diff --git a/customization/i3.md b/customization/i3.md
index 9178fccf..a8de3b6d 100644
--- a/customization/i3.md
+++ b/customization/i3.md
@@ -11,18 +11,25 @@ redirect_from:
 
 # i3 installation in dom0
 
-i3 is part of the testing repository (as of Qubes R3.1) and can be installed from there
-using the dom0 update mechanism.
+i3 is part of the stable repository (as of Qubes R3.1) and can be installed by
+using the [dom0 update mechanism](/doc/software-update-dom0/). To install the i3
+window manager and the its Qubes specific configuration:
 
-    $ sudo qubes-dom0-update --enablerepo=qubes-dom0-current-testing i3
-    
-Qubes-specific configuation is available in a separate package and can be installed
-optionally. Otherwise you can write your own configuration (see below).
+    $ sudo qubes-dom0-update i3 i3-settings-qubes
+
+The Qubes-specific configuration (package `i3-settings-qubes`) can be installed
+optionally in case you would prefer writing your own configuration (see
+[customization](#customization) section for scripts and configuration).
 
-    $ sudo qubes-dom0-update --enablerepo=qubes-dom0-current-testing i3-settings-qubes
-    
 That's it. After logging out, you can select i3 in the login manager.
 
+### Customization
+
+* [xdg_autostart_script](https://gist.github.com/SietsevanderMolen/7b4cc32ce7b4884513b0a639540e454f)
+* [i3bar_script](https://gist.github.com/SietsevanderMolen/e7f594f209dfaa3596907e427b657e30)
+* [terminal_start_script](https://gist.github.com/SietsevanderMolen/7c6f2b5773dbc0c08e1509e49abd1e96)
+* [i3 config with dmenu-i3-window-jumper](https://github.com/anadahz/qubes-i3-config/blob/master/config)
+
 ## Compilation and installation from source
 
 Note that the compilation from source is done in a Fedora based domU (could
@@ -33,7 +40,7 @@ installed through the package manager.
 
 Clone the i3-qubes repository here:
 
-    $ git clone https://github.com/SietsevanderMolen/i3-qubes.git
+    $ git clone https://github.com/QubesOS/qubes-desktop-linux-i3
 
 In this case, the most interesting file is probably
 `i3/0001-Show-qubes-domain-in-non-optional-colored-borders.patch` It's the patch
@@ -47,7 +54,7 @@ it.
 ### Building
 
 You'll need to install the build dependencies, which are listed in
-build-deps.list. You can verify them and then install them with
+build-deps.list. You can verify them and then install them with:
 
     $ sudo dnf install -y $(cat build-deps.list)
 
@@ -76,12 +83,8 @@ dependencies that we can easily install with:
         rxvt-unicode xcb-util-wm perl-JSON-XS xcb-util-cursor \\
         dzen2 dmenu xorg-x11-fonts-misc libev
 
-After that you can just install the generated rpm like any other local package
+After that you can just install the generated rpm like any other local package:
 
     $ sudo yum localinstall i3.rpm
 
 Log out, select i3, then log in again.
-
-[xdg_autostart_script]:https://gist.github.com/SietsevanderMolen/7b4cc32ce7b4884513b0a639540e454f
-[i3bar_script]: https://gist.github.com/SietsevanderMolen/e7f594f209dfaa3596907e427b657e30
-[terminal_start_script]: https://gist.github.com/SietsevanderMolen/7c6f2b5773dbc0c08e1509e49abd1e96