diff --git a/data/themes/default/pause.png b/data/themes/default/pause.png
index c9b45d7d9..04725f997 100644
Binary files a/data/themes/default/pause.png and b/data/themes/default/pause.png differ
diff --git a/data/themes/default/play.png b/data/themes/default/play.png
index eea2cf9b6..ee66b4929 100644
Binary files a/data/themes/default/play.png and b/data/themes/default/play.png differ
diff --git a/data/themes/default/record.png b/data/themes/default/record.png
index 125107958..fc1d435d3 100644
Binary files a/data/themes/default/record.png and b/data/themes/default/record.png differ
diff --git a/data/themes/default/record_accompany.png b/data/themes/default/record_accompany.png
index 0dbbb91b9..7dd091a12 100644
Binary files a/data/themes/default/record_accompany.png and b/data/themes/default/record_accompany.png differ
diff --git a/data/themes/default/reload.png b/data/themes/default/reload.png
index 699153a93..c92882ecd 100644
Binary files a/data/themes/default/reload.png and b/data/themes/default/reload.png differ
diff --git a/data/themes/default/stop.png b/data/themes/default/stop.png
index 4e64f396c..2d204586a 100644
Binary files a/data/themes/default/stop.png and b/data/themes/default/stop.png differ
diff --git a/data/themes/default/style.css b/data/themes/default/style.css
index 54c9d9412..94a4b393c 100644
--- a/data/themes/default/style.css
+++ b/data/themes/default/style.css
@@ -1,4 +1,6 @@
-/* LMMS style sheet */
+/********************
+ * LMMS style sheet *
+ ********************/
 
 QWhatsThat {
 	color: black;
@@ -12,6 +14,7 @@ AutomationEditor {
 	background-color: rgb(0, 0, 0);
 }
 
+/* text box */
 
 QLineEdit {
 	border-radius: 4px;
@@ -20,6 +23,8 @@ QLineEdit {
 	color: #e0e0e0;
 }
 
+/* text box when it wants text */
+
 QLineEdit:focus {
 	border: 1px solid rgba(0,0,0, 128);
 }
@@ -89,6 +94,20 @@ pianoRoll {
 	background-color: rgb(0, 0, 0);
 }
 
+/* main toolbar oscilloscope - can have transparent bg now */
+
+visualizationWidget  {
+	background: none;
+	border: none;
+}
+
+/* main toolbar cpu load widget - this can have transparent bg now */
+
+cpuloadWidget {
+	border: none;
+	background: url(resources:cpuload_bg.png);
+}
+
 /* scrollbar: trough */
 
 QScrollBar:horizontal {
@@ -104,15 +123,6 @@ QScrollBar:vertical {
     margin: 13px 0px;
 }
 
-visualizationWidget  {
-	background: none;
-	border: none;
-}
-
-cpuloadWidget {
-	border: none;
-	background: url(resources:cpuload_bg.png);
-}
 /* scrollbar: trough clicky things */
 
 QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal,
@@ -130,7 +140,7 @@ QScrollBar::add-page:vertical:pressed, QScrollBar::sub-page:vertical:pressed {
 QScrollBar::handle:horizontal {
     background: qlineargradient(spread:reflect,
                      x1:0.5, y1:0, x2:0.5, y2:1,
-                     stop:0 #747474, stop:0.5 #c9c9c9, stop:1 #808080);
+                     stop:0 #969696, stop:0.5 #c9c9c9, stop:1 #aaa);
     border: 1px outset #888;
     border-radius: 2px;
     min-width: 24px;
@@ -139,7 +149,7 @@ QScrollBar::handle:horizontal {
 QScrollBar::handle:horizontal:hover {
     background: qlineargradient(spread:reflect,
                      x1:0.5, y1:0, x2:0.5, y2:1,
-                     stop:0 #747474, stop:0.5 #f0f0f0, stop:1 #808080);
+                     stop:0 #969696, stop:0.5 #f0f0f0, stop:1 #aaa);
 }
 
 QScrollBar::handle:horizontal:pressed {
@@ -151,7 +161,7 @@ QScrollBar::handle:horizontal:pressed {
 QScrollBar::handle:vertical {
     background: qlineargradient(spread:reflect,
                      x1:0, y1:0.5, x2:1, y2:0.5,
-                     stop:0 #747474, stop:0.5 #c9c9c9, stop:1 #808080);
+                     stop:0 #969696, stop:0.5 #c9c9c9, stop:1 #aaa);
     border: 1px outset #888;
     border-radius: 2px;
     min-height: 24px;
@@ -160,7 +170,7 @@ QScrollBar::handle:vertical {
 QScrollBar::handle:vertical:hover {
     background: qlineargradient(spread:reflect,
                      x1:0, y1:0.5, x2:1, y2:0.5,
-                     stop:0 #747474, stop:0.5 #f0f0f0, stop:1 #808080);
+                     stop:0 #969696, stop:0.5 #f0f0f0, stop:1 #aaa);
 }
 
 QScrollBar::handle:vertical:pressed {
@@ -201,6 +211,8 @@ QScrollBar::add-line:disabled, QScrollBar::sub-line:disabled {
 	background: #747474;
 }
 
+/* arrow button arrows */
+
 QScrollBar::left-arrow:horizontal, QScrollBar::right-arrow:horizontal,
 QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical {
     border: none;
@@ -218,18 +230,23 @@ QScrollBar::right-arrow:horizontal:disabled { background-image: url(resources:sb
 QScrollBar::up-arrow:vertical:disabled { background-image: url(resources:sbarrow_up_d.png);}
 QScrollBar::down-arrow:vertical:disabled { background-image: url(resources:sbarrow_down_d.png);}
 
+/* background for song editor and bb-editor */
 
 TrackContainerView QFrame{
 	background-color: #49515b;
 }
 
-nStateButton {
+/* autoscroll, loop, stop behaviour toggle buttons */
+
+nStateButton {	
 	max-height: 26px;
 	max-width: 26px;
 	min-height: 26px;
 	min-width: 26px;
 }
 
+/* gear button in tracks */
+
 trackOperationsWidget > QPushButton {
 	max-height: 26px;
 	max-width: 26px;
@@ -260,15 +277,19 @@ trackOperationsWidget > QPushButton::menu-indicator:checked
 	top: 3px;
 }
 
-trackWidget {
-/*	border-bottom: 1px solid rgb(0, 0, 0);*/
+/* actually has no effect yet so disabled */
+/*trackWidget {
+/*	border-bottom: 1px solid rgb(0, 0, 0);*//*
 	background-color: rgb(0, 0, 0);
-}
+}*/
+
+/* font sizes */
+
 nameLabel, effectLabel, sf2InstrumentView > QLabel {
 	font-size:10px;
 }
 
-
+/* main toolbar sliders (master vol, master pitch) */
 
 automatableSlider::groove:vertical {
 	background: rgba(0,0,0, 128);
@@ -287,11 +308,14 @@ automatableSlider::handle:vertical {
 	margin: -4px -12px -2px;
 }
 
+/* window that shows up when you add effects */
 
 EffectSelectDialog QScrollArea {
 	background: #5b6571;
 }
 
+/* the inner boxes in LADSPA effect windows */
+
 EffectControlDialog QGroupBox {
 	background: #49515b;
 	margin-top: 1ex;
@@ -300,6 +324,8 @@ EffectControlDialog QGroupBox {
 	border: 1px solid rgba(0,0,0, 64);
 }
 
+/* the inner box titles when present (channel 1, channel 2...) */
+
 EffectControlDialog QGroupBox::title {
 	subcontrol-origin: margin;
 	subcontrol-position: top left;
@@ -310,10 +336,14 @@ EffectControlDialog QGroupBox::title {
 	padding: 2px 1px;
 }
 
+/* main toolbar */
+
 QWidget#mainToolbar {
 	background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #98a2a7, stop:1 #5b646f);
 }
 
+/* smaller toolbars */
+
 QToolBar {
 	background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #98a2a7, stop:1 #5b646f);
 }
@@ -327,16 +357,22 @@ QToolButton, toolButton {
 	color: black;
 }
 
+/* separate corner rounding for play and stop buttons! */
+
 toolButton#playButton {
-	border-top-left-radius: 10px 6px;
-	border-bottom-left-radius: 10px 6px;
+	border-top-left-radius: 8px 6px;
+	border-bottom-left-radius: 8px 6px;
 }
 
 toolButton#stopButton {
-	border-top-right-radius: 10px 6px;
-	border-bottom-right-radius: 10px 6px;	
+	border-top-right-radius: 8px 6px;
+	border-bottom-right-radius: 8px 6px;	
 }
 
+/* record and record-accompany can be styled with #recordButton and #recordAccompanyButton respectively */
+
+/* all tool buttons */
+
 QToolButton:hover, toolButton:hover {
 	background: qradialgradient(cx:0.3, cy:0.3, radius:0.8, fx:0.3, fy:0.3, stop:0 #e0e0e0, stop:0.5 #c9c9c9, stop:1 #969696 );
 	border: 1px solid rgba(0,0,0,128);
@@ -358,6 +394,8 @@ QToolButton:checked, toolButton:checked  {
 	color: black;
 }
 
+/* track label buttons - the part that contains the icon and track title */
+
 trackLabelButton {
 	background-color: #5b6571;
 	color: #c9c9c9;
@@ -400,7 +438,7 @@ trackLabelButton:checked:pressed {
 	background: qlineargradient(spread:reflect, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 #49515b, stop:0.3 #5b6571, stop:1 #6b7581 );
 }
 
-
+/* sidebar, sidebar buttons */
 
 SideBar {
 	background: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop: 0 #98a2a7, stop: 1.0 #5b646f);
@@ -410,13 +448,16 @@ SideBar QToolButton {
 	font-size: 12px;
 }
 
+/* font sizes for text buttons */
+
 FxMixerView QPushButton, EffectRackView QPushButton, ControllerRackView QPushButton {
 	font-size: 10px;
 }
 
-timeLine {
+/* has no effect yet */
+/*timeLine {
 	font-size: 8px;
-}
+}*/
 
 QTreeView {
 	alternate-background-color: #747474;
@@ -522,9 +563,3 @@ palette:brighttext {color: #4afd85}
 palette:highlight {color: #202020}
 palette:highlightedtext {color: #ffffff}
 
-/* Notes:
-
-lcd-spinbox colors: (12, 250, 150), (37, 57, 42)
-
-
-*/
diff --git a/src/gui/widgets/knob.cpp b/src/gui/widgets/knob.cpp
index 44b4449b5..e03d2a6fc 100644
--- a/src/gui/widgets/knob.cpp
+++ b/src/gui/widgets/knob.cpp
@@ -352,6 +352,7 @@ void knob::drawKnob( QPainter * _p )
 		}
 		case knobDark_28:
 		{
+			p.setPen( QPen( QApplication::palette().color( QPalette::Active, QPalette::WindowText ), 2 ) );
 			const float rb = qMax<float>( ( radius - 10 ) / 3.0,
 									0.0 );
 			const float re = qMax<float>( ( radius - 4 ), 0.0 );