From 5f16fb1ff29b8cde4b8bd84b0a6d32d7a1e31c37 Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <dustin.kirkland@gazzang.com>
Date: Thu, 23 Feb 2012 14:35:53 -0600
Subject: [PATCH] * usr/bin/byobu, usr/lib/byobu/include/constants:   - fix 256
 color support   - default to colors specified in the Ubuntu brand guidelines 
    + http://design.canonical.com/the-toolkit/ubuntu-brand-guidelines/

---
 debian/changelog                | 5 ++++-
 usr/bin/byobu                   | 2 +-
 usr/lib/byobu/include/constants | 9 +++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 07d38191..1d014605 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 byobu (5.15) unreleased; urgency=low
 
-  * UNRELEASED
+  * usr/bin/byobu, usr/lib/byobu/include/constants:
+    - fix 256 color support
+    - default to colors specified in the Ubuntu brand guidelines
+      + http://design.canonical.com/the-toolkit/ubuntu-brand-guidelines/
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 23 Feb 2012 08:04:07 -0600
 
diff --git a/usr/bin/byobu b/usr/bin/byobu
index af33e0aa..b61afc90 100755
--- a/usr/bin/byobu
+++ b/usr/bin/byobu
@@ -95,7 +95,7 @@ case $BYOBU_BACKEND in
 	tmux)
 		# Use 256 colors if possible
 		if command -v tput >/dev/null; then
-			if [ "$(tput colors 2>/dev/null || echo 0)" = "256" ]; then
+			if [ "$(tput colors 2>/dev/null || echo 0)" = "256" ] || [ "$COLORTERM" = "gnome-terminal" ] || [ "$TERM" = "xterm" ]; then
 				[ -z "$SCREEN_TERM" ] && SCREEN_TERM="-2"
 			fi
 		fi
diff --git a/usr/lib/byobu/include/constants b/usr/lib/byobu/include/constants
index 81017680..321002d2 100755
--- a/usr/lib/byobu/include/constants
+++ b/usr/lib/byobu/include/constants
@@ -99,7 +99,8 @@ command -v greadlink >/dev/null 2>&1 && export BYOBU_READLINK="greadlink" || exp
 command -v sensible-pager >/dev/null 2>&1 && export BYOBU_PAGER="sensible-pager" || export BYOBU_PAGER="less"
 
 # Default colors
-[ -n "$BYOBU_DARK" ] || export BYOBU_DARK="black"
-[ -n "$BYOBU_LIGHT" ] || export BYOBU_LIGHT="white"
-[ -n "$BYOBU_ACCENT" ] || export BYOBU_ACCENT="magenta"
-[ -n "$BYOBU_HIGHLIGHT" ] || export BYOBU_HIGHLIGHT="red"
+export BYOBU_DARK="#AEA79F"		# WARM GREY
+export BYOBU_LIGHT="#333333"		# COOL GREY
+export BYOBU_ACCENT="#75507B"		# AUBERGINE
+export BYOBU_HIGHLIGHT="#DD4814"	# UBUNTU ORANGE
+