diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html
index e9e006e9..29bf848d 100644
--- a/data/interfaces/default/config.html
+++ b/data/interfaces/default/config.html
@@ -91,7 +91,7 @@
             
             <tr>
                 <td>
-                    <h3>Use Black Hole:</h3><input type="checkbox" name="blackhole" value=1 ${config['use_blackhole']} />
+                    <h3>Use Black Hole: <input type="checkbox" name="blackhole" value=1 ${config['use_blackhole']} /></h3>
                 </td>
 
                 <td>
@@ -104,7 +104,7 @@
 
             <tr>
                 <td>
-                    <h3>Usenet Retention:</h3><input type="text" name="usenet_retention" value="${config['usenet_retention']}" size="20" maxlength="40">
+                    <h3>Usenet Retention:<input type="text" name="usenet_retention" value="${config['usenet_retention']}" size="20" maxlength="40"></h3>
                 </td>
             </tr>
         </table>
@@ -266,14 +266,14 @@
 					<%
 						if config['encoder'] == 'lame':
 							lameselect = 'selected="selected"'
-							ffdshowselect = ''
+							ffmpegselect = ''
 						else:
 							lameselect = ''
-							ffdshowselect = 'selected="selected"'							
+							ffmpegselect = 'selected="selected"'							
 					%>
 					<h3>Encoder: <select name="encoder">
 						<option value="lame" ${lameselect}>lame</option>
-						<option value="ffdshow" ${ffdshowselect}>ffdshow</option>
+						<option value="ffmpeg" ${ffmpegselect}>ffmpeg</option>
 					</select>
 					Bitrate: <input type="text" name="bitrate" value="${config['bitrate']}" size="3" maxlength="5" />kbps <br>
 					<br>
diff --git a/data/interfaces/remix/config.html b/data/interfaces/remix/config.html
index e9e006e9..29bf848d 100644
--- a/data/interfaces/remix/config.html
+++ b/data/interfaces/remix/config.html
@@ -91,7 +91,7 @@
             
             <tr>
                 <td>
-                    <h3>Use Black Hole:</h3><input type="checkbox" name="blackhole" value=1 ${config['use_blackhole']} />
+                    <h3>Use Black Hole: <input type="checkbox" name="blackhole" value=1 ${config['use_blackhole']} /></h3>
                 </td>
 
                 <td>
@@ -104,7 +104,7 @@
 
             <tr>
                 <td>
-                    <h3>Usenet Retention:</h3><input type="text" name="usenet_retention" value="${config['usenet_retention']}" size="20" maxlength="40">
+                    <h3>Usenet Retention:<input type="text" name="usenet_retention" value="${config['usenet_retention']}" size="20" maxlength="40"></h3>
                 </td>
             </tr>
         </table>
@@ -266,14 +266,14 @@
 					<%
 						if config['encoder'] == 'lame':
 							lameselect = 'selected="selected"'
-							ffdshowselect = ''
+							ffmpegselect = ''
 						else:
 							lameselect = ''
-							ffdshowselect = 'selected="selected"'							
+							ffmpegselect = 'selected="selected"'							
 					%>
 					<h3>Encoder: <select name="encoder">
 						<option value="lame" ${lameselect}>lame</option>
-						<option value="ffdshow" ${ffdshowselect}>ffdshow</option>
+						<option value="ffmpeg" ${ffmpegselect}>ffmpeg</option>
 					</select>
 					Bitrate: <input type="text" name="bitrate" value="${config['bitrate']}" size="3" maxlength="5" />kbps <br>
 					<br>
diff --git a/headphones/encode.py b/headphones/encode.py
index 181e8a93..632e9a45 100644
--- a/headphones/encode.py
+++ b/headphones/encode.py
@@ -25,7 +25,7 @@ def encode(albumPath):
 		
 	for r,d,f in os.walk(albumPath):
 		for music in f:
-			if any(music.endswith('.' + x) for x in headphones.MEDIA_FORMATS):
+			if any(music.endswith('.' + x) for x in ["flac", "m4a", "wav"]):
 				musicFiles.append(os.path.join(r, music))
 				musicTempFiles.append(os.path.join(tempDirEncode, music))
 	
diff --git a/headphones/version.py b/headphones/version.py
index b6c5af53..0dda129e 100644
--- a/headphones/version.py
+++ b/headphones/version.py
@@ -1 +1 @@
-HEADPHONES_VERSION = "develop"
\ No newline at end of file
+HEADPHONES_VERSION = "master"
\ No newline at end of file
diff --git a/headphones/webserve.py b/headphones/webserve.py
index 1034a482..cbd2d1c3 100644
--- a/headphones/webserve.py
+++ b/headphones/webserve.py
@@ -304,8 +304,7 @@ class WebInterface(object):
 	
 		interface_dir = os.path.join(headphones.PROG_DIR, 'data/interfaces/')
 		interface_list = [ name for name in os.listdir(interface_dir) if os.path.isdir(os.path.join(interface_dir, name)) ]
-		print 'Value going in: '
-		print headphones.ENCODER
+
 		config = { 
 					"http_host" : headphones.HTTP_HOST,
 					"http_user" : headphones.HTTP_USERNAME,