diff --git a/Zennysoft.Game.Ma/src/app/App.cs b/Zennysoft.Game.Ma/src/app/App.cs
index 1624cc74..84ceaea1 100644
--- a/Zennysoft.Game.Ma/src/app/App.cs
+++ b/Zennysoft.Game.Ma/src/app/App.cs
@@ -9,10 +9,10 @@ using Zennysoft.Ma.Adapter;
 
 namespace Zennysoft.Game.Ma;
 
-public interface IApp : ICanvasLayer, IProvide<IAppRepo>;
+public interface IApp : INode, IProvide<IAppRepo>;
 
 [Meta(typeof(IAutoNode))]
-public partial class App : CanvasLayer, IApp
+public partial class App : Node, IApp
 {
   public override void _Notification(int what) => this.Notify(what);
 
@@ -28,8 +28,6 @@ public partial class App : CanvasLayer, IApp
   public IAppLogic AppLogic { get; set; } = default!;
   public AppLogic.IBinding AppBinding { get; set; } = default!;
 
-  [Node] public ISubViewport GameWindow { get; set; } = default!;
-
   public void Initialize()
   {
     var container = new SimpleInjector.Container();
@@ -62,8 +60,6 @@ public partial class App : CanvasLayer, IApp
       })
       .Handle((in AppLogic.Output.SetupGameScene _) =>
       {
-        Game = Instantiator.LoadAndInstantiate<Game>(GAME_SCENE_PATH);
-        GameWindow.AddChildEx(Game);
         Instantiator.SceneTree.Paused = false;
       })
       .Handle((in AppLogic.Output.ShowMainMenu _) =>
diff --git a/Zennysoft.Game.Ma/src/app/App.tscn b/Zennysoft.Game.Ma/src/app/App.tscn
index 0090447a..6d30ab46 100644
--- a/Zennysoft.Game.Ma/src/app/App.tscn
+++ b/Zennysoft.Game.Ma/src/app/App.tscn
@@ -1,24 +1,10 @@
-[gd_scene load_steps=2 format=3 uid="uid://cagfc5ridmteu"]
+[gd_scene load_steps=3 format=3 uid="uid://cagfc5ridmteu"]
 
 [ext_resource type="Script" uid="uid://d1f8blk5ucqvq" path="res://src/app/App.cs" id="1_rt73h"]
+[ext_resource type="PackedScene" uid="uid://33ek675mfb5n" path="res://src/game/Game.tscn" id="2_1uiag"]
 
-[node name="App" type="CanvasLayer"]
+[node name="App" type="Node"]
 process_mode = 3
 script = ExtResource("1_rt73h")
 
-[node name="SubViewportContainer" type="SubViewportContainer" parent="."]
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-stretch = true
-
-[node name="GameWindow" type="SubViewport" parent="SubViewportContainer"]
-unique_name_in_owner = true
-transparent_bg = true
-handle_input_locally = false
-audio_listener_enable_2d = true
-audio_listener_enable_3d = true
-size = Vector2i(1920, 1080)
-render_target_update_mode = 4
+[node name="Game" parent="." instance=ExtResource("2_1uiag")]
diff --git a/Zennysoft.Game.Ma/src/audio/sfx/Select.ogg b/Zennysoft.Game.Ma/src/audio/sfx/Select.ogg
new file mode 100644
index 00000000..39735d23
Binary files /dev/null and b/Zennysoft.Game.Ma/src/audio/sfx/Select.ogg differ
diff --git a/Zennysoft.Game.Ma/src/audio/sfx/Select.ogg.import b/Zennysoft.Game.Ma/src/audio/sfx/Select.ogg.import
new file mode 100644
index 00000000..af92bf01
--- /dev/null
+++ b/Zennysoft.Game.Ma/src/audio/sfx/Select.ogg.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://bb5lchnrvacf8"
+path="res://.godot/imported/Select.ogg-d9dd04507bb827ea76d34cbcda6e7708.oggvorbisstr"
+
+[deps]
+
+source_file="res://src/audio/sfx/Select.ogg"
+dest_files=["res://.godot/imported/Select.ogg-d9dd04507bb827ea76d34cbcda6e7708.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4
diff --git a/Zennysoft.Game.Ma/src/game/Game.tscn b/Zennysoft.Game.Ma/src/game/Game.tscn
index 124601e1..4c73475a 100644
--- a/Zennysoft.Game.Ma/src/game/Game.tscn
+++ b/Zennysoft.Game.Ma/src/game/Game.tscn
@@ -105,7 +105,6 @@ grow_vertical = 2
 stretch = true
 
 [node name="SubViewport" type="SubViewport" parent="SubViewportContainer"]
-transparent_bg = true
 handle_input_locally = false
 size = Vector2i(1440, 1080)
 render_target_update_mode = 4