diff --git a/core/modules/user/css/user.admin.css b/core/modules/user/css/user.admin.css
index ba872d0..b1afb12 100644
--- a/core/modules/user/css/user.admin.css
+++ b/core/modules/user/css/user.admin.css
@@ -3,13 +3,13 @@
  * Admin styling for the User module.
  */
 
-#permissions td.module {
+#permissions .module {
   font-weight: bold;
 }
-#permissions td.permission {
+#permissions .permission {
   padding-left: 1.5em; /* LTR */
 }
-[dir="rtl"] #permissions td.permission {
+[dir="rtl"] #permissions .permission {
   padding-left: 0;
   padding-right: 1.5em;
 }
diff --git a/core/modules/user/css/user.module.css b/core/modules/user/css/user.module.css
index 869d016..f554933 100644
--- a/core/modules/user/css/user.module.css
+++ b/core/modules/user/css/user.module.css
@@ -1,4 +1,5 @@
 /**
+ * @file
  * Password strength indicator.
  */
 .password-strength__title,
@@ -6,55 +7,15 @@
   display: inline;
 }
 .password-strength__meter {
-  background-color: #ebeae4;
   height: 0.75em;
-  margin-top: 0.5em;
+  background-color: lightgray;
 }
 .password-strength__indicator {
+  background-color: gray;
   height: 100%;
-  width: 0%;
-  background-color: #77b259;
-  -webkit-transition: width 0.5s ease-out;
-  transition: width 0.5s ease-out;
-}
-input.password-confirm,
-input.password-field,
-.password-strength {
-  width: 55%;
+  width: 0;
 }
 div.password-confirm {
   visibility: hidden;
   width: 55%;
 }
-div.form-item div.password-suggestions {
-  padding: 0.2em 0.5em;
-  margin: 0.7em 0;
-  max-width: 34.7em;
-  border: 1px solid #b4b4b4;
-}
-div.password-suggestions ul {
-  margin-bottom: 0;
-}
-.confirm-parent,
-.password-parent {
-  clear: left; /* LTR */
-  margin: 0;
-  max-width: 33em;
-  overflow: hidden;
-}
-[dir="rtl"] .confirm-parent,
-[dir="rtl"] .password-parent {
-  clear: right;
-}
-.password-strength__indicator.is-weak {
-  background-color: #e62600;
-}
-.password-strength__indicator.is-fair {
-  background-color: #e09600;
-}
-.password-strength__indicator.is-good {
-  background-color: #0074bd;
-}
-.password-strength__indicator.is-strong {
-  background-color: #77b259;
-}
diff --git a/core/modules/user/css/user.module.css b/core/modules/user/css/user.theme.css
similarity index 78%
copy from core/modules/user/css/user.module.css
copy to core/modules/user/css/user.theme.css
index 869d016..6106015 100644
--- a/core/modules/user/css/user.module.css
+++ b/core/modules/user/css/user.theme.css
@@ -1,38 +1,42 @@
 /**
+ * @file
  * Password strength indicator.
  */
-.password-strength__title,
-.password-strength__text {
-  display: inline;
-}
 .password-strength__meter {
-  background-color: #ebeae4;
-  height: 0.75em;
   margin-top: 0.5em;
+  background-color: #ebeae4;
 }
 .password-strength__indicator {
-  height: 100%;
-  width: 0%;
   background-color: #77b259;
   -webkit-transition: width 0.5s ease-out;
   transition: width 0.5s ease-out;
 }
+.form-item .password-suggestions {
+  border: 1px solid #b4b4b4;
+}
+.password-strength__indicator.is-weak {
+  background-color: #e62600;
+}
+.password-strength__indicator.is-fair {
+  background-color: #e09600;
+}
+.password-strength__indicator.is-good {
+  background-color: #0074bd;
+}
+.password-strength__indicator.is-strong {
+  background-color: #77b259;
+}
 input.password-confirm,
 input.password-field,
 .password-strength {
   width: 55%;
 }
-div.password-confirm {
-  visibility: hidden;
-  width: 55%;
-}
-div.form-item div.password-suggestions {
+.form-item .password-suggestions {
   padding: 0.2em 0.5em;
   margin: 0.7em 0;
   max-width: 34.7em;
-  border: 1px solid #b4b4b4;
 }
-div.password-suggestions ul {
+.password-suggestions ul {
   margin-bottom: 0;
 }
 .confirm-parent,
@@ -46,15 +50,3 @@ div.password-suggestions ul {
 [dir="rtl"] .password-parent {
   clear: right;
 }
-.password-strength__indicator.is-weak {
-  background-color: #e62600;
-}
-.password-strength__indicator.is-fair {
-  background-color: #e09600;
-}
-.password-strength__indicator.is-good {
-  background-color: #0074bd;
-}
-.password-strength__indicator.is-strong {
-  background-color: #77b259;
-}
diff --git a/core/modules/user/user.libraries.yml b/core/modules/user/user.libraries.yml
index 037023a..8376351 100644
--- a/core/modules/user/user.libraries.yml
+++ b/core/modules/user/user.libraries.yml
@@ -5,6 +5,8 @@ drupal.user:
   css:
     component:
       css/user.module.css: {}
+    theme:
+      css/user.theme.css: {}
   dependencies:
     - core/jquery
     - core/drupal