diff --git a/include/BandLimitedWave.h b/include/BandLimitedWave.h
index ca83b21b6..330cd37fd 100644
--- a/include/BandLimitedWave.h
+++ b/include/BandLimitedWave.h
@@ -30,7 +30,7 @@
 #include <QDataStream>
 #include <QFile>
 
-#include "config_mgr.h"
+#include "ConfigManager.h"
 #include "export.h"
 #include "interpolation.h"
 #include "lmms_basics.h"
diff --git a/include/config_mgr.h b/include/ConfigManager.h
similarity index 76%
rename from include/config_mgr.h
rename to include/ConfigManager.h
index 480c4d0de..4caf1bdc1 100644
--- a/include/config_mgr.h
+++ b/include/ConfigManager.h
@@ -1,8 +1,8 @@
 /*
- * config_mgr.h - class configManager, a class for managing LMMS-configuration
+ * ConfigManager.h - class ConfigManager, a class for managing LMMS-configuration
  *
  * Copyright (c) 2005-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
  * This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _CONFIG_MGR_H
-#define _CONFIG_MGR_H
+#ifndef CONFIG_MGR_H
+#define CONFIG_MGR_H
 
 #include "lmmsconfig.h"
 
@@ -47,120 +47,125 @@ const QString TRACK_ICON_PATH = "track_icons/";
 const QString LOCALE_PATH = "locale/";
 
 
-class EXPORT configManager
+class EXPORT ConfigManager
 {
 public:
-	static inline configManager * inst()
+	static inline ConfigManager * inst()
 	{
 		if( s_instanceOfMe == NULL )
 		{
-			s_instanceOfMe = new configManager();
+			s_instanceOfMe = new ConfigManager();
 		}
-		return( s_instanceOfMe );
+		return s_instanceOfMe;
 	}
 
 	const QString & dataDir() const
 	{
-		return( m_dataDir );
+		return m_dataDir;
 	}
 
 	const QString & workingDir() const
 	{
-		return( m_workingDir );
+		return m_workingDir;
 	}
 
 	QString userProjectsDir() const
 	{
-		return( workingDir() + PROJECTS_PATH );
+		return workingDir() + PROJECTS_PATH;
 	}
 
 	QString userPresetsDir() const
 	{
-		return( workingDir() + PRESETS_PATH );
+		return workingDir() + PRESETS_PATH;
 	}
 
 	QString userSamplesDir() const
 	{
-		return( workingDir() + SAMPLES_PATH );
+		return workingDir() + SAMPLES_PATH;
 	}
 
 	QString factoryProjectsDir() const
 	{
-		return( dataDir() + PROJECTS_PATH );
+		return dataDir() + PROJECTS_PATH;
 	}
 
 	QString factoryPresetsDir() const
 	{
-		return( dataDir() + PRESETS_PATH );
+		return dataDir() + PRESETS_PATH;
 	}
 
 	QString factorySamplesDir() const
 	{
-		return( dataDir() + SAMPLES_PATH );
+		return dataDir() + SAMPLES_PATH;
 	}
 
 	QString defaultArtworkDir() const
 	{
-		return( m_dataDir + DEFAULT_THEME_PATH );
+		return m_dataDir + DEFAULT_THEME_PATH;
 	}
 
 	QString artworkDir() const
 	{
-		return( m_artworkDir );
+		return m_artworkDir;
 	}
 
 	QString trackIconsDir() const
 	{
-		return( m_dataDir + TRACK_ICON_PATH );
+		return m_dataDir + TRACK_ICON_PATH;
 	}
 
 	QString localeDir() const
 	{
-		return( m_dataDir + LOCALE_PATH );
+		return m_dataDir + LOCALE_PATH;
 	}
 
 	const QString & pluginDir() const
 	{
-		return( m_pluginDir );
+		return m_pluginDir;
 	}
 
 	const QString & vstDir() const
 	{
-		return( m_vstDir );
+		return m_vstDir;
 	}
 
 	const QString & flDir() const
 	{
-		return( m_flDir );
+		return m_flDir;
 	}
 
 	const QString & ladspaDir() const
 	{
-		return( m_ladDir );
+		return m_ladDir;
+	}
+
+	const QString & recoveryFile() const
+	{
+		return m_recoveryFile;
 	}
 
 #ifdef LMMS_HAVE_STK
 	const QString & stkDir() const
 	{
-		return( m_stkDir );
+		return m_stkDir;
 	}
 #endif
 
 #ifdef LMMS_HAVE_FLUIDSYNTH
 	const QString & defaultSoundfont() const
 	{
-		return( m_defaultSoundfont );
+		return m_defaultSoundfont;
 	}
 #endif
 
 	const QString & backgroundArtwork() const
 	{
-		return( m_backgroundArtwork );
+		return m_backgroundArtwork;
 	}
 
 	inline const QStringList & recentlyOpenedProjects() const
 	{
-		return( m_recentlyOpenedProjects );
+		return m_recentlyOpenedProjects;
 	}
 
 	void addRecentlyOpenedProject( const QString & _file );
@@ -185,11 +190,11 @@ public:
 
 
 private:
-	static configManager * s_instanceOfMe;
+	static ConfigManager * s_instanceOfMe;
 
-	configManager();
-	configManager( const configManager & _c );
-	~configManager();
+	ConfigManager();
+	ConfigManager( const ConfigManager & _c );
+	~ConfigManager();
 
 
 	const QString m_lmmsRcFile;
@@ -200,6 +205,7 @@ private:
 	QString m_vstDir;
 	QString m_flDir;
 	QString m_ladDir;
+	QString m_recoveryFile;
 #ifdef LMMS_HAVE_STK
 	QString m_stkDir;
 #endif
diff --git a/include/MainWindow.h b/include/MainWindow.h
index 8a92fa5f1..12f21ad81 100644
--- a/include/MainWindow.h
+++ b/include/MainWindow.h
@@ -35,7 +35,7 @@ class QDomElement;
 class QGridLayout;
 class QMdiArea;
 
-class configManager;
+class ConfigManager;
 class PluginView;
 class toolButton;
 
diff --git a/plugins/LadspaEffect/LadspaEffect.cpp b/plugins/LadspaEffect/LadspaEffect.cpp
index c9063e1bf..f70ea7444 100644
--- a/plugins/LadspaEffect/LadspaEffect.cpp
+++ b/plugins/LadspaEffect/LadspaEffect.cpp
@@ -29,7 +29,7 @@
 #include "LadspaEffect.h"
 #include "DataFile.h"
 #include "AudioDevice.h"
-#include "config_mgr.h"
+#include "ConfigManager.h"
 #include "ladspa_2_lmms.h"
 #include "LadspaControl.h"
 #include "LadspaSubPluginFeatures.h"
diff --git a/plugins/MidiImport/MidiImport.cpp b/plugins/MidiImport/MidiImport.cpp
index bdbf7e7ca..2dad0cb82 100644
--- a/plugins/MidiImport/MidiImport.cpp
+++ b/plugins/MidiImport/MidiImport.cpp
@@ -34,7 +34,7 @@
 #include "InstrumentTrack.h"
 #include "AutomationTrack.h"
 #include "AutomationPattern.h"
-#include "config_mgr.h"
+#include "ConfigManager.h"
 #include "Pattern.h"
 #include "Instrument.h"
 #include "MainWindow.h"
@@ -97,7 +97,7 @@ bool MidiImport::tryImport( TrackContainer* tc )
 
 #ifdef LMMS_HAVE_FLUIDSYNTH
 	if( engine::hasGUI() &&
-		configManager::inst()->defaultSoundfont().isEmpty() )
+		ConfigManager::inst()->defaultSoundfont().isEmpty() )
 	{
 		QMessageBox::information( engine::mainWindow(),
 			tr( "Setup incomplete" ),
@@ -226,7 +226,7 @@ public:
 			if( it_inst )
 			{
 				isSF2 = true;
-				it_inst->loadFile( configManager::inst()->defaultSoundfont() );
+				it_inst->loadFile( ConfigManager::inst()->defaultSoundfont() );
 				it_inst->childModel( "bank" )->setValue( 0 );
 				it_inst->childModel( "patch" )->setValue( 0 );
 			}
diff --git a/plugins/VstEffect/VstSubPluginFeatures.cpp b/plugins/VstEffect/VstSubPluginFeatures.cpp
index e578f3ee8..ec873d9f6 100644
--- a/plugins/VstEffect/VstSubPluginFeatures.cpp
+++ b/plugins/VstEffect/VstSubPluginFeatures.cpp
@@ -28,7 +28,7 @@
 #include <QLabel>
 
 #include "VstSubPluginFeatures.h"
-#include "config_mgr.h"
+#include "ConfigManager.h"
 
 
 VstSubPluginFeatures::VstSubPluginFeatures( Plugin::PluginTypes _type ) :
@@ -52,7 +52,7 @@ void VstSubPluginFeatures::fillDescriptionWidget( QWidget * _parent,
 void VstSubPluginFeatures::listSubPluginKeys( const Plugin::Descriptor * _desc,
 														KeyList & _kl ) const
 {
-	QStringList dlls = QDir( configManager::inst()->vstDir() ).
+	QStringList dlls = QDir( ConfigManager::inst()->vstDir() ).
 				entryList( QStringList() << "*.dll",
 						QDir::Files, QDir::Name );
 	// TODO: eval m_type
diff --git a/plugins/audio_file_processor/audio_file_processor.cpp b/plugins/audio_file_processor/audio_file_processor.cpp
index 21cf15f3f..1ff8c742a 100644
--- a/plugins/audio_file_processor/audio_file_processor.cpp
+++ b/plugins/audio_file_processor/audio_file_processor.cpp
@@ -747,7 +747,7 @@ AudioFileProcessorWaveView::AudioFileProcessorWaveView( QWidget * _parent, int _
 	m_isDragging( false ),
 	m_reversed( false ),
 	m_framesPlayed( 0 ),
-	m_animation(configManager::inst()->value("ui", "animateafp").toInt())
+	m_animation(ConfigManager::inst()->value("ui", "animateafp").toInt())
 {
 	setFixedSize( _w, _h );
 	setMouseTracking( true );
diff --git a/plugins/flp_import/FlpImport.cpp b/plugins/flp_import/FlpImport.cpp
index 5669ab496..95c476944 100644
--- a/plugins/flp_import/FlpImport.cpp
+++ b/plugins/flp_import/FlpImport.cpp
@@ -36,7 +36,7 @@
 #include "bb_track.h"
 #include "bb_track_container.h"
 #include "combobox.h"
-#include "config_mgr.h"
+#include "ConfigManager.h"
 #include "debug.h"
 #include "Effect.h"
 #include "engine.h"
@@ -1070,16 +1070,16 @@ if( p.currentEffectChannel <= NumFLFxChannels )
 								f.mid( 12 );
 				}*/
 				f.replace( '\\', QDir::separator() );
-				if( QFileInfo( configManager::inst()->flDir() +
+				if( QFileInfo( ConfigManager::inst()->flDir() +
 						"/Data/" ).exists() )
 				{
-					f = configManager::inst()->flDir() +
+					f = ConfigManager::inst()->flDir() +
 								"/Data/" + f;
 				}
 				else
 				{
 					// FL 3 compat
-					f = configManager::inst()->flDir() +
+					f = ConfigManager::inst()->flDir() +
 							"/Samples/" + f;
 				}
 				cc->sampleFileName = f;
diff --git a/plugins/patman/patman.cpp b/plugins/patman/patman.cpp
index 54b3cbab9..0cf9ea199 100644
--- a/plugins/patman/patman.cpp
+++ b/plugins/patman/patman.cpp
@@ -525,16 +525,16 @@ void PatmanView::openFile( void )
 		else
 		{
 			ofd.setDirectory(
-				configManager::inst()->userSamplesDir() );
+				ConfigManager::inst()->userSamplesDir() );
 		}
 	}
 	else if( QFileInfo( m_pi->m_patchFile ).isRelative() )
 	{
-		QString f = configManager::inst()->userSamplesDir()
+		QString f = ConfigManager::inst()->userSamplesDir()
 							+ m_pi->m_patchFile;
 		if( QFileInfo( f ).exists() == false )
 		{
-			f = configManager::inst()->factorySamplesDir()
+			f = ConfigManager::inst()->factorySamplesDir()
 							+ m_pi->m_patchFile;
 		}
 
diff --git a/plugins/sf2_player/sf2_player.cpp b/plugins/sf2_player/sf2_player.cpp
index 34be71575..141e32620 100644
--- a/plugins/sf2_player/sf2_player.cpp
+++ b/plugins/sf2_player/sf2_player.cpp
@@ -121,7 +121,7 @@ sf2Instrument::sf2Instrument( InstrumentTrack * _instrument_track ) :
 	InstrumentPlayHandle * iph = new InstrumentPlayHandle( this );
 	engine::mixer()->addPlayHandle( iph );
 
-	loadFile( configManager::inst()->defaultSoundfont() );
+	loadFile( ConfigManager::inst()->defaultSoundfont() );
 
 	updateSampleRate();
 	updateReverbOn();
@@ -1060,10 +1060,10 @@ void sf2InstrumentView::showFileDialog()
 		QString f = k->m_filename;
 		if( QFileInfo( f ).isRelative() )
 		{
-			f = configManager::inst()->userSamplesDir() + f;
+			f = ConfigManager::inst()->userSamplesDir() + f;
 			if( QFileInfo( f ).exists() == false )
 			{
-				f = configManager::inst()->factorySamplesDir() + k->m_filename;
+				f = ConfigManager::inst()->factorySamplesDir() + k->m_filename;
 			}
 		}
 		ofd.setDirectory( QFileInfo( f ).absolutePath() );
@@ -1071,7 +1071,7 @@ void sf2InstrumentView::showFileDialog()
 	}
 	else
 	{
-		ofd.setDirectory( configManager::inst()->userSamplesDir() );
+		ofd.setDirectory( ConfigManager::inst()->userSamplesDir() );
 	}
 
 	m_fileDialogButton->setEnabled( false );
diff --git a/plugins/stk/mallets/mallets.cpp b/plugins/stk/mallets/mallets.cpp
index 692f644a8..3a2f81325 100644
--- a/plugins/stk/mallets/mallets.cpp
+++ b/plugins/stk/mallets/mallets.cpp
@@ -77,8 +77,8 @@ malletsInstrument::malletsInstrument( InstrumentTrack * _instrument_track ):
 	m_strikeModel( false, this, tr( "Bowed" ) ),
 	m_presetsModel(this),
 	m_spreadModel(0, 0, 255, 1, this, tr( "Spread" )),
-	m_filesMissing( !QDir( configManager::inst()->stkDir() ).exists() ||
-		!QFileInfo( configManager::inst()->stkDir() + QDir::separator()
+	m_filesMissing( !QDir( ConfigManager::inst()->stkDir() ).exists() ||
+		!QFileInfo( ConfigManager::inst()->stkDir() + QDir::separator()
 						+ "sinewave.raw" ).exists() )
 {
 	// try to inform user about missing Stk-installation
@@ -533,7 +533,7 @@ malletsSynth::malletsSynth( const StkFloat _pitch,
 	try
 	{
 		Stk::setSampleRate( _sample_rate );
-		Stk::setRawwavePath( configManager::inst()->stkDir()
+		Stk::setRawwavePath( ConfigManager::inst()->stkDir()
 						.toLatin1().constData() );
 	
 		m_voice = new ModalBar();
@@ -580,7 +580,7 @@ malletsSynth::malletsSynth( const StkFloat _pitch,
 	try
 	{
 		Stk::setSampleRate( _sample_rate );
-		Stk::setRawwavePath( configManager::inst()->stkDir()
+		Stk::setRawwavePath( ConfigManager::inst()->stkDir()
 						.toLatin1().constData() );
 	
 		m_voice = new TubeBell();
@@ -625,7 +625,7 @@ malletsSynth::malletsSynth( const StkFloat _pitch,
 	try
 	{
 		Stk::setSampleRate( _sample_rate );
-		Stk::setRawwavePath( configManager::inst()->stkDir()
+		Stk::setRawwavePath( ConfigManager::inst()->stkDir()
 						.toLatin1().constData() );
 
 		m_voice = new BandedWG();
diff --git a/plugins/vestige/vestige.cpp b/plugins/vestige/vestige.cpp
index 7162333df..2e4efc722 100644
--- a/plugins/vestige/vestige.cpp
+++ b/plugins/vestige/vestige.cpp
@@ -171,7 +171,7 @@ void vestigeInstrument::saveSettings( QDomDocument & _doc, QDomElement & _this )
 	if( QFileInfo( m_pluginDLL ).isAbsolute() )
 	{
 		QString f = QString( m_pluginDLL ).replace( QDir::separator(), '/' );
-		QString vd = QString( configManager::inst()->vstDir() ).replace( QDir::separator(), '/' );
+		QString vd = QString( ConfigManager::inst()->vstDir() ).replace( QDir::separator(), '/' );
         	QString relativePath;
 		if( !( relativePath = f.section( vd, 1, 1 ) ).isEmpty() )
 		{
@@ -623,7 +623,7 @@ void VestigeInstrumentView::openPlugin()
 	}
 	else
 	{
-		dir = configManager::inst()->vstDir();
+		dir = ConfigManager::inst()->vstDir();
 	}
 	// change dir to position of previously opened file
 	ofd.setDirectory( dir );
diff --git a/plugins/vst_base/VstPlugin.cpp b/plugins/vst_base/VstPlugin.cpp
index e0c433132..4d62fa6af 100644
--- a/plugins/vst_base/VstPlugin.cpp
+++ b/plugins/vst_base/VstPlugin.cpp
@@ -45,7 +45,7 @@
 #include <windows.h>
 #endif
 
-#include "config_mgr.h"
+#include "ConfigManager.h"
 #include "engine.h"
 #include "MainWindow.h"
 #include "song.h"
@@ -174,7 +174,7 @@ void VstPlugin::tryLoad( const QString &remoteVstPluginExecutable )
 	QString p = m_plugin;
 	if( QFileInfo( p ).dir().isRelative() )
 	{
-		p = configManager::inst()->vstDir() + QDir::separator() + p;
+		p = ConfigManager::inst()->vstDir() + QDir::separator() + p;
 	}
 
 	sendMessage( message( IdVstLoadPlugin ).addString( QSTR_TO_STDSTR( p ) ) );
diff --git a/plugins/zynaddsubfx/ZynAddSubFx.cpp b/plugins/zynaddsubfx/ZynAddSubFx.cpp
index cd56d5d64..f4f166914 100644
--- a/plugins/zynaddsubfx/ZynAddSubFx.cpp
+++ b/plugins/zynaddsubfx/ZynAddSubFx.cpp
@@ -435,12 +435,12 @@ void ZynAddSubFxInstrument::initPlugin()
 			RemotePlugin::message( IdZasfLmmsWorkingDirectory ).
 				addString(
 					QSTR_TO_STDSTR(
-						QString( configManager::inst()->workingDir() ) ) ) );
+						QString( ConfigManager::inst()->workingDir() ) ) ) );
 		m_remotePlugin->sendMessage(
 			RemotePlugin::message( IdZasfPresetDirectory ).
 				addString(
 					QSTR_TO_STDSTR(
-						QString( configManager::inst()->factoryPresetsDir() +
+						QString( ConfigManager::inst()->factoryPresetsDir() +
 								QDir::separator() + "ZynAddSubFX" ) ) ) );
 
 		m_remotePlugin->updateSampleRate( engine::mixer()->processingSampleRate() );
diff --git a/src/core/BandLimitedWave.cpp b/src/core/BandLimitedWave.cpp
index 0611537e8..e06da0f9b 100644
--- a/src/core/BandLimitedWave.cpp
+++ b/src/core/BandLimitedWave.cpp
@@ -66,7 +66,7 @@ void BandLimitedWave::generateWaves()
 	int i;
 
 // set wavetable directory
-	s_wavetableDir = configManager::inst()->dataDir() + "wavetables/";
+	s_wavetableDir = ConfigManager::inst()->dataDir() + "wavetables/";
 
 // set wavetable files
 	QFile saw_file( s_wavetableDir + "saw.bin" );
diff --git a/src/core/config_mgr.cpp b/src/core/ConfigManager.cpp
similarity index 89%
rename from src/core/config_mgr.cpp
rename to src/core/ConfigManager.cpp
index c9a930f0b..c70cc142a 100644
--- a/src/core/config_mgr.cpp
+++ b/src/core/ConfigManager.cpp
@@ -1,5 +1,5 @@
 /*
- * config_mgr.cpp - implementation of class configManager
+ * ConfigManager.cpp - implementation of class ConfigManager
  *
  * Copyright (c) 2005-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  *
@@ -29,7 +29,7 @@
 #include <QApplication>
 
 #include "lmmsversion.h"
-#include "config_mgr.h"
+#include "ConfigManager.h"
 #include "MainWindow.h"
 
 
@@ -37,16 +37,16 @@ static inline QString ensureTrailingSlash( const QString & _s )
 {
 	if( _s.right( 1 ) != QDir::separator() )
 	{
-		return( _s + QDir::separator() );
+		return _s + QDir::separator();
 	}
-	return( _s );
+	return _s;
 }
 
 
-configManager * configManager::s_instanceOfMe = NULL;
+ConfigManager * ConfigManager::s_instanceOfMe = NULL;
 
 
-configManager::configManager() :
+ConfigManager::ConfigManager() :
 	m_lmmsRcFile( QDir::home().absolutePath() + QDir::separator() +
 								".lmmsrc.xml" ),
 	m_workingDir( QDir::home().absolutePath() + QDir::separator() +
@@ -66,14 +66,15 @@ configManager::configManager() :
 	m_pluginDir( qApp->applicationDirPath() + '/' + PLUGIN_DIR ),
 #endif
 	m_vstDir( m_workingDir + "vst" + QDir::separator() ),
-	m_flDir( QDir::home().absolutePath() )
+	m_flDir( QDir::home().absolutePath() ),
+	m_recoveryFile( QDir(m_workingDir).absoluteFilePath("recover.mmp") )
 {
 }
 
 
 
 
-configManager::~configManager()
+ConfigManager::~ConfigManager()
 {
 	saveConfigFile();
 }
@@ -81,7 +82,7 @@ configManager::~configManager()
 
 
 
-void configManager::setWorkingDir( const QString & _wd )
+void ConfigManager::setWorkingDir( const QString & _wd )
 {
 	m_workingDir = ensureTrailingSlash( _wd );
 }
@@ -89,7 +90,7 @@ void configManager::setWorkingDir( const QString & _wd )
 
 
 
-void configManager::setVSTDir( const QString & _vd )
+void ConfigManager::setVSTDir( const QString & _vd )
 {
 	m_vstDir = ensureTrailingSlash( _vd );
 }
@@ -97,7 +98,7 @@ void configManager::setVSTDir( const QString & _vd )
 
 
 
-void configManager::setArtworkDir( const QString & _ad )
+void ConfigManager::setArtworkDir( const QString & _ad )
 {
 	m_artworkDir = ensureTrailingSlash( _ad );
 }
@@ -105,7 +106,7 @@ void configManager::setArtworkDir( const QString & _ad )
 
 
 
-void configManager::setFLDir( const QString & _fd )
+void ConfigManager::setFLDir( const QString & _fd )
 {
 	m_flDir = ensureTrailingSlash( _fd );
 }
@@ -113,7 +114,7 @@ void configManager::setFLDir( const QString & _fd )
 
 
 
-void configManager::setLADSPADir( const QString & _fd )
+void ConfigManager::setLADSPADir( const QString & _fd )
 {
 	m_ladDir = _fd;
 }
@@ -121,7 +122,7 @@ void configManager::setLADSPADir( const QString & _fd )
 
 
 
-void configManager::setSTKDir( const QString & _fd )
+void ConfigManager::setSTKDir( const QString & _fd )
 {
 #ifdef LMMS_HAVE_STK
 	m_stkDir = ensureTrailingSlash( _fd );
@@ -131,7 +132,7 @@ void configManager::setSTKDir( const QString & _fd )
 
 
 
-void configManager::setDefaultSoundfont( const QString & _sf )
+void ConfigManager::setDefaultSoundfont( const QString & _sf )
 {
 #ifdef LMMS_HAVE_FLUIDSYNTH
 	m_defaultSoundfont = _sf;
@@ -141,7 +142,7 @@ void configManager::setDefaultSoundfont( const QString & _sf )
 
 
 
-void configManager::setBackgroundArtwork( const QString & _ba )
+void ConfigManager::setBackgroundArtwork( const QString & _ba )
 {
 #ifdef LMMS_HAVE_FLUIDSYNTH
 	m_backgroundArtwork = _ba;
@@ -151,7 +152,7 @@ void configManager::setBackgroundArtwork( const QString & _ba )
 
 
 
-void configManager::addRecentlyOpenedProject( const QString & _file )
+void ConfigManager::addRecentlyOpenedProject( const QString & _file )
 {
 	m_recentlyOpenedProjects.removeAll( _file );
 	if( m_recentlyOpenedProjects.size() > 15 )
@@ -159,13 +160,13 @@ void configManager::addRecentlyOpenedProject( const QString & _file )
 		m_recentlyOpenedProjects.removeLast();
 	}
 	m_recentlyOpenedProjects.push_front( _file );
-	configManager::inst()->saveConfigFile();
+	ConfigManager::inst()->saveConfigFile();
 }
 
 
 
 
-const QString & configManager::value( const QString & _class,
+const QString & ConfigManager::value( const QString & _class,
 					const QString & _attribute ) const
 {
 	if( m_settings.contains( _class ) )
@@ -176,18 +177,18 @@ const QString & configManager::value( const QString & _class,
 		{
 			if( ( *it ).first == _attribute )
 			{
-				return( ( *it ).second );
+				return ( *it ).second ;
 			}
 		}
 	}
 	static QString empty;
-	return( empty );
+	return empty;
 }
 
 
 
 
-void configManager::setValue( const QString & _class,
+void ConfigManager::setValue( const QString & _class,
 				const QString & _attribute,
 				const QString & _value )
 {
@@ -234,7 +235,7 @@ static QString windowsConfigPath( int _type )
 
 
 
-void configManager::loadConfigFile()
+void ConfigManager::loadConfigFile()
 {
 	// read the XML file and create DOM tree
 	QFile cfg_file( m_lmmsRcFile );
@@ -395,7 +396,7 @@ void configManager::loadConfigFile()
 
 
 
-void configManager::saveConfigFile()
+void ConfigManager::saveConfigFile()
 {
 	setValue( "paths", "artwork", m_artworkDir );
 	setValue( "paths", "workingdir", m_workingDir );
diff --git a/src/core/DataFile.cpp b/src/core/DataFile.cpp
index 34d74936a..5204b7829 100644
--- a/src/core/DataFile.cpp
+++ b/src/core/DataFile.cpp
@@ -35,7 +35,7 @@
 #include <QMessageBox>
 
 
-#include "config_mgr.h"
+#include "ConfigManager.h"
 #include "project_version.h"
 #include "SongEditor.h"
 #include "Effect.h"
@@ -170,7 +170,7 @@ QString DataFile::nameWithExtension( const QString & _fn ) const
 					_fn.section( '.', -1 ) != "mpt" &&
 					_fn.section( '.', -1 ) != "mmpz" )
 			{
-				if( configManager::inst()->value( "app",
+				if( ConfigManager::inst()->value( "app",
 						"nommpz" ).toInt() == 0 )
 				{
 					return _fn + ".mmpz";
diff --git a/src/core/Effect.cpp b/src/core/Effect.cpp
index ce4473636..1717dbd45 100644
--- a/src/core/Effect.cpp
+++ b/src/core/Effect.cpp
@@ -31,7 +31,7 @@
 #include "EffectControls.h"
 #include "EffectView.h"
 
-#include "config_mgr.h"
+#include "ConfigManager.h"
 
 
 Effect::Effect( const Plugin::Descriptor * _desc,
@@ -54,7 +54,7 @@ Effect::Effect( const Plugin::Descriptor * _desc,
 	m_srcState[0] = m_srcState[1] = NULL;
 	reinitSRC();
 	
-	if( configManager::inst()->value( "ui", "disableautoquit").toInt() )
+	if( ConfigManager::inst()->value( "ui", "disableautoquit").toInt() )
 	{
 		m_autoQuitDisabled = true;
 	}
diff --git a/src/core/Mixer.cpp b/src/core/Mixer.cpp
index 7c1790a2a..4aa9faa5b 100644
--- a/src/core/Mixer.cpp
+++ b/src/core/Mixer.cpp
@@ -35,7 +35,7 @@
 #include "InstrumentTrack.h"
 #include "debug.h"
 #include "engine.h"
-#include "config_mgr.h"
+#include "ConfigManager.h"
 #include "SamplePlayHandle.h"
 #include "PianoRoll.h"
 #include "atomic_int.h"
@@ -92,11 +92,11 @@ Mixer::Mixer() :
 		m_framesPerPeriod = DEFAULT_BUFFER_SIZE;
 		m_fifo = new fifo( 1 );
 	}
-	else if( configManager::inst()->value( "mixer", "framesperaudiobuffer"
+	else if( ConfigManager::inst()->value( "mixer", "framesperaudiobuffer"
 						).toInt() >= 32 )
 	{
 		m_framesPerPeriod =
-			(fpp_t) configManager::inst()->value( "mixer",
+			(fpp_t) ConfigManager::inst()->value( "mixer",
 					"framesperaudiobuffer" ).toInt();
 
 		if( m_framesPerPeriod > DEFAULT_BUFFER_SIZE )
@@ -112,7 +112,7 @@ Mixer::Mixer() :
 	}
 	else
 	{
-		configManager::inst()->setValue( "mixer",
+		ConfigManager::inst()->setValue( "mixer",
 							"framesperaudiobuffer",
 				QString::number( m_framesPerPeriod ) );
 		m_fifo = new fifo( 1 );
@@ -237,7 +237,7 @@ void Mixer::stopProcessing()
 sample_rate_t Mixer::baseSampleRate() const
 {
 	sample_rate_t sr =
-		configManager::inst()->value( "mixer", "samplerate" ).toInt();
+		ConfigManager::inst()->value( "mixer", "samplerate" ).toInt();
 	if( sr < 44100 )
 	{
 		sr = 44100;
@@ -720,7 +720,7 @@ AudioDevice * Mixer::tryAudioDevices()
 {
 	bool success_ful = false;
 	AudioDevice * dev = NULL;
-	QString dev_name = configManager::inst()->value( "mixer", "audiodev" );
+	QString dev_name = ConfigManager::inst()->value( "mixer", "audiodev" );
 
 	if( dev_name == AudioDummy::name() )
 	{
@@ -833,7 +833,7 @@ AudioDevice * Mixer::tryAudioDevices()
 
 MidiClient * Mixer::tryMidiClients()
 {
-	QString client_name = configManager::inst()->value( "mixer",
+	QString client_name = ConfigManager::inst()->value( "mixer",
 								"mididev" );
 
 #ifdef LMMS_HAVE_ALSA
diff --git a/src/core/NotePlayHandle.cpp b/src/core/NotePlayHandle.cpp
index 63caabdf0..27c858158 100644
--- a/src/core/NotePlayHandle.cpp
+++ b/src/core/NotePlayHandle.cpp
@@ -25,7 +25,7 @@
 
 #include "NotePlayHandle.h"
 #include "basic_filters.h"
-#include "config_mgr.h"
+#include "ConfigManager.h"
 #include "DetuningHelper.h"
 #include "InstrumentSoundShaping.h"
 #include "InstrumentTrack.h"
diff --git a/src/core/Plugin.cpp b/src/core/Plugin.cpp
index 02d725f03..f9500586d 100644
--- a/src/core/Plugin.cpp
+++ b/src/core/Plugin.cpp
@@ -31,7 +31,7 @@
 #include "embed.h"
 #include "engine.h"
 #include "Mixer.h"
-#include "config_mgr.h"
+#include "ConfigManager.h"
 #include "DummyPlugin.h"
 #include "AutomatableModel.h"
 
@@ -93,7 +93,7 @@ AutomatableModel * Plugin::childModel( const QString & )
 Plugin * Plugin::instantiate( const QString & pluginName, Model * parent,
 								void * data )
 {
-	QLibrary pluginLibrary( configManager::inst()->pluginDir() + pluginName );
+	QLibrary pluginLibrary( ConfigManager::inst()->pluginDir() + pluginName );
 	if( pluginLibrary.load() == false )
 	{
 		if( engine::hasGUI() )
@@ -129,7 +129,7 @@ Plugin * Plugin::instantiate( const QString & pluginName, Model * parent,
 
 void Plugin::getDescriptorsOfAvailPlugins( DescriptorList& pluginDescriptors )
 {
-	QDir directory( configManager::inst()->pluginDir() );
+	QDir directory( ConfigManager::inst()->pluginDir() );
 #ifdef LMMS_BUILD_WIN32
 	QFileInfoList list = directory.entryInfoList( QStringList( "*.dll" ) );
 #else
diff --git a/src/core/RemotePlugin.cpp b/src/core/RemotePlugin.cpp
index 73eb31a8d..a1ed77c42 100644
--- a/src/core/RemotePlugin.cpp
+++ b/src/core/RemotePlugin.cpp
@@ -31,7 +31,7 @@
 #include "RemotePlugin.h"
 #include "Mixer.h"
 #include "engine.h"
-#include "config_mgr.h"
+#include "ConfigManager.h"
 
 #include <QDir>
 
@@ -130,7 +130,7 @@ bool RemotePlugin::init( const QString &pluginExecutable,
 		reset( new shmFifo(), new shmFifo() );
 		m_failed = false;
 	}
-	QString exec = configManager::inst()->pluginDir() +
+	QString exec = ConfigManager::inst()->pluginDir() +
 					QDir::separator() + pluginExecutable;
 
 	QStringList args;
diff --git a/src/core/SampleBuffer.cpp b/src/core/SampleBuffer.cpp
index 46bcc1ff6..51d268206 100644
--- a/src/core/SampleBuffer.cpp
+++ b/src/core/SampleBuffer.cpp
@@ -52,7 +52,7 @@
 
 
 #include "base64.h"
-#include "config_mgr.h"
+#include "ConfigManager.h"
 #include "debug.h"
 #include "drumsynth.h"
 #include "endian_handling.h"
@@ -957,10 +957,10 @@ QString SampleBuffer::openAudioFile() const
 		QString f = m_audioFile;
 		if( QFileInfo( f ).isRelative() )
 		{
-			f = configManager::inst()->userSamplesDir() + f;
+			f = ConfigManager::inst()->userSamplesDir() + f;
 			if( QFileInfo( f ).exists() == false )
 			{
-				f = configManager::inst()->factorySamplesDir() +
+				f = ConfigManager::inst()->factorySamplesDir() +
 								m_audioFile;
 			}
 		}
@@ -968,7 +968,7 @@ QString SampleBuffer::openAudioFile() const
 	}
 	else
 	{
-		dir = configManager::inst()->userSamplesDir();
+		dir = ConfigManager::inst()->userSamplesDir();
 	}
 	// change dir to position of previously opened file
 	ofd.setDirectory( dir );
@@ -1030,7 +1030,7 @@ QString SampleBuffer::openAndSetWaveformFile()
 {
 	if( m_audioFile.isEmpty() )
 	{
-		m_audioFile = configManager::inst()->factorySamplesDir() + "waveforms/10saw.flac";
+		m_audioFile = ConfigManager::inst()->factorySamplesDir() + "waveforms/10saw.flac";
 	}
 
 	QString fileName = this->openAudioFile();
@@ -1401,8 +1401,8 @@ QString SampleBuffer::tryToMakeRelative( const QString & _file )
 	if( QFileInfo( _file ).isRelative() == false )
 	{
 		QString f = QString( _file ).replace( QDir::separator(), '/' );
-		QString fsd = configManager::inst()->factorySamplesDir();
-		QString usd = configManager::inst()->userSamplesDir();
+		QString fsd = ConfigManager::inst()->factorySamplesDir();
+		QString usd = ConfigManager::inst()->userSamplesDir();
 		fsd.replace( QDir::separator(), '/' );
 		usd.replace( QDir::separator(), '/' );
 		if( f.startsWith( fsd ) )
@@ -1427,13 +1427,13 @@ QString SampleBuffer::tryToMakeAbsolute( const QString & _file )
 		return _file;
 	}
 
-	QString f = configManager::inst()->userSamplesDir() + _file;
+	QString f = ConfigManager::inst()->userSamplesDir() + _file;
 	if( QFileInfo( f ).exists() )
 	{
 		return f;
 	}
 
-	return configManager::inst()->factorySamplesDir() + _file;
+	return ConfigManager::inst()->factorySamplesDir() + _file;
 }
 
 
diff --git a/src/core/VstSyncController.cpp b/src/core/VstSyncController.cpp
index f8deb58cf..c98d93e7a 100644
--- a/src/core/VstSyncController.cpp
+++ b/src/core/VstSyncController.cpp
@@ -25,7 +25,7 @@
 
 #include <QDebug>
 
-#include "config_mgr.h"
+#include "ConfigManager.h"
 #include "engine.h"
 #include "lmmsconfig.h"
 #include "Mixer.h"
@@ -52,7 +52,7 @@ VstSyncController::VstSyncController() :
 	m_shmID( -1 ),
 	m_shm( "/usr/bin/lmms" )
 {
-	if( configManager::inst()->value( "ui", "syncvstplugins" ).toInt() )
+	if( ConfigManager::inst()->value( "ui", "syncvstplugins" ).toInt() )
 	{
 		connect( engine::mixer(), SIGNAL( sampleRateChanged() ), this, SLOT( updateSampleRate() ) );
 
diff --git a/src/core/audio/AudioAlsa.cpp b/src/core/audio/AudioAlsa.cpp
index eefadc246..0d2ee4b93 100644
--- a/src/core/audio/AudioAlsa.cpp
+++ b/src/core/audio/AudioAlsa.cpp
@@ -30,7 +30,7 @@
 #ifdef LMMS_HAVE_ALSA
 
 #include "endian_handling.h"
-#include "config_mgr.h"
+#include "ConfigManager.h"
 #include "engine.h"
 #include "LcdSpinBox.h"
 #include "gui_templates.h"
@@ -40,7 +40,7 @@
 
 AudioAlsa::AudioAlsa( bool & _success_ful, Mixer*  _mixer ) :
 	AudioDevice( tLimit<ch_cnt_t>(
-		configManager::inst()->value( "audioalsa", "channels" ).toInt(),
+		ConfigManager::inst()->value( "audioalsa", "channels" ).toInt(),
 					DEFAULT_CHANNELS, SURROUND_CHANNELS ),
 								_mixer ),
 	m_handle( NULL ),
@@ -123,7 +123,7 @@ AudioAlsa::~AudioAlsa()
 
 QString AudioAlsa::probeDevice()
 {
-	QString dev = configManager::inst()->value( "audioalsa", "device" );
+	QString dev = ConfigManager::inst()->value( "audioalsa", "device" );
 	if( dev == "" )
 	{
 		if( getenv( "AUDIODEV" ) != NULL )
@@ -507,7 +507,7 @@ AudioAlsa::setupWidget::setupWidget( QWidget * _parent ) :
 	LcdSpinBoxModel * m = new LcdSpinBoxModel( /* this */ );
 	m->setRange( DEFAULT_CHANNELS, SURROUND_CHANNELS );
 	m->setStep( 2 );
-	m->setValue( configManager::inst()->value( "audioalsa",
+	m->setValue( ConfigManager::inst()->value( "audioalsa",
 							"channels" ).toInt() );
 
 	m_channels = new LcdSpinBox( 1, this );
@@ -530,9 +530,9 @@ AudioAlsa::setupWidget::~setupWidget()
 
 void AudioAlsa::setupWidget::saveSettings()
 {
-	configManager::inst()->setValue( "audioalsa", "device",
+	ConfigManager::inst()->setValue( "audioalsa", "device",
 							m_device->text() );
-	configManager::inst()->setValue( "audioalsa", "channels",
+	ConfigManager::inst()->setValue( "audioalsa", "channels",
 				QString::number( m_channels->value<int>() ) );
 }
 
diff --git a/src/core/audio/AudioDevice.cpp b/src/core/audio/AudioDevice.cpp
index a6e4094e3..26a790e3e 100644
--- a/src/core/audio/AudioDevice.cpp
+++ b/src/core/audio/AudioDevice.cpp
@@ -25,7 +25,7 @@
 #include <cstring>
 
 #include "AudioDevice.h"
-#include "config_mgr.h"
+#include "ConfigManager.h"
 #include "debug.h"
 
 
@@ -248,7 +248,7 @@ void AudioDevice::clearS16Buffer( int_sample_t * _outbuf, const fpp_t _frames )
 
 bool AudioDevice::hqAudio() const
 {
-	return configManager::inst()->value( "mixer", "hqaudio" ).toInt();
+	return ConfigManager::inst()->value( "mixer", "hqaudio" ).toInt();
 }
 
 
diff --git a/src/core/audio/AudioJack.cpp b/src/core/audio/AudioJack.cpp
index 7e79b9e69..809da7d95 100644
--- a/src/core/audio/AudioJack.cpp
+++ b/src/core/audio/AudioJack.cpp
@@ -36,7 +36,7 @@
 #include "engine.h"
 #include "templates.h"
 #include "gui_templates.h"
-#include "config_mgr.h"
+#include "ConfigManager.h"
 #include "LcdSpinBox.h"
 #include "AudioPort.h"
 #include "MainWindow.h"
@@ -45,7 +45,7 @@
 
 
 AudioJack::AudioJack( bool & _success_ful, Mixer*  _mixer ) :
-	AudioDevice( tLimit<int>( configManager::inst()->value(
+	AudioDevice( tLimit<int>( ConfigManager::inst()->value(
 					"audiojack", "channels" ).toInt(),
 					DEFAULT_CHANNELS, SURROUND_CHANNELS ),
 								_mixer ),
@@ -131,7 +131,7 @@ void AudioJack::restartAfterZombified()
 
 bool AudioJack::initJackClient()
 {
-	QString clientName = configManager::inst()->value( "audiojack",
+	QString clientName = ConfigManager::inst()->value( "audiojack",
 								"clientname" );
 	if( clientName.isEmpty() )
 	{
@@ -434,7 +434,7 @@ void AudioJack::shutdownCallback( void * _udata )
 AudioJack::setupWidget::setupWidget( QWidget * _parent ) :
 	AudioDevice::setupWidget( AudioJack::name(), _parent )
 {
-	QString cn = configManager::inst()->value( "audiojack", "clientname" );
+	QString cn = ConfigManager::inst()->value( "audiojack", "clientname" );
 	if( cn.isEmpty() )
 	{
 		cn = "lmms";
@@ -449,7 +449,7 @@ AudioJack::setupWidget::setupWidget( QWidget * _parent ) :
 	LcdSpinBoxModel * m = new LcdSpinBoxModel( /* this */ );	
 	m->setRange( DEFAULT_CHANNELS, SURROUND_CHANNELS );
 	m->setStep( 2 );
-	m->setValue( configManager::inst()->value( "audiojack",
+	m->setValue( ConfigManager::inst()->value( "audiojack",
 							"channels" ).toInt() );
 
 	m_channels = new LcdSpinBox( 1, this );
@@ -471,9 +471,9 @@ AudioJack::setupWidget::~setupWidget()
 
 void AudioJack::setupWidget::saveSettings()
 {
-	configManager::inst()->setValue( "audiojack", "clientname",
+	ConfigManager::inst()->setValue( "audiojack", "clientname",
 							m_clientName->text() );
-	configManager::inst()->setValue( "audiojack", "channels",
+	ConfigManager::inst()->setValue( "audiojack", "channels",
 				QString::number( m_channels->value<int>() ) );
 }
 
diff --git a/src/core/audio/AudioOss.cpp b/src/core/audio/AudioOss.cpp
index f73f211b2..958983fe3 100644
--- a/src/core/audio/AudioOss.cpp
+++ b/src/core/audio/AudioOss.cpp
@@ -58,7 +58,7 @@
 #endif
 
 
-#include "config_mgr.h"
+#include "ConfigManager.h"
 
 
 #ifndef _PATH_DEV_DSP
@@ -73,7 +73,7 @@
 
 AudioOss::AudioOss( bool & _success_ful, Mixer*  _mixer ) :
 	AudioDevice( tLimit<ch_cnt_t>(
-		configManager::inst()->value( "audiooss", "channels" ).toInt(),
+		ConfigManager::inst()->value( "audiooss", "channels" ).toInt(),
 					DEFAULT_CHANNELS, SURROUND_CHANNELS ),
 								_mixer ),
 	m_convertEndian( false )
@@ -202,7 +202,7 @@ AudioOss::~AudioOss()
 
 QString AudioOss::probeDevice()
 {
-	QString dev = configManager::inst()->value( "AudioOss", "Device" );
+	QString dev = ConfigManager::inst()->value( "AudioOss", "Device" );
 	if( dev.isEmpty() )
 	{
 		char * adev = getenv( "AUDIODEV" );	// Is there a standard
@@ -341,7 +341,7 @@ AudioOss::setupWidget::setupWidget( QWidget * _parent ) :
 	LcdSpinBoxModel * m = new LcdSpinBoxModel( /* this */ );	
 	m->setRange( DEFAULT_CHANNELS, SURROUND_CHANNELS );
 	m->setStep( 2 );
-	m->setValue( configManager::inst()->value( "audiooss",
+	m->setValue( ConfigManager::inst()->value( "audiooss",
 							"channels" ).toInt() );
 
 	m_channels = new LcdSpinBox( 1, this );
@@ -364,9 +364,9 @@ AudioOss::setupWidget::~setupWidget()
 
 void AudioOss::setupWidget::saveSettings()
 {
-	configManager::inst()->setValue( "audiooss", "device",
+	ConfigManager::inst()->setValue( "audiooss", "device",
 							m_device->text() );
-	configManager::inst()->setValue( "audiooss", "channels",
+	ConfigManager::inst()->setValue( "audiooss", "channels",
 				QString::number( m_channels->value<int>() ) );
 }
 
diff --git a/src/core/audio/AudioPortAudio.cpp b/src/core/audio/AudioPortAudio.cpp
index 087f8dc3b..2f6219785 100644
--- a/src/core/audio/AudioPortAudio.cpp
+++ b/src/core/audio/AudioPortAudio.cpp
@@ -43,7 +43,7 @@ void AudioPortAudioSetupUtil::updateChannels()
 
 #include "engine.h"
 #include "debug.h"
-#include "config_mgr.h"
+#include "ConfigManager.h"
 #include "gui_templates.h"
 #include "templates.h"
 #include "combobox.h"
@@ -52,7 +52,7 @@ void AudioPortAudioSetupUtil::updateChannels()
 
 AudioPortAudio::AudioPortAudio( bool & _success_ful, Mixer * _mixer ) :
 	AudioDevice( tLimit<ch_cnt_t>(
-		configManager::inst()->value( "audioportaudio", "channels" ).toInt(),
+		ConfigManager::inst()->value( "audioportaudio", "channels" ).toInt(),
 					DEFAULT_CHANNELS, SURROUND_CHANNELS ),
 								_mixer ),
 	m_paStream( NULL ),
@@ -78,8 +78,8 @@ AudioPortAudio::AudioPortAudio( bool & _success_ful, Mixer * _mixer ) :
 		return;
 	}
 	
-	const QString& backend = configManager::inst()->value( "audioportaudio", "backend" );
-	const QString& device = configManager::inst()->value( "audioportaudio", "device" );
+	const QString& backend = ConfigManager::inst()->value( "audioportaudio", "backend" );
+	const QString& device = ConfigManager::inst()->value( "audioportaudio", "device" );
 		
 	PaDeviceIndex inDevIdx = -1;
 	PaDeviceIndex outDevIdx = -1;
@@ -408,7 +408,7 @@ AudioPortAudio::setupWidget::setupWidget( QWidget * _parent ) :
 /*	LcdSpinBoxModel * m = new LcdSpinBoxModel(  );
 	m->setRange( DEFAULT_CHANNELS, SURROUND_CHANNELS );
 	m->setStep( 2 );
-	m->setValue( configManager::inst()->value( "audioportaudio",
+	m->setValue( ConfigManager::inst()->value( "audioportaudio",
 							"channels" ).toInt() );
 
 	m_channels = new LcdSpinBox( 1, this );
@@ -434,9 +434,9 @@ AudioPortAudio::setupWidget::setupWidget( QWidget * _parent ) :
 	Pa_Terminate();
 
 
-	const QString& backend = configManager::inst()->value( "audioportaudio",
+	const QString& backend = ConfigManager::inst()->value( "audioportaudio",
 		"backend" );
-	const QString& device = configManager::inst()->value( "audioportaudio",
+	const QString& device = ConfigManager::inst()->value( "audioportaudio",
 		"device" );
 	
 	int i = qMax( 0, m_setupUtil.m_backendModel.findText( backend ) );
@@ -475,11 +475,11 @@ AudioPortAudio::setupWidget::~setupWidget()
 void AudioPortAudio::setupWidget::saveSettings()
 {
 
-	configManager::inst()->setValue( "audioportaudio", "backend",
+	ConfigManager::inst()->setValue( "audioportaudio", "backend",
 							m_setupUtil.m_backendModel.currentText() );
-	configManager::inst()->setValue( "audioportaudio", "device",
+	ConfigManager::inst()->setValue( "audioportaudio", "device",
 							m_setupUtil.m_deviceModel.currentText() );
-/*	configManager::inst()->setValue( "audioportaudio", "channels",
+/*	ConfigManager::inst()->setValue( "audioportaudio", "channels",
 				QString::number( m_channels->value<int>() ) );*/
 
 }
diff --git a/src/core/audio/AudioPulseAudio.cpp b/src/core/audio/AudioPulseAudio.cpp
index 6f6f63fd5..142c105d6 100644
--- a/src/core/audio/AudioPulseAudio.cpp
+++ b/src/core/audio/AudioPulseAudio.cpp
@@ -30,7 +30,7 @@
 #ifdef LMMS_HAVE_PULSEAUDIO
 
 #include "endian_handling.h"
-#include "config_mgr.h"
+#include "ConfigManager.h"
 #include "LcdSpinBox.h"
 #include "gui_templates.h"
 #include "templates.h"
@@ -47,7 +47,7 @@ static void stream_write_callback(pa_stream *s, size_t length, void *userdata)
 
 AudioPulseAudio::AudioPulseAudio( bool & _success_ful, Mixer*  _mixer ) :
 	AudioDevice( tLimit<ch_cnt_t>(
-		configManager::inst()->value( "audiopa", "channels" ).toInt(),
+		ConfigManager::inst()->value( "audiopa", "channels" ).toInt(),
 					DEFAULT_CHANNELS, SURROUND_CHANNELS ),
 								_mixer ),
 	m_s( NULL ),
@@ -76,7 +76,7 @@ AudioPulseAudio::~AudioPulseAudio()
 
 QString AudioPulseAudio::probeDevice()
 {
-	QString dev = configManager::inst()->value( "audiopa", "device" );
+	QString dev = ConfigManager::inst()->value( "audiopa", "device" );
 	if( dev.isEmpty() )
 	{
 		if( getenv( "AUDIODEV" ) != NULL )
@@ -292,7 +292,7 @@ AudioPulseAudio::setupWidget::setupWidget( QWidget * _parent ) :
 	LcdSpinBoxModel * m = new LcdSpinBoxModel( /* this */ );
 	m->setRange( DEFAULT_CHANNELS, SURROUND_CHANNELS );
 	m->setStep( 2 );
-	m->setValue( configManager::inst()->value( "audiopa",
+	m->setValue( ConfigManager::inst()->value( "audiopa",
 							"channels" ).toInt() );
 
 	m_channels = new LcdSpinBox( 1, this );
@@ -315,9 +315,9 @@ AudioPulseAudio::setupWidget::~setupWidget()
 
 void AudioPulseAudio::setupWidget::saveSettings()
 {
-	configManager::inst()->setValue( "audiopa", "device",
+	ConfigManager::inst()->setValue( "audiopa", "device",
 							m_device->text() );
-	configManager::inst()->setValue( "audiopa", "channels",
+	ConfigManager::inst()->setValue( "audiopa", "channels",
 				QString::number( m_channels->value<int>() ) );
 }
 
diff --git a/src/core/audio/AudioSdl.cpp b/src/core/audio/AudioSdl.cpp
index 4393dafdf..2222da372 100644
--- a/src/core/audio/AudioSdl.cpp
+++ b/src/core/audio/AudioSdl.cpp
@@ -31,7 +31,7 @@
 
 #include "engine.h"
 #include "debug.h"
-#include "config_mgr.h"
+#include "ConfigManager.h"
 #include "gui_templates.h"
 #include "templates.h"
 
@@ -205,7 +205,7 @@ void AudioSdl::sdlAudioCallback( Uint8 * _buf, int _len )
 AudioSdl::setupWidget::setupWidget( QWidget * _parent ) :
 	AudioDevice::setupWidget( AudioSdl::name(), _parent )
 {
-	QString dev = configManager::inst()->value( "audiosdl", "device" );
+	QString dev = ConfigManager::inst()->value( "audiosdl", "device" );
 	m_device = new QLineEdit( dev, this );
 	m_device->setGeometry( 10, 20, 160, 20 );
 
@@ -227,7 +227,7 @@ AudioSdl::setupWidget::~setupWidget()
 
 void AudioSdl::setupWidget::saveSettings()
 {
-	configManager::inst()->setValue( "audiosdl", "device",
+	ConfigManager::inst()->setValue( "audiosdl", "device",
 							m_device->text() );
 }
 
diff --git a/src/core/engine.cpp b/src/core/engine.cpp
index 506ee4da4..d7dc0ef87 100644
--- a/src/core/engine.cpp
+++ b/src/core/engine.cpp
@@ -27,7 +27,7 @@
 #include "AutomationEditor.h"
 #include "bb_editor.h"
 #include "bb_track_container.h"
-#include "config_mgr.h"
+#include "ConfigManager.h"
 #include "ControllerRackView.h"
 #include "FxMixer.h"
 #include "FxMixerView.h"
@@ -137,14 +137,14 @@ void engine::destroy()
 
 	deleteHelper( &s_ladspaManager );
 
-	//delete configManager::inst();
+	//delete ConfigManager::inst();
 	deleteHelper( &s_projectJournal );
 
 	s_mainWindow = NULL;
 
 	deleteHelper( &s_song );
 
-	delete configManager::inst();
+	delete ConfigManager::inst();
 }
 
 
diff --git a/src/core/ladspa_manager.cpp b/src/core/ladspa_manager.cpp
index 19aa40f3c..40f79162c 100644
--- a/src/core/ladspa_manager.cpp
+++ b/src/core/ladspa_manager.cpp
@@ -32,7 +32,7 @@
 
 #include <math.h>
 
-#include "config_mgr.h"
+#include "ConfigManager.h"
 #include "ladspa_manager.h"
 
 
@@ -41,9 +41,9 @@ ladspaManager::ladspaManager()
 {
 	QStringList ladspaDirectories = QString( getenv( "LADSPA_PATH" ) ).
 								split( LADSPA_PATH_SEPERATOR );
-	ladspaDirectories += configManager::inst()->ladspaDir().split( ',' );
+	ladspaDirectories += ConfigManager::inst()->ladspaDir().split( ',' );
 
-	ladspaDirectories.push_back( configManager::inst()->pluginDir() + "ladspa" );
+	ladspaDirectories.push_back( ConfigManager::inst()->pluginDir() + "ladspa" );
 #ifndef LMMS_BUILD_WIN32
 	ladspaDirectories.push_back( qApp->applicationDirPath() + '/' + LIB_DIR + "ladspa" );
 	ladspaDirectories.push_back( "/usr/lib/ladspa" );
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 31dd6309b..1b4ee81be 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -56,7 +56,7 @@
 #include <unistd.h>
 #endif
 
-#include "config_mgr.h"
+#include "ConfigManager.h"
 #include "embed.h"
 #include "engine.h"
 #include "LmmsStyle.h"
@@ -75,7 +75,7 @@ static inline QString baseName( const QString & _file )
 
 
 inline void loadTranslation( const QString & _tname,
-	const QString & _dir = configManager::inst()->localeDir() )
+	const QString & _dir = ConfigManager::inst()->localeDir() )
 {
 	QTranslator * t = new QTranslator( QCoreApplication::instance() );
 	QString name = _tname + ".qm";
@@ -363,7 +363,7 @@ int main( int argc, char * * argv )
 
 #ifdef LMMS_BUILD_WIN32
 #undef QT_TRANSLATIONS_DIR
-#define QT_TRANSLATIONS_DIR configManager::inst()->localeDir()
+#define QT_TRANSLATIONS_DIR ConfigManager::inst()->localeDir()
 #endif
 
 #ifdef QT_TRANSLATIONS_DIR
@@ -390,7 +390,7 @@ int main( int argc, char * * argv )
 #endif
 #endif
 
-	configManager::inst()->loadConfigFile();
+	ConfigManager::inst()->loadConfigFile();
 
 	if( render_out.isEmpty() )
 	{
@@ -422,7 +422,7 @@ int main( int argc, char * * argv )
 		srand( getpid() + time( 0 ) );
 
 		// recover a file?
-		QString recoveryFile = QDir(configManager::inst()->workingDir()).absoluteFilePath("recover.dataFile");
+		QString recoveryFile = ConfigManager::inst()->recoveryFile();
 		if( QFileInfo(recoveryFile).exists() &&
 			QMessageBox::question( engine::mainWindow(), MainWindow::tr( "Project recovery" ),
 						MainWindow::tr( "It looks like the last session did not end properly. "
diff --git a/src/core/midi/MidiAlsaRaw.cpp b/src/core/midi/MidiAlsaRaw.cpp
index 316bde251..82e2457f1 100644
--- a/src/core/midi/MidiAlsaRaw.cpp
+++ b/src/core/midi/MidiAlsaRaw.cpp
@@ -26,7 +26,7 @@
 #include <QLineEdit>
 
 #include "MidiAlsaRaw.h"
-#include "config_mgr.h"
+#include "ConfigManager.h"
 #include "gui_templates.h"
 
 
@@ -80,7 +80,7 @@ MidiAlsaRaw::~MidiAlsaRaw()
 
 QString MidiAlsaRaw::probeDevice()
 {
-	QString dev = configManager::inst()->value( "MidiAlsaRaw", "Device" );
+	QString dev = ConfigManager::inst()->value( "MidiAlsaRaw", "Device" );
 	if( dev == "" )
 	{
 		if( getenv( "MIDIDEV" ) != NULL )
@@ -199,7 +199,7 @@ MidiAlsaRaw::setupWidget::~setupWidget()
 
 void MidiAlsaRaw::setupWidget::saveSettings()
 {
-	configManager::inst()->setValue( "MidiAlsaRaw", "Device",
+	ConfigManager::inst()->setValue( "MidiAlsaRaw", "Device",
 							m_device->text() );
 }
 
diff --git a/src/core/midi/MidiAlsaSeq.cpp b/src/core/midi/MidiAlsaSeq.cpp
index 964ed18b9..d1cdc1a16 100644
--- a/src/core/midi/MidiAlsaSeq.cpp
+++ b/src/core/midi/MidiAlsaSeq.cpp
@@ -26,7 +26,7 @@
 #include <QLineEdit>
 
 #include "MidiAlsaSeq.h"
-#include "config_mgr.h"
+#include "ConfigManager.h"
 #include "engine.h"
 #include "gui_templates.h"
 #include "song.h"
@@ -146,7 +146,7 @@ MidiAlsaSeq::~MidiAlsaSeq()
 
 QString MidiAlsaSeq::probeDevice()
 {
-	QString dev = configManager::inst()->value( "Midialsaseq", "device" );
+	QString dev = ConfigManager::inst()->value( "Midialsaseq", "device" );
 	if( dev.isEmpty() )
 	{
 		if( getenv( "MIDIDEV" ) != NULL )
@@ -730,7 +730,7 @@ MidiAlsaSeq::setupWidget::~setupWidget()
 
 void MidiAlsaSeq::setupWidget::saveSettings()
 {
-	configManager::inst()->setValue( "Midialsaseq", "device",
+	ConfigManager::inst()->setValue( "Midialsaseq", "device",
 							m_device->text() );
 }
 
diff --git a/src/core/midi/MidiOss.cpp b/src/core/midi/MidiOss.cpp
index 7462adf9d..9a7f685e0 100644
--- a/src/core/midi/MidiOss.cpp
+++ b/src/core/midi/MidiOss.cpp
@@ -37,7 +37,7 @@
 #endif
 
 
-#include "config_mgr.h"
+#include "ConfigManager.h"
 #include "gui_templates.h"
 
 
@@ -74,7 +74,7 @@ MidiOss::~MidiOss()
 
 QString MidiOss::probeDevice()
 {
-	QString dev = configManager::inst()->value( "midioss", "device" );
+	QString dev = ConfigManager::inst()->value( "midioss", "device" );
 	if( dev.isEmpty() )
 	{
 		if( getenv( "MIDIDEV" ) != NULL )
@@ -137,7 +137,7 @@ MidiOss::setupWidget::~setupWidget()
 
 void MidiOss::setupWidget::saveSettings()
 {
-	configManager::inst()->setValue( "midioss", "device",
+	ConfigManager::inst()->setValue( "midioss", "device",
 							m_device->text() );
 }
 
diff --git a/src/core/midi/MidiWinMM.cpp b/src/core/midi/MidiWinMM.cpp
index 2c0d7c9ea..f5f717ad0 100644
--- a/src/core/midi/MidiWinMM.cpp
+++ b/src/core/midi/MidiWinMM.cpp
@@ -26,7 +26,7 @@
 #include <QLineEdit>
 
 #include "MidiWinMM.h"
-#include "config_mgr.h"
+#include "ConfigManager.h"
 #include "engine.h"
 #include "gui_templates.h"
 #include "MidiPort.h"
diff --git a/src/core/song.cpp b/src/core/song.cpp
index cfaecc285..9601dcd7a 100644
--- a/src/core/song.cpp
+++ b/src/core/song.cpp
@@ -36,7 +36,7 @@
 #include "bb_editor.h"
 #include "bb_track.h"
 #include "bb_track_container.h"
-#include "config_mgr.h"
+#include "ConfigManager.h"
 #include "ControllerRackView.h"
 #include "ControllerConnection.h"
 #include "embed.h"
@@ -795,7 +795,7 @@ void song::clearProject()
 // create new file
 void song::createNewProject()
 {
-	QString default_template = configManager::inst()->userProjectsDir()
+	QString default_template = ConfigManager::inst()->userProjectsDir()
 						+ "templates/default.mpt";
 
 	if( QFile::exists( default_template ) )
@@ -804,7 +804,7 @@ void song::createNewProject()
 		return;
 	}
 
-	default_template = configManager::inst()->factoryProjectsDir()
+	default_template = ConfigManager::inst()->factoryProjectsDir()
 						+ "templates/default.mpt";
 	if( QFile::exists( default_template ) )
 	{
@@ -989,7 +989,7 @@ void song::loadProject( const QString & _file_name )
 
 	engine::mixer()->unlock();
 
-	configManager::inst()->addRecentlyOpenedProject( _file_name );
+	ConfigManager::inst()->addRecentlyOpenedProject( _file_name );
 
 	engine::projectJournal()->setJournalling( true );
 
@@ -1049,7 +1049,7 @@ bool song::guiSaveProject()
 							).arg( m_fileName ),
 				embed::getIconPixmap( "project_save", 24, 24 ),
 									2000 );
-		configManager::inst()->addRecentlyOpenedProject( m_fileName );
+		ConfigManager::inst()->addRecentlyOpenedProject( m_fileName );
 		m_modified = false;
 		engine::mainWindow()->resetWindowTitle();
 	}
@@ -1090,7 +1090,7 @@ bool song::guiSaveProjectAs( const QString & _file_name )
 void song::importProject()
 {
 	FileDialog ofd( NULL, tr( "Import file" ),
-			configManager::inst()->userProjectsDir(),
+			ConfigManager::inst()->userProjectsDir(),
 			tr("MIDI sequences") +
 			" (*.mid *.midi *.rmi);;" +
 			tr("FL Studio projects") +
@@ -1191,7 +1191,7 @@ void song::exportProject(bool multiExport)
 		}
 		else
 		{
-			efd.setDirectory( configManager::inst()->userProjectsDir() );
+			efd.setDirectory( ConfigManager::inst()->userProjectsDir() );
 			base_filename = tr( "untitled" );
 		}
 		efd.selectFile( base_filename + __fileEncodeDevices[0].m_extension );
diff --git a/src/core/track.cpp b/src/core/track.cpp
index 10bafb51b..960540bf6 100644
--- a/src/core/track.cpp
+++ b/src/core/track.cpp
@@ -52,7 +52,7 @@
 #include "bb_editor.h"
 #include "bb_track.h"
 #include "bb_track_container.h"
-#include "config_mgr.h"
+#include "ConfigManager.h"
 #include "Clipboard.h"
 #include "embed.h"
 #include "engine.h"
@@ -1587,7 +1587,7 @@ trackOperationsWidget::trackOperationsWidget( trackView * _parent ) :
 	m_soloBtn->setInactiveGraphic( embed::getIconPixmap( "led_off" ) );
 	m_soloBtn->setCheckable( true );
 
-	if( configManager::inst()->value( "ui",
+	if( ConfigManager::inst()->value( "ui",
 					  "compacttrackbuttons" ).toInt() )
 	{
 		m_muteBtn->move( 46, 0 );
@@ -2443,7 +2443,7 @@ trackView::~trackView()
  */
 void trackView::resizeEvent( QResizeEvent * _re )
 {
-	if( configManager::inst()->value( "ui",
+	if( ConfigManager::inst()->value( "ui",
 					  "compacttrackbuttons" ).toInt() )
 	{
 		m_trackOperationsWidget.setFixedSize( TRACK_OP_WIDTH_COMPACT, height() - 1 );
diff --git a/src/gui/FileBrowser.cpp b/src/gui/FileBrowser.cpp
index 34cf48b9f..794a8e33f 100644
--- a/src/gui/FileBrowser.cpp
+++ b/src/gui/FileBrowser.cpp
@@ -34,7 +34,7 @@
 
 #include "FileBrowser.h"
 #include "bb_track_container.h"
-#include "config_mgr.h"
+#include "ConfigManager.h"
 #include "debug.h"
 #include "embed.h"
 #include "engine.h"
@@ -768,7 +768,7 @@ void Directory::update( void )
 			int top_index = childCount();
 			if( addItems( fullName( *it ) ) &&
 				( *it ).contains(
-					configManager::inst()->dataDir() ) )
+					ConfigManager::inst()->dataDir() ) )
 			{
 				QTreeWidgetItem * sep = new QTreeWidgetItem;
 				sep->setText( 0,
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index 3d1b707fc..b44f2e2df 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -51,7 +51,7 @@
 #include "FileBrowser.h"
 #include "plugin_browser.h"
 #include "SideBar.h"
-#include "config_mgr.h"
+#include "ConfigManager.h"
 #include "Mixer.h"
 #include "PluginView.h"
 #include "project_notes.h"
@@ -93,24 +93,24 @@ MainWindow::MainWindow() :
 	QSplitter * splitter = new QSplitter( Qt::Horizontal, w );
 	splitter->setChildrenCollapsible( false );
 
-	QString wdir = configManager::inst()->workingDir();
+	QString wdir = ConfigManager::inst()->workingDir();
 	sideBar->appendTab( new pluginBrowser( splitter ) );
 	sideBar->appendTab( new FileBrowser(
-				configManager::inst()->userProjectsDir() + "*" +
-				configManager::inst()->factoryProjectsDir(),
+				ConfigManager::inst()->userProjectsDir() + "*" +
+				ConfigManager::inst()->factoryProjectsDir(),
 					"*.mmp *.mmpz *.xml *.mid *.flp",
 							tr( "My projects" ),
 					embed::getIconPixmap( "project_file" ).transformed( QTransform().rotate( 90 ) ),
 							splitter ) );
 	sideBar->appendTab( new FileBrowser(
-				configManager::inst()->userSamplesDir() + "*" +
-				configManager::inst()->factorySamplesDir(),
+				ConfigManager::inst()->userSamplesDir() + "*" +
+				ConfigManager::inst()->factorySamplesDir(),
 					"*", tr( "My samples" ),
 					embed::getIconPixmap( "sample_file" ).transformed( QTransform().rotate( 90 ) ),
 							splitter ) );
 	sideBar->appendTab( new FileBrowser(
-				configManager::inst()->userPresetsDir() + "*" +
-				configManager::inst()->factoryPresetsDir(),
+				ConfigManager::inst()->userPresetsDir() + "*" +
+				ConfigManager::inst()->factoryPresetsDir(),
 					"*.xpf *.cs.xml *.xiz",
 					tr( "My presets" ),
 					embed::getIconPixmap( "preset_file" ).transformed( QTransform().rotate( 90 ) ),
@@ -151,7 +151,7 @@ MainWindow::MainWindow() :
 	m_workspace = new QMdiArea( splitter );
 
 	// Load background
-	QString bgArtwork = configManager::inst()->backgroundArtwork();
+	QString bgArtwork = ConfigManager::inst()->backgroundArtwork();
 	QImage bgImage;
 	if( !bgArtwork.isEmpty() )
 	{
@@ -192,7 +192,7 @@ MainWindow::MainWindow() :
 
 	m_updateTimer.start( 1000 / 20, this );	// 20 fps
 
-	if( configManager::inst()->value( "ui", "enableautosave" ).toInt() )
+	if( ConfigManager::inst()->value( "ui", "enableautosave" ).toInt() )
 	{
 		// connect auto save
 		connect(&m_autoSaveTimer, SIGNAL(timeout()), this, SLOT(autoSave()));
@@ -515,9 +515,9 @@ void MainWindow::finalize()
 	m_toolBarLayout->setColumnStretch( 100, 1 );
 
 	// setup-dialog opened before?
-	if( !configManager::inst()->value( "app", "configured" ).toInt() )
+	if( !ConfigManager::inst()->value( "app", "configured" ).toInt() )
 	{
-		configManager::inst()->setValue( "app", "configured", "1" );
+		ConfigManager::inst()->setValue( "app", "configured", "1" );
 		// no, so show it that user can setup everything
 		setupDialog sd;
 		sd.exec();
@@ -706,8 +706,8 @@ void MainWindow::createNewProjectFromTemplate( QAction * _idx )
 	{
 		QString dir_base = m_templatesMenu->actions().indexOf( _idx )
 						>= m_custom_templates_count ?
-				configManager::inst()->factoryProjectsDir() :
-				configManager::inst()->userProjectsDir();
+				ConfigManager::inst()->factoryProjectsDir() :
+				ConfigManager::inst()->userProjectsDir();
 		engine::getSong()->createNewProjectFromTemplate(
 			dir_base + "templates/" + _idx->text() + ".mpt" );
 	}
@@ -722,7 +722,7 @@ void MainWindow::openProject()
 	{
 		FileDialog ofd( this, tr( "Open project" ), "", tr( "LMMS (*.mmp *.mmpz)" ) );
 
-		ofd.setDirectory( configManager::inst()->userProjectsDir() );
+		ofd.setDirectory( ConfigManager::inst()->userProjectsDir() );
 		ofd.setFileMode( FileDialog::ExistingFiles );
 		if( ofd.exec () == QDialog::Accepted &&
 						!ofd.selectedFiles().isEmpty() )
@@ -741,7 +741,7 @@ void MainWindow::openProject()
 void MainWindow::updateRecentlyOpenedProjectsMenu()
 {
 	m_recentlyOpenedProjectsMenu->clear();
-	QStringList rup = configManager::inst()->recentlyOpenedProjects();
+	QStringList rup = ConfigManager::inst()->recentlyOpenedProjects();
 	for( QStringList::iterator it = rup.begin(); it != rup.end(); ++it )
 	{
 		m_recentlyOpenedProjectsMenu->addAction(
@@ -757,7 +757,7 @@ void MainWindow::openRecentlyOpenedProject( QAction * _action )
 	const QString & f = _action->text();
 	setCursor( Qt::WaitCursor );
 	engine::getSong()->loadProject( f );
-	configManager::inst()->addRecentlyOpenedProject( f );
+	ConfigManager::inst()->addRecentlyOpenedProject( f );
 	setCursor( Qt::ArrowCursor );
 }
 
@@ -793,7 +793,7 @@ bool MainWindow::saveProjectAs()
 	}
 	else
 	{
-		sfd.setDirectory( configManager::inst()->userProjectsDir() );
+		sfd.setDirectory( ConfigManager::inst()->userProjectsDir() );
 	}
 
 	if( sfd.exec () == FileDialog::Accepted &&
@@ -1000,8 +1000,7 @@ void MainWindow::closeEvent( QCloseEvent * _ce )
 	if( mayChangeProject() )
 	{
 		// delete recovery file
-		QDir working(configManager::inst()->workingDir());
-		working.remove("recover.mmp");
+		QFile::remove(ConfigManager::inst()->recoveryFile());
 		_ce->accept();
 	}
 	else
@@ -1085,7 +1084,7 @@ void MainWindow::fillTemplatesMenu()
 {
 	m_templatesMenu->clear();
 
-	QDir user_d( configManager::inst()->userProjectsDir() + "templates" );
+	QDir user_d( ConfigManager::inst()->userProjectsDir() + "templates" );
 	QStringList templates = user_d.entryList( QStringList( "*.mpt" ),
 						QDir::Files | QDir::Readable );
 
@@ -1098,7 +1097,7 @@ void MainWindow::fillTemplatesMenu()
 					( *it ).left( ( *it ).length() - 4 ) );
 	}
 
-	QDir d( configManager::inst()->factoryProjectsDir() + "templates" );
+	QDir d( ConfigManager::inst()->factoryProjectsDir() + "templates" );
 	templates = d.entryList( QStringList( "*.mpt" ),
 						QDir::Files | QDir::Readable );
 
@@ -1146,8 +1145,7 @@ void MainWindow::autoSave()
 	if( !( engine::getSong()->isPlaying() ||
 			engine::getSong()->isExporting() ) )
 	{
-		QDir work(configManager::inst()->workingDir());
-		engine::getSong()->saveProjectFile(work.absoluteFilePath("recover.mmp"));
+		engine::getSong()->saveProjectFile(ConfigManager::inst()->recoveryFile());
 	}
 	else
 	{
diff --git a/src/gui/PianoRoll.cpp b/src/gui/PianoRoll.cpp
index ebe72ab69..e87412325 100644
--- a/src/gui/PianoRoll.cpp
+++ b/src/gui/PianoRoll.cpp
@@ -45,7 +45,7 @@
 #include <math.h>
 #include <algorithm>
 
-#include "config_mgr.h"
+#include "ConfigManager.h"
 #include "PianoRoll.h"
 #include "bb_track_container.h"
 #include "Clipboard.h"
@@ -3444,7 +3444,7 @@ void PianoRoll::paintEvent( QPaintEvent * _pe )
 								*cursor );
 	}
 
-	if( configManager::inst()->value( "ui", "printnotelabels").toInt() )
+	if( ConfigManager::inst()->value( "ui", "printnotelabels").toInt() )
 	{
 		printNoteHeights(p, keyAreaBottom(), width(), m_startKey);
 	}
diff --git a/src/gui/SongEditor.cpp b/src/gui/SongEditor.cpp
index 121298ea1..ae033fbec 100644
--- a/src/gui/SongEditor.cpp
+++ b/src/gui/SongEditor.cpp
@@ -38,7 +38,7 @@
 #include "SongEditor.h"
 #include "automatable_slider.h"
 #include "combobox.h"
-#include "config_mgr.h"
+#include "ConfigManager.h"
 #include "cpuload_widget.h"
 #include "embed.h"
 #include "LcdSpinBox.h"
@@ -52,7 +52,6 @@
 #include "TimeDisplayWidget.h"
 #include "AudioDevice.h"
 #include "PianoRoll.h"
-#include "config_mgr.h"
 
 
 
@@ -79,7 +78,7 @@ SongEditor::SongEditor( song * _song ) :
 	TrackContainerView( _song ),
 	m_s( _song ),
 	m_scrollBack( false ),
-	m_smoothScroll( configManager::inst()->value( "ui", "smoothscroll" ).toInt() )
+	m_smoothScroll( ConfigManager::inst()->value( "ui", "smoothscroll" ).toInt() )
 {
 	setWindowTitle( tr( "Song-Editor" ) );
 	setWindowIcon( embed::getIconPixmap( "songeditor" ) );
@@ -88,7 +87,7 @@ SongEditor::SongEditor( song * _song ) :
 	setFocus();
 
 	// create time-line
-	int widgetTotal = configManager::inst()->value( "ui",
+	int widgetTotal = ConfigManager::inst()->value( "ui",
 							"compacttrackbuttons" ).toInt()==1 ?
 		DEFAULT_SETTINGS_WIDGET_WIDTH_COMPACT + TRACK_OP_WIDTH_COMPACT :
 		DEFAULT_SETTINGS_WIDGET_WIDTH + TRACK_OP_WIDTH;
@@ -706,7 +705,7 @@ static inline void animateScroll( QScrollBar *scrollBar, int newVal, bool smooth
 void SongEditor::updatePosition( const MidiTime & _t )
 {
 	int widgetWidth, trackOpWidth;
-	if( configManager::inst()->value( "ui", "compacttrackbuttons" ).toInt() )
+	if( ConfigManager::inst()->value( "ui", "compacttrackbuttons" ).toInt() )
 	{
 		widgetWidth = DEFAULT_SETTINGS_WIDGET_WIDTH_COMPACT;
 		trackOpWidth = TRACK_OP_WIDTH_COMPACT;
diff --git a/src/gui/bb_editor.cpp b/src/gui/bb_editor.cpp
index 1ae7d417f..df0f918ed 100644
--- a/src/gui/bb_editor.cpp
+++ b/src/gui/bb_editor.cpp
@@ -34,7 +34,7 @@
 #include "MainWindow.h"
 #include "song.h"
 #include "tool_button.h"
-#include "config_mgr.h"
+#include "ConfigManager.h"
 #include "DataFile.h"
 #include "string_pair_drag.h"
 
@@ -66,7 +66,7 @@ bbEditor::bbEditor( bbTrackContainer* tc ) :
 	setWindowIcon( embed::getIconPixmap( "bb_track_btn" ) );
 	setWindowTitle( tr( "Beat+Bassline Editor" ) );
 	// TODO: Use style sheet
-	if( configManager::inst()->value( "ui",
+	if( ConfigManager::inst()->value( "ui",
 					  "compacttrackbuttons" ).toInt() )
 	{
 		setMinimumWidth( TRACK_OP_WIDTH_COMPACT + DEFAULT_SETTINGS_WIDGET_WIDTH_COMPACT
diff --git a/src/gui/dialogs/FileDialog.cpp b/src/gui/dialogs/FileDialog.cpp
index c20cde560..c2e9c5672 100644
--- a/src/gui/dialogs/FileDialog.cpp
+++ b/src/gui/dialogs/FileDialog.cpp
@@ -27,7 +27,7 @@
 #include <QDesktopServices>
 #include <QListView>
 
-#include "config_mgr.h"
+#include "ConfigManager.h"
 #include "FileDialog.h"
 
 
@@ -62,7 +62,7 @@ FileDialog::FileDialog( QWidget *parent, const QString &caption,
 #else
 	urls << QUrl::fromLocalFile( QDesktopServices::storageLocation( QDesktopServices::MusicLocation ) );
 #endif
-	urls << QUrl::fromLocalFile( configManager::inst()->workingDir() );
+	urls << QUrl::fromLocalFile( ConfigManager::inst()->workingDir() );
 
 	// Add `/Volumes` directory on OS X systems, this allows the user to browse
 	// external disk drives.
diff --git a/src/gui/embed.cpp b/src/gui/embed.cpp
index 98d04c52d..9ea1b088f 100644
--- a/src/gui/embed.cpp
+++ b/src/gui/embed.cpp
@@ -28,7 +28,7 @@
 #include <QImageReader>
 #include <QList>
 #include "embed.h"
-#include "config_mgr.h"
+#include "ConfigManager.h"
 
 #ifndef PLUGIN_NAME
 namespace embed
@@ -72,19 +72,19 @@ QPixmap getIconPixmap( const char * _name, int _w, int _h )
 #ifdef PLUGIN_NAME
 		for ( i = 0; i < candidates.size() && p.isNull(); ++i )  {
 			name = candidates.at( i );
-			p = QPixmap( configManager::inst()->artworkDir() + "plugins/" +
+			p = QPixmap( ConfigManager::inst()->artworkDir() + "plugins/" +
 				     STRINGIFY( PLUGIN_NAME ) + "_" + name );
 		}
 #endif
 		for ( i = 0; i < candidates.size() && p.isNull(); ++i )  {
 			name = candidates.at( i );
-			p = QPixmap( configManager::inst()->artworkDir() + name );
+			p = QPixmap( ConfigManager::inst()->artworkDir() + name );
 		}
 		
 		// nothing found, so look in default-artwork-dir
 		for ( i = 0; i < candidates.size() && p.isNull(); ++i )  {
 			name = candidates.at( i );
-			p = QPixmap( configManager::inst()->defaultArtworkDir() 
+			p = QPixmap( ConfigManager::inst()->defaultArtworkDir() 
 				     + name );
 		}
 		
diff --git a/src/gui/setup_dialog.cpp b/src/gui/setup_dialog.cpp
index d5c9d9c91..de6a62e8f 100644
--- a/src/gui/setup_dialog.cpp
+++ b/src/gui/setup_dialog.cpp
@@ -38,7 +38,7 @@
 #include "gui_templates.h"
 #include "Mixer.h"
 #include "ProjectJournal.h"
-#include "config_mgr.h"
+#include "ConfigManager.h"
 #include "embed.h"
 #include "engine.h"
 #include "debug.h"
@@ -85,44 +85,44 @@ inline void labelWidget( QWidget * _w, const QString & _txt )
 
 
 setupDialog::setupDialog( ConfigTabs _tab_to_open ) :
-	m_bufferSize( configManager::inst()->value( "mixer",
+	m_bufferSize( ConfigManager::inst()->value( "mixer",
 					"framesperaudiobuffer" ).toInt() ),
-	m_toolTips( !configManager::inst()->value( "tooltips",
+	m_toolTips( !ConfigManager::inst()->value( "tooltips",
 							"disabled" ).toInt() ),
-	m_warnAfterSetup( !configManager::inst()->value( "app",
+	m_warnAfterSetup( !ConfigManager::inst()->value( "app",
 						"nomsgaftersetup" ).toInt() ),
-	m_displaydBV( configManager::inst()->value( "app", 
+	m_displaydBV( ConfigManager::inst()->value( "app", 
 		      				"displaydbv" ).toInt() ),
-	m_MMPZ( !configManager::inst()->value( "app", "nommpz" ).toInt() ),
-	m_hqAudioDev( configManager::inst()->value( "mixer",
+	m_MMPZ( !ConfigManager::inst()->value( "app", "nommpz" ).toInt() ),
+	m_hqAudioDev( ConfigManager::inst()->value( "mixer",
 							"hqaudio" ).toInt() ),
-	m_workingDir( configManager::inst()->workingDir() ),
-	m_vstDir( configManager::inst()->vstDir() ),
-	m_artworkDir( configManager::inst()->artworkDir() ),
-	m_flDir( configManager::inst()->flDir() ),
-	m_ladDir( configManager::inst()->ladspaDir() ),
+	m_workingDir( ConfigManager::inst()->workingDir() ),
+	m_vstDir( ConfigManager::inst()->vstDir() ),
+	m_artworkDir( ConfigManager::inst()->artworkDir() ),
+	m_flDir( ConfigManager::inst()->flDir() ),
+	m_ladDir( ConfigManager::inst()->ladspaDir() ),
 #ifdef LMMS_HAVE_FLUIDSYNTH
-	m_defaultSoundfont( configManager::inst()->defaultSoundfont() ),
+	m_defaultSoundfont( ConfigManager::inst()->defaultSoundfont() ),
 #endif
 #ifdef LMMS_HAVE_STK
-	m_stkDir( configManager::inst()->stkDir() ),
+	m_stkDir( ConfigManager::inst()->stkDir() ),
 #endif
-	m_backgroundArtwork( configManager::inst()->backgroundArtwork() ),
-	m_smoothScroll( configManager::inst()->value( "ui", "smoothscroll" ).toInt() ),
-	m_enableAutoSave( configManager::inst()->value( "ui", "enableautosave" ).toInt() ),
-	m_oneInstrumentTrackWindow( configManager::inst()->value( "ui",
+	m_backgroundArtwork( ConfigManager::inst()->backgroundArtwork() ),
+	m_smoothScroll( ConfigManager::inst()->value( "ui", "smoothscroll" ).toInt() ),
+	m_enableAutoSave( ConfigManager::inst()->value( "ui", "enableautosave" ).toInt() ),
+	m_oneInstrumentTrackWindow( ConfigManager::inst()->value( "ui",
 					"oneinstrumenttrackwindow" ).toInt() ),
-	m_compactTrackButtons( configManager::inst()->value( "ui",
+	m_compactTrackButtons( ConfigManager::inst()->value( "ui",
 					"compacttrackbuttons" ).toInt() ),
-	m_syncVSTPlugins( configManager::inst()->value( "ui",
+	m_syncVSTPlugins( ConfigManager::inst()->value( "ui",
 							"syncvstplugins" ).toInt() ),
-	m_animateAFP(configManager::inst()->value( "ui",
+	m_animateAFP(ConfigManager::inst()->value( "ui",
 						   "animateafp").toInt() ),
-	m_printNoteLabels(configManager::inst()->value( "ui",
+	m_printNoteLabels(ConfigManager::inst()->value( "ui",
 						   "printnotelabels").toInt() ),
-	m_displayWaveform(configManager::inst()->value( "ui",
+	m_displayWaveform(ConfigManager::inst()->value( "ui",
 						   "displaywaveform").toInt() ),
-	m_disableAutoQuit(configManager::inst()->value( "ui",
+	m_disableAutoQuit(ConfigManager::inst()->value( "ui",
 						   "disableautoquit").toInt() )
 {
 	setWindowIcon( embed::getIconPixmap( "setup_general" ) );
@@ -792,54 +792,54 @@ setupDialog::~setupDialog()
 
 void setupDialog::accept()
 {
-	configManager::inst()->setValue( "mixer", "framesperaudiobuffer",
+	ConfigManager::inst()->setValue( "mixer", "framesperaudiobuffer",
 					QString::number( m_bufferSize ) );
-	configManager::inst()->setValue( "mixer", "audiodev",
+	ConfigManager::inst()->setValue( "mixer", "audiodev",
 			m_audioIfaceNames[m_audioInterfaces->currentText()] );
-	configManager::inst()->setValue( "mixer", "mididev",
+	ConfigManager::inst()->setValue( "mixer", "mididev",
 			m_midiIfaceNames[m_midiInterfaces->currentText()] );
-	configManager::inst()->setValue( "tooltips", "disabled",
+	ConfigManager::inst()->setValue( "tooltips", "disabled",
 					QString::number( !m_toolTips ) );
-	configManager::inst()->setValue( "app", "nomsgaftersetup",
+	ConfigManager::inst()->setValue( "app", "nomsgaftersetup",
 					QString::number( !m_warnAfterSetup ) );
-	configManager::inst()->setValue( "app", "displaydbv",
+	ConfigManager::inst()->setValue( "app", "displaydbv",
 					QString::number( m_displaydBV ) );
-	configManager::inst()->setValue( "app", "nommpz",
+	ConfigManager::inst()->setValue( "app", "nommpz",
 						QString::number( !m_MMPZ ) );
-	configManager::inst()->setValue( "mixer", "hqaudio",
+	ConfigManager::inst()->setValue( "mixer", "hqaudio",
 					QString::number( m_hqAudioDev ) );
-	configManager::inst()->setValue( "ui", "smoothscroll",
+	ConfigManager::inst()->setValue( "ui", "smoothscroll",
 					QString::number( m_smoothScroll ) );
-	configManager::inst()->setValue( "ui", "enableautosave",
+	ConfigManager::inst()->setValue( "ui", "enableautosave",
 					QString::number( m_enableAutoSave ) );
-	configManager::inst()->setValue( "ui", "oneinstrumenttrackwindow",
+	ConfigManager::inst()->setValue( "ui", "oneinstrumenttrackwindow",
 					QString::number( m_oneInstrumentTrackWindow ) );
-	configManager::inst()->setValue( "ui", "compacttrackbuttons",
+	ConfigManager::inst()->setValue( "ui", "compacttrackbuttons",
 					QString::number( m_compactTrackButtons ) );
-	configManager::inst()->setValue( "ui", "syncvstplugins",
+	ConfigManager::inst()->setValue( "ui", "syncvstplugins",
 					QString::number( m_syncVSTPlugins ) );
-	configManager::inst()->setValue( "ui", "animateafp",
+	ConfigManager::inst()->setValue( "ui", "animateafp",
 					QString::number( m_animateAFP ) );
-	configManager::inst()->setValue( "ui", "printnotelabels",
+	ConfigManager::inst()->setValue( "ui", "printnotelabels",
 					QString::number( m_printNoteLabels ) );
-	configManager::inst()->setValue( "ui", "displaywaveform",
+	ConfigManager::inst()->setValue( "ui", "displaywaveform",
 					QString::number( m_displayWaveform ) );
-	configManager::inst()->setValue( "ui", "disableautoquit",
+	ConfigManager::inst()->setValue( "ui", "disableautoquit",
 					QString::number( m_disableAutoQuit ) );
 
 
-	configManager::inst()->setWorkingDir( m_workingDir );
-	configManager::inst()->setVSTDir( m_vstDir );
-	configManager::inst()->setArtworkDir( m_artworkDir );
-	configManager::inst()->setFLDir( m_flDir );
-	configManager::inst()->setLADSPADir( m_ladDir );
+	ConfigManager::inst()->setWorkingDir( m_workingDir );
+	ConfigManager::inst()->setVSTDir( m_vstDir );
+	ConfigManager::inst()->setArtworkDir( m_artworkDir );
+	ConfigManager::inst()->setFLDir( m_flDir );
+	ConfigManager::inst()->setLADSPADir( m_ladDir );
 #ifdef LMMS_HAVE_FLUIDSYNTH
-	configManager::inst()->setDefaultSoundfont( m_defaultSoundfont );
+	ConfigManager::inst()->setDefaultSoundfont( m_defaultSoundfont );
 #endif
 #ifdef LMMS_HAVE_STK
-	configManager::inst()->setSTKDir( m_stkDir );
+	ConfigManager::inst()->setSTKDir( m_stkDir );
 #endif	
-	configManager::inst()->setBackgroundArtwork( m_backgroundArtwork );
+	ConfigManager::inst()->setBackgroundArtwork( m_backgroundArtwork );
 
 	// tell all audio-settings-widget to save their settings
 	for( AswMap::iterator it = m_audioIfaceSetupWidgets.begin();
@@ -854,7 +854,7 @@ void setupDialog::accept()
 		it.value()->saveSettings();
 	}
 
-	configManager::inst()->saveConfigFile();
+	ConfigManager::inst()->saveConfigFile();
 
 	QDialog::accept();
 	if( m_warnAfterSetup )
diff --git a/src/gui/widgets/fader.cpp b/src/gui/widgets/fader.cpp
index 3be8c6a06..eeadaecd2 100644
--- a/src/gui/widgets/fader.cpp
+++ b/src/gui/widgets/fader.cpp
@@ -54,7 +54,7 @@
 #include "embed.h"
 #include "engine.h"
 #include "caption_menu.h"
-#include "config_mgr.h"
+#include "ConfigManager.h"
 #include "text_float.h"
 #include "MainWindow.h"
 
@@ -265,7 +265,7 @@ void fader::setPeak_R( float fPeak )
 // update tooltip showing value and adjust position while changing fader value
 void fader::updateTextFloat()
 {
-	if( configManager::inst()->value( "app", "displaydbv" ).toInt() )
+	if( ConfigManager::inst()->value( "app", "displaydbv" ).toInt() )
 	{
 		s_textFloat->setText( QString("Volume: %1 dBV").
 				arg( 20.0 * log10( model()->value() ), 3, 'f', 2 ) );
diff --git a/src/gui/widgets/knob.cpp b/src/gui/widgets/knob.cpp
index 2dcf299a3..6f9404988 100644
--- a/src/gui/widgets/knob.cpp
+++ b/src/gui/widgets/knob.cpp
@@ -38,7 +38,7 @@
 #include "lmms_math.h"
 #include "knob.h"
 #include "caption_menu.h"
-#include "config_mgr.h"
+#include "ConfigManager.h"
 #include "ControllerConnection.h"
 #include "embed.h"
 #include "engine.h"
@@ -713,7 +713,7 @@ void knob::enterValue()
 	bool ok;
 	float new_val;
 	if( isVolumeKnob() &&
-		configManager::inst()->value( "app", "displaydbv" ).toInt() )
+		ConfigManager::inst()->value( "app", "displaydbv" ).toInt() )
 	{
 		new_val = QInputDialog::getDouble(
 			this, windowTitle(),
@@ -768,7 +768,7 @@ void knob::friendlyUpdate()
 QString knob::displayValue() const
 {
 	if( isVolumeKnob() &&
-		configManager::inst()->value( "app", "displaydbv" ).toInt() )
+		ConfigManager::inst()->value( "app", "displaydbv" ).toInt() )
 	{
 		return m_description.trimmed() + QString( " %1 dBV" ).
 				arg( 20.0 * log10( model()->value() / volumeRatio() ),
diff --git a/src/gui/widgets/tooltip.cpp b/src/gui/widgets/tooltip.cpp
index 6aa81c3b9..2b501c338 100644
--- a/src/gui/widgets/tooltip.cpp
+++ b/src/gui/widgets/tooltip.cpp
@@ -26,12 +26,12 @@
 #include <QToolTip>
 
 #include "tooltip.h"
-#include "config_mgr.h"
+#include "ConfigManager.h"
 
 
 void toolTip::add( QWidget * _w, const QString & _txt )
 {
-	if( !configManager::inst()->value( "tooltips", "disabled" ).toInt() )
+	if( !ConfigManager::inst()->value( "tooltips", "disabled" ).toInt() )
 	{
 		_w->setToolTip( _txt );
 	}
diff --git a/src/gui/widgets/track_label_button.cpp b/src/gui/widgets/track_label_button.cpp
index f0016a413..184175962 100644
--- a/src/gui/widgets/track_label_button.cpp
+++ b/src/gui/widgets/track_label_button.cpp
@@ -33,7 +33,7 @@
 #include "rename_dialog.h"
 #include "InstrumentTrack.h"
 #include "Instrument.h"
-#include "config_mgr.h"
+#include "ConfigManager.h"
 #include "engine.h"
 
 
@@ -48,7 +48,7 @@ trackLabelButton::trackLabelButton( trackView * _tv, QWidget * _parent ) :
 	setCursor( QCursor( embed::getIconPixmap( "hand" ), 3, 3 ) );
 	setToolButtonStyle( Qt::ToolButtonTextBesideIcon );
 
-	if( configManager::inst()->value( "ui",
+	if( ConfigManager::inst()->value( "ui",
 					  "compacttrackbuttons" ).toInt() )
 	{
 		setFixedSize( 32, 29 );
@@ -148,7 +148,7 @@ void trackLabelButton::paintEvent( QPaintEvent * _pe )
 			}
 		}
 	}
-	if( configManager::inst()->value( "ui",
+	if( ConfigManager::inst()->value( "ui",
 					  "compacttrackbuttons" ).toInt() )
 	{
 		setText("");
diff --git a/src/gui/widgets/visualization_widget.cpp b/src/gui/widgets/visualization_widget.cpp
index a3c5ecf21..2533380ea 100644
--- a/src/gui/widgets/visualization_widget.cpp
+++ b/src/gui/widgets/visualization_widget.cpp
@@ -34,7 +34,7 @@
 #include "tooltip.h"
 #include "song.h"
 
-#include "config_mgr.h"
+#include "ConfigManager.h"
 
 
 
@@ -47,7 +47,7 @@ visualizationWidget::visualizationWidget( const QPixmap & _bg, QWidget * _p,
 {
 	setFixedSize( s_background.width(), s_background.height() );
 	setAttribute( Qt::WA_OpaquePaintEvent, true );
-	setActive( configManager::inst()->value( "ui", "displaywaveform").toInt() );
+	setActive( ConfigManager::inst()->value( "ui", "displaywaveform").toInt() );
 
 	const fpp_t frames = engine::mixer()->framesPerPeriod();
 	m_buffer = new sampleFrame[frames];
diff --git a/src/tracks/InstrumentTrack.cpp b/src/tracks/InstrumentTrack.cpp
index 37479f9ca..f54c9901b 100644
--- a/src/tracks/InstrumentTrack.cpp
+++ b/src/tracks/InstrumentTrack.cpp
@@ -42,7 +42,7 @@
 #include "AudioPort.h"
 #include "AutomationPattern.h"
 #include "bb_track.h"
-#include "config_mgr.h"
+#include "ConfigManager.h"
 #include "ControllerConnection.h"
 #include "debug.h"
 #include "EffectChain.h"
@@ -860,7 +860,7 @@ InstrumentTrackView::InstrumentTrackView( InstrumentTrack * _it, TrackContainerV
 
 	// creation of widgets for track-settings-widget
 	int widgetWidth;
-	if( configManager::inst()->value( "ui",
+	if( ConfigManager::inst()->value( "ui",
 					  "compacttrackbuttons" ).toInt() )
 	{
 		widgetWidth = DEFAULT_SETTINGS_WIDGET_WIDTH_COMPACT;
@@ -983,7 +983,7 @@ void InstrumentTrackView::freeInstrumentTrackWindow()
 	{
 		m_lastPos = m_window->parentWidget()->pos();
 
-		if( configManager::inst()->value( "ui",
+		if( ConfigManager::inst()->value( "ui",
 										"oneinstrumenttrackwindow" ).toInt() ||
 						s_windowCache.count() < INSTRUMENT_WINDOW_CACHE_SIZE )
 		{
@@ -1033,7 +1033,7 @@ InstrumentTrackWindow * InstrumentTrackView::getInstrumentTrackWindow()
 		m_window->updateInstrumentView();
 		model()->setHook( m_window );
 
-		if( configManager::inst()->
+		if( ConfigManager::inst()->
 							value( "ui", "oneinstrumenttrackwindow" ).toInt() )
 		{
 			s_windowCache << m_window;
@@ -1046,7 +1046,7 @@ InstrumentTrackWindow * InstrumentTrackView::getInstrumentTrackWindow()
 	else
 	{
 		m_window = new InstrumentTrackWindow( this );
-		if( configManager::inst()->
+		if( ConfigManager::inst()->
 							value( "ui", "oneinstrumenttrackwindow" ).toInt() )
 		{
 			// first time, an InstrumentTrackWindow is opened
@@ -1389,7 +1389,7 @@ void InstrumentTrackWindow::saveSettingsBtnClicked()
 {
 	FileDialog sfd( this, tr( "Save preset" ), "", tr( "XML preset file (*.xpf)" ) );
 
-	QString presetRoot = configManager::inst()->userPresetsDir();
+	QString presetRoot = ConfigManager::inst()->userPresetsDir();
 	if( !QDir( presetRoot ).exists() )
 	{
 		QDir().mkdir( presetRoot );
diff --git a/src/tracks/SampleTrack.cpp b/src/tracks/SampleTrack.cpp
index 51e222fdb..97beed1dd 100644
--- a/src/tracks/SampleTrack.cpp
+++ b/src/tracks/SampleTrack.cpp
@@ -46,7 +46,7 @@
 #include "MainWindow.h"
 #include "EffectRackView.h"
 #include "track_label_button.h"
-#include "config_mgr.h"
+#include "ConfigManager.h"
 
 
 SampleTCO::SampleTCO( track * _track ) :
@@ -538,7 +538,7 @@ SampleTrackView::SampleTrackView( SampleTrack * _t, TrackContainerView* tcv ) :
 	m_volumeKnob->setVolumeKnob( true );
 	m_volumeKnob->setModel( &_t->m_volumeModel );
 	m_volumeKnob->setHintText( tr( "Channel volume:" ) + " ", "%" );
-	if( configManager::inst()->value( "ui",
+	if( ConfigManager::inst()->value( "ui",
 					  "compacttrackbuttons" ).toInt() )
 	{
 		m_volumeKnob->move( DEFAULT_SETTINGS_WIDGET_WIDTH_COMPACT-2*24, 2 );