diff --git a/View/Pastes/view.ctp b/View/Pastes/view.ctp
index 63cc043..b142ce7 100755
--- a/View/Pastes/view.ctp
+++ b/View/Pastes/view.ctp
@@ -1,8 +1,8 @@
 <div class="paste paste-view">
 	<div class="row">
 		<div class="columns nine">
-			<div class="code body" lang="<?php echo h($paste['Paste']['lang']); ?>">
-				<?php echo $this->Geshi->highlightText($paste['Paste']['body'], $paste['Paste']['lang']);?>
+			<div class="code-body" lang="<?php echo h($paste['Paste']['lang']); ?>">
+				<?php echo $this->Geshi->highlightAsTable($paste['Paste']['body'], $paste['Paste']['lang']);?>
 			</div>
 		</div>
 		<div class="columns three">
diff --git a/webroot/css/geshi.css b/webroot/css/geshi.css
index 64faa97..4d0c52c 100644
--- a/webroot/css/geshi.css
+++ b/webroot/css/geshi.css
@@ -1,37 +1,52 @@
 /**
  * Code previews
  */
+.code-body {
+	overflow-x: auto;
+	margin: 20px 0;
+	border-radius: 5px;
+	border: 1px solid #ccc;
+}
+
 .code {
+	background: rgb(235, 235, 235);
+	border: none;
 	font-family: Monaco, "Bitstream Vera Sans Mono", Courier, monospaced;
-	margin: 20px 0;
-	line-height: 20px;
 	font-size: 12px;
+	line-height: 20px;
 	padding: 0;
-	background: rgb(235, 235, 235);
+	margin: 0;
 	white-space:normal;
-	position: relative;
-	border-radius: 5px;
+	width: 100%;
 }
-.code ol {
-	list-style: decimal;
-	list-style-position: outside;
+.code-block {
 	padding: 0;
+}
+
+.code-numbers {
 	margin: 0;
+	padding: 0;
+	text-align: right;
+	border-right: 1px solid rgb(220, 220, 210);
+}
+
+/** lines have .de1 */
+.code .de1 {
+	background: rgb(235, 235, 235);
 }
-.code ol li {
+.code-numbers .de1 {
+	padding: 0 4px;
+}
+
+.code-block .de1 {
 	background: rgb(250, 250, 248);
-	margin: 0 0 0 42px;
-	padding: 0 0 0 5px;
 	color: #000;
-	clear: none;
-	list-style: decimal;
 	white-space:pre;
 	line-height: 18px;
 	height: 18px;
+	padding: 0 0 0 4px;
 }
-.code ol li div {
-	color:#000;
-}
+
 
 /* comments */
 .co1,