diff --git a/lib/global.php b/lib/global.php
index c94862e..8d5c75f 100644
--- a/lib/global.php
+++ b/lib/global.php
@@ -22,6 +22,7 @@
 	$smarty->cache_dir = 'smarty/cache/';
 
 	$smarty->assign('version', $version);
+	$smarty->assign('template', $_CONFIG['template']);
 
 	include('lib/mpd.class.php');
 	$mympd = new mpd('localhost',6600);
diff --git a/lib/image.php b/lib/image.php
index 761c5c9..6c927c1 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -7,7 +7,7 @@
 	$height = $_GET['size'];
 
 	// Content type
-	header('Content-type: image/jpeg');
+	//header('Content-type: image/jpeg');
 
 	$script_root = substr($_SERVER["SCRIPT_FILENAME"], 0, strrpos(substr($_SERVER["SCRIPT_FILENAME"], 0, strrpos($_SERVER["SCRIPT_FILENAME"], '/')), '/'));
 
diff --git a/templates/default/control.html b/templates/default/control.html
index 6139ec0..908592f 100644
--- a/templates/default/control.html
+++ b/templates/default/control.html
@@ -1,4 +1,4 @@
-		<div id="controls"><a href="index.php?action=prev"><img src="images/prev_button.gif" Alt="Previous" /></a><a href="index.php?action=play"><img src="images/play_button.gif" Alt="Play" /></a><a href="index.php?action=pause"><img src="images/pause_button.gif" Alt="Pause" /></a><a href="index.php?action=stop"><img src="images/stop_button.gif" Alt="Stop" /></a><a href="index.php?action=next"><img src="images/next_button.gif" Alt="Next" /></a></div>
+		<div id="controls"><a href="index.php?action=prev"><img src="templates/{$template}/images/prev_button.gif" Alt="Previous" /></a><a href="index.php?action=play"><img src="templates/{$template}/images/play_button.gif" Alt="Play" /></a><a href="index.php?action=pause"><img src="templates/{$template}/images/pause_button.gif" Alt="Pause" /></a><a href="index.php?action=stop"><img src="templates/{$template}/images/stop_button.gif" Alt="Stop" /></a><a href="index.php?action=next"><img src="templates/{$template}/images/next_button.gif" Alt="Next" /></a></div>
 		
 		<div id="song_display">{if $current_title}<span class="pos">{$current_track_no+1|string_format:"%02d"}.</span> <span class="title">{$current_title}</span><br /><span class="artist">{$current_artist}</span> {if $current_album}<!--<span class="album">({$current_album})</span>-->{/if}{elseif $current_file}{$current_file}{else}<br />[Nothing playing]{/if}</div>
 
@@ -6,5 +6,5 @@
 
 		{if $mpd_state == 'play' || $mpd_state == 'pause'}<div id="progress"><div id="progressbar" style="margin-right: {$initialprogress}px;">&nbsp;</div></div>{/if}
 
-		{if $coverimage}<div id="cover_image"><img id="cover" title="{$current_album}" src="lib/image.php?file={$coverimage}&size={$coversize}" /></div>{/if}
+		{if $coverimage}<div id="cover_image"><img id="cover" title="{$current_album}" src="lib/image.php?file={$coverimage|escape:'url'}&size={$coversize}" /></div>{/if}
 
diff --git a/images/add.gif b/templates/default/images/add.gif
similarity index 100%
rename from images/add.gif
rename to templates/default/images/add.gif
diff --git a/images/add.png b/templates/default/images/add.png
similarity index 100%
rename from images/add.png
rename to templates/default/images/add.png
diff --git a/images/addall.gif b/templates/default/images/addall.gif
similarity index 100%
rename from images/addall.gif
rename to templates/default/images/addall.gif
diff --git a/images/album.gif b/templates/default/images/album.gif
similarity index 100%
rename from images/album.gif
rename to templates/default/images/album.gif
diff --git a/images/artist.gif b/templates/default/images/artist.gif
similarity index 100%
rename from images/artist.gif
rename to templates/default/images/artist.gif
diff --git a/images/crumb_trail.gif b/templates/default/images/crumb_trail.gif
similarity index 100%
rename from images/crumb_trail.gif
rename to templates/default/images/crumb_trail.gif
diff --git a/images/del.gif b/templates/default/images/del.gif
similarity index 100%
rename from images/del.gif
rename to templates/default/images/del.gif
diff --git a/images/del.png b/templates/default/images/del.png
similarity index 100%
rename from images/del.png
rename to templates/default/images/del.png
diff --git a/images/delall.gif b/templates/default/images/delall.gif
similarity index 100%
rename from images/delall.gif
rename to templates/default/images/delall.gif
diff --git a/images/dir.gif b/templates/default/images/dir.gif
similarity index 100%
rename from images/dir.gif
rename to templates/default/images/dir.gif
diff --git a/images/home.gif b/templates/default/images/home.gif
similarity index 100%
rename from images/home.gif
rename to templates/default/images/home.gif
diff --git a/images/next_button.gif b/templates/default/images/next_button.gif
similarity index 100%
rename from images/next_button.gif
rename to templates/default/images/next_button.gif
diff --git a/images/next_button.png b/templates/default/images/next_button.png
similarity index 100%
rename from images/next_button.png
rename to templates/default/images/next_button.png
diff --git a/images/note.gif b/templates/default/images/note.gif
similarity index 100%
rename from images/note.gif
rename to templates/default/images/note.gif
diff --git a/images/pause_button.gif b/templates/default/images/pause_button.gif
similarity index 100%
rename from images/pause_button.gif
rename to templates/default/images/pause_button.gif
diff --git a/images/pause_button.png b/templates/default/images/pause_button.png
similarity index 100%
rename from images/pause_button.png
rename to templates/default/images/pause_button.png
diff --git a/images/play.gif b/templates/default/images/play.gif
similarity index 100%
rename from images/play.gif
rename to templates/default/images/play.gif
diff --git a/images/play.png b/templates/default/images/play.png
similarity index 100%
rename from images/play.png
rename to templates/default/images/play.png
diff --git a/images/play_button.gif b/templates/default/images/play_button.gif
similarity index 100%
rename from images/play_button.gif
rename to templates/default/images/play_button.gif
diff --git a/images/play_button.png b/templates/default/images/play_button.png
similarity index 100%
rename from images/play_button.png
rename to templates/default/images/play_button.png
diff --git a/images/playall.gif b/templates/default/images/playall.gif
similarity index 100%
rename from images/playall.gif
rename to templates/default/images/playall.gif
diff --git a/images/prev_button.gif b/templates/default/images/prev_button.gif
similarity index 100%
rename from images/prev_button.gif
rename to templates/default/images/prev_button.gif
diff --git a/images/prev_button.png b/templates/default/images/prev_button.png
similarity index 100%
rename from images/prev_button.png
rename to templates/default/images/prev_button.png
diff --git a/images/stop_button.gif b/templates/default/images/stop_button.gif
similarity index 100%
rename from images/stop_button.gif
rename to templates/default/images/stop_button.gif
diff --git a/images/stop_button.png b/templates/default/images/stop_button.png
similarity index 100%
rename from images/stop_button.png
rename to templates/default/images/stop_button.png