diff --git a/.gitmodules b/.gitmodules
index 71e6aba..4190240 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,24 +1,9 @@
-[submodule "Tweaks/YTUHD"]
-	path = Tweaks/YTUHD
-	url = https://github.com/arichornloverALT/YTUHD.git
-[submodule "Tweaks/YouPiP"]
-	path = Tweaks/YouPiP
-	url = https://github.com/Balackburn/YouPiP.git
-[submodule "Tweaks/Return-YouTube-Dislikes"]
-	path = Tweaks/Return-YouTube-Dislikes
-	url = https://github.com/Balackburn/Return-YouTube-Dislikes.git
 [submodule "Tweaks/Alderis"]
 	path = Tweaks/Alderis
 	url = https://github.com/hbang/Alderis.git
 [submodule "Tweaks/PSHeader"]
 	path = Tweaks/PSHeader
 	url = https://github.com/PoomSmart/PSHeader.git
-[submodule "Tweaks/YTABConfig"]
-	path = Tweaks/YTABConfig
-	url = https://github.com/Balackburn/YTABConfig.git
-[submodule "Tweaks/YouMute"]
-	path = Tweaks/YouMute
-	url = https://github.com/arichornloverALT/YouMute.git
 [submodule "Tweaks/FLEX"]
 	path = Tweaks/FLEX
 	url = https://github.com/qnblackcat/FLEX-Classes.git
@@ -37,15 +22,30 @@
 [submodule "Tweaks/YTVideoOverlay"]
 	path = Tweaks/YTVideoOverlay
 	url = https://github.com/arichornloverALT/YTVideoOverlay.git
-[submodule "Tweaks/YouQuality"]
-	path = Tweaks/YouQuality
-	url = https://github.com/Balackburn/YouQuality.git
 [submodule "Tweaks/protobuf"]
 	path = Tweaks/protobuf
 	url = https://github.com/protocolbuffers/protobuf.git
-[submodule "Tweaks/YouGroupSettings"]
-	path = Tweaks/YouGroupSettings
-	url = https://github.com/arichornloverALT/YouGroupSettings.git
 [submodule "Tweaks/YouTubeHeader"]
 	path = Tweaks/YouTubeHeader
 	url = https://github.com/PoomSmart/YouTubeHeader.git
+[submodule "Tweaks/YouPiP"]
+	path = Tweaks/YouPiP
+	url = https://github.com/PoomSmart/YouPiP
+[submodule "Tweaks/YTABConfig"]
+	path = Tweaks/YTABConfig
+	url = https://github.com/PoomSmart/YTABConfig
+[submodule "Tweaks/YTUHD"]
+	path = Tweaks/YTUHD
+	url = https://github.com/PoomSmart/YTUHD
+[submodule "Tweaks/YouGroupSettings"]
+	path = Tweaks/YouGroupSettings
+	url = https://github.com/PoomSmart/YouGroupSettings
+[submodule "Tweaks/YouMute"]
+	path = Tweaks/YouMute
+	url = https://github.com/PoomSmart/YouMute
+[submodule "Tweaks/YouQuality"]
+	path = Tweaks/YouQuality
+	url = https://github.com/PoomSmart/YouQuality
+[submodule "Tweaks/Return-YouTube-Dislikes"]
+	path = Tweaks/Return-YouTube-Dislikes
+	url = https://github.com/arichornloverALT/Return-YouTube-Dislikes.git
diff --git a/Makefile b/Makefile
index e8a36be..86f79c3 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,9 @@ BUNDLE_ID = com.google.ios.youtube
 
 EXTRA_CFLAGS := $(addprefix -I,$(shell find Tweaks/FLEX -name '*.h' -exec dirname {} \;)) -I$(THEOS_PROJECT_DIR)/Tweaks
 
+# Allow YouTubeHeader to be accessible using #include <...>
+export ADDITIONAL_CFLAGS = -I$(THEOS_PROJECT_DIR)/Tweaks
+
 YTLitePlus_INJECT_DYLIBS = Tweaks/YTLite/var/jb/Library/MobileSubstrate/DynamicLibraries/YTLite.dylib .theos/obj/libcolorpicker.dylib .theos/obj/iSponsorBlock.dylib .theos/obj/YTUHD.dylib .theos/obj/YouPiP.dylib .theos/obj/YouTubeDislikesReturn.dylib .theos/obj/YTABConfig.dylib .theos/obj/YouMute.dylib .theos/obj/DontEatMyContent.dylib .theos/obj/YTHoldForSpeed.dylib .theos/obj/YTVideoOverlay.dylib .theos/obj/YouGroupSettings.dylib .theos/obj/YouQuality.dylib
 YTLitePlus_FILES = YTLitePlus.xm $(shell find Source -name '*.xm' -o -name '*.x' -o -name '*.m') $(shell find Tweaks/FLEX -type f \( -iname \*.c -o -iname \*.m -o -iname \*.mm \))
 YTLitePlus_IPA = ./tmp/Payload/YouTube.app
diff --git a/Tweaks/Return-YouTube-Dislikes b/Tweaks/Return-YouTube-Dislikes
index 7f9848c..d5f62ae 160000
--- a/Tweaks/Return-YouTube-Dislikes
+++ b/Tweaks/Return-YouTube-Dislikes
@@ -1 +1 @@
-Subproject commit 7f9848cd482cc274050e329b745aba619df1789f
+Subproject commit d5f62ae296fafec2fa58f92e31ac4f3afb37f358
diff --git a/Tweaks/YTABConfig b/Tweaks/YTABConfig
index a0a4998..0731dec 160000
--- a/Tweaks/YTABConfig
+++ b/Tweaks/YTABConfig
@@ -1 +1 @@
-Subproject commit a0a499818041feb274b3f81e0403e3ee334938d6
+Subproject commit 0731dec58e018485f169660699caae19a4a290ad
diff --git a/Tweaks/YTUHD b/Tweaks/YTUHD
index 12b4991..54b8acf 160000
--- a/Tweaks/YTUHD
+++ b/Tweaks/YTUHD
@@ -1 +1 @@
-Subproject commit 12b4991ade6d3edd1e4fb28fe19bb32b6dc93206
+Subproject commit 54b8acfd7862cbc204e52f519ed0c17930025c41
diff --git a/Tweaks/YouGroupSettings b/Tweaks/YouGroupSettings
index 5124008..e8a53da 160000
--- a/Tweaks/YouGroupSettings
+++ b/Tweaks/YouGroupSettings
@@ -1 +1 @@
-Subproject commit 5124008ae0902c7a5d48fb10fce74f43545d5df7
+Subproject commit e8a53da0af88ea93427603ca7fd26e1d469cf4d2
diff --git a/Tweaks/YouMute b/Tweaks/YouMute
index 6bb2792..eeace62 160000
--- a/Tweaks/YouMute
+++ b/Tweaks/YouMute
@@ -1 +1 @@
-Subproject commit 6bb27928a6ade1be90a0516f8da363092c3c7b57
+Subproject commit eeace62782bb5e55b5c675ffc4491eecf1673889
diff --git a/Tweaks/YouPiP b/Tweaks/YouPiP
index 23f6ca2..da1e64a 160000
--- a/Tweaks/YouPiP
+++ b/Tweaks/YouPiP
@@ -1 +1 @@
-Subproject commit 23f6ca2f949130f6c570b9f85160021bb9bda73d
+Subproject commit da1e64a037368ac944c356834a7c7727a76e110e
diff --git a/Tweaks/YouQuality b/Tweaks/YouQuality
index 9a6b36a..5b571fd 160000
--- a/Tweaks/YouQuality
+++ b/Tweaks/YouQuality
@@ -1 +1 @@
-Subproject commit 9a6b36aaa09b4191d084e4fcec1f0e5467b1c741
+Subproject commit 5b571fd76ccf4ea5e89cc99e87062cd89713997f