diff --git a/configuration/config-files.md b/configuration/config-files.md
index dec1dd0e..f2bf902d 100644
--- a/configuration/config-files.md
+++ b/configuration/config-files.md
@@ -9,8 +9,11 @@ redirect_from:
 - "/wiki/UserDoc/ConfigFiles/"
 ---
 
-Qubes specific VM config files
-==============================
+Configuration Files
+===================
+
+Qubes-specific VM config files
+------------------------------
 
 These files are placed in /rw, which survives a VM restart.
 That way, they can be used to customize a single VM instead of all VMs based on the same template. 
@@ -48,8 +51,9 @@ Note that scripts need to be executable (chmod +x) to be used.
 
 Also, take a look at [bind-dirs](/doc/bind-dirs) for instructions on how to easily modify arbitrary system files in an AppVM and have those changes persist.
 
+
 GUI and audio configuration in dom0
-===================================
+-----------------------------------
 
 The GUI configuration file `/etc/qubes/guid.conf` in one of a few not managed by qubes-prefs or the Qubes Manager tool.
 Sample config (included in default installation):
@@ -97,3 +101,4 @@ Currently supported settings:
 
 -   `audio_low_latency` - force low-latency audio mode (about 40ms compared to 200-500ms by default).
     Note that this will cause much higher CPU usage in dom0.
+
diff --git a/managing-os/templates.md b/managing-os/templates.md
index a7cbee80..e1b8e1f4 100644
--- a/managing-os/templates.md
+++ b/managing-os/templates.md
@@ -19,10 +19,38 @@ There are also templates available with or without certain software preinstalled
 The concept of TemplateVMs is initially described [here](/getting-started/#appvms-qubes-and-templatevms). 
 The technical details of this implementation are described in the developer documentation [here](/doc/template-implementation/).
 
-Some templates are available in ready-to-use binary form, but some of them are available only as source code, which can be built using the [Qubes Builder](/doc/qubes-builder/). In particular, some template "flavors" are available in source code form only. Take a look at the [Qubes Builder documentation](/doc/qubes-builder/) for instructions on how to compile them.
+Some templates are available in ready-to-use binary form, but some of them are available only as source code, which can be built using the [Qubes Builder](/doc/qubes-builder/).
+In particular, some template "flavors" are available in source code form only.
+Take a look at the [Qubes Builder documentation](/doc/qubes-builder/) for instructions on how to compile them.
+
+
+How to install, uninstall, and reinstall
+----------------------------------------
+
+### How to install
+
+Please refer to each TemplateVM's installation instructions below.
+Usually, the installation method is to execute the following type of command in dom0:
+
+    $ sudo qubes-dom0-update qubes-template-<name>
+
+(where `qubes-template-<name>` is the name of your TemplateVM package)
+
+### How to uninstall
+
+To uninstall a TemplateVM, execute the following type of command in dom0:
+
+    $ sudo dnf remove qubes-template-<name>
+
+(where `qubes-template-<name>` is the name of your TemplateVM package)
+
+If this doesn't work, you can [remove it manually](/doc/remove-vm-manually/).
+
+### How to reinstall
 
 To reinstall a currently installed TemplateVM, see [here](/doc/reinstall-template/).
 
+
 Invisible Things Lab (ITL) Supported templates
 -----------------------
 
diff --git a/troubleshooting/remove-vm-manually.md b/troubleshooting/remove-vm-manually.md
index 168dcaf9..17be55cc 100644
--- a/troubleshooting/remove-vm-manually.md
+++ b/troubleshooting/remove-vm-manually.md
@@ -8,22 +8,27 @@ How to Remove VMs Manually
 ==========================
 
 How to Remove a TemplateVM Manually (R3.2)
------------------------------------------
+------------------------------------------
 
-All commands should be executed in a dom0 terminal.
+Try the [normal method] before resorting to this one.
+All of the following commands should be executed in a dom0 terminal.
 
 1. Remove the TemplateVM's directory:
 
-        $ rm -rf /var/lib/qubes/vm-templates/<template-name>
+       $ rm -rf /var/lib/qubes/vm-templates/<template-name>
 
 2. Remove the TemplateVM from qubes.xml:
 
-        $ qvm-remove --just-db <template-name>
+       $ qvm-remove --just-db <template-name>
 
 3. Remove the TemplateVM's `*.desktop` files from `~/.local/share/applications`:
 
-        $ rm ~/.local/share/applications/<template-name>*
+       $ rm ~/.local/share/applications/<template-name>*
 
 4. Remove the TemplateVM's Applications Menu entry:
         
-        $ sudo rm /etc/xdg/menus/applications-merged/<template-name>*
+       $ sudo rm /etc/xdg/menus/applications-merged/<template-name>*
+
+
+[normal method]: /doc/templates/#how-to-install-uninstall-and-reinstall
+