diff --git a/app/src/main/java/org/toop/app/App.java b/app/src/main/java/org/toop/app/App.java
index 96980b1..64513d5 100644
--- a/app/src/main/java/org/toop/app/App.java
+++ b/app/src/main/java/org/toop/app/App.java
@@ -3,10 +3,10 @@ package org.toop.app;
 import org.toop.app.view.ViewStack;
 import org.toop.app.view.views.MainView;
 import org.toop.app.view.views.QuitView;
-import org.toop.framework.asset.ResourceManager;
-import org.toop.framework.asset.resources.CssAsset;
 import org.toop.framework.audio.events.AudioEvents;
 import org.toop.framework.eventbus.EventFlow;
+import org.toop.framework.resource.ResourceManager;
+import org.toop.framework.resource.resources.CssAsset;
 import org.toop.local.AppContext;
 import org.toop.local.AppSettings;
 
diff --git a/app/src/main/java/org/toop/app/view/views/ChallengeView.java b/app/src/main/java/org/toop/app/view/views/ChallengeView.java
index 3c73491..f5ee907 100644
--- a/app/src/main/java/org/toop/app/view/views/ChallengeView.java
+++ b/app/src/main/java/org/toop/app/view/views/ChallengeView.java
@@ -4,13 +4,13 @@ import org.toop.app.GameInformation;
 import org.toop.app.Server;
 import org.toop.app.view.View;
 import org.toop.app.view.ViewStack;
+import org.toop.local.AppContext;
 
 import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.Button;
 import javafx.scene.control.Slider;
 import javafx.scene.text.Text;
-import org.toop.local.AppContext;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/org/toop/app/view/views/GameView.java b/app/src/main/java/org/toop/app/view/views/GameView.java
index 2eb11a2..e8f12cb 100644
--- a/app/src/main/java/org/toop/app/view/views/GameView.java
+++ b/app/src/main/java/org/toop/app/view/views/GameView.java
@@ -2,11 +2,11 @@ package org.toop.app.view.views;
 
 import org.toop.app.view.View;
 import org.toop.app.view.ViewStack;
+import org.toop.local.AppContext;
 
 import javafx.geometry.Pos;
 import javafx.scene.control.Button;
 import javafx.scene.text.Text;
-import org.toop.local.AppContext;
 
 public final class GameView extends View {
 	private static class GameOverView extends View {
diff --git a/app/src/main/java/org/toop/app/view/views/SendChallengeView.java b/app/src/main/java/org/toop/app/view/views/SendChallengeView.java
index d1a65ce..a3bde9b 100644
--- a/app/src/main/java/org/toop/app/view/views/SendChallengeView.java
+++ b/app/src/main/java/org/toop/app/view/views/SendChallengeView.java
@@ -4,6 +4,7 @@ import org.toop.app.GameInformation;
 import org.toop.app.Server;
 import org.toop.app.view.View;
 import org.toop.app.view.ViewStack;
+import org.toop.local.AppContext;
 
 import javafx.geometry.Pos;
 import javafx.scene.Node;
@@ -11,7 +12,6 @@ import javafx.scene.control.Button;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.Slider;
 import javafx.scene.text.Text;
-import org.toop.local.AppContext;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/org/toop/app/view/views/ServerView.java b/app/src/main/java/org/toop/app/view/views/ServerView.java
index 918ff4a..36614eb 100644
--- a/app/src/main/java/org/toop/app/view/views/ServerView.java
+++ b/app/src/main/java/org/toop/app/view/views/ServerView.java
@@ -1,14 +1,14 @@
 package org.toop.app.view.views;
 
-import javafx.application.Platform;
 import org.toop.app.view.View;
 import org.toop.app.view.ViewStack;
+import org.toop.local.AppContext;
 
+import javafx.application.Platform;
 import javafx.geometry.Pos;
 import javafx.scene.control.Button;
 import javafx.scene.control.ListView;
 import javafx.scene.text.Text;
-import org.toop.local.AppContext;
 
 import java.util.List;
 import java.util.function.Consumer;
diff --git a/app/src/main/java/org/toop/local/AppSettings.java b/app/src/main/java/org/toop/local/AppSettings.java
index 4c367c5..aed8cff 100644
--- a/app/src/main/java/org/toop/local/AppSettings.java
+++ b/app/src/main/java/org/toop/local/AppSettings.java
@@ -1,9 +1,6 @@
 package org.toop.local;
 
-import java.io.File;
-import java.util.Locale;
 import org.toop.app.App;
-import org.toop.framework.asset.resources.SettingsAsset;
 import org.toop.framework.audio.events.AudioEvents;
 import org.toop.framework.eventbus.EventFlow;
 import org.toop.framework.resource.ResourceManager;
@@ -15,62 +12,55 @@ import java.io.File;
 import java.util.Locale;
 
 public class AppSettings {
-    private static SettingsAsset settingsAsset;
+	private static SettingsAsset settingsAsset;
 
-    private SettingsAsset settingsAsset;
+	public static void applySettings() {
+		settingsAsset = getPath();
+		if (!settingsAsset.isLoaded()) {
+			settingsAsset.load();
+		}
 
-    public void applySettings() {
-        this.settingsAsset = getPath();
-        if (!this.settingsAsset.isLoaded()) {
-            this.settingsAsset.load();
-    public static void applySettings() {
-        SettingsAsset settings = getPath();
-        if (!settings.isLoaded()) {
-            settings.load();
-        }
+		Settings settingsData = settingsAsset.getContent();
 
-        Settings settingsData = this.settingsAsset.getContent();
+		AppContext.setLocale(Locale.of(settingsData.locale));
+		App.setFullscreen(settingsData.fullScreen);
+		new EventFlow()
+			.addPostEvent(new AudioEvents.ChangeVolume(settingsData.volume))
+			.asyncPostEvent();
+		new EventFlow()
+			.addPostEvent(new AudioEvents.ChangeFxVolume(settingsData.fxVolume))
+			.asyncPostEvent();
+		new EventFlow()
+			.addPostEvent(new AudioEvents.ChangeMusicVolume(settingsData.musicVolume))
+			.asyncPostEvent();
+		App.setStyle(settingsAsset.getTheme(), settingsAsset.getLayoutSize());
+	}
 
-        AppContext.setLocale(Locale.of(settingsData.locale));
-        App.setFullscreen(settingsData.fullScreen);
-        new EventFlow()
-                .addPostEvent(new AudioEvents.ChangeVolume(settingsData.volume))
-                .asyncPostEvent();
-        new EventFlow()
-                .addPostEvent(new AudioEvents.ChangeFxVolume(settingsData.fxVolume))
-                .asyncPostEvent();
-        new EventFlow()
-                .addPostEvent(new AudioEvents.ChangeMusicVolume(settingsData.musicVolume))
-                .asyncPostEvent();
-        App.setStyle(settingsAsset.getTheme(), settingsAsset.getLayoutSize());
-    }
+	public static SettingsAsset getPath() {
+		if (settingsAsset == null) {
+			String os = System.getProperty("os.name").toLowerCase();
+			String basePath;
 
-    public static SettingsAsset getPath() {
-        if (settingsAsset == null) {
-            String os = System.getProperty("os.name").toLowerCase();
-            String basePath;
+			if (os.contains("win")) {
+				basePath = System.getenv("APPDATA");
+				if (basePath == null) {
+					basePath = System.getProperty("user.home");
+				}
+			} else if (os.contains("mac")) {
+				basePath = System.getProperty("user.home") + "/Library/Application Support";
+			} else {
+				basePath = System.getProperty("user.home") + "/.config";
+			}
 
-            if (os.contains("win")) {
-                basePath = System.getenv("APPDATA");
-                if (basePath == null) {
-                    basePath = System.getProperty("user.home");
-                }
-            } else if (os.contains("mac")) {
-                basePath = System.getProperty("user.home") + "/Library/Application Support";
-            } else {
-                basePath = System.getProperty("user.home") + "/.config";
-            }
-
-            File settingsFile =
-                    new File(basePath + File.separator + "ISY1" + File.separator + "settings.json");
+			File settingsFile =
+				new File(basePath + File.separator + "ISY1" + File.separator + "settings.json");
 //            this.settingsAsset = new SettingsAsset(settingsFile);
-            ResourceManager.addAsset(new ResourceMeta<>("settings.json", new SettingsAsset(settingsFile)));
-        }
-        return ResourceManager.get("settings.json");
-    }
+			ResourceManager.addAsset(new ResourceMeta<>("settings.json", new SettingsAsset(settingsFile)));
+		}
+		return ResourceManager.get("settings.json");
+	}
 
 	public static SettingsAsset getSettings() {
-		assert settingsAsset != null;
 		return settingsAsset;
 	}
-}
+}
\ No newline at end of file