diff --git a/ChangeLog b/ChangeLog
index 6680babc3..e4db9debb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -81,7 +81,21 @@
 	Hide pitch bend one vibed instrument
 	
 	* src/gui/setup_dialog.cpp:
-	Minor layout fix
+	- Minor layout fix
+	- Fix incorrect starting directory for STK
+
+	* data/CMakeLists.txt:
+	* data/backgrounds:
+	* data/backgrounds/CMakeLists.txt:
+	* data/backgrounds/lmms_tile.png:
+	* data/backgrounds/vinnie.png:
+	- Move llama theme background to backgrounds/
+	- Resurrect the old background
+	- more to come..
+
+	* data/themes/llama:
+	* data/themes/llama/background_artwork.png:
+	- Remove llama theme
 
 2008-09-20	Paul Giblock <drfaygo/at/gmail/dot/com>
 
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 104c9e378..96f99e313 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,3 +1,4 @@
+ADD_SUBDIRECTORY(backgrounds)
 ADD_SUBDIRECTORY(locale)
 ADD_SUBDIRECTORY(presets)
 ADD_SUBDIRECTORY(projects)
diff --git a/data/backgrounds/CMakeLists.txt b/data/backgrounds/CMakeLists.txt
new file mode 100644
index 000000000..d4d07ab49
--- /dev/null
+++ b/data/backgrounds/CMakeLists.txt
@@ -0,0 +1,2 @@
+FILE(GLOB PNG_FILES *.png)
+INSTALL(FILES ${PNG_FILES} DESTINATION ${LMMS_DATA_DIR}/backgrounds)
diff --git a/data/themes/llama/background_artwork.png b/data/backgrounds/lmms_tile.png
similarity index 100%
rename from data/themes/llama/background_artwork.png
rename to data/backgrounds/lmms_tile.png
diff --git a/data/backgrounds/vinnie.png b/data/backgrounds/vinnie.png
new file mode 100644
index 000000000..bce36a889
Binary files /dev/null and b/data/backgrounds/vinnie.png differ
diff --git a/src/gui/setup_dialog.cpp b/src/gui/setup_dialog.cpp
index 101105f00..50403ff6e 100644
--- a/src/gui/setup_dialog.cpp
+++ b/src/gui/setup_dialog.cpp
@@ -995,7 +995,7 @@ void setupDialog::openSTKDir( void )
 #ifdef LMMS_HAVE_STK
 	QString new_dir = QFileDialog::getExistingDirectory( this,
 				tr( "Choose STK rawwave directory" ),
-							m_ladDir );
+							m_stkDir );
 	if( new_dir != QString::null )
 	{
 		m_stkLineEdit->setText( new_dir );