diff --git a/Control_Track.H b/Control_Track.H
index 9babe58..fb5abea 100644
--- a/Control_Track.H
+++ b/Control_Track.H
@@ -29,6 +29,7 @@ public:
 
     Control_Track ( int X, int Y, int W, int H ) : Track( X, Y, W, H )
         {
+            color( fl_darker( FL_GREEN ) );
         }
 
     void
@@ -50,7 +51,7 @@ public:
 
             fl_line_style( FL_SOLID, 4 );
 
-            fl_color( FL_RED );
+            fl_color( selection_color() );
 
             fl_begin_line();
 
diff --git a/Waveform.C b/Waveform.C
index e223d0a..48114f2 100644
--- a/Waveform.C
+++ b/Waveform.C
@@ -65,10 +65,15 @@ draw_waveform ( int ox, int X, int Y, int W, int H, Audio_File *_clip, int chann
         else
             fl_color( color );
 
-        if ( p.min < -1.0 || p.max > 1.0 )
-            fl_color( FL_RED );
 
-        fl_line( x, mid + (H / 2 * p.min), x, mid + (H / 2 * p.max) );
+        if ( p.min < -1.0 || p.max > 1.0 )
+        {
+            fl_color( FL_RED );
+            fl_line( x, Y, x, Y + H );
+        }
+        else
+            fl_line( x, mid + (H / 2 * p.min), x, mid + (H / 2 * p.max) );
+
 
     }