diff --git a/data/themes/default/style.css b/data/themes/default/style.css
index bab240bf3..572139dfc 100644
--- a/data/themes/default/style.css
+++ b/data/themes/default/style.css
@@ -245,6 +245,18 @@ nStateButton {
 	min-width: 26px;
 }
 
+/* track background colors */
+trackContentWidget {
+	qproperty-darkerColor1: rgb( 50, 50, 50 );
+	qproperty-darkerColor2: rgb( 20, 20, 20 );
+	qproperty-darkerColor3: rgb( 15, 15, 15 );
+	qproperty-lighterColor1: rgb( 50, 50, 50 );
+	qproperty-lighterColor2: rgb( 40, 40, 40 );
+	qproperty-lighterColor3: rgb( 30, 30, 30 );
+	qproperty-gradMidPoint: 0.33;
+}
+
+
 /* gear button in tracks */
 
 trackOperationsWidget > QPushButton {
@@ -472,16 +484,27 @@ TrackContainerView QLabel
 /* instrument pattern */
 patternView {
 	color: rgb( 119, 199, 216 );
+	qproperty-fgColor: rgb( 187, 227, 236 );
+	qproperty-textColor: rgb( 255, 255, 255 );
 }
 
 /* sample track pattern */
 SampleTCOView {
 	color: rgb( 74, 253, 133 );
+	qproperty-fgColor: rgb( 187, 227, 236 );
+	qproperty-textColor: rgb( 255, 60, 60 );	
 }
 
 /* automation pattern */
 AutomationPatternView {
 	color: #99afff;
+	qproperty-fgColor: rgb( 204, 215, 255 );
+	qproperty-textColor: rgb( 255, 255, 255 );
+}
+
+/* bb-pattern */
+bbTCOView {
+	qproperty-textColor: rgb( 255, 255, 255 );
 }
 
 /* Plugins */
diff --git a/include/AutomationPatternView.h b/include/AutomationPatternView.h
index 5d8bed1d4..73b2a7d9e 100644
--- a/include/AutomationPatternView.h
+++ b/include/AutomationPatternView.h
@@ -33,11 +33,15 @@ class AutomationPattern;
 class AutomationPatternView : public trackContentObjectView
 {
 	Q_OBJECT
+
+// theming qproperties
+	Q_PROPERTY( QColor fgColor READ fgColor WRITE setFgColor )
+	Q_PROPERTY( QColor textColor READ textColor WRITE setTextColor )
+
 public:
 	AutomationPatternView( AutomationPattern * _pat, trackView * _parent );
 	virtual ~AutomationPatternView();
 
-
 public slots:
 	virtual void update();
 
@@ -67,7 +71,6 @@ private:
 	bool m_needsUpdate;
 
 	void scaleTimemapToFit( float oldMin, float oldMax );
-
 } ;
 
 
diff --git a/include/SampleTrack.h b/include/SampleTrack.h
index 2afd9285b..a2e8f5b75 100644
--- a/include/SampleTrack.h
+++ b/include/SampleTrack.h
@@ -88,6 +88,11 @@ signals:
 class SampleTCOView : public trackContentObjectView
 {
 	Q_OBJECT
+	
+// theming qproperties
+	Q_PROPERTY( QColor fgColor READ fgColor WRITE setFgColor )
+	Q_PROPERTY( QColor textColor READ textColor WRITE setTextColor )
+
 public:
 	SampleTCOView( SampleTCO * _tco, trackView * _tv );
 	virtual ~SampleTCOView();
@@ -108,7 +113,6 @@ protected:
 
 private:
 	SampleTCO * m_tco;
-
 } ;
 
 
diff --git a/include/pattern.h b/include/pattern.h
index c3985ff7c..2fff9697e 100644
--- a/include/pattern.h
+++ b/include/pattern.h
@@ -147,6 +147,10 @@ private:
 class patternView : public trackContentObjectView
 {
 	Q_OBJECT
+
+// theming qproperties
+	Q_PROPERTY( QColor fgColor READ fgColor WRITE setFgColor )
+	Q_PROPERTY( QColor textColor READ textColor WRITE setTextColor )
 public:
 	patternView( pattern * _pattern, trackView * _parent );
 	virtual ~patternView();
@@ -185,7 +189,6 @@ private:
 	pattern * m_pat;
 	QPixmap m_paintPixmap;
 	bool m_needsUpdate;
-
 } ;
 
 
diff --git a/include/track.h b/include/track.h
index 47196e847..f1baa570d 100644
--- a/include/track.h
+++ b/include/track.h
@@ -29,6 +29,7 @@
 #include <QtCore/QVector>
 #include <QtCore/QList>
 #include <QtGui/QWidget>
+#include <QColor>
 
 #include "lmms_basics.h"
 #include "MidiTime.h"
@@ -162,6 +163,11 @@ private:
 class trackContentObjectView : public selectableObject, public ModelView
 {
 	Q_OBJECT
+
+// theming qproperties
+	Q_PROPERTY( QColor fgColor READ fgColor WRITE setFgColor )
+	Q_PROPERTY( QColor textColor READ textColor WRITE setTextColor )
+
 public:
 	trackContentObjectView( trackContentObject * _tco, trackView * _tv );
 	virtual ~trackContentObjectView();
@@ -172,7 +178,11 @@ public:
 	{
 		return m_tco;
 	}
-
+// qproperty access func
+	QColor fgColor() const;
+	QColor textColor() const;
+	void setFgColor( const QColor & _c );
+	void setTextColor( const QColor & _c );
 
 public slots:
 	virtual bool close();
@@ -227,6 +237,9 @@ private:
 
 	MidiTime m_oldTime;// used for undo/redo while mouse-button is pressed
 
+// qproperty fields
+	QColor * m_fgColor;
+	QColor * m_textColor;
 } ;
 
 
@@ -236,6 +249,18 @@ private:
 class trackContentWidget : public QWidget, public JournallingObject
 {
 	Q_OBJECT
+	
+	// qproperties for track background gradients
+	Q_PROPERTY( QColor darkerColor1 READ darkerColor1 WRITE setDarkerColor1 )
+	Q_PROPERTY( QColor darkerColor2 READ darkerColor2 WRITE setDarkerColor2 )
+	Q_PROPERTY( QColor darkerColor3 READ darkerColor3 WRITE setDarkerColor3 )
+	
+	Q_PROPERTY( QColor lighterColor1 READ lighterColor1 WRITE setLighterColor1 )
+	Q_PROPERTY( QColor lighterColor2 READ lighterColor2 WRITE setLighterColor2 )
+	Q_PROPERTY( QColor lighterColor3 READ lighterColor3 WRITE setLighterColor3 )
+	
+	Q_PROPERTY( float gradMidPoint READ gradMidPoint WRITE setGradMidPoint )
+	
 public:
 	trackContentWidget( trackView * _parent );
 	virtual ~trackContentWidget();
@@ -255,6 +280,28 @@ public:
 
 	MidiTime endPosition( const MidiTime & _pos_start );
 
+	// qproperty access methods
+
+	QColor darkerColor1() const;
+	QColor darkerColor2() const;
+	QColor darkerColor3() const;
+
+	QColor lighterColor1() const;
+	QColor lighterColor2() const;
+	QColor lighterColor3() const;
+
+	float gradMidPoint() const;
+	
+	void setDarkerColor1( const QColor & _c );
+	void setDarkerColor2( const QColor & _c );
+	void setDarkerColor3( const QColor & _c );
+	
+	void setLighterColor1( const QColor & _c );
+	void setLighterColor2( const QColor & _c );
+	void setLighterColor3( const QColor & _c );
+	
+	void setGradMidPoint( float _g );
+
 public slots:
 	void update();
 	void changePosition( const MidiTime & _new_pos = MidiTime( -1 ) );
@@ -295,6 +342,14 @@ private:
 
 	QPixmap m_background;
 
+	// qproperty fields
+	QColor * m_darkerColor1;
+	QColor * m_darkerColor2;
+	QColor * m_darkerColor3;
+	QColor * m_lighterColor1;
+	QColor * m_lighterColor2;
+	QColor * m_lighterColor3;
+	float m_gradMidPoint;
 } ;
 
 
diff --git a/plugins/monstro/Monstro.cpp b/plugins/monstro/Monstro.cpp
index 313bffb8c..465f0b859 100644
--- a/plugins/monstro/Monstro.cpp
+++ b/plugins/monstro/Monstro.cpp
@@ -72,21 +72,34 @@ MonstroSynth::MonstroSynth( MonstroInstrument * _i, NotePlayHandle * _nph,
 	m_lfo1_buf = new sample_t[_frames];
 	m_lfo2_buf = new sample_t[_frames];
 
-	m_osc1l_phase = 0.0;
-	m_osc1r_phase = 0.0;
-	m_osc2l_phase = 0.0;
-	m_osc2r_phase = 0.0;
-	m_osc3l_phase = 0.0;
-	m_osc3r_phase = 0.0;
+	m_osc1l_phase = 0.0f;
+	m_osc1r_phase = 0.0f;
+	m_osc2l_phase = 0.0f;
+	m_osc2r_phase = 0.0f;
+	m_osc3l_phase = 0.0f;
+	m_osc3r_phase = 0.0f;
 
-	m_env1_phase = 0.0;
-	m_env2_phase = 0.0;
+	m_env1_phase = 0.0f;
+	m_env2_phase = 0.0f;
 
-	m_lfo1_phase = 0.0;
-	m_lfo2_phase = 0.0;
+	m_lfo1_phase = 0.0f;
+	m_lfo2_phase = 0.0f;
 
-	m_osc1l_last = 0.0;
-	m_osc1r_last = 0.0;
+	m_osc1l_last = 0.0f;
+	m_osc1r_last = 0.0f;
+	
+	m_osc2l_last = 0.0f;
+	m_osc2r_last = 0.0f;
+	
+	m_osc3l_last = 0.0f;
+	m_osc3r_last = 0.0f;
+	
+	m_l_last = 0.0f;
+	m_r_last = 0.0f;
+
+// constants for very simple antialias/bandlimiting by amp delta capping
+	m_adcap1 = ADCAP1 / m_samplerate;
+	m_adcap2 = ADCAP2 / m_samplerate;
 }
 
 
@@ -104,37 +117,37 @@ void MonstroSynth::renderOutput( fpp_t _frames, sampleFrame * _buf  )
 {
 // macros for modulating with env/lfos
 #define modulatefreq( car, mod ) \
-		if( mod##_e1 != 0.0 ) car = qBound( MIN_FREQ, car * powf( 2.0, m_env1_buf[f] * mod##_e1 * 2 ), MAX_FREQ );	\
-		if( mod##_e2 != 0.0 ) car = qBound( MIN_FREQ, car * powf( 2.0, m_env2_buf[f] * mod##_e2 * 2 ), MAX_FREQ );	\
-		if( mod##_l1 != 0.0 ) car = qBound( MIN_FREQ, car * powf( 2.0, m_lfo1_buf[f] * mod##_l1 ), MAX_FREQ );	\
-		if( mod##_l2 != 0.0 ) car = qBound( MIN_FREQ, car * powf( 2.0, m_lfo2_buf[f] * mod##_l2 ), MAX_FREQ );
+		if( mod##_e1 != 0.0f ) car = qBound( MIN_FREQ, car * powf( 2.0f, m_env1_buf[f] * mod##_e1 * 2.0f ), MAX_FREQ );	\
+		if( mod##_e2 != 0.0f ) car = qBound( MIN_FREQ, car * powf( 2.0f, m_env2_buf[f] * mod##_e2 * 2.0f ), MAX_FREQ );	\
+		if( mod##_l1 != 0.0f ) car = qBound( MIN_FREQ, car * powf( 2.0f, m_lfo1_buf[f] * mod##_l1 ), MAX_FREQ );	\
+		if( mod##_l2 != 0.0f ) car = qBound( MIN_FREQ, car * powf( 2.0f, m_lfo2_buf[f] * mod##_l2 ), MAX_FREQ );
 
 #define modulateabs( car, mod ) \
-		if( mod##_e1 != 0.0 ) car = qBound( 0.0f, car + mod##_e1 * m_env1_buf[f], 1.0f );	\
-		if( mod##_e2 != 0.0 ) car = qBound( 0.0f, car + mod##_e2 * m_env2_buf[f], 1.0f );	\
-		if( mod##_l1 != 0.0 ) car = qBound( 0.0f, car + mod##_l1 / 2 * m_lfo1_buf[f], 1.0f );	\
-		if( mod##_l2 != 0.0 ) car = qBound( 0.0f, car + mod##_l2 / 2 * m_lfo2_buf[f], 1.0f );
+		if( mod##_e1 != 0.0f ) car = qBound( 0.0f, car + mod##_e1 * m_env1_buf[f], 1.0f );	\
+		if( mod##_e2 != 0.0f ) car = qBound( 0.0f, car + mod##_e2 * m_env2_buf[f], 1.0f );	\
+		if( mod##_l1 != 0.0f ) car = qBound( 0.0f, car + mod##_l1 * 0.5f * m_lfo1_buf[f], 1.0f );	\
+		if( mod##_l2 != 0.0f ) car = qBound( 0.0f, car + mod##_l2 * 0.5f * m_lfo2_buf[f], 1.0f );
 
 #define modulatephs( car, mod ) \
-		if( mod##_e1 != 0.0 ) car = fraction( car + mod##_e1 * m_env1_buf[f] );	\
-		if( mod##_e2 != 0.0 ) car = fraction( car + mod##_e2 * m_env2_buf[f] );	\
-		if( mod##_l1 != 0.0 ) car = fraction( car + mod##_l1 / 2 * m_lfo1_buf[f] );	\
-		if( mod##_l2 != 0.0 ) car = fraction( car + mod##_l2 / 2 * m_lfo2_buf[f] );
+		if( mod##_e1 != 0.0f ) car += ( mod##_e1 * m_env1_buf[f] );	\
+		if( mod##_e2 != 0.0f ) car += ( mod##_e2 * m_env2_buf[f] );	\
+		if( mod##_l1 != 0.0f ) car += ( mod##_l1 * 0.5f * m_lfo1_buf[f] );	\
+		if( mod##_l2 != 0.0f ) car += ( mod##_l2 * 0.5f * m_lfo2_buf[f] );
 
 #define modulatevol( car, mod ) \
-		if( mod##_e1 > 0.0 ) car = qBound( 0.0f, car * ( 1.0f - mod##_e1 + mod##_e1 * m_env1_buf[f] ), MODCLIP );	\
-		if( mod##_e1 < 0.0 ) car = qBound( 0.0f, car * ( 1.0f + mod##_e1 * m_env1_buf[f] ), MODCLIP );	\
-		if( mod##_e2 > 0.0 ) car = qBound( 0.0f, car * ( 1.0f - mod##_e2 + mod##_e2 * m_env2_buf[f] ), MODCLIP );	\
-		if( mod##_e2 < 0.0 ) car = qBound( 0.0f, car * ( 1.0f + mod##_e2 * m_env2_buf[f] ), MODCLIP );	\
-		if( mod##_l1 != 0.0 ) car = qBound( 0.0f, car * ( 1.0f + mod##_l1 * m_lfo1_buf[f] ), MODCLIP );	\
-		if( mod##_l2 != 0.0 ) car = qBound( 0.0f, car * ( 1.0f + mod##_l2 * m_lfo2_buf[f] ), MODCLIP );
+		if( mod##_e1 > 0.0f ) car = qBound( 0.0f, car * ( 1.0f - mod##_e1 + mod##_e1 * m_env1_buf[f] ), MODCLIP );	\
+		if( mod##_e1 < 0.0f ) car = qBound( 0.0f, car * ( 1.0f + mod##_e1 * m_env1_buf[f] ), MODCLIP );	\
+		if( mod##_e2 > 0.0f ) car = qBound( 0.0f, car * ( 1.0f - mod##_e2 + mod##_e2 * m_env2_buf[f] ), MODCLIP );	\
+		if( mod##_e2 < 0.0f ) car = qBound( 0.0f, car * ( 1.0f + mod##_e2 * m_env2_buf[f] ), MODCLIP );	\
+		if( mod##_l1 != 0.0f ) car = qBound( 0.0f, car * ( 1.0f + mod##_l1 * m_lfo1_buf[f] ), MODCLIP );	\
+		if( mod##_l2 != 0.0f ) car = qBound( 0.0f, car * ( 1.0f + mod##_l2 * m_lfo2_buf[f] ), MODCLIP );
 
 	// pre-render env's and lfo's
 	renderModulators( _frames );
 
 	// get updated osc1 values
 	// get pulse width
-	const float pw = ( m_parent->m_osc1Pw.value() / 100.0 );
+	const float pw = ( m_parent->m_osc1Pw.value() / 100.0f );
 	const float o1pw_e1 = ( m_parent->m_pw1env1.value() );
 	const float o1pw_e2 = ( m_parent->m_pw1env2.value() );
 	const float o1pw_l1 = ( m_parent->m_pw1lfo1.value() );
@@ -223,7 +236,7 @@ void MonstroSynth::renderOutput( fpp_t _frames, sampleFrame * _buf  )
 	const float o3v_l2 = ( m_parent->m_vol3lfo2.value() );
 
 	// get sub
-	const float o3sub = ( m_parent->m_osc3Sub.value() + 100.0 ) / 200.0;
+	const float o3sub = ( m_parent->m_osc3Sub.value() + 100.0f ) / 200.0f;
 	const float o3s_e1 = ( m_parent->m_sub3env1.value() );
 	const float o3s_e2 = ( m_parent->m_sub3env2.value() );
 	const float o3s_l1 = ( m_parent->m_sub3lfo1.value() );
@@ -241,6 +254,7 @@ void MonstroSynth::renderOutput( fpp_t _frames, sampleFrame * _buf  )
 	const bool o2sync = m_parent->m_osc2Sync.value();
 	const bool o3sync = m_parent->m_osc3Sync.value();
 
+
 	///////////////////////////
 	//                       //
 	// 	 start buffer loop   //
@@ -248,7 +262,28 @@ void MonstroSynth::renderOutput( fpp_t _frames, sampleFrame * _buf  )
 	///////////////////////////
 
 
+	// declare variables for for loop
+	// osc1 vars
+	float o1l_f;
+	float o1r_f;
+	float o1l_p;
+	float o1r_p;
+	float o1_pw;
+	
+	// osc2 vars
+	float o2l_f;
+	float o2r_f;
+	float o2l_p;
+	float o2r_p;
+	
+	// osc3 vars
+	float o3l_f;
+	float o3r_f;
+	float o3l_p;
+	float o3r_p;
+	float sub;
 
+	// begin for loop
 	for( f_cnt_t f = 0; f < _frames; f++ )
 	{
 
@@ -267,50 +302,70 @@ void MonstroSynth::renderOutput( fpp_t _frames, sampleFrame * _buf  )
 		//				           //
 		/////////////////////////////
 
-		// sync send "signals"
-		bool syncl = false;
-		bool syncr = false;
-
 		// calc and mod frequencies
-		float o1l_f = o1lfb;
-		float o1r_f = o1rfb;
+		o1l_f = o1lfb;
+		o1r_f = o1rfb;
 		modulatefreq( o1l_f, o1f )
 		modulatefreq( o1r_f, o1f )
 
 		// calc and modulate phase
-		float o1l_p = m_osc1l_phase + o1lpo;
-		float o1r_p = m_osc1r_phase + o1rpo;
+		o1l_p = m_osc1l_phase + o1lpo;
+		o1r_p = m_osc1r_phase + o1rpo;
 		modulatephs( o1l_p, o1p )
 		modulatephs( o1r_p, o1p )
 
 		// calc and modulate pulse
-		float o1_pw = pw;
+		o1_pw = pw;
 		modulateabs( o1_pw, o1pw )
 
 		// bounds check for phase
-		if( o1l_p < 0 ) o1l_p += 1.0f;
-		if( o1r_p < 0 ) o1r_p += 1.0f;
-
+		if( o1l_p < 0 ) o1l_p -= floorf( o1l_p );
+		if( o1r_p < 0 ) o1r_p -= floorf( o1r_p );
+		
 		// pulse wave osc
-		sample_t O1L = ( o1l_p < o1_pw ) ? 1.0f : -1.0f;
-		sample_t O1R = ( o1r_p < o1_pw ) ? 1.0f : -1.0f;
+		sample_t O1L = ( fraction( o1l_p ) < o1_pw ) ? 1.0f : -1.0f;
+		sample_t O1R = ( fraction( o1r_p ) < o1_pw ) ? 1.0f : -1.0f;
 
-		// check for rise/fall, and "send" sync if appropriate
+		// check for rise/fall, and sync if appropriate
 		// sync on rise
 		if( o1ssr )
 		{
-			if( O1L > m_osc1l_last ) syncl = true;
-			if( O1R > m_osc1r_last ) syncr = true;
+			if( o2sync )
+			{
+				if( O1L > m_osc1l_last ) m_osc2l_phase = 0.0f;
+				if( O1R > m_osc1r_last ) m_osc2r_phase = 0.0f;
+			}		
+			if( o3sync )
+			{
+				if( O1L > m_osc1l_last ) m_osc3l_phase = 0.0f;
+				if( O1R > m_osc1r_last ) m_osc3r_phase = 0.0f;
+			}
 		}
+		// sync on fall
 		if( o1ssf )
 		{
-			if( O1L < m_osc1l_last ) syncl = true;
-			if( O1R < m_osc1r_last ) syncr = true;
+			if( o2sync )
+			{
+				if( O1L < m_osc1l_last ) m_osc2l_phase = 0.0f;
+				if( O1R < m_osc1r_last ) m_osc2r_phase = 0.0f;
+			}		
+			if( o3sync )
+			{
+				if( O1L < m_osc1l_last ) m_osc3l_phase = 0.0f;
+				if( O1R < m_osc1r_last ) m_osc3r_phase = 0.0f;
+			}
 		}
 
 		// update last before signal is touched
+		// also do a very simplistic amp delta cap - it's a pulse wave signal so we won't care about it too much...
+		const sample_t tmpl = m_osc1l_last;
+		const sample_t tmpr = m_osc1r_last;
+
 		m_osc1l_last = O1L;
 		m_osc1r_last = O1R;
+		
+		if( tmpl != O1L ) O1L = 0.0f;
+		if( tmpr != O1R ) O1R = 0.0f;
 
 		// modulate volume
 		O1L *= o1lv;
@@ -329,32 +384,31 @@ void MonstroSynth::renderOutput( fpp_t _frames, sampleFrame * _buf  )
 		/////////////////////////////
 
 		// calc and mod frequencies
-		float o2l_f = o2lfb;
-		float o2r_f = o2rfb;
+		o2l_f = o2lfb;
+		o2r_f = o2rfb;
 		modulatefreq( o2l_f, o2f )
 		modulatefreq( o2r_f, o2f )
 
-		// check for sync
-		if( o2sync )
-		{
-			if( syncl ) m_osc2l_phase = 0.0f;
-			if( syncr ) m_osc2r_phase = 0.0f;
-		}
-
 		// calc and modulate phase
-		float o2l_p = m_osc2l_phase + o2lpo;
-		float o2r_p = m_osc2r_phase + o2rpo;
+		o2l_p = m_osc2l_phase + o2lpo;
+		o2r_p = m_osc2r_phase + o2rpo;
 		modulatephs( o2l_p, o2p )
 		modulatephs( o2r_p, o2p )
 
 		// bounds check for phase
-		if( o2l_p < 0 ) o2l_p += 1.0f;
-		if( o2r_p < 0 ) o2r_p += 1.0f;
+		if( o2l_p < 0 ) o2l_p -= floorf( o2l_p );
+		if( o2r_p < 0 ) o2r_p -= floorf( o2r_p );
 
 		// multi-wave DC Oscillator
 		sample_t O2L = oscillate( o2w, o2l_p );
 		sample_t O2R = oscillate( o2w, o2r_p );
 
+		// do simple alias reduction filtering before volume is touched, by capping amplitude delta
+		O2L = qBound( m_osc2l_last - m_adcap1, O2L, m_osc2l_last + m_adcap1 );
+		O2R = qBound( m_osc2r_last - m_adcap1, O2R, m_osc2r_last + m_adcap1 );
+		m_osc2l_last = O2L;
+		m_osc2r_last = O2R;
+
 		// modulate volume
 		O2L *= o2lv;
 		O2R *= o2rv;
@@ -372,8 +426,8 @@ void MonstroSynth::renderOutput( fpp_t _frames, sampleFrame * _buf  )
 		/////////////////////////////
 
 		// calc and mod frequencies
-		float o3l_f = o3fb;
-		float o3r_f = o3fb;
+		o3l_f = o3fb;
+		o3r_f = o3fb;
 		modulatefreq( o3l_f, o3f )
 		modulatefreq( o3r_f, o3f )
 		// o2 modulation?
@@ -383,16 +437,9 @@ void MonstroSynth::renderOutput( fpp_t _frames, sampleFrame * _buf  )
 			o3r_f = qBound( MIN_FREQ, o3r_f * powf( 2.0f, O2R * 2 ), MAX_FREQ );
 		}
 
-		// check for sync
-		if( o3sync )
-		{
-			if( syncl ) m_osc3l_phase = 0.0f;
-			if( syncr ) m_osc3r_phase = 0.0f;
-		}
-
 		// calc and modulate phase
-		float o3l_p = m_osc3l_phase + o3lpo;
-		float o3r_p = m_osc3r_phase + o3rpo;
+		o3l_p = m_osc3l_phase + o3lpo;
+		o3r_p = m_osc3r_phase + o3rpo;
 		modulatephs( o3l_p, o3p )
 		modulatephs( o3r_p, o3p )
 		// o2 modulation?
@@ -403,8 +450,8 @@ void MonstroSynth::renderOutput( fpp_t _frames, sampleFrame * _buf  )
 		}
 
 		// bounds check for phase
-		if( o3l_p < 0 ) o3l_p += 1.0f;
-		if( o3r_p < 0 ) o3r_p += 1.0f;
+		if( o3l_p < 0 ) o3l_p -= floorf( o3l_p );
+		if( o3r_p < 0 ) o3r_p -= floorf( o3r_p );
 
 		// multi-wave DC Oscillator, sub-osc 1
 		sample_t O3AL = oscillate( o3w1, o3l_p );
@@ -415,12 +462,18 @@ void MonstroSynth::renderOutput( fpp_t _frames, sampleFrame * _buf  )
 		sample_t O3BR = oscillate( o3w2, o3r_p );
 
 		// calc and modulate sub
-		float sub = o3sub;
+		sub = o3sub;
 		modulateabs( sub, o3s )
 
 		sample_t O3L = linearInterpolate( O3AL, O3BL, sub );
 		sample_t O3R = linearInterpolate( O3AR, O3BR, sub );
 
+		// do very simple bandlimit filtering by amp delta capping, before volume is touched
+		O3L = qBound( m_osc3l_last - m_adcap1, O3L, m_osc3l_last + m_adcap1 );
+		O3R = qBound( m_osc3r_last - m_adcap1, O3R, m_osc3r_last + m_adcap1 );
+		m_osc3l_last = O3L;
+		m_osc3r_last = O3R;
+
 		// modulate volume
 		O3L *= o3lv;
 		O3R *= o3rv;
@@ -437,8 +490,18 @@ void MonstroSynth::renderOutput( fpp_t _frames, sampleFrame * _buf  )
 		m_osc3l_phase = fraction( m_osc3l_phase + 1.0f / ( static_cast<float>( m_samplerate ) / o3l_f ) );
 		m_osc3r_phase = fraction( m_osc3r_phase + 1.0f / ( static_cast<float>( m_samplerate ) / o3r_f ) );
 
-		_buf[f][0] = O1L + O3L + ( omod == MOD_MIX ? O2L : 0.0f );
-		_buf[f][1] = O1R + O3R + ( omod == MOD_MIX ? O2R : 0.0f );
+		// simple bandlimiting
+		sample_t L = O1L + O3L + ( omod == MOD_MIX ? O2L : 0.0f );
+		sample_t R = O1R + O3R + ( omod == MOD_MIX ? O2R : 0.0f );
+
+		L = qBound( m_l_last - m_adcap2, L, m_l_last + m_adcap2 );
+		R = qBound( m_r_last - m_adcap2, R, m_r_last + m_adcap2 );
+
+		_buf[f][0] = L;
+		_buf[f][1] = R;
+		
+		m_l_last = L;
+		m_r_last = R;
 	}
 }
 
@@ -476,7 +539,7 @@ void MonstroSynth::renderModulators( fpp_t _frames )
 					lfo1_s = Oscillator::sinSample( ph );
 					if( t < m_parent->m_lfo1_att ) lfo1_s *= ( static_cast<sample_t>( t ) / m_parent-> m_lfo1_att );
 					m_lfo1_buf[f] = lfo1_s;
-					m_lfo1_phase += 1.0 / lfo1_r;
+					m_lfo1_phase += 1.0f / lfo1_r;
 				}
 				break;
 		case WAVE_TRI:
@@ -487,7 +550,7 @@ void MonstroSynth::renderModulators( fpp_t _frames )
 					lfo1_s = Oscillator::triangleSample( ph );
 					if( t < m_parent->m_lfo1_att ) lfo1_s *= ( static_cast<sample_t>( t ) / m_parent->m_lfo1_att );
 					m_lfo1_buf[f] = lfo1_s;
-					m_lfo1_phase += 1.0 / lfo1_r;
+					m_lfo1_phase += 1.0f / lfo1_r;
 				}
 				break;
 		case WAVE_SAW:
@@ -498,7 +561,7 @@ void MonstroSynth::renderModulators( fpp_t _frames )
 					lfo1_s = Oscillator::sawSample( ph );
 					if( t < m_parent->m_lfo1_att ) lfo1_s *= ( static_cast<sample_t>( t ) / m_parent->m_lfo1_att );
 					m_lfo1_buf[f] = lfo1_s;
-					m_lfo1_phase += 1.0 / lfo1_r;
+					m_lfo1_phase += 1.0f / lfo1_r;
 				}
 				break;
 		case WAVE_RAMP:
@@ -509,7 +572,7 @@ void MonstroSynth::renderModulators( fpp_t _frames )
 					lfo1_s = Oscillator::sawSample( ph ) * -1.0f;
 					if( t < m_parent->m_lfo1_att ) lfo1_s *= ( static_cast<sample_t>( t ) / m_parent->m_lfo1_att );
 					m_lfo1_buf[f] = lfo1_s;
-					m_lfo1_phase += 1.0 / lfo1_r;
+					m_lfo1_phase += 1.0f / lfo1_r;
 				}
 				break;
 		case WAVE_SQR:
@@ -520,7 +583,7 @@ void MonstroSynth::renderModulators( fpp_t _frames )
 					lfo1_s = Oscillator::squareSample( ph );
 					if( t < m_parent->m_lfo1_att ) lfo1_s *= ( static_cast<sample_t>( t ) / m_parent->m_lfo1_att );
 					m_lfo1_buf[f] = lfo1_s;
-					m_lfo1_phase += 1.0 / lfo1_r;
+					m_lfo1_phase += 1.0f / lfo1_r;
 				}
 				break;
 		case WAVE_SQRSOFT:
@@ -531,7 +594,7 @@ void MonstroSynth::renderModulators( fpp_t _frames )
 					lfo1_s = oscillate( WAVE_SQRSOFT, ph );
 					if( t < m_parent->m_lfo1_att ) lfo1_s *= ( static_cast<sample_t>( t ) / m_parent->m_lfo1_att );
 					m_lfo1_buf[f] = lfo1_s;
-					m_lfo1_phase += 1.0 / lfo1_r;
+					m_lfo1_phase += 1.0f / lfo1_r;
 				}
 				break;
 		case WAVE_MOOG:
@@ -542,7 +605,7 @@ void MonstroSynth::renderModulators( fpp_t _frames )
 					lfo1_s = Oscillator::moogSawSample( ph );
 					if( t < m_parent->m_lfo1_att ) lfo1_s *= ( static_cast<sample_t>( t ) / m_parent->m_lfo1_att );
 					m_lfo1_buf[f] = lfo1_s;
-					m_lfo1_phase += 1.0 / lfo1_r;
+					m_lfo1_phase += 1.0f / lfo1_r;
 				}
 				break;
 		case WAVE_SINABS:
@@ -553,7 +616,7 @@ void MonstroSynth::renderModulators( fpp_t _frames )
 					lfo1_s = oscillate( WAVE_SINABS, ph );
 					if( t < m_parent->m_lfo1_att ) lfo1_s *= ( static_cast<sample_t>( t ) / m_parent->m_lfo1_att );
 					m_lfo1_buf[f] = lfo1_s;
-					m_lfo1_phase += 1.0 / lfo1_r;
+					m_lfo1_phase += 1.0f / lfo1_r;
 				}
 				break;
 		case WAVE_EXP:
@@ -564,7 +627,7 @@ void MonstroSynth::renderModulators( fpp_t _frames )
 					lfo1_s = Oscillator::expSample( ph );
 					if( t < m_parent->m_lfo1_att ) lfo1_s *= ( static_cast<sample_t>( t ) / m_parent-> m_lfo1_att );
 					m_lfo1_buf[f] = lfo1_s;
-					m_lfo1_phase += 1.0 / lfo1_r;
+					m_lfo1_phase += 1.0f / lfo1_r;
 				}
 				break;
 		case WAVE_NOISE:
@@ -576,7 +639,7 @@ void MonstroSynth::renderModulators( fpp_t _frames )
 					lfo1_s = m_lfo1_last;
 					if( t < m_parent->m_lfo1_att ) lfo1_s *= ( static_cast<sample_t>( t ) / m_parent->m_lfo1_att );
 					m_lfo1_buf[f] = lfo1_s;
-					m_lfo1_phase += 1.0 / lfo1_r;
+					m_lfo1_phase += 1.0f / lfo1_r;
 				}
 				break;
 	}
@@ -593,7 +656,7 @@ void MonstroSynth::renderModulators( fpp_t _frames )
 					lfo2_s = Oscillator::sinSample( ph );
 					if( t < m_parent->m_lfo2_att ) lfo2_s *= ( static_cast<sample_t>( t ) / m_parent-> m_lfo2_att );
 					m_lfo2_buf[f] = lfo2_s;
-					m_lfo2_phase += 1.0 / lfo2_r;
+					m_lfo2_phase += 1.0f / lfo2_r;
 				}
 				break;
 		case WAVE_TRI:
@@ -604,7 +667,7 @@ void MonstroSynth::renderModulators( fpp_t _frames )
 					lfo2_s = Oscillator::triangleSample( ph );
 					if( t < m_parent->m_lfo2_att ) lfo2_s *= ( static_cast<sample_t>( t ) / m_parent->m_lfo2_att );
 					m_lfo2_buf[f] = lfo2_s;
-					m_lfo2_phase += 1.0 / lfo2_r;
+					m_lfo2_phase += 1.0f / lfo2_r;
 				}
 				break;
 		case WAVE_SAW:
@@ -615,7 +678,7 @@ void MonstroSynth::renderModulators( fpp_t _frames )
 					lfo2_s = Oscillator::sawSample( ph );
 					if( t < m_parent->m_lfo2_att ) lfo2_s *= ( static_cast<sample_t>( t ) / m_parent->m_lfo2_att );
 					m_lfo2_buf[f] = lfo2_s;
-					m_lfo2_phase += 1.0 / lfo2_r;
+					m_lfo2_phase += 1.0f / lfo2_r;
 				}
 				break;
 		case WAVE_RAMP:
@@ -626,7 +689,7 @@ void MonstroSynth::renderModulators( fpp_t _frames )
 					lfo2_s = Oscillator::sawSample( ph ) * -1.0f;
 					if( t < m_parent->m_lfo2_att ) lfo2_s *= ( static_cast<sample_t>( t ) / m_parent->m_lfo2_att );
 					m_lfo2_buf[f] = lfo2_s;
-					m_lfo2_phase += 1.0 / lfo2_r;
+					m_lfo2_phase += 1.0f / lfo2_r;
 				}
 				break;
 		case WAVE_SQR:
@@ -637,7 +700,7 @@ void MonstroSynth::renderModulators( fpp_t _frames )
 					lfo2_s = Oscillator::squareSample( ph );
 					if( t < m_parent->m_lfo2_att ) lfo2_s *= ( static_cast<sample_t>( t ) / m_parent->m_lfo2_att );
 					m_lfo2_buf[f] = lfo2_s;
-					m_lfo2_phase += 1.0 / lfo2_r;
+					m_lfo2_phase += 1.0f / lfo2_r;
 				}
 				break;
 		case WAVE_SQRSOFT:
@@ -648,7 +711,7 @@ void MonstroSynth::renderModulators( fpp_t _frames )
 					lfo2_s = oscillate( WAVE_SQRSOFT, ph );
 					if( t < m_parent->m_lfo2_att ) lfo2_s *= ( static_cast<sample_t>( t ) / m_parent->m_lfo2_att );
 					m_lfo2_buf[f] = lfo2_s;
-					m_lfo2_phase += 1.0 / lfo2_r;
+					m_lfo2_phase += 1.0f / lfo2_r;
 				}
 				break;
 		case WAVE_MOOG:
@@ -659,7 +722,7 @@ void MonstroSynth::renderModulators( fpp_t _frames )
 					lfo2_s = Oscillator::moogSawSample( ph );
 					if( t < m_parent->m_lfo2_att ) lfo2_s *= ( static_cast<sample_t>( t ) / m_parent->m_lfo2_att );
 					m_lfo2_buf[f] = lfo2_s;
-					m_lfo2_phase += 1.0 / lfo2_r;
+					m_lfo2_phase += 1.0f / lfo2_r;
 				}
 				break;
 		case WAVE_SINABS:
@@ -670,7 +733,7 @@ void MonstroSynth::renderModulators( fpp_t _frames )
 					lfo2_s = oscillate( WAVE_SINABS, ph );
 					if( t < m_parent->m_lfo2_att ) lfo2_s *= ( static_cast<sample_t>( t ) / m_parent->m_lfo2_att );
 					m_lfo2_buf[f] = lfo2_s;
-					m_lfo2_phase += 1.0 / lfo2_r;
+					m_lfo2_phase += 1.0f / lfo2_r;
 				}
 				break;
 		case WAVE_EXP:
@@ -681,7 +744,7 @@ void MonstroSynth::renderModulators( fpp_t _frames )
 					lfo2_s = Oscillator::expSample( ph );
 					if( t < m_parent->m_lfo2_att ) lfo2_s *= ( static_cast<sample_t>( t ) / m_parent-> m_lfo2_att );
 					m_lfo2_buf[f] = lfo2_s;
-					m_lfo2_phase += 1.0 / lfo2_r;
+					m_lfo2_phase += 1.0f / lfo2_r;
 				}
 				break;
 		case WAVE_NOISE:
@@ -693,7 +756,7 @@ void MonstroSynth::renderModulators( fpp_t _frames )
 					lfo2_s = m_lfo2_last;
 					if( t < m_parent->m_lfo2_att ) lfo2_s *= ( static_cast<sample_t>( t ) / m_parent->m_lfo2_att );
 					m_lfo2_buf[f] = lfo2_s;
-					m_lfo2_phase += 1.0 / lfo2_r;
+					m_lfo2_phase += 1.0f / lfo2_r;
 				}
 				break;
 	}
@@ -863,18 +926,18 @@ MonstroInstrument::MonstroInstrument( InstrumentTrack * _instrument_track ) :
 
 		m_env1Pre( 0.0f, 0.0f, 2000.0f, 1.0f, 2000.0f, this, tr( "Env 1 Pre-delay" ) ),
 		m_env1Att( 0.0f, 0.0f, 2000.0f, 1.0f, 2000.0f, this, tr( "Env 1 Attack" ) ),
-		m_env1Hold( 0.0f, 0.0f, 2000.0f, 1.0f, 2000.0f, this, tr( "Env 1 Hold" ) ),
-		m_env1Dec( 0.0f, 0.0f, 2000.0f, 1.0f, 2000.0f, this, tr( "Env 1 Decay" ) ),
+		m_env1Hold( 0.0f, 0.0f, 4000.0f, 1.0f, 4000.0f, this, tr( "Env 1 Hold" ) ),
+		m_env1Dec( 0.0f, 0.0f, 4000.0f, 1.0f, 4000.0f, this, tr( "Env 1 Decay" ) ),
 		m_env1Sus( 1.0f, 0.0f, 1.0f, 0.001f, this, tr( "Env 1 Sustain" ) ),
-		m_env1Rel( 0.0f, 0.0f, 2000.0f, 1.0f, 2000.0f, this, tr( "Env 1 Release" ) ),
+		m_env1Rel( 0.0f, 0.0f, 4000.0f, 1.0f, 4000.0f, this, tr( "Env 1 Release" ) ),
 		m_env1Slope( 0.0f, -1.0f, 1.0f, 0.001f, this, tr( "Env 1 Slope" ) ),
 
 		m_env2Pre( 0.0f, 0.0f, 2000.0f, 1.0f, 2000.0f, this, tr( "Env 2 Pre-delay" ) ),
 		m_env2Att( 0.0f, 0.0f, 2000.0f, 1.0f, 2000.0f, this, tr( "Env 2 Attack" ) ),
-		m_env2Hold( 0.0f, 0.0f, 2000.0f, 1.0f, 2000.0f, this, tr( "Env 2 Hold" ) ),
-		m_env2Dec( 0.0f, 0.0f, 2000.0f, 1.0f, 2000.0f, this, tr( "Env 2 Decay" ) ),
+		m_env2Hold( 0.0f, 0.0f, 4000.0f, 1.0f, 4000.0f, this, tr( "Env 2 Hold" ) ),
+		m_env2Dec( 0.0f, 0.0f, 4000.0f, 1.0f, 4000.0f, this, tr( "Env 2 Decay" ) ),
 		m_env2Sus( 1.0f, 0.0f, 1.0f, 0.001f, this, tr( "Env 2 Sustain" ) ),
-		m_env2Rel( 0.0f, 0.0f, 2000.0f, 1.0f, 2000.0f, this, tr( "Env 2 Release" ) ),
+		m_env2Rel( 0.0f, 0.0f, 4000.0f, 1.0f, 4000.0f, this, tr( "Env 2 Release" ) ),
 		m_env2Slope( 0.0f, -1.0f, 1.0f, 0.001f, this, tr( "Env 2 Slope" ) ),
 
 		m_o23Mod( 0, 0, NUM_MODS - 1, this, tr( "Osc2-3 modulation" ) ),
@@ -1318,28 +1381,28 @@ void MonstroInstrument::updateFreq()
 
 void MonstroInstrument::updatePO()
 {
-	m_osc1l_po = m_osc1Spo.value() / 360.0;
-	m_osc1r_po = ( m_osc1Spo.value() * -1.0 ) / 360.0;
+	m_osc1l_po = m_osc1Spo.value() / 720.0;
+	m_osc1r_po = ( m_osc1Spo.value() * -1.0 ) / 720.0;
 
-	m_osc2l_po = m_osc2Spo.value() / 360.0;
-	m_osc2r_po = ( m_osc2Spo.value() * -1.0 ) / 360.0;
+	m_osc2l_po = m_osc2Spo.value() / 720.0;
+	m_osc2r_po = ( m_osc2Spo.value() * -1.0 ) / 720.0;
 
-	m_osc3l_po = m_osc3Spo.value() / 360.0;
-	m_osc3r_po = ( m_osc3Spo.value() * -1.0 ) / 360.0;
+	m_osc3l_po = m_osc3Spo.value() / 720.0;
+	m_osc3r_po = ( m_osc3Spo.value() * -1.0 ) / 720.0;
 }
 
 void MonstroInstrument::updateEnvelope1()
 {
 	if( m_env1Pre.value() == 0.0f ) m_env1_pre = 1.0;
-		else m_env1_pre =  1.0 / ( m_env1Pre.value()  / 1000.0f ) / m_samplerate;
+		else m_env1_pre =  1.0f / ( m_env1Pre.value()  / 1000.0f ) / m_samplerate;
 	if( m_env1Att.value() == 0.0f ) m_env1_att = 1.0;
-		else m_env1_att =  1.0 / ( m_env1Att.value()  / 1000.0f ) / m_samplerate;
+		else m_env1_att =  1.0f / ( m_env1Att.value()  / 1000.0f ) / m_samplerate;
 	if( m_env1Hold.value() == 0.0f ) m_env1_hold = 1.0;
-		else m_env1_hold = 1.0 / ( m_env1Hold.value() / 1000.0f ) / m_samplerate;
+		else m_env1_hold = 1.0f / ( m_env1Hold.value() / 1000.0f ) / m_samplerate;
 	if( m_env1Dec.value() == 0.0f ) m_env1_dec = 1.0;
-		else m_env1_dec =  1.0 / ( m_env1Dec.value()  / 1000.0f ) / m_samplerate;
+		else m_env1_dec =  1.0f / ( m_env1Dec.value()  / 1000.0f ) / m_samplerate;
 	if( m_env1Rel.value() == 0.0f ) m_env1_rel = 1.0;
-		else m_env1_rel =  1.0 / ( m_env1Rel.value()  / 1000.0f ) / m_samplerate;
+		else m_env1_rel =  1.0f / ( m_env1Rel.value()  / 1000.0f ) / m_samplerate;
 
 	m_env1_len = ( m_env1Pre.value() + m_env1Att.value() + m_env1Hold.value() + m_env1Dec.value() ) * m_samplerate / 1000.0f;
 	m_env1_relF = m_env1Rel.value() * m_samplerate / 1000.0f;
@@ -1347,15 +1410,15 @@ void MonstroInstrument::updateEnvelope1()
 void MonstroInstrument::updateEnvelope2()
 {
 	if( m_env2Pre.value() == 0.0f ) m_env2_pre = 1.0;
-		else m_env2_pre =  1.0 / ( m_env2Pre.value()  / 1000.0f ) / m_samplerate;
+		else m_env2_pre =  1.0f / ( m_env2Pre.value()  / 1000.0f ) / m_samplerate;
 	if( m_env2Att.value() == 0.0f ) m_env2_att = 1.0;
-		else m_env2_att =  1.0 / ( m_env2Att.value()  / 1000.0f ) / m_samplerate;
+		else m_env2_att =  1.0f / ( m_env2Att.value()  / 1000.0f ) / m_samplerate;
 	if( m_env2Hold.value() == 0.0f ) m_env2_hold = 1.0;
-		else m_env2_hold = 1.0 / ( m_env2Hold.value() / 1000.0f ) / m_samplerate;
+		else m_env2_hold = 1.0f / ( m_env2Hold.value() / 1000.0f ) / m_samplerate;
 	if( m_env2Dec.value() == 0.0f ) m_env2_dec = 1.0;
-		else m_env2_dec =  1.0 / ( m_env2Dec.value()  / 1000.0f ) / m_samplerate;
+		else m_env2_dec =  1.0f / ( m_env2Dec.value()  / 1000.0f ) / m_samplerate;
 	if( m_env2Rel.value() == 0.0f ) m_env2_rel = 1.0;
-		else m_env2_rel =  1.0 / ( m_env2Rel.value()  / 1000.0f ) / m_samplerate;
+		else m_env2_rel =  1.0f / ( m_env2Rel.value()  / 1000.0f ) / m_samplerate;
 
 	m_env2_len = ( m_env2Pre.value() + m_env2Att.value() + m_env2Hold.value() + m_env2Dec.value() ) * m_samplerate / 1000.0f;
 	m_env2_relF = m_env2Rel.value() * m_samplerate / 1000.0f;
diff --git a/plugins/monstro/Monstro.h b/plugins/monstro/Monstro.h
index 83a687cd6..45cf71778 100644
--- a/plugins/monstro/Monstro.h
+++ b/plugins/monstro/Monstro.h
@@ -38,6 +38,9 @@
 #include "Oscillator.h"
 #include "lmms_math.h"
 
+//
+//	UI Macros
+//
 
 #define makeknob( name, x, y, hint, unit, oname ) 		\
 	name = new knob( knobStyled, view ); 				\
@@ -85,7 +88,7 @@
 	name .addItem( tr( "Exponential wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "exp" ) ) );	\
 	name .addItem( tr( "Random" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "rand" ) ) );
 
-
+// UI constants
 const int O1ROW = 22;
 const int O2ROW = 22 + 39;
 const int O3ROW = 22 + 39 * 2;
@@ -127,6 +130,7 @@ const int MATROW6 = 22 + 39*5;
 const int OPVIEW = 0;
 const int MATVIEW = 1;
 
+// waveform enumerators
 const int WAVE_SINE = 0;
 const int WAVE_TRI = 1;
 const int WAVE_SAW = 2;
@@ -139,6 +143,7 @@ const int WAVE_EXP = 8;
 const int WAVE_NOISE = 9;
 const int NUM_WAVES = 10;
 
+// modulation enumerators
 const int MOD_MIX = 0;
 const int MOD_AM = 1;
 const int MOD_FM = 2;
@@ -150,6 +155,11 @@ const float MODCLIP = 2.0;
 const float MIN_FREQ = 18.0f;
 const float MAX_FREQ = 48000.0f;
 
+// constants for amp delta capping - these will be divided by samplerate by the synth
+const float ADCAP1 = 44100 / 4;
+const float ADCAP2 = 44100 / 4.5;
+
+
 class MonstroInstrument;
 class MonstroView;
 
@@ -259,6 +269,18 @@ private:
 
 	sample_t m_osc1l_last;
 	sample_t m_osc1r_last;
+
+	sample_t m_osc2l_last;
+	sample_t m_osc2r_last;
+
+	sample_t m_osc3l_last;
+	sample_t m_osc3r_last;
+	
+	sample_t m_l_last;
+	sample_t m_r_last;
+	
+	float m_adcap1;
+	float m_adcap2;
 };
 
 class MonstroInstrument : public Instrument
diff --git a/src/core/track.cpp b/src/core/track.cpp
index 82d040eca..0f2dabc4f 100644
--- a/src/core/track.cpp
+++ b/src/core/track.cpp
@@ -249,7 +249,9 @@ trackContentObjectView::trackContentObjectView( trackContentObject * _tco,
 	m_action( NoAction ),
 	m_autoResize( false ),
 	m_initialMouseX( 0 ),
-	m_hint( NULL )
+	m_hint( NULL ),
+	m_fgColor( NULL ),
+	m_textColor( NULL )
 {
 	if( s_textFloat == NULL )
 	{
@@ -275,6 +277,9 @@ trackContentObjectView::trackContentObjectView( trackContentObject * _tco,
 	connect( m_tco, SIGNAL( destroyedTCO() ), this, SLOT( close() ) );
 	setModel( m_tco );
 
+	setFgColor( QColor( 0,0,0 ) );
+	setTextColor( QColor( 0,0,0 ) );
+
 	m_trackView->getTrackContentWidget()->addTCOView( this );
 }
 
@@ -314,6 +319,23 @@ bool trackContentObjectView::fixedTCOs()
 
 
 
+// qproperty access functions, to be inherited & used by TCOviews
+//! \brief CSS theming qproperty access method
+QColor trackContentObjectView::fgColor() const
+{ if( m_fgColor ) return *m_fgColor; else return QColor( 0,0,0 ); }
+
+//! \brief CSS theming qproperty access method
+QColor trackContentObjectView::textColor() const
+{ if( m_textColor ) return *m_textColor; else return QColor( 0,0,0 ); }
+
+//! \brief CSS theming qproperty access method
+void trackContentObjectView::setFgColor( const QColor & _c )
+{ if( m_fgColor ) *m_fgColor = _c; else m_fgColor = new QColor( 0,0,0 ); }
+
+//! \brief CSS theming qproperty access method
+void trackContentObjectView::setTextColor( const QColor & _c )
+{ if( m_textColor ) *m_textColor = _c; else m_textColor = new QColor( 0,0,0 ); }
+
 
 /*! \brief Close a trackContentObjectView
  *
@@ -817,7 +839,14 @@ void trackContentObjectView::setAutoResizeEnabled( bool _e )
  */
 trackContentWidget::trackContentWidget( trackView * _parent ) :
 	QWidget( _parent ),
-	m_trackView( _parent )
+	m_trackView( _parent ),
+	m_darkerColor1( NULL ),
+	m_darkerColor2( NULL ),
+	m_darkerColor3( NULL ),
+	m_lighterColor1( NULL ),
+	m_lighterColor2( NULL ),
+	m_lighterColor3( NULL ),
+	m_gradMidPoint( 0.0f )
 {
 	setAcceptDrops( true );
 
@@ -825,6 +854,16 @@ trackContentWidget::trackContentWidget( trackView * _parent ) :
 			SIGNAL( positionChanged( const MidiTime & ) ),
 			this, SLOT( changePosition( const MidiTime & ) ) );
 
+//initialize qproperties
+	setDarkerColor1( QColor( 0, 0, 0 ) );
+	setDarkerColor2( QColor( 0, 0, 0 ) );
+	setDarkerColor3( QColor( 0, 0, 0 ) );
+	setLighterColor1( QColor( 0, 0, 0 ) );
+	setLighterColor2( QColor( 0, 0, 0 ) );
+	setLighterColor3( QColor( 0, 0, 0 ) );
+	
+	setStyle( QApplication::style() );
+	
 	updateBackground();
 }
 
@@ -856,15 +895,15 @@ void trackContentWidget::updateBackground()
 	QPainter pmp( &m_background );
 
 	QLinearGradient grad( 0,0, 0, h );
-	grad.setColorAt( 0.0, QColor( 50, 50, 50 ) );
-	grad.setColorAt( 0.33, QColor( 20, 20, 20 ) );
-	grad.setColorAt( 1.0, QColor( 15, 15, 15 ) );
+	grad.setColorAt( 0.0, darkerColor1() );
+	grad.setColorAt( gradMidPoint(), darkerColor2() );
+	grad.setColorAt( 1.0, darkerColor3() );
 	pmp.fillRect( 0, 0, w, h, grad );
 
 	QLinearGradient grad2( 0,0, 0, h );
-	grad2.setColorAt( 0.0, QColor( 50, 50, 50 ) );
-	grad2.setColorAt( 0.33, QColor( 40, 40, 40 ) );
-	grad2.setColorAt( 1.0, QColor( 30, 30, 30 ) );
+	grad2.setColorAt( 0.0, lighterColor1() );
+	grad2.setColorAt( gradMidPoint(), lighterColor2() );
+	grad2.setColorAt( 1.0, lighterColor3() );
 	pmp.fillRect( w, 0, w , h, grad2 );
 
 	// draw lines
@@ -1195,6 +1234,62 @@ MidiTime trackContentWidget::endPosition( const MidiTime & _pos_start )
 }
 
 
+// qproperty access methods
+//! \brief CSS theming qproperty access method
+QColor trackContentWidget::darkerColor1() const 
+{ if( m_darkerColor1 ) return *m_darkerColor1; else return QColor( 0, 0, 0 ); }
+
+//! \brief CSS theming qproperty access method
+QColor trackContentWidget::darkerColor2() const 
+{ if( m_darkerColor2 ) return *m_darkerColor2; else return QColor( 0, 0, 0 ); }
+
+//! \brief CSS theming qproperty access method
+QColor trackContentWidget::darkerColor3() const 
+{ if( m_darkerColor3 ) return *m_darkerColor3; else return QColor( 0, 0, 0 ); }
+
+//! \brief CSS theming qproperty access method
+QColor trackContentWidget::lighterColor1() const 
+{ if( m_lighterColor1 ) return *m_lighterColor1; else return QColor( 0, 0, 0 ); }
+
+//! \brief CSS theming qproperty access method
+QColor trackContentWidget::lighterColor2() const 
+{ if( m_lighterColor2 ) return *m_lighterColor2; else return QColor( 0, 0, 0 ); }
+
+//! \brief CSS theming qproperty access method
+QColor trackContentWidget::lighterColor3() const 
+{ if( m_lighterColor3 ) return *m_lighterColor3; else return QColor( 0, 0, 0 ); }
+
+//! \brief CSS theming qproperty access method
+void trackContentWidget::setDarkerColor1( const QColor & _c ) 
+{ if( m_darkerColor1 ) *m_darkerColor1 = _c; else m_darkerColor1 = new QColor( _c ); }
+
+//! \brief CSS theming qproperty access method
+void trackContentWidget::setDarkerColor2( const QColor & _c ) 
+{ if( m_darkerColor2 ) *m_darkerColor2 = _c; else m_darkerColor2 = new QColor( _c ); }
+
+//! \brief CSS theming qproperty access method
+void trackContentWidget::setDarkerColor3( const QColor & _c ) 
+{ if( m_darkerColor3 ) *m_darkerColor3 = _c; else m_darkerColor3 = new QColor( _c ); }
+
+//! \brief CSS theming qproperty access method
+void trackContentWidget::setLighterColor1( const QColor & _c ) 
+{ if( m_lighterColor1 ) *m_lighterColor1 = _c; else m_lighterColor1 = new QColor( _c ); }
+
+//! \brief CSS theming qproperty access method
+void trackContentWidget::setLighterColor2( const QColor & _c ) 
+{ if( m_lighterColor2 ) *m_lighterColor2 = _c; else m_lighterColor2 = new QColor( _c ); }
+
+//! \brief CSS theming qproperty access method
+void trackContentWidget::setLighterColor3( const QColor & _c ) 
+{ if( m_lighterColor3 ) *m_lighterColor3 = _c; else m_lighterColor3 = new QColor( _c ); }
+
+//! \brief CSS theming qproperty access method
+float trackContentWidget::gradMidPoint() const 
+{ return m_gradMidPoint; }
+
+//! \brief CSS theming qproperty access method
+void trackContentWidget::setGradMidPoint( float _g ) 
+{ m_gradMidPoint = _g; }
 
 
 
diff --git a/src/gui/AutomationPatternView.cpp b/src/gui/AutomationPatternView.cpp
index 9cec7920c..baa19376c 100644
--- a/src/gui/AutomationPatternView.cpp
+++ b/src/gui/AutomationPatternView.cpp
@@ -273,8 +273,9 @@ void AutomationPatternView::paintEvent( QPaintEvent * )
 
 	QLinearGradient lin2grad( 0, min, 0, max );
 
-	lin2grad.setColorAt( 1, c.lighter( 200 ) );
-	lin2grad.setColorAt( 0, c );
+	lin2grad.setColorAt( 1, fgColor().lighter( 150 ) );
+	lin2grad.setColorAt( 0.5, fgColor() );
+	lin2grad.setColorAt( 0, fgColor().darker( 150 ) );
 
 	for( AutomationPattern::timeMap::const_iterator it =
 						m_pat->getTimeMap().begin();
@@ -313,7 +314,7 @@ void AutomationPatternView::paintEvent( QPaintEvent * )
 
 	QColor text_color = ( m_pat->isMuted() || m_pat->getTrack()->isMuted() )
 		? QColor( 30, 30, 30 )
-		: QColor( 255, 255, 255 );
+		: textColor();
 
 	p.setPen( QColor( 0, 0, 0 ) );
 	p.drawText( 4, p.fontMetrics().height()+1, m_pat->name() );
diff --git a/src/tracks/SampleTrack.cpp b/src/tracks/SampleTrack.cpp
index a886b5303..e71479ad4 100644
--- a/src/tracks/SampleTrack.cpp
+++ b/src/tracks/SampleTrack.cpp
@@ -358,7 +358,7 @@ void SampleTCOView::paintEvent( QPaintEvent * _pe )
 	}
 	else
 	{
-		p.setPen( c.lighter( 200 ) );
+		p.setPen( fgColor() );
 	}
 	QRect r = QRect( 1, 1,
 			qMax( static_cast<int>( m_tco->sampleLength() *
@@ -383,10 +383,10 @@ void SampleTCOView::paintEvent( QPaintEvent * _pe )
 
 		p.setPen( QColor( 0, 0, 0 ) );	
 		p.drawText( 10, p.fontMetrics().height()+1, "Rec" );
-		p.setPen( QColor( 255, 60, 60 ) );	
+		p.setPen( textColor() );	
 		p.drawText( 9, p.fontMetrics().height(), "Rec" );
 		
-		p.setBrush( QBrush( QColor( 255, 60, 60 ) ) );
+		p.setBrush( QBrush( textColor() ) );
 		p.drawEllipse( 4, 5, 4, 4 );
 	}
 }
diff --git a/src/tracks/bb_track.cpp b/src/tracks/bb_track.cpp
index cc156599e..15bace3fc 100644
--- a/src/tracks/bb_track.cpp
+++ b/src/tracks/bb_track.cpp
@@ -219,7 +219,7 @@ void bbTCOView::paintEvent( QPaintEvent * )
 	
 	p.setPen( QColor( 0, 0, 0 ) );
 	p.drawText( 4, p.fontMetrics().height()+1, m_bbTCO->name() );
-	p.setPen( QColor( 255, 255, 255 ) );
+	p.setPen( textColor() );
 	p.drawText( 3, p.fontMetrics().height(), m_bbTCO->name() );
 	
 	if( m_bbTCO->isMuted() )
diff --git a/src/tracks/pattern.cpp b/src/tracks/pattern.cpp
index c1022d991..6310eb7b7 100644
--- a/src/tracks/pattern.cpp
+++ b/src/tracks/pattern.cpp
@@ -1019,7 +1019,7 @@ void patternView::paintEvent( QPaintEvent * )
 				}
 				else
 				{
-					p.setPen( QColor( 255, 255, 255 ) );	/// \todo make this a qproperty
+					p.setPen( fgColor() );	
 				}
 
 				// scan through all the notes and draw them on the pattern
@@ -1133,7 +1133,7 @@ void patternView::paintEvent( QPaintEvent * )
 
 	QColor text_color = ( m_pat->isMuted() || m_pat->getTrack()->isMuted() )
 		? QColor( 30, 30, 30 )
-		: QColor( 255, 255, 255 );
+		: textColor();
 
 	if( m_pat->name() != m_pat->instrumentTrack()->name() )
 	{