diff --git a/templates/default/browse.html b/templates/default/browse.html
index d492811..245db68 100644
--- a/templates/default/browse.html
+++ b/templates/default/browse.html
@@ -1,6 +1,6 @@
 
 			<ul id="crumb_trail">
-				<li><a href="index.php?browse=/"><img src="images/home.gif" alt="Home" /></a></li>
+				<li><a href="index.php?browse=/"><img src="templates/{$template}/images/home.gif" alt="Home" /></a></li>
 
 				{foreach from=$dir_list item=dir_list_item}
 					<li>&bull; <a href="index.php?browse={$dir_list_item.path}">{$dir_list_item.name|escape:'html'}</a></li>
@@ -8,7 +8,7 @@
 
 			</ul>
 
-			<div id="buttons"><a href="index.php?action=playall"><img src="images/playall.gif" /></a> <a href="index.php?action=addall"><img src="images/addall.gif" /></a></div>
+			<div id="buttons"><a href="index.php?action=playall"><img src="templates/{$template}/images/playall.gif" /></a> <a href="index.php?action=addall"><img src="templates/{$template}/images/addall.gif" /></a></div>
 
 			<ul class="list">
 				{foreach from=$browselist item=browselist_item}
diff --git a/templates/default/browselist_item.html b/templates/default/browselist_item.html
index e461e11..7737043 100644
--- a/templates/default/browselist_item.html
+++ b/templates/default/browselist_item.html
@@ -1,18 +1,18 @@
 
 				{if $browselist_item.directory}
 
-				<li><a href="index.php?browse={$browselist_item.directory}"><img src="images/dir.gif" class="icon" /> {$browselist_item.directory_name|escape:'html'}</a></li>
+				<li><a href="index.php?browse={$browselist_item.directory}"><img src="templates/{$template}/images/dir.gif" class="icon" /> {$browselist_item.directory_name|escape:'html'}</a></li>
 
 				{elseif $browselist_item.metaArtist}
 
-				<li><a href="index.php?browse={$browselist_item.path|escape:'url'}"><img src="images/artist.gif" class="icon" /> {$browselist_item.metaArtist|escape:'html'}</a></li>
+				<li><a href="index.php?browse={$browselist_item.path|escape:'url'}"><img src="templates/{$template}/images/artist.gif" class="icon" /> {$browselist_item.metaArtist|escape:'html'}</a></li>
 
 				{elseif $browselist_item.metaAlbum}
 
-				<li><a href="index.php?browse={$browselist_item.path|escape:'url'}"><img src="images/album.gif" class="icon" /> {$browselist_item.metaAlbum|escape:'html'}</a></li>
+				<li><a href="index.php?browse={$browselist_item.path|escape:'url'}"><img src="templates/{$template}/images/album.gif" class="icon" /> {$browselist_item.metaAlbum|escape:'html'}</a></li>
 
 				{elseif $browselist_item.Title}
 
-				{if $browselist_item.in_playlist}<li class="playing">{else}<li>{/if}<a href="{$browselist_add_link}{$browselist_item.file|escape:'url'}"><img src="images/add.gif" alt="Add" class="button" /></a><a href="{$browselist_play_link}{$browselist_item.file|escape:'url'}"><img src="images/play.gif" alt="Play" class="button" /></a><img src="images/note.gif" class="icon" /> {if $browselist_item.Title|escape:'html'}<span class="title">{$browselist_item.Title|escape:'html'}</span>{if $browselist_item.Artist && $show_extra_track_info}<br /><span class="artist">{$browselist_item.Artist|escape:'html'}</span> {if $browselist_item.Album}<span class="album">({$browselist_item.Album|escape:'html'})</span>{/if}{/if}{else}{$browselist_item.file|escape:'html'}{/if}</li>
+				{if $browselist_item.in_playlist}<li class="playing">{else}<li>{/if}<a href="{$browselist_add_link}{$browselist_item.file|escape:'url'}"><img src="templates/{$template}/images/add.gif" alt="Add" class="button" /></a><a href="{$browselist_play_link}{$browselist_item.file|escape:'url'}"><img src="templates/{$template}/images/play.gif" alt="Play" class="button" /></a><img src="templates/{$template}/images/note.gif" class="icon" /> {if $browselist_item.Title|escape:'html'}<span class="title">{$browselist_item.Title|escape:'html'}</span>{if $browselist_item.Artist && $show_extra_track_info}<br /><span class="artist">{$browselist_item.Artist|escape:'html'}</span> {if $browselist_item.Album}<span class="album">({$browselist_item.Album|escape:'html'})</span>{/if}{/if}{else}{$browselist_item.file|escape:'html'}{/if}</li>
 
 				{/if}
diff --git a/templates/default/playlist.html b/templates/default/playlist.html
index 182b40a..45c5878 100644
--- a/templates/default/playlist.html
+++ b/templates/default/playlist.html
@@ -1,5 +1,5 @@
 			{if $playlist}
-			<div id="buttons"><a href="{$playlist_clear_link}"><img src="images/delall.gif" /></a></div>
+			<div id="buttons"><a href="{$playlist_clear_link}"><img src="templates/{$template}/images/delall.gif" /></a></div>
 
 			<ul class="list">
 				{foreach from=$playlist item=playlist_item}
diff --git a/templates/default/playlist_item.html b/templates/default/playlist_item.html
index 4b2c4e0..4da35fb 100644
--- a/templates/default/playlist_item.html
+++ b/templates/default/playlist_item.html
@@ -1 +1 @@
-				{if $playlist_item.Pos == $playing}<li class="playing">{else}<li>{/if}<a href="{$playlist_remove_link}{$playlist_item.Pos}"><img src="images/del.gif" alt="Remove from Playlist" class="button" /></a><a href="{$playlist_play_link}{$playlist_item.Pos}"><img src="images/play.gif" alt="Play" class="button" /></a><img src="images/note.gif" class="icon" /> <span class="pos">{$playlist_item.Pos+1|string_format:"%02d"}.</span> {if $playlist_item.Title}<span class="title">{$playlist_item.Title}</span>{if $playlist_item.Artist && $show_extra_track_info}<br /><span class="artist">{$playlist_item.Artist}</span> {if $playlist_item.Album}<span class="album">({$playlist_item.Album})</span>{/if}{/if}{else}{$playlist_item.file}{/if}</li>
+				{if $playlist_item.Pos == $playing}<li class="playing">{else}<li>{/if}<a href="{$playlist_remove_link}{$playlist_item.Pos}"><img src="templates/{$template}/images/del.gif" alt="Remove from Playlist" class="button" /></a><a href="{$playlist_play_link}{$playlist_item.Pos}"><img src="templates/{$template}/images/play.gif" alt="Play" class="button" /></a><img src="templates/{$template}/images/note.gif" class="icon" /> <span class="pos">{$playlist_item.Pos+1|string_format:"%02d"}.</span> {if $playlist_item.Title}<span class="title">{$playlist_item.Title}</span>{if $playlist_item.Artist && $show_extra_track_info}<br /><span class="artist">{$playlist_item.Artist}</span> {if $playlist_item.Album}<span class="album">({$playlist_item.Album})</span>{/if}{/if}{else}{$playlist_item.file}{/if}</li>