diff --git a/README.md b/README.md
index 6bb758e..68bd65f 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,7 @@
 - [Droppy](#droppy)
 - [FileRun](#filerun)
   * [Default username and password](#default-username-and-password-1)
+- [Filestash](#filestash)
 - [FreePBX](#freepbx)
   * [First installation](#first-installation-2)
 - [Freescout](#freescout)
@@ -48,16 +49,18 @@
 - [Mattermost](#mattermost)
 - [Miniflux](#miniflux)
   * [Notes](#notes-3)
-- [Netbox](#netbox)
+- [Mumble](#mumble)
   * [Notes](#notes-4)
+- [Netbox](#netbox)
+  * [Notes](#notes-5)
 - [phpBB](#phpbb)
 - [PsiTransfer](#psitransfer)
-  * [Notes](#notes-5)
-- [Pure-FTPd](#pure-ftpd)
   * [Notes](#notes-6)
+- [Pure-FTPd](#pure-ftpd)
+  * [Notes](#notes-7)
 - [Pwndrop](#pwndrop)
 - [Quakejs](#quakejs)
-- [Notes](#notes-7)
+- [Notes](#notes-8)
 - [Reactive-resume](#reactive-resume)
 - [Riot-web](#riot-web)
   * [Before running the docker](#before-running-the-docker-3)
@@ -65,12 +68,15 @@
 - [Selfoss](#selfoss)
 - [Shiori](#shiori)
   * [Default username and password](#default-username-and-password-4)
-  * [Notes](#notes-8)
+  * [Notes](#notes-9)
+- [Solr](#solr)
 - [StackEdit](#stackedit)
 - [Wallabag](#wallabag)
   * [Default username and password](#default-username-and-password-5)
   * [PHP errors](#php-errors)
   * [Missing texture and images](#missing-texture-and-images)
+- [YaCy](#yacy)
+  * [Default username and password](#default-username-and-password-6)
 
 ----
 # ArchiveBox
@@ -230,6 +236,18 @@
 * Username: ```superuser```
 * Password: ```superuser```
 
+----
+# Filestash
+![Filestash](https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/filestash.png)
+
+**Application Name:** Filestash
+
+**Application Site:** https://www.filestash.app/
+
+**Docker Hub:** https://hub.docker.com/r/machines/filestash/
+
+**Github:** https://github.com/mickael-kerjean/filestash
+
 ----
 # FreePBX
 ![FreePBX](https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/freepbx.png)
@@ -480,6 +498,21 @@ For more content https://wiki.kiwix.org/wiki/Content
 * Admin username and password is setup at in docker variables then you can change in Miniflux settings. Docker variable will be ignored when you change it inside the docker.
 * PostgreSQL DB Required (Not Included)
 
+----
+# Mumble
+![Mumble](https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/mumble.png)
+
+**Application Name:** Mumble
+
+**Application Site:** https://www.mumble.com/
+
+**Docker Hub:** https://hub.docker.com/r/phlak/mumble
+
+**Github:** https://github.com/PHLAK/docker-mumble
+## Notes
+* Download config.ini an customize it ```wget -O /mnt/user/appdata/mumble/config.ini https://raw.githubusercontent.com/PHLAK/docker-mumble/master/files/config.ini```
+* See https://wiki.mumble.info/wiki/Murmur.ini for more options
+
 ----
 # Netbox
 ![Netbox](https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/netbox.png)
@@ -635,6 +668,18 @@ Password: ```gopher```
 ## Notes
 * Create new account inside the web gui so the default one will be removed.
 
+----
+# Solr
+![Solr](https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/solr.png)
+
+**Application Name:** Solr
+
+**Application Site:** https://lucene.apache.org/solr/
+
+**Docker Hub:** https://hub.docker.com/r/bitnami/solr
+
+**Github:** https://github.com/bitnami/bitnami-docker-solr
+
 ----
 # StackEdit
 ![Shiori](https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/stackedit.png)
@@ -664,4 +709,18 @@ Password: ```wallabag```
 ## PHP errors
 * https://github.com/wallabag/docker/issues/185
 ## Missing texture and images 
-* Make sure the domain variable is right http://ip:6500 and if you are hosting it http://wallabag.example.com or https://wallabag.example.com.
\ No newline at end of file
+* Make sure the domain variable is right http://ip:6500 and if you are hosting it http://wallabag.example.com or https://wallabag.example.com.
+----
+# YaCy
+![YaCy](https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/yacy.png)
+
+**Application Name:** YaCy
+
+**Application Site:** https://yacy.net/
+
+**Docker Hub:** https://hub.docker.com/r/yacy/yacy_search_server/
+
+**Github:** https://www.github.com/yacy/yacy_search_server
+## Default username and password
+Username: ```admin```
+Password: ```docker```
\ No newline at end of file
diff --git a/templates/filestash.xml b/templates/filestash.xml
new file mode 100644
index 0000000..bf91624
--- /dev/null
+++ b/templates/filestash.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<Container version="2">
+  <Name>filestash</Name>
+  <Repository>machines/filestash:latest</Repository>
+  <Registry>https://hub.docker.com/r/machines/filestash/</Registry>
+  <Network>bridge</Network>
+  <Shell>sh</Shell>
+  <Privileged>false</Privileged>
+  <Support>https://forums.unraid.net/topic/89502-support-a75g-repo/</Support>
+  <Project>https://www.filestash.app/</Project>
+  <Overview>A modern web client for SFTP, S3, FTP, WebDAV, Git, Minio, LDAP, CalDAV, CardDAV, Mysql, Backblaze, ...</Overview>
+  <Category>Cloud: Productivity: Network:Web</Category>
+  <WebUI>http://[IP]:[PORT:8334]/</WebUI>
+  <TemplateURL>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/filestash.xml</TemplateURL>
+  <Icon>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/filestash.png</Icon>
+  <ExtraParams/>
+  <PostArgs/>
+  <DonateText/>
+  <DonateLink/>
+  <Description>A modern web client for SFTP, S3, FTP, WebDAV, Git, Minio, LDAP, CalDAV, CardDAV, Mysql, Backblaze, ...</Description>
+  <Config Name="Port" Target="8334" Default="8334" Mode="tcp" Description="Port" Type="Port" Display="always" Required="true" Mask="false">8334</Config>
+  <Config Name="Appdata" Target="/app/data/state/" Default="/mnt/user/appdata/filestash/" Mode="rw" Description="Container Path: /app/data/state/" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/appdata/filestash/</Config>
+</Container>
\ No newline at end of file
diff --git a/templates/icons/filestash.png b/templates/icons/filestash.png
new file mode 100644
index 0000000..299c4d4
Binary files /dev/null and b/templates/icons/filestash.png differ
diff --git a/templates/icons/mumble.png b/templates/icons/mumble.png
new file mode 100644
index 0000000..e71c303
Binary files /dev/null and b/templates/icons/mumble.png differ
diff --git a/templates/icons/solr.png b/templates/icons/solr.png
new file mode 100644
index 0000000..ee0e7f1
Binary files /dev/null and b/templates/icons/solr.png differ
diff --git a/templates/icons/yacy.png b/templates/icons/yacy.png
new file mode 100644
index 0000000..6fb9025
Binary files /dev/null and b/templates/icons/yacy.png differ
diff --git a/templates/mumble.xml b/templates/mumble.xml
new file mode 100644
index 0000000..ca38f1f
--- /dev/null
+++ b/templates/mumble.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<Container version="2">
+  <Name>mumble</Name>
+  <Repository>phlak/mumble:latest</Repository>
+  <Registry>https://hub.docker.com/r/phlak/mumble/</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.mumble.com/</Project>
+  <Overview>Mumble is an open source voice communication application[br]Download config.ini[/br]wget -O /mnt/user/appdata/mumble/config.ini https://raw.githubusercontent.com/PHLAK/docker-mumble/master/files/config.ini</Overview>
+  <Category>Productivity: Network:Voip Network:Messenger</Category>
+  <WebUI/>
+  <TemplateURL/>
+  <Icon>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/mumble.png</Icon>
+  <ExtraParams/>
+  <PostArgs/>
+  <CPUset/>
+  <DateInstalled>1588610732</DateInstalled>
+  <DonateText/>
+  <DonateLink/>
+  <Description>Mumble is an open source voice communication application[br]Download config.ini[/br]wget -O /mnt/user/appdata/mumble/config.ini https://raw.githubusercontent.com/PHLAK/docker-mumble/master/files/config.ini</Description>
+  <Networking>
+    <Mode>bridge</Mode>
+    <Publish>
+      <Port>
+        <HostPort>64738</HostPort>
+        <ContainerPort>64738</ContainerPort>
+        <Protocol>tcp</Protocol>
+      </Port>
+      <Port>
+        <HostPort>64738</HostPort>
+        <ContainerPort>64738</ContainerPort>
+        <Protocol>udp</Protocol>
+      </Port>
+    </Publish>
+  </Networking>
+  <Data>
+    <Volume>
+      <HostDir>/mnt/user/appdata/mumble/</HostDir>
+      <ContainerDir>/etc/mumble</ContainerDir>
+      <Mode>rw</Mode>
+    </Volume>
+  </Data>
+  <Environment>
+    <Variable>
+      <Value>Password</Value>
+      <Name>SUPERUSER_PASSWORD</Name>
+      <Mode/>
+    </Variable>
+  </Environment>
+  <Labels/>
+  <Config Name="Port TCP" Target="64738" Default="64738" Mode="tcp" Description="64738 TCP" Type="Port" Display="always" Required="true" Mask="false">64738</Config>
+  <Config Name="Port UDP" Target="64738" Default="64738" Mode="udp" Description="64738 UDP" Type="Port" Display="always" Required="true" Mask="false">64738</Config>
+  <Config Name="Appdata" Target="/etc/mumble" Default="/mnt/user/appdata/mumble/" Mode="rw" Description="Appdata" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/appdata/mumble/</Config>
+  <Config Name="SUPERUSER_PASSWORD" Target="SUPERUSER_PASSWORD" Default="Password" Mode="" Description="SUPERUSER_PASSWORD" Type="Variable" Display="always" Required="false" Mask="false">Password</Config>
+</Container>
\ No newline at end of file
diff --git a/templates/solr.xml b/templates/solr.xml
new file mode 100644
index 0000000..7ba9519
--- /dev/null
+++ b/templates/solr.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<Container version="2">
+  <Name>solr</Name>
+  <Repository>bitnami/solr:latest</Repository>
+  <Registry>https://hub.docker.com/r/bitnami/solr/</Registry>
+  <Network>bridge</Network>
+  <Shell>sh</Shell>
+  <Privileged>false</Privileged>
+  <Support>https://forums.unraid.net/topic/89502-support-a75g-repo/</Support>
+  <Project>https://lucene.apache.org/solr/</Project>
+  <Overview>Solr is the popular, blazing-fast, open source enterprise search platform built on Apache Lucene.</Overview>
+  <Category>Tools:</Category>
+  <WebUI>http://[IP]:[PORT:8983]</WebUI>
+  <TemplateURL>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/solr.xml</TemplateURL>
+  <Icon>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/solr.png</Icon>
+  <ExtraParams/>
+  <PostArgs/>
+  <DonateText/>
+  <DonateLink/>
+  <Description>Solr is the popular, blazing-fast, open source enterprise search platform built on Apache Lucene.</Description>
+  <Config Name="Port" Target="8983" Default="8983" Mode="tcp" Description="Port" Type="Port" Display="always" Required="true" Mask="false">8983</Config>
+  <Config Name="Appdata" Target="/bitnami" Default="/mnt/user/appdata/solr/" Mode="rw" Description="Appdata" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/appdata/solr/</Config>
+  <Config Name="SOLR_PORT_NUMBER" Target="SOLR_PORT_NUMBER" Default="8983" Mode="" Description="Port used by Solr server. Default: 8983" Type="Variable" Display="always" Required="true" Mask="false">8983</Config>
+  <Config Name="SOLR_CORE" Target="SOLR_CORE" Default="my_core" Mode="" Description="Core name to create at first run." Type="Variable" Display="always" Required="true" Mask="false">my_core</Config>
+</Container>
\ No newline at end of file
diff --git a/templates/yacy.xml b/templates/yacy.xml
new file mode 100644
index 0000000..e74b3ad
--- /dev/null
+++ b/templates/yacy.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<Container version="2">
+  <Name>yacy</Name>
+  <Repository>yacy/yacy_search_server:latest</Repository>
+  <Registry>https://hub.docker.com/r/yacy/yacy_search_server/</Registry>
+  <Network>bridge</Network>
+  <Shell>sh</Shell>
+  <Privileged>false</Privileged>
+  <Support>https://forums.unraid.net/topic/89502-support-a75g-repo/</Support>
+  <Project>https://yacy.net/</Project>
+  <Overview>YaCy decentralized search engine (https://yacy.net)[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]docker[/B][/u][/b]</Overview>
+  <Category>Tools: Network:Web</Category>
+  <WebUI>http://[IP]:[PORT:8090]/</WebUI>
+  <TemplateURL>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/yacy.xml</TemplateURL>
+  <Icon>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/yacy.png</Icon>
+  <ExtraParams>--log-opt max-size=200m --log-opt max-file=2</ExtraParams>
+  <PostArgs/>
+  <DonateText/>
+  <DonateLink/>
+  <Description>YaCy decentralized search engine (https://yacy.net)[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]docker[/B][/u][/b]</Description>
+  <Config Name="HTTP" Target="8090" Default="8090" Mode="tcp" Description="HTTP" Type="Port" Display="always" Required="true" Mask="false">8090</Config>
+  <Config Name="HTTPs" Target="8443" Default="8443" Mode="tcp" Description="HTTPs (Not Required if you using reverse proxy)" Type="Port" Display="always" Required="false" Mask="false">8443</Config>
+  <Config Name="Appdata" Target="/opt/yacy_search_server/DATA" Default="/mnt/user/appdata/yacy/" Mode="rw" Description="Appdata" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/appdata/yacy/</Config>
+</Container>
\ No newline at end of file