diff --git a/templates/img/teddycloud.png b/templates/img/teddycloud.png
index 6badfd56..93667cf6 100644
Binary files a/templates/img/teddycloud.png and b/templates/img/teddycloud.png differ
diff --git a/templates/img/tinshop-ng.png b/templates/img/tinshop-ng.png
new file mode 100644
index 00000000..b7d9ec24
Binary files /dev/null and b/templates/img/tinshop-ng.png differ
diff --git a/templates/mealiev1.xml b/templates/mealiev1.xml
index 82e4f0a4..5b6e9f0c 100644
--- a/templates/mealiev1.xml
+++ b/templates/mealiev1.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0"?>
 <Container version="2">
   <Name>mealiev1</Name>
-  <Repository>ghcr.io/mealie-recipes/mealie:nightly</Repository>
-  <Registry>ghcr.io/mealie-recipes/mealie:nightly</Registry>
+  <Repository>mealie-recipes/mealie</Repository>
+  <Registry>ghcr.io/mealie-recipes/mealie</Registry>
+  <Branch>
+    <Tag>latest</Tag>
+    <TagDescription>Latest stable release</TagDescription>
+  </Branch>
+  <Branch>
+    <Tag>nightly</Tag>
+    <TagDescription>Latest nightly release</TagDescription>
   <Network>bridge</Network>
   <Shell>sh</Shell>
   <Privileged>false</Privileged>
diff --git a/templates/teddycloud.xml b/templates/teddycloud.xml
index 40bd6143..cace273d 100644
--- a/templates/teddycloud.xml
+++ b/templates/teddycloud.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0"?>
 <Container version="2">
-  <Name>teddycloud</Name>
-  <Repository>ghcr.io/toniebox-reverse-engineering/teddycloud:latest</Repository>
-  <Registry>ghcr.io/toniebox-reverse-engineering/teddycloud:latest</Registry>
-  <Network>bridge</Network>
-  <Privileged>false</Privileged>
-  <Support>https://forums.unraid.net/topic/138058-support-catduck-templates</Support>
-  <Project>https://github.com/toniebox-reverse-engineering/teddycloud</Project>
-  <Overview>teddyCloud is an alternative server for your Toniebox, allowing you to host the cloud services locally. This gives you the control about which data is sent to the original manufacturers cloud and allows you to host your own figurine audio files on e.g. your NAS or any other server.
-  </Overview>
-  <WebUI>http://[IP]:[PORT:80]</WebUI>
-  <Category>MediaServer:Music MediaServer:Other</Category>
-  <TemplateURL>https://raw.githubusercontent.com/selfhosters/unRAID-CA-templates/master/templates/teddycloud.xml</TemplateURL>
-  <Icon>https://raw.githubusercontent.com/selfhosters/unRAID-CA-templates/master/templates/img/teddycloud.png</Icon>
-  <Config Name="WEB UI" Target="80" Default="7780" Mode="tcp" Description="This an optional port for the webui of teddycloud" Type="Port" Display="always" Required="true" Mask="false"/>
-  <Config Name="SSL-Certs" Target="443" Default="7443" Mode="tcp" Description="Required PORT to get certificates" Type="Port" Display="always" Required="true" Mask="false">7443</Config>
-  <Config Name="content" Target="/teddycloud/data/content" Default="" Mode="rw" Description="" Type="Path" Display="always" Required="false" Mask="false">/mnt/user/appdata/teddycloud/data/content</Config>
-  <Config Name="config" Target="/teddycloud/config" Default="" Mode="rw" Description="" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/appdata/teddycloud/config</Config>
-  <Config Name="certs" Target="/teddycloud/certs" Default="" Mode="rw" Description="Place your certs here after grabbing them off your device. (Yes you need to do this)" Type="Path" Display="advanced" Required="true" Mask="false">/mnt/user/appdata/teddycloud/certs</Config>
-  <Config Name="library" Target="/teddycloud/data/library" Default="" Mode="rw" Description="" Type="Path" Display="advanced" Required="false" Mask="false">/mnt/user/appdata/teddycloud/data/library</Config>
-  <Config Name="firmware" Target="/teddycloud/data/firmware" Default="" Mode="rw" Description="" Type="Path" Display="advanced" Required="true" Mask="false">/mnt/user/appdata/teddycloud/data/firmware</Config>
+    <Name>teddycloud</Name>
+    <Repository>ghcr.io/toniebox-reverse-engineering/teddycloud:latest</Repository>
+    <Registry>ghcr.io/toniebox-reverse-engineering/teddycloud:latest</Registry>
+    <Network>bridge</Network>
+    <Privileged>false</Privileged>
+    <Support>https://forums.unraid.net/topic/138058-support-catduck-templates</Support>
+    <Project>https://github.com/toniebox-reverse-engineering/teddycloud</Project>
+    <Overview>teddyCloud is an alternative server for your Toniebox, allowing you to host the cloud services locally. This gives you the control about which data is sent to the original manufacturers cloud and allows you to host your own figurine audio files on e.g. your NAS or any other server.
+    </Overview>
+    <WebUI>http://[IP]:[PORT:7780]</WebUI>
+    <Category>MediaServer:Music MediaServer:Other</Category>
+    <TemplateURL>https://raw.githubusercontent.com/selfhosters/unRAID-CA-templates/master/templates/teddycloud.xml</TemplateURL>
+    <Icon>https://raw.githubusercontent.com/selfhosters/unRAID-CA-templates/master/templates/img/teddycloud.xml</Icon>
+    </Config Name="WEB UI" Target="80" Default="7780" Mode="tcp" Description="This an optional port for the webui of teddycloud" Type="Port" Display="always" Required="true" Mask="false">
+    <Config Name="SSL-Certs" Target="443" Default="7443" Mode="tcp" Description="Required PORT to get certificates" Type="Port" Display="always" Required="true" Mask="false">7443</Config>
+    <Config Name="content" Target="/teddycloud/data/content" Default="" Mode="rw" Description="" Type="Path" Display="always" Required="false" Mask="false">/mnt/user/appdata/teddycloud/data/content</Config>
+    <Config Name="config" Target="/teddycloud/config" Default="" Mode="rw" Description="" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/appdata/teddycloud/config</Config>
+    <Config Name="certs" Target="/teddycloud/certs" Default="" Mode="rw" Description="Place your certs here after grabbing them off your device. (Yes you need to do this)" Type="Path" Display="advanced" Required="true" Mask="false">/mnt/user/appdata/teddycloud/certs</Config>
+    <Config Name="library" Target="/teddycloud/data/library" Default="" Mode="rw" Description="" Type="Path" Display="advanced" Required="false" Mask="false">/mnt/user/appdata/teddycloud/data/library</Config>
+    <Config Name="firmware" Target="/teddycloud/data/firmware" Default="" Mode="rw" Description="" Type="Path" Display="advanced" Required="true" Mask="false">/mnt/user/appdata/teddycloud/data/firmware</Config>
 </Container>
diff --git a/templates/tinshop-ng.xml b/templates/tinshop-ng.xml
new file mode 100644
index 00000000..fdae5de8
--- /dev/null
+++ b/templates/tinshop-ng.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<Container version="2">
+  <Name>tinshop-ng</Name>
+  <Repository>hcr.io/ajmandourah/tinshop-ng:latest</Repository>
+  <Registry>hcr.io/ajmandourah/tinshop-ng:latest</Registry>
+  <Network>bridge</Network>
+  <Privileged>false</Privileged>
+  <Support>https://forums.unraid.net/topic/138058-support-catduck-templates</Support>
+  <Project>https://github.com/ajmandourah/tinshop-ng</Project>
+  <Overview>Tinshop-NG is a better nut server. Everything should be able to be confiured with environment variables.
+  </Overview>
+  <WebUI>http://[IP]:[PORT:3000]</WebUI>
+  <Category>GameServers:</Category>
+  <TemplateURL>https://raw.githubusercontent.com/selfhosters/unRAID-CA-templates/master/templates/tinshop-ng.xml</TemplateURL>
+  <Icon>https://raw.githubusercontent.com/selfhosters/unRAID-CA-templates/master/templates/img/tinshop-ng.png</Icon>
+  <Config Name="Port" Target="3000" Default="3000" Mode="tcp" Description="" Type="Port" Display="always" Required="false" Mask="false">3341</Config>
+  <Config Name="appdata" Target="/data" Default="" Mode="rw" Description="" Type="Path" Display="always" Required="false" Mask="false">/mnt/user/appdata/tinshop-ng</Config>
+  <Config Name="Game Directory" Target="/games" Default="" Mode="rw" Description="" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/media/gaming/game_files/nintendo/switch/nsp/</Config>
+  <Config Name="TINSHOP_PROTOCOL" Target="TINSHOP_PROTOCOL" Default="" Mode="" Description="" Type="Variable" Display="always" Required="true" Mask="false">http</Config>
+  <Config Name="TINSHOP_REVERSEPROXY&#9;" Target="TINSHOP_REVERSEPROXY" Default="" Mode="" Description="" Type="Variable" Display="always" Required="true" Mask="false">true</Config>
+  <Config Name="TINSHOP_HOST" Target="TINSHOP_HOST" Default="" Mode="" Description="" Type="Variable" Display="always" Required="false" Mask="false">tinshop.fleebailey33.com</Config>
+  <Config Name="TINSHOP_NAME" Target="TINSHOP_NAME" Default="" Mode="" Description="" Type="Variable" Display="advanced" Required="false" Mask="false">Tinshop</Config>
+  <Config Name="TINSHOP_DEBUG_NFS" Target="TINSHOP_DEBUG_NFS" Default="false" Mode="" Description="" Type="Variable" Display="advanced" Required="false" Mask="false">false</Config>
+  <Config Name="TINSHOP_DEBUG_NOSECURITY" Target="TINSHOP_DEBUG_NOSECURITY" Default="false" Mode="" Description="" Type="Variable" Display="advanced" Required="false" Mask="false">false</Config>
+  <Config Name="Welcome Message" Target="TINSHOP_WELCOMEMESSAGE" Default="" Mode="" Description="" Type="Variable" Display="advanced" Required="false" Mask="false">Welcome to my Tinshop!</Config>
+  <Config Name="Games Directory" Target="TINSHOP_SOURCES_DIRECTORIES" Default="" Mode="" Description="" Type="Variable" Display="advanced" Required="true" Mask="false">/games</Config>
+  <Config Name="TINSHOP_SECURITY_WHITELIST" Target="TINSHOP_SECURITY_WHITELIST" Default="" Mode="" Description="" Type="Variable" Display="advanced" Required="false" Mask="false"/>
+  <Config Name="TINSHOP_SECURITY_BANNEDTHEME" Target="TINSHOP_SECURITY_BANNEDTHEME" Default="" Mode="" Description="" Type="Variable" Display="advanced" Required="false" Mask="false"/>
+  <Config Name="TINSHOP_NSP_CHECKVERIFIED" Target="TINSHOP_NSP_CHECKVERIFIED" Default="" Mode="" Description="" Type="Variable" Display="advanced" Required="false" Mask="false"/>
+  <Config Name="TINSHOP_SECURITY_FORWARDAUTH&#9;" Target="TINSHOP_SECURITY_FORWARDAUTH" Default="" Mode="" Description="" Type="Variable" Display="advanced" Required="false" Mask="false"/>
+  <Config Name="TINSHOP_SOURCES_NSF" Target="TINSHOP_SOURCES_NSF" Default="" Mode="" Description="" Type="Variable" Display="advanced" Required="false" Mask="false">false</Config>
+  <Config Name="TINSHOP_SECURITY_BLACKLIST" Target="TINSHOP_SECURITY_BLACKLIST" Default="false" Mode="" Description="" Type="Variable" Display="advanced" Required="false" Mask="false">false</Config>
+</Container>
\ No newline at end of file