diff --git a/build.gradle b/build.gradle
index e0b9e74078..b3239e9c47 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,13 +35,13 @@ test {
 }
 
 application {
-    mainClass.set("arona.Launcher")
+    mainClass.set("arona.Arona")
 }
 
 shadowJar {
     archiveBaseName = "arona"
     archiveClassifier = null
-    mainClassName = "arona.Arona"
+    mainClassName = "arona.Launcher"
     archiveFileName = "arona.jar"
     dependsOn("distZip", "distTar")
 }
diff --git a/src/main/java/arona/gui/Main.java b/src/main/java/arona/gui/Main.java
index d2bb6b1223..4fb43c1045 100644
--- a/src/main/java/arona/gui/Main.java
+++ b/src/main/java/arona/gui/Main.java
@@ -26,6 +26,7 @@ public void start(Stage stage) {
             stage.setScene(scene);
             fxmlLoader.<MainWindow>getController().setArona(arona);
             fxmlLoader.<MainWindow>getController().setStage(stage);
+            stage.setTitle("A.R.O.N.A.");
             stage.show();
         } catch (IOException e) {
             e.printStackTrace();