diff --git a/static/css/change_password.css b/static/css/change_password.css
index 06942ef..f17101c 100644
--- a/static/css/change_password.css
+++ b/static/css/change_password.css
@@ -64,6 +64,54 @@ body.light .container-change-password {
   --box-shadow: 0 3px 12px rgba(0,0,0,0.04);
 }
 
+/* ====================================================================== */
+/* RetroIPTV theme page-scoped overrides                                  */
+/* ====================================================================== */
+body.retroiptv .container-change-password {
+  --panel-bg: #f6e1c8;
+  --panel-text: #111;
+  --panel-border: rgba(0,0,0,0.08);
+  --card-head-bg: rgba(0,0,0,0.02);
+  --heading-color: #111;
+  --heading-weight: 700;
+
+  --label-color: #333;
+  --muted-color: rgba(0,0,0,0.56);
+
+  --input-bg: #fff;
+  --input-border: rgba(0,0,0,0.12);
+  --input-color: #111;
+  --placeholder-color: rgba(0,0,0,0.38);
+
+  --primary-color: #3fb7b0;
+  --primary-contrast: #fff;
+  --box-shadow: 0 3px 12px rgba(0,0,0,0.04);
+}
+
+/* ====================================================================== */
+/* Retro Magazine theme page-scoped overrides                             */
+/* ====================================================================== */
+body.retro-magazine .container-change-password {
+  --panel-bg: #fff;
+  --panel-text: #111;
+  --panel-border: rgba(0,0,0,0.08);
+  --card-head-bg: rgba(0,0,0,0.02);
+  --heading-color: #111;
+  --heading-weight: 700;
+
+  --label-color: #333;
+  --muted-color: rgba(0,0,0,0.56);
+
+  --input-bg: #fff;
+  --input-border: rgba(0,0,0,0.12);
+  --input-color: #111;
+  --placeholder-color: rgba(0,0,0,0.38);
+
+  --primary-color: #06c;
+  --primary-contrast: #fff;
+  --box-shadow: 0 3px 12px rgba(0,0,0,0.04);
+}
+
 /* ====================================================================== */
 /* Layout                                                                */
 /* ====================================================================== */
@@ -140,9 +188,61 @@ body.light .container-change-password {
   filter: brightness(0.96);
 }
 
-/* Flash messages */
+/* Flash messages - ensure visibility across all themes */
 .flash-messages { margin-top: 12px; }
-.flash { color: var(--panel-text); background: transparent; margin: 6px 0; }
+.flash { 
+  color: var(--panel-text); 
+  background: rgba(30, 211, 206, 0.1); 
+  padding: 8px 12px;
+  border-radius: 4px;
+  border-left: 3px solid var(--primary-color);
+  margin: 6px 0;
+  font-weight: 600;
+}
+
+/* Ensure flash messages have high contrast in all themes */
+body.dark .container-change-password .flash {
+  color: #ffffff;
+  background: rgba(30, 211, 206, 0.2);
+  border-left-color: #1ed3ce;
+}
+
+body.light .container-change-password .flash {
+  color: #000000;
+  background: #e3f2fd;
+  border-left-color: #1976d2;
+}
+
+body.retroiptv .container-change-password .flash,
+body.retro-magazine .container-change-password .flash {
+  color: #000000;
+  background: #b2ebf2;
+  border-left-color: #00acc1;
+}
+
+body.directv .container-change-password .flash {
+  color: #000000;
+  background: #bbdefb;
+  border-left-color: #1976d2;
+}
+
+body.comcast .container-change-password .flash {
+  color: #ffffff;
+  background: rgba(30, 211, 206, 0.2);
+  border-left-color: #1ed3ce;
+}
+
+body.tvguide1990 .container-change-password .flash {
+  color: #000000;
+  background: #e3f2fd;
+  border-left-color: #1976d2;
+}
+
+body.retro-aol .container-change-password .flash {
+  color: #000000;
+  background: #e0f2f1;
+  border-left-color: #00897b;
+}
 
 /* ====================================================================== */
 /* Theme-specific overrides: explicit, robust and page-scoped            */
diff --git a/static/css/change_tuner.css b/static/css/change_tuner.css
index 033b956..e24353b 100644
--- a/static/css/change_tuner.css
+++ b/static/css/change_tuner.css
@@ -81,6 +81,62 @@ body.light .container-change-tuner {
   --dropdown-color: #111;
 }
 
+/* ====================================================================== */
+/* RetroIPTV theme page-scoped overrides                                  */
+/* ====================================================================== */
+body.retroiptv .container-change-tuner {
+  --panel-bg: #f6e1c8;
+  --panel-text: #111;
+  --panel-border: rgba(0,0,0,0.08);
+  --card-head-bg: rgba(0,0,0,0.02);
+  --heading-color: #111;
+  --heading-weight: 700;
+
+  --label-color: #333;
+  --muted-color: rgba(0,0,0,0.56);
+
+  --input-bg: #fff;
+  --input-border: rgba(0,0,0,0.12);
+  --input-color: #111;
+  --placeholder-color: rgba(0,0,0,0.38);
+
+  --primary-color: #3fb7b0;
+  --primary-hover: #31988f;
+  --primary-contrast: #ffffff;
+  --box-shadow: 0 6px 18px rgba(0,0,0,0.06);
+
+  --dropdown-bg: #fff;
+  --dropdown-color: #111;
+}
+
+/* ====================================================================== */
+/* Retro Magazine theme page-scoped overrides                             */
+/* ====================================================================== */
+body.retro-magazine .container-change-tuner {
+  --panel-bg: #fff;
+  --panel-text: #111;
+  --panel-border: rgba(0,0,0,0.08);
+  --card-head-bg: rgba(0,0,0,0.02);
+  --heading-color: #111;
+  --heading-weight: 700;
+
+  --label-color: #333;
+  --muted-color: rgba(0,0,0,0.56);
+
+  --input-bg: #fff;
+  --input-border: rgba(0,0,0,0.12);
+  --input-color: #111;
+  --placeholder-color: rgba(0,0,0,0.38);
+
+  --primary-color: #06c;
+  --primary-hover: #058;
+  --primary-contrast: #ffffff;
+  --box-shadow: 0 6px 18px rgba(0,0,0,0.06);
+
+  --dropdown-bg: #fff;
+  --dropdown-color: #111;
+}
+
 /* ====================================================================== */
 /* Layout                                                                */
 /* ====================================================================== */
@@ -258,6 +314,71 @@ button:focus, select:focus, input:focus, textarea:focus {
   outline-offset: 2px;
 }
 
+/* ====================================================================== */
+/* Flash messages - ensure visibility across all themes                    */
+/* ====================================================================== */
+.flash-messages { 
+  margin-top: 20px;
+  max-width: 1100px;
+  margin-left: auto;
+  margin-right: auto;
+  padding: 0 18px;
+}
+.flash { 
+  color: var(--panel-text); 
+  background: rgba(30, 211, 206, 0.1); 
+  padding: 12px 16px;
+  border-radius: 6px;
+  border-left: 4px solid var(--primary-color);
+  margin: 10px 0;
+  font-weight: 600;
+  font-size: 0.95rem;
+}
+
+/* Ensure flash messages have high contrast in all themes */
+body.dark .container-change-tuner .flash {
+  color: #ffffff;
+  background: rgba(30, 211, 206, 0.2);
+  border-left-color: #1ed3ce;
+}
+
+body.light .container-change-tuner .flash {
+  color: #000000;
+  background: #e3f2fd;
+  border-left-color: #1976d2;
+}
+
+body.retroiptv .container-change-tuner .flash,
+body.retro-magazine .container-change-tuner .flash {
+  color: #000000;
+  background: #b2ebf2;
+  border-left-color: #00acc1;
+}
+
+body.directv .container-change-tuner .flash {
+  color: #000000;
+  background: #bbdefb;
+  border-left-color: #1976d2;
+}
+
+body.comcast .container-change-tuner .flash {
+  color: #ffffff;
+  background: rgba(30, 211, 206, 0.2);
+  border-left-color: #1ed3ce;
+}
+
+body.tvguide1990 .container-change-tuner .flash {
+  color: #000000;
+  background: #e3f2fd;
+  border-left-color: #1976d2;
+}
+
+body.retro-aol .container-change-tuner .flash {
+  color: #000000;
+  background: #e0f2f1;
+  border-left-color: #00897b;
+}
+
 /* ====================================================================== */
 /* Responsive                                                              */
 /* ====================================================================== */
@@ -265,6 +386,7 @@ button:focus, select:focus, input:focus, textarea:focus {
   .card-grid { grid-template-columns: 1fr; }
   .subgrid { grid-template-columns: 1fr; }
   .row-inline { flex-direction: column; }
+  .flash-messages { padding: 0 12px; }
 }
 
 /* ====================================================================== */
diff --git a/static/css/manage_users.css b/static/css/manage_users.css
index ae92e9d..f52864c 100644
--- a/static/css/manage_users.css
+++ b/static/css/manage_users.css
@@ -68,6 +68,58 @@ body.light .container-manage-users {
   --dropdown-color: #111;
 }
 
+/* RetroIPTV theme page-scoped overrides */
+body.retroiptv .container-manage-users {
+  --panel-bg: #f6e1c8;
+  --panel-text: #111;
+  --panel-border: rgba(0,0,0,0.08);
+  --card-head-bg: rgba(0,0,0,0.02);
+  --heading-color: #111;
+  --heading-weight: 700;
+
+  --label-color: #333;
+  --muted-color: rgba(0,0,0,0.56);
+
+  --input-bg: #fff;
+  --input-border: rgba(0,0,0,0.12);
+  --input-color: #111;
+  --placeholder-color: rgba(0,0,0,0.38);
+
+  --primary-color: #3fb7b0;
+  --primary-hover: #31988f;
+  --primary-contrast: #ffffff;
+  --box-shadow: 0 6px 18px rgba(0,0,0,0.06);
+
+  --dropdown-bg: #fff;
+  --dropdown-color: #111;
+}
+
+/* Retro Magazine theme page-scoped overrides */
+body.retro-magazine .container-manage-users {
+  --panel-bg: #fff;
+  --panel-text: #111;
+  --panel-border: rgba(0,0,0,0.08);
+  --card-head-bg: rgba(0,0,0,0.02);
+  --heading-color: #111;
+  --heading-weight: 700;
+
+  --label-color: #333;
+  --muted-color: rgba(0,0,0,0.56);
+
+  --input-bg: #fff;
+  --input-border: rgba(0,0,0,0.12);
+  --input-color: #111;
+  --placeholder-color: rgba(0,0,0,0.38);
+
+  --primary-color: #06c;
+  --primary-hover: #058;
+  --primary-contrast: #ffffff;
+  --box-shadow: 0 6px 18px rgba(0,0,0,0.06);
+
+  --dropdown-bg: #fff;
+  --dropdown-color: #111;
+}
+
 /* Layout */
 .container-manage-users {
   max-width: 720px;
@@ -159,9 +211,61 @@ body.light .container-manage-users {
 .actions { display:flex; gap:8px; }
 .inline-form { display:inline; margin:0; padding:0; }
 
-/* Flash messages */
+/* Flash messages - ensure visibility across all themes */
 .flash-messages { margin-top: 12px; }
-.flash { color: var(--panel-text); background: transparent; margin: 6px 0; }
+.flash { 
+  color: var(--panel-text); 
+  background: rgba(30, 211, 206, 0.1); 
+  padding: 8px 12px;
+  border-radius: 4px;
+  border-left: 3px solid var(--primary-color);
+  margin: 6px 0;
+  font-weight: 600;
+}
+
+/* Ensure flash messages have high contrast in all themes */
+body.dark .container-manage-users .flash {
+  color: #ffffff;
+  background: rgba(30, 211, 206, 0.2);
+  border-left-color: #1ed3ce;
+}
+
+body.light .container-manage-users .flash {
+  color: #000000;
+  background: #e3f2fd;
+  border-left-color: #1976d2;
+}
+
+body.retroiptv .container-manage-users .flash,
+body.retro-magazine .container-manage-users .flash {
+  color: #000000;
+  background: #b2ebf2;
+  border-left-color: #00acc1;
+}
+
+body.directv .container-manage-users .flash {
+  color: #000000;
+  background: #bbdefb;
+  border-left-color: #1976d2;
+}
+
+body.comcast .container-manage-users .flash {
+  color: #ffffff;
+  background: rgba(30, 211, 206, 0.2);
+  border-left-color: #1ed3ce;
+}
+
+body.tvguide1990 .container-manage-users .flash {
+  color: #000000;
+  background: #e3f2fd;
+  border-left-color: #1976d2;
+}
+
+body.retro-aol .container-manage-users .flash {
+  color: #000000;
+  background: #e0f2f1;
+  border-left-color: #00897b;
+}
 
 /* Theme-specific header overrides to match change_tuner exact colors */
 /* RetroIPTV */
diff --git a/templates/change_password.html b/templates/change_password.html
index d7cded7..9f680d0 100644
--- a/templates/change_password.html
+++ b/templates/change_password.html
@@ -9,12 +9,6 @@
 <div class="container-change-password">
   <div class="box">
     <h2>Change Password</h2>
-    <form method="POST">
-        <input type="password" name="old_password" placeholder="Current Password" required>
-        <input type="password" name="new_password" placeholder="New Password" required>
-        <input type="password" name="confirm_password" placeholder="Confirm Password" required>
-        <button type="submit" class="primary">Change Password</button>
-    </form>
 
     {% with messages = get_flashed_messages() %}
         {% if messages %}
@@ -25,6 +19,14 @@ <h2>Change Password</h2>
             </div>
         {% endif %}
     {% endwith %}
+
+    <form method="POST">
+        <input type="password" name="old_password" placeholder="Current Password" required>
+        <input type="password" name="new_password" placeholder="New Password" required>
+        <input type="password" name="confirm_password" placeholder="Confirm Password" required>
+        <button type="submit" class="primary">Change Password</button>
+    </form>
+
   </div>
 </div>
 {% endblock %}
diff --git a/templates/change_tuner.html b/templates/change_tuner.html
index 49fb05b..13eb860 100644
--- a/templates/change_tuner.html
+++ b/templates/change_tuner.html
@@ -12,6 +12,16 @@ <h1>Tuners</h1>
     <p class="lead">Switch the active tuner, edit tuner sources, and manage tuners. Dangerous actions are separated below to avoid accidental deletion.</p>
   </header>
 
+  {% with messages = get_flashed_messages() %}
+    {% if messages %}
+      <div class="flash-messages">
+        {% for msg in messages %}
+          <p class="flash">{{ msg }}</p>
+        {% endfor %}
+      </div>
+    {% endif %}
+  {% endwith %}
+
   <main class="card-grid">
     <!-- Active tuner + Auto-refresh combined -->
     <section class="card card-primary" aria-labelledby="lbl-active-tuner">
diff --git a/templates/manage_users.html b/templates/manage_users.html
index 05e4c3d..b55ca3a 100644
--- a/templates/manage_users.html
+++ b/templates/manage_users.html
@@ -10,6 +10,16 @@
   <div class="box">
     <h2>Manage Users</h2>
 
+    {% with messages = get_flashed_messages() %}
+      {% if messages %}
+        <div class="flash-messages">
+          {% for msg in messages %}
+            <p class="flash">{{ msg }}</p>
+          {% endfor %}
+        </div>
+      {% endif %}
+    {% endwith %}
+
     <form method="POST" class="add-user-form">
       <h3>Add New User</h3>
       <input type="hidden" name="action" value="add">
@@ -47,15 +57,6 @@ <h3>Existing Users</h3>
       </table>
     </div>
 
-    {% with messages = get_flashed_messages() %}
-      {% if messages %}
-        <div class="flash-messages">
-          {% for msg in messages %}
-            <p class="flash">{{ msg }}</p>
-          {% endfor %}
-        </div>
-      {% endif %}
-    {% endwith %}
   </div>
 </div>
 {% endblock %}