diff --git a/Templates.md b/Templates.md
index 61f7c0be..e6b9cfc1 100644
--- a/Templates.md
+++ b/Templates.md
@@ -8,10 +8,13 @@ redirect_from: /wiki/Templates/
 ITL Supported
 -------------
 
--   [Fedora - Minimal](/wiki/Templates/FedoraMinimal)
+-   Fedora
+-   [Fedora - Minimal](/doc/Templates/FedoraMinimal)
 
 Community Supported
 -------------------
 
--   [Debian](/wiki/Templates/Debian)
+-   [Debian](/doc/Templates/Debian/)
+-   [Whonix](/doc/Templates/Whonix/)
+-   [Archlinux](/doc/Templates/Archlinux/)
 
diff --git a/Templates/Archlinux.md b/Templates/Archlinux.md
new file mode 100644
index 00000000..a325f4d3
--- /dev/null
+++ b/Templates/Archlinux.md
@@ -0,0 +1,28 @@
+---
+layout: doc
+title: Archlinux template
+permalink: /doc/Templates/Archlinux/
+redirect_from: /wiki/Templates/Archlinux/
+---
+
+Archlinux template
+===============
+
+Archlinux template is one of the templates made by Qubes community. It should
+be considered experimental as Qubes developers team use mainly Fedora-based VMs
+to test new features/updates.
+
+Main maintainer of this template is [Olivier Médoc](mailto:o_medoc@yahoo.fr).
+
+Install
+-------
+
+Currently we do not ship ready to use binary package. It can be compiled using
+[this instructions](/doc/BuildingArchlinuxTemplate/).
+
+Olivier provides binary package build by himself, you can get it [here](https://groups.google.com/d/msgid/qubes-devel/54CE3FB1.3050708%40yahoo.fr).
+
+Known issues
+------------
+
+If you want to help in improving the template, feel free to [contribute](/doc/ContributingHowto/).
diff --git a/Templates/Debian.md b/Templates/Debian.md
index 6ca6ab62..818f2a92 100644
--- a/Templates/Debian.md
+++ b/Templates/Debian.md
@@ -16,15 +16,10 @@ Install
 It can be installed via the following command:
 
 {% highlight trac-wiki %}
-[user@dom0 ~]$ sudo qubes-dom0-update --enablerepo=qubes-templates-community qubes-template-debian-8-x64
+[user@dom0 ~]$ sudo qubes-dom0-update --enablerepo=qubes-templates-community qubes-template-debian-8
 {% endhighlight %}
 
 Known issues
 ------------
 
--   gnome-terminal by default is configured to black text on black background
--   GTK applications looks ugly (GTK theme not installed/set?)
--   Probably not working as netvm or proxyvm (untested as of today)
--   Slow VM shutdown - qrexec agent termination takes a while (SIGTERM not handled?)
-
 If you want to help in improving the template, feel free to [contribute](/wiki/ContributingHowto).
diff --git a/Templates/Whonix.md b/Templates/Whonix.md
new file mode 100644
index 00000000..30fadcb6
--- /dev/null
+++ b/Templates/Whonix.md
@@ -0,0 +1,18 @@
+---
+layout: doc
+title: Whonix template
+permalink: /doc/Templates/Whonix/
+redirect_from: /wiki/Templates/Whonix/
+---
+
+Whonix template(s)
+==================
+
+Whonix is an operating system focused on anonymity, privacy and security. It's
+based on the Tor anonymity network, Debian GNU/Linux and security by isolation.
+Its primary isolation mechanism is VirtualBox, but now it is also possible to
+run it on top of Qubes OS!
+
+Whonix template(s) are another Qubes community contribution. Currently Whonix activelly maintains those templates.
+
+More details, including installation instructions on [Whonix Qubes web page](https://www.whonix.org/wiki/Qubes).