diff --git a/README.md b/README.md
index d4e6518b..d7b17a23 100644
--- a/README.md
+++ b/README.md
@@ -277,10 +277,6 @@ paige:
       hide: false
     section:
       class: "mb-3 w-100"
-    terms:
-      hide: false
-      inner_class: "badge text-bg-secondary text-decoration-none"
-      outer_class: "mb-0 text-center"
   math: false # Enable math typesetting
   menu:
     breakpoint: "sm" # Bootstrap breakpoint at which to display all menu items
@@ -297,10 +293,6 @@ paige:
   search:
     hide_page: false
   style: ""
-  terms:
-    hide: false
-    inner_class: "badge text-bg-secondary text-decoration-none"
-    outer_class: "text-center"
   table_of_contents:
     class: "border mb-3 pe-3 ps-3 pt-3 rounded"
     hide: false
diff --git a/layouts/partials/paige/metadata.html b/layouts/partials/paige/metadata.html
index 9854aef8..e12330f4 100644
--- a/layouts/partials/paige/metadata.html
+++ b/layouts/partials/paige/metadata.html
@@ -9,7 +9,7 @@
 {{ end }}
 
 {{ $authors := partial "paige/authors.html" $page }}
-{{ $categories := cond ($page.Param "paige.terms.hide" | not) ($page.Params.categories | default slice) slice | uniq }}
+{{ $categories := $page.Params.categories | default slice | uniq }}
 {{ $commiturl := "" }}
 {{ $date := cond ($page.Param "paige.date.hide" | not) (cond (eq ($page.Param "paige.date.source" | default "published") "published") $page.PublishDate $page.Lastmod) "" }}
 {{ $dateclass := $page.Param "paige.date.class" | default "paige-date text-center text-secondary" }}
@@ -18,9 +18,7 @@
 {{ $nogap := "mb-0" }}
 {{ $readingtime := cond ($page.Param "paige.reading_time.hide" | not) $page.ReadingTime "" }}
 {{ $readingtimeclass := $page.Param "paige.reading_time.class" | default "paige-reading-time text-center text-secondary" }}
-{{ $tags := cond ($page.Param "paige.terms.hide" | not) ($page.Params.tags | default slice) slice | uniq }}
-{{ $termsinnerclass := $page.Param "paige.terms.inner_class" | default "badge paige-terms-inner text-bg-secondary text-decoration-none" }}
-{{ $termsouterclass := $page.Param "paige.terms.outer_class" | default "paige-terms-outer text-center" }}
+{{ $tags := $page.Params.tags | default slice | uniq }}
 {{ $title := $page.Title | markdownify }}
 {{ $titlelink := $page.Params.link }}
 {{ $titlepage := $page.RelPermalink }}
@@ -39,7 +37,7 @@
     {{ end }}
 
     {{ if or $categories $tags }}
-        <p {{ with $termsouterclass }} class="{{ . }}" {{ end }}>
+        <p class="paige-terms-outer text-center">
             {{ $terms := slice }}
 
             {{ range $categories }}
@@ -51,7 +49,7 @@
             {{ end }}
 
             {{ range sort $terms "name" }}
-                <a {{ with $termsinnerclass }} class="{{ . }}" {{ end }} href="{{ .url | safeURL }}">{{ .name }}</a>
+                <a class="badge paige-terms-inner text-bg-secondary text-decoration-none" href="{{ .url | safeURL }}">{{ .name }}</a>
             {{ end }}
         </p>
     {{ end }}
diff --git a/layouts/partials/paige/pages.html b/layouts/partials/paige/pages.html
index 73991d30..8006abf3 100644
--- a/layouts/partials/paige/pages.html
+++ b/layouts/partials/paige/pages.html
@@ -24,7 +24,7 @@
                 {{ end }}
                 {{ range .Pages }}
                     {{ $authors := partial "paige/authors.html" . }}
-                    {{ $categories := cond ($page.Param "paige.list.terms.hide" | not) (.Params.categories | default slice) slice | uniq }}
+                    {{ $categories := .Params.categories | default slice | uniq }}
                     {{ $commiturl := "" }}
                     {{ $date := cond ($page.Param "paige.list.date.hide" | not) .PublishDate "" }}
                     {{ $dateclass := $page.Param "paige.list.date.class" | default "mb-0 paige-date text-center text-secondary" }}
@@ -39,9 +39,7 @@
                     {{ $readingtimeclass := $page.Param "paige.list.reading_time.class" | default "mb-0 paige-reading-time text-center text-secondary" }}
                     {{ $sectionclass := $page.Param "paige.list.section.class" | default "mb-3 paige-page w-100" }}
                     {{ $summary := .Summary | htmlUnescape | plainify }}
-                    {{ $tags := cond ($page.Param "paige.list.terms.hide" | not) (.Params.tags | default slice) slice | uniq }}
-                    {{ $termsinnerclass := $page.Param "paige.list.terms.inner_class" | default "badge paige-terms-inner text-bg-secondary text-decoration-none" }}
-                    {{ $termsouterclass := $page.Param "paige.list.terms.outer_class" | default "mb-0 paige-terms-outer text-center" }}
+                    {{ $tags := .Params.tags | default slice | uniq }}
                     {{ $title := .Title | markdownify }}
                     {{ $titlelink := .RelPermalink }}
 
@@ -86,7 +84,7 @@
                         {{ end }}
 
                         {{ if or $categories $tags }}
-                            <p {{ with $termsouterclass }} class="{{ . }}" {{ end }}>
+                            <p class="mb-0 paige-terms-outer text-center">
                                 {{ $terms := slice }}
 
                                 {{ range $categories }}
@@ -98,7 +96,7 @@
                                 {{ end }}
 
                                 {{ range sort $terms "name" }}
-                                    <a {{ with $termsinnerclass }} class="{{ . }}" {{ end }} href="{{ .url | safeURL }}">{{ .name }}</a>
+                                    <a class="badge paige-terms-inner text-bg-secondary text-decoration-none" href="{{ .url | safeURL }}">{{ .name }}</a>
                                 {{ end }}
                             </p>
                         {{ end }}