diff --git a/sonic-radiance.love/assets/battle.lua b/sonic-radiance.love/assets/battle.lua
index 3c23bb8..7de9bed 100644
--- a/sonic-radiance.love/assets/battle.lua
+++ b/sonic-radiance.love/assets/battle.lua
@@ -7,28 +7,13 @@ return {
     {"ranks",         "assets/gui/ranks"},
     {"qtebtn",        "assets/gui/qtebtn"}
   },
-  ["sprites"]  = {
-    {"cursorground",  "assets/gui/cursor/ground"}
-  },
   ["textures"] = {
-    {"menucursor",    "assets/gui/cursor-menulist.png"},
-    {"statusbar",     "assets/gui/status_bar.png"},
     {"expbar",     "assets/gui/expbar.png"},
-    {"cursorpeak",    "assets/gui/cursor/peak.png"},
     {"actorsShadow",  "assets/sprites/shadow.png"},
     {"emptytile",     "assets/backgrounds/tilemask.png"},
 
     {"badnicsIcon",     "assets/sprites/characters/badnics.png"},
 
-
-    {"e_speedster", "assets/gui/emblem_speedster.png"},
-    {"e_technic",   "assets/gui/emblem_technic.png"},
-    {"e_power",     "assets/gui/emblem_power.png"},
-
-    {"m_speedster", "assets/gui/emblem_speedster_mask.png"},
-    {"m_technic",   "assets/gui/emblem_technic_mask.png"},
-    {"m_power",     "assets/gui/emblem_power_mask.png"},
-
     {"hudturn",     "assets/gui/strings/hudturn.png"},
     {"battlecompleted", "assets/gui/strings/battle_completed.png" },
     {"egghead", "assets/gui/egghead.png"},
@@ -39,7 +24,6 @@ return {
     {"crown", "assets/gui/crown.png"}
   },
   ["fonts"]    = {
-    {"small",         "assets/gui/fonts/PixelOperator.ttf", 16},
     {"victory",       "assets/gui/fonts/vipnagorgialla.ttf", 12}
   },
   ["imagefonts"]    = {
@@ -55,11 +39,6 @@ return {
     {"woosh", "assets/sfx/woosh.wav"},
     {"spincharge", "assets/sfx/spincharge.wav"},
     {"spinrelease", "assets/sfx/spinrelease.wav"},
-    {"badnicsBoom", "assets/sfx/badnicsDestroyed.wav"},
-
-    {"mBack", "assets/sfx/menus/back.wav"},
-    {"mBeep", "assets/sfx/menus/beep.wav"},
-    {"mSelect", "assets/sfx/menus/select.wav"},
-    {"mError", "assets/sfx/menus/error.wav"},
+    {"badnicsBoom", "assets/sfx/badnicsDestroyed.wav"}
   }
 }
diff --git a/sonic-radiance.love/assets/commons.lua b/sonic-radiance.love/assets/commons.lua
index fcce4e7..5a2c364 100644
--- a/sonic-radiance.love/assets/commons.lua
+++ b/sonic-radiance.love/assets/commons.lua
@@ -17,6 +17,8 @@ return {
     {"m_speedster", "assets/gui/emblem_speedster_mask.png"},
     {"m_technic",   "assets/gui/emblem_technic_mask.png"},
     {"m_power",     "assets/gui/emblem_power_mask.png"},
+
+    {"background",    "assets/artworks/back.png"}
   },
   ["fonts"]    = {
     {"small",         "assets/gui/fonts/PixelOperator.ttf", 16}
@@ -24,6 +26,8 @@ return {
   ["imagefonts"]    = {
     {"hudnbrs",       "assets/gui/fonts/hudnumbers"},
     {"hudnbrs_small", "assets/gui/fonts/hudsmallnumbers"},
+
+    {"title",        "assets/gui/fonts/SA2font"},
   },
   ["sfx"] = {
     {"mBack", "assets/sfx/menus/back.wav"},
diff --git a/sonic-radiance.love/assets/debug.lua b/sonic-radiance.love/assets/debug.lua
index 4181dbe..cd60076 100644
--- a/sonic-radiance.love/assets/debug.lua
+++ b/sonic-radiance.love/assets/debug.lua
@@ -10,25 +10,14 @@ return {
     {"hitGFX",        "assets/sprites/gfx/hit1"},
   },
   ["textures"] = {
-    {"menucursor",    "assets/gui/cursor-menulist.png"},
     {"statusbar",     "assets/gui/status_bar.png"},
-    {"cursorpeak",    "assets/gui/cursor/peak.png"},
     {"actorsShadow",  "assets/sprites/shadow.png"},
     {"emptytile",     "assets/backgrounds/tilemask.png"},
 
-    {"e_speedster", "assets/gui/emblem_speedster.png"},
-    {"e_technic",   "assets/gui/emblem_technic.png"},
-    {"e_power",     "assets/gui/emblem_power.png"},
-
-    {"m_speedster", "assets/gui/emblem_speedster_mask.png"},
-    {"m_technic",   "assets/gui/emblem_technic_mask.png"},
-    {"m_power",     "assets/gui/emblem_power_mask.png"},
-
     {"hudturn",     "assets/gui/strings/hudturn.png"},
     {"battlecompleted", "assets/gui/strings/battle_completed.png" }
   },
   ["fonts"]    = {
-    {"small",         "assets/gui/fonts/PixelOperator.ttf", 16},
     {"victory",       "assets/gui/fonts/vipnagorgialla.ttf", 12}
   },
   ["imagefonts"]    = {
@@ -41,11 +30,6 @@ return {
     {"jump", "assets/sfx/jump.wav"},
     {"woosh", "assets/sfx/woosh.wav"},
     {"spincharge", "assets/sfx/spincharge.wav"},
-    {"spinrelease", "assets/sfx/spinrelease.wav"},
-
-    {"mBack", "assets/sfx/menus/back.wav"},
-    {"mBeep", "assets/sfx/menus/beep.wav"},
-    {"mSelect", "assets/sfx/menus/select.wav"},
-    {"mError", "assets/sfx/menus/error.wav"},
+    {"spinrelease", "assets/sfx/spinrelease.wav"}
   }
 }
diff --git a/sonic-radiance.love/assets/menus.lua b/sonic-radiance.love/assets/menus.lua
deleted file mode 100644
index bfeff91..0000000
--- a/sonic-radiance.love/assets/menus.lua
+++ /dev/null
@@ -1,21 +0,0 @@
-return {
-  ["sprites"]  = {
-    {"cursorground",  "assets/gui/cursor/ground"},
-    {"hitGFX",        "assets/sprites/gfx/hit1"},
-  },
-  ["textures"] = {
-    {"background",    "assets/artworks/back.png"}
-  },
-  ["fonts"]    = {
-    {"small",         "assets/gui/fonts/PixelOperator.ttf", 16}
-  },
-  ["imagefonts"]    = {
-    {"title",        "assets/gui/fonts/SA2font"},
-  },
-  ["sfx"] = {
-    {"mBack", "assets/sfx/menus/back.wav"},
-    {"mBeep", "assets/sfx/menus/beep.wav"},
-    {"mSelect", "assets/sfx/menus/select.wav"},
-    {"mError", "assets/sfx/menus/error.wav"},
-  }
-}
diff --git a/sonic-radiance.love/assets/overworld.lua b/sonic-radiance.love/assets/overworld.lua
index 5bb444f..3da8335 100644
--- a/sonic-radiance.love/assets/overworld.lua
+++ b/sonic-radiance.love/assets/overworld.lua
@@ -15,19 +15,9 @@ return {
     {"sparkles",        "assets/sprites/gfx/sparkles"},
   },
   ["textures"] = {
-    {"menucursor",    "assets/gui/cursor-menulist.png"},
     {"statusbar",     "assets/gui/status_bar.png"},
-    {"cursorpeak",    "assets/gui/cursor/peak.png"},
     {"actorsShadow",  "assets/sprites/shadow.png"},
 
-    {"e_speedster", "assets/gui/emblem_speedster.png"},
-    {"e_technic",   "assets/gui/emblem_technic.png"},
-    {"e_power",     "assets/gui/emblem_power.png"},
-
-    {"m_speedster", "assets/gui/emblem_speedster_mask.png"},
-    {"m_technic",   "assets/gui/emblem_technic_mask.png"},
-    {"m_power",     "assets/gui/emblem_power_mask.png"},
-
     {"guiRing",     "assets/gui/ring.png"},
     {"lvl",     "assets/gui/strings/lvl.png"},
     {"exp",     "assets/gui/strings/exp.png"},
@@ -37,7 +27,6 @@ return {
 
   },
   ["fonts"]    = {
-    {"small",         "assets/gui/fonts/PixelOperator.ttf", 16},
     {"victory",       "assets/gui/fonts/vipnagorgialla.ttf", 12}
   },
   ["imagefonts"]    = {
@@ -56,11 +45,6 @@ return {
     {"ring", "assets/sfx/ring.wav"},
     {"pop", "assets/sfx/pop.wav"},
     {"fall", "assets/sfx/fall.wav"},
-    {"splash", "assets/sfx/splash.wav"},
-
-    {"mBack", "assets/sfx/menus/back.wav"},
-    {"mBeep", "assets/sfx/menus/beep.wav"},
-    {"mSelect", "assets/sfx/menus/select.wav"},
-    {"mError", "assets/sfx/menus/error.wav"},
+    {"splash", "assets/sfx/splash.wav"}
   }
 }
diff --git a/sonic-radiance.love/scenes/battlesystem/init.lua b/sonic-radiance.love/scenes/battlesystem/init.lua
index ed8e9ff..00e9dd2 100644
--- a/sonic-radiance.love/scenes/battlesystem/init.lua
+++ b/sonic-radiance.love/scenes/battlesystem/init.lua
@@ -14,6 +14,7 @@ local TweenManager = require "birb.classes.time"
 function BattleSystem:new(battleData)
   BattleSystem.super.new(self)
 
+  self.assets:batchImport("assets.commons")
   self.assets:batchImport("assets.battle")
 
   self:playMusic(battleData.music)
diff --git a/sonic-radiance.love/scenes/debug/menu/init.lua b/sonic-radiance.love/scenes/debug/menu/init.lua
index a434168..b9aa121 100644
--- a/sonic-radiance.love/scenes/debug/menu/init.lua
+++ b/sonic-radiance.love/scenes/debug/menu/init.lua
@@ -11,7 +11,7 @@ local TweenManager = require "birb.classes.time"
 
 function DebugMenu:new()
   DebugMenu.super.new(self)
-  self.assets:batchImport("assets.menus")
+  self.assets:batchImport("assets.commons")
   menu.commons.MainMenu(self, "BaseMenu")
   menu.StartGameWidget(self, "BaseMenu")
   menu.commons.SceneWidget(self, "BaseMenu", scenes.options, "Options")
diff --git a/sonic-radiance.love/scenes/debug/viewers/animation/init.lua b/sonic-radiance.love/scenes/debug/viewers/animation/init.lua
index 069af42..920cb34 100644
--- a/sonic-radiance.love/scenes/debug/viewers/animation/init.lua
+++ b/sonic-radiance.love/scenes/debug/viewers/animation/init.lua
@@ -8,6 +8,7 @@ local Sprite = require "birb.modules.assets.types.sprites"
 
 function CharAnimViewer:new()
   CharAnimViewer.super.new(self)
+  self.assets:batchImport("assets.commons")
   self.assets:batchImport("assets.debug")
   local mainMenu = menu.commons.DebugMenu(self, "MainMenu")
 
diff --git a/sonic-radiance.love/scenes/debug/viewers/battleBack/init.lua b/sonic-radiance.love/scenes/debug/viewers/battleBack/init.lua
index 1f02833..bcb4237 100644
--- a/sonic-radiance.love/scenes/debug/viewers/battleBack/init.lua
+++ b/sonic-radiance.love/scenes/debug/viewers/battleBack/init.lua
@@ -8,6 +8,7 @@ local backgroundList = require "datas.gamedata.maps.shoot.zones"
 
 function BackgroundViewer:new()
   BackgroundViewer.super.new(self)
+  self.assets:batchImport("assets.commons")
   self.assets:batchImport("assets.debug")
   menu.commons.DebugMenu(self, "MainMenu")
 
diff --git a/sonic-radiance.love/scenes/debug/viewers/choregraphy/init.lua b/sonic-radiance.love/scenes/debug/viewers/choregraphy/init.lua
index 39262a5..62b886e 100644
--- a/sonic-radiance.love/scenes/debug/viewers/choregraphy/init.lua
+++ b/sonic-radiance.love/scenes/debug/viewers/choregraphy/init.lua
@@ -8,7 +8,8 @@ local Fighter = require "scenes.debug.viewers.choregraphy.mocks.fighter"
 
 function ChoregraphyViewer:new()
   ChoregraphyViewer.super.new(self)
-  self.assets:batchImport("scenes.battlesystem.assets")
+  self.assets:batchImport("assets.commons")
+  self.assets:batchImport("assets.battle")
   self.world = World(self)
 
   self:buildMenu()
diff --git a/sonic-radiance.love/scenes/menus/options/init.lua b/sonic-radiance.love/scenes/menus/options/init.lua
index 9dcc909..ad7ace7 100644
--- a/sonic-radiance.love/scenes/menus/options/init.lua
+++ b/sonic-radiance.love/scenes/menus/options/init.lua
@@ -10,7 +10,7 @@ local MenuBack    = require "game.modules.gui.menuback"
 function OptionsMenu:new()
   OptionsMenu.super.new(self)
 
-  self.assets:batchImport("assets.menus")
+  self.assets:batchImport("assets.commons")
   self:addMenu("main", true)
   self:addSubMenu("video", "Video")
   self:addSubMenu("audio", "Audio")
diff --git a/sonic-radiance.love/scenes/menus/titlescreen/init.lua b/sonic-radiance.love/scenes/menus/titlescreen/init.lua
index 010c14f..f459382 100644
--- a/sonic-radiance.love/scenes/menus/titlescreen/init.lua
+++ b/sonic-radiance.love/scenes/menus/titlescreen/init.lua
@@ -37,7 +37,7 @@ function TitleScreen:new(fromMenu)
   local fromMenu = (fromMenu == true)
 
   self.borders = gui.newBorder(424, 30, 8)
-  self.assets:batchImport("assets.menus")
+  self.assets:batchImport("assets.commons")
   self.assets:addImage("logo", "assets/artworks/logo.png")
   self.assets:addTileset("charicons", "assets/sprites/characters/charicons")
   self.assets.fonts["small"]:setLineHeight(16/18)