diff --git a/README.md b/README.md
index eb4ab3c..1d8e837 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 # Unraid Templates
 - [ArchiveBox](#archivebox)
   * [First installation](#first-installation)
+- [CryptPad](#cryptpad)
+  * [First installation](#first-installation-1)
 - [CyberChef](#cyberchef)
 - [Dashmachine](#dashmachine)
   * [Default username and password](#default-username-and-password)
@@ -14,7 +16,7 @@
 - [FileRun](#filerun)
   * [Default username and password](#default-username-and-password-1)
 - [FreePBX](#freepbx)
-  * [First installation](#first-installation-1)
+  * [First installation](#first-installation-2)
 - [Freescout](#freescout)
   * [Creating User](#creating-user)
 - [Firefox-Syncserver](#firefox-syncserver)
@@ -23,6 +25,7 @@
   * [Notes](#notes)
 - [Golinks](#golinks)
   * [Usage](#usage)
+- [Gossa](#gossa)
 - [Gotify](#gotify)
   * [Before running the docker](#before-running-the-docker-1)
   * [Default username and password](#default-username-and-password-3)
@@ -39,17 +42,21 @@
   * [Guides](#guides)
 - [Miniflux](#miniflux)
   * [Notes](#notes-3)
-- [PsiTransfer](#psitransfer)
+- [Netbox](#netbox)
   * [Notes](#notes-4)
-- [Pure-FTPd](#pure-ftpd)
+- [phpBB](#phpbb)
+- [PsiTransfer](#psitransfer)
   * [Notes](#notes-5)
+- [Pure-FTPd](#pure-ftpd)
+  * [Notes](#notes-6)
+- [Pwndrop](#pwndrop)
 - [Reactive-resume](#reactive-resume)
 - [Riot-web](#riot-web)
   * [Before running the docker](#before-running-the-docker-3)
 - [Searx](#searx)
 - [Shiori](#shiori)
   * [Default username and password](#default-username-and-password-4)
-  * [Notes](#notes-6)
+  * [Notes](#notes-7)
 - [StackEdit](#stackedit)
 - [Wallabag](#wallabag)
   * [Default username and password](#default-username-and-password-5)
@@ -71,6 +78,20 @@
 * After first run shut it down then remove Post Arguments and add ```./archive (URL,FEED,BOOKMARK,FILE)``` https://github.com/pirate/ArchiveBox/wiki/Usage#import-a-single-url-or-list-of-urls-via-stdin
 *  [Publishing Your Archive](https://github.com/pirate/ArchiveBox/wiki/Publishing-Your-Archive#publishing-your-archive)
 
+----
+# CryptPad
+![CryptPad](https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/cryptpad.png)
+
+**Application Name:** CryptPad
+
+**Application Site:** https://cryptpad.fr/
+
+**Docker Hub:** https://hub.docker.com/r/cryptpad/cryptpad
+
+**Github:** https://github.com/xwiki-labs/cryptpad
+## First installation 
+* Edit config.js /mnt/appdata/cryptpad/cfg/config.js ```httpAddress: '0.0.0.0'``` and remove ```//``` before it
+
 ----
 # CyberChef
 ![CyberChef](https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/cyberchef.png)
@@ -95,14 +116,15 @@
 
 **Github:** https://github.com/rmountjoy92/DashMachine
 ## Default username and password
-Username: ```admin```
-Password: ```admin```
+* Username: ```admin```
+* Password: ```admin```
 ## ~~Unauthorized~~
 ~~If you get unauthorized page add /login <- ```http://IP:PORT/login```~~
 
 ----
 # db-backup
 ![db-backup](https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/db-backup.png)
+
 *<div>Icons made by <a href="https://www.flaticon.com/authors/srip" title="srip">srip</a> from <a href="https://www.flaticon.com/" title="Flaticon">www.flaticon.com</a></div>*
 
 **Application Name:** db-backup
@@ -149,6 +171,7 @@ Password: ```admin```
 ----
 # Docpht
 ![Docpht](https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/docpht.png)
+
 *Icons made by <a href="https://www.flaticon.com/authors/freepik" title="Freepik">Freepik</a> from <a href="https://www.flaticon.com/" title="Flaticon"> www.flaticon.com</a>*
 
 **Application Name:** Docpht
@@ -183,8 +206,8 @@ Password: ```admin```
 
 **Github:** https://github.com/filerun/docker
 ## Default username and password
-Username: ```superuser```
-Password: ```superuser```
+* Username: ```superuser```
+* Password: ```superuser```
 
 ----
 # FreePBX
@@ -215,7 +238,6 @@ Password: ```superuser```
 ## Creating User
 * CLI ```cd /www/html``` then ```php artisan freescout:create-user```
 
-
 ----
 # Firefox-Syncserver
 ![Firefox-Syncserver](https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/firefox-syncserver.png)
@@ -250,6 +272,7 @@ Password: ```flarum```
 ![Golinks](https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/golinks.png)
     
 *<div>Icons made by <a href="https://www.flaticon.com/authors/iconixar" title="iconixar">iconixar</a> from <a href="https://www.flaticon.com/" title="Flaticon">www.flaticon.com</a></div>*
+
 **Application Name:** Golinks
 
 **Application Site:** https://github.com/prologic/golinks
@@ -260,6 +283,20 @@ Password: ```flarum```
 ## Usage
 * https://github.com/prologic/golinks#usage
     
+----
+# Gossa
+![Gossa](https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/gossa.png)
+
+*<div>Icons made by <a href="https://www.flaticon.com/authors/srip" title="srip">srip</a> from <a href="https://www.flaticon.com/" title="Flaticon">www.flaticon.com</a></div>*
+
+**Application Name:** Gossa
+
+**Application Site:** https://www.github.com/pldubouilh/gossa
+
+**Docker Hub:** https://hub.docker.com/r/pldubouilh/gossa/
+
+**Github:** https://www.github.com/pldubouilh/gossa
+
 ----
 # Gotify
 ![Gotify](https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/gotify.png)
@@ -275,8 +312,8 @@ Password: ```flarum```
 ```mkdir -p /mnt/user/appdata/gotify/config/```
 ```wget -O /mnt/user/appdata/gotify/config/config.yml https://raw.githubusercontent.com/gotify/server/master/config.example.yml```
 ## Default username and password
-Username: ```admin```
-Password: ```admin```
+* Username: ```admin```
+* Password: ```admin```
     
 ----
 # Homer
@@ -372,9 +409,37 @@ 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)
 
+----
+# Netbox
+![Netbox](https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/netbox.png)
+
+**Application Name:** Netbox
+
+**Application Site:** https://github.com/netbox-community/netbox
+
+**Docker Hub:** https://hub.docker.com/r/pitkley/netbox
+
+**Github:** https://github.com/pitkley/docker-netbox
+## Notes
+* Create User cli to the docker then ```./manage.py createsuperuser```
+* PostgreSQL DB Required (Not Included)
+
+----
+# phpBB
+![phpBB](https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/phpbb.png)
+
+**Application Name:** phpBB
+
+**Application Site:** https://www.phpbb.com/
+
+**Docker Hub:** https://hub.docker.com/r/bitnami/phpbb
+
+**Github:** https://github.com/bitnami/bitnami-docker-phpbb/
+
 ----
 # PsiTransfer
 ![psitransfer](https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/psitransfer.png)
+
 *<div>Icons made by <a href="https://www.flaticon.com/authors/google" title="Google">Google</a> from <a href="https://www.flaticon.com/" title="Flaticon">www.flaticon.com</a></div>*
 
 **Application Name:** PsiTransfer
@@ -404,6 +469,18 @@ For more content https://wiki.kiwix.org/wiki/Content
 * Creating User use console then ```pure-pw useradd admin -u 99 -g 100 -d /home/admin -m``` then enter password of your choosing.
 * https://github.com/crazy-max/docker-pure-ftpd#notes
 
+----
+# Pwndrop
+![Pwndrop](https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/pwndrop.png)
+
+**Application Name:** Pwndrop
+
+**Application Site:** https://github.com/kgretzky/pwndrop
+
+**Docker Hub:** https://hub.docker.com/r/harshavardhanj/pwndrop
+
+**Github:** https://github.com/kgretzky/pwndrop
+
 ----
 # Reactive-resume
 ![Reactive-resume](https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/reactive-resume.png)
@@ -428,8 +505,8 @@ For more content https://wiki.kiwix.org/wiki/Content
 
 **Github:** https://www.github.com/vector-im/riot-web
 ## Before running the docker
-```mkdir -p /mnt/user/appdata/riot-web/config```
-```wget -O /mnt/user/appdata/riot-web/config/config.json https://riot.im/develop/config.json```
+1. ```mkdir -p /mnt/user/appdata/riot-web/config```
+2.    ```wget -O /mnt/user/appdata/riot-web/config/config.json https://riot.im/develop/config.json```
 
 ----
 # Searx
@@ -487,6 +564,6 @@ Password: ```gopher```
 Username: ```wallabag```
 Password: ```wallabag```
 ## PHP errors
-https://github.com/wallabag/docker/issues/185
+* 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.
\ No newline at end of file
diff --git a/templates/cryptpad.xml b/templates/cryptpad.xml
new file mode 100644
index 0000000..4e16d20
--- /dev/null
+++ b/templates/cryptpad.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<Container version="2">
+  <Name>cryptpad</Name>
+  <Repository>cryptpad/cryptpad:latest</Repository>
+  <Registry>https://hub.docker.com/r/cryptpad/cryptpad/</Registry>
+  <Network>bridge</Network>
+  <Shell>sh</Shell>
+  <Privileged>false</Privileged>
+  <Support>https://forums.unraid.net/topic/89502-support-a75g-repo/</Support>
+  <Project>https://cryptpad.fr/</Project>
+  <Overview>CryptPad is the Zero Knowledge realtime collaborative editor.[br]Run it then edit config.js /mnt/appdata/cryptpad/cfg/config.js "httpAddress: '0.0.0.0'"</Overview>
+  <Category>Productivity: Security:</Category>
+  <WebUI>http://[IP]:[PORT:3000]/</WebUI>
+  <TemplateURL>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/cryptpad.xml</TemplateURL>
+  <Icon>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/cryptpad.png</Icon>
+  <ExtraParams/>
+  <PostArgs/>
+  <DonateText/>
+  <DonateLink/>
+  <Description>CryptPad is the Zero Knowledge realtime collaborative editor.[br]Run it then edit config. /mnt/appdata/cryptpad/cfg/config.js "httpAddress: '0.0.0.0'"</Description>
+  <Config Name="Port 1" Target="3000" Default="3000" Mode="tcp" Description="Container Port: 3000" Type="Port" Display="always" Required="true" Mask="false">3000</Config>
+  <Config Name="Port 2" Target="3001" Default="3001" Mode="tcp" Description="Container Port: 3001" Type="Port" Display="always" Required="false" Mask="false">3001</Config>
+  <Config Name="CFG" Target="/cryptpad/cfg" Default="/mnt/user/appdata/cryptpad/cfg/" Mode="rw" Description="CFG" Type="Path" Display="always" Required="false" Mask="false">/mnt/user/appdata/cryptpad/cfg/</Config>
+  <Config Name="Storage" Target="/cryptpad/storage" Default="/mnt/user/appdata/cryptpad/blob/storage/" Mode="rw" Description="Storage" Type="Path" Display="always" Required="false" Mask="false">/mnt/user/appdata/cryptpad/blob/storage/</Config>
+  <Config Name="Datastore" Target="/cryptpad/datastore" Default="/mnt/user/appdata/cryptpad/datastore/" Mode="rw" Description="Datastore" Type="Path" Display="always" Required="false" Mask="false">/mnt/user/appdata/cryptpad/datastore/</Config>
+  <Config Name="Customize" Target="/cryptpad/customize" Default="/mnt/user/appdata/cryptpad/customize/" Mode="rw" Description="Customize" Type="Path" Display="always" Required="false" Mask="false">/mnt/user/appdata/cryptpad/customize/</Config>
+  <Config Name="Blobstage" Target="/cryptpad/blobstage" Default="/mnt/user/appdata/cryptpad/blobstage/" Mode="rw" Description="Blobstage" Type="Path" Display="always" Required="false" Mask="false">/mnt/user/appdata/cryptpad/blobstage/</Config>
+  <Config Name="Blob" Target="/cryptpad/blob" Default="/mnt/user/appdata/cryptpad/blob/" Mode="rw" Description="Blob" Type="Path" Display="always" Required="false" Mask="false">/mnt/user/appdata/cryptpad/blob/</Config>
+  <Config Name="STORAGE" Target="STORAGE" Default="/cryptpad/storage/" Mode="" Description="STORAGE" Type="Variable" Display="always" Required="false" Mask="false">/cryptpad/storage/</Config>
+  <Config Name="USE_SSL" Target="USE_SSL" Default="false|true" Mode="" Description="USE_SSL" Type="Variable" Display="always" Required="false" Mask="false">false</Config>
+  <Config Name="VERSION" Target="VERSION" Default="latest" Mode="" Description="VERSION" Type="Variable" Display="always" Required="false" Mask="false">latest</Config>
+</Container>
\ No newline at end of file
diff --git a/templates/gossa.xml b/templates/gossa.xml
new file mode 100644
index 0000000..9c01e37
--- /dev/null
+++ b/templates/gossa.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<Container version="2">
+  <Name>gossa</Name>
+  <Repository>pldubouilh/gossa:latest</Repository>
+  <Registry>https://hub.docker.com/r/pldubouilh/gossa/</Registry>
+  <Network>bridge</Network>
+  <Shell>sh</Shell>
+  <Privileged>false</Privileged>
+  <Support>https://forums.unraid.net/topic/89502-support-a75g-repo/</Support>
+  <Project>https://github.com/pldubouilh/gossa</Project>
+  <Overview>&#x1F3B6; a fast and simple multimedia fileserver</Overview>
+  <Category>Cloud:</Category>
+  <WebUI>http://[IP]:[PORT:8001]/</WebUI>
+  <TemplateURL>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/gossa.xml</TemplateURL>
+  <Icon>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/gossa.png</Icon>
+  <ExtraParams/>
+  <PostArgs/>
+  <DonateText/>
+  <DonateLink/>
+  <Description>&#x1F3B6; a fast and simple multimedia fileserver</Description>
+  <Config Name="Port" Target="8001" Default="8001" Mode="tcp" Description="Port" Type="Port" Display="always" Required="true" Mask="false">8001</Config>
+  <Config Name="Data" Target="/shared" Default="/mnt/user/appdata/gossa/" Mode="rw" Description="Data" Type="Path" Display="always" Required="false" Mask="false">/mnt/user/appdata/gossa/</Config>
+  <Config Name="FOLLOW_SYMLINKS" Target="FOLLOW_SYMLINKS" Default="false|true" Mode="" Description="FOLLOW_SYMLINKS" Type="Variable" Display="advanced" Required="false" Mask="false">false</Config>
+  <Config Name="PREFIX" Target="PREFIX" Default="/" Mode="" Description="PREFIX" Type="Variable" Display="advanced" Required="false" Mask="false">/</Config>
+  <Config Name="UID" Target="UID" Default="99" Mode="" Description="UID" Type="Variable" Display="advanced" Required="false" Mask="false">99</Config>
+  <Config Name="GID" Target="GID" Default="100" Mode="" Description="GID" Type="Variable" Display="advanced" Required="false" Mask="false">100</Config>
+</Container>
\ No newline at end of file
diff --git a/templates/icons/cryptpad.png b/templates/icons/cryptpad.png
new file mode 100644
index 0000000..ed6a5df
Binary files /dev/null and b/templates/icons/cryptpad.png differ
diff --git a/templates/icons/gossa.png b/templates/icons/gossa.png
new file mode 100644
index 0000000..ed4ddec
Binary files /dev/null and b/templates/icons/gossa.png differ
diff --git a/templates/icons/netbox.png b/templates/icons/netbox.png
new file mode 100644
index 0000000..a1ec229
Binary files /dev/null and b/templates/icons/netbox.png differ
diff --git a/templates/icons/phpbb.png b/templates/icons/phpbb.png
new file mode 100644
index 0000000..ffd7817
Binary files /dev/null and b/templates/icons/phpbb.png differ
diff --git a/templates/icons/pwndrop.png b/templates/icons/pwndrop.png
new file mode 100644
index 0000000..2897366
Binary files /dev/null and b/templates/icons/pwndrop.png differ
diff --git a/templates/icons/shaarli.png b/templates/icons/shaarli.png
new file mode 100644
index 0000000..80687bc
Binary files /dev/null and b/templates/icons/shaarli.png differ
diff --git a/templates/netbox.xml b/templates/netbox.xml
new file mode 100644
index 0000000..85ed081
--- /dev/null
+++ b/templates/netbox.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<Container version="2">
+  <Name>netbox</Name>
+  <Repository>pitkley/netbox:latest</Repository>
+  <Registry>https://hub.docker.com/r/pitkley/netbox</Registry>
+  <Network>bridge</Network>
+  <Shell>sh</Shell>
+  <Privileged>false</Privileged>
+  <Support>https://forums.unraid.net/topic/89502-support-a75g-repo/</Support>
+  <Project>https://github.com/netbox-community/netbox</Project>
+  <Overview>IP address management (IPAM) and data center infrastructure management (DCIM) tool. [br] To create User cli to the docker then "./manage.py createsuperuser" [br] Postgres required </Overview>
+  <Category>Tools: Network:Management</Category>
+  <WebUI>http://[IP]:[PORT:8000]/</WebUI>
+  <TemplateURL>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/netbox.xml</TemplateURL>
+  <Icon>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/netbox.png</Icon>
+  <ExtraParams/>
+  <PostArgs/>
+  <DonateText/>
+  <DonateLink/>
+  <Description>IP address management (IPAM) and data center infrastructure management (DCIM) tool. [br] To create User cli to the docker then "./manage.py createsuperuser" [br] Postgres required </Description>
+  <Config Name="Port" Target="8000" Default="8000" Mode="tcp" Description="Port" Type="Port" Display="always" Required="true" Mask="false">8000</Config>
+  <Config Name="DB_HOST" Target="DB_HOST" Default="netbox" Mode="" Description="DB Hostname or IP Postgres" Type="Variable" Display="always" Required="true" Mask="false">postgres</Config>
+  <Config Name="DB_NAME" Target="DB_NAME" Default="netbox" Mode="" Description="DB NAME Postgres" Type="Variable" Display="always" Required="true" Mask="false">netbox</Config>
+  <Config Name="DB_USER" Target="DB_USER" Default="netbox" Mode="" Description="DB USER Postgres" Type="Variable" Display="always" Required="true" Mask="false">netbox</Config>
+  <Config Name="DB_PASS" Target="DB_PASS" Default="netbox" Mode="" Description="DB PASS Postgres" Type="Variable" Display="always" Required="true" Mask="false">netbox</Config>
+  <Config Name="SECRET_KEY" Target="SECRET_KEY" Default="ChangeMe" Mode="" Description="SECRET_KEY" Type="Variable" Display="always" Required="true" Mask="false">ChangeMe</Config>
+  <Config Name="ALLOWED_HOSTS" Target="ALLOWED_HOSTS" Default="0.0.0.0" Mode="" Description="ALLOWED_HOSTS" Type="Variable" Display="advanced" Required="true" Mask="false">*</Config>
+</Container>
\ No newline at end of file
diff --git a/templates/phpbb.xml b/templates/phpbb.xml
new file mode 100644
index 0000000..a3569ea
--- /dev/null
+++ b/templates/phpbb.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<Container version="2">
+  <Name>phpbb</Name>
+  <Repository>bitnami/phpbb:latest</Repository>
+  <Registry>https://hub.docker.com/r/bitnami/phpbb/</Registry>
+  <Network>bridge</Network>
+  <Shell>sh</Shell>
+  <Privileged>false</Privileged>
+  <Support>https://forums.unraid.net/topic/89502-support-a75g-repo/</Support>
+  <Project>https://www.phpbb.com/</Project>
+  <Overview>phpBB is a bulletin board solution that allows you to create forums and subforums.</Overview>
+  <Category>Productivity:</Category>
+  <WebUI>http://[IP]:[PORT:80]/</WebUI>
+  <TemplateURL>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/phpbb.xml</TemplateURL>
+  <Icon>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/phpbb.png</Icon>
+  <ExtraParams/>
+  <PostArgs/>
+  <DonateText/>
+  <DonateLink/>
+  <Description>phpBB is a bulletin board solution that allows you to create forums and subforums.</Description>
+  <Config Name="Port" Target="80" Default="8000" Mode="tcp" Description="Port" Type="Port" Display="always" Required="true" Mask="false">8000</Config>
+  <Config Name="ALLOW_EMPTY_PASSWORD" Target="ALLOW_EMPTY_PASSWORD" Default="no|yes" Mode="" Description="ALLOW_EMPTY_PASSWORD" Type="Variable" Display="always" Required="true" Mask="false">no</Config>
+  <Config Name="MARIADB_HOST" Target="MARIADB_HOST" Default="mariadb" Mode="" Description="Hostname or IP for MariaDB server." Type="Variable" Display="always" Required="false" Mask="false">mariadb</Config>
+  <Config Name="MARIADB_PORT_NUMBER" Target="MARIADB_PORT_NUMBER" Default="3306" Mode="" Description="Port used by MariaDB server." Type="Variable" Display="always" Required="false" Mask="false">3306</Config>
+  <Config Name="PHPBB_DATABASE_USER" Target="PHPBB_DATABASE_USER" Default="bn_phpbb" Mode="" Description="Database user that phpBB will use to connect with the database." Type="Variable" Display="always" Required="true" Mask="false">bn_phpbb</Config>
+  <Config Name="PHPBB_DATABASE_PASSWORD" Target="PHPBB_DATABASE_PASSWORD" Default="password" Mode="" Description="Database password that Phpbb will use to connect with the database" Type="Variable" Display="always" Required="true" Mask="false">password</Config>
+  <Config Name="PHPBB_DATABASE_NAME" Target="PHPBB_DATABASE_NAME" Default="bitnami_phpbb" Mode="" Description="Database name that phpBB will use to connect with the database" Type="Variable" Display="always" Required="true" Mask="false">bitnami_phpbb</Config>
+  <Config Name="PHPBB_USERNAME" Target="PHPBB_USERNAME" Default="user" Mode="" Description="phpBB application username." Type="Variable" Display="always" Required="false" Mask="false">user</Config>
+  <Config Name="PHPBB_PASSWORD" Target="PHPBB_PASSWORD" Default="bitnami" Mode="" Description="phpBB application password." Type="Variable" Display="always" Required="false" Mask="false">bitnami</Config>
+  <Config Name="PHPBB_EMAIL" Target="PHPBB_EMAIL" Default="user@example.com" Mode="" Description="phpBB application email." Type="Variable" Display="always" Required="false" Mask="false">user@example.com</Config>
+  <Config Name="PHPBB_FORUM_NAME" Target="PHPBB_FORUM_NAME" Default="Phpbb" Mode="" Description="Forum Name" Type="Variable" Display="always" Required="false" Mask="false">Phpbb</Config>
+  <Config Name="PHPBB_FORUM_DESCRIPTION" Target="PHPBB_FORUM_DESCRIPTION" Default="A little text to describe your forum" Mode="" Description="Forum Description" Type="Variable" Display="always" Required="false" Mask="false">A little text to describe your forum</Config>
+  <Config Name="PHP_MEMORY_LIMIT" Target="PHP_MEMORY_LIMIT" Default="256M" Mode="" Description="Memory limit for PHP." Type="Variable" Display="advanced" Required="false" Mask="false">256M</Config>
+</Container>
\ No newline at end of file
diff --git a/templates/pwndrop.xml b/templates/pwndrop.xml
new file mode 100644
index 0000000..37e3762
--- /dev/null
+++ b/templates/pwndrop.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<Container version="2">
+  <Name>pwndrop</Name>
+  <Repository>harshavardhanj/pwndrop:latest</Repository>
+  <Registry>https://hub.docker.com/r/harshavardhanj/pwndrop/</Registry>
+  <Network>bridge</Network>
+  <Shell>sh</Shell>
+  <Privileged>false</Privileged>
+  <Support>https://forums.unraid.net/topic/89502-support-a75g-repo/</Support>
+  <Project>https://github.com/kgretzky/pwndrop</Project>
+  <Overview>Self-hosted file hosting service allowing easy uploads and sharing of payloads over HTTP and WebDAV.</Overview>
+  <Category>Cloud:</Category>
+  <WebUI>http://[IP]:[PORT:80]/pwndrop</WebUI>
+  <TemplateURL>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/pwndrop.xml</TemplateURL>
+  <Icon>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/pwndrop.png</Icon>
+  <ExtraParams/>
+  <PostArgs/>
+  <DonateText/>
+  <DonateLink/>
+  <Description>Self-hosted file hosting service allowing easy uploads and sharing of payloads over HTTP and WebDAV.</Description>
+  <Config Name="Port" Target="80" Default="8000" Mode="tcp" Description="Port" Type="Port" Display="always" Required="false" Mask="false">8000</Config>
+  <Config Name="Data" Target="/pwndrop/data" Default="/mnt/user/appdata/pwndrop/" Mode="rw" Description="Data" Type="Path" Display="always" Required="false" Mask="false">/mnt/user/appdata/pwndrop/</Config>
+</Container>
\ No newline at end of file
diff --git a/templates/shaarli.xml b/templates/shaarli.xml
new file mode 100644
index 0000000..e1973c0
--- /dev/null
+++ b/templates/shaarli.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<Container version="2">
+  <Name>shaarli</Name>
+  <Repository>shaarli/shaarli:master</Repository>
+  <Registry>https://hub.docker.com/r/shaarli/shaarli/</Registry>
+  <Network>bridge</Network>
+  <Shell>sh</Shell>
+  <Privileged>false</Privileged>
+  <Support>https://forums.unraid.net/topic/89502-support-a75g-repo/</Support>
+  <Project>https://github.com/shaarli/Shaarli</Project>
+  <Overview>The personal, minimalist, super-fast, database free, bookmarking service.</Overview>
+  <Category>Productivity:</Category>
+  <WebUI>http://[IP]:[PORT:80]/</WebUI>
+  <TemplateURL>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/shaarli.xml</TemplateURL>
+  <Icon>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/shaarli.png</Icon>
+  <ExtraParams/>
+  <PostArgs/>
+  <DonateText/>
+  <DonateLink/>
+  <Description>The personal, minimalist, super-fast, database free, bookmarking service.</Description>
+  <Config Name="Port" Target="80" Default="8000" Mode="tcp" Description="Port" Type="Port" Display="always" Required="false" Mask="false">8000</Config>
+  <Config Name="Cache" Target="/var/www/shaarli/cache" Default="/mnt/user/appdata/shaarli/cache/" Mode="rw" Description="Cache" Type="Path" Display="always" Required="false" Mask="false">/mnt/user/appdata/shaarli/cache/</Config>
+  <Config Name="Data" Target="/var/www/shaarli/data" Default="/mnt/user/appdata/shaarli/data/" Mode="rw" Description="Data" Type="Path" Display="always" Required="false" Mask="false">/mnt/user/appdata/shaarli/data/</Config>
+</Container>
\ No newline at end of file