diff --git a/linuxserver.io/doublecommander.xml b/linuxserver.io/doublecommander.xml
index 4f767e8..b6304c8 100644
--- a/linuxserver.io/doublecommander.xml
+++ b/linuxserver.io/doublecommander.xml
@@ -18,6 +18,6 @@
     <Config Name="PUID" Target="PUID" Default="99" Mode="" Description="Container Variable: PUID" Type="Variable" Display="always" Required="false" Mask="false"/>
     <Config Name="PGID" Target="PGID" Default="100" Mode="" Description="Container Variable: PGID" Type="Variable" Display="always" Required="false" Mask="false"/>
     <Config Name="WebUI" Target="3000" Default="3000" Mode="tcp" Description="Container Port: 3000" Type="Port" Display="always" Required="false" Mask="false"/>
-    <Config Name="Host data directory" Target="/data" Default="" Mode="rw" Description="Appdata" Type="Path" Display="always" Required="false" Mask="false"/>
+    <Config Name="Host data directory" Target="/data" Default="" Mode="rw" Description="Host data directory" Type="Path" Display="always" Required="false" Mask="false"/>
     <Config Name="Appdata" Target="/config" Default="" Mode="rw" Description="Appdata" Type="Path" Display="always" Required="false" Mask="false"/>
 </Container>
\ No newline at end of file
diff --git a/linuxserver.io/lychee.xml b/linuxserver.io/lychee.xml
index 2307ef8..5b4bb8c 100644
--- a/linuxserver.io/lychee.xml
+++ b/linuxserver.io/lychee.xml
@@ -1,58 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Container>
-  <TemplateURL>https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/lychee.xml</TemplateURL>
-  <Beta>False</Beta>
-  <Category>Cloud: Network:Web Network:Management MediaApp:Photos MediaServer:Photos</Category>
-  <Date>2017-02-24</Date>
+<?xml version="1.0"?>
+<Container version="2">
   <Name>lychee</Name>
-  <Project>https://lychee.electerious.com</Project>
-  <Support>https://forums.unraid.net/topic/54743-support-linuxserverio-lychee/</Support>
   <Repository>linuxserver/lychee</Repository>
   <Registry>https://hub.docker.com/r/linuxserver/lychee/</Registry>
   <Network>bridge</Network>
+  <Shell>bash</Shell>
   <Privileged>false</Privileged>
+  <Support>https://forums.unraid.net/topic/54743-support-linuxserverio-lychee/</Support>
+  <Project>https://lychee.electerious.com</Project>
   <Overview>Lychee is a free photo-management tool, which runs on your server or web-space. Installing is a matter of seconds. Upload, manage and share photos like from a native application. Lychee comes with everything you need and all your photos are stored securely.</Overview>
+  <Category>Cloud: Network:Web Network:Management MediaApp:Photos MediaServer:Photos</Category>
   <WebUI>http://[IP]:[PORT:80]/</WebUI>
+  <TemplateURL>https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/lychee.xml</TemplateURL>
   <Icon>https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/lychee-icon.png</Icon>
-  <Description>Lychee is a free photo-management tool, which runs on your server or web-space. Installing is a matter of seconds. Upload, manage and share photos like from a native application. Lychee comes with everything you need and all your photos are stored securely.[br]
-[br]
-    [b][span style='color: #E80000;']Directions:[/span][/b][br]
-    [b]/config[/b] : Where the config file will be created.[br]
-    [b]/pictures[/b] : Where pictures are uploaded to.[br]</Description>
-  <Networking>
-    <Mode>bridge</Mode>
-    <Publish>
-      <Port>
-        <HostPort></HostPort>
-        <ContainerPort>80</ContainerPort>
-        <Protocol>tcp</Protocol>
-      </Port>
-    </Publish>
-  </Networking>
-  <Data>
-    <Volume>
-      <HostDir></HostDir>
-      <ContainerDir>/config</ContainerDir>
-      <Mode>rw</Mode>
-    </Volume>
-    <Volume>
-      <HostDir></HostDir>
-      <ContainerDir>/pictures</ContainerDir>
-      <Mode>rw</Mode>
-    </Volume>
-  </Data>
-  <Environment>
-    <Variable>
-      <Value>99</Value>
-      <Name>PUID</Name>
-    </Variable>
-    <Variable>
-      <Value>100</Value>
-      <Name>PGID</Name>
-    </Variable>
-  </Environment>
-  <DonateText>Donations</DonateText>
-  <DonateLink>https://www.linuxserver.io/donate</DonateLink>
-  <DonateImg>https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/donate.png</DonateImg>
-  <BaseImage>lsiobase/nginx</BaseImage>
-</Container>
+  <Config Name="Host Port 1" Target="80" Default="" Mode="tcp" Description="Container Port: 80" Type="Port" Display="always" Required="true" Mask="false"/>
+  <Config Name="Host Path 2" Target="/pictures" Default="" Mode="rw" Description="Container Path: /pictures" Type="Path" Display="always" Required="true" Mask="false"/>
+  <Config Name="Key 1" Target="PUID" Default="99" Mode="" Description="Container Variable: PUID" Type="Variable" Display="always" Required="false" Mask="false"/>
+  <Config Name="Key 2" Target="PGID" Default="100" Mode="" Description="Container Variable: PGID" Type="Variable" Display="always" Required="false" Mask="false"/>
+  <Config Name="Database Host" Target="DB_HOST" Default="" Mode="" Description="Container Variable: DB_HOST" Type="Variable" Display="always" Required="true" Mask="false"/>
+  <Config Name="Database Username" Target="DB_USERNAME" Default="" Mode="" Description="Container Variable: DB_USERNAME" Type="Variable" Display="always" Required="true" Mask="false"/>
+  <Config Name="Database Password" Target="DB_PASSWORD" Default="" Mode="" Description="Container Variable: DB_PASSWORD" Type="Variable" Display="always" Required="true" Mask="false"/>
+  <Config Name="Database" Target="DB_DATABASE" Default="" Mode="" Description="Container Variable: DB_DATABASE" Type="Variable" Display="always" Required="true" Mask="false"/>
+  <Config Name="AppData Config Path" Target="/config" Default="" Mode="rw" Description="Container Path: /config" Type="Path" Display="always" Required="true" Mask="false"/>
+</Container>
\ No newline at end of file