diff --git a/unraid/rdesktop.xml b/unraid/rdesktop.xml
index cd34ff6..36f36f6 100755
--- a/unraid/rdesktop.xml
+++ b/unraid/rdesktop.xml
@@ -16,87 +16,156 @@
     <ReadMe>https://github.com/linuxserver/docker-rdesktop#readme</ReadMe>
     <Branch>
         <Tag>latest</Tag>
-        <TagDescription>XFCE Focal</TagDescription>
-    </Branch>
-    <Branch>
-        <Tag>xfce-bionic</Tag>
-        <TagDescription>XFCE Bionic</TagDescription>
-        <ReadMe>https://github.com/linuxserver/docker-rdesktop/tree/xfce-bionic#readme</ReadMe>
-        <GitHub>https://github.com/linuxserver/docker-rdesktop/tree/xfce-bionic#application-setup</GitHub>
-    </Branch>
-    <Branch>
-        <Tag>kde-focal</Tag>
-        <TagDescription>KDE Focal</TagDescription>
-        <ReadMe>https://github.com/linuxserver/docker-rdesktop/tree/kde-focal#readme</ReadMe>
-        <GitHub>https://github.com/linuxserver/docker-rdesktop/tree/kde-focal#application-setup</GitHub>
-    </Branch>
-    <Branch>
-        <Tag>kde-bionic</Tag>
-        <TagDescription>KDE Bionic</TagDescription>
-        <ReadMe>https://github.com/linuxserver/docker-rdesktop/tree/kde-bionic#readme</ReadMe>
-        <GitHub>https://github.com/linuxserver/docker-rdesktop/tree/kde-bionic#application-setup</GitHub>
-    </Branch>
-    <Branch>
-        <Tag>mate-focal</Tag>
-        <TagDescription>MATE Focal</TagDescription>
-        <ReadMe>https://github.com/linuxserver/docker-rdesktop/tree/mate-focal#readme</ReadMe>
-        <GitHub>https://github.com/linuxserver/docker-rdesktop/tree/mate-focal#application-setup</GitHub>
-    </Branch>
-    <Branch>
-        <Tag>mate-bionic</Tag>
-        <TagDescription>MATE Bionic</TagDescription>
-        <ReadMe>https://github.com/linuxserver/docker-rdesktop/tree/mate-bionic#readme</ReadMe>
-        <GitHub>https://github.com/linuxserver/docker-rdesktop/tree/mate-bionic#application-setup</GitHub>
-    </Branch>
-    <Branch>
-        <Tag>i3-focal</Tag>
-        <TagDescription>i3 Focal</TagDescription>
-        <ReadMe>https://github.com/linuxserver/docker-rdesktop/tree/i3-focal#readme</ReadMe>
-        <GitHub>https://github.com/linuxserver/docker-rdesktop/tree/i3-focal#application-setup</GitHub>
-    </Branch>
-    <Branch>
-        <Tag>i3-bionic</Tag>
-        <TagDescription>i3 Bionic</TagDescription>
-        <ReadMe>https://github.com/linuxserver/docker-rdesktop/tree/i3-bionic#readme</ReadMe>
-        <GitHub>https://github.com/linuxserver/docker-rdesktop/tree/i3-bionic#application-setup</GitHub>
-    </Branch>
-    <Branch>
-        <Tag>openbox-focal</Tag>
-        <TagDescription>Openbox Focal</TagDescription>
-        <ReadMe>https://github.com/linuxserver/docker-rdesktop/tree/openbox-focal#readme</ReadMe>
-        <GitHub>https://github.com/linuxserver/docker-rdesktop/tree/openbox-focal#application-setup</GitHub>
-    </Branch>
-    <Branch>
-        <Tag>openbox-bionic</Tag>
-        <TagDescription>Openbox Bionic</TagDescription>
-        <ReadMe>https://github.com/linuxserver/docker-rdesktop/tree/openbox-bionic#readme</ReadMe>
-        <GitHub>https://github.com/linuxserver/docker-rdesktop/tree/openbox-bionic#application-setup</GitHub>
-    </Branch>
-    <Branch>
-        <Tag>icewm-focal</Tag>
-        <TagDescription>IceWM Focal</TagDescription>
-        <ReadMe>https://github.com/linuxserver/docker-rdesktop/tree/icewm-focal#readme</ReadMe>
-        <GitHub>https://github.com/linuxserver/docker-rdesktop/tree/icewm-focal#application-setup</GitHub>
-    </Branch>
-    <Branch>
-        <Tag>icewm-bionic</Tag>
-        <TagDescription>IceWM Bionic</TagDescription>
-        <ReadMe>https://github.com/linuxserver/docker-rdesktop/tree/icewm-bionic#readme</ReadMe>
-        <GitHub>https://github.com/linuxserver/docker-rdesktop/tree/icewm-bionic#application-setup</GitHub>
-    </Branch>
-    <Branch>
-        <Tag>alpine</Tag>
         <TagDescription>XFCE Alpine</TagDescription>
-        <ReadMe>https://github.com/linuxserver/docker-rdesktop/tree/alpine#readme</ReadMe>
-        <GitHub>https://github.com/linuxserver/docker-rdesktop/tree/alpine#application-setup</GitHub>
+    </Branch>
+    <Branch>
+        <Tag>ubuntu-xfce</Tag>
+        <TagDescription>XFCE Ubuntu</TagDescription>
+        <ReadMe>https://github.com/linuxserver/docker-rdesktop/tree/ubuntu-xfce#readme</ReadMe>
+        <GitHub>https://github.com/linuxserver/docker-rdesktop/tree/ubuntu-xfce#application-setup</GitHub>
+    </Branch>
+    <Branch>
+        <Tag>fedora-xfce</Tag>
+        <TagDescription>XFCE Fedora</TagDescription>
+        <ReadMe>https://github.com/linuxserver/docker-rdesktop/tree/fedora-xfce#readme</ReadMe>
+        <GitHub>https://github.com/linuxserver/docker-rdesktop/tree/fedora-xfce#application-setup</GitHub>
+    </Branch>
+    <Branch>
+        <Tag>arch-xfce</Tag>
+        <TagDescription>XFCE Arch</TagDescription>
+        <ReadMe>https://github.com/linuxserver/docker-rdesktop/tree/arch-xfce#readme</ReadMe>
+        <GitHub>https://github.com/linuxserver/docker-rdesktop/tree/arch-xfce#application-setup</GitHub>
+    </Branch>
+    <Branch>
+        <Tag>alpine-kde</Tag>
+        <TagDescription>KDE Alpine</TagDescription>
+        <ReadMe>https://github.com/linuxserver/docker-rdesktop/tree/alpine-kde#readme</ReadMe>
+        <GitHub>https://github.com/linuxserver/docker-rdesktop/tree/alpine-kde#application-setup</GitHub>
+    </Branch>
+    <Branch>
+        <Tag>ubuntu-kde</Tag>
+        <TagDescription>KDE Ubuntu</TagDescription>
+        <ReadMe>https://github.com/linuxserver/docker-rdesktop/tree/ubuntu-kde#readme</ReadMe>
+        <GitHub>https://github.com/linuxserver/docker-rdesktop/tree/ubuntu-kde#application-setup</GitHub>
+    </Branch>
+    <Branch>
+        <Tag>fedora-kde</Tag>
+        <TagDescription>KDE Fedora</TagDescription>
+        <ReadMe>https://github.com/linuxserver/docker-rdesktop/tree/fedora-kde#readme</ReadMe>
+        <GitHub>https://github.com/linuxserver/docker-rdesktop/tree/fedora-kde#application-setup</GitHub>
+    </Branch>
+    <Branch>
+        <Tag>arch-kde</Tag>
+        <TagDescription>KDE Arch</TagDescription>
+        <ReadMe>https://github.com/linuxserver/docker-rdesktop/tree/arch-kde#readme</ReadMe>
+        <GitHub>https://github.com/linuxserver/docker-rdesktop/tree/arch-kde#application-setup</GitHub>
+    </Branch>
+    <Branch>
+        <Tag>alpine-mate</Tag>
+        <TagDescription>MATE Alpine</TagDescription>
+        <ReadMe>https://github.com/linuxserver/docker-rdesktop/tree/alpine-mate#readme</ReadMe>
+        <GitHub>https://github.com/linuxserver/docker-rdesktop/tree/alpine-mate#application-setup</GitHub>
+    </Branch>
+    <Branch>
+        <Tag>ubuntu-mate</Tag>
+        <TagDescription>MATE Ubuntu</TagDescription>
+        <ReadMe>https://github.com/linuxserver/docker-rdesktop/tree/ubuntu-mate#readme</ReadMe>
+        <GitHub>https://github.com/linuxserver/docker-rdesktop/tree/ubuntu-mate#application-setup</GitHub>
+    </Branch>
+    <Branch>
+        <Tag>fedora-mate</Tag>
+        <TagDescription>MATE Fedora</TagDescription>
+        <ReadMe>https://github.com/linuxserver/docker-rdesktop/tree/fedora-mate#readme</ReadMe>
+        <GitHub>https://github.com/linuxserver/docker-rdesktop/tree/fedora-mate#application-setup</GitHub>
+    </Branch>
+    <Branch>
+        <Tag>arch-mate</Tag>
+        <TagDescription>MATE Arch</TagDescription>
+        <ReadMe>https://github.com/linuxserver/docker-rdesktop/tree/arch-mate#readme</ReadMe>
+        <GitHub>https://github.com/linuxserver/docker-rdesktop/tree/arch-mate#application-setup</GitHub>
+    </Branch>
+    <Branch>
+        <Tag>alpine-i3</Tag>
+        <TagDescription>i3 Alpine</TagDescription>
+        <ReadMe>https://github.com/linuxserver/docker-rdesktop/tree/alpine-i3#readme</ReadMe>
+        <GitHub>https://github.com/linuxserver/docker-rdesktop/tree/alpine-i3#application-setup</GitHub>
+    </Branch>
+    <Branch>
+        <Tag>ubuntu-i3</Tag>
+        <TagDescription>i3 Ubuntu</TagDescription>
+        <ReadMe>https://github.com/linuxserver/docker-rdesktop/tree/ubuntu-i3#readme</ReadMe>
+        <GitHub>https://github.com/linuxserver/docker-rdesktop/tree/ubuntu-i3#application-setup</GitHub>
+    </Branch>
+    <Branch>
+        <Tag>fedora-i3</Tag>
+        <TagDescription>i3 Fedora</TagDescription>
+        <ReadMe>https://github.com/linuxserver/docker-rdesktop/tree/fedora-i3#readme</ReadMe>
+        <GitHub>https://github.com/linuxserver/docker-rdesktop/tree/fedora-i3#application-setup</GitHub>
+    </Branch>
+    <Branch>
+        <Tag>arch-i3</Tag>
+        <TagDescription>i3 Arch</TagDescription>
+        <ReadMe>https://github.com/linuxserver/docker-rdesktop/tree/arch-i3#readme</ReadMe>
+        <GitHub>https://github.com/linuxserver/docker-rdesktop/tree/arch-i3#application-setup</GitHub>
+    </Branch>
+    <Branch>
+        <Tag>alpine-openbox</Tag>
+        <TagDescription>Openbox Alpine</TagDescription>
+        <ReadMe>https://github.com/linuxserver/docker-rdesktop/tree/alpine-openbox#readme</ReadMe>
+        <GitHub>https://github.com/linuxserver/docker-rdesktop/tree/alpine-openbox#application-setup</GitHub>
+    </Branch>
+    <Branch>
+        <Tag>ubuntu-openbox</Tag>
+        <TagDescription>Openbox Ubuntu</TagDescription>
+        <ReadMe>https://github.com/linuxserver/docker-rdesktop/tree/ubuntu-openbox#readme</ReadMe>
+        <GitHub>https://github.com/linuxserver/docker-rdesktop/tree/ubuntu-openbox#application-setup</GitHub>
+    </Branch>
+    <Branch>
+        <Tag>fedora-openbox</Tag>
+        <TagDescription>Openbox Fedora</TagDescription>
+        <ReadMe>https://github.com/linuxserver/docker-rdesktop/tree/fedora-openbox#readme</ReadMe>
+        <GitHub>https://github.com/linuxserver/docker-rdesktop/tree/fedora-openbox#application-setup</GitHub>
+    </Branch>
+    <Branch>
+        <Tag>arch-openbox</Tag>
+        <TagDescription>Openbox Arch</TagDescription>
+        <ReadMe>https://github.com/linuxserver/docker-rdesktop/tree/arch-openbox#readme</ReadMe>
+        <GitHub>https://github.com/linuxserver/docker-rdesktop/tree/arch-openbox#application-setup</GitHub>
+    </Branch>
+    <Branch>
+        <Tag>alpine-icewm</Tag>
+        <TagDescription>IceWM Alpine</TagDescription>
+        <ReadMe>https://github.com/linuxserver/docker-rdesktop/tree/alpine-icewm#readme</ReadMe>
+        <GitHub>https://github.com/linuxserver/docker-rdesktop/tree/alpine-icewm#application-setup</GitHub>
+    </Branch>
+    <Branch>
+        <Tag>ubuntu-icewm</Tag>
+        <TagDescription>IceWM Ubuntu</TagDescription>
+        <ReadMe>https://github.com/linuxserver/docker-rdesktop/tree/ubuntu-icewm#readme</ReadMe>
+        <GitHub>https://github.com/linuxserver/docker-rdesktop/tree/ubuntu-icewm#application-setup</GitHub>
+    </Branch>
+    <Branch>
+        <Tag>fedora-icewm</Tag>
+        <TagDescription>IceWM Fedora</TagDescription>
+        <ReadMe>https://github.com/linuxserver/docker-rdesktop/tree/fedora-icewm#readme</ReadMe>
+        <GitHub>https://github.com/linuxserver/docker-rdesktop/tree/fedora-icewm#application-setup</GitHub>
+    </Branch>
+    <Branch>
+        <Tag>arch-icewm</Tag>
+        <TagDescription>IceWM Arch</TagDescription>
+        <ReadMe>https://github.com/linuxserver/docker-rdesktop/tree/arch-icewm#readme</ReadMe>
+        <GitHub>https://github.com/linuxserver/docker-rdesktop/tree/arch-icewm#application-setup</GitHub>
     </Branch>
     <Project>http://xrdp.org/</Project>
-    <Overview>Rdesktop(http://xrdp.org/) - Ubuntu based containers containing full desktop environments in officially supported flavors accessible via RDP.</Overview>
-    <WebUI>http://[IP]:[PORT:3389]</WebUI>
+    <Overview>Rdesktop(http://xrdp.org/) - Containers containing full desktop environments in many popular flavors for Alpine, Ubuntu, Arch, and Fedora accessible via RDP.</Overview>
+    <WebUI>http://[IP]:[PORT:3000]</WebUI>
     <TemplateURL>https://raw.githubusercontent.com/linuxserver/templates/main/unraid/rdesktop.xml</TemplateURL>
     <Icon>https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/rdesktop-logo.png</Icon>
-    <Date>2021-05-05</Date>
+    <Date>2022-03-05</Date>
     <Changes>
+### 2022-03-05
+- Organize tags differently to run Ubuntu at latest LTS, make Alpine latest, add docs about GPU accel.
+
 ### 2021-05-05
 - Reduce default packages to their flavor specific basics.
 
@@ -116,4 +185,5 @@
     <Config Name="PUID" Target="PUID" Default="99" Description="Container Variable: PUID" Type="Variable" Display="advanced" Required="true" Mask="false"/>
     <Config Name="PGID" Target="PGID" Default="100" Description="Container Variable: PGID" Type="Variable" Display="advanced" Required="true" Mask="false"/>
     <Config Name="UMASK" Target="UMASK" Default="022" Description="Container Variable: UMASK" Type="Variable" Display="advanced" Required="false" Mask="false"/>
+    <Config Name="/dev/dri" Default="/dev/dri" Description="Add this for GL support (Linux hosts only)" Type="Device" Display="always" Required="false" Mask="false"/>
 </Container>