diff --git a/src/General/Build.coffee b/src/General/Build.coffee
index bdf279bc7..8292089fc 100644
--- a/src/General/Build.coffee
+++ b/src/General/Build.coffee
@@ -223,21 +223,6 @@ Build =
     root.dataset.fullID = thread.fullID
     $.addClass root, thread.OP.highlights... if thread.OP.highlights
 
-    for quote in $$ '.quotelink', root.lastElementChild
-      href = quote.getAttribute 'href'
-      quote.href = "/#{thread.board}/thread/#{thread.ID}" + href if href[0] is '#'
-
-    for exif in $$ '.abbr, .exif', root.lastElementChild
-      $.rm exif
-
-    for pp in $$ '.prettyprint', root.lastElementChild
-      cc = $.el 'span', className: 'catalog-code'
-      $.add cc, [pp.childNodes...]
-      $.replace pp, cc
-
-    for br in $$ 'br', root.lastElementChild when br.previousSibling?.nodeName is 'BR'
-      $.rm br
-
     if thread.isSticky
       $.add $('.catalog-icons', root), $.el 'img',
         src: "#{staticPath}sticky#{gifIcon}"
diff --git a/src/css/style.css b/src/css/style.css
index 69d76d3f1..daf076576 100644
--- a/src/css/style.css
+++ b/src/css/style.css
@@ -801,10 +801,24 @@ div[data-checked="false"] > .suboption-list {
 .board_tg .catalog-thread > .comment > b {
   font-weight: normal;
 }
-.catalog-code {
-  background-color: #FFF;
-  display: inline-block;
+.catalog-thread .prettyprinted {
   max-width: 100%;
+  box-sizing: border-box;
+}
+.catalog-thread table.exif {
+  border-collapse: collapse;
+}
+.catalog-thread table.exif[style*="display: block;"] {
+  display: inline-block !important;
+}
+.catalog-thread table.exif, .catalog-thread table.exif > tbody {
+  background-color: inherit;
+}
+.catalog-thread table.exif, .catalog-thread table.exif td {
+  min-width: 0;
+}
+.catalog-thread table.exif td {
+  padding-top: 1px;
 }
 :root.hats-enabled .catalog-thread::after {
   content: '';