diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html
index 94037a0a..3b8df313 100644
--- a/data/interfaces/default/config.html
+++ b/data/interfaces/default/config.html
@@ -162,17 +162,17 @@
 	                   	  </div>
 	                </fieldset>
                     
-                    <fieldset id="nzb_download_dir">
+                    <fieldset id="general_nzb_options2">
                        	<div class="row">
                             <label>Music Download Directory:</label>
                             <input type="text" name="download_dir" value="${config['download_dir']}" size="50">
                             <small>Full path where SAB or NZBget downloads your music. e.g. /Users/name/Downloads/music</small>
                         </div>
-                    </fieldset>
 	                
-                   	<div class="checkbox row">                    	
+						<div class="checkbox row">                    	
                    	    	<input type="text" name="usenet_retention" value="${config['usenet_retention']}" size="5"><label>Usenet Retention</label>
-                   	 </div>
+						</div>
+					</fieldset>
 	            </td>
                 <td>
                    	<fieldset>
@@ -200,21 +200,22 @@
 								<small>Utorrent Host</small>
 							</div>
 						</fieldset>
-						<div class="row">
-								<label>Minimum seeders:</label>
-								<input type="text" name="numberofseeders" value="${config['numberofseeders']}" size="5">
-								<small>Number of minimum seeders a torrent must have to be accepted</small>
-						</div>
-                   		<div class="row">
-							<label>Music Download Directory</label>
-							<input type="text" name="download_torrent_dir" value="${config['download_torrent_dir']}" size="50">
-							<small>Full path where your torrent client downloads your music e.g. /Users/name/Downloads/music</small>
-                   		</div>        
-				<div class="row checkbox">
-				<label>Keep Files for Seeding</label>
-				<input type="checkbox" name="keep_torrent_files" value="1" ${config['keep_torrent_files']}>		
-				</div>
-			</fieldset>
+						<fieldset id="general_torrent_options">
+							<div class="row">
+									<label>Minimum seeders:</label>
+									<input type="text" name="numberofseeders" value="${config['numberofseeders']}" size="5">
+									<small>Number of minimum seeders a torrent must have to be accepted</small>
+							</div>
+	                   		<div class="row">
+								<label>Music Download Directory</label>
+								<input type="text" name="download_torrent_dir" value="${config['download_torrent_dir']}" size="50">
+								<small>Full path where your torrent client downloads your music e.g. /Users/name/Downloads/music</small>
+	                   		</div>   
+	                   		<div class="row checkbox">
+								<label>Keep Files for Seeding</label>
+								<input type="checkbox" name="keep_torrent_files" value="1" ${config['keep_torrent_files']}>		
+							</div>
+	                   	</fieldset>     
                 </td>
             </tr>            
     
diff --git a/headphones/__init__.py b/headphones/__init__.py
index e28ecfbb..108248f3 100644
--- a/headphones/__init__.py
+++ b/headphones/__init__.py
@@ -137,9 +137,13 @@ NZBGET_PASSWORD = None
 NZBGET_CATEGORY = None
 NZBGET_HOST = None
 
-NZBMATRIX = False
-NZBMATRIX_USERNAME = None
-NZBMATRIX_APIKEY = None
+TRANSMISSION_HOST = None
+TRANSMISSION_USERNAME = None
+TRANSMISSION_PASSWORD = None
+
+UTORRENT_HOST = None
+UTORRENT_USERNAME = None
+UTORRENT_PASSWORD = None
 
 NEWZNAB = False
 NEWZNAB_HOST = None
@@ -151,10 +155,6 @@ NZBSORG = False
 NZBSORG_UID = None
 NZBSORG_HASH = None
 
-NEWZBIN = False
-NEWZBIN_UID = None
-NEWZBIN_PASSWORD = None
-
 NZBSRUS = False
 NZBSRUS_UID = None
 NZBSRUS_APIKEY = None
@@ -294,8 +294,9 @@ def initialize():
                 TORRENTBLACKHOLE_DIR, NUMBEROFSEEDERS, ISOHUNT, KAT, MININOVA, WAFFLES, WAFFLES_UID, WAFFLES_PASSKEY, \
                 RUTRACKER, RUTRACKER_USER, RUTRACKER_PASSWORD, WHATCD, WHATCD_USERNAME, WHATCD_PASSWORD, DOWNLOAD_TORRENT_DIR, \
                 LIBRARYSCAN, LIBRARYSCAN_INTERVAL, DOWNLOAD_SCAN_INTERVAL, SAB_HOST, SAB_USERNAME, SAB_PASSWORD, SAB_APIKEY, SAB_CATEGORY, \
-                NZBGET_USERNAME, NZBGET_PASSWORD, NZBGET_CATEGORY, NZBGET_HOST, NZBMATRIX, NZBMATRIX_USERNAME, NZBMATRIX_APIKEY, NEWZNAB, NEWZNAB_HOST, NEWZNAB_APIKEY, NEWZNAB_ENABLED, EXTRA_NEWZNABS, \
-                NZBSORG, NZBSORG_UID, NZBSORG_HASH, NEWZBIN, NEWZBIN_UID, NEWZBIN_PASSWORD, NZBSRUS, NZBSRUS_UID, NZBSRUS_APIKEY, NZBX, \
+                NZBGET_USERNAME, NZBGET_PASSWORD, NZBGET_CATEGORY, NZBGET_HOST, TRANSMISSION_HOST, TRANSMISSION_USERNAME, TRANSMISSION_PASSWORD, \
+                UTORRENT_HOST, UTORRENT_USERNAME, UTORRENT_PASSWORD, NEWZNAB, NEWZNAB_HOST, NEWZNAB_APIKEY, NEWZNAB_ENABLED, EXTRA_NEWZNABS, \
+                NZBSORG, NZBSORG_UID, NZBSORG_HASH, NZBSRUS, NZBSRUS_UID, NZBSRUS_APIKEY, NZBX, \
                 NZB_DOWNLOADER, TORRENT_DOWNLOADER, PREFERRED_WORDS, REQUIRED_WORDS, IGNORED_WORDS, \
                 LASTFM_USERNAME, INTERFACE, FOLDER_PERMISSIONS, ENCODERFOLDER, ENCODER_PATH, ENCODER, XLDPROFILE, BITRATE, SAMPLINGFREQUENCY, \
                 MUSIC_ENCODER, ADVANCEDENCODER, ENCODEROUTPUTFORMAT, ENCODERQUALITY, ENCODERVBRCBR, ENCODERLOSSLESS, DELETE_LOSSLESS_FILES, \
@@ -312,12 +313,12 @@ def initialize():
         CheckSection('General')
         CheckSection('SABnzbd')
         CheckSection('NZBget')
-        CheckSection('NZBMatrix')
+        CheckSection('Transmission')
+        CheckSection('uTorrent')
         CheckSection('Newznab')
         CheckSection('NZBsorg')
         CheckSection('NZBsRus')
         CheckSection('nzbX')
-        CheckSection('Newzbin')
         CheckSection('Waffles')
         CheckSection('Rutracker')
         CheckSection('What.cd')
@@ -423,10 +424,14 @@ def initialize():
         NZBGET_PASSWORD = check_setting_str(CFG, 'NZBget', 'nzbget_password', '')
         NZBGET_CATEGORY = check_setting_str(CFG, 'NZBget', 'nzbget_category', '')
         NZBGET_HOST = check_setting_str(CFG, 'NZBget', 'nzbget_host', '')
-		
-        NZBMATRIX = bool(check_setting_int(CFG, 'NZBMatrix', 'nzbmatrix', 0))
-        NZBMATRIX_USERNAME = check_setting_str(CFG, 'NZBMatrix', 'nzbmatrix_username', '')
-        NZBMATRIX_APIKEY = check_setting_str(CFG, 'NZBMatrix', 'nzbmatrix_apikey', '')
+        
+        TRANSMISSION_HOST = check_setting_str(CFG, 'Transmission', 'transmission_host', '')
+        TRANSMISSION_USERNAME = check_setting_str(CFG, 'Transmission', 'transmission_username', '')
+        TRANSMISSION_PASSWORD = check_setting_str(CFG, 'Transmission', 'transmission_password', '')
+        
+        UTORRENT_HOST = check_setting_str(CFG, 'uTorrent', 'utorrent_host', '')
+        UTORRENT_USERNAME = check_setting_str(CFG, 'uTorrent', 'utorrent_username', '')
+        UTORRENT_PASSWORD = check_setting_str(CFG, 'uTorrent', 'utorrent_password', '')
 
         NEWZNAB = bool(check_setting_int(CFG, 'Newznab', 'newznab', 0))
         NEWZNAB_HOST = check_setting_str(CFG, 'Newznab', 'newznab_host', '')
@@ -441,10 +446,6 @@ def initialize():
         NZBSORG_UID = check_setting_str(CFG, 'NZBsorg', 'nzbsorg_uid', '')
         NZBSORG_HASH = check_setting_str(CFG, 'NZBsorg', 'nzbsorg_hash', '')
 
-        NEWZBIN = bool(check_setting_int(CFG, 'Newzbin', 'newzbin', 0))
-        NEWZBIN_UID = check_setting_str(CFG, 'Newzbin', 'newzbin_uid', '')
-        NEWZBIN_PASSWORD = check_setting_str(CFG, 'Newzbin', 'newzbin_password', '')
-
         NZBSRUS = bool(check_setting_int(CFG, 'NZBsRus', 'nzbsrus', 0))
         NZBSRUS_UID = check_setting_str(CFG, 'NZBsRus', 'nzbsrus_uid', '')
         NZBSRUS_APIKEY = check_setting_str(CFG, 'NZBsRus', 'nzbsrus_apikey', '')
@@ -772,11 +773,16 @@ def config_write():
     new_config['NZBget']['nzbget_password'] = NZBGET_PASSWORD
     new_config['NZBget']['nzbget_category'] = NZBGET_CATEGORY
     new_config['NZBget']['nzbget_host'] = NZBGET_HOST
-
-    new_config['NZBMatrix'] = {}
-    new_config['NZBMatrix']['nzbmatrix'] = int(NZBMATRIX)
-    new_config['NZBMatrix']['nzbmatrix_username'] = NZBMATRIX_USERNAME
-    new_config['NZBMatrix']['nzbmatrix_apikey'] = NZBMATRIX_APIKEY
+    
+    new_config['Transmission'] = {}
+    new_config['Transmission']['transmission_host'] = TRANSMISSION_HOST
+    new_config['Transmission']['transmission_username'] = TRANSMISSION_USERNAME
+    new_config['Transmission']['transmission_password'] = TRANSMISSION_PASSWORD
+    
+    new_config['uTorrent'] = {}
+    new_config['uTorrent']['utorrent_host'] = UTORRENT_HOST
+    new_config['uTorrent']['utorrent_username'] = UTORRENT_USERNAME
+    new_config['uTorrent']['utorrent_password'] = UTORRENT_PASSWORD
 
     new_config['Newznab'] = {}
     new_config['Newznab']['newznab'] = int(NEWZNAB)
@@ -796,11 +802,6 @@ def config_write():
     new_config['NZBsorg']['nzbsorg_uid'] = NZBSORG_UID
     new_config['NZBsorg']['nzbsorg_hash'] = NZBSORG_HASH
 
-    new_config['Newzbin'] = {}
-    new_config['Newzbin']['newzbin'] = int(NEWZBIN)
-    new_config['Newzbin']['newzbin_uid'] = NEWZBIN_UID
-    new_config['Newzbin']['newzbin_password'] = NEWZBIN_PASSWORD
-
     new_config['NZBsRus'] = {}
     new_config['NZBsRus']['nzbsrus'] = int(NZBSRUS)
     new_config['NZBsRus']['nzbsrus_uid'] = NZBSRUS_UID