diff --git a/cockpit.changes b/cockpit.changes
index 8eb2a4f..cb52e32 100644
--- a/cockpit.changes
+++ b/cockpit.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jun 17 10:09:09 UTC 2022 - Adam Majer <adam.majer@suse.de>
+
+- css-overrides.patch: css overrides for better theming support
+
 -------------------------------------------------------------------
 Fri Jun 10 08:22:31 UTC 2022 - Adam Majer <adam.majer@suse.de>
 
diff --git a/remove-pwscore.patch b/remove-pwscore.patch
index 7135edf..694af27 100644
--- a/remove-pwscore.patch
+++ b/remove-pwscore.patch
@@ -30,25 +30,32 @@ Index: cockpit/pkg/lib/cockpit-components-password.jsx
      });
  }
  
-@@ -60,6 +63,7 @@ export const PasswordFormFields = ({
+@@ -53,13 +56,12 @@ export const PasswordFormFields = ({
+ }) => {
+     const [password, setPassword] = useState(undefined);
+     const [passwordConfirm, setConfirmPassword] = useState(undefined);
+-    const [passwordStrength, setPasswordStrength] = useState("");
+-    const [passwordMessage, setPasswordMessage] = useState("");
+ 
+     function onPasswordChanged(value) {
          setPassword(value);
          change("password", value);
  
-+/*
++        /*
          if (value) {
              password_quality(value)
                      .catch(ex => {
-@@ -73,7 +77,9 @@ export const PasswordFormFields = ({
+@@ -73,7 +75,9 @@ export const PasswordFormFields = ({
              setPasswordStrength("");
              setPasswordMessage("");
          }
-+*/
++        */
      }
-+/*
++    /*
  
      let variant;
      if (passwordStrength === "")
-@@ -84,6 +90,7 @@ export const PasswordFormFields = ({
+@@ -84,6 +88,7 @@ export const PasswordFormFields = ({
          variant = "warning";
      else
          variant = "danger";
@@ -56,7 +63,7 @@ Index: cockpit/pkg/lib/cockpit-components-password.jsx
  
      return (
          <>
-@@ -101,16 +108,7 @@ export const PasswordFormFields = ({
+@@ -101,16 +106,6 @@ export const PasswordFormFields = ({
                         fieldId={idPrefix + "-pw1"}>
                  <TextInput className="check-passwords" type="password" id={idPrefix + "-pw1"}
                             autocomplete="new-password" value={password} onChange={onPasswordChanged} />
@@ -68,7 +75,7 @@ Index: cockpit/pkg/lib/cockpit-components-password.jsx
 -                              measureLocation={ProgressMeasureLocation.none}
 -                              variant={variant}
 -                              value={Number.isInteger(passwordStrength) ? passwordStrength : 0} />
-                     <div id={idPrefix + "-password-meter-message"} className="pf-c-form__helper-text" aria-live="polite">{passwordMessage}</div>
+-                    <div id={idPrefix + "-password-meter-message"} className="pf-c-form__helper-text" aria-live="polite">{passwordMessage}</div>
 -                </div>
              </FormGroup>