diff --git a/Misc/Features/CaptivePortalCheck.txt b/Misc/Features/CaptivePortalCheck.txt
index 7d97054e..7deeb3e8 100644
--- a/Misc/Features/CaptivePortalCheck.txt
+++ b/Misc/Features/CaptivePortalCheck.txt
@@ -18,7 +18,7 @@ There are multiple solutions:
- If a maintainer blocked it, it'd cause issues (no Internet symbol when there is)
List of known connectivity check endpoints
- + DivestOS - 204 - http://divestos.xyz/gen204.php
+ + DivestOS - 204 - http://divestos.org/gen204.php
- Google - 204 - https://www.google.com/generate_204
- Google - 204 - http://connectivitycheck.gstatic.com/generate_204
- Google - 204 - http://www.google.com/gen_204
diff --git a/Patches/Common/android_vendor_divested/prebuilts/etc/additional_fdroid_repos.xml b/Patches/Common/android_vendor_divested/prebuilts/etc/additional_fdroid_repos.xml
index 207aa30f..40c807a0 100644
--- a/Patches/Common/android_vendor_divested/prebuilts/etc/additional_fdroid_repos.xml
+++ b/Patches/Common/android_vendor_divested/prebuilts/etc/additional_fdroid_repos.xml
@@ -4,7 +4,7 @@
- DivestOS Official
-- https://divestos.xyz/fdroid/official
+- https://divestos.org/fdroid/official
- This repository contains apps created by Divested Computing, Inc.
@@ -19,7 +19,7 @@
- DivestOS Unofficial
-- https://divestos.xyz/fdroid/unofficial
+- https://divestos.org/fdroid/unofficial
- This repository contains unofficial builds of open source apps that are not included in the official F-Droid repo or IzzySoft repo.
@@ -34,7 +34,7 @@
- DivestOS Provisioner
-- https://divestos.xyz/fdroid/provisioner
+- https://divestos.org/fdroid/provisioner
- This is an empty repo used to provision a device using the push install feature. Consider disabling after first use.
diff --git a/Patches/LineageOS-14.1/android_frameworks_base/0007-Connectivity.patch b/Patches/LineageOS-14.1/android_frameworks_base/0007-Connectivity.patch
index 8303b9ca..1e507629 100644
--- a/Patches/LineageOS-14.1/android_frameworks_base/0007-Connectivity.patch
+++ b/Patches/LineageOS-14.1/android_frameworks_base/0007-Connectivity.patch
@@ -17,10 +17,10 @@ index 97669d242f0..2a39f90b19b 100644
// TODO: append a random length parameter to the default HTTPS url.
// TODO: randomize browser version ids in the default User-Agent String.
- private static final String DEFAULT_HTTPS_URL = "https://www.google.com/generate_204";
-+ private static final String DEFAULT_HTTPS_URL = "https://divestos.xyz/gen204.php";
++ private static final String DEFAULT_HTTPS_URL = "https://divestos.org/gen204.php";
private static final String DEFAULT_HTTP_URL =
- "http://connectivitycheck.gstatic.com/generate_204";
-+ "http://divestos.xyz/gen204.php";
++ "http://divestos.org/gen204.php";
private static final String DEFAULT_FALLBACK_URL = "http://www.google.com/gen_204";
private static final String DEFAULT_USER_AGENT = "Mozilla/5.0 (X11; Linux x86_64) "
+ "AppleWebKit/537.36 (KHTML, like Gecko) "
diff --git a/Patches/LineageOS-15.1/android_frameworks_base/0005-Connectivity.patch b/Patches/LineageOS-15.1/android_frameworks_base/0005-Connectivity.patch
index a2317aa5..535c2d62 100644
--- a/Patches/LineageOS-15.1/android_frameworks_base/0005-Connectivity.patch
+++ b/Patches/LineageOS-15.1/android_frameworks_base/0005-Connectivity.patch
@@ -17,11 +17,11 @@ index d3a93542c74..32918aa3cdc 100644
// TODO: append a random length parameter to the default HTTPS url.
// TODO: randomize browser version ids in the default User-Agent String.
- private static final String DEFAULT_HTTPS_URL = "https://www.google.com/generate_204";
-+ private static final String DEFAULT_HTTPS_URL = "https://divestos.xyz/gen204.php";
++ private static final String DEFAULT_HTTPS_URL = "https://divestos.org/gen204.php";
private static final String DEFAULT_HTTP_URL =
- "http://connectivitycheck.gstatic.com/generate_204";
- private static final String DEFAULT_FALLBACK_URL = "http://www.google.com/gen_204";
-+ "http://divestos.xyz/gen204.php";
++ "http://divestos.org/gen204.php";
+ private static final String DEFAULT_FALLBACK_URL = "https://www.google.com/generate_204";
private static final String DEFAULT_OTHER_FALLBACK_URLS =
- "http://play.googleapis.com/generate_204";
diff --git a/Patches/LineageOS-16.0/android_frameworks_base/0005-Connectivity.patch b/Patches/LineageOS-16.0/android_frameworks_base/0005-Connectivity.patch
index a2317aa5..535c2d62 100644
--- a/Patches/LineageOS-16.0/android_frameworks_base/0005-Connectivity.patch
+++ b/Patches/LineageOS-16.0/android_frameworks_base/0005-Connectivity.patch
@@ -17,11 +17,11 @@ index d3a93542c74..32918aa3cdc 100644
// TODO: append a random length parameter to the default HTTPS url.
// TODO: randomize browser version ids in the default User-Agent String.
- private static final String DEFAULT_HTTPS_URL = "https://www.google.com/generate_204";
-+ private static final String DEFAULT_HTTPS_URL = "https://divestos.xyz/gen204.php";
++ private static final String DEFAULT_HTTPS_URL = "https://divestos.org/gen204.php";
private static final String DEFAULT_HTTP_URL =
- "http://connectivitycheck.gstatic.com/generate_204";
- private static final String DEFAULT_FALLBACK_URL = "http://www.google.com/gen_204";
-+ "http://divestos.xyz/gen204.php";
++ "http://divestos.org/gen204.php";
+ private static final String DEFAULT_FALLBACK_URL = "https://www.google.com/generate_204";
private static final String DEFAULT_OTHER_FALLBACK_URLS =
- "http://play.googleapis.com/generate_204";
diff --git a/Patches/Wallpapers b/Patches/Wallpapers
index 49815eae..7f8ab4c3 160000
--- a/Patches/Wallpapers
+++ b/Patches/Wallpapers
@@ -1 +1 @@
-Subproject commit 49815eae9bf74fe881da53a0ecba6954f04cf408
+Subproject commit 7f8ab4c37e09d0030189fade739e24e461ad5c6b
diff --git a/Scripts/Generate_Signing_Keys.sh b/Scripts/Generate_Signing_Keys.sh
index 70316f5f..6affd3af 100644
--- a/Scripts/Generate_Signing_Keys.sh
+++ b/Scripts/Generate_Signing_Keys.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-#desc='/O=Divested Computing, Inc./CN=DivestOS/emailAddress=support@divestos.xyz';
+#desc='/O=Divested Computing, Inc./CN=DivestOS/emailAddress=support@divestos.org';
desc='/O=Example/CN=ExampleOS/emailAddress=support@example.com';
type='rsa'; #Options: rsa, ec
diff --git a/Scripts/init.sh b/Scripts/init.sh
index baa9b0e5..ed53269f 100644
--- a/Scripts/init.sh
+++ b/Scripts/init.sh
@@ -38,7 +38,7 @@ export DOS_GPS_GLONASS_FORCED=true; #Enables GLONASS on all devices
export DOS_GRAPHENE_MALLOC=false; #Enables use of GrapheneOS' hardened memory allocator on 64-bit platforms
export DOS_HOSTS_BLOCKING=true; #Switch to false to prevent inclusion of our HOSTS file
export DOS_HOSTS_BLOCKING_APP="DNS66"; #App installed when built-in blocking is disabled. Options: Blokada, DNS66
-export DOS_HOSTS_BLOCKING_LIST="https://divestos.xyz/hosts"; #Must be in the format "127.0.0.1 bad.domain.tld"
+export DOS_HOSTS_BLOCKING_LIST="https://divestos.org/hosts"; #Must be in the format "127.0.0.1 bad.domain.tld"
export DOS_LOWRAM_ENABLED=false; #Switch to true to enable low_ram on all devices
export DOS_MALWARE_SCAN_ENABLED=true; #Set true to perform a fast scan on patchWorkspace() and a through scan on buildAll()
export DOS_MALWARE_SCAN_SETTING="quick"; #buildAll() scan speed. Options: quick, extra, slow, full
@@ -58,9 +58,9 @@ export DOS_BRANDING_BOOTANIMATION_FONT="Fira-Sans-Bold"; #Options: $ convert -li
export DOS_BRANDING_BOOTANIMATION_STYLE="plasma"; #Options: gradient, plasma
#export DOS_BRANDING_BOOTANIMATION_COLOR="#FF5722-#FF8A65"; #gradient
export DOS_BRANDING_BOOTANIMATION_COLOR="#FF5722-#03A9F4"; #plasma
-export DOS_BRANDING_LINK_ABOUT="https://divestos.xyz/index.php?page=about";
-export DOS_BRANDING_LINK_PRIVACY="https://divestos.xyz/index.php?page=privacy_policy";
-export DOS_BRANDING_SERVER_OTA="https://divestos.xyz/updater.php";
+export DOS_BRANDING_LINK_ABOUT="https://divestos.org/index.php?page=about";
+export DOS_BRANDING_LINK_PRIVACY="https://divestos.org/index.php?page=privacy_policy";
+export DOS_BRANDING_SERVER_OTA="https://divestos.org/updater.php";
export DOS_BRANDING_SERVER_OTA_ONION=$DOS_BRANDING_SERVER_OTA;
export DOS_THEME_50="FFCA28"; #Amber 400