diff --git a/Patches/LineageOS-17.1/android_packages_apps_Settings/0001-Captive_Portal_Toggle-gos.patch b/Patches/LineageOS-17.1/android_packages_apps_Settings/0001-Captive_Portal_Toggle-gos.patch
index 633ea809..d52cda3e 100644
--- a/Patches/LineageOS-17.1/android_packages_apps_Settings/0001-Captive_Portal_Toggle-gos.patch
+++ b/Patches/LineageOS-17.1/android_packages_apps_Settings/0001-Captive_Portal_Toggle-gos.patch
@@ -37,25 +37,25 @@ index b983f467df..d799348200 100644
 +    <string-array name="connectivity_check_entries">
 +        <item>Disabled</item>
 +        <item>Google (US) [default]</item>
-+        <!--<item>GrapheneOS (CA)</item>-->
 +        <item>DivestOS (US)</item>
 +        <item>openSUSE (DE)</item>
 +        <item>Ubuntu (UK)</item>
 +        <item>Amazon Fire OS (US)</item>
 +        <item>Microsoft Edge (US)</item>
 +        <item>Kuketz (DE)</item>
++        <!--<item>GrapheneOS (CA)</item>-->
 +    </string-array>
 +
 +    <string-array name="connectivity_check_values" translatable="false">
 +        <item>0</item>
 +        <item>1</item>
-+        <!--<item>2</item>-->
++        <item>2</item>
 +        <item>3</item>
 +        <item>4</item>
 +        <item>5</item>
 +        <item>6</item>
 +        <item>7</item>
-+        <item>8</item>
++        <!--<item>8</item>-->
 +    </string-array>
 +
      <!-- Security settings.  The delay after screen is turned off until device locks.
@@ -197,13 +197,13 @@ index 0000000000..942ae750bc
 +
 +    private static final int DISABLED_CAPTIVE_PORTAL_INTVAL = 0;
 +    private static final int STANDARD_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 1;
-+    private static final int GRAPHENEOS_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 2;
-+    private static final int DIVESTOS_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 3;
-+    private static final int OPENSUSE_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 4;
-+    private static final int UBUNTU_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 5;
-+    private static final int AMAZON_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 6;
-+    private static final int MICROSOFT_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 7;
-+    private static final int KUKETZ_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 8;
++    private static final int DIVESTOS_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 2;
++    private static final int OPENSUSE_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 3;
++    private static final int UBUNTU_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 4;
++    private static final int AMAZON_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 5;
++    private static final int MICROSOFT_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 6;
++    private static final int KUKETZ_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 7;
++    private static final int GRAPHENEOS_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 8;
 +
 +    private static final String KEY_CONNECTIVITY_CHECK_SETTINGS =
 +            "connectivity_check_settings";
diff --git a/Patches/LineageOS-18.1/android_packages_apps_Settings/0001-Captive_Portal_Toggle-gos.patch b/Patches/LineageOS-18.1/android_packages_apps_Settings/0001-Captive_Portal_Toggle-gos.patch
index d765046c..f0e6ba8d 100644
--- a/Patches/LineageOS-18.1/android_packages_apps_Settings/0001-Captive_Portal_Toggle-gos.patch
+++ b/Patches/LineageOS-18.1/android_packages_apps_Settings/0001-Captive_Portal_Toggle-gos.patch
@@ -37,25 +37,25 @@ index 617548cadc..87fd6e5df6 100644
 +    <string-array name="connectivity_check_entries">
 +        <item>Disabled</item>
 +        <item>Google (US) [default]</item>
-+        <!--<item>GrapheneOS (CA)</item>-->
 +        <item>DivestOS (US)</item>
 +        <item>openSUSE (DE)</item>
 +        <item>Ubuntu (UK)</item>
 +        <item>Amazon Fire OS (US)</item>
 +        <item>Microsoft Edge (US)</item>
 +        <item>Kuketz (DE)</item>
++        <!--<item>GrapheneOS (CA)</item>-->
 +    </string-array>
 +
 +    <string-array name="connectivity_check_values" translatable="false">
 +        <item>0</item>
 +        <item>1</item>
-+        <!--<item>2</item>-->
++        <item>2</item>
 +        <item>3</item>
 +        <item>4</item>
 +        <item>5</item>
 +        <item>6</item>
 +        <item>7</item>
-+        <item>8</item>
++        <!--<item>8</item>-->
 +    </string-array>
 +
      <!-- Security settings.  The delay after screen is turned off until device locks.
@@ -197,13 +197,13 @@ index 0000000000..942ae750bc
 +
 +    private static final int DISABLED_CAPTIVE_PORTAL_INTVAL = 0;
 +    private static final int STANDARD_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 1;
-+    private static final int GRAPHENEOS_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 2;
-+    private static final int DIVESTOS_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 3;
-+    private static final int OPENSUSE_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 4;
-+    private static final int UBUNTU_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 5;
-+    private static final int AMAZON_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 6;
-+    private static final int MICROSOFT_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 7;
-+    private static final int KUKETZ_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 8;
++    private static final int DIVESTOS_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 2;
++    private static final int OPENSUSE_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 3;
++    private static final int UBUNTU_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 4;
++    private static final int AMAZON_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 5;
++    private static final int MICROSOFT_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 6;
++    private static final int KUKETZ_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 7;
++    private static final int GRAPHENEOS_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 8;
 +
 +    private static final String KEY_CONNECTIVITY_CHECK_SETTINGS =
 +            "connectivity_check_settings";
diff --git a/Patches/LineageOS-19.1/android_packages_apps_Settings/0013-Captive_Portal_Toggle.patch b/Patches/LineageOS-19.1/android_packages_apps_Settings/0013-Captive_Portal_Toggle.patch
index 21b4d9b4..7b391d72 100644
--- a/Patches/LineageOS-19.1/android_packages_apps_Settings/0013-Captive_Portal_Toggle.patch
+++ b/Patches/LineageOS-19.1/android_packages_apps_Settings/0013-Captive_Portal_Toggle.patch
@@ -35,25 +35,25 @@ index f50d130936..584550265c 100644
 +    <string-array name="connectivity_check_entries">
 +        <item>Disabled</item>
 +        <item>Google (US) [default]</item>
-+        <!--<item>GrapheneOS (CA)</item>-->
 +        <item>DivestOS (US)</item>
 +        <item>openSUSE (DE)</item>
 +        <item>Ubuntu (UK)</item>
 +        <item>Amazon Fire OS (US)</item>
 +        <item>Microsoft Edge (US)</item>
 +        <item>Kuketz (DE)</item>
++        <!--<item>GrapheneOS (CA)</item>-->
 +    </string-array>
 +
 +    <string-array name="connectivity_check_values" translatable="false">
 +        <item>0</item>
 +        <item>1</item>
-+        <!--<item>2</item>-->
++        <item>2</item>
 +        <item>3</item>
 +        <item>4</item>
 +        <item>5</item>
 +        <item>6</item>
 +        <item>7</item>
-+        <item>8</item>
++        <!--<item>8</item>-->
 +    </string-array>
 +
      <!-- Security settings.  The delay after screen is turned off until device locks.
@@ -178,13 +178,13 @@ index 0000000000..5328c3ee6a
 +
 +    private static final int DISABLED_CAPTIVE_PORTAL_INTVAL = 0;
 +    private static final int STANDARD_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 1;
-+    private static final int GRAPHENEOS_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 2;
-+    private static final int DIVESTOS_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 3;
-+    private static final int OPENSUSE_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 4;
-+    private static final int UBUNTU_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 5;
-+    private static final int AMAZON_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 6;
-+    private static final int MICROSOFT_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 7;
-+    private static final int KUKETZ_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 8;
++    private static final int DIVESTOS_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 2;
++    private static final int OPENSUSE_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 3;
++    private static final int UBUNTU_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 4;
++    private static final int AMAZON_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 5;
++    private static final int MICROSOFT_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 6;
++    private static final int KUKETZ_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 7;
++    private static final int GRAPHENEOS_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 8;
 +
 +    private static final String KEY_CONNECTIVITY_CHECK_SETTINGS =
 +            "connectivity_check_settings";
diff --git a/Patches/LineageOS-20.0/android_packages_apps_Settings/0013-Captive_Portal_Toggle.patch b/Patches/LineageOS-20.0/android_packages_apps_Settings/0013-Captive_Portal_Toggle.patch
index dab9ea46..a85e9f1e 100644
--- a/Patches/LineageOS-20.0/android_packages_apps_Settings/0013-Captive_Portal_Toggle.patch
+++ b/Patches/LineageOS-20.0/android_packages_apps_Settings/0013-Captive_Portal_Toggle.patch
@@ -25,7 +25,7 @@ Change-Id: I8a762d0f29ac42fce3dcfc7189e8ff216a8f8d1a
  create mode 100644 src/com/android/settings/network/ConnectivityCheckPreferenceController.java
 
 diff --git a/res/values/arrays.xml b/res/values/arrays.xml
-index cfc7671652..5f72bf702e 100644
+index cfc7671652..ed2b2a6b16 100644
 --- a/res/values/arrays.xml
 +++ b/res/values/arrays.xml
 @@ -210,6 +210,30 @@
@@ -35,25 +35,25 @@ index cfc7671652..5f72bf702e 100644
 +    <string-array name="connectivity_check_entries">
 +        <item>Disabled</item>
 +        <item>Google (US) [default]</item>
-+        <!--<item>GrapheneOS (CA)</item>-->
 +        <item>DivestOS (US)</item>
 +        <item>openSUSE (DE)</item>
 +        <item>Ubuntu (UK)</item>
 +        <item>Amazon Fire OS (US)</item>
 +        <item>Microsoft Edge (US)</item>
 +        <item>Kuketz (DE)</item>
++        <!--<item>GrapheneOS (CA)</item>-->
 +    </string-array>
 +
 +    <string-array name="connectivity_check_values" translatable="false">
 +        <item>0</item>
 +        <item>1</item>
-+        <!--<item>2</item>-->
++        <item>2</item>
 +        <item>3</item>
 +        <item>4</item>
 +        <item>5</item>
 +        <item>6</item>
 +        <item>7</item>
-+        <item>8</item>
++        <!--<item>8</item>-->
 +    </string-array>
 +
      <!-- Security settings.  The delay after screen is turned off until device locks.
@@ -73,7 +73,7 @@ index fa753aaa8e..858d5a6588 100644
  </resources>
 diff --git a/src/com/android/settings/network/ConnectivityCheckPreferenceController.java b/src/com/android/settings/network/ConnectivityCheckPreferenceController.java
 new file mode 100644
-index 0000000000..5328c3ee6a
+index 0000000000..6723f27cbe
 --- /dev/null
 +++ b/src/com/android/settings/network/ConnectivityCheckPreferenceController.java
 @@ -0,0 +1,339 @@
@@ -178,13 +178,13 @@ index 0000000000..5328c3ee6a
 +
 +    private static final int DISABLED_CAPTIVE_PORTAL_INTVAL = 0;
 +    private static final int STANDARD_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 1;
-+    private static final int GRAPHENEOS_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 2;
-+    private static final int DIVESTOS_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 3;
-+    private static final int OPENSUSE_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 4;
-+    private static final int UBUNTU_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 5;
-+    private static final int AMAZON_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 6;
-+    private static final int MICROSOFT_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 7;
-+    private static final int KUKETZ_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 8;
++    private static final int DIVESTOS_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 2;
++    private static final int OPENSUSE_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 3;
++    private static final int UBUNTU_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 4;
++    private static final int AMAZON_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 5;
++    private static final int MICROSOFT_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 6;
++    private static final int KUKETZ_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 7;
++    private static final int GRAPHENEOS_CAPTIVE_PORTAL_HTTP_URL_INTVAL = 8;
 +
 +    private static final String KEY_CONNECTIVITY_CHECK_SETTINGS =
 +            "connectivity_check_settings";
diff --git a/Patches/LineageOS-20.0/android_packages_modules_DnsResolver/0002-hosts_toggle.patch b/Patches/LineageOS-20.0/android_packages_modules_DnsResolver/0002-hosts_toggle.patch
index 6768f8d2..35d2378f 100644
--- a/Patches/LineageOS-20.0/android_packages_modules_DnsResolver/0002-hosts_toggle.patch
+++ b/Patches/LineageOS-20.0/android_packages_modules_DnsResolver/0002-hosts_toggle.patch
@@ -10,7 +10,7 @@ Change-Id: Iea165003474e1107dc77980985bf9928c369dbb5
  1 file changed, 4 insertions(+)
 
 diff --git a/getaddrinfo.cpp b/getaddrinfo.cpp
-index d854293..6ff4f09 100644
+index d854293..4760f7f 100644
 --- a/getaddrinfo.cpp
 +++ b/getaddrinfo.cpp
 @@ -57,6 +57,7 @@
diff --git a/Patches/LineageOS-20.0/android_system_sepolicy/0003-ptrace_scope-2.patch b/Patches/LineageOS-20.0/android_system_sepolicy/0003-ptrace_scope-2.patch
index cce94280..5ea1be58 100644
--- a/Patches/LineageOS-20.0/android_system_sepolicy/0003-ptrace_scope-2.patch
+++ b/Patches/LineageOS-20.0/android_system_sepolicy/0003-ptrace_scope-2.patch
@@ -77,7 +77,7 @@ index f235b35b7..895b8f1df 100644
  persist.logd.           u:object_r:logd_prop:s0
  ro.logd.                u:object_r:logd_prop:s0
 diff --git a/prebuilts/api/33.0/private/property_contexts b/prebuilts/api/33.0/private/property_contexts
-index 4eda4a169..111f7890a 100644
+index 5a04be1d2..ebb3ce102 100644
 --- a/prebuilts/api/33.0/private/property_contexts
 +++ b/prebuilts/api/33.0/private/property_contexts
 @@ -58,6 +58,7 @@ persist.nfc.            u:object_r:nfc_prop:s0
@@ -89,7 +89,7 @@ index 4eda4a169..111f7890a 100644
  persist.logd.           u:object_r:logd_prop:s0
  ro.logd.                u:object_r:logd_prop:s0
 diff --git a/private/property_contexts b/private/property_contexts
-index 4eda4a169..111f7890a 100644
+index 5a04be1d2..ebb3ce102 100644
 --- a/private/property_contexts
 +++ b/private/property_contexts
 @@ -58,6 +58,7 @@ persist.nfc.            u:object_r:nfc_prop:s0