diff --git a/.idea/copyright/GPL_3_0.xml b/.idea/copyright/GPL_3_0.xml
new file mode 100644
index 0000000..872f956
--- /dev/null
+++ b/.idea/copyright/GPL_3_0.xml
@@ -0,0 +1,6 @@
+<component name="CopyrightManager">
+    <copyright>
+        <option name="notice" value="This file is part of ViaForge - https://github.com/FlorianMichael/ViaForge&#10;Copyright (C) 2021-&amp;#36;today.year FlorianMichael/EnZaXD and contributors&#10;&#10;This program is free software: you can redistribute it and/or modify&#10;it under the terms of the GNU General Public License as published by&#10;the Free Software Foundation, either version 3 of the License, or&#10;(at your option) any later version.&#10;&#10;This program is distributed in the hope that it will be useful,&#10;but WITHOUT ANY WARRANTY; without even the implied warranty of&#10;MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the&#10;GNU General Public License for more details.&#10;&#10;You should have received a copy of the GNU General Public License&#10;along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;." />
+        <option name="myName" value="GPL-3.0" />
+    </copyright>
+</component>
\ No newline at end of file
diff --git a/.idea/copyright/profile_settings.xml b/.idea/copyright/profile_settings.xml
new file mode 100644
index 0000000..508fdf4
--- /dev/null
+++ b/.idea/copyright/profile_settings.xml
@@ -0,0 +1,8 @@
+<component name="CopyrightManager">
+    <settings default="GPL_3_0">
+        <module2copyright>
+            <element module="Project Files" copyright="GPL-3.0" />
+        </module2copyright>
+        <LanguageOptions name="__TEMPLATE__" />
+    </settings>
+</component>
\ No newline at end of file
diff --git a/README.md b/README.md
index 71f103f..aa0c164 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
 # Legacy development branch for ViaForge 1.8
 
 Upstream changes are merged into this branch every release.
+
 Switch to the `master` branch for the latest changes.
diff --git a/src/main/java/de/florianmichael/viaforge/ViaForge18.java b/src/main/java/de/florianmichael/viaforge/ViaForge18.java
index 550c896..c76caa2 100644
--- a/src/main/java/de/florianmichael/viaforge/ViaForge18.java
+++ b/src/main/java/de/florianmichael/viaforge/ViaForge18.java
@@ -32,7 +32,7 @@ import java.util.function.Supplier;
 @Mod(modid = "viaforge")
 public class ViaForge18 implements VFPlatform {
     
-    public final static ViaForge18 PLATFORM = new ViaForge18();
+    public static final ViaForge18 PLATFORM = new ViaForge18();
 
     @Override
     public int getGameVersion() {
diff --git a/src/main/java/de/florianmichael/viaforge/common/ViaForgeCommon.java b/src/main/java/de/florianmichael/viaforge/common/ViaForgeCommon.java
index 533541f..ccaaa8e 100644
--- a/src/main/java/de/florianmichael/viaforge/common/ViaForgeCommon.java
+++ b/src/main/java/de/florianmichael/viaforge/common/ViaForgeCommon.java
@@ -43,8 +43,8 @@ import java.io.File;
  */
 public class ViaForgeCommon {
     
-    public final static AttributeKey<UserConnection> LOCAL_VIA_USER = AttributeKey.valueOf("local_via_user");
-    public final static AttributeKey<VFNetworkManager> VF_NETWORK_MANAGER = AttributeKey.valueOf("encryption_setup");
+    public static final AttributeKey<UserConnection> LOCAL_VIA_USER = AttributeKey.valueOf("local_via_user");
+    public static final AttributeKey<VFNetworkManager> VF_NETWORK_MANAGER = AttributeKey.valueOf("encryption_setup");
 
     private static ViaForgeCommon manager;
 
diff --git a/src/main/java/de/florianmichael/viaforge/common/platform/ViaForgeConfig.java b/src/main/java/de/florianmichael/viaforge/common/platform/ViaForgeConfig.java
index 3de8aae..fdda058 100644
--- a/src/main/java/de/florianmichael/viaforge/common/platform/ViaForgeConfig.java
+++ b/src/main/java/de/florianmichael/viaforge/common/platform/ViaForgeConfig.java
@@ -29,18 +29,18 @@ import java.util.Map;
 
 public class ViaForgeConfig extends Config {
 
-    public final static String CLIENT_SIDE_VERSION = "client-side-version";
-    public final static String VERIFY_SESSION_IN_OLD_VERSIONS = "verify-session-in-old-versions";
-    public final static String ALLOW_BETACRAFT_AUTHENTICATION = "allow-betacraft-authentication";
-    public final static String SHOW_PROTOCOL_VERSION_IN_F3 = "show-protocol-version-in-f3";
+    public static final String CLIENT_SIDE_VERSION = "client-side-version";
+    public static final String VERIFY_SESSION_IN_OLD_VERSIONS = "verify-session-in-old-versions";
+    public static final String ALLOW_BETACRAFT_AUTHENTICATION = "allow-betacraft-authentication";
+    public static final String SHOW_PROTOCOL_VERSION_IN_F3 = "show-protocol-version-in-f3";
 
-    public final static String SHOW_MAIN_MENU_BUTTON = "show-main-menu-button";
-    public final static String SHOW_MULTIPLAYER_BUTTON = "show-multiplayer-button";
-    public final static String SHOW_DIRECT_CONNECT_BUTTON = "show-direct-connect-button";
-    public final static String SHOW_ADD_SERVER_BUTTON = "show-add-server-button";
+    public static final String SHOW_MAIN_MENU_BUTTON = "show-main-menu-button";
+    public static final String SHOW_MULTIPLAYER_BUTTON = "show-multiplayer-button";
+    public static final String SHOW_DIRECT_CONNECT_BUTTON = "show-direct-connect-button";
+    public static final String SHOW_ADD_SERVER_BUTTON = "show-add-server-button";
 
-    public final static String VIA_FORGE_BUTTON_POSITION = "via-forge-button-position";
-    public final static String ADD_SERVER_SCREEN_BUTTON_POSITION = "add-server-screen-button-position";
+    public static final String VIA_FORGE_BUTTON_POSITION = "via-forge-button-position";
+    public static final String ADD_SERVER_SCREEN_BUTTON_POSITION = "add-server-screen-button-position";
 
     /**
      * @param configFile The location of where the config is loaded/saved.
diff --git a/src/main/java/de/florianmichael/viaforge/provider/ViaForgeGameProfileFetcher.java b/src/main/java/de/florianmichael/viaforge/provider/ViaForgeGameProfileFetcher.java
index b768c52..3adcfa4 100644
--- a/src/main/java/de/florianmichael/viaforge/provider/ViaForgeGameProfileFetcher.java
+++ b/src/main/java/de/florianmichael/viaforge/provider/ViaForgeGameProfileFetcher.java
@@ -35,9 +35,9 @@ import java.util.concurrent.CompletableFuture;
 
 public class ViaForgeGameProfileFetcher extends GameProfileFetcher {
 
-    public final static HttpAuthenticationService AUTHENTICATION_SERVICE = new YggdrasilAuthenticationService(Proxy.NO_PROXY, "");
-    public final static MinecraftSessionService SESSION_SERVICE = AUTHENTICATION_SERVICE.createMinecraftSessionService();
-    public final static GameProfileRepository GAME_PROFILE_REPOSITORY = AUTHENTICATION_SERVICE.createProfileRepository();
+    public static final HttpAuthenticationService AUTHENTICATION_SERVICE = new YggdrasilAuthenticationService(Proxy.NO_PROXY, "");
+    public static final MinecraftSessionService SESSION_SERVICE = AUTHENTICATION_SERVICE.createMinecraftSessionService();
+    public static final GameProfileRepository GAME_PROFILE_REPOSITORY = AUTHENTICATION_SERVICE.createProfileRepository();
 
     @Override
     public UUID loadMojangUUID(String playerName) throws Exception {