diff --git a/css/bootstrap5/privatebin.css b/css/bootstrap5/privatebin.css
index 871d6b993..c8edd620a 100644
--- a/css/bootstrap5/privatebin.css
+++ b/css/bootstrap5/privatebin.css
@@ -56,10 +56,20 @@
 	transition: background-color 0.75s ease-out;
 }
 
-li.L0, li.L1, li.L2, li.L3, li.L5, li.L6, li.L7, li.L8 {
+[data-bs-theme=light] pre, [data-bs-theme=light] .card {
+	background-color: RGBA(var(--bs-light-rgb), var(--bs-bg-opacity, 1));
+}
+
+li.L0, li.L1, li.L2, li.L3, li.L4, li.L5, li.L6, li.L7, li.L8, li.L9 {
+	color: revert !important;
 	list-style-type: decimal !important;
 }
 
+[data-bs-theme=dark] li.L1, [data-bs-theme=dark] li.L3, [data-bs-theme=dark] li.L5,
+[data-bs-theme=dark] li.L7, [data-bs-theme=dark] li.L9 {
+	background-color: var(--bs-gray-dark) !important;
+}
+
 .text-right button {
 	float: right;
 }
diff --git a/tpl/bootstrap5.php b/tpl/bootstrap5.php
index dee107442..822f65b8f 100644
--- a/tpl/bootstrap5.php
+++ b/tpl/bootstrap5.php
@@ -426,8 +426,8 @@
 				<article class="row">
 					<div id="placeholder" class="col-md-12 hidden"><?php echo I18n::_('+++ no paste text +++'); ?></div>
 					<div id="attachmentPreview" class="col-md-12 text-center hidden"></div>
-					<div id="prettymessage" class="col-md-12 hidden">
-						<pre id="prettyprint" class="col-md-12 prettyprint linenums:1"></pre>
+					<div id="prettymessage" class="card col-md-12 hidden">
+						<pre id="prettyprint" class="card-body col-md-12 prettyprint linenums:1"></pre>
 					</div>
 					<div id="plaintext" class="col-md-12 hidden"></div>
 					<p class="col-md-12"><textarea id="message" name="message" cols="80" rows="25" class="form-control hidden"></textarea></p>