diff --git a/internal/util/util.go b/internal/util/util.go
new file mode 100644
index 0000000..abf4272
--- /dev/null
+++ b/internal/util/util.go
@@ -0,0 +1,19 @@
+package util
+
+import (
+	"html/template"
+	"strings"
+)
+
+func EnrichPost(body string) string {
+	lines := strings.Split(body, "\n")
+	for i, line := range lines {
+		if strings.HasPrefix(line, ">") {
+			escaped := template.HTMLEscapeString(line)
+			lines[i] = `<span class="greentext">` + escaped + `</span>`
+		} else {
+			lines[i] = template.HTMLEscapeString(line)
+		}
+	}
+	return strings.Join(lines, "<br />")
+}
diff --git a/web/static/index.css b/web/static/index.css
index 1545d25..06ab7bb 100644
--- a/web/static/index.css
+++ b/web/static/index.css
@@ -55,6 +55,7 @@ body {
 #catalog {
     display: flex;
     margin: 2rem;
+    flex-wrap: wrap;
 }
 
 .catalog-preview {
@@ -62,8 +63,7 @@ body {
     text-align: center;
     padding: 10px;
     border: 2px solid rgba(111, 111, 111, 0.34);
-    min-width: 140px;
-    max-width: 200px;
+    width: 200px;
     max-height: 192px;
 }
 
@@ -187,6 +187,10 @@ body {
     margin-bottom: 10px;
 }
 
+.greentext {
+    color: #789922
+}
+
 /* GENERAL LAYOUT */
 
 .container {
diff --git a/web/views/thread.templ b/web/views/thread.templ
index 2800695..e29cb5c 100644
--- a/web/views/thread.templ
+++ b/web/views/thread.templ
@@ -3,6 +3,7 @@ package views
 import (
 	"fmt"
 	"github.com/dominicf2001/comfychan/internal/database"
+	"github.com/dominicf2001/comfychan/internal/util"
 	"github.com/dominicf2001/comfychan/web/views/shared"
 	"strconv"
 )
@@ -21,7 +22,9 @@ templ ThreadPosts(posts []database.Post) {
 				<span class="post-time">{ post.CreatedAt.Format("15:04") }</span>
 				<span class="post-num">No. { strconv.Itoa(post.Id) }</span>
 			</header>
-			<p>{ post.Body }</p>
+			<p>
+				@templ.Raw(util.EnrichPost(post.Body))
+			</p>
 		</article>
 		<br/>
 	}
@@ -71,7 +74,9 @@ templ Thread(board database.Board, thread database.Thread, posts []database.Post
 					<span class="post-time">{ posts[0].CreatedAt.Format("15:04") }</span>
 					<span class="post-num">No. { strconv.Itoa(posts[0].Id) }</span>
 				</header>
-				<p class="post-body">{ posts[0].Body }</p>
+				<p class="post-body">
+					@templ.Raw(util.EnrichPost(posts[0].Body))
+				</p>
 			</article>
 			<div hx-get={ fmt.Sprintf("/hx/%s/threads/%d/posts", board.Slug, thread.Id) } hx-trigger="refreshPosts from:body">
 				@ThreadPosts(posts[1:])
diff --git a/web/views/threads.templ b/web/views/threads.templ
index c9aa906..812f6d7 100644
--- a/web/views/threads.templ
+++ b/web/views/threads.templ
@@ -1,6 +1,7 @@
 package views
 
 import "fmt"
+import "github.com/dominicf2001/comfychan/internal/util"
 
 type CatalogThreadPreview struct {
 	Subject   string
@@ -17,7 +18,9 @@ templ ThreadsCatalog(previews []CatalogThreadPreview) {
 					<img class="catalog-preview-img" src={ fmt.Sprintf("/static/img/posts/%s", preview.MediaPath) }/>
 				</a>
 				<h1><a href={ templ.SafeURL(preview.ThreadURL) } class="catalog-preview-link">{ preview.Subject }</a></h1>
-				<p>{ preview.Body }</p>
+				<p>
+					@templ.Raw(util.EnrichPost(preview.Body))
+				</p>
 			</div>
 		}
 	</div>