diff --git a/docs/doxygen/Doxyfile b/docs/doxygen/Doxyfile
index 48fd394131..013ed19968 100644
--- a/docs/doxygen/Doxyfile
+++ b/docs/doxygen/Doxyfile
@@ -71,8 +71,19 @@ ALIASES += true="\b true"
 ALIASES += false="\b false"
 ALIASES += NULL="\b NULL"
 
+# these are useful for creation of tables
+ALIASES += row{2}=""
+
 # NOTE: we could put aliases also for e.g. @wxDefaultSize, @wxDefaultPosition, @wxID_ANY, etc
 
+# NOTE: these are important as you can't write in the docs
+#       just #ifdef since the # character is used by Doxygen
+#       for explicit linking; use the following aliases instead!
+ALIASES += ifdef="\b \c \#ifdef"
+ALIASES += ifndef="\b \c \#ifndef"
+ALIASES += if="\b \c \#if"          # NOTE: this overrides the Doxygen \if command
+ALIASES += endif="\b \c \#endif"
+
 
 #---------------------------------------------------------------------------
 # Build related configuration options
@@ -119,7 +130,7 @@ WARN_LOGFILE           = doxygen.log
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = . ./overviews ../../include/interface 
+INPUT                  = . ./overviews ../../interface
 INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          = *.h *.txt
 RECURSIVE              = YES
@@ -213,7 +224,7 @@ MAN_LINKS              = NO
 #---------------------------------------------------------------------------
 # configuration options related to the XML output
 #---------------------------------------------------------------------------
-GENERATE_XML           = YES
+GENERATE_XML           = NO
 XML_OUTPUT             = xml
 XML_SCHEMA             = 
 XML_DTD                = 
diff --git a/docs/doxygen/categories.h b/docs/doxygen/categories.h
index 88805049fd..c4f6eb827b 100644
--- a/docs/doxygen/categories.h
+++ b/docs/doxygen/categories.h
@@ -194,7 +194,7 @@
  This is a new set of classes for writing a customizable application
  interface with built-in docking, floatable panes and a flexible
  MDI-like interface. Further classes for custom notebooks with
- draggable tabs etc. are in progress. See also @ref wxaui_overview.
+ draggable tabs etc. are in progress. See also @ref aui_overview.
 
  @li wxAuiManager: The central class for managing the interface
  @li wxAuiNotebook: A replacement notebook class with extra features
@@ -443,7 +443,7 @@
 
  @li wxDebugContext: Provides memory-checking facilities
  @li Debugging macros: Debug macros for assertion and checking
- @li WXDEBUG\_NEW: Use this macro to give further debugging information
+ @li WXDEBUG_NEW: Use this macro to give further debugging information
  @li wxDebugReport: Base class for creating debug reports in case of a program crash.
  @li wxDebugReportCompress: Class for creating compressed debug reports.
  @li wxDebugReportUpload: Class for uploading compressed debug reports via HTTP.
diff --git a/docs/doxygen/const_cpp.h b/docs/doxygen/const_cpp.h
index 30da2547d5..12df2d5267 100644
--- a/docs/doxygen/const_cpp.h
+++ b/docs/doxygen/const_cpp.h
@@ -15,7 +15,7 @@
  by category (and sorted by alphabetical order inside each category).
  All of these macros except for the @c wxUSE_XXX variety is defined if the
  corresponding condition is @true and undefined if it isn't, so they should be
- always tested using @c #ifdef and not @c #if.
+ always tested using @ifdef and not @if.
 
  TODO: what can we use here instead of \twocolitem to keep text readable??
 
@@ -155,7 +155,7 @@
  macro corresponds to the compiler version: $1020$ for $4.2$ (the first supported
  version), $1100$ for $5.0$, $1200$ for $6.0$ and so on. For convenience, the
  symbols __VISUALCn__ are also defined for each major compiler version from
- 5 to 9, i.e. you can use tests such @c #ifdef __VISUALC7__} to test
+ 5 to 9, i.e. you can use tests such @ifdef __VISUALC7__} to test
  for compiler version being precisely 7.}
  \twocolitem{__XLC__}{AIX compiler}
  \twocolitem{__WATCOMC__}{Watcom C++. The value of this macro corresponds to
@@ -204,7 +204,7 @@
  includes a number of wxWidgets headers thus making it unnecessary to include
  them explicitly. However if this is not defined, you do need to include them
  and so the usual idiom which allows to support both cases is to first include
- @c wx/wxprec.h} and then, inside @c #ifndef WX_PRECOMP}, individual
+ @c wx/wxprec.h} and then, inside @ifndef WX_PRECOMP}, individual
  headers you need.}
  \twocolitem{_UNICODE and UNICODE}{both are defined if wxUSE_UNICODE is set to $1$}
  \twocolitem{wxUSE_GUI}{this particular feature test macro is defined to $1$
diff --git a/docs/doxygen/const_keymod.h b/docs/doxygen/const_keymod.h
index a2c7d854d1..9fcd9eae5b 100644
--- a/docs/doxygen/const_keymod.h
+++ b/docs/doxygen/const_keymod.h
@@ -33,7 +33,7 @@
      };
  @endverbatim
  
- Notice that @c wxMOD\_CMD should be used instead of @c wxMOD_CONTROL 
+ Notice that @c wxMOD_CMD should be used instead of @c wxMOD_CONTROL 
  in portable code to account for the fact that although 
  @c Control modifier exists under Mac OS, it is not used for the same
  purpose as under Windows or Unix there while the special Mac-specific 
diff --git a/docs/doxygen/const_wxusedef.h b/docs/doxygen/const_wxusedef.h
index e09c544d3c..fbe5deff29 100644
--- a/docs/doxygen/const_wxusedef.h
+++ b/docs/doxygen/const_wxusedef.h
@@ -16,7 +16,7 @@
  category). These symbols are always defined and whether the given feature is
  active or not depends on their value: if defined as @c 1, feature is active,
  otherwise it is disabled. Because of this these symbols should be always tested
- using @c #if and not @c #ifdef.
+ using @if and not @ifdef.
  
  @li @ref wxusedefmulti
  @li @ref wxusedefunix
diff --git a/docs/doxygen/copyright.h b/docs/doxygen/copyright.h
index d818039ebb..681d31c115 100644
--- a/docs/doxygen/copyright.h
+++ b/docs/doxygen/copyright.h
@@ -110,7 +110,7 @@
  [This is the first released version of the library GPL. It is
  numbered 2 because it goes with version 2 of the ordinary GPL.]
 
- @subsection Preamble
+ @section gnulicense_preamble Preamble
 
  The licenses for most software are designed to take away your
  freedom to share and change it. By contrast, the GNU General Public
@@ -545,7 +545,7 @@
  END OF TERMS AND CONDITIONS
  </center>
 
- @subsection Appendix: How to Apply These Terms to Your New Libraries
+ @section gnulicense_appendix Appendix: How to Apply These Terms to Your New Libraries
 
  If you develop a new library, and you want it to be of the greatest
  possible use to the public, we recommend making it free software that
diff --git a/docs/doxygen/devtips.h b/docs/doxygen/devtips.h
index 103a0ac58a..0802e7af91 100644
--- a/docs/doxygen/devtips.h
+++ b/docs/doxygen/devtips.h
@@ -69,7 +69,7 @@
 
  Most ports of wxWidgets can create either a static library or a shared
  library. wxWidgets can also be built in multilib and monolithic variants.
- See the @ref librarieslist for more information on these.
+ See the @ref libraries_page for more information on these.
 
 
 
@@ -198,8 +198,8 @@
  wxInt32, wxInt16, wxInt8, wxUint32, wxUint16 = wxWord, wxUint8 = wxByte
 
  where wxInt32 stands for a 32-bit signed integer type etc. You can also check
- which architecture the program is compiled on using the wxBYTE\_ORDER define
- which is either wxBIG\_ENDIAN or wxLITTLE\_ENDIAN (in the future maybe wxPDP\_ENDIAN
+ which architecture the program is compiled on using the wxBYTE_ORDER define
+ which is either wxBIG_ENDIAN or wxLITTLE_ENDIAN (in the future maybe wxPDP_ENDIAN
  as well).
 
  The macros handling bit-swapping with respect to the applications endianness
diff --git a/docs/doxygen/platdetails.h b/docs/doxygen/platdetails.h
index 8a131b9512..c092f01381 100644
--- a/docs/doxygen/platdetails.h
+++ b/docs/doxygen/platdetails.h
@@ -506,13 +506,13 @@
  doesn't do a perfect job of converting the project files from eVC++ format.
  
  When you have converted the wxWidgets workspace, edit the configuration properties
- for each configuration and in the Librarian, add a relative path ..\..\lib to
+ for each configuration and in the Librarian, add a relative path ..\\..\\lib to
  each library path. For example: 
- <tt>..\$(PlatformName)\$(ConfigurationName)\wx_mono.lib</tt>.
+ <tt>..\\$(PlatformName)\\$(ConfigurationName)\\wx_mono.lib</tt>.
  
  Then, for a sample you want to compile, edit the configuration properties
  and make sure 
- <tt>..\..\lib\\$(PlatformName)\\$(ConfigurationName)</tt> 
+ <tt>..\\..\\lib\\$(PlatformName)\\$(ConfigurationName)</tt> 
  is in the Linker/General/Additional Library Directories property. 
  Also change the Linker/Input/Additional Dependencies property to something like 
  <tt>coredll.lib wx_mono.lib wx_wxjpeg.lib wx_wxpng.lib wx_wxzlib.lib wx_wxexpat.lib 
diff --git a/docs/doxygen/utilities.h b/docs/doxygen/utilities.h
index 5053ae8dd1..40c3293d28 100644
--- a/docs/doxygen/utilities.h
+++ b/docs/doxygen/utilities.h
@@ -10,7 +10,7 @@
 
  @page utilities_page Utilities and libraries supplied with wxWidgets
 
- In addition to the @ref librarieslist, some
+ In addition to the @ref libraries_page, some
  additional utilities are supplied in the @c utils hierarchy.
 
  For other user-contributed packages, please see the Contributions page
diff --git a/docs/doxygen/wxwidgets.css b/docs/doxygen/wxwidgets.css
index 80bc91ad6a..619dee1f45 100644
--- a/docs/doxygen/wxwidgets.css
+++ b/docs/doxygen/wxwidgets.css
@@ -11,6 +11,7 @@ H1 {
 }
 H2 {
 	font-size: 120%;
+    margin-left: 30px;
 }
 H3 {
 	font-size: 100%;