5 files changed, 11 insertions, 26 deletions

diff --git a/templates/layouts/categorized_list.html b/templates/layouts/categorized_list.html
index 67dc466..6c3c7f3 100644
--- a/templates/layouts/categorized_list.html
+++ b/templates/layouts/categorized_list.html
@@ -5,23 +5,11 @@
     itemtype="https://schema.org/DataFeed"
     itemid="$url.full$"
 >
-    <header class="s-colored-links">
-        <h1 class="o-heading o-heading--xxl u-mt-0 p-name" itemprop="name headline">
-            <span class="o-heading__primary">$title$</span>
-        </h1>
-
-$body$
+    <header class="c-subheader s-links">
+        <h1 class="o-heading c-subheader__title p-name" itemprop="name headline">$title$.</h1>
+        $body$
     </header>
 
-    $if(notoc)$$else$
-        <nav class="c-hnav s-invisible-links" aria-label="Sections">
-            <h2 class="u-mt-0">Jump to</h2>
-            $for(list)$
-                <a class="c-hnav__item" href="#$it.slug$">$it.title$</a>
-            $endfor$
-        </nav>
-    $endif$
-
     <div class="l-card-list">
         $for(list)$
             <section class="h-entry h-feed" itemprop="dataFeedElement" itemscope itemtype="https://schema.org/DataFeed">
@@ -34,7 +22,7 @@ $body$
                         $endif$
                     </h2>
                     $if(it.description)$
-                        <div class="s-small s-colored-links">$it.description$</div>
+                        <div class="s-small s-links s-links--colored">$it.description$</div>
                     $endif$ 
                 </header>
                 <div class="l-card-list__cards l-card-list__cards--$it.layout.id$">
diff --git a/templates/layouts/exhibit.html b/templates/layouts/exhibit.html
index 7a50635..e378f74 100644
--- a/templates/layouts/exhibit.html
+++ b/templates/layouts/exhibit.html
@@ -49,7 +49,7 @@
 
     <div class="l-container l-container--pad-x l-container--pad-y l-container--narrow-125 u-pt-0">
         <div class="l-container l-container--narrow u-ml-0">
-            <div class="s-colored-links s-headings s-blockquotes s-code s-lists s-tables s-alerts e-content" itemprop="articleBody">
+            <div class="s-links s-links--colored s-headings s-blockquotes s-code s-lists s-tables s-alerts e-content" itemprop="articleBody">
 $body$
             </div>
         </div>
diff --git a/templates/layouts/list.html b/templates/layouts/list.html
index cf54c4b..6fe65c4 100644
--- a/templates/layouts/list.html
+++ b/templates/layouts/list.html
@@ -5,12 +5,9 @@
     itemtype="https://schema.org/DataFeed"
     itemid="$url.full$"
 >
-    <header class="s-colored-links">
-        <h1 class="o-heading o-heading--xxl u-mt-0 p-name" itemprop="name headline">
-            <span class="o-heading__primary">$title$</span>
-        </h1>
-
-$body$
+    <header class="c-subheader s-links">
+        <h1 class="o-heading c-subheader__title p-name" itemprop="name headline">$title$.</h1>
+        $body$
     </header>
 
     <div class="l-card-list">
diff --git a/templates/layouts/page.html b/templates/layouts/page.html
index b1f7835..4bc6e17 100644
--- a/templates/layouts/page.html
+++ b/templates/layouts/page.html
@@ -22,14 +22,14 @@
             <span class="s-headings__primary">$title$</span>
         </h1>
 
-        <div class="s-colored-links s-headings s-blockquotes s-code s-lists s-tables s-alerts e-content" itemprop="articleBody">
+        <div class="s-links s-links--colored s-headings s-blockquotes s-code s-lists s-tables s-alerts e-content" itemprop="articleBody">
             <div class="l-container l-container--narrow u-ml-0">
 $body$
             </div>
         </div>
 
         $if(references)$
-            <footer class="s-colored-links s-lists">
+            <footer class="s-links s-links--colored s-lists">
                 <h1>References</h1>
                 <ul>
                     $for(references)$
diff --git a/templates/layouts/redirect.html b/templates/layouts/redirect.html
index d515abe..8e40b72 100644
--- a/templates/layouts/redirect.html
+++ b/templates/layouts/redirect.html
@@ -1,4 +1,4 @@
-<main class="c-main l-container l-container--pad-x l-container--pad-y l-container--narrow s-colored-links s-headlines">
+<main class="c-main l-container l-container--pad-x l-container--pad-y l-container--narrow s-links s-links--colored s-headlines">
     <h1 class="u-mt-0">
         <span class="s-headlines__title-inner">$title$</span>
     </h1>