diff --git a/debian/changelog b/debian/changelog
index ea57813..d54c215 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,13 +6,16 @@ desktop-base (7.0.3) UNRELEASED; urgency=low
     - Don't cut off the last hostname letter.
     - Adjust font sizes and colors.
   * Ksplash: Do nut cut off blurred icons.
-  * Reduce opacity of debian swirl in gdm/kdm background to be 
+  * Reduce opacity of debian swirl in gdm/kdm background to be
     less distracting.
 
   [ Paul Tagliamonte ]
   * debian/rules: Use xz compression for binary packages. (Closes: #683903)
     - Thanks to Ansgar Burchardt <ansgar@debian.org> for the patch & bug.
 
+  [ Jonathan Carter ]
+  * Update joy theme to be more password-friendly.
+
  -- Paul Tagliamonte <paultag@debian.org>  Sun, 05 Aug 2012 08:55:10 -0400
 
 desktop-base (7.0.2) unstable; urgency=low
diff --git a/plymouth/joy/joy.script b/plymouth/joy/joy.script
index 86f2745..f346d09 100644
--- a/plymouth/joy/joy.script
+++ b/plymouth/joy/joy.script
@@ -51,7 +51,7 @@ bg_sprite.SetPosition(Window.GetX() + Window.GetWidth() / 2 - scaled_bg_image.Ge
 
 # Set the text colour in (rgb / 256)
 text_colour.red = 0.0;
-text_colour.green = 0.0;
+text_colour.green =  0.0;
 text_colour.blue = 0.0;
 
 # Tinted text #988592
@@ -60,9 +60,9 @@ tinted_text_colour.green = 0.0;
 tinted_text_colour.blue = 0.0;
 
 # Action Text - #ffffff - RGB 255 255 255
-action_text_colour.red = 0.0;
-action_text_colour.green = 0.0;
-action_text_colour.blue = 0.0;
+action_text_colour.red = 1.0;
+action_text_colour.green = 1.0;
+action_text_colour.blue = 1.0;
 
 # Orange - #ff4012 - RGB 255 64 18
 debugsprite = Sprite();
@@ -197,11 +197,13 @@ if (bits_per_pixel == 4) {
     logo_filename = "debian_logo16.png";
     progress_dot_off_filename = "progress_dot_off16.png";
     progress_dot_on_filename = "progress_dot_on16.png";
+    password_dot_filename = "password_dot.png";
     password_field_filename = "password_field16.png";
 } else {
     logo_filename = "debian_logo.png";
     progress_dot_off_filename = "progress_dot_off.png";
     progress_dot_on_filename = "progress_dot_on.png";
+    password_dot_filename = "password_dot.png";
     password_field_filename = "password_field.png";
 }
 
@@ -531,7 +533,7 @@ fun password_dialogue_setup (message_label) {
     local.entry;
     local.bullet_image;
     
-    bullet_image = Image (progress_dot_off_filename);
+    bullet_image = Image (password_dot_filename);
     entry.image = Image (password_field_filename);
     
     # Hide the normal labels
@@ -721,7 +723,7 @@ fun update_progress_label (progress) {
             # See if we any other fsck check is complete
             # and, if so, hide the progress bars and the labels
             on_fsck_completed ();
-        
+       
             return 0;
         }
     }    
diff --git a/plymouth/joy/password_dot.png b/plymouth/joy/password_dot.png
new file mode 100644
index 0000000..7dd7413
Binary files /dev/null and b/plymouth/joy/password_dot.png differ
diff --git a/plymouth/joy/password_dot16.png b/plymouth/joy/password_dot16.png
new file mode 100644
index 0000000..991a586
Binary files /dev/null and b/plymouth/joy/password_dot16.png differ
diff --git a/plymouth/joy/password_field.png b/plymouth/joy/password_field.png
index d40aaf2..4c0b93e 100644
Binary files a/plymouth/joy/password_field.png and b/plymouth/joy/password_field.png differ
diff --git a/plymouth/joy/password_field16.png b/plymouth/joy/password_field16.png
index 1a0d19b..962c557 100644
Binary files a/plymouth/joy/password_field16.png and b/plymouth/joy/password_field16.png differ