2 files changed, 74 insertions, 19 deletions
diff --git a/content/pages/software/uenv.md b/content/pages/software/uenv.md
deleted file mode 100644
index 0f7a292..0000000
--- a/content/pages/software/uenv.md
+++ /dev/null
@@ -1,19 +0,0 @@
-Title: uenv
-Authors: David Runge
-
-**uenv** - as in *"useful environments"* - is a collection of scripts, systemd service and timer units and configuration that go along with it.  
-A couple of them might only be useful, when using window managers like <a href="http://awesome.naquadah.org/" target="_blank">Awesome</a>, that stem from a minimalistic approach...
-Some of the functionalities implemented here can be found in desktop environments like <a href="https://www.kde.org/" target="_blank">KDE</a> or <a href="https://www.gnome.org/" target="_blank">Gnome</a>.
-
-# Development
-All development takes place in my <a href="https://git.sleepmap.de" target="_blank">private git</a> repository. However you can ask for your SSH key to be included to be able to push to this repository.  
-For readonly access, just clone:  
-
-    git clone git://sleepmap.de/uenv.git
-
-
-You can also read the <a href="https://git.sleepmap.de/uenv.git/about/" target="_blank">About</a> page for uenv.
-
-# Packages
-
-* Archlinux (AUR): <a href="(https://aur.archlinux.org/packages/uenv-git/" target="_blank">uenv-git</a>
diff --git a/content/pages/software/uenv.rst b/content/pages/software/uenv.rst
new file mode 100644
index 0000000..5670ce1
--- /dev/null
+++ b/content/pages/software/uenv.rst
@@ -0,0 +1,74 @@
+uenv
+####
+
+:authors: David Runge
+
+| **uenv** - as in **u**\ seful **env**\ ironments - is a collection of scripts, |systemd| service and timer units and configuration that go along with it.
+| Some of the functionalities implemented here can only be found in |desktop-environments| like |kde| or |gnome| and therefore are very useful in more minimalistic environments such as |tiling-window-managers| or |headless_computers|.
+| For further information read its |uenv-about|.
+|
+
+Development
+___________
+
+| All development takes place in a |uenv-git|. You can ask for your |ssh-key| to be included to be able to push to this repository.
+| For readonly access, just clone:
+
+  .. code:: bash
+
+    git clone git://sleepmap.de/software/uenv.git
+
+Packages
+________
+
+* |archlinux| (|aur|): |uenv-git-aur|
+
+
+.. |systemd| raw:: html
+
+  <a href="https://www.freedesktop.org/wiki/Software/systemd/" target="_blank">systemd</a>
+
+.. |desktop-environments| raw:: html
+
+  <a href="https://en.wikipedia.org/wiki/Desktop_environment" target="_blank">desktop environments</a>
+
+.. |kde| raw:: html
+
+  <a href="https://www.kde.org/" target="_blank">KDE</a>
+
+.. |gnome| raw:: html
+
+  <a href="https://www.gnome.org/" target="_blank">Gnome</a>
+
+.. |tiling-window-managers| raw:: html
+
+  <a href="https://en.wikipedia.org/wiki/Tiling_window_manager" target="_blank">tiling window managers</a>
+
+.. |headless_computers| raw:: html
+
+  <a href="https://en.wikipedia.org/wiki/Headless_computer" target="_blank">headless computers</a>
+
+.. |uenv-about| raw:: html
+
+  <a href="https://git.sleepmap.de/software/uenv.git/about/" target="_blank">about page</a>
+
+.. |uenv-git| raw:: html
+
+  <a href="https://git.sleepmap.de/software/uenv.git" target="_blank">git repository</a>
+
+.. |ssh-key| raw:: html
+
+  <a href="https://en.wikipedia.org/wiki/Secure_Shell#ARCHITECTURE" target="_blank">SSH public key</a>
+
+.. |archlinux| raw:: html
+
+  <a href="https://archlinux.org" target="_blank">Arch Linux</a>
+
+.. |aur| raw:: html
+
+  <a href="https://aur.archlinux.org" target="_blank">AUR</a>
+
+.. |uenv-git-aur| raw:: html
+
+  <a href="https://aur.archlinux.org/packages/uenv-git/" target="_blank">uenv-git</a>
+