diff --git a/docs/guidedtour/index.html b/docs/guidedtour/index.html
deleted file mode 100644
index fbba737..0000000
--- a/docs/guidedtour/index.html
+++ /dev/null
@@ -1,118 +0,0 @@
----
-layout: default
-title: Guided Tour - Index
----
-Window Maker
-
-Guided Tour
-
-
-
-
-
-
-
-
-
-
-
-
-
-Foreword
-
-This tutorial is intended to help Window Maker users gain knowledge
-about the many excellent features
-of this window manager. The official Users Guide is worth reading. It can
-be reached from the Window
-Maker site.
-Other guides, tutorials and tips can be found at various sites on the
-internet. An
-internet search for "Window Maker guide how-to" might provide
-additional worthwhile information.
-
-
-
-This guided tour is NOT supposed to be a README, INSTALL or FAQ . These
-are worth reading, or more accurately, they should be considered COMPULSORY reading.
-
-
-
-
-The information in the guided tour is based upon Window Maker version 0.95.3.
-Check your version by opening WPrefs.app (the Window Maker Preferences
-tool). The version number is shown in the initial WPrefs window just
-below the "Window Maker Preferences" title. You may also run the
-command "wmaker --version" in
-a terminal (without the quotation marks). This command returns the installed version number of Window Maker.
-
-
-A special word of thanks
-
-The original Window Maker Guided Tour site was created and maintained
-for many years by Georges Tarbouriech. Where possible, I have retained
-his original work - including the layout and structure of the pages,
-the descriptions of Window Maker features,
-and even some of his original graphics. I want these pages to be up-to-date,
-but I also want them to be (as much as possible) a continuation
-of Georges' work. Thank you, Georges.
-(Having said that, anything you
-find in error is without question my fault - so don't blame Georges
-for any mistakes!)
-If you find an error, have a suggestion, or wish to make a comment, you may contact me by email at bnance<atsigngoeshere>uu.edu.
-
-
-
-This tour will attempt to follow Window Maker development, but not
-every update can be taken into account. In other words, this
-tour can help you learn the basics, but does not pretend to provide all
-of the detail or all of the latest information available in the
-official README, INSTALL and FAQ documents provided by Window Maker
-developers and maintainers.
-
-Table of contents
-
-
-
-
-
-
-Archives
-
-
-
-
-
-Two archives are available: HTML and pictures.
-
-tut.tar.gz (12K) HTML files
-img.tar.gz (613K) Picture files
-
-
-
-
-Links of interest
Window Maker on Debian 6 (YouTube) by fourandnine
-Arch Linux Window Maker Wiki Entry
-Debian Stable (Squeeze) Package Listing
-Window Maker on Mageia Linux (YouTube) by St. Louis Mageia Users' Group
-
-
-
-
-
-
-Window
-Maker
-
-
-
diff --git a/docs/guidedtour/index.rst b/docs/guidedtour/index.rst
new file mode 100644
index 0000000..c5a5a97
--- /dev/null
+++ b/docs/guidedtour/index.rst
@@ -0,0 +1,102 @@
+---
+layout: default
+title: Guided Tour - Index
+---
+
+Window Maker
+============
+
+.. class:: center
+
+Guided Tour
+-----------
+
+.. class:: screenshot center
+
+.. image:: images/gnusteplogo.png
+ :alt: Amanda by Agnieszka Czajkowska
+ :height: 100
+ :width: 100
+
+
+Foreword
+--------
+
+This tutorial is intended to help Window Maker users gain knowledge about the
+many excellent features of this window manager. The official Users Guide is
+worth reading. It can be reached from the `Window Maker site <{{ site.baseurl
+}}/docs/guide_toc.html>`_. Other guides, tutorials and tips can be found at
+various sites on the internet. An internet search for "Window Maker guide
+how-to" might provide additional worthwhile information.
+
+This guided tour is NOT supposed to be a README, INSTALL or FAQ. These are
+worth reading, or more accurately, they should be considered COMPULSORY
+reading.
+
+The information in the guided tour is based upon Window Maker version 0.95.3.
+Check your version by opening WPrefs.app (the Window Maker Preferences tool).
+The version number is shown in the initial WPrefs window just below the "Window
+Maker Preferences" title. You may also run the command "*wmaker --version*" in
+a terminal (without the quotation marks). This command returns the installed
+version number of Window Maker.
+
+A special word of thanks
+------------------------
+
+The original Window Maker Guided Tour site was created and maintained for many
+years by Georges Tarbouriech. Where possible, I have retained his original
+work - including the layout and structure of the pages, the descriptions of
+Window Maker features, and even some of his original graphics. I want these
+pages to be up-to-date, but I also want them to be (as much as possible) a
+continuation of Georges' work. *Thank you, Georges*. (Having said that,
+anything you find in error is without question my fault - so don't blame
+Georges for any mistakes!) If you find an error, have a suggestion, or wish to
+make a comment, you may contact me by email at
+*bnance<atsigngoeshere>uu.edu*.
+
+This tour will attempt to follow Window Maker development, but not
+every update can be taken into account. In other words, this
+tour can help you learn the basics, but does not pretend to provide all
+of the detail or all of the latest information available in the
+official README, INSTALL and FAQ documents provided by Window Maker
+developers and maintainers.
+
+Table of contents
+~~~~~~~~~~~~~~~~~
+
+.. class:: contents
+
+- `Preferences `_
+- `Windows `_
+- `Menus `_
+- `Dock `_
+- `Clip `_
+- `Backgrounds and themes `_
+- `Miscellaneous `_
+- `News `_
+
+Archives
+--------
+
+Two archives are available: HTML and pictures.
+
+.. TODO: figure out what's the status of those archives.
+
+- `tut.tar.gz (12K) HTML files `_
+- `img.tar.gz (613K) Picture files `_
+
+Links of interest
+-----------------
+
+- `Window Maker on Debian 6 (YouTube)
+ `_ by fourandnine
+- `Arch Linux Window Maker Wiki Entry
+ `_
+- `Debian Stable (Squeeze) Package Listing
+ `_
+- `Window Maker on Mageia Linux (YouTube)
+ `_ by St. Louis Mageia Users' Group
+
+.. class:: center
+
+ `Window Maker `_
diff --git a/style.css b/style.css
index 74a63c7..b366168 100644
--- a/style.css
+++ b/style.css
@@ -38,9 +38,9 @@ pre {
margin-bottom: 3em;
}
-p.center {text-align: center}
-p.caption {text-align: center}
+.caption {text-align: center}
+.center:not(.section), .center>h1, .center>h2{ text-align: center }
p.screenshot a img {
border: 1px solid black;
@@ -52,6 +52,15 @@ p.screenshot a img {
margin: auto;
}
+/* guided tour */
+
+#window-maker h1.title { text-align: center }
+#window-maker #guided-tour img {
+ display:block;
+ margin-left: auto;
+ margin-right: auto;
+}
+
/* gallery */
p.gallery {