diff --git a/site/fonts.org b/site/fonts.org
deleted file mode 100644
index e8fdd8e..0000000
--- a/site/fonts.org
+++ /dev/null
@@ -1,13 +0,0 @@
-I'm always looking for new and better fonts.
-
-- [[http://damieng.com/blog/2008/05/26/envy-code-r-preview-7-coding-font-released][Envy Code R]] :: Another programming font.
-  - Has a dashed ~0~ (zero).
-  - It has a bold typeface.
-  - It has a cursive typeface.
-
-- [[http://sourceforge.net/projects/sourcecodepro.adobe/][Source Code Pro]] :: The monospaced companion of the [[http://sourceforge.net/projects/sourcesans.adobe/][first open source
-     font]] by adobe.
-  - It has a dotted ~0~ (zero).
-  - It has a bold typeface.
-  - It has no cursive typeface, and they don't seem to intend to add
-    one.
diff --git a/site/fonts/envy_code_r.org b/site/fonts/envy_code_r.org
new file mode 100644
index 0000000..11e29e3
--- /dev/null
+++ b/site/fonts/envy_code_r.org
@@ -0,0 +1,14 @@
+#+TITLE: ryu/ fonts/Envy Code R
+#+OPTIONS: toc:nil
+#+LANGUAGE: en
+#+STARTUP: showall
+
+* [[http://damieng.com/blog/2008/05/26/envy-code-r-preview-7-coding-font-released][Envy Code R]]
+
+  I *like* that it has a dashed ~0~ (zero) and bold and italic faces. The
+  parentheses are not bad, but they're not my favorite either. The
+  differences between ~iI1lLoO0~ are quite clear.
+
+  At first it looked a little thin, but the fact that it has an
+  italic face was reason enough for me to get used to it and now I
+  don't notice it anymore.
diff --git a/site/fonts/source_code_pro.org b/site/fonts/source_code_pro.org
new file mode 100644
index 0000000..d45b1de
--- /dev/null
+++ b/site/fonts/source_code_pro.org
@@ -0,0 +1,10 @@
+#+TITLE: ryu/ fonts/Source Code Pro
+#+OPTIONS: toc:nil
+#+LANGUAGE: en
+#+STARTUP: showall
+
+* [[http://sourceforge.net/projects/sourcecodepro.adobe/][Source Code Pro]]
+
+  Companion of the [[http://sourceforge.net/projects/sourcesans.adobe/][first open source font by adobe]]. I *dislike* that it
+  has a dotted ~0~ (zero) and that it has no italic typeface and no
+  intention of adding one either. I *like* that it has a bold face.
diff --git a/site/index.org b/site/index.org
index 470888b..2236ee8 100644
--- a/site/index.org
+++ b/site/index.org
@@ -31,6 +31,12 @@
 
   - Look at some of the [[http://ryuslash.org/mediagoblin/][pictures]] I've uploaded.
 
-  - I also have some [[file:fonts.org][notes on fonts]] I have tried.
+  - I also have some notes on programming fonts I have tried:
+    [[file:fonts/envy_code_r.org][Envy Code R]],
+    [[file:fonts/source_code_pro.org][Source Code Pro]],
+    of which I'm currently using [[file:fonts/envy_code_r.org][Envy Code R]].
 
-  - Or on some [[file:windowmanagers.org][window managers]] I've used.
+  - Or on some window managers I've used:
+    [[file:wm/awesome.org][Awesome]],
+    [[file:wm/stumpwm.org][Stumpwm]],
+    of which I'm currently using [[file:wm/stumpwm.org][Stumpwm]].
diff --git a/site/windowmanagers.org b/site/windowmanagers.org
deleted file mode 100644
index 630381a..0000000
--- a/site/windowmanagers.org
+++ /dev/null
@@ -1,11 +0,0 @@
-I am barely ever satisfied with my window manager, so I'm always
-looking to identify why, what I can do about it and which window
-manager allows me to do that. I have a strong preference for
-programmable window managers, so that will entail most of the ones
-I'll list here.
-
-- [[http://awesome.naquadah.org/][awesome]] :: Almost everyone knows awesome, it's (one of) the biggest
-             and best-known tiling window managers around.
-  - It is an automatic tiler.
-  - It is configured using lua, this gives it a lot of flexibility,
-    but lua is far from my favorite language.
diff --git a/site/wm/awesome.org b/site/wm/awesome.org
new file mode 100644
index 0000000..6b34f37
--- /dev/null
+++ b/site/wm/awesome.org
@@ -0,0 +1,18 @@
+#+TITLE: ryu/ wm/Awesome
+#+OPTIONS: toc:nil
+#+LANGUAGE: en
+#+STARTUP: showall
+
+* [[http://awesome.naquadah.org/][Awesome]]
+
+  An automatic tiling window manager. It can be customized with the
+  [[http://www.lua.org/][Lua]] programming language. Lua has always had a bit of a bad
+  reputation with me, but that hasn't stopped me from using this
+  window manager. I still don't like the language, but with awesome
+  you can really do a lot cool things.
+
+  It is almost the Emacs of window managers. It has a lot of features
+  that other "simple" window managers don't bother with, or leave up
+  to other programs and it has a pretty impressive API for
+  interacting with it. Of the extensible window managers I have used
+  this is certainly the most active one at this moment.
diff --git a/site/wm/stumpwm.org b/site/wm/stumpwm.org
new file mode 100644
index 0000000..ea951ad
--- /dev/null
+++ b/site/wm/stumpwm.org
@@ -0,0 +1,12 @@
+#+TITLE: ryu/ wm/Stumpwm
+#+OPTIONS: toc:nil
+#+LANGUAGE: en
+#+STARTUP: showall
+
+* [[http://stumpwm.nongnu.org/][Stumpwm]]
+
+  Written completely in Common Lisp. A manual tiling window manager.
+  Very low on the "bling" side, but very extensible due to the
+  language it's written in. It has some strange quirks, it needs a
+  patch to be able to work with HTML hexadecimal colors and it
+  isn't actively developed at the moment.