diff --git a/src/app-profile/user.js b/src/app-profile/user.js
index c4bb768..8f5596f 100644
--- a/src/app-profile/user.js
+++ b/src/app-profile/user.js
@@ -1,19 +1,18 @@
-# Overrides for Extension Preferences
-# Tor Browser Bundle
-# Do not edit this file.
-#
-# This file is modified from a file included in the Tor Browser Bundle.
-#
-# Copyright 2017 The Tor Project.  See LICENSE.tor for licensing information.
+/*
+Overrides#
+for Extension Preferences# Tor Browser Bundle# Do not edit this file.##This file is modified from a file included in the Tor Browser Bundle.##Copyright 2017 The Tor Project.See LICENSE.tor#
+for licensing information.
 
-# HTTPS Everywhere Preferences:
+HTTPS Everywhere Preferences:
+*/
 user_pref("extensions.https_everywhere._observatory.popup_shown", true);
 user_pref("extensions.https_everywhere.toolbar_hint_shown", true);
 
-# NoScript Preferences:
-# In order to disable all scripts by default, uncomment the following line...
-# user_pref("capability.policy.maonoscript.javascript.enabled", "noAccess");
-# and comment out the following line
+/*
+NoScript Preferences: #In order to disable all scripts by
+default, uncomment the following line...#user_pref("capability.policy.maonoscript.javascript.enabled", "noAccess");#
+and comment out the following line
+*/
 user_pref("capability.policy.maonoscript.javascript.enabled", "allAccess");
 user_pref("capability.policy.maonoscript.sites", "[System+Principal] about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache");
 user_pref("noscript.default", "[System+Principal] about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache");
@@ -106,7 +105,7 @@ user_pref("network.proxy.ftp_port", 4444);
 user_pref("network.proxy.socks", "127.0.0.1");
 user_pref("network.proxy.socks_port", 4444);
 user_pref("network.proxy.share_proxy_settings", true);
-user_pref("browser.startup.homepage", "about:blank");
+user_pref("browser.startup.homepage", "http://127.0.0.1:7657/home");
 
 // Privacy-harden and disable irrelevant features.
 user_pref("app.normandy.api_url", "");
@@ -221,4 +220,4 @@ user_pref("webgl.disable-extensions", true);
 user_pref("webgl.min_capability_mode", true);
 user_pref("webgl.disable-fail-if-major-performance-caveat", true);
 user_pref("webgl.enable-webgl2", false);
-user_pref("dom.w3c_touch_events.enabled", false);
+user_pref("dom.w3c_touch_events.enabled", false);
\ No newline at end of file
diff --git a/src/profile/prefs.js b/src/profile/prefs.js
index 7312217..48bf864 100644
--- a/src/profile/prefs.js
+++ b/src/profile/prefs.js
@@ -58,6 +58,4 @@ user_pref("webgl.disable-fail-if-major-performance-caveat", true);
 user_pref("webgl.enable-webgl2", false);
 user_pref("media.navigator.enabled", false);
 user_pref("dom.w3c_touch_events.enabled", false);
-user_pref("fission.autostart", true);
-user_pref("gfx.webrender.all", false);
-user_pref("privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts", false);
\ No newline at end of file
+user_pref("browser.privatebrowsing.autostart", false);
\ No newline at end of file
diff --git a/src/profile/user.js b/src/profile/user.js
index 0a945b8..a15ef1e 100644
--- a/src/profile/user.js
+++ b/src/profile/user.js
@@ -1,15 +1,18 @@
-//# Overrides
-//for Extension Preferences# Tor Browser Bundle# Do not edit this file.##This file is modified from a file included in the Tor Browser Bundle.##Copyright 2017 The Tor Project.See LICENSE.tor
-//for licensing information.
+/*
+Overrides#
+for Extension Preferences# Tor Browser Bundle# Do not edit this file.##This file is modified from a file included in the Tor Browser Bundle.##Copyright 2017 The Tor Project.See LICENSE.tor#
+for licensing information.
 
-//# HTTPS Everywhere Preferences:
+HTTPS Everywhere Preferences:
+*/
 user_pref("extensions.https_everywhere._observatory.popup_shown", true);
 user_pref("extensions.https_everywhere.toolbar_hint_shown", true);
 
-//# NoScript Preferences: #In order to disable all scripts by
-//default, uncomment the following line...
-//#user_pref("capability.policy.maonoscript.javascript.enabled", "noAccess");#
-//and comment out the following line
+/*
+NoScript Preferences: #In order to disable all scripts by
+default, uncomment the following line...#user_pref("capability.policy.maonoscript.javascript.enabled", "noAccess");#
+and comment out the following line
+*/
 user_pref("capability.policy.maonoscript.javascript.enabled", "allAccess");
 user_pref("capability.policy.maonoscript.sites", "[System+Principal] about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache");
 user_pref("noscript.default", "[System+Principal] about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache");
@@ -79,6 +82,9 @@ user_pref("extensions.torbutton.use_nontor_proxy", true);
 //user_pref("extensions.torlauncher.socks_port_use_ipc", );
 //user_pref("extensions.torlauncher.socks_ipc_path", "");
 
+// TODO: this is a Tor Browser specific setting which is ignored on Firefox. If
+// I make it true, the SOCKS outproxy will have something to connect to. But I
+// need to test more to find out if that's prudent.
 user_pref("extensions.torlauncher.start_tor", false);
 //user_pref("extensions.torlauncher.default_bridge_type", "");
 user_pref("extensions.torlauncher.prompt_at_startup", false);
@@ -102,7 +108,7 @@ user_pref("network.proxy.ftp_port", 4444);
 user_pref("network.proxy.socks", "127.0.0.1");
 user_pref("network.proxy.socks_port", 4444);
 user_pref("network.proxy.share_proxy_settings", true);
-user_pref("browser.startup.homepage", "about:blank");
+user_pref("browser.startup.homepage", "http://127.0.0.1:7657/home");
 
 // Privacy-harden and disable irrelevant features.
 user_pref("app.normandy.api_url", "");
@@ -218,6 +224,4 @@ user_pref("webgl.min_capability_mode", true);
 user_pref("webgl.disable-fail-if-major-performance-caveat", true);
 user_pref("webgl.enable-webgl2", false);
 user_pref("dom.w3c_touch_events.enabled", false);
-user_pref("fission.autostart", true);
-user_pref("gfx.webrender.all", false);
-user_pref("privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts", false);
\ No newline at end of file
+user_pref("browser.privatebrowsing.autostart", false);
\ No newline at end of file