diff --git a/etc/doxygen/mainpage.dox b/etc/doxygen/mainpage.dox
deleted file mode 100644
index 86a60d2bcb95b20ea039327eb9dffcdb809ced52..0000000000000000000000000000000000000000
--- a/etc/doxygen/mainpage.dox
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
-
-\mainpage
-
-\li \subpage ArmarXGui-Overview Overview
-\li \subpage ArmarXGui-HowTos ArmarXGui HowTos
-\li \subpage ArmarXGui-FAQ "ArmarXGui FAQ"
-\li \subpage ArmarXGui-Components "ArmarXGui Components"
-\li \subpage ArmarXGui-GuiPlugins "ArmarXGui Gui Plugins"
-\li \subpage ArmarXGui-License "ArmarXGui License"
-
- */
diff --git a/etc/doxygen/mainpage.md b/etc/doxygen/mainpage.md
new file mode 100644
index 0000000000000000000000000000000000000000..107819e8ef4012d446e01398d3d0b67601e7a689
--- /dev/null
+++ b/etc/doxygen/mainpage.md
@@ -0,0 +1,7 @@
+\mainpage
+
+- \subpage ArmarXGui-Overview "ArmarXGui Overview"
+- \subpage ArmarXGui-HowTos "ArmarXGui How To's"
+- \subpage ArmarXGui-Tutorials "ArmarXGui Tutorials"
+- \subpage ArmarXGui-Components "ArmarXGui Components"
+- \subpage ArmarXGui-GuiPlugins "ArmarXGui Gui Plugins"
diff --git a/etc/doxygen/pages/Tutorials.dox b/etc/doxygen/pages/Tutorials.dox
deleted file mode 100644
index fa39d14b4b633b7f1e9b90218d1cb66d19ecd7d3..0000000000000000000000000000000000000000
--- a/etc/doxygen/pages/Tutorials.dox
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
-
-\page ArmarXGui-Tutorials ArmarXGui Tutorials
-
-Tutorials from ArmarXGui:
-
-\li \subpage ArmarXGui-Tutorials-CreateGuiPlugin
-
-\li  \ref Component-RemoteGuiExample2 (Example component for how to use the RemoteGui)
-
-*/
diff --git a/etc/doxygen/pages/Tutorials.md b/etc/doxygen/pages/Tutorials.md
new file mode 100644
index 0000000000000000000000000000000000000000..1833dbda5b92784f777e34f0ea82c1765aa01996
--- /dev/null
+++ b/etc/doxygen/pages/Tutorials.md
@@ -0,0 +1,10 @@
+# ArmarXGui Tutorials  {#ArmarXGui-Tutorials}
+
+Tutorials from ArmarXGui:
+
+- \subpage ArmarXGui-Tutorials-CreateGuiPlugin
+
+
+Examples:
+
+- \ref Component-RemoteGuiExample2 (Example component for how to use the RemoteGui)