diff --git a/pom.xml b/pom.xml
index 6f0494df5..911fa13f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.tonikelope</groupId>
     <artifactId>MegaBasterd</artifactId>
-    <version>8.20</version>
+    <version>8.21</version>
     <packaging>jar</packaging>
     <repositories>
         <repository>
diff --git a/src/main/java/com/tonikelope/megabasterd/MainPanel.java b/src/main/java/com/tonikelope/megabasterd/MainPanel.java
index 384ea6695..0c8e10521 100644
--- a/src/main/java/com/tonikelope/megabasterd/MainPanel.java
+++ b/src/main/java/com/tonikelope/megabasterd/MainPanel.java
@@ -69,7 +69,7 @@
  */
 public final class MainPanel {
 
-    public static final String VERSION = "8.20";
+    public static final String VERSION = "8.21";
     public static final boolean FORCE_SMART_PROXY = false; //TRUE FOR DEBUGING SMART PROXY
     public static final int THROTTLE_SLICE_SIZE = 16 * 1024;
     public static final int DEFAULT_BYTE_BUFFER_SIZE = 16 * 1024;
@@ -106,20 +106,6 @@ public final class MainPanel {
 
     public static void main(String args[]) {
 
-        try {
-
-            setupSqliteTables();
-
-        } catch (SQLException ex) {
-            Logger.getLogger(MainPanel.class.getName()).log(SEVERE, null, ex);
-        }
-
-        setNimbusLookAndFeel("yes".equals(DBTools.selectSettingValue("dark_mode")));
-
-        if ("yes".equals(DBTools.selectSettingValue("upload_log"))) {
-            MiscTools.createUploadLogDir();
-        }
-
         if (args.length > 0) {
 
             if (args.length > 1) {
@@ -144,6 +130,20 @@ public static void main(String args[]) {
             MEGABASTERD_HOME_DIR = f.getParentFile().getAbsolutePath();
         }
 
+        try {
+
+            setupSqliteTables();
+
+        } catch (SQLException ex) {
+            Logger.getLogger(MainPanel.class.getName()).log(SEVERE, null, ex);
+        }
+
+        setNimbusLookAndFeel("yes".equals(DBTools.selectSettingValue("dark_mode")));
+
+        if ("yes".equals(DBTools.selectSettingValue("upload_log"))) {
+            MiscTools.createUploadLogDir();
+        }
+
         final MainPanel main_panel = new MainPanel();
 
         invokeLater(() -> {
diff --git a/src/main/resources/images/mbasterd_screen.png b/src/main/resources/images/mbasterd_screen.png
index 431b652d3..cab16a4a3 100644
Binary files a/src/main/resources/images/mbasterd_screen.png and b/src/main/resources/images/mbasterd_screen.png differ