diff --git a/Source/Examples/OpenAL/1.1/Playback.cs b/Source/Examples/OpenAL/1.1/Playback.cs
index 096e972e..f19917c7 100644
--- a/Source/Examples/OpenAL/1.1/Playback.cs
+++ b/Source/Examples/OpenAL/1.1/Playback.cs
@@ -14,7 +14,7 @@ using OpenTK.Audio;
 
 namespace Examples
 {
-    [Example("Playback", ExampleCategory.OpenAL, "1.1")]
+    [Example("Playback", ExampleCategory.OpenAL, "1.1", Documentation="Playback")]
     public class Playback
     {
         static readonly string filename = Path.Combine(Path.Combine("Data", "Audio"), "the_ring_that_fell.wav");
diff --git a/Source/Examples/OpenAL/EFX/EFXReverb.cs b/Source/Examples/OpenAL/EFX/EFXReverb.cs
index 2286a21b..a4c127ca 100644
--- a/Source/Examples/OpenAL/EFX/EFXReverb.cs
+++ b/Source/Examples/OpenAL/EFX/EFXReverb.cs
@@ -32,7 +32,7 @@ using OpenTK.Audio;
 
 namespace Examples
 {
-    [Example("EFX: Reverb", ExampleCategory.OpenAL, "EFX")]
+    [Example("EFX: Reverb", ExampleCategory.OpenAL, "EFX", Documentation="EFXReverb")]
     public class ReverbExample
     {
         static readonly string filename = Path.Combine(Path.Combine("Data", "Audio"), "the_ring_that_fell.wav");
diff --git a/Source/Examples/OpenGL/1.5/VertexBufferObject.cs b/Source/Examples/OpenGL/1.5/VertexBufferObject.cs
index 23aa645d..a2d7bc1d 100644
--- a/Source/Examples/OpenGL/1.5/VertexBufferObject.cs
+++ b/Source/Examples/OpenGL/1.5/VertexBufferObject.cs
@@ -21,20 +21,18 @@ using OpenTK.Math;
 
 namespace Examples.Tutorial
 {
-    [Example("Vertex Buffer Objects", ExampleCategory.OpenGL, "1.5", Documentation="VertexBufferObjects")]
+    [Example("Vertex Buffer Objects", ExampleCategory.OpenGL, "1.5", false, Documentation="VertexBufferObject")]
     public class T08_VBO : GameWindow
     {
         #region --- Private Fields ---
 
         Shapes.Shape cube = new Examples.Shapes.Cube();
-        //Shapes.Shape plane = new Examples.Shapes.Plane(16, 16, 2.0f, 2.0f);
 
         struct Vbo
         {
             public int VboID, EboID, NumElements;
         }
         Vbo[] vbo = new Vbo[2];
-        //float angle;
 
         public static readonly int order = 8;
 
diff --git a/Source/Examples/OpenGL/GLSL/JuliaSetFractal.cs b/Source/Examples/OpenGL/GLSL/JuliaSetFractal.cs
index 2c9fe47b..f4e2f776 100644
--- a/Source/Examples/OpenGL/GLSL/JuliaSetFractal.cs
+++ b/Source/Examples/OpenGL/GLSL/JuliaSetFractal.cs
@@ -26,7 +26,7 @@ namespace Examples.Tutorial
     /// One more major optimization could be applied (exploit the symmetry of the image with RTT), but
     /// that would make the program alot more complicated to follow. You can do this as an exercise.
     /// </summary>
-    [Example("GLSL Animated Julia Set", ExampleCategory.OpenGL, "GLSL", Documentation="JuliaSetFractal.cs")]
+    [Example("Julia Set Fractal", ExampleCategory.OpenGL, "GLSL", Documentation="JuliaSetFractal")]
     public class JuliaSetFractal : GameWindow
     {
         public JuliaSetFractal()
diff --git a/Source/Examples/OpenTK/GLControl/MultipleGLControls.cs b/Source/Examples/OpenTK/GLControl/MultipleGLControls.cs
index 4530a2ae..5831765f 100644
--- a/Source/Examples/OpenTK/GLControl/MultipleGLControls.cs
+++ b/Source/Examples/OpenTK/GLControl/MultipleGLControls.cs
@@ -11,7 +11,7 @@ using OpenTK.Graphics.OpenGL;
 
 namespace Examples.WinForms
 {
-    [Example("Multiple GLControls", ExampleCategory.OpenTK, "GLControl", 3, Documentation="MultipleGLControls.cs")]
+    [Example("Multiple GLControls", ExampleCategory.OpenTK, "GLControl", 3, Documentation="MultipleGLControls")]
     public partial class MultipleGLControlsForm : Form
     {
         public MultipleGLControlsForm()
diff --git a/Source/Examples/OpenTK/Test/Color4Serialization.cs b/Source/Examples/OpenTK/Test/Color4Serialization.cs
index d7adf47a..e3a71696 100644
--- a/Source/Examples/OpenTK/Test/Color4Serialization.cs
+++ b/Source/Examples/OpenTK/Test/Color4Serialization.cs
@@ -32,7 +32,7 @@ using OpenTK.Graphics;
 
 namespace Examples.Tests
 {
-    [Example("Color4 Serialization", ExampleCategory.OpenTK, "Test")]
+    [Example("Color4 Serialization", ExampleCategory.OpenTK, "Test", Documentation="Color4Serialization")]
     public class Color4Serialization
     {
         public static void Main()
diff --git a/Source/Examples/OpenTK/Test/Extensions.cs b/Source/Examples/OpenTK/Test/Extensions.cs
index 55b337d2..9444896d 100644
--- a/Source/Examples/OpenTK/Test/Extensions.cs
+++ b/Source/Examples/OpenTK/Test/Extensions.cs
@@ -22,7 +22,7 @@ using System.Text.RegularExpressions;
 
 namespace Examples.WinForms
 {
-    [Example("OpenGL Extensions", ExampleCategory.OpenTK, "Test")]
+    [Example("OpenGL Extensions", ExampleCategory.OpenTK, "Test", Documentation="Extensions")]
     public partial class Extensions : Form
     {
         #region Fields
diff --git a/Source/Examples/OpenTK/Test/GameWindowStates.cs b/Source/Examples/OpenTK/Test/GameWindowStates.cs
index d175be1d..62b99150 100644
--- a/Source/Examples/OpenTK/Test/GameWindowStates.cs
+++ b/Source/Examples/OpenTK/Test/GameWindowStates.cs
@@ -17,7 +17,7 @@ using OpenTK.Input;
 
 namespace Examples.Tests
 {
-    [Example("GameWindow states", ExampleCategory.OpenTK, "Test")]
+    [Example("GameWindow states", ExampleCategory.OpenTK, "Test", Documentation="GameWindowStates")]
     public class GameWindowStates : GameWindow
     {
         Font font = new Font(FontFamily.GenericSansSerif, 16.0f);
diff --git a/Source/Examples/OpenTK/Test/InputLogger.cs b/Source/Examples/OpenTK/Test/InputLogger.cs
index 72d549c5..0aba80fb 100644
--- a/Source/Examples/OpenTK/Test/InputLogger.cs
+++ b/Source/Examples/OpenTK/Test/InputLogger.cs
@@ -23,7 +23,7 @@ using OpenTK.Graphics.OpenGL;
 
 namespace Examples.Tests
 {
-    [Example("Input Logger", ExampleCategory.OpenTK, "Test")]
+    [Example("Input Logger", ExampleCategory.OpenTK, "Test", Documentation="InputLogger")]
     public partial class InputLogger : Form
     {
         #region Fields
diff --git a/Source/Examples/OpenTK/Test/TestResolutionChanges.cs b/Source/Examples/OpenTK/Test/TestResolutionChanges.cs
index 5c30ce5d..1192747b 100644
--- a/Source/Examples/OpenTK/Test/TestResolutionChanges.cs
+++ b/Source/Examples/OpenTK/Test/TestResolutionChanges.cs
@@ -17,7 +17,7 @@ using System.Threading;
 
 namespace Examples.Tests
 {
-    [Example("Test Resolution Changes", ExampleCategory.OpenTK, "Test")]
+    [Example("Test Resolution Changes", ExampleCategory.OpenTK, "Test", Documentation="TestResolutionChanges")]
     public class TestResolutionChanges
     {
         public static void Main()