diff --git a/data/themes/default/automation.png b/data/themes/default/automation.png
index 65a0a83d01..d6193e4f6b 100644
Binary files a/data/themes/default/automation.png and b/data/themes/default/automation.png differ
diff --git a/data/themes/default/automation_track.png b/data/themes/default/automation_track.png
index 40fc9a50b6..d6193e4f6b 100644
Binary files a/data/themes/default/automation_track.png and b/data/themes/default/automation_track.png differ
diff --git a/data/themes/default/background_artwork.png b/data/themes/default/background_artwork.png
index 0f2ba9a5ef..8725e664f6 100644
Binary files a/data/themes/default/background_artwork.png and b/data/themes/default/background_artwork.png differ
diff --git a/data/themes/default/bb_track.png b/data/themes/default/bb_track.png
index 40f58e139e..9e353be471 100644
Binary files a/data/themes/default/bb_track.png and b/data/themes/default/bb_track.png differ
diff --git a/data/themes/default/controller.png b/data/themes/default/controller.png
index 72229e955a..6bd108d226 100644
Binary files a/data/themes/default/controller.png and b/data/themes/default/controller.png differ
diff --git a/data/themes/default/fx_mixer.png b/data/themes/default/fx_mixer.png
index 85d8462682..bfde545d53 100644
Binary files a/data/themes/default/fx_mixer.png and b/data/themes/default/fx_mixer.png differ
diff --git a/data/themes/default/lcd_19green.png b/data/themes/default/lcd_19green.png
index d1dd66571b..a154f40e9f 100644
Binary files a/data/themes/default/lcd_19green.png and b/data/themes/default/lcd_19green.png differ
diff --git a/data/themes/default/piano.png b/data/themes/default/piano.png
index 5577fd1ec6..22523893e2 100644
Binary files a/data/themes/default/piano.png and b/data/themes/default/piano.png differ
diff --git a/data/themes/default/progression_cubic_hermite.png b/data/themes/default/progression_cubic_hermite.png
index 77be565620..1010f87352 100644
Binary files a/data/themes/default/progression_cubic_hermite.png and b/data/themes/default/progression_cubic_hermite.png differ
diff --git a/data/themes/default/progression_discrete.png b/data/themes/default/progression_discrete.png
index b28bb29c6c..5faf0e4aa5 100644
Binary files a/data/themes/default/progression_discrete.png and b/data/themes/default/progression_discrete.png differ
diff --git a/data/themes/default/progression_linear.png b/data/themes/default/progression_linear.png
index 8059e793fd..d6193e4f6b 100644
Binary files a/data/themes/default/progression_linear.png and b/data/themes/default/progression_linear.png differ
diff --git a/data/themes/default/project_export.png b/data/themes/default/project_export.png
index 999a415b4e..13c0b9d08a 100644
Binary files a/data/themes/default/project_export.png and b/data/themes/default/project_export.png differ
diff --git a/data/themes/default/project_new.png b/data/themes/default/project_new.png
index 828e07d0ec..489548b6bc 100644
Binary files a/data/themes/default/project_new.png and b/data/themes/default/project_new.png differ
diff --git a/data/themes/default/project_new_from_template.png b/data/themes/default/project_new_from_template.png
index 3d0f5cc1d5..1353505b9b 100644
Binary files a/data/themes/default/project_new_from_template.png and b/data/themes/default/project_new_from_template.png differ
diff --git a/data/themes/default/project_notes.png b/data/themes/default/project_notes.png
index 528a2bb361..6991b3a7ea 100644
Binary files a/data/themes/default/project_notes.png and b/data/themes/default/project_notes.png differ
diff --git a/data/themes/default/project_open.png b/data/themes/default/project_open.png
index 7422ad3338..7188b38949 100644
Binary files a/data/themes/default/project_open.png and b/data/themes/default/project_open.png differ
diff --git a/data/themes/default/project_open_recent.png b/data/themes/default/project_open_recent.png
index eb07bb20b0..4e57b3b827 100644
Binary files a/data/themes/default/project_open_recent.png and b/data/themes/default/project_open_recent.png differ
diff --git a/data/themes/default/project_save.png b/data/themes/default/project_save.png
index 7fa489c0fe..83c7fd7bd4 100644
Binary files a/data/themes/default/project_save.png and b/data/themes/default/project_save.png differ
diff --git a/data/themes/default/songeditor.png b/data/themes/default/songeditor.png
index 4f5203878e..1f7f39c66c 100644
Binary files a/data/themes/default/songeditor.png and b/data/themes/default/songeditor.png differ
diff --git a/data/themes/default/step_btn_off.png b/data/themes/default/step_btn_off.png
index 2948422e90..5e40d3e5a2 100644
Binary files a/data/themes/default/step_btn_off.png and b/data/themes/default/step_btn_off.png differ
diff --git a/data/themes/default/step_btn_off_light.png b/data/themes/default/step_btn_off_light.png
index c069d5e98d..f8f64bea85 100644
Binary files a/data/themes/default/step_btn_off_light.png and b/data/themes/default/step_btn_off_light.png differ
diff --git a/data/themes/default/step_btn_on.png b/data/themes/default/step_btn_on.png
index 7d520bc74c..fc7fde9f79 100644
Binary files a/data/themes/default/step_btn_on.png and b/data/themes/default/step_btn_on.png differ
diff --git a/data/themes/default/step_btn_on_100.png b/data/themes/default/step_btn_on_100.png
index d3b4f15f92..3d21b87c68 100644
Binary files a/data/themes/default/step_btn_on_100.png and b/data/themes/default/step_btn_on_100.png differ
diff --git a/data/themes/default/step_btn_on_yellow.png b/data/themes/default/step_btn_on_yellow.png
index 827a3ca1ab..cce0c10eda 100644
Binary files a/data/themes/default/step_btn_on_yellow.png and b/data/themes/default/step_btn_on_yellow.png differ
diff --git a/data/themes/default/style.css b/data/themes/default/style.css
index 0aed57e49e..006ff6164a 100644
--- a/data/themes/default/style.css
+++ b/data/themes/default/style.css
@@ -300,12 +300,12 @@ QTreeView {
 /* Plugins */
 
 TripleOscillatorView knob {
-	color: rgb(1, 114, 216);
+	color: rgb(1, 32, 64);
 	qproperty-outerColor: rgb(0, 0, 0);
-	qproperty-innerRadius: 1;
-	qproperty-outerRadius: 6.5;
-	qproperty-centerPointX: 13.5;
-	qproperty-centerPointY: 13.5;
+	qproperty-innerRadius: 2;
+	qproperty-outerRadius: 7;
+	qproperty-centerPointX: 13.0;
+	qproperty-centerPointY: 14.0;
 	qproperty-lineWidth: 2;
 }
 
diff --git a/plugins/triple_oscillator/artwork.png b/plugins/triple_oscillator/artwork.png
index 0c6db17685..e3ef38116a 100644
Binary files a/plugins/triple_oscillator/artwork.png and b/plugins/triple_oscillator/artwork.png differ
diff --git a/plugins/triple_oscillator/exp_shape_active.png b/plugins/triple_oscillator/exp_shape_active.png
index e9b1345348..af1f24a97a 100644
Binary files a/plugins/triple_oscillator/exp_shape_active.png and b/plugins/triple_oscillator/exp_shape_active.png differ
diff --git a/plugins/triple_oscillator/exp_shape_inactive.png b/plugins/triple_oscillator/exp_shape_inactive.png
index fb76a8e5d9..4444a8a41b 100644
Binary files a/plugins/triple_oscillator/exp_shape_inactive.png and b/plugins/triple_oscillator/exp_shape_inactive.png differ
diff --git a/plugins/triple_oscillator/fm_active.png b/plugins/triple_oscillator/fm_active.png
index a4a66dcc47..625f409338 100644
Binary files a/plugins/triple_oscillator/fm_active.png and b/plugins/triple_oscillator/fm_active.png differ
diff --git a/plugins/triple_oscillator/fm_inactive.png b/plugins/triple_oscillator/fm_inactive.png
index 2a12bf6708..daddc70bab 100644
Binary files a/plugins/triple_oscillator/fm_inactive.png and b/plugins/triple_oscillator/fm_inactive.png differ
diff --git a/plugins/triple_oscillator/mix_active.png b/plugins/triple_oscillator/mix_active.png
index 6eba8e39e8..9dd52e3b57 100644
Binary files a/plugins/triple_oscillator/mix_active.png and b/plugins/triple_oscillator/mix_active.png differ
diff --git a/plugins/triple_oscillator/mix_inactive.png b/plugins/triple_oscillator/mix_inactive.png
index 6138a11cdd..57814a8a63 100644
Binary files a/plugins/triple_oscillator/mix_inactive.png and b/plugins/triple_oscillator/mix_inactive.png differ
diff --git a/plugins/triple_oscillator/moog_saw_shape_active.png b/plugins/triple_oscillator/moog_saw_shape_active.png
index 79c78a9c8e..5cabc3bb2f 100644
Binary files a/plugins/triple_oscillator/moog_saw_shape_active.png and b/plugins/triple_oscillator/moog_saw_shape_active.png differ
diff --git a/plugins/triple_oscillator/moog_saw_shape_inactive.png b/plugins/triple_oscillator/moog_saw_shape_inactive.png
index f4bb000f8a..b07d863b4e 100644
Binary files a/plugins/triple_oscillator/moog_saw_shape_inactive.png and b/plugins/triple_oscillator/moog_saw_shape_inactive.png differ
diff --git a/plugins/triple_oscillator/pm_active.png b/plugins/triple_oscillator/pm_active.png
index cb37870f17..b8e9520728 100644
Binary files a/plugins/triple_oscillator/pm_active.png and b/plugins/triple_oscillator/pm_active.png differ
diff --git a/plugins/triple_oscillator/pm_inactive.png b/plugins/triple_oscillator/pm_inactive.png
index 8f9fd3ddc7..458f49bdba 100644
Binary files a/plugins/triple_oscillator/pm_inactive.png and b/plugins/triple_oscillator/pm_inactive.png differ
diff --git a/plugins/triple_oscillator/saw_shape_active.png b/plugins/triple_oscillator/saw_shape_active.png
index 2279f24d3a..88622a2ea2 100644
Binary files a/plugins/triple_oscillator/saw_shape_active.png and b/plugins/triple_oscillator/saw_shape_active.png differ
diff --git a/plugins/triple_oscillator/saw_shape_inactive.png b/plugins/triple_oscillator/saw_shape_inactive.png
index f7e679d54e..e28c5a3159 100644
Binary files a/plugins/triple_oscillator/saw_shape_inactive.png and b/plugins/triple_oscillator/saw_shape_inactive.png differ
diff --git a/plugins/triple_oscillator/sin_shape_active.png b/plugins/triple_oscillator/sin_shape_active.png
index 7bac6e4a55..0f51d6fbce 100644
Binary files a/plugins/triple_oscillator/sin_shape_active.png and b/plugins/triple_oscillator/sin_shape_active.png differ
diff --git a/plugins/triple_oscillator/sin_shape_inactive.png b/plugins/triple_oscillator/sin_shape_inactive.png
index 3a84f66af0..591e5a9b2c 100644
Binary files a/plugins/triple_oscillator/sin_shape_inactive.png and b/plugins/triple_oscillator/sin_shape_inactive.png differ
diff --git a/plugins/triple_oscillator/square_shape_active.png b/plugins/triple_oscillator/square_shape_active.png
index 7d686527c1..bfacc0cbb1 100644
Binary files a/plugins/triple_oscillator/square_shape_active.png and b/plugins/triple_oscillator/square_shape_active.png differ
diff --git a/plugins/triple_oscillator/square_shape_inactive.png b/plugins/triple_oscillator/square_shape_inactive.png
index f2990bf0c1..e8e1a16591 100644
Binary files a/plugins/triple_oscillator/square_shape_inactive.png and b/plugins/triple_oscillator/square_shape_inactive.png differ
diff --git a/plugins/triple_oscillator/sync_active.png b/plugins/triple_oscillator/sync_active.png
index cffd1b3d62..fa07bcfa7d 100644
Binary files a/plugins/triple_oscillator/sync_active.png and b/plugins/triple_oscillator/sync_active.png differ
diff --git a/plugins/triple_oscillator/sync_inactive.png b/plugins/triple_oscillator/sync_inactive.png
index b5bc4aea8a..579eceb123 100644
Binary files a/plugins/triple_oscillator/sync_inactive.png and b/plugins/triple_oscillator/sync_inactive.png differ
diff --git a/plugins/triple_oscillator/triangle_shape_active.png b/plugins/triple_oscillator/triangle_shape_active.png
index 97d0d1c30b..ad343d7bed 100644
Binary files a/plugins/triple_oscillator/triangle_shape_active.png and b/plugins/triple_oscillator/triangle_shape_active.png differ
diff --git a/plugins/triple_oscillator/triangle_shape_inactive.png b/plugins/triple_oscillator/triangle_shape_inactive.png
index a0199e8f27..e2ab7406d2 100644
Binary files a/plugins/triple_oscillator/triangle_shape_inactive.png and b/plugins/triple_oscillator/triangle_shape_inactive.png differ
diff --git a/plugins/triple_oscillator/usr_shape_active.png b/plugins/triple_oscillator/usr_shape_active.png
index ac6ea1f3c4..463aa6882d 100644
Binary files a/plugins/triple_oscillator/usr_shape_active.png and b/plugins/triple_oscillator/usr_shape_active.png differ
diff --git a/plugins/triple_oscillator/usr_shape_inactive.png b/plugins/triple_oscillator/usr_shape_inactive.png
index 53f1eb3dcb..923d6b2d80 100644
Binary files a/plugins/triple_oscillator/usr_shape_inactive.png and b/plugins/triple_oscillator/usr_shape_inactive.png differ
diff --git a/plugins/triple_oscillator/white_noise_shape_active.png b/plugins/triple_oscillator/white_noise_shape_active.png
index 83c44606ec..2cd52eaff7 100644
Binary files a/plugins/triple_oscillator/white_noise_shape_active.png and b/plugins/triple_oscillator/white_noise_shape_active.png differ
diff --git a/plugins/triple_oscillator/white_noise_shape_inactive.png b/plugins/triple_oscillator/white_noise_shape_inactive.png
index 19984f5866..c989dafc89 100644
Binary files a/plugins/triple_oscillator/white_noise_shape_inactive.png and b/plugins/triple_oscillator/white_noise_shape_inactive.png differ
diff --git a/src/gui/AutomationPatternView.cpp b/src/gui/AutomationPatternView.cpp
index c4d260c536..86dd1b2ccf 100644
--- a/src/gui/AutomationPatternView.cpp
+++ b/src/gui/AutomationPatternView.cpp
@@ -280,7 +280,7 @@ void AutomationPatternView::paintEvent( QPaintEvent * )
 	}
 	else
 	{
-		p.setPen( QColor( 0, 64, 255 ) );
+		p.setPen( QColor( 0, 180, 60 ) );
 	}
 
 	p.drawText( 2, p.fontMetrics().height() - 1, m_pat->name() );
diff --git a/src/gui/piano_roll.cpp b/src/gui/piano_roll.cpp
index 61aa435513..27ebbcacee 100644
--- a/src/gui/piano_roll.cpp
+++ b/src/gui/piano_roll.cpp
@@ -844,7 +844,7 @@ inline void pianoRoll::drawNoteRect( QPainter & _p, int _x, int _y,
 			( (float)( PanningRight - _n->getPanning() ) ) / 
 			( (float)( PanningRight - PanningLeft ) ) * 2.0f );
 
-	const QColor defaultNoteColor( 0x4A, 0xFD, 0x85 );
+	const QColor defaultNoteColor( 0x77, 0xC7, 0xD8 );
 	QColor col = defaultNoteColor;
 	
 	if( _n->length() < 0 )
@@ -2680,7 +2680,7 @@ static void printNoteHeights(QPainter& p, int bottom, int width, int startKey)
 	};
 
 	p.setFont( pointSize<KEY_LINE_HEIGHT-4>( p.font() ) );
-	p.setPen( QColor( 255, 255, 0 ) );
+	p.setPen( QColor( 255, 255, 255 ) );
 	for( int y = bottom, key = startKey; y > PR_TOP_MARGIN;
 			y -= KEY_LINE_HEIGHT, key++)
 	{
@@ -2924,7 +2924,7 @@ void pianoRoll::paintEvent( QPaintEvent * _pe )
 	QFont f = p.font();
 	f.setBold( false );
 	p.setFont( pointSize<10>( f ) );
-	p.setPen( QColor( 255, 255, 0 ) );
+	p.setPen( QColor( 255, 255, 255) );
 	p.drawText( QRect( 0, keyAreaBottom(), 
 					  WHITE_KEY_WIDTH, noteEditBottom() - keyAreaBottom() ),
 			   Qt::AlignCenter | Qt::TextWordWrap,
@@ -3072,7 +3072,7 @@ void pianoRoll::paintEvent( QPaintEvent * _pe )
 			int editHandleTop = 0;
 			if( m_noteEditMode == NoteEditVolume )
 			{
-				QColor color = QColor::fromHsv( 120, 221, 
+				QColor color = QColor::fromHsv( 140, 221, 
 						qMin(255, 60 + ( *it )->getVolume() ) );
 				if( ( *it )->selected() )
 				{
@@ -3091,7 +3091,7 @@ void pianoRoll::paintEvent( QPaintEvent * _pe )
 			}
 			else if( m_noteEditMode == NoteEditPanning )
 			{
-				QColor color( 0xFF, 0xB0, 0x00 );
+				QColor color( 0x99, 0xAF, 0xFF );
 				if( ( *it )->selected() )
 				{
 					color.setRgb( 0x00, 0x40, 0xC0 );
@@ -3119,7 +3119,7 @@ void pianoRoll::paintEvent( QPaintEvent * _pe )
 			}
 		}
 		
-		p.setPen( QPen( QColor( 0xEA, 0xA1, 0x00 ),
+		p.setPen( QPen( QColor( 0x99, 0xAF, 0xFF ),
 				NE_LINE_WIDTH+2 ) );
 		p.drawPoints( editHandles );
 		
diff --git a/src/tracks/pattern.cpp b/src/tracks/pattern.cpp
index 54c7ef41c3..06dc26622e 100644
--- a/src/tracks/pattern.cpp
+++ b/src/tracks/pattern.cpp
@@ -1271,7 +1271,7 @@ void patternView::paintEvent( QPaintEvent * )
 	}
 	else
 	{
-		p.setPen( QColor( 32, 240, 32 ) );
+		p.setPen( QColor( 32, 240, 101 ) );
 	}
 
 	if( m_pat->name() != m_pat->instrumentTrack()->name() )