diff --git a/data/interfaces/brink/config.html b/data/interfaces/brink/config.html
index 01e01af5..28c366f8 100644
--- a/data/interfaces/brink/config.html
+++ b/data/interfaces/brink/config.html
@@ -424,8 +424,8 @@
 					    <input type="text" name="folder_format" value="${config['folder_format']}" size="43" />
                         <div class="tooltip">
 						    <span>
-							    Use: %Artist%/%artist%, %Album%/%album%, %Year%/%year%, %Type%/%type% (release type) and %First%/%first% (first letter in artist name)
-                      		    E.g.: %Type%/%First%/%artist%/%album% [%year%] = Album/G/girl talk/all day [2010]
+							    Use: $Artist/$artist, $Album/$album, $Year/$year, $Type/$type (release type) and $First/$first (first letter in artist name)
+                      		    E.g.: $Type/$First/$artist/$album [$year] = Album/G/girl talk/all day [2010]
 						    </span>
 					    </div>
                         <br /><br />
@@ -435,7 +435,7 @@
 						    <input type="text" name="file_format" value="${config['file_format']}" size="43" />
 							<div class="tooltip">
 								<span>
-									Use: %Track%/%track% (track #), %Title%/%title%, %Artist%/%artist%, %Album%/%album% and %Year%/%year%
+									Use: $Track/$track (track #), $Title/$title, $Artist/$artist, $Album/$album and $Year/$year
 								<span>
 							</div>
                     </td>
diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html
index d792924f..f75b5c50 100644
--- a/data/interfaces/default/config.html
+++ b/data/interfaces/default/config.html
@@ -314,12 +314,12 @@
                 	<h2>Renaming Options:</h2>
 					<br>
                     <h3>Folder Format:</h3><input type="text" name="folder_format" value="${config['folder_format']}" size="43"><br>
-                      <i class="smalltext">Use: %Artist%/%artist%, %Album%/%album%, %Year%/%year%, %Type%/%type% (release type) and %First%/%first% (first letter in artist name)<br />
-                      				E.g.: %Type%/%First%/%artist%/%album% [%year%] = Album/G/girl talk/all day [2010]</i>
+                      <i class="smalltext">Use: $Artist/$artist, $Album/$album, $Year/$year, $Type/$type (release type) and $First/$first (first letter in artist name)<br />
+                      				E.g.: $Type/$First/$artist/$album [$year] = Album/G/girl talk/all day [2010]</i>
                     <br><br>
                     <h3>File Format:</h3><input type="text" name="file_format" value="${config['file_format']}" size="43">
                       <br>
-                      <i class="smalltext">Use: %Track%/%track% (track #), %Title%/%title%, %Artist%/%artist%, %Album%/%album% and %Year%/%year%</i>
+                      <i class="smalltext">Use: $Track/$track (track #), $Title/$title, $Artist/$artist, $Album/$album and $Year/$year</i>
                 </td>
                 <td>
                       <h2>Miscellaneous:</h2>
diff --git a/data/interfaces/remix/config.html b/data/interfaces/remix/config.html
index dae45c58..f75b5c50 100644
--- a/data/interfaces/remix/config.html
+++ b/data/interfaces/remix/config.html
@@ -314,12 +314,12 @@
                 	<h2>Renaming Options:</h2>
 					<br>
                     <h3>Folder Format:</h3><input type="text" name="folder_format" value="${config['folder_format']}" size="43"><br>
-                      <i class="smalltext">Use: Artist/artist, Album/album, Year/year, Type/type (release type) and First/first (first letter in artist name)<br />
-                      				E.g.: Type/First/artist/album [year] = Album/G/girl talk/all day [2010]</i>
+                      <i class="smalltext">Use: $Artist/$artist, $Album/$album, $Year/$year, $Type/$type (release type) and $First/$first (first letter in artist name)<br />
+                      				E.g.: $Type/$First/$artist/$album [$year] = Album/G/girl talk/all day [2010]</i>
                     <br><br>
                     <h3>File Format:</h3><input type="text" name="file_format" value="${config['file_format']}" size="43">
                       <br>
-                      <i class="smalltext">Use: Track/track (track #), Title/title, Artist/artist, Album/album and Year/year</i>
+                      <i class="smalltext">Use: $Track/$track (track #), $Title/$title, $Artist/$artist, $Album/$album and $Year/$year</i>
                 </td>
                 <td>
                       <h2>Miscellaneous:</h2>
diff --git a/headphones/__init__.py b/headphones/__init__.py
index 427f6c96..408e0a8f 100644
--- a/headphones/__init__.py
+++ b/headphones/__init__.py
@@ -366,27 +366,27 @@ def initialize():
 
 			from headphones.helpers import replace_all
 
-			file_values = {	'Track':		'%Track%',
-							'Title':		'%Title%',
-							'Artist':		'%Artist%',
-							'Album':		'%Album%',
-							'Year':			'%Year%',
-							'track':		'%track%',
-							'title':		'%title%',
-							'artist':		'%artist%',
-							'album':		'%album%',
-							'year':			'%year%'
+			file_values = {	'Track':		'$Track',
+							'Title':		'$Title',
+							'Artist':		'$Artist',
+							'Album':		'$Album',
+							'Year':			'$Year',
+							'track':		'$track',
+							'title':		'$title',
+							'artist':		'$artist',
+							'album':		'$album',
+							'year':			'$year'
 							}
-			folder_values = { 	'Artist':	'%Artist%',
-								'Album':	'%Album%',
-								'Year':		'%Year%',
-								'Type':  	'%Type%',
-								'First':	'%First%',
-								'artist':	'%artist%',
-								'album':	'%album%',
-								'year':		'%year%',
-								'type':  	'%type%',
-								'first':	'%first%'
+			folder_values = { 	'Artist':	'$Artist',
+								'Album':	'$Album',
+								'Year':		'$Year',
+								'Type':  	'$Type',
+								'First':	'$First',
+								'artist':	'$artist',
+								'album':	'$album',
+								'year':		'$year',
+								'type':  	'$type',
+								'first':	'$first'
 							}	
 			FILE_FORMAT = replace_all(FILE_FORMAT, file_values)
 			FOLDER_FORMAT = replace_all(FOLDER_FORMAT, folder_values)
diff --git a/headphones/postprocessor.py b/headphones/postprocessor.py
index af5b9a61..462795a4 100644
--- a/headphones/postprocessor.py
+++ b/headphones/postprocessor.py
@@ -329,16 +329,16 @@ def moveFiles(albumpath, release, tracks):
 		firstchar = sortname[0]
 	
 
-	values = {	'%Artist%':	artist,
-				'%Album%':	album,
-				'%Year%':		year,
-				'%Type%':  releasetype,
-				'%First%':	firstchar,
-				'%artist%':	artist.lower(),
-				'%album%':	album.lower(),
-				'%year%':		year,
-				'%type%':  releasetype.lower(),
-				'%first%':	firstchar.lower()
+	values = {	'$Artist':	artist,
+				'$Album':	album,
+				'$Year':		year,
+				'$Type':  releasetype,
+				'$First':	firstchar,
+				'$artist':	artist.lower(),
+				'$album':	album.lower(),
+				'$year':		year,
+				'$type':  releasetype.lower(),
+				'$first':	firstchar.lower()
 			}
 			
 	
@@ -504,16 +504,16 @@ def renameFiles(albumpath, downloaded_track_list, release):
 		else:
 			title = f.title
 			
-			values = {	'%Track%':		tracknumber,
-						'%Title%':		title,
-						'%Artist%':		release['ArtistName'],
-						'%Album%':		release['AlbumTitle'],
-						'%Year%':			year,
-						'%track%':		tracknumber,
-						'%title%':		title.lower(),
-						'%artist%':		release['ArtistName'].lower(),
-						'%album%':		release['AlbumTitle'].lower(),
-						'%year%':			year
+			values = {	'$Track':		tracknumber,
+						'$Title':		title,
+						'$Artist':		release['ArtistName'],
+						'$Album':		release['AlbumTitle'],
+						'$Year':			year,
+						'$track':		tracknumber,
+						'$title':		title.lower(),
+						'$artist':		release['ArtistName'].lower(),
+						'$album':		release['AlbumTitle'].lower(),
+						'$year':			year
 						}
 						
 			ext = os.path.splitext(downloaded_track)[1]