diff --git a/src/General/Build.coffee b/src/General/Build.coffee
index 6442f7891..d4ae3e130 100755
--- a/src/General/Build.coffee
+++ b/src/General/Build.coffee
@@ -329,9 +329,9 @@ Build =
       imgClass = 'no-file'
 
     thumb = if imgClass
-      <%= html('<img src="${src}" class="thumb ${imgClass}">') %>
+      <%= html('<img src="${src}" class="catalog-thumb ${imgClass}">') %>
     else
-      <%= html('<img src="${src}" class="thumb" width="${imgWidth}" height="${imgHeight}">') %>
+      <%= html('<img src="${src}" class="catalog-thumb" width="${imgWidth}" height="${imgHeight}">') %>
 
     postCount = data.replies + 1
     fileCount = data.images  + !!data.ext
@@ -348,9 +348,9 @@ Build =
       '<a href="/${thread.board}/thread/${thread.ID}">' +
         '&{thumb}' +
       '</a>' +
-      '<div class="thread-stats" title="Post count / File count / Page count">' +
+      '<div class="catalog-stats" title="Post count / File count / Page count">' +
         '<span class="post-count">${postCount}</span> / <span class="file-count">${fileCount}</span> / <span class="page-count">${pageCount}</span>' +
-        '<span class="thread-icons"></span>' +
+        '<span class="catalog-icons"></span>' +
       '</div>' +
       '&{subject}' +
       '<div class="comment">&{thread.OP.info.commentHTML}</div>'
@@ -368,12 +368,12 @@ Build =
       $.rm br
 
     if thread.isSticky
-      $.add $('.thread-icons', root), $.el 'img',
+      $.add $('.catalog-icons', root), $.el 'img',
         src: "#{staticPath}sticky#{gifIcon}"
         className: 'stickyIcon'
         title: 'Sticky'
     if thread.isClosed
-      $.add $('.thread-icons', root), $.el 'img',
+      $.add $('.catalog-icons', root), $.el 'img',
         src: "#{staticPath}closed#{gifIcon}"
         className: 'closedIcon'
         title: 'Closed'
diff --git a/src/General/css/style.css b/src/General/css/style.css
index fc4a27fc7..18c09679e 100755
--- a/src/General/css/style.css
+++ b/src/General/css/style.css
@@ -502,7 +502,9 @@ hr + div.center:not(.ad-cnt):not(.topad):not(.middlead):not(.bottomad) {
 .summary {
   text-decoration: none;
 }
-.catalog-mode .board {
+
+/* Catalog */
+:root.catalog-mode .board {
   text-align: center;
 }
 .catalog-thread {
@@ -520,43 +522,43 @@ hr + div.center:not(.ad-cnt):not(.topad):not(.middlead):not(.bottomad) {
   flex-shrink: 0;
   position: relative;
 }
-.thumb {
+.catalog-thumb {
   max-width: 150px;
   max-height: 150px;
   border-radius: 2px;
   box-shadow: 0 0 5px rgba(0, 0, 0, .25);
 }
-.thumb:not(.deleted-file):not(.no-file) {
+.catalog-thumb:not(.deleted-file):not(.no-file) {
   min-width: 30px;
   min-height: 30px;
 }
-.thumb.spoiler-file {
+.catalog-thumb.spoiler-file {
   width: 100px;
   height: 100px;
 }
-.thumb.deleted-file {
+.catalog-thumb.deleted-file {
   width: 127px;
   height: 13px;
   padding: 20px 11px;
 }
-.thumb.no-file {
+.catalog-thumb.no-file {
   width: 77px;
   height: 13px;
   padding: 20px 36px;
 }
-.thread-icons > img,
-.catalog-thread > .thread-stats > .menu-button {
+.catalog-icons > img,
+.catalog-stats > .menu-button {
   width: 1em;
   height: 1em;
   margin: 0;
   vertical-align: text-top;
 }
-.catalog-thread > .thread-stats > .menu-button {
+.catalog-stats > .menu-button {
   text-align: center;
   bottom: 1px;
   font-weight: normal;
 }
-.thread-stats {
+.catalog-stats {
   flex-shrink: 0;
   cursor: help;
   font-size: 10px;
@@ -831,7 +833,7 @@ span.hide-announcement {
 }
 /* Werk Tyme */
 :root.werkTyme .postContainer:not(.noFile) .fileThumb,
-:root.werkTyme .thumb:not(.deleted-file):not(.no-file),
+:root.werkTyme .catalog-thumb:not(.deleted-file):not(.no-file),
 :root:not(.werkTyme) .werkTyme-filename {
   display: none;
 }
@@ -863,8 +865,8 @@ span.hide-announcement {
 .filter-highlight > .reply {
   box-shadow: -5px 0 rgba(255, 0, 0, .5);
 }
-.pinned .thumb,
-.filter-highlight .thumb {
+.pinned .catalog-thumb,
+.filter-highlight .catalog-thumb {
   border: 2px solid rgba(255, 0, 0, .5);
 }
 
diff --git a/src/General/lib/catalogthread.class b/src/General/lib/catalogthread.class
index 2942a5eb6..0ae4a65b6 100644
--- a/src/General/lib/catalogthread.class
+++ b/src/General/lib/catalogthread.class
@@ -7,9 +7,9 @@ class CatalogThread
     @board = @thread.board
     @nodes =
       root: root
-      thumb:     $ '.thumb',        root
-      icons:     $ '.thread-icons', root
-      postCount: $ '.post-count',   root
-      fileCount: $ '.file-count',   root
-      pageCount: $ '.page-count',   root
+      thumb:     $ '.catalog-thumb', root
+      icons:     $ '.catalog-icons', root
+      postCount: $ '.post-count',    root
+      fileCount: $ '.file-count',    root
+      pageCount: $ '.page-count',    root
     @thread.catalogView = @