diff --git a/Doc/Doxyfile b/Doc/Doxyfile
index bcd5f86d..d933f278 100644
--- a/Doc/Doxyfile
+++ b/Doc/Doxyfile
@@ -801,7 +801,7 @@ HTML_FOOTER            = html/acg_footer.html
 # the style sheet file to the HTML output directory, so don't put your own 
 # stylesheet in the HTML output directory as well, or it will be erased!
 
-HTML_STYLESHEET        = 
+HTML_STYLESHEET        = html/acg_style.css
 
 # If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
 # files or namespaces will be aligned in HTML using tables. If set to 
@@ -962,13 +962,13 @@ ENUM_VALUES_PER_LINE   = 4
 # releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE 
 # respectively.
 
-GENERATE_TREEVIEW      = NONE
+GENERATE_TREEVIEW      = ALL
 
 # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
 # used to set the initial width (in pixels) of the frame in which the tree 
 # is shown.
 
-TREEVIEW_WIDTH         = 250
+TREEVIEW_WIDTH         = 300
 
 # Use this tag to change the font size of Latex formulas included 
 # as images in the HTML documentation. The default is 10. Note that 
@@ -1523,4 +1523,4 @@ DOT_CLEANUP            = YES
 # The SEARCHENGINE tag specifies whether or not a search engine should be 
 # used. If set to NO the values of all tags below this one will be ignored.
 
-SEARCHENGINE           = NO
+SEARCHENGINE           = YES
diff --git a/Doc/doxy.config.in b/Doc/doxy.config.in
index 546bb29b..b7f363cc 100644
--- a/Doc/doxy.config.in
+++ b/Doc/doxy.config.in
@@ -638,7 +638,8 @@ EXAMPLE_PATH           = @CMAKE_CURRENT_SOURCE_DIR@/Examples \
 # blank all files are included.
 
 EXAMPLE_PATTERNS       = *.cc \
-                         *.hh
+                         *.hh \
+                         *.txt
 
 # If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
 # searched for input files to be used with the \include or \dontinclude 
@@ -800,7 +801,7 @@ HTML_FOOTER            = @CMAKE_CURRENT_SOURCE_DIR@/html/acg_footer.html
 # the style sheet file to the HTML output directory, so don't put your own 
 # stylesheet in the HTML output directory as well, or it will be erased!
 
-HTML_STYLESHEET        = 
+HTML_STYLESHEET        = @CMAKE_CURRENT_SOURCE_DIR@/html/acg_style.css
 
 # If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
 # files or namespaces will be aligned in HTML using tables. If set to 
@@ -961,13 +962,13 @@ ENUM_VALUES_PER_LINE   = 4
 # releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE 
 # respectively.
 
-GENERATE_TREEVIEW      = NONE
+GENERATE_TREEVIEW      = ALL
 
 # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
 # used to set the initial width (in pixels) of the frame in which the tree 
 # is shown.
 
-TREEVIEW_WIDTH         = 250
+TREEVIEW_WIDTH         = 300
 
 # Use this tag to change the font size of Latex formulas included 
 # as images in the HTML documentation. The default is 10. Note that 
@@ -1522,4 +1523,4 @@ DOT_CLEANUP            = YES
 # The SEARCHENGINE tag specifies whether or not a search engine should be 
 # used. If set to NO the values of all tags below this one will be ignored.
 
-SEARCHENGINE           = NO
+SEARCHENGINE           = YES
diff --git a/Doc/mainpage.docu b/Doc/mainpage.docu
index 083e3412..0381f2c9 100644
--- a/Doc/mainpage.docu
+++ b/Doc/mainpage.docu
@@ -22,7 +22,8 @@ is given.
 \li \ref compiling
 
 <br /><br />
-\section mesh_docu Using and understanding OpenMesh
+
+\subpage mesh_docu
 
 We provide a short overview over the functionality of the %OpenMesh
 library and some additional concepts in \ref tutorial. Additionally, we explain the 
@@ -39,14 +40,14 @@ most important topics of %OpenMesh in the following sections:
 The %OpenMeshTools library that contains some useful tools
 for i.e. mesh processing:
     
-    \li \ref tools_docu
+    \li \subpage tools_docu
     
 <br /><br />
-\section tutorial Tutorials (code examples)
+\subpage tutorial
 
 This section is supposed to introduce the basic concepts of
 %OpenMesh. <!--For detailed information, consult the online documentation
-(\ref mesh_docu).-->
+(\subpage mesh_docu ).-->
 
 <!--In this tutorial we will introduce the %OpenMesh library by means of
 simple examples. The first one just builds a polygonal mesh
@@ -76,7 +77,7 @@ repeatedly replacing each vertex' position by the center of gravity
 \li \ref tutorial_09
 
 <br /><br />
-\section background Additional information on OpenMesh
+\subpage additional_information
 
 \li \ref mesh_first_to_read
 \li \ref mesh_cpp
@@ -84,4 +85,22 @@ repeatedly replacing each vertex' position by the center of gravity
 \li \ref naming_conventions
 \li \ref history
 
+\page mesh_docu Using and understanding OpenMesh
+\li \subpage mesh_features
+\li \subpage mesh_hds
+\li \subpage mesh_iterators
+\li \subpage mesh_navigation
+\li \subpage mesh_io
+\li \subpage mesh_operations
+\li \subpage mesh_hierarchy
+\li \subpage mesh_type
+
+\page additional_information Additional Information on OpenMesh
+\li \subpage mesh_first_to_read
+\li \subpage mesh_cpp
+\li \subpage mesh_members
+\li \subpage naming_conventions
+\li \subpage history
+
+
 **/
diff --git a/Doc/tools.docu b/Doc/tools.docu
index 06a8289c..6e0f4745 100644
--- a/Doc/tools.docu
+++ b/Doc/tools.docu
@@ -2,11 +2,11 @@
 
 /** \page tools_docu OpenMesh Tools Documentation
 
-- \ref decimater_docu
-- \ref subdivider_docu
-- \ref vdpm_docu
-- Miscellaneous
-  - \ref OpenMesh::StripifierT
+\li \subpage decimater_docu
+\li \subpage subdivider_docu
+\li \subpage vdpm_docu
+\li Miscellaneous
+    OpenMesh::StripifierT
 
 */
 
diff --git a/Doc/tutorial_main.docu b/Doc/tutorial_main.docu
index c9b1a534..d07e9ab7 100644
--- a/Doc/tutorial_main.docu
+++ b/Doc/tutorial_main.docu
@@ -28,16 +28,17 @@ repeatedly replacing each vertex' position by the center of gravity
 \li write the mesh to standard output.
 
 <ol>
-<li> \ref tutorial_01
-<li> \ref tutorial_02
-<li> \ref tutorial_03
-<li> \ref tutorial_04
-<li> \ref tutorial_05
-<li> \ref tutorial_06
-<li> \ref tutorial_07
-<li> \ref tutorial_07b
-<li> \ref tutorial_08
-<li> \ref tutorial_09
+<li> \subpage tutorial_build
+<li> \subpage tutorial_01
+<li> \subpage tutorial_02
+<li> \subpage tutorial_03
+<li> \subpage tutorial_04
+<li> \subpage tutorial_05
+<li> \subpage tutorial_06
+<li> \subpage tutorial_07
+<li> \subpage tutorial_07b
+<li> \subpage tutorial_08
+<li> \subpage tutorial_09
 </ol>
 
 */