diff --git a/data/interfaces/brink/config.html b/data/interfaces/brink/config.html
index ce10c1eb..01e01af5 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 dae45c58..d792924f 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/headphones/__init__.py b/headphones/__init__.py
index d69f64ab..427f6c96 100644
--- a/headphones/__init__.py
+++ b/headphones/__init__.py
@@ -363,8 +363,10 @@ def initialize():
             CONFIG_VERSION = '1'
             
         if CONFIG_VERSION == '1':
-        	from headphones.helpers import replace_all
-        	file_values = {	'Track':		'%Track%',
+
+			from headphones.helpers import replace_all
+
+			file_values = {	'Track':		'%Track%',
 							'Title':		'%Title%',
 							'Artist':		'%Artist%',
 							'Album':		'%Album%',
@@ -385,12 +387,11 @@ def initialize():
 								'year':		'%year%',
 								'type':  	'%type%',
 								'first':	'%first%'
-			}
+							}	
+			FILE_FORMAT = replace_all(FILE_FORMAT, file_values)
+			FOLDER_FORMAT = replace_all(FOLDER_FORMAT, folder_values)
 			
-            FILE_FORMAT = replace_all(FILE_FORMAT, file_values)
-            FOLDER_FORMAT = replace_all(FOLDER_FORMAT, folder_values)
-            
-            CONFIG_VERSION = '2'
+			CONFIG_VERSION = '2'
         
         if not LOG_DIR:
             LOG_DIR = os.path.join(DATA_DIR, 'logs')