diff --git a/Makefile b/Makefile
index 31f095351..3e5eea861 100644
--- a/Makefile
+++ b/Makefile
@@ -93,7 +93,12 @@ SDL_CFLAGS=$(shell sdl-config --cflags)
 
 # The entire set of CFLAGS:
 
-CFLAGS=-O2 -Wall
+CFLAGS=-O2 -W -Wall -fno-common -ffast-math \
+	-Wcast-align -Wredundant-decls \
+	-Wbad-function-cast -Wwrite-strings \
+	-Waggregate-return \
+	-Wstrict-prototypes -Wmissing-prototypes
+
 DEFS=-DDATA_PREFIX=\"$(DATA_PREFIX)\" \
 	-D$(NOSOUNDFLAG) -DDOC_PREFIX=\"$(DOC_PREFIX)\" \
 	-DLOCALEDIR=\"$(LOCALE_PREFIX)\" -DCONFDIR=\"$(CONFDIR)\"
diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index 6df745de3..ff6f69104 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -8,6 +8,13 @@ http://www.newbreedsoftware.com/tuxpaint/
 
 
 2004.November.21 (0.9.15)
+  * Improved compiler warnings (CLFAGS in Makefile)
+    Albert Cahalan <albert@users.sourceforge.net>
+
+  * Added beige and tan colors.  Changed "Lime" to "Neon Green."
+    Tweaked some color values.  Moved grey/silver next to black/white.
+    Albert Cahalan <albert@users.sourceforge.net>
+
   * Albanian translation created.
     Ilir Rugova <ilirrugova@gmx.de>
     Laurent Dhima <laurenti@alblinux.net>
diff --git a/src/colors.h b/src/colors.h
index 5457d617e..a218a12c9 100644
--- a/src/colors.h
+++ b/src/colors.h
@@ -8,7 +8,7 @@
   bill@newbreedsoftware.com
   http://www.newbreedsoftware.com/tuxpaint/
 
-  June 14, 2002 - February 9, 2004
+  June 14, 2002 - November 21, 2004
 */
 
 
@@ -17,20 +17,22 @@
 
 enum {
   COLOR_BLACK,
+  COLOR_GREY,
+  COLOR_SILVER,
   COLOR_WHITE,
   COLOR_RED,
   COLOR_PINK,
   COLOR_ORANGE,
   COLOR_YELLOW,
-  COLOR_LIME,
+  COLOR_NEON,
   COLOR_GREEN,
-  COLOR_CYAN,
+  COLOR_SKYBLUE,
   COLOR_BLUE,
   COLOR_PURPLE,
-  COLOR_FUCHSIA, /* ... */
+  COLOR_MAGENTA,
   COLOR_BROWN,
-  COLOR_GREY,
-  COLOR_SILVER,  /* ... */
+  COLOR_TAN,
+  COLOR_BEIGE,
   NUM_COLORS
 };
 
@@ -39,20 +41,22 @@ enum {
 
 int color_hexes[NUM_COLORS][3] = {
   {0, 0, 0},       /* Black */
+  {128, 128, 128}, /* Gray */
+  {192, 192, 192}, /* Silver */
   {255, 255, 255}, /* White */
   {255,   0,   0}, /* Red */
-  {255, 128, 160}, /* Pink */
+  {255, 165, 211}, /* Pink */
   {255, 128,   0}, /* Orange */
   {255, 255,   0}, /* Yellow */
-  {  0, 255,   0}, /* Lime */
-  {  0, 132,  64}, /* Green */
-  {  0, 255, 255}, /* Cyan */
+  {140, 255,   0}, /* Neon */
+  { 33, 148,  33}, /* Green */
+  {138, 168, 205}, /* Sky blue */
   {  0,   0, 255}, /* Blue */
   { 96,   0, 128}, /* Purple */
-  {255,   0, 255}, /* Fuchsia */
+  {255,   0, 255}, /* Magenta */
   {128,  96,   0}, /* Brown */
-  {128, 128, 128}, /* Gray */
-  {192, 192, 192}  /* Silver */
+  {226, 189, 166}, /* Tan */
+  {247, 228, 219}  /* Beige */
 };
 
 
@@ -60,18 +64,20 @@ int color_hexes[NUM_COLORS][3] = {
 
 char * color_names[NUM_COLORS] = {
   gettext_noop("Black!"),
+  gettext_noop("Gray!"),
+  gettext_noop("Silver!"),
   gettext_noop("White!"),
   gettext_noop("Red!"),
   gettext_noop("Pink!"),
   gettext_noop("Orange!"),
   gettext_noop("Yellow!"),
-  gettext_noop("Lime!"),
+  gettext_noop("Neon green!"),
   gettext_noop("Green!"),
-  gettext_noop("Cyan!"),
+  gettext_noop("Sky blue!"),
   gettext_noop("Blue!"),
   gettext_noop("Purple!"),
-  gettext_noop("Fuchsia!"),
+  gettext_noop("Magenta!"),
   gettext_noop("Brown!"),
-  gettext_noop("Gray!"),
-  gettext_noop("Silver!")
+  gettext_noop("Tan!"),
+  gettext_noop("Beige!")
 };