diff --git a/ChangeLog b/ChangeLog
index d133fb4b4..a15bf69bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,8 +21,8 @@
 	* src/core/mixer.cpp:
 	trigger controller's frame counter
 
-	* data/themes/llama/background_artwork.png:
 	* data/themes/llama:
+	* data/themes/llama/background_artwork.png:
 	* data/themes/Makefile.am:
 	start a theme with my preferences
 
diff --git a/include/automatable_model.h b/include/automatable_model.h
index f8a03acbe..0d418f929 100644
--- a/include/automatable_model.h
+++ b/include/automatable_model.h
@@ -151,7 +151,6 @@ public:
 				this, SIGNAL( dataChanged() ) );
     }
 
-
 	inline virtual T initValue( void ) const
 	{
 		return( m_initValue );
@@ -300,12 +299,12 @@ public slots:
 
 
 
-template<typename T, typename EDIT_STEP_TYPE = T>
+template<typename T, typename EDIT_STEP_TYPE, class WIDGET_BASE>
 class automatableModelView : public modelView
 {
 public:
 	typedef automatableModel<T, EDIT_STEP_TYPE> autoModel;
-	typedef automatableModelView<T, EDIT_STEP_TYPE> autoModelView;
+	typedef automatableModelView<WIDGET_BASE, T, EDIT_STEP_TYPE> autoModelView;
 
 	automatableModelView( ::model * _model ) :
 		modelView( _model )
@@ -342,14 +341,15 @@ public:
 
 #define generateModelPrimitive(type,type2)					\
 		typedef automatableModel<type,type2> type##Model;		\
-		typedef automatableModelView<type,type2> type##ModelView;	\
+		typedef automatableModelView<type,type2,WIDGET_BASE> type##ModelView<WIDGET_BASE>;	\
 
 // some model-primitives
 
 generateModelPrimitive(float,float);
 generateModelPrimitive(int,int);
 
-class boolModel : public automatableModel<bool, signed char>
+template<class WIDGET_TYPE>
+class boolModel : public automatableModel<bool, signed char, WIDGET_TYPE>
 {
 public:
 	boolModel(  const bool _val = FALSE,
@@ -362,7 +362,7 @@ public:
 
 } ;
 
-typedef automatableModelView<bool, signed char> boolModelView;
+typedef automatableModelView<bool, signed char, WIDGET_TYPE> boolModelView<WIDGET_TYPE>;
 
 
 #endif
diff --git a/include/knob.h b/include/knob.h
index 9d6850533..b8afd4be0 100644
--- a/include/knob.h
+++ b/include/knob.h
@@ -47,7 +47,7 @@ enum knobTypes
 
 
 
-class knob : public QWidget, public floatModelView
+class knob : public QWidget, public floatModelView<QWidget>
 {
 	Q_OBJECT
 public:
diff --git a/src/core/mv_base.cpp b/src/core/mv_base.cpp
index 10026acb9..6b09509b6 100644
--- a/src/core/mv_base.cpp
+++ b/src/core/mv_base.cpp
@@ -70,11 +70,14 @@ void modelView::doConnections( void )
 {
 	if( m_model != NULL )
 	{
+        // Why queued connections? this causes a terrible stair effect when
+        // the GUI can't keep up. If anything should suffer, it should be
+        // GUI response.
 		QWidget * w = dynamic_cast<QWidget *>( this );
 		QObject::connect( m_model, SIGNAL( dataChanged() ),
-				w, SLOT( update() ), Qt::QueuedConnection );
+				w, SLOT( update() ) /*, Qt::QueuedConnection */ );
 		QObject::connect( m_model, SIGNAL( propertiesChanged() ),
-				w, SLOT( update() ), Qt::QueuedConnection );
+				w, SLOT( update() ) /*, Qt::QueuedConnection */ );
 	}
 }