diff --git a/src/_includes/components/blog.njk b/src/_includes/components/blog.njk
index e3b1ee9..260a89d 100644
--- a/src/_includes/components/blog.njk
+++ b/src/_includes/components/blog.njk
@@ -1,4 +1,4 @@
-<main class="wrapper-lg stack-xl">
+<main class="stack-xl">
     <h1>{{ title }}</h1>
 
     <aside class="inverse text-center">
diff --git a/src/_includes/eventcalendar.njk b/src/_includes/eventcalendar.njk
index 1592278..9d7ecc3 100644
--- a/src/_includes/eventcalendar.njk
+++ b/src/_includes/eventcalendar.njk
@@ -2,7 +2,7 @@
 layout: "base.njk"
 ---
 
-<main class="wrapper-lg events">
+<main class="events">
     <article class="stack-lg">
         <h1 class="text-center">{{ title }}</h1>
         <div class="stack-lg">     
diff --git a/src/_includes/page.njk b/src/_includes/page.njk
index e5d545a..9f12b8d 100644
--- a/src/_includes/page.njk
+++ b/src/_includes/page.njk
@@ -3,7 +3,7 @@ layout: base.njk
 includeFA: true
 ---
 
-<main class="wrapper-lg stack-lg">
+<main class="stack-lg">
 	<h1 class="text-center">{{ title }}</h1>
 	<div class="wrapper-md stack-lg">
 		{{ content | safe }}
diff --git a/src/blogroll.html b/src/blogroll.html
index 9c87143..48a1d1f 100644
--- a/src/blogroll.html
+++ b/src/blogroll.html
@@ -2,7 +2,7 @@
 title: Blogroll
 layout: base.njk
 ---
-<main class="wrapper-lg stack-lg">
+<main class="stack-lg">
     <article>
         <h1 class="text-center">{{ title }}</h1>
         <div class="stack-lg">
diff --git a/src/css/exceptions/callout.css b/src/css/exceptions/callout.css
index 533987e..fa35430 100644
--- a/src/css/exceptions/callout.css
+++ b/src/css/exceptions/callout.css
@@ -2,7 +2,7 @@
     background-color: var(--color-callout-bg);
     border: 2px solid var(--color-callout-border);
     /* border-radius: 10px; */
-    color: var(--color-primary);
+    color: var(--color-callout-text, var(--color-primary));
     height: fit-content;
     padding: var(--space-size-2xs);
     text-align: center;
@@ -39,4 +39,10 @@
             margin: 0;
         }
     }
+
+    &[data-callout="warning"] {
+        --color-callout-bg: light-dark(var(--color-amber-400), var(--color-amber-800));
+        --color-callout-border: light-dark(var(--color-amber-600), var(--color-amber-600));
+        --color-callout-text: light-dark(var(--color-neutral-900), var(--color-neutral-200));
+    }
 }
\ No newline at end of file
diff --git a/src/saved-links.njk b/src/saved-links.njk
index b8cb240..249bb17 100644
--- a/src/saved-links.njk
+++ b/src/saved-links.njk
@@ -2,7 +2,7 @@
 title: Saved links
 layout: base.njk
 ---
-<main class="wrapper-lg stack-lg">
+<main class="stack-lg">
 <h1>{{ title }}</h1>
 
 <p>