diff --git a/themes/index.html b/themes/index.html
deleted file mode 100644
index db2c3aa..0000000
--- a/themes/index.html
+++ /dev/null
@@ -1,34 +0,0 @@
----
-layout: default
-title: Themes
----
-
-          <br />
-          <br />
-
-	  <h1>Themes</h1>
-
-	  <h2>Documentation</h2>
-	  
-	  <ul>
-	    <li><a href="themepacks.html">ThemePacks HOWTO</a></li>
-	    <li><a href="theme-HOWTO.html">Theme HOWTO</a> (out of date)</li>
-	  </ul>
-
-	  <h2>Links</h2>
-
-	  <ul>
-	    <li><a href="http://www.jessanderson.org/wmthemes/">Jess Anderson's Themes for Window Maker</a></li>
-	    <li><a href="http://box-look.org/index.php?xcontentmode=7313">Box-Look.org Window Maker Themes</a></li>
-	    <li><a href="http://www.gozer.org/window_maker/themes/">Gozer.org Window Maker Themes</a></li>
-	    <li><a href="http://lonelymachines.org/windowmaker-themes/">LonelyMachines Window Maker Themes</a></li>
-	    <li><a href="http://www.cs.mun.ca/~gstarkes/wmaker/themes/">Tower's Window Maker Themes</a></li>
-	  </ul>
-	  
-
-          <h2>Themes Gallery</h2>
-
-          <div class="screenshot">
-            <a href="screenshots/NeXT-Retro.png"><img src="screenshots/thumb_NeXT-Retro.png" height="250" alt="NeXT-Retro" /></a><br />
-            <b><a href="Themes/NeXT-Retro.tar.gz">NeXT-Retro</a></b> by Martin Dietze (<a href="Themes/NeXT-Retro_README.txt">README</a>, <a href="Themes/NeXT-Retro_dockapps.txt">dockapps information</a>) <p />
-          </div>
diff --git a/themes/index.md b/themes/index.md
new file mode 100644
index 0000000..795d491
--- /dev/null
+++ b/themes/index.md
@@ -0,0 +1,29 @@
+---
+layout: default
+title: Themes
+---
+
+Themes
+======
+
+Documentation
+-------------
+
+*   [ThemePacks HOWTO](themepacks.html)
+*   [Theme HOWTO](theme-HOWTO.html) (out of date)
+
+Links
+-----
+
+* [Box-Look.org Window Maker Themes](https://www.box-look.org/browse/cat/144/ord/latest/)
+* [DeviantArt Themes](https://www.deviantart.com/customization/skins/themes/windowmaker/)
+* [Gozer.org Window Maker Themes](http://www.gozer.org/window_maker/themes/)
+* [Jess Anderson's Themes for Window Maker](http://www.jessanderson.org/wmthemes/)
+* [LonelyMachines Window Maker Themes](http://lonelymachines.org/windowmaker-themes/)
+* [Tower's Window Maker Themes](http://www.cs.mun.ca/~gstarkes/wmaker/themes/)
+
+Themes Gallery
+--------------
+
+[![NeXT-Retro](screenshots/thumb_NeXT-Retro.png)](screenshots/NeXT-Retro.png)  
+**[NeXT-Retro](Themes/NeXT-Retro.tar.gz)** by Martin Dietze ([README](Themes/NeXT-Retro_README.txt), [dockapps information](Themes/NeXT-Retro_dockapps.txt))