diff --git a/TODO.markdown b/TODO.markdown
index 2281b07644..78471b3743 100644
--- a/TODO.markdown
+++ b/TODO.markdown
@@ -55,7 +55,6 @@ Pages to review:
  - Basic+tutorial+14+Handy+elements.markdown
  - Releases.markdown
  - Basic+tutorial+15+Clutter+integration.markdown
- - Table+of+Concepts.markdown
  - Basic+tutorial+16+Platform-specific+elements.markdown
  - Basic+tutorial+1+Hello+world.markdown
  - iOS+tutorial+1+Link+against+GStreamer.markdown
@@ -75,3 +74,4 @@ Reviewed pages:
  - Installing+the+SDK.markdown
  - Installing+for+Android+development.markdown
  - Building+from+source+using+Cerbero.markdown
+ - Table+of+Concepts.markdown
diff --git a/Table+of+Concepts.markdown b/Table+of+Concepts.markdown
index c2cf4a746e..411ec1a25e 100644
--- a/Table+of+Concepts.markdown
+++ b/Table+of+Concepts.markdown
@@ -1,57 +1,46 @@
 # Table of Concepts
-
 This page last changed on Jun 06, 2012 by xartigas.
 
 This table shows in which tutorial each of the following key GStreamer
 concepts is discussed.
 
-  - Action signals: [Playback tutorial 1: Playbin2
-    usage](Playback%2Btutorial%2B1%253A%2BPlaybin2%2Busage.html)
-  - Audio switching: [Playback tutorial 1: Playbin2
-    usage](Playback%2Btutorial%2B1%253A%2BPlaybin2%2Busage.html)
-  - Buffers: [Basic tutorial 8: Short-cutting the
-    pipeline](Basic%2Btutorial%2B8%253A%2BShort-cutting%2Bthe%2Bpipeline.html)
-  - Bus: [Basic tutorial 2: GStreamer
-    concepts](Basic%2Btutorial%2B2%253A%2BGStreamer%2Bconcepts.html)
-  - Capabilities: [Basic tutorial 6: Media formats and Pad
-    Capabilities](Basic%2Btutorial%2B6%253A%2BMedia%2Bformats%2Band%2BPad%2BCapabilities.html)
-  - Debugging: [Basic tutorial 11: Debugging
-    tools](Basic%2Btutorial%2B11%253A%2BDebugging%2Btools.html)
-  - Discoverer: [Basic tutorial 9: Media information
-    gathering](Basic%2Btutorial%2B9%253A%2BMedia%2Binformation%2Bgathering.html)
-  - Elements: [Basic tutorial 2: GStreamer
-    concepts](Basic%2Btutorial%2B2%253A%2BGStreamer%2Bconcepts.html)
-  - gst-discoverer: [Basic tutorial 10: GStreamer
-    tools](Basic%2Btutorial%2B10%253A%2BGStreamer%2Btools.html)
-  - gst-inspect: [Basic tutorial 10: GStreamer
-    tools](Basic%2Btutorial%2B10%253A%2BGStreamer%2Btools.html), [gst-inspect](gst-inspect.html)
-  - gst-launch: [Basic tutorial 10: GStreamer
-    tools](Basic%2Btutorial%2B10%253A%2BGStreamer%2Btools.html), [gst-launch](gst-launch.html)
-  - GUI: [Basic tutorial 5: GUI toolkit
-    integration](Basic%2Btutorial%2B5%253A%2BGUI%2Btoolkit%2Bintegration.html)
-  - Links: [Basic tutorial 2: GStreamer
-    concepts](Basic%2Btutorial%2B2%253A%2BGStreamer%2Bconcepts.html)
-  - Pads: [Basic tutorial 3: Dynamic
-    pipelines](Basic%2Btutorial%2B3%253A%2BDynamic%2Bpipelines.html)
-  - Pad Availability: [Basic tutorial 7: Multithreading and Pad
-    Availability](Basic%2Btutorial%2B7%253A%2BMultithreading%2Band%2BPad%2BAvailability.html)
-  - Pipelines: [Basic tutorial 2: GStreamer
-    concepts](Basic%2Btutorial%2B2%253A%2BGStreamer%2Bconcepts.html)
-  - Queries: [Basic tutorial 4: Time
-    management](Basic%2Btutorial%2B4%253A%2BTime%2Bmanagement.html)
-  - Seeks: [Basic tutorial 4: Time
-    management](Basic%2Btutorial%2B4%253A%2BTime%2Bmanagement.html)
-  - Signals: [Basic tutorial 3: Dynamic
-    pipelines](Basic%2Btutorial%2B3%253A%2BDynamic%2Bpipelines.html)
-  - States: [Basic tutorial 3: Dynamic
-    pipelines](Basic%2Btutorial%2B3%253A%2BDynamic%2Bpipelines.html)
-  - Subtitles: [Playback tutorial 2: Subtitle
-    management](Playback%2Btutorial%2B2%253A%2BSubtitle%2Bmanagement.html)
-  - Tags: [Playback tutorial 1: Playbin2
-    usage](Playback%2Btutorial%2B1%253A%2BPlaybin2%2Busage.html)
-  - Tools: [Basic tutorial 10: GStreamer
-    tools](Basic%2Btutorial%2B10%253A%2BGStreamer%2Btools.html)
-  - Threads: [Basic tutorial 7: Multithreading and Pad
-    Availability](Basic%2Btutorial%2B7%253A%2BMultithreading%2Band%2BPad%2BAvailability.html)
+-   Action signals: [Playback tutorial 1: Playbin usage]
+-   Audio switching: [Playback tutorial 1: Playbin usage]
+-   Buffers: [Basic tutorial 8: Short-cutting the pipeline]
+-   Bus: [Basic tutorial 2: GStreamer concepts]
+-   Capabilities: [Basic tutorial 6: Media formats and Pad Capabilities]
+-   Debugging: [Basic tutorial 11: Debugging tools]
+-   Discoverer: [Basic tutorial 9: Media information gathering]
+-   Elements: [Basic tutorial 2: GStreamer concepts]
+-   gst-discoverer: [Basic tutorial 10: GStreamer tools]
+-   gst-inspect: [Basic tutorial 10: GStreamer tools], [gst-inspect]
+-   gst-launch: [Basic tutorial 10: GStreamer tools], [gst-launch]
+-   GUI: [Basic tutorial 5: GUI toolkit integration]
+-   Links: [Basic tutorial 2: GStreamer concepts]
+-   Pads: [Basic tutorial 3: Dynamic pipelines]
+-   Pad Availability: [Basic tutorial 7: Multithreading and Pad
+    Availability]
+-   Pipelines: [Basic tutorial 2: GStreamer concepts]
+-   Queries: [Basic tutorial 4: Time management]
+-   Seeks: [Basic tutorial 4: Time management]
+-   Signals: [Basic tutorial 3: Dynamic pipelines]
+-   States: [Basic tutorial 3: Dynamic pipelines]
+-   Subtitles: [Playback tutorial 2: Subtitle management]
+-   Tags: [Playback tutorial 1: Playbin usage]
+-   Tools: [Basic tutorial 10: GStreamer tools]
+-   Threads: [Basic tutorial 7: Multithreading and Pad Availability]
 
-Document generated by Confluence on Oct 08, 2015 10:27
+  [Playback tutorial 1: Playbin usage]: Playback+tutorial+1+Playbin2+usage.markdown
+  [Basic tutorial 8: Short-cutting the pipeline]: Basic+tutorial+8+Short-cutting+the+pipeline.markdown
+  [Basic tutorial 2: GStreamer concepts]: Basic+tutorial+2+GStreamer+concepts.markdown
+  [Basic tutorial 6: Media formats and Pad Capabilities]: Basic+tutorial+6+Media+formats+and+Pad+Capabilities.markdown
+  [Basic tutorial 11: Debugging tools]: Basic+tutorial+11+Debugging+tools.markdown
+  [Basic tutorial 9: Media information gathering]: Basic+tutorial+9+Media+information+gathering.markdown
+  [Basic tutorial 10: GStreamer tools]: Basic+tutorial+10+GStreamer+tools.markdown
+  [gst-inspect]: gst-inspect.markdown
+  [gst-launch]: gst-launch.markdown
+  [Basic tutorial 5: GUI toolkit integration]: Basic+tutorial+5+GUI+toolkit+integration.markdown
+  [Basic tutorial 3: Dynamic pipelines]: Basic+tutorial+3+Dynamic+pipelines.markdown
+  [Basic tutorial 7: Multithreading and Pad Availability]: Basic+tutorial+7+Multithreading+and+Pad+Availability.markdown
+  [Basic tutorial 4: Time management]: Basic+tutorial+4+Time+management.markdown
+  [Playback tutorial 2: Subtitle management]: Playback+tutorial+2+Subtitle+management.markdown