diff --git a/code/DocumentationParser.php b/code/DocumentationParser.php
index 6d66da3..4e06c99 100755
--- a/code/DocumentationParser.php
+++ b/code/DocumentationParser.php
@@ -54,11 +54,15 @@ class DocumentationParser {
 
 		$md = self::rewrite_api_links($md, $page);
 		$md = self::rewrite_heading_anchors($md, $page);
+
 		$md = self::rewrite_code_blocks($md);
-		
+
 		$parser = new ParsedownExtra();
-		
-		return $parser->text($md);
+		$parser->setBreaksEnabled(false);
+
+		$text = $parser->text($md);
+
+		return $text;
 	}
 	
 	public static function rewrite_code_blocks($md) {
@@ -66,46 +70,73 @@ class DocumentationParser {
 		$inner = false;
 		$mode = false;
 		$end = false;
+		$debug = false;
 
 		$lines = explode("\n", $md);
 		$output = array();
 
 		foreach($lines as $i => $line) {
+			if($debug) var_dump('Line '. ($i + 1) . ' '. $line);
+
 			// if line just contains whitespace, continue down the page.
 			// Prevents code blocks with leading tabs adding an extra line.
-			if(preg_match('/^\s$/', $line)) {
+			if(preg_match('/^\s$/', $line) && !$started) {
 				continue;
 			}
 
 			if(!$started && preg_match('/^[\t]*:::\s*(.*)/', $line, $matches)) {
 				// first line with custom formatting
+				if($debug) var_dump('Starts a new block with :::');
+
 				$started = true;
 				$mode = self::CODE_BLOCK_COLON;
-				$output[$i] = sprintf('<pre class="brush: %s">', (isset($matches[1])) ? $matches[1] : "");
+
+				$output[$i] = sprintf('```%s', (isset($matches[1])) ? trim($matches[1]) : "");
+
 			} else if(!$started && preg_match('/^\t*```\s*(.*)/', $line, $matches)) {
+				if($debug) var_dump('Starts a new block with ```'); 
+
 				$started = true;
 				$mode = self::CODE_BLOCK_BACKTICK;
-				$output[$i] = sprintf('<pre class="brush: %s">', (isset($matches[1])) ? $matches[1] : "");
+
+				$output[$i] = sprintf('```%s', (isset($matches[1])) ? trim($matches[1]) : "");
 			} else if($started && $mode == self::CODE_BLOCK_BACKTICK) {
 				// inside a backtick fenced box
 				if(preg_match('/^\t*```\s*/', $line, $matches)) {
+					if($debug) var_dump('End a block with ```'); 
+
 					// end of the backtick fenced box. Unset the line that contains the backticks
 					$end = true;
 				}
 				else {
+					if($debug) var_dump('Still in a block with ```'); 
+
 					// still inside the line.
-					$output[$i] = ($started) ? '' : '<pre>' . "\n";
-					$output[$i] .= htmlentities($line, ENT_COMPAT, 'UTF-8');
+					if(!$started) {
+						$output[$i - 1] = '```';
+					}
+
+					$output[$i] = $line;
 					$inner = true;
 				}
 			} else if(preg_match('/^[\ ]{0,3}?[\t](.*)/', $line, $matches)) {
+
 				// inner line of block, or first line of standard markdown code block
 				// regex removes first tab (any following tabs are part of the code).
-				$output[$i] = ($started) ? '' : '<pre>' . "\n";
-				$output[$i] .= htmlentities($matches[1], ENT_COMPAT, 'UTF-8');
+				if(!$started) {
+					if($debug) var_dump('Start code block because of tab. No fence'); 
+
+					$output[$i - 1] = '```';
+				} else {
+					if($debug) var_dump('Content is still tabbed so still inner');
+				}
+
+				$output[$i] = $matches[1];
 				$inner = true;
 				$started = true;
-			} else if($started && $inner && $mode == self::CODE_BLOCK_COLON && trim($line) === "") {
+			} else if($started && $inner && trim($line) === "") {
+				if($debug) var_dump('Inner line of code block'); 
+
 				// still inside a colon based block, if the line is only whitespace 
 				// then continue with  with it. We can continue with it for now as 
 				// it'll be tidied up later in the $end section.
@@ -121,14 +152,19 @@ class DocumentationParser {
 				// and include this line. The edge case where this will fail is
 				// new the following segment contains a code block as well as it
 				// will not open.
+				if($debug) {
+					var_dump('Contains something that isnt code. So end the code.');
+				}
+
 				$end = true;
 				$output[$i] = $line;
-				$i = $i -1;
+				$i = $i - 1;
 			} else {
 				$output[$i] = $line;
 			}
 
 			if($end) {
+				if($debug) var_dump('End of code block');
 				$output = self::finalize_code_output($i, $output);
 
 				// reset state
@@ -137,34 +173,27 @@ class DocumentationParser {
 		}
 
 		if($started) {
-			$output = self::finalize_code_output($i, $output);
+			$output = self::finalize_code_output($i+1, $output);
 		}
 
-		return join("\n", $output);
+		return implode("\n", $output);
 
 	}
 
 	/**
+	 * Adds the closing code backticks. Removes trailing whitespace.
+	 *
 	 * @param int
 	 * @param array
 	 *
 	 * @return array
 	 */
 	private static function finalize_code_output($i, $output) {
-		$j = $i;
-
-		while(isset($output[$j]) && trim($output[$j]) === "") {
-			unset($output[$j]);
-		
-			$j--;
+		if(isset($output[$i]) && trim($output[$i])) {
+			$output[$i] .= "\n```\n";
 		}
-				
-		if(isset($output[$j])) {
-			$output[$j] .= "</pre>\n";
-		}
-
 		else {
-			$output[$j] = "</pre>\n\n";
+			$output[$i] = "```";
 		}
 
 		return $output;				
diff --git a/code/controllers/DocumentationViewer.php b/code/controllers/DocumentationViewer.php
index 65afbcc..dffe655 100755
--- a/code/controllers/DocumentationViewer.php
+++ b/code/controllers/DocumentationViewer.php
@@ -368,7 +368,7 @@ class DocumentationViewer extends Controller {
 		$html = $page->getHTML();
 		$html = $this->replaceChildrenCalls($html);
 
-		return DBField::create_field("HTMLText", $html);
+		return $html;
 	}
 
 	public function replaceChildrenCalls($html) {
diff --git a/code/models/DocumentationPage.php b/code/models/DocumentationPage.php
index be3af43..8613a04 100755
--- a/code/models/DocumentationPage.php
+++ b/code/models/DocumentationPage.php
@@ -168,10 +168,12 @@ class DocumentationPage extends ViewableData {
 	 * @return string
 	 */
 	public function getHTML() {
-		return DocumentationParser::parse(
+		$html = DocumentationParser::parse(
 			$this, 
 			$this->entity->Link()
 		);
+
+		return $html;
 	}
 	
 	/**
diff --git a/javascript/DocumentationViewer.js b/javascript/DocumentationViewer.js
index 037400c..05c5fb8 100755
--- a/javascript/DocumentationViewer.js
+++ b/javascript/DocumentationViewer.js
@@ -198,6 +198,23 @@
 			$("#Form_LanguageForm").submit();
 		});
 		
+		/** ---------------------------------------------
+		 * SYNTAX HIGHLIGHTER 
+		 *
+		 * As the Markdown parser now uses the GFM structure (```yml) this does
+		 * not work with SyntaxHighlighter. The below translates the GFM output
+		 * to one SyntaxHighter can use
+		 */
+		$("pre").each(function(i, elem) {
+			var code = $(elem).find('code[class^=language]');
+
+			if(code.length > 0) {
+				var brush = code.attr('class').replace('language-', '');
+				$(elem).attr('class', 'brush: '+ brush);
+				$(elem).html(code.html());
+			}
+		});
+		
 		SyntaxHighlighter.defaults.toolbar = false;
 		SyntaxHighlighter.all();
 	});
diff --git a/templates/Layout/DocumentationViewer_DocumentationPage.ss b/templates/Layout/DocumentationViewer_DocumentationPage.ss
index 7c1743f..49a4b87 100755
--- a/templates/Layout/DocumentationViewer_DocumentationPage.ss
+++ b/templates/Layout/DocumentationViewer_DocumentationPage.ss
@@ -24,7 +24,7 @@
 
 	<% include DocumentationTableContents %>
 		
-	$Content
+	$Content.RAW
 
 	<% include DocumentationNextPrevious %>
 
diff --git a/tests/DocumentationParserTest.php b/tests/DocumentationParserTest.php
index 96b7999..f764be6 100755
--- a/tests/DocumentationParserTest.php
+++ b/tests/DocumentationParserTest.php
@@ -73,6 +73,93 @@ class DocumentationParserTest extends SapphireTest {
 
 		$manifest = new DocumentationManifest(true);
 	}
+	public function testRewriteCodeBlocks() {
+		$codePage = new DocumentationPage(
+			$this->entityAlt,
+			'CodeSnippets.md',
+			DOCSVIEWER_PATH . '/tests/docs-parser/en/CodeSnippets.md'
+		);
+
+		$result = DocumentationParser::rewrite_code_blocks(
+			$codePage->getMarkdown()
+		);
+
+		$expected = <<<HTML
+#### <% control Foo %>
+```
+code block
+<% without formatting prefix %>
+```
+Paragraph with a segment of <% foo %>
+```
+code block
+
+that has a line in it
+```
+This is a yaml block
+
+```yaml
+foo: bar
+
+baz: qux
+```
+This is a yaml block with tab in that new line
+
+```yaml
+foo: bar
+
+baz: qux
+```
+HTML;
+
+		$this->assertEquals($expected, $result, 'Code blocks support line breaks');
+
+		$result = DocumentationParser::rewrite_code_blocks(
+			$this->page->getMarkdown()
+		);
+
+		$expected = <<<HTML
+```php
+code block
+with multiple
+lines
+	and tab indent
+	and escaped < brackets
+	
+```
+Normal text after code block
+HTML;
+
+		$this->assertContains($expected, $result, 'Custom code blocks with ::: prefix');		
+		
+		$expected = <<<HTML
+```
+code block
+without formatting prefix
+```
+HTML;
+		$this->assertContains($expected, $result, 'Traditional markdown code blocks');
+
+		$expected = <<<HTML
+```
+Fenced code block
+```
+HTML;
+		$this->assertContains($expected, $result, 'Backtick code blocks');
+		
+		$expected = <<<HTML
+```php
+Fenced box with
+
+new lines in
+
+between
+
+content
+```
+HTML;
+		$this->assertContains($expected, $result, 'Backtick with newlines');
+	}
 
 	public function testRelativeLinks() {
 		// index.md
@@ -188,52 +275,7 @@ class DocumentationParserTest extends SapphireTest {
 		$this->assertEquals('title-one', DocumentationParser::generate_html_id('Title--one'));
 	}
 
-	public function testRewriteCodeBlocks() {
-		$result = DocumentationParser::rewrite_code_blocks(
-			$this->page->getMarkdown()
-		);
 
-		$expected = <<<HTML
-<pre class="brush: php">
-code block
-with multiple
-lines
-	and tab indent
-	and escaped &lt; brackets</pre>
-
-Normal text after code block
-HTML;
-
-
-		$this->assertContains($expected, $result, 'Custom code blocks with ::: prefix');		
-		
-		$expected = <<<HTML
-<pre>
-code block
-without formatting prefix</pre>
-HTML;
-		$this->assertContains($expected, $result, 'Traditional markdown code blocks');
-
-		$expected = <<<HTML
-<pre class="brush: ">
-Fenced code block
-</pre>
-HTML;
-		$this->assertContains($expected, $result, 'Backtick code blocks');
-		
-		$expected = <<<HTML
-<pre class="brush: php">
-Fenced box with
-
-new lines in
-
-between
-
-content
-</pre>
-HTML;
-		$this->assertContains($expected, $result, 'Backtick with newlines');
-	}
 	
 	public function testImageRewrites() {
 		
@@ -317,7 +359,6 @@ HTML;
 		$this->assertContains('## Heading duplicate {#heading-duplicate-3}', $result);
 		
 	}
-		
 
 
 	public function testRetrieveMetaData() {
diff --git a/tests/docs-parser/en/CodeSnippets.md b/tests/docs-parser/en/CodeSnippets.md
index 2f90d3f..97312dd 100755
--- a/tests/docs-parser/en/CodeSnippets.md
+++ b/tests/docs-parser/en/CodeSnippets.md
@@ -4,3 +4,21 @@
 	<% without formatting prefix %>
 
 Paragraph with a segment of <% foo %>
+
+	code block
+
+	that has a line in it
+
+This is a yaml block
+
+	:::yaml
+	foo: bar
+
+	baz: qux
+
+This is a yaml block with tab in that new line
+
+	:::yaml
+	foo: bar
+	
+	baz: qux
\ No newline at end of file
diff --git a/tests/docs/en/test.md b/tests/docs/en/test.md
index f1104db..ff5fdbf 100755
--- a/tests/docs/en/test.md
+++ b/tests/docs/en/test.md
@@ -19,11 +19,14 @@ test
 		and tab indent
 		and escaped < brackets
 		
+
 Normal text after code block
 
 	code block
 	without formatting prefix
 
+How about fences?
+
 ```
 Fenced code block
 ```