diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index ef75eabca..8cf9e53d3 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -31,11 +31,10 @@ android {
         applicationId = "projekt.substratum"
         minSdkVersion(24)
         targetSdkVersion(28)
-        versionCode = 1013
-        versionName = "one thousand thirteen"
+        versionCode = 1015
+        versionName = "one thousand fifteen"
         buildConfigField("java.util.Date", "buildTime", "new java.util.Date(${System.currentTimeMillis()}L)")
         buildConfigField("String", "GIT_HASH", "\"${gitHash()}\"")
-        buildConfigField("boolean", "ENHANCED_LOGGING", "false")
         setProperty("archivesBaseName", "substratum_${gitHash()}")
     }
     compileOptions {
@@ -62,9 +61,6 @@ android {
             //proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
     }
-    dexOptions {
-        setJavaMaxHeapSize("2048m")
-    }
     lintOptions.isAbortOnError = false
 }
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 28c5fb00f..1193fbf2c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,6 +12,7 @@
     android:installLocation="internalOnly">
 
     <!-- Loading the showcase and theme wallpapers -->
+    <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <!-- Float UI use -->
     <uses-permission
diff --git a/app/src/main/assets/rescue.dat b/app/src/main/assets/rescue.dat
index 41793961c..594e4df52 100644
Binary files a/app/src/main/assets/rescue.dat and b/app/src/main/assets/rescue.dat differ
diff --git a/app/src/main/java/projekt/substratum/common/References.java b/app/src/main/java/projekt/substratum/common/References.java
index 9f719362a..3ddf54ebe 100644
--- a/app/src/main/java/projekt/substratum/common/References.java
+++ b/app/src/main/java/projekt/substratum/common/References.java
@@ -52,7 +52,6 @@
 import android.widget.TableRow;
 import android.widget.TextView;
 import androidx.annotation.Nullable;
-import projekt.substratum.BuildConfig;
 import projekt.substratum.InformationActivity;
 import projekt.substratum.LauncherActivity;
 import projekt.substratum.MainActivity;
@@ -92,7 +91,7 @@ public class References {
     public static final boolean ENABLE_EXTRAS_DIALOG = false; // Show a dialog when applying extras
     public static final boolean ENABLE_AAPT_OUTPUT = false; // WARNING, DEVELOPERS - BREAKS COMPILE
     public static final boolean ENABLE_PACKAGE_LOGGING = false; // Show time/date/place of install
-    public static final boolean ENABLE_DIRECT_ASSETS_LOGGING = BuildConfig.ENHANCED_LOGGING; // Self explanatory
+    public static final boolean ENABLE_DIRECT_ASSETS_LOGGING = false; // Self explanatory
     public static final boolean BYPASS_SYSTEM_VERSION_CHECK = false; // For developer previews only!
     public static final boolean BYPASS_SUBSTRATUM_BUILDER_DELETION = false; // Do not delete cache?
     public static final String SECURITY_UPDATE_WARN_AFTER = "2018-02-01";
@@ -205,7 +204,7 @@ public class References {
     public static final int REFRESH_WINDOW_DELAY = 500;
     // This int controls the default grid count for the theme adapter
     public static final int MIN_GRID_COUNT = 1;
-    public static final int DEFAULT_GRID_COUNT = 1;
+    public static final int DEFAULT_GRID_COUNT = 2;
     public static final int MAX_GRID_COUNT = 4;
     // This String controls the default theme setting
     public static final String APP_THEME = "app_theme";
@@ -516,14 +515,8 @@ public static void injectRescueArchives(Context context) {
         if (rescueFileLegacy.exists() && rescueFileLegacy.delete()) {
             Log.e(SUBSTRATUM_LOG, "Deleted the rescue legacy file!");
         }
-        copyRescueFile(context, "rescue_legacy.dat",
-                Environment.getExternalStorageDirectory().getAbsolutePath() +
-                        File.separator + "substratum" +
-                        File.separator + "SubstratumRescue_Legacy.zip");
-        copyRescueFile(context, "rescue.dat",
-                Environment.getExternalStorageDirectory().getAbsolutePath() +
-                        File.separator + "substratum" +
-                        File.separator + "SubstratumRescue.zip");
+        copyRescueFile(context, "rescue_legacy.dat", rescueFileLegacy.getAbsolutePath());
+        copyRescueFile(context, "rescue.dat", rescueFile.getAbsolutePath());
     }
 
     /**
@@ -633,7 +626,8 @@ public static boolean isNetworkAvailable(Context context) {
             return activeNetworkInfo != null &&
                     activeNetworkInfo.isConnected() &&
                     !checkSiteAvailability.equals("");
-        } catch (Exception ignored) {
+        } catch (Exception e) {
+            e.printStackTrace();
         }
         return false;
     }
diff --git a/app/src/main/java/projekt/substratum/common/Systems.java b/app/src/main/java/projekt/substratum/common/Systems.java
index 8a63219d9..9ae1f6aa8 100644
--- a/app/src/main/java/projekt/substratum/common/Systems.java
+++ b/app/src/main/java/projekt/substratum/common/Systems.java
@@ -691,7 +691,8 @@ public static String checkFirmwareSupport(
                     }
                 }
             }
-        } catch (Exception ignored) {
+        } catch (Exception e) {
+            e.printStackTrace();
         }
         return supportedRom;
     }
diff --git a/app/src/main/java/projekt/substratum/fragments/SettingsFragment.java b/app/src/main/java/projekt/substratum/fragments/SettingsFragment.java
index f18272e13..060898a3f 100644
--- a/app/src/main/java/projekt/substratum/fragments/SettingsFragment.java
+++ b/app/src/main/java/projekt/substratum/fragments/SettingsFragment.java
@@ -102,8 +102,12 @@ public void onCreatePreferences(
         // About Substratum
         StringBuilder sb = new StringBuilder();
         Preference aboutSubstratum = getPreferenceManager().findPreference("about_substratum");
-        sb.append(BuildConfig.VERSION_NAME).append(" (").append(BuildConfig.VERSION_CODE).append(")");
-        if (BuildConfig.DEBUG) sb.append(" - ").append(BuildConfig.GIT_HASH);
+        sb.append(BuildConfig.VERSION_NAME);
+        if (BuildConfig.DEBUG) {
+            sb.append(" (").append(BuildConfig.GIT_HASH).append(")");
+        } else {
+            sb.append(" (").append(BuildConfig.VERSION_CODE).append(")");
+        }
         aboutSubstratum.setSummary(sb.toString());
         aboutSubstratum.setIcon(context.getDrawable(R.mipmap.main_launcher));
         aboutSubstratum.setOnPreferenceClickListener(
diff --git a/app/src/main/java/projekt/substratum/util/helpers/ValidatorUtils.java b/app/src/main/java/projekt/substratum/util/helpers/ValidatorUtils.java
index 0efeb22cb..a4cc4286f 100644
--- a/app/src/main/java/projekt/substratum/util/helpers/ValidatorUtils.java
+++ b/app/src/main/java/projekt/substratum/util/helpers/ValidatorUtils.java
@@ -59,48 +59,47 @@ public checkROMSupportList(SettingsFragment settingsFragment) {
         protected void onPostExecute(String result) {
             super.onPostExecute(result);
             SettingsFragment settingsFragment = ref.get();
-            if (settingsFragment == null) return;
-            try {
-                if (!Systems.checkThemeInterfacer(settingsFragment.context) &&
-                        !Systems.checkSubstratumService(settingsFragment.context)) {
-                    return;
-                }
-
-                if (!References.isNetworkAvailable(settingsFragment.context)) {
-                    settingsFragment.platformSummary.append('\n')
-                            .append(settingsFragment.getString(R.string.rom_status))
-                            .append(' ')
-                            .append(settingsFragment.getString(R.string.rom_status_network));
-                    settingsFragment.systemPlatform.setSummary(
-                            settingsFragment.platformSummary.toString());
-                    return;
-                }
+            if (settingsFragment == null || !settingsFragment.isAdded())
+                return;
+            if (!Systems.checkThemeInterfacer(settingsFragment.context) &&
+                    !Systems.checkSubstratumService(settingsFragment.context)) {
+                return;
+            }
 
-                if (!result.isEmpty()) {
-                    String supportedRom = String.format(
-                            settingsFragment.getString(R.string.rom_status_supported), result);
-                    settingsFragment.platformSummary.append('\n')
-                            .append(settingsFragment.getString(R.string.rom_status))
-                            .append(' ')
-                            .append(supportedRom);
-                    settingsFragment.systemPlatform.setSummary(
-                            settingsFragment.platformSummary.toString());
-                    return;
-                }
+            if (!References.isNetworkAvailable(settingsFragment.context)) {
+                settingsFragment.platformSummary.append('\n')
+                        .append(settingsFragment.getString(R.string.rom_status))
+                        .append(' ')
+                        .append(settingsFragment.getString(R.string.rom_status_network));
+                settingsFragment.systemPlatform.setSummary(
+                        settingsFragment.platformSummary.toString());
+                return;
+            }
 
+            if (result != null && !result.isEmpty()) {
+                String supportedRom = String.format(
+                        settingsFragment.getString(R.string.rom_status_supported), result);
                 settingsFragment.platformSummary.append('\n')
                         .append(settingsFragment.getString(R.string.rom_status))
                         .append(' ')
-                        .append(settingsFragment.getString(R.string.rom_status_unsupported));
+                        .append(supportedRom);
                 settingsFragment.systemPlatform.setSummary(
                         settingsFragment.platformSummary.toString());
-            } catch (IllegalStateException ignored) { /* Not much we can do about this */}
+                return;
+            }
+
+            settingsFragment.platformSummary.append('\n')
+                    .append(settingsFragment.getString(R.string.rom_status))
+                    .append(' ')
+                    .append(settingsFragment.getString(R.string.rom_status_unsupported));
+            settingsFragment.systemPlatform.setSummary(
+                    settingsFragment.platformSummary.toString());
         }
 
         @Override
         protected String doInBackground(String... sUrl) {
             SettingsFragment settingsFragment = ref.get();
-            if (settingsFragment.isAdded() && settingsFragment != null) {
+            if (settingsFragment.isAdded()) {
                 return Systems.checkFirmwareSupport(settingsFragment.context, sUrl[0], sUrl[1]);
             }
             return null;
@@ -125,7 +124,7 @@ public downloadRepositoryList(SettingsFragment settingsFragment) {
         protected void onPreExecute() {
             super.onPreExecute();
             SettingsFragment settingsFragment = ref.get();
-            if (settingsFragment.isAdded() && settingsFragment != null) {
+            if (settingsFragment.isAdded()) {
                 if (settingsFragment.getActivity() != null) {
                     settingsFragment.dialog = new Dialog(settingsFragment.getActivity());
                     settingsFragment.dialog.setContentView(R.layout.validator_dialog);
@@ -139,7 +138,7 @@ protected void onPreExecute() {
         protected void onPostExecute(ArrayList<String> result) {
             super.onPostExecute(result);
             SettingsFragment settingsFragment = ref.get();
-            if (settingsFragment.isAdded() && settingsFragment != null) {
+            if (settingsFragment.isAdded()) {
                 Collection<String> erroredPackages = new ArrayList<>();
                 for (int x = 0; x < settingsFragment.errors.size(); x++) {
                     ValidatorError error = settingsFragment.errors.get(x);
@@ -193,7 +192,7 @@ protected ArrayList<String> doInBackground(String... sUrl) {
             // First, we have to download the repository list into the cache
             SettingsFragment settingsFragment = ref.get();
             ArrayList<String> packages = new ArrayList<>();
-            if (settingsFragment.isAdded() && settingsFragment != null) {
+            if (settingsFragment.isAdded()) {
                 FileDownloader.init(
                         settingsFragment.context,
                         settingsFragment.getString(Systems.IS_OREO ?