diff --git a/documentation/preface.dox b/documentation/preface.dox
index 85920d91b..fe094acca 100644
--- a/documentation/preface.dox
+++ b/documentation/preface.dox
@@ -2,78 +2,72 @@
 
  \page preface Preface
 
-<P>This manual describes the Fast Light Tool Kit ("FLTK")
+This manual describes the Fast Light Tool Kit ("FLTK")
 version 1.3.0, a C++ Graphical User Interface
 ("GUI") toolkit for UNIX, Microsoft Windows and MacOS. Each
 of the chapters in this manual is designed as a tutorial for
 using FLTK, while the appendices provide a convenient reference
 for all FLTK widgets, functions, and operating system
-interfaces.</P>
+interfaces.
 
-<P><B>This manual may be printed, modified, and/or used under
-the terms of the FLTK license provided in <A
-HREF="license.html">Appendix J</A>.</B>
+<B>This manual may be printed, modified, and/or used under
+the terms of the FLTK license provided in \ref license.</B>
 
 <H2>Organization</H2>
 
-<P>This manual is organized into the following chapters and appendices:</P>
+This manual is organized into the following chapters and appendices:
 
-<UL>
+	\li \ref intro
 
-	<LI><A HREF="intro.html#intro">Chapter 1 - Introduction to FLTK</A></LI>
+	\li \ref basics
 
-	<LI><A HREF="basics.html#basics">Chapter 2 - FLTK Basics</A></LI>
+	\li \ref common
 
-	<LI><A HREF="common.html#common">Chapter 3 - Common Widgets and Attributes</A></LI>
+	\li \ref editor
 
-	<LI><A HREF="editor.html#editor">Chapter 4 - Designing a Simple Text Editor</A></LI>
+	\li \ref drawing
 
-	<LI><A HREF="drawing.html#drawing">Chapter 5 - Drawing Things in FLTK</A></LI>
+	\li \ref events
 
-	<LI><A HREF="events.html#events">Chapter 6 - Handling Events</A></LI>
+	\li \ref subclassing
 
-	<LI><A HREF="subclassing.html#subclassing">Chapter 7 - Adding and Extending Widgets</A></LI>
+	\li \ref opengl
 
-	<LI><A HREF="opengl.html#opengl">Chapter 8 - Using OpenGL</A></LI>
+	\li \ref fluid
 
-	<LI><A HREF="fluid.html#FLUID">Chapter 9 - Programming With FLUID</A></LI>
+	\li \ref advanced
 
-	<LI><A HREF="advanced.html">Chapter 10 - Advanced FLTK</A></LI>
+	\li \ref unicode
 
-	<LI><A HREF="classes.html">Appendix A - Class Reference</A></LI>
+	\li <A class="el" HREF="classes.html">A - Class Reference</A>
 
-	<LI><A HREF="functions.html#functions">Appendix B - Function Reference</A></LI>
+	\li <A class="el" HREF="functions.html#functions">B - Function Reference</A>
 
-	<LI><A HREF="enumerations.html#Enumerations">Appendix C - FLTK Enumerations</A></LI>
+	\li \ref enumerations
 
-	<LI><A HREF="glut.html#glut">Appendix D - GLUT Compatibility</A></LI>
+	\li \ref glut
 
-	<LI><A HREF="forms.html#forms">Appendix E - Forms Compatibility</A></LI>
+	\li \ref forms
 
-	<LI><A HREF="osissues.html#osissues">Appendix F - Operating System Issues</A></LI>
+	\li \ref osissues
 
-	<LI><A HREF="migration_1_1.html">Appendix G - Migrating from FLTK 1.0 to FLTK 1.1</A></LI>
+	\li \ref migration_1_1
 
-	<LI><A HREF="migration_1_3.html">Appendix H - Migrating from FLTK 1.1 to FLTK 1.3</A></LI>
+	\li \ref migration_1_3
 
-	<LI><A HREF="development.html">Appendix I - Developer Information</A></LI>
+	\li \ref development
 
-	<LI><A HREF="license.html#license">Appendix J - Software License</A></LI>
+	\li \ref license
 
-	<LI><A HREF="examples.html#examples">Appendix K - Example Source Code</A></LI>
-
-</UL>
+	\li \ref examples
 
 <H2>Conventions</H2>
 
 <P>The following typeface conventions are used in this manual:</P>
 
-<UL>
-	<LI>Function and constant names are shown in <B><TT>bold courier type</TT></B></LI>
+	\li Function and constant names are shown in <B><TT>bold courier type</TT></B>
 
-	<LI>Code samples and commands are shown in <TT>regular courier type</TT></LI>
-
-</UL>
+	\li Code samples and commands are shown in <TT>regular courier type</TT>
 
 <H2>Abbreviations</H2>
 
@@ -99,7 +93,7 @@ HREF="license.html">Appendix J</A>.</B>
 
 <P>FLTK is Copyright 1998-2008 by Bill Spitzak and others.  Use and
 distribution of FLTK is governed by the GNU Library General Public
-License with 4 exceptions, located in <A HREF="license.html#license">Appendix J</A>.</P>
+License with 4 exceptions, located in \ref license.</P>
 
 <P>UNIX is a registered trademark of the X Open Group, Inc. 
 Microsoft and Windows are registered trademarks of Microsoft