diff --git a/app/src/main/java/com/nextcloud/client/jobs/CalendarBackupWork.kt b/app/src/main/java/com/nextcloud/client/jobs/CalendarBackupWork.kt
index ffd24857c4ab..e65554204ad6 100644
--- a/app/src/main/java/com/nextcloud/client/jobs/CalendarBackupWork.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/CalendarBackupWork.kt
@@ -15,8 +15,8 @@ import androidx.work.WorkerParameters
 import com.nextcloud.client.account.UserAccountManager
 import com.nextcloud.client.preferences.AppPreferences
 import com.owncloud.android.lib.common.utils.Log_OC
-import third_parties.sufficientlysecure.AndroidCalendar
-import third_parties.sufficientlysecure.SaveCalendar
+import thirdparties.sufficientlysecure.AndroidCalendar
+import thirdparties.sufficientlysecure.SaveCalendar
 import java.util.Calendar
 
 class CalendarBackupWork(
diff --git a/app/src/main/java/com/nextcloud/client/jobs/CalendarImportWork.kt b/app/src/main/java/com/nextcloud/client/jobs/CalendarImportWork.kt
index 03a4d42f71d8..bc8066a5d408 100644
--- a/app/src/main/java/com/nextcloud/client/jobs/CalendarImportWork.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/CalendarImportWork.kt
@@ -16,9 +16,9 @@ import androidx.work.WorkerParameters
 import com.nextcloud.client.logger.Logger
 import com.owncloud.android.lib.common.utils.Log_OC
 import net.fortuna.ical4j.data.CalendarBuilder
-import third_parties.sufficientlysecure.AndroidCalendar
-import third_parties.sufficientlysecure.CalendarSource
-import third_parties.sufficientlysecure.ProcessVEvent
+import thirdparties.sufficientlysecure.AndroidCalendar
+import thirdparties.sufficientlysecure.CalendarSource
+import thirdparties.sufficientlysecure.ProcessVEvent
 import java.io.File
 
 class CalendarImportWork(
diff --git a/app/src/main/java/com/nextcloud/client/jobs/ContactsImportWork.kt b/app/src/main/java/com/nextcloud/client/jobs/ContactsImportWork.kt
index 2b231e491d6e..4a7d1eece9d3 100644
--- a/app/src/main/java/com/nextcloud/client/jobs/ContactsImportWork.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/ContactsImportWork.kt
@@ -23,7 +23,7 @@ import com.owncloud.android.ui.fragment.contactsbackup.VCardComparator
 import ezvcard.Ezvcard
 import ezvcard.VCard
 import org.apache.commons.io.FileUtils
-import third_parties.ezvcard_android.ContactOperations
+import thirdparties.ezvcardAndroid.ContactOperations
 import java.io.BufferedInputStream
 import java.io.File
 import java.io.FileInputStream
diff --git a/app/src/main/java/com/nextcloud/utils/text/MentionChipSpan.kt b/app/src/main/java/com/nextcloud/utils/text/MentionChipSpan.kt
index 7b439b36d024..dea38a1d15d3 100644
--- a/app/src/main/java/com/nextcloud/utils/text/MentionChipSpan.kt
+++ b/app/src/main/java/com/nextcloud/utils/text/MentionChipSpan.kt
@@ -7,7 +7,7 @@
 package com.nextcloud.utils.text
 
 import android.graphics.drawable.Drawable
-import third_parties.fresco.BetterImageSpan
+import thirdparties.fresco.BetterImageSpan
 import java.util.Objects
 
 class MentionChipSpan(drawable: Drawable, verticalAlignment: Int, var id: String, var label: CharSequence?) :
diff --git a/app/src/main/java/com/owncloud/android/datamodel/OCFile.java b/app/src/main/java/com/owncloud/android/datamodel/OCFile.java
index 7aaf0e05924f..f42feb760680 100644
--- a/app/src/main/java/com/owncloud/android/datamodel/OCFile.java
+++ b/app/src/main/java/com/owncloud/android/datamodel/OCFile.java
@@ -42,7 +42,7 @@
 import androidx.annotation.Nullable;
 import androidx.core.content.FileProvider;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import third_parties.daveKoeller.AlphanumComparator;
+import thirdparties.daveKoeller.AlphanumComparator;
 
 public class OCFile implements Parcelable, Comparable<OCFile>, ServerFileInterface {
 
diff --git a/app/src/main/java/com/owncloud/android/providers/FileContentProvider.java b/app/src/main/java/com/owncloud/android/providers/FileContentProvider.java
index 47ecdab72fcd..797de413eca6 100644
--- a/app/src/main/java/com/owncloud/android/providers/FileContentProvider.java
+++ b/app/src/main/java/com/owncloud/android/providers/FileContentProvider.java
@@ -48,7 +48,7 @@
 import androidx.sqlite.db.SupportSQLiteQuery;
 import androidx.sqlite.db.SupportSQLiteQueryBuilder;
 import dagger.android.AndroidInjection;
-import third_parties.aosp.SQLiteTokenizer;
+import thirdparties.aosp.SQLiteTokenizer;
 
 /**
  * The ContentProvider for the Nextcloud App.
diff --git a/app/src/main/java/com/owncloud/android/ui/activities/adapter/ActivityListAdapter.kt b/app/src/main/java/com/owncloud/android/ui/activities/adapter/ActivityListAdapter.kt
index e6d305e114f4..c683fb31be2b 100644
--- a/app/src/main/java/com/owncloud/android/ui/activities/adapter/ActivityListAdapter.kt
+++ b/app/src/main/java/com/owncloud/android/ui/activities/adapter/ActivityListAdapter.kt
@@ -53,7 +53,7 @@ import com.owncloud.android.utils.theme.ViewThemeUtils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import third_parties.fresco.BetterImageSpan
+import thirdparties.fresco.BetterImageSpan
 import java.util.Locale
 import kotlin.math.floor
 import kotlin.math.log
diff --git a/app/src/main/java/com/owncloud/android/ui/asynctasks/FetchRemoteFileTask.kt b/app/src/main/java/com/owncloud/android/ui/asynctasks/FetchRemoteFileTask.kt
index 8cba7f3aa3d2..3f0d33b6bd4e 100644
--- a/app/src/main/java/com/owncloud/android/ui/asynctasks/FetchRemoteFileTask.kt
+++ b/app/src/main/java/com/owncloud/android/ui/asynctasks/FetchRemoteFileTask.kt
@@ -25,7 +25,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.lang.ref.WeakReference
 
-@Suppress("DEPRECATION", "TooGenericExceptionCaught", "TooGenericExceptionThrown")
+@Suppress("DEPRECATION", "TooGenericExceptionCaught", "TooGenericExceptionThrown", "LongParameterList")
 class FetchRemoteFileTask(
     private val user: User,
     private val fileId: String,
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/BackupFragment.kt b/app/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/BackupFragment.kt
index 43263ad6e441..1d932709cb6f 100644
--- a/app/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/BackupFragment.kt
+++ b/app/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/BackupFragment.kt
@@ -51,7 +51,7 @@ import com.owncloud.android.utils.theme.ViewThemeUtils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import third_parties.daveKoeller.AlphanumComparator
+import thirdparties.daveKoeller.AlphanumComparator
 import java.util.Calendar
 import java.util.GregorianCalendar
 import javax.inject.Inject
@@ -408,7 +408,7 @@ class BackupFragment :
         }
     }
 
-    @Suppress("ComplexMethod", "MagicNumber")
+    @Suppress("ComplexMethod", "MagicNumber", "ReturnCount")
     override fun onDateSet(view: DatePicker, year: Int, month: Int, dayOfMonth: Int) {
         val contactsPreferenceActivity = activity as? ContactsPreferenceActivity ?: run {
             activity?.let { DisplayUtils.showSnackMessage(it, R.string.error_choosing_date) }
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/BackupListAdapter.kt b/app/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/BackupListAdapter.kt
index db46585b5dcd..8e2d87edc295 100644
--- a/app/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/BackupListAdapter.kt
+++ b/app/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/BackupListAdapter.kt
@@ -39,7 +39,7 @@ import com.owncloud.android.utils.BitmapUtils
 import com.owncloud.android.utils.theme.ViewThemeUtils
 import ezvcard.VCard
 import ezvcard.property.Photo
-import third_parties.sufficientlysecure.AndroidCalendar
+import thirdparties.sufficientlysecure.AndroidCalendar
 
 @Suppress("LongParameterList", "TooManyFunctions")
 class BackupListAdapter(
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/CalendarItemViewHolder.java b/app/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/CalendarItemViewHolder.java
index 5e55970a922f..8e86e0da4ca2 100644
--- a/app/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/CalendarItemViewHolder.java
+++ b/app/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/CalendarItemViewHolder.java
@@ -19,7 +19,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import third_parties.sufficientlysecure.AndroidCalendar;
+import thirdparties.sufficientlysecure.AndroidCalendar;
 
 class CalendarItemViewHolder extends SectionedViewHolder {
     public CalendarlistListItemBinding binding;
diff --git a/app/src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.kt b/app/src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.kt
index d4e6929614c2..f57470d71e0a 100644
--- a/app/src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.kt
+++ b/app/src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.kt
@@ -55,7 +55,7 @@ import io.noties.markwon.syntax.Prism4jThemeDefault
 import io.noties.markwon.syntax.SyntaxHighlightPlugin
 import io.noties.prism4j.Prism4j
 import io.noties.prism4j.annotations.PrismBundle
-import third_parties.io.noties.prism4j.languages.MarkwonGrammarLocator
+import thirdparties.io.noties.prism4j.languages.MarkwonGrammarLocator
 import javax.inject.Inject
 
 @PrismBundle(
diff --git a/app/src/main/java/com/owncloud/android/utils/FileSortOrderByName.kt b/app/src/main/java/com/owncloud/android/utils/FileSortOrderByName.kt
index 9c5dbced6b8d..ec64befc14bc 100644
--- a/app/src/main/java/com/owncloud/android/utils/FileSortOrderByName.kt
+++ b/app/src/main/java/com/owncloud/android/utils/FileSortOrderByName.kt
@@ -11,7 +11,7 @@ import com.owncloud.android.datamodel.OCFile
 import com.owncloud.android.lib.resources.files.model.ServerFileInterface
 import com.owncloud.android.lib.resources.trashbin.model.TrashbinFile
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings
-import third_parties.daveKoeller.AlphanumComparator
+import thirdparties.daveKoeller.AlphanumComparator
 import java.io.File
 import java.util.Locale
 
diff --git a/app/src/main/java/third_parties/aosp/SQLiteTokenizer.java b/app/src/main/java/thirdparties/aosp/SQLiteTokenizer.java
similarity index 99%
rename from app/src/main/java/third_parties/aosp/SQLiteTokenizer.java
rename to app/src/main/java/thirdparties/aosp/SQLiteTokenizer.java
index 67eeea4cc46c..c1217180b5a7 100644
--- a/app/src/main/java/third_parties/aosp/SQLiteTokenizer.java
+++ b/app/src/main/java/thirdparties/aosp/SQLiteTokenizer.java
@@ -4,7 +4,7 @@
  * SPDX-FileCopyrightText: 2019 The Android Open Source Project
  * SPDX-License-Identifier: Apache-2.0
  */
-package third_parties.aosp;
+package thirdparties.aosp;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/third_parties/daveKoeller/AlphanumComparator.java b/app/src/main/java/thirdparties/daveKoeller/AlphanumComparator.java
similarity index 96%
rename from app/src/main/java/third_parties/daveKoeller/AlphanumComparator.java
rename to app/src/main/java/thirdparties/daveKoeller/AlphanumComparator.java
index 62ae2b60d7b0..a8f6939754d9 100644
--- a/app/src/main/java/third_parties/daveKoeller/AlphanumComparator.java
+++ b/app/src/main/java/thirdparties/daveKoeller/AlphanumComparator.java
@@ -1,187 +1,187 @@
-/*
- * SPDX-FileCopyrightText: 2017 Tobias Kaminsky <tobias@kaminsky.me>
- * SPDX-FileCopyrightText: 2012 Daniel Migowski
- * SPDX-FileCopyrightText: 2012 Andre Bogus
- * SPDX-FileCopyrightText: 2012 David Koelle
- * SPDX-License-Identifier: LGPL-2.1-or-later
- *
- * The Alphanum Algorithm is an improved sorting algorithm for strings
- * containing numbers.  Instead of sorting numbers in ASCII order like
- * a standard sort, this algorithm sorts numbers in numeric order.
- *
- * The Alphanum Algorithm is discussed at http://www.DaveKoelle.com
- */
-
-package third_parties.daveKoeller;
-
-import com.owncloud.android.lib.resources.files.model.ServerFileInterface;
-
-import java.io.File;
-import java.io.Serializable;
-import java.math.BigInteger;
-import java.text.Collator;
-import java.util.Comparator;
-
-/*
- * This is an updated version with enhancements made by Daniel Migowski, Andre Bogus, and David Koelle
- *  *
- * To convert to use Templates (Java 1.5+):
- * - Change "implements Comparator" to "implements Comparator<String>"
- * - Change "compare(Object o1, Object o2)" to "compare(String s1, String s2)"
- * - Remove the type checking and casting in compare().
- *
- * To use this class:
- * Use the static "sort" method from the java.util.Collections class:
- * Collections.sort(your list, new AlphanumComparator());
- *
- * Adapted to fit
- * https://github.com/nextcloud/server/blob/9a4253ef7c34f9dc71a6a9f7828a10df769f0c32/tests/lib/NaturalSortTest.php
- * by Tobias Kaminsky
- */
-public class AlphanumComparator<T> implements Comparator<T>, Serializable {
-    private static boolean isDigit(char ch) {
-        return ch >= 48 && ch <= 57;
-    }
-
-    private static boolean isSpecialChar(char ch) {
-        return ch <= 47 || ch >= 58 && ch <= 64 || ch >= 91 && ch <= 96 || ch >= 123 && ch <= 126;
-    }
-
-    /**
-     * Length of string is passed in for improved efficiency (only need to calculate it once)
-     **/
-    private static String getChunk(String string, int stringLength, int marker) {
-        StringBuilder chunk = new StringBuilder();
-        char c = string.charAt(marker);
-        chunk.append(c);
-        marker++;
-        if (isDigit(c)) {
-            while (marker < stringLength) {
-                c = string.charAt(marker);
-                if (!isDigit(c)) {
-                    break;
-                }
-                chunk.append(c);
-                marker++;
-            }
-        } else if (!isSpecialChar(c)) {
-            while (marker < stringLength) {
-                c = string.charAt(marker);
-                if (isDigit(c) || isSpecialChar(c)) {
-                    break;
-                }
-                chunk.append(c);
-                marker++;
-            }
-        }
-        return chunk.toString();
-    }
-
-    public static int compare(ServerFileInterface o1, ServerFileInterface o2) {
-        String s1 = o1.getFileName();
-        String s2 = o2.getFileName();
-
-        return compare(s1, s2);
-    }
-
-    public static int compare(File f1, File f2) {
-        String s1 = f1.getPath();
-        String s2 = f2.getPath();
-
-        return compare(s1, s2);
-    }
-
-    public int compare(T t1, T t2) {
-        return compare(t1.toString(), t2.toString());
-    }
-
-    public static int compare(String s1, String s2) {
-        int thisMarker = 0;
-        int thatMarker = 0;
-        int s1Length = s1.length();
-        int s2Length = s2.length();
-
-        while (thisMarker < s1Length && thatMarker < s2Length) {
-            String thisChunk = getChunk(s1, s1Length, thisMarker);
-            thisMarker += thisChunk.length();
-
-            String thatChunk = getChunk(s2, s2Length, thatMarker);
-            thatMarker += thatChunk.length();
-
-            // If both chunks contain numeric characters, sort them numerically
-            int result = 0;
-            if (isDigit(thisChunk.charAt(0)) && isDigit(thatChunk.charAt(0))) {
-                // extract digits
-                int thisChunkZeroCount = 0;
-                boolean zero = true;
-                int countThis = 0;
-                while (countThis < (thisChunk.length()) && isDigit(thisChunk.charAt(countThis))) {
-                    if (zero) {
-                        if (Character.getNumericValue(thisChunk.charAt(countThis)) == 0) {
-                            thisChunkZeroCount++;
-                        } else {
-                            zero = false;
-                        }
-                    }
-                    countThis++;
-                }
-
-
-                int thatChunkZeroCount = 0;
-                int countThat = 0;
-                zero = true;
-                while (countThat < (thatChunk.length()) && isDigit(thatChunk.charAt(countThat))) {
-                    if (zero) {
-                        if (Character.getNumericValue(thatChunk.charAt(countThat)) == 0) {
-                            thatChunkZeroCount++;
-                        } else {
-                            zero = false;
-                        }
-                    }
-                    countThat++;
-                }
-
-                BigInteger thisChunkValue = new BigInteger(thisChunk.substring(0, countThis));
-                BigInteger thatChunkValue = new BigInteger(thatChunk.substring(0, countThat));
-
-                result = thisChunkValue.compareTo(thatChunkValue);
-
-                if (result == 0) {
-                    // value is equal, compare leading zeros
-                    result = Integer.compare(thisChunkZeroCount, thatChunkZeroCount);
-
-                    if (result != 0) {
-                        return result;
-                    }
-                } else {
-                    return result;
-                }
-            } else if (isSpecialChar(thisChunk.charAt(0)) && isSpecialChar(thatChunk.charAt(0))) {
-                for (int i = 0; i < thisChunk.length(); i++) {
-                    if (thisChunk.charAt(i) == '.' && thatChunk.charAt(i) != '.') {
-                        return -1;
-                    } else if (thatChunk.charAt(i) == '.' && thisChunk.charAt(i) != '.') {
-                        return 1;
-                    } else {
-                        result = thisChunk.charAt(i) - thatChunk.charAt(i);
-                        if (result != 0) {
-                            return result;
-                        }
-                    }
-                }
-            } else if (isSpecialChar(thisChunk.charAt(0)) && !isSpecialChar(thatChunk.charAt(0))) {
-                return -1;
-            } else if (!isSpecialChar(thisChunk.charAt(0)) && isSpecialChar(thatChunk.charAt(0))) {
-                return 1;
-            } else {
-                result = Collator.getInstance().compare(thisChunk, thatChunk);
-            }
-
-            if (result != 0) {
-                return result;
-            }
-        }
-
-        return s1Length - s2Length;
-    }
-}
+/*
+ * SPDX-FileCopyrightText: 2017 Tobias Kaminsky <tobias@kaminsky.me>
+ * SPDX-FileCopyrightText: 2012 Daniel Migowski
+ * SPDX-FileCopyrightText: 2012 Andre Bogus
+ * SPDX-FileCopyrightText: 2012 David Koelle
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
+ * The Alphanum Algorithm is an improved sorting algorithm for strings
+ * containing numbers.  Instead of sorting numbers in ASCII order like
+ * a standard sort, this algorithm sorts numbers in numeric order.
+ *
+ * The Alphanum Algorithm is discussed at http://www.DaveKoelle.com
+ */
+
+package thirdparties.daveKoeller;
+
+import com.owncloud.android.lib.resources.files.model.ServerFileInterface;
+
+import java.io.File;
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.text.Collator;
+import java.util.Comparator;
+
+/*
+ * This is an updated version with enhancements made by Daniel Migowski, Andre Bogus, and David Koelle
+ *  *
+ * To convert to use Templates (Java 1.5+):
+ * - Change "implements Comparator" to "implements Comparator<String>"
+ * - Change "compare(Object o1, Object o2)" to "compare(String s1, String s2)"
+ * - Remove the type checking and casting in compare().
+ *
+ * To use this class:
+ * Use the static "sort" method from the java.util.Collections class:
+ * Collections.sort(your list, new AlphanumComparator());
+ *
+ * Adapted to fit
+ * https://github.com/nextcloud/server/blob/9a4253ef7c34f9dc71a6a9f7828a10df769f0c32/tests/lib/NaturalSortTest.php
+ * by Tobias Kaminsky
+ */
+public class AlphanumComparator<T> implements Comparator<T>, Serializable {
+    private static boolean isDigit(char ch) {
+        return ch >= 48 && ch <= 57;
+    }
+
+    private static boolean isSpecialChar(char ch) {
+        return ch <= 47 || ch >= 58 && ch <= 64 || ch >= 91 && ch <= 96 || ch >= 123 && ch <= 126;
+    }
+
+    /**
+     * Length of string is passed in for improved efficiency (only need to calculate it once)
+     **/
+    private static String getChunk(String string, int stringLength, int marker) {
+        StringBuilder chunk = new StringBuilder();
+        char c = string.charAt(marker);
+        chunk.append(c);
+        marker++;
+        if (isDigit(c)) {
+            while (marker < stringLength) {
+                c = string.charAt(marker);
+                if (!isDigit(c)) {
+                    break;
+                }
+                chunk.append(c);
+                marker++;
+            }
+        } else if (!isSpecialChar(c)) {
+            while (marker < stringLength) {
+                c = string.charAt(marker);
+                if (isDigit(c) || isSpecialChar(c)) {
+                    break;
+                }
+                chunk.append(c);
+                marker++;
+            }
+        }
+        return chunk.toString();
+    }
+
+    public static int compare(ServerFileInterface o1, ServerFileInterface o2) {
+        String s1 = o1.getFileName();
+        String s2 = o2.getFileName();
+
+        return compare(s1, s2);
+    }
+
+    public static int compare(File f1, File f2) {
+        String s1 = f1.getPath();
+        String s2 = f2.getPath();
+
+        return compare(s1, s2);
+    }
+
+    public int compare(T t1, T t2) {
+        return compare(t1.toString(), t2.toString());
+    }
+
+    public static int compare(String s1, String s2) {
+        int thisMarker = 0;
+        int thatMarker = 0;
+        int s1Length = s1.length();
+        int s2Length = s2.length();
+
+        while (thisMarker < s1Length && thatMarker < s2Length) {
+            String thisChunk = getChunk(s1, s1Length, thisMarker);
+            thisMarker += thisChunk.length();
+
+            String thatChunk = getChunk(s2, s2Length, thatMarker);
+            thatMarker += thatChunk.length();
+
+            // If both chunks contain numeric characters, sort them numerically
+            int result = 0;
+            if (isDigit(thisChunk.charAt(0)) && isDigit(thatChunk.charAt(0))) {
+                // extract digits
+                int thisChunkZeroCount = 0;
+                boolean zero = true;
+                int countThis = 0;
+                while (countThis < (thisChunk.length()) && isDigit(thisChunk.charAt(countThis))) {
+                    if (zero) {
+                        if (Character.getNumericValue(thisChunk.charAt(countThis)) == 0) {
+                            thisChunkZeroCount++;
+                        } else {
+                            zero = false;
+                        }
+                    }
+                    countThis++;
+                }
+
+
+                int thatChunkZeroCount = 0;
+                int countThat = 0;
+                zero = true;
+                while (countThat < (thatChunk.length()) && isDigit(thatChunk.charAt(countThat))) {
+                    if (zero) {
+                        if (Character.getNumericValue(thatChunk.charAt(countThat)) == 0) {
+                            thatChunkZeroCount++;
+                        } else {
+                            zero = false;
+                        }
+                    }
+                    countThat++;
+                }
+
+                BigInteger thisChunkValue = new BigInteger(thisChunk.substring(0, countThis));
+                BigInteger thatChunkValue = new BigInteger(thatChunk.substring(0, countThat));
+
+                result = thisChunkValue.compareTo(thatChunkValue);
+
+                if (result == 0) {
+                    // value is equal, compare leading zeros
+                    result = Integer.compare(thisChunkZeroCount, thatChunkZeroCount);
+
+                    if (result != 0) {
+                        return result;
+                    }
+                } else {
+                    return result;
+                }
+            } else if (isSpecialChar(thisChunk.charAt(0)) && isSpecialChar(thatChunk.charAt(0))) {
+                for (int i = 0; i < thisChunk.length(); i++) {
+                    if (thisChunk.charAt(i) == '.' && thatChunk.charAt(i) != '.') {
+                        return -1;
+                    } else if (thatChunk.charAt(i) == '.' && thisChunk.charAt(i) != '.') {
+                        return 1;
+                    } else {
+                        result = thisChunk.charAt(i) - thatChunk.charAt(i);
+                        if (result != 0) {
+                            return result;
+                        }
+                    }
+                }
+            } else if (isSpecialChar(thisChunk.charAt(0)) && !isSpecialChar(thatChunk.charAt(0))) {
+                return -1;
+            } else if (!isSpecialChar(thisChunk.charAt(0)) && isSpecialChar(thatChunk.charAt(0))) {
+                return 1;
+            } else {
+                result = Collator.getInstance().compare(thisChunk, thatChunk);
+            }
+
+            if (result != 0) {
+                return result;
+            }
+        }
+
+        return s1Length - s2Length;
+    }
+}
diff --git a/app/src/main/java/third_parties/ezvcard_android/AndroidCustomField.java b/app/src/main/java/thirdparties/ezvcardAndroid/AndroidCustomField.java
similarity index 98%
rename from app/src/main/java/third_parties/ezvcard_android/AndroidCustomField.java
rename to app/src/main/java/thirdparties/ezvcardAndroid/AndroidCustomField.java
index 678450327c21..995b1a0f0c1e 100644
--- a/app/src/main/java/third_parties/ezvcard_android/AndroidCustomField.java
+++ b/app/src/main/java/thirdparties/ezvcardAndroid/AndroidCustomField.java
@@ -2,7 +2,7 @@
  * SPDX-FileCopyrightText: 2014-2015, Michael Angstadt, All rights reserved
  * SPDX-License-Identifier: BSD-2-Clause
  */
-package third_parties.ezvcard_android;
+package thirdparties.ezvcardAndroid;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/app/src/main/java/third_parties/ezvcard_android/ContactOperations.java b/app/src/main/java/thirdparties/ezvcardAndroid/ContactOperations.java
similarity index 99%
rename from app/src/main/java/third_parties/ezvcard_android/ContactOperations.java
rename to app/src/main/java/thirdparties/ezvcardAndroid/ContactOperations.java
index b233fd4bec94..a216b3461785 100644
--- a/app/src/main/java/third_parties/ezvcard_android/ContactOperations.java
+++ b/app/src/main/java/thirdparties/ezvcardAndroid/ContactOperations.java
@@ -2,7 +2,7 @@
  * SPDX-FileCopyrightText: 2014-2015, Michael Angstadt, All rights reserved
  * SPDX-License-Identifier: BSD-2-Clause
  */
-package third_parties.ezvcard_android;
+package thirdparties.ezvcardAndroid;
 
 import android.content.ContentProviderOperation;
 import android.content.ContentValues;
diff --git a/app/src/main/java/third_parties/ezvcard_android/DataMappings.java b/app/src/main/java/thirdparties/ezvcardAndroid/DataMappings.java
similarity index 99%
rename from app/src/main/java/third_parties/ezvcard_android/DataMappings.java
rename to app/src/main/java/thirdparties/ezvcardAndroid/DataMappings.java
index 245e4c6f4464..5b30630dc1db 100644
--- a/app/src/main/java/third_parties/ezvcard_android/DataMappings.java
+++ b/app/src/main/java/thirdparties/ezvcardAndroid/DataMappings.java
@@ -2,7 +2,7 @@
  * SPDX-FileCopyrightText: 2014-2015, Michael Angstadt, All rights reserved
  * SPDX-License-Identifier: BSD-2-Clause
  */
-package third_parties.ezvcard_android;
+package thirdparties.ezvcardAndroid;
 
 import android.provider.ContactsContract;
 
diff --git a/app/src/main/java/third_parties/fresco/BetterImageSpan.kt b/app/src/main/java/thirdparties/fresco/BetterImageSpan.kt
similarity index 99%
rename from app/src/main/java/third_parties/fresco/BetterImageSpan.kt
rename to app/src/main/java/thirdparties/fresco/BetterImageSpan.kt
index 3f57b61b0e6d..17c23bfaf64d 100644
--- a/app/src/main/java/third_parties/fresco/BetterImageSpan.kt
+++ b/app/src/main/java/thirdparties/fresco/BetterImageSpan.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-package third_parties.fresco
+package thirdparties.fresco
 
 import android.graphics.Canvas
 import android.graphics.Paint
diff --git a/app/src/main/java/third_parties/io/noties/prism4j/languages/MarkwonGrammarLocator.java b/app/src/main/java/thirdparties/io/noties/prism4j/languages/MarkwonGrammarLocator.java
similarity index 98%
rename from app/src/main/java/third_parties/io/noties/prism4j/languages/MarkwonGrammarLocator.java
rename to app/src/main/java/thirdparties/io/noties/prism4j/languages/MarkwonGrammarLocator.java
index 3aba62b33233..7d5b99cc91a0 100644
--- a/app/src/main/java/third_parties/io/noties/prism4j/languages/MarkwonGrammarLocator.java
+++ b/app/src/main/java/thirdparties/io/noties/prism4j/languages/MarkwonGrammarLocator.java
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package third_parties.io.noties.prism4j.languages;
+package thirdparties.io.noties.prism4j.languages;
 
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_c.java b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_c.java
similarity index 98%
rename from app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_c.java
rename to app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_c.java
index 219f513a2af2..aa6625887977 100644
--- a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_c.java
+++ b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_c.java
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package third_parties.io.noties.prism4j.languages;
+package thirdparties.io.noties.prism4j.languages;
 
 import androidx.annotation.NonNull;
 import io.noties.prism4j.GrammarUtils;
diff --git a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_clike.java b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_clike.java
similarity index 97%
rename from app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_clike.java
rename to app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_clike.java
index 4c4196896d39..85aafe54e8c1 100644
--- a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_clike.java
+++ b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_clike.java
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package third_parties.io.noties.prism4j.languages;
+package thirdparties.io.noties.prism4j.languages;
 
 import java.util.regex.Pattern;
 
diff --git a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_clojure.java b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_clojure.java
similarity index 98%
rename from app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_clojure.java
rename to app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_clojure.java
index 3828e99c0610..3e6321bddfe4 100644
--- a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_clojure.java
+++ b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_clojure.java
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package third_parties.io.noties.prism4j.languages;
+package thirdparties.io.noties.prism4j.languages;
 
 import androidx.annotation.NonNull;
 import io.noties.prism4j.Prism4j;
diff --git a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_cpp.java b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_cpp.java
similarity index 97%
rename from app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_cpp.java
rename to app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_cpp.java
index b5d23efa0afb..2449c770bcc2 100644
--- a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_cpp.java
+++ b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_cpp.java
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package third_parties.io.noties.prism4j.languages;
+package thirdparties.io.noties.prism4j.languages;
 
 import androidx.annotation.NonNull;
 import io.noties.prism4j.GrammarUtils;
diff --git a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_csharp.java b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_csharp.java
similarity index 98%
rename from app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_csharp.java
rename to app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_csharp.java
index 57bd94c29f2a..8c2e56274b3d 100644
--- a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_csharp.java
+++ b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_csharp.java
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package third_parties.io.noties.prism4j.languages;
+package thirdparties.io.noties.prism4j.languages;
 
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_css.java b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_css.java
similarity index 98%
rename from app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_css.java
rename to app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_css.java
index acb216f5163c..b97ee7ecefce 100644
--- a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_css.java
+++ b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_css.java
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package third_parties.io.noties.prism4j.languages;
+package thirdparties.io.noties.prism4j.languages;
 
 import androidx.annotation.NonNull;
 import io.noties.prism4j.GrammarUtils;
diff --git a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_dart.java b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_dart.java
similarity index 96%
rename from app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_dart.java
rename to app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_dart.java
index 42ca06e35f18..3bfaa7858593 100644
--- a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_dart.java
+++ b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_dart.java
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package third_parties.io.noties.prism4j.languages;
+package thirdparties.io.noties.prism4j.languages;
 
 import androidx.annotation.NonNull;
 import io.noties.prism4j.GrammarUtils;
diff --git a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_git.java b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_git.java
similarity index 96%
rename from app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_git.java
rename to app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_git.java
index 5a455969c871..88e0e4ad6b60 100644
--- a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_git.java
+++ b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_git.java
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package third_parties.io.noties.prism4j.languages;
+package thirdparties.io.noties.prism4j.languages;
 
 import androidx.annotation.NonNull;
 import io.noties.prism4j.Prism4j;
diff --git a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_go.java b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_go.java
similarity index 97%
rename from app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_go.java
rename to app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_go.java
index 95b69c4d5882..045ed7b91e08 100644
--- a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_go.java
+++ b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_go.java
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package third_parties.io.noties.prism4j.languages;
+package thirdparties.io.noties.prism4j.languages;
 
 import androidx.annotation.NonNull;
 import io.noties.prism4j.GrammarUtils;
diff --git a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_groovy.java b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_groovy.java
similarity index 98%
rename from app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_groovy.java
rename to app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_groovy.java
index 65de4d3677a3..7d51393dc8f0 100644
--- a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_groovy.java
+++ b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_groovy.java
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package third_parties.io.noties.prism4j.languages;
+package thirdparties.io.noties.prism4j.languages;
 
 import androidx.annotation.NonNull;
 import io.noties.prism4j.GrammarUtils;
diff --git a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_java.java b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_java.java
similarity index 97%
rename from app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_java.java
rename to app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_java.java
index c81cff9a06e7..c7b4324f8c9a 100644
--- a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_java.java
+++ b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_java.java
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package third_parties.io.noties.prism4j.languages;
+package thirdparties.io.noties.prism4j.languages;
 
 import androidx.annotation.NonNull;
 import io.noties.prism4j.GrammarUtils;
diff --git a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_javascript.java b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_javascript.java
similarity index 98%
rename from app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_javascript.java
rename to app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_javascript.java
index 592bf2f692fb..aa055b9401ce 100644
--- a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_javascript.java
+++ b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_javascript.java
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package third_parties.io.noties.prism4j.languages;
+package thirdparties.io.noties.prism4j.languages;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_json.java b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_json.java
similarity index 96%
rename from app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_json.java
rename to app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_json.java
index 6c9750b0525f..6baada19b7c1 100644
--- a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_json.java
+++ b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_json.java
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package third_parties.io.noties.prism4j.languages;
+package thirdparties.io.noties.prism4j.languages;
 
 import androidx.annotation.NonNull;
 import io.noties.prism4j.Prism4j;
diff --git a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_kotlin.java b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_kotlin.java
similarity index 98%
rename from app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_kotlin.java
rename to app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_kotlin.java
index 719248ca33b0..b8df1f3eced0 100644
--- a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_kotlin.java
+++ b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_kotlin.java
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package third_parties.io.noties.prism4j.languages;
+package thirdparties.io.noties.prism4j.languages;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_latex.java b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_latex.java
similarity index 97%
rename from app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_latex.java
rename to app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_latex.java
index ae14bbfdcc3e..ac94059a5b8a 100644
--- a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_latex.java
+++ b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_latex.java
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package third_parties.io.noties.prism4j.languages;
+package thirdparties.io.noties.prism4j.languages;
 
 import java.util.regex.Pattern;
 
diff --git a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_makefile.java b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_makefile.java
similarity index 97%
rename from app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_makefile.java
rename to app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_makefile.java
index 2092fa22c2dd..9d4257baefad 100644
--- a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_makefile.java
+++ b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_makefile.java
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package third_parties.io.noties.prism4j.languages;
+package thirdparties.io.noties.prism4j.languages;
 
 import androidx.annotation.NonNull;
 import io.noties.prism4j.Prism4j;
diff --git a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_markdown.java b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_markdown.java
similarity index 98%
rename from app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_markdown.java
rename to app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_markdown.java
index 250abead501b..a8b75bd3755f 100644
--- a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_markdown.java
+++ b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_markdown.java
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package third_parties.io.noties.prism4j.languages;
+package thirdparties.io.noties.prism4j.languages;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
diff --git a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_markup.java b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_markup.java
similarity index 98%
rename from app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_markup.java
rename to app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_markup.java
index 8d178c6dda79..6eea70d239ca 100644
--- a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_markup.java
+++ b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_markup.java
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package third_parties.io.noties.prism4j.languages;
+package thirdparties.io.noties.prism4j.languages;
 
 import java.util.regex.Pattern;
 
diff --git a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_python.java b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_python.java
similarity index 98%
rename from app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_python.java
rename to app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_python.java
index 80e906361145..9519405ce646 100644
--- a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_python.java
+++ b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_python.java
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package third_parties.io.noties.prism4j.languages;
+package thirdparties.io.noties.prism4j.languages;
 
 import androidx.annotation.NonNull;
 import io.noties.prism4j.Prism4j;
diff --git a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_scala.java b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_scala.java
similarity index 97%
rename from app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_scala.java
rename to app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_scala.java
index ab46f8d5f8f2..2c2a2e4c86de 100644
--- a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_scala.java
+++ b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_scala.java
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package third_parties.io.noties.prism4j.languages;
+package thirdparties.io.noties.prism4j.languages;
 
 import androidx.annotation.NonNull;
 import io.noties.prism4j.GrammarUtils;
diff --git a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_sql.java b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_sql.java
similarity index 98%
rename from app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_sql.java
rename to app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_sql.java
index 8e22dcad7ce9..c889870bda3c 100644
--- a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_sql.java
+++ b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_sql.java
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package third_parties.io.noties.prism4j.languages;
+package thirdparties.io.noties.prism4j.languages;
 
 import androidx.annotation.NonNull;
 import io.noties.prism4j.Prism4j;
diff --git a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_swift.java b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_swift.java
similarity index 98%
rename from app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_swift.java
rename to app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_swift.java
index 1f078ce338ef..6c2ec6e2c16e 100644
--- a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_swift.java
+++ b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_swift.java
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package third_parties.io.noties.prism4j.languages;
+package thirdparties.io.noties.prism4j.languages;
 
 import java.util.List;
 
diff --git a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_yaml.java b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_yaml.java
similarity index 98%
rename from app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_yaml.java
rename to app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_yaml.java
index 99e34752b381..2b03e65ccbe2 100644
--- a/app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_yaml.java
+++ b/app/src/main/java/thirdparties/io/noties/prism4j/languages/Prism_yaml.java
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package third_parties.io.noties.prism4j.languages;
+package thirdparties.io.noties.prism4j.languages;
 
 import androidx.annotation.NonNull;
 import io.noties.prism4j.Prism4j;
diff --git a/app/src/main/java/third_parties/sufficientlysecure/AndroidCalendar.java b/app/src/main/java/thirdparties/sufficientlysecure/AndroidCalendar.java
similarity index 99%
rename from app/src/main/java/third_parties/sufficientlysecure/AndroidCalendar.java
rename to app/src/main/java/thirdparties/sufficientlysecure/AndroidCalendar.java
index 098421035cb3..c2af23591899 100644
--- a/app/src/main/java/third_parties/sufficientlysecure/AndroidCalendar.java
+++ b/app/src/main/java/thirdparties/sufficientlysecure/AndroidCalendar.java
@@ -5,7 +5,7 @@
  * SPDX-FileCopyrightText: 2021 Nextcloud GmbH
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
-package third_parties.sufficientlysecure;
+package thirdparties.sufficientlysecure;
 
 import android.content.ContentProviderClient;
 import android.content.ContentResolver;
diff --git a/app/src/main/java/third_parties/sufficientlysecure/CalendarSource.java b/app/src/main/java/thirdparties/sufficientlysecure/CalendarSource.java
similarity index 98%
rename from app/src/main/java/third_parties/sufficientlysecure/CalendarSource.java
rename to app/src/main/java/thirdparties/sufficientlysecure/CalendarSource.java
index d5bea39edb9e..11e8e0c6cb33 100644
--- a/app/src/main/java/third_parties/sufficientlysecure/CalendarSource.java
+++ b/app/src/main/java/thirdparties/sufficientlysecure/CalendarSource.java
@@ -5,7 +5,7 @@
  * SPDX-FileCopyrightText: 2021 Nextcloud GmbH
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
-package third_parties.sufficientlysecure;
+package thirdparties.sufficientlysecure;
 
 import android.content.Context;
 import android.net.Uri;
diff --git a/app/src/main/java/third_parties/sufficientlysecure/DuplicateHandlingEnum.java b/app/src/main/java/thirdparties/sufficientlysecure/DuplicateHandlingEnum.java
similarity index 88%
rename from app/src/main/java/third_parties/sufficientlysecure/DuplicateHandlingEnum.java
rename to app/src/main/java/thirdparties/sufficientlysecure/DuplicateHandlingEnum.java
index 97db8732a940..c86c2deb3601 100644
--- a/app/src/main/java/third_parties/sufficientlysecure/DuplicateHandlingEnum.java
+++ b/app/src/main/java/thirdparties/sufficientlysecure/DuplicateHandlingEnum.java
@@ -5,7 +5,7 @@
  * SPDX-FileCopyrightText: 2021 Nextcloud GmbH
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
-package third_parties.sufficientlysecure;
+package thirdparties.sufficientlysecure;
 
 public enum DuplicateHandlingEnum {
     DUP_REPLACE,
diff --git a/app/src/main/java/third_parties/sufficientlysecure/ProcessVEvent.java b/app/src/main/java/thirdparties/sufficientlysecure/ProcessVEvent.java
similarity index 99%
rename from app/src/main/java/third_parties/sufficientlysecure/ProcessVEvent.java
rename to app/src/main/java/thirdparties/sufficientlysecure/ProcessVEvent.java
index ad799ffe971e..06c4886330d1 100644
--- a/app/src/main/java/third_parties/sufficientlysecure/ProcessVEvent.java
+++ b/app/src/main/java/thirdparties/sufficientlysecure/ProcessVEvent.java
@@ -6,7 +6,7 @@
  * SPDX-FileCopyrightText: 2010-2011 Lukas Aichbauer
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
-package third_parties.sufficientlysecure;
+package thirdparties.sufficientlysecure;
 
 import android.annotation.SuppressLint;
 import android.content.ContentResolver;
diff --git a/app/src/main/java/third_parties/sufficientlysecure/SaveCalendar.java b/app/src/main/java/thirdparties/sufficientlysecure/SaveCalendar.java
similarity index 99%
rename from app/src/main/java/third_parties/sufficientlysecure/SaveCalendar.java
rename to app/src/main/java/thirdparties/sufficientlysecure/SaveCalendar.java
index cfa537d11e74..f1f37fce1d6b 100644
--- a/app/src/main/java/third_parties/sufficientlysecure/SaveCalendar.java
+++ b/app/src/main/java/thirdparties/sufficientlysecure/SaveCalendar.java
@@ -6,7 +6,7 @@
  * SPDX-FileCopyrightText: 2010-2011 Lukas Aichbauer
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
-package third_parties.sufficientlysecure;
+package thirdparties.sufficientlysecure;
 
 import android.annotation.SuppressLint;
 import android.content.ContentResolver;
diff --git a/app/src/main/res/values/dims.xml b/app/src/main/res/values/dims.xml
index ee7e4a0c9020..414320cc5a10 100644
--- a/app/src/main/res/values/dims.xml
+++ b/app/src/main/res/values/dims.xml
@@ -52,7 +52,6 @@
     <dimen name="grid_checkbox_size">18dp</dimen>
     <dimen name="grid_checkbox_margin">6dp</dimen>
     <dimen name="grid_recommended_file_container_width">160dp</dimen>
-    <dimen name="grid_container_height">120dp</dimen>
     <dimen name="grid_container_default_max_file_name">80dp</dimen>
 
     <dimen name="button_width">140dp</dimen>
diff --git a/app/src/test/java/com/nextcloud/client/utils/NaturalSortTest.kt b/app/src/test/java/com/nextcloud/client/utils/NaturalSortTest.kt
index d9fa102fdc65..bfd6b5e6b527 100644
--- a/app/src/test/java/com/nextcloud/client/utils/NaturalSortTest.kt
+++ b/app/src/test/java/com/nextcloud/client/utils/NaturalSortTest.kt
@@ -11,7 +11,7 @@ import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
-import third_parties.daveKoeller.AlphanumComparator
+import thirdparties.daveKoeller.AlphanumComparator
 
 /**
  * Adapted on 2022/02/04 from https://github.com/nextcloud/server/blob/caff1023ea72bb2ea94130e18a2a6e2ccf819e5f/tests/lib/NaturalSortTest.php
diff --git a/ruleset.xml b/ruleset.xml
index 6fb727b23e10..4f9cadb49754 100644
--- a/ruleset.xml
+++ b/ruleset.xml
@@ -15,7 +15,7 @@
     </description>
     <exclude-pattern>.*/R.java</exclude-pattern>
     <exclude-pattern>.*/gen/.*</exclude-pattern>
-    <exclude-pattern>.*/third_parties/.*</exclude-pattern>
+    <exclude-pattern>.*/thirdparties/.*</exclude-pattern>
 
     <rule ref="rulesets/java/logging-java.xml" />
     <rule ref="rulesets/java/braces.xml" />
diff --git a/scripts/analysis/spotbugs-filter.xml b/scripts/analysis/spotbugs-filter.xml
index 27f8ae23acd7..e9dc38cffcbb 100644
--- a/scripts/analysis/spotbugs-filter.xml
+++ b/scripts/analysis/spotbugs-filter.xml
@@ -59,12 +59,12 @@
 	<Match>
 	    <Or>
 	        <Package name="~io\.noties\..*" />
-			<Package name="~third_parties\.ezvcard_android\..*" />
+			<Package name="~thirdparties\.ezvcardAndroid\..*" />
 			<Package name="~com\.afollestad\.sectionedrecyclerview\..*" />
 			<Package name="~butterknife\..*" />
 			<Package name="~de\.cotech\..*" />
 			<Package name="~pl\.droidsonroids\..*" />
-            <Package name="~third_parties\..*" />
+            <Package name="~thirdparties\..*" />
 		</Or>
 	</Match>
 	 <Match>