diff --git a/client/.lostpixel/baseline/components-alert-story-vue_Info Alert.png b/client/.lostpixel/baseline/components-alert-story-vue_Info Alert.png
index 8893269..10442fa 100644
Binary files a/client/.lostpixel/baseline/components-alert-story-vue_Info Alert.png and b/client/.lostpixel/baseline/components-alert-story-vue_Info Alert.png differ
diff --git a/client/.lostpixel/baseline/components-alert-story-vue_Warning Alert.png b/client/.lostpixel/baseline/components-alert-story-vue_Warning Alert.png
index 7fdef91..44bccaf 100644
Binary files a/client/.lostpixel/baseline/components-alert-story-vue_Warning Alert.png and b/client/.lostpixel/baseline/components-alert-story-vue_Warning Alert.png differ
diff --git a/client/.lostpixel/baseline/components-dateyearmonthrange-story-vue_default.png b/client/.lostpixel/baseline/components-dateyearmonthrange-story-vue_default.png
index 937677b..0fad4d7 100644
Binary files a/client/.lostpixel/baseline/components-dateyearmonthrange-story-vue_default.png and b/client/.lostpixel/baseline/components-dateyearmonthrange-story-vue_default.png differ
diff --git a/client/.lostpixel/baseline/components-diamondtext-story-vue_1 char DiamondText.png b/client/.lostpixel/baseline/components-diamondtext-story-vue_1 char DiamondText.png
index 7f365c1..82dd1e8 100644
Binary files a/client/.lostpixel/baseline/components-diamondtext-story-vue_1 char DiamondText.png and b/client/.lostpixel/baseline/components-diamondtext-story-vue_1 char DiamondText.png differ
diff --git a/client/.lostpixel/baseline/components-diamondtext-story-vue_2 chars DiamondText.png b/client/.lostpixel/baseline/components-diamondtext-story-vue_2 chars DiamondText.png
index 50706d7..6c127e1 100644
Binary files a/client/.lostpixel/baseline/components-diamondtext-story-vue_2 chars DiamondText.png and b/client/.lostpixel/baseline/components-diamondtext-story-vue_2 chars DiamondText.png differ
diff --git a/client/.lostpixel/baseline/components-diamondtext-story-vue_3 chars DiamondText.png b/client/.lostpixel/baseline/components-diamondtext-story-vue_3 chars DiamondText.png
index e521e67..7dd27bb 100644
Binary files a/client/.lostpixel/baseline/components-diamondtext-story-vue_3 chars DiamondText.png and b/client/.lostpixel/baseline/components-diamondtext-story-vue_3 chars DiamondText.png differ
diff --git a/client/.lostpixel/baseline/components-footer-story-vue_Footer.png b/client/.lostpixel/baseline/components-footer-story-vue_Footer.png
index aef2bd6..0437e8c 100644
Binary files a/client/.lostpixel/baseline/components-footer-story-vue_Footer.png and b/client/.lostpixel/baseline/components-footer-story-vue_Footer.png differ
diff --git a/client/.lostpixel/baseline/components-rfccard-story-vue_default.png b/client/.lostpixel/baseline/components-rfccard-story-vue_default.png
index 174c82b..66b94dc 100644
Binary files a/client/.lostpixel/baseline/components-rfccard-story-vue_default.png and b/client/.lostpixel/baseline/components-rfccard-story-vue_default.png differ
diff --git a/client/.lostpixel/baseline/components-rfcdocument-story-vue_default.png b/client/.lostpixel/baseline/components-rfcdocument-story-vue_default.png
index 016b8ae..8155efa 100644
Binary files a/client/.lostpixel/baseline/components-rfcdocument-story-vue_default.png and b/client/.lostpixel/baseline/components-rfcdocument-story-vue_default.png differ
diff --git a/client/.lostpixel/baseline/components-rfctabs-story-vue_Has errata.png b/client/.lostpixel/baseline/components-rfctabs-story-vue_Has errata.png
index 005e717..ebf5995 100644
Binary files a/client/.lostpixel/baseline/components-rfctabs-story-vue_Has errata.png and b/client/.lostpixel/baseline/components-rfctabs-story-vue_Has errata.png differ
diff --git a/client/.lostpixel/baseline/components-searchfilter-story-vue_default.png b/client/.lostpixel/baseline/components-searchfilter-story-vue_default.png
index 530b3e7..1a8ea9e 100644
Binary files a/client/.lostpixel/baseline/components-searchfilter-story-vue_default.png and b/client/.lostpixel/baseline/components-searchfilter-story-vue_default.png differ
diff --git a/client/.lostpixel/baseline/components-tag-story-vue_Tag - Longest title.png b/client/.lostpixel/baseline/components-tag-story-vue_Tag - Longest title.png
index 7c3f8f9..6777de2 100644
Binary files a/client/.lostpixel/baseline/components-tag-story-vue_Tag - Longest title.png and b/client/.lostpixel/baseline/components-tag-story-vue_Tag - Longest title.png differ
diff --git a/client/.lostpixel/baseline/components-tag-story-vue_Tag - longer title.png b/client/.lostpixel/baseline/components-tag-story-vue_Tag - longer title.png
index 88c78bb..6611ad5 100644
Binary files a/client/.lostpixel/baseline/components-tag-story-vue_Tag - longer title.png and b/client/.lostpixel/baseline/components-tag-story-vue_Tag - longer title.png differ
diff --git a/client/.lostpixel/baseline/components-tag-story-vue_Tag - normal title.png b/client/.lostpixel/baseline/components-tag-story-vue_Tag - normal title.png
index de9ef47..c29822e 100644
Binary files a/client/.lostpixel/baseline/components-tag-story-vue_Tag - normal title.png and b/client/.lostpixel/baseline/components-tag-story-vue_Tag - normal title.png differ
diff --git a/client/.lostpixel/baseline/components-tag-story-vue_Tag - short title.png b/client/.lostpixel/baseline/components-tag-story-vue_Tag - short title.png
index a53683b..56594d1 100644
Binary files a/client/.lostpixel/baseline/components-tag-story-vue_Tag - short title.png and b/client/.lostpixel/baseline/components-tag-story-vue_Tag - short title.png differ
diff --git a/client/.lostpixel/baseline/tailwind_Full Config.png b/client/.lostpixel/baseline/tailwind_Full Config.png
index cc94a9c..e981764 100644
Binary files a/client/.lostpixel/baseline/tailwind_Full Config.png and b/client/.lostpixel/baseline/tailwind_Full Config.png differ
diff --git a/client/components/Alert.story.vue b/client/components/Alert.story.vue
index 77876db..b6dbae6 100644
--- a/client/components/Alert.story.vue
+++ b/client/components/Alert.story.vue
@@ -9,14 +9,14 @@
   >
     <Variant title="Warning Alert" theme="light">
       <Alert variant="warning" heading="This alert is a warning">
-        <p class="text-sm">
+        <p class="text-base">
           For more information, please refer to the documentation
         </p>
       </Alert>
     </Variant>
     <Variant title="Info Alert">
       <Alert variant="info" heading="This RFC is now obsolete">
-        <p class="text-sm">
+        <p class="text-base">
           For more information, please refer to the documentation
         </p>
       </Alert>
diff --git a/client/components/DateYearMonthRange.vue b/client/components/DateYearMonthRange.vue
index 2d31e42..697a52f 100644
--- a/client/components/DateYearMonthRange.vue
+++ b/client/components/DateYearMonthRange.vue
@@ -1,6 +1,6 @@
 <template>
   <fieldset>
-    <legend class="text-sm font-bold mb-1">{{ props.label }}</legend>
+    <legend class="text-base font-bold mb-1">{{ props.label }}</legend>
     <div class="flex gap-2">
       <YearMonthDropdown
         v-model="startValue"
diff --git a/client/components/DiamondText.vue b/client/components/DiamondText.vue
index 00a75ec..eeddf3a 100644
--- a/client/components/DiamondText.vue
+++ b/client/components/DiamondText.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     :class="[
-      'inline-flex flex-col justify-center items-center bg-yellow-400 dark:bg-yellow-800 text-black dark:text-white text-xs uppercase font-semibold',
+      'inline-flex flex-col justify-center items-center bg-yellow-400 dark:bg-yellow-800 text-black dark:text-white text-base uppercase font-semibold',
       {
         'w-[20px] h-[20px] [clip-path:polygon(0%_50%,_50%_0%,_50%_0%,100%_50%,50%_100%,50%_100%)]':
           props.text.length === 1,
diff --git a/client/components/Footer.vue b/client/components/Footer.vue
index 81d2404..3b55645 100644
--- a/client/components/Footer.vue
+++ b/client/components/Footer.vue
@@ -35,7 +35,7 @@
             <li
               v-for="(child, childIndex) in menuItem.children"
               :key="childIndex"
-              class="text-sm"
+              class="text-base"
             >
               <a
                 :href="child.href"
diff --git a/client/components/HeaderNavThemeDesktop.vue b/client/components/HeaderNavThemeDesktop.vue
index cc7c87b..10258e7 100644
--- a/client/components/HeaderNavThemeDesktop.vue
+++ b/client/components/HeaderNavThemeDesktop.vue
@@ -24,7 +24,7 @@
       <HeadlessListboxOptions
         class="absolute z-10 right-0 bg-white text-black dark:bg-black dark:text-white dark:border-2 mt-1 w-[10em] top-[40px] max-h-60 rounded-md py-1 shadow-lg"
       >
-        <div class="text-sm font-bold pl-4 pr-2 py-1">Select theme:</div>
+        <div class="text-base font-bold pl-4 pr-2 py-1">Select theme:</div>
         <HeadlessListboxOption
           v-for="colorPreference in colorPreferences"
           :key="colorPreference.value"
diff --git a/client/components/Heading.vue b/client/components/Heading.vue
index db6a418..f4b8518 100644
--- a/client/components/Heading.vue
+++ b/client/components/Heading.vue
@@ -51,6 +51,6 @@ const headingStyles: Record<`h${Props['level']}`, string> = {
   h3: 'text-xl font-bold',
   h4: 'text-lg font-bold',
   h5: 'text-base font-bold',
-  h6: 'text-xs font-bold'
+  h6: 'text-base font-bold'
 }
 </script>
diff --git a/client/components/RFCCard.vue b/client/components/RFCCard.vue
index c622ffc..2f074b0 100644
--- a/client/components/RFCCard.vue
+++ b/client/components/RFCCard.vue
@@ -20,7 +20,7 @@
     </div>
     <ul
       v-if="props.body"
-      class="hidden lg:block text-sm text-blue-900 dark:text-white"
+      class="hidden lg:block text-base text-blue-900 dark:text-white"
     >
       <li v-for="(part, index) in props.body" :key="index" class="inline">
         <GraphicsDiamond v-if="index > 0" />{{ part }}
@@ -28,7 +28,7 @@
     </ul>
     <ul
       v-if="props.footer"
-      class="hidden lg:block text-xs text-gray-800 mt-1 dark:text-white"
+      class="hidden lg:block text-base text-gray-800 mt-1 dark:text-white"
     >
       <li v-for="(part, index) in props.footer" :key="index" class="inline">
         <GraphicsDiamond v-if="index > 0" />{{ part }}
@@ -41,7 +41,7 @@
           type="button"
           :aria-expanded="isMobileAbstractOpen"
           :aria-controls="abstractDomId"
-          class="relative z-50 text-blue-800 dark:text-blue-100 underline text-sm p-3 -left-3 -top-3 -mb-3"
+          class="relative z-50 text-blue-800 dark:text-blue-100 underline text-base p-3 -left-3 -top-3 -mb-3"
           @click="isMobileAbstractOpen = !isMobileAbstractOpen"
         >
           <template v-if="isMobileAbstractOpen">Hide abstract</template>
@@ -80,7 +80,7 @@
     <p
       v-if="props.redNote"
       :class="[
-        'text-red-700 dark:text-red-300 text-xs',
+        'text-red-700 dark:text-red-300 text-base',
         isMobileAbstractOpen && 'mt-2'
       ]"
     >
diff --git a/client/components/RFCDocumentBody.vue b/client/components/RFCDocumentBody.vue
index 0207d79..71e0ac0 100644
--- a/client/components/RFCDocumentBody.vue
+++ b/client/components/RFCDocumentBody.vue
@@ -61,7 +61,7 @@
     <div v-if="props.errata">
       <button
         type="button"
-        class="text-sm underline text-blue-300 dark:text-blue-100 p-2"
+        class="text-base underline text-blue-300 dark:text-blue-100 p-2"
         @click="gotoErrata"
       >
         {{ props.errata.length }}
@@ -77,7 +77,7 @@
     variant="warning"
     heading="This RFC is now obsolete"
   >
-    <p class="text-sm">
+    <p class="text-base">
       For more information, please refer to
       <a :href="`/info/${props.obsoletedBy}`"
         >{{ obsoletedByRFCId.type }} {{ obsoletedByRFCId.number }}
@@ -91,7 +91,7 @@
     variant="info"
     heading="This RFC updates the following RFC:"
   >
-    <p class="text-sm">
+    <p class="text-base">
       See also
       <a href="/info/rfc9052"
         >RFC 9052 CBOR Object Signing and Encryption (COSE): Structures and
@@ -103,7 +103,7 @@
   <div
     v-for="(page, index) in props.pagesHtml"
     :key="index"
-    class="mt-10 text-[9px] sm:text-xs lg:text-sm"
+    class="mt-10 text-[9px] sm:text-base lg:text-base"
   >
     <div class="font-mono whitespace-pre-wrap px-3 xs:px-0" v-html="page" />
   </div>
diff --git a/client/components/SearchFilterSelect.vue b/client/components/SearchFilterSelect.vue
index 95f3fa9..f9c3b7e 100644
--- a/client/components/SearchFilterSelect.vue
+++ b/client/components/SearchFilterSelect.vue
@@ -1,9 +1,9 @@
 <template>
   <label>
-    <span class="text-sm font-bold block mb-1">{{ props.label }}</span>
+    <span class="text-base font-bold block mb-1">{{ props.label }}</span>
     <select
       v-model="value"
-      class="clear-both text-sm bg-white text-black dark:bg-black dark:text-white dark:border"
+      class="clear-both text-base bg-white text-black dark:bg-black dark:text-white dark:border"
     >
       <option
         v-for="([itemValue, itemLabel], itemIndex) in props.options"
diff --git a/client/components/SearchFilterStatuses.vue b/client/components/SearchFilterStatuses.vue
index e632f3f..f3efee4 100644
--- a/client/components/SearchFilterStatuses.vue
+++ b/client/components/SearchFilterStatuses.vue
@@ -1,12 +1,12 @@
 <template>
   <fieldset>
-    <legend class="text-sm font-bold mb-2">Status</legend>
+    <legend class="text-base font-bold mb-2">Status</legend>
     <ul class="grid-cols-2 grid gap-1 lg:w-3/4">
       <li
         v-for="(statusLabel, statusValue, statusIndex) in Statuses"
         :key="statusIndex"
       >
-        <label class="text-sm cursor-pointer">
+        <label class="text-base cursor-pointer">
           <input
             class="mr-2"
             type="checkbox"
diff --git a/client/components/SearchMobileFilter.vue b/client/components/SearchMobileFilter.vue
index 796feca..9f59cf3 100644
--- a/client/components/SearchMobileFilter.vue
+++ b/client/components/SearchMobileFilter.vue
@@ -49,7 +49,7 @@
   <div>
     <button
       type="button"
-      class="flex gap-1 bg-white text-black dark:bg-black dark:text-white text-xs p-3"
+      class="flex gap-1 bg-white text-black dark:bg-black dark:text-white text-base p-3"
       @click="isOpen = true"
     >
       <GraphicsFilter />
diff --git a/client/components/Tag.vue b/client/components/Tag.vue
index 76b74a5..a587776 100644
--- a/client/components/Tag.vue
+++ b/client/components/Tag.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     :class="[
-      'pointer-events-none inline-flex items-center bg-blue-200 dark:bg-blue-800 text-white text-xs uppercase font-semibold',
+      'pointer-events-none inline-flex items-center bg-blue-400 dark:bg-blue-800 text-white text-base uppercase font-semibold',
       props.class,
       {
         '[clip-path:polygon(0%_50%,_6%_0%,_96%_0%,100%_50%,96%_100%,6%_100%)]':
@@ -35,7 +35,7 @@
         </template>
       </span>
       <span
-        class="bg-yellow-400 dark:bg-yellow-700 dark:text-white text-black pl-2 pr-5 py-2"
+        class="bg-yellow-200 dark:bg-yellow-700 dark:text-white text-black pl-2 pr-5 py-2"
       >
         <template v-if="typeof props.text[1] === 'string'">
           {{ props.text[1] }}
diff --git a/client/components/YearMonthDropdown.vue b/client/components/YearMonthDropdown.vue
index a4eb9de..50effcd 100644
--- a/client/components/YearMonthDropdown.vue
+++ b/client/components/YearMonthDropdown.vue
@@ -3,7 +3,7 @@
     <span class="sr-only">{{ props.label }}</span>
     <select
       v-model="value"
-      class="text-sm bg-white text-black dark:bg-black dark:text-white dark:border"
+      class="text-base bg-white text-black dark:bg-black dark:text-white dark:border"
       :title="props.label"
     >
       <option value="" :disabled="isDisabled" class="text-gray-700">
diff --git a/client/pages/index.vue b/client/pages/index.vue
index 9399026..6a9d2cd 100644
--- a/client/pages/index.vue
+++ b/client/pages/index.vue
@@ -11,7 +11,7 @@
           <Heading level="2" has-icon class="text-left mt-10 pl-5 md:pl-0">
             Latest RFCs
           </Heading>
-          <p class="hidden mt-8 lg:block text-sm text-grey-800 pl-5">
+          <p class="hidden mt-8 lg:block text-base text-grey-800 pl-5">
             Looking for works in progress? Go to
             <a
               href="https://datatracker.ietf.org/"
diff --git a/client/pages/search.vue b/client/pages/search.vue
index fc3c5cf..dccc595 100644
--- a/client/pages/search.vue
+++ b/client/pages/search.vue
@@ -38,11 +38,11 @@
               </template>
             </Heading>
             <div class="hidden lg:block">
-              <label class="text-sm">
+              <label class="text-base">
                 <span>Sort by</span>
                 <select
                   v-model="searchStore.orderBy"
-                  class="text-sm ml-2 bg-white text-black dark:bg-black dark:text-white dark:border"
+                  class="text-base ml-2 bg-white text-black dark:bg-black dark:text-white dark:border"
                 >
                   <option value="lowest">RFC no. (Lowest first)</option>
                   <option value="highest">RFC no. (Highest first)</option>
diff --git a/client/tailwind.config.js b/client/tailwind.config.js
index 6e8768d..45d4ef1 100644
--- a/client/tailwind.config.js
+++ b/client/tailwind.config.js
@@ -17,7 +17,11 @@ export default {
           950: '#00101C'
         },
         yellow: {
+          100: '#FFEE66',
+          200: '#FFE459',
           400: '#FFD13E',
+          500: '#E2B72A',
+          600: '#C49C15',
           750: '#A78201'
         }
       }