diff --git a/apps/tup-ui/src/main.global.css b/apps/tup-ui/src/main.global.css
index 2eda1e4f3..920048111 100644
--- a/apps/tup-ui/src/main.global.css
+++ b/apps/tup-ui/src/main.global.css
@@ -7,6 +7,11 @@
 /* TODO: Remove when TACC/Core-CMS loads TACC/Core-Styles v2.14+ */
 @import url("@tacc/core-styles/dist/trumps/s-affixed-input-wrapper.css");
 
+/* To use new form styles in core-styles.base.css */
+/* TODO: Remove when TACC/Core-CMS loads TACC/Core-Styles v2.15+ */
+@import url("@tacc/core-styles/dist/elements/form.css");
+@import url("@tacc/core-styles/dist/trumps/s-form.css");
+
 /* To overwrite @tacc/core-styles CEPv2 spacing */
 :root {
   /* TACC/Core-Styles/blob/823b7b9/src/lib/_imports/settings/space.css */
diff --git a/apps/tup-ui/src/main.global.for-core-styles.css b/apps/tup-ui/src/main.global.for-core-styles.css
index 6d84d9f9b..e022907af 100644
--- a/apps/tup-ui/src/main.global.for-core-styles.css
+++ b/apps/tup-ui/src/main.global.for-core-styles.css
@@ -47,28 +47,3 @@ hr {
 :root {
   --global-color-danger--normal: #dc393b;
 }
-
-/* TODO: Remove when TACC/Core-CMS loads TACC/Core-Styles with `s-form` */
-/* To mimic `c-form__field` layout */
-.s-form > div > label + input {
-  display: block;
-}
-.s-form > div + button {
-  display: block;
-  margin-top: 2rem; /* to mimic c-form__field margin-bottom */
-}
-/* To mimic `c-form__help` */
-.s-form small {
-  display: block;
-  font-size: var(--global-font-size--small);
-  font-style: italic;
-}
-.s-form :not(ul,label) + small {
-  margin-top: 0.3em;
-}
-.s-form small > :not(details, a, samp) {
-  font-style: initial;
-}
-.s-affixed-input-wrapper.s-form small {
-  grid-area: help;
-}
diff --git a/libs/tup-components/src/auth/LoginComponent/LoginComponent.module.css b/libs/tup-components/src/auth/LoginComponent/LoginComponent.module.css
index fc04abf23..2a28a6916 100644
--- a/libs/tup-components/src/auth/LoginComponent/LoginComponent.module.css
+++ b/libs/tup-components/src/auth/LoginComponent/LoginComponent.module.css
@@ -1,6 +1,3 @@
-/* So login form is built off CMS styles */
-@import url('@tacc/core-styles/dist/elements/form.cms.css') layer(base);
-
 /* CONTAINER */
 
 .root {
@@ -54,10 +51,8 @@
   display: none;
 }
 .field {
-  max-width: unset; /* undo forms.cms.css `input...` */
-
   /* To use larger field inputs, always (not just coarse pointer devices) */
-  padding: 12px 12px; /* mimic forms.cms.css `@media (pointer: coarse)` */
+  padding: 12px 12px; /* mimic Core Styles forms.css @media (pointer: coarse) */
 }
 
 
diff --git a/package-lock.json b/package-lock.json
index 444453ae8..02bb3fabc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -41,7 +41,7 @@
         "@nrwl/vite": "^15.6.3",
         "@nrwl/web": "15.6.3",
         "@nrwl/workspace": "15.6.3",
-        "@tacc/core-styles": "^2.14.0",
+        "@tacc/core-styles": "^2.15.0",
         "@testing-library/jest-dom": "^5.16.4",
         "@testing-library/react": "13.4.0",
         "@testing-library/user-event": "^14.4.3",
@@ -5703,9 +5703,9 @@
       }
     },
     "node_modules/@tacc/core-styles": {
-      "version": "2.14.0",
-      "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.14.0.tgz",
-      "integrity": "sha512-AXJIF9tOdUsiGdOehNntbN3OeuycKlE/cUjJCnG65kWkmryEUhcytSUZF29Xd7xXCvmNwr6qlCOSVNU39POlhA==",
+      "version": "2.15.0",
+      "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.15.0.tgz",
+      "integrity": "sha512-zm9wNFemDLZpKPFfF2D0pVQqsbrNJMdf8T5VrEBm9cHA2c3fMFB7uV8RpKc4xrWVshYK7Z9pqqMw8WFrtL2zZQ==",
       "dev": true,
       "bin": {
         "core-styles": "src/cli.js"
@@ -29561,9 +29561,9 @@
       }
     },
     "@tacc/core-styles": {
-      "version": "2.14.0",
-      "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.14.0.tgz",
-      "integrity": "sha512-AXJIF9tOdUsiGdOehNntbN3OeuycKlE/cUjJCnG65kWkmryEUhcytSUZF29Xd7xXCvmNwr6qlCOSVNU39POlhA==",
+      "version": "2.15.0",
+      "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.15.0.tgz",
+      "integrity": "sha512-zm9wNFemDLZpKPFfF2D0pVQqsbrNJMdf8T5VrEBm9cHA2c3fMFB7uV8RpKc4xrWVshYK7Z9pqqMw8WFrtL2zZQ==",
       "dev": true,
       "requires": {}
     },
diff --git a/package.json b/package.json
index 5c8416604..67fe86abc 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "@nrwl/vite": "^15.6.3",
     "@nrwl/web": "15.6.3",
     "@nrwl/workspace": "15.6.3",
-    "@tacc/core-styles": "^2.14.0",
+    "@tacc/core-styles": "^2.15.0",
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "13.4.0",
     "@testing-library/user-event": "^14.4.3",