diff --git a/Dockerfile b/Dockerfile
index 397063c..f62451f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,9 +17,6 @@ RUN mkdir ${CTC_FOLDER}
 RUN mkdir ${CTC_FOLDER}/tools
 RUN wget -O ${CTC_FOLDER}/tools/apktool.jar https://f001.backblazeb2.com/file/avepub/apktool-cli-all.jar
 
-# Grab xml-patch (https://github.com/dnault/xml-patch)
-RUN wget -O ${CTC_FOLDER}/tools/xml-patch.jar https://jcenter.bintray.com/com/github/dnault/xml-patch/0.3.1/xml-patch-0.3.1.jar
-
 # Grab emoji sets
 ENV EMOJI_PATH=${CTC_FOLDER}/emojis
 ENV EMOJI_MUTANT_PATH=${EMOJI_PATH}/mutant
@@ -52,10 +49,14 @@ RUN keytool -genkey -alias test \
     -dname "CN=Test, OU=Test, O=Test, L=Test, S=Test, C=Test" \
     -storepass password -keypass password
 
+# Git will moan about this otherwise..
+RUN git config pull.rebase false
+
 # Make folder for git repo
 RUN mkdir ${CTC_FOLDER}/gitrepo
 WORKDIR ${CTC_FOLDER}/gitrepo
 
+
 # paths in ctcconfig in docker
 # container							fs
 # /opt/ctc/gitrepo					
diff --git a/resources/old-patches/README.md b/resources/old-patches/README.md
index fcffff3..0723a0e 100644
--- a/resources/old-patches/README.md
+++ b/resources/old-patches/README.md
@@ -11,6 +11,3 @@ Here's why these patches are no longer maintained in this form:
 - customdefaultemoji: There doesn't seem to be default emojis anymore?
 - noprofilestrip: UI changes removed the profile strip.
 - nonearby: Didn't add much anyways.
-- squareavatars: Moved to xml-patchs
-- betterrotation: Moved to xml-patchs
-- noblocked: Moved to xml-patchs
\ No newline at end of file
diff --git a/resources/patches/.gitignore b/resources/patches/.gitignore
deleted file mode 100644
index 43911a1..0000000
--- a/resources/patches/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*/*-custom.patch
-
diff --git a/resources/old-patches/betterrotation/1340.patch b/resources/patches/betterrotation/1340.patch
similarity index 100%
rename from resources/old-patches/betterrotation/1340.patch
rename to resources/patches/betterrotation/1340.patch
diff --git a/resources/old-patches/betterrotation/1355.patch b/resources/patches/betterrotation/1355.patch
similarity index 100%
rename from resources/old-patches/betterrotation/1355.patch
rename to resources/patches/betterrotation/1355.patch
diff --git a/resources/old-patches/betterrotation/1356.patch b/resources/patches/betterrotation/1356.patch
similarity index 100%
rename from resources/old-patches/betterrotation/1356.patch
rename to resources/patches/betterrotation/1356.patch
diff --git a/resources/old-patches/betterrotation/1358.patch b/resources/patches/betterrotation/1358.patch
similarity index 100%
rename from resources/old-patches/betterrotation/1358.patch
rename to resources/patches/betterrotation/1358.patch
diff --git a/resources/old-patches/betterrotation/1361.patch b/resources/patches/betterrotation/1361.patch
similarity index 100%
rename from resources/old-patches/betterrotation/1361.patch
rename to resources/patches/betterrotation/1361.patch
diff --git a/resources/old-patches/betterrotation/1362.patch b/resources/patches/betterrotation/1362.patch
similarity index 100%
rename from resources/old-patches/betterrotation/1362.patch
rename to resources/patches/betterrotation/1362.patch
diff --git a/resources/old-patches/betterrotation/1365.patch b/resources/patches/betterrotation/1365.patch
similarity index 100%
rename from resources/old-patches/betterrotation/1365.patch
rename to resources/patches/betterrotation/1365.patch
diff --git a/resources/old-patches/betterrotation/1367.patch b/resources/patches/betterrotation/1367.patch
similarity index 100%
rename from resources/old-patches/betterrotation/1367.patch
rename to resources/patches/betterrotation/1367.patch
diff --git a/resources/old-patches/betterrotation/1368.patch b/resources/patches/betterrotation/1368.patch
similarity index 100%
rename from resources/old-patches/betterrotation/1368.patch
rename to resources/patches/betterrotation/1368.patch
diff --git a/resources/old-patches/betterrotation/1370.patch b/resources/patches/betterrotation/1370.patch
similarity index 100%
rename from resources/old-patches/betterrotation/1370.patch
rename to resources/patches/betterrotation/1370.patch
diff --git a/resources/old-patches/betterrotation/1371.patch b/resources/patches/betterrotation/1371.patch
similarity index 100%
rename from resources/old-patches/betterrotation/1371.patch
rename to resources/patches/betterrotation/1371.patch
diff --git a/resources/old-patches/betterrotation/78204.patch b/resources/patches/betterrotation/78204.patch
similarity index 100%
rename from resources/old-patches/betterrotation/78204.patch
rename to resources/patches/betterrotation/78204.patch
diff --git a/resources/old-patches/betterrotation/87202.patch b/resources/patches/betterrotation/87202.patch
similarity index 100%
rename from resources/old-patches/betterrotation/87202.patch
rename to resources/patches/betterrotation/87202.patch
diff --git a/resources/old-patches/betterrotation/README.md b/resources/patches/betterrotation/README.md
similarity index 100%
rename from resources/old-patches/betterrotation/README.md
rename to resources/patches/betterrotation/README.md
diff --git a/resources/patches/customtheme/87202.patch b/resources/patches/customtheme/87202.patch
deleted file mode 100644
index 675024a..0000000
--- a/resources/patches/customtheme/87202.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -crB from/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali to/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali
-*** from/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali	2020-12-13 04:52:13.078109887 +0000
---- to/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali	2020-12-13 04:52:26.076186978 +0000
-***************
-*** 82,88 ****
-      .line 3
-      iget-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1;->this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
-  
-!     const v1, 0x7f0602e0
-  
-      invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
-  
---- 82,88 ----
-      .line 3
-      iget-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1;->this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
-  
-!     const v1, 0x7f060024
-  
-      invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
-  
diff --git a/resources/patches/customversion/87202.patch b/resources/patches/customversion/87202.patch
index 2f68535..63c2890 100644
--- a/resources/patches/customversion/87202.patch
+++ b/resources/patches/customversion/87202.patch
@@ -14,6 +14,6 @@ diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali
 
       invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-!     const-string v1, " - 87.2 - Alpha (87202), with Cutthecord patches"
+!     const-string v1, " - 87.2 - Alpha (87202), With Cutthecord patches"
 
       invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
\ No newline at end of file
diff --git a/resources/old-patches/noblocked/1006.patch b/resources/patches/noblocked/1006.patch
similarity index 100%
rename from resources/old-patches/noblocked/1006.patch
rename to resources/patches/noblocked/1006.patch
diff --git a/resources/old-patches/noblocked/1007.patch b/resources/patches/noblocked/1007.patch
similarity index 100%
rename from resources/old-patches/noblocked/1007.patch
rename to resources/patches/noblocked/1007.patch
diff --git a/resources/old-patches/noblocked/1011.patch b/resources/patches/noblocked/1011.patch
similarity index 100%
rename from resources/old-patches/noblocked/1011.patch
rename to resources/patches/noblocked/1011.patch
diff --git a/resources/old-patches/noblocked/1012.patch b/resources/patches/noblocked/1012.patch
similarity index 100%
rename from resources/old-patches/noblocked/1012.patch
rename to resources/patches/noblocked/1012.patch
diff --git a/resources/old-patches/noblocked/1013.patch b/resources/patches/noblocked/1013.patch
similarity index 100%
rename from resources/old-patches/noblocked/1013.patch
rename to resources/patches/noblocked/1013.patch
diff --git a/resources/old-patches/noblocked/1015.patch b/resources/patches/noblocked/1015.patch
similarity index 100%
rename from resources/old-patches/noblocked/1015.patch
rename to resources/patches/noblocked/1015.patch
diff --git a/resources/old-patches/noblocked/1016.patch b/resources/patches/noblocked/1016.patch
similarity index 100%
rename from resources/old-patches/noblocked/1016.patch
rename to resources/patches/noblocked/1016.patch
diff --git a/resources/old-patches/noblocked/1019.patch b/resources/patches/noblocked/1019.patch
similarity index 100%
rename from resources/old-patches/noblocked/1019.patch
rename to resources/patches/noblocked/1019.patch
diff --git a/resources/old-patches/noblocked/1020.patch b/resources/patches/noblocked/1020.patch
similarity index 100%
rename from resources/old-patches/noblocked/1020.patch
rename to resources/patches/noblocked/1020.patch
diff --git a/resources/old-patches/noblocked/1021.patch b/resources/patches/noblocked/1021.patch
similarity index 100%
rename from resources/old-patches/noblocked/1021.patch
rename to resources/patches/noblocked/1021.patch
diff --git a/resources/old-patches/noblocked/1022.patch b/resources/patches/noblocked/1022.patch
similarity index 100%
rename from resources/old-patches/noblocked/1022.patch
rename to resources/patches/noblocked/1022.patch
diff --git a/resources/old-patches/noblocked/1023.patch b/resources/patches/noblocked/1023.patch
similarity index 100%
rename from resources/old-patches/noblocked/1023.patch
rename to resources/patches/noblocked/1023.patch
diff --git a/resources/old-patches/noblocked/1024.patch b/resources/patches/noblocked/1024.patch
similarity index 100%
rename from resources/old-patches/noblocked/1024.patch
rename to resources/patches/noblocked/1024.patch
diff --git a/resources/old-patches/noblocked/1025.patch b/resources/patches/noblocked/1025.patch
similarity index 100%
rename from resources/old-patches/noblocked/1025.patch
rename to resources/patches/noblocked/1025.patch
diff --git a/resources/old-patches/noblocked/1026.patch b/resources/patches/noblocked/1026.patch
similarity index 100%
rename from resources/old-patches/noblocked/1026.patch
rename to resources/patches/noblocked/1026.patch
diff --git a/resources/old-patches/noblocked/1029.patch b/resources/patches/noblocked/1029.patch
similarity index 100%
rename from resources/old-patches/noblocked/1029.patch
rename to resources/patches/noblocked/1029.patch
diff --git a/resources/old-patches/noblocked/1031.patch b/resources/patches/noblocked/1031.patch
similarity index 100%
rename from resources/old-patches/noblocked/1031.patch
rename to resources/patches/noblocked/1031.patch
diff --git a/resources/old-patches/noblocked/1032.patch b/resources/patches/noblocked/1032.patch
similarity index 100%
rename from resources/old-patches/noblocked/1032.patch
rename to resources/patches/noblocked/1032.patch
diff --git a/resources/old-patches/noblocked/1033.patch b/resources/patches/noblocked/1033.patch
similarity index 100%
rename from resources/old-patches/noblocked/1033.patch
rename to resources/patches/noblocked/1033.patch
diff --git a/resources/old-patches/noblocked/1036.patch b/resources/patches/noblocked/1036.patch
similarity index 100%
rename from resources/old-patches/noblocked/1036.patch
rename to resources/patches/noblocked/1036.patch
diff --git a/resources/old-patches/noblocked/1037.patch b/resources/patches/noblocked/1037.patch
similarity index 100%
rename from resources/old-patches/noblocked/1037.patch
rename to resources/patches/noblocked/1037.patch
diff --git a/resources/old-patches/noblocked/1040.patch b/resources/patches/noblocked/1040.patch
similarity index 100%
rename from resources/old-patches/noblocked/1040.patch
rename to resources/patches/noblocked/1040.patch
diff --git a/resources/old-patches/noblocked/1041.patch b/resources/patches/noblocked/1041.patch
similarity index 100%
rename from resources/old-patches/noblocked/1041.patch
rename to resources/patches/noblocked/1041.patch
diff --git a/resources/old-patches/noblocked/1045.patch b/resources/patches/noblocked/1045.patch
similarity index 100%
rename from resources/old-patches/noblocked/1045.patch
rename to resources/patches/noblocked/1045.patch
diff --git a/resources/old-patches/noblocked/1046.patch b/resources/patches/noblocked/1046.patch
similarity index 100%
rename from resources/old-patches/noblocked/1046.patch
rename to resources/patches/noblocked/1046.patch
diff --git a/resources/old-patches/noblocked/1047.patch b/resources/patches/noblocked/1047.patch
similarity index 100%
rename from resources/old-patches/noblocked/1047.patch
rename to resources/patches/noblocked/1047.patch
diff --git a/resources/old-patches/noblocked/1049.patch b/resources/patches/noblocked/1049.patch
similarity index 100%
rename from resources/old-patches/noblocked/1049.patch
rename to resources/patches/noblocked/1049.patch
diff --git a/resources/old-patches/noblocked/1052.patch b/resources/patches/noblocked/1052.patch
similarity index 100%
rename from resources/old-patches/noblocked/1052.patch
rename to resources/patches/noblocked/1052.patch
diff --git a/resources/old-patches/noblocked/1053.patch b/resources/patches/noblocked/1053.patch
similarity index 100%
rename from resources/old-patches/noblocked/1053.patch
rename to resources/patches/noblocked/1053.patch
diff --git a/resources/old-patches/noblocked/1054.patch b/resources/patches/noblocked/1054.patch
similarity index 100%
rename from resources/old-patches/noblocked/1054.patch
rename to resources/patches/noblocked/1054.patch
diff --git a/resources/old-patches/noblocked/1056.patch b/resources/patches/noblocked/1056.patch
similarity index 100%
rename from resources/old-patches/noblocked/1056.patch
rename to resources/patches/noblocked/1056.patch
diff --git a/resources/old-patches/noblocked/1057.patch b/resources/patches/noblocked/1057.patch
similarity index 100%
rename from resources/old-patches/noblocked/1057.patch
rename to resources/patches/noblocked/1057.patch
diff --git a/resources/old-patches/noblocked/1062.patch b/resources/patches/noblocked/1062.patch
similarity index 100%
rename from resources/old-patches/noblocked/1062.patch
rename to resources/patches/noblocked/1062.patch
diff --git a/resources/old-patches/noblocked/1065.patch b/resources/patches/noblocked/1065.patch
similarity index 100%
rename from resources/old-patches/noblocked/1065.patch
rename to resources/patches/noblocked/1065.patch
diff --git a/resources/old-patches/noblocked/1066.patch b/resources/patches/noblocked/1066.patch
similarity index 100%
rename from resources/old-patches/noblocked/1066.patch
rename to resources/patches/noblocked/1066.patch
diff --git a/resources/old-patches/noblocked/1069.patch b/resources/patches/noblocked/1069.patch
similarity index 100%
rename from resources/old-patches/noblocked/1069.patch
rename to resources/patches/noblocked/1069.patch
diff --git a/resources/old-patches/noblocked/1073.patch b/resources/patches/noblocked/1073.patch
similarity index 100%
rename from resources/old-patches/noblocked/1073.patch
rename to resources/patches/noblocked/1073.patch
diff --git a/resources/old-patches/noblocked/1074.patch b/resources/patches/noblocked/1074.patch
similarity index 100%
rename from resources/old-patches/noblocked/1074.patch
rename to resources/patches/noblocked/1074.patch
diff --git a/resources/old-patches/noblocked/1078.patch b/resources/patches/noblocked/1078.patch
similarity index 100%
rename from resources/old-patches/noblocked/1078.patch
rename to resources/patches/noblocked/1078.patch
diff --git a/resources/old-patches/noblocked/1084.patch b/resources/patches/noblocked/1084.patch
similarity index 100%
rename from resources/old-patches/noblocked/1084.patch
rename to resources/patches/noblocked/1084.patch
diff --git a/resources/old-patches/noblocked/1085.patch b/resources/patches/noblocked/1085.patch
similarity index 100%
rename from resources/old-patches/noblocked/1085.patch
rename to resources/patches/noblocked/1085.patch
diff --git a/resources/old-patches/noblocked/1087.patch b/resources/patches/noblocked/1087.patch
similarity index 100%
rename from resources/old-patches/noblocked/1087.patch
rename to resources/patches/noblocked/1087.patch
diff --git a/resources/old-patches/noblocked/1091.patch b/resources/patches/noblocked/1091.patch
similarity index 100%
rename from resources/old-patches/noblocked/1091.patch
rename to resources/patches/noblocked/1091.patch
diff --git a/resources/old-patches/noblocked/1092.patch b/resources/patches/noblocked/1092.patch
similarity index 100%
rename from resources/old-patches/noblocked/1092.patch
rename to resources/patches/noblocked/1092.patch
diff --git a/resources/old-patches/noblocked/1100.patch b/resources/patches/noblocked/1100.patch
similarity index 100%
rename from resources/old-patches/noblocked/1100.patch
rename to resources/patches/noblocked/1100.patch
diff --git a/resources/old-patches/noblocked/1103.patch b/resources/patches/noblocked/1103.patch
similarity index 100%
rename from resources/old-patches/noblocked/1103.patch
rename to resources/patches/noblocked/1103.patch
diff --git a/resources/old-patches/noblocked/1104.patch b/resources/patches/noblocked/1104.patch
similarity index 100%
rename from resources/old-patches/noblocked/1104.patch
rename to resources/patches/noblocked/1104.patch
diff --git a/resources/old-patches/noblocked/1105.patch b/resources/patches/noblocked/1105.patch
similarity index 100%
rename from resources/old-patches/noblocked/1105.patch
rename to resources/patches/noblocked/1105.patch
diff --git a/resources/old-patches/noblocked/1107.patch b/resources/patches/noblocked/1107.patch
similarity index 100%
rename from resources/old-patches/noblocked/1107.patch
rename to resources/patches/noblocked/1107.patch
diff --git a/resources/old-patches/noblocked/1123.patch b/resources/patches/noblocked/1123.patch
similarity index 100%
rename from resources/old-patches/noblocked/1123.patch
rename to resources/patches/noblocked/1123.patch
diff --git a/resources/old-patches/noblocked/1132.patch b/resources/patches/noblocked/1132.patch
similarity index 100%
rename from resources/old-patches/noblocked/1132.patch
rename to resources/patches/noblocked/1132.patch
diff --git a/resources/old-patches/noblocked/1134.patch b/resources/patches/noblocked/1134.patch
similarity index 100%
rename from resources/old-patches/noblocked/1134.patch
rename to resources/patches/noblocked/1134.patch
diff --git a/resources/old-patches/noblocked/1144.patch b/resources/patches/noblocked/1144.patch
similarity index 100%
rename from resources/old-patches/noblocked/1144.patch
rename to resources/patches/noblocked/1144.patch
diff --git a/resources/old-patches/noblocked/1145.patch b/resources/patches/noblocked/1145.patch
similarity index 100%
rename from resources/old-patches/noblocked/1145.patch
rename to resources/patches/noblocked/1145.patch
diff --git a/resources/old-patches/noblocked/1146.patch b/resources/patches/noblocked/1146.patch
similarity index 100%
rename from resources/old-patches/noblocked/1146.patch
rename to resources/patches/noblocked/1146.patch
diff --git a/resources/old-patches/noblocked/1148.patch b/resources/patches/noblocked/1148.patch
similarity index 100%
rename from resources/old-patches/noblocked/1148.patch
rename to resources/patches/noblocked/1148.patch
diff --git a/resources/old-patches/noblocked/1150.patch b/resources/patches/noblocked/1150.patch
similarity index 100%
rename from resources/old-patches/noblocked/1150.patch
rename to resources/patches/noblocked/1150.patch
diff --git a/resources/old-patches/noblocked/1167.patch b/resources/patches/noblocked/1167.patch
similarity index 100%
rename from resources/old-patches/noblocked/1167.patch
rename to resources/patches/noblocked/1167.patch
diff --git a/resources/old-patches/noblocked/1169.patch b/resources/patches/noblocked/1169.patch
similarity index 100%
rename from resources/old-patches/noblocked/1169.patch
rename to resources/patches/noblocked/1169.patch
diff --git a/resources/old-patches/noblocked/1171.patch b/resources/patches/noblocked/1171.patch
similarity index 100%
rename from resources/old-patches/noblocked/1171.patch
rename to resources/patches/noblocked/1171.patch
diff --git a/resources/old-patches/noblocked/1180.patch b/resources/patches/noblocked/1180.patch
similarity index 100%
rename from resources/old-patches/noblocked/1180.patch
rename to resources/patches/noblocked/1180.patch
diff --git a/resources/old-patches/noblocked/1181.patch b/resources/patches/noblocked/1181.patch
similarity index 100%
rename from resources/old-patches/noblocked/1181.patch
rename to resources/patches/noblocked/1181.patch
diff --git a/resources/old-patches/noblocked/1192.patch b/resources/patches/noblocked/1192.patch
similarity index 100%
rename from resources/old-patches/noblocked/1192.patch
rename to resources/patches/noblocked/1192.patch
diff --git a/resources/old-patches/noblocked/1196.patch b/resources/patches/noblocked/1196.patch
similarity index 100%
rename from resources/old-patches/noblocked/1196.patch
rename to resources/patches/noblocked/1196.patch
diff --git a/resources/old-patches/noblocked/1200.patch b/resources/patches/noblocked/1200.patch
similarity index 100%
rename from resources/old-patches/noblocked/1200.patch
rename to resources/patches/noblocked/1200.patch
diff --git a/resources/old-patches/noblocked/1201.patch b/resources/patches/noblocked/1201.patch
similarity index 100%
rename from resources/old-patches/noblocked/1201.patch
rename to resources/patches/noblocked/1201.patch
diff --git a/resources/old-patches/noblocked/1208.patch b/resources/patches/noblocked/1208.patch
similarity index 100%
rename from resources/old-patches/noblocked/1208.patch
rename to resources/patches/noblocked/1208.patch
diff --git a/resources/old-patches/noblocked/1213.patch b/resources/patches/noblocked/1213.patch
similarity index 100%
rename from resources/old-patches/noblocked/1213.patch
rename to resources/patches/noblocked/1213.patch
diff --git a/resources/old-patches/noblocked/1216.patch b/resources/patches/noblocked/1216.patch
similarity index 100%
rename from resources/old-patches/noblocked/1216.patch
rename to resources/patches/noblocked/1216.patch
diff --git a/resources/old-patches/noblocked/1218.patch b/resources/patches/noblocked/1218.patch
similarity index 100%
rename from resources/old-patches/noblocked/1218.patch
rename to resources/patches/noblocked/1218.patch
diff --git a/resources/old-patches/noblocked/1223.patch b/resources/patches/noblocked/1223.patch
similarity index 100%
rename from resources/old-patches/noblocked/1223.patch
rename to resources/patches/noblocked/1223.patch
diff --git a/resources/old-patches/noblocked/1243.patch b/resources/patches/noblocked/1243.patch
similarity index 100%
rename from resources/old-patches/noblocked/1243.patch
rename to resources/patches/noblocked/1243.patch
diff --git a/resources/old-patches/noblocked/1246.patch b/resources/patches/noblocked/1246.patch
similarity index 100%
rename from resources/old-patches/noblocked/1246.patch
rename to resources/patches/noblocked/1246.patch
diff --git a/resources/old-patches/noblocked/1249.patch b/resources/patches/noblocked/1249.patch
similarity index 100%
rename from resources/old-patches/noblocked/1249.patch
rename to resources/patches/noblocked/1249.patch
diff --git a/resources/old-patches/noblocked/1251.patch b/resources/patches/noblocked/1251.patch
similarity index 100%
rename from resources/old-patches/noblocked/1251.patch
rename to resources/patches/noblocked/1251.patch
diff --git a/resources/old-patches/noblocked/1252.patch b/resources/patches/noblocked/1252.patch
similarity index 100%
rename from resources/old-patches/noblocked/1252.patch
rename to resources/patches/noblocked/1252.patch
diff --git a/resources/old-patches/noblocked/1259.patch b/resources/patches/noblocked/1259.patch
similarity index 100%
rename from resources/old-patches/noblocked/1259.patch
rename to resources/patches/noblocked/1259.patch
diff --git a/resources/old-patches/noblocked/1266.patch b/resources/patches/noblocked/1266.patch
similarity index 100%
rename from resources/old-patches/noblocked/1266.patch
rename to resources/patches/noblocked/1266.patch
diff --git a/resources/old-patches/noblocked/1270.patch b/resources/patches/noblocked/1270.patch
similarity index 100%
rename from resources/old-patches/noblocked/1270.patch
rename to resources/patches/noblocked/1270.patch
diff --git a/resources/old-patches/noblocked/1273.patch b/resources/patches/noblocked/1273.patch
similarity index 100%
rename from resources/old-patches/noblocked/1273.patch
rename to resources/patches/noblocked/1273.patch
diff --git a/resources/old-patches/noblocked/1279.patch b/resources/patches/noblocked/1279.patch
similarity index 100%
rename from resources/old-patches/noblocked/1279.patch
rename to resources/patches/noblocked/1279.patch
diff --git a/resources/old-patches/noblocked/1280.patch b/resources/patches/noblocked/1280.patch
similarity index 100%
rename from resources/old-patches/noblocked/1280.patch
rename to resources/patches/noblocked/1280.patch
diff --git a/resources/old-patches/noblocked/1281.patch b/resources/patches/noblocked/1281.patch
similarity index 100%
rename from resources/old-patches/noblocked/1281.patch
rename to resources/patches/noblocked/1281.patch
diff --git a/resources/old-patches/noblocked/1282.patch b/resources/patches/noblocked/1282.patch
similarity index 100%
rename from resources/old-patches/noblocked/1282.patch
rename to resources/patches/noblocked/1282.patch
diff --git a/resources/old-patches/noblocked/1284.patch b/resources/patches/noblocked/1284.patch
similarity index 100%
rename from resources/old-patches/noblocked/1284.patch
rename to resources/patches/noblocked/1284.patch
diff --git a/resources/old-patches/noblocked/1290.patch b/resources/patches/noblocked/1290.patch
similarity index 100%
rename from resources/old-patches/noblocked/1290.patch
rename to resources/patches/noblocked/1290.patch
diff --git a/resources/old-patches/noblocked/1294.patch b/resources/patches/noblocked/1294.patch
similarity index 100%
rename from resources/old-patches/noblocked/1294.patch
rename to resources/patches/noblocked/1294.patch
diff --git a/resources/old-patches/noblocked/1295.patch b/resources/patches/noblocked/1295.patch
similarity index 100%
rename from resources/old-patches/noblocked/1295.patch
rename to resources/patches/noblocked/1295.patch
diff --git a/resources/old-patches/noblocked/1298.patch b/resources/patches/noblocked/1298.patch
similarity index 100%
rename from resources/old-patches/noblocked/1298.patch
rename to resources/patches/noblocked/1298.patch
diff --git a/resources/old-patches/noblocked/1300.patch b/resources/patches/noblocked/1300.patch
similarity index 100%
rename from resources/old-patches/noblocked/1300.patch
rename to resources/patches/noblocked/1300.patch
diff --git a/resources/old-patches/noblocked/1301.patch b/resources/patches/noblocked/1301.patch
similarity index 100%
rename from resources/old-patches/noblocked/1301.patch
rename to resources/patches/noblocked/1301.patch
diff --git a/resources/old-patches/noblocked/1304.patch b/resources/patches/noblocked/1304.patch
similarity index 100%
rename from resources/old-patches/noblocked/1304.patch
rename to resources/patches/noblocked/1304.patch
diff --git a/resources/old-patches/noblocked/1306.patch b/resources/patches/noblocked/1306.patch
similarity index 100%
rename from resources/old-patches/noblocked/1306.patch
rename to resources/patches/noblocked/1306.patch
diff --git a/resources/old-patches/noblocked/1307.patch b/resources/patches/noblocked/1307.patch
similarity index 100%
rename from resources/old-patches/noblocked/1307.patch
rename to resources/patches/noblocked/1307.patch
diff --git a/resources/old-patches/noblocked/1310.patch b/resources/patches/noblocked/1310.patch
similarity index 100%
rename from resources/old-patches/noblocked/1310.patch
rename to resources/patches/noblocked/1310.patch
diff --git a/resources/old-patches/noblocked/1315.patch b/resources/patches/noblocked/1315.patch
similarity index 100%
rename from resources/old-patches/noblocked/1315.patch
rename to resources/patches/noblocked/1315.patch
diff --git a/resources/old-patches/noblocked/1318.patch b/resources/patches/noblocked/1318.patch
similarity index 100%
rename from resources/old-patches/noblocked/1318.patch
rename to resources/patches/noblocked/1318.patch
diff --git a/resources/old-patches/noblocked/1330.patch b/resources/patches/noblocked/1330.patch
similarity index 100%
rename from resources/old-patches/noblocked/1330.patch
rename to resources/patches/noblocked/1330.patch
diff --git a/resources/old-patches/noblocked/1334.patch b/resources/patches/noblocked/1334.patch
similarity index 100%
rename from resources/old-patches/noblocked/1334.patch
rename to resources/patches/noblocked/1334.patch
diff --git a/resources/old-patches/noblocked/1339.patch b/resources/patches/noblocked/1339.patch
similarity index 100%
rename from resources/old-patches/noblocked/1339.patch
rename to resources/patches/noblocked/1339.patch
diff --git a/resources/old-patches/noblocked/1340.patch b/resources/patches/noblocked/1340.patch
similarity index 100%
rename from resources/old-patches/noblocked/1340.patch
rename to resources/patches/noblocked/1340.patch
diff --git a/resources/old-patches/noblocked/1355.patch b/resources/patches/noblocked/1355.patch
similarity index 100%
rename from resources/old-patches/noblocked/1355.patch
rename to resources/patches/noblocked/1355.patch
diff --git a/resources/old-patches/noblocked/1356.patch b/resources/patches/noblocked/1356.patch
similarity index 100%
rename from resources/old-patches/noblocked/1356.patch
rename to resources/patches/noblocked/1356.patch
diff --git a/resources/old-patches/noblocked/1358.patch b/resources/patches/noblocked/1358.patch
similarity index 100%
rename from resources/old-patches/noblocked/1358.patch
rename to resources/patches/noblocked/1358.patch
diff --git a/resources/old-patches/noblocked/1361.patch b/resources/patches/noblocked/1361.patch
similarity index 100%
rename from resources/old-patches/noblocked/1361.patch
rename to resources/patches/noblocked/1361.patch
diff --git a/resources/old-patches/noblocked/1362.patch b/resources/patches/noblocked/1362.patch
similarity index 100%
rename from resources/old-patches/noblocked/1362.patch
rename to resources/patches/noblocked/1362.patch
diff --git a/resources/old-patches/noblocked/1365.patch b/resources/patches/noblocked/1365.patch
similarity index 100%
rename from resources/old-patches/noblocked/1365.patch
rename to resources/patches/noblocked/1365.patch
diff --git a/resources/old-patches/noblocked/1367.patch b/resources/patches/noblocked/1367.patch
similarity index 100%
rename from resources/old-patches/noblocked/1367.patch
rename to resources/patches/noblocked/1367.patch
diff --git a/resources/old-patches/noblocked/1368.patch b/resources/patches/noblocked/1368.patch
similarity index 100%
rename from resources/old-patches/noblocked/1368.patch
rename to resources/patches/noblocked/1368.patch
diff --git a/resources/old-patches/noblocked/1370.patch b/resources/patches/noblocked/1370.patch
similarity index 100%
rename from resources/old-patches/noblocked/1370.patch
rename to resources/patches/noblocked/1370.patch
diff --git a/resources/old-patches/noblocked/1371.patch b/resources/patches/noblocked/1371.patch
similarity index 100%
rename from resources/old-patches/noblocked/1371.patch
rename to resources/patches/noblocked/1371.patch
diff --git a/resources/old-patches/noblocked/78204.patch b/resources/patches/noblocked/78204.patch
similarity index 100%
rename from resources/old-patches/noblocked/78204.patch
rename to resources/patches/noblocked/78204.patch
diff --git a/resources/old-patches/noblocked/835.patch b/resources/patches/noblocked/835.patch
similarity index 100%
rename from resources/old-patches/noblocked/835.patch
rename to resources/patches/noblocked/835.patch
diff --git a/resources/old-patches/noblocked/836.patch b/resources/patches/noblocked/836.patch
similarity index 100%
rename from resources/old-patches/noblocked/836.patch
rename to resources/patches/noblocked/836.patch
diff --git a/resources/old-patches/noblocked/839.patch b/resources/patches/noblocked/839.patch
similarity index 100%
rename from resources/old-patches/noblocked/839.patch
rename to resources/patches/noblocked/839.patch
diff --git a/resources/old-patches/noblocked/841.patch b/resources/patches/noblocked/841.patch
similarity index 100%
rename from resources/old-patches/noblocked/841.patch
rename to resources/patches/noblocked/841.patch
diff --git a/resources/old-patches/noblocked/842.patch b/resources/patches/noblocked/842.patch
similarity index 100%
rename from resources/old-patches/noblocked/842.patch
rename to resources/patches/noblocked/842.patch
diff --git a/resources/old-patches/noblocked/843.patch b/resources/patches/noblocked/843.patch
similarity index 100%
rename from resources/old-patches/noblocked/843.patch
rename to resources/patches/noblocked/843.patch
diff --git a/resources/old-patches/noblocked/844.patch b/resources/patches/noblocked/844.patch
similarity index 100%
rename from resources/old-patches/noblocked/844.patch
rename to resources/patches/noblocked/844.patch
diff --git a/resources/old-patches/noblocked/845.patch b/resources/patches/noblocked/845.patch
similarity index 100%
rename from resources/old-patches/noblocked/845.patch
rename to resources/patches/noblocked/845.patch
diff --git a/resources/old-patches/noblocked/848.patch b/resources/patches/noblocked/848.patch
similarity index 100%
rename from resources/old-patches/noblocked/848.patch
rename to resources/patches/noblocked/848.patch
diff --git a/resources/old-patches/noblocked/850.patch b/resources/patches/noblocked/850.patch
similarity index 100%
rename from resources/old-patches/noblocked/850.patch
rename to resources/patches/noblocked/850.patch
diff --git a/resources/old-patches/noblocked/851.patch b/resources/patches/noblocked/851.patch
similarity index 100%
rename from resources/old-patches/noblocked/851.patch
rename to resources/patches/noblocked/851.patch
diff --git a/resources/old-patches/noblocked/853.patch b/resources/patches/noblocked/853.patch
similarity index 100%
rename from resources/old-patches/noblocked/853.patch
rename to resources/patches/noblocked/853.patch
diff --git a/resources/old-patches/noblocked/854.patch b/resources/patches/noblocked/854.patch
similarity index 100%
rename from resources/old-patches/noblocked/854.patch
rename to resources/patches/noblocked/854.patch
diff --git a/resources/old-patches/noblocked/855.patch b/resources/patches/noblocked/855.patch
similarity index 100%
rename from resources/old-patches/noblocked/855.patch
rename to resources/patches/noblocked/855.patch
diff --git a/resources/old-patches/noblocked/856.patch b/resources/patches/noblocked/856.patch
similarity index 100%
rename from resources/old-patches/noblocked/856.patch
rename to resources/patches/noblocked/856.patch
diff --git a/resources/old-patches/noblocked/87202.patch b/resources/patches/noblocked/87202.patch
similarity index 100%
rename from resources/old-patches/noblocked/87202.patch
rename to resources/patches/noblocked/87202.patch
diff --git a/resources/old-patches/noblocked/876.patch b/resources/patches/noblocked/876.patch
similarity index 100%
rename from resources/old-patches/noblocked/876.patch
rename to resources/patches/noblocked/876.patch
diff --git a/resources/old-patches/noblocked/884.patch b/resources/patches/noblocked/884.patch
similarity index 100%
rename from resources/old-patches/noblocked/884.patch
rename to resources/patches/noblocked/884.patch
diff --git a/resources/old-patches/noblocked/888.patch b/resources/patches/noblocked/888.patch
similarity index 100%
rename from resources/old-patches/noblocked/888.patch
rename to resources/patches/noblocked/888.patch
diff --git a/resources/old-patches/noblocked/896.patch b/resources/patches/noblocked/896.patch
similarity index 100%
rename from resources/old-patches/noblocked/896.patch
rename to resources/patches/noblocked/896.patch
diff --git a/resources/old-patches/noblocked/897.patch b/resources/patches/noblocked/897.patch
similarity index 100%
rename from resources/old-patches/noblocked/897.patch
rename to resources/patches/noblocked/897.patch
diff --git a/resources/old-patches/noblocked/898.patch b/resources/patches/noblocked/898.patch
similarity index 100%
rename from resources/old-patches/noblocked/898.patch
rename to resources/patches/noblocked/898.patch
diff --git a/resources/old-patches/noblocked/899.patch b/resources/patches/noblocked/899.patch
similarity index 100%
rename from resources/old-patches/noblocked/899.patch
rename to resources/patches/noblocked/899.patch
diff --git a/resources/old-patches/noblocked/900.patch b/resources/patches/noblocked/900.patch
similarity index 100%
rename from resources/old-patches/noblocked/900.patch
rename to resources/patches/noblocked/900.patch
diff --git a/resources/old-patches/noblocked/901.patch b/resources/patches/noblocked/901.patch
similarity index 100%
rename from resources/old-patches/noblocked/901.patch
rename to resources/patches/noblocked/901.patch
diff --git a/resources/old-patches/noblocked/902.patch b/resources/patches/noblocked/902.patch
similarity index 100%
rename from resources/old-patches/noblocked/902.patch
rename to resources/patches/noblocked/902.patch
diff --git a/resources/old-patches/noblocked/903.patch b/resources/patches/noblocked/903.patch
similarity index 100%
rename from resources/old-patches/noblocked/903.patch
rename to resources/patches/noblocked/903.patch
diff --git a/resources/old-patches/noblocked/904.patch b/resources/patches/noblocked/904.patch
similarity index 100%
rename from resources/old-patches/noblocked/904.patch
rename to resources/patches/noblocked/904.patch
diff --git a/resources/old-patches/noblocked/906.patch b/resources/patches/noblocked/906.patch
similarity index 100%
rename from resources/old-patches/noblocked/906.patch
rename to resources/patches/noblocked/906.patch
diff --git a/resources/old-patches/noblocked/909.patch b/resources/patches/noblocked/909.patch
similarity index 100%
rename from resources/old-patches/noblocked/909.patch
rename to resources/patches/noblocked/909.patch
diff --git a/resources/old-patches/noblocked/910.patch b/resources/patches/noblocked/910.patch
similarity index 100%
rename from resources/old-patches/noblocked/910.patch
rename to resources/patches/noblocked/910.patch
diff --git a/resources/old-patches/noblocked/938.patch b/resources/patches/noblocked/938.patch
similarity index 100%
rename from resources/old-patches/noblocked/938.patch
rename to resources/patches/noblocked/938.patch
diff --git a/resources/old-patches/noblocked/939.patch b/resources/patches/noblocked/939.patch
similarity index 100%
rename from resources/old-patches/noblocked/939.patch
rename to resources/patches/noblocked/939.patch
diff --git a/resources/old-patches/noblocked/940.patch b/resources/patches/noblocked/940.patch
similarity index 100%
rename from resources/old-patches/noblocked/940.patch
rename to resources/patches/noblocked/940.patch
diff --git a/resources/old-patches/noblocked/942.patch b/resources/patches/noblocked/942.patch
similarity index 100%
rename from resources/old-patches/noblocked/942.patch
rename to resources/patches/noblocked/942.patch
diff --git a/resources/old-patches/noblocked/943.patch b/resources/patches/noblocked/943.patch
similarity index 100%
rename from resources/old-patches/noblocked/943.patch
rename to resources/patches/noblocked/943.patch
diff --git a/resources/old-patches/noblocked/945.patch b/resources/patches/noblocked/945.patch
similarity index 100%
rename from resources/old-patches/noblocked/945.patch
rename to resources/patches/noblocked/945.patch
diff --git a/resources/old-patches/noblocked/946.patch b/resources/patches/noblocked/946.patch
similarity index 100%
rename from resources/old-patches/noblocked/946.patch
rename to resources/patches/noblocked/946.patch
diff --git a/resources/old-patches/noblocked/947.patch b/resources/patches/noblocked/947.patch
similarity index 100%
rename from resources/old-patches/noblocked/947.patch
rename to resources/patches/noblocked/947.patch
diff --git a/resources/old-patches/noblocked/948.patch b/resources/patches/noblocked/948.patch
similarity index 100%
rename from resources/old-patches/noblocked/948.patch
rename to resources/patches/noblocked/948.patch
diff --git a/resources/old-patches/noblocked/963.patch b/resources/patches/noblocked/963.patch
similarity index 100%
rename from resources/old-patches/noblocked/963.patch
rename to resources/patches/noblocked/963.patch
diff --git a/resources/old-patches/noblocked/964.patch b/resources/patches/noblocked/964.patch
similarity index 100%
rename from resources/old-patches/noblocked/964.patch
rename to resources/patches/noblocked/964.patch
diff --git a/resources/old-patches/noblocked/965.patch b/resources/patches/noblocked/965.patch
similarity index 100%
rename from resources/old-patches/noblocked/965.patch
rename to resources/patches/noblocked/965.patch
diff --git a/resources/old-patches/noblocked/966.patch b/resources/patches/noblocked/966.patch
similarity index 100%
rename from resources/old-patches/noblocked/966.patch
rename to resources/patches/noblocked/966.patch
diff --git a/resources/old-patches/noblocked/967.patch b/resources/patches/noblocked/967.patch
similarity index 100%
rename from resources/old-patches/noblocked/967.patch
rename to resources/patches/noblocked/967.patch
diff --git a/resources/old-patches/noblocked/968.patch b/resources/patches/noblocked/968.patch
similarity index 100%
rename from resources/old-patches/noblocked/968.patch
rename to resources/patches/noblocked/968.patch
diff --git a/resources/old-patches/noblocked/970.patch b/resources/patches/noblocked/970.patch
similarity index 100%
rename from resources/old-patches/noblocked/970.patch
rename to resources/patches/noblocked/970.patch
diff --git a/resources/old-patches/noblocked/980.patch b/resources/patches/noblocked/980.patch
similarity index 100%
rename from resources/old-patches/noblocked/980.patch
rename to resources/patches/noblocked/980.patch
diff --git a/resources/old-patches/noblocked/984.patch b/resources/patches/noblocked/984.patch
similarity index 100%
rename from resources/old-patches/noblocked/984.patch
rename to resources/patches/noblocked/984.patch
diff --git a/resources/old-patches/noblocked/986.patch b/resources/patches/noblocked/986.patch
similarity index 100%
rename from resources/old-patches/noblocked/986.patch
rename to resources/patches/noblocked/986.patch
diff --git a/resources/old-patches/noblocked/991.patch b/resources/patches/noblocked/991.patch
similarity index 100%
rename from resources/old-patches/noblocked/991.patch
rename to resources/patches/noblocked/991.patch
diff --git a/resources/old-patches/noblocked/992.patch b/resources/patches/noblocked/992.patch
similarity index 100%
rename from resources/old-patches/noblocked/992.patch
rename to resources/patches/noblocked/992.patch
diff --git a/resources/old-patches/noblocked/993.patch b/resources/patches/noblocked/993.patch
similarity index 100%
rename from resources/old-patches/noblocked/993.patch
rename to resources/patches/noblocked/993.patch
diff --git a/resources/old-patches/noblocked/994.patch b/resources/patches/noblocked/994.patch
similarity index 100%
rename from resources/old-patches/noblocked/994.patch
rename to resources/patches/noblocked/994.patch
diff --git a/resources/old-patches/noblocked/996.patch b/resources/patches/noblocked/996.patch
similarity index 100%
rename from resources/old-patches/noblocked/996.patch
rename to resources/patches/noblocked/996.patch
diff --git a/resources/old-patches/noblocked/README.md b/resources/patches/noblocked/README.md
similarity index 100%
rename from resources/old-patches/noblocked/README.md
rename to resources/patches/noblocked/README.md
diff --git a/resources/old-patches/squareavatars/1006.patch b/resources/patches/squareavatars/1006.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1006.patch
rename to resources/patches/squareavatars/1006.patch
diff --git a/resources/old-patches/squareavatars/1007.patch b/resources/patches/squareavatars/1007.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1007.patch
rename to resources/patches/squareavatars/1007.patch
diff --git a/resources/old-patches/squareavatars/1011.patch b/resources/patches/squareavatars/1011.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1011.patch
rename to resources/patches/squareavatars/1011.patch
diff --git a/resources/old-patches/squareavatars/1012.patch b/resources/patches/squareavatars/1012.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1012.patch
rename to resources/patches/squareavatars/1012.patch
diff --git a/resources/old-patches/squareavatars/1013.patch b/resources/patches/squareavatars/1013.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1013.patch
rename to resources/patches/squareavatars/1013.patch
diff --git a/resources/old-patches/squareavatars/1015.patch b/resources/patches/squareavatars/1015.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1015.patch
rename to resources/patches/squareavatars/1015.patch
diff --git a/resources/old-patches/squareavatars/1016.patch b/resources/patches/squareavatars/1016.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1016.patch
rename to resources/patches/squareavatars/1016.patch
diff --git a/resources/old-patches/squareavatars/1019.patch b/resources/patches/squareavatars/1019.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1019.patch
rename to resources/patches/squareavatars/1019.patch
diff --git a/resources/old-patches/squareavatars/1020.patch b/resources/patches/squareavatars/1020.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1020.patch
rename to resources/patches/squareavatars/1020.patch
diff --git a/resources/old-patches/squareavatars/1021.patch b/resources/patches/squareavatars/1021.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1021.patch
rename to resources/patches/squareavatars/1021.patch
diff --git a/resources/old-patches/squareavatars/1022.patch b/resources/patches/squareavatars/1022.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1022.patch
rename to resources/patches/squareavatars/1022.patch
diff --git a/resources/old-patches/squareavatars/1023.patch b/resources/patches/squareavatars/1023.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1023.patch
rename to resources/patches/squareavatars/1023.patch
diff --git a/resources/old-patches/squareavatars/1024.patch b/resources/patches/squareavatars/1024.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1024.patch
rename to resources/patches/squareavatars/1024.patch
diff --git a/resources/old-patches/squareavatars/1025.patch b/resources/patches/squareavatars/1025.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1025.patch
rename to resources/patches/squareavatars/1025.patch
diff --git a/resources/old-patches/squareavatars/1026.patch b/resources/patches/squareavatars/1026.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1026.patch
rename to resources/patches/squareavatars/1026.patch
diff --git a/resources/old-patches/squareavatars/1029.patch b/resources/patches/squareavatars/1029.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1029.patch
rename to resources/patches/squareavatars/1029.patch
diff --git a/resources/old-patches/squareavatars/1031.patch b/resources/patches/squareavatars/1031.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1031.patch
rename to resources/patches/squareavatars/1031.patch
diff --git a/resources/old-patches/squareavatars/1032.patch b/resources/patches/squareavatars/1032.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1032.patch
rename to resources/patches/squareavatars/1032.patch
diff --git a/resources/old-patches/squareavatars/1033.patch b/resources/patches/squareavatars/1033.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1033.patch
rename to resources/patches/squareavatars/1033.patch
diff --git a/resources/old-patches/squareavatars/1036.patch b/resources/patches/squareavatars/1036.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1036.patch
rename to resources/patches/squareavatars/1036.patch
diff --git a/resources/old-patches/squareavatars/1037.patch b/resources/patches/squareavatars/1037.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1037.patch
rename to resources/patches/squareavatars/1037.patch
diff --git a/resources/old-patches/squareavatars/1040.patch b/resources/patches/squareavatars/1040.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1040.patch
rename to resources/patches/squareavatars/1040.patch
diff --git a/resources/old-patches/squareavatars/1041.patch b/resources/patches/squareavatars/1041.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1041.patch
rename to resources/patches/squareavatars/1041.patch
diff --git a/resources/old-patches/squareavatars/1045.patch b/resources/patches/squareavatars/1045.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1045.patch
rename to resources/patches/squareavatars/1045.patch
diff --git a/resources/old-patches/squareavatars/1046.patch b/resources/patches/squareavatars/1046.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1046.patch
rename to resources/patches/squareavatars/1046.patch
diff --git a/resources/old-patches/squareavatars/1047.patch b/resources/patches/squareavatars/1047.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1047.patch
rename to resources/patches/squareavatars/1047.patch
diff --git a/resources/old-patches/squareavatars/1049.patch b/resources/patches/squareavatars/1049.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1049.patch
rename to resources/patches/squareavatars/1049.patch
diff --git a/resources/old-patches/squareavatars/1052.patch b/resources/patches/squareavatars/1052.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1052.patch
rename to resources/patches/squareavatars/1052.patch
diff --git a/resources/old-patches/squareavatars/1053.patch b/resources/patches/squareavatars/1053.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1053.patch
rename to resources/patches/squareavatars/1053.patch
diff --git a/resources/old-patches/squareavatars/1054.patch b/resources/patches/squareavatars/1054.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1054.patch
rename to resources/patches/squareavatars/1054.patch
diff --git a/resources/old-patches/squareavatars/1056.patch b/resources/patches/squareavatars/1056.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1056.patch
rename to resources/patches/squareavatars/1056.patch
diff --git a/resources/old-patches/squareavatars/1057.patch b/resources/patches/squareavatars/1057.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1057.patch
rename to resources/patches/squareavatars/1057.patch
diff --git a/resources/old-patches/squareavatars/1062.patch b/resources/patches/squareavatars/1062.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1062.patch
rename to resources/patches/squareavatars/1062.patch
diff --git a/resources/old-patches/squareavatars/1065.patch b/resources/patches/squareavatars/1065.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1065.patch
rename to resources/patches/squareavatars/1065.patch
diff --git a/resources/old-patches/squareavatars/1066.patch b/resources/patches/squareavatars/1066.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1066.patch
rename to resources/patches/squareavatars/1066.patch
diff --git a/resources/old-patches/squareavatars/1069.patch b/resources/patches/squareavatars/1069.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1069.patch
rename to resources/patches/squareavatars/1069.patch
diff --git a/resources/old-patches/squareavatars/1073.patch b/resources/patches/squareavatars/1073.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1073.patch
rename to resources/patches/squareavatars/1073.patch
diff --git a/resources/old-patches/squareavatars/1074.patch b/resources/patches/squareavatars/1074.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1074.patch
rename to resources/patches/squareavatars/1074.patch
diff --git a/resources/old-patches/squareavatars/1078.patch b/resources/patches/squareavatars/1078.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1078.patch
rename to resources/patches/squareavatars/1078.patch
diff --git a/resources/old-patches/squareavatars/1084.patch b/resources/patches/squareavatars/1084.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1084.patch
rename to resources/patches/squareavatars/1084.patch
diff --git a/resources/old-patches/squareavatars/1085.patch b/resources/patches/squareavatars/1085.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1085.patch
rename to resources/patches/squareavatars/1085.patch
diff --git a/resources/old-patches/squareavatars/1087.patch b/resources/patches/squareavatars/1087.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1087.patch
rename to resources/patches/squareavatars/1087.patch
diff --git a/resources/old-patches/squareavatars/1091.patch b/resources/patches/squareavatars/1091.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1091.patch
rename to resources/patches/squareavatars/1091.patch
diff --git a/resources/old-patches/squareavatars/1092.patch b/resources/patches/squareavatars/1092.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1092.patch
rename to resources/patches/squareavatars/1092.patch
diff --git a/resources/old-patches/squareavatars/1100.patch b/resources/patches/squareavatars/1100.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1100.patch
rename to resources/patches/squareavatars/1100.patch
diff --git a/resources/old-patches/squareavatars/1103.patch b/resources/patches/squareavatars/1103.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1103.patch
rename to resources/patches/squareavatars/1103.patch
diff --git a/resources/old-patches/squareavatars/1104.patch b/resources/patches/squareavatars/1104.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1104.patch
rename to resources/patches/squareavatars/1104.patch
diff --git a/resources/old-patches/squareavatars/1105.patch b/resources/patches/squareavatars/1105.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1105.patch
rename to resources/patches/squareavatars/1105.patch
diff --git a/resources/old-patches/squareavatars/1107.patch b/resources/patches/squareavatars/1107.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1107.patch
rename to resources/patches/squareavatars/1107.patch
diff --git a/resources/old-patches/squareavatars/1123.patch b/resources/patches/squareavatars/1123.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1123.patch
rename to resources/patches/squareavatars/1123.patch
diff --git a/resources/old-patches/squareavatars/1132.patch b/resources/patches/squareavatars/1132.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1132.patch
rename to resources/patches/squareavatars/1132.patch
diff --git a/resources/old-patches/squareavatars/1134.patch b/resources/patches/squareavatars/1134.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1134.patch
rename to resources/patches/squareavatars/1134.patch
diff --git a/resources/old-patches/squareavatars/1144.patch b/resources/patches/squareavatars/1144.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1144.patch
rename to resources/patches/squareavatars/1144.patch
diff --git a/resources/old-patches/squareavatars/1145.patch b/resources/patches/squareavatars/1145.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1145.patch
rename to resources/patches/squareavatars/1145.patch
diff --git a/resources/old-patches/squareavatars/1146.patch b/resources/patches/squareavatars/1146.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1146.patch
rename to resources/patches/squareavatars/1146.patch
diff --git a/resources/old-patches/squareavatars/1148.patch b/resources/patches/squareavatars/1148.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1148.patch
rename to resources/patches/squareavatars/1148.patch
diff --git a/resources/old-patches/squareavatars/1150.patch b/resources/patches/squareavatars/1150.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1150.patch
rename to resources/patches/squareavatars/1150.patch
diff --git a/resources/old-patches/squareavatars/1167.patch b/resources/patches/squareavatars/1167.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1167.patch
rename to resources/patches/squareavatars/1167.patch
diff --git a/resources/old-patches/squareavatars/1169.patch b/resources/patches/squareavatars/1169.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1169.patch
rename to resources/patches/squareavatars/1169.patch
diff --git a/resources/old-patches/squareavatars/1171.patch b/resources/patches/squareavatars/1171.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1171.patch
rename to resources/patches/squareavatars/1171.patch
diff --git a/resources/old-patches/squareavatars/1180.patch b/resources/patches/squareavatars/1180.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1180.patch
rename to resources/patches/squareavatars/1180.patch
diff --git a/resources/old-patches/squareavatars/1181.patch b/resources/patches/squareavatars/1181.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1181.patch
rename to resources/patches/squareavatars/1181.patch
diff --git a/resources/old-patches/squareavatars/1192.patch b/resources/patches/squareavatars/1192.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1192.patch
rename to resources/patches/squareavatars/1192.patch
diff --git a/resources/old-patches/squareavatars/1196.patch b/resources/patches/squareavatars/1196.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1196.patch
rename to resources/patches/squareavatars/1196.patch
diff --git a/resources/old-patches/squareavatars/1200.patch b/resources/patches/squareavatars/1200.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1200.patch
rename to resources/patches/squareavatars/1200.patch
diff --git a/resources/old-patches/squareavatars/1201.patch b/resources/patches/squareavatars/1201.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1201.patch
rename to resources/patches/squareavatars/1201.patch
diff --git a/resources/old-patches/squareavatars/1208.patch b/resources/patches/squareavatars/1208.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1208.patch
rename to resources/patches/squareavatars/1208.patch
diff --git a/resources/old-patches/squareavatars/1213.patch b/resources/patches/squareavatars/1213.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1213.patch
rename to resources/patches/squareavatars/1213.patch
diff --git a/resources/old-patches/squareavatars/1216.patch b/resources/patches/squareavatars/1216.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1216.patch
rename to resources/patches/squareavatars/1216.patch
diff --git a/resources/old-patches/squareavatars/1218.patch b/resources/patches/squareavatars/1218.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1218.patch
rename to resources/patches/squareavatars/1218.patch
diff --git a/resources/old-patches/squareavatars/1223.patch b/resources/patches/squareavatars/1223.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1223.patch
rename to resources/patches/squareavatars/1223.patch
diff --git a/resources/old-patches/squareavatars/1243.patch b/resources/patches/squareavatars/1243.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1243.patch
rename to resources/patches/squareavatars/1243.patch
diff --git a/resources/old-patches/squareavatars/1246.patch b/resources/patches/squareavatars/1246.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1246.patch
rename to resources/patches/squareavatars/1246.patch
diff --git a/resources/old-patches/squareavatars/1249.patch b/resources/patches/squareavatars/1249.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1249.patch
rename to resources/patches/squareavatars/1249.patch
diff --git a/resources/old-patches/squareavatars/1251.patch b/resources/patches/squareavatars/1251.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1251.patch
rename to resources/patches/squareavatars/1251.patch
diff --git a/resources/old-patches/squareavatars/1252.patch b/resources/patches/squareavatars/1252.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1252.patch
rename to resources/patches/squareavatars/1252.patch
diff --git a/resources/old-patches/squareavatars/1259.patch b/resources/patches/squareavatars/1259.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1259.patch
rename to resources/patches/squareavatars/1259.patch
diff --git a/resources/old-patches/squareavatars/1266.patch b/resources/patches/squareavatars/1266.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1266.patch
rename to resources/patches/squareavatars/1266.patch
diff --git a/resources/old-patches/squareavatars/1270.patch b/resources/patches/squareavatars/1270.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1270.patch
rename to resources/patches/squareavatars/1270.patch
diff --git a/resources/old-patches/squareavatars/1273.patch b/resources/patches/squareavatars/1273.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1273.patch
rename to resources/patches/squareavatars/1273.patch
diff --git a/resources/old-patches/squareavatars/1279.patch b/resources/patches/squareavatars/1279.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1279.patch
rename to resources/patches/squareavatars/1279.patch
diff --git a/resources/old-patches/squareavatars/1280.patch b/resources/patches/squareavatars/1280.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1280.patch
rename to resources/patches/squareavatars/1280.patch
diff --git a/resources/old-patches/squareavatars/1281.patch b/resources/patches/squareavatars/1281.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1281.patch
rename to resources/patches/squareavatars/1281.patch
diff --git a/resources/old-patches/squareavatars/1282.patch b/resources/patches/squareavatars/1282.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1282.patch
rename to resources/patches/squareavatars/1282.patch
diff --git a/resources/old-patches/squareavatars/1284.patch b/resources/patches/squareavatars/1284.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1284.patch
rename to resources/patches/squareavatars/1284.patch
diff --git a/resources/old-patches/squareavatars/1290.patch b/resources/patches/squareavatars/1290.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1290.patch
rename to resources/patches/squareavatars/1290.patch
diff --git a/resources/old-patches/squareavatars/1294.patch b/resources/patches/squareavatars/1294.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1294.patch
rename to resources/patches/squareavatars/1294.patch
diff --git a/resources/old-patches/squareavatars/1295.patch b/resources/patches/squareavatars/1295.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1295.patch
rename to resources/patches/squareavatars/1295.patch
diff --git a/resources/old-patches/squareavatars/1298.patch b/resources/patches/squareavatars/1298.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1298.patch
rename to resources/patches/squareavatars/1298.patch
diff --git a/resources/old-patches/squareavatars/1300.patch b/resources/patches/squareavatars/1300.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1300.patch
rename to resources/patches/squareavatars/1300.patch
diff --git a/resources/old-patches/squareavatars/1301.patch b/resources/patches/squareavatars/1301.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1301.patch
rename to resources/patches/squareavatars/1301.patch
diff --git a/resources/old-patches/squareavatars/1304.patch b/resources/patches/squareavatars/1304.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1304.patch
rename to resources/patches/squareavatars/1304.patch
diff --git a/resources/old-patches/squareavatars/1306.patch b/resources/patches/squareavatars/1306.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1306.patch
rename to resources/patches/squareavatars/1306.patch
diff --git a/resources/old-patches/squareavatars/1307.patch b/resources/patches/squareavatars/1307.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1307.patch
rename to resources/patches/squareavatars/1307.patch
diff --git a/resources/old-patches/squareavatars/1310.patch b/resources/patches/squareavatars/1310.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1310.patch
rename to resources/patches/squareavatars/1310.patch
diff --git a/resources/old-patches/squareavatars/1315.patch b/resources/patches/squareavatars/1315.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1315.patch
rename to resources/patches/squareavatars/1315.patch
diff --git a/resources/old-patches/squareavatars/1318.patch b/resources/patches/squareavatars/1318.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1318.patch
rename to resources/patches/squareavatars/1318.patch
diff --git a/resources/old-patches/squareavatars/1330.patch b/resources/patches/squareavatars/1330.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1330.patch
rename to resources/patches/squareavatars/1330.patch
diff --git a/resources/old-patches/squareavatars/1334.patch b/resources/patches/squareavatars/1334.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1334.patch
rename to resources/patches/squareavatars/1334.patch
diff --git a/resources/old-patches/squareavatars/1339.patch b/resources/patches/squareavatars/1339.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1339.patch
rename to resources/patches/squareavatars/1339.patch
diff --git a/resources/old-patches/squareavatars/1340.patch b/resources/patches/squareavatars/1340.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1340.patch
rename to resources/patches/squareavatars/1340.patch
diff --git a/resources/old-patches/squareavatars/1355.patch b/resources/patches/squareavatars/1355.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1355.patch
rename to resources/patches/squareavatars/1355.patch
diff --git a/resources/old-patches/squareavatars/1356.patch b/resources/patches/squareavatars/1356.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1356.patch
rename to resources/patches/squareavatars/1356.patch
diff --git a/resources/old-patches/squareavatars/1358.patch b/resources/patches/squareavatars/1358.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1358.patch
rename to resources/patches/squareavatars/1358.patch
diff --git a/resources/old-patches/squareavatars/1361.patch b/resources/patches/squareavatars/1361.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1361.patch
rename to resources/patches/squareavatars/1361.patch
diff --git a/resources/old-patches/squareavatars/1362.patch b/resources/patches/squareavatars/1362.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1362.patch
rename to resources/patches/squareavatars/1362.patch
diff --git a/resources/old-patches/squareavatars/1365.patch b/resources/patches/squareavatars/1365.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1365.patch
rename to resources/patches/squareavatars/1365.patch
diff --git a/resources/old-patches/squareavatars/1367.patch b/resources/patches/squareavatars/1367.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1367.patch
rename to resources/patches/squareavatars/1367.patch
diff --git a/resources/old-patches/squareavatars/1368.patch b/resources/patches/squareavatars/1368.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1368.patch
rename to resources/patches/squareavatars/1368.patch
diff --git a/resources/old-patches/squareavatars/1370.patch b/resources/patches/squareavatars/1370.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1370.patch
rename to resources/patches/squareavatars/1370.patch
diff --git a/resources/old-patches/squareavatars/1371.patch b/resources/patches/squareavatars/1371.patch
similarity index 100%
rename from resources/old-patches/squareavatars/1371.patch
rename to resources/patches/squareavatars/1371.patch
diff --git a/resources/old-patches/squareavatars/78204.patch b/resources/patches/squareavatars/78204.patch
similarity index 100%
rename from resources/old-patches/squareavatars/78204.patch
rename to resources/patches/squareavatars/78204.patch
diff --git a/resources/old-patches/squareavatars/835.patch b/resources/patches/squareavatars/835.patch
similarity index 100%
rename from resources/old-patches/squareavatars/835.patch
rename to resources/patches/squareavatars/835.patch
diff --git a/resources/old-patches/squareavatars/836.patch b/resources/patches/squareavatars/836.patch
similarity index 100%
rename from resources/old-patches/squareavatars/836.patch
rename to resources/patches/squareavatars/836.patch
diff --git a/resources/old-patches/squareavatars/839.patch b/resources/patches/squareavatars/839.patch
similarity index 100%
rename from resources/old-patches/squareavatars/839.patch
rename to resources/patches/squareavatars/839.patch
diff --git a/resources/old-patches/squareavatars/841.patch b/resources/patches/squareavatars/841.patch
similarity index 100%
rename from resources/old-patches/squareavatars/841.patch
rename to resources/patches/squareavatars/841.patch
diff --git a/resources/old-patches/squareavatars/842.patch b/resources/patches/squareavatars/842.patch
similarity index 100%
rename from resources/old-patches/squareavatars/842.patch
rename to resources/patches/squareavatars/842.patch
diff --git a/resources/old-patches/squareavatars/843.patch b/resources/patches/squareavatars/843.patch
similarity index 100%
rename from resources/old-patches/squareavatars/843.patch
rename to resources/patches/squareavatars/843.patch
diff --git a/resources/old-patches/squareavatars/844.patch b/resources/patches/squareavatars/844.patch
similarity index 100%
rename from resources/old-patches/squareavatars/844.patch
rename to resources/patches/squareavatars/844.patch
diff --git a/resources/old-patches/squareavatars/845.patch b/resources/patches/squareavatars/845.patch
similarity index 100%
rename from resources/old-patches/squareavatars/845.patch
rename to resources/patches/squareavatars/845.patch
diff --git a/resources/old-patches/squareavatars/848.patch b/resources/patches/squareavatars/848.patch
similarity index 100%
rename from resources/old-patches/squareavatars/848.patch
rename to resources/patches/squareavatars/848.patch
diff --git a/resources/old-patches/squareavatars/850.patch b/resources/patches/squareavatars/850.patch
similarity index 100%
rename from resources/old-patches/squareavatars/850.patch
rename to resources/patches/squareavatars/850.patch
diff --git a/resources/old-patches/squareavatars/851.patch b/resources/patches/squareavatars/851.patch
similarity index 100%
rename from resources/old-patches/squareavatars/851.patch
rename to resources/patches/squareavatars/851.patch
diff --git a/resources/old-patches/squareavatars/853.patch b/resources/patches/squareavatars/853.patch
similarity index 100%
rename from resources/old-patches/squareavatars/853.patch
rename to resources/patches/squareavatars/853.patch
diff --git a/resources/old-patches/squareavatars/854.patch b/resources/patches/squareavatars/854.patch
similarity index 100%
rename from resources/old-patches/squareavatars/854.patch
rename to resources/patches/squareavatars/854.patch
diff --git a/resources/old-patches/squareavatars/855.patch b/resources/patches/squareavatars/855.patch
similarity index 100%
rename from resources/old-patches/squareavatars/855.patch
rename to resources/patches/squareavatars/855.patch
diff --git a/resources/old-patches/squareavatars/856.patch b/resources/patches/squareavatars/856.patch
similarity index 100%
rename from resources/old-patches/squareavatars/856.patch
rename to resources/patches/squareavatars/856.patch
diff --git a/resources/old-patches/squareavatars/87202.patch b/resources/patches/squareavatars/87202.patch
similarity index 100%
rename from resources/old-patches/squareavatars/87202.patch
rename to resources/patches/squareavatars/87202.patch
diff --git a/resources/old-patches/squareavatars/876.patch b/resources/patches/squareavatars/876.patch
similarity index 100%
rename from resources/old-patches/squareavatars/876.patch
rename to resources/patches/squareavatars/876.patch
diff --git a/resources/old-patches/squareavatars/884.patch b/resources/patches/squareavatars/884.patch
similarity index 100%
rename from resources/old-patches/squareavatars/884.patch
rename to resources/patches/squareavatars/884.patch
diff --git a/resources/old-patches/squareavatars/888.patch b/resources/patches/squareavatars/888.patch
similarity index 100%
rename from resources/old-patches/squareavatars/888.patch
rename to resources/patches/squareavatars/888.patch
diff --git a/resources/old-patches/squareavatars/896.patch b/resources/patches/squareavatars/896.patch
similarity index 100%
rename from resources/old-patches/squareavatars/896.patch
rename to resources/patches/squareavatars/896.patch
diff --git a/resources/old-patches/squareavatars/897.patch b/resources/patches/squareavatars/897.patch
similarity index 100%
rename from resources/old-patches/squareavatars/897.patch
rename to resources/patches/squareavatars/897.patch
diff --git a/resources/old-patches/squareavatars/898.patch b/resources/patches/squareavatars/898.patch
similarity index 100%
rename from resources/old-patches/squareavatars/898.patch
rename to resources/patches/squareavatars/898.patch
diff --git a/resources/old-patches/squareavatars/899.patch b/resources/patches/squareavatars/899.patch
similarity index 100%
rename from resources/old-patches/squareavatars/899.patch
rename to resources/patches/squareavatars/899.patch
diff --git a/resources/old-patches/squareavatars/900.patch b/resources/patches/squareavatars/900.patch
similarity index 100%
rename from resources/old-patches/squareavatars/900.patch
rename to resources/patches/squareavatars/900.patch
diff --git a/resources/old-patches/squareavatars/901.patch b/resources/patches/squareavatars/901.patch
similarity index 100%
rename from resources/old-patches/squareavatars/901.patch
rename to resources/patches/squareavatars/901.patch
diff --git a/resources/old-patches/squareavatars/902.patch b/resources/patches/squareavatars/902.patch
similarity index 100%
rename from resources/old-patches/squareavatars/902.patch
rename to resources/patches/squareavatars/902.patch
diff --git a/resources/old-patches/squareavatars/903.patch b/resources/patches/squareavatars/903.patch
similarity index 100%
rename from resources/old-patches/squareavatars/903.patch
rename to resources/patches/squareavatars/903.patch
diff --git a/resources/old-patches/squareavatars/904.patch b/resources/patches/squareavatars/904.patch
similarity index 100%
rename from resources/old-patches/squareavatars/904.patch
rename to resources/patches/squareavatars/904.patch
diff --git a/resources/old-patches/squareavatars/906.patch b/resources/patches/squareavatars/906.patch
similarity index 100%
rename from resources/old-patches/squareavatars/906.patch
rename to resources/patches/squareavatars/906.patch
diff --git a/resources/old-patches/squareavatars/909.patch b/resources/patches/squareavatars/909.patch
similarity index 100%
rename from resources/old-patches/squareavatars/909.patch
rename to resources/patches/squareavatars/909.patch
diff --git a/resources/old-patches/squareavatars/910.patch b/resources/patches/squareavatars/910.patch
similarity index 100%
rename from resources/old-patches/squareavatars/910.patch
rename to resources/patches/squareavatars/910.patch
diff --git a/resources/old-patches/squareavatars/938.patch b/resources/patches/squareavatars/938.patch
similarity index 100%
rename from resources/old-patches/squareavatars/938.patch
rename to resources/patches/squareavatars/938.patch
diff --git a/resources/old-patches/squareavatars/939.patch b/resources/patches/squareavatars/939.patch
similarity index 100%
rename from resources/old-patches/squareavatars/939.patch
rename to resources/patches/squareavatars/939.patch
diff --git a/resources/old-patches/squareavatars/940.patch b/resources/patches/squareavatars/940.patch
similarity index 100%
rename from resources/old-patches/squareavatars/940.patch
rename to resources/patches/squareavatars/940.patch
diff --git a/resources/old-patches/squareavatars/942.patch b/resources/patches/squareavatars/942.patch
similarity index 100%
rename from resources/old-patches/squareavatars/942.patch
rename to resources/patches/squareavatars/942.patch
diff --git a/resources/old-patches/squareavatars/943.patch b/resources/patches/squareavatars/943.patch
similarity index 100%
rename from resources/old-patches/squareavatars/943.patch
rename to resources/patches/squareavatars/943.patch
diff --git a/resources/old-patches/squareavatars/945.patch b/resources/patches/squareavatars/945.patch
similarity index 100%
rename from resources/old-patches/squareavatars/945.patch
rename to resources/patches/squareavatars/945.patch
diff --git a/resources/old-patches/squareavatars/946.patch b/resources/patches/squareavatars/946.patch
similarity index 100%
rename from resources/old-patches/squareavatars/946.patch
rename to resources/patches/squareavatars/946.patch
diff --git a/resources/old-patches/squareavatars/947.patch b/resources/patches/squareavatars/947.patch
similarity index 100%
rename from resources/old-patches/squareavatars/947.patch
rename to resources/patches/squareavatars/947.patch
diff --git a/resources/old-patches/squareavatars/948.patch b/resources/patches/squareavatars/948.patch
similarity index 100%
rename from resources/old-patches/squareavatars/948.patch
rename to resources/patches/squareavatars/948.patch
diff --git a/resources/old-patches/squareavatars/963.patch b/resources/patches/squareavatars/963.patch
similarity index 100%
rename from resources/old-patches/squareavatars/963.patch
rename to resources/patches/squareavatars/963.patch
diff --git a/resources/old-patches/squareavatars/964.patch b/resources/patches/squareavatars/964.patch
similarity index 100%
rename from resources/old-patches/squareavatars/964.patch
rename to resources/patches/squareavatars/964.patch
diff --git a/resources/old-patches/squareavatars/965.patch b/resources/patches/squareavatars/965.patch
similarity index 100%
rename from resources/old-patches/squareavatars/965.patch
rename to resources/patches/squareavatars/965.patch
diff --git a/resources/old-patches/squareavatars/966.patch b/resources/patches/squareavatars/966.patch
similarity index 100%
rename from resources/old-patches/squareavatars/966.patch
rename to resources/patches/squareavatars/966.patch
diff --git a/resources/old-patches/squareavatars/967.patch b/resources/patches/squareavatars/967.patch
similarity index 100%
rename from resources/old-patches/squareavatars/967.patch
rename to resources/patches/squareavatars/967.patch
diff --git a/resources/old-patches/squareavatars/968.patch b/resources/patches/squareavatars/968.patch
similarity index 100%
rename from resources/old-patches/squareavatars/968.patch
rename to resources/patches/squareavatars/968.patch
diff --git a/resources/old-patches/squareavatars/970.patch b/resources/patches/squareavatars/970.patch
similarity index 100%
rename from resources/old-patches/squareavatars/970.patch
rename to resources/patches/squareavatars/970.patch
diff --git a/resources/old-patches/squareavatars/980.patch b/resources/patches/squareavatars/980.patch
similarity index 100%
rename from resources/old-patches/squareavatars/980.patch
rename to resources/patches/squareavatars/980.patch
diff --git a/resources/old-patches/squareavatars/984.patch b/resources/patches/squareavatars/984.patch
similarity index 100%
rename from resources/old-patches/squareavatars/984.patch
rename to resources/patches/squareavatars/984.patch
diff --git a/resources/old-patches/squareavatars/986.patch b/resources/patches/squareavatars/986.patch
similarity index 100%
rename from resources/old-patches/squareavatars/986.patch
rename to resources/patches/squareavatars/986.patch
diff --git a/resources/old-patches/squareavatars/991.patch b/resources/patches/squareavatars/991.patch
similarity index 100%
rename from resources/old-patches/squareavatars/991.patch
rename to resources/patches/squareavatars/991.patch
diff --git a/resources/old-patches/squareavatars/992.patch b/resources/patches/squareavatars/992.patch
similarity index 100%
rename from resources/old-patches/squareavatars/992.patch
rename to resources/patches/squareavatars/992.patch
diff --git a/resources/old-patches/squareavatars/993.patch b/resources/patches/squareavatars/993.patch
similarity index 100%
rename from resources/old-patches/squareavatars/993.patch
rename to resources/patches/squareavatars/993.patch
diff --git a/resources/old-patches/squareavatars/994.patch b/resources/patches/squareavatars/994.patch
similarity index 100%
rename from resources/old-patches/squareavatars/994.patch
rename to resources/patches/squareavatars/994.patch
diff --git a/resources/old-patches/squareavatars/996.patch b/resources/patches/squareavatars/996.patch
similarity index 100%
rename from resources/old-patches/squareavatars/996.patch
rename to resources/patches/squareavatars/996.patch
diff --git a/resources/old-patches/squareavatars/README.md b/resources/patches/squareavatars/README.md
similarity index 100%
rename from resources/old-patches/squareavatars/README.md
rename to resources/patches/squareavatars/README.md
diff --git a/resources/patchport-state.json b/resources/patchport-state.json
index 865816f..497642f 100644
--- a/resources/patchport-state.json
+++ b/resources/patchport-state.json
@@ -1 +1 @@
-{"versionname": "87.2 - Alpha", "versioncode": "87202"}
\ No newline at end of file
+{"versionname": "49.13", "versioncode": "1340"}
\ No newline at end of file
diff --git a/resources/scripts/ctcci/ctcci.py b/resources/scripts/ctcci/ctcci.py
index 73a987d..b372d43 100644
--- a/resources/scripts/ctcci/ctcci.py
+++ b/resources/scripts/ctcci/ctcci.py
@@ -14,20 +14,14 @@ FORCE = False
 DEFAULT_PATCHES = ["necessary", "branding", "customversion"]
 OPTIONAL_PATCHES = ["necessary", "blobs"]
 
-def xmlpatch(patch_file, workdir, patch_name=""):
-    if not os.path.exists(patch_file):
-        # Allow missing patches
-        return
-
-    print(f"Applying {patch_file}")
-
-    subprocess.run(f"java -cp /opt/ctc/tools/xml-patch.jar com.github.dnault.xmlpatch.BatchPatcher --patch {patch_file} --srcdir {workdir}",
-                   shell=True, check=True, cwd=workdir)
 
 def patch(patch_file, workdir, patch_name=""):
     if not os.path.exists(patch_file):
-        # Allow missing patches
-        return
+        # Allow missing optional patches
+        if patch_name in OPTIONAL_PATCHES:
+            return
+
+        raise FileNotFoundError(f"No patches with name \"{patch_file}\" :(")
 
     print(f"Applying {patch_file}")
 
@@ -84,34 +78,42 @@ shutil.copytree(BASE_APK_PATH, WORK_APK_PATH)
 
 # Go through patches and apply every single one of them
 for patch_name in PATCHES:
-    pre_script = os.path.join(REPO_FOLDER, "resources/patches", patch_name, f"{VERSION}-pre.sh")
+    pre_script = os.path.join(REPO_FOLDER, "resources/patches",
+                              patch_name, f"{VERSION}-pre.sh")
     if os.path.exists(pre_script):
-        subprocess.run(f"bash {pre_script}", shell=True, cwd=WORK_APK_PATH)
-    pre_script = os.path.join(REPO_FOLDER, "resources/xmlpatches", patch_name, f"{VERSION}-pre.sh")
-    if os.path.exists(pre_script):
-        subprocess.run(f"bash {pre_script}", shell=True, cwd=WORK_APK_PATH)
+        subprocess.run(f"bash {pre_script}",
+                       shell=True,
+                       cwd=WORK_APK_PATH)
 
     # Apply custom emoji patches
     if patch_name in ["mutant", "blobs"]:
         print(f"Applying {patch_name} emoji patch")
-        patch_script = os.path.join(REPO_FOLDER, "resources/patches", patch_name, "emojireplace.py")
-        subprocess.run(f"{PYTHON_BIN} {patch_script}", shell=True, cwd=WORK_APK_PATH)
+        patch_script = os.path.join(REPO_FOLDER, "resources/patches",
+                                    patch_name, "emojireplace.py")
+        subprocess.run(f"{PYTHON_BIN} {patch_script}",
+                       shell=True,
+                       cwd=WORK_APK_PATH)
 
     # Apply custom emoji patches
     elif patch_name == "customtheme":
         print(f"Applying splash patch")
-        splash = os.path.join(REPO_FOLDER, "resources/patches", patch_name, "asset_loading.png")
-        patch_script = os.path.join(REPO_FOLDER, "resources/patches", patch_name, "fixsplash.sh")
+        splash = os.path.join(REPO_FOLDER, "resources/patches",
+                              patch_name, "asset_loading.png")
+        patch_script = os.path.join(REPO_FOLDER, "resources/patches",
+                                    patch_name, "fixsplash.sh")
 
-        subprocess.run(f"bash {patch_script} {splash}", shell=True, cwd=WORK_APK_PATH)
+        subprocess.run(f"bash {patch_script} {splash}",
+                       shell=True,
+                       cwd=WORK_APK_PATH)
 
-    patch_file = os.path.join(REPO_FOLDER, "resources/patches", patch_name, f"{VERSION}.patch")
-    xml_patch_file = os.path.join(REPO_FOLDER, "resources/xmlpatches", patch_name, f"{VERSION}.xml")
+    patch_file = os.path.join(REPO_FOLDER, "resources/patches",
+                              patch_name, f"{VERSION}.patch")
 
     # Apply custom version patches
     if patch_name == "customversion":
         print(f"Applying custom version")
-        patch_script = os.path.join(REPO_FOLDER, "resources/patches", patch_name, "addpatch.py")
+        patch_script = os.path.join(REPO_FOLDER, "resources/patches",
+                                    patch_name, "addpatch.py")
 
         subprocess.run(f"{PYTHON_BIN} {patch_script} {patch_file} "
                        f"{' '.join(PATCHES)}",
@@ -124,31 +126,44 @@ for patch_name in PATCHES:
         print(f"Applying branding icon patch")
         if BRANCH in ICONS:
             shutil.copyfile(ICONS[BRANCH],
-                            os.path.join(WORK_APK_PATH, "res", "mipmap-xxxhdpi", "logo_debug.png"))
+                            os.path.join(WORK_APK_PATH, "res",
+                                         "mipmap-xxxhdpi", "logo_debug.png"))
         elif "default" in ICONS:
             shutil.copyfile(ICONS["default"],
-                            os.path.join(WORK_APK_PATH, "res", "mipmap-xxxhdpi", "logo_debug.png"))
+                            os.path.join(WORK_APK_PATH, "res",
+                                         "mipmap-xxxhdpi", "logo_debug.png"))
 
         if BRANCH in DYN_ICONS:
             shutil.copyfile(DYN_ICONS[BRANCH]["bg"],
-                            os.path.join(WORK_APK_PATH, "res", "mipmap-xxxhdpi", "ic_launcher_background.png"))
+                            os.path.join(WORK_APK_PATH, "res",
+                                         "mipmap-xxxhdpi",
+                                         "ic_launcher_background.png"))
             shutil.copyfile(DYN_ICONS[BRANCH]["fg"],
-                            os.path.join(WORK_APK_PATH, "res", "mipmap-xxxhdpi", "ic_launcher_foreground.png"))
+                            os.path.join(WORK_APK_PATH, "res",
+                                         "mipmap-xxxhdpi",
+                                         "ic_launcher_foreground.png"))
         elif "default" in ICONS:
             shutil.copyfile(DYN_ICONS["default"]["bg"],
-                            os.path.join(WORK_APK_PATH, "res", "mipmap-xxxhdpi", "ic_launcher_background.png"))
+                            os.path.join(WORK_APK_PATH, "res",
+                                         "mipmap-xxxhdpi",
+                                         "ic_launcher_background.png"))
             shutil.copyfile(DYN_ICONS["default"]["fg"],
-                            os.path.join(WORK_APK_PATH, "res", "mipmap-xxxhdpi", "ic_launcher_foreground.png"))
+                            os.path.join(WORK_APK_PATH, "res",
+                                         "mipmap-xxxhdpi",
+                                         "ic_launcher_foreground.png"))
 
-        patch_script = os.path.join(REPO_FOLDER, "resources/patches", patch_name, "customicon.sh")
+        patch_script = os.path.join(REPO_FOLDER, "resources/patches",
+                                    patch_name, "customicon.sh")
 
         subprocess.run(f"bash {patch_script}", shell=True, cwd=WORK_APK_PATH)
 
-        patch_script = os.path.join(REPO_FOLDER, "resources/patches", patch_name, "customdynamicicon.sh")
+        patch_script = os.path.join(REPO_FOLDER, "resources/patches",
+                                    patch_name, "customdynamicicon.sh")
 
         subprocess.run(f"bash {patch_script}", shell=True, cwd=WORK_APK_PATH)
 
-        patch_script = os.path.join(REPO_FOLDER, "resources/patches", patch_name, "addpatch.py")
+        patch_script = os.path.join(REPO_FOLDER, "resources/patches",
+                                    patch_name, "addpatch.py")
 
         # Hell code
         app_name = APP_NAMES.get(BRANCH, APP_NAMES.get("default", "CutTheCord"))
@@ -161,9 +176,13 @@ for patch_name in PATCHES:
         patch(patch_file.replace(".patch", "-custom.patch"), WORK_APK_PATH)
     elif patch_name in ["bettertm", "bettertmlight"]:
         print(f"Applying bettertm emoji patch")
-        patch_dir = os.path.join(REPO_FOLDER, "resources/patches", patch_name)
-        patch_script = os.path.join(REPO_FOLDER, "resources/patches", patch_name, "bettertm.sh")
-        subprocess.run(f"bash {patch_script} {patch_dir}", shell=True, cwd=WORK_APK_PATH)
+        patch_dir = os.path.join(REPO_FOLDER, "resources/patches",
+                                 patch_name)
+        patch_script = os.path.join(REPO_FOLDER, "resources/patches",
+                                    patch_name, "bettertm.sh")
+        subprocess.run(f"bash {patch_script} {patch_dir}",
+                       shell=True,
+                       cwd=WORK_APK_PATH)
     # Apply custom ringtone
     elif patch_name == "customring":
         print(f"Applying custom ringtone")
@@ -172,7 +191,9 @@ for patch_name in PATCHES:
         else:
             CUSTOM_RINGTONE = RINGTONES["default"]
 
-        shutil.copyfile(CUSTOM_RINGTONE, os.path.join(WORK_APK_PATH, "res", "raw", "call_ringing.mp3"))
+        shutil.copyfile(CUSTOM_RINGTONE,
+                        os.path.join(WORK_APK_PATH, "res",
+                                     "raw", "call_ringing.mp3"))
     # Apply custom fonts
     elif patch_name == "customfont":
         print(f"Applying custom font")
@@ -182,18 +203,19 @@ for patch_name in PATCHES:
             fonts = FONTS["default"]
 
         for font in fonts:
-            shutil.copyfile(fonts[font], os.path.join(WORK_APK_PATH, "res", "font", font))
+            shutil.copyfile(fonts[font],
+                            os.path.join(WORK_APK_PATH, "res",
+                                         "font", font))
     # Apply any other patches
     else:
         patch(patch_file, WORK_APK_PATH, patch_name)
-        xmlpatch(xml_patch_file, WORK_APK_PATH, patch_name)
 
-    post_script = os.path.join(REPO_FOLDER, "resources/patches", patch_name, f"{VERSION}-post.sh")
+    post_script = os.path.join(REPO_FOLDER, "resources/patches",
+                               patch_name, f"{VERSION}-post.sh")
     if os.path.exists(post_script):
-        subprocess.run(f"bash {post_script}", shell=True, cwd=WORK_APK_PATH)
-    post_script = os.path.join(REPO_FOLDER, "resources/xmlpatches", patch_name, f"{VERSION}-post.sh")
-    if os.path.exists(post_script):
-        subprocess.run(f"bash {post_script}", shell=True, cwd=WORK_APK_PATH)
+        subprocess.run(f"bash {post_script}",
+                       shell=True,
+                       cwd=WORK_APK_PATH)
 
 # Pack the APK
 subprocess.run(f"{APKTOOL_BIN} b discord",
diff --git a/resources/scripts/patchport.py b/resources/scripts/patchport.py
index b9e485d..134b787 100644
--- a/resources/scripts/patchport.py
+++ b/resources/scripts/patchport.py
@@ -75,7 +75,7 @@ def fix_offset(patch_contents):
 
     return patch_out
 
-# TODO replace with xml-patch version
+
 def make_necessary(version_name, version_code):
     # OH GOD OH FUCK
     shutil.rmtree(tmp_folder, ignore_errors=True)
@@ -88,9 +88,11 @@ def make_necessary(version_name, version_code):
     with open(os.path.join(tmp_folder, "AndroidManifest.xml")) as fin:
         filec = fin.read()
         incorrect_versioncode = re_versioncode_xml.findall(filec)[0]
-        filec = filec.replace(incorrect_versioncode, f'platformBuildVersionCode="{to_versioncode}"')
+        filec = filec.replace(incorrect_versioncode,
+                              f'platformBuildVersionCode="{to_versioncode}"')
         incorrect_versionname = re_versionname_xml.findall(filec)[0]
-        filec = filec.replace(incorrect_versionname, f'platformBuildVersionName="{to_versionname}"')
+        filec = filec.replace(incorrect_versionname,
+                              f'platformBuildVersionName="{to_versionname}"')
         with open(os.path.join(tmp_folder, "AndroidManifest.xml"), "w") as fout:
             fout.write(filec)
 
@@ -132,94 +134,6 @@ with open(os.path.join(apk_folder, "res", "values", "strings.xml")) as f:
 
 failures = []
 
-for patch in os.listdir(os.path.join(cutthecord_folder, "resources/xmlpatches")):
-    if debug:
-        print(f"going over xml patch: {patch}")
-
-    # Ignore non-dirs
-    if not os.path.isdir(os.path.join(cutthecord_folder, "resources/xmlpatches", patch)):
-        if debug:
-            print(f"patch is not a folder, skipping: {patch}")
-        continue
-
-    pre_in_path = os.path.join(cutthecord_folder, "resources/xmlpatches", patch, f"{from_versioncode}-pre.sh")
-    post_in_path = os.path.join(cutthecord_folder, "resources/xmlpatches", patch, f"{from_versioncode}-post.sh")
-    pre_out_path = os.path.join(cutthecord_folder, "resources/xmlpatches", patch, f"{to_versioncode}-pre.sh")
-    post_out_path = os.path.join(cutthecord_folder, "resources/xmlpatches", patch, f"{to_versioncode}-post.sh")
-
-    patch_path = os.path.join(cutthecord_folder, "resources/xmlpatches", patch, f"{from_versioncode}.xml")
-    out_path = os.path.join(cutthecord_folder, "resources/xmlpatches", patch, f"{to_versioncode}.xml")
-    tmp_out_path = os.path.join("/tmp/", patch, f"{to_versioncode}.xml")
-    readme_path = os.path.join(cutthecord_folder, "resources/xmlpatches", patch, "README.md")
-
-    # Handle copying of versioned scripts, untested and dirty!
-    script_path = os.path.join(cutthecord_folder, "resources/xmlpatches", patch, f"{from_versioncode}.sh")
-    if os.path.exists(script_path):
-        script_out_path = os.path.join(cutthecord_folder, "resources/xmlpatches", patch, f"{to_versioncode}.sh")
-        with open(script_path) as f:
-            with open(script_out_path, "w") as f2:
-                f2.write(f.read())
-
-    # Check if patch exists for from_version, if it doesn't, warn user
-    if not os.path.isfile(patch_path) and patch not in ["necessary"]:
-        # Don't warn on instructional patches
-        if patch not in ["customfont", "customring", "bettertm", "bettertmlight", "blobs"]:
-            print(f"SKIPPED: No {from_versionname} version found for {patch}.")
-        continue
-
-    # Check if pre-script exists, if it does copy it
-    if os.path.isfile(pre_in_path):
-        shutil.copyfile(pre_in_path, pre_out_path)
-        print(f"PRE COPIED: {patch}'s pre script was copied.")
-
-    # Check if post-script exists, if it does copy it
-    if os.path.isfile(post_in_path):
-        shutil.copyfile(post_in_path, post_out_path)
-        print(f"POST COPIED: {patch}'s post script was copied.")
-
-	
-    # Create necessary instead of porting it.
-    if patch == "necessary":
-        patch_contents = make_necessary(to_versioncode, to_versionname)
-    else:
-        # Get a modified version of the patch
-        patch_contents = modify_patch(patch, patch_path)
-
-    # Pass the new patch to patch command and get it to attempt to patch
-    with open(tmp_out_path, "w") as f:
-        f.write(patch_contents)
-    out = subprocess.run("java -cp /opt/ctc/tools/xml-patch.jar com.github.dnault.xmlpatch.BatchPatcher --patch {tmp_out_path} --srcdir {apk_folder} --destdir /tmp/", shell=True,
-                         cwd=apk_folder, text=True,
-                         capture_output=True)
-
-    # Check for issues
-    if "ERROR" in out.stdout or "EXCEPTION" in out.stdout:
-        print(f"FAILED: {patch} failed, please fix by hand.")
-        failures.append(patch)
-        out_path += "-failed"
-
-    if debug:
-        print(out.stdout)
-
-    # Apply patch to main APK folder too
-    if patch in ["necessary"]:
-        apply_patch(patch_contents)
-
-    if from_versionname != to_versionname:
-        # Add supported version to readme of that patch, hacky
-        # https://stackoverflow.com/a/35130508/3286892
-        with open(readme_path, 'r') as f:
-            readme_text = f.read().replace(f'- {from_versionname}\n', f'- {from_versionname}\n' f'- {to_versionname}\n')
-        with open(readme_path, "w") as f:
-            f.write(readme_text)
-
-    # Save ported patch
-    with open(out_path, "w") as f:
-        f.write(patch_contents)
-
-    if not out_path.endswith("-failed"):
-        print(f"PORTED: {patch} was successfully ported.")
-
 for patch in os.listdir(os.path.join(cutthecord_folder, "resources/patches")):
     if debug:
         print(f"going over patch: {patch}")
@@ -230,19 +144,27 @@ for patch in os.listdir(os.path.join(cutthecord_folder, "resources/patches")):
             print(f"patch is not a folder, skipping: {patch}")
         continue
 
-    pre_in_path = os.path.join(cutthecord_folder, "resources/patches", patch, f"{from_versioncode}-pre.sh")
-    post_in_path = os.path.join(cutthecord_folder, "resources/patches", patch, f"{from_versioncode}-post.sh")
-    pre_out_path = os.path.join(cutthecord_folder, "resources/patches", patch, f"{to_versioncode}-pre.sh")
-    post_out_path = os.path.join(cutthecord_folder, "resources/patches", patch, f"{to_versioncode}-post.sh")
+    pre_in_path = os.path.join(cutthecord_folder, "resources/patches", patch,
+                               f"{from_versioncode}-pre.sh")
+    post_in_path = os.path.join(cutthecord_folder, "resources/patches", patch,
+                                f"{from_versioncode}-post.sh")
+    pre_out_path = os.path.join(cutthecord_folder, "resources/patches", patch,
+                                f"{to_versioncode}-pre.sh")
+    post_out_path = os.path.join(cutthecord_folder, "resources/patches", patch,
+                                 f"{to_versioncode}-post.sh")
 
-    patch_path = os.path.join(cutthecord_folder, "resources/patches", patch, f"{from_versioncode}.patch")
-    out_path = os.path.join(cutthecord_folder, "resources/patches", patch, f"{to_versioncode}.patch")
+    patch_path = os.path.join(cutthecord_folder, "resources/patches", patch,
+                              f"{from_versioncode}.patch")
+    out_path = os.path.join(cutthecord_folder, "resources/patches", patch,
+                            f"{to_versioncode}.patch")
     readme_path = os.path.join(cutthecord_folder, "resources/patches", patch, "README.md")
 
     # Handle copying of versioned scripts, untested and dirty!
-    script_path = os.path.join(cutthecord_folder, "resources/patches", patch, f"{from_versioncode}.sh")
+    script_path = os.path.join(cutthecord_folder, "resources/patches", patch,
+                               f"{from_versioncode}.sh")
     if os.path.exists(script_path):
-        script_out_path = os.path.join(cutthecord_folder, "resources/patches", patch, f"{to_versioncode}.sh")
+        script_out_path = os.path.join(cutthecord_folder, "resources/patches", patch,
+                                       f"{to_versioncode}.sh")
         with open(script_path) as f:
             with open(script_out_path, "w") as f2:
                 f2.write(f.read())
@@ -250,7 +172,9 @@ for patch in os.listdir(os.path.join(cutthecord_folder, "resources/patches")):
     # Check if patch exists for from_version, if it doesn't, warn user
     if not os.path.isfile(patch_path) and patch not in ["necessary"]:
         # Don't warn on instructional patches
-        if patch not in ["customfont", "customring", "bettertm", "bettertmlight", "blobs"]:
+        if patch not in ["customfont", "customring",
+                         "bettertm", "bettertmlight",
+                         "blobs"]:
             print(f"SKIPPED: No {from_versionname} version found for {patch}.")
         continue
 
@@ -264,7 +188,6 @@ for patch in os.listdir(os.path.join(cutthecord_folder, "resources/patches")):
         shutil.copyfile(post_in_path, post_out_path)
         print(f"POST COPIED: {patch}'s post script was copied.")
 
-	
     # Create necessary instead of porting it.
     if patch == "necessary":
         patch_contents = make_necessary(to_versioncode, to_versionname)
@@ -303,7 +226,9 @@ for patch in os.listdir(os.path.join(cutthecord_folder, "resources/patches")):
         # Add supported version to readme of that patch, hacky
         # https://stackoverflow.com/a/35130508/3286892
         with open(readme_path, 'r') as f:
-            readme_text = f.read().replace(f'- {from_versionname}\n', f'- {from_versionname}\n' f'- {to_versionname}\n')
+            readme_text = f.read().replace(f'- {from_versionname}\n',
+                                           f'- {from_versionname}\n'
+                                           f'- {to_versionname}\n')
         with open(readme_path, "w") as f:
             f.write(readme_text)
 
diff --git a/resources/xmlpatches/betterrotation/87202.xml b/resources/xmlpatches/betterrotation/87202.xml
deleted file mode 100644
index 6148a37..0000000
--- a/resources/xmlpatches/betterrotation/87202.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<diffs>
-    <diff file="AndroidManifest.xml" xmlns:android="http://schemas.android.com/apk/res/android">
-        <!-- Remove android:screenOrientation entry -->
-        <remove msel="manifest/application/activity/@android:screenOrientation"/>
-    </diff>
-</diffs>
diff --git a/resources/xmlpatches/betterrotation/README.md b/resources/xmlpatches/betterrotation/README.md
deleted file mode 100644
index 3ad7d6c..0000000
--- a/resources/xmlpatches/betterrotation/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-## DisTok CutTheCord: Better Rotation
-
-This patch changes rotation settings to disallow upside down rotation.
-
-Contributed by [clienthax](https://gitdab.com/clienthax).
-
-
diff --git a/resources/xmlpatches/customtheme/87202.xml b/resources/xmlpatches/customtheme/87202.xml
deleted file mode 100644
index 34ead93..0000000
--- a/resources/xmlpatches/customtheme/87202.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<diffs>
-
-    <diff file="res/drawable/drawable_circle_black.xml" xmlns:android="http://schemas.android.com/apk/res/android">
-        <replace sel="shape/solid/@android:color">@android:color/transparent</replace>
-    </diff>
-
-    <diff file="res/drawable/drawable_overlay_channels_active_dark.xml" xmlns:android="http://schemas.android.com/apk/res/android">
-        <replace sel="layer-list/item/shape/solid/@android:color">@color/primary_500</replace>
-    </diff>
-
-    <diff file="res/layout/widget_chat_input.xml" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-        <replace sel="LinearLayout/LinearLayout/RelativeLayout/@android:background">@color/primary_600</replace>
-    </diff>
-
-    <diff file="res/values/colors.xml">
-        <replace sel="resources/color[@name='dark_grey_2']/text()">#ff000000</replace>
-        <replace sel="resources/color[@name='dark_grey_2_alpha_10']/text()">#ff000000</replace>
-        <replace sel="resources/color[@name='design_dark_default_color_background']/text()">#ff000000</replace>
-        <replace sel="resources/color[@name='design_dark_default_color_surface']/text()">#ff000000</replace>
-        <replace sel="resources/color[@name='grey_unread']/text()">#ff000000</replace>
-        <replace sel="resources/color[@name='link']/text()">#ff50f148</replace>
-        <replace sel="resources/color[@name='primary_500']/text()">#ff333333</replace>
-        <replace sel="resources/color[@name='primary_500_alpha_20']/text()">#330f0f0f</replace>
-        <replace sel="resources/color[@name='primary_500_alpha_30']/text()">#4d0f0f0f</replace>
-        <replace sel="resources/color[@name='primary_500_alpha_32']/text()">#510f0f0f</replace>
-        <replace sel="resources/color[@name='primary_500_alpha_60']/text()">#990f0f0f</replace>
-        <replace sel="resources/color[@name='primary_600']/text()">#ff000000</replace>
-        <replace sel="resources/color[@name='primary_600_alpha_60']/text()">#99000000</replace>
-        <replace sel="resources/color[@name='primary_630']/text()">#ff000000</replace>
-        <replace sel="resources/color[@name='primary_630_alpha_60']/text()">#99000000</replace>
-        <replace sel="resources/color[@name='primary_630_alpha_90']/text()">#e6000000</replace>
-        <replace sel="resources/color[@name='primary_660']/text()">#ff000000</replace>
-        <replace sel="resources/color[@name='primary_660_alpha_90']/text()">#e6000000</replace>
-        <replace sel="resources/color[@name='primary_700']/text()">#ff000000</replace>
-        <replace sel="resources/color[@name='primary_700_alpha_50']/text()">#80000000</replace>
-        <replace sel="resources/color[@name='primary_700_alpha_60']/text()">#990f0f0f</replace>
-        <replace sel="resources/color[@name='primary_dark_600']/text()">#ff000000</replace>
-        <replace sel="resources/color[@name='primary_dark_630']/text()">#ff000000</replace>
-        <replace sel="resources/color[@name='primary_dark_700']/text()">#ff000000</replace>
-        <replace sel="resources/color[@name='tooltip_background_dark']/text()">#e6000000</replace>
-    </diff>
-
-</diffs>
diff --git a/resources/xmlpatches/noblocked/87202.xml b/resources/xmlpatches/noblocked/87202.xml
deleted file mode 100644
index efaf874..0000000
--- a/resources/xmlpatches/noblocked/87202.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<diffs>
-    <diff file="res/layout/widget_chat_list_adapter_item_blocked.xml" xmlns:android="http://schemas.android.com/apk/res/android">
-        <replace sel="RelativeLayout/@android:paddingLeft">0px</replace>
-        <replace sel="RelativeLayout/@android:paddingTop">0px</replace>
-        <replace sel="RelativeLayout/@android:paddingRight">0px</replace>
-        <replace sel="RelativeLayout/@android:layout_width">0px</replace>
-        <replace sel="RelativeLayout/@android:layout_height">0px</replace>
-        <replace sel="RelativeLayout/@android:layout_marginLeft">0px</replace>
-        <replace sel="RelativeLayout/TextView/@android:textSize">0sp</replace>
-        <replace sel="RelativeLayout/TextView/@android:paddingTop">0dip</replace>
-        <replace sel="RelativeLayout/TextView/@android:paddingBottom">0dip</replace>
-    </diff>
-</diffs>
diff --git a/resources/xmlpatches/noblocked/README.md b/resources/xmlpatches/noblocked/README.md
deleted file mode 100644
index 122780b..0000000
--- a/resources/xmlpatches/noblocked/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## DisTok CutTheCord: Custom Version Patch
-
-This patch completely hides the "# Blocked Message(s)" thing.
diff --git a/resources/xmlpatches/squareavatars/87202.xml b/resources/xmlpatches/squareavatars/87202.xml
deleted file mode 100644
index c7933a1..0000000
--- a/resources/xmlpatches/squareavatars/87202.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<diffs>
-    <diff file="res/values/dimens.xml">
-        <replace sel="/resources/dimen[@name='guild_icon_radius']/text()">0.0dp</replace>
-    </diff>
-    <diff file="res/values/styles.xml">
-        <replace sel="resources/style[@name='Avatar']/item[@name='roundAsCircle']/text()">false</replace>
-        <add pos="after" sel="resources/style[@name='Avatar']/item[@name='roundAsCircle']"><item name="roundedCornerRadius">3dp</item></add>
-    </diff>
-</diffs>
diff --git a/resources/xmlpatches/squareavatars/README.md b/resources/xmlpatches/squareavatars/README.md
deleted file mode 100644
index 01ab417..0000000
--- a/resources/xmlpatches/squareavatars/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-## DisTok CutTheCord: Square Avatars Patch
-
-This patch turns the circle avatars to their full square versions, letting you see the whole image.
-
-A very small amount of rounding is applied to make it look a little better.
-