diff --git a/src/General/Index.coffee b/src/General/Index.coffee
index bcdf4530b..cd728002c 100644
--- a/src/General/Index.coffee
+++ b/src/General/Index.coffee
@@ -755,6 +755,8 @@ Index =
       if thread.nodes.placeholder
         $.replace thread.nodes.placeholder, thread.OP.nodes.root
         thread.nodes.placeholder = null
+        $.rmClass thread.OP.nodes.root, 'catalog-postContainer'
+        $.rmClass thread.OP.nodes.post, 'catalog-post'
       if (file = thread.OP.file) and (thumb = thread.OP.file.thumb) and thumb.dataset.src
         thumb.src = thumb.dataset.src
         # XXX https://bugzilla.mozilla.org/show_bug.cgi?id=1021289
@@ -775,6 +777,8 @@ Index =
         thread.nodes.placeholder = $.el 'div'
         $.replace thread.OP.nodes.root, thread.nodes.placeholder
         $.add thread.catalogView.nodes.root, thread.OP.nodes.root
+        $.addClass thread.OP.nodes.root, 'catalog-postContainer'
+        $.addClass thread.OP.nodes.post, 'catalog-post'
       nodes.push thread.catalogView.nodes.root
     $.add Index.root, nodes
     if doc.contains Index.root
diff --git a/src/classes/Post.Clone.coffee b/src/classes/Post.Clone.coffee
index 6599128d3..97a520adf 100644
--- a/src/classes/Post.Clone.coffee
+++ b/src/classes/Post.Clone.coffee
@@ -29,6 +29,8 @@ Post.Clone = class extends Post
     $.rmClass @nodes.post, 'highlight' # keybind navigation, ID highlighting
 
     # Remove catalog stuff.
+    $.rmClass @nodes.root, 'catalog-postContainer'
+    $.rmClass @nodes.post, 'catalog-post'
     $.rm $('.catalog-link', @nodes.post)
     $.rm $('.catalog-stats', @nodes.post)
     $.rm $('.catalog-replies', @nodes.post)
diff --git a/src/css/burichan.css b/src/css/burichan.css
index a028b90df..937675b3f 100644
--- a/src/css/burichan.css
+++ b/src/css/burichan.css
@@ -31,12 +31,12 @@
 }
 
 /* Catalog */
-:root.burichan .catalog-thread > .postContainer:hover > .post {
+:root.burichan .catalog-postContainer:hover > .post {
   background-color: #D6DAF0;
 }
 :root.burichan.werkTyme .catalog-thread:not(:hover),
-:root.burichan .catalog-thread > .postContainer:hover > .post,
-:root.burichan .catalog-thread > .postContainer:hover .catalog-reply {
+:root.burichan .catalog-postContainer:hover > .post,
+:root.burichan .catalog-postContainer:hover .catalog-reply {
   border-color: #B7C5D9;
 }
 
diff --git a/src/css/futaba.css b/src/css/futaba.css
index 708ff66f2..45b731d1b 100644
--- a/src/css/futaba.css
+++ b/src/css/futaba.css
@@ -31,12 +31,12 @@
 }
 
 /* Catalog */
-:root.futaba .catalog-thread > .postContainer:hover > .post {
+:root.futaba .catalog-postContainer:hover > .post {
   background-color: #F0E0D6;
 }
 :root.futaba.werkTyme .catalog-thread:not(:hover),
-:root.futaba .catalog-thread > .postContainer:hover > .post,
-:root.futaba .catalog-thread > .postContainer:hover .catalog-reply {
+:root.futaba .catalog-postContainer:hover > .post,
+:root.futaba .catalog-postContainer:hover .catalog-reply {
   border-color: #D9BFB7;
 }
 
diff --git a/src/css/photon.css b/src/css/photon.css
index b0ed2b9c2..c62285707 100644
--- a/src/css/photon.css
+++ b/src/css/photon.css
@@ -31,12 +31,12 @@
 }
 
 /* Catalog */
-:root.photon .catalog-thread > .postContainer:hover > .post {
+:root.photon .catalog-postContainer:hover > .post {
   background-color: #DDD;
 }
 :root.photon.werkTyme .catalog-thread:not(:hover),
-:root.photon .catalog-thread > .postContainer:hover > .post,
-:root.photon .catalog-thread > .postContainer:hover .catalog-reply {
+:root.photon .catalog-postContainer:hover > .post,
+:root.photon .catalog-postContainer:hover .catalog-reply {
   border-color: #CCC;
 }
 :root.photon .catalog-code {
diff --git a/src/css/style.css b/src/css/style.css
index 2cfb81840..a8b65f31a 100644
--- a/src/css/style.css
+++ b/src/css/style.css
@@ -722,45 +722,47 @@ div[data-checked="false"] > .suboption-list {
 div.catalog-thread {
   margin: 4px;
 }
-.catalog-small .catalog-thread {
+.catalog-small > .catalog-thread {
   width: 165px;
   height: 320px;
 }
-.catalog-large .catalog-thread {
+.catalog-large > .catalog-thread {
   width: 270px;
   height: 410px;
 }
-.catalog-thread > .postContainer {
+.catalog-postContainer {
   position: absolute;
   top: -4px;
   left: 0;
   right: 0;
   bottom: 0;
 }
-.catalog-thread > .postContainer:not(:hover) {
+.catalog-postContainer:not(:hover) {
   overflow: hidden;
 }
-.catalog-thread > .postContainer:hover {
+.catalog-postContainer:hover {
   z-index: 1;
 }
-.catalog-thread .post {
+.catalog-post {
   position: absolute;
   top: 4px;
   left: 0;
   right: 0;
-  margin: -21px -1px -1px;
   border: 1px solid transparent;
   padding-top: 20px;
 }
-.catalog-thread.noFile .post {
+div.catalog-post {
+  margin: -21px -1px -1px;
+}
+.catalog-thread.noFile > * > .catalog-post {
   margin-top: -7px;
   padding-top: 6px;
 }
-.catalog-thread > .postContainer:hover > .post {
+.catalog-postContainer:hover > .catalog-post {
   margin-left: -61px;
   margin-right: -61px;
 }
-.catalog-thread > .postContainer:hover > .post > :not(.catalog-replies) {
+.catalog-postContainer:hover > * > :not(.catalog-replies) {
   padding-left: 2px;
   padding-right: 2px;
 }
@@ -809,57 +811,58 @@ div.catalog-thread {
 .catalog-stats > [title] {
   cursor: help;
 }
-.catalog-thread .postMessage {
+.catalog-post > .postMessage {
   margin: 0;
   padding-bottom: .3em;
 }
-#delform .catalog-thread > .postContainer:not(:hover) .file,
-#delform .catalog-thread > .postContainer:not(:hover) .postInfo > :not(.subject),
-#delform .catalog-thread > .postContainer > :not(.post),
-#delform .catalog-thread .file > :not(.fileText),
-#delform .catalog-thread .file > .fileText > :not(:first-child),
-#delform .catalog-thread .postInfo > :not(.subject):not(.nameBlock):not(.dateTime),
-#delform .catalog-thread .posteruid,
-.thread:not(.catalog-thread) .catalog-link,
-.thread:not(.catalog-thread) .catalog-stats,
-.thread:not(.catalog-thread) .catalog-replies,
-.catalog-thread > .postContainer:not(:hover) .catalog-replies {
+.catalog-postContainer:not(:hover) > * > .file,
+.catalog-postContainer:not(:hover) > * > .postInfo > :not(.subject),
+.catalog-postContainer:not(:hover) > * > .catalog-replies,
+.catalog-thread > .catalog-postContainer > :not(.catalog-post),
+.catalog-post > .file > :not(.fileText),
+.catalog-post > * > .fileText > :not(:first-child),
+.catalog-post > .postInfo > :not(.subject):not(.nameBlock):not(.dateTime),
+.catalog-post > * > * > .posteruid,
+.post:not(.catalog-post) > .catalog-link,
+.post:not(.catalog-post) > .catalog-stats,
+.post:not(.catalog-post) > .catalog-replies {
   display: none;
 }
-.catalog-thread .file {
+.catalog-post > .file {
   position: absolute;
   left: 0;
   right: 0;
   top: 0;
 }
-.catalog-thread .fileText {
+.catalog-post > * > .fileText {
   min-height: 16px;
   padding: 2px;
 }
-.catalog-small .fileText {
+.catalog-small .catalog-post > * .fileText {
   font-size: 10px;
 }
-.catalog-thread .file:not(:hover) .fileText {
+.catalog-post > .file:not(:hover) > .fileText {
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
 }
-.catalog-thread .file:hover {
+.catalog-post > .file:hover {
   z-index: 2;
   background-color: inherit;
 }
-#delform .catalog-thread .postInfo {
+div.catalog-post > div.postInfo {
   width: auto;
 }
-.catalog-thread .subject {
+.catalog-post > * > .subject {
   display: block;
 }
-.catalog-thread .dateTime {
+.catalog-post > * > .dateTime {
   display: inline-block;
   font-style: italic;
 }
-.catalog-thread .postInfo > :not(.subject),
-.catalog-thread > .postContainer:hover .postMessage:not(:empty) {
+.catalog-post > * > .nameBlock,
+.catalog-post > * > .dateTime,
+.catalog-postContainer:hover > * > .postMessage:not(:empty) {
   padding-top: .3em;
 }
 .catalog-reply {
@@ -880,26 +883,28 @@ div.catalog-thread {
   overflow: hidden;
   text-overflow: ellipsis;
 }
-.catalog-thread .prettyprinted {
+.catalog-post .prettyprinted {
   max-width: 100%;
   box-sizing: border-box;
 }
-.catalog-thread .MathJax_Display {
+.catalog-post .MathJax_Display {
   text-align: center !important;
 }
-.catalog-thread table.exif {
+.catalog-post > * > .exif {
   border-collapse: collapse;
 }
-.catalog-thread table.exif[style*="display: block;"] {
+.catalog-post > * > .exif[style*="display: block;"] {
   display: inline-block !important;
 }
-.catalog-thread table.exif, .catalog-thread table.exif > tbody {
+.catalog-post > * > .exif,
+.catalog-post > * > .exif > tbody {
   background-color: inherit;
 }
-.catalog-thread table.exif, .catalog-thread table.exif td {
+.catalog-post > * > .exif,
+.catalog-post > * > .exif td {
   min-width: 0;
 }
-.catalog-thread table.exif td {
+.catalog-post > * > .exif td {
   padding-top: 1px;
 }
 :root.hats-enabled .catalog-thread::after {
@@ -908,13 +913,13 @@ div.catalog-thread {
   position: absolute;
   background-size: contain;
 }
-:root.hats-enabled .catalog-small .catalog-thread::after {
+:root.hats-enabled .catalog-small > .catalog-thread::after {
   left: -10px;
   top: -65px;
   width: 100px;
   height: 100px;
 }
-:root.hats-enabled .catalog-large .catalog-thread::after {
+:root.hats-enabled .catalog-large > .catalog-thread::after {
   left: -15px;
   top: -105px;
   width: 160px;
@@ -1083,7 +1088,7 @@ span.hide-announcement {
 :root.resurrect-quotes .deadlink {
   text-decoration: none !important;
 }
-.catalog-thread .qmark-ct {
+.catalog-post .qmark-ct {
   display: none;
 }
 .backlink.deadlink:not(.forwardlink),
diff --git a/src/css/tomorrow.css b/src/css/tomorrow.css
index ce8f17b52..0564327df 100644
--- a/src/css/tomorrow.css
+++ b/src/css/tomorrow.css
@@ -30,12 +30,12 @@
 }
 
 /* Catalog */
-:root.tomorrow .catalog-thread > .postContainer:hover > .post {
+:root.tomorrow .catalog-postContainer:hover > .post {
   background-color: #282A2E;
 }
 :root.tomorrow.werkTyme .catalog-thread:not(:hover),
-:root.tomorrow .catalog-thread > .postContainer:hover > .post,
-:root.tomorrow .catalog-thread > .postContainer:hover .catalog-reply {
+:root.tomorrow .catalog-postContainer:hover > .post,
+:root.tomorrow .catalog-postContainer:hover .catalog-reply {
   border-color: #111;
 }
 :root.tomorrow .catalog-code {
diff --git a/src/css/yotsuba-b.css b/src/css/yotsuba-b.css
index c7db08fd8..c8aa1ad18 100644
--- a/src/css/yotsuba-b.css
+++ b/src/css/yotsuba-b.css
@@ -31,12 +31,12 @@
 }
 
 /* Catalog */
-:root.yotsuba-b .catalog-thread > .postContainer:hover > .post {
+:root.yotsuba-b .catalog-postContainer:hover > .post {
   background-color: #D6DAF0;
 }
 :root.yotsuba-b.werkTyme .catalog-thread:not(:hover),
-:root.yotsuba-b .catalog-thread > .postContainer:hover > .post,
-:root.yotsuba-b .catalog-thread > .postContainer:hover .catalog-reply {
+:root.yotsuba-b .catalog-postContainer:hover > .post,
+:root.yotsuba-b .catalog-postContainer:hover .catalog-reply {
   border-color: #B7C5D9;
 }
 
diff --git a/src/css/yotsuba.css b/src/css/yotsuba.css
index b2cf55fe0..c7a775da9 100644
--- a/src/css/yotsuba.css
+++ b/src/css/yotsuba.css
@@ -31,12 +31,12 @@
 }
 
 /* Catalog */
-:root.yotsuba .catalog-thread > .postContainer:hover > .post {
+:root.yotsuba .catalog-postContainer:hover > .post {
   background-color: #F0E0D6;
 }
 :root.yotsuba.werkTyme .catalog-thread:not(:hover),
-:root.yotsuba .catalog-thread > .postContainer:hover > .post,
-:root.yotsuba .catalog-thread > .postContainer:hover .catalog-reply {
+:root.yotsuba .catalog-postContainer:hover > .post,
+:root.yotsuba .catalog-postContainer:hover .catalog-reply {
   border-color: #D9BFB7;
 }