diff --git a/.gitignore b/.gitignore
index ab9f022..4913b8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,4 +21,4 @@ CVS
 composer.lock
 .phpunit.result.cache
 tests/Site/build_testing/
-
+tests/Site/torchlight.php
diff --git a/src/BlockManager.php b/src/BlockManager.php
index ace3fc1..ca41df1 100644
--- a/src/BlockManager.php
+++ b/src/BlockManager.php
@@ -74,12 +74,13 @@ protected function renderMarkdownCapturedBlocks()
                 $id = $this->getCapturedGroup('/id="(.+?)"/', $element);
                 $classes = $this->getCapturedGroup('/class="(.+?)"/', $element);
 
-                $id = $id ? "id='$id'" : '';
+                $id = $id ? " id='$id'" : '';
+
                 // User defined classes + Torchlight classes from the API.
                 $classes = trim("$classes $block->classes");
 
                 // Build up a new element.
-                $html = "<pre><code $id class='{$classes}' style='{$block->styles}'>{$block->highlighted}</code></pre>";
+                $html = "<pre><code{$id} class='{$classes}' style='{$block->styles}'>{$block->highlighted}</code></pre>";
 
                 // Finally swap the old element for the new, highlighted one.
                 $contents = str_replace($element, $html, $contents);
diff --git a/tests/snapshots/attributes-get-carried-over.html b/tests/snapshots/attributes-get-carried-over.html
index 49a9ecd..e9c441d 100644
--- a/tests/snapshots/attributes-get-carried-over.html
+++ b/tests/snapshots/attributes-get-carried-over.html
@@ -1,7 +1,5 @@
 <p>Some text before</p>
 
-<pre><code id='id' class='language-php class' style=''>&lt;?php
-
-echo &quot;hello world&quot;;</code></pre>
+<pre><code id='id' class='language-php class torchlight' style=''><div class='line'>&lt;?php</div><div class='line'></div><div class='line'>echo &quot;hello world&quot;;</div></code></pre>
 
 <p>Some text after</p>
diff --git a/tests/snapshots/jigsaw-escapes-get-fixed.html b/tests/snapshots/jigsaw-escapes-get-fixed.html
index ed9afe0..102daac 100644
--- a/tests/snapshots/jigsaw-escapes-get-fixed.html
+++ b/tests/snapshots/jigsaw-escapes-get-fixed.html
@@ -1,8 +1,5 @@
 <p>Some text before</p>
 
-<pre><code  class='language-text' style=''>&lt;?php
-@
-{{
-{!!</code></pre>
+<pre><code class='language-text torchlight' style=''><div class='line'>&lt;?php</div><div class='line'>@</div><div class='line'>{{</div><div class='line'>{!!</div></code></pre>
 
 <p>Some text after</p>
diff --git a/tests/snapshots/non-existent-id.html b/tests/snapshots/non-existent-id.html
index 0d62129..ac70728 100644
--- a/tests/snapshots/non-existent-id.html
+++ b/tests/snapshots/non-existent-id.html
@@ -1,3 +1,3 @@
-<pre><code class="" style="" id="hello-world-1">echo &quot;hello world 1&quot;;</code></pre>
+<pre><code class="torchlight" style="" id="hello-world-1"><div class='line'>echo &quot;hello world 1&quot;;</div></code></pre>
 
 An id with no block remains: __torchlight-block-[fake_id]__
\ No newline at end of file
diff --git a/tests/snapshots/one-component.html b/tests/snapshots/one-component.html
index 09d3345..e3782c9 100644
--- a/tests/snapshots/one-component.html
+++ b/tests/snapshots/one-component.html
@@ -1 +1 @@
-<pre><code class="" style="" id="hello-world-1">echo &quot;hello world 1&quot;;</code></pre>
\ No newline at end of file
+<pre><code class="torchlight" style="" id="hello-world-1"><div class='line'>echo &quot;hello world 1&quot;;</div></code></pre>
\ No newline at end of file
diff --git a/tests/snapshots/two-components.html b/tests/snapshots/two-components.html
index bc12a88..9a6123f 100644
--- a/tests/snapshots/two-components.html
+++ b/tests/snapshots/two-components.html
@@ -1,3 +1,3 @@
-<pre><code class="" style="">echo &quot;hello world 1&quot;;</code></pre>
+<pre><code class="torchlight" style=""><div class='line'>echo &quot;hello world 1&quot;;</div></code></pre>
 
-<pre><code class="" style="">echo &quot;hello world 2&quot;;</code></pre>
\ No newline at end of file
+<pre><code class="torchlight" style=""><div class='line'>echo &quot;hello world 2&quot;;</div></code></pre>
\ No newline at end of file