diff --git a/etc/scripts/torbrowser-windows.sh b/etc/scripts/torbrowser-windows.sh
index 33a59cf..37cf5a3 100755
--- a/etc/scripts/torbrowser-windows.sh
+++ b/etc/scripts/torbrowser-windows.sh
@@ -5,11 +5,11 @@ TORSOCKS=$(which torsocks)
 #    . "${TORSOCKS}" on
 #fi
 
-version="$(curl -s https://aus1.torproject.org/torbrowser/update_3/release/downloads.json | jq -r ".version")"
-locale="en-US" # mention your locale. default = en-US
-if [ -d /etc/default/locale ]; then
-    . /etc/default/locale
-    locale=$(echo "${LANG}" | cut -d . -f1)
+if [ -z $version ]; then
+    version="$(curl -s https://aus1.torproject.org/torbrowser/update_3/release/downloads.json | jq -r ".version")"
+fi
+if [ -z $locale ]; then
+    locale="ALL" # mention your locale. default = ALL
 fi
 
 if [ ! -f ./tor.keyring ]; then
diff --git a/etc/scripts/torbrowser.sh b/etc/scripts/torbrowser.sh
index 9954f3a..c3c4dd9 100755
--- a/etc/scripts/torbrowser.sh
+++ b/etc/scripts/torbrowser.sh
@@ -6,11 +6,11 @@ if [ -f "${TORSOCKS}" ]; then
     echo ""
 fi
 
-version="$(curl -s https://aus1.torproject.org/torbrowser/update_3/release/downloads.json | jq -r ".version")"
-locale="en-US" # mention your locale. default = en-US
-if [ -d /etc/default/locale ]; then
-    . /etc/default/locale
-    locale=$(echo "${LANG}" | cut -d . -f1)
+if [ -z $version ]; then
+    version="$(curl -s https://aus1.torproject.org/torbrowser/update_3/release/downloads.json | jq -r ".version")"
+fi
+if [ -z $locale ]; then
+    locale="ALL" # mention your locale. default = ALL
 fi
 
 if [ ! -f ./tor.keyring ]; then
diff --git a/scripts/build.number b/scripts/build.number
index 16b5732..7bd8f79 100644
--- a/scripts/build.number
+++ b/scripts/build.number
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Sat Dec 31 21:01:03 UTC 2022
-build.number=422
+#Sat Dec 31 22:09:35 UTC 2022
+build.number=424
diff --git a/src/java/net/i2p/i2pfirefox/I2PFirefox.java b/src/java/net/i2p/i2pfirefox/I2PFirefox.java
index 9e948b6..ab2d546 100644
--- a/src/java/net/i2p/i2pfirefox/I2PFirefox.java
+++ b/src/java/net/i2p/i2pfirefox/I2PFirefox.java
@@ -612,6 +612,11 @@ public class I2PFirefox extends I2PCommonBrowser {
           pb.environment().put("MOZ_MAINTENANCE_SERVICE", "0");
           pb.environment().put("MOZ_PLUGIN_PATH", pluginsFolder);
           pb.environment().put("MOZ_UPDATER", "0");
+          pb.environment().put("TB_CUSTOM_HOMEPAGE", newArgs[4]);
+          pb.environment().put("TOR_FORCE_NET_CONFIG", "0");
+          pb.environment().put("TOR_SKIP_LAUNCH", "1");
+          pb.environment().put("TOR_SKIP_CONTROLPORTTEST", "1");
+          pb.environment().put("TOR_NONTOR_PROXY", "1");
           return pb;
         } catch (IOException e) {
           logger.warning(e.toString());
@@ -635,6 +640,12 @@ public class I2PFirefox extends I2PCommonBrowser {
         pb.environment().put("MOZ_MAINTENANCE_SERVICE", "0");
         pb.environment().put("MOZ_PLUGIN_PATH", pluginsFolder);
         pb.environment().put("MOZ_UPDATER", "0");
+        if (args.length > 4)
+          pb.environment().put("TB_CUSTOM_HOMEPAGE", args[4]);
+        pb.environment().put("TOR_FORCE_NET_CONFIG", "0");
+        pb.environment().put("TOR_SKIP_LAUNCH", "1");
+        pb.environment().put("TOR_SKIP_CONTROLPORTTEST", "1");
+        pb.environment().put("TOR_NONTOR_PROXY", "1");
         return pb;
       }
 
@@ -657,6 +668,12 @@ public class I2PFirefox extends I2PCommonBrowser {
     pb.environment().put("MOZ_MAINTENANCE_SERVICE", "0");
     pb.environment().put("MOZ_PLUGIN_PATH", pluginsFolder);
     pb.environment().put("MOZ_UPDATER", "0");
+    if (args.length > 4)
+      pb.environment().put("TB_CUSTOM_HOMEPAGE", args[4]);
+    pb.environment().put("TOR_FORCE_NET_CONFIG", "0");
+    pb.environment().put("TOR_SKIP_LAUNCH", "1");
+    pb.environment().put("TOR_SKIP_CONTROLPORTTEST", "1");
+    pb.environment().put("TOR_NONTOR_PROXY", "1");
     return pb;
     //}
     // return null;
diff --git a/src/prefs.js b/src/prefs.js
index 3c1d117..9b8c3aa 100644
--- a/src/prefs.js
+++ b/src/prefs.js
@@ -63,4 +63,5 @@ user_pref("browser.display.use_system_colors", false);
 user_pref("dom.image-lazy-loading.enabled", false);
 user_pref("extensions.autoDisableScopes", 0);
 user_pref("extensions.enabledScopes", 1);
-user_pref("toolkit.legacyUserProfileCustomizations.stylesheets", false);
\ No newline at end of file
+user_pref("toolkit.legacyUserProfileCustomizations.stylesheets", false);
+user_pref("browser.fixup.domainsuffixwhitelist.i2p", true);
\ No newline at end of file
diff --git a/src/user-overrides.js b/src/user-overrides.js
index 678566a..f5c9459 100644
--- a/src/user-overrides.js
+++ b/src/user-overrides.js
@@ -227,4 +227,5 @@ user_pref("webgl.enable-webgl2", false);
 user_pref("dom.w3c_touch_events.enabled", false);
 user_pref("browser.privatebrowsing.autostart", false);
 user_pref("browser.display.use_system_colors", false);
-user_pref("toolkit.legacyUserProfileCustomizations.stylesheets", false);
\ No newline at end of file
+user_pref("toolkit.legacyUserProfileCustomizations.stylesheets", false);
+user_pref("browser.fixup.domainsuffixwhitelist.i2p", true);
\ No newline at end of file