diff --git a/demdata_cms/Dockerfile b/demdata_cms/Dockerfile
index 09e63639..6cb853e0 100644
--- a/demdata_cms/Dockerfile
+++ b/demdata_cms/Dockerfile
@@ -1,5 +1,5 @@
-# TACC/Core-CMS#v3.12.0-beta.2
-FROM taccwma/core-cms:55db2ed
+# TACC/Core-CMS#782 (v4.4.0+)
+FROM taccwma/core-cms:c82d56f
 
 WORKDIR /code
 
diff --git a/demdata_cms/src/taccsite_custom/demdata_cms/templates/assets_custom.html b/demdata_cms/src/taccsite_custom/demdata_cms/templates/assets_custom.html
index 2270171c..f57e131f 100644
--- a/demdata_cms/src/taccsite_custom/demdata_cms/templates/assets_custom.html
+++ b/demdata_cms/src/taccsite_custom/demdata_cms/templates/assets_custom.html
@@ -2,7 +2,6 @@
 
 <link rel="stylesheet" href="/static/site_cms/css/build/core-styles.theme.has-dark-logo.css" />
 
-{% include './snippets/from-ecep-cms/site-css-links.html' %}
 {% include './snippets/from-tup-cms/css-elements-monospace.html' %}
 {% include './snippets/from-tup-cms/css-elements-address.html' %}
 {% include './snippets/from-tup-cms/css-elements-body.html' %}
diff --git a/demdata_cms/src/taccsite_custom/demdata_cms/templates/fullwidth.html b/demdata_cms/src/taccsite_custom/demdata_cms/templates/fullwidth.html
index c0f92047..002d4b85 100644
--- a/demdata_cms/src/taccsite_custom/demdata_cms/templates/fullwidth.html
+++ b/demdata_cms/src/taccsite_custom/demdata_cms/templates/fullwidth.html
@@ -1,6 +1,8 @@
 {% extends "fullwidth.html" %}
 {% load cms_tags %}
 
+{% block page_type_class %}s-irregular-links{% endblock page_type_class %}
+
 {% block assets_custom %}
   {{ block.super }}
 
diff --git a/demdata_cms/src/taccsite_custom/demdata_cms/templates/snippets/from-ecep-cms/site-css-links.html b/demdata_cms/src/taccsite_custom/demdata_cms/templates/snippets/from-ecep-cms/site-css-links.html
deleted file mode 100644
index 831b52f0..00000000
--- a/demdata_cms/src/taccsite_custom/demdata_cms/templates/snippets/from-ecep-cms/site-css-links.html
+++ /dev/null
@@ -1,28 +0,0 @@
-{# https://github.com/TACC/Core-Styles/blob/511c870/src/lib/_imports/trumps/s-irregular-links.css #}
-{# https://github.com/TACC/Core-Styles/blob/511c870/src/lib/_imports/tools/x-link.css #}
-<style id="site-css-links">
-/* TODO: Do this the right way:
-         1. Load Core-Styles with s-irregular-links.
-         2. For EPIC, add "s-" class to a root element
-*/
-main :where(
-  a,
-  .c-button--as-link
-) {
-    text-decoration-line: underline;
-}
-main :where(
-  a:hover,
-  .c-button--as-link:hover
-) {
-    text-decoration-style: dashed;
-    text-decoration-thickness: from-font; /* TODO: Add to Core-Styles */
-}
-main :where(
-  a:active,
-  .c-button--as-link:active
-) {
-    text-decoration-style: dotted;
-    text-decoration-thickness: from-font; /* TODO: Add to Core-Styles */
-}
-</style>
diff --git a/demdata_cms/src/taccsite_custom/demdata_cms/templates/standard.html b/demdata_cms/src/taccsite_custom/demdata_cms/templates/standard.html
index f1cf9e22..0f05d175 100644
--- a/demdata_cms/src/taccsite_custom/demdata_cms/templates/standard.html
+++ b/demdata_cms/src/taccsite_custom/demdata_cms/templates/standard.html
@@ -1,6 +1,8 @@
 {% extends "standard.html" %}
 {% load cms_tags %}
 
+{% block page_type_class %}s-irregular-links{% endblock page_type_class %}
+
 {% block assets_custom %}
   {{ block.super }}