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 40c807a0..cf4b9e4f 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
@@ -6,7 +6,7 @@
- https://divestos.org/fdroid/official
-- This repository contains apps created by Divested Computing, Inc.
+- This repository contains apps created by Divested Computing Group
- 19
diff --git a/Patches/Wallpapers b/Patches/Wallpapers
index 7f8ab4c3..b0347702 160000
--- a/Patches/Wallpapers
+++ b/Patches/Wallpapers
@@ -1 +1 @@
-Subproject commit 7f8ab4c37e09d0030189fade739e24e461ad5c6b
+Subproject commit b0347702915ee1f4552562c368c531ceafaa352e
diff --git a/PrebuiltApps b/PrebuiltApps
index b18ebf42..bf165e7a 160000
--- a/PrebuiltApps
+++ b/PrebuiltApps
@@ -1 +1 @@
-Subproject commit b18ebf42af0132a71256f04189675e8b62ba4537
+Subproject commit bf165e7ae17023a0f732471cc674e1676f64346d
diff --git a/Scripts/Common/Deblob.sh b/Scripts/Common/Deblob.sh
index 42beeb56..a91783b6 100644
--- a/Scripts/Common/Deblob.sh
+++ b/Scripts/Common/Deblob.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#DivestOS: A privacy oriented Android distribution
-#Copyright (c) 2017-2018 Divested Computing, Inc.
+#Copyright (c) 2017-2018 Divested Computing Group
#
#This program is free software: you can redistribute it and/or modify
#it under the terms of the GNU General Public License as published by
diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh
index b1b5cf9c..254aca50 100644
--- a/Scripts/Common/Functions.sh
+++ b/Scripts/Common/Functions.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#DivestOS: A privacy oriented Android distribution
-#Copyright (c) 2017-2018 Divested Computing, Inc.
+#Copyright (c) 2017-2018 Divested Computing Group
#
#This program is free software: you can redistribute it and/or modify
#it under the terms of the GNU General Public License as published by
diff --git a/Scripts/Common/Optimize.sh b/Scripts/Common/Optimize.sh
index 11792de0..5bd8d569 100644
--- a/Scripts/Common/Optimize.sh
+++ b/Scripts/Common/Optimize.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#DivestOS: A privacy oriented Android distribution
-#Copyright (c) 2017-2018 Divested Computing, Inc.
+#Copyright (c) 2017-2018 Divested Computing Group
#
#This program is free software: you can redistribute it and/or modify
#it under the terms of the GNU General Public License as published by
diff --git a/Scripts/Common/Overclock.sh b/Scripts/Common/Overclock.sh
index 3afef057..1ce5dd33 100644
--- a/Scripts/Common/Overclock.sh
+++ b/Scripts/Common/Overclock.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#DivestOS: A privacy oriented Android distribution
-#Copyright (c) 2017-2018 Divested Computing, Inc.
+#Copyright (c) 2017-2018 Divested Computing Group
#
#This program is free software: you can redistribute it and/or modify
#it under the terms of the GNU General Public License as published by
diff --git a/Scripts/Common/Patch_CVE.sh b/Scripts/Common/Patch_CVE.sh
index 451898ed..ae44d0fe 100644
--- a/Scripts/Common/Patch_CVE.sh
+++ b/Scripts/Common/Patch_CVE.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#DivestOS: A privacy oriented Android distribution
-#Copyright (c) 2017-2018 Divested Computing, Inc.
+#Copyright (c) 2017-2018 Divested Computing Group
#
#This program is free software: you can redistribute it and/or modify
#it under the terms of the GNU General Public License as published by
diff --git a/Scripts/Generate_Signing_Keys.sh b/Scripts/Generate_Signing_Keys.sh
index 6affd3af..39735534 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.org';
+#desc='/O=Divested Computing Group/CN=DivestOS/emailAddress=support@divestos.org';
desc='/O=Example/CN=ExampleOS/emailAddress=support@example.com';
type='rsa'; #Options: rsa, ec
diff --git a/Scripts/LineageOS-11.0/Defaults.sh b/Scripts/LineageOS-11.0/Defaults.sh
index d1e221e8..efe6fe91 100644
--- a/Scripts/LineageOS-11.0/Defaults.sh
+++ b/Scripts/LineageOS-11.0/Defaults.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#DivestOS: A privacy oriented Android distribution
-#Copyright (c) 2017-2018 Divested Computing, Inc.
+#Copyright (c) 2017-2018 Divested Computing Group
#
#This program is free software: you can redistribute it and/or modify
#it under the terms of the GNU General Public License as published by
diff --git a/Scripts/LineageOS-11.0/Functions.sh b/Scripts/LineageOS-11.0/Functions.sh
index fc11fffb..0a4696e6 100644
--- a/Scripts/LineageOS-11.0/Functions.sh
+++ b/Scripts/LineageOS-11.0/Functions.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#DivestOS: A privacy oriented Android distribution
-#Copyright (c) 2017-2018 Divested Computing, Inc.
+#Copyright (c) 2017-2018 Divested Computing Group
#
#This program is free software: you can redistribute it and/or modify
#it under the terms of the GNU General Public License as published by
diff --git a/Scripts/LineageOS-11.0/Patch.sh b/Scripts/LineageOS-11.0/Patch.sh
index 32c93a55..2e755736 100644
--- a/Scripts/LineageOS-11.0/Patch.sh
+++ b/Scripts/LineageOS-11.0/Patch.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#DivestOS: A privacy oriented Android distribution
-#Copyright (c) 2015-2018 Divested Computing, Inc.
+#Copyright (c) 2015-2018 Divested Computing Group
#
#This program is free software: you can redistribute it and/or modify
#it under the terms of the GNU General Public License as published by
diff --git a/Scripts/LineageOS-11.0/Rebrand.sh b/Scripts/LineageOS-11.0/Rebrand.sh
index 8ed733b9..9c2ed7a6 100644
--- a/Scripts/LineageOS-11.0/Rebrand.sh
+++ b/Scripts/LineageOS-11.0/Rebrand.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#DivestOS: A privacy oriented Android distribution
-#Copyright (c) 2017-2018 Divested Computing, Inc.
+#Copyright (c) 2017-2018 Divested Computing Group
#
#This program is free software: you can redistribute it and/or modify
#it under the terms of the GNU General Public License as published by
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_grouper.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_grouper.sh
index f82b8388..9bb83398 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_grouper.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_grouper.sh
@@ -59,8 +59,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13695/^4.12.9/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14106/^4.12/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14489/^4.13.2/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15265/^4.13/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15868/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15868/3.4/0003.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15868/3.4/0002.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15868/3.4/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16525/^4.13.8/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16526/^4.13.6/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16532/^4.13.11/0001.patch
diff --git a/Scripts/LineageOS-14.1/Defaults.sh b/Scripts/LineageOS-14.1/Defaults.sh
index 64024bdc..49f93762 100644
--- a/Scripts/LineageOS-14.1/Defaults.sh
+++ b/Scripts/LineageOS-14.1/Defaults.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#DivestOS: A privacy oriented Android distribution
-#Copyright (c) 2017-2018 Divested Computing, Inc.
+#Copyright (c) 2017-2018 Divested Computing Group
#
#This program is free software: you can redistribute it and/or modify
#it under the terms of the GNU General Public License as published by
diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh
index 0f352254..3d359b29 100644
--- a/Scripts/LineageOS-14.1/Functions.sh
+++ b/Scripts/LineageOS-14.1/Functions.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#DivestOS: A privacy oriented Android distribution
-#Copyright (c) 2017-2018 Divested Computing, Inc.
+#Copyright (c) 2017-2018 Divested Computing Group
#
#This program is free software: you can redistribute it and/or modify
#it under the terms of the GNU General Public License as published by
diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh
index 484c6fbc..27da480c 100644
--- a/Scripts/LineageOS-14.1/Patch.sh
+++ b/Scripts/LineageOS-14.1/Patch.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#DivestOS: A privacy oriented Android distribution
-#Copyright (c) 2015-2018 Divested Computing, Inc.
+#Copyright (c) 2015-2018 Divested Computing Group
#
#This program is free software: you can redistribute it and/or modify
#it under the terms of the GNU General Public License as published by
diff --git a/Scripts/LineageOS-14.1/Rebrand.sh b/Scripts/LineageOS-14.1/Rebrand.sh
index dc1f7dfe..cecc8d13 100644
--- a/Scripts/LineageOS-14.1/Rebrand.sh
+++ b/Scripts/LineageOS-14.1/Rebrand.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#DivestOS: A privacy oriented Android distribution
-#Copyright (c) 2017-2018 Divested Computing, Inc.
+#Copyright (c) 2017-2018 Divested Computing Group
#
#This program is free software: you can redistribute it and/or modify
#it under the terms of the GNU General Public License as published by
diff --git a/Scripts/LineageOS-14.1/Theme.sh b/Scripts/LineageOS-14.1/Theme.sh
index 581479b9..a9c1e9ea 100644
--- a/Scripts/LineageOS-14.1/Theme.sh
+++ b/Scripts/LineageOS-14.1/Theme.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#DivestOS: A privacy oriented Android distribution
-#Copyright (c) 2017-2018 Divested Computing, Inc.
+#Copyright (c) 2017-2018 Divested Computing Group
#
#This program is free software: you can redistribute it and/or modify
#it under the terms of the GNU General Public License as published by
diff --git a/Scripts/LineageOS-15.1/Defaults.sh b/Scripts/LineageOS-15.1/Defaults.sh
index a4370681..def1f6d4 100644
--- a/Scripts/LineageOS-15.1/Defaults.sh
+++ b/Scripts/LineageOS-15.1/Defaults.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#DivestOS: A privacy oriented Android distribution
-#Copyright (c) 2017-2018 Divested Computing, Inc.
+#Copyright (c) 2017-2018 Divested Computing Group
#
#This program is free software: you can redistribute it and/or modify
#it under the terms of the GNU General Public License as published by
diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh
index 2dce3617..3994924e 100644
--- a/Scripts/LineageOS-15.1/Functions.sh
+++ b/Scripts/LineageOS-15.1/Functions.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#DivestOS: A privacy oriented Android distribution
-#Copyright (c) 2017-2018 Divested Computing, Inc.
+#Copyright (c) 2017-2018 Divested Computing Group
#
#This program is free software: you can redistribute it and/or modify
#it under the terms of the GNU General Public License as published by
diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh
index 15233b4b..506f9a6e 100644
--- a/Scripts/LineageOS-15.1/Patch.sh
+++ b/Scripts/LineageOS-15.1/Patch.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#DivestOS: A privacy oriented Android distribution
-#Copyright (c) 2015-2018 Divested Computing, Inc.
+#Copyright (c) 2015-2018 Divested Computing Group
#
#This program is free software: you can redistribute it and/or modify
#it under the terms of the GNU General Public License as published by
diff --git a/Scripts/LineageOS-15.1/Rebrand.sh b/Scripts/LineageOS-15.1/Rebrand.sh
index 6633bf85..b51be511 100644
--- a/Scripts/LineageOS-15.1/Rebrand.sh
+++ b/Scripts/LineageOS-15.1/Rebrand.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#DivestOS: A privacy oriented Android distribution
-#Copyright (c) 2017-2018 Divested Computing, Inc.
+#Copyright (c) 2017-2018 Divested Computing Group
#
#This program is free software: you can redistribute it and/or modify
#it under the terms of the GNU General Public License as published by
diff --git a/Scripts/LineageOS-16.0/Defaults.sh b/Scripts/LineageOS-16.0/Defaults.sh
index 973cdcc5..5cbe9c98 100644
--- a/Scripts/LineageOS-16.0/Defaults.sh
+++ b/Scripts/LineageOS-16.0/Defaults.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#DivestOS: A privacy oriented Android distribution
-#Copyright (c) 2017-2018 Divested Computing, Inc.
+#Copyright (c) 2017-2018 Divested Computing Group
#
#This program is free software: you can redistribute it and/or modify
#it under the terms of the GNU General Public License as published by
diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh
index 6617c852..5a84cace 100644
--- a/Scripts/LineageOS-16.0/Functions.sh
+++ b/Scripts/LineageOS-16.0/Functions.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#DivestOS: A privacy oriented Android distribution
-#Copyright (c) 2017-2018 Divested Computing, Inc.
+#Copyright (c) 2017-2018 Divested Computing Group
#
#This program is free software: you can redistribute it and/or modify
#it under the terms of the GNU General Public License as published by
diff --git a/Scripts/LineageOS-16.0/Patch.sh b/Scripts/LineageOS-16.0/Patch.sh
index 16896588..2a62e3b0 100644
--- a/Scripts/LineageOS-16.0/Patch.sh
+++ b/Scripts/LineageOS-16.0/Patch.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#DivestOS: A privacy oriented Android distribution
-#Copyright (c) 2015-2018 Divested Computing, Inc.
+#Copyright (c) 2015-2018 Divested Computing Group
#
#This program is free software: you can redistribute it and/or modify
#it under the terms of the GNU General Public License as published by
diff --git a/Scripts/LineageOS-16.0/Rebrand.sh b/Scripts/LineageOS-16.0/Rebrand.sh
index a0310f2a..d77f79ff 100644
--- a/Scripts/LineageOS-16.0/Rebrand.sh
+++ b/Scripts/LineageOS-16.0/Rebrand.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#DivestOS: A privacy oriented Android distribution
-#Copyright (c) 2017-2018 Divested Computing, Inc.
+#Copyright (c) 2017-2018 Divested Computing Group
#
#This program is free software: you can redistribute it and/or modify
#it under the terms of the GNU General Public License as published by
diff --git a/Scripts/init.sh b/Scripts/init.sh
index ed53269f..2cb20f48 100644
--- a/Scripts/init.sh
+++ b/Scripts/init.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#DivestOS: A privacy oriented Android distribution
-#Copyright (c) 2017-2018 Divested Computing, Inc.
+#Copyright (c) 2017-2018 Divested Computing Group
#
#This program is free software: you can redistribute it and/or modify
#it under the terms of the GNU General Public License as published by