diff --git a/templates/gotify.xml b/templates/gotify.xml
index 08be85d..6e0d1c3 100644
--- a/templates/gotify.xml
+++ b/templates/gotify.xml
@@ -7,10 +7,10 @@
   <MyIP/>
   <Shell>sh</Shell>
   <Privileged>false</Privileged>
-  <Support>https://forums.unraid.net/topic/89502-support-a75g-repo/?do=edit</Support>
+  <Support>https://forums.unraid.net/topic/89502-support-a75g-repo/</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>
+  <Category>Productivity: Tools: Network:Messenger Status:Stable</Category>
   <WebUI>http://[IP]:[PORT:80]</WebUI>
   <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>
diff --git a/templates/homer.xml b/templates/homer.xml
new file mode 100644
index 0000000..68d0737
--- /dev/null
+++ b/templates/homer.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<Container version="2">
+  <Name>homer</Name>
+  <Repository>b4bz/homer</Repository>
+  <Registry>https://hub.docker.com/r/b4bz/homer/</Registry>
+  <Network>bridge</Network>
+  <MyIP/>
+  <Shell>sh</Shell>
+  <Privileged>false</Privileged>
+  <Support>https://forums.unraid.net/topic/89502-support-a75g-repo/</Support>
+  <Project>https://github.com/bastienwirtz/homer</Project>
+  <Overview>A dead simple static HOMe for your servER to keep your services on hand from a simple yaml config.[br][br]Download config.yml[/br][/br]wget -O /mnt/user/appdata/homer/config/config.yml https://raw.githubusercontent.com/bastienwirtz/homer/master/config.yml</Overview>
+  <Category>Network:Web</Category>
+  <WebUI>http://[IP]:[PORT:8080]</WebUI>
+  <TemplateURL/>
+  <Icon>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/homer.png</Icon>
+  <ExtraParams/>
+  <PostArgs/>
+  <CPUset/>
+  <DateInstalled>1583907477</DateInstalled>
+  <DonateText/>
+  <DonateLink/>
+  <Description>A dead simple static HOMe for your servER to keep your services on hand from a simple yaml config.[br][br]Download config.yml[/br][/br]wget -O /mnt/user/appdata/homer/config.yml https://raw.githubusercontent.com/bastienwirtz/homer/master/config.yml</Description>
+  <Networking>
+    <Mode>bridge</Mode>
+    <Publish>
+      <Port>
+        <HostPort>8080</HostPort>
+        <ContainerPort>8080</ContainerPort>
+        <Protocol>tcp</Protocol>
+      </Port>
+    </Publish>
+  </Networking>
+  <Data>
+    <Volume>
+      <HostDir>/mnt/user/appdata/homer/assets/</HostDir>
+      <ContainerDir>/www/assets</ContainerDir>
+      <Mode>rw</Mode>
+    </Volume>
+    <Volume>
+      <HostDir>/mnt/user/appdata/homer/config.yml</HostDir>
+      <ContainerDir>/www/config.yml</ContainerDir>
+      <Mode>rw</Mode>
+    </Volume>
+  </Data>
+  <Environment/>
+  <Labels/>
+  <Config Name="Host Port 1" Target="8080" Default="" Mode="tcp" Description="Container Port: 8080" Type="Port" Display="always" Required="false" Mask="false">8080</Config>
+  <Config Name="Host Path 1" Target="/www/assets" Default="" Mode="rw" Description="Container Path: /www/assets" Type="Path" Display="always" Required="false" Mask="false">/mnt/user/appdata/homer/assets/</Config>
+  <Config Name="Host Path 2" Target="/www/config.yml" Default="" Mode="rw" Description="Container Path: /www/config.yml" Type="Path" Display="always" Required="false" Mask="false">/mnt/user/appdata/homer/config/config.yml</Config>
+</Container>
\ No newline at end of file
diff --git a/templates/icons/homer.png b/templates/icons/homer.png
new file mode 100644
index 0000000..bd9a6fd
Binary files /dev/null and b/templates/icons/homer.png differ
diff --git a/templates/icons/kiwix.png b/templates/icons/kiwix.png
new file mode 100644
index 0000000..3fa79c7
Binary files /dev/null and b/templates/icons/kiwix.png differ
diff --git a/templates/kiwix-serve.xml b/templates/kiwix-serve.xml
new file mode 100644
index 0000000..daae0e3
--- /dev/null
+++ b/templates/kiwix-serve.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<Container version="2">
+  <Name>kiwix-serve</Name>
+  <Repository>kiwix/kiwix-serve</Repository>
+  <Registry>https://hub.docker.com/r/kiwix/kiwix-serve/</Registry>
+  <Network>bridge</Network>
+  <MyIP/>
+  <Shell>sh</Shell>
+  <Privileged>false</Privileged>
+  <Support>https://forums.unraid.net/topic/89502-support-a75g-repo/</Support>
+  <Project>https://www.kiwix.org/</Project>
+  <Overview>Kiwix enables you to have the whole Wikipedia at hand wherever you go! [br]Remove download link after download complete.[/br]</Overview>
+  <Category>Productivity:</Category>
+  <WebUI>http://[IP]:[PORT:80]</WebUI>
+  <TemplateURL/>
+  <Icon>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/kiwix.png</Icon>
+  <ExtraParams/>
+  <PostArgs>*.zim</PostArgs>
+  <CPUset/>
+  <DateInstalled>1583904132</DateInstalled>
+  <DonateText/>
+  <DonateLink/>
+  <Description>Kiwix enables you to have the whole Wikipedia at hand wherever you go! [br]Remove download link after download complete.[/br]</Description>
+  <Networking>
+    <Mode>bridge</Mode>
+    <Publish>
+      <Port>
+        <HostPort>8040</HostPort>
+        <ContainerPort>80</ContainerPort>
+        <Protocol>tcp</Protocol>
+      </Port>
+    </Publish>
+  </Networking>
+  <Data>
+    <Volume>
+      <HostDir>/mnt/user/appdata/kiwix-serve/</HostDir>
+      <ContainerDir>/data</ContainerDir>
+      <Mode>rw</Mode>
+    </Volume>
+  </Data>
+  <Environment>
+    <Variable>
+      <Value>http://download.kiwix.org/zim/wikipedia_en_chemistry_nopic.zim</Value>
+      <Name>DOWNLOAD</Name>
+      <Mode/>
+    </Variable>
+  </Environment>
+  <Labels/>
+  <Config Name="Host Port 1" Target="80" Default="" Mode="tcp" Description="Container Port: 80" Type="Port" Display="always" Required="false" Mask="false">8040</Config>
+  <Config Name="Host Path 1" Target="/data" Default="" Mode="rw" Description="Container Path: /data" Type="Path" Display="always" Required="false" Mask="false">/mnt/user/appdata/kiwix-serve/</Config>
+  <Config Name="Host Key 1" Target="DOWNLOAD" Default="" Mode="" Description="Add download link here to download contents https://wiki.kiwix.org/wiki/Content" Type="Variable" Display="always" Required="false" Mask="false">http://download.kiwix.org/zim/wikipedia_en_chemistry_nopic.zim</Config>
+</Container>
\ No newline at end of file