diff --git a/headphones/__init__.py b/headphones/__init__.py
index 085013ac..dccdab78 100644
--- a/headphones/__init__.py
+++ b/headphones/__init__.py
@@ -42,7 +42,7 @@ POSSIBLE_EXTRAS = [
     "audiobook",
     "other",
     "dj-mix",
-    "mixtape_street",
+    "mixtape/street",
     "broadcast",
     "interview",
     "demo"
diff --git a/headphones/config.py b/headphones/config.py
index 585efcdd..f9cdf8e3 100644
--- a/headphones/config.py
+++ b/headphones/config.py
@@ -5,223 +5,221 @@ import re
 from configobj import ConfigObj
 
 _config_definitions = {
-    'CONFIG_VERSION': (str, 'General', '0'),
-    'HTTP_PORT': (int, 'General', 8181),
-    'HTTP_HOST': (str, 'General', '0.0.0.0'),
-    'HTTP_USERNAME': (str, 'General', ''),
-    'HTTP_PASSWORD': (str, 'General', ''),
-    'HTTP_ROOT': (str, 'General', '/'),
-    'HTTP_PROXY': (int, 'General', 0),
-    'ENABLE_HTTPS': (int, 'General', 0),
-    'LAUNCH_BROWSER': (int, 'General', 1),
+    'ADD_ALBUM_ART': (int, 'General', 0),
+    'ADVANCEDENCODER': (str, 'General', ''),
+    'ALBUM_ART_FORMAT': (str, 'General', 'folder'),
+    'ALBUM_COMPLETION_PCT': (int, 'Advanced', 80), # This is used in importer.py to determine how complete an album needs to be - to be considered "downloaded". Percentage from 0-100
     'API_ENABLED': (int, 'General', 0),
     'API_KEY': (str, 'General', ''),
-    'GIT_PATH': (str, 'General', ''),
-    'GIT_USER': (str, 'General', 'rembo10'),
-    'GIT_BRANCH': (str, 'General', 'master'),
-    'DO_NOT_OVERRIDE_GIT_BRANCH': (int, 'General', 0),
-    'LOG_DIR': (str, 'General', ''),
-    'CACHE_DIR': (str, 'General', ''),
-    'CHECK_GITHUB': (int, 'General', 1),
-    'CHECK_GITHUB_ON_STARTUP': (int, 'General', 1),
-    'CHECK_GITHUB_INTERVAL': (int, 'General', 360),
-    'MUSIC_DIR': (str, 'General', ''),
-    'DESTINATION_DIR': (str, 'General',''),
-    'LOSSLESS_DESTINATION_DIR': (str, 'General', ''),
-    'PREFERRED_QUALITY': (int, 'General', 0),
-    'PREFERRED_BITRATE': (str, 'General', ''),
-    'PREFERRED_BITRATE_HIGH_BUFFER': (int, 'General', 0),
-    'PREFERRED_BITRATE_LOW_BUFFER': (int, 'General', 0),
-    'PREFERRED_BITRATE_ALLOW_LOSSLESS': (int, 'General', 0),
-    'DETECT_BITRATE': (int, 'General', 0),
-    'LOSSLESS_BITRATE_FROM': (int, 'General', 0),
-    'LOSSLESS_BITRATE_TO': (int, 'General', 0),
-    'AUTO_ADD_ARTISTS': (int, 'General', 1),
-    'CORRECT_METADATA': (int, 'General', 0),
-    'FREEZE_DB': (int, 'General', 0),
-    'MOVE_FILES': (int, 'General', 0),
-    'RENAME_FILES': (int, 'General', 0),
-    'FOLDER_FORMAT': (str, 'General', 'Artist/Album [Year]'),
-    'FILE_FORMAT': (str, 'General', 'Track Artist - Album [Year] - Title'),
-    'FILE_UNDERSCORES': (int, 'General', 0),
-    'CLEANUP_FILES': (int, 'General', 0),
-    'KEEP_NFO': (int, 'General', 0),
-    'ADD_ALBUM_ART': (int, 'General', 0),
-    'ALBUM_ART_FORMAT': (str, 'General', 'folder'),
-    'EMBED_ALBUM_ART': (int, 'General', 0),
-    'EMBED_LYRICS': (int, 'General', 0),
-    'REPLACE_EXISTING_FOLDERS': (int, 'General', 0),
-    'NZB_DOWNLOADER': (int, 'General', 0),  # 0: sabnzbd, 1: nzbget, 2: blackhole
-    'TORRENT_DOWNLOADER': (int, 'General', 0),  # 0: blackhole, 1: transmission, 2: utorrent
-    'DOWNLOAD_DIR': (str, 'General', ''),
-    'BLACKHOLE': (int, 'General', 0),
-    'BLACKHOLE_DIR': (str, 'General', ''),
-    'USENET_RETENTION': (int, 'General', '1500'),
-    'INCLUDE_EXTRAS': (int, 'General', 0),
-    'EXTRAS': (str, 'General', ''),
-    'AUTOWANT_UPCOMING': (int, 'General', 1),
     'AUTOWANT_ALL': (int, 'General', 0),
     'AUTOWANT_MANUALLY_ADDED': (int, 'General', 1),
-    'KEEP_TORRENT_FILES': (int, 'General', 0),
-    'PREFER_TORRENTS': (int, 'General', 0),
-
-    'OPEN_MAGNET_LINKS': (int, 'General', 0),
-    'SEARCH_INTERVAL': (int, 'General', 1440),
-    'LIBRARYSCAN': (int, 'General', 1),
-    'LIBRARYSCAN_INTERVAL': (int, 'General', 300),
+    'AUTOWANT_UPCOMING': (int, 'General', 1),
+    'AUTO_ADD_ARTISTS': (int, 'General', 1),
+    'BITRATE': (int, 'General', 192),
+    'BLACKHOLE': (int, 'General', 0),
+    'BLACKHOLE_DIR': (str, 'General', ''),
+    'BOXCAR_ENABLED': (int, 'Boxcar', 0),
+    'BOXCAR_ONSNATCH': (int, 'Boxcar', 0),
+    'BOXCAR_TOKEN': (str, 'Boxcar', ''),
+    'CACHE_DIR': (str, 'General', ''),
+    'CACHE_SIZEMB': (int, 'Advanced', 32),
+    'CHECK_GITHUB': (int, 'General', 1),
+    'CHECK_GITHUB_INTERVAL': (int, 'General', 360),
+    'CHECK_GITHUB_ON_STARTUP': (int, 'General', 1),
+    'CLEANUP_FILES': (int, 'General', 0),
+    'CONFIG_VERSION': (str, 'General', '0'),
+    'CORRECT_METADATA': (int, 'General', 0),
+    'CUSTOMHOST': (str, 'General', 'localhost'),
+    'CUSTOMPORT': (int, 'General', 5000),
+    'CUSTOMSLEEP': (int, 'General', 1),
+    'DELETE_LOSSLESS_FILES': (int, 'General', 1),
+    'DESTINATION_DIR': (str, 'General', ''),
+    'DETECT_BITRATE': (int, 'General', 0),
+    'DOWNLOAD_DIR': (str, 'General', ''),
     'DOWNLOAD_SCAN_INTERVAL': (int, 'General', 5),
-    'UPDATE_DB_INTERVAL': (int, 'General', 24),
-    'MB_IGNORE_AGE': (int, 'General', 365),
-    'TORRENT_REMOVAL_INTERVAL': (int, 'General', 720),
-    'TORRENTBLACKHOLE_DIR': (str, 'General', ''),
-    'NUMBEROFSEEDERS': (str, 'General', '10'),
     'DOWNLOAD_TORRENT_DIR': (str, 'General', ''),
+    'DO_NOT_OVERRIDE_GIT_BRANCH': (int, 'General', 0),
+    'EMBED_ALBUM_ART': (int, 'General', 0),
+    'EMBED_LYRICS': (int, 'General', 0),
+    'ENABLE_HTTPS': (int, 'General', 0),
+    'ENCODER': (str, 'General', 'ffmpeg'),
+    'ENCODERFOLDER': (str, 'General', ''),
+    'ENCODERLOSSLESS': (int, 'General', 1),
+    'ENCODEROUTPUTFORMAT': (str, 'General', 'mp3'),
+    'ENCODERQUALITY': (int, 'General', 2),
+    'ENCODERVBRCBR': (str, 'General', 'cbr'),
+    'ENCODER_MULTICORE': (int, 'General', 0),
+    'ENCODER_MULTICORE_COUNT': (int, 'General', 0),
+    'ENCODER_PATH': (str, 'General', ''),
+    'EXTRAS': (str, 'General', ''),
+    'EXTRA_NEWZNABS': (list, 'Newznab', ''),
+    'FILE_FORMAT': (str, 'General', 'Track Artist - Album [Year] - Title'),
+    'FILE_PERMISSIONS': (str, 'General', '0644'),
+    'FILE_UNDERSCORES': (int, 'General', 0),
+    'FOLDER_FORMAT': (str, 'General', 'Artist/Album [Year]'),
+    'FOLDER_PERMISSIONS': (str, 'General', '0755'),
+    'FREEZE_DB': (int, 'General', 0),
+    'GIT_BRANCH': (str, 'General', 'master'),
+    'GIT_PATH': (str, 'General', ''),
+    'GIT_USER': (str, 'General', 'rembo10'),
+    'GROWL_ENABLED': (int, 'Growl', 0),
+    'GROWL_HOST': (str, 'Growl', ''),
+    'GROWL_ONSNATCH': (int, 'Growl', 0),
+    'GROWL_PASSWORD': (str, 'Growl', ''),
+    'HEADPHONES_INDEXER': (bool, 'General', False),
+    'HPPASS': (str, 'General', ''),
+    'HPUSER': (str, 'General', ''),
+    'HTTPS_CERT': (str, 'General', ''),
+    'HTTPS_KEY': (str, 'General', ''),
+    'HTTP_HOST': (str, 'General', '0.0.0.0'),
+    'HTTP_PASSWORD': (str, 'General', ''),
+    'HTTP_PORT': (int, 'General', 8181),
+    'HTTP_PROXY': (int, 'General', 0),
+    'HTTP_ROOT': (str, 'General', '/'),
+    'HTTP_USERNAME': (str, 'General', ''),
+    'IGNORED_WORDS': (str, 'General', ''),
+    'INCLUDE_EXTRAS': (int, 'General', 0),
+    'INTERFACE': (str, 'General', 'default'),
+    'JOURNAL_MODE': (str, 'Advanced', 'wal'),
     'KAT': (int, 'Kat', 0),
     'KAT_PROXY_URL': (str, 'Kat', ''),
     'KAT_RATIO': (str, 'Kat', ''),
+    'KEEP_NFO': (int, 'General', 0),
+    'KEEP_TORRENT_FILES': (int, 'General', 0),
+    'LASTFM_USERNAME': (str, 'General', ''),
+    'LAUNCH_BROWSER': (int, 'General', 1),
+    'LIBRARYSCAN': (int, 'General', 1),
+    'LIBRARYSCAN_INTERVAL': (int, 'General', 300),
+    'LMS_ENABLED': (int, 'LMS', 0),
+    'LMS_HOST': (str, 'LMS', ''),
+    'LOG_DIR': (str, 'General', ''),
+    'LOSSLESS_BITRATE_FROM': (int, 'General', 0),
+    'LOSSLESS_BITRATE_TO': (int, 'General', 0),
+    'LOSSLESS_DESTINATION_DIR': (str, 'General', ''),
+    'MB_IGNORE_AGE': (int, 'General', 365),
+    'MININOVA': (int, 'Mininova', 0),
+    'MININOVA_RATIO': (str, 'Mininova', ''),
+    'MIRROR': (str, 'General', 'musicbrainz.org'),
+    'MOVE_FILES': (int, 'General', 0),
+    'MPC_ENABLED': (bool, 'MPC', False),
+    'MUSIC_DIR': (str, 'General', ''),
+    'MUSIC_ENCODER': (int, 'General', 0),
+    'NEWZNAB': (int, 'Newznab', 0),
+    'NEWZNAB_APIKEY': (str, 'Newznab', ''),
+    'NEWZNAB_ENABLED': (int, 'Newznab', 1),
+    'NEWZNAB_HOST': (str, 'Newznab', ''),
+    'NMA_APIKEY': (str, 'NMA', ''),
+    'NMA_ENABLED': (int, 'NMA', 0),
+    'NMA_ONSNATCH': (int, 'NMA', 0),
+    'NMA_PRIORITY': (int, 'NMA', 0),
+    'NUMBEROFSEEDERS': (str, 'General', '10'),
+    'NZBGET_CATEGORY': (str, 'NZBget', ''),
+    'NZBGET_HOST': (str, 'NZBget', ''),
+    'NZBGET_PASSWORD': (str, 'NZBget', ''),
+    'NZBGET_PRIORITY': (int, 'NZBget', 0),
+    'NZBGET_USERNAME': (str, 'NZBget', 'nzbget'),
+    'NZBSORG': (int, 'NZBsorg', 0),
+    'NZBSORG_HASH': (str, 'NZBsorg', ''),
+    'NZBSORG_UID': (str, 'NZBsorg', ''),
+    'NZB_DOWNLOADER': (int, 'General', 0),
+    'OMGWTFNZBS': (int, 'omgwtfnzbs', 0),
+    'OMGWTFNZBS_APIKEY': (str, 'omgwtfnzbs', ''),
+    'OMGWTFNZBS_UID': (str, 'omgwtfnzbs', ''),
+    'OPEN_MAGNET_LINKS': (int, 'General', 0),
+    'OSX_NOTIFY_APP': (str, 'OSX_Notify', '/Applications/Headphones'),
+    'OSX_NOTIFY_ENABLED': (int, 'OSX_Notify', 0),
+    'OSX_NOTIFY_ONSNATCH': (int, 'OSX_Notify', 0),
     'PIRATEBAY': (int, 'Piratebay', 0),
     'PIRATEBAY_PROXY_URL': (str, 'Piratebay', ''),
     'PIRATEBAY_RATIO': (str, 'Piratebay', ''),
-    'MININOVA': (int, 'Mininova', 0),
-    'MININOVA_RATIO': (str, 'Mininova', ''),
-    'WAFFLES': (int, 'Waffles', 0),
-    'WAFFLES_UID': (str, 'Waffles', ''),
-    'WAFFLES_PASSKEY': (str, 'Waffles', ''),
-    'WAFFLES_RATIO': (str, 'Waffles', ''),
+    'PLEX_CLIENT_HOST': (str, 'Plex', ''),
+    'PLEX_ENABLED': (int, 'Plex', 0),
+    'PLEX_NOTIFY': (int, 'Plex', 0),
+    'PLEX_PASSWORD': (str, 'Plex', ''),
+    'PLEX_SERVER_HOST': (str, 'Plex', ''),
+    'PLEX_UPDATE': (int, 'Plex', 0),
+    'PLEX_USERNAME': (str, 'Plex', ''),
+    'PREFERRED_BITRATE': (str, 'General', ''),
+    'PREFERRED_BITRATE_ALLOW_LOSSLESS': (int, 'General', 0),
+    'PREFERRED_BITRATE_HIGH_BUFFER': (int, 'General', 0),
+    'PREFERRED_BITRATE_LOW_BUFFER': (int, 'General', 0),
+    'PREFERRED_QUALITY': (int, 'General', 0),
+    'PREFERRED_WORDS': (str, 'General', ''),
+    'PREFER_TORRENTS': (int, 'General', 0),
+    'PROWL_ENABLED': (int, 'Prowl', 0),
+    'PROWL_KEYS': (str, 'Prowl', ''),
+    'PROWL_ONSNATCH': (int, 'Prowl', 0),
+    'PROWL_PRIORITY': (int, 'Prowl', 0),
+    'PUSHALOT_APIKEY': (str, 'Pushalot', ''),
+    'PUSHALOT_ENABLED': (int, 'Pushalot', 0),
+    'PUSHALOT_ONSNATCH': (int, 'Pushalot', 0),
+    'PUSHBULLET_APIKEY': (str, 'PushBullet', ''),
+    'PUSHBULLET_DEVICEID': (str, 'PushBullet', ''),
+    'PUSHBULLET_ENABLED': (int, 'PushBullet', 0),
+    'PUSHBULLET_ONSNATCH': (int, 'PushBullet', 0),
+    'PUSHOVER_APITOKEN': (str, 'Pushover', ''),
+    'PUSHOVER_ENABLED': (int, 'Pushover', 0),
+    'PUSHOVER_KEYS': (str, 'Pushover', ''),
+    'PUSHOVER_ONSNATCH': (int, 'Pushover', 0),
+    'PUSHOVER_PRIORITY': (int, 'Pushover', 0),
+    'RENAME_FILES': (int, 'General', 0),
+    'REPLACE_EXISTING_FOLDERS': (int, 'General', 0),
+    'REQUIRED_WORDS': (str, 'General', ''),
     'RUTRACKER': (int, 'Rutracker', 0),
-    'RUTRACKER_USER': (str, 'Rutracker', ''),
     'RUTRACKER_PASSWORD': (str, 'Rutracker', ''),
     'RUTRACKER_RATIO': (str, 'Rutracker', ''),
-    'WHATCD': (int, 'What.cd', 0),
-    'WHATCD_USERNAME': (str, 'What.cd', ''),
-    'WHATCD_PASSWORD': (str, 'What.cd', ''),
-    'WHATCD_RATIO': (str, 'What.cd', ''),
-    'SAB_HOST': (str, 'SABnzbd', ''),
-    'SAB_USERNAME': (str, 'SABnzbd', ''),
-    'SAB_PASSWORD': (str, 'SABnzbd', ''),
+    'RUTRACKER_USER': (str, 'Rutracker', ''),
     'SAB_APIKEY': (str, 'SABnzbd', ''),
     'SAB_CATEGORY': (str, 'SABnzbd', ''),
-    'NZBGET_USERNAME': (str, 'NZBget', 'nzbget_username', 'nzbget'),
-    'NZBGET_PASSWORD': (str, 'NZBget', 'nzbget_password', ''),
-    'NZBGET_CATEGORY': (str, 'NZBget', 'nzbget_category', ''),
-    'NZBGET_HOST': (str, 'NZBget', 'nzbget_host', ''),
-    'NZBGET_PRIORITY': (int, 'NZBget', 'nzbget_priority', 0),
-    'TRANSMISSION_HOST': (str,  'Transmission', 'transmission_host', ''),
-    'TRANSMISSION_USERNAME': (str,  'Transmission', 'transmission_username', ''),
-    'TRANSMISSION_PASSWORD': (str,  'Transmission', 'transmission_password', ''),
-    'UTORRENT_HOST': (str,  'uTorrent', 'utorrent_host', ''),
-    'UTORRENT_USERNAME': (str,  'uTorrent', 'utorrent_username', ''),
-    'UTORRENT_PASSWORD': (str,  'uTorrent', 'utorrent_password', ''),
-    'UTORRENT_LABEL': (str,  'uTorrent', 'utorrent_label', ''),
-    'NEWZNAB': (int, 'Newznab', 'newznab', 0),
-    'NEWZNAB_HOST': (str,  'Newznab', 'newznab_host', ''),
-    'NEWZNAB_APIKEY': (str,  'Newznab', 'newznab_apikey', ''),
-    'NEWZNAB_ENABLED': (int, 'Newznab', 'newznab_enabled', 1),
-    'NZBSORG': (int, 'NZBsorg', 'nzbsorg', 0),
-    'NZBSORG_UID': (str, 'NZBsorg', 'nzbsorg_uid', ''),
-    'NZBSORG_HASH': (str, 'NZBsorg', 'nzbsorg_hash', ''),
-    'OMGWTFNZBS': (int, 'omgwtfnzbs', 'omgwtfnzbs', 0),
-    'OMGWTFNZBS_UID': (str, 'omgwtfnzbs', 'omgwtfnzbs_uid', ''),
-    'OMGWTFNZBS_APIKEY': (str, 'omgwtfnzbs', 'omgwtfnzbs_apikey', ''),
-    'PREFERRED_WORDS': (str, 'General', 'preferred_words', ''),
-    'IGNORED_WORDS': (str, 'General', 'ignored_words', ''),
-    'REQUIRED_WORDS': (str, 'General', 'required_words', ''),
-    'LASTFM_USERNAME': (str, 'General', 'lastfm_username', ''),
-    'INTERFACE': (str, 'General', 'interface', 'default'),
-    'FOLDER_PERMISSIONS': (str, 'General', 'folder_permissions', '0755'),
-    'FILE_PERMISSIONS': (str, 'General', 'file_permissions', '0644'),
-    'ENCODERFOLDER': (str, 'General', 'encoderfolder', ''),
-    'ENCODER_PATH': (str, 'General', 'encoder_path', ''),
-    'ENCODER': (str, 'General', 'encoder', 'ffmpeg'),
-    'XLDPROFILE': (str, 'General', 'xldprofile', ''),
-    'BITRATE': (int, 'General', 'bitrate', 192),
-    'SAMPLINGFREQUENCY': (int, 'General', 'samplingfrequency', 44100),
-    'MUSIC_ENCODER': (int, 'General', 'music_encoder', 0),
-    'ADVANCEDENCODER': (str, 'General', 'advancedencoder', ''),
-    'ENCODEROUTPUTFORMAT': (str, 'General', 'encoderoutputformat', 'mp3'),
-    'ENCODERQUALITY': (int, 'General', 'encoderquality', 2),
-    'ENCODERVBRCBR': (str, 'General', 'encodervbrcbr', 'cbr'),
-    'ENCODERLOSSLESS': (int, 'General', 'encoderlossless', 1),
-    'ENCODER_MULTICORE': (int, 'General', 'encoder_multicore', 0),
-    'DELETE_LOSSLESS_FILES': (int, 'General', 'delete_lossless_files', 1),
-    'GROWL_ENABLED': (int, 'Growl', 'growl_enabled', 0),
-    'GROWL_HOST': (str, 'Growl', 'growl_host', ''),
-    'GROWL_PASSWORD': (str, 'Growl', 'growl_password', ''),
-    'GROWL_ONSNATCH': (int, 'Growl', 'growl_onsnatch', 0),
-    'PROWL_ENABLED': (int, 'Prowl', 'prowl_enabled', 0),
-    'PROWL_KEYS': (str, 'Prowl', 'prowl_keys', ''),
-    'PROWL_ONSNATCH': (int, 'Prowl', 'prowl_onsnatch', 0),
-    'PROWL_PRIORITY': (int, 'Prowl', 'prowl_priority', 0),
-    'XBMC_ENABLED': (int, 'XBMC', 'xbmc_enabled', 0),
-    'XBMC_HOST': (str, 'XBMC', 'xbmc_host', ''),
-    'XBMC_USERNAME': (str, 'XBMC', 'xbmc_username', ''),
-    'XBMC_PASSWORD': (str, 'XBMC', 'xbmc_password', ''),
-    'XBMC_UPDATE': (int, 'XBMC', 'xbmc_update', 0),
-    'XBMC_NOTIFY': (int, 'XBMC', 'xbmc_notify', 0),
-    'LMS_ENABLED': (int, 'LMS', 'lms_enabled', 0),
-    'LMS_HOST': (str, 'LMS', 'lms_host', ''),
-    'PLEX_ENABLED': (int, 'Plex', 'plex_enabled', 0),
-    'PLEX_SERVER_HOST': (str, 'Plex', 'plex_server_host', ''),
-    'PLEX_CLIENT_HOST': (str, 'Plex', 'plex_client_host', ''),
-    'PLEX_USERNAME': (str, 'Plex', 'plex_username', ''),
-    'PLEX_PASSWORD': (str, 'Plex', 'plex_password', ''),
-    'PLEX_UPDATE': (int, 'Plex', 'plex_update', 0),
-    'PLEX_NOTIFY': (int, 'Plex', 'plex_notify', 0),
-    'NMA_ENABLED': (int, 'NMA', 'nma_enabled', 0),
-    'NMA_APIKEY': (str, 'NMA', 'nma_apikey', ''),
-    'NMA_PRIORITY': (int, 'NMA', 'nma_priority', 0),
-    'NMA_ONSNATCH': (int, 'NMA', 'nma_onsnatch', 0),
-    'PUSHALOT_ENABLED': (int, 'Pushalot', 'pushalot_enabled', 0),
-    'PUSHALOT_APIKEY': (str, 'Pushalot', 'pushalot_apikey', ''),
-    'PUSHALOT_ONSNATCH': (int, 'Pushalot', 'pushalot_onsnatch', 0),
-    'SYNOINDEX_ENABLED': (int, 'Synoindex', 'synoindex_enabled', 0),
-    'PUSHOVER_ENABLED': (int, 'Pushover', 'pushover_enabled', 0),
-    'PUSHOVER_KEYS': (str, 'Pushover', 'pushover_keys', ''),
-    'PUSHOVER_ONSNATCH': (int, 'Pushover', 'pushover_onsnatch', 0),
-    'PUSHOVER_PRIORITY': (int, 'Pushover', 'pushover_priority', 0),
-    'PUSHOVER_APITOKEN': (str, 'Pushover', 'pushover_apitoken', ''),
-    'PUSHBULLET_ENABLED': (int, 'PushBullet', 'pushbullet_enabled', 0),
-    'PUSHBULLET_APIKEY': (str, 'PushBullet', 'pushbullet_apikey', ''),
-    'PUSHBULLET_DEVICEID': (str, 'PushBullet', 'pushbullet_deviceid', ''),
-    'PUSHBULLET_ONSNATCH': (int, 'PushBullet', 'pushbullet_onsnatch', 0),
-    'TWITTER_ENABLED': (int, 'Twitter', 'twitter_enabled', 0),
-    'TWITTER_ONSNATCH': (int, 'Twitter', 'twitter_onsnatch', 0),
-    'TWITTER_USERNAME': (str, 'Twitter', 'twitter_username', ''),
-    'TWITTER_PASSWORD': (str, 'Twitter', 'twitter_password', ''),
-    'TWITTER_PREFIX': (str, 'Twitter', 'twitter_prefix', 'Headphones'),
-    'OSX_NOTIFY_ENABLED': (int, 'OSX_Notify', 'osx_notify_enabled', 0),
-    'OSX_NOTIFY_ONSNATCH': (int, 'OSX_Notify', 'osx_notify_onsnatch', 0),
-    'OSX_NOTIFY_APP': (str, 'OSX_Notify', 'osx_notify_app', '/Applications/Headphones'),
-    'BOXCAR_ENABLED': (int, 'Boxcar', 'boxcar_enabled', 0),
-    'BOXCAR_ONSNATCH': (int, 'Boxcar', 'boxcar_onsnatch', 0),
-    'BOXCAR_TOKEN': (str, 'Boxcar', 'boxcar_token', ''),
-    'SUBSONIC_ENABLED': (int, 'Subsonic', 'subsonic_enabled', 0),
-    'SUBSONIC_HOST': (str, 'Subsonic', 'subsonic_host', ''),
-    'SUBSONIC_USERNAME': (str, 'Subsonic', 'subsonic_username', ''),
-    'SUBSONIC_PASSWORD': (str, 'Subsonic', 'subsonic_password', ''),
-    'SONGKICK_ENABLED': (int, 'Songkick', 'songkick_enabled', 1),
-    'SONGKICK_APIKEY': (str, 'Songkick', 'songkick_apikey', 'nd1We7dFW2RqxPw8'),
-    'SONGKICK_LOCATION': (str, 'Songkick', 'songkick_location', ''),
-    'SONGKICK_FILTER_ENABLED': (int, 'Songkick', 'songkick_filter_enabled', 0),
-    'MIRROR': (str, 'General', 'mirror', 'musicbrainz.org'),
-    'CUSTOMHOST': (str, 'General', 'customhost', 'localhost'),
-    'CUSTOMPORT': (int, 'General', 'customport', 5000),
-    'CUSTOMSLEEP': (int, 'General', 'customsleep', 1),
-    'HPUSER': (str, 'General', 'hpuser', ''),
-    'HPPASS': (str, 'General', 'hppass', ''),
-    'CACHE_SIZEMB': (int, 'Advanced', 'cache_sizemb', 32),
-    'JOURNAL_MODE': (str, 'Advanced', 'journal_mode', 'wal'),
-    'ALBUM_COMPLETION_PCT': (int, 'Advanced', 'album_completion_pct', 80),  # This is used in importer.py to determine how complete an album needs to be - to be considered "downloaded". Percentage from 0-100
-    'VERIFY_SSL_CERT': (bool, 'Advanced', 'verify_ssl_cert', 1),
-    'HTTPS_CERT': (str, 'General', 'https_cert', ''),
-    'HTTPS_KEY': (str, 'General', 'https_key', ''),
-    'ENCODER_MULTICORE_COUNT': (int, 'General', 'encoder_multicore_count', 0),
-    'EXTRA_NEWZNABS': (list, 'Newznab', 'extra_newznabs', ''),
-    'MPC_ENABLED': (bool, 'MPC', 'mpc_enabled', False),
-    'HEADPHONES_INDEXER': (bool, 'General', 'headphones_indexer', False)
+    'SAB_HOST': (str, 'SABnzbd', ''),
+    'SAB_PASSWORD': (str, 'SABnzbd', ''),
+    'SAB_USERNAME': (str, 'SABnzbd', ''),
+    'SAMPLINGFREQUENCY': (int, 'General', 44100),
+    'SEARCH_INTERVAL': (int, 'General', 1440),
+    'SONGKICK_APIKEY': (str, 'Songkick', 'nd1We7dFW2RqxPw8'),
+    'SONGKICK_ENABLED': (int, 'Songkick', 1),
+    'SONGKICK_FILTER_ENABLED': (int, 'Songkick', 0),
+    'SONGKICK_LOCATION': (str, 'Songkick', ''),
+    'SUBSONIC_ENABLED': (int, 'Subsonic', 0),
+    'SUBSONIC_HOST': (str, 'Subsonic', ''),
+    'SUBSONIC_PASSWORD': (str, 'Subsonic', ''),
+    'SUBSONIC_USERNAME': (str, 'Subsonic', ''),
+    'SYNOINDEX_ENABLED': (int, 'Synoindex', 0),
+    'TORRENTBLACKHOLE_DIR': (str, 'General', ''),
+    'TORRENT_DOWNLOADER': (int, 'General', 0),
+    'TORRENT_REMOVAL_INTERVAL': (int, 'General', 720),
+    'TRANSMISSION_HOST': (str, 'Transmission', ''),
+    'TRANSMISSION_PASSWORD': (str, 'Transmission', ''),
+    'TRANSMISSION_USERNAME': (str, 'Transmission', ''),
+    'TWITTER_ENABLED': (int, 'Twitter', 0),
+    'TWITTER_ONSNATCH': (int, 'Twitter', 0),
+    'TWITTER_PASSWORD': (str, 'Twitter', ''),
+    'TWITTER_PREFIX': (str, 'Twitter', 'Headphones'),
+    'TWITTER_USERNAME': (str, 'Twitter', ''),
+    'UPDATE_DB_INTERVAL': (int, 'General', 24),
+    'USENET_RETENTION': (int, 'General', '1500'),
+    'UTORRENT_HOST': (str, 'uTorrent', ''),
+    'UTORRENT_LABEL': (str, 'uTorrent', ''),
+    'UTORRENT_PASSWORD': (str, 'uTorrent', ''),
+    'UTORRENT_USERNAME': (str, 'uTorrent', ''),
+    'VERIFY_SSL_CERT': (bool, 'Advanced', 1),
+    'WAFFLES': (int, 'Waffles', 0),
+    'WAFFLES_PASSKEY': (str, 'Waffles', ''),
+    'WAFFLES_RATIO': (str, 'Waffles', ''),
+    'WAFFLES_UID': (str, 'Waffles', ''),
+    'WHATCD': (int, 'What.cd', 0),
+    'WHATCD_PASSWORD': (str, 'What.cd', ''),
+    'WHATCD_RATIO': (str, 'What.cd', ''),
+    'WHATCD_USERNAME': (str, 'What.cd', ''),
+    'XBMC_ENABLED': (int, 'XBMC', 0),
+    'XBMC_HOST': (str, 'XBMC', ''),
+    'XBMC_NOTIFY': (int, 'XBMC', 0),
+    'XBMC_PASSWORD': (str, 'XBMC', ''),
+    'XBMC_UPDATE': (int, 'XBMC', 0),
+    'XBMC_USERNAME': (str, 'XBMC', ''),
+    'XLDPROFILE': (str, 'General', '')
 }
 
-
 class Config(object):
     """ Wraps access to particular values in a config file """