diff --git a/src/Clean_Theme.cxx b/src/Clean_Theme.cxx
index 7db9c2a..5640d8c 100644
--- a/src/Clean_Theme.cxx
+++ b/src/Clean_Theme.cxx
@@ -27,7 +27,7 @@
 
 static void clean_color(Fl_Color c)
 {
-    c = fl_color_average( FL_WHITE, c, 0.15f );
+    c = fl_color_average( FL_WHITE, c, 0.10f );
 
     if (Fl::draw_box_active())
         fl_color(c);
@@ -64,7 +64,7 @@ static void up_box(int x, int y, int w, int h, Fl_Color c)
 
 static void down_frame(int x, int y, int w, int h, Fl_Color c)
 {
-    rect(x, y, w, h, fl_color_average( FL_BLACK, c, 0.2 ) );
+    rect(x, y, w, h, fl_color_average( FL_BLACK, c, 0.2f ) );
 }
 
 static void down_box(int x, int y, int w, int h, Fl_Color c)
diff --git a/src/Gleam_Theme.cxx b/src/Gleam_Theme.cxx
index e99ef6a..955c7f3 100644
--- a/src/Gleam_Theme.cxx
+++ b/src/Gleam_Theme.cxx
@@ -52,13 +52,15 @@ static void shade_rect_up(int x, int y, int w, int h, Fl_Color bc)
     fl_rectf(x, y, w, third + 1);
     const float step_size = 0.10;
     float k = 0.5f;
-
-    for (int j = 0; j < third; k -= step_size, j++ )
+    int j = 0;
+    for (; j < third; k -= step_size, j++ )
     {
 	gleam_color(fl_color_average( FL_WHITE, bc, k));
 	fl_line(x, y + j, x + w - 1, y + j);
     }
-    
+
+    gleam_color(bc);
+    fl_rectf( x, y + j, x + w - 1, h - j );
 }
 
 static void frame_rect_up(int x, int y, int w, int h, Fl_Color bc)