diff --git a/LICENSE b/LICENSE
index 0b2ceef1..0e360300 100644
--- a/LICENSE
+++ b/LICENSE
@@ -2,19 +2,19 @@ Below are the license mappings for all of the files found in this repository.
 All attempts have been made to ensure accuracy of the corresponding license files.
 If you've found an issue please file an issue or pull request.
 
-Manifests - GPLv3
-Misc - GPLv3
+Manifests - GPL-3.0-or-later
+Misc - GPL-3.0-or-later
 Patches/
 	Common/
-		android_vendor_divested - GPLv3
+		android_vendor_divested - GPL-3.0-or-later
 			default_wallpaper.png - Unsplash, Pawel Czerwinski
 		[Everything Else] - Apache-2.0
 	LineageOS-*/
-		android_kernel_* - GPLv2
+		android_kernel_* - GPL-2.0-only
 		[Everything Else] - Apache-2.0
-	Linux - See COPYING included (GPLv2)
+	Linux - See COPYING included (GPL-2.0-only)
 	Wallpapers - See LICENSE included (Unsplash)
 PrebuiltApps - See LICENSE included
-Scripts - GPLv3
+Scripts - GPL-3.0-or-later
 
 Please see the included LICENSE.* files for the corresponding full license texts.
diff --git a/LICENSE.GPLv3 b/LICENSE.GPL-3.0
similarity index 100%
rename from LICENSE.GPLv3
rename to LICENSE.GPL-3.0
diff --git a/Patches/Wallpapers b/Patches/Wallpapers
index 82a4cdbd..966f20f7 160000
--- a/Patches/Wallpapers
+++ b/Patches/Wallpapers
@@ -1 +1 @@
-Subproject commit 82a4cdbd09fc7d89ee22bac327d659b85d2f7d57
+Subproject commit 966f20f711b25309db5ece4857cd0a4420de2485
diff --git a/PrebuiltApps b/PrebuiltApps
index 6183cf4a..3a4541a5 160000
--- a/PrebuiltApps
+++ b/PrebuiltApps
@@ -1 +1 @@
-Subproject commit 6183cf4a11067b39d856e6e6701deb2a9d53e314
+Subproject commit 3a4541a5c58cbe3a031c7eea09cd186d6fe5ac02