diff --git a/src/flash.cpp b/src/flash.cpp
index 6cf791e..6e8eab1 100644
--- a/src/flash.cpp
+++ b/src/flash.cpp
@@ -5,22 +5,17 @@
 //This caused an error with a development version of g++ on a Mandrake system
 //in Sweden.
 FlashButton::FlashButton( QString text, QString name, QWidget* parent )
-        :QPushButton( text, parent )
+        : QPushButton( text, parent )
 {
     this->setObjectName(name);
     //record the base palette for posterity.
-    Normal = palette();
+    flashPalette = normalPalette = palette();
 
     //define the palette the button will have when it flashes.
-    QPalette cg = this->palette();
-    cg.setCurrentColorGroup(QPalette::Inactive);
-    cg.setColor(QPalette::Button, HIGHLIGHT);
-    cg.setColor(QPalette::Light, HIGHLIGHT.light(150));
-    cg.setColor(QPalette::Midlight, HIGHLIGHT.light(125));
-    cg.setColor(QPalette::Dark, HIGHLIGHT.dark(200));
-    cg.setColor(QPalette::Mid, HIGHLIGHT.dark(150));
-    Flash = cg;
-    isflash=false;
+    flashPalette.setCurrentColorGroup(QPalette::Inactive);
+    flashPalette.setColor(QPalette::Button, flashPalette.color(QPalette::Highlight));
+    flashPalette.setColor(QPalette::ButtonText, flashPalette.color(QPalette::HighlightedText));
+    flashing = false;
 
     setAutoDefault( false );
     setFocusPolicy(Qt::NoFocus);
@@ -29,22 +24,22 @@ FlashButton::FlashButton( QString text, QString name, QWidget* parent )
 
 void FlashButton::flash()
 {
-    emit( flashed( !isflash ) );
-    if (isflash)
+    emit( flashed( !flashing ) );
+    if (flashing)
     {
-        setPalette( Normal );
-        isflash = false;
+        setPalette( normalPalette );
+        flashing = false;
     }
     else
     {
-        setPalette( Flash );
-        isflash = true;
+        setPalette( flashPalette );
+        flashing = true;
     }
 }
 
 
 FlashRadioArray::FlashRadioArray( const QStringList &names, bool horizontal, QWidget* parent)
-        :QWidget( parent )
+        : QWidget( parent )
 {
     if (horizontal) {
         mainLayout = new QHBoxLayout( this);
diff --git a/src/flash.h b/src/flash.h
index 30cc518..8c1eba2 100644
--- a/src/flash.h
+++ b/src/flash.h
@@ -1,20 +1,6 @@
 #ifndef QJOYPAD_FLASH_H
 #define QJOYPAD_FLASH_H
 
-
-//The color the buttons flash! Feel free to change this.
-//The three numbers are all you need to touch, and they
-//represent the red, green, and blue values of the color,
-//respectively.
-
-#define HIGHLIGHT QColor( 0,0,255 )
-
-
-//--- --- --- --- End of editable code.
-
-
-
-
 #include <QPushButton>
 #include <QPalette>
 #include <QBoxLayout>
@@ -39,11 +25,11 @@ class FlashButton : public QPushButton
 		void flashed( bool on );
 	private:
 		//is this currently "flashed" (ie, colored blue)?
-		bool isflash;
+		bool flashing;
 		//the normal, unflashed palette
-		QPalette Normal;
+		QPalette normalPalette;
 		//the colorful flashed palette
-		QPalette Flash;
+		QPalette flashPalette;
 };
 
 //An array of flashing mutually-exclusive toggle buttons.