diff --git a/src/pref.py b/src/pref.py
index 93da578d1..71b9fd2c0 100644
--- a/src/pref.py
+++ b/src/pref.py
@@ -61,7 +61,7 @@ DEFAULT_PREFS = {
     "listen_on" : [6881,6889],
     "lock_tray" : False,
     "max_active_torrents" : -1,
-    "max_connections" : 400,
+    "max_connections" : 200,
     "max_download_speed" : -1,
     "max_download_speed_bps": -1,
     "max_number_uploads" : 10,
@@ -69,14 +69,29 @@ DEFAULT_PREFS = {
     "max_upload_speed_bps" : -1,
     "pref_rc4" : True,
     "prioritize_first_last_pieces" : False,
-    "proxy_type" : common.ProxyType.none,
+    "web_proxy_type" : common.ProxyType.none,
+    "peer_proxy_type" : common.ProxyType.none,
+    "dht_proxy_type" : common.ProxyType.none,
+    "tracker_proxy_type" : common.ProxyType.none,
     "peer_proxy" : False,
     "tracker_proxy" : False,
     "dht_proxy" : False,
-    "proxy_hostname" : "",
-    "proxy_username" : "",
-    "proxy_password" : "",
-    "proxy_port": 8080,
+    "peer_proxy_hostname" : "",
+    "peer_proxy_username" : "",
+    "peer_proxy_password" : "",
+    "peer_proxy_port": 8080,
+    "dht_proxy_hostname" : "",
+    "dht_proxy_username" : "",
+    "dht_proxy_password" : "",
+    "dht_proxy_port": 8080,
+    "web_proxy_hostname" : "",
+    "web_proxy_username" : "",
+    "web_proxy_password" : "",
+    "web_proxy_port": 8080,
+    "tracker_proxy_hostname" : "",
+    "tracker_proxy_username" : "",
+    "tracker_proxy_password" : "",
+    "tracker_proxy_port": 8080,
     "queue_seeds_to_bottom" : False,
     "random_port" : False,
     "show_availability" : True,