From df5cc7fe30cbdfac408750026199c688a318b16a Mon Sep 17 00:00:00 2001
From: Manuel Gasser <manuel.gasser.ch@gmail.com>
Date: Sun, 21 Dec 2025 11:16:12 +0100
Subject: [PATCH 01/11] Add initial VS style docking layout implementation

---
 .../Features/BottomBar/BottomBar.cs           |   4 +-
 .../Features/BottomBar/RunningTasksDisplay.cs | 102 +++---
 .../Features/CodeEditor/CodeEditorPanel.cs    |   2 +-
 .../CustomControls/InvertedVSplitContainer.cs |  72 ++---
 .../Features/Layout/DockSymbol.cs             |  12 +
 .../Features/Layout/DockSymbol.cs.uid         |   1 +
 .../Features/Layout/DockSymbol.tscn           |  23 ++
 .../Features/Layout/IdeDockLayout.cs          | 303 ++++++++++++++++++
 .../Features/Layout/IdeDockLayout.cs.uid      |   1 +
 .../Features/Layout/IdeDockLayout.tscn        |  19 ++
 .../Features/Layout/IdeDockOverlay.cs         | 153 +++++++++
 .../Features/Layout/IdeDockOverlay.cs.uid     |   1 +
 .../Features/Layout/IdeDockOverlay.tscn       | 100 ++++++
 .../Features/Layout/IdeLayoutNode.cs          |  42 +++
 .../Features/Layout/IdeLayoutNode.cs.uid      |   1 +
 .../Features/LeftSideBar/LeftSideBar.cs       |  96 +++---
 src/SharpIDE.Godot/IdeRoot.cs                 |  28 +-
 src/SharpIDE.Godot/IdeRoot.tscn               |  83 +----
 18 files changed, 815 insertions(+), 228 deletions(-)
 create mode 100644 src/SharpIDE.Godot/Features/Layout/DockSymbol.cs
 create mode 100644 src/SharpIDE.Godot/Features/Layout/DockSymbol.cs.uid
 create mode 100644 src/SharpIDE.Godot/Features/Layout/DockSymbol.tscn
 create mode 100644 src/SharpIDE.Godot/Features/Layout/IdeDockLayout.cs
 create mode 100644 src/SharpIDE.Godot/Features/Layout/IdeDockLayout.cs.uid
 create mode 100644 src/SharpIDE.Godot/Features/Layout/IdeDockLayout.tscn
 create mode 100644 src/SharpIDE.Godot/Features/Layout/IdeDockOverlay.cs
 create mode 100644 src/SharpIDE.Godot/Features/Layout/IdeDockOverlay.cs.uid
 create mode 100644 src/SharpIDE.Godot/Features/Layout/IdeDockOverlay.tscn
 create mode 100644 src/SharpIDE.Godot/Features/Layout/IdeLayoutNode.cs
 create mode 100644 src/SharpIDE.Godot/Features/Layout/IdeLayoutNode.cs.uid

diff --git a/src/SharpIDE.Godot/Features/BottomBar/BottomBar.cs b/src/SharpIDE.Godot/Features/BottomBar/BottomBar.cs
index 995f8590..27fff250 100644
--- a/src/SharpIDE.Godot/Features/BottomBar/BottomBar.cs
+++ b/src/SharpIDE.Godot/Features/BottomBar/BottomBar.cs
@@ -4,5 +4,5 @@ namespace SharpIDE.Godot.Features.BottomBar;
 
 public partial class BottomBar : PanelContainer
 {
-    
-}
\ No newline at end of file
+	
+}
diff --git a/src/SharpIDE.Godot/Features/BottomBar/RunningTasksDisplay.cs b/src/SharpIDE.Godot/Features/BottomBar/RunningTasksDisplay.cs
index d965efa3..9c71cfb3 100644
--- a/src/SharpIDE.Godot/Features/BottomBar/RunningTasksDisplay.cs
+++ b/src/SharpIDE.Godot/Features/BottomBar/RunningTasksDisplay.cs
@@ -7,57 +7,57 @@ namespace SharpIDE.Godot.Features.BottomBar;
 
 public partial class RunningTasksDisplay : HBoxContainer
 {
-    [Inject] private readonly ActivityMonitor _activityMonitor = null!;
-    
-    private bool _isSolutionRestoring;
-    private bool _isSolutionLoading;
-    private bool _isSolutionDiagnosticsBeingRetrieved;
+	[Inject] private readonly ActivityMonitor _activityMonitor = null!;
+	
+	private bool _isSolutionRestoring;
+	private bool _isSolutionLoading;
+	private bool _isSolutionDiagnosticsBeingRetrieved;
 
-    private Label _solutionRestoringLabel = null!;
-    private Label _solutionLoadingLabel = null!;
-    private Label _solutionDiagnosticsLabel = null!;
-    
-    public override void _Ready()
-    {
-        _solutionRestoringLabel = GetNode<Label>("%SolutionRestoringLabel");
-        _solutionLoadingLabel = GetNode<Label>("%SolutionLoadingLabel");
-        _solutionDiagnosticsLabel = GetNode<Label>("%SolutionDiagnosticsLabel");
-        Visible = false;
-        _activityMonitor.ActivityChanged.Subscribe(OnActivityChanged);
-    }
+	private Label _solutionRestoringLabel = null!;
+	private Label _solutionLoadingLabel = null!;
+	private Label _solutionDiagnosticsLabel = null!;
+	
+	public override void _Ready()
+	{
+		_solutionRestoringLabel = GetNode<Label>("%SolutionRestoringLabel");
+		_solutionLoadingLabel = GetNode<Label>("%SolutionLoadingLabel");
+		_solutionDiagnosticsLabel = GetNode<Label>("%SolutionDiagnosticsLabel");
+		Visible = false;
+		_activityMonitor.ActivityChanged.Subscribe(OnActivityChanged);
+	}
 
-    public override void _ExitTree()
-    {
-        _activityMonitor.ActivityChanged.Unsubscribe(OnActivityChanged);
-    }
+	public override void _ExitTree()
+	{
+		_activityMonitor.ActivityChanged.Unsubscribe(OnActivityChanged);
+	}
 
-    private async Task OnActivityChanged(Activity activity)
-    {
-        var isOccurring = !activity.IsStopped;
-        if (activity.DisplayName == $"{nameof(RoslynAnalysis)}.{nameof(RoslynAnalysis.UpdateSolutionDiagnostics)}")
-        {
-            _isSolutionDiagnosticsBeingRetrieved = isOccurring;
-        }
-        else if (activity.DisplayName == "OpenSolution")
-        {
-            _isSolutionLoading = isOccurring;
-        }
-        else if (activity.DisplayName == "RestoreSolution")
-        {
-            _isSolutionRestoring = isOccurring;
-        }
-        else
-        {
-            return;
-        }
-        
-        var visible = _isSolutionDiagnosticsBeingRetrieved || _isSolutionLoading || _isSolutionRestoring;
-        await this.InvokeAsync(() =>
-        {
-            _solutionLoadingLabel.Visible = _isSolutionLoading;
-            _solutionDiagnosticsLabel.Visible = _isSolutionDiagnosticsBeingRetrieved;
-            _solutionRestoringLabel.Visible = _isSolutionRestoring;
-            Visible = visible;
-        });
-    }
-}
\ No newline at end of file
+	private async Task OnActivityChanged(Activity activity)
+	{
+		var isOccurring = !activity.IsStopped;
+		if (activity.DisplayName == $"{nameof(RoslynAnalysis)}.{nameof(RoslynAnalysis.UpdateSolutionDiagnostics)}")
+		{
+			_isSolutionDiagnosticsBeingRetrieved = isOccurring;
+		}
+		else if (activity.DisplayName == "OpenSolution")
+		{
+			_isSolutionLoading = isOccurring;
+		}
+		else if (activity.DisplayName == "RestoreSolution")
+		{
+			_isSolutionRestoring = isOccurring;
+		}
+		else
+		{
+			return;
+		}
+		
+		var visible = _isSolutionDiagnosticsBeingRetrieved || _isSolutionLoading || _isSolutionRestoring;
+		await this.InvokeAsync(() =>
+		{
+			_solutionLoadingLabel.Visible = _isSolutionLoading;
+			_solutionDiagnosticsLabel.Visible = _isSolutionDiagnosticsBeingRetrieved;
+			_solutionRestoringLabel.Visible = _isSolutionRestoring;
+			Visible = visible;
+		});
+	}
+}
diff --git a/src/SharpIDE.Godot/Features/CodeEditor/CodeEditorPanel.cs b/src/SharpIDE.Godot/Features/CodeEditor/CodeEditorPanel.cs
index b38b7305..0b770078 100644
--- a/src/SharpIDE.Godot/Features/CodeEditor/CodeEditorPanel.cs
+++ b/src/SharpIDE.Godot/Features/CodeEditor/CodeEditorPanel.cs
@@ -244,4 +244,4 @@ public void SetIconsForFileExtension(SharpIdeFile file, int newTabIndex)
 			//tabContainer.SetIconOverlay(0, overlayIcon);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/SharpIDE.Godot/Features/CustomControls/InvertedVSplitContainer.cs b/src/SharpIDE.Godot/Features/CustomControls/InvertedVSplitContainer.cs
index 81f7d778..65c47c21 100644
--- a/src/SharpIDE.Godot/Features/CustomControls/InvertedVSplitContainer.cs
+++ b/src/SharpIDE.Godot/Features/CustomControls/InvertedVSplitContainer.cs
@@ -1,45 +1,45 @@
-using Godot;
+using Godot;
 
 namespace SharpIDE.Godot.Features.CustomControls;
 
 [GlobalClass, Tool]
 public partial class InvertedVSplitContainer : VSplitContainer
 {
-    [Export]
-    private int _invertedOffset = 200;
-    private bool _invertedCollapsed = false;
+	[Export]
+	private int _invertedOffset = 200;
+	private bool _invertedCollapsed = false;
 
-    public void InvertedSetCollapsed(bool collapsed)
-    {
-        if (_invertedCollapsed == collapsed) return;
-        _invertedCollapsed = collapsed;
-        if (collapsed)
-        {
-            SplitOffset = (int)Size.Y + 100;
-            DraggingEnabled = false;
-        }
-        else
-        {
-            SplitOffset = (int)Size.Y - _invertedOffset;
-            DraggingEnabled = true;
-        }
-    }
+	public void InvertedSetCollapsed(bool collapsed)
+	{
+		if (_invertedCollapsed == collapsed) return;
+		_invertedCollapsed = collapsed;
+		if (collapsed)
+		{
+			SplitOffset = (int)Size.Y + 100;
+			DraggingEnabled = false;
+		}
+		else
+		{
+			SplitOffset = (int)Size.Y - _invertedOffset;
+			DraggingEnabled = true;
+		}
+	}
 
-    public override void _Ready()
-    {
-        Dragged += OnDragged;
-    }
+	public override void _Ready()
+	{
+		Dragged += OnDragged;
+	}
 
-    private void OnDragged(long offset)
-    {
-        _invertedOffset = (int)Size.Y - SplitOffset;
-    }
-    
-    public override void _Notification(int what)
-    {
-        if (what == NotificationResized)
-        {
-            SplitOffset = (int)Size.Y - _invertedOffset;
-        }
-    }
-}
\ No newline at end of file
+	private void OnDragged(long offset)
+	{
+		_invertedOffset = (int)Size.Y - SplitOffset;
+	}
+	
+	public override void _Notification(int what)
+	{
+		if (what == NotificationResized)
+		{
+			SplitOffset = (int)Size.Y - _invertedOffset;
+		}
+	}
+}
diff --git a/src/SharpIDE.Godot/Features/Layout/DockSymbol.cs b/src/SharpIDE.Godot/Features/Layout/DockSymbol.cs
new file mode 100644
index 00000000..ce547dac
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/DockSymbol.cs
@@ -0,0 +1,12 @@
+using Godot;
+
+namespace SharpIDE.Godot.Features.Layout;
+
+public partial class DockSymbol : Control
+{
+	[Export]
+	public DockScope DockScope { get; set; }
+	
+	[Export]
+	public DockPosition DockPosition { get; set; }
+}
diff --git a/src/SharpIDE.Godot/Features/Layout/DockSymbol.cs.uid b/src/SharpIDE.Godot/Features/Layout/DockSymbol.cs.uid
new file mode 100644
index 00000000..68c345db
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/DockSymbol.cs.uid
@@ -0,0 +1 @@
+uid://b7ct0lv0nasr1
diff --git a/src/SharpIDE.Godot/Features/Layout/DockSymbol.tscn b/src/SharpIDE.Godot/Features/Layout/DockSymbol.tscn
new file mode 100644
index 00000000..39e4ed6e
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/DockSymbol.tscn
@@ -0,0 +1,23 @@
+[gd_scene load_steps=2 format=3 uid="uid://cg4bhc63k7esg"]
+
+[ext_resource type="Script" uid="uid://b7ct0lv0nasr1" path="res://Features/Layout/DockSymbol.cs" id="1_6pqf8"]
+
+[node name="DockSymbol" type="Control"]
+layout_mode = 3
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+size_flags_horizontal = 3
+size_flags_vertical = 3
+script = ExtResource("1_6pqf8")
+
+[node name="Symbol" type="ColorRect" parent="."]
+unique_name_in_owner = true
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeDockLayout.cs b/src/SharpIDE.Godot/Features/Layout/IdeDockLayout.cs
new file mode 100644
index 00000000..7165915a
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/IdeDockLayout.cs
@@ -0,0 +1,303 @@
+using Godot;
+
+using SharpIDE.Application.Features.SolutionDiscovery.VsPersistence;
+using SharpIDE.Godot.Features.CodeEditor;
+using SharpIDE.Godot.Features.SolutionExplorer;
+
+namespace SharpIDE.Godot.Features.Layout;
+
+public partial class IdeDockLayout : Control
+{
+	private IdeLayoutNode _layout = null!;
+
+	private SharpIdeSolutionModel? _solution;
+
+	private IdeDockOverlay _dockOverlay = null!;
+
+	private Control? _layoutNode;
+	private IdeLayoutNode? _draggedNode;
+	private readonly Dictionary<Control, IdeLayoutNode> _nodeMap = [];
+
+	/// <inheritdoc />
+	public override void _Ready()
+	{
+		_dockOverlay = GetNode<IdeDockOverlay>("%DockOverlay");
+
+		// TODO: Add layout profiles and persist layout
+		_layout = new IdeSplitNode(
+			Orientation.Horizontal,
+			FirstNode: new IdeSceneNode("uid://cy1bb32g7j7dr"),
+			SecondNode: new IdeSplitNode(
+				Orientation.Vertical,
+				FirstNode: new IdeSceneNode("uid://cy1bb32g7j7dr"),
+				SecondNode: new IdeSceneNode("uid://c5dlwgcx3ubyp")));
+
+		FocusExited += CancelDrag;
+
+		RebuildLayoutTree();
+	}
+
+	/// <inheritdoc />
+	public override void _UnhandledKeyInput(InputEvent @event)
+	{
+		if (@event is InputEventKey { Keycode: Key.Escape, Pressed: true })
+		{
+			CancelDrag();
+		}
+	}
+
+	// TODO: This is currently a workaround. A better way to set the solution should be found.
+	public void ChangeSolution(SharpIdeSolutionModel solution)
+	{
+		_solution = solution;
+
+		CallDeferred(nameof(ChangeSolutionImpl));
+	}
+
+	private void ChangeSolutionImpl()
+	{
+		//if (_solution is null)
+		{
+			return;
+		}
+
+		foreach (var editor in GetAllChildren<CodeEditorPanel>(this))
+		{
+			editor.Solution = _solution;
+		}
+
+		foreach (var explorer in GetAllChildren<SolutionExplorerPanel>(this))
+		{
+			explorer.SolutionModel = _solution;
+			_ = Task.GodotRun(explorer.BindToSolution);
+		}
+	}
+
+	private IEnumerable<TNode> GetAllChildren<TNode>(Node node) where TNode : Node
+	{
+		return node.GetChildren()
+				   .SelectMany(child =>
+				   {
+					   var children = GetAllChildren<TNode>(child);
+
+					   if (child is TNode nodeChild)
+					   {
+						   children = children.Prepend(nodeChild);
+					   }
+
+					   return children;
+				   });
+	}
+
+	private void RebuildLayoutTree()
+	{
+		_dockOverlay.ClearDockTargets();
+
+		_layoutNode?.QueueFree();
+		_layoutNode = BuildLayoutTree(_layout);
+		AddChild(_layoutNode);
+
+		ChangeSolution(_solution!);
+	}
+
+	private Control BuildLayoutTree(IdeLayoutNode layoutNode)
+	{
+		return layoutNode switch
+		{
+			IdeSplitNode splitNode => BuildSplitLayout(splitNode),
+			IdeTabGroupNode tabGroupNode => BuildTabGroupLayout(tabGroupNode),
+			IdeSceneNode viewNode => BuildSceneLayout(viewNode),
+
+			_ => throw new ArgumentException(
+					 $"The layout node of type '{layoutNode.GetType().FullName}' is not supported.",
+					 nameof(layoutNode))
+		};
+	}
+
+	private Control BuildSplitLayout(IdeSplitNode splitNode)
+	{
+		SplitContainer container = splitNode.Orientation switch
+		{
+			Orientation.Horizontal => new HSplitContainer(),
+			Orientation.Vertical => new VSplitContainer(),
+
+			_ => throw new ArgumentException(
+					 $"The split orientation '{splitNode.Orientation}' is not supported.",
+					 nameof(splitNode))
+		};
+
+		container.SizeFlagsHorizontal = SizeFlags.ExpandFill;
+		container.SizeFlagsVertical = SizeFlags.ExpandFill;
+		container.SetAnchorsAndOffsetsPreset(LayoutPreset.FullRect);
+
+		var firstChild = BuildLayoutTree(splitNode.FirstNode);
+		var secondChild = BuildLayoutTree(splitNode.SecondNode);
+
+		container.AddChild(firstChild);
+		container.AddChild(secondChild);
+
+		var (firstRatio, secondRatio) = GetStretchRatio(splitNode);
+
+		firstChild.SizeFlagsHorizontal = SizeFlags.ExpandFill;
+		firstChild.SizeFlagsVertical = SizeFlags.ExpandFill;
+		secondChild.SizeFlagsHorizontal = SizeFlags.ExpandFill;
+		secondChild.SizeFlagsVertical = SizeFlags.ExpandFill;
+		firstChild.SetStretchRatio(firstRatio);
+		secondChild.SetStretchRatio(secondRatio);
+
+		_nodeMap[container] = splitNode;
+
+		return container;
+	}
+
+	private (float FirstRation, float SecondRatio) GetStretchRatio(IdeSplitNode splitNode)
+	{
+		return (1.0f, 1.0f);
+	}
+
+	private Control BuildTabGroupLayout(IdeTabGroupNode tabGroupNode)
+	{
+		throw new NotImplementedException();
+	}
+
+	private Control BuildSceneLayout(IdeSceneNode sceneNode)
+	{
+		var sceneResource = ResourceLoader.Load<PackedScene>(sceneNode.ResourceUid);
+		var scene = sceneResource.Instantiate<Control>();
+		scene.GuiInput += input => OnSceneGuiInput(input, sceneNode);
+
+		_dockOverlay.RegisterDockTarget(scene);
+		_nodeMap[scene] = sceneNode;
+
+		return scene;
+	}
+
+	private void OnSceneGuiInput(InputEvent input, IdeLayoutNode node)
+	{
+		if (input is not InputEventMouseButton { ButtonIndex: MouseButton.Left } leftButton)
+		{
+			return;
+		}
+
+		if (leftButton.Pressed)
+		{
+			BeginDrag(node);
+			return;
+		}
+
+		EndDrag();
+	}
+
+	private void BeginDrag(IdeLayoutNode draggedNode)
+	{
+		GD.Print(nameof(BeginDrag));
+		
+		_draggedNode = draggedNode;
+		_dockOverlay.Visible = true;
+	}
+
+	private void EndDrag()
+	{
+		GD.Print(nameof(EndDrag));
+		
+		if (_draggedNode is null || _dockOverlay.CurrentDockPosition is DockPosition.None)
+		{
+			CancelDrag();
+			return;
+		}
+
+		switch (_dockOverlay.CurrentDockScope)
+		{
+			case DockScope.Global:
+				DockTarget(_draggedNode, _layout, _dockOverlay.CurrentDockPosition);
+				break;
+			case DockScope.Local when _dockOverlay.HoveredTarget is not null:
+				DockTarget(_draggedNode, _nodeMap[_dockOverlay.HoveredTarget], _dockOverlay.CurrentDockPosition);
+				break;
+		}
+
+		CancelDrag();
+	}
+
+	private void CancelDrag()
+	{
+		GD.Print(nameof(CancelDrag));
+		
+		_draggedNode = null;
+		_dockOverlay.Visible = false;
+	}
+
+	private IdeLayoutNode ReplaceNode(IdeLayoutNode current, IdeLayoutNode target, IdeLayoutNode replacement)
+	{
+		// TODO: FIX
+		if (ReferenceEquals(_layout, target) || ReferenceEquals(current, target))
+		{
+			return replacement;
+		}
+
+		if (current is IdeSplitNode splitNode)
+		{
+			return splitNode with
+			{
+				FirstNode = ReplaceNode(splitNode.FirstNode, target, replacement),
+				SecondNode = ReplaceNode(splitNode.SecondNode, target, replacement)
+			};
+		}
+
+		return current;
+	}
+
+	private IdeLayoutNode? RemoveNode(IdeLayoutNode current, IdeLayoutNode target)
+	{
+		if (ReferenceEquals(current, target))
+		{
+			return null;
+		}
+
+		if (current is not IdeSplitNode splitNode)
+		{
+			return current;
+		}
+
+		var first = RemoveNode(splitNode.FirstNode, target);
+		var second = RemoveNode(splitNode.SecondNode, target);
+
+		if (first is null)
+		{
+			return second;
+		}
+
+		if (second is null)
+		{
+			return first;
+		}
+
+		return splitNode with
+		{
+			FirstNode = first,
+			SecondNode = second
+		};
+	}
+
+	private void DockTarget(IdeLayoutNode dragged, IdeLayoutNode target, DockPosition position)
+	{
+		var replacement = position switch
+		{
+			DockPosition.Left => new IdeSplitNode(Orientation.Horizontal, dragged, target),
+			DockPosition.Right => new IdeSplitNode(Orientation.Horizontal, target, dragged),
+			DockPosition.Top => new IdeSplitNode(Orientation.Vertical, dragged, target),
+			DockPosition.Bottom => new IdeSplitNode(Orientation.Vertical, target, dragged),
+
+			_ => target
+		};
+
+		if (ReferenceEquals(replacement, target))
+		{
+			return;
+		}
+
+		_layout = ReplaceNode(RemoveNode(_layout, dragged)!, target, replacement);
+		
+		RebuildLayoutTree();
+	}
+}
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeDockLayout.cs.uid b/src/SharpIDE.Godot/Features/Layout/IdeDockLayout.cs.uid
new file mode 100644
index 00000000..d1745f33
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/IdeDockLayout.cs.uid
@@ -0,0 +1 @@
+uid://byeop8uus5e03
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeDockLayout.tscn b/src/SharpIDE.Godot/Features/Layout/IdeDockLayout.tscn
new file mode 100644
index 00000000..80a99e85
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/IdeDockLayout.tscn
@@ -0,0 +1,19 @@
+[gd_scene load_steps=3 format=3 uid="uid://bcn33cckidihf"]
+
+[ext_resource type="Script" uid="uid://byeop8uus5e03" path="res://Features/Layout/IdeDockLayout.cs" id="1_v5k85"]
+[ext_resource type="PackedScene" uid="uid://cv8tsg87o2q7w" path="res://Features/Layout/IdeDockOverlay.tscn" id="2_1xd2f"]
+
+[node name="IdeDockLayout" type="Control"]
+layout_mode = 3
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+script = ExtResource("1_v5k85")
+
+[node name="DockOverlay" parent="." instance=ExtResource("2_1xd2f")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 1
+DockPreviewColor = Color(0.1767, 0.716565, 0.93, 0.40392157)
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeDockOverlay.cs b/src/SharpIDE.Godot/Features/Layout/IdeDockOverlay.cs
new file mode 100644
index 00000000..d2ed9449
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/IdeDockOverlay.cs
@@ -0,0 +1,153 @@
+using Godot;
+
+namespace SharpIDE.Godot.Features.Layout;
+
+public partial class IdeDockOverlay : Control
+{
+	private readonly List<Control> _dockTargets = [];
+
+	private IReadOnlyCollection<DockSymbol> _dockSymbols = null!;
+
+	[Export]
+	public float DockPreviewSize { get; set; } = 0.3f;
+
+	[Export]
+	public Color DockPreviewColor { get; set; } = CachedColors.Gray;
+
+	[Export]
+	public Control GlobalDockSymbols { get; set; } = null!;
+
+	[Export]
+	public Control LocalDockSymbols { get; set; } = null!;
+
+	public Control? HoveredTarget { get; private set; }
+
+	public DockScope CurrentDockScope { get; private set; }
+
+	public DockPosition CurrentDockPosition { get; private set; }
+
+	public override void _Ready()
+	{
+		_dockSymbols = GlobalDockSymbols.GetChildren()
+										.OfType<DockSymbol>()
+										.Concat(LocalDockSymbols.GetChildren().OfType<DockSymbol>())
+										.ToArray();
+	}
+
+	/// <inheritdoc />
+	public override void _Process(double delta)
+	{
+		if (Visible)
+		{
+			UpdateDockPreview(GetGlobalMousePosition());
+		}
+	}
+
+	/// <inheritdoc />
+	public override void _Draw()
+	{
+		DrawDockPreview();
+	}
+
+	public void RegisterDockTarget(Control node)
+	{
+		_dockTargets.Add(node);
+	}
+
+	public void ClearDockTargets()
+	{
+		_dockTargets.Clear();
+	}
+
+	private void DrawDockPreview()
+	{
+		switch (CurrentDockScope)
+		{
+			case DockScope.Global:
+				DrawTargetDockPreview(this);
+				break;
+			case DockScope.Local when HoveredTarget is not null:
+				DrawTargetDockPreview(HoveredTarget);
+				break;
+		}
+	}
+
+	private void DrawTargetDockPreview(Control target)
+	{
+		var rect = target.GetGlobalRect();
+		var localRect = new Rect2(
+			rect.Position - GlobalPosition,
+			rect.Size);
+
+		var highlight = CurrentDockPosition switch
+		{
+			DockPosition.Left => new Rect2(
+				localRect.Position,
+				new Vector2(localRect.Size.X * DockPreviewSize, localRect.Size.Y)),
+			DockPosition.Right => new Rect2(
+				localRect.Position + new Vector2(localRect.Size.X * (1.0f - DockPreviewSize), 0),
+				new Vector2(localRect.Size.X * DockPreviewSize, localRect.Size.Y)),
+			DockPosition.Top => new Rect2(
+				localRect.Position,
+				new Vector2(localRect.Size.X, localRect.Size.Y * DockPreviewSize)),
+			DockPosition.Bottom => new Rect2(
+				localRect.Position + new Vector2(0, localRect.Size.Y * (1.0f - DockPreviewSize)),
+				new Vector2(localRect.Size.X, localRect.Size.Y * DockPreviewSize)),
+
+			_ => new Rect2(Vector2.Zero, Vector2.Zero)
+		};
+
+		DrawRect(highlight, DockPreviewColor, filled: true);
+	}
+
+	private void UpdateDockPreview(Vector2 mousePosition)
+	{
+		(CurrentDockScope, CurrentDockPosition) = GetDockScopeAndPosition(mousePosition);
+
+		HoveredTarget = FindDockTarget(mousePosition);
+
+		if (HoveredTarget is null)
+		{
+			LocalDockSymbols.Visible = false;
+			QueueRedraw();
+			return;
+		}
+
+		var targetCenterPosition = HoveredTarget.GlobalPosition
+								 - GlobalPosition
+								 + HoveredTarget.Size / 2.0f
+								 - LocalDockSymbols.Size / 2.0f;
+
+		LocalDockSymbols.Position = targetCenterPosition;
+		LocalDockSymbols.Visible = true;
+
+		QueueRedraw();
+	}
+
+	private Control? FindDockTarget(Vector2 mousePosition)
+	{
+		foreach (var target in _dockTargets)
+		{
+			if (!target.Visible)
+			{
+				continue;
+			}
+
+			if (target.GetGlobalRect().HasPoint(mousePosition))
+			{
+				return target;
+			}
+		}
+
+		return null;
+	}
+
+	private (DockScope Scope, DockPosition Position) GetDockScopeAndPosition(Vector2 mousePosition)
+	{
+		var hoveredSymbol = _dockSymbols.FirstOrDefault(symbol => symbol.GetGlobalRect().HasPoint(mousePosition));
+
+		return hoveredSymbol is not null
+				   ? (hoveredSymbol.DockScope, hoveredSymbol.DockPosition)
+				   : (DockScope.None, DockPosition.None);
+	}
+}
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeDockOverlay.cs.uid b/src/SharpIDE.Godot/Features/Layout/IdeDockOverlay.cs.uid
new file mode 100644
index 00000000..d873c7c4
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/IdeDockOverlay.cs.uid
@@ -0,0 +1 @@
+uid://dxi5t8ey1t06x
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeDockOverlay.tscn b/src/SharpIDE.Godot/Features/Layout/IdeDockOverlay.tscn
new file mode 100644
index 00000000..ffc9146a
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/IdeDockOverlay.tscn
@@ -0,0 +1,100 @@
+[gd_scene load_steps=3 format=3 uid="uid://cv8tsg87o2q7w"]
+
+[ext_resource type="Script" uid="uid://dxi5t8ey1t06x" path="res://Features/Layout/IdeDockOverlay.cs" id="1_ktovp"]
+[ext_resource type="PackedScene" uid="uid://cg4bhc63k7esg" path="res://Features/Layout/DockSymbol.tscn" id="2_bfwau"]
+
+[node name="IdeDockOverlay" type="Control" node_paths=PackedStringArray("GlobalDockSymbols", "LocalDockSymbols")]
+z_index = 1
+layout_mode = 3
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+mouse_filter = 2
+script = ExtResource("1_ktovp")
+GlobalDockSymbols = NodePath("GlobalDockSymbols")
+LocalDockSymbols = NodePath("LocalDockSymbols")
+
+[node name="GlobalDockSymbols" type="MarginContainer" parent="."]
+z_index = 1
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+theme_override_constants/margin_left = 20
+theme_override_constants/margin_top = 20
+theme_override_constants/margin_right = 20
+theme_override_constants/margin_bottom = 20
+
+[node name="Left" parent="GlobalDockSymbols" instance=ExtResource("2_bfwau")]
+custom_minimum_size = Vector2(15, 30)
+layout_mode = 2
+size_flags_horizontal = 0
+size_flags_vertical = 4
+DockScope = 1
+DockPosition = 1
+
+[node name="Right" parent="GlobalDockSymbols" instance=ExtResource("2_bfwau")]
+custom_minimum_size = Vector2(15, 30)
+layout_mode = 2
+size_flags_horizontal = 8
+size_flags_vertical = 4
+DockScope = 1
+DockPosition = 2
+
+[node name="Top" parent="GlobalDockSymbols" instance=ExtResource("2_bfwau")]
+custom_minimum_size = Vector2(30, 15)
+layout_mode = 2
+size_flags_horizontal = 4
+size_flags_vertical = 0
+DockScope = 1
+DockPosition = 3
+
+[node name="Bottom" parent="GlobalDockSymbols" instance=ExtResource("2_bfwau")]
+custom_minimum_size = Vector2(30, 15)
+layout_mode = 2
+size_flags_horizontal = 4
+size_flags_vertical = 8
+DockScope = 1
+DockPosition = 4
+
+[node name="LocalDockSymbols" type="MarginContainer" parent="."]
+z_index = 1
+layout_mode = 1
+offset_right = 80.0
+offset_bottom = 80.0
+
+[node name="Left" parent="LocalDockSymbols" instance=ExtResource("2_bfwau")]
+custom_minimum_size = Vector2(15, 30)
+layout_mode = 2
+size_flags_horizontal = 0
+size_flags_vertical = 4
+DockScope = 2
+DockPosition = 1
+
+[node name="Right" parent="LocalDockSymbols" instance=ExtResource("2_bfwau")]
+custom_minimum_size = Vector2(15, 30)
+layout_mode = 2
+size_flags_horizontal = 8
+size_flags_vertical = 4
+DockScope = 2
+DockPosition = 2
+
+[node name="Top" parent="LocalDockSymbols" instance=ExtResource("2_bfwau")]
+custom_minimum_size = Vector2(30, 15)
+layout_mode = 2
+size_flags_horizontal = 4
+size_flags_vertical = 0
+DockScope = 2
+DockPosition = 3
+
+[node name="Bottom" parent="LocalDockSymbols" instance=ExtResource("2_bfwau")]
+custom_minimum_size = Vector2(30, 15)
+layout_mode = 2
+size_flags_horizontal = 4
+size_flags_vertical = 8
+DockScope = 2
+DockPosition = 4
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeLayoutNode.cs b/src/SharpIDE.Godot/Features/Layout/IdeLayoutNode.cs
new file mode 100644
index 00000000..dd5fd621
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/IdeLayoutNode.cs
@@ -0,0 +1,42 @@
+namespace SharpIDE.Godot.Features.Layout;
+
+public abstract record IdeLayoutNode;
+
+public enum Orientation
+{
+    Horizontal = 1,
+    Vertical = 2
+}
+
+public enum DockScope
+{
+    None = 0,
+    Global = 1,
+    Local = 2
+}
+
+public enum DockPosition
+{
+    None = 0,
+    Left = 1,
+    Right = 2,
+    Top = 3,
+    Bottom = 4
+}
+
+public record IdeSplitNode(
+    Orientation Orientation,
+    IdeLayoutNode FirstNode,
+    IdeLayoutNode SecondNode,
+    float Ratio = 0.5f) : IdeLayoutNode;
+
+public record IdeSceneNode(string ResourceUid) : IdeLayoutNode;
+
+public record IdeTabGroupNode(
+    string ResourceUid,
+    List<IdeDocumentTab> DocumentTabs,
+    int ActiveTabIndex) : IdeSceneNode(ResourceUid);
+
+public record IdeDocumentTab(
+    string TabId,
+    string Label);
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeLayoutNode.cs.uid b/src/SharpIDE.Godot/Features/Layout/IdeLayoutNode.cs.uid
new file mode 100644
index 00000000..1c5e57d5
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/IdeLayoutNode.cs.uid
@@ -0,0 +1 @@
+uid://cppr6tht71awe
diff --git a/src/SharpIDE.Godot/Features/LeftSideBar/LeftSideBar.cs b/src/SharpIDE.Godot/Features/LeftSideBar/LeftSideBar.cs
index 103e60fd..eaf0f85d 100644
--- a/src/SharpIDE.Godot/Features/LeftSideBar/LeftSideBar.cs
+++ b/src/SharpIDE.Godot/Features/LeftSideBar/LeftSideBar.cs
@@ -5,52 +5,52 @@ namespace SharpIDE.Godot.Features.LeftSideBar;
 
 public partial class LeftSideBar : Panel
 {
-    private Button _slnExplorerButton = null!;
-    // These are in a ButtonGroup, which handles mutual exclusivity of being toggled on
-    private Button _problemsButton = null!;
-    private Button _runButton = null!;
-    private Button _buildButton = null!;
-    private Button _debugButton = null!;
-    private Button _ideDiagnosticsButton = null!;
-    private Button _nugetButton = null!;
-    private Button _testExplorerButton = null!;
-    
-    public override void _Ready()
-    {
-        _slnExplorerButton = GetNode<Button>("%SlnExplorerButton");
-        _problemsButton = GetNode<Button>("%ProblemsButton");
-        _runButton = GetNode<Button>("%RunButton");
-        _buildButton = GetNode<Button>("%BuildButton");
-        _debugButton = GetNode<Button>("%DebugButton");
-        _ideDiagnosticsButton = GetNode<Button>("%IdeDiagnosticsButton");
-        _nugetButton = GetNode<Button>("%NugetButton");
-        _testExplorerButton = GetNode<Button>("%TestExplorerButton");
-        
-        _problemsButton.Toggled += toggledOn => GodotGlobalEvents.Instance.BottomPanelTabSelected.InvokeParallelFireAndForget(toggledOn ? BottomPanelType.Problems : null);
-        _runButton.Toggled += toggledOn => GodotGlobalEvents.Instance.BottomPanelTabSelected.InvokeParallelFireAndForget(toggledOn ? BottomPanelType.Run : null);
-        _buildButton.Toggled += toggledOn => GodotGlobalEvents.Instance.BottomPanelTabSelected.InvokeParallelFireAndForget(toggledOn ? BottomPanelType.Build : null);
-        _debugButton.Toggled += toggledOn => GodotGlobalEvents.Instance.BottomPanelTabSelected.InvokeParallelFireAndForget(toggledOn ? BottomPanelType.Debug : null);
-        _ideDiagnosticsButton.Toggled += toggledOn => GodotGlobalEvents.Instance.BottomPanelTabSelected.InvokeParallelFireAndForget(toggledOn ? BottomPanelType.IdeDiagnostics : null);
-        _nugetButton.Toggled += toggledOn => GodotGlobalEvents.Instance.BottomPanelTabSelected.InvokeParallelFireAndForget(toggledOn ? BottomPanelType.Nuget : null);
-        _testExplorerButton.Toggled += toggledOn => GodotGlobalEvents.Instance.BottomPanelTabSelected.InvokeParallelFireAndForget(toggledOn ? BottomPanelType.TestExplorer : null);
-        GodotGlobalEvents.Instance.BottomPanelTabExternallySelected.Subscribe(OnBottomPanelTabExternallySelected);
-    }
+	private Button _slnExplorerButton = null!;
+	// These are in a ButtonGroup, which handles mutual exclusivity of being toggled on
+	private Button _problemsButton = null!;
+	private Button _runButton = null!;
+	private Button _buildButton = null!;
+	private Button _debugButton = null!;
+	private Button _ideDiagnosticsButton = null!;
+	private Button _nugetButton = null!;
+	private Button _testExplorerButton = null!;
+	
+	public override void _Ready()
+	{
+		_slnExplorerButton = GetNode<Button>("%SlnExplorerButton");
+		_problemsButton = GetNode<Button>("%ProblemsButton");
+		_runButton = GetNode<Button>("%RunButton");
+		_buildButton = GetNode<Button>("%BuildButton");
+		_debugButton = GetNode<Button>("%DebugButton");
+		_ideDiagnosticsButton = GetNode<Button>("%IdeDiagnosticsButton");
+		_nugetButton = GetNode<Button>("%NugetButton");
+		_testExplorerButton = GetNode<Button>("%TestExplorerButton");
+		
+		_problemsButton.Toggled += toggledOn => GodotGlobalEvents.Instance.BottomPanelTabSelected.InvokeParallelFireAndForget(toggledOn ? BottomPanelType.Problems : null);
+		_runButton.Toggled += toggledOn => GodotGlobalEvents.Instance.BottomPanelTabSelected.InvokeParallelFireAndForget(toggledOn ? BottomPanelType.Run : null);
+		_buildButton.Toggled += toggledOn => GodotGlobalEvents.Instance.BottomPanelTabSelected.InvokeParallelFireAndForget(toggledOn ? BottomPanelType.Build : null);
+		_debugButton.Toggled += toggledOn => GodotGlobalEvents.Instance.BottomPanelTabSelected.InvokeParallelFireAndForget(toggledOn ? BottomPanelType.Debug : null);
+		_ideDiagnosticsButton.Toggled += toggledOn => GodotGlobalEvents.Instance.BottomPanelTabSelected.InvokeParallelFireAndForget(toggledOn ? BottomPanelType.IdeDiagnostics : null);
+		_nugetButton.Toggled += toggledOn => GodotGlobalEvents.Instance.BottomPanelTabSelected.InvokeParallelFireAndForget(toggledOn ? BottomPanelType.Nuget : null);
+		_testExplorerButton.Toggled += toggledOn => GodotGlobalEvents.Instance.BottomPanelTabSelected.InvokeParallelFireAndForget(toggledOn ? BottomPanelType.TestExplorer : null);
+		GodotGlobalEvents.Instance.BottomPanelTabExternallySelected.Subscribe(OnBottomPanelTabExternallySelected);
+	}
 
-    private async Task OnBottomPanelTabExternallySelected(BottomPanelType arg)
-    {
-        await this.InvokeAsync(() =>
-        {
-            switch (arg)
-            {
-                case BottomPanelType.Run: _runButton.ButtonPressed = true; break;
-                case BottomPanelType.Debug: _debugButton.ButtonPressed = true; break;
-                case BottomPanelType.Build: _buildButton.ButtonPressed = true; break;
-                case BottomPanelType.Problems: _problemsButton.ButtonPressed = true; break;
-                case BottomPanelType.IdeDiagnostics: _ideDiagnosticsButton.ButtonPressed = true; break;
-                case BottomPanelType.Nuget: _nugetButton.ButtonPressed = true; break;
-                case BottomPanelType.TestExplorer: _testExplorerButton.ButtonPressed = true; break;
-                default: throw new ArgumentOutOfRangeException(nameof(arg), arg, null);
-            }
-        });
-    }
-}
\ No newline at end of file
+	private async Task OnBottomPanelTabExternallySelected(BottomPanelType arg)
+	{
+		await this.InvokeAsync(() =>
+		{
+			switch (arg)
+			{
+				case BottomPanelType.Run: _runButton.ButtonPressed = true; break;
+				case BottomPanelType.Debug: _debugButton.ButtonPressed = true; break;
+				case BottomPanelType.Build: _buildButton.ButtonPressed = true; break;
+				case BottomPanelType.Problems: _problemsButton.ButtonPressed = true; break;
+				case BottomPanelType.IdeDiagnostics: _ideDiagnosticsButton.ButtonPressed = true; break;
+				case BottomPanelType.Nuget: _nugetButton.ButtonPressed = true; break;
+				case BottomPanelType.TestExplorer: _testExplorerButton.ButtonPressed = true; break;
+				default: throw new ArgumentOutOfRangeException(nameof(arg), arg, null);
+			}
+		});
+	}
+}
diff --git a/src/SharpIDE.Godot/IdeRoot.cs b/src/SharpIDE.Godot/IdeRoot.cs
index f194aa45..1d24faf5 100644
--- a/src/SharpIDE.Godot/IdeRoot.cs
+++ b/src/SharpIDE.Godot/IdeRoot.cs
@@ -13,6 +13,7 @@
 using SharpIDE.Godot.Features.BottomPanel;
 using SharpIDE.Godot.Features.CodeEditor;
 using SharpIDE.Godot.Features.CustomControls;
+using SharpIDE.Godot.Features.Layout;
 using SharpIDE.Godot.Features.Run;
 using SharpIDE.Godot.Features.Search;
 using SharpIDE.Godot.Features.Search.SearchAllFiles;
@@ -23,6 +24,7 @@ namespace SharpIDE.Godot;
 public partial class IdeRoot : Control
 {
 	public IdeWindow IdeWindow { get; set; } = null!;
+	
 	private Button _openSlnButton = null!;
 	private Button _buildSlnButton = null!;
 	private Button _rebuildSlnButton = null!;
@@ -37,6 +39,8 @@ public partial class IdeRoot : Control
 	private Button _runMenuButton = null!;
 	private Popup _runMenuPopup = null!;
 	private BottomPanelManager _bottomPanelManager = null!;
+
+	private IdeDockLayout _dockLayoutRoot = null!;
 	
 	private readonly PackedScene _runMenuItemScene = ResourceLoader.Load<PackedScene>("res://Features/Run/RunMenuItem.tscn");
 	private TaskCompletionSource _nodeReadyTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
@@ -45,12 +49,12 @@ public partial class IdeRoot : Control
 	[Inject] private readonly IdeFileExternalChangeHandler _fileExternalChangeHandler = null!;
 	[Inject] private readonly IdeFileWatcher _fileWatcher = null!;
 	[Inject] private readonly BuildService _buildService = null!;
-    [Inject] private readonly IdeOpenTabsFileManager _openTabsFileManager = null!;
-    [Inject] private readonly RoslynAnalysis _roslynAnalysis = null!;
-    [Inject] private readonly SharpIdeSolutionModificationService _sharpIdeSolutionModificationService = null!;
-    [Inject] private readonly SharpIdeSolutionAccessor _sharpIdeSolutionAccessor = null!;
-    [Inject] private readonly IdeNavigationHistoryService _navigationHistoryService = null!;
-    [Inject] private readonly ILogger<IdeRoot> _logger = null!;
+	[Inject] private readonly IdeOpenTabsFileManager _openTabsFileManager = null!;
+	[Inject] private readonly RoslynAnalysis _roslynAnalysis = null!;
+	[Inject] private readonly SharpIdeSolutionModificationService _sharpIdeSolutionModificationService = null!;
+	[Inject] private readonly SharpIdeSolutionAccessor _sharpIdeSolutionAccessor = null!;
+	[Inject] private readonly IdeNavigationHistoryService _navigationHistoryService = null!;
+	[Inject] private readonly ILogger<IdeRoot> _logger = null!;
 
 	public override void _EnterTree()
 	{
@@ -76,11 +80,13 @@ public override void _Ready()
 		_codeEditorPanel = GetNode<CodeEditorPanel>("%CodeEditorPanel");
 		_searchWindow = GetNode<SearchWindow>("%SearchWindow");
 		_searchAllFilesWindow = GetNode<SearchAllFilesWindow>("%SearchAllFilesWindow");
-		_solutionExplorerPanel = GetNode<SolutionExplorerPanel>("%SolutionExplorerPanel");
-		_runPanel = GetNode<RunPanel>("%RunPanel");
-		_invertedVSplitContainer = GetNode<InvertedVSplitContainer>("%InvertedVSplitContainer");
+		 _solutionExplorerPanel = GetNode<SolutionExplorerPanel>("%SolutionExplorerPanel");
+		 _runPanel = GetNode<RunPanel>("%RunPanel");
+		 _invertedVSplitContainer = GetNode<InvertedVSplitContainer>("%InvertedVSplitContainer");
 		_bottomPanelManager = GetNode<BottomPanelManager>("%BottomPanel");
 		
+		_dockLayoutRoot = GetNode<IdeDockLayout>("%DockLayoutRoot");
+		
 		_runMenuButton.Pressed += OnRunMenuButtonPressed;
 		GodotGlobalEvents.Instance.FileSelected.Subscribe(OnSolutionExplorerPanelOnFileSelected);
 		_openSlnButton.Pressed += () => IdeWindow.PickSolution();
@@ -160,6 +166,8 @@ public void SetSlnFilePath(string path)
 			_ = Task.GodotRun(_solutionExplorerPanel.BindToSolution);
 			_roslynAnalysis.StartLoadingSolutionInWorkspace(solutionModel);
 			_fileWatcher.StartWatching(solutionModel);
+
+			//_dockLayoutRoot.ChangeSolution(solutionModel);
 			
 			var previousTabs = Singletons.AppState.RecentSlns.Single(s => s.FilePath == solutionModel.FilePath).IdeSolutionState.OpenTabs;
 			var filesToOpen = previousTabs
@@ -208,4 +216,4 @@ public override void _UnhandledKeyInput(InputEvent @event)
 			_searchAllFilesWindow.Popup();
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/SharpIDE.Godot/IdeRoot.tscn b/src/SharpIDE.Godot/IdeRoot.tscn
index 2598a987..a22c2dd2 100644
--- a/src/SharpIDE.Godot/IdeRoot.tscn
+++ b/src/SharpIDE.Godot/IdeRoot.tscn
@@ -1,35 +1,19 @@
-[gd_scene load_steps=24 format=3 uid="uid://b2oniigcp5ew5"]
+[gd_scene load_steps=12 format=3 uid="uid://b2oniigcp5ew5"]
 
 [ext_resource type="FontFile" uid="uid://38igu11xwba6" path="res://Inter-VariableFont.ttf" id="1_7ptyn"]
 [ext_resource type="Script" uid="uid://bavypuy7b375x" path="res://IdeRoot.cs" id="1_whawi"]
 [ext_resource type="Texture2D" uid="uid://bkty6563cthj8" path="res://Features/Run/Resources/Run.svg" id="2_8x8ub"]
-[ext_resource type="Script" uid="uid://kvnhndc3l6ih" path="res://Features/CustomControls/InvertedVSplitContainer.cs" id="3_0ybuf"]
 [ext_resource type="PackedScene" uid="uid://biyhfwx36ium8" path="res://Features/LeftSideBar/LeftSideBar.tscn" id="3_f60gr"]
 [ext_resource type="PackedScene" uid="uid://bgpc5vsddmakc" path="res://Features/Navigation/ForwardBackwardButtonContainer.tscn" id="3_ptnvy"]
 [ext_resource type="PackedScene" uid="uid://c6xurjdabssao" path="res://Features/Settings/SettingsButton.tscn" id="5_pm5al"]
-[ext_resource type="PackedScene" uid="uid://cy1bb32g7j7dr" path="res://Features/SolutionExplorer/SolutionExplorerPanel.tscn" id="5_s2dv6"]
-[ext_resource type="PackedScene" uid="uid://bcoytt3bw0gpe" path="res://Features/Run/RunPanel.tscn" id="5_y3aoi"]
-[ext_resource type="Script" uid="uid://cvvgp42r3nml8" path="res://Features/BottomPanel/BottomPanelManager.cs" id="7_i62lx"]
-[ext_resource type="PackedScene" uid="uid://c5dlwgcx3ubyp" path="res://Features/CodeEditor/CodeEditorPanel.tscn" id="8_7ptyn"]
-[ext_resource type="PackedScene" uid="uid://co6dkhdolriej" path="res://Features/Build/BuildPanel.tscn" id="9_rllbf"]
-[ext_resource type="PackedScene" uid="uid://tqpmww430cor" path="res://Features/Problems/ProblemsPanel.tscn" id="11_b7c1a"]
-[ext_resource type="PackedScene" uid="uid://dkjips8oudqou" path="res://Features/Debug_/DebugPanel.tscn" id="11_s2dv6"]
+[ext_resource type="PackedScene" uid="uid://bcn33cckidihf" path="res://Features/Layout/IdeDockLayout.tscn" id="7_4dy53"]
 [ext_resource type="PackedScene" uid="uid://8lk0qj233a7p" path="res://Features/Search/SearchInFiles/SearchWindow.tscn" id="13_7ptyn"]
-[ext_resource type="PackedScene" uid="uid://b0tjuqq3bca5e" path="res://Features/IdeDiagnostics/IdeDiagnosticsPanel.tscn" id="13_woo5i"]
 [ext_resource type="PackedScene" uid="uid://b8kytk23cfo4x" path="res://Features/Search/SearchAllFiles/SearchAllFilesWindow.tscn" id="15_gh8b1"]
-[ext_resource type="PackedScene" uid="uid://duyxg107nfh2f" path="res://Features/Nuget/NugetPanel.tscn" id="15_lv3f5"]
-[ext_resource type="PackedScene" uid="uid://hwdok1kch3b3" path="res://Features/TestExplorer/TestExplorerPanel.tscn" id="16_0sv7o"]
 [ext_resource type="PackedScene" uid="uid://dr41a4isv0dd5" path="res://Features/BottomBar/BottomBar.tscn" id="18_gyy5s"]
 
 [sub_resource type="Theme" id="Theme_s2dv6"]
 default_font = ExtResource("1_7ptyn")
 
-[sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_woo5i"]
-size = Vector2(0, 0)
-
-[sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_7ptyn"]
-size = Vector2(0, 0)
-
 [node name="IdeRoot" type="Control"]
 layout_mode = 3
 anchors_preset = 15
@@ -136,71 +120,10 @@ size_flags_vertical = 3
 [node name="LeftSideBar" parent="VBoxContainer/HBoxContainer" instance=ExtResource("3_f60gr")]
 layout_mode = 2
 
-[node name="InvertedVSplitContainer" type="VSplitContainer" parent="VBoxContainer/HBoxContainer"]
+[node name="DockLayoutRoot" parent="VBoxContainer/HBoxContainer" instance=ExtResource("7_4dy53")]
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 3
-theme_override_constants/separation = 4
-theme_override_constants/minimum_grab_thickness = 10
-theme_override_icons/grabber = SubResource("PlaceholderTexture2D_woo5i")
-split_offset = 370
-script = ExtResource("3_0ybuf")
-metadata/_custom_type_script = "uid://kvnhndc3l6ih"
-
-[node name="HSplitContainer" type="HSplitContainer" parent="VBoxContainer/HBoxContainer/InvertedVSplitContainer"]
-layout_mode = 2
-size_flags_horizontal = 3
-theme_override_constants/separation = 4
-theme_override_constants/minimum_grab_thickness = 10
-theme_override_icons/grabber = SubResource("PlaceholderTexture2D_7ptyn")
-split_offset = 400
-
-[node name="SolutionExplorerPanel" parent="VBoxContainer/HBoxContainer/InvertedVSplitContainer/HSplitContainer" instance=ExtResource("5_s2dv6")]
-unique_name_in_owner = true
-layout_mode = 2
-
-[node name="CodeEditorPanel" parent="VBoxContainer/HBoxContainer/InvertedVSplitContainer/HSplitContainer" instance=ExtResource("8_7ptyn")]
-unique_name_in_owner = true
-layout_mode = 2
-
-[node name="BottomPanel" type="Panel" parent="VBoxContainer/HBoxContainer/InvertedVSplitContainer"]
-unique_name_in_owner = true
-layout_mode = 2
-script = ExtResource("7_i62lx")
-
-[node name="ProblemsPanel" parent="VBoxContainer/HBoxContainer/InvertedVSplitContainer/BottomPanel" instance=ExtResource("11_b7c1a")]
-unique_name_in_owner = true
-visible = false
-layout_mode = 1
-
-[node name="RunPanel" parent="VBoxContainer/HBoxContainer/InvertedVSplitContainer/BottomPanel" instance=ExtResource("5_y3aoi")]
-unique_name_in_owner = true
-layout_mode = 1
-
-[node name="DebugPanel" parent="VBoxContainer/HBoxContainer/InvertedVSplitContainer/BottomPanel" instance=ExtResource("11_s2dv6")]
-unique_name_in_owner = true
-visible = false
-layout_mode = 1
-
-[node name="BuildPanel" parent="VBoxContainer/HBoxContainer/InvertedVSplitContainer/BottomPanel" instance=ExtResource("9_rllbf")]
-unique_name_in_owner = true
-visible = false
-layout_mode = 1
-
-[node name="IdeDiagnosticsPanel" parent="VBoxContainer/HBoxContainer/InvertedVSplitContainer/BottomPanel" instance=ExtResource("13_woo5i")]
-unique_name_in_owner = true
-visible = false
-layout_mode = 1
-
-[node name="NugetPanel" parent="VBoxContainer/HBoxContainer/InvertedVSplitContainer/BottomPanel" instance=ExtResource("15_lv3f5")]
-unique_name_in_owner = true
-visible = false
-layout_mode = 1
-
-[node name="TestExplorerPanel" parent="VBoxContainer/HBoxContainer/InvertedVSplitContainer/BottomPanel" instance=ExtResource("16_0sv7o")]
-unique_name_in_owner = true
-visible = false
-layout_mode = 1
 
 [node name="BottomBar" parent="VBoxContainer" instance=ExtResource("18_gyy5s")]
 layout_mode = 2

From 209554e90c7381747fdf62d4969d70d5587eddde Mon Sep 17 00:00:00 2001
From: Manuel Gasser <manuel.gasser.ch@gmail.com>
Date: Sun, 21 Dec 2025 18:36:24 +0100
Subject: [PATCH 02/11] Implement docking for scenes

---
 src/SharpIDE.Godot/DiAutoload.cs              |   4 +-
 .../BottomPanel/BottomPanelManager.cs         | 108 +++---
 .../Features/CodeEditor/CodeEditorPanel.cs    |  14 +-
 .../Features/Layout/IdeDockComponent.cs       |  17 +
 .../Features/Layout/IdeDockComponent.cs.uid   |   1 +
 .../Features/Layout/IdeDockComponent.tscn     |  34 ++
 .../Features/Layout/IdeDockLayout.cs          | 125 ++-----
 .../Features/Layout/IdeDockOverlay.cs         | 327 ++++++++++--------
 .../Features/Layout/IdeLayoutNode.cs          |   5 +-
 .../Features/Nuget/NugetPanel.cs              |   6 +-
 .../Features/Problems/ProblemsPanel.cs        |  11 +-
 .../SolutionExplorer/SolutionExplorerPanel.cs |  23 +-
 .../TestExplorer/TestExplorerPanel.cs         |  10 +-
 src/SharpIDE.Godot/IdeRoot.cs                 |  55 ++-
 src/SharpIDE.Godot/IdeWindow.cs               |   5 +-
 .../SharpIdeSolutionAccessor.cs               |   9 -
 src/SharpIDE.Godot/SharpIdeSolutionManager.cs |  22 ++
 ....cs.uid => SharpIdeSolutionManager.cs.uid} |   0
 18 files changed, 412 insertions(+), 364 deletions(-)
 create mode 100644 src/SharpIDE.Godot/Features/Layout/IdeDockComponent.cs
 create mode 100644 src/SharpIDE.Godot/Features/Layout/IdeDockComponent.cs.uid
 create mode 100644 src/SharpIDE.Godot/Features/Layout/IdeDockComponent.tscn
 delete mode 100644 src/SharpIDE.Godot/SharpIdeSolutionAccessor.cs
 create mode 100644 src/SharpIDE.Godot/SharpIdeSolutionManager.cs
 rename src/SharpIDE.Godot/{SharpIdeSolutionAccessor.cs.uid => SharpIdeSolutionManager.cs.uid} (100%)

diff --git a/src/SharpIDE.Godot/DiAutoload.cs b/src/SharpIDE.Godot/DiAutoload.cs
index 39242594..ba8581b3 100644
--- a/src/SharpIDE.Godot/DiAutoload.cs
+++ b/src/SharpIDE.Godot/DiAutoload.cs
@@ -22,7 +22,7 @@ public override void _EnterTree()
         var services = new ServiceCollection();
 
         services.AddApplication();
-        services.AddScoped<SharpIdeSolutionAccessor>();
+        services.AddScoped<SharpIdeSolutionManager>();
         services.AddScoped<ActivityMonitor>();
 
         services.AddHttpClient();
@@ -83,7 +83,7 @@ private void InjectDependencies(object target)
                     GetTree().Quit();
                     return;
                 }
-
+                
                 field.SetValue(target, service);
             }
         }
diff --git a/src/SharpIDE.Godot/Features/BottomPanel/BottomPanelManager.cs b/src/SharpIDE.Godot/Features/BottomPanel/BottomPanelManager.cs
index d195205b..7f3ae892 100644
--- a/src/SharpIDE.Godot/Features/BottomPanel/BottomPanelManager.cs
+++ b/src/SharpIDE.Godot/Features/BottomPanel/BottomPanelManager.cs
@@ -12,61 +12,61 @@ namespace SharpIDE.Godot.Features.BottomPanel;
 
 public partial class BottomPanelManager : Panel
 {
-    private RunPanel _runPanel = null!;
-    private DebugPanel _debugPanel = null!;
-    private BuildPanel _buildPanel = null!;
-    private ProblemsPanel _problemsPanel = null!;
-    private IdeDiagnosticsPanel _ideDiagnosticsPanel = null!;
-    private NugetPanel _nugetPanel = null!;
-    private TestExplorerPanel _testExplorerPanel = null!;
+	private RunPanel _runPanel = null!;
+	private DebugPanel _debugPanel = null!;
+	private BuildPanel _buildPanel = null!;
+	private ProblemsPanel _problemsPanel = null!;
+	private IdeDiagnosticsPanel _ideDiagnosticsPanel = null!;
+	private NugetPanel _nugetPanel = null!;
+	private TestExplorerPanel _testExplorerPanel = null!;
 
-    private Dictionary<BottomPanelType, Control> _panelTypeMap = [];
-    
-    public override void _Ready()
-    {
-        _runPanel = GetNode<RunPanel>("%RunPanel");
-        _debugPanel = GetNode<DebugPanel>("%DebugPanel");
-        _buildPanel = GetNode<BuildPanel>("%BuildPanel");
-        _problemsPanel = GetNode<ProblemsPanel>("%ProblemsPanel");
-        _ideDiagnosticsPanel = GetNode<IdeDiagnosticsPanel>("%IdeDiagnosticsPanel");
-        _nugetPanel = GetNode<NugetPanel>("%NugetPanel");
-        _testExplorerPanel = GetNode<TestExplorerPanel>("%TestExplorerPanel");
-        
-        _panelTypeMap = new Dictionary<BottomPanelType, Control>
-        {
-            { BottomPanelType.Run, _runPanel },
-            { BottomPanelType.Debug, _debugPanel },
-            { BottomPanelType.Build, _buildPanel },
-            { BottomPanelType.Problems, _problemsPanel },
-            { BottomPanelType.IdeDiagnostics, _ideDiagnosticsPanel },
-            { BottomPanelType.Nuget, _nugetPanel },
-            { BottomPanelType.TestExplorer, _testExplorerPanel }
-        };
+	private Dictionary<BottomPanelType, Control> _panelTypeMap = [];
+	
+	public override void _Ready()
+	{
+		_runPanel = GetNode<RunPanel>("%RunPanel");
+		_debugPanel = GetNode<DebugPanel>("%DebugPanel");
+		_buildPanel = GetNode<BuildPanel>("%BuildPanel");
+		_problemsPanel = GetNode<ProblemsPanel>("%ProblemsPanel");
+		_ideDiagnosticsPanel = GetNode<IdeDiagnosticsPanel>("%IdeDiagnosticsPanel");
+		_nugetPanel = GetNode<NugetPanel>("%NugetPanel");
+		_testExplorerPanel = GetNode<TestExplorerPanel>("%TestExplorerPanel");
+		
+		_panelTypeMap = new Dictionary<BottomPanelType, Control>
+		{
+			{ BottomPanelType.Run, _runPanel },
+			{ BottomPanelType.Debug, _debugPanel },
+			{ BottomPanelType.Build, _buildPanel },
+			{ BottomPanelType.Problems, _problemsPanel },
+			{ BottomPanelType.IdeDiagnostics, _ideDiagnosticsPanel },
+			{ BottomPanelType.Nuget, _nugetPanel },
+			{ BottomPanelType.TestExplorer, _testExplorerPanel }
+		};
 
-        GodotGlobalEvents.Instance.BottomPanelTabSelected.Subscribe(OnBottomPanelTabSelected);
-    }
+		GodotGlobalEvents.Instance.BottomPanelTabSelected.Subscribe(OnBottomPanelTabSelected);
+	}
 
-    public override void _ExitTree()
-    {
-        GodotGlobalEvents.Instance.BottomPanelTabSelected.Subscribe(OnBottomPanelTabSelected);
-    }
+	public override void _ExitTree()
+	{
+		GodotGlobalEvents.Instance.BottomPanelTabSelected.Subscribe(OnBottomPanelTabSelected);
+	}
 
-    private async Task OnBottomPanelTabSelected(BottomPanelType? type)
-    {
-        await this.InvokeAsync(() =>
-        {
-            if (type == null)
-            {
-                GodotGlobalEvents.Instance.BottomPanelVisibilityChangeRequested.InvokeParallelFireAndForget(false);
-            }
-            else
-            {
-                GodotGlobalEvents.Instance.BottomPanelVisibilityChangeRequested.InvokeParallelFireAndForget(true);
-            }
-            foreach (var kvp in _panelTypeMap)
-            {
-                kvp.Value.Visible = kvp.Key == type;
-            }
-        });
-    }
-}
\ No newline at end of file
+	private async Task OnBottomPanelTabSelected(BottomPanelType? type)
+	{
+		await this.InvokeAsync(() =>
+		{
+			if (type == null)
+			{
+				GodotGlobalEvents.Instance.BottomPanelVisibilityChangeRequested.InvokeParallelFireAndForget(false);
+			}
+			else
+			{
+				GodotGlobalEvents.Instance.BottomPanelVisibilityChangeRequested.InvokeParallelFireAndForget(true);
+			}
+			foreach (var kvp in _panelTypeMap)
+			{
+				kvp.Value.Visible = kvp.Key == type;
+			}
+		});
+	}
+}
diff --git a/src/SharpIDE.Godot/Features/CodeEditor/CodeEditorPanel.cs b/src/SharpIDE.Godot/Features/CodeEditor/CodeEditorPanel.cs
index 0b770078..83140efd 100644
--- a/src/SharpIDE.Godot/Features/CodeEditor/CodeEditorPanel.cs
+++ b/src/SharpIDE.Godot/Features/CodeEditor/CodeEditorPanel.cs
@@ -17,12 +17,13 @@ public partial class CodeEditorPanel : MarginContainer
 {
 	[Export]
 	public Texture2D CsFileTexture { get; set; } = null!;
-	public SharpIdeSolutionModel Solution { get; set; } = null!;
 	private PackedScene _sharpIdeCodeEditScene = GD.Load<PackedScene>("res://Features/CodeEditor/SharpIdeCodeEdit.tscn");
 	private TabContainer _tabContainer = null!;
 	private ConcurrentDictionary<SharpIdeProjectModel, ExecutionStopInfo> _debuggerExecutionStopInfoByProject = [];
 	
 	[Inject] private readonly RunService _runService = null!;
+	[Inject] private readonly SharpIdeSolutionManager _solutionManager = null!;
+	
 	public override void _Ready()
 	{
 		_tabContainer = GetNode<TabContainer>("TabContainer");
@@ -33,6 +34,7 @@ public override void _Ready()
 		tabBar.TabClosePressed += OnTabClosePressed;
 		GlobalEvents.Instance.DebuggerExecutionStopped.Subscribe(OnDebuggerExecutionStopped);
 		GlobalEvents.Instance.ProjectStoppedDebugging.Subscribe(OnProjectStoppedDebugging);
+		GodotGlobalEvents.Instance.FileSelected.Subscribe(SetSharpIdeFile);
 	}
 
 	public override void _GuiInput(InputEvent @event)
@@ -69,7 +71,7 @@ private void AdjustCodeEditorUiScale(bool increase)
 	public override void _ExitTree()
 	{
 		var selectedTabIndex = _tabContainer.CurrentTab;
-		var thisSolution = Singletons.AppState.RecentSlns.Single(s => s.FilePath == Solution.FilePath);
+		var thisSolution = Singletons.AppState.RecentSlns.Single(s => s.FilePath == _solutionManager.SolutionModel.FilePath);
 		thisSolution.IdeSolutionState.OpenTabs = _tabContainer.GetChildren().OfType<SharpIdeCodeEdit>()
 			.Select((t, index) => new OpenTab
 			{
@@ -124,7 +126,7 @@ private void OnTabClosePressed(long tabIndex)
 		tab.QueueFree();
 	}
 
-	public async Task SetSharpIdeFile(SharpIdeFile file, SharpIdeFileLinePosition? fileLinePosition)
+	private async Task SetSharpIdeFile(SharpIdeFile file, SharpIdeFileLinePosition? fileLinePosition)
 	{
 		await Task.CompletedTask.ConfigureAwait(ConfigureAwaitOptions.ForceYielding);
 		var existingTab = await this.InvokeAsync(() => _tabContainer.GetChildren().OfType<SharpIdeCodeEdit>().FirstOrDefault(t => t.SharpIdeFile == file));
@@ -139,7 +141,7 @@ await this.InvokeAsync(() =>
 			return;
 		}
 		var newTab = _sharpIdeCodeEditScene.Instantiate<SharpIdeCodeEdit>();
-		newTab.Solution = Solution;
+		newTab.Solution = _solutionManager.SolutionModel;
 		await this.InvokeAsync(() =>
 		{
 			_tabContainer.AddChild(newTab);
@@ -167,13 +169,11 @@ await this.InvokeAsync(() =>
 	private static readonly Color ExecutingLineColor = new Color("665001");
 	private async Task OnDebuggerExecutionStopped(ExecutionStopInfo executionStopInfo)
 	{
-		Guard.Against.Null(Solution, nameof(Solution));
-		
 		var currentSharpIdeFile = await this.InvokeAsync<SharpIdeFile>(() => _tabContainer.GetChild<SharpIdeCodeEdit>(_tabContainer.CurrentTab).SharpIdeFile);
 		
 		if (executionStopInfo.FilePath != currentSharpIdeFile?.Path)
 		{
-			var file = Solution.AllFiles[executionStopInfo.FilePath];
+			var file = _solutionManager.SolutionModel.AllFiles[executionStopInfo.FilePath];
 			await GodotGlobalEvents.Instance.FileExternallySelected.InvokeParallelAsync(file, null).ConfigureAwait(false);
 		}
 		var lineInt = executionStopInfo.Line - 1; // Debugging is 1-indexed, Godot is 0-indexed
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeDockComponent.cs b/src/SharpIDE.Godot/Features/Layout/IdeDockComponent.cs
new file mode 100644
index 00000000..110f562f
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/IdeDockComponent.cs
@@ -0,0 +1,17 @@
+using Godot;
+
+namespace SharpIDE.Godot.Features.Layout;
+
+public partial class IdeDockComponent : VBoxContainer
+{
+	public IdeSceneNode ComponentNode { get; set; } = null!;
+
+	public override void _Ready()
+	{
+		GetNode<Label>("%ComponentName").Text = ComponentNode.Name;
+		
+		var sceneResource = ResourceLoader.Load<PackedScene>(ComponentNode.ResourceUid);
+		var scene = sceneResource.Instantiate<Control>();
+		GetNode<Control>("%ScenePresenter").AddChild(scene);
+	}
+}
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeDockComponent.cs.uid b/src/SharpIDE.Godot/Features/Layout/IdeDockComponent.cs.uid
new file mode 100644
index 00000000..b3385eee
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/IdeDockComponent.cs.uid
@@ -0,0 +1 @@
+uid://c2hitudanbd2u
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeDockComponent.tscn b/src/SharpIDE.Godot/Features/Layout/IdeDockComponent.tscn
new file mode 100644
index 00000000..0c9b310b
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/IdeDockComponent.tscn
@@ -0,0 +1,34 @@
+[gd_scene load_steps=2 format=3 uid="uid://b36lno754a2is"]
+
+[ext_resource type="Script" uid="uid://c2hitudanbd2u" path="res://Features/Layout/IdeDockComponent.cs" id="1_6ujk8"]
+
+[node name="IdeDockComponent" type="VBoxContainer"]
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+size_flags_horizontal = 3
+size_flags_vertical = 3
+theme_override_constants/separation = 1
+script = ExtResource("1_6ujk8")
+
+[node name="TopBar" type="PanelContainer" parent="."]
+layout_mode = 2
+mouse_filter = 2
+
+[node name="Margins" type="MarginContainer" parent="TopBar"]
+layout_mode = 2
+theme_override_constants/margin_left = 5
+theme_override_constants/margin_top = 5
+theme_override_constants/margin_bottom = 5
+
+[node name="ComponentName" type="Label" parent="TopBar/Margins"]
+unique_name_in_owner = true
+layout_mode = 2
+vertical_alignment = 1
+
+[node name="ScenePresenter" type="Control" parent="."]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_vertical = 3
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeDockLayout.cs b/src/SharpIDE.Godot/Features/Layout/IdeDockLayout.cs
index 7165915a..5d3d21f8 100644
--- a/src/SharpIDE.Godot/Features/Layout/IdeDockLayout.cs
+++ b/src/SharpIDE.Godot/Features/Layout/IdeDockLayout.cs
@@ -1,94 +1,47 @@
 using Godot;
 
 using SharpIDE.Application.Features.SolutionDiscovery.VsPersistence;
-using SharpIDE.Godot.Features.CodeEditor;
-using SharpIDE.Godot.Features.SolutionExplorer;
 
 namespace SharpIDE.Godot.Features.Layout;
 
 public partial class IdeDockLayout : Control
 {
+	[Export]
+	public int DockComponentSeparation { get; set; } = 0;
+	
+	private readonly Dictionary<Control, IdeLayoutNode> _nodeMap = [];
 	private IdeLayoutNode _layout = null!;
 
-	private SharpIdeSolutionModel? _solution;
-
 	private IdeDockOverlay _dockOverlay = null!;
 
 	private Control? _layoutNode;
-	private IdeLayoutNode? _draggedNode;
-	private readonly Dictionary<Control, IdeLayoutNode> _nodeMap = [];
 
 	/// <inheritdoc />
 	public override void _Ready()
 	{
 		_dockOverlay = GetNode<IdeDockOverlay>("%DockOverlay");
 
+		// TODO: Wrap scenes in dock panel component scene
 		// TODO: Add layout profiles and persist layout
 		_layout = new IdeSplitNode(
 			Orientation.Horizontal,
-			FirstNode: new IdeSceneNode("uid://cy1bb32g7j7dr"),
-			SecondNode: new IdeSplitNode(
-				Orientation.Vertical,
-				FirstNode: new IdeSceneNode("uid://cy1bb32g7j7dr"),
-				SecondNode: new IdeSceneNode("uid://c5dlwgcx3ubyp")));
+			FirstNode: new IdeSceneNode("uid://cy1bb32g7j7dr", "Solution Explorer"),
+			SecondNode: new IdeSceneNode("uid://c5dlwgcx3ubyp", "Code Editor"));
 
-		FocusExited += CancelDrag;
+		FocusExited += _dockOverlay.EndDrag;
 
 		RebuildLayoutTree();
 	}
 
 	/// <inheritdoc />
-	public override void _UnhandledKeyInput(InputEvent @event)
+	public override void _UnhandledKeyInput(InputEvent input)
 	{
-		if (@event is InputEventKey { Keycode: Key.Escape, Pressed: true })
+		if (input is InputEventKey { Keycode: Key.Escape, Pressed: true })
 		{
-			CancelDrag();
+			_dockOverlay.EndDrag();
 		}
 	}
-
-	// TODO: This is currently a workaround. A better way to set the solution should be found.
-	public void ChangeSolution(SharpIdeSolutionModel solution)
-	{
-		_solution = solution;
-
-		CallDeferred(nameof(ChangeSolutionImpl));
-	}
-
-	private void ChangeSolutionImpl()
-	{
-		//if (_solution is null)
-		{
-			return;
-		}
-
-		foreach (var editor in GetAllChildren<CodeEditorPanel>(this))
-		{
-			editor.Solution = _solution;
-		}
-
-		foreach (var explorer in GetAllChildren<SolutionExplorerPanel>(this))
-		{
-			explorer.SolutionModel = _solution;
-			_ = Task.GodotRun(explorer.BindToSolution);
-		}
-	}
-
-	private IEnumerable<TNode> GetAllChildren<TNode>(Node node) where TNode : Node
-	{
-		return node.GetChildren()
-				   .SelectMany(child =>
-				   {
-					   var children = GetAllChildren<TNode>(child);
-
-					   if (child is TNode nodeChild)
-					   {
-						   children = children.Prepend(nodeChild);
-					   }
-
-					   return children;
-				   });
-	}
-
+	
 	private void RebuildLayoutTree()
 	{
 		_dockOverlay.ClearDockTargets();
@@ -96,8 +49,6 @@ private void RebuildLayoutTree()
 		_layoutNode?.QueueFree();
 		_layoutNode = BuildLayoutTree(_layout);
 		AddChild(_layoutNode);
-
-		ChangeSolution(_solution!);
 	}
 
 	private Control BuildLayoutTree(IdeLayoutNode layoutNode)
@@ -129,6 +80,7 @@ private Control BuildSplitLayout(IdeSplitNode splitNode)
 		container.SizeFlagsHorizontal = SizeFlags.ExpandFill;
 		container.SizeFlagsVertical = SizeFlags.ExpandFill;
 		container.SetAnchorsAndOffsetsPreset(LayoutPreset.FullRect);
+		container.AddThemeConstantOverride("separation", DockComponentSeparation);
 
 		var firstChild = BuildLayoutTree(splitNode.FirstNode);
 		var secondChild = BuildLayoutTree(splitNode.SecondNode);
@@ -162,17 +114,18 @@ private Control BuildTabGroupLayout(IdeTabGroupNode tabGroupNode)
 
 	private Control BuildSceneLayout(IdeSceneNode sceneNode)
 	{
-		var sceneResource = ResourceLoader.Load<PackedScene>(sceneNode.ResourceUid);
-		var scene = sceneResource.Instantiate<Control>();
-		scene.GuiInput += input => OnSceneGuiInput(input, sceneNode);
 
-		_dockOverlay.RegisterDockTarget(scene);
-		_nodeMap[scene] = sceneNode;
+		var component = ResourceLoader.Load<PackedScene>("uid://b36lno754a2is").Instantiate<IdeDockComponent>();
+		component.ComponentNode = sceneNode;
+		component.GuiInput += input => OnDockComponentGuiInput(input, sceneNode);
+
+		_dockOverlay.RegisterDockTarget(component);
+		_nodeMap[component] = sceneNode;
 
-		return scene;
+		return component;
 	}
 
-	private void OnSceneGuiInput(InputEvent input, IdeLayoutNode node)
+	private void OnDockComponentGuiInput(InputEvent input, IdeLayoutNode node)
 	{
 		if (input is not InputEventMouseButton { ButtonIndex: MouseButton.Left } leftButton)
 		{
@@ -190,47 +143,34 @@ private void OnSceneGuiInput(InputEvent input, IdeLayoutNode node)
 
 	private void BeginDrag(IdeLayoutNode draggedNode)
 	{
-		GD.Print(nameof(BeginDrag));
-		
-		_draggedNode = draggedNode;
-		_dockOverlay.Visible = true;
+		_dockOverlay.BeginDrag(draggedNode);
 	}
 
 	private void EndDrag()
 	{
-		GD.Print(nameof(EndDrag));
-		
-		if (_draggedNode is null || _dockOverlay.CurrentDockPosition is DockPosition.None)
+		if (_dockOverlay.DraggedNode is null || _dockOverlay.CurrentDockPosition is DockPosition.None)
 		{
-			CancelDrag();
+			_dockOverlay.EndDrag();
 			return;
 		}
 
 		switch (_dockOverlay.CurrentDockScope)
 		{
 			case DockScope.Global:
-				DockTarget(_draggedNode, _layout, _dockOverlay.CurrentDockPosition);
+				DockTarget(_dockOverlay.DraggedNode, _layout, _dockOverlay.CurrentDockPosition);
 				break;
 			case DockScope.Local when _dockOverlay.HoveredTarget is not null:
-				DockTarget(_draggedNode, _nodeMap[_dockOverlay.HoveredTarget], _dockOverlay.CurrentDockPosition);
+				DockTarget(_dockOverlay.DraggedNode, _nodeMap[_dockOverlay.HoveredTarget], _dockOverlay.CurrentDockPosition);
 				break;
 		}
 
-		CancelDrag();
-	}
-
-	private void CancelDrag()
-	{
-		GD.Print(nameof(CancelDrag));
-		
-		_draggedNode = null;
-		_dockOverlay.Visible = false;
+		_dockOverlay.EndDrag();
 	}
 
 	private IdeLayoutNode ReplaceNode(IdeLayoutNode current, IdeLayoutNode target, IdeLayoutNode replacement)
 	{
 		// TODO: FIX
-		if (ReferenceEquals(_layout, target) || ReferenceEquals(current, target))
+		if (ReferenceEquals(current, target))
 		{
 			return replacement;
 		}
@@ -244,7 +184,7 @@ private IdeLayoutNode ReplaceNode(IdeLayoutNode current, IdeLayoutNode target, I
 			};
 		}
 
-		return current;
+		return replacement;
 	}
 
 	private IdeLayoutNode? RemoveNode(IdeLayoutNode current, IdeLayoutNode target)
@@ -281,6 +221,9 @@ private IdeLayoutNode ReplaceNode(IdeLayoutNode current, IdeLayoutNode target, I
 
 	private void DockTarget(IdeLayoutNode dragged, IdeLayoutNode target, DockPosition position)
 	{
+		_layout = RemoveNode(_layout, dragged)!;
+		target = RemoveNode(target, dragged)!;
+		
 		var replacement = position switch
 		{
 			DockPosition.Left => new IdeSplitNode(Orientation.Horizontal, dragged, target),
@@ -296,8 +239,8 @@ private void DockTarget(IdeLayoutNode dragged, IdeLayoutNode target, DockPositio
 			return;
 		}
 
-		_layout = ReplaceNode(RemoveNode(_layout, dragged)!, target, replacement);
-		
+		_layout = ReplaceNode(_layout, target, replacement);
+
 		RebuildLayoutTree();
 	}
 }
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeDockOverlay.cs b/src/SharpIDE.Godot/Features/Layout/IdeDockOverlay.cs
index d2ed9449..6e1b0e55 100644
--- a/src/SharpIDE.Godot/Features/Layout/IdeDockOverlay.cs
+++ b/src/SharpIDE.Godot/Features/Layout/IdeDockOverlay.cs
@@ -4,150 +4,183 @@ namespace SharpIDE.Godot.Features.Layout;
 
 public partial class IdeDockOverlay : Control
 {
-	private readonly List<Control> _dockTargets = [];
-
-	private IReadOnlyCollection<DockSymbol> _dockSymbols = null!;
-
-	[Export]
-	public float DockPreviewSize { get; set; } = 0.3f;
-
-	[Export]
-	public Color DockPreviewColor { get; set; } = CachedColors.Gray;
-
-	[Export]
-	public Control GlobalDockSymbols { get; set; } = null!;
-
-	[Export]
-	public Control LocalDockSymbols { get; set; } = null!;
-
-	public Control? HoveredTarget { get; private set; }
-
-	public DockScope CurrentDockScope { get; private set; }
-
-	public DockPosition CurrentDockPosition { get; private set; }
-
-	public override void _Ready()
-	{
-		_dockSymbols = GlobalDockSymbols.GetChildren()
-										.OfType<DockSymbol>()
-										.Concat(LocalDockSymbols.GetChildren().OfType<DockSymbol>())
-										.ToArray();
-	}
-
-	/// <inheritdoc />
-	public override void _Process(double delta)
-	{
-		if (Visible)
-		{
-			UpdateDockPreview(GetGlobalMousePosition());
-		}
-	}
-
-	/// <inheritdoc />
-	public override void _Draw()
-	{
-		DrawDockPreview();
-	}
-
-	public void RegisterDockTarget(Control node)
-	{
-		_dockTargets.Add(node);
-	}
-
-	public void ClearDockTargets()
-	{
-		_dockTargets.Clear();
-	}
-
-	private void DrawDockPreview()
-	{
-		switch (CurrentDockScope)
-		{
-			case DockScope.Global:
-				DrawTargetDockPreview(this);
-				break;
-			case DockScope.Local when HoveredTarget is not null:
-				DrawTargetDockPreview(HoveredTarget);
-				break;
-		}
-	}
-
-	private void DrawTargetDockPreview(Control target)
-	{
-		var rect = target.GetGlobalRect();
-		var localRect = new Rect2(
-			rect.Position - GlobalPosition,
-			rect.Size);
-
-		var highlight = CurrentDockPosition switch
-		{
-			DockPosition.Left => new Rect2(
-				localRect.Position,
-				new Vector2(localRect.Size.X * DockPreviewSize, localRect.Size.Y)),
-			DockPosition.Right => new Rect2(
-				localRect.Position + new Vector2(localRect.Size.X * (1.0f - DockPreviewSize), 0),
-				new Vector2(localRect.Size.X * DockPreviewSize, localRect.Size.Y)),
-			DockPosition.Top => new Rect2(
-				localRect.Position,
-				new Vector2(localRect.Size.X, localRect.Size.Y * DockPreviewSize)),
-			DockPosition.Bottom => new Rect2(
-				localRect.Position + new Vector2(0, localRect.Size.Y * (1.0f - DockPreviewSize)),
-				new Vector2(localRect.Size.X, localRect.Size.Y * DockPreviewSize)),
-
-			_ => new Rect2(Vector2.Zero, Vector2.Zero)
-		};
-
-		DrawRect(highlight, DockPreviewColor, filled: true);
-	}
-
-	private void UpdateDockPreview(Vector2 mousePosition)
-	{
-		(CurrentDockScope, CurrentDockPosition) = GetDockScopeAndPosition(mousePosition);
-
-		HoveredTarget = FindDockTarget(mousePosition);
-
-		if (HoveredTarget is null)
-		{
-			LocalDockSymbols.Visible = false;
-			QueueRedraw();
-			return;
-		}
-
-		var targetCenterPosition = HoveredTarget.GlobalPosition
-								 - GlobalPosition
-								 + HoveredTarget.Size / 2.0f
-								 - LocalDockSymbols.Size / 2.0f;
-
-		LocalDockSymbols.Position = targetCenterPosition;
-		LocalDockSymbols.Visible = true;
-
-		QueueRedraw();
-	}
-
-	private Control? FindDockTarget(Vector2 mousePosition)
-	{
-		foreach (var target in _dockTargets)
-		{
-			if (!target.Visible)
-			{
-				continue;
-			}
-
-			if (target.GetGlobalRect().HasPoint(mousePosition))
-			{
-				return target;
-			}
-		}
-
-		return null;
-	}
-
-	private (DockScope Scope, DockPosition Position) GetDockScopeAndPosition(Vector2 mousePosition)
-	{
-		var hoveredSymbol = _dockSymbols.FirstOrDefault(symbol => symbol.GetGlobalRect().HasPoint(mousePosition));
-
-		return hoveredSymbol is not null
-				   ? (hoveredSymbol.DockScope, hoveredSymbol.DockPosition)
-				   : (DockScope.None, DockPosition.None);
-	}
-}
+    private readonly List<IdeDockComponent> _dockTargets = [];
+
+    private IReadOnlyCollection<DockSymbol> _dockSymbols = null!;
+
+    [Export]
+    public float DockPreviewSize { get; set; } = 0.3f;
+
+    [Export]
+    public Color DockPreviewColor { get; set; } = CachedColors.Gray;
+
+    [Export]
+    public Control GlobalDockSymbols { get; set; } = null!;
+
+    [Export]
+    public Control LocalDockSymbols { get; set; } = null!;
+
+    public IdeDockComponent? HoveredTarget { get; private set; }
+
+    public DockScope CurrentDockScope { get; private set; }
+
+    public DockPosition CurrentDockPosition { get; private set; }
+
+    public IdeLayoutNode? DraggedNode { get; private set; }
+
+    public override void _Ready()
+    {
+        _dockSymbols = GlobalDockSymbols.GetChildren()
+                                        .OfType<DockSymbol>()
+                                        .Concat(LocalDockSymbols.GetChildren().OfType<DockSymbol>())
+                                        .ToArray();
+    }
+
+    /// <inheritdoc />
+    public override void _Process(double delta)
+    {
+        if (Visible)
+        {
+            UpdateDockPreview(GetGlobalMousePosition());
+        }
+    }
+
+    /// <inheritdoc />
+    public override void _Draw()
+    {
+        DrawDockPreview();
+    }
+
+    public void RegisterDockTarget(IdeDockComponent node)
+    {
+        _dockTargets.Add(node);
+    }
+
+    public void ClearDockTargets()
+    {
+        _dockTargets.Clear();
+    }
+
+    public void BeginDrag(IdeLayoutNode draggedNode)
+    {
+        DraggedNode = draggedNode;
+        Visible = true;
+    }
+
+    public void EndDrag()
+    {
+        Visible = false;
+        DraggedNode = null;
+    }
+
+    private void DrawDockPreview()
+    {
+        switch (CurrentDockScope)
+        {
+            case DockScope.Global:
+                DrawTargetDockPreview(this);
+                break;
+            case DockScope.Local when HoveredTarget is not null:
+                DrawTargetDockPreview(HoveredTarget);
+                break;
+        }
+    }
+
+    private void DrawTargetDockPreview(Control target)
+    {
+        var rect = target.GetGlobalRect();
+        var localRect = new Rect2(
+            rect.Position - GlobalPosition,
+            rect.Size);
+
+        var highlight = CurrentDockPosition switch
+        {
+            DockPosition.Left => new Rect2(
+                localRect.Position,
+                new Vector2(localRect.Size.X * DockPreviewSize, localRect.Size.Y)),
+            DockPosition.Right => new Rect2(
+                localRect.Position + new Vector2(localRect.Size.X * (1.0f - DockPreviewSize), 0),
+                new Vector2(localRect.Size.X * DockPreviewSize, localRect.Size.Y)),
+            DockPosition.Top => new Rect2(
+                localRect.Position,
+                new Vector2(localRect.Size.X, localRect.Size.Y * DockPreviewSize)),
+            DockPosition.Bottom => new Rect2(
+                localRect.Position + new Vector2(0, localRect.Size.Y * (1.0f - DockPreviewSize)),
+                new Vector2(localRect.Size.X, localRect.Size.Y * DockPreviewSize)),
+
+            _ => new Rect2(Vector2.Zero, Vector2.Zero)
+        };
+
+        DrawRect(highlight, DockPreviewColor, filled: true);
+    }
+
+    private void UpdateDockPreview(Vector2 mousePosition)
+    {
+        (CurrentDockScope, CurrentDockPosition) = GetDockScopeAndPosition(mousePosition);
+
+        HoveredTarget = FindDockTarget(mousePosition);
+
+        if (DraggedNode is null
+         || HoveredTarget is null
+         || !CanLocalDock(DraggedNode, HoveredTarget.ComponentNode, CurrentDockPosition))
+        {
+            LocalDockSymbols.Visible = false;
+            QueueRedraw();
+            return;
+        }
+
+        var targetCenterPosition = HoveredTarget.GlobalPosition
+                                 - GlobalPosition
+                                 + HoveredTarget.Size / 2.0f
+                                 - LocalDockSymbols.Size / 2.0f;
+
+        LocalDockSymbols.Position = targetCenterPosition;
+        LocalDockSymbols.Visible = true;
+
+        QueueRedraw();
+    }
+
+    private IdeDockComponent? FindDockTarget(Vector2 mousePosition)
+    {
+        foreach (var target in _dockTargets)
+        {
+            if (!target.Visible)
+            {
+                continue;
+            }
+
+            if (target.GetGlobalRect().HasPoint(mousePosition))
+            {
+                return target;
+            }
+        }
+
+        return null;
+    }
+
+    private (DockScope Scope, DockPosition Position) GetDockScopeAndPosition(Vector2 mousePosition)
+    {
+        var hoveredSymbol = _dockSymbols.FirstOrDefault(symbol => symbol.GetGlobalRect().HasPoint(mousePosition));
+
+        return hoveredSymbol is not null
+                   ? (hoveredSymbol.DockScope, hoveredSymbol.DockPosition)
+                   : (DockScope.None, DockPosition.None);
+    }
+
+    private bool CanLocalDock(IdeLayoutNode dragged, IdeLayoutNode target, DockPosition position)
+    {
+        if (IsDescendant(dragged, target))
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    private static bool IsDescendant(IdeLayoutNode root, IdeLayoutNode target)
+    {
+        return ReferenceEquals(root, target)
+            || (root is IdeSplitNode splitNode
+             && (IsDescendant(splitNode.FirstNode, target) || IsDescendant(splitNode.SecondNode, target)));
+    }
+}
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeLayoutNode.cs b/src/SharpIDE.Godot/Features/Layout/IdeLayoutNode.cs
index dd5fd621..7716e7d2 100644
--- a/src/SharpIDE.Godot/Features/Layout/IdeLayoutNode.cs
+++ b/src/SharpIDE.Godot/Features/Layout/IdeLayoutNode.cs
@@ -30,12 +30,13 @@ public record IdeSplitNode(
     IdeLayoutNode SecondNode,
     float Ratio = 0.5f) : IdeLayoutNode;
 
-public record IdeSceneNode(string ResourceUid) : IdeLayoutNode;
+public record IdeSceneNode(string ResourceUid, string Name) : IdeLayoutNode;
 
 public record IdeTabGroupNode(
     string ResourceUid,
+    string Name,
     List<IdeDocumentTab> DocumentTabs,
-    int ActiveTabIndex) : IdeSceneNode(ResourceUid);
+    int ActiveTabIndex) : IdeSceneNode(ResourceUid, Name);
 
 public record IdeDocumentTab(
     string TabId,
diff --git a/src/SharpIDE.Godot/Features/Nuget/NugetPanel.cs b/src/SharpIDE.Godot/Features/Nuget/NugetPanel.cs
index 682545a4..3e506fc5 100644
--- a/src/SharpIDE.Godot/Features/Nuget/NugetPanel.cs
+++ b/src/SharpIDE.Godot/Features/Nuget/NugetPanel.cs
@@ -30,7 +30,7 @@ public partial class NugetPanel : Control
 	private SharpIdeSolutionModel? _solution;
 	
 	[Inject] private readonly NugetClientService _nugetClientService = null!;
-	[Inject] private readonly SharpIdeSolutionAccessor _sharpIdeSolutionAccessor = null!;
+	[Inject] private readonly SharpIdeSolutionManager _sharpIdeSolutionManager = null!;
 	[Inject] private readonly ActivityMonitor _activityMonitor = null!;
 	
 	private readonly PackedScene _packageEntryScene = ResourceLoader.Load<PackedScene>("uid://cqc2xlt81ju8s");
@@ -70,8 +70,8 @@ public override void _Ready()
 
 	private async Task _AsyncReady()
 	{
-		await _sharpIdeSolutionAccessor.SolutionReadyTcs.Task;
-		_solution = _sharpIdeSolutionAccessor.SolutionModel;
+		await _sharpIdeSolutionManager.SolutionReadyTcs.Task;
+		_solution = _sharpIdeSolutionManager.SolutionModel;
 		_projects = [null!, .._solution!.AllProjects.OrderBy(s => s.Name)]; // So that index 0 is solution // Probably should use Item Metadata instead of this
 		await this.InvokeAsync(() =>
 		{
diff --git a/src/SharpIDE.Godot/Features/Problems/ProblemsPanel.cs b/src/SharpIDE.Godot/Features/Problems/ProblemsPanel.cs
index 2a86bdd6..fbf7fd5b 100644
--- a/src/SharpIDE.Godot/Features/Problems/ProblemsPanel.cs
+++ b/src/SharpIDE.Godot/Features/Problems/ProblemsPanel.cs
@@ -17,10 +17,8 @@ public partial class ProblemsPanel : Control
     public Texture2D ErrorIcon { get; set; } = null!;
     [Export]
     public Texture2D CsprojIcon { get; set; } = null!;
-
-    private SharpIdeSolutionModel? _solution;
     
-    [Inject] private readonly SharpIdeSolutionAccessor _sharpIdeSolutionAccessor = null!;
+    [Inject] private readonly SharpIdeSolutionManager _sharpIdeSolutionManager = null!;
     
 	private Tree _tree = null!;
     private TreeItem _rootItem = null!;
@@ -40,9 +38,8 @@ public override void _Ready()
 
     private async Task AsyncReady()
     {
-        await _sharpIdeSolutionAccessor.SolutionReadyTcs.Task;
-        _solution = _sharpIdeSolutionAccessor.SolutionModel;
-        _projects.AddRange(_solution!.AllProjects);
+        await _sharpIdeSolutionManager.SolutionReadyTcs.Task;
+        _projects.AddRange(_sharpIdeSolutionManager.SolutionModel.AllProjects);
     }
 
     public void BindToTree(ObservableHashSet<SharpIdeProjectModel> list)
@@ -203,7 +200,7 @@ private void TreeOnItemActivated()
     
     private void OpenDocumentContainingDiagnostic(SharpIdeDiagnostic diagnostic)
     {
-        var file = _solution!.AllFiles[diagnostic.FilePath];
+        var file = _sharpIdeSolutionManager.SolutionModel.AllFiles[diagnostic.FilePath];
         var linePosition = new SharpIdeFileLinePosition(diagnostic.Span.Start.Line, diagnostic.Span.Start.Character);
         GodotGlobalEvents.Instance.FileExternallySelected.InvokeParallelFireAndForget(file, linePosition);
     }
diff --git a/src/SharpIDE.Godot/Features/SolutionExplorer/SolutionExplorerPanel.cs b/src/SharpIDE.Godot/Features/SolutionExplorer/SolutionExplorerPanel.cs
index 5599ada6..32555a4d 100644
--- a/src/SharpIDE.Godot/Features/SolutionExplorer/SolutionExplorerPanel.cs
+++ b/src/SharpIDE.Godot/Features/SolutionExplorer/SolutionExplorerPanel.cs
@@ -1,11 +1,13 @@
 using System.Collections.Specialized;
+using System.Runtime.CompilerServices;
+
 using Ardalis.GuardClauses;
 using Godot;
 using ObservableCollections;
 using R3;
 using SharpIDE.Application;
 using SharpIDE.Application.Features.Analysis;
-using SharpIDE.Application.Features.NavigationHistory;
+using SharpIDE.Application.Features.Events;
 using SharpIDE.Application.Features.SolutionDiscovery;
 using SharpIDE.Application.Features.SolutionDiscovery.VsPersistence;
 using SharpIDE.Godot.Features.Common;
@@ -27,7 +29,6 @@ public partial class SolutionExplorerPanel : MarginContainer
 	[Export]
 	public Texture2D SlnIcon { get; set; } = null!;
 	
-	public SharpIdeSolutionModel SolutionModel { get; set; } = null!;
 	private PanelContainer _panelContainer = null!;
 	private Tree _tree = null!;
 	private TreeItem _rootItem = null!;
@@ -35,6 +36,9 @@ public partial class SolutionExplorerPanel : MarginContainer
 	private enum ClipboardOperation { Cut, Copy }
 
 	private (List<IFileOrFolder>, ClipboardOperation)? _itemsOnClipboard;
+	
+	[Inject] private readonly SharpIdeSolutionManager _solutionManager = null!;
+	
 	public override void _Ready()
 	{
 		_panelContainer = GetNode<PanelContainer>("PanelContainer");
@@ -43,6 +47,14 @@ public override void _Ready()
 		// Remove the tree from the scene tree for now, we will add it back when we bind to a solution
 		_panelContainer.RemoveChild(_tree);
 		GodotGlobalEvents.Instance.FileExternallySelected.Subscribe(OnFileExternallySelected);
+
+		_ = Task.GodotRun(_AsyncReady);
+	}
+
+	private async Task _AsyncReady()
+	{
+		await _solutionManager.SolutionReadyTcs.Task;
+		await BindToSolution(_solutionManager.SolutionModel);
 	}
 
 	public override void _UnhandledKeyInput(InputEvent @event)
@@ -130,9 +142,8 @@ await this.InvokeAsync(() =>
 		return null;
 	}
 
-	public async Task BindToSolution() => await BindToSolution(SolutionModel);
 	[RequiresGodotUiThread]
-	public async Task BindToSolution(SharpIdeSolutionModel solution)
+	public async Task BindToSolution(SharpIdeSolutionModel solution, [CallerMemberName] string caller = "")
 	{
 		await Task.CompletedTask.ConfigureAwait(ConfigureAwaitOptions.ForceYielding);
 		using var _ = SharpIdeOtel.Source.StartActivity($"{nameof(SolutionExplorerPanel)}.{nameof(BindToSolution)}");
@@ -221,8 +232,10 @@ private TreeItem CreateSlnFolderTreeItem(Tree tree, TreeItem parent, SharpIdeSol
 	}
 
 	[RequiresGodotUiThread]
-	private TreeItem CreateProjectTreeItem(Tree tree, TreeItem parent, SharpIdeProjectModel projectModel)
+	private TreeItem CreateProjectTreeItem(Tree tree, TreeItem parent, SharpIdeProjectModel projectModel, [CallerMemberName] string caller = "")
 	{
+		GD.Print($"[{caller}] CreateProjectTreeItem({projectModel.FilePath})");
+		
 		var projectItem = tree.CreateItem(parent);
 		projectItem.SetText(0, projectModel.Name);
 		projectItem.SetIcon(0, CsprojIcon);
diff --git a/src/SharpIDE.Godot/Features/TestExplorer/TestExplorerPanel.cs b/src/SharpIDE.Godot/Features/TestExplorer/TestExplorerPanel.cs
index 86187ce0..030ad8a0 100644
--- a/src/SharpIDE.Godot/Features/TestExplorer/TestExplorerPanel.cs
+++ b/src/SharpIDE.Godot/Features/TestExplorer/TestExplorerPanel.cs
@@ -7,7 +7,7 @@ namespace SharpIDE.Godot.Features.TestExplorer;
 
 public partial class TestExplorerPanel : Control
 {
-    [Inject] private readonly SharpIdeSolutionAccessor _solutionAccessor = null!;
+    [Inject] private readonly SharpIdeSolutionManager _solutionManager = null!;
     [Inject] private readonly TestRunnerService _testRunnerService = null!;
     [Inject] private readonly BuildService _buildService = null!;
     
@@ -40,8 +40,8 @@ private void OnRefreshButtonPressed()
 
     private async Task DiscoverTestNodesForSolution(bool withBuild)
     {
-        await _solutionAccessor.SolutionReadyTcs.Task;
-        var solution = _solutionAccessor.SolutionModel!;
+        await _solutionManager.SolutionReadyTcs.Task;
+        var solution = _solutionManager.SolutionModel!;
         if (withBuild)
         {
             await _buildService.MsBuildAsync(solution.FilePath);
@@ -68,8 +68,8 @@ private void OnRunAllTestsButtonPressed()
     {
         _ = Task.GodotRun(async () =>
         {
-            await _solutionAccessor.SolutionReadyTcs.Task;
-            var solution = _solutionAccessor.SolutionModel!;
+            await _solutionManager.SolutionReadyTcs.Task;
+            var solution = _solutionManager.SolutionModel!;
             await _buildService.MsBuildAsync(solution.FilePath);
             await this.InvokeAsync(() => _testNodesVBoxContainer.QueueFreeChildren());
             _testNodeEntryNodes.Clear();
diff --git a/src/SharpIDE.Godot/IdeRoot.cs b/src/SharpIDE.Godot/IdeRoot.cs
index 1d24faf5..1e96e218 100644
--- a/src/SharpIDE.Godot/IdeRoot.cs
+++ b/src/SharpIDE.Godot/IdeRoot.cs
@@ -1,23 +1,22 @@
 using System.Diagnostics;
+
 using Godot;
+
 using Microsoft.Extensions.Logging;
+
 using SharpIDE.Application.Features.Analysis;
 using SharpIDE.Application.Features.Build;
 using SharpIDE.Application.Features.Events;
 using SharpIDE.Application.Features.FilePersistence;
 using SharpIDE.Application.Features.FileWatching;
 using SharpIDE.Application.Features.NavigationHistory;
-using SharpIDE.Application.Features.Run;
 using SharpIDE.Application.Features.SolutionDiscovery;
-using SharpIDE.Application.Features.SolutionDiscovery.VsPersistence;
 using SharpIDE.Godot.Features.BottomPanel;
-using SharpIDE.Godot.Features.CodeEditor;
 using SharpIDE.Godot.Features.CustomControls;
 using SharpIDE.Godot.Features.Layout;
 using SharpIDE.Godot.Features.Run;
 using SharpIDE.Godot.Features.Search;
 using SharpIDE.Godot.Features.Search.SearchAllFiles;
-using SharpIDE.Godot.Features.SolutionExplorer;
 
 namespace SharpIDE.Godot;
 
@@ -32,13 +31,9 @@ public partial class IdeRoot : Control
 	private Button _restoreSlnButton = null!;
 	private SearchWindow _searchWindow = null!;
 	private SearchAllFilesWindow _searchAllFilesWindow = null!;
-	private CodeEditorPanel _codeEditorPanel = null!;
-	private SolutionExplorerPanel _solutionExplorerPanel = null!;
 	private InvertedVSplitContainer _invertedVSplitContainer = null!;
-	private RunPanel _runPanel = null!;
 	private Button _runMenuButton = null!;
 	private Popup _runMenuPopup = null!;
-	private BottomPanelManager _bottomPanelManager = null!;
 
 	private IdeDockLayout _dockLayoutRoot = null!;
 	
@@ -52,8 +47,8 @@ public partial class IdeRoot : Control
 	[Inject] private readonly IdeOpenTabsFileManager _openTabsFileManager = null!;
 	[Inject] private readonly RoslynAnalysis _roslynAnalysis = null!;
 	[Inject] private readonly SharpIdeSolutionModificationService _sharpIdeSolutionModificationService = null!;
-	[Inject] private readonly SharpIdeSolutionAccessor _sharpIdeSolutionAccessor = null!;
 	[Inject] private readonly IdeNavigationHistoryService _navigationHistoryService = null!;
+	[Inject] private readonly SharpIdeSolutionManager _solutionManager = null!;
 	[Inject] private readonly ILogger<IdeRoot> _logger = null!;
 
 	public override void _EnterTree()
@@ -77,15 +72,9 @@ public override void _Ready()
 		_restoreSlnButton = GetNode<Button>("%RestoreSlnButton");
 		_runMenuPopup = GetNode<Popup>("%RunMenuPopup");
 		_runMenuButton = GetNode<Button>("%RunMenuButton");
-		_codeEditorPanel = GetNode<CodeEditorPanel>("%CodeEditorPanel");
 		_searchWindow = GetNode<SearchWindow>("%SearchWindow");
 		_searchAllFilesWindow = GetNode<SearchAllFilesWindow>("%SearchAllFilesWindow");
-		 _solutionExplorerPanel = GetNode<SolutionExplorerPanel>("%SolutionExplorerPanel");
-		 _runPanel = GetNode<RunPanel>("%RunPanel");
-		 _invertedVSplitContainer = GetNode<InvertedVSplitContainer>("%InvertedVSplitContainer");
-		_bottomPanelManager = GetNode<BottomPanelManager>("%BottomPanel");
-		
-		_dockLayoutRoot = GetNode<IdeDockLayout>("%DockLayoutRoot");
+		 //_invertedVSplitContainer = GetNode<InvertedVSplitContainer>("%InvertedVSplitContainer");
 		
 		_runMenuButton.Pressed += OnRunMenuButtonPressed;
 		GodotGlobalEvents.Instance.FileSelected.Subscribe(OnSolutionExplorerPanelOnFileSelected);
@@ -94,7 +83,7 @@ public override void _Ready()
 		_rebuildSlnButton.Pressed += OnRebuildSlnButtonPressed;
 		_cleanSlnButton.Pressed += OnCleanSlnButtonPressed;
 		_restoreSlnButton.Pressed += OnRestoreSlnButtonPressed;
-		GodotGlobalEvents.Instance.BottomPanelVisibilityChangeRequested.Subscribe(async show => await this.InvokeAsync(() => _invertedVSplitContainer.InvertedSetCollapsed(!show)));
+		//GodotGlobalEvents.Instance.BottomPanelVisibilityChangeRequested.Subscribe(async show => await this.InvokeAsync(() => _invertedVSplitContainer.InvertedSetCollapsed(!show)));
 		GetTree().GetRoot().FocusExited += OnFocusExited;
 		_nodeReadyTcs.SetResult();
 	}
@@ -118,29 +107,37 @@ private void OnRunMenuButtonPressed()
 
 	private async void OnBuildSlnButtonPressed()
 	{
+		await _solutionManager.SolutionReadyTcs.Task;
+		
 		GodotGlobalEvents.Instance.BottomPanelTabExternallySelected.InvokeParallelFireAndForget(BottomPanelType.Build);
-		await _buildService.MsBuildAsync(_solutionExplorerPanel.SolutionModel.FilePath);
+		await _buildService.MsBuildAsync(_solutionManager.SolutionModel.FilePath);
 	}
 	private async void OnRebuildSlnButtonPressed()
 	{
+		await _solutionManager.SolutionReadyTcs.Task;
+		
 		GodotGlobalEvents.Instance.BottomPanelTabExternallySelected.InvokeParallelFireAndForget(BottomPanelType.Build);
-		await _buildService.MsBuildAsync(_solutionExplorerPanel.SolutionModel.FilePath, BuildType.Rebuild);
+		await _buildService.MsBuildAsync(_solutionManager.SolutionModel.FilePath, BuildType.Rebuild);
 	}
 	private async void OnCleanSlnButtonPressed()
 	{
+		await _solutionManager.SolutionReadyTcs.Task;
+		
 		GodotGlobalEvents.Instance.BottomPanelTabExternallySelected.InvokeParallelFireAndForget(BottomPanelType.Build);
-		await _buildService.MsBuildAsync(_solutionExplorerPanel.SolutionModel.FilePath, BuildType.Clean);
+		await _buildService.MsBuildAsync(_solutionManager.SolutionModel.FilePath, BuildType.Clean);
 	}
 	private async void OnRestoreSlnButtonPressed()
 	{
+		await _solutionManager.SolutionReadyTcs.Task;
+		
 		GodotGlobalEvents.Instance.BottomPanelTabExternallySelected.InvokeParallelFireAndForget(BottomPanelType.Build);
-		await _buildService.MsBuildAsync(_solutionExplorerPanel.SolutionModel.FilePath, BuildType.Restore);
+		await _buildService.MsBuildAsync(_solutionManager.SolutionModel.FilePath, BuildType.Restore);
 	}
 
-	private async Task OnSolutionExplorerPanelOnFileSelected(SharpIdeFile file, SharpIdeFileLinePosition? fileLinePosition)
+	private Task OnSolutionExplorerPanelOnFileSelected(SharpIdeFile file, SharpIdeFileLinePosition? fileLinePosition)
 	{
-		await _codeEditorPanel.SetSharpIdeFile(file, fileLinePosition);
 		_navigationHistoryService.RecordNavigation(file, fileLinePosition ?? new SharpIdeFileLinePosition(0, 0));
+		return Task.CompletedTask;
 	}
 
 	public void SetSlnFilePath(string path)
@@ -149,25 +146,21 @@ public void SetSlnFilePath(string path)
 		{
 			GD.Print($"Selected: {path}");
 			var timer = Stopwatch.StartNew();
-			var solutionModel = await VsPersistenceMapper.GetSolutionModel(path); // TODO: Probably refactor into a DI Service
+			var solutionModel = await _solutionManager.LoadSolution(path);
 			timer.Stop();
 			await _nodeReadyTcs.Task;
 			// Do not use injected services until after _nodeReadyTcs - Services aren't injected until _Ready
 			_logger.LogInformation("Solution model fully created in {ElapsedMilliseconds} ms", timer.ElapsedMilliseconds);
-			_sharpIdeSolutionAccessor.SolutionModel = solutionModel;
-			_sharpIdeSolutionAccessor.SolutionReadyTcs.SetResult();
-			_solutionExplorerPanel.SolutionModel = solutionModel;
-			_codeEditorPanel.Solution = solutionModel;
+			//_solutionExplorerPanel.SolutionModel = solutionModel;
+			//_codeEditorPanel.Solution = solutionModel;
 			_searchWindow.Solution = solutionModel;
 			_searchAllFilesWindow.Solution = solutionModel;
 			_fileExternalChangeHandler.SolutionModel = solutionModel;
 			_fileChangedService.SolutionModel = solutionModel;
 			_sharpIdeSolutionModificationService.SolutionModel = solutionModel;
-			_ = Task.GodotRun(_solutionExplorerPanel.BindToSolution);
+			//_ = Task.GodotRun(_solutionExplorerPanel.BindToSolution);
 			_roslynAnalysis.StartLoadingSolutionInWorkspace(solutionModel);
 			_fileWatcher.StartWatching(solutionModel);
-
-			//_dockLayoutRoot.ChangeSolution(solutionModel);
 			
 			var previousTabs = Singletons.AppState.RecentSlns.Single(s => s.FilePath == solutionModel.FilePath).IdeSolutionState.OpenTabs;
 			var filesToOpen = previousTabs
diff --git a/src/SharpIDE.Godot/IdeWindow.cs b/src/SharpIDE.Godot/IdeWindow.cs
index 6d0bf9fd..cad93061 100644
--- a/src/SharpIDE.Godot/IdeWindow.cs
+++ b/src/SharpIDE.Godot/IdeWindow.cs
@@ -93,7 +93,7 @@ public void PickSolution(bool fullscreen = false)
                 _slnPicker = null;
                 return;
             }
-            ideRoot.SetSlnFilePath(slnPath);
+
             var recentSln = Singletons.AppState.RecentSlns.SingleOrDefault(s => s.FilePath == slnPath);
             if (recentSln is not null)
             {
@@ -120,6 +120,9 @@ await this.InvokeAsync(() =>
                 _ideRoot = ideRoot; // This has no DI services, until it is added to the scene tree
                 GetNode<DiAutoload>("/root/DiAutoload").ResetScope();
                 AddChild(ideRoot);
+                
+                // This is executed after resetting the DI scope to ensure the DI services are available.
+                _ideRoot.SetSlnFilePath(slnPath);
             });
         });
     }
diff --git a/src/SharpIDE.Godot/SharpIdeSolutionAccessor.cs b/src/SharpIDE.Godot/SharpIdeSolutionAccessor.cs
deleted file mode 100644
index 0f6f774c..00000000
--- a/src/SharpIDE.Godot/SharpIdeSolutionAccessor.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using SharpIDE.Application.Features.SolutionDiscovery.VsPersistence;
-
-namespace SharpIDE.Godot;
-
-public class SharpIdeSolutionAccessor
-{
-    public SharpIdeSolutionModel SolutionModel { get; set; } = null!;
-    public TaskCompletionSource SolutionReadyTcs { get; } = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
-}
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/SharpIdeSolutionManager.cs b/src/SharpIDE.Godot/SharpIdeSolutionManager.cs
new file mode 100644
index 00000000..ca2b496d
--- /dev/null
+++ b/src/SharpIDE.Godot/SharpIdeSolutionManager.cs
@@ -0,0 +1,22 @@
+using Godot;
+
+using SharpIDE.Application.Features.Events;
+using SharpIDE.Application.Features.SolutionDiscovery.VsPersistence;
+
+namespace SharpIDE.Godot;
+
+public class SharpIdeSolutionManager
+{
+    public SharpIdeSolutionModel SolutionModel { get; set; } = null!;
+    public TaskCompletionSource SolutionReadyTcs { get; } = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+
+    public async Task<SharpIdeSolutionModel> LoadSolution(
+        string solutionFilePath,
+        CancellationToken cancellationToken = default)
+    {
+        SolutionModel = await VsPersistenceMapper.GetSolutionModel(solutionFilePath, cancellationToken);
+        SolutionReadyTcs.SetResult();
+
+        return SolutionModel;
+    }
+}
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/SharpIdeSolutionAccessor.cs.uid b/src/SharpIDE.Godot/SharpIdeSolutionManager.cs.uid
similarity index 100%
rename from src/SharpIDE.Godot/SharpIdeSolutionAccessor.cs.uid
rename to src/SharpIDE.Godot/SharpIdeSolutionManager.cs.uid

From efdc3feff9ecf6fa8d383b0362d335e597cc9fbb Mon Sep 17 00:00:00 2001
From: Manuel Gasser <manuel.gasser.ch@gmail.com>
Date: Sun, 21 Dec 2025 20:39:00 +0100
Subject: [PATCH 03/11] Wrap bottom panel into multi function panel scene

---
 ...mPanelManager.cs => MultiFunctionPanel.cs} | 14 ++--
 ...nager.cs.uid => MultiFunctionPanel.cs.uid} |  0
 .../BottomPanel/MultiFunctionPanel.tscn       | 53 ++++++++++++
 .../CustomControls/InvertedVSplitContainer.cs | 45 ----------
 .../InvertedVSplitContainer.cs.uid            |  1 -
 .../Features/Layout/IdeDockComponent.cs       |  2 +
 .../Features/Layout/IdeDockLayout.cs          | 83 ++++++++++---------
 .../Features/Layout/IdeDockOverlay.cs         |  3 +
 .../Features/Layout/ResourceHelper.cs         |  8 ++
 .../Features/Layout/ResourceHelper.cs.uid     |  1 +
 src/SharpIDE.Godot/IdeRoot.cs                 | 22 +++--
 src/SharpIDE.Godot/IdeRoot.tscn               |  2 +-
 12 files changed, 132 insertions(+), 102 deletions(-)
 rename src/SharpIDE.Godot/Features/BottomPanel/{BottomPanelManager.cs => MultiFunctionPanel.cs} (87%)
 rename src/SharpIDE.Godot/Features/BottomPanel/{BottomPanelManager.cs.uid => MultiFunctionPanel.cs.uid} (100%)
 create mode 100644 src/SharpIDE.Godot/Features/BottomPanel/MultiFunctionPanel.tscn
 delete mode 100644 src/SharpIDE.Godot/Features/CustomControls/InvertedVSplitContainer.cs
 delete mode 100644 src/SharpIDE.Godot/Features/CustomControls/InvertedVSplitContainer.cs.uid
 create mode 100644 src/SharpIDE.Godot/Features/Layout/ResourceHelper.cs
 create mode 100644 src/SharpIDE.Godot/Features/Layout/ResourceHelper.cs.uid

diff --git a/src/SharpIDE.Godot/Features/BottomPanel/BottomPanelManager.cs b/src/SharpIDE.Godot/Features/BottomPanel/MultiFunctionPanel.cs
similarity index 87%
rename from src/SharpIDE.Godot/Features/BottomPanel/BottomPanelManager.cs
rename to src/SharpIDE.Godot/Features/BottomPanel/MultiFunctionPanel.cs
index 7f3ae892..a1c46ae7 100644
--- a/src/SharpIDE.Godot/Features/BottomPanel/BottomPanelManager.cs
+++ b/src/SharpIDE.Godot/Features/BottomPanel/MultiFunctionPanel.cs
@@ -10,7 +10,7 @@
 
 namespace SharpIDE.Godot.Features.BottomPanel;
 
-public partial class BottomPanelManager : Panel
+public partial class MultiFunctionPanel : Panel
 {
 	private RunPanel _runPanel = null!;
 	private DebugPanel _debugPanel = null!;
@@ -42,6 +42,8 @@ public override void _Ready()
 			{ BottomPanelType.Nuget, _nugetPanel },
 			{ BottomPanelType.TestExplorer, _testExplorerPanel }
 		};
+		
+		_ = OnBottomPanelTabSelected(BottomPanelType.Run);
 
 		GodotGlobalEvents.Instance.BottomPanelTabSelected.Subscribe(OnBottomPanelTabSelected);
 	}
@@ -55,14 +57,8 @@ private async Task OnBottomPanelTabSelected(BottomPanelType? type)
 	{
 		await this.InvokeAsync(() =>
 		{
-			if (type == null)
-			{
-				GodotGlobalEvents.Instance.BottomPanelVisibilityChangeRequested.InvokeParallelFireAndForget(false);
-			}
-			else
-			{
-				GodotGlobalEvents.Instance.BottomPanelVisibilityChangeRequested.InvokeParallelFireAndForget(true);
-			}
+			Visible = type is not null;
+			
 			foreach (var kvp in _panelTypeMap)
 			{
 				kvp.Value.Visible = kvp.Key == type;
diff --git a/src/SharpIDE.Godot/Features/BottomPanel/BottomPanelManager.cs.uid b/src/SharpIDE.Godot/Features/BottomPanel/MultiFunctionPanel.cs.uid
similarity index 100%
rename from src/SharpIDE.Godot/Features/BottomPanel/BottomPanelManager.cs.uid
rename to src/SharpIDE.Godot/Features/BottomPanel/MultiFunctionPanel.cs.uid
diff --git a/src/SharpIDE.Godot/Features/BottomPanel/MultiFunctionPanel.tscn b/src/SharpIDE.Godot/Features/BottomPanel/MultiFunctionPanel.tscn
new file mode 100644
index 00000000..a8c28d92
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/BottomPanel/MultiFunctionPanel.tscn
@@ -0,0 +1,53 @@
+[gd_scene load_steps=9 format=3 uid="uid://b8wqkwa7sjrid"]
+
+[ext_resource type="PackedScene" uid="uid://bcoytt3bw0gpe" path="res://Features/Run/RunPanel.tscn" id="1_5oqeb"]
+[ext_resource type="Script" uid="uid://cvvgp42r3nml8" path="res://Features/BottomPanel/MultiFunctionPanel.cs" id="1_ychf2"]
+[ext_resource type="PackedScene" uid="uid://dkjips8oudqou" path="res://Features/Debug_/DebugPanel.tscn" id="2_ychf2"]
+[ext_resource type="PackedScene" uid="uid://co6dkhdolriej" path="res://Features/Build/BuildPanel.tscn" id="3_c0wk5"]
+[ext_resource type="PackedScene" uid="uid://tqpmww430cor" path="res://Features/Problems/ProblemsPanel.tscn" id="4_q2bjq"]
+[ext_resource type="PackedScene" uid="uid://b0tjuqq3bca5e" path="res://Features/IdeDiagnostics/IdeDiagnosticsPanel.tscn" id="5_4yghs"]
+[ext_resource type="PackedScene" uid="uid://duyxg107nfh2f" path="res://Features/Nuget/NugetPanel.tscn" id="6_nf1h4"]
+[ext_resource type="PackedScene" uid="uid://hwdok1kch3b3" path="res://Features/TestExplorer/TestExplorerPanel.tscn" id="7_0nbtl"]
+
+[node name="MultiFunctionPanel" type="Panel"]
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+script = ExtResource("1_ychf2")
+
+[node name="RunPanel" parent="." instance=ExtResource("1_5oqeb")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 1
+
+[node name="DebugPanel" parent="." instance=ExtResource("2_ychf2")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 1
+
+[node name="BuildPanel" parent="." instance=ExtResource("3_c0wk5")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 1
+
+[node name="ProblemsPanel" parent="." instance=ExtResource("4_q2bjq")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 1
+
+[node name="IdeDiagnosticsPanel" parent="." instance=ExtResource("5_4yghs")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 1
+
+[node name="NugetPanel" parent="." instance=ExtResource("6_nf1h4")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 1
+
+[node name="TestExplorerPanel" parent="." instance=ExtResource("7_0nbtl")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 1
diff --git a/src/SharpIDE.Godot/Features/CustomControls/InvertedVSplitContainer.cs b/src/SharpIDE.Godot/Features/CustomControls/InvertedVSplitContainer.cs
deleted file mode 100644
index 65c47c21..00000000
--- a/src/SharpIDE.Godot/Features/CustomControls/InvertedVSplitContainer.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using Godot;
-
-namespace SharpIDE.Godot.Features.CustomControls;
-
-[GlobalClass, Tool]
-public partial class InvertedVSplitContainer : VSplitContainer
-{
-	[Export]
-	private int _invertedOffset = 200;
-	private bool _invertedCollapsed = false;
-
-	public void InvertedSetCollapsed(bool collapsed)
-	{
-		if (_invertedCollapsed == collapsed) return;
-		_invertedCollapsed = collapsed;
-		if (collapsed)
-		{
-			SplitOffset = (int)Size.Y + 100;
-			DraggingEnabled = false;
-		}
-		else
-		{
-			SplitOffset = (int)Size.Y - _invertedOffset;
-			DraggingEnabled = true;
-		}
-	}
-
-	public override void _Ready()
-	{
-		Dragged += OnDragged;
-	}
-
-	private void OnDragged(long offset)
-	{
-		_invertedOffset = (int)Size.Y - SplitOffset;
-	}
-	
-	public override void _Notification(int what)
-	{
-		if (what == NotificationResized)
-		{
-			SplitOffset = (int)Size.Y - _invertedOffset;
-		}
-	}
-}
diff --git a/src/SharpIDE.Godot/Features/CustomControls/InvertedVSplitContainer.cs.uid b/src/SharpIDE.Godot/Features/CustomControls/InvertedVSplitContainer.cs.uid
deleted file mode 100644
index 7ac56340..00000000
--- a/src/SharpIDE.Godot/Features/CustomControls/InvertedVSplitContainer.cs.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://kvnhndc3l6ih
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeDockComponent.cs b/src/SharpIDE.Godot/Features/Layout/IdeDockComponent.cs
index 110f562f..312b891d 100644
--- a/src/SharpIDE.Godot/Features/Layout/IdeDockComponent.cs
+++ b/src/SharpIDE.Godot/Features/Layout/IdeDockComponent.cs
@@ -13,5 +13,7 @@ public override void _Ready()
 		var sceneResource = ResourceLoader.Load<PackedScene>(ComponentNode.ResourceUid);
 		var scene = sceneResource.Instantiate<Control>();
 		GetNode<Control>("%ScenePresenter").AddChild(scene);
+
+		scene.VisibilityChanged += () => Visible = scene.Visible;
 	}
 }
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeDockLayout.cs b/src/SharpIDE.Godot/Features/Layout/IdeDockLayout.cs
index 5d3d21f8..10852aea 100644
--- a/src/SharpIDE.Godot/Features/Layout/IdeDockLayout.cs
+++ b/src/SharpIDE.Godot/Features/Layout/IdeDockLayout.cs
@@ -21,16 +21,7 @@ public override void _Ready()
 	{
 		_dockOverlay = GetNode<IdeDockOverlay>("%DockOverlay");
 
-		// TODO: Wrap scenes in dock panel component scene
-		// TODO: Add layout profiles and persist layout
-		_layout = new IdeSplitNode(
-			Orientation.Horizontal,
-			FirstNode: new IdeSceneNode("uid://cy1bb32g7j7dr", "Solution Explorer"),
-			SecondNode: new IdeSceneNode("uid://c5dlwgcx3ubyp", "Code Editor"));
-
 		FocusExited += _dockOverlay.EndDrag;
-
-		RebuildLayoutTree();
 	}
 
 	/// <inheritdoc />
@@ -41,6 +32,12 @@ public override void _UnhandledKeyInput(InputEvent input)
 			_dockOverlay.EndDrag();
 		}
 	}
+
+	public void UpdateLayout(IdeLayoutNode layout)
+	{
+		_layout = layout;
+		RebuildLayoutTree();
+	}
 	
 	private void RebuildLayoutTree()
 	{
@@ -102,8 +99,9 @@ private Control BuildSplitLayout(IdeSplitNode splitNode)
 		return container;
 	}
 
-	private (float FirstRation, float SecondRatio) GetStretchRatio(IdeSplitNode splitNode)
+	private (float FirstRatio, float SecondRatio) GetStretchRatio(IdeSplitNode splitNode)
 	{
+		// TODO: Calculate ratio
 		return (1.0f, 1.0f);
 	}
 
@@ -114,7 +112,6 @@ private Control BuildTabGroupLayout(IdeTabGroupNode tabGroupNode)
 
 	private Control BuildSceneLayout(IdeSceneNode sceneNode)
 	{
-
 		var component = ResourceLoader.Load<PackedScene>("uid://b36lno754a2is").Instantiate<IdeDockComponent>();
 		component.ComponentNode = sceneNode;
 		component.GuiInput += input => OnDockComponentGuiInput(input, sceneNode);
@@ -167,10 +164,43 @@ private void EndDrag()
 		_dockOverlay.EndDrag();
 	}
 
+	private void DockTarget(IdeLayoutNode dragged, IdeLayoutNode target, DockPosition position)
+	{
+		if (ReferenceEquals(_layout, target))
+		{
+			_layout = RemoveNode(target, dragged)!;
+			target = _layout;
+		}
+		else
+		{
+			_layout = RemoveNode(_layout, dragged)!;
+			target = RemoveNode(target, dragged)!;
+		}
+		
+		
+		var replacement = position switch
+		{
+			DockPosition.Left => new IdeSplitNode(Orientation.Horizontal, dragged, target),
+			DockPosition.Right => new IdeSplitNode(Orientation.Horizontal, target, dragged),
+			DockPosition.Top => new IdeSplitNode(Orientation.Vertical, dragged, target),
+			DockPosition.Bottom => new IdeSplitNode(Orientation.Vertical, target, dragged),
+
+			_ => target
+		};
+
+		if (ReferenceEquals(replacement, target))
+		{
+			return;
+		}
+
+		_layout = ReplaceNode(_layout, target, replacement);
+
+		RebuildLayoutTree();
+	}
+
 	private IdeLayoutNode ReplaceNode(IdeLayoutNode current, IdeLayoutNode target, IdeLayoutNode replacement)
 	{
-		// TODO: FIX
-		if (ReferenceEquals(current, target))
+		if (ReferenceEquals(_layout, target) || ReferenceEquals(current, target))
 		{
 			return replacement;
 		}
@@ -184,7 +214,7 @@ private IdeLayoutNode ReplaceNode(IdeLayoutNode current, IdeLayoutNode target, I
 			};
 		}
 
-		return replacement;
+		return current;
 	}
 
 	private IdeLayoutNode? RemoveNode(IdeLayoutNode current, IdeLayoutNode target)
@@ -218,29 +248,4 @@ private IdeLayoutNode ReplaceNode(IdeLayoutNode current, IdeLayoutNode target, I
 			SecondNode = second
 		};
 	}
-
-	private void DockTarget(IdeLayoutNode dragged, IdeLayoutNode target, DockPosition position)
-	{
-		_layout = RemoveNode(_layout, dragged)!;
-		target = RemoveNode(target, dragged)!;
-		
-		var replacement = position switch
-		{
-			DockPosition.Left => new IdeSplitNode(Orientation.Horizontal, dragged, target),
-			DockPosition.Right => new IdeSplitNode(Orientation.Horizontal, target, dragged),
-			DockPosition.Top => new IdeSplitNode(Orientation.Vertical, dragged, target),
-			DockPosition.Bottom => new IdeSplitNode(Orientation.Vertical, target, dragged),
-
-			_ => target
-		};
-
-		if (ReferenceEquals(replacement, target))
-		{
-			return;
-		}
-
-		_layout = ReplaceNode(_layout, target, replacement);
-
-		RebuildLayoutTree();
-	}
 }
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeDockOverlay.cs b/src/SharpIDE.Godot/Features/Layout/IdeDockOverlay.cs
index 6e1b0e55..3a43dcf3 100644
--- a/src/SharpIDE.Godot/Features/Layout/IdeDockOverlay.cs
+++ b/src/SharpIDE.Godot/Features/Layout/IdeDockOverlay.cs
@@ -71,6 +71,9 @@ public void EndDrag()
     {
         Visible = false;
         DraggedNode = null;
+        CurrentDockScope = DockScope.None;
+        CurrentDockPosition = DockPosition.None;
+        HoveredTarget = null;
     }
 
     private void DrawDockPreview()
diff --git a/src/SharpIDE.Godot/Features/Layout/ResourceHelper.cs b/src/SharpIDE.Godot/Features/Layout/ResourceHelper.cs
new file mode 100644
index 00000000..92d59cdf
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/ResourceHelper.cs
@@ -0,0 +1,8 @@
+namespace SharpIDE.Godot.Features.Layout;
+
+public static class ResourceHelper
+{
+    public static string SolutionExplorerId = "uid://cy1bb32g7j7dr";
+    public static string CodeEditorId = "uid://c5dlwgcx3ubyp";
+    public static string MultiFunctionPanelId = "uid://b8wqkwa7sjrid";
+}
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/Layout/ResourceHelper.cs.uid b/src/SharpIDE.Godot/Features/Layout/ResourceHelper.cs.uid
new file mode 100644
index 00000000..065c6744
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/ResourceHelper.cs.uid
@@ -0,0 +1 @@
+uid://5meoh17y0wpo
diff --git a/src/SharpIDE.Godot/IdeRoot.cs b/src/SharpIDE.Godot/IdeRoot.cs
index 1e96e218..99589c36 100644
--- a/src/SharpIDE.Godot/IdeRoot.cs
+++ b/src/SharpIDE.Godot/IdeRoot.cs
@@ -12,12 +12,13 @@
 using SharpIDE.Application.Features.NavigationHistory;
 using SharpIDE.Application.Features.SolutionDiscovery;
 using SharpIDE.Godot.Features.BottomPanel;
-using SharpIDE.Godot.Features.CustomControls;
 using SharpIDE.Godot.Features.Layout;
 using SharpIDE.Godot.Features.Run;
 using SharpIDE.Godot.Features.Search;
 using SharpIDE.Godot.Features.Search.SearchAllFiles;
 
+using Orientation = SharpIDE.Godot.Features.Layout.Orientation;
+
 namespace SharpIDE.Godot;
 
 public partial class IdeRoot : Control
@@ -31,9 +32,9 @@ public partial class IdeRoot : Control
 	private Button _restoreSlnButton = null!;
 	private SearchWindow _searchWindow = null!;
 	private SearchAllFilesWindow _searchAllFilesWindow = null!;
-	private InvertedVSplitContainer _invertedVSplitContainer = null!;
 	private Button _runMenuButton = null!;
 	private Popup _runMenuPopup = null!;
+	private IdeDockLayout _ideLayoutRoot = null!;
 
 	private IdeDockLayout _dockLayoutRoot = null!;
 	
@@ -74,7 +75,7 @@ public override void _Ready()
 		_runMenuButton = GetNode<Button>("%RunMenuButton");
 		_searchWindow = GetNode<SearchWindow>("%SearchWindow");
 		_searchAllFilesWindow = GetNode<SearchAllFilesWindow>("%SearchAllFilesWindow");
-		 //_invertedVSplitContainer = GetNode<InvertedVSplitContainer>("%InvertedVSplitContainer");
+		_ideLayoutRoot = GetNode<IdeDockLayout>("%LayoutRoot");
 		
 		_runMenuButton.Pressed += OnRunMenuButtonPressed;
 		GodotGlobalEvents.Instance.FileSelected.Subscribe(OnSolutionExplorerPanelOnFileSelected);
@@ -83,9 +84,19 @@ public override void _Ready()
 		_rebuildSlnButton.Pressed += OnRebuildSlnButtonPressed;
 		_cleanSlnButton.Pressed += OnCleanSlnButtonPressed;
 		_restoreSlnButton.Pressed += OnRestoreSlnButtonPressed;
-		//GodotGlobalEvents.Instance.BottomPanelVisibilityChangeRequested.Subscribe(async show => await this.InvokeAsync(() => _invertedVSplitContainer.InvertedSetCollapsed(!show)));
 		GetTree().GetRoot().FocusExited += OnFocusExited;
 		_nodeReadyTcs.SetResult();
+		
+		// TODO: Add layout profiles and persist layout
+		var ideLayout = new IdeSplitNode(
+			Orientation.Vertical,
+			FirstNode: new IdeSplitNode(
+				Orientation.Horizontal,
+				FirstNode: new IdeSceneNode(ResourceHelper.SolutionExplorerId, "Solution Explorer"),
+				SecondNode: new IdeSceneNode(ResourceHelper.CodeEditorId, "Code Editor")),
+			SecondNode: new IdeSceneNode(ResourceHelper.MultiFunctionPanelId, "Multi Function Panel"));
+		
+		_ideLayoutRoot.UpdateLayout(ideLayout);
 	}
 	
 	// TODO: Problematic, as this is called even when the focus shifts to an embedded subwindow, such as a popup 
@@ -151,14 +162,11 @@ public void SetSlnFilePath(string path)
 			await _nodeReadyTcs.Task;
 			// Do not use injected services until after _nodeReadyTcs - Services aren't injected until _Ready
 			_logger.LogInformation("Solution model fully created in {ElapsedMilliseconds} ms", timer.ElapsedMilliseconds);
-			//_solutionExplorerPanel.SolutionModel = solutionModel;
-			//_codeEditorPanel.Solution = solutionModel;
 			_searchWindow.Solution = solutionModel;
 			_searchAllFilesWindow.Solution = solutionModel;
 			_fileExternalChangeHandler.SolutionModel = solutionModel;
 			_fileChangedService.SolutionModel = solutionModel;
 			_sharpIdeSolutionModificationService.SolutionModel = solutionModel;
-			//_ = Task.GodotRun(_solutionExplorerPanel.BindToSolution);
 			_roslynAnalysis.StartLoadingSolutionInWorkspace(solutionModel);
 			_fileWatcher.StartWatching(solutionModel);
 			
diff --git a/src/SharpIDE.Godot/IdeRoot.tscn b/src/SharpIDE.Godot/IdeRoot.tscn
index a22c2dd2..dd9cdd2d 100644
--- a/src/SharpIDE.Godot/IdeRoot.tscn
+++ b/src/SharpIDE.Godot/IdeRoot.tscn
@@ -120,7 +120,7 @@ size_flags_vertical = 3
 [node name="LeftSideBar" parent="VBoxContainer/HBoxContainer" instance=ExtResource("3_f60gr")]
 layout_mode = 2
 
-[node name="DockLayoutRoot" parent="VBoxContainer/HBoxContainer" instance=ExtResource("7_4dy53")]
+[node name="LayoutRoot" parent="VBoxContainer/HBoxContainer" instance=ExtResource("7_4dy53")]
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 3

From aae85fea05544f2ad7961298f59978a152584f35 Mon Sep 17 00:00:00 2001
From: Manuel Gasser <manuel.gasser.ch@gmail.com>
Date: Sun, 21 Dec 2025 20:44:12 +0100
Subject: [PATCH 04/11] Remove unecessary changes and minor cleanup

---
 src/SharpIDE.Godot/DiAutoload.cs              |   2 +-
 .../Features/BottomBar/BottomBar.cs           |   4 +-
 .../Features/BottomBar/RunningTasksDisplay.cs | 102 ++--
 .../BottomPanel/MultiFunctionPanel.cs         | 102 ++--
 .../Features/Layout/DockSymbol.cs             |  12 +-
 .../Features/Layout/IdeDockComponent.cs       |  22 +-
 .../Features/Layout/IdeDockLayout.cs          | 490 +++++++++---------
 .../Features/LeftSideBar/LeftSideBar.cs       |  96 ++--
 .../SolutionExplorer/SolutionExplorerPanel.cs |   6 +-
 9 files changed, 417 insertions(+), 419 deletions(-)

diff --git a/src/SharpIDE.Godot/DiAutoload.cs b/src/SharpIDE.Godot/DiAutoload.cs
index ba8581b3..764f6af8 100644
--- a/src/SharpIDE.Godot/DiAutoload.cs
+++ b/src/SharpIDE.Godot/DiAutoload.cs
@@ -83,7 +83,7 @@ private void InjectDependencies(object target)
                     GetTree().Quit();
                     return;
                 }
-                
+
                 field.SetValue(target, service);
             }
         }
diff --git a/src/SharpIDE.Godot/Features/BottomBar/BottomBar.cs b/src/SharpIDE.Godot/Features/BottomBar/BottomBar.cs
index 27fff250..995f8590 100644
--- a/src/SharpIDE.Godot/Features/BottomBar/BottomBar.cs
+++ b/src/SharpIDE.Godot/Features/BottomBar/BottomBar.cs
@@ -4,5 +4,5 @@ namespace SharpIDE.Godot.Features.BottomBar;
 
 public partial class BottomBar : PanelContainer
 {
-	
-}
+    
+}
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/BottomBar/RunningTasksDisplay.cs b/src/SharpIDE.Godot/Features/BottomBar/RunningTasksDisplay.cs
index 9c71cfb3..d965efa3 100644
--- a/src/SharpIDE.Godot/Features/BottomBar/RunningTasksDisplay.cs
+++ b/src/SharpIDE.Godot/Features/BottomBar/RunningTasksDisplay.cs
@@ -7,57 +7,57 @@ namespace SharpIDE.Godot.Features.BottomBar;
 
 public partial class RunningTasksDisplay : HBoxContainer
 {
-	[Inject] private readonly ActivityMonitor _activityMonitor = null!;
-	
-	private bool _isSolutionRestoring;
-	private bool _isSolutionLoading;
-	private bool _isSolutionDiagnosticsBeingRetrieved;
+    [Inject] private readonly ActivityMonitor _activityMonitor = null!;
+    
+    private bool _isSolutionRestoring;
+    private bool _isSolutionLoading;
+    private bool _isSolutionDiagnosticsBeingRetrieved;
 
-	private Label _solutionRestoringLabel = null!;
-	private Label _solutionLoadingLabel = null!;
-	private Label _solutionDiagnosticsLabel = null!;
-	
-	public override void _Ready()
-	{
-		_solutionRestoringLabel = GetNode<Label>("%SolutionRestoringLabel");
-		_solutionLoadingLabel = GetNode<Label>("%SolutionLoadingLabel");
-		_solutionDiagnosticsLabel = GetNode<Label>("%SolutionDiagnosticsLabel");
-		Visible = false;
-		_activityMonitor.ActivityChanged.Subscribe(OnActivityChanged);
-	}
+    private Label _solutionRestoringLabel = null!;
+    private Label _solutionLoadingLabel = null!;
+    private Label _solutionDiagnosticsLabel = null!;
+    
+    public override void _Ready()
+    {
+        _solutionRestoringLabel = GetNode<Label>("%SolutionRestoringLabel");
+        _solutionLoadingLabel = GetNode<Label>("%SolutionLoadingLabel");
+        _solutionDiagnosticsLabel = GetNode<Label>("%SolutionDiagnosticsLabel");
+        Visible = false;
+        _activityMonitor.ActivityChanged.Subscribe(OnActivityChanged);
+    }
 
-	public override void _ExitTree()
-	{
-		_activityMonitor.ActivityChanged.Unsubscribe(OnActivityChanged);
-	}
+    public override void _ExitTree()
+    {
+        _activityMonitor.ActivityChanged.Unsubscribe(OnActivityChanged);
+    }
 
-	private async Task OnActivityChanged(Activity activity)
-	{
-		var isOccurring = !activity.IsStopped;
-		if (activity.DisplayName == $"{nameof(RoslynAnalysis)}.{nameof(RoslynAnalysis.UpdateSolutionDiagnostics)}")
-		{
-			_isSolutionDiagnosticsBeingRetrieved = isOccurring;
-		}
-		else if (activity.DisplayName == "OpenSolution")
-		{
-			_isSolutionLoading = isOccurring;
-		}
-		else if (activity.DisplayName == "RestoreSolution")
-		{
-			_isSolutionRestoring = isOccurring;
-		}
-		else
-		{
-			return;
-		}
-		
-		var visible = _isSolutionDiagnosticsBeingRetrieved || _isSolutionLoading || _isSolutionRestoring;
-		await this.InvokeAsync(() =>
-		{
-			_solutionLoadingLabel.Visible = _isSolutionLoading;
-			_solutionDiagnosticsLabel.Visible = _isSolutionDiagnosticsBeingRetrieved;
-			_solutionRestoringLabel.Visible = _isSolutionRestoring;
-			Visible = visible;
-		});
-	}
-}
+    private async Task OnActivityChanged(Activity activity)
+    {
+        var isOccurring = !activity.IsStopped;
+        if (activity.DisplayName == $"{nameof(RoslynAnalysis)}.{nameof(RoslynAnalysis.UpdateSolutionDiagnostics)}")
+        {
+            _isSolutionDiagnosticsBeingRetrieved = isOccurring;
+        }
+        else if (activity.DisplayName == "OpenSolution")
+        {
+            _isSolutionLoading = isOccurring;
+        }
+        else if (activity.DisplayName == "RestoreSolution")
+        {
+            _isSolutionRestoring = isOccurring;
+        }
+        else
+        {
+            return;
+        }
+        
+        var visible = _isSolutionDiagnosticsBeingRetrieved || _isSolutionLoading || _isSolutionRestoring;
+        await this.InvokeAsync(() =>
+        {
+            _solutionLoadingLabel.Visible = _isSolutionLoading;
+            _solutionDiagnosticsLabel.Visible = _isSolutionDiagnosticsBeingRetrieved;
+            _solutionRestoringLabel.Visible = _isSolutionRestoring;
+            Visible = visible;
+        });
+    }
+}
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/BottomPanel/MultiFunctionPanel.cs b/src/SharpIDE.Godot/Features/BottomPanel/MultiFunctionPanel.cs
index a1c46ae7..ba706b3b 100644
--- a/src/SharpIDE.Godot/Features/BottomPanel/MultiFunctionPanel.cs
+++ b/src/SharpIDE.Godot/Features/BottomPanel/MultiFunctionPanel.cs
@@ -1,5 +1,5 @@
 using Godot;
-using SharpIDE.Application.Features.SolutionDiscovery.VsPersistence;
+
 using SharpIDE.Godot.Features.Build;
 using SharpIDE.Godot.Features.Debug_;
 using SharpIDE.Godot.Features.IdeDiagnostics;
@@ -12,57 +12,57 @@ namespace SharpIDE.Godot.Features.BottomPanel;
 
 public partial class MultiFunctionPanel : Panel
 {
-	private RunPanel _runPanel = null!;
-	private DebugPanel _debugPanel = null!;
-	private BuildPanel _buildPanel = null!;
-	private ProblemsPanel _problemsPanel = null!;
-	private IdeDiagnosticsPanel _ideDiagnosticsPanel = null!;
-	private NugetPanel _nugetPanel = null!;
-	private TestExplorerPanel _testExplorerPanel = null!;
+    private RunPanel _runPanel = null!;
+    private DebugPanel _debugPanel = null!;
+    private BuildPanel _buildPanel = null!;
+    private ProblemsPanel _problemsPanel = null!;
+    private IdeDiagnosticsPanel _ideDiagnosticsPanel = null!;
+    private NugetPanel _nugetPanel = null!;
+    private TestExplorerPanel _testExplorerPanel = null!;
+
+    private Dictionary<BottomPanelType, Control> _panelTypeMap = [];
+
+    public override void _Ready()
+    {
+        _runPanel = GetNode<RunPanel>("%RunPanel");
+        _debugPanel = GetNode<DebugPanel>("%DebugPanel");
+        _buildPanel = GetNode<BuildPanel>("%BuildPanel");
+        _problemsPanel = GetNode<ProblemsPanel>("%ProblemsPanel");
+        _ideDiagnosticsPanel = GetNode<IdeDiagnosticsPanel>("%IdeDiagnosticsPanel");
+        _nugetPanel = GetNode<NugetPanel>("%NugetPanel");
+        _testExplorerPanel = GetNode<TestExplorerPanel>("%TestExplorerPanel");
+
+        _panelTypeMap = new Dictionary<BottomPanelType, Control>
+        {
+            { BottomPanelType.Run, _runPanel },
+            { BottomPanelType.Debug, _debugPanel },
+            { BottomPanelType.Build, _buildPanel },
+            { BottomPanelType.Problems, _problemsPanel },
+            { BottomPanelType.IdeDiagnostics, _ideDiagnosticsPanel },
+            { BottomPanelType.Nuget, _nugetPanel },
+            { BottomPanelType.TestExplorer, _testExplorerPanel }
+        };
+
+        _ = OnBottomPanelTabSelected(BottomPanelType.Run);
 
-	private Dictionary<BottomPanelType, Control> _panelTypeMap = [];
-	
-	public override void _Ready()
-	{
-		_runPanel = GetNode<RunPanel>("%RunPanel");
-		_debugPanel = GetNode<DebugPanel>("%DebugPanel");
-		_buildPanel = GetNode<BuildPanel>("%BuildPanel");
-		_problemsPanel = GetNode<ProblemsPanel>("%ProblemsPanel");
-		_ideDiagnosticsPanel = GetNode<IdeDiagnosticsPanel>("%IdeDiagnosticsPanel");
-		_nugetPanel = GetNode<NugetPanel>("%NugetPanel");
-		_testExplorerPanel = GetNode<TestExplorerPanel>("%TestExplorerPanel");
-		
-		_panelTypeMap = new Dictionary<BottomPanelType, Control>
-		{
-			{ BottomPanelType.Run, _runPanel },
-			{ BottomPanelType.Debug, _debugPanel },
-			{ BottomPanelType.Build, _buildPanel },
-			{ BottomPanelType.Problems, _problemsPanel },
-			{ BottomPanelType.IdeDiagnostics, _ideDiagnosticsPanel },
-			{ BottomPanelType.Nuget, _nugetPanel },
-			{ BottomPanelType.TestExplorer, _testExplorerPanel }
-		};
-		
-		_ = OnBottomPanelTabSelected(BottomPanelType.Run);
+        GodotGlobalEvents.Instance.BottomPanelTabSelected.Subscribe(OnBottomPanelTabSelected);
+    }
 
-		GodotGlobalEvents.Instance.BottomPanelTabSelected.Subscribe(OnBottomPanelTabSelected);
-	}
+    public override void _ExitTree()
+    {
+        GodotGlobalEvents.Instance.BottomPanelTabSelected.Subscribe(OnBottomPanelTabSelected);
+    }
 
-	public override void _ExitTree()
-	{
-		GodotGlobalEvents.Instance.BottomPanelTabSelected.Subscribe(OnBottomPanelTabSelected);
-	}
+    private async Task OnBottomPanelTabSelected(BottomPanelType? type)
+    {
+        await this.InvokeAsync(() =>
+        {
+            Visible = type is not null;
 
-	private async Task OnBottomPanelTabSelected(BottomPanelType? type)
-	{
-		await this.InvokeAsync(() =>
-		{
-			Visible = type is not null;
-			
-			foreach (var kvp in _panelTypeMap)
-			{
-				kvp.Value.Visible = kvp.Key == type;
-			}
-		});
-	}
-}
+            foreach (var kvp in _panelTypeMap)
+            {
+                kvp.Value.Visible = kvp.Key == type;
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/Layout/DockSymbol.cs b/src/SharpIDE.Godot/Features/Layout/DockSymbol.cs
index ce547dac..1ef7de35 100644
--- a/src/SharpIDE.Godot/Features/Layout/DockSymbol.cs
+++ b/src/SharpIDE.Godot/Features/Layout/DockSymbol.cs
@@ -4,9 +4,9 @@ namespace SharpIDE.Godot.Features.Layout;
 
 public partial class DockSymbol : Control
 {
-	[Export]
-	public DockScope DockScope { get; set; }
-	
-	[Export]
-	public DockPosition DockPosition { get; set; }
-}
+    [Export]
+    public DockScope DockScope { get; set; }
+
+    [Export]
+    public DockPosition DockPosition { get; set; }
+}
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeDockComponent.cs b/src/SharpIDE.Godot/Features/Layout/IdeDockComponent.cs
index 312b891d..1392e1ca 100644
--- a/src/SharpIDE.Godot/Features/Layout/IdeDockComponent.cs
+++ b/src/SharpIDE.Godot/Features/Layout/IdeDockComponent.cs
@@ -4,16 +4,16 @@ namespace SharpIDE.Godot.Features.Layout;
 
 public partial class IdeDockComponent : VBoxContainer
 {
-	public IdeSceneNode ComponentNode { get; set; } = null!;
+    public IdeSceneNode ComponentNode { get; set; } = null!;
 
-	public override void _Ready()
-	{
-		GetNode<Label>("%ComponentName").Text = ComponentNode.Name;
-		
-		var sceneResource = ResourceLoader.Load<PackedScene>(ComponentNode.ResourceUid);
-		var scene = sceneResource.Instantiate<Control>();
-		GetNode<Control>("%ScenePresenter").AddChild(scene);
+    public override void _Ready()
+    {
+        GetNode<Label>("%ComponentName").Text = ComponentNode.Name;
 
-		scene.VisibilityChanged += () => Visible = scene.Visible;
-	}
-}
+        var sceneResource = ResourceLoader.Load<PackedScene>(ComponentNode.ResourceUid);
+        var scene = sceneResource.Instantiate<Control>();
+        GetNode<Control>("%ScenePresenter").AddChild(scene);
+
+        scene.VisibilityChanged += () => Visible = scene.Visible;
+    }
+}
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeDockLayout.cs b/src/SharpIDE.Godot/Features/Layout/IdeDockLayout.cs
index 10852aea..2f903aaf 100644
--- a/src/SharpIDE.Godot/Features/Layout/IdeDockLayout.cs
+++ b/src/SharpIDE.Godot/Features/Layout/IdeDockLayout.cs
@@ -1,251 +1,251 @@
 using Godot;
 
-using SharpIDE.Application.Features.SolutionDiscovery.VsPersistence;
-
 namespace SharpIDE.Godot.Features.Layout;
 
 public partial class IdeDockLayout : Control
 {
-	[Export]
-	public int DockComponentSeparation { get; set; } = 0;
-	
-	private readonly Dictionary<Control, IdeLayoutNode> _nodeMap = [];
-	private IdeLayoutNode _layout = null!;
-
-	private IdeDockOverlay _dockOverlay = null!;
-
-	private Control? _layoutNode;
-
-	/// <inheritdoc />
-	public override void _Ready()
-	{
-		_dockOverlay = GetNode<IdeDockOverlay>("%DockOverlay");
-
-		FocusExited += _dockOverlay.EndDrag;
-	}
-
-	/// <inheritdoc />
-	public override void _UnhandledKeyInput(InputEvent input)
-	{
-		if (input is InputEventKey { Keycode: Key.Escape, Pressed: true })
-		{
-			_dockOverlay.EndDrag();
-		}
-	}
-
-	public void UpdateLayout(IdeLayoutNode layout)
-	{
-		_layout = layout;
-		RebuildLayoutTree();
-	}
-	
-	private void RebuildLayoutTree()
-	{
-		_dockOverlay.ClearDockTargets();
-
-		_layoutNode?.QueueFree();
-		_layoutNode = BuildLayoutTree(_layout);
-		AddChild(_layoutNode);
-	}
-
-	private Control BuildLayoutTree(IdeLayoutNode layoutNode)
-	{
-		return layoutNode switch
-		{
-			IdeSplitNode splitNode => BuildSplitLayout(splitNode),
-			IdeTabGroupNode tabGroupNode => BuildTabGroupLayout(tabGroupNode),
-			IdeSceneNode viewNode => BuildSceneLayout(viewNode),
-
-			_ => throw new ArgumentException(
-					 $"The layout node of type '{layoutNode.GetType().FullName}' is not supported.",
-					 nameof(layoutNode))
-		};
-	}
-
-	private Control BuildSplitLayout(IdeSplitNode splitNode)
-	{
-		SplitContainer container = splitNode.Orientation switch
-		{
-			Orientation.Horizontal => new HSplitContainer(),
-			Orientation.Vertical => new VSplitContainer(),
-
-			_ => throw new ArgumentException(
-					 $"The split orientation '{splitNode.Orientation}' is not supported.",
-					 nameof(splitNode))
-		};
-
-		container.SizeFlagsHorizontal = SizeFlags.ExpandFill;
-		container.SizeFlagsVertical = SizeFlags.ExpandFill;
-		container.SetAnchorsAndOffsetsPreset(LayoutPreset.FullRect);
-		container.AddThemeConstantOverride("separation", DockComponentSeparation);
-
-		var firstChild = BuildLayoutTree(splitNode.FirstNode);
-		var secondChild = BuildLayoutTree(splitNode.SecondNode);
-
-		container.AddChild(firstChild);
-		container.AddChild(secondChild);
-
-		var (firstRatio, secondRatio) = GetStretchRatio(splitNode);
-
-		firstChild.SizeFlagsHorizontal = SizeFlags.ExpandFill;
-		firstChild.SizeFlagsVertical = SizeFlags.ExpandFill;
-		secondChild.SizeFlagsHorizontal = SizeFlags.ExpandFill;
-		secondChild.SizeFlagsVertical = SizeFlags.ExpandFill;
-		firstChild.SetStretchRatio(firstRatio);
-		secondChild.SetStretchRatio(secondRatio);
-
-		_nodeMap[container] = splitNode;
-
-		return container;
-	}
-
-	private (float FirstRatio, float SecondRatio) GetStretchRatio(IdeSplitNode splitNode)
-	{
-		// TODO: Calculate ratio
-		return (1.0f, 1.0f);
-	}
-
-	private Control BuildTabGroupLayout(IdeTabGroupNode tabGroupNode)
-	{
-		throw new NotImplementedException();
-	}
-
-	private Control BuildSceneLayout(IdeSceneNode sceneNode)
-	{
-		var component = ResourceLoader.Load<PackedScene>("uid://b36lno754a2is").Instantiate<IdeDockComponent>();
-		component.ComponentNode = sceneNode;
-		component.GuiInput += input => OnDockComponentGuiInput(input, sceneNode);
-
-		_dockOverlay.RegisterDockTarget(component);
-		_nodeMap[component] = sceneNode;
-
-		return component;
-	}
-
-	private void OnDockComponentGuiInput(InputEvent input, IdeLayoutNode node)
-	{
-		if (input is not InputEventMouseButton { ButtonIndex: MouseButton.Left } leftButton)
-		{
-			return;
-		}
-
-		if (leftButton.Pressed)
-		{
-			BeginDrag(node);
-			return;
-		}
-
-		EndDrag();
-	}
-
-	private void BeginDrag(IdeLayoutNode draggedNode)
-	{
-		_dockOverlay.BeginDrag(draggedNode);
-	}
-
-	private void EndDrag()
-	{
-		if (_dockOverlay.DraggedNode is null || _dockOverlay.CurrentDockPosition is DockPosition.None)
-		{
-			_dockOverlay.EndDrag();
-			return;
-		}
-
-		switch (_dockOverlay.CurrentDockScope)
-		{
-			case DockScope.Global:
-				DockTarget(_dockOverlay.DraggedNode, _layout, _dockOverlay.CurrentDockPosition);
-				break;
-			case DockScope.Local when _dockOverlay.HoveredTarget is not null:
-				DockTarget(_dockOverlay.DraggedNode, _nodeMap[_dockOverlay.HoveredTarget], _dockOverlay.CurrentDockPosition);
-				break;
-		}
-
-		_dockOverlay.EndDrag();
-	}
-
-	private void DockTarget(IdeLayoutNode dragged, IdeLayoutNode target, DockPosition position)
-	{
-		if (ReferenceEquals(_layout, target))
-		{
-			_layout = RemoveNode(target, dragged)!;
-			target = _layout;
-		}
-		else
-		{
-			_layout = RemoveNode(_layout, dragged)!;
-			target = RemoveNode(target, dragged)!;
-		}
-		
-		
-		var replacement = position switch
-		{
-			DockPosition.Left => new IdeSplitNode(Orientation.Horizontal, dragged, target),
-			DockPosition.Right => new IdeSplitNode(Orientation.Horizontal, target, dragged),
-			DockPosition.Top => new IdeSplitNode(Orientation.Vertical, dragged, target),
-			DockPosition.Bottom => new IdeSplitNode(Orientation.Vertical, target, dragged),
-
-			_ => target
-		};
-
-		if (ReferenceEquals(replacement, target))
-		{
-			return;
-		}
-
-		_layout = ReplaceNode(_layout, target, replacement);
-
-		RebuildLayoutTree();
-	}
-
-	private IdeLayoutNode ReplaceNode(IdeLayoutNode current, IdeLayoutNode target, IdeLayoutNode replacement)
-	{
-		if (ReferenceEquals(_layout, target) || ReferenceEquals(current, target))
-		{
-			return replacement;
-		}
-
-		if (current is IdeSplitNode splitNode)
-		{
-			return splitNode with
-			{
-				FirstNode = ReplaceNode(splitNode.FirstNode, target, replacement),
-				SecondNode = ReplaceNode(splitNode.SecondNode, target, replacement)
-			};
-		}
-
-		return current;
-	}
-
-	private IdeLayoutNode? RemoveNode(IdeLayoutNode current, IdeLayoutNode target)
-	{
-		if (ReferenceEquals(current, target))
-		{
-			return null;
-		}
-
-		if (current is not IdeSplitNode splitNode)
-		{
-			return current;
-		}
-
-		var first = RemoveNode(splitNode.FirstNode, target);
-		var second = RemoveNode(splitNode.SecondNode, target);
-
-		if (first is null)
-		{
-			return second;
-		}
-
-		if (second is null)
-		{
-			return first;
-		}
-
-		return splitNode with
-		{
-			FirstNode = first,
-			SecondNode = second
-		};
-	}
-}
+    private readonly Dictionary<Control, IdeLayoutNode> _nodeMap = [];
+    private IdeLayoutNode _layout = null!;
+
+    private IdeDockOverlay _dockOverlay = null!;
+
+    private Control? _layoutNode;
+
+    [Export]
+    public int DockComponentSeparation { get; set; }
+
+    /// <inheritdoc />
+    public override void _Ready()
+    {
+        _dockOverlay = GetNode<IdeDockOverlay>("%DockOverlay");
+
+        FocusExited += _dockOverlay.EndDrag;
+    }
+
+    /// <inheritdoc />
+    public override void _UnhandledKeyInput(InputEvent input)
+    {
+        if (input is InputEventKey { Keycode: Key.Escape, Pressed: true })
+        {
+            _dockOverlay.EndDrag();
+        }
+    }
+
+    public void UpdateLayout(IdeLayoutNode layout)
+    {
+        _layout = layout;
+        RebuildLayoutTree();
+    }
+
+    private void RebuildLayoutTree()
+    {
+        _dockOverlay.ClearDockTargets();
+
+        _layoutNode?.QueueFree();
+        _layoutNode = BuildLayoutTree(_layout);
+        AddChild(_layoutNode);
+    }
+
+    private Control BuildLayoutTree(IdeLayoutNode layoutNode)
+    {
+        return layoutNode switch
+        {
+            IdeSplitNode splitNode => BuildSplitLayout(splitNode),
+            IdeTabGroupNode tabGroupNode => BuildTabGroupLayout(tabGroupNode),
+            IdeSceneNode viewNode => BuildSceneLayout(viewNode),
+
+            _ => throw new ArgumentException(
+                     $"The layout node of type '{layoutNode.GetType().FullName}' is not supported.",
+                     nameof(layoutNode))
+        };
+    }
+
+    private Control BuildSplitLayout(IdeSplitNode splitNode)
+    {
+        SplitContainer container = splitNode.Orientation switch
+        {
+            Orientation.Horizontal => new HSplitContainer(),
+            Orientation.Vertical => new VSplitContainer(),
+
+            _ => throw new ArgumentException(
+                     $"The split orientation '{splitNode.Orientation}' is not supported.",
+                     nameof(splitNode))
+        };
+
+        container.SizeFlagsHorizontal = SizeFlags.ExpandFill;
+        container.SizeFlagsVertical = SizeFlags.ExpandFill;
+        container.SetAnchorsAndOffsetsPreset(LayoutPreset.FullRect);
+        container.AddThemeConstantOverride("separation", DockComponentSeparation);
+
+        var firstChild = BuildLayoutTree(splitNode.FirstNode);
+        var secondChild = BuildLayoutTree(splitNode.SecondNode);
+
+        container.AddChild(firstChild);
+        container.AddChild(secondChild);
+
+        var (firstRatio, secondRatio) = GetStretchRatio(splitNode);
+
+        firstChild.SizeFlagsHorizontal = SizeFlags.ExpandFill;
+        firstChild.SizeFlagsVertical = SizeFlags.ExpandFill;
+        secondChild.SizeFlagsHorizontal = SizeFlags.ExpandFill;
+        secondChild.SizeFlagsVertical = SizeFlags.ExpandFill;
+        firstChild.SetStretchRatio(firstRatio);
+        secondChild.SetStretchRatio(secondRatio);
+
+        _nodeMap[container] = splitNode;
+
+        return container;
+    }
+
+    private (float FirstRatio, float SecondRatio) GetStretchRatio(IdeSplitNode splitNode)
+    {
+        // TODO: Calculate ratio
+        return (1.0f, 1.0f);
+    }
+
+    private Control BuildTabGroupLayout(IdeTabGroupNode tabGroupNode)
+    {
+        throw new NotImplementedException();
+    }
+
+    private Control BuildSceneLayout(IdeSceneNode sceneNode)
+    {
+        var component = ResourceLoader.Load<PackedScene>("uid://b36lno754a2is").Instantiate<IdeDockComponent>();
+        component.ComponentNode = sceneNode;
+        component.GuiInput += input => OnDockComponentGuiInput(input, sceneNode);
+
+        _dockOverlay.RegisterDockTarget(component);
+        _nodeMap[component] = sceneNode;
+
+        return component;
+    }
+
+    private void OnDockComponentGuiInput(InputEvent input, IdeLayoutNode node)
+    {
+        if (input is not InputEventMouseButton { ButtonIndex: MouseButton.Left } leftButton)
+        {
+            return;
+        }
+
+        if (leftButton.Pressed)
+        {
+            BeginDrag(node);
+            return;
+        }
+
+        EndDrag();
+    }
+
+    private void BeginDrag(IdeLayoutNode draggedNode)
+    {
+        _dockOverlay.BeginDrag(draggedNode);
+    }
+
+    private void EndDrag()
+    {
+        if (_dockOverlay.DraggedNode is null || _dockOverlay.CurrentDockPosition is DockPosition.None)
+        {
+            _dockOverlay.EndDrag();
+            return;
+        }
+
+        switch (_dockOverlay.CurrentDockScope)
+        {
+            case DockScope.Global:
+                DockTarget(_dockOverlay.DraggedNode, _layout, _dockOverlay.CurrentDockPosition);
+                break;
+            case DockScope.Local when _dockOverlay.HoveredTarget is not null:
+                DockTarget(
+                    _dockOverlay.DraggedNode,
+                    _nodeMap[_dockOverlay.HoveredTarget],
+                    _dockOverlay.CurrentDockPosition);
+                break;
+        }
+
+        _dockOverlay.EndDrag();
+    }
+
+    private void DockTarget(IdeLayoutNode dragged, IdeLayoutNode target, DockPosition position)
+    {
+        if (ReferenceEquals(_layout, target))
+        {
+            _layout = RemoveNode(target, dragged)!;
+            target = _layout;
+        }
+        else
+        {
+            _layout = RemoveNode(_layout, dragged)!;
+            target = RemoveNode(target, dragged)!;
+        }
+
+        var replacement = position switch
+        {
+            DockPosition.Left => new IdeSplitNode(Orientation.Horizontal, dragged, target),
+            DockPosition.Right => new IdeSplitNode(Orientation.Horizontal, target, dragged),
+            DockPosition.Top => new IdeSplitNode(Orientation.Vertical, dragged, target),
+            DockPosition.Bottom => new IdeSplitNode(Orientation.Vertical, target, dragged),
+
+            _ => target
+        };
+
+        if (ReferenceEquals(replacement, target))
+        {
+            return;
+        }
+
+        _layout = ReplaceNode(_layout, target, replacement);
+
+        RebuildLayoutTree();
+    }
+
+    private IdeLayoutNode ReplaceNode(IdeLayoutNode current, IdeLayoutNode target, IdeLayoutNode replacement)
+    {
+        if (ReferenceEquals(_layout, target) || ReferenceEquals(current, target))
+        {
+            return replacement;
+        }
+
+        if (current is IdeSplitNode splitNode)
+        {
+            return splitNode with
+            {
+                FirstNode = ReplaceNode(splitNode.FirstNode, target, replacement),
+                SecondNode = ReplaceNode(splitNode.SecondNode, target, replacement)
+            };
+        }
+
+        return current;
+    }
+
+    private IdeLayoutNode? RemoveNode(IdeLayoutNode current, IdeLayoutNode target)
+    {
+        if (ReferenceEquals(current, target))
+        {
+            return null;
+        }
+
+        if (current is not IdeSplitNode splitNode)
+        {
+            return current;
+        }
+
+        var first = RemoveNode(splitNode.FirstNode, target);
+        var second = RemoveNode(splitNode.SecondNode, target);
+
+        if (first is null)
+        {
+            return second;
+        }
+
+        if (second is null)
+        {
+            return first;
+        }
+
+        return splitNode with
+        {
+            FirstNode = first,
+            SecondNode = second
+        };
+    }
+}
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/LeftSideBar/LeftSideBar.cs b/src/SharpIDE.Godot/Features/LeftSideBar/LeftSideBar.cs
index eaf0f85d..103e60fd 100644
--- a/src/SharpIDE.Godot/Features/LeftSideBar/LeftSideBar.cs
+++ b/src/SharpIDE.Godot/Features/LeftSideBar/LeftSideBar.cs
@@ -5,52 +5,52 @@ namespace SharpIDE.Godot.Features.LeftSideBar;
 
 public partial class LeftSideBar : Panel
 {
-	private Button _slnExplorerButton = null!;
-	// These are in a ButtonGroup, which handles mutual exclusivity of being toggled on
-	private Button _problemsButton = null!;
-	private Button _runButton = null!;
-	private Button _buildButton = null!;
-	private Button _debugButton = null!;
-	private Button _ideDiagnosticsButton = null!;
-	private Button _nugetButton = null!;
-	private Button _testExplorerButton = null!;
-	
-	public override void _Ready()
-	{
-		_slnExplorerButton = GetNode<Button>("%SlnExplorerButton");
-		_problemsButton = GetNode<Button>("%ProblemsButton");
-		_runButton = GetNode<Button>("%RunButton");
-		_buildButton = GetNode<Button>("%BuildButton");
-		_debugButton = GetNode<Button>("%DebugButton");
-		_ideDiagnosticsButton = GetNode<Button>("%IdeDiagnosticsButton");
-		_nugetButton = GetNode<Button>("%NugetButton");
-		_testExplorerButton = GetNode<Button>("%TestExplorerButton");
-		
-		_problemsButton.Toggled += toggledOn => GodotGlobalEvents.Instance.BottomPanelTabSelected.InvokeParallelFireAndForget(toggledOn ? BottomPanelType.Problems : null);
-		_runButton.Toggled += toggledOn => GodotGlobalEvents.Instance.BottomPanelTabSelected.InvokeParallelFireAndForget(toggledOn ? BottomPanelType.Run : null);
-		_buildButton.Toggled += toggledOn => GodotGlobalEvents.Instance.BottomPanelTabSelected.InvokeParallelFireAndForget(toggledOn ? BottomPanelType.Build : null);
-		_debugButton.Toggled += toggledOn => GodotGlobalEvents.Instance.BottomPanelTabSelected.InvokeParallelFireAndForget(toggledOn ? BottomPanelType.Debug : null);
-		_ideDiagnosticsButton.Toggled += toggledOn => GodotGlobalEvents.Instance.BottomPanelTabSelected.InvokeParallelFireAndForget(toggledOn ? BottomPanelType.IdeDiagnostics : null);
-		_nugetButton.Toggled += toggledOn => GodotGlobalEvents.Instance.BottomPanelTabSelected.InvokeParallelFireAndForget(toggledOn ? BottomPanelType.Nuget : null);
-		_testExplorerButton.Toggled += toggledOn => GodotGlobalEvents.Instance.BottomPanelTabSelected.InvokeParallelFireAndForget(toggledOn ? BottomPanelType.TestExplorer : null);
-		GodotGlobalEvents.Instance.BottomPanelTabExternallySelected.Subscribe(OnBottomPanelTabExternallySelected);
-	}
+    private Button _slnExplorerButton = null!;
+    // These are in a ButtonGroup, which handles mutual exclusivity of being toggled on
+    private Button _problemsButton = null!;
+    private Button _runButton = null!;
+    private Button _buildButton = null!;
+    private Button _debugButton = null!;
+    private Button _ideDiagnosticsButton = null!;
+    private Button _nugetButton = null!;
+    private Button _testExplorerButton = null!;
+    
+    public override void _Ready()
+    {
+        _slnExplorerButton = GetNode<Button>("%SlnExplorerButton");
+        _problemsButton = GetNode<Button>("%ProblemsButton");
+        _runButton = GetNode<Button>("%RunButton");
+        _buildButton = GetNode<Button>("%BuildButton");
+        _debugButton = GetNode<Button>("%DebugButton");
+        _ideDiagnosticsButton = GetNode<Button>("%IdeDiagnosticsButton");
+        _nugetButton = GetNode<Button>("%NugetButton");
+        _testExplorerButton = GetNode<Button>("%TestExplorerButton");
+        
+        _problemsButton.Toggled += toggledOn => GodotGlobalEvents.Instance.BottomPanelTabSelected.InvokeParallelFireAndForget(toggledOn ? BottomPanelType.Problems : null);
+        _runButton.Toggled += toggledOn => GodotGlobalEvents.Instance.BottomPanelTabSelected.InvokeParallelFireAndForget(toggledOn ? BottomPanelType.Run : null);
+        _buildButton.Toggled += toggledOn => GodotGlobalEvents.Instance.BottomPanelTabSelected.InvokeParallelFireAndForget(toggledOn ? BottomPanelType.Build : null);
+        _debugButton.Toggled += toggledOn => GodotGlobalEvents.Instance.BottomPanelTabSelected.InvokeParallelFireAndForget(toggledOn ? BottomPanelType.Debug : null);
+        _ideDiagnosticsButton.Toggled += toggledOn => GodotGlobalEvents.Instance.BottomPanelTabSelected.InvokeParallelFireAndForget(toggledOn ? BottomPanelType.IdeDiagnostics : null);
+        _nugetButton.Toggled += toggledOn => GodotGlobalEvents.Instance.BottomPanelTabSelected.InvokeParallelFireAndForget(toggledOn ? BottomPanelType.Nuget : null);
+        _testExplorerButton.Toggled += toggledOn => GodotGlobalEvents.Instance.BottomPanelTabSelected.InvokeParallelFireAndForget(toggledOn ? BottomPanelType.TestExplorer : null);
+        GodotGlobalEvents.Instance.BottomPanelTabExternallySelected.Subscribe(OnBottomPanelTabExternallySelected);
+    }
 
-	private async Task OnBottomPanelTabExternallySelected(BottomPanelType arg)
-	{
-		await this.InvokeAsync(() =>
-		{
-			switch (arg)
-			{
-				case BottomPanelType.Run: _runButton.ButtonPressed = true; break;
-				case BottomPanelType.Debug: _debugButton.ButtonPressed = true; break;
-				case BottomPanelType.Build: _buildButton.ButtonPressed = true; break;
-				case BottomPanelType.Problems: _problemsButton.ButtonPressed = true; break;
-				case BottomPanelType.IdeDiagnostics: _ideDiagnosticsButton.ButtonPressed = true; break;
-				case BottomPanelType.Nuget: _nugetButton.ButtonPressed = true; break;
-				case BottomPanelType.TestExplorer: _testExplorerButton.ButtonPressed = true; break;
-				default: throw new ArgumentOutOfRangeException(nameof(arg), arg, null);
-			}
-		});
-	}
-}
+    private async Task OnBottomPanelTabExternallySelected(BottomPanelType arg)
+    {
+        await this.InvokeAsync(() =>
+        {
+            switch (arg)
+            {
+                case BottomPanelType.Run: _runButton.ButtonPressed = true; break;
+                case BottomPanelType.Debug: _debugButton.ButtonPressed = true; break;
+                case BottomPanelType.Build: _buildButton.ButtonPressed = true; break;
+                case BottomPanelType.Problems: _problemsButton.ButtonPressed = true; break;
+                case BottomPanelType.IdeDiagnostics: _ideDiagnosticsButton.ButtonPressed = true; break;
+                case BottomPanelType.Nuget: _nugetButton.ButtonPressed = true; break;
+                case BottomPanelType.TestExplorer: _testExplorerButton.ButtonPressed = true; break;
+                default: throw new ArgumentOutOfRangeException(nameof(arg), arg, null);
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/SolutionExplorer/SolutionExplorerPanel.cs b/src/SharpIDE.Godot/Features/SolutionExplorer/SolutionExplorerPanel.cs
index 32555a4d..42c5ae0a 100644
--- a/src/SharpIDE.Godot/Features/SolutionExplorer/SolutionExplorerPanel.cs
+++ b/src/SharpIDE.Godot/Features/SolutionExplorer/SolutionExplorerPanel.cs
@@ -143,7 +143,7 @@ await this.InvokeAsync(() =>
 	}
 
 	[RequiresGodotUiThread]
-	public async Task BindToSolution(SharpIdeSolutionModel solution, [CallerMemberName] string caller = "")
+	public async Task BindToSolution(SharpIdeSolutionModel solution)
 	{
 		await Task.CompletedTask.ConfigureAwait(ConfigureAwaitOptions.ForceYielding);
 		using var _ = SharpIdeOtel.Source.StartActivity($"{nameof(SolutionExplorerPanel)}.{nameof(BindToSolution)}");
@@ -232,10 +232,8 @@ private TreeItem CreateSlnFolderTreeItem(Tree tree, TreeItem parent, SharpIdeSol
 	}
 
 	[RequiresGodotUiThread]
-	private TreeItem CreateProjectTreeItem(Tree tree, TreeItem parent, SharpIdeProjectModel projectModel, [CallerMemberName] string caller = "")
+	private TreeItem CreateProjectTreeItem(Tree tree, TreeItem parent, SharpIdeProjectModel projectModel)
 	{
-		GD.Print($"[{caller}] CreateProjectTreeItem({projectModel.FilePath})");
-		
 		var projectItem = tree.CreateItem(parent);
 		projectItem.SetText(0, projectModel.Name);
 		projectItem.SetIcon(0, CsprojIcon);

From e33295cbbd15ef477f00ecf8a9ba0dae04b7479b Mon Sep 17 00:00:00 2001
From: Manuel Gasser <manuel.gasser.ch@gmail.com>
Date: Sun, 21 Dec 2025 21:47:48 +0100
Subject: [PATCH 05/11] Add dock component ID in helper

---
 src/SharpIDE.Godot/Features/Layout/IdeDockLayout.cs  | 3 ++-
 src/SharpIDE.Godot/Features/Layout/ResourceHelper.cs | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/SharpIDE.Godot/Features/Layout/IdeDockLayout.cs b/src/SharpIDE.Godot/Features/Layout/IdeDockLayout.cs
index 2f903aaf..31c558c3 100644
--- a/src/SharpIDE.Godot/Features/Layout/IdeDockLayout.cs
+++ b/src/SharpIDE.Godot/Features/Layout/IdeDockLayout.cs
@@ -110,7 +110,8 @@ private Control BuildTabGroupLayout(IdeTabGroupNode tabGroupNode)
 
     private Control BuildSceneLayout(IdeSceneNode sceneNode)
     {
-        var component = ResourceLoader.Load<PackedScene>("uid://b36lno754a2is").Instantiate<IdeDockComponent>();
+        var component = ResourceLoader.Load<PackedScene>(ResourceHelper.DockComponentId)
+                                      .Instantiate<IdeDockComponent>();
         component.ComponentNode = sceneNode;
         component.GuiInput += input => OnDockComponentGuiInput(input, sceneNode);
 
diff --git a/src/SharpIDE.Godot/Features/Layout/ResourceHelper.cs b/src/SharpIDE.Godot/Features/Layout/ResourceHelper.cs
index 92d59cdf..23154d8d 100644
--- a/src/SharpIDE.Godot/Features/Layout/ResourceHelper.cs
+++ b/src/SharpIDE.Godot/Features/Layout/ResourceHelper.cs
@@ -5,4 +5,5 @@ public static class ResourceHelper
     public static string SolutionExplorerId = "uid://cy1bb32g7j7dr";
     public static string CodeEditorId = "uid://c5dlwgcx3ubyp";
     public static string MultiFunctionPanelId = "uid://b8wqkwa7sjrid";
+    public static string DockComponentId = "uid://b36lno754a2is";
 }
\ No newline at end of file

From fb88b0fa1e51e04efae9f0e985680f6d4ebc4f7b Mon Sep 17 00:00:00 2001
From: Manuel Gasser <manuel.gasser.ch@gmail.com>
Date: Tue, 23 Dec 2025 11:12:30 +0100
Subject: [PATCH 06/11] Rework UI layout to make it compatible with a drag and
 drop system

---
 .../Features/BottomPanel/BottomPanelType.cs   |  12 -
 .../BottomPanel/BottomPanelType.cs.uid        |   1 -
 .../BottomPanel/MultiFunctionPanel.cs         |  68 -----
 .../BottomPanel/MultiFunctionPanel.cs.uid     |   1 -
 .../BottomPanel/MultiFunctionPanel.tscn       |  53 ----
 .../Features/Layout/DockSymbol.cs             |  12 -
 .../Features/Layout/DockSymbol.cs.uid         |   1 -
 .../Features/Layout/DockSymbol.tscn           |  23 --
 .../Features/Layout/IdeDockComponent.cs       |  19 --
 .../Features/Layout/IdeDockComponent.cs.uid   |   1 -
 .../Features/Layout/IdeDockComponent.tscn     |  34 ---
 .../Features/Layout/IdeDockLayout.cs          | 252 ------------------
 .../Features/Layout/IdeDockLayout.cs.uid      |   1 -
 .../Features/Layout/IdeDockLayout.tscn        |  19 --
 .../Features/Layout/IdeDockOverlay.cs         | 189 -------------
 .../Features/Layout/IdeDockOverlay.cs.uid     |   1 -
 .../Features/Layout/IdeDockOverlay.tscn       | 100 -------
 .../Features/Layout/IdeLayoutNode.cs          |  43 ---
 .../Features/Layout/IdeLayoutNode.cs.uid      |   1 -
 .../Features/Layout/IdeMainLayout.cs          | 152 +++++++++++
 .../Features/Layout/IdeMainLayout.cs.uid      |   1 +
 .../Features/Layout/IdeMainLayout.tscn        |  84 ++++++
 .../Features/Layout/IdeToolInfo.cs            |  18 ++
 .../Features/Layout/IdeToolInfo.cs.uid        |   1 +
 .../Features/Layout/IdeTools.cs               |  35 +++
 .../Features/Layout/IdeTools.cs.uid           |   1 +
 .../Features/Layout/ResourceHelper.cs         |   9 -
 .../Features/Layout/ResourceHelper.cs.uid     |   1 -
 .../{LeftSideBar => Layout}/Resources/Ide.svg |   0
 .../Features/Layout/Resources/Ide.svg.import  |  18 ++
 .../Resources/Nuget.svg                       |   0
 .../Layout/Resources/Nuget.svg.import         |  18 ++
 .../Resources/SidebarDebug.svg                |   0
 .../Layout/Resources/SidebarDebug.svg.import  |  18 ++
 .../Resources/SidebarFolder.svg               |   0
 .../Layout/Resources/SidebarFolder.svg.import |  18 ++
 .../Resources/SidebarProblem.svg              |   0
 .../Resources/SidebarProblem.svg.import       |  18 ++
 .../Resources/SidebarRun.svg                  |   0
 .../Layout/Resources/SidebarRun.svg.import    |  18 ++
 .../Resources/SidebarTestExplorer.svg         |   0
 .../Resources/SidebarTestExplorer.svg.import  |  18 ++
 .../Resources/Terminal.svg                    |   0
 .../Layout/Resources/Terminal.svg.import      |  18 ++
 .../Resources/ToolButtonStyleNormal.tres}     |   0
 .../Resources/ToolButtonStylePressed.tres}    |   0
 src/SharpIDE.Godot/Features/Layout/Sidebar.cs |  15 ++
 .../Features/Layout/Sidebar.cs.uid            |   1 +
 .../Features/Layout/Sidebar.tscn              |  40 +++
 .../Features/Layout/SidebarToolGroup.tscn     |  26 ++
 .../Features/Layout/ToolAnchorExtensions.cs   |  27 ++
 .../Layout/ToolAnchorExtensions.cs.uid        |   1 +
 .../Features/Layout/ToolArea.cs               |  44 +++
 .../Features/Layout/ToolArea.cs.uid           |   1 +
 .../Features/Layout/ToolArea.tscn             |  11 +
 .../Features/Layout/ToolButton.cs             |   8 +
 .../Features/Layout/ToolButton.cs.uid         |   1 +
 .../Features/Layout/ToolButton.tscn           |  22 ++
 .../Features/Layout/ToolDockOverlay.cs        |  15 ++
 .../Features/Layout/ToolDockOverlay.cs.uid    |   1 +
 .../Features/Layout/ToolDockOverlay.tscn      |  13 +
 .../LeftBottomSidebarButtonGroup.tres         |   4 -
 .../Features/LeftSideBar/LeftSideBar.cs       |  56 ----
 .../Features/LeftSideBar/LeftSideBar.cs.uid   |   1 -
 .../Features/LeftSideBar/LeftSideBar.tscn     | 173 ------------
 .../LeftSideBar/Resources/Ide.svg.import      |  18 --
 .../LeftSideBar/Resources/Nuget.svg.import    |  18 --
 .../Resources/SidebarDebug.svg.import         |  18 --
 .../Resources/SidebarFolder.svg.import        |  18 --
 .../Resources/SidebarProblem.svg.import       |  18 --
 .../Resources/SidebarRun.svg.import           |  18 --
 .../Resources/SidebarTestExplorer.svg.import  |  18 --
 .../LeftSideBar/Resources/Terminal.svg.import |  18 --
 .../Features/Nuget/NugetPackageDetails.tscn   |   2 +-
 .../Features/Nuget/PackageEntry.tscn          |   2 +-
 .../Features/Run/RunMenuItem.cs               |   6 +-
 .../ContextMenus/ProjectContextMenu.cs        |   6 +-
 src/SharpIDE.Godot/GodotGlobalEvents.cs       |   6 +-
 src/SharpIDE.Godot/IdeRoot.cs                 |  86 ++++--
 src/SharpIDE.Godot/IdeRoot.tscn               |  15 +-
 src/SharpIDE.Godot/NodeExtensions.cs          |   8 +
 81 files changed, 749 insertions(+), 1263 deletions(-)
 delete mode 100644 src/SharpIDE.Godot/Features/BottomPanel/BottomPanelType.cs
 delete mode 100644 src/SharpIDE.Godot/Features/BottomPanel/BottomPanelType.cs.uid
 delete mode 100644 src/SharpIDE.Godot/Features/BottomPanel/MultiFunctionPanel.cs
 delete mode 100644 src/SharpIDE.Godot/Features/BottomPanel/MultiFunctionPanel.cs.uid
 delete mode 100644 src/SharpIDE.Godot/Features/BottomPanel/MultiFunctionPanel.tscn
 delete mode 100644 src/SharpIDE.Godot/Features/Layout/DockSymbol.cs
 delete mode 100644 src/SharpIDE.Godot/Features/Layout/DockSymbol.cs.uid
 delete mode 100644 src/SharpIDE.Godot/Features/Layout/DockSymbol.tscn
 delete mode 100644 src/SharpIDE.Godot/Features/Layout/IdeDockComponent.cs
 delete mode 100644 src/SharpIDE.Godot/Features/Layout/IdeDockComponent.cs.uid
 delete mode 100644 src/SharpIDE.Godot/Features/Layout/IdeDockComponent.tscn
 delete mode 100644 src/SharpIDE.Godot/Features/Layout/IdeDockLayout.cs
 delete mode 100644 src/SharpIDE.Godot/Features/Layout/IdeDockLayout.cs.uid
 delete mode 100644 src/SharpIDE.Godot/Features/Layout/IdeDockLayout.tscn
 delete mode 100644 src/SharpIDE.Godot/Features/Layout/IdeDockOverlay.cs
 delete mode 100644 src/SharpIDE.Godot/Features/Layout/IdeDockOverlay.cs.uid
 delete mode 100644 src/SharpIDE.Godot/Features/Layout/IdeDockOverlay.tscn
 delete mode 100644 src/SharpIDE.Godot/Features/Layout/IdeLayoutNode.cs
 delete mode 100644 src/SharpIDE.Godot/Features/Layout/IdeLayoutNode.cs.uid
 create mode 100644 src/SharpIDE.Godot/Features/Layout/IdeMainLayout.cs
 create mode 100644 src/SharpIDE.Godot/Features/Layout/IdeMainLayout.cs.uid
 create mode 100644 src/SharpIDE.Godot/Features/Layout/IdeMainLayout.tscn
 create mode 100644 src/SharpIDE.Godot/Features/Layout/IdeToolInfo.cs
 create mode 100644 src/SharpIDE.Godot/Features/Layout/IdeToolInfo.cs.uid
 create mode 100644 src/SharpIDE.Godot/Features/Layout/IdeTools.cs
 create mode 100644 src/SharpIDE.Godot/Features/Layout/IdeTools.cs.uid
 delete mode 100644 src/SharpIDE.Godot/Features/Layout/ResourceHelper.cs
 delete mode 100644 src/SharpIDE.Godot/Features/Layout/ResourceHelper.cs.uid
 rename src/SharpIDE.Godot/Features/{LeftSideBar => Layout}/Resources/Ide.svg (100%)
 create mode 100644 src/SharpIDE.Godot/Features/Layout/Resources/Ide.svg.import
 rename src/SharpIDE.Godot/Features/{LeftSideBar => Layout}/Resources/Nuget.svg (100%)
 create mode 100644 src/SharpIDE.Godot/Features/Layout/Resources/Nuget.svg.import
 rename src/SharpIDE.Godot/Features/{LeftSideBar => Layout}/Resources/SidebarDebug.svg (100%)
 create mode 100644 src/SharpIDE.Godot/Features/Layout/Resources/SidebarDebug.svg.import
 rename src/SharpIDE.Godot/Features/{LeftSideBar => Layout}/Resources/SidebarFolder.svg (100%)
 create mode 100644 src/SharpIDE.Godot/Features/Layout/Resources/SidebarFolder.svg.import
 rename src/SharpIDE.Godot/Features/{LeftSideBar => Layout}/Resources/SidebarProblem.svg (100%)
 create mode 100644 src/SharpIDE.Godot/Features/Layout/Resources/SidebarProblem.svg.import
 rename src/SharpIDE.Godot/Features/{LeftSideBar => Layout}/Resources/SidebarRun.svg (100%)
 create mode 100644 src/SharpIDE.Godot/Features/Layout/Resources/SidebarRun.svg.import
 rename src/SharpIDE.Godot/Features/{LeftSideBar => Layout}/Resources/SidebarTestExplorer.svg (100%)
 create mode 100644 src/SharpIDE.Godot/Features/Layout/Resources/SidebarTestExplorer.svg.import
 rename src/SharpIDE.Godot/Features/{LeftSideBar => Layout}/Resources/Terminal.svg (100%)
 create mode 100644 src/SharpIDE.Godot/Features/Layout/Resources/Terminal.svg.import
 rename src/SharpIDE.Godot/Features/{LeftSideBar/Resources/LeftSideBarButtonStyleNormal.tres => Layout/Resources/ToolButtonStyleNormal.tres} (100%)
 rename src/SharpIDE.Godot/Features/{LeftSideBar/Resources/LeftSideBarButtonStylePressed.tres => Layout/Resources/ToolButtonStylePressed.tres} (100%)
 create mode 100644 src/SharpIDE.Godot/Features/Layout/Sidebar.cs
 create mode 100644 src/SharpIDE.Godot/Features/Layout/Sidebar.cs.uid
 create mode 100644 src/SharpIDE.Godot/Features/Layout/Sidebar.tscn
 create mode 100644 src/SharpIDE.Godot/Features/Layout/SidebarToolGroup.tscn
 create mode 100644 src/SharpIDE.Godot/Features/Layout/ToolAnchorExtensions.cs
 create mode 100644 src/SharpIDE.Godot/Features/Layout/ToolAnchorExtensions.cs.uid
 create mode 100644 src/SharpIDE.Godot/Features/Layout/ToolArea.cs
 create mode 100644 src/SharpIDE.Godot/Features/Layout/ToolArea.cs.uid
 create mode 100644 src/SharpIDE.Godot/Features/Layout/ToolArea.tscn
 create mode 100644 src/SharpIDE.Godot/Features/Layout/ToolButton.cs
 create mode 100644 src/SharpIDE.Godot/Features/Layout/ToolButton.cs.uid
 create mode 100644 src/SharpIDE.Godot/Features/Layout/ToolButton.tscn
 create mode 100644 src/SharpIDE.Godot/Features/Layout/ToolDockOverlay.cs
 create mode 100644 src/SharpIDE.Godot/Features/Layout/ToolDockOverlay.cs.uid
 create mode 100644 src/SharpIDE.Godot/Features/Layout/ToolDockOverlay.tscn
 delete mode 100644 src/SharpIDE.Godot/Features/LeftSideBar/LeftBottomSidebarButtonGroup.tres
 delete mode 100644 src/SharpIDE.Godot/Features/LeftSideBar/LeftSideBar.cs
 delete mode 100644 src/SharpIDE.Godot/Features/LeftSideBar/LeftSideBar.cs.uid
 delete mode 100644 src/SharpIDE.Godot/Features/LeftSideBar/LeftSideBar.tscn
 delete mode 100644 src/SharpIDE.Godot/Features/LeftSideBar/Resources/Ide.svg.import
 delete mode 100644 src/SharpIDE.Godot/Features/LeftSideBar/Resources/Nuget.svg.import
 delete mode 100644 src/SharpIDE.Godot/Features/LeftSideBar/Resources/SidebarDebug.svg.import
 delete mode 100644 src/SharpIDE.Godot/Features/LeftSideBar/Resources/SidebarFolder.svg.import
 delete mode 100644 src/SharpIDE.Godot/Features/LeftSideBar/Resources/SidebarProblem.svg.import
 delete mode 100644 src/SharpIDE.Godot/Features/LeftSideBar/Resources/SidebarRun.svg.import
 delete mode 100644 src/SharpIDE.Godot/Features/LeftSideBar/Resources/SidebarTestExplorer.svg.import
 delete mode 100644 src/SharpIDE.Godot/Features/LeftSideBar/Resources/Terminal.svg.import

diff --git a/src/SharpIDE.Godot/Features/BottomPanel/BottomPanelType.cs b/src/SharpIDE.Godot/Features/BottomPanel/BottomPanelType.cs
deleted file mode 100644
index 71e01e04..00000000
--- a/src/SharpIDE.Godot/Features/BottomPanel/BottomPanelType.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace SharpIDE.Godot.Features.BottomPanel;
-
-public enum BottomPanelType
-{
-    Run,
-    Debug,
-    Build,
-    Problems,
-    IdeDiagnostics,
-    Nuget,
-    TestExplorer
-}
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/BottomPanel/BottomPanelType.cs.uid b/src/SharpIDE.Godot/Features/BottomPanel/BottomPanelType.cs.uid
deleted file mode 100644
index d61f8df1..00000000
--- a/src/SharpIDE.Godot/Features/BottomPanel/BottomPanelType.cs.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://dyoci88kqk2r1
diff --git a/src/SharpIDE.Godot/Features/BottomPanel/MultiFunctionPanel.cs b/src/SharpIDE.Godot/Features/BottomPanel/MultiFunctionPanel.cs
deleted file mode 100644
index ba706b3b..00000000
--- a/src/SharpIDE.Godot/Features/BottomPanel/MultiFunctionPanel.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using Godot;
-
-using SharpIDE.Godot.Features.Build;
-using SharpIDE.Godot.Features.Debug_;
-using SharpIDE.Godot.Features.IdeDiagnostics;
-using SharpIDE.Godot.Features.Nuget;
-using SharpIDE.Godot.Features.Problems;
-using SharpIDE.Godot.Features.Run;
-using SharpIDE.Godot.Features.TestExplorer;
-
-namespace SharpIDE.Godot.Features.BottomPanel;
-
-public partial class MultiFunctionPanel : Panel
-{
-    private RunPanel _runPanel = null!;
-    private DebugPanel _debugPanel = null!;
-    private BuildPanel _buildPanel = null!;
-    private ProblemsPanel _problemsPanel = null!;
-    private IdeDiagnosticsPanel _ideDiagnosticsPanel = null!;
-    private NugetPanel _nugetPanel = null!;
-    private TestExplorerPanel _testExplorerPanel = null!;
-
-    private Dictionary<BottomPanelType, Control> _panelTypeMap = [];
-
-    public override void _Ready()
-    {
-        _runPanel = GetNode<RunPanel>("%RunPanel");
-        _debugPanel = GetNode<DebugPanel>("%DebugPanel");
-        _buildPanel = GetNode<BuildPanel>("%BuildPanel");
-        _problemsPanel = GetNode<ProblemsPanel>("%ProblemsPanel");
-        _ideDiagnosticsPanel = GetNode<IdeDiagnosticsPanel>("%IdeDiagnosticsPanel");
-        _nugetPanel = GetNode<NugetPanel>("%NugetPanel");
-        _testExplorerPanel = GetNode<TestExplorerPanel>("%TestExplorerPanel");
-
-        _panelTypeMap = new Dictionary<BottomPanelType, Control>
-        {
-            { BottomPanelType.Run, _runPanel },
-            { BottomPanelType.Debug, _debugPanel },
-            { BottomPanelType.Build, _buildPanel },
-            { BottomPanelType.Problems, _problemsPanel },
-            { BottomPanelType.IdeDiagnostics, _ideDiagnosticsPanel },
-            { BottomPanelType.Nuget, _nugetPanel },
-            { BottomPanelType.TestExplorer, _testExplorerPanel }
-        };
-
-        _ = OnBottomPanelTabSelected(BottomPanelType.Run);
-
-        GodotGlobalEvents.Instance.BottomPanelTabSelected.Subscribe(OnBottomPanelTabSelected);
-    }
-
-    public override void _ExitTree()
-    {
-        GodotGlobalEvents.Instance.BottomPanelTabSelected.Subscribe(OnBottomPanelTabSelected);
-    }
-
-    private async Task OnBottomPanelTabSelected(BottomPanelType? type)
-    {
-        await this.InvokeAsync(() =>
-        {
-            Visible = type is not null;
-
-            foreach (var kvp in _panelTypeMap)
-            {
-                kvp.Value.Visible = kvp.Key == type;
-            }
-        });
-    }
-}
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/BottomPanel/MultiFunctionPanel.cs.uid b/src/SharpIDE.Godot/Features/BottomPanel/MultiFunctionPanel.cs.uid
deleted file mode 100644
index 10be36fc..00000000
--- a/src/SharpIDE.Godot/Features/BottomPanel/MultiFunctionPanel.cs.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://cvvgp42r3nml8
diff --git a/src/SharpIDE.Godot/Features/BottomPanel/MultiFunctionPanel.tscn b/src/SharpIDE.Godot/Features/BottomPanel/MultiFunctionPanel.tscn
deleted file mode 100644
index a8c28d92..00000000
--- a/src/SharpIDE.Godot/Features/BottomPanel/MultiFunctionPanel.tscn
+++ /dev/null
@@ -1,53 +0,0 @@
-[gd_scene load_steps=9 format=3 uid="uid://b8wqkwa7sjrid"]
-
-[ext_resource type="PackedScene" uid="uid://bcoytt3bw0gpe" path="res://Features/Run/RunPanel.tscn" id="1_5oqeb"]
-[ext_resource type="Script" uid="uid://cvvgp42r3nml8" path="res://Features/BottomPanel/MultiFunctionPanel.cs" id="1_ychf2"]
-[ext_resource type="PackedScene" uid="uid://dkjips8oudqou" path="res://Features/Debug_/DebugPanel.tscn" id="2_ychf2"]
-[ext_resource type="PackedScene" uid="uid://co6dkhdolriej" path="res://Features/Build/BuildPanel.tscn" id="3_c0wk5"]
-[ext_resource type="PackedScene" uid="uid://tqpmww430cor" path="res://Features/Problems/ProblemsPanel.tscn" id="4_q2bjq"]
-[ext_resource type="PackedScene" uid="uid://b0tjuqq3bca5e" path="res://Features/IdeDiagnostics/IdeDiagnosticsPanel.tscn" id="5_4yghs"]
-[ext_resource type="PackedScene" uid="uid://duyxg107nfh2f" path="res://Features/Nuget/NugetPanel.tscn" id="6_nf1h4"]
-[ext_resource type="PackedScene" uid="uid://hwdok1kch3b3" path="res://Features/TestExplorer/TestExplorerPanel.tscn" id="7_0nbtl"]
-
-[node name="MultiFunctionPanel" type="Panel"]
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-script = ExtResource("1_ychf2")
-
-[node name="RunPanel" parent="." instance=ExtResource("1_5oqeb")]
-unique_name_in_owner = true
-visible = false
-layout_mode = 1
-
-[node name="DebugPanel" parent="." instance=ExtResource("2_ychf2")]
-unique_name_in_owner = true
-visible = false
-layout_mode = 1
-
-[node name="BuildPanel" parent="." instance=ExtResource("3_c0wk5")]
-unique_name_in_owner = true
-visible = false
-layout_mode = 1
-
-[node name="ProblemsPanel" parent="." instance=ExtResource("4_q2bjq")]
-unique_name_in_owner = true
-visible = false
-layout_mode = 1
-
-[node name="IdeDiagnosticsPanel" parent="." instance=ExtResource("5_4yghs")]
-unique_name_in_owner = true
-visible = false
-layout_mode = 1
-
-[node name="NugetPanel" parent="." instance=ExtResource("6_nf1h4")]
-unique_name_in_owner = true
-visible = false
-layout_mode = 1
-
-[node name="TestExplorerPanel" parent="." instance=ExtResource("7_0nbtl")]
-unique_name_in_owner = true
-visible = false
-layout_mode = 1
diff --git a/src/SharpIDE.Godot/Features/Layout/DockSymbol.cs b/src/SharpIDE.Godot/Features/Layout/DockSymbol.cs
deleted file mode 100644
index 1ef7de35..00000000
--- a/src/SharpIDE.Godot/Features/Layout/DockSymbol.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Godot;
-
-namespace SharpIDE.Godot.Features.Layout;
-
-public partial class DockSymbol : Control
-{
-    [Export]
-    public DockScope DockScope { get; set; }
-
-    [Export]
-    public DockPosition DockPosition { get; set; }
-}
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/Layout/DockSymbol.cs.uid b/src/SharpIDE.Godot/Features/Layout/DockSymbol.cs.uid
deleted file mode 100644
index 68c345db..00000000
--- a/src/SharpIDE.Godot/Features/Layout/DockSymbol.cs.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://b7ct0lv0nasr1
diff --git a/src/SharpIDE.Godot/Features/Layout/DockSymbol.tscn b/src/SharpIDE.Godot/Features/Layout/DockSymbol.tscn
deleted file mode 100644
index 39e4ed6e..00000000
--- a/src/SharpIDE.Godot/Features/Layout/DockSymbol.tscn
+++ /dev/null
@@ -1,23 +0,0 @@
-[gd_scene load_steps=2 format=3 uid="uid://cg4bhc63k7esg"]
-
-[ext_resource type="Script" uid="uid://b7ct0lv0nasr1" path="res://Features/Layout/DockSymbol.cs" id="1_6pqf8"]
-
-[node name="DockSymbol" type="Control"]
-layout_mode = 3
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-size_flags_horizontal = 3
-size_flags_vertical = 3
-script = ExtResource("1_6pqf8")
-
-[node name="Symbol" type="ColorRect" parent="."]
-unique_name_in_owner = true
-layout_mode = 1
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeDockComponent.cs b/src/SharpIDE.Godot/Features/Layout/IdeDockComponent.cs
deleted file mode 100644
index 1392e1ca..00000000
--- a/src/SharpIDE.Godot/Features/Layout/IdeDockComponent.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Godot;
-
-namespace SharpIDE.Godot.Features.Layout;
-
-public partial class IdeDockComponent : VBoxContainer
-{
-    public IdeSceneNode ComponentNode { get; set; } = null!;
-
-    public override void _Ready()
-    {
-        GetNode<Label>("%ComponentName").Text = ComponentNode.Name;
-
-        var sceneResource = ResourceLoader.Load<PackedScene>(ComponentNode.ResourceUid);
-        var scene = sceneResource.Instantiate<Control>();
-        GetNode<Control>("%ScenePresenter").AddChild(scene);
-
-        scene.VisibilityChanged += () => Visible = scene.Visible;
-    }
-}
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeDockComponent.cs.uid b/src/SharpIDE.Godot/Features/Layout/IdeDockComponent.cs.uid
deleted file mode 100644
index b3385eee..00000000
--- a/src/SharpIDE.Godot/Features/Layout/IdeDockComponent.cs.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://c2hitudanbd2u
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeDockComponent.tscn b/src/SharpIDE.Godot/Features/Layout/IdeDockComponent.tscn
deleted file mode 100644
index 0c9b310b..00000000
--- a/src/SharpIDE.Godot/Features/Layout/IdeDockComponent.tscn
+++ /dev/null
@@ -1,34 +0,0 @@
-[gd_scene load_steps=2 format=3 uid="uid://b36lno754a2is"]
-
-[ext_resource type="Script" uid="uid://c2hitudanbd2u" path="res://Features/Layout/IdeDockComponent.cs" id="1_6ujk8"]
-
-[node name="IdeDockComponent" type="VBoxContainer"]
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-size_flags_horizontal = 3
-size_flags_vertical = 3
-theme_override_constants/separation = 1
-script = ExtResource("1_6ujk8")
-
-[node name="TopBar" type="PanelContainer" parent="."]
-layout_mode = 2
-mouse_filter = 2
-
-[node name="Margins" type="MarginContainer" parent="TopBar"]
-layout_mode = 2
-theme_override_constants/margin_left = 5
-theme_override_constants/margin_top = 5
-theme_override_constants/margin_bottom = 5
-
-[node name="ComponentName" type="Label" parent="TopBar/Margins"]
-unique_name_in_owner = true
-layout_mode = 2
-vertical_alignment = 1
-
-[node name="ScenePresenter" type="Control" parent="."]
-unique_name_in_owner = true
-layout_mode = 2
-size_flags_vertical = 3
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeDockLayout.cs b/src/SharpIDE.Godot/Features/Layout/IdeDockLayout.cs
deleted file mode 100644
index 31c558c3..00000000
--- a/src/SharpIDE.Godot/Features/Layout/IdeDockLayout.cs
+++ /dev/null
@@ -1,252 +0,0 @@
-using Godot;
-
-namespace SharpIDE.Godot.Features.Layout;
-
-public partial class IdeDockLayout : Control
-{
-    private readonly Dictionary<Control, IdeLayoutNode> _nodeMap = [];
-    private IdeLayoutNode _layout = null!;
-
-    private IdeDockOverlay _dockOverlay = null!;
-
-    private Control? _layoutNode;
-
-    [Export]
-    public int DockComponentSeparation { get; set; }
-
-    /// <inheritdoc />
-    public override void _Ready()
-    {
-        _dockOverlay = GetNode<IdeDockOverlay>("%DockOverlay");
-
-        FocusExited += _dockOverlay.EndDrag;
-    }
-
-    /// <inheritdoc />
-    public override void _UnhandledKeyInput(InputEvent input)
-    {
-        if (input is InputEventKey { Keycode: Key.Escape, Pressed: true })
-        {
-            _dockOverlay.EndDrag();
-        }
-    }
-
-    public void UpdateLayout(IdeLayoutNode layout)
-    {
-        _layout = layout;
-        RebuildLayoutTree();
-    }
-
-    private void RebuildLayoutTree()
-    {
-        _dockOverlay.ClearDockTargets();
-
-        _layoutNode?.QueueFree();
-        _layoutNode = BuildLayoutTree(_layout);
-        AddChild(_layoutNode);
-    }
-
-    private Control BuildLayoutTree(IdeLayoutNode layoutNode)
-    {
-        return layoutNode switch
-        {
-            IdeSplitNode splitNode => BuildSplitLayout(splitNode),
-            IdeTabGroupNode tabGroupNode => BuildTabGroupLayout(tabGroupNode),
-            IdeSceneNode viewNode => BuildSceneLayout(viewNode),
-
-            _ => throw new ArgumentException(
-                     $"The layout node of type '{layoutNode.GetType().FullName}' is not supported.",
-                     nameof(layoutNode))
-        };
-    }
-
-    private Control BuildSplitLayout(IdeSplitNode splitNode)
-    {
-        SplitContainer container = splitNode.Orientation switch
-        {
-            Orientation.Horizontal => new HSplitContainer(),
-            Orientation.Vertical => new VSplitContainer(),
-
-            _ => throw new ArgumentException(
-                     $"The split orientation '{splitNode.Orientation}' is not supported.",
-                     nameof(splitNode))
-        };
-
-        container.SizeFlagsHorizontal = SizeFlags.ExpandFill;
-        container.SizeFlagsVertical = SizeFlags.ExpandFill;
-        container.SetAnchorsAndOffsetsPreset(LayoutPreset.FullRect);
-        container.AddThemeConstantOverride("separation", DockComponentSeparation);
-
-        var firstChild = BuildLayoutTree(splitNode.FirstNode);
-        var secondChild = BuildLayoutTree(splitNode.SecondNode);
-
-        container.AddChild(firstChild);
-        container.AddChild(secondChild);
-
-        var (firstRatio, secondRatio) = GetStretchRatio(splitNode);
-
-        firstChild.SizeFlagsHorizontal = SizeFlags.ExpandFill;
-        firstChild.SizeFlagsVertical = SizeFlags.ExpandFill;
-        secondChild.SizeFlagsHorizontal = SizeFlags.ExpandFill;
-        secondChild.SizeFlagsVertical = SizeFlags.ExpandFill;
-        firstChild.SetStretchRatio(firstRatio);
-        secondChild.SetStretchRatio(secondRatio);
-
-        _nodeMap[container] = splitNode;
-
-        return container;
-    }
-
-    private (float FirstRatio, float SecondRatio) GetStretchRatio(IdeSplitNode splitNode)
-    {
-        // TODO: Calculate ratio
-        return (1.0f, 1.0f);
-    }
-
-    private Control BuildTabGroupLayout(IdeTabGroupNode tabGroupNode)
-    {
-        throw new NotImplementedException();
-    }
-
-    private Control BuildSceneLayout(IdeSceneNode sceneNode)
-    {
-        var component = ResourceLoader.Load<PackedScene>(ResourceHelper.DockComponentId)
-                                      .Instantiate<IdeDockComponent>();
-        component.ComponentNode = sceneNode;
-        component.GuiInput += input => OnDockComponentGuiInput(input, sceneNode);
-
-        _dockOverlay.RegisterDockTarget(component);
-        _nodeMap[component] = sceneNode;
-
-        return component;
-    }
-
-    private void OnDockComponentGuiInput(InputEvent input, IdeLayoutNode node)
-    {
-        if (input is not InputEventMouseButton { ButtonIndex: MouseButton.Left } leftButton)
-        {
-            return;
-        }
-
-        if (leftButton.Pressed)
-        {
-            BeginDrag(node);
-            return;
-        }
-
-        EndDrag();
-    }
-
-    private void BeginDrag(IdeLayoutNode draggedNode)
-    {
-        _dockOverlay.BeginDrag(draggedNode);
-    }
-
-    private void EndDrag()
-    {
-        if (_dockOverlay.DraggedNode is null || _dockOverlay.CurrentDockPosition is DockPosition.None)
-        {
-            _dockOverlay.EndDrag();
-            return;
-        }
-
-        switch (_dockOverlay.CurrentDockScope)
-        {
-            case DockScope.Global:
-                DockTarget(_dockOverlay.DraggedNode, _layout, _dockOverlay.CurrentDockPosition);
-                break;
-            case DockScope.Local when _dockOverlay.HoveredTarget is not null:
-                DockTarget(
-                    _dockOverlay.DraggedNode,
-                    _nodeMap[_dockOverlay.HoveredTarget],
-                    _dockOverlay.CurrentDockPosition);
-                break;
-        }
-
-        _dockOverlay.EndDrag();
-    }
-
-    private void DockTarget(IdeLayoutNode dragged, IdeLayoutNode target, DockPosition position)
-    {
-        if (ReferenceEquals(_layout, target))
-        {
-            _layout = RemoveNode(target, dragged)!;
-            target = _layout;
-        }
-        else
-        {
-            _layout = RemoveNode(_layout, dragged)!;
-            target = RemoveNode(target, dragged)!;
-        }
-
-        var replacement = position switch
-        {
-            DockPosition.Left => new IdeSplitNode(Orientation.Horizontal, dragged, target),
-            DockPosition.Right => new IdeSplitNode(Orientation.Horizontal, target, dragged),
-            DockPosition.Top => new IdeSplitNode(Orientation.Vertical, dragged, target),
-            DockPosition.Bottom => new IdeSplitNode(Orientation.Vertical, target, dragged),
-
-            _ => target
-        };
-
-        if (ReferenceEquals(replacement, target))
-        {
-            return;
-        }
-
-        _layout = ReplaceNode(_layout, target, replacement);
-
-        RebuildLayoutTree();
-    }
-
-    private IdeLayoutNode ReplaceNode(IdeLayoutNode current, IdeLayoutNode target, IdeLayoutNode replacement)
-    {
-        if (ReferenceEquals(_layout, target) || ReferenceEquals(current, target))
-        {
-            return replacement;
-        }
-
-        if (current is IdeSplitNode splitNode)
-        {
-            return splitNode with
-            {
-                FirstNode = ReplaceNode(splitNode.FirstNode, target, replacement),
-                SecondNode = ReplaceNode(splitNode.SecondNode, target, replacement)
-            };
-        }
-
-        return current;
-    }
-
-    private IdeLayoutNode? RemoveNode(IdeLayoutNode current, IdeLayoutNode target)
-    {
-        if (ReferenceEquals(current, target))
-        {
-            return null;
-        }
-
-        if (current is not IdeSplitNode splitNode)
-        {
-            return current;
-        }
-
-        var first = RemoveNode(splitNode.FirstNode, target);
-        var second = RemoveNode(splitNode.SecondNode, target);
-
-        if (first is null)
-        {
-            return second;
-        }
-
-        if (second is null)
-        {
-            return first;
-        }
-
-        return splitNode with
-        {
-            FirstNode = first,
-            SecondNode = second
-        };
-    }
-}
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeDockLayout.cs.uid b/src/SharpIDE.Godot/Features/Layout/IdeDockLayout.cs.uid
deleted file mode 100644
index d1745f33..00000000
--- a/src/SharpIDE.Godot/Features/Layout/IdeDockLayout.cs.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://byeop8uus5e03
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeDockLayout.tscn b/src/SharpIDE.Godot/Features/Layout/IdeDockLayout.tscn
deleted file mode 100644
index 80a99e85..00000000
--- a/src/SharpIDE.Godot/Features/Layout/IdeDockLayout.tscn
+++ /dev/null
@@ -1,19 +0,0 @@
-[gd_scene load_steps=3 format=3 uid="uid://bcn33cckidihf"]
-
-[ext_resource type="Script" uid="uid://byeop8uus5e03" path="res://Features/Layout/IdeDockLayout.cs" id="1_v5k85"]
-[ext_resource type="PackedScene" uid="uid://cv8tsg87o2q7w" path="res://Features/Layout/IdeDockOverlay.tscn" id="2_1xd2f"]
-
-[node name="IdeDockLayout" type="Control"]
-layout_mode = 3
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-script = ExtResource("1_v5k85")
-
-[node name="DockOverlay" parent="." instance=ExtResource("2_1xd2f")]
-unique_name_in_owner = true
-visible = false
-layout_mode = 1
-DockPreviewColor = Color(0.1767, 0.716565, 0.93, 0.40392157)
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeDockOverlay.cs b/src/SharpIDE.Godot/Features/Layout/IdeDockOverlay.cs
deleted file mode 100644
index 3a43dcf3..00000000
--- a/src/SharpIDE.Godot/Features/Layout/IdeDockOverlay.cs
+++ /dev/null
@@ -1,189 +0,0 @@
-using Godot;
-
-namespace SharpIDE.Godot.Features.Layout;
-
-public partial class IdeDockOverlay : Control
-{
-    private readonly List<IdeDockComponent> _dockTargets = [];
-
-    private IReadOnlyCollection<DockSymbol> _dockSymbols = null!;
-
-    [Export]
-    public float DockPreviewSize { get; set; } = 0.3f;
-
-    [Export]
-    public Color DockPreviewColor { get; set; } = CachedColors.Gray;
-
-    [Export]
-    public Control GlobalDockSymbols { get; set; } = null!;
-
-    [Export]
-    public Control LocalDockSymbols { get; set; } = null!;
-
-    public IdeDockComponent? HoveredTarget { get; private set; }
-
-    public DockScope CurrentDockScope { get; private set; }
-
-    public DockPosition CurrentDockPosition { get; private set; }
-
-    public IdeLayoutNode? DraggedNode { get; private set; }
-
-    public override void _Ready()
-    {
-        _dockSymbols = GlobalDockSymbols.GetChildren()
-                                        .OfType<DockSymbol>()
-                                        .Concat(LocalDockSymbols.GetChildren().OfType<DockSymbol>())
-                                        .ToArray();
-    }
-
-    /// <inheritdoc />
-    public override void _Process(double delta)
-    {
-        if (Visible)
-        {
-            UpdateDockPreview(GetGlobalMousePosition());
-        }
-    }
-
-    /// <inheritdoc />
-    public override void _Draw()
-    {
-        DrawDockPreview();
-    }
-
-    public void RegisterDockTarget(IdeDockComponent node)
-    {
-        _dockTargets.Add(node);
-    }
-
-    public void ClearDockTargets()
-    {
-        _dockTargets.Clear();
-    }
-
-    public void BeginDrag(IdeLayoutNode draggedNode)
-    {
-        DraggedNode = draggedNode;
-        Visible = true;
-    }
-
-    public void EndDrag()
-    {
-        Visible = false;
-        DraggedNode = null;
-        CurrentDockScope = DockScope.None;
-        CurrentDockPosition = DockPosition.None;
-        HoveredTarget = null;
-    }
-
-    private void DrawDockPreview()
-    {
-        switch (CurrentDockScope)
-        {
-            case DockScope.Global:
-                DrawTargetDockPreview(this);
-                break;
-            case DockScope.Local when HoveredTarget is not null:
-                DrawTargetDockPreview(HoveredTarget);
-                break;
-        }
-    }
-
-    private void DrawTargetDockPreview(Control target)
-    {
-        var rect = target.GetGlobalRect();
-        var localRect = new Rect2(
-            rect.Position - GlobalPosition,
-            rect.Size);
-
-        var highlight = CurrentDockPosition switch
-        {
-            DockPosition.Left => new Rect2(
-                localRect.Position,
-                new Vector2(localRect.Size.X * DockPreviewSize, localRect.Size.Y)),
-            DockPosition.Right => new Rect2(
-                localRect.Position + new Vector2(localRect.Size.X * (1.0f - DockPreviewSize), 0),
-                new Vector2(localRect.Size.X * DockPreviewSize, localRect.Size.Y)),
-            DockPosition.Top => new Rect2(
-                localRect.Position,
-                new Vector2(localRect.Size.X, localRect.Size.Y * DockPreviewSize)),
-            DockPosition.Bottom => new Rect2(
-                localRect.Position + new Vector2(0, localRect.Size.Y * (1.0f - DockPreviewSize)),
-                new Vector2(localRect.Size.X, localRect.Size.Y * DockPreviewSize)),
-
-            _ => new Rect2(Vector2.Zero, Vector2.Zero)
-        };
-
-        DrawRect(highlight, DockPreviewColor, filled: true);
-    }
-
-    private void UpdateDockPreview(Vector2 mousePosition)
-    {
-        (CurrentDockScope, CurrentDockPosition) = GetDockScopeAndPosition(mousePosition);
-
-        HoveredTarget = FindDockTarget(mousePosition);
-
-        if (DraggedNode is null
-         || HoveredTarget is null
-         || !CanLocalDock(DraggedNode, HoveredTarget.ComponentNode, CurrentDockPosition))
-        {
-            LocalDockSymbols.Visible = false;
-            QueueRedraw();
-            return;
-        }
-
-        var targetCenterPosition = HoveredTarget.GlobalPosition
-                                 - GlobalPosition
-                                 + HoveredTarget.Size / 2.0f
-                                 - LocalDockSymbols.Size / 2.0f;
-
-        LocalDockSymbols.Position = targetCenterPosition;
-        LocalDockSymbols.Visible = true;
-
-        QueueRedraw();
-    }
-
-    private IdeDockComponent? FindDockTarget(Vector2 mousePosition)
-    {
-        foreach (var target in _dockTargets)
-        {
-            if (!target.Visible)
-            {
-                continue;
-            }
-
-            if (target.GetGlobalRect().HasPoint(mousePosition))
-            {
-                return target;
-            }
-        }
-
-        return null;
-    }
-
-    private (DockScope Scope, DockPosition Position) GetDockScopeAndPosition(Vector2 mousePosition)
-    {
-        var hoveredSymbol = _dockSymbols.FirstOrDefault(symbol => symbol.GetGlobalRect().HasPoint(mousePosition));
-
-        return hoveredSymbol is not null
-                   ? (hoveredSymbol.DockScope, hoveredSymbol.DockPosition)
-                   : (DockScope.None, DockPosition.None);
-    }
-
-    private bool CanLocalDock(IdeLayoutNode dragged, IdeLayoutNode target, DockPosition position)
-    {
-        if (IsDescendant(dragged, target))
-        {
-            return false;
-        }
-
-        return true;
-    }
-
-    private static bool IsDescendant(IdeLayoutNode root, IdeLayoutNode target)
-    {
-        return ReferenceEquals(root, target)
-            || (root is IdeSplitNode splitNode
-             && (IsDescendant(splitNode.FirstNode, target) || IsDescendant(splitNode.SecondNode, target)));
-    }
-}
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeDockOverlay.cs.uid b/src/SharpIDE.Godot/Features/Layout/IdeDockOverlay.cs.uid
deleted file mode 100644
index d873c7c4..00000000
--- a/src/SharpIDE.Godot/Features/Layout/IdeDockOverlay.cs.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://dxi5t8ey1t06x
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeDockOverlay.tscn b/src/SharpIDE.Godot/Features/Layout/IdeDockOverlay.tscn
deleted file mode 100644
index ffc9146a..00000000
--- a/src/SharpIDE.Godot/Features/Layout/IdeDockOverlay.tscn
+++ /dev/null
@@ -1,100 +0,0 @@
-[gd_scene load_steps=3 format=3 uid="uid://cv8tsg87o2q7w"]
-
-[ext_resource type="Script" uid="uid://dxi5t8ey1t06x" path="res://Features/Layout/IdeDockOverlay.cs" id="1_ktovp"]
-[ext_resource type="PackedScene" uid="uid://cg4bhc63k7esg" path="res://Features/Layout/DockSymbol.tscn" id="2_bfwau"]
-
-[node name="IdeDockOverlay" type="Control" node_paths=PackedStringArray("GlobalDockSymbols", "LocalDockSymbols")]
-z_index = 1
-layout_mode = 3
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-mouse_filter = 2
-script = ExtResource("1_ktovp")
-GlobalDockSymbols = NodePath("GlobalDockSymbols")
-LocalDockSymbols = NodePath("LocalDockSymbols")
-
-[node name="GlobalDockSymbols" type="MarginContainer" parent="."]
-z_index = 1
-layout_mode = 1
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-theme_override_constants/margin_left = 20
-theme_override_constants/margin_top = 20
-theme_override_constants/margin_right = 20
-theme_override_constants/margin_bottom = 20
-
-[node name="Left" parent="GlobalDockSymbols" instance=ExtResource("2_bfwau")]
-custom_minimum_size = Vector2(15, 30)
-layout_mode = 2
-size_flags_horizontal = 0
-size_flags_vertical = 4
-DockScope = 1
-DockPosition = 1
-
-[node name="Right" parent="GlobalDockSymbols" instance=ExtResource("2_bfwau")]
-custom_minimum_size = Vector2(15, 30)
-layout_mode = 2
-size_flags_horizontal = 8
-size_flags_vertical = 4
-DockScope = 1
-DockPosition = 2
-
-[node name="Top" parent="GlobalDockSymbols" instance=ExtResource("2_bfwau")]
-custom_minimum_size = Vector2(30, 15)
-layout_mode = 2
-size_flags_horizontal = 4
-size_flags_vertical = 0
-DockScope = 1
-DockPosition = 3
-
-[node name="Bottom" parent="GlobalDockSymbols" instance=ExtResource("2_bfwau")]
-custom_minimum_size = Vector2(30, 15)
-layout_mode = 2
-size_flags_horizontal = 4
-size_flags_vertical = 8
-DockScope = 1
-DockPosition = 4
-
-[node name="LocalDockSymbols" type="MarginContainer" parent="."]
-z_index = 1
-layout_mode = 1
-offset_right = 80.0
-offset_bottom = 80.0
-
-[node name="Left" parent="LocalDockSymbols" instance=ExtResource("2_bfwau")]
-custom_minimum_size = Vector2(15, 30)
-layout_mode = 2
-size_flags_horizontal = 0
-size_flags_vertical = 4
-DockScope = 2
-DockPosition = 1
-
-[node name="Right" parent="LocalDockSymbols" instance=ExtResource("2_bfwau")]
-custom_minimum_size = Vector2(15, 30)
-layout_mode = 2
-size_flags_horizontal = 8
-size_flags_vertical = 4
-DockScope = 2
-DockPosition = 2
-
-[node name="Top" parent="LocalDockSymbols" instance=ExtResource("2_bfwau")]
-custom_minimum_size = Vector2(30, 15)
-layout_mode = 2
-size_flags_horizontal = 4
-size_flags_vertical = 0
-DockScope = 2
-DockPosition = 3
-
-[node name="Bottom" parent="LocalDockSymbols" instance=ExtResource("2_bfwau")]
-custom_minimum_size = Vector2(30, 15)
-layout_mode = 2
-size_flags_horizontal = 4
-size_flags_vertical = 8
-DockScope = 2
-DockPosition = 4
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeLayoutNode.cs b/src/SharpIDE.Godot/Features/Layout/IdeLayoutNode.cs
deleted file mode 100644
index 7716e7d2..00000000
--- a/src/SharpIDE.Godot/Features/Layout/IdeLayoutNode.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-namespace SharpIDE.Godot.Features.Layout;
-
-public abstract record IdeLayoutNode;
-
-public enum Orientation
-{
-    Horizontal = 1,
-    Vertical = 2
-}
-
-public enum DockScope
-{
-    None = 0,
-    Global = 1,
-    Local = 2
-}
-
-public enum DockPosition
-{
-    None = 0,
-    Left = 1,
-    Right = 2,
-    Top = 3,
-    Bottom = 4
-}
-
-public record IdeSplitNode(
-    Orientation Orientation,
-    IdeLayoutNode FirstNode,
-    IdeLayoutNode SecondNode,
-    float Ratio = 0.5f) : IdeLayoutNode;
-
-public record IdeSceneNode(string ResourceUid, string Name) : IdeLayoutNode;
-
-public record IdeTabGroupNode(
-    string ResourceUid,
-    string Name,
-    List<IdeDocumentTab> DocumentTabs,
-    int ActiveTabIndex) : IdeSceneNode(ResourceUid, Name);
-
-public record IdeDocumentTab(
-    string TabId,
-    string Label);
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeLayoutNode.cs.uid b/src/SharpIDE.Godot/Features/Layout/IdeLayoutNode.cs.uid
deleted file mode 100644
index 1c5e57d5..00000000
--- a/src/SharpIDE.Godot/Features/Layout/IdeLayoutNode.cs.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://cppr6tht71awe
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeMainLayout.cs b/src/SharpIDE.Godot/Features/Layout/IdeMainLayout.cs
new file mode 100644
index 00000000..d381cfda
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/IdeMainLayout.cs
@@ -0,0 +1,152 @@
+using Godot;
+
+using SharpIDE.Application.Features.Events;
+
+namespace SharpIDE.Godot.Features.Layout;
+
+public partial class IdeMainLayout : Control
+{
+	private readonly Dictionary<ToolAnchor, ToolArea> _toolAreaMap = [];
+	private readonly Dictionary<ToolAnchor, Control> _sidebarToolsMap = [];
+	private readonly Dictionary<ToolAnchor, ButtonGroup> _toolButtonGroupMap = [];
+
+	private Dictionary<IdeTool, IdeToolInfo> _toolMap = [];
+	private Dictionary<IdeTool, ToolButton> _toolButtonMap = [];
+
+	private Sidebar _leftSidebar = null!;
+	private Sidebar _rightSidebar = null!;
+	private Control _bottomArea = null!;
+
+	public override void _Ready()
+	{
+		_leftSidebar = GetNode<Sidebar>("%LeftSidebar");
+		_rightSidebar = GetNode<Sidebar>("%RightSidebar");
+		_bottomArea = GetNode<Control>("%BottomArea");
+		
+		_toolAreaMap[ToolAnchor.LeftTop] = GetNode<ToolArea>("%LeftTopToolArea");
+		_toolAreaMap[ToolAnchor.RightTop] = GetNode<ToolArea>("%RightTopToolArea");
+		_toolAreaMap[ToolAnchor.BottomLeft] = GetNode<ToolArea>("%BottomLeftToolArea");
+		_toolAreaMap[ToolAnchor.BottomRight] = GetNode<ToolArea>("%BottomRightToolArea");
+
+		_sidebarToolsMap[ToolAnchor.LeftTop] = _leftSidebar.TopTools;
+		_sidebarToolsMap[ToolAnchor.RightTop] = _rightSidebar.TopTools;
+		_sidebarToolsMap[ToolAnchor.BottomLeft] = _leftSidebar.BottomTools;
+		_sidebarToolsMap[ToolAnchor.BottomRight] = _rightSidebar.BottomTools;
+
+		_toolButtonGroupMap[ToolAnchor.LeftTop] = new ButtonGroup { AllowUnpress = true };
+		_toolButtonGroupMap[ToolAnchor.RightTop] = new ButtonGroup { AllowUnpress = true };
+		_toolButtonGroupMap[ToolAnchor.BottomLeft] = new ButtonGroup { AllowUnpress = true };
+		_toolButtonGroupMap[ToolAnchor.BottomRight] = new ButtonGroup { AllowUnpress = true };
+		
+		GodotGlobalEvents.Instance.IdeToolExternallySelected.Subscribe(tool =>
+		{
+			CallDeferred(
+				nameof(OnIdeToolExternallySelected),
+				Variant.From(tool));
+			return Task.CompletedTask;
+		});
+	}
+
+	private void OnIdeToolExternallySelected(IdeTool tool)
+	{
+		var anchor = _toolMap[tool].Anchor;
+		
+		foreach (var toolInfo in _toolMap.Values.Where(t => t.Anchor == anchor))
+		{
+			_toolButtonMap[toolInfo.Tool].SetPressedNoSignal(toolInfo.Tool == tool);
+			toolInfo.IsVisible = toolInfo.Tool == tool;
+		}
+		
+		ToggleTool(tool, toggledOn: true);
+	}
+
+	/// <inheritdoc />
+	public override Variant _GetDragData(Vector2 atPosition)
+	{
+		return default;
+	}
+
+	/// <inheritdoc />
+	public override bool _CanDropData(Vector2 atPosition, Variant data)
+	{
+		return false;
+	}
+
+	/// <inheritdoc />
+	public override void _DropData(Vector2 atPosition, Variant data)
+	{
+		
+	}
+
+	public void InitializeLayout(IReadOnlyList<IdeToolInfo> toolInfos)
+	{
+		_toolMap = toolInfos.ToDictionary(toolInfo => toolInfo.Tool);
+		
+		foreach (var sidebarToolGroup in _sidebarToolsMap.Values)
+		{
+			sidebarToolGroup.RemoveChildren();
+		}
+		
+		foreach (var toolInfo in toolInfos)
+		{
+			var sidebarToolGroup = _sidebarToolsMap[toolInfo.Anchor];
+
+			var button = CreateToolButton(toolInfo);
+			_toolButtonMap[toolInfo.Tool] = button;
+			
+			sidebarToolGroup.AddChild(button);
+
+			if (toolInfo is { IsPinned: true, IsVisible: true })
+			{
+				_toolAreaMap[toolInfo.Anchor].SetActiveTool(toolInfo);
+			}
+		}
+		
+		UpdateSidebarVisibility();
+		UpdateBottomAreaVisibility();
+	}
+
+	private void UpdateSidebarVisibility()
+	{
+		_leftSidebar.Visible =
+			_toolMap.Values.Any(toolInfo => toolInfo.Anchor.IsLeft() && toolInfo is
+			{
+				IsPinned: true, IsVisible: true
+			});
+
+		_rightSidebar.Visible =
+			_toolMap.Values.Any(toolInfo => toolInfo.Anchor.IsLeft() && toolInfo is
+			{
+				IsPinned: true, IsVisible: true
+			});
+	}
+
+	private ToolButton CreateToolButton(IdeToolInfo toolInfo)
+	{
+		var toolButton = ResourceLoader.Load<PackedScene>("uid://gcpcsulb43in").Instantiate<ToolButton>();
+		
+		toolButton.SetButtonIcon(toolInfo.Icon);
+		toolButton.Toggled += toggledOn => ToggleTool(toolInfo.Tool,  toggledOn);
+		toolButton.ButtonGroup = _toolButtonGroupMap[toolInfo.Anchor];
+		toolButton.ButtonPressed = toolInfo is { IsPinned: true, IsVisible: true };
+
+		return toolButton;
+	}
+
+	private void ToggleTool(IdeTool tool, bool toggledOn)
+	{
+		var toolInfo = _toolMap[tool];
+		var toolArea = _toolAreaMap[toolInfo.Anchor];
+		
+		toolArea.SetActiveTool(toggledOn ? toolInfo : null);
+		
+		UpdateBottomAreaVisibility();
+	}
+
+	private void UpdateBottomAreaVisibility()
+	{
+		_bottomArea.Visible =
+			_toolMap.Values.Any(toolInfo => toolInfo.Anchor.IsBottom()
+											 && toolInfo is { IsPinned: true, IsVisible: true });
+	}
+}
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeMainLayout.cs.uid b/src/SharpIDE.Godot/Features/Layout/IdeMainLayout.cs.uid
new file mode 100644
index 00000000..f864a61b
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/IdeMainLayout.cs.uid
@@ -0,0 +1 @@
+uid://bu3a3xbolcijl
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeMainLayout.tscn b/src/SharpIDE.Godot/Features/Layout/IdeMainLayout.tscn
new file mode 100644
index 00000000..913988c4
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/IdeMainLayout.tscn
@@ -0,0 +1,84 @@
+[gd_scene load_steps=6 format=3 uid="uid://bbdbcqg3jys2b"]
+
+[ext_resource type="Script" uid="uid://bu3a3xbolcijl" path="res://Features/Layout/IdeMainLayout.cs" id="1_tq23w"]
+[ext_resource type="PackedScene" uid="uid://cy2a1p2twwni0" path="res://Features/Layout/Sidebar.tscn" id="2_e53sf"]
+[ext_resource type="PackedScene" uid="uid://b8wqkwa7sjrid" path="res://Features/Layout/ToolArea.tscn" id="3_cxuiw"]
+[ext_resource type="PackedScene" uid="uid://c5dlwgcx3ubyp" path="res://Features/CodeEditor/CodeEditorPanel.tscn" id="4_kocsp"]
+[ext_resource type="PackedScene" uid="uid://f1hvt1gn1adf" path="res://Features/Layout/ToolDockOverlay.tscn" id="5_e53sf"]
+
+[node name="IdeMainLayout" type="Control"]
+layout_mode = 3
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+size_flags_horizontal = 3
+size_flags_vertical = 3
+script = ExtResource("1_tq23w")
+
+[node name="Root" type="HBoxContainer" parent="."]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+
+[node name="LeftSidebar" parent="Root" instance=ExtResource("2_e53sf")]
+unique_name_in_owner = true
+layout_mode = 2
+
+[node name="CenterArea" type="VSplitContainer" parent="Root"]
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="TopArea" type="HSplitContainer" parent="Root/CenterArea"]
+layout_mode = 2
+size_flags_vertical = 3
+size_flags_stretch_ratio = 2.0
+
+[node name="LeftTopToolArea" parent="Root/CenterArea/TopArea" instance=ExtResource("3_cxuiw")]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="HSplitContainer" type="HSplitContainer" parent="Root/CenterArea/TopArea"]
+layout_mode = 2
+size_flags_horizontal = 3
+size_flags_stretch_ratio = 5.0
+
+[node name="CodeEditor" parent="Root/CenterArea/TopArea/HSplitContainer" instance=ExtResource("4_kocsp")]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 3
+size_flags_stretch_ratio = 5.0
+
+[node name="RightTopToolArea" parent="Root/CenterArea/TopArea/HSplitContainer" instance=ExtResource("3_cxuiw")]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="BottomArea" type="HSplitContainer" parent="Root/CenterArea"]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_vertical = 3
+
+[node name="BottomLeftToolArea" parent="Root/CenterArea/BottomArea" instance=ExtResource("3_cxuiw")]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="BottomRightToolArea" parent="Root/CenterArea/BottomArea" instance=ExtResource("3_cxuiw")]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="RightSidebar" parent="Root" instance=ExtResource("2_e53sf")]
+unique_name_in_owner = true
+layout_mode = 2
+
+[node name="ToolDockOverlay" parent="." instance=ExtResource("5_e53sf")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 1
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeToolInfo.cs b/src/SharpIDE.Godot/Features/Layout/IdeToolInfo.cs
new file mode 100644
index 00000000..ad70b03f
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/IdeToolInfo.cs
@@ -0,0 +1,18 @@
+using Godot;
+
+namespace SharpIDE.Godot.Features.Layout;
+
+public enum ToolAnchor
+{
+    None = 0,
+    LeftTop = 1,
+    RightTop = 2,
+    BottomLeft = 3,
+    BottomRight = 4
+}
+
+public record IdeToolInfo(IdeTool Tool, ToolAnchor Anchor, bool IsPinned, bool IsVisible, Control Control, Texture2D Icon)
+{
+    public bool IsPinned { get; set; } = IsPinned;
+    public bool IsVisible { get; set; } = IsVisible;
+}
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeToolInfo.cs.uid b/src/SharpIDE.Godot/Features/Layout/IdeToolInfo.cs.uid
new file mode 100644
index 00000000..ff9d2717
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/IdeToolInfo.cs.uid
@@ -0,0 +1 @@
+uid://cc76jylpg3cfp
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeTools.cs b/src/SharpIDE.Godot/Features/Layout/IdeTools.cs
new file mode 100644
index 00000000..186b138f
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/IdeTools.cs
@@ -0,0 +1,35 @@
+using Godot;
+
+namespace SharpIDE.Godot.Features.Layout;
+
+public enum IdeTool
+{
+    SolutionExplorer,
+    Problems,
+    Run,
+    Debug,
+    Build,
+    Nuget,
+    TestExplorer,
+}
+
+public sealed record IdeToolData(Texture2D Icon, PackedScene Scene);
+
+public static class IdeTools
+{
+    public static readonly IReadOnlyDictionary<IdeTool, IdeToolData> ToolDataMap = new Dictionary<IdeTool, IdeToolData>
+    {
+        [IdeTool.SolutionExplorer] = new(Load<Texture2D>("uid://ccj0dw81x3bkc"), Load<PackedScene>("uid://cy1bb32g7j7dr")),
+        [IdeTool.Problems] = new(Load<Texture2D>("uid://uukf1nwjhthv"), Load<PackedScene>("uid://tqpmww430cor")),
+        [IdeTool.Run] = new(Load<Texture2D>("uid://cre7q0efp4vrq"), Load<PackedScene>("uid://bcoytt3bw0gpe")),
+        [IdeTool.Debug] = new(Load<Texture2D>("uid://butisxqww0boc"), Load<PackedScene>("uid://dkjips8oudqou")),
+        [IdeTool.Build] = new(Load<Texture2D>("uid://b0170ypw8uf3a"), Load<PackedScene>("uid://co6dkhdolriej")),
+        [IdeTool.Nuget] = new(Load<Texture2D>("uid://b5ih61vdjv5e6"), Load<PackedScene>("uid://duyxg107nfh2f")),
+        [IdeTool.TestExplorer] = new(Load<Texture2D>("uid://dged1mm438qli"), Load<PackedScene>("uid://hwdok1kch3b3")),
+    };
+
+    private static TResource Load<TResource>(string resourceUid) where TResource : Resource
+    {
+        return ResourceLoader.Load<TResource>(resourceUid);
+    }
+}
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeTools.cs.uid b/src/SharpIDE.Godot/Features/Layout/IdeTools.cs.uid
new file mode 100644
index 00000000..6374692d
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/IdeTools.cs.uid
@@ -0,0 +1 @@
+uid://y6y6ekt26qvv
diff --git a/src/SharpIDE.Godot/Features/Layout/ResourceHelper.cs b/src/SharpIDE.Godot/Features/Layout/ResourceHelper.cs
deleted file mode 100644
index 23154d8d..00000000
--- a/src/SharpIDE.Godot/Features/Layout/ResourceHelper.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace SharpIDE.Godot.Features.Layout;
-
-public static class ResourceHelper
-{
-    public static string SolutionExplorerId = "uid://cy1bb32g7j7dr";
-    public static string CodeEditorId = "uid://c5dlwgcx3ubyp";
-    public static string MultiFunctionPanelId = "uid://b8wqkwa7sjrid";
-    public static string DockComponentId = "uid://b36lno754a2is";
-}
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/Layout/ResourceHelper.cs.uid b/src/SharpIDE.Godot/Features/Layout/ResourceHelper.cs.uid
deleted file mode 100644
index 065c6744..00000000
--- a/src/SharpIDE.Godot/Features/Layout/ResourceHelper.cs.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://5meoh17y0wpo
diff --git a/src/SharpIDE.Godot/Features/LeftSideBar/Resources/Ide.svg b/src/SharpIDE.Godot/Features/Layout/Resources/Ide.svg
similarity index 100%
rename from src/SharpIDE.Godot/Features/LeftSideBar/Resources/Ide.svg
rename to src/SharpIDE.Godot/Features/Layout/Resources/Ide.svg
diff --git a/src/SharpIDE.Godot/Features/Layout/Resources/Ide.svg.import b/src/SharpIDE.Godot/Features/Layout/Resources/Ide.svg.import
new file mode 100644
index 00000000..cad226e8
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/Resources/Ide.svg.import
@@ -0,0 +1,18 @@
+[remap]
+
+importer="svg"
+type="DPITexture"
+uid="uid://dx8bt0adxpqgy"
+path="res://.godot/imported/Ide.svg-db83dc3a832f21820b0a91f0283367d7.dpitex"
+
+[deps]
+
+source_file="res://Features/Layout/Resources/Ide.svg"
+dest_files=["res://.godot/imported/Ide.svg-db83dc3a832f21820b0a91f0283367d7.dpitex"]
+
+[params]
+
+base_scale=1.0
+saturation=1.0
+color_map={}
+compress=true
diff --git a/src/SharpIDE.Godot/Features/LeftSideBar/Resources/Nuget.svg b/src/SharpIDE.Godot/Features/Layout/Resources/Nuget.svg
similarity index 100%
rename from src/SharpIDE.Godot/Features/LeftSideBar/Resources/Nuget.svg
rename to src/SharpIDE.Godot/Features/Layout/Resources/Nuget.svg
diff --git a/src/SharpIDE.Godot/Features/Layout/Resources/Nuget.svg.import b/src/SharpIDE.Godot/Features/Layout/Resources/Nuget.svg.import
new file mode 100644
index 00000000..b41f5bbb
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/Resources/Nuget.svg.import
@@ -0,0 +1,18 @@
+[remap]
+
+importer="svg"
+type="DPITexture"
+uid="uid://b5ih61vdjv5e6"
+path="res://.godot/imported/Nuget.svg-36d5b7c20fcd38a4c8b8f31da0e7b29f.dpitex"
+
+[deps]
+
+source_file="res://Features/Layout/Resources/Nuget.svg"
+dest_files=["res://.godot/imported/Nuget.svg-36d5b7c20fcd38a4c8b8f31da0e7b29f.dpitex"]
+
+[params]
+
+base_scale=0.5
+saturation=1.0
+color_map={}
+compress=true
diff --git a/src/SharpIDE.Godot/Features/LeftSideBar/Resources/SidebarDebug.svg b/src/SharpIDE.Godot/Features/Layout/Resources/SidebarDebug.svg
similarity index 100%
rename from src/SharpIDE.Godot/Features/LeftSideBar/Resources/SidebarDebug.svg
rename to src/SharpIDE.Godot/Features/Layout/Resources/SidebarDebug.svg
diff --git a/src/SharpIDE.Godot/Features/Layout/Resources/SidebarDebug.svg.import b/src/SharpIDE.Godot/Features/Layout/Resources/SidebarDebug.svg.import
new file mode 100644
index 00000000..cc9f0c05
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/Resources/SidebarDebug.svg.import
@@ -0,0 +1,18 @@
+[remap]
+
+importer="svg"
+type="DPITexture"
+uid="uid://butisxqww0boc"
+path="res://.godot/imported/SidebarDebug.svg-6f1c0e3358c8db682eb49c5e398a09f7.dpitex"
+
+[deps]
+
+source_file="res://Features/Layout/Resources/SidebarDebug.svg"
+dest_files=["res://.godot/imported/SidebarDebug.svg-6f1c0e3358c8db682eb49c5e398a09f7.dpitex"]
+
+[params]
+
+base_scale=3.0
+saturation=1.0
+color_map={}
+compress=true
diff --git a/src/SharpIDE.Godot/Features/LeftSideBar/Resources/SidebarFolder.svg b/src/SharpIDE.Godot/Features/Layout/Resources/SidebarFolder.svg
similarity index 100%
rename from src/SharpIDE.Godot/Features/LeftSideBar/Resources/SidebarFolder.svg
rename to src/SharpIDE.Godot/Features/Layout/Resources/SidebarFolder.svg
diff --git a/src/SharpIDE.Godot/Features/Layout/Resources/SidebarFolder.svg.import b/src/SharpIDE.Godot/Features/Layout/Resources/SidebarFolder.svg.import
new file mode 100644
index 00000000..52411f65
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/Resources/SidebarFolder.svg.import
@@ -0,0 +1,18 @@
+[remap]
+
+importer="svg"
+type="DPITexture"
+uid="uid://ccj0dw81x3bkc"
+path="res://.godot/imported/SidebarFolder.svg-586a9184693147c28205b4a51a3408ad.dpitex"
+
+[deps]
+
+source_file="res://Features/Layout/Resources/SidebarFolder.svg"
+dest_files=["res://.godot/imported/SidebarFolder.svg-586a9184693147c28205b4a51a3408ad.dpitex"]
+
+[params]
+
+base_scale=3.0
+saturation=1.0
+color_map={}
+compress=true
diff --git a/src/SharpIDE.Godot/Features/LeftSideBar/Resources/SidebarProblem.svg b/src/SharpIDE.Godot/Features/Layout/Resources/SidebarProblem.svg
similarity index 100%
rename from src/SharpIDE.Godot/Features/LeftSideBar/Resources/SidebarProblem.svg
rename to src/SharpIDE.Godot/Features/Layout/Resources/SidebarProblem.svg
diff --git a/src/SharpIDE.Godot/Features/Layout/Resources/SidebarProblem.svg.import b/src/SharpIDE.Godot/Features/Layout/Resources/SidebarProblem.svg.import
new file mode 100644
index 00000000..090fcce2
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/Resources/SidebarProblem.svg.import
@@ -0,0 +1,18 @@
+[remap]
+
+importer="svg"
+type="DPITexture"
+uid="uid://uukf1nwjhthv"
+path="res://.godot/imported/SidebarProblem.svg-980e6a0d910f0b1501b62cb690eab8a9.dpitex"
+
+[deps]
+
+source_file="res://Features/Layout/Resources/SidebarProblem.svg"
+dest_files=["res://.godot/imported/SidebarProblem.svg-980e6a0d910f0b1501b62cb690eab8a9.dpitex"]
+
+[params]
+
+base_scale=3.0
+saturation=1.0
+color_map={}
+compress=true
diff --git a/src/SharpIDE.Godot/Features/LeftSideBar/Resources/SidebarRun.svg b/src/SharpIDE.Godot/Features/Layout/Resources/SidebarRun.svg
similarity index 100%
rename from src/SharpIDE.Godot/Features/LeftSideBar/Resources/SidebarRun.svg
rename to src/SharpIDE.Godot/Features/Layout/Resources/SidebarRun.svg
diff --git a/src/SharpIDE.Godot/Features/Layout/Resources/SidebarRun.svg.import b/src/SharpIDE.Godot/Features/Layout/Resources/SidebarRun.svg.import
new file mode 100644
index 00000000..00fdc578
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/Resources/SidebarRun.svg.import
@@ -0,0 +1,18 @@
+[remap]
+
+importer="svg"
+type="DPITexture"
+uid="uid://cre7q0efp4vrq"
+path="res://.godot/imported/SidebarRun.svg-26d166c514c7b031a00337f17cd264a9.dpitex"
+
+[deps]
+
+source_file="res://Features/Layout/Resources/SidebarRun.svg"
+dest_files=["res://.godot/imported/SidebarRun.svg-26d166c514c7b031a00337f17cd264a9.dpitex"]
+
+[params]
+
+base_scale=3.0
+saturation=1.0
+color_map={}
+compress=true
diff --git a/src/SharpIDE.Godot/Features/LeftSideBar/Resources/SidebarTestExplorer.svg b/src/SharpIDE.Godot/Features/Layout/Resources/SidebarTestExplorer.svg
similarity index 100%
rename from src/SharpIDE.Godot/Features/LeftSideBar/Resources/SidebarTestExplorer.svg
rename to src/SharpIDE.Godot/Features/Layout/Resources/SidebarTestExplorer.svg
diff --git a/src/SharpIDE.Godot/Features/Layout/Resources/SidebarTestExplorer.svg.import b/src/SharpIDE.Godot/Features/Layout/Resources/SidebarTestExplorer.svg.import
new file mode 100644
index 00000000..88d7fa1e
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/Resources/SidebarTestExplorer.svg.import
@@ -0,0 +1,18 @@
+[remap]
+
+importer="svg"
+type="DPITexture"
+uid="uid://dged1mm438qli"
+path="res://.godot/imported/SidebarTestExplorer.svg-5c5b2ef57b1a79102a5a2c7eae95c756.dpitex"
+
+[deps]
+
+source_file="res://Features/Layout/Resources/SidebarTestExplorer.svg"
+dest_files=["res://.godot/imported/SidebarTestExplorer.svg-5c5b2ef57b1a79102a5a2c7eae95c756.dpitex"]
+
+[params]
+
+base_scale=0.5
+saturation=1.0
+color_map={}
+compress=true
diff --git a/src/SharpIDE.Godot/Features/LeftSideBar/Resources/Terminal.svg b/src/SharpIDE.Godot/Features/Layout/Resources/Terminal.svg
similarity index 100%
rename from src/SharpIDE.Godot/Features/LeftSideBar/Resources/Terminal.svg
rename to src/SharpIDE.Godot/Features/Layout/Resources/Terminal.svg
diff --git a/src/SharpIDE.Godot/Features/Layout/Resources/Terminal.svg.import b/src/SharpIDE.Godot/Features/Layout/Resources/Terminal.svg.import
new file mode 100644
index 00000000..950c3c77
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/Resources/Terminal.svg.import
@@ -0,0 +1,18 @@
+[remap]
+
+importer="svg"
+type="DPITexture"
+uid="uid://b0170ypw8uf3a"
+path="res://.godot/imported/Terminal.svg-027637379ad9c5f527454469295af8af.dpitex"
+
+[deps]
+
+source_file="res://Features/Layout/Resources/Terminal.svg"
+dest_files=["res://.godot/imported/Terminal.svg-027637379ad9c5f527454469295af8af.dpitex"]
+
+[params]
+
+base_scale=3.0
+saturation=1.0
+color_map={}
+compress=true
diff --git a/src/SharpIDE.Godot/Features/LeftSideBar/Resources/LeftSideBarButtonStyleNormal.tres b/src/SharpIDE.Godot/Features/Layout/Resources/ToolButtonStyleNormal.tres
similarity index 100%
rename from src/SharpIDE.Godot/Features/LeftSideBar/Resources/LeftSideBarButtonStyleNormal.tres
rename to src/SharpIDE.Godot/Features/Layout/Resources/ToolButtonStyleNormal.tres
diff --git a/src/SharpIDE.Godot/Features/LeftSideBar/Resources/LeftSideBarButtonStylePressed.tres b/src/SharpIDE.Godot/Features/Layout/Resources/ToolButtonStylePressed.tres
similarity index 100%
rename from src/SharpIDE.Godot/Features/LeftSideBar/Resources/LeftSideBarButtonStylePressed.tres
rename to src/SharpIDE.Godot/Features/Layout/Resources/ToolButtonStylePressed.tres
diff --git a/src/SharpIDE.Godot/Features/Layout/Sidebar.cs b/src/SharpIDE.Godot/Features/Layout/Sidebar.cs
new file mode 100644
index 00000000..cd1724b7
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/Sidebar.cs
@@ -0,0 +1,15 @@
+using Godot;
+
+namespace SharpIDE.Godot.Features.Layout;
+
+public partial class Sidebar : Panel
+{
+	public Control TopTools { get; private set; } = null!;
+	public Control BottomTools { get; private set; } = null!;
+
+	public override void _Ready()
+	{
+		TopTools = GetNode<Control>("%TopTools");
+		BottomTools = GetNode<Control>("%BottomTools");
+	}
+}
diff --git a/src/SharpIDE.Godot/Features/Layout/Sidebar.cs.uid b/src/SharpIDE.Godot/Features/Layout/Sidebar.cs.uid
new file mode 100644
index 00000000..27636882
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/Sidebar.cs.uid
@@ -0,0 +1 @@
+uid://d3uqv7eerpt1p
diff --git a/src/SharpIDE.Godot/Features/Layout/Sidebar.tscn b/src/SharpIDE.Godot/Features/Layout/Sidebar.tscn
new file mode 100644
index 00000000..1fa9dd99
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/Sidebar.tscn
@@ -0,0 +1,40 @@
+[gd_scene load_steps=2 format=3 uid="uid://cy2a1p2twwni0"]
+
+[ext_resource type="Script" uid="uid://d3uqv7eerpt1p" path="res://Features/Layout/Sidebar.cs" id="1_4ivyu"]
+
+[node name="Sidebar" type="Panel"]
+custom_minimum_size = Vector2(50, 0)
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+size_flags_vertical = 3
+script = ExtResource("1_4ivyu")
+
+[node name="Margins" type="MarginContainer" parent="."]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+theme_override_constants/margin_left = 5
+theme_override_constants/margin_top = 5
+theme_override_constants/margin_right = 5
+theme_override_constants/margin_bottom = 5
+
+[node name="VBoxContainer" type="VBoxContainer" parent="Margins"]
+layout_mode = 2
+
+[node name="TopTools" type="VBoxContainer" parent="Margins/VBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+
+[node name="Control" type="Control" parent="Margins/VBoxContainer"]
+layout_mode = 2
+size_flags_vertical = 3
+
+[node name="BottomTools" type="VBoxContainer" parent="Margins/VBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
diff --git a/src/SharpIDE.Godot/Features/Layout/SidebarToolGroup.tscn b/src/SharpIDE.Godot/Features/Layout/SidebarToolGroup.tscn
new file mode 100644
index 00000000..08c26267
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/SidebarToolGroup.tscn
@@ -0,0 +1,26 @@
+[gd_scene load_steps=2 format=3 uid="uid://dqv21c7r2gnhu"]
+
+[sub_resource type="CSharpScript" id="CSharpScript_negu7"]
+script/source = "using Godot;
+
+namespace SharpIDE.Godot.Features.Layout;
+
+public partial class SidebarToolGroup : Control
+{
+	public Control ToolGroup { get; private set; } = null!;
+
+	public override void _Ready()
+	{
+		ToolGroup = GetNode<Control>(\"%ToolGroup\");
+	}
+}
+"
+
+[node name="SidebarToolGroup" type="Control"]
+layout_mode = 3
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+script = SubResource("CSharpScript_negu7")
diff --git a/src/SharpIDE.Godot/Features/Layout/ToolAnchorExtensions.cs b/src/SharpIDE.Godot/Features/Layout/ToolAnchorExtensions.cs
new file mode 100644
index 00000000..1810eeb3
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/ToolAnchorExtensions.cs
@@ -0,0 +1,27 @@
+namespace SharpIDE.Godot.Features.Layout;
+
+public static class ToolAnchorExtensions
+{
+    extension(ToolAnchor anchor)
+    {
+        public bool IsLeft()
+        {
+            return anchor is ToolAnchor.LeftTop or ToolAnchor.BottomLeft;
+        }
+
+        public bool IsRight()
+        {
+            return anchor is ToolAnchor.RightTop or ToolAnchor.BottomRight;
+        }
+
+        public bool IsTop()
+        {
+            return anchor is ToolAnchor.LeftTop or ToolAnchor.RightTop;
+        }
+
+        public bool IsBottom()
+        {
+            return anchor is ToolAnchor.BottomLeft or ToolAnchor.BottomRight;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/Layout/ToolAnchorExtensions.cs.uid b/src/SharpIDE.Godot/Features/Layout/ToolAnchorExtensions.cs.uid
new file mode 100644
index 00000000..d1609248
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/ToolAnchorExtensions.cs.uid
@@ -0,0 +1 @@
+uid://nmwvva8a4w56
diff --git a/src/SharpIDE.Godot/Features/Layout/ToolArea.cs b/src/SharpIDE.Godot/Features/Layout/ToolArea.cs
new file mode 100644
index 00000000..8e9a8bb0
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/ToolArea.cs
@@ -0,0 +1,44 @@
+using Godot;
+
+namespace SharpIDE.Godot.Features.Layout;
+
+public partial class ToolArea : Control
+{
+	private IdeToolInfo? _activeTool;
+
+	public override void _Ready()
+	{
+		Visible = false;
+	}
+
+	public void SetActiveTool(IdeToolInfo? toolInfo)
+	{
+		if (ReferenceEquals(_activeTool, toolInfo))
+		{
+			return;
+		}
+		
+		if (_activeTool is not null)
+		{
+			RemoveChild(_activeTool.Control);
+			_activeTool.IsVisible = false;
+		}
+		
+		if (toolInfo is null)
+		{
+			Visible = false;
+			_activeTool = null;
+			return;
+		}
+
+		if (toolInfo.Control.GetParent() is { } parent)
+		{
+			parent.RemoveChild(toolInfo.Control);
+		}
+		
+		_activeTool = toolInfo;
+		
+		AddChild(_activeTool.Control);
+		Visible = _activeTool.IsVisible = true;
+	}
+}
diff --git a/src/SharpIDE.Godot/Features/Layout/ToolArea.cs.uid b/src/SharpIDE.Godot/Features/Layout/ToolArea.cs.uid
new file mode 100644
index 00000000..98271ac5
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/ToolArea.cs.uid
@@ -0,0 +1 @@
+uid://diqwg1bxg3tlp
diff --git a/src/SharpIDE.Godot/Features/Layout/ToolArea.tscn b/src/SharpIDE.Godot/Features/Layout/ToolArea.tscn
new file mode 100644
index 00000000..4bf5132d
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/ToolArea.tscn
@@ -0,0 +1,11 @@
+[gd_scene load_steps=2 format=3 uid="uid://b8wqkwa7sjrid"]
+
+[ext_resource type="Script" uid="uid://diqwg1bxg3tlp" path="res://Features/Layout/ToolArea.cs" id="1_03jti"]
+
+[node name="ToolArea" type="Panel"]
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+script = ExtResource("1_03jti")
diff --git a/src/SharpIDE.Godot/Features/Layout/ToolButton.cs b/src/SharpIDE.Godot/Features/Layout/ToolButton.cs
new file mode 100644
index 00000000..d14099a1
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/ToolButton.cs
@@ -0,0 +1,8 @@
+using Godot;
+
+namespace SharpIDE.Godot.Features.Layout;
+
+// TODO: Remove?
+public partial class ToolButton : Button
+{
+}
diff --git a/src/SharpIDE.Godot/Features/Layout/ToolButton.cs.uid b/src/SharpIDE.Godot/Features/Layout/ToolButton.cs.uid
new file mode 100644
index 00000000..b9473051
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/ToolButton.cs.uid
@@ -0,0 +1 @@
+uid://14orxapuy7mg
diff --git a/src/SharpIDE.Godot/Features/Layout/ToolButton.tscn b/src/SharpIDE.Godot/Features/Layout/ToolButton.tscn
new file mode 100644
index 00000000..a555e469
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/ToolButton.tscn
@@ -0,0 +1,22 @@
+[gd_scene load_steps=5 format=3 uid="uid://gcpcsulb43in"]
+
+[ext_resource type="Script" uid="uid://14orxapuy7mg" path="res://Features/Layout/ToolButton.cs" id="1_8ncbp"]
+[ext_resource type="StyleBox" uid="uid://cosaurtj574yc" path="res://Features/Layout/Resources/ToolButtonStyleNormal.tres" id="1_83dai"]
+[ext_resource type="StyleBox" uid="uid://d26wbe6o067ko" path="res://Features/Layout/Resources/ToolButtonStylePressed.tres" id="2_m4fy1"]
+
+[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_83dai"]
+
+[node name="ToolButton" type="Button"]
+custom_minimum_size = Vector2(40, 40)
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+theme_override_styles/normal = ExtResource("1_83dai")
+theme_override_styles/pressed = ExtResource("2_m4fy1")
+theme_override_styles/focus = SubResource("StyleBoxEmpty_83dai")
+toggle_mode = true
+icon_alignment = 1
+expand_icon = true
+script = ExtResource("1_8ncbp")
diff --git a/src/SharpIDE.Godot/Features/Layout/ToolDockOverlay.cs b/src/SharpIDE.Godot/Features/Layout/ToolDockOverlay.cs
new file mode 100644
index 00000000..ff13eb42
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/ToolDockOverlay.cs
@@ -0,0 +1,15 @@
+using Godot;
+using System;
+
+public partial class ToolDockOverlay : Control
+{
+	// Called when the node enters the scene tree for the first time.
+	public override void _Ready()
+	{
+	}
+
+	// Called every frame. 'delta' is the elapsed time since the previous frame.
+	public override void _Process(double delta)
+	{
+	}
+}
diff --git a/src/SharpIDE.Godot/Features/Layout/ToolDockOverlay.cs.uid b/src/SharpIDE.Godot/Features/Layout/ToolDockOverlay.cs.uid
new file mode 100644
index 00000000..a169154f
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/ToolDockOverlay.cs.uid
@@ -0,0 +1 @@
+uid://dc57hptoukgk1
diff --git a/src/SharpIDE.Godot/Features/Layout/ToolDockOverlay.tscn b/src/SharpIDE.Godot/Features/Layout/ToolDockOverlay.tscn
new file mode 100644
index 00000000..f34a060a
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/ToolDockOverlay.tscn
@@ -0,0 +1,13 @@
+[gd_scene load_steps=2 format=3 uid="uid://f1hvt1gn1adf"]
+
+[ext_resource type="Script" uid="uid://dc57hptoukgk1" path="res://Features/Layout/ToolDockOverlay.cs" id="1_s7p4m"]
+
+[node name="ToolDockOverlay" type="Control"]
+layout_mode = 3
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+mouse_filter = 2
+script = ExtResource("1_s7p4m")
diff --git a/src/SharpIDE.Godot/Features/LeftSideBar/LeftBottomSidebarButtonGroup.tres b/src/SharpIDE.Godot/Features/LeftSideBar/LeftBottomSidebarButtonGroup.tres
deleted file mode 100644
index 5c90e98f..00000000
--- a/src/SharpIDE.Godot/Features/LeftSideBar/LeftBottomSidebarButtonGroup.tres
+++ /dev/null
@@ -1,4 +0,0 @@
-[gd_resource type="ButtonGroup" format=3 uid="uid://c2nmo2x3va0gi"]
-
-[resource]
-allow_unpress = true
diff --git a/src/SharpIDE.Godot/Features/LeftSideBar/LeftSideBar.cs b/src/SharpIDE.Godot/Features/LeftSideBar/LeftSideBar.cs
deleted file mode 100644
index 103e60fd..00000000
--- a/src/SharpIDE.Godot/Features/LeftSideBar/LeftSideBar.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using Godot;
-using SharpIDE.Godot.Features.BottomPanel;
-
-namespace SharpIDE.Godot.Features.LeftSideBar;
-
-public partial class LeftSideBar : Panel
-{
-    private Button _slnExplorerButton = null!;
-    // These are in a ButtonGroup, which handles mutual exclusivity of being toggled on
-    private Button _problemsButton = null!;
-    private Button _runButton = null!;
-    private Button _buildButton = null!;
-    private Button _debugButton = null!;
-    private Button _ideDiagnosticsButton = null!;
-    private Button _nugetButton = null!;
-    private Button _testExplorerButton = null!;
-    
-    public override void _Ready()
-    {
-        _slnExplorerButton = GetNode<Button>("%SlnExplorerButton");
-        _problemsButton = GetNode<Button>("%ProblemsButton");
-        _runButton = GetNode<Button>("%RunButton");
-        _buildButton = GetNode<Button>("%BuildButton");
-        _debugButton = GetNode<Button>("%DebugButton");
-        _ideDiagnosticsButton = GetNode<Button>("%IdeDiagnosticsButton");
-        _nugetButton = GetNode<Button>("%NugetButton");
-        _testExplorerButton = GetNode<Button>("%TestExplorerButton");
-        
-        _problemsButton.Toggled += toggledOn => GodotGlobalEvents.Instance.BottomPanelTabSelected.InvokeParallelFireAndForget(toggledOn ? BottomPanelType.Problems : null);
-        _runButton.Toggled += toggledOn => GodotGlobalEvents.Instance.BottomPanelTabSelected.InvokeParallelFireAndForget(toggledOn ? BottomPanelType.Run : null);
-        _buildButton.Toggled += toggledOn => GodotGlobalEvents.Instance.BottomPanelTabSelected.InvokeParallelFireAndForget(toggledOn ? BottomPanelType.Build : null);
-        _debugButton.Toggled += toggledOn => GodotGlobalEvents.Instance.BottomPanelTabSelected.InvokeParallelFireAndForget(toggledOn ? BottomPanelType.Debug : null);
-        _ideDiagnosticsButton.Toggled += toggledOn => GodotGlobalEvents.Instance.BottomPanelTabSelected.InvokeParallelFireAndForget(toggledOn ? BottomPanelType.IdeDiagnostics : null);
-        _nugetButton.Toggled += toggledOn => GodotGlobalEvents.Instance.BottomPanelTabSelected.InvokeParallelFireAndForget(toggledOn ? BottomPanelType.Nuget : null);
-        _testExplorerButton.Toggled += toggledOn => GodotGlobalEvents.Instance.BottomPanelTabSelected.InvokeParallelFireAndForget(toggledOn ? BottomPanelType.TestExplorer : null);
-        GodotGlobalEvents.Instance.BottomPanelTabExternallySelected.Subscribe(OnBottomPanelTabExternallySelected);
-    }
-
-    private async Task OnBottomPanelTabExternallySelected(BottomPanelType arg)
-    {
-        await this.InvokeAsync(() =>
-        {
-            switch (arg)
-            {
-                case BottomPanelType.Run: _runButton.ButtonPressed = true; break;
-                case BottomPanelType.Debug: _debugButton.ButtonPressed = true; break;
-                case BottomPanelType.Build: _buildButton.ButtonPressed = true; break;
-                case BottomPanelType.Problems: _problemsButton.ButtonPressed = true; break;
-                case BottomPanelType.IdeDiagnostics: _ideDiagnosticsButton.ButtonPressed = true; break;
-                case BottomPanelType.Nuget: _nugetButton.ButtonPressed = true; break;
-                case BottomPanelType.TestExplorer: _testExplorerButton.ButtonPressed = true; break;
-                default: throw new ArgumentOutOfRangeException(nameof(arg), arg, null);
-            }
-        });
-    }
-}
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/LeftSideBar/LeftSideBar.cs.uid b/src/SharpIDE.Godot/Features/LeftSideBar/LeftSideBar.cs.uid
deleted file mode 100644
index 836c8b58..00000000
--- a/src/SharpIDE.Godot/Features/LeftSideBar/LeftSideBar.cs.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://bddno1bbvvp5q
diff --git a/src/SharpIDE.Godot/Features/LeftSideBar/LeftSideBar.tscn b/src/SharpIDE.Godot/Features/LeftSideBar/LeftSideBar.tscn
deleted file mode 100644
index 19ccbeb8..00000000
--- a/src/SharpIDE.Godot/Features/LeftSideBar/LeftSideBar.tscn
+++ /dev/null
@@ -1,173 +0,0 @@
-[gd_scene load_steps=13 format=3 uid="uid://biyhfwx36ium8"]
-
-[ext_resource type="Script" uid="uid://bddno1bbvvp5q" path="res://Features/LeftSideBar/LeftSideBar.cs" id="1_rgaf0"]
-[ext_resource type="ButtonGroup" uid="uid://c2nmo2x3va0gi" path="res://Features/LeftSideBar/LeftBottomSidebarButtonGroup.tres" id="2_1aad6"]
-[ext_resource type="Texture2D" uid="uid://ccj0dw81x3bkc" path="res://Features/LeftSideBar/Resources/SidebarFolder.svg" id="2_jg03n"]
-[ext_resource type="Texture2D" uid="uid://uukf1nwjhthv" path="res://Features/LeftSideBar/Resources/SidebarProblem.svg" id="4_prju6"]
-[ext_resource type="StyleBox" uid="uid://cosaurtj574yc" path="res://Features/LeftSideBar/Resources/LeftSideBarButtonStyleNormal.tres" id="4_umcfu"]
-[ext_resource type="StyleBox" uid="uid://d26wbe6o067ko" path="res://Features/LeftSideBar/Resources/LeftSideBarButtonStylePressed.tres" id="5_csqeq"]
-[ext_resource type="Texture2D" uid="uid://cre7q0efp4vrq" path="res://Features/LeftSideBar/Resources/SidebarRun.svg" id="5_jg03n"]
-[ext_resource type="Texture2D" uid="uid://b0170ypw8uf3a" path="res://Features/LeftSideBar/Resources/Terminal.svg" id="6_ddh6f"]
-[ext_resource type="Texture2D" uid="uid://butisxqww0boc" path="res://Features/LeftSideBar/Resources/SidebarDebug.svg" id="6_jg03n"]
-[ext_resource type="Texture2D" uid="uid://dx8bt0adxpqgy" path="res://Features/LeftSideBar/Resources/Ide.svg" id="9_6ih3m"]
-[ext_resource type="Texture2D" uid="uid://b5ih61vdjv5e6" path="res://Features/LeftSideBar/Resources/Nuget.svg" id="11_csqeq"]
-[ext_resource type="Texture2D" uid="uid://dged1mm438qli" path="res://Features/LeftSideBar/Resources/SidebarTestExplorer.svg" id="12_rlff3"]
-
-[node name="LeftSideBar" type="Panel"]
-custom_minimum_size = Vector2(80, 0)
-anchors_preset = 13
-anchor_left = 0.5
-anchor_right = 0.5
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-script = ExtResource("1_rgaf0")
-
-[node name="MarginContainer" type="MarginContainer" parent="."]
-layout_mode = 1
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-theme_override_constants/margin_left = 5
-theme_override_constants/margin_top = 5
-theme_override_constants/margin_right = 5
-theme_override_constants/margin_bottom = 5
-
-[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer"]
-layout_mode = 2
-
-[node name="SlnExplorerButton" type="Button" parent="MarginContainer/VBoxContainer"]
-unique_name_in_owner = true
-custom_minimum_size = Vector2(0, 50)
-layout_mode = 2
-focus_mode = 0
-theme_override_font_sizes/font_size = 13
-theme_override_styles/normal = ExtResource("4_umcfu")
-theme_override_styles/pressed = ExtResource("5_csqeq")
-toggle_mode = true
-button_pressed = true
-text = "Explorer"
-icon = ExtResource("2_jg03n")
-icon_alignment = 1
-vertical_icon_alignment = 0
-expand_icon = true
-
-[node name="Spacer" type="Control" parent="MarginContainer/VBoxContainer"]
-layout_mode = 2
-size_flags_vertical = 3
-
-[node name="ProblemsButton" type="Button" parent="MarginContainer/VBoxContainer"]
-unique_name_in_owner = true
-custom_minimum_size = Vector2(0, 50)
-layout_mode = 2
-focus_mode = 0
-theme_override_font_sizes/font_size = 13
-theme_override_styles/normal = ExtResource("4_umcfu")
-theme_override_styles/pressed = ExtResource("5_csqeq")
-toggle_mode = true
-button_group = ExtResource("2_1aad6")
-text = "Problems"
-icon = ExtResource("4_prju6")
-icon_alignment = 1
-vertical_icon_alignment = 0
-expand_icon = true
-
-[node name="RunButton" type="Button" parent="MarginContainer/VBoxContainer"]
-unique_name_in_owner = true
-custom_minimum_size = Vector2(0, 50)
-layout_mode = 2
-focus_mode = 0
-theme_override_font_sizes/font_size = 13
-theme_override_styles/normal = ExtResource("4_umcfu")
-theme_override_styles/pressed = ExtResource("5_csqeq")
-toggle_mode = true
-button_pressed = true
-button_group = ExtResource("2_1aad6")
-text = "Run"
-icon = ExtResource("5_jg03n")
-icon_alignment = 1
-vertical_icon_alignment = 0
-expand_icon = true
-
-[node name="DebugButton" type="Button" parent="MarginContainer/VBoxContainer"]
-unique_name_in_owner = true
-custom_minimum_size = Vector2(0, 50)
-layout_mode = 2
-focus_mode = 0
-theme_override_font_sizes/font_size = 13
-theme_override_styles/normal = ExtResource("4_umcfu")
-theme_override_styles/pressed = ExtResource("5_csqeq")
-toggle_mode = true
-button_group = ExtResource("2_1aad6")
-text = "Debug"
-icon = ExtResource("6_jg03n")
-icon_alignment = 1
-vertical_icon_alignment = 0
-expand_icon = true
-
-[node name="BuildButton" type="Button" parent="MarginContainer/VBoxContainer"]
-unique_name_in_owner = true
-custom_minimum_size = Vector2(0, 50)
-layout_mode = 2
-focus_mode = 0
-theme_override_font_sizes/font_size = 13
-theme_override_styles/normal = ExtResource("4_umcfu")
-theme_override_styles/pressed = ExtResource("5_csqeq")
-toggle_mode = true
-button_group = ExtResource("2_1aad6")
-text = "Build"
-icon = ExtResource("6_ddh6f")
-icon_alignment = 1
-vertical_icon_alignment = 0
-expand_icon = true
-
-[node name="IdeDiagnosticsButton" type="Button" parent="MarginContainer/VBoxContainer"]
-unique_name_in_owner = true
-visible = false
-custom_minimum_size = Vector2(0, 50)
-layout_mode = 2
-focus_mode = 0
-theme_override_font_sizes/font_size = 13
-theme_override_styles/normal = ExtResource("4_umcfu")
-theme_override_styles/pressed = ExtResource("5_csqeq")
-toggle_mode = true
-button_group = ExtResource("2_1aad6")
-text = "IDE"
-icon = ExtResource("9_6ih3m")
-icon_alignment = 1
-vertical_icon_alignment = 0
-expand_icon = true
-
-[node name="NugetButton" type="Button" parent="MarginContainer/VBoxContainer"]
-unique_name_in_owner = true
-custom_minimum_size = Vector2(0, 50)
-layout_mode = 2
-focus_mode = 0
-theme_override_font_sizes/font_size = 13
-theme_override_styles/normal = ExtResource("4_umcfu")
-theme_override_styles/pressed = ExtResource("5_csqeq")
-toggle_mode = true
-button_group = ExtResource("2_1aad6")
-text = "NuGet"
-icon = ExtResource("11_csqeq")
-icon_alignment = 1
-vertical_icon_alignment = 0
-expand_icon = true
-
-[node name="TestExplorerButton" type="Button" parent="MarginContainer/VBoxContainer"]
-unique_name_in_owner = true
-custom_minimum_size = Vector2(0, 50)
-layout_mode = 2
-focus_mode = 0
-theme_override_font_sizes/font_size = 13
-theme_override_styles/normal = ExtResource("4_umcfu")
-theme_override_styles/pressed = ExtResource("5_csqeq")
-toggle_mode = true
-button_group = ExtResource("2_1aad6")
-text = "Tests"
-icon = ExtResource("12_rlff3")
-icon_alignment = 1
-vertical_icon_alignment = 0
-expand_icon = true
diff --git a/src/SharpIDE.Godot/Features/LeftSideBar/Resources/Ide.svg.import b/src/SharpIDE.Godot/Features/LeftSideBar/Resources/Ide.svg.import
deleted file mode 100644
index b2f7b1cd..00000000
--- a/src/SharpIDE.Godot/Features/LeftSideBar/Resources/Ide.svg.import
+++ /dev/null
@@ -1,18 +0,0 @@
-[remap]
-
-importer="svg"
-type="DPITexture"
-uid="uid://dx8bt0adxpqgy"
-path="res://.godot/imported/Ide.svg-14326ac709c12e8e531cab0bf80b4873.dpitex"
-
-[deps]
-
-source_file="res://Features/LeftSideBar/Resources/Ide.svg"
-dest_files=["res://.godot/imported/Ide.svg-14326ac709c12e8e531cab0bf80b4873.dpitex"]
-
-[params]
-
-base_scale=1.0
-saturation=1.0
-color_map={}
-compress=true
diff --git a/src/SharpIDE.Godot/Features/LeftSideBar/Resources/Nuget.svg.import b/src/SharpIDE.Godot/Features/LeftSideBar/Resources/Nuget.svg.import
deleted file mode 100644
index c43d95ab..00000000
--- a/src/SharpIDE.Godot/Features/LeftSideBar/Resources/Nuget.svg.import
+++ /dev/null
@@ -1,18 +0,0 @@
-[remap]
-
-importer="svg"
-type="DPITexture"
-uid="uid://b5ih61vdjv5e6"
-path="res://.godot/imported/Nuget.svg-c9a0eefd4c46c6cc65cb44205e31ca0f.dpitex"
-
-[deps]
-
-source_file="res://Features/LeftSideBar/Resources/Nuget.svg"
-dest_files=["res://.godot/imported/Nuget.svg-c9a0eefd4c46c6cc65cb44205e31ca0f.dpitex"]
-
-[params]
-
-base_scale=0.5
-saturation=1.0
-color_map={}
-compress=true
diff --git a/src/SharpIDE.Godot/Features/LeftSideBar/Resources/SidebarDebug.svg.import b/src/SharpIDE.Godot/Features/LeftSideBar/Resources/SidebarDebug.svg.import
deleted file mode 100644
index 5697b021..00000000
--- a/src/SharpIDE.Godot/Features/LeftSideBar/Resources/SidebarDebug.svg.import
+++ /dev/null
@@ -1,18 +0,0 @@
-[remap]
-
-importer="svg"
-type="DPITexture"
-uid="uid://butisxqww0boc"
-path="res://.godot/imported/SidebarDebug.svg-e03458145016aa2c2106ad2ce79b813f.dpitex"
-
-[deps]
-
-source_file="res://Features/LeftSideBar/Resources/SidebarDebug.svg"
-dest_files=["res://.godot/imported/SidebarDebug.svg-e03458145016aa2c2106ad2ce79b813f.dpitex"]
-
-[params]
-
-base_scale=3.0
-saturation=1.0
-color_map={}
-compress=true
diff --git a/src/SharpIDE.Godot/Features/LeftSideBar/Resources/SidebarFolder.svg.import b/src/SharpIDE.Godot/Features/LeftSideBar/Resources/SidebarFolder.svg.import
deleted file mode 100644
index 8a8c23ba..00000000
--- a/src/SharpIDE.Godot/Features/LeftSideBar/Resources/SidebarFolder.svg.import
+++ /dev/null
@@ -1,18 +0,0 @@
-[remap]
-
-importer="svg"
-type="DPITexture"
-uid="uid://ccj0dw81x3bkc"
-path="res://.godot/imported/SidebarFolder.svg-97f6e1c0f0f47ede1e32206806e1510e.dpitex"
-
-[deps]
-
-source_file="res://Features/LeftSideBar/Resources/SidebarFolder.svg"
-dest_files=["res://.godot/imported/SidebarFolder.svg-97f6e1c0f0f47ede1e32206806e1510e.dpitex"]
-
-[params]
-
-base_scale=3.0
-saturation=1.0
-color_map={}
-compress=true
diff --git a/src/SharpIDE.Godot/Features/LeftSideBar/Resources/SidebarProblem.svg.import b/src/SharpIDE.Godot/Features/LeftSideBar/Resources/SidebarProblem.svg.import
deleted file mode 100644
index b7935f63..00000000
--- a/src/SharpIDE.Godot/Features/LeftSideBar/Resources/SidebarProblem.svg.import
+++ /dev/null
@@ -1,18 +0,0 @@
-[remap]
-
-importer="svg"
-type="DPITexture"
-uid="uid://uukf1nwjhthv"
-path="res://.godot/imported/SidebarProblem.svg-f24099a368b2bb55d1953d2cb3d4dd58.dpitex"
-
-[deps]
-
-source_file="res://Features/LeftSideBar/Resources/SidebarProblem.svg"
-dest_files=["res://.godot/imported/SidebarProblem.svg-f24099a368b2bb55d1953d2cb3d4dd58.dpitex"]
-
-[params]
-
-base_scale=3.0
-saturation=1.0
-color_map={}
-compress=true
diff --git a/src/SharpIDE.Godot/Features/LeftSideBar/Resources/SidebarRun.svg.import b/src/SharpIDE.Godot/Features/LeftSideBar/Resources/SidebarRun.svg.import
deleted file mode 100644
index df096aa8..00000000
--- a/src/SharpIDE.Godot/Features/LeftSideBar/Resources/SidebarRun.svg.import
+++ /dev/null
@@ -1,18 +0,0 @@
-[remap]
-
-importer="svg"
-type="DPITexture"
-uid="uid://cre7q0efp4vrq"
-path="res://.godot/imported/SidebarRun.svg-8ef45bb5bf22749053ccd7adff27b0d6.dpitex"
-
-[deps]
-
-source_file="res://Features/LeftSideBar/Resources/SidebarRun.svg"
-dest_files=["res://.godot/imported/SidebarRun.svg-8ef45bb5bf22749053ccd7adff27b0d6.dpitex"]
-
-[params]
-
-base_scale=3.0
-saturation=1.0
-color_map={}
-compress=true
diff --git a/src/SharpIDE.Godot/Features/LeftSideBar/Resources/SidebarTestExplorer.svg.import b/src/SharpIDE.Godot/Features/LeftSideBar/Resources/SidebarTestExplorer.svg.import
deleted file mode 100644
index db6e60d8..00000000
--- a/src/SharpIDE.Godot/Features/LeftSideBar/Resources/SidebarTestExplorer.svg.import
+++ /dev/null
@@ -1,18 +0,0 @@
-[remap]
-
-importer="svg"
-type="DPITexture"
-uid="uid://dged1mm438qli"
-path="res://.godot/imported/SidebarTestExplorer.svg-274afd5c05ed773432cc3c30b32fdc5d.dpitex"
-
-[deps]
-
-source_file="res://Features/LeftSideBar/Resources/SidebarTestExplorer.svg"
-dest_files=["res://.godot/imported/SidebarTestExplorer.svg-274afd5c05ed773432cc3c30b32fdc5d.dpitex"]
-
-[params]
-
-base_scale=0.5
-saturation=1.0
-color_map={}
-compress=true
diff --git a/src/SharpIDE.Godot/Features/LeftSideBar/Resources/Terminal.svg.import b/src/SharpIDE.Godot/Features/LeftSideBar/Resources/Terminal.svg.import
deleted file mode 100644
index 66a91045..00000000
--- a/src/SharpIDE.Godot/Features/LeftSideBar/Resources/Terminal.svg.import
+++ /dev/null
@@ -1,18 +0,0 @@
-[remap]
-
-importer="svg"
-type="DPITexture"
-uid="uid://b0170ypw8uf3a"
-path="res://.godot/imported/Terminal.svg-8349236a94474ebd271d555c4975949b.dpitex"
-
-[deps]
-
-source_file="res://Features/LeftSideBar/Resources/Terminal.svg"
-dest_files=["res://.godot/imported/Terminal.svg-8349236a94474ebd271d555c4975949b.dpitex"]
-
-[params]
-
-base_scale=3.0
-saturation=1.0
-color_map={}
-compress=true
diff --git a/src/SharpIDE.Godot/Features/Nuget/NugetPackageDetails.tscn b/src/SharpIDE.Godot/Features/Nuget/NugetPackageDetails.tscn
index 37ba246f..60e2253b 100644
--- a/src/SharpIDE.Godot/Features/Nuget/NugetPackageDetails.tscn
+++ b/src/SharpIDE.Godot/Features/Nuget/NugetPackageDetails.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=5 format=3 uid="uid://odaefch2sdft"]
 
 [ext_resource type="Script" uid="uid://d1v1v4uqdu2rw" path="res://Features/Nuget/NugetPackageDetails.cs" id="1_c3hm2"]
-[ext_resource type="Texture2D" uid="uid://b5ih61vdjv5e6" path="res://Features/LeftSideBar/Resources/Nuget.svg" id="1_jrdf0"]
+[ext_resource type="Texture2D" uid="uid://b5ih61vdjv5e6" path="res://Features/Layout/Resources/Nuget.svg" id="1_jrdf0"]
 [ext_resource type="PackedScene" uid="uid://5uan5u23cr2s" path="res://Features/Nuget/PackageDetailsProjectEntry.tscn" id="3_tik62"]
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_tik62"]
diff --git a/src/SharpIDE.Godot/Features/Nuget/PackageEntry.tscn b/src/SharpIDE.Godot/Features/Nuget/PackageEntry.tscn
index fe548b7d..6e4f6390 100644
--- a/src/SharpIDE.Godot/Features/Nuget/PackageEntry.tscn
+++ b/src/SharpIDE.Godot/Features/Nuget/PackageEntry.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=5 format=3 uid="uid://cqc2xlt81ju8s"]
 
 [ext_resource type="Script" uid="uid://cwriljtokcujb" path="res://Features/Nuget/PackageEntry.cs" id="1_gehww"]
-[ext_resource type="Texture2D" uid="uid://b5ih61vdjv5e6" path="res://Features/LeftSideBar/Resources/Nuget.svg" id="1_kw1n7"]
+[ext_resource type="Texture2D" uid="uid://b5ih61vdjv5e6" path="res://Features/Layout/Resources/Nuget.svg" id="1_kw1n7"]
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_6ov2c"]
 draw_center = false
diff --git a/src/SharpIDE.Godot/Features/Run/RunMenuItem.cs b/src/SharpIDE.Godot/Features/Run/RunMenuItem.cs
index cb945a2c..7d421b54 100644
--- a/src/SharpIDE.Godot/Features/Run/RunMenuItem.cs
+++ b/src/SharpIDE.Godot/Features/Run/RunMenuItem.cs
@@ -1,7 +1,7 @@
 using Godot;
 using SharpIDE.Application.Features.Run;
 using SharpIDE.Application.Features.SolutionDiscovery.VsPersistence;
-using SharpIDE.Godot.Features.BottomPanel;
+using SharpIDE.Godot.Features.Layout;
 
 namespace SharpIDE.Godot.Features.Run;
 
@@ -55,13 +55,13 @@ private async void OnStopButtonPressed()
 
     private async void OnRunButtonPressed()
     {
-		GodotGlobalEvents.Instance.BottomPanelTabExternallySelected.InvokeParallelFireAndForget(BottomPanelType.Run);
+		GodotGlobalEvents.Instance.IdeToolExternallySelected.InvokeParallelFireAndForget(IdeTool.Run);
         await _runService.RunProject(Project).ConfigureAwait(false);
     }
     
     private async void OnDebugButtonPressed()
     {
-        GodotGlobalEvents.Instance.BottomPanelTabExternallySelected.InvokeParallelFireAndForget(BottomPanelType.Debug);
+        GodotGlobalEvents.Instance.IdeToolExternallySelected.InvokeParallelFireAndForget(IdeTool.Debug);
         await _runService.RunProject(Project, true, Singletons.AppState.IdeSettings.DebuggerExecutablePath).ConfigureAwait(false);
     }
 }
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/SolutionExplorer/ContextMenus/ProjectContextMenu.cs b/src/SharpIDE.Godot/Features/SolutionExplorer/ContextMenus/ProjectContextMenu.cs
index 30f7113e..29fd04ee 100644
--- a/src/SharpIDE.Godot/Features/SolutionExplorer/ContextMenus/ProjectContextMenu.cs
+++ b/src/SharpIDE.Godot/Features/SolutionExplorer/ContextMenus/ProjectContextMenu.cs
@@ -5,7 +5,7 @@
 using SharpIDE.Application.Features.Events;
 using SharpIDE.Application.Features.Run;
 using SharpIDE.Application.Features.SolutionDiscovery.VsPersistence;
-using SharpIDE.Godot.Features.BottomPanel;
+using SharpIDE.Godot.Features.Layout;
 
 namespace SharpIDE.Godot.Features.SolutionExplorer;
 
@@ -62,7 +62,7 @@ private void OpenContextMenuProject(SharpIdeProjectModel project)
             {
                 _ = Task.GodotRun(async () =>
                 {
-		            GodotGlobalEvents.Instance.BottomPanelTabExternallySelected.InvokeParallelFireAndForget(BottomPanelType.Run);
+		            GodotGlobalEvents.Instance.IdeToolExternallySelected.InvokeParallelFireAndForget(IdeTool.Run);
                     await _runService.RunProject(project);
                 });
             }
@@ -98,7 +98,7 @@ private void OpenContextMenuProject(SharpIdeProjectModel project)
     }
     private async Task MsBuildProject(SharpIdeProjectModel project, BuildType buildType)
     {
-        GodotGlobalEvents.Instance.BottomPanelTabExternallySelected.InvokeParallelFireAndForget(BottomPanelType.Build);
+        GodotGlobalEvents.Instance.IdeToolExternallySelected.InvokeParallelFireAndForget(IdeTool.Build);
         await _buildService.MsBuildAsync(project.FilePath, buildType);
     }
 }
diff --git a/src/SharpIDE.Godot/GodotGlobalEvents.cs b/src/SharpIDE.Godot/GodotGlobalEvents.cs
index 35e76028..7b78cff8 100644
--- a/src/SharpIDE.Godot/GodotGlobalEvents.cs
+++ b/src/SharpIDE.Godot/GodotGlobalEvents.cs
@@ -1,16 +1,14 @@
 using SharpIDE.Application.Features.Analysis;
 using SharpIDE.Application.Features.Events;
 using SharpIDE.Application.Features.SolutionDiscovery;
-using SharpIDE.Godot.Features.BottomPanel;
+using SharpIDE.Godot.Features.Layout;
 
 namespace SharpIDE.Godot;
 
 public class GodotGlobalEvents
 {
     public static GodotGlobalEvents Instance { get; set; } = null!;
-    public EventWrapper<BottomPanelType, Task> BottomPanelTabExternallySelected { get; } = new(_ => Task.CompletedTask);
-    public EventWrapper<BottomPanelType?, Task> BottomPanelTabSelected { get; } = new(_ => Task.CompletedTask);
-    public EventWrapper<bool, Task> BottomPanelVisibilityChangeRequested { get; } = new(_ => Task.CompletedTask);
+    public EventWrapper<IdeTool, Task> IdeToolExternallySelected { get; } = new(_ => Task.CompletedTask);
     public EventWrapper<SharpIdeFile, SharpIdeFileLinePosition?, Task> FileSelected { get; } = new((_, _) => Task.CompletedTask);
     public EventWrapper<SharpIdeFile, SharpIdeFileLinePosition?, Task> FileExternallySelected { get; } = new((_, _) => Task.CompletedTask);
 }
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/IdeRoot.cs b/src/SharpIDE.Godot/IdeRoot.cs
index 99589c36..a48bc7b4 100644
--- a/src/SharpIDE.Godot/IdeRoot.cs
+++ b/src/SharpIDE.Godot/IdeRoot.cs
@@ -2,6 +2,7 @@
 
 using Godot;
 
+using Microsoft.CodeAnalysis;
 using Microsoft.Extensions.Logging;
 
 using SharpIDE.Application.Features.Analysis;
@@ -11,13 +12,12 @@
 using SharpIDE.Application.Features.FileWatching;
 using SharpIDE.Application.Features.NavigationHistory;
 using SharpIDE.Application.Features.SolutionDiscovery;
-using SharpIDE.Godot.Features.BottomPanel;
+using SharpIDE.Godot.Features.CodeEditor;
 using SharpIDE.Godot.Features.Layout;
 using SharpIDE.Godot.Features.Run;
 using SharpIDE.Godot.Features.Search;
 using SharpIDE.Godot.Features.Search.SearchAllFiles;
-
-using Orientation = SharpIDE.Godot.Features.Layout.Orientation;
+using SharpIDE.Godot.Features.SolutionExplorer;
 
 namespace SharpIDE.Godot;
 
@@ -32,11 +32,11 @@ public partial class IdeRoot : Control
 	private Button _restoreSlnButton = null!;
 	private SearchWindow _searchWindow = null!;
 	private SearchAllFilesWindow _searchAllFilesWindow = null!;
+	private CodeEditorPanel _codeEditorPanel = null!;
+	private SolutionExplorerPanel _solutionExplorerPanel = null!;
 	private Button _runMenuButton = null!;
 	private Popup _runMenuPopup = null!;
-	private IdeDockLayout _ideLayoutRoot = null!;
-
-	private IdeDockLayout _dockLayoutRoot = null!;
+	private IdeMainLayout _mainLayout = null!;
 	
 	private readonly PackedScene _runMenuItemScene = ResourceLoader.Load<PackedScene>("res://Features/Run/RunMenuItem.tscn");
 	private TaskCompletionSource _nodeReadyTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
@@ -75,7 +75,7 @@ public override void _Ready()
 		_runMenuButton = GetNode<Button>("%RunMenuButton");
 		_searchWindow = GetNode<SearchWindow>("%SearchWindow");
 		_searchAllFilesWindow = GetNode<SearchAllFilesWindow>("%SearchAllFilesWindow");
-		_ideLayoutRoot = GetNode<IdeDockLayout>("%LayoutRoot");
+		_mainLayout = GetNode<IdeMainLayout>("%MainLayout");
 		
 		_runMenuButton.Pressed += OnRunMenuButtonPressed;
 		GodotGlobalEvents.Instance.FileSelected.Subscribe(OnSolutionExplorerPanelOnFileSelected);
@@ -88,15 +88,61 @@ public override void _Ready()
 		_nodeReadyTcs.SetResult();
 		
 		// TODO: Add layout profiles and persist layout
-		var ideLayout = new IdeSplitNode(
-			Orientation.Vertical,
-			FirstNode: new IdeSplitNode(
-				Orientation.Horizontal,
-				FirstNode: new IdeSceneNode(ResourceHelper.SolutionExplorerId, "Solution Explorer"),
-				SecondNode: new IdeSceneNode(ResourceHelper.CodeEditorId, "Code Editor")),
-			SecondNode: new IdeSceneNode(ResourceHelper.MultiFunctionPanelId, "Multi Function Panel"));
-		
-		_ideLayoutRoot.UpdateLayout(ideLayout);
+		// TODO: Check how to instantiate views
+		var tools = new[]
+		{
+			new IdeToolInfo(
+				IdeTool.SolutionExplorer,
+				ToolAnchor.LeftTop,
+				IsPinned: true,
+				IsVisible: true,
+				IdeTools.ToolDataMap[IdeTool.SolutionExplorer].Scene.Instantiate<Control>(),
+				IdeTools.ToolDataMap[IdeTool.SolutionExplorer].Icon),
+			new IdeToolInfo(
+				IdeTool.Problems,
+				ToolAnchor.BottomLeft,
+				IsPinned: true,
+				IsVisible: false,
+				IdeTools.ToolDataMap[IdeTool.Problems].Scene.Instantiate<Control>(),
+				IdeTools.ToolDataMap[IdeTool.Problems].Icon),
+			new IdeToolInfo(
+				IdeTool.Run,
+				ToolAnchor.BottomLeft,
+				IsPinned: true,
+				IsVisible: true,
+				IdeTools.ToolDataMap[IdeTool.Run].Scene.Instantiate<Control>(),
+				IdeTools.ToolDataMap[IdeTool.Run].Icon),
+			new IdeToolInfo(
+				IdeTool.Debug,
+				ToolAnchor.BottomLeft,
+				IsPinned: true,
+				IsVisible: false,
+				IdeTools.ToolDataMap[IdeTool.Debug].Scene.Instantiate<Control>(),
+				IdeTools.ToolDataMap[IdeTool.Debug].Icon),
+			new IdeToolInfo(
+				IdeTool.Build,
+				ToolAnchor.BottomLeft,
+				IsPinned: true,
+				IsVisible: false,
+				IdeTools.ToolDataMap[IdeTool.Build].Scene.Instantiate<Control>(),
+				IdeTools.ToolDataMap[IdeTool.Build].Icon),
+			new IdeToolInfo(
+				IdeTool.Nuget,
+				ToolAnchor.BottomLeft,
+				IsPinned: true,
+				IsVisible: false,
+				IdeTools.ToolDataMap[IdeTool.Nuget].Scene.Instantiate<Control>(),
+				IdeTools.ToolDataMap[IdeTool.Nuget].Icon),
+			new IdeToolInfo(
+				IdeTool.TestExplorer,
+				ToolAnchor.BottomLeft,
+				IsPinned: true,
+				IsVisible: false,
+				IdeTools.ToolDataMap[IdeTool.TestExplorer].Scene.Instantiate<Control>(),
+				IdeTools.ToolDataMap[IdeTool.TestExplorer].Icon)
+		};
+
+		_mainLayout.InitializeLayout(tools);
 	}
 	
 	// TODO: Problematic, as this is called even when the focus shifts to an embedded subwindow, such as a popup 
@@ -120,28 +166,28 @@ private async void OnBuildSlnButtonPressed()
 	{
 		await _solutionManager.SolutionReadyTcs.Task;
 		
-		GodotGlobalEvents.Instance.BottomPanelTabExternallySelected.InvokeParallelFireAndForget(BottomPanelType.Build);
+		GodotGlobalEvents.Instance.IdeToolExternallySelected.InvokeParallelFireAndForget(IdeTool.Build);
 		await _buildService.MsBuildAsync(_solutionManager.SolutionModel.FilePath);
 	}
 	private async void OnRebuildSlnButtonPressed()
 	{
 		await _solutionManager.SolutionReadyTcs.Task;
 		
-		GodotGlobalEvents.Instance.BottomPanelTabExternallySelected.InvokeParallelFireAndForget(BottomPanelType.Build);
+		GodotGlobalEvents.Instance.IdeToolExternallySelected.InvokeParallelFireAndForget(IdeTool.Build);
 		await _buildService.MsBuildAsync(_solutionManager.SolutionModel.FilePath, BuildType.Rebuild);
 	}
 	private async void OnCleanSlnButtonPressed()
 	{
 		await _solutionManager.SolutionReadyTcs.Task;
 		
-		GodotGlobalEvents.Instance.BottomPanelTabExternallySelected.InvokeParallelFireAndForget(BottomPanelType.Build);
+		GodotGlobalEvents.Instance.IdeToolExternallySelected.InvokeParallelFireAndForget(IdeTool.Build);
 		await _buildService.MsBuildAsync(_solutionManager.SolutionModel.FilePath, BuildType.Clean);
 	}
 	private async void OnRestoreSlnButtonPressed()
 	{
 		await _solutionManager.SolutionReadyTcs.Task;
 		
-		GodotGlobalEvents.Instance.BottomPanelTabExternallySelected.InvokeParallelFireAndForget(BottomPanelType.Build);
+		GodotGlobalEvents.Instance.IdeToolExternallySelected.InvokeParallelFireAndForget(IdeTool.Build);
 		await _buildService.MsBuildAsync(_solutionManager.SolutionModel.FilePath, BuildType.Restore);
 	}
 
diff --git a/src/SharpIDE.Godot/IdeRoot.tscn b/src/SharpIDE.Godot/IdeRoot.tscn
index dd9cdd2d..d73c2cc8 100644
--- a/src/SharpIDE.Godot/IdeRoot.tscn
+++ b/src/SharpIDE.Godot/IdeRoot.tscn
@@ -1,12 +1,11 @@
-[gd_scene load_steps=12 format=3 uid="uid://b2oniigcp5ew5"]
+[gd_scene load_steps=11 format=3 uid="uid://b2oniigcp5ew5"]
 
 [ext_resource type="FontFile" uid="uid://38igu11xwba6" path="res://Inter-VariableFont.ttf" id="1_7ptyn"]
 [ext_resource type="Script" uid="uid://bavypuy7b375x" path="res://IdeRoot.cs" id="1_whawi"]
 [ext_resource type="Texture2D" uid="uid://bkty6563cthj8" path="res://Features/Run/Resources/Run.svg" id="2_8x8ub"]
-[ext_resource type="PackedScene" uid="uid://biyhfwx36ium8" path="res://Features/LeftSideBar/LeftSideBar.tscn" id="3_f60gr"]
 [ext_resource type="PackedScene" uid="uid://bgpc5vsddmakc" path="res://Features/Navigation/ForwardBackwardButtonContainer.tscn" id="3_ptnvy"]
 [ext_resource type="PackedScene" uid="uid://c6xurjdabssao" path="res://Features/Settings/SettingsButton.tscn" id="5_pm5al"]
-[ext_resource type="PackedScene" uid="uid://bcn33cckidihf" path="res://Features/Layout/IdeDockLayout.tscn" id="7_4dy53"]
+[ext_resource type="PackedScene" uid="uid://bbdbcqg3jys2b" path="res://Features/Layout/IdeMainLayout.tscn" id="6_rllbf"]
 [ext_resource type="PackedScene" uid="uid://8lk0qj233a7p" path="res://Features/Search/SearchInFiles/SearchWindow.tscn" id="13_7ptyn"]
 [ext_resource type="PackedScene" uid="uid://b8kytk23cfo4x" path="res://Features/Search/SearchAllFiles/SearchAllFilesWindow.tscn" id="15_gh8b1"]
 [ext_resource type="PackedScene" uid="uid://dr41a4isv0dd5" path="res://Features/BottomBar/BottomBar.tscn" id="18_gyy5s"]
@@ -113,17 +112,9 @@ layout_mode = 2
 [node name="SettingsButton" parent="VBoxContainer/Panel/HBoxContainer" instance=ExtResource("5_pm5al")]
 layout_mode = 2
 
-[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]
-layout_mode = 2
-size_flags_vertical = 3
-
-[node name="LeftSideBar" parent="VBoxContainer/HBoxContainer" instance=ExtResource("3_f60gr")]
-layout_mode = 2
-
-[node name="LayoutRoot" parent="VBoxContainer/HBoxContainer" instance=ExtResource("7_4dy53")]
+[node name="MainLayout" parent="VBoxContainer" instance=ExtResource("6_rllbf")]
 unique_name_in_owner = true
 layout_mode = 2
-size_flags_horizontal = 3
 
 [node name="BottomBar" parent="VBoxContainer" instance=ExtResource("18_gyy5s")]
 layout_mode = 2
diff --git a/src/SharpIDE.Godot/NodeExtensions.cs b/src/SharpIDE.Godot/NodeExtensions.cs
index 6482871f..86d365be 100644
--- a/src/SharpIDE.Godot/NodeExtensions.cs
+++ b/src/SharpIDE.Godot/NodeExtensions.cs
@@ -78,6 +78,14 @@ public void RemoveChildAndQueueFree(Node child)
             node.RemoveChild(child);
             child.QueueFree();
         }
+
+        public void RemoveChildren()
+        {
+            foreach (var child in node.GetChildren())
+            {
+                node.RemoveChild(child);
+            }
+        }
         public Task<T> InvokeAsync<T>(Func<T> workItem)
         {
             var taskCompletionSource = new TaskCompletionSource<T>(TaskCreationOptions.RunContinuationsAsynchronously);

From 46a0dee8b85e68075f5df3f022cb1e022ab2de56 Mon Sep 17 00:00:00 2001
From: Manuel Gasser <manuel.gasser.ch@gmail.com>
Date: Tue, 23 Dec 2025 20:50:06 +0100
Subject: [PATCH 07/11] Implement tool drag and drop mechanism

---
 .../Features/Layout/DropZone.cs               |  13 ++
 .../Features/Layout/DropZone.cs.uid           |   1 +
 .../Features/Layout/IdeMainLayout.cs          |  83 ++++++---
 .../Features/Layout/IdeMainLayout.tscn        | 105 ++++++++++-
 .../Features/Layout/IdeToolInfo.cs            |  11 +-
 src/SharpIDE.Godot/Features/Layout/Sidebar.cs |  28 ++-
 .../Features/Layout/Sidebar.tscn              |   2 +
 .../Features/Layout/SidebarToolGroup.tscn     |  26 ---
 .../Features/Layout/ToolArea.cs               |  18 +-
 .../Features/Layout/ToolButton.cs             |  52 +++++-
 .../Features/Layout/ToolButton.tscn           |   1 +
 .../Features/Layout/ToolDockOverlay.cs        |  15 --
 .../Features/Layout/ToolDragOverlay.cs        | 164 ++++++++++++++++++
 ...kOverlay.cs.uid => ToolDragOverlay.cs.uid} |   0
 ...lDockOverlay.tscn => ToolDragOverlay.tscn} |   4 +-
 15 files changed, 437 insertions(+), 86 deletions(-)
 create mode 100644 src/SharpIDE.Godot/Features/Layout/DropZone.cs
 create mode 100644 src/SharpIDE.Godot/Features/Layout/DropZone.cs.uid
 delete mode 100644 src/SharpIDE.Godot/Features/Layout/SidebarToolGroup.tscn
 delete mode 100644 src/SharpIDE.Godot/Features/Layout/ToolDockOverlay.cs
 create mode 100644 src/SharpIDE.Godot/Features/Layout/ToolDragOverlay.cs
 rename src/SharpIDE.Godot/Features/Layout/{ToolDockOverlay.cs.uid => ToolDragOverlay.cs.uid} (100%)
 rename src/SharpIDE.Godot/Features/Layout/{ToolDockOverlay.tscn => ToolDragOverlay.tscn} (78%)

diff --git a/src/SharpIDE.Godot/Features/Layout/DropZone.cs b/src/SharpIDE.Godot/Features/Layout/DropZone.cs
new file mode 100644
index 00000000..eb39a5b9
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/DropZone.cs
@@ -0,0 +1,13 @@
+using Godot;
+
+namespace SharpIDE.Godot.Features.Layout;
+
+public partial class DropZone : Control
+{
+	public ColorRect Highlight { get; set; } = null!;
+	
+	public override void _Ready()
+	{
+		Highlight = GetNode<ColorRect>("Highlight");
+	}
+}
diff --git a/src/SharpIDE.Godot/Features/Layout/DropZone.cs.uid b/src/SharpIDE.Godot/Features/Layout/DropZone.cs.uid
new file mode 100644
index 00000000..34beefdb
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/DropZone.cs.uid
@@ -0,0 +1 @@
+uid://dh8sh21lx7p34
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeMainLayout.cs b/src/SharpIDE.Godot/Features/Layout/IdeMainLayout.cs
index d381cfda..1585d8a8 100644
--- a/src/SharpIDE.Godot/Features/Layout/IdeMainLayout.cs
+++ b/src/SharpIDE.Godot/Features/Layout/IdeMainLayout.cs
@@ -9,19 +9,21 @@ public partial class IdeMainLayout : Control
 	private readonly Dictionary<ToolAnchor, ToolArea> _toolAreaMap = [];
 	private readonly Dictionary<ToolAnchor, Control> _sidebarToolsMap = [];
 	private readonly Dictionary<ToolAnchor, ButtonGroup> _toolButtonGroupMap = [];
+	private readonly Dictionary<IdeTool, ToolButton> _toolButtonMap = [];
 
 	private Dictionary<IdeTool, IdeToolInfo> _toolMap = [];
-	private Dictionary<IdeTool, ToolButton> _toolButtonMap = [];
 
 	private Sidebar _leftSidebar = null!;
 	private Sidebar _rightSidebar = null!;
 	private Control _bottomArea = null!;
+	private ToolDragOverlay _toolDragOverlay = null!;
 
 	public override void _Ready()
 	{
 		_leftSidebar = GetNode<Sidebar>("%LeftSidebar");
 		_rightSidebar = GetNode<Sidebar>("%RightSidebar");
 		_bottomArea = GetNode<Control>("%BottomArea");
+		_toolDragOverlay = GetNode<ToolDragOverlay>("%ToolDragOverlay");
 		
 		_toolAreaMap[ToolAnchor.LeftTop] = GetNode<ToolArea>("%LeftTopToolArea");
 		_toolAreaMap[ToolAnchor.RightTop] = GetNode<ToolArea>("%RightTopToolArea");
@@ -33,11 +35,15 @@ public override void _Ready()
 		_sidebarToolsMap[ToolAnchor.BottomLeft] = _leftSidebar.BottomTools;
 		_sidebarToolsMap[ToolAnchor.BottomRight] = _rightSidebar.BottomTools;
 
-		_toolButtonGroupMap[ToolAnchor.LeftTop] = new ButtonGroup { AllowUnpress = true };
-		_toolButtonGroupMap[ToolAnchor.RightTop] = new ButtonGroup { AllowUnpress = true };
-		_toolButtonGroupMap[ToolAnchor.BottomLeft] = new ButtonGroup { AllowUnpress = true };
-		_toolButtonGroupMap[ToolAnchor.BottomRight] = new ButtonGroup { AllowUnpress = true };
-		
+		_toolButtonGroupMap[ToolAnchor.LeftTop] = new ButtonGroup
+			{ ResourceName = $"{ToolAnchor.LeftTop}", AllowUnpress = true };
+		_toolButtonGroupMap[ToolAnchor.RightTop] = new ButtonGroup
+			{ ResourceName = $"{ToolAnchor.RightTop}", AllowUnpress = true };
+		_toolButtonGroupMap[ToolAnchor.BottomLeft] = new ButtonGroup
+			{ ResourceName = $"{ToolAnchor.BottomLeft}", AllowUnpress = true };
+		_toolButtonGroupMap[ToolAnchor.BottomRight] = new ButtonGroup
+			{ ResourceName = $"{ToolAnchor.BottomRight}", AllowUnpress = true };
+
 		GodotGlobalEvents.Instance.IdeToolExternallySelected.Subscribe(tool =>
 		{
 			CallDeferred(
@@ -45,6 +51,8 @@ public override void _Ready()
 				Variant.From(tool));
 			return Task.CompletedTask;
 		});
+
+		_toolDragOverlay.ToolDropped += OnToolDropped;
 	}
 
 	private void OnIdeToolExternallySelected(IdeTool tool)
@@ -61,21 +69,51 @@ private void OnIdeToolExternallySelected(IdeTool tool)
 	}
 
 	/// <inheritdoc />
-	public override Variant _GetDragData(Vector2 atPosition)
+	public override void _Notification(int what)
 	{
-		return default;
+		switch ((long)what)
+		{
+			case NotificationDragBegin:
+				_leftSidebar.Visible = true;
+				_rightSidebar.Visible = true;
+				_toolDragOverlay.Visible = true;
+				break;
+			case NotificationDragEnd:
+				_toolDragOverlay.Visible = false;
+				UpdateSidebarVisibility();
+				break;
+		}
 	}
 
-	/// <inheritdoc />
-	public override bool _CanDropData(Vector2 atPosition, Variant data)
+	private void OnToolDropped(object? _, ToolDropData dropData)
 	{
-		return false;
-	}
+		var toolInfo = _toolMap[dropData.Tool];
+		var toolButton = _toolButtonMap[dropData.Tool];
+		var tools = _sidebarToolsMap[dropData.Anchor];
+		var buttonGroup = _toolButtonGroupMap[dropData.Anchor];
+		var oldToolArea = _toolAreaMap[toolInfo.Anchor];
+		var newToolArea = _toolAreaMap[dropData.Anchor];
+
+		if (toolButton.GetParent() is { } buttonParent)
+		{
+			buttonParent.RemoveChild(toolButton);
+		}
 
-	/// <inheritdoc />
-	public override void _DropData(Vector2 atPosition, Variant data)
-	{
-		
+		if (oldToolArea.ActiveTool?.Tool == dropData.Tool)
+		{
+			oldToolArea.SetActiveTool(null);
+		}
+
+		toolInfo.Anchor = dropData.Anchor;
+
+		toolButton.ButtonGroup = buttonGroup;
+		tools.AddChild(toolButton);
+		tools.MoveChild(toolButton, dropData.Index);
+
+		if (toolButton.ButtonPressed)
+		{
+			OnIdeToolExternallySelected(toolInfo.Tool);
+		}
 	}
 
 	public void InitializeLayout(IReadOnlyList<IdeToolInfo> toolInfos)
@@ -109,22 +147,17 @@ public void InitializeLayout(IReadOnlyList<IdeToolInfo> toolInfos)
 	private void UpdateSidebarVisibility()
 	{
 		_leftSidebar.Visible =
-			_toolMap.Values.Any(toolInfo => toolInfo.Anchor.IsLeft() && toolInfo is
-			{
-				IsPinned: true, IsVisible: true
-			});
+			_toolMap.Values.Any(toolInfo => toolInfo.Anchor.IsLeft() && toolInfo.IsPinned);
 
 		_rightSidebar.Visible =
-			_toolMap.Values.Any(toolInfo => toolInfo.Anchor.IsLeft() && toolInfo is
-			{
-				IsPinned: true, IsVisible: true
-			});
+			_toolMap.Values.Any(toolInfo => toolInfo.Anchor.IsRight() && toolInfo.IsPinned);
 	}
 
 	private ToolButton CreateToolButton(IdeToolInfo toolInfo)
 	{
 		var toolButton = ResourceLoader.Load<PackedScene>("uid://gcpcsulb43in").Instantiate<ToolButton>();
-		
+
+		toolButton.Tool = toolInfo.Tool;
 		toolButton.SetButtonIcon(toolInfo.Icon);
 		toolButton.Toggled += toggledOn => ToggleTool(toolInfo.Tool,  toggledOn);
 		toolButton.ButtonGroup = _toolButtonGroupMap[toolInfo.Anchor];
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeMainLayout.tscn b/src/SharpIDE.Godot/Features/Layout/IdeMainLayout.tscn
index 913988c4..f2346d73 100644
--- a/src/SharpIDE.Godot/Features/Layout/IdeMainLayout.tscn
+++ b/src/SharpIDE.Godot/Features/Layout/IdeMainLayout.tscn
@@ -1,10 +1,11 @@
-[gd_scene load_steps=6 format=3 uid="uid://bbdbcqg3jys2b"]
+[gd_scene load_steps=7 format=3 uid="uid://bbdbcqg3jys2b"]
 
 [ext_resource type="Script" uid="uid://bu3a3xbolcijl" path="res://Features/Layout/IdeMainLayout.cs" id="1_tq23w"]
 [ext_resource type="PackedScene" uid="uid://cy2a1p2twwni0" path="res://Features/Layout/Sidebar.tscn" id="2_e53sf"]
 [ext_resource type="PackedScene" uid="uid://b8wqkwa7sjrid" path="res://Features/Layout/ToolArea.tscn" id="3_cxuiw"]
 [ext_resource type="PackedScene" uid="uid://c5dlwgcx3ubyp" path="res://Features/CodeEditor/CodeEditorPanel.tscn" id="4_kocsp"]
-[ext_resource type="PackedScene" uid="uid://f1hvt1gn1adf" path="res://Features/Layout/ToolDockOverlay.tscn" id="5_e53sf"]
+[ext_resource type="PackedScene" uid="uid://f1hvt1gn1adf" path="res://Features/Layout/ToolDragOverlay.tscn" id="5_e53sf"]
+[ext_resource type="Script" uid="uid://dh8sh21lx7p34" path="res://Features/Layout/DropZone.cs" id="6_yv27d"]
 
 [node name="IdeMainLayout" type="Control"]
 layout_mode = 3
@@ -32,11 +33,13 @@ layout_mode = 2
 [node name="CenterArea" type="VSplitContainer" parent="Root"]
 layout_mode = 2
 size_flags_horizontal = 3
+theme_override_constants/separation = 0
 
 [node name="TopArea" type="HSplitContainer" parent="Root/CenterArea"]
 layout_mode = 2
 size_flags_vertical = 3
 size_flags_stretch_ratio = 2.0
+theme_override_constants/separation = 0
 
 [node name="LeftTopToolArea" parent="Root/CenterArea/TopArea" instance=ExtResource("3_cxuiw")]
 unique_name_in_owner = true
@@ -47,6 +50,7 @@ size_flags_horizontal = 3
 layout_mode = 2
 size_flags_horizontal = 3
 size_flags_stretch_ratio = 5.0
+theme_override_constants/separation = 0
 
 [node name="CodeEditor" parent="Root/CenterArea/TopArea/HSplitContainer" instance=ExtResource("4_kocsp")]
 unique_name_in_owner = true
@@ -63,6 +67,8 @@ size_flags_horizontal = 3
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_vertical = 3
+theme_override_constants/separation = 0
+theme_override_constants/minimum_grab_thickness = 6
 
 [node name="BottomLeftToolArea" parent="Root/CenterArea/BottomArea" instance=ExtResource("3_cxuiw")]
 unique_name_in_owner = true
@@ -78,7 +84,100 @@ size_flags_horizontal = 3
 unique_name_in_owner = true
 layout_mode = 2
 
-[node name="ToolDockOverlay" parent="." instance=ExtResource("5_e53sf")]
+[node name="ToolDragOverlay" parent="." node_paths=PackedStringArray("LeftSidebar", "RightSidebar", "LeftTopZone", "RightTopZone", "BottomLeftZone", "BottomRightZone") instance=ExtResource("5_e53sf")]
 unique_name_in_owner = true
 visible = false
 layout_mode = 1
+mouse_filter = 1
+LeftSidebar = NodePath("../Root/LeftSidebar")
+RightSidebar = NodePath("../Root/RightSidebar")
+LeftTopZone = NodePath("LeftTopDropZone")
+RightTopZone = NodePath("RightTopDropZone")
+BottomLeftZone = NodePath("BottomLeftDropZone")
+BottomRightZone = NodePath("BottomRightDropZone")
+
+[node name="LeftTopDropZone" type="Control" parent="ToolDragOverlay"]
+layout_mode = 1
+anchor_right = 0.2
+anchor_bottom = 0.5
+size_flags_horizontal = 0
+size_flags_vertical = 0
+mouse_filter = 1
+script = ExtResource("6_yv27d")
+
+[node name="Highlight" type="ColorRect" parent="ToolDragOverlay/LeftTopDropZone"]
+visible = false
+layout_mode = 1
+anchors_preset = -1
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_left = 50.227203
+mouse_filter = 2
+color = Color(0, 0.7268333, 0.89, 0.5137255)
+
+[node name="RightTopDropZone" type="Control" parent="ToolDragOverlay"]
+layout_mode = 1
+anchor_left = 0.8
+anchor_right = 1.0
+anchor_bottom = 0.5
+size_flags_horizontal = 0
+size_flags_vertical = 0
+mouse_filter = 1
+script = ExtResource("6_yv27d")
+
+[node name="Highlight" type="ColorRect" parent="ToolDragOverlay/RightTopDropZone"]
+visible = false
+layout_mode = 1
+anchors_preset = -1
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_right = -49.99678
+mouse_filter = 2
+color = Color(0, 0.7254902, 0.8901961, 0.5137255)
+
+[node name="BottomLeftDropZone" type="Control" parent="ToolDragOverlay"]
+layout_mode = 1
+anchor_top = 0.5
+anchor_right = 0.2
+anchor_bottom = 1.0
+grow_vertical = 0
+size_flags_horizontal = 0
+size_flags_vertical = 0
+mouse_filter = 1
+script = ExtResource("6_yv27d")
+
+[node name="Highlight" type="ColorRect" parent="ToolDragOverlay/BottomLeftDropZone"]
+visible = false
+layout_mode = 1
+anchors_preset = -1
+anchor_top = 0.349
+anchor_right = 2.4740002
+anchor_bottom = 1.0
+offset_left = 50.227203
+offset_top = -0.07600403
+mouse_filter = 2
+color = Color(0, 0.7254902, 0.8901961, 0.5137255)
+
+[node name="BottomRightDropZone" type="Control" parent="ToolDragOverlay"]
+layout_mode = 1
+anchor_left = 0.8
+anchor_top = 0.5
+anchor_right = 1.0
+anchor_bottom = 1.0
+size_flags_horizontal = 0
+size_flags_vertical = 0
+mouse_filter = 1
+script = ExtResource("6_yv27d")
+
+[node name="Highlight" type="ColorRect" parent="ToolDragOverlay/BottomRightDropZone"]
+visible = false
+layout_mode = 1
+anchors_preset = -1
+anchor_left = -1.475
+anchor_top = 0.34600002
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_top = -0.104003906
+offset_right = -49.99678
+mouse_filter = 2
+color = Color(0, 0.7254902, 0.8901961, 0.5137255)
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeToolInfo.cs b/src/SharpIDE.Godot/Features/Layout/IdeToolInfo.cs
index ad70b03f..290ec8f0 100644
--- a/src/SharpIDE.Godot/Features/Layout/IdeToolInfo.cs
+++ b/src/SharpIDE.Godot/Features/Layout/IdeToolInfo.cs
@@ -11,8 +11,17 @@ public enum ToolAnchor
     BottomRight = 4
 }
 
-public record IdeToolInfo(IdeTool Tool, ToolAnchor Anchor, bool IsPinned, bool IsVisible, Control Control, Texture2D Icon)
+public record IdeToolInfo(
+    IdeTool Tool,
+    ToolAnchor Anchor,
+    bool IsPinned,
+    bool IsVisible,
+    Control Control,
+    Texture2D Icon)
 {
+    public ToolAnchor Anchor { get; set; } = Anchor;
+    
     public bool IsPinned { get; set; } = IsPinned;
+
     public bool IsVisible { get; set; } = IsVisible;
 }
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/Layout/Sidebar.cs b/src/SharpIDE.Godot/Features/Layout/Sidebar.cs
index cd1724b7..88639d91 100644
--- a/src/SharpIDE.Godot/Features/Layout/Sidebar.cs
+++ b/src/SharpIDE.Godot/Features/Layout/Sidebar.cs
@@ -4,12 +4,32 @@ namespace SharpIDE.Godot.Features.Layout;
 
 public partial class Sidebar : Panel
 {
-	public Control TopTools { get; private set; } = null!;
-	public Control BottomTools { get; private set; } = null!;
+	[Export]
+	public Vector2 ToolMinimumSize { get; set; } = Vector2.Zero;
+	
+	public Container TopTools { get; private set; } = null!;
+	public Container BottomTools { get; private set; } = null!;
+
+	[Export]
+	public Color PreviewColor { get; set; }
+
+	public Control ToolPreview = null!;
 
 	public override void _Ready()
 	{
-		TopTools = GetNode<Control>("%TopTools");
-		BottomTools = GetNode<Control>("%BottomTools");
+		TopTools = GetNode<Container>("%TopTools");
+		BottomTools = GetNode<Container>("%BottomTools");
+
+		ToolPreview = CreateToolPreview();
+	}
+
+	private ColorRect CreateToolPreview()
+	{
+		var rect = new ColorRect();
+		rect.Color = PreviewColor;
+		rect.CustomMinimumSize = ToolMinimumSize;
+		rect.SizeFlagsHorizontal = SizeFlags.Fill;
+		rect.SizeFlagsVertical = SizeFlags.Fill;
+		return rect;
 	}
 }
diff --git a/src/SharpIDE.Godot/Features/Layout/Sidebar.tscn b/src/SharpIDE.Godot/Features/Layout/Sidebar.tscn
index 1fa9dd99..02334074 100644
--- a/src/SharpIDE.Godot/Features/Layout/Sidebar.tscn
+++ b/src/SharpIDE.Godot/Features/Layout/Sidebar.tscn
@@ -11,6 +11,8 @@ grow_horizontal = 2
 grow_vertical = 2
 size_flags_vertical = 3
 script = ExtResource("1_4ivyu")
+ToolMinimumSize = Vector2(40, 40)
+PreviewColor = Color(0, 0.7268333, 0.89, 0.6901961)
 
 [node name="Margins" type="MarginContainer" parent="."]
 layout_mode = 1
diff --git a/src/SharpIDE.Godot/Features/Layout/SidebarToolGroup.tscn b/src/SharpIDE.Godot/Features/Layout/SidebarToolGroup.tscn
deleted file mode 100644
index 08c26267..00000000
--- a/src/SharpIDE.Godot/Features/Layout/SidebarToolGroup.tscn
+++ /dev/null
@@ -1,26 +0,0 @@
-[gd_scene load_steps=2 format=3 uid="uid://dqv21c7r2gnhu"]
-
-[sub_resource type="CSharpScript" id="CSharpScript_negu7"]
-script/source = "using Godot;
-
-namespace SharpIDE.Godot.Features.Layout;
-
-public partial class SidebarToolGroup : Control
-{
-	public Control ToolGroup { get; private set; } = null!;
-
-	public override void _Ready()
-	{
-		ToolGroup = GetNode<Control>(\"%ToolGroup\");
-	}
-}
-"
-
-[node name="SidebarToolGroup" type="Control"]
-layout_mode = 3
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-script = SubResource("CSharpScript_negu7")
diff --git a/src/SharpIDE.Godot/Features/Layout/ToolArea.cs b/src/SharpIDE.Godot/Features/Layout/ToolArea.cs
index 8e9a8bb0..6ad0660d 100644
--- a/src/SharpIDE.Godot/Features/Layout/ToolArea.cs
+++ b/src/SharpIDE.Godot/Features/Layout/ToolArea.cs
@@ -4,7 +4,7 @@ namespace SharpIDE.Godot.Features.Layout;
 
 public partial class ToolArea : Control
 {
-	private IdeToolInfo? _activeTool;
+	public IdeToolInfo? ActiveTool { get; private set; }
 
 	public override void _Ready()
 	{
@@ -13,21 +13,21 @@ public override void _Ready()
 
 	public void SetActiveTool(IdeToolInfo? toolInfo)
 	{
-		if (ReferenceEquals(_activeTool, toolInfo))
+		if (ReferenceEquals(ActiveTool, toolInfo))
 		{
 			return;
 		}
 		
-		if (_activeTool is not null)
+		if (ActiveTool is not null)
 		{
-			RemoveChild(_activeTool.Control);
-			_activeTool.IsVisible = false;
+			RemoveChild(ActiveTool.Control);
+			ActiveTool.IsVisible = false;
 		}
 		
 		if (toolInfo is null)
 		{
 			Visible = false;
-			_activeTool = null;
+			ActiveTool = null;
 			return;
 		}
 
@@ -36,9 +36,9 @@ public void SetActiveTool(IdeToolInfo? toolInfo)
 			parent.RemoveChild(toolInfo.Control);
 		}
 		
-		_activeTool = toolInfo;
+		ActiveTool = toolInfo;
 		
-		AddChild(_activeTool.Control);
-		Visible = _activeTool.IsVisible = true;
+		AddChild(ActiveTool.Control);
+		Visible = ActiveTool.IsVisible = true;
 	}
 }
diff --git a/src/SharpIDE.Godot/Features/Layout/ToolButton.cs b/src/SharpIDE.Godot/Features/Layout/ToolButton.cs
index d14099a1..c42b8613 100644
--- a/src/SharpIDE.Godot/Features/Layout/ToolButton.cs
+++ b/src/SharpIDE.Godot/Features/Layout/ToolButton.cs
@@ -2,7 +2,57 @@
 
 namespace SharpIDE.Godot.Features.Layout;
 
-// TODO: Remove?
 public partial class ToolButton : Button
 {
+	public IdeTool Tool { get; set; }
+	
+	[Export]
+	public Color DragPreviewColor { get; set; }
+
+	private bool _pressedBeforeDrag;
+	
+
+	/// <inheritdoc />
+	public override Variant _GetDragData(Vector2 atPosition)
+	{
+		SetDragPreview(CreateDragPreview());
+
+		// We save the state and unpress the button without toggle signal,
+		// otherwise Hide() will unpress the button which toggles it.
+		_pressedBeforeDrag = ButtonPressed;
+		SetPressedNoSignal(false);
+		Hide();
+		
+		return Variant.From(Tool);
+	}
+
+	/// <inheritdoc />
+	public override void _Notification(int what)
+	{
+		switch ((long) what)
+		{
+			case NotificationDragEnd:
+				Show();
+				SetPressedNoSignal(_pressedBeforeDrag);
+				break;
+		}
+	}
+
+	private Control CreateDragPreview()
+	{
+		var rect = new ColorRect();
+		rect.Size = Size;
+		rect.Color = DragPreviewColor;
+		
+		var icon = new TextureRect
+		{
+			Texture = Icon,
+			ExpandMode = TextureRect.ExpandModeEnum.FitWidthProportional,
+		};
+		
+		icon.SetAnchorsPreset(LayoutPreset.FullRect);
+		
+		rect.AddChild(icon);
+		return rect;
+	}
 }
diff --git a/src/SharpIDE.Godot/Features/Layout/ToolButton.tscn b/src/SharpIDE.Godot/Features/Layout/ToolButton.tscn
index a555e469..8e3a218f 100644
--- a/src/SharpIDE.Godot/Features/Layout/ToolButton.tscn
+++ b/src/SharpIDE.Godot/Features/Layout/ToolButton.tscn
@@ -20,3 +20,4 @@ toggle_mode = true
 icon_alignment = 1
 expand_icon = true
 script = ExtResource("1_8ncbp")
+DragPreviewColor = Color(0.36, 0.36, 0.36, 0.7294118)
diff --git a/src/SharpIDE.Godot/Features/Layout/ToolDockOverlay.cs b/src/SharpIDE.Godot/Features/Layout/ToolDockOverlay.cs
deleted file mode 100644
index ff13eb42..00000000
--- a/src/SharpIDE.Godot/Features/Layout/ToolDockOverlay.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Godot;
-using System;
-
-public partial class ToolDockOverlay : Control
-{
-	// Called when the node enters the scene tree for the first time.
-	public override void _Ready()
-	{
-	}
-
-	// Called every frame. 'delta' is the elapsed time since the previous frame.
-	public override void _Process(double delta)
-	{
-	}
-}
diff --git a/src/SharpIDE.Godot/Features/Layout/ToolDragOverlay.cs b/src/SharpIDE.Godot/Features/Layout/ToolDragOverlay.cs
new file mode 100644
index 00000000..a052c848
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/ToolDragOverlay.cs
@@ -0,0 +1,164 @@
+using Godot;
+
+namespace SharpIDE.Godot.Features.Layout;
+
+public sealed record ToolDropData(IdeTool Tool, ToolAnchor Anchor, int Index);
+
+public partial class ToolDragOverlay : Control
+{
+	private readonly Dictionary<DropZone, ToolAnchor> _dropZoneMap = [];
+	private readonly Dictionary<ToolAnchor, Sidebar> _sidebarMap = [];
+
+	[Export]
+	public Sidebar LeftSidebar { get; set; } = null!;
+
+	[Export]
+	public Sidebar RightSidebar { get; set; } = null!;
+
+	[Export]
+	public DropZone LeftTopZone { get; set; } = null!;
+
+	[Export]
+	public DropZone RightTopZone { get; set; } = null!;
+
+	[Export]
+	public DropZone BottomLeftZone { get; set; } = null!;
+
+	[Export]
+	public DropZone BottomRightZone { get; set; } = null!;
+
+	public event EventHandler<ToolDropData>? ToolDropped;
+
+	public override void _Ready()
+	{
+		// TODO: Sidebar visibility not working
+		_dropZoneMap[LeftTopZone] = ToolAnchor.LeftTop;
+		_dropZoneMap[RightTopZone] = ToolAnchor.RightTop;
+		_dropZoneMap[BottomLeftZone] = ToolAnchor.BottomLeft;
+		_dropZoneMap[BottomRightZone] = ToolAnchor.BottomRight;
+
+		_sidebarMap[ToolAnchor.LeftTop] = LeftSidebar;
+		_sidebarMap[ToolAnchor.RightTop] = RightSidebar;
+		_sidebarMap[ToolAnchor.BottomLeft] = LeftSidebar;
+		_sidebarMap[ToolAnchor.BottomRight] = RightSidebar;
+
+		VisibilityChanged += OnVisibilityChanged;
+	}
+
+	/// <inheritdoc />
+	public override bool _CanDropData(Vector2 _, Variant data)
+	{
+		HideToolPreviews();
+		HideDropZoneHighlights();
+
+		var mousePosition = GetGlobalMousePosition();
+
+		foreach (var (zone, anchor) in _dropZoneMap)
+		{
+			if (InDropZone(zone, mousePosition))
+			{
+				ShowGhostPreview(anchor, mousePosition);
+				zone.Highlight.Show();
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/// <inheritdoc />
+	public override void _DropData(Vector2 atPosition, Variant data)
+	{
+		var mousePosition = GetGlobalMousePosition();
+
+		foreach (var (zone, anchor) in _dropZoneMap)
+		{
+			if (InDropZone(zone, mousePosition))
+			{
+				ToolDropped?.Invoke(
+					sender: this,
+					new ToolDropData(
+						data.As<IdeTool>(),
+						anchor,
+						CalculateInsertionIndex(GetSidebarTools(anchor), mousePosition)));
+				return;
+			}
+		}
+	}
+
+	private void OnVisibilityChanged()
+	{
+		if (!Visible)
+		{
+			HideToolPreviews();
+			HideDropZoneHighlights();
+		}
+	}
+
+	private void RaiseToolDropped(IdeTool tool, ToolAnchor anchor) { }
+
+	private void ShowGhostPreview(ToolAnchor anchor, Vector2 mousePosition)
+	{
+		var sidebar = _sidebarMap[anchor];
+		var tools = GetSidebarTools(anchor);
+		var previewIndex = CalculateInsertionIndex(tools, mousePosition);
+
+		tools.AddChild(sidebar.ToolPreview);
+		tools.MoveChild(sidebar.ToolPreview, previewIndex);
+	}
+
+	private Container GetSidebarTools(ToolAnchor anchor)
+	{
+		var sidebar = _sidebarMap[anchor];
+
+		return anchor switch
+		{
+			ToolAnchor.LeftTop or ToolAnchor.RightTop => sidebar.TopTools,
+			ToolAnchor.BottomLeft or ToolAnchor.BottomRight => sidebar.BottomTools,
+			_ => throw new ArgumentException($"No tools to show preview in for anchor '{anchor}'.", nameof(anchor))
+		};
+	}
+
+	private void HideToolPreviews()
+	{
+		if (LeftSidebar.ToolPreview.GetParent() is { } leftParent)
+		{
+			leftParent.RemoveChild(LeftSidebar.ToolPreview);
+		}
+
+		if (RightSidebar.ToolPreview.GetParent() is { } rightParent)
+		{
+			rightParent.RemoveChild(RightSidebar.ToolPreview);
+		}
+	}
+
+	private void HideDropZoneHighlights()
+	{
+		foreach (var zone in _dropZoneMap.Keys)
+		{
+			zone.Highlight.Hide();
+		}
+	}
+
+	private static int CalculateInsertionIndex(Container tools, Vector2 mousePosition)
+	{
+		foreach (var child in tools.GetChildren().OfType<ToolButton>())
+		{
+			var rect = child.GetGlobalRect();
+
+			var midpoint = rect.Position.Y + rect.Size.Y / 2.0f;
+
+			if (mousePosition.Y < midpoint)
+			{
+				return child.GetIndex();
+			}
+		}
+
+		return tools.GetChildCount();
+	}
+
+	private static bool InDropZone(Control dropZone, Vector2 position)
+	{
+		return dropZone.GetGlobalRect().HasPoint(position);
+	}
+}
diff --git a/src/SharpIDE.Godot/Features/Layout/ToolDockOverlay.cs.uid b/src/SharpIDE.Godot/Features/Layout/ToolDragOverlay.cs.uid
similarity index 100%
rename from src/SharpIDE.Godot/Features/Layout/ToolDockOverlay.cs.uid
rename to src/SharpIDE.Godot/Features/Layout/ToolDragOverlay.cs.uid
diff --git a/src/SharpIDE.Godot/Features/Layout/ToolDockOverlay.tscn b/src/SharpIDE.Godot/Features/Layout/ToolDragOverlay.tscn
similarity index 78%
rename from src/SharpIDE.Godot/Features/Layout/ToolDockOverlay.tscn
rename to src/SharpIDE.Godot/Features/Layout/ToolDragOverlay.tscn
index f34a060a..7370c9f7 100644
--- a/src/SharpIDE.Godot/Features/Layout/ToolDockOverlay.tscn
+++ b/src/SharpIDE.Godot/Features/Layout/ToolDragOverlay.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://f1hvt1gn1adf"]
 
-[ext_resource type="Script" uid="uid://dc57hptoukgk1" path="res://Features/Layout/ToolDockOverlay.cs" id="1_s7p4m"]
+[ext_resource type="Script" uid="uid://dc57hptoukgk1" path="res://Features/Layout/ToolDragOverlay.cs" id="1_cwqxu"]
 
 [node name="ToolDockOverlay" type="Control"]
 layout_mode = 3
@@ -10,4 +10,4 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 mouse_filter = 2
-script = ExtResource("1_s7p4m")
+script = ExtResource("1_cwqxu")

From e8d334826a699c0eeba1b5d223213adb608eed4f Mon Sep 17 00:00:00 2001
From: Manuel Gasser <manuel.gasser.ch@gmail.com>
Date: Wed, 24 Dec 2025 12:47:25 +0100
Subject: [PATCH 08/11] Fix minor bugs and cleanup implementation

---
 src/SharpIDE.Godot/DiAutoload.cs              |   2 +
 .../Features/Layout/IdeLayoutState.cs         |  31 ++
 .../Features/Layout/IdeLayoutState.cs.uid     |   1 +
 .../Features/Layout/IdeMainLayout.cs          | 264 +++++++++++-------
 .../Features/Layout/IdeToolInfo.cs            |  27 --
 .../Features/Layout/IdeToolInfo.cs.uid        |   1 -
 .../Features/Layout/IdeToolState.cs           |  24 ++
 .../Features/Layout/IdeToolState.cs.uid       |   1 +
 .../Features/Layout/IdeTools.cs               |  35 ---
 .../Features/Layout/Resources/Icons.cs        |  15 +
 .../Features/Layout/Resources/Icons.cs.uid    |   1 +
 .../Features/Layout/Resources/Scenes.cs       |  16 ++
 .../Features/Layout/Resources/Scenes.cs.uid   |   1 +
 .../Features/Layout/ToolAnchor.cs             |  10 +
 .../Features/Layout/ToolAnchor.cs.uid         |   1 +
 .../Features/Layout/ToolArea.cs               |  41 +--
 .../Features/Layout/ToolButton.cs             |  17 +-
 .../Features/Layout/ToolDragOverlay.cs        | 113 +++++---
 .../Features/Run/RunMenuItem.cs               |   5 +-
 .../ContextMenus/ProjectContextMenu.cs        |   5 +-
 .../Features/Tools/IdeToolDescriptor.cs       |  12 +
 .../Features/Tools/IdeToolDescriptor.cs.uid   |   1 +
 .../Features/Tools/IdeToolDescriptors.cs      |  43 +++
 .../IdeToolDescriptors.cs.uid}                |   0
 .../Features/Tools/IdeToolId.cs               |  13 +
 .../Features/Tools/IdeToolId.cs.uid           |   1 +
 .../Features/Tools/IdeToolInstance.cs         |   5 +
 .../Features/Tools/IdeToolInstance.cs.uid     |   1 +
 .../Features/Tools/SharpIdeToolManager.cs     |  22 ++
 .../Features/Tools/SharpIdeToolManager.cs.uid |   1 +
 src/SharpIDE.Godot/GodotGlobalEvents.cs       |   3 +-
 src/SharpIDE.Godot/IdeRoot.cs                 |  66 +----
 32 files changed, 486 insertions(+), 293 deletions(-)
 create mode 100644 src/SharpIDE.Godot/Features/Layout/IdeLayoutState.cs
 create mode 100644 src/SharpIDE.Godot/Features/Layout/IdeLayoutState.cs.uid
 delete mode 100644 src/SharpIDE.Godot/Features/Layout/IdeToolInfo.cs
 delete mode 100644 src/SharpIDE.Godot/Features/Layout/IdeToolInfo.cs.uid
 create mode 100644 src/SharpIDE.Godot/Features/Layout/IdeToolState.cs
 create mode 100644 src/SharpIDE.Godot/Features/Layout/IdeToolState.cs.uid
 delete mode 100644 src/SharpIDE.Godot/Features/Layout/IdeTools.cs
 create mode 100644 src/SharpIDE.Godot/Features/Layout/Resources/Icons.cs
 create mode 100644 src/SharpIDE.Godot/Features/Layout/Resources/Icons.cs.uid
 create mode 100644 src/SharpIDE.Godot/Features/Layout/Resources/Scenes.cs
 create mode 100644 src/SharpIDE.Godot/Features/Layout/Resources/Scenes.cs.uid
 create mode 100644 src/SharpIDE.Godot/Features/Layout/ToolAnchor.cs
 create mode 100644 src/SharpIDE.Godot/Features/Layout/ToolAnchor.cs.uid
 create mode 100644 src/SharpIDE.Godot/Features/Tools/IdeToolDescriptor.cs
 create mode 100644 src/SharpIDE.Godot/Features/Tools/IdeToolDescriptor.cs.uid
 create mode 100644 src/SharpIDE.Godot/Features/Tools/IdeToolDescriptors.cs
 rename src/SharpIDE.Godot/Features/{Layout/IdeTools.cs.uid => Tools/IdeToolDescriptors.cs.uid} (100%)
 create mode 100644 src/SharpIDE.Godot/Features/Tools/IdeToolId.cs
 create mode 100644 src/SharpIDE.Godot/Features/Tools/IdeToolId.cs.uid
 create mode 100644 src/SharpIDE.Godot/Features/Tools/IdeToolInstance.cs
 create mode 100644 src/SharpIDE.Godot/Features/Tools/IdeToolInstance.cs.uid
 create mode 100644 src/SharpIDE.Godot/Features/Tools/SharpIdeToolManager.cs
 create mode 100644 src/SharpIDE.Godot/Features/Tools/SharpIdeToolManager.cs.uid

diff --git a/src/SharpIDE.Godot/DiAutoload.cs b/src/SharpIDE.Godot/DiAutoload.cs
index 764f6af8..7d805ba5 100644
--- a/src/SharpIDE.Godot/DiAutoload.cs
+++ b/src/SharpIDE.Godot/DiAutoload.cs
@@ -5,6 +5,7 @@
 using Microsoft.Extensions.Logging;
 using SharpIDE.Application;
 using SharpIDE.Godot.Features.ActivityListener;
+using SharpIDE.Godot.Features.Tools;
 
 namespace SharpIDE.Godot;
 
@@ -23,6 +24,7 @@ public override void _EnterTree()
 
         services.AddApplication();
         services.AddScoped<SharpIdeSolutionManager>();
+        services.AddScoped<SharpIdeToolManager>();
         services.AddScoped<ActivityMonitor>();
 
         services.AddHttpClient();
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeLayoutState.cs b/src/SharpIDE.Godot/Features/Layout/IdeLayoutState.cs
new file mode 100644
index 00000000..a47ab172
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/IdeLayoutState.cs
@@ -0,0 +1,31 @@
+using SharpIDE.Godot.Features.Tools;
+
+namespace SharpIDE.Godot.Features.Layout;
+
+public sealed record IdeLayoutState
+{
+    public static readonly IdeLayoutState Default = new()
+    {
+        SidebarTools = new Dictionary<ToolAnchor, List<IdeToolState>>
+        {
+            [ToolAnchor.LeftTop] =
+            [
+                new IdeToolState(IdeToolId.SolutionExplorer, ToolAnchor.LeftTop, IsActive: true)
+            ],
+            [ToolAnchor.RightTop] = [],
+            [ToolAnchor.BottomLeft] =
+            [
+                new IdeToolState(IdeToolId.Problems, ToolAnchor.BottomLeft, IsActive: false),
+                new IdeToolState(IdeToolId.Run, ToolAnchor.BottomLeft, IsActive: false),
+                new IdeToolState(IdeToolId.Debug, ToolAnchor.BottomLeft, IsActive: false),
+                new IdeToolState(IdeToolId.Build, ToolAnchor.BottomLeft, IsActive: false),
+                new IdeToolState(IdeToolId.Nuget, ToolAnchor.BottomLeft, IsActive: false),
+                new IdeToolState(IdeToolId.TestExplorer, ToolAnchor.BottomLeft, IsActive: false),
+                new IdeToolState(IdeToolId.IdeDiagnostics, ToolAnchor.BottomLeft, IsActive: false)
+            ],
+            [ToolAnchor.BottomRight] = []
+        }
+    };
+
+    public Dictionary<ToolAnchor, List<IdeToolState>> SidebarTools { get; init; } = [];
+}
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeLayoutState.cs.uid b/src/SharpIDE.Godot/Features/Layout/IdeLayoutState.cs.uid
new file mode 100644
index 00000000..24a69d92
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/IdeLayoutState.cs.uid
@@ -0,0 +1 @@
+uid://c1hjlyj0augv1
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeMainLayout.cs b/src/SharpIDE.Godot/Features/Layout/IdeMainLayout.cs
index 1585d8a8..7a87c042 100644
--- a/src/SharpIDE.Godot/Features/Layout/IdeMainLayout.cs
+++ b/src/SharpIDE.Godot/Features/Layout/IdeMainLayout.cs
@@ -1,22 +1,25 @@
 using Godot;
 
-using SharpIDE.Application.Features.Events;
+using SharpIDE.Godot.Features.Layout.Resources;
+using SharpIDE.Godot.Features.Tools;
 
 namespace SharpIDE.Godot.Features.Layout;
 
 public partial class IdeMainLayout : Control
 {
-	private readonly Dictionary<ToolAnchor, ToolArea> _toolAreaMap = [];
-	private readonly Dictionary<ToolAnchor, Control> _sidebarToolsMap = [];
-	private readonly Dictionary<ToolAnchor, ButtonGroup> _toolButtonGroupMap = [];
-	private readonly Dictionary<IdeTool, ToolButton> _toolButtonMap = [];
+	private readonly Dictionary<ToolAnchor, AnchorState> _anchorStateMap = [];
+	private readonly Dictionary<IdeToolId, ToolButton> _toolButtonMap = [];
 
-	private Dictionary<IdeTool, IdeToolInfo> _toolMap = [];
+	[Inject]
+	private readonly SharpIdeToolManager _toolManager = null!;
+
+	private Dictionary<IdeToolId, IdeToolState> _toolStateMap = [];
 
 	private Sidebar _leftSidebar = null!;
 	private Sidebar _rightSidebar = null!;
 	private Control _bottomArea = null!;
 	private ToolDragOverlay _toolDragOverlay = null!;
+	private IdeLayoutState _layout = null!;
 
 	public override void _Ready()
 	{
@@ -24,48 +27,38 @@ public override void _Ready()
 		_rightSidebar = GetNode<Sidebar>("%RightSidebar");
 		_bottomArea = GetNode<Control>("%BottomArea");
 		_toolDragOverlay = GetNode<ToolDragOverlay>("%ToolDragOverlay");
+
+		_anchorStateMap[ToolAnchor.LeftTop] = new AnchorState(
+			_leftSidebar.TopTools,
+			GetNode<ToolArea>("%LeftTopToolArea"),
+			new ButtonGroup { AllowUnpress = true });
+		_anchorStateMap[ToolAnchor.RightTop] = new AnchorState(
+			_rightSidebar.TopTools,
+			GetNode<ToolArea>("%RightTopToolArea"),
+			new ButtonGroup { AllowUnpress = true });
+		_anchorStateMap[ToolAnchor.BottomLeft] = new AnchorState(
+			_leftSidebar.BottomTools,
+			GetNode<ToolArea>("%BottomLeftToolArea"),
+			new ButtonGroup { AllowUnpress = true });
+		_anchorStateMap[ToolAnchor.BottomRight] = new AnchorState(
+			_rightSidebar.BottomTools,
+			GetNode<ToolArea>("%BottomRightToolArea"),
+			new ButtonGroup { AllowUnpress = true });
+
+		// TODO: Load layout from persistence
+		_layout = IdeLayoutState.Default;
 		
-		_toolAreaMap[ToolAnchor.LeftTop] = GetNode<ToolArea>("%LeftTopToolArea");
-		_toolAreaMap[ToolAnchor.RightTop] = GetNode<ToolArea>("%RightTopToolArea");
-		_toolAreaMap[ToolAnchor.BottomLeft] = GetNode<ToolArea>("%BottomLeftToolArea");
-		_toolAreaMap[ToolAnchor.BottomRight] = GetNode<ToolArea>("%BottomRightToolArea");
-
-		_sidebarToolsMap[ToolAnchor.LeftTop] = _leftSidebar.TopTools;
-		_sidebarToolsMap[ToolAnchor.RightTop] = _rightSidebar.TopTools;
-		_sidebarToolsMap[ToolAnchor.BottomLeft] = _leftSidebar.BottomTools;
-		_sidebarToolsMap[ToolAnchor.BottomRight] = _rightSidebar.BottomTools;
-
-		_toolButtonGroupMap[ToolAnchor.LeftTop] = new ButtonGroup
-			{ ResourceName = $"{ToolAnchor.LeftTop}", AllowUnpress = true };
-		_toolButtonGroupMap[ToolAnchor.RightTop] = new ButtonGroup
-			{ ResourceName = $"{ToolAnchor.RightTop}", AllowUnpress = true };
-		_toolButtonGroupMap[ToolAnchor.BottomLeft] = new ButtonGroup
-			{ ResourceName = $"{ToolAnchor.BottomLeft}", AllowUnpress = true };
-		_toolButtonGroupMap[ToolAnchor.BottomRight] = new ButtonGroup
-			{ ResourceName = $"{ToolAnchor.BottomRight}", AllowUnpress = true };
-
-		GodotGlobalEvents.Instance.IdeToolExternallySelected.Subscribe(tool =>
+		InitializeLayout(_layout);
+
+		GodotGlobalEvents.Instance.IdeToolExternallyActivated.Subscribe(tool =>
 		{
 			CallDeferred(
-				nameof(OnIdeToolExternallySelected),
+				nameof(OnIdeToolExternallyActivated),
 				Variant.From(tool));
 			return Task.CompletedTask;
 		});
 
-		_toolDragOverlay.ToolDropped += OnToolDropped;
-	}
-
-	private void OnIdeToolExternallySelected(IdeTool tool)
-	{
-		var anchor = _toolMap[tool].Anchor;
-		
-		foreach (var toolInfo in _toolMap.Values.Where(t => t.Anchor == anchor))
-		{
-			_toolButtonMap[toolInfo.Tool].SetPressedNoSignal(toolInfo.Tool == tool);
-			toolInfo.IsVisible = toolInfo.Tool == tool;
-		}
-		
-		ToggleTool(tool, toggledOn: true);
+		_toolDragOverlay.ToolMoveRequested += OnToolMoveRequested;
 	}
 
 	/// <inheritdoc />
@@ -80,106 +73,175 @@ public override void _Notification(int what)
 				break;
 			case NotificationDragEnd:
 				_toolDragOverlay.Visible = false;
-				UpdateSidebarVisibility();
+				ApplySidebarVisibility();
 				break;
 		}
 	}
 
-	private void OnToolDropped(object? _, ToolDropData dropData)
+	private void InitializeLayout(IdeLayoutState layoutState)
+	{
+		_toolStateMap = layoutState.SidebarTools.Values.SelectMany(x => x).ToDictionary(state => state.ToolId);
+
+		foreach (var anchorState in _anchorStateMap.Values)
+		{
+			anchorState.SidebarTools.RemoveChildren();
+		}
+
+		foreach (var toolState in _toolStateMap.Values)
+		{
+			var anchorState = _anchorStateMap[toolState.Anchor];
+
+			var button = CreateToolButton(toolState);
+			_toolButtonMap[toolState.ToolId] = button;
+
+			anchorState.SidebarTools.AddChild(button);
+
+			if (toolState.IsActive)
+			{
+				var instance = _toolManager.GetInstance(toolState.ToolId);
+
+				anchorState.ToolArea.ShowTool(instance.Control);
+			}
+		}
+
+		ApplySidebarVisibility();
+		ApplyBottomAreaVisibility();
+	}
+
+	private void ActivateTool(IdeToolId toolId)
 	{
-		var toolInfo = _toolMap[dropData.Tool];
-		var toolButton = _toolButtonMap[dropData.Tool];
-		var tools = _sidebarToolsMap[dropData.Anchor];
-		var buttonGroup = _toolButtonGroupMap[dropData.Anchor];
-		var oldToolArea = _toolAreaMap[toolInfo.Anchor];
-		var newToolArea = _toolAreaMap[dropData.Anchor];
+		SetToolActive(toolId, true);
+		_toolButtonMap[toolId].SetPressedNoSignal(true);
+		ApplyToolVisibility(toolId);
+	}
+
+	private void DeactivateTool(IdeToolId toolId)
+	{
+		SetToolActive(toolId, false);
+		_toolButtonMap[toolId].SetPressedNoSignal(false);
+		ApplyToolVisibility(toolId);
+	}
+
+	private void DeactivateTools(ToolAnchor anchor)
+	{
+		foreach (var toolState in _toolStateMap.Values.Where(t => t.Anchor == anchor))
+		{
+			DeactivateTool(toolState.ToolId);
+		}
+	}
+
+	private void MoveTool(IdeToolId toolId, ToolAnchor targetAnchor, int anchorToolIndex)
+	{
+		var toolState = _toolStateMap[toolId];
+		var targetAnchorState = _anchorStateMap[targetAnchor];
+		var toolButton = _toolButtonMap[toolState.ToolId];
+
+		var originAnchor = toolState.Anchor;
+		var originAnchorState = _anchorStateMap[originAnchor];
+
+		_layout.SidebarTools[toolState.Anchor].Remove(toolState);
+		_layout.SidebarTools[targetAnchor].Insert(anchorToolIndex, toolState);
+		toolState.Anchor = targetAnchor;
+
+		if (originAnchor == targetAnchor)
+		{
+			targetAnchorState.SidebarTools.MoveChild(toolButton, anchorToolIndex);
+			return;
+		}
 
 		if (toolButton.GetParent() is { } buttonParent)
 		{
 			buttonParent.RemoveChild(toolButton);
 		}
 
-		if (oldToolArea.ActiveTool?.Tool == dropData.Tool)
+		var instance = _toolManager.GetInstance(toolId);
+
+		if (ReferenceEquals(originAnchorState.ToolArea.CurrentTool, instance.Control))
 		{
-			oldToolArea.SetActiveTool(null);
+			originAnchorState.ToolArea.HideTool();
 		}
 
-		toolInfo.Anchor = dropData.Anchor;
-
-		toolButton.ButtonGroup = buttonGroup;
-		tools.AddChild(toolButton);
-		tools.MoveChild(toolButton, dropData.Index);
+		toolButton.ButtonGroup = targetAnchorState.ButtonGroup;
+		targetAnchorState.SidebarTools.AddChild(toolButton);
+		targetAnchorState.SidebarTools.MoveChild(toolButton, anchorToolIndex);
 
 		if (toolButton.ButtonPressed)
 		{
-			OnIdeToolExternallySelected(toolInfo.Tool);
+			OnIdeToolExternallyActivated(toolState.ToolId);
 		}
 	}
 
-	public void InitializeLayout(IReadOnlyList<IdeToolInfo> toolInfos)
+	private void SetToolActive(IdeToolId toolId, bool isActive)
 	{
-		_toolMap = toolInfos.ToDictionary(toolInfo => toolInfo.Tool);
-		
-		foreach (var sidebarToolGroup in _sidebarToolsMap.Values)
+		_toolStateMap[toolId].IsActive = isActive;
+	}
+
+	private void ApplyToolVisibility(IdeToolId toolId)
+	{
+		var toolState = _toolStateMap[toolId];
+		var toolArea = _anchorStateMap[toolState.Anchor].ToolArea;
+		var instance = _toolManager.GetInstance(toolId);
+
+		if (toolState.IsActive)
 		{
-			sidebarToolGroup.RemoveChildren();
+			toolArea.ShowTool(instance.Control);
 		}
-		
-		foreach (var toolInfo in toolInfos)
+		else
 		{
-			var sidebarToolGroup = _sidebarToolsMap[toolInfo.Anchor];
+			toolArea.HideTool();
+		}
 
-			var button = CreateToolButton(toolInfo);
-			_toolButtonMap[toolInfo.Tool] = button;
-			
-			sidebarToolGroup.AddChild(button);
+		ApplyBottomAreaVisibility();
+	}
 
-			if (toolInfo is { IsPinned: true, IsVisible: true })
-			{
-				_toolAreaMap[toolInfo.Anchor].SetActiveTool(toolInfo);
-			}
+	private void OnIdeToolExternallyActivated(IdeToolId toolId)
+	{
+		if (!_toolStateMap.TryGetValue(toolId, out var toolState))
+		{
+			GD.PrintErr($"Externally activated tool '{toolId}' is not part of layout.");
+			return;
 		}
-		
-		UpdateSidebarVisibility();
-		UpdateBottomAreaVisibility();
+
+		var anchor = toolState.Anchor;
+		DeactivateTools(anchor);
+		ActivateTool(toolId);
 	}
 
-	private void UpdateSidebarVisibility()
+	private void OnToolMoveRequested(object? _, ToolMoveData moveData)
 	{
-		_leftSidebar.Visible =
-			_toolMap.Values.Any(toolInfo => toolInfo.Anchor.IsLeft() && toolInfo.IsPinned);
+		MoveTool(moveData.ToolId, moveData.Anchor, moveData.Index);
+	}
 
-		_rightSidebar.Visible =
-			_toolMap.Values.Any(toolInfo => toolInfo.Anchor.IsRight() && toolInfo.IsPinned);
+	private void ApplySidebarVisibility()
+	{
+		_leftSidebar.Visible = _toolStateMap.Values.Any(toolState => toolState.Anchor.IsLeft());
+		_rightSidebar.Visible = _toolStateMap.Values.Any(toolState => toolState.Anchor.IsRight());
 	}
 
-	private ToolButton CreateToolButton(IdeToolInfo toolInfo)
+	private ToolButton CreateToolButton(IdeToolState toolState)
 	{
-		var toolButton = ResourceLoader.Load<PackedScene>("uid://gcpcsulb43in").Instantiate<ToolButton>();
+		var toolButton = Scenes.ToolButton.Instantiate<ToolButton>();
+
+		toolButton.ToolId = toolState.ToolId;
 
-		toolButton.Tool = toolInfo.Tool;
-		toolButton.SetButtonIcon(toolInfo.Icon);
-		toolButton.Toggled += toggledOn => ToggleTool(toolInfo.Tool,  toggledOn);
-		toolButton.ButtonGroup = _toolButtonGroupMap[toolInfo.Anchor];
-		toolButton.ButtonPressed = toolInfo is { IsPinned: true, IsVisible: true };
+		var icon = IdeToolDescriptors.Descriptors[toolState.ToolId].Icon;
+
+		toolButton.SetButtonIcon(icon);
+		toolButton.Toggled += toggledOn =>
+		{
+			SetToolActive(toolState.ToolId, toggledOn);
+			ApplyToolVisibility(toolState.ToolId);
+		};
+		toolButton.ButtonGroup = _anchorStateMap[toolState.Anchor].ButtonGroup;
+		toolButton.ButtonPressed = toolState.IsActive;
 
 		return toolButton;
 	}
 
-	private void ToggleTool(IdeTool tool, bool toggledOn)
+	private void ApplyBottomAreaVisibility()
 	{
-		var toolInfo = _toolMap[tool];
-		var toolArea = _toolAreaMap[toolInfo.Anchor];
-		
-		toolArea.SetActiveTool(toggledOn ? toolInfo : null);
-		
-		UpdateBottomAreaVisibility();
+		_bottomArea.Visible = _toolStateMap.Values.Any(toolState => toolState.Anchor.IsBottom() && toolState.IsActive);
 	}
 
-	private void UpdateBottomAreaVisibility()
-	{
-		_bottomArea.Visible =
-			_toolMap.Values.Any(toolInfo => toolInfo.Anchor.IsBottom()
-											 && toolInfo is { IsPinned: true, IsVisible: true });
-	}
+	private sealed record AnchorState(Control SidebarTools, ToolArea ToolArea, ButtonGroup ButtonGroup);
 }
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeToolInfo.cs b/src/SharpIDE.Godot/Features/Layout/IdeToolInfo.cs
deleted file mode 100644
index 290ec8f0..00000000
--- a/src/SharpIDE.Godot/Features/Layout/IdeToolInfo.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Godot;
-
-namespace SharpIDE.Godot.Features.Layout;
-
-public enum ToolAnchor
-{
-    None = 0,
-    LeftTop = 1,
-    RightTop = 2,
-    BottomLeft = 3,
-    BottomRight = 4
-}
-
-public record IdeToolInfo(
-    IdeTool Tool,
-    ToolAnchor Anchor,
-    bool IsPinned,
-    bool IsVisible,
-    Control Control,
-    Texture2D Icon)
-{
-    public ToolAnchor Anchor { get; set; } = Anchor;
-    
-    public bool IsPinned { get; set; } = IsPinned;
-
-    public bool IsVisible { get; set; } = IsVisible;
-}
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeToolInfo.cs.uid b/src/SharpIDE.Godot/Features/Layout/IdeToolInfo.cs.uid
deleted file mode 100644
index ff9d2717..00000000
--- a/src/SharpIDE.Godot/Features/Layout/IdeToolInfo.cs.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://cc76jylpg3cfp
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeToolState.cs b/src/SharpIDE.Godot/Features/Layout/IdeToolState.cs
new file mode 100644
index 00000000..05d45adf
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/IdeToolState.cs
@@ -0,0 +1,24 @@
+using SharpIDE.Godot.Features.Tools;
+
+namespace SharpIDE.Godot.Features.Layout;
+
+public sealed record IdeToolState(
+    IdeToolId ToolId,
+    ToolAnchor Anchor,
+    bool IsActive)
+{
+    /// <summary>
+    ///     The ID of the tool.
+    /// </summary>
+    public IdeToolId ToolId { get; init; } = ToolId;
+
+    /// <summary>
+    ///     The current anchor of the tool.
+    /// </summary>
+    public ToolAnchor Anchor { get; set; } = Anchor;
+
+    /// <summary>
+    ///     Indicates if the tool is active.
+    /// </summary>
+    public bool IsActive { get; set; } = IsActive;
+}
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeToolState.cs.uid b/src/SharpIDE.Godot/Features/Layout/IdeToolState.cs.uid
new file mode 100644
index 00000000..6ec2dfda
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/IdeToolState.cs.uid
@@ -0,0 +1 @@
+uid://7cd4qvu71evb
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeTools.cs b/src/SharpIDE.Godot/Features/Layout/IdeTools.cs
deleted file mode 100644
index 186b138f..00000000
--- a/src/SharpIDE.Godot/Features/Layout/IdeTools.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Godot;
-
-namespace SharpIDE.Godot.Features.Layout;
-
-public enum IdeTool
-{
-    SolutionExplorer,
-    Problems,
-    Run,
-    Debug,
-    Build,
-    Nuget,
-    TestExplorer,
-}
-
-public sealed record IdeToolData(Texture2D Icon, PackedScene Scene);
-
-public static class IdeTools
-{
-    public static readonly IReadOnlyDictionary<IdeTool, IdeToolData> ToolDataMap = new Dictionary<IdeTool, IdeToolData>
-    {
-        [IdeTool.SolutionExplorer] = new(Load<Texture2D>("uid://ccj0dw81x3bkc"), Load<PackedScene>("uid://cy1bb32g7j7dr")),
-        [IdeTool.Problems] = new(Load<Texture2D>("uid://uukf1nwjhthv"), Load<PackedScene>("uid://tqpmww430cor")),
-        [IdeTool.Run] = new(Load<Texture2D>("uid://cre7q0efp4vrq"), Load<PackedScene>("uid://bcoytt3bw0gpe")),
-        [IdeTool.Debug] = new(Load<Texture2D>("uid://butisxqww0boc"), Load<PackedScene>("uid://dkjips8oudqou")),
-        [IdeTool.Build] = new(Load<Texture2D>("uid://b0170ypw8uf3a"), Load<PackedScene>("uid://co6dkhdolriej")),
-        [IdeTool.Nuget] = new(Load<Texture2D>("uid://b5ih61vdjv5e6"), Load<PackedScene>("uid://duyxg107nfh2f")),
-        [IdeTool.TestExplorer] = new(Load<Texture2D>("uid://dged1mm438qli"), Load<PackedScene>("uid://hwdok1kch3b3")),
-    };
-
-    private static TResource Load<TResource>(string resourceUid) where TResource : Resource
-    {
-        return ResourceLoader.Load<TResource>(resourceUid);
-    }
-}
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/Layout/Resources/Icons.cs b/src/SharpIDE.Godot/Features/Layout/Resources/Icons.cs
new file mode 100644
index 00000000..31b9e4ad
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/Resources/Icons.cs
@@ -0,0 +1,15 @@
+using Godot;
+
+namespace SharpIDE.Godot.Features.Layout.Resources;
+
+public static class Icons
+{
+    public static readonly Texture2D SolutionExplorer = ResourceLoader.Load<Texture2D>("uid://ccj0dw81x3bkc");
+    public static readonly Texture2D Problems = ResourceLoader.Load<Texture2D>("uid://uukf1nwjhthv");
+    public static readonly Texture2D Run = ResourceLoader.Load<Texture2D>("uid://cre7q0efp4vrq");
+    public static readonly Texture2D Debug = ResourceLoader.Load<Texture2D>("uid://butisxqww0boc");
+    public static readonly Texture2D Build = ResourceLoader.Load<Texture2D>("uid://b0170ypw8uf3a");
+    public static readonly Texture2D Nuget = ResourceLoader.Load<Texture2D>("uid://b5ih61vdjv5e6");
+    public static readonly Texture2D TestExplorer = ResourceLoader.Load<Texture2D>("uid://dged1mm438qli");
+    public static readonly Texture2D IdeDiagnostics = ResourceLoader.Load<Texture2D>("uid://dx8bt0adxpqgy");
+}
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/Layout/Resources/Icons.cs.uid b/src/SharpIDE.Godot/Features/Layout/Resources/Icons.cs.uid
new file mode 100644
index 00000000..4f3f8556
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/Resources/Icons.cs.uid
@@ -0,0 +1 @@
+uid://sn5652n26arl
diff --git a/src/SharpIDE.Godot/Features/Layout/Resources/Scenes.cs b/src/SharpIDE.Godot/Features/Layout/Resources/Scenes.cs
new file mode 100644
index 00000000..a7ea8690
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/Resources/Scenes.cs
@@ -0,0 +1,16 @@
+using Godot;
+
+namespace SharpIDE.Godot.Features.Layout.Resources;
+
+public static class Scenes
+{
+    public static readonly PackedScene SolutionExplorer = ResourceLoader.Load<PackedScene>("uid://cy1bb32g7j7dr");
+    public static readonly PackedScene Problems = ResourceLoader.Load<PackedScene>("uid://tqpmww430cor");
+    public static readonly PackedScene Run = ResourceLoader.Load<PackedScene>("uid://bcoytt3bw0gpe");
+    public static readonly PackedScene Debug = ResourceLoader.Load<PackedScene>("uid://dkjips8oudqou");
+    public static readonly PackedScene Build = ResourceLoader.Load<PackedScene>("uid://co6dkhdolriej");
+    public static readonly PackedScene Nuget = ResourceLoader.Load<PackedScene>("uid://duyxg107nfh2f");
+    public static readonly PackedScene TestExplorer = ResourceLoader.Load<PackedScene>("uid://hwdok1kch3b3");
+    public static readonly PackedScene IdeDiagnostics = ResourceLoader.Load<PackedScene>("uid://b0tjuqq3bca5e");
+    public static readonly PackedScene ToolButton = ResourceLoader.Load<PackedScene>("uid://gcpcsulb43in");
+}
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/Layout/Resources/Scenes.cs.uid b/src/SharpIDE.Godot/Features/Layout/Resources/Scenes.cs.uid
new file mode 100644
index 00000000..4b1ce3d1
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/Resources/Scenes.cs.uid
@@ -0,0 +1 @@
+uid://cdcpmps0kcbou
diff --git a/src/SharpIDE.Godot/Features/Layout/ToolAnchor.cs b/src/SharpIDE.Godot/Features/Layout/ToolAnchor.cs
new file mode 100644
index 00000000..82e41b44
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/ToolAnchor.cs
@@ -0,0 +1,10 @@
+namespace SharpIDE.Godot.Features.Layout;
+
+public enum ToolAnchor
+{
+    None = 0,
+    LeftTop = 1,
+    RightTop = 2,
+    BottomLeft = 3,
+    BottomRight = 4
+}
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/Layout/ToolAnchor.cs.uid b/src/SharpIDE.Godot/Features/Layout/ToolAnchor.cs.uid
new file mode 100644
index 00000000..162b1c45
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Layout/ToolAnchor.cs.uid
@@ -0,0 +1 @@
+uid://dauviio1vuhws
diff --git a/src/SharpIDE.Godot/Features/Layout/ToolArea.cs b/src/SharpIDE.Godot/Features/Layout/ToolArea.cs
index 6ad0660d..feec5739 100644
--- a/src/SharpIDE.Godot/Features/Layout/ToolArea.cs
+++ b/src/SharpIDE.Godot/Features/Layout/ToolArea.cs
@@ -4,41 +4,44 @@ namespace SharpIDE.Godot.Features.Layout;
 
 public partial class ToolArea : Control
 {
-	public IdeToolInfo? ActiveTool { get; private set; }
+	public Control? CurrentTool { get; private set; }
 
 	public override void _Ready()
 	{
 		Visible = false;
 	}
 
-	public void SetActiveTool(IdeToolInfo? toolInfo)
+	public void ShowTool(Control tool)
 	{
-		if (ReferenceEquals(ActiveTool, toolInfo))
+		if (ReferenceEquals(CurrentTool, tool))
 		{
 			return;
 		}
-		
-		if (ActiveTool is not null)
+
+		if (CurrentTool is not null)
 		{
-			RemoveChild(ActiveTool.Control);
-			ActiveTool.IsVisible = false;
+			HideTool();
 		}
-		
-		if (toolInfo is null)
+
+		if (tool.GetParent() is ToolArea parent)
 		{
-			Visible = false;
-			ActiveTool = null;
-			return;
+			parent.HideTool();
 		}
 
-		if (toolInfo.Control.GetParent() is { } parent)
+		CurrentTool = tool;
+
+		AddChild(CurrentTool);
+		Visible = true;
+	}
+
+	public void HideTool()
+	{
+		if (CurrentTool is not null)
 		{
-			parent.RemoveChild(toolInfo.Control);
+			RemoveChild(CurrentTool);
 		}
-		
-		ActiveTool = toolInfo;
-		
-		AddChild(ActiveTool.Control);
-		Visible = ActiveTool.IsVisible = true;
+
+		CurrentTool = null;
+		Visible = false;
 	}
 }
diff --git a/src/SharpIDE.Godot/Features/Layout/ToolButton.cs b/src/SharpIDE.Godot/Features/Layout/ToolButton.cs
index c42b8613..5d2f40e0 100644
--- a/src/SharpIDE.Godot/Features/Layout/ToolButton.cs
+++ b/src/SharpIDE.Godot/Features/Layout/ToolButton.cs
@@ -1,29 +1,26 @@
 using Godot;
 
+using SharpIDE.Godot.Features.Tools;
+
 namespace SharpIDE.Godot.Features.Layout;
 
 public partial class ToolButton : Button
 {
-	public IdeTool Tool { get; set; }
+	public IdeToolId ToolId { get; set; }
 	
 	[Export]
 	public Color DragPreviewColor { get; set; }
 
-	private bool _pressedBeforeDrag;
-	
-
 	/// <inheritdoc />
 	public override Variant _GetDragData(Vector2 atPosition)
 	{
 		SetDragPreview(CreateDragPreview());
 
-		// We save the state and unpress the button without toggle signal,
-		// otherwise Hide() will unpress the button which toggles it.
-		_pressedBeforeDrag = ButtonPressed;
-		SetPressedNoSignal(false);
+		// We disable the button when dragging to ensure the Hide() does not toggle it.
+		Disabled = true;
 		Hide();
 		
-		return Variant.From(Tool);
+		return Variant.From(ToolId);
 	}
 
 	/// <inheritdoc />
@@ -32,8 +29,8 @@ public override void _Notification(int what)
 		switch ((long) what)
 		{
 			case NotificationDragEnd:
+				Disabled = false;
 				Show();
-				SetPressedNoSignal(_pressedBeforeDrag);
 				break;
 		}
 	}
diff --git a/src/SharpIDE.Godot/Features/Layout/ToolDragOverlay.cs b/src/SharpIDE.Godot/Features/Layout/ToolDragOverlay.cs
index a052c848..ad03f718 100644
--- a/src/SharpIDE.Godot/Features/Layout/ToolDragOverlay.cs
+++ b/src/SharpIDE.Godot/Features/Layout/ToolDragOverlay.cs
@@ -1,12 +1,16 @@
+using System.Diagnostics.CodeAnalysis;
+
 using Godot;
 
+using SharpIDE.Godot.Features.Tools;
+
 namespace SharpIDE.Godot.Features.Layout;
 
-public sealed record ToolDropData(IdeTool Tool, ToolAnchor Anchor, int Index);
+public sealed record ToolMoveData(IdeToolId ToolId, ToolAnchor Anchor, int Index);
 
 public partial class ToolDragOverlay : Control
 {
-	private readonly Dictionary<DropZone, ToolAnchor> _dropZoneMap = [];
+	private readonly Dictionary<DropZone, ToolAnchor> _dropZoneAnchorMap = [];
 	private readonly Dictionary<ToolAnchor, Sidebar> _sidebarMap = [];
 
 	[Export]
@@ -27,15 +31,15 @@ public partial class ToolDragOverlay : Control
 	[Export]
 	public DropZone BottomRightZone { get; set; } = null!;
 
-	public event EventHandler<ToolDropData>? ToolDropped;
+	public event EventHandler<ToolMoveData>? ToolMoveRequested;
 
 	public override void _Ready()
 	{
 		// TODO: Sidebar visibility not working
-		_dropZoneMap[LeftTopZone] = ToolAnchor.LeftTop;
-		_dropZoneMap[RightTopZone] = ToolAnchor.RightTop;
-		_dropZoneMap[BottomLeftZone] = ToolAnchor.BottomLeft;
-		_dropZoneMap[BottomRightZone] = ToolAnchor.BottomRight;
+		_dropZoneAnchorMap[LeftTopZone] = ToolAnchor.LeftTop;
+		_dropZoneAnchorMap[RightTopZone] = ToolAnchor.RightTop;
+		_dropZoneAnchorMap[BottomLeftZone] = ToolAnchor.BottomLeft;
+		_dropZoneAnchorMap[BottomRightZone] = ToolAnchor.BottomRight;
 
 		_sidebarMap[ToolAnchor.LeftTop] = LeftSidebar;
 		_sidebarMap[ToolAnchor.RightTop] = RightSidebar;
@@ -46,44 +50,61 @@ public override void _Ready()
 	}
 
 	/// <inheritdoc />
-	public override bool _CanDropData(Vector2 _, Variant data)
+	public override bool _CanDropData(Vector2 pos, Variant data)
 	{
+		if (data.VariantType is not Variant.Type.Int)
+		{
+			return false;
+		}
+		
 		HideToolPreviews();
 		HideDropZoneHighlights();
 
 		var mousePosition = GetGlobalMousePosition();
 
-		foreach (var (zone, anchor) in _dropZoneMap)
+		if (TryGetAnchorAndZoneAtPosition(mousePosition, out var anchor, out var dropZone))
 		{
-			if (InDropZone(zone, mousePosition))
-			{
-				ShowGhostPreview(anchor, mousePosition);
-				zone.Highlight.Show();
-				return true;
-			}
+			ShowGhostPreview(anchor.Value, mousePosition);
+			dropZone.Highlight.Show();
+			return true;
 		}
 
 		return false;
 	}
 
 	/// <inheritdoc />
-	public override void _DropData(Vector2 atPosition, Variant data)
+	public override void _DropData(Vector2 _, Variant data)
 	{
 		var mousePosition = GetGlobalMousePosition();
 
-		foreach (var (zone, anchor) in _dropZoneMap)
+		if (TryGetAnchorAndZoneAtPosition(mousePosition, out var anchor, out var _))
+		{
+			RaiseToolDropped(
+				data.As<IdeToolId>(),
+				anchor.Value,
+				CalculateInsertionIndex(GetSidebarTools(anchor.Value), mousePosition, preview: false));
+		}
+	}
+
+	private bool TryGetAnchorAndZoneAtPosition(
+		Vector2 position,
+		[NotNullWhen(true)] out ToolAnchor? anchor,
+		[NotNullWhen(true)] out DropZone? dropZone)
+	{
+		anchor = null;
+		dropZone = null;
+
+		foreach (var (zone, zoneAnchor) in _dropZoneAnchorMap)
 		{
-			if (InDropZone(zone, mousePosition))
+			if (InDropZone(zone, position))
 			{
-				ToolDropped?.Invoke(
-					sender: this,
-					new ToolDropData(
-						data.As<IdeTool>(),
-						anchor,
-						CalculateInsertionIndex(GetSidebarTools(anchor), mousePosition)));
-				return;
+				anchor = zoneAnchor;
+				dropZone = zone;
+				return true;
 			}
 		}
+
+		return false;
 	}
 
 	private void OnVisibilityChanged()
@@ -95,15 +116,27 @@ private void OnVisibilityChanged()
 		}
 	}
 
-	private void RaiseToolDropped(IdeTool tool, ToolAnchor anchor) { }
+	private void RaiseToolDropped(IdeToolId toolId, ToolAnchor anchor, int index)
+	{
+		ToolMoveRequested?.Invoke(
+			sender: this,
+			new ToolMoveData(
+				toolId,
+				anchor,
+				index));
+	}
 
 	private void ShowGhostPreview(ToolAnchor anchor, Vector2 mousePosition)
 	{
 		var sidebar = _sidebarMap[anchor];
 		var tools = GetSidebarTools(anchor);
-		var previewIndex = CalculateInsertionIndex(tools, mousePosition);
+		var previewIndex = CalculateInsertionIndex(tools, mousePosition, preview: true);
+
+		if (!ReferenceEquals(sidebar.ToolPreview.GetParent(), tools))
+		{
+			tools.AddChild(sidebar.ToolPreview);
+		}
 
-		tools.AddChild(sidebar.ToolPreview);
 		tools.MoveChild(sidebar.ToolPreview, previewIndex);
 	}
 
@@ -134,27 +167,39 @@ private void HideToolPreviews()
 
 	private void HideDropZoneHighlights()
 	{
-		foreach (var zone in _dropZoneMap.Keys)
+		foreach (var zone in _dropZoneAnchorMap.Keys)
 		{
 			zone.Highlight.Hide();
 		}
 	}
 
-	private static int CalculateInsertionIndex(Container tools, Vector2 mousePosition)
+	// TODO: Check why ths does not calculate correct index
+	private static int CalculateInsertionIndex(Container tools, Vector2 mousePosition, bool preview)
 	{
-		foreach (var child in tools.GetChildren().OfType<ToolButton>())
+		var children = tools.GetChildren()
+							.OfType<ToolButton>()
+
+							// When in preview we don't ignore the disabled button (button being dragged)
+							// in order to insert this preview in the correct index.
+							// When calculating the index for the actual insertion we ignore the button being dragged.
+							.Where(button => preview || !button.Disabled)
+							.Index()
+							.ToList();
+
+		foreach (var (index, child) in children)
 		{
 			var rect = child.GetGlobalRect();
-
 			var midpoint = rect.Position.Y + rect.Size.Y / 2.0f;
 
 			if (mousePosition.Y < midpoint)
 			{
-				return child.GetIndex();
+				GD.Print($"[{nameof(CalculateInsertionIndex)}]: {index})");
+				return index;
 			}
 		}
+		GD.Print($"[{nameof(CalculateInsertionIndex)}]: {children.Count})");
 
-		return tools.GetChildCount();
+		return children.Count;
 	}
 
 	private static bool InDropZone(Control dropZone, Vector2 position)
diff --git a/src/SharpIDE.Godot/Features/Run/RunMenuItem.cs b/src/SharpIDE.Godot/Features/Run/RunMenuItem.cs
index 7d421b54..0e314744 100644
--- a/src/SharpIDE.Godot/Features/Run/RunMenuItem.cs
+++ b/src/SharpIDE.Godot/Features/Run/RunMenuItem.cs
@@ -2,6 +2,7 @@
 using SharpIDE.Application.Features.Run;
 using SharpIDE.Application.Features.SolutionDiscovery.VsPersistence;
 using SharpIDE.Godot.Features.Layout;
+using SharpIDE.Godot.Features.Tools;
 
 namespace SharpIDE.Godot.Features.Run;
 
@@ -55,13 +56,13 @@ private async void OnStopButtonPressed()
 
     private async void OnRunButtonPressed()
     {
-		GodotGlobalEvents.Instance.IdeToolExternallySelected.InvokeParallelFireAndForget(IdeTool.Run);
+		GodotGlobalEvents.Instance.IdeToolExternallyActivated.InvokeParallelFireAndForget(IdeToolId.Run);
         await _runService.RunProject(Project).ConfigureAwait(false);
     }
     
     private async void OnDebugButtonPressed()
     {
-        GodotGlobalEvents.Instance.IdeToolExternallySelected.InvokeParallelFireAndForget(IdeTool.Debug);
+        GodotGlobalEvents.Instance.IdeToolExternallyActivated.InvokeParallelFireAndForget(IdeToolId.Debug);
         await _runService.RunProject(Project, true, Singletons.AppState.IdeSettings.DebuggerExecutablePath).ConfigureAwait(false);
     }
 }
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/SolutionExplorer/ContextMenus/ProjectContextMenu.cs b/src/SharpIDE.Godot/Features/SolutionExplorer/ContextMenus/ProjectContextMenu.cs
index 29fd04ee..13793893 100644
--- a/src/SharpIDE.Godot/Features/SolutionExplorer/ContextMenus/ProjectContextMenu.cs
+++ b/src/SharpIDE.Godot/Features/SolutionExplorer/ContextMenus/ProjectContextMenu.cs
@@ -6,6 +6,7 @@
 using SharpIDE.Application.Features.Run;
 using SharpIDE.Application.Features.SolutionDiscovery.VsPersistence;
 using SharpIDE.Godot.Features.Layout;
+using SharpIDE.Godot.Features.Tools;
 
 namespace SharpIDE.Godot.Features.SolutionExplorer;
 
@@ -62,7 +63,7 @@ private void OpenContextMenuProject(SharpIdeProjectModel project)
             {
                 _ = Task.GodotRun(async () =>
                 {
-		            GodotGlobalEvents.Instance.IdeToolExternallySelected.InvokeParallelFireAndForget(IdeTool.Run);
+		            GodotGlobalEvents.Instance.IdeToolExternallyActivated.InvokeParallelFireAndForget(IdeToolId.Run);
                     await _runService.RunProject(project);
                 });
             }
@@ -98,7 +99,7 @@ private void OpenContextMenuProject(SharpIdeProjectModel project)
     }
     private async Task MsBuildProject(SharpIdeProjectModel project, BuildType buildType)
     {
-        GodotGlobalEvents.Instance.IdeToolExternallySelected.InvokeParallelFireAndForget(IdeTool.Build);
+        GodotGlobalEvents.Instance.IdeToolExternallyActivated.InvokeParallelFireAndForget(IdeToolId.Build);
         await _buildService.MsBuildAsync(project.FilePath, buildType);
     }
 }
diff --git a/src/SharpIDE.Godot/Features/Tools/IdeToolDescriptor.cs b/src/SharpIDE.Godot/Features/Tools/IdeToolDescriptor.cs
new file mode 100644
index 00000000..8374e0c8
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Tools/IdeToolDescriptor.cs
@@ -0,0 +1,12 @@
+using Godot;
+
+namespace SharpIDE.Godot.Features.Tools;
+
+public sealed record IdeToolDescriptor(IdeToolId Id, Texture2D Texture, PackedScene Scene)
+{
+    public IdeToolId Id { get; } = Id;
+
+    public Texture2D Icon { get; } = Texture;
+
+    public PackedScene Scene { get; } = Scene;
+}
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/Tools/IdeToolDescriptor.cs.uid b/src/SharpIDE.Godot/Features/Tools/IdeToolDescriptor.cs.uid
new file mode 100644
index 00000000..61cec7f2
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Tools/IdeToolDescriptor.cs.uid
@@ -0,0 +1 @@
+uid://bwppja3c0vvqc
diff --git a/src/SharpIDE.Godot/Features/Tools/IdeToolDescriptors.cs b/src/SharpIDE.Godot/Features/Tools/IdeToolDescriptors.cs
new file mode 100644
index 00000000..9aa2cafb
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Tools/IdeToolDescriptors.cs
@@ -0,0 +1,43 @@
+using SharpIDE.Godot.Features.Layout.Resources;
+
+namespace SharpIDE.Godot.Features.Tools;
+
+public static class IdeToolDescriptors
+{
+    public static readonly IReadOnlyDictionary<IdeToolId, IdeToolDescriptor> Descriptors =
+        new Dictionary<IdeToolId, IdeToolDescriptor>
+        {
+            [IdeToolId.SolutionExplorer] = new(
+                IdeToolId.SolutionExplorer,
+                Icons.SolutionExplorer,
+                Scenes.SolutionExplorer),
+            [IdeToolId.Problems] = new(
+                IdeToolId.Problems,
+                Icons.Problems,
+                Scenes.Problems),
+            [IdeToolId.Run] = new(
+                IdeToolId.Run,
+                Icons.Run,
+                Scenes.Run),
+            [IdeToolId.Debug] = new(
+                IdeToolId.Debug,
+                Icons.Debug,
+                Scenes.Debug),
+            [IdeToolId.Build] = new(
+                IdeToolId.Build,
+                Icons.Build,
+                Scenes.Build),
+            [IdeToolId.Nuget] = new(
+                IdeToolId.Nuget,
+                Icons.Nuget,
+                Scenes.Nuget),
+            [IdeToolId.TestExplorer] = new(
+                IdeToolId.TestExplorer,
+                Icons.TestExplorer,
+                Scenes.TestExplorer),
+            [IdeToolId.IdeDiagnostics] = new(
+                IdeToolId.IdeDiagnostics,
+                Icons.IdeDiagnostics,
+                Scenes.IdeDiagnostics)
+        };
+}
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeTools.cs.uid b/src/SharpIDE.Godot/Features/Tools/IdeToolDescriptors.cs.uid
similarity index 100%
rename from src/SharpIDE.Godot/Features/Layout/IdeTools.cs.uid
rename to src/SharpIDE.Godot/Features/Tools/IdeToolDescriptors.cs.uid
diff --git a/src/SharpIDE.Godot/Features/Tools/IdeToolId.cs b/src/SharpIDE.Godot/Features/Tools/IdeToolId.cs
new file mode 100644
index 00000000..6376e1f6
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Tools/IdeToolId.cs
@@ -0,0 +1,13 @@
+namespace SharpIDE.Godot.Features.Tools;
+
+public enum IdeToolId
+{
+    SolutionExplorer = 0,
+    Problems = 1,
+    Run = 2,
+    Debug = 3,
+    Build = 4,
+    Nuget = 5,
+    TestExplorer = 6,
+    IdeDiagnostics = 7
+}
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/Tools/IdeToolId.cs.uid b/src/SharpIDE.Godot/Features/Tools/IdeToolId.cs.uid
new file mode 100644
index 00000000..984ae352
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Tools/IdeToolId.cs.uid
@@ -0,0 +1 @@
+uid://cx6faxk0kh8cj
diff --git a/src/SharpIDE.Godot/Features/Tools/IdeToolInstance.cs b/src/SharpIDE.Godot/Features/Tools/IdeToolInstance.cs
new file mode 100644
index 00000000..91c0b0fa
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Tools/IdeToolInstance.cs
@@ -0,0 +1,5 @@
+using Godot;
+
+namespace SharpIDE.Godot.Features.Tools;
+
+public sealed record IdeToolInstance(IdeToolId Id, Control Control, Texture2D Icon);
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/Tools/IdeToolInstance.cs.uid b/src/SharpIDE.Godot/Features/Tools/IdeToolInstance.cs.uid
new file mode 100644
index 00000000..b5a09a86
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Tools/IdeToolInstance.cs.uid
@@ -0,0 +1 @@
+uid://cfpyg1slcfb8l
diff --git a/src/SharpIDE.Godot/Features/Tools/SharpIdeToolManager.cs b/src/SharpIDE.Godot/Features/Tools/SharpIdeToolManager.cs
new file mode 100644
index 00000000..95bde65a
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Tools/SharpIdeToolManager.cs
@@ -0,0 +1,22 @@
+using Godot;
+
+namespace SharpIDE.Godot.Features.Tools;
+
+public sealed class SharpIdeToolManager
+{
+    private readonly Dictionary<IdeToolId, IdeToolInstance> _instances = [];
+
+    public IdeToolInstance GetInstance(IdeToolId id)
+    {
+        if (_instances.TryGetValue(id, out var instance))
+        {
+            return instance;
+        }
+
+        var descriptor = IdeToolDescriptors.Descriptors[id];
+        instance = new IdeToolInstance(id, descriptor.Scene.Instantiate<Control>(), descriptor.Icon);
+        _instances[id] = instance;
+
+        return instance;
+    }
+}
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/Tools/SharpIdeToolManager.cs.uid b/src/SharpIDE.Godot/Features/Tools/SharpIdeToolManager.cs.uid
new file mode 100644
index 00000000..d5f8ca48
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/Tools/SharpIdeToolManager.cs.uid
@@ -0,0 +1 @@
+uid://c8kyfppc5dyjd
diff --git a/src/SharpIDE.Godot/GodotGlobalEvents.cs b/src/SharpIDE.Godot/GodotGlobalEvents.cs
index 7b78cff8..42137f11 100644
--- a/src/SharpIDE.Godot/GodotGlobalEvents.cs
+++ b/src/SharpIDE.Godot/GodotGlobalEvents.cs
@@ -2,13 +2,14 @@
 using SharpIDE.Application.Features.Events;
 using SharpIDE.Application.Features.SolutionDiscovery;
 using SharpIDE.Godot.Features.Layout;
+using SharpIDE.Godot.Features.Tools;
 
 namespace SharpIDE.Godot;
 
 public class GodotGlobalEvents
 {
     public static GodotGlobalEvents Instance { get; set; } = null!;
-    public EventWrapper<IdeTool, Task> IdeToolExternallySelected { get; } = new(_ => Task.CompletedTask);
+    public EventWrapper<IdeToolId, Task> IdeToolExternallyActivated { get; } = new(_ => Task.CompletedTask);
     public EventWrapper<SharpIdeFile, SharpIdeFileLinePosition?, Task> FileSelected { get; } = new((_, _) => Task.CompletedTask);
     public EventWrapper<SharpIdeFile, SharpIdeFileLinePosition?, Task> FileExternallySelected { get; } = new((_, _) => Task.CompletedTask);
 }
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/IdeRoot.cs b/src/SharpIDE.Godot/IdeRoot.cs
index a48bc7b4..e70b420e 100644
--- a/src/SharpIDE.Godot/IdeRoot.cs
+++ b/src/SharpIDE.Godot/IdeRoot.cs
@@ -18,6 +18,7 @@
 using SharpIDE.Godot.Features.Search;
 using SharpIDE.Godot.Features.Search.SearchAllFiles;
 using SharpIDE.Godot.Features.SolutionExplorer;
+using SharpIDE.Godot.Features.Tools;
 
 namespace SharpIDE.Godot;
 
@@ -86,63 +87,6 @@ public override void _Ready()
 		_restoreSlnButton.Pressed += OnRestoreSlnButtonPressed;
 		GetTree().GetRoot().FocusExited += OnFocusExited;
 		_nodeReadyTcs.SetResult();
-		
-		// TODO: Add layout profiles and persist layout
-		// TODO: Check how to instantiate views
-		var tools = new[]
-		{
-			new IdeToolInfo(
-				IdeTool.SolutionExplorer,
-				ToolAnchor.LeftTop,
-				IsPinned: true,
-				IsVisible: true,
-				IdeTools.ToolDataMap[IdeTool.SolutionExplorer].Scene.Instantiate<Control>(),
-				IdeTools.ToolDataMap[IdeTool.SolutionExplorer].Icon),
-			new IdeToolInfo(
-				IdeTool.Problems,
-				ToolAnchor.BottomLeft,
-				IsPinned: true,
-				IsVisible: false,
-				IdeTools.ToolDataMap[IdeTool.Problems].Scene.Instantiate<Control>(),
-				IdeTools.ToolDataMap[IdeTool.Problems].Icon),
-			new IdeToolInfo(
-				IdeTool.Run,
-				ToolAnchor.BottomLeft,
-				IsPinned: true,
-				IsVisible: true,
-				IdeTools.ToolDataMap[IdeTool.Run].Scene.Instantiate<Control>(),
-				IdeTools.ToolDataMap[IdeTool.Run].Icon),
-			new IdeToolInfo(
-				IdeTool.Debug,
-				ToolAnchor.BottomLeft,
-				IsPinned: true,
-				IsVisible: false,
-				IdeTools.ToolDataMap[IdeTool.Debug].Scene.Instantiate<Control>(),
-				IdeTools.ToolDataMap[IdeTool.Debug].Icon),
-			new IdeToolInfo(
-				IdeTool.Build,
-				ToolAnchor.BottomLeft,
-				IsPinned: true,
-				IsVisible: false,
-				IdeTools.ToolDataMap[IdeTool.Build].Scene.Instantiate<Control>(),
-				IdeTools.ToolDataMap[IdeTool.Build].Icon),
-			new IdeToolInfo(
-				IdeTool.Nuget,
-				ToolAnchor.BottomLeft,
-				IsPinned: true,
-				IsVisible: false,
-				IdeTools.ToolDataMap[IdeTool.Nuget].Scene.Instantiate<Control>(),
-				IdeTools.ToolDataMap[IdeTool.Nuget].Icon),
-			new IdeToolInfo(
-				IdeTool.TestExplorer,
-				ToolAnchor.BottomLeft,
-				IsPinned: true,
-				IsVisible: false,
-				IdeTools.ToolDataMap[IdeTool.TestExplorer].Scene.Instantiate<Control>(),
-				IdeTools.ToolDataMap[IdeTool.TestExplorer].Icon)
-		};
-
-		_mainLayout.InitializeLayout(tools);
 	}
 	
 	// TODO: Problematic, as this is called even when the focus shifts to an embedded subwindow, such as a popup 
@@ -166,28 +110,28 @@ private async void OnBuildSlnButtonPressed()
 	{
 		await _solutionManager.SolutionReadyTcs.Task;
 		
-		GodotGlobalEvents.Instance.IdeToolExternallySelected.InvokeParallelFireAndForget(IdeTool.Build);
+		GodotGlobalEvents.Instance.IdeToolExternallyActivated.InvokeParallelFireAndForget(IdeToolId.Build);
 		await _buildService.MsBuildAsync(_solutionManager.SolutionModel.FilePath);
 	}
 	private async void OnRebuildSlnButtonPressed()
 	{
 		await _solutionManager.SolutionReadyTcs.Task;
 		
-		GodotGlobalEvents.Instance.IdeToolExternallySelected.InvokeParallelFireAndForget(IdeTool.Build);
+		GodotGlobalEvents.Instance.IdeToolExternallyActivated.InvokeParallelFireAndForget(IdeToolId.Build);
 		await _buildService.MsBuildAsync(_solutionManager.SolutionModel.FilePath, BuildType.Rebuild);
 	}
 	private async void OnCleanSlnButtonPressed()
 	{
 		await _solutionManager.SolutionReadyTcs.Task;
 		
-		GodotGlobalEvents.Instance.IdeToolExternallySelected.InvokeParallelFireAndForget(IdeTool.Build);
+		GodotGlobalEvents.Instance.IdeToolExternallyActivated.InvokeParallelFireAndForget(IdeToolId.Build);
 		await _buildService.MsBuildAsync(_solutionManager.SolutionModel.FilePath, BuildType.Clean);
 	}
 	private async void OnRestoreSlnButtonPressed()
 	{
 		await _solutionManager.SolutionReadyTcs.Task;
 		
-		GodotGlobalEvents.Instance.IdeToolExternallySelected.InvokeParallelFireAndForget(IdeTool.Build);
+		GodotGlobalEvents.Instance.IdeToolExternallyActivated.InvokeParallelFireAndForget(IdeToolId.Build);
 		await _buildService.MsBuildAsync(_solutionManager.SolutionModel.FilePath, BuildType.Restore);
 	}
 

From e92ab82064be1ab253fb4ab5c4ceec22f9f3a0b3 Mon Sep 17 00:00:00 2001
From: Manuel Gasser <manuel.gasser.ch@gmail.com>
Date: Wed, 24 Dec 2025 13:01:19 +0100
Subject: [PATCH 09/11] Remove TODOs and reorder methods

---
 .../Features/Layout/IdeMainLayout.cs          | 76 +++++++++----------
 .../Features/Layout/ToolDragOverlay.cs        | 66 ++++++++--------
 2 files changed, 69 insertions(+), 73 deletions(-)

diff --git a/src/SharpIDE.Godot/Features/Layout/IdeMainLayout.cs b/src/SharpIDE.Godot/Features/Layout/IdeMainLayout.cs
index 7a87c042..cc7db608 100644
--- a/src/SharpIDE.Godot/Features/Layout/IdeMainLayout.cs
+++ b/src/SharpIDE.Godot/Features/Layout/IdeMainLayout.cs
@@ -78,6 +78,24 @@ public override void _Notification(int what)
 		}
 	}
 
+	private void OnIdeToolExternallyActivated(IdeToolId toolId)
+	{
+		if (!_toolStateMap.TryGetValue(toolId, out var toolState))
+		{
+			GD.PrintErr($"Externally activated tool '{toolId}' is not part of layout.");
+			return;
+		}
+
+		var anchor = toolState.Anchor;
+		DeactivateTools(anchor);
+		ActivateTool(toolId);
+	}
+
+	private void OnToolMoveRequested(object? _, ToolMoveData moveData)
+	{
+		MoveTool(moveData.ToolId, moveData.Anchor, moveData.Index);
+	}
+
 	private void InitializeLayout(IdeLayoutState layoutState)
 	{
 		_toolStateMap = layoutState.SidebarTools.Values.SelectMany(x => x).ToDictionary(state => state.ToolId);
@@ -176,6 +194,26 @@ private void SetToolActive(IdeToolId toolId, bool isActive)
 		_toolStateMap[toolId].IsActive = isActive;
 	}
 
+	private ToolButton CreateToolButton(IdeToolState toolState)
+	{
+		var toolButton = Scenes.ToolButton.Instantiate<ToolButton>();
+
+		toolButton.ToolId = toolState.ToolId;
+
+		var icon = IdeToolDescriptors.Descriptors[toolState.ToolId].Icon;
+
+		toolButton.SetButtonIcon(icon);
+		toolButton.Toggled += toggledOn =>
+		{
+			SetToolActive(toolState.ToolId, toggledOn);
+			ApplyToolVisibility(toolState.ToolId);
+		};
+		toolButton.ButtonGroup = _anchorStateMap[toolState.Anchor].ButtonGroup;
+		toolButton.ButtonPressed = toolState.IsActive;
+
+		return toolButton;
+	}
+
 	private void ApplyToolVisibility(IdeToolId toolId)
 	{
 		var toolState = _toolStateMap[toolId];
@@ -194,50 +232,12 @@ private void ApplyToolVisibility(IdeToolId toolId)
 		ApplyBottomAreaVisibility();
 	}
 
-	private void OnIdeToolExternallyActivated(IdeToolId toolId)
-	{
-		if (!_toolStateMap.TryGetValue(toolId, out var toolState))
-		{
-			GD.PrintErr($"Externally activated tool '{toolId}' is not part of layout.");
-			return;
-		}
-
-		var anchor = toolState.Anchor;
-		DeactivateTools(anchor);
-		ActivateTool(toolId);
-	}
-
-	private void OnToolMoveRequested(object? _, ToolMoveData moveData)
-	{
-		MoveTool(moveData.ToolId, moveData.Anchor, moveData.Index);
-	}
-
 	private void ApplySidebarVisibility()
 	{
 		_leftSidebar.Visible = _toolStateMap.Values.Any(toolState => toolState.Anchor.IsLeft());
 		_rightSidebar.Visible = _toolStateMap.Values.Any(toolState => toolState.Anchor.IsRight());
 	}
 
-	private ToolButton CreateToolButton(IdeToolState toolState)
-	{
-		var toolButton = Scenes.ToolButton.Instantiate<ToolButton>();
-
-		toolButton.ToolId = toolState.ToolId;
-
-		var icon = IdeToolDescriptors.Descriptors[toolState.ToolId].Icon;
-
-		toolButton.SetButtonIcon(icon);
-		toolButton.Toggled += toggledOn =>
-		{
-			SetToolActive(toolState.ToolId, toggledOn);
-			ApplyToolVisibility(toolState.ToolId);
-		};
-		toolButton.ButtonGroup = _anchorStateMap[toolState.Anchor].ButtonGroup;
-		toolButton.ButtonPressed = toolState.IsActive;
-
-		return toolButton;
-	}
-
 	private void ApplyBottomAreaVisibility()
 	{
 		_bottomArea.Visible = _toolStateMap.Values.Any(toolState => toolState.Anchor.IsBottom() && toolState.IsActive);
diff --git a/src/SharpIDE.Godot/Features/Layout/ToolDragOverlay.cs b/src/SharpIDE.Godot/Features/Layout/ToolDragOverlay.cs
index ad03f718..73efb6eb 100644
--- a/src/SharpIDE.Godot/Features/Layout/ToolDragOverlay.cs
+++ b/src/SharpIDE.Godot/Features/Layout/ToolDragOverlay.cs
@@ -35,7 +35,6 @@ public partial class ToolDragOverlay : Control
 
 	public override void _Ready()
 	{
-		// TODO: Sidebar visibility not working
 		_dropZoneAnchorMap[LeftTopZone] = ToolAnchor.LeftTop;
 		_dropZoneAnchorMap[RightTopZone] = ToolAnchor.RightTop;
 		_dropZoneAnchorMap[BottomLeftZone] = ToolAnchor.BottomLeft;
@@ -86,6 +85,25 @@ public override void _DropData(Vector2 _, Variant data)
 		}
 	}
 
+	private void OnVisibilityChanged()
+	{
+		if (!Visible)
+		{
+			HideToolPreviews();
+			HideDropZoneHighlights();
+		}
+	}
+
+	private void RaiseToolDropped(IdeToolId toolId, ToolAnchor anchor, int index)
+	{
+		ToolMoveRequested?.Invoke(
+			sender: this,
+			new ToolMoveData(
+				toolId,
+				anchor,
+				index));
+	}
+
 	private bool TryGetAnchorAndZoneAtPosition(
 		Vector2 position,
 		[NotNullWhen(true)] out ToolAnchor? anchor,
@@ -107,25 +125,6 @@ private bool TryGetAnchorAndZoneAtPosition(
 		return false;
 	}
 
-	private void OnVisibilityChanged()
-	{
-		if (!Visible)
-		{
-			HideToolPreviews();
-			HideDropZoneHighlights();
-		}
-	}
-
-	private void RaiseToolDropped(IdeToolId toolId, ToolAnchor anchor, int index)
-	{
-		ToolMoveRequested?.Invoke(
-			sender: this,
-			new ToolMoveData(
-				toolId,
-				anchor,
-				index));
-	}
-
 	private void ShowGhostPreview(ToolAnchor anchor, Vector2 mousePosition)
 	{
 		var sidebar = _sidebarMap[anchor];
@@ -140,18 +139,6 @@ private void ShowGhostPreview(ToolAnchor anchor, Vector2 mousePosition)
 		tools.MoveChild(sidebar.ToolPreview, previewIndex);
 	}
 
-	private Container GetSidebarTools(ToolAnchor anchor)
-	{
-		var sidebar = _sidebarMap[anchor];
-
-		return anchor switch
-		{
-			ToolAnchor.LeftTop or ToolAnchor.RightTop => sidebar.TopTools,
-			ToolAnchor.BottomLeft or ToolAnchor.BottomRight => sidebar.BottomTools,
-			_ => throw new ArgumentException($"No tools to show preview in for anchor '{anchor}'.", nameof(anchor))
-		};
-	}
-
 	private void HideToolPreviews()
 	{
 		if (LeftSidebar.ToolPreview.GetParent() is { } leftParent)
@@ -173,7 +160,18 @@ private void HideDropZoneHighlights()
 		}
 	}
 
-	// TODO: Check why ths does not calculate correct index
+	private Container GetSidebarTools(ToolAnchor anchor)
+	{
+		var sidebar = _sidebarMap[anchor];
+
+		return anchor switch
+		{
+			ToolAnchor.LeftTop or ToolAnchor.RightTop => sidebar.TopTools,
+			ToolAnchor.BottomLeft or ToolAnchor.BottomRight => sidebar.BottomTools,
+			_ => throw new ArgumentException($"No tools to show preview in for anchor '{anchor}'.", nameof(anchor))
+		};
+	}
+	
 	private static int CalculateInsertionIndex(Container tools, Vector2 mousePosition, bool preview)
 	{
 		var children = tools.GetChildren()
@@ -193,11 +191,9 @@ private static int CalculateInsertionIndex(Container tools, Vector2 mousePositio
 
 			if (mousePosition.Y < midpoint)
 			{
-				GD.Print($"[{nameof(CalculateInsertionIndex)}]: {index})");
 				return index;
 			}
 		}
-		GD.Print($"[{nameof(CalculateInsertionIndex)}]: {children.Count})");
 
 		return children.Count;
 	}

From 3fa9b324b4c0d98ee74ab3fa9bee1e9d7ce6b010 Mon Sep 17 00:00:00 2001
From: Manuel Gasser <manuel.gasser.ch@gmail.com>
Date: Wed, 24 Dec 2025 14:01:16 +0100
Subject: [PATCH 10/11] Remove unecessary changes

---
 src/SharpIDE.Godot/DiAutoload.cs              |  2 +-
 .../Features/CodeEditor/CodeEditorPanel.cs    | 16 ++++-----
 .../Features/Layout/IdeMainLayout.cs          | 12 +++----
 .../Features/Nuget/NugetPanel.cs              |  6 ++--
 .../Features/Problems/ProblemsPanel.cs        |  8 ++---
 .../SolutionExplorer/SolutionExplorerPanel.cs | 17 ++-------
 .../TestExplorer/TestExplorerPanel.cs         | 10 +++---
 .../Features/Tools/SharpIdeToolManager.cs     | 10 ++++++
 src/SharpIDE.Godot/IdeRoot.cs                 | 36 +++++++++----------
 .../SharpIdeSolutionAccessor.cs               |  9 +++++
 .../SharpIdeSolutionAccessor.cs.uid           |  1 +
 src/SharpIDE.Godot/SharpIdeSolutionManager.cs | 22 ------------
 12 files changed, 68 insertions(+), 81 deletions(-)
 create mode 100644 src/SharpIDE.Godot/SharpIdeSolutionAccessor.cs
 create mode 100644 src/SharpIDE.Godot/SharpIdeSolutionAccessor.cs.uid
 delete mode 100644 src/SharpIDE.Godot/SharpIdeSolutionManager.cs

diff --git a/src/SharpIDE.Godot/DiAutoload.cs b/src/SharpIDE.Godot/DiAutoload.cs
index 7d805ba5..82f7deac 100644
--- a/src/SharpIDE.Godot/DiAutoload.cs
+++ b/src/SharpIDE.Godot/DiAutoload.cs
@@ -23,7 +23,7 @@ public override void _EnterTree()
         var services = new ServiceCollection();
 
         services.AddApplication();
-        services.AddScoped<SharpIdeSolutionManager>();
+        services.AddScoped<SharpIdeSolutionAccessor>();
         services.AddScoped<SharpIdeToolManager>();
         services.AddScoped<ActivityMonitor>();
 
diff --git a/src/SharpIDE.Godot/Features/CodeEditor/CodeEditorPanel.cs b/src/SharpIDE.Godot/Features/CodeEditor/CodeEditorPanel.cs
index 83140efd..b38b7305 100644
--- a/src/SharpIDE.Godot/Features/CodeEditor/CodeEditorPanel.cs
+++ b/src/SharpIDE.Godot/Features/CodeEditor/CodeEditorPanel.cs
@@ -17,13 +17,12 @@ public partial class CodeEditorPanel : MarginContainer
 {
 	[Export]
 	public Texture2D CsFileTexture { get; set; } = null!;
+	public SharpIdeSolutionModel Solution { get; set; } = null!;
 	private PackedScene _sharpIdeCodeEditScene = GD.Load<PackedScene>("res://Features/CodeEditor/SharpIdeCodeEdit.tscn");
 	private TabContainer _tabContainer = null!;
 	private ConcurrentDictionary<SharpIdeProjectModel, ExecutionStopInfo> _debuggerExecutionStopInfoByProject = [];
 	
 	[Inject] private readonly RunService _runService = null!;
-	[Inject] private readonly SharpIdeSolutionManager _solutionManager = null!;
-	
 	public override void _Ready()
 	{
 		_tabContainer = GetNode<TabContainer>("TabContainer");
@@ -34,7 +33,6 @@ public override void _Ready()
 		tabBar.TabClosePressed += OnTabClosePressed;
 		GlobalEvents.Instance.DebuggerExecutionStopped.Subscribe(OnDebuggerExecutionStopped);
 		GlobalEvents.Instance.ProjectStoppedDebugging.Subscribe(OnProjectStoppedDebugging);
-		GodotGlobalEvents.Instance.FileSelected.Subscribe(SetSharpIdeFile);
 	}
 
 	public override void _GuiInput(InputEvent @event)
@@ -71,7 +69,7 @@ private void AdjustCodeEditorUiScale(bool increase)
 	public override void _ExitTree()
 	{
 		var selectedTabIndex = _tabContainer.CurrentTab;
-		var thisSolution = Singletons.AppState.RecentSlns.Single(s => s.FilePath == _solutionManager.SolutionModel.FilePath);
+		var thisSolution = Singletons.AppState.RecentSlns.Single(s => s.FilePath == Solution.FilePath);
 		thisSolution.IdeSolutionState.OpenTabs = _tabContainer.GetChildren().OfType<SharpIdeCodeEdit>()
 			.Select((t, index) => new OpenTab
 			{
@@ -126,7 +124,7 @@ private void OnTabClosePressed(long tabIndex)
 		tab.QueueFree();
 	}
 
-	private async Task SetSharpIdeFile(SharpIdeFile file, SharpIdeFileLinePosition? fileLinePosition)
+	public async Task SetSharpIdeFile(SharpIdeFile file, SharpIdeFileLinePosition? fileLinePosition)
 	{
 		await Task.CompletedTask.ConfigureAwait(ConfigureAwaitOptions.ForceYielding);
 		var existingTab = await this.InvokeAsync(() => _tabContainer.GetChildren().OfType<SharpIdeCodeEdit>().FirstOrDefault(t => t.SharpIdeFile == file));
@@ -141,7 +139,7 @@ await this.InvokeAsync(() =>
 			return;
 		}
 		var newTab = _sharpIdeCodeEditScene.Instantiate<SharpIdeCodeEdit>();
-		newTab.Solution = _solutionManager.SolutionModel;
+		newTab.Solution = Solution;
 		await this.InvokeAsync(() =>
 		{
 			_tabContainer.AddChild(newTab);
@@ -169,11 +167,13 @@ await this.InvokeAsync(() =>
 	private static readonly Color ExecutingLineColor = new Color("665001");
 	private async Task OnDebuggerExecutionStopped(ExecutionStopInfo executionStopInfo)
 	{
+		Guard.Against.Null(Solution, nameof(Solution));
+		
 		var currentSharpIdeFile = await this.InvokeAsync<SharpIdeFile>(() => _tabContainer.GetChild<SharpIdeCodeEdit>(_tabContainer.CurrentTab).SharpIdeFile);
 		
 		if (executionStopInfo.FilePath != currentSharpIdeFile?.Path)
 		{
-			var file = _solutionManager.SolutionModel.AllFiles[executionStopInfo.FilePath];
+			var file = Solution.AllFiles[executionStopInfo.FilePath];
 			await GodotGlobalEvents.Instance.FileExternallySelected.InvokeParallelAsync(file, null).ConfigureAwait(false);
 		}
 		var lineInt = executionStopInfo.Line - 1; // Debugging is 1-indexed, Godot is 0-indexed
@@ -244,4 +244,4 @@ public void SetIconsForFileExtension(SharpIdeFile file, int newTabIndex)
 			//tabContainer.SetIconOverlay(0, overlayIcon);
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/Layout/IdeMainLayout.cs b/src/SharpIDE.Godot/Features/Layout/IdeMainLayout.cs
index cc7db608..75d7480e 100644
--- a/src/SharpIDE.Godot/Features/Layout/IdeMainLayout.cs
+++ b/src/SharpIDE.Godot/Features/Layout/IdeMainLayout.cs
@@ -116,9 +116,9 @@ private void InitializeLayout(IdeLayoutState layoutState)
 
 			if (toolState.IsActive)
 			{
-				var instance = _toolManager.GetInstance(toolState.ToolId);
+				var toolControl = _toolManager.GetControl<Control>(toolState.ToolId);
 
-				anchorState.ToolArea.ShowTool(instance.Control);
+				anchorState.ToolArea.ShowTool(toolControl);
 			}
 		}
 
@@ -172,9 +172,9 @@ private void MoveTool(IdeToolId toolId, ToolAnchor targetAnchor, int anchorToolI
 			buttonParent.RemoveChild(toolButton);
 		}
 
-		var instance = _toolManager.GetInstance(toolId);
+		var toolControl = _toolManager.GetControl<Control>(toolId);
 
-		if (ReferenceEquals(originAnchorState.ToolArea.CurrentTool, instance.Control))
+		if (ReferenceEquals(originAnchorState.ToolArea.CurrentTool, toolControl))
 		{
 			originAnchorState.ToolArea.HideTool();
 		}
@@ -218,11 +218,11 @@ private void ApplyToolVisibility(IdeToolId toolId)
 	{
 		var toolState = _toolStateMap[toolId];
 		var toolArea = _anchorStateMap[toolState.Anchor].ToolArea;
-		var instance = _toolManager.GetInstance(toolId);
+		var toolControl = _toolManager.GetControl<Control>(toolId);
 
 		if (toolState.IsActive)
 		{
-			toolArea.ShowTool(instance.Control);
+			toolArea.ShowTool(toolControl);
 		}
 		else
 		{
diff --git a/src/SharpIDE.Godot/Features/Nuget/NugetPanel.cs b/src/SharpIDE.Godot/Features/Nuget/NugetPanel.cs
index 3e506fc5..682545a4 100644
--- a/src/SharpIDE.Godot/Features/Nuget/NugetPanel.cs
+++ b/src/SharpIDE.Godot/Features/Nuget/NugetPanel.cs
@@ -30,7 +30,7 @@ public partial class NugetPanel : Control
 	private SharpIdeSolutionModel? _solution;
 	
 	[Inject] private readonly NugetClientService _nugetClientService = null!;
-	[Inject] private readonly SharpIdeSolutionManager _sharpIdeSolutionManager = null!;
+	[Inject] private readonly SharpIdeSolutionAccessor _sharpIdeSolutionAccessor = null!;
 	[Inject] private readonly ActivityMonitor _activityMonitor = null!;
 	
 	private readonly PackedScene _packageEntryScene = ResourceLoader.Load<PackedScene>("uid://cqc2xlt81ju8s");
@@ -70,8 +70,8 @@ public override void _Ready()
 
 	private async Task _AsyncReady()
 	{
-		await _sharpIdeSolutionManager.SolutionReadyTcs.Task;
-		_solution = _sharpIdeSolutionManager.SolutionModel;
+		await _sharpIdeSolutionAccessor.SolutionReadyTcs.Task;
+		_solution = _sharpIdeSolutionAccessor.SolutionModel;
 		_projects = [null!, .._solution!.AllProjects.OrderBy(s => s.Name)]; // So that index 0 is solution // Probably should use Item Metadata instead of this
 		await this.InvokeAsync(() =>
 		{
diff --git a/src/SharpIDE.Godot/Features/Problems/ProblemsPanel.cs b/src/SharpIDE.Godot/Features/Problems/ProblemsPanel.cs
index fbf7fd5b..2eb2e0ce 100644
--- a/src/SharpIDE.Godot/Features/Problems/ProblemsPanel.cs
+++ b/src/SharpIDE.Godot/Features/Problems/ProblemsPanel.cs
@@ -18,7 +18,7 @@ public partial class ProblemsPanel : Control
     [Export]
     public Texture2D CsprojIcon { get; set; } = null!;
     
-    [Inject] private readonly SharpIdeSolutionManager _sharpIdeSolutionManager = null!;
+    [Inject] private readonly SharpIdeSolutionAccessor _sharpIdeSolutionAccessor = null!;
     
 	private Tree _tree = null!;
     private TreeItem _rootItem = null!;
@@ -38,8 +38,8 @@ public override void _Ready()
 
     private async Task AsyncReady()
     {
-        await _sharpIdeSolutionManager.SolutionReadyTcs.Task;
-        _projects.AddRange(_sharpIdeSolutionManager.SolutionModel.AllProjects);
+        await _sharpIdeSolutionAccessor.SolutionReadyTcs.Task;
+        _projects.AddRange(_sharpIdeSolutionAccessor.SolutionModel.AllProjects);
     }
 
     public void BindToTree(ObservableHashSet<SharpIdeProjectModel> list)
@@ -200,7 +200,7 @@ private void TreeOnItemActivated()
     
     private void OpenDocumentContainingDiagnostic(SharpIdeDiagnostic diagnostic)
     {
-        var file = _sharpIdeSolutionManager.SolutionModel.AllFiles[diagnostic.FilePath];
+        var file = _sharpIdeSolutionAccessor.SolutionModel.AllFiles[diagnostic.FilePath];
         var linePosition = new SharpIdeFileLinePosition(diagnostic.Span.Start.Line, diagnostic.Span.Start.Character);
         GodotGlobalEvents.Instance.FileExternallySelected.InvokeParallelFireAndForget(file, linePosition);
     }
diff --git a/src/SharpIDE.Godot/Features/SolutionExplorer/SolutionExplorerPanel.cs b/src/SharpIDE.Godot/Features/SolutionExplorer/SolutionExplorerPanel.cs
index 42c5ae0a..5599ada6 100644
--- a/src/SharpIDE.Godot/Features/SolutionExplorer/SolutionExplorerPanel.cs
+++ b/src/SharpIDE.Godot/Features/SolutionExplorer/SolutionExplorerPanel.cs
@@ -1,13 +1,11 @@
 using System.Collections.Specialized;
-using System.Runtime.CompilerServices;
-
 using Ardalis.GuardClauses;
 using Godot;
 using ObservableCollections;
 using R3;
 using SharpIDE.Application;
 using SharpIDE.Application.Features.Analysis;
-using SharpIDE.Application.Features.Events;
+using SharpIDE.Application.Features.NavigationHistory;
 using SharpIDE.Application.Features.SolutionDiscovery;
 using SharpIDE.Application.Features.SolutionDiscovery.VsPersistence;
 using SharpIDE.Godot.Features.Common;
@@ -29,6 +27,7 @@ public partial class SolutionExplorerPanel : MarginContainer
 	[Export]
 	public Texture2D SlnIcon { get; set; } = null!;
 	
+	public SharpIdeSolutionModel SolutionModel { get; set; } = null!;
 	private PanelContainer _panelContainer = null!;
 	private Tree _tree = null!;
 	private TreeItem _rootItem = null!;
@@ -36,9 +35,6 @@ public partial class SolutionExplorerPanel : MarginContainer
 	private enum ClipboardOperation { Cut, Copy }
 
 	private (List<IFileOrFolder>, ClipboardOperation)? _itemsOnClipboard;
-	
-	[Inject] private readonly SharpIdeSolutionManager _solutionManager = null!;
-	
 	public override void _Ready()
 	{
 		_panelContainer = GetNode<PanelContainer>("PanelContainer");
@@ -47,14 +43,6 @@ public override void _Ready()
 		// Remove the tree from the scene tree for now, we will add it back when we bind to a solution
 		_panelContainer.RemoveChild(_tree);
 		GodotGlobalEvents.Instance.FileExternallySelected.Subscribe(OnFileExternallySelected);
-
-		_ = Task.GodotRun(_AsyncReady);
-	}
-
-	private async Task _AsyncReady()
-	{
-		await _solutionManager.SolutionReadyTcs.Task;
-		await BindToSolution(_solutionManager.SolutionModel);
 	}
 
 	public override void _UnhandledKeyInput(InputEvent @event)
@@ -142,6 +130,7 @@ await this.InvokeAsync(() =>
 		return null;
 	}
 
+	public async Task BindToSolution() => await BindToSolution(SolutionModel);
 	[RequiresGodotUiThread]
 	public async Task BindToSolution(SharpIdeSolutionModel solution)
 	{
diff --git a/src/SharpIDE.Godot/Features/TestExplorer/TestExplorerPanel.cs b/src/SharpIDE.Godot/Features/TestExplorer/TestExplorerPanel.cs
index 030ad8a0..86187ce0 100644
--- a/src/SharpIDE.Godot/Features/TestExplorer/TestExplorerPanel.cs
+++ b/src/SharpIDE.Godot/Features/TestExplorer/TestExplorerPanel.cs
@@ -7,7 +7,7 @@ namespace SharpIDE.Godot.Features.TestExplorer;
 
 public partial class TestExplorerPanel : Control
 {
-    [Inject] private readonly SharpIdeSolutionManager _solutionManager = null!;
+    [Inject] private readonly SharpIdeSolutionAccessor _solutionAccessor = null!;
     [Inject] private readonly TestRunnerService _testRunnerService = null!;
     [Inject] private readonly BuildService _buildService = null!;
     
@@ -40,8 +40,8 @@ private void OnRefreshButtonPressed()
 
     private async Task DiscoverTestNodesForSolution(bool withBuild)
     {
-        await _solutionManager.SolutionReadyTcs.Task;
-        var solution = _solutionManager.SolutionModel!;
+        await _solutionAccessor.SolutionReadyTcs.Task;
+        var solution = _solutionAccessor.SolutionModel!;
         if (withBuild)
         {
             await _buildService.MsBuildAsync(solution.FilePath);
@@ -68,8 +68,8 @@ private void OnRunAllTestsButtonPressed()
     {
         _ = Task.GodotRun(async () =>
         {
-            await _solutionManager.SolutionReadyTcs.Task;
-            var solution = _solutionManager.SolutionModel!;
+            await _solutionAccessor.SolutionReadyTcs.Task;
+            var solution = _solutionAccessor.SolutionModel!;
             await _buildService.MsBuildAsync(solution.FilePath);
             await this.InvokeAsync(() => _testNodesVBoxContainer.QueueFreeChildren());
             _testNodeEntryNodes.Clear();
diff --git a/src/SharpIDE.Godot/Features/Tools/SharpIdeToolManager.cs b/src/SharpIDE.Godot/Features/Tools/SharpIdeToolManager.cs
index 95bde65a..1e509c72 100644
--- a/src/SharpIDE.Godot/Features/Tools/SharpIdeToolManager.cs
+++ b/src/SharpIDE.Godot/Features/Tools/SharpIdeToolManager.cs
@@ -19,4 +19,14 @@ public IdeToolInstance GetInstance(IdeToolId id)
 
         return instance;
     }
+
+    public TNode GetControl<TNode>(IdeToolId id) where TNode : Control
+    {
+        return (TNode)GetInstance(id).Control;
+    }
+
+    public Texture2D GetIcon(IdeToolId id)
+    {
+        return GetInstance(id).Icon;
+    }
 }
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/IdeRoot.cs b/src/SharpIDE.Godot/IdeRoot.cs
index e70b420e..1585143c 100644
--- a/src/SharpIDE.Godot/IdeRoot.cs
+++ b/src/SharpIDE.Godot/IdeRoot.cs
@@ -12,6 +12,7 @@
 using SharpIDE.Application.Features.FileWatching;
 using SharpIDE.Application.Features.NavigationHistory;
 using SharpIDE.Application.Features.SolutionDiscovery;
+using SharpIDE.Application.Features.SolutionDiscovery.VsPersistence;
 using SharpIDE.Godot.Features.CodeEditor;
 using SharpIDE.Godot.Features.Layout;
 using SharpIDE.Godot.Features.Run;
@@ -25,7 +26,6 @@ namespace SharpIDE.Godot;
 public partial class IdeRoot : Control
 {
 	public IdeWindow IdeWindow { get; set; } = null!;
-	
 	private Button _openSlnButton = null!;
 	private Button _buildSlnButton = null!;
 	private Button _rebuildSlnButton = null!;
@@ -49,8 +49,9 @@ public partial class IdeRoot : Control
 	[Inject] private readonly IdeOpenTabsFileManager _openTabsFileManager = null!;
 	[Inject] private readonly RoslynAnalysis _roslynAnalysis = null!;
 	[Inject] private readonly SharpIdeSolutionModificationService _sharpIdeSolutionModificationService = null!;
+	[Inject] private readonly SharpIdeSolutionAccessor _sharpIdeSolutionAccessor = null!;
 	[Inject] private readonly IdeNavigationHistoryService _navigationHistoryService = null!;
-	[Inject] private readonly SharpIdeSolutionManager _solutionManager = null!;
+	[Inject] private readonly SharpIdeToolManager _toolManager = null!;
 	[Inject] private readonly ILogger<IdeRoot> _logger = null!;
 
 	public override void _EnterTree()
@@ -77,7 +78,8 @@ public override void _Ready()
 		_searchWindow = GetNode<SearchWindow>("%SearchWindow");
 		_searchAllFilesWindow = GetNode<SearchAllFilesWindow>("%SearchAllFilesWindow");
 		_mainLayout = GetNode<IdeMainLayout>("%MainLayout");
-		
+		_codeEditorPanel = _mainLayout.GetNode<CodeEditorPanel>("%CodeEditor");
+
 		_runMenuButton.Pressed += OnRunMenuButtonPressed;
 		GodotGlobalEvents.Instance.FileSelected.Subscribe(OnSolutionExplorerPanelOnFileSelected);
 		_openSlnButton.Pressed += () => IdeWindow.PickSolution();
@@ -108,37 +110,29 @@ private void OnRunMenuButtonPressed()
 
 	private async void OnBuildSlnButtonPressed()
 	{
-		await _solutionManager.SolutionReadyTcs.Task;
-		
 		GodotGlobalEvents.Instance.IdeToolExternallyActivated.InvokeParallelFireAndForget(IdeToolId.Build);
-		await _buildService.MsBuildAsync(_solutionManager.SolutionModel.FilePath);
+		await _buildService.MsBuildAsync(_sharpIdeSolutionAccessor.SolutionModel.FilePath);
 	}
 	private async void OnRebuildSlnButtonPressed()
 	{
-		await _solutionManager.SolutionReadyTcs.Task;
-		
 		GodotGlobalEvents.Instance.IdeToolExternallyActivated.InvokeParallelFireAndForget(IdeToolId.Build);
-		await _buildService.MsBuildAsync(_solutionManager.SolutionModel.FilePath, BuildType.Rebuild);
+		await _buildService.MsBuildAsync(_sharpIdeSolutionAccessor.SolutionModel.FilePath, BuildType.Rebuild);
 	}
 	private async void OnCleanSlnButtonPressed()
 	{
-		await _solutionManager.SolutionReadyTcs.Task;
-		
 		GodotGlobalEvents.Instance.IdeToolExternallyActivated.InvokeParallelFireAndForget(IdeToolId.Build);
-		await _buildService.MsBuildAsync(_solutionManager.SolutionModel.FilePath, BuildType.Clean);
+		await _buildService.MsBuildAsync(_sharpIdeSolutionAccessor.SolutionModel.FilePath, BuildType.Clean);
 	}
 	private async void OnRestoreSlnButtonPressed()
 	{
-		await _solutionManager.SolutionReadyTcs.Task;
-		
 		GodotGlobalEvents.Instance.IdeToolExternallyActivated.InvokeParallelFireAndForget(IdeToolId.Build);
-		await _buildService.MsBuildAsync(_solutionManager.SolutionModel.FilePath, BuildType.Restore);
+		await _buildService.MsBuildAsync(_sharpIdeSolutionAccessor.SolutionModel.FilePath, BuildType.Restore);
 	}
 
-	private Task OnSolutionExplorerPanelOnFileSelected(SharpIdeFile file, SharpIdeFileLinePosition? fileLinePosition)
+	private async Task OnSolutionExplorerPanelOnFileSelected(SharpIdeFile file, SharpIdeFileLinePosition? fileLinePosition)
 	{
+		await _codeEditorPanel.SetSharpIdeFile(file, fileLinePosition);
 		_navigationHistoryService.RecordNavigation(file, fileLinePosition ?? new SharpIdeFileLinePosition(0, 0));
-		return Task.CompletedTask;
 	}
 
 	public void SetSlnFilePath(string path)
@@ -147,16 +141,22 @@ public void SetSlnFilePath(string path)
 		{
 			GD.Print($"Selected: {path}");
 			var timer = Stopwatch.StartNew();
-			var solutionModel = await _solutionManager.LoadSolution(path);
+			var solutionModel = await VsPersistenceMapper.GetSolutionModel(path); // TODO: Probably refactor into a DI Service
 			timer.Stop();
 			await _nodeReadyTcs.Task;
 			// Do not use injected services until after _nodeReadyTcs - Services aren't injected until _Ready
 			_logger.LogInformation("Solution model fully created in {ElapsedMilliseconds} ms", timer.ElapsedMilliseconds);
+			var solutionExplorer = _toolManager.GetControl<SolutionExplorerPanel>(IdeToolId.SolutionExplorer);
+			solutionExplorer.SolutionModel = solutionModel;
+			_codeEditorPanel.Solution = solutionModel;
+			_sharpIdeSolutionAccessor.SolutionModel = solutionModel;
+			_sharpIdeSolutionAccessor.SolutionReadyTcs.SetResult();
 			_searchWindow.Solution = solutionModel;
 			_searchAllFilesWindow.Solution = solutionModel;
 			_fileExternalChangeHandler.SolutionModel = solutionModel;
 			_fileChangedService.SolutionModel = solutionModel;
 			_sharpIdeSolutionModificationService.SolutionModel = solutionModel;
+			_ = Task.GodotRun(solutionExplorer.BindToSolution);
 			_roslynAnalysis.StartLoadingSolutionInWorkspace(solutionModel);
 			_fileWatcher.StartWatching(solutionModel);
 			
diff --git a/src/SharpIDE.Godot/SharpIdeSolutionAccessor.cs b/src/SharpIDE.Godot/SharpIdeSolutionAccessor.cs
new file mode 100644
index 00000000..0f6f774c
--- /dev/null
+++ b/src/SharpIDE.Godot/SharpIdeSolutionAccessor.cs
@@ -0,0 +1,9 @@
+using SharpIDE.Application.Features.SolutionDiscovery.VsPersistence;
+
+namespace SharpIDE.Godot;
+
+public class SharpIdeSolutionAccessor
+{
+    public SharpIdeSolutionModel SolutionModel { get; set; } = null!;
+    public TaskCompletionSource SolutionReadyTcs { get; } = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+}
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/SharpIdeSolutionAccessor.cs.uid b/src/SharpIDE.Godot/SharpIdeSolutionAccessor.cs.uid
new file mode 100644
index 00000000..4abacd65
--- /dev/null
+++ b/src/SharpIDE.Godot/SharpIdeSolutionAccessor.cs.uid
@@ -0,0 +1 @@
+uid://7brxu0yejph5
diff --git a/src/SharpIDE.Godot/SharpIdeSolutionManager.cs b/src/SharpIDE.Godot/SharpIdeSolutionManager.cs
deleted file mode 100644
index ca2b496d..00000000
--- a/src/SharpIDE.Godot/SharpIdeSolutionManager.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Godot;
-
-using SharpIDE.Application.Features.Events;
-using SharpIDE.Application.Features.SolutionDiscovery.VsPersistence;
-
-namespace SharpIDE.Godot;
-
-public class SharpIdeSolutionManager
-{
-    public SharpIdeSolutionModel SolutionModel { get; set; } = null!;
-    public TaskCompletionSource SolutionReadyTcs { get; } = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
-
-    public async Task<SharpIdeSolutionModel> LoadSolution(
-        string solutionFilePath,
-        CancellationToken cancellationToken = default)
-    {
-        SolutionModel = await VsPersistenceMapper.GetSolutionModel(solutionFilePath, cancellationToken);
-        SolutionReadyTcs.SetResult();
-
-        return SolutionModel;
-    }
-}
\ No newline at end of file

From 8a1e382c4493fd00e548002dc55e36034f646138 Mon Sep 17 00:00:00 2001
From: Manuel Gasser <manuel.gasser.ch@gmail.com>
Date: Wed, 24 Dec 2025 14:10:46 +0100
Subject: [PATCH 11/11] Remove incorrect UID file

---
 src/SharpIDE.Godot/SharpIdeSolutionAccessor.cs.uid | 2 +-
 src/SharpIDE.Godot/SharpIdeSolutionManager.cs.uid  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 src/SharpIDE.Godot/SharpIdeSolutionManager.cs.uid

diff --git a/src/SharpIDE.Godot/SharpIdeSolutionAccessor.cs.uid b/src/SharpIDE.Godot/SharpIdeSolutionAccessor.cs.uid
index 4abacd65..0cc08e4e 100644
--- a/src/SharpIDE.Godot/SharpIdeSolutionAccessor.cs.uid
+++ b/src/SharpIDE.Godot/SharpIdeSolutionAccessor.cs.uid
@@ -1 +1 @@
-uid://7brxu0yejph5
+uid://c4yqvlku4akmt
diff --git a/src/SharpIDE.Godot/SharpIdeSolutionManager.cs.uid b/src/SharpIDE.Godot/SharpIdeSolutionManager.cs.uid
deleted file mode 100644
index 0cc08e4e..00000000
--- a/src/SharpIDE.Godot/SharpIdeSolutionManager.cs.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://c4yqvlku4akmt