diff --git a/bin/battery b/bin/battery
index 3cd0d3ad..3b305e6b 100755
--- a/bin/battery
+++ b/bin/battery
@@ -59,18 +59,12 @@ for bat in $BATS; do
    rem=$(search "$statefile" "remaining capacity: *\(.*\) m[AW]h")
 
    percent=$( echo "$rem" "$full" | awk '{printf "%.0f",  100*$1/$2}')
-   if [ "$percent" -lt 17 ]; then
-	per_color="{= rw}"
-   elif [ "$percent" -lt 33 ]; then
-	per_color="{= Rw}"
-   elif [ "$percent" -lt 50 ]; then
-	per_color="{= Yk}"
+   if [ "$percent" -lt 33 ]; then
+	per_color="{= Rk}"
    elif [ "$percent" -lt 67 ]; then
-	per_color="{= yk}"
-   elif [ "$percent" -lt 83 ]; then
-	per_color="{= Gw}"
+	per_color="{= Yk}"
    else
-	per_color="{= gw}"
+	per_color="{= Gk}"
    fi
    percent="$percent%"
 
diff --git a/debian/changelog b/debian/changelog
index 37d8dc03..5533832c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,9 @@ byobu (2.4) unreleased; urgency=low
     instead, LP: #376080
   * bin/network-down,network-up,updates-available: use /var/run/screen
     for status cache files, to keep from waking up the disk
-  * bin/battery: color the entire battery the same way
+  * bin/battery: color the entire battery the same way, only use 3 tones,
+    Green/Yellow/Red (6 was too confusing), always use black text on
+    capital G/Y/R background
   * byobu-export: tar files with owner/group as root/root, LP: #371025
   * byobu, debian/install, motd+shell, profiles/byoburc: launch screen
     with a simple config file that includes the chosen profile plus
@@ -33,7 +35,7 @@ byobu (2.4) unreleased; urgency=low
   [ Dustin Kirkland ]
   * -
 
- -- Dustin Kirkland <kirkland@ubuntu.com>  Sat, 16 May 2009 20:35:23 +0100
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Sat, 16 May 2009 21:06:53 +0100
 
 byobu (2.3-0ubuntu1) karmic; urgency=low