diff --git a/data/themes/default/effect_plugin.png b/data/themes/default/effect_plugin.png
index 188298b08..81b0e0519 100644
Binary files a/data/themes/default/effect_plugin.png and b/data/themes/default/effect_plugin.png differ
diff --git a/data/themes/default/knob02.png b/data/themes/default/knob02.png
index bd491a8d6..c4e84a314 100644
Binary files a/data/themes/default/knob02.png and b/data/themes/default/knob02.png differ
diff --git a/data/themes/default/knob03.png b/data/themes/default/knob03.png
index b663e9e38..d620272bf 100644
Binary files a/data/themes/default/knob03.png and b/data/themes/default/knob03.png differ
diff --git a/data/themes/default/style.css b/data/themes/default/style.css
index 8ca0a3925..0ef4dbdc4 100644
--- a/data/themes/default/style.css
+++ b/data/themes/default/style.css
@@ -173,7 +173,39 @@ automatableSlider::handle:vertical {
 	margin: -4px -12px -2px;
 }
 
+EffectRackView QScrollArea, EffectRackView QVBoxLayout  {
+    border-radius: 2px;
+    border: 1px solid rgba(0,0,0, 64);
+    background: #49515b;
+}
 
+EffectSelectDialog QScrollArea {
+	background: #5b6571;
+}
+
+ControllerRackView QScrollArea, ControllerRackView QVBoxLayout {
+    border-radius: 2px;
+    border: 1px solid rgba(0,0,0, 64);
+    background: #49515b;
+}
+
+EffectControlDialog QGroupBox {
+	background: #49515b;
+	margin-top: 1ex;
+	padding: 10px 2px 1px;
+	border-radius: 4px;
+	border: 1px solid rgba(0,0,0, 64);
+}
+
+EffectControlDialog QGroupBox::title {
+	subcontrol-origin: margin;
+	subcontrol-position: top left;
+	background: #5b6571;
+	color: white;
+	border-radius: 2px;
+	border: 1px solid rgba(0,0,0, 64);
+	padding: 2px 1px;
+}
 
 QWidget#mainToolbar {
 	background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #98a2a7, stop:1 #5b646f);
diff --git a/plugins/sid/artwork.png b/plugins/sid/artwork.png
index 06b4ab786..c1dbaaddd 100644
Binary files a/plugins/sid/artwork.png and b/plugins/sid/artwork.png differ
diff --git a/src/gui/widgets/knob.cpp b/src/gui/widgets/knob.cpp
index cc92850a9..320e274c4 100644
--- a/src/gui/widgets/knob.cpp
+++ b/src/gui/widgets/knob.cpp
@@ -328,18 +328,22 @@ void knob::drawKnob( QPainter * _p )
 				width() / 2 - m_knobPixmap->width() / 2 ), 0,
 				*m_knobPixmap );
 
-	p.setPen( QPen( QColor( 200, 0, 0 ), 2 ) );
+//	p.setPen( QPen( QColor( 200, 0, 0 ), 2 ) );
 	p.setRenderHint( QPainter::Antialiasing );
 
 	switch( m_knobNum )
 	{
 		case knobSmall_17:
 		{
-			p.drawLine( calculateLine( mid, radius ) );
+			p.setPen( QPen( QApplication::palette().color( QPalette::Active,
+							QPalette::WindowText ), 2 ) );
+			p.drawLine( calculateLine( mid, radius-2 ) );
 			break;
 		}
 		case knobBright_26:
 		{
+			p.setPen( QPen( QApplication::palette().color( QPalette::Active,
+							QPalette::WindowText ), 2 ) );
 			p.drawLine( calculateLine( mid, radius-5 ) );
 			break;
 		}
@@ -355,7 +359,8 @@ void knob::drawKnob( QPainter * _p )
 		}
 		case knobGreen_17:
 		{
-			p.setPen( QPen( QColor( 0, 200, 0 ), 2 ) );
+			p.setPen( QPen( QApplication::palette().color( QPalette::Active,
+							QPalette::BrightText, 2 ) );
 			p.drawLine( calculateLine( mid, radius ) );
 			break;
 		}