diff --git a/app/src/main/java/org/toop/local/AppSettings.java b/app/src/main/java/org/toop/local/AppSettings.java
index 70e88bd..cce3525 100644
--- a/app/src/main/java/org/toop/local/AppSettings.java
+++ b/app/src/main/java/org/toop/local/AppSettings.java
@@ -5,6 +5,8 @@ import java.util.Locale;
 import org.toop.app.App;
 import org.toop.framework.audio.events.AudioEvents;
 import org.toop.framework.eventbus.EventFlow;
+import org.toop.framework.resource.ResourceManager;
+import org.toop.framework.resource.ResourceMeta;
 import org.toop.framework.resource.resources.SettingsAsset;
 import org.toop.framework.settings.Settings;
 
@@ -13,11 +15,12 @@ public class AppSettings {
     private SettingsAsset settingsAsset;
 
     public void applySettings() {
-        SettingsAsset settings = getPath();
-        if (!settings.isLoaded()) {
-            settings.load();
+        this.settingsAsset = getPath();
+        if (!this.settingsAsset.isLoaded()) {
+            this.settingsAsset.load();
         }
-        Settings settingsData = settings.getContent();
+
+        Settings settingsData = this.settingsAsset.getContent();
 
         AppContext.setLocale(Locale.of(settingsData.locale));
         App.setFullscreen(settingsData.fullScreen);
@@ -51,8 +54,9 @@ public class AppSettings {
 
             File settingsFile =
                     new File(basePath + File.separator + "ISY1" + File.separator + "settings.json");
-            this.settingsAsset = new SettingsAsset(settingsFile);
+//            this.settingsAsset = new SettingsAsset(settingsFile);
+            ResourceManager.addAsset(new ResourceMeta<>("settings.json", new SettingsAsset(settingsFile)));
         }
-        return this.settingsAsset;
+        return ResourceManager.get("settings.json");
     }
 }
diff --git a/framework/src/main/java/org/toop/framework/resource/ResourceManager.java b/framework/src/main/java/org/toop/framework/resource/ResourceManager.java
index 8bc2d97..9641733 100644
--- a/framework/src/main/java/org/toop/framework/resource/ResourceManager.java
+++ b/framework/src/main/java/org/toop/framework/resource/ResourceManager.java
@@ -2,6 +2,9 @@ package org.toop.framework.resource;
 
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.toop.framework.resource.exceptions.ResourceNotFoundException;
 import org.toop.framework.resource.resources.*;
 
@@ -48,7 +51,7 @@ import org.toop.framework.resource.resources.*;
  * </ul>
  */
 public class ResourceManager {
-    //    private static final Logger logger = LogManager.getLogger(ResourceManager.class);
+        private static final Logger logger = LogManager.getLogger(ResourceManager.class);
     private static final Map<String, ResourceMeta<? extends BaseResource>> assets =
             new ConcurrentHashMap<>();
 
@@ -127,5 +130,6 @@ public class ResourceManager {
      */
     public static void addAsset(ResourceMeta<? extends BaseResource> asset) {
         assets.put(asset.getName(), asset);
+        logger.info("Successfully added asset: {}, to the asset list", asset.getName());
     }
 }