From be643edbdde2264d69a0cee86a858ae963df61d8 Mon Sep 17 00:00:00 2001
From: RR-CodeBase <73562973+RR-CodeBase@users.noreply.github.com>
Date: Tue, 6 Jan 2026 09:41:58 +0200
Subject: [PATCH 01/17] Create New Button

Added Create New
---
 .../Features/BottomBar/RunningTasksDisplay.cs | 102 ++++++-------
 src/SharpIDE.Godot/Features/Git/GitColours.cs |  56 ++++----
 .../Features/LeftSideBar/LeftSideBar.cs       |  96 ++++++-------
 .../Features/SlnPicker/PreviousSlnEntry.cs    |  40 +++---
 .../Features/SlnPicker/SlnPicker.tscn         |   7 +
 .../SolutionExplorer/SolutionExplorerPanel.cs | 134 +++++++++---------
 6 files changed, 221 insertions(+), 214 deletions(-)

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/Git/GitColours.cs b/src/SharpIDE.Godot/Features/Git/GitColours.cs
index 11501b32..03dee9b3 100644
--- a/src/SharpIDE.Godot/Features/Git/GitColours.cs
+++ b/src/SharpIDE.Godot/Features/Git/GitColours.cs
@@ -1,35 +1,35 @@
-using Godot;
+using Godot;
 using SharpIDE.Application.Features.SolutionDiscovery.VsPersistence;
 
 namespace SharpIDE.Godot.Features.Git;
 
 public static class GitColours
 {
-    private const string NewFileColourHexCode = "50964c";
-    private const string EditedFileColourHexCode = "6496ba";
-    private const string UnalteredFileColourHexCode = "d4d4d4";
-    
-    public static readonly Color GitNewFileColour = new Color(NewFileColourHexCode);
-    public static readonly Color GitEditedFileColour = new Color(EditedFileColourHexCode);
-    public static readonly Color GitUnalteredFileColour = new Color(UnalteredFileColourHexCode);
+	private const string NewFileColourHexCode = "50964c";
+	private const string EditedFileColourHexCode = "6496ba";
+	private const string UnalteredFileColourHexCode = "d4d4d4";
+	
+	public static readonly Color GitNewFileColour = new Color(NewFileColourHexCode);
+	public static readonly Color GitEditedFileColour = new Color(EditedFileColourHexCode);
+	public static readonly Color GitUnalteredFileColour = new Color(UnalteredFileColourHexCode);
 
-    public static readonly Color GitNewFileTransparentColour = new Color(NewFileColourHexCode, 0.4f);
-    public static readonly Color GitEditedFileTransparentColour = new Color(EditedFileColourHexCode, 0.4f);
-    public static readonly Color GitUnalteredFileTransparentColour = new Color(UnalteredFileColourHexCode, 0.4f);
-    
-    public static Color GetColorForGitFileStatus(GitFileStatus fileStatus) => fileStatus switch
-    {
-        GitFileStatus.Added => GitNewFileColour,
-        GitFileStatus.Modified => GitEditedFileColour,
-        GitFileStatus.Unaltered => GitUnalteredFileColour,
-        _ => GitUnalteredFileColour
-    };
-    
-    public static Color GetColorForGitLineStatus(GitLineStatus lineStatus) => lineStatus switch
-    {
-        GitLineStatus.Added => GitNewFileTransparentColour,
-        GitLineStatus.Modified => GitEditedFileTransparentColour,
-        GitLineStatus.Unaltered => GitUnalteredFileTransparentColour,
-        _ => GitUnalteredFileTransparentColour
-    };
-}
\ No newline at end of file
+	public static readonly Color GitNewFileTransparentColour = new Color(NewFileColourHexCode, 0.4f);
+	public static readonly Color GitEditedFileTransparentColour = new Color(EditedFileColourHexCode, 0.4f);
+	public static readonly Color GitUnalteredFileTransparentColour = new Color(UnalteredFileColourHexCode, 0.4f);
+	
+	public static Color GetColorForGitFileStatus(GitFileStatus fileStatus) => fileStatus switch
+	{
+		GitFileStatus.Added => GitNewFileColour,
+		GitFileStatus.Modified => GitEditedFileColour,
+		GitFileStatus.Unaltered => GitUnalteredFileColour,
+		_ => GitUnalteredFileColour
+	};
+	
+	public static Color GetColorForGitLineStatus(GitLineStatus lineStatus) => lineStatus switch
+	{
+		GitLineStatus.Added => GitNewFileTransparentColour,
+		GitLineStatus.Modified => GitEditedFileTransparentColour,
+		GitLineStatus.Unaltered => GitUnalteredFileTransparentColour,
+		_ => GitUnalteredFileTransparentColour
+	};
+}
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/Features/SlnPicker/PreviousSlnEntry.cs b/src/SharpIDE.Godot/Features/SlnPicker/PreviousSlnEntry.cs
index a6a91195..179fe445 100644
--- a/src/SharpIDE.Godot/Features/SlnPicker/PreviousSlnEntry.cs
+++ b/src/SharpIDE.Godot/Features/SlnPicker/PreviousSlnEntry.cs
@@ -5,24 +5,24 @@ namespace SharpIDE.Godot.Features.SlnPicker;
 
 public partial class PreviousSlnEntry : MarginContainer
 {
-    private Label _slnPathLabel = null!;
-    private Label _slnNameLabel = null!;
-    private Panel _slnColourPanel = null!;
-    private Button _slnEntryButton = null!;
-    
-    public RecentSln RecentSln { get; set; } = null!;
-    public Action<string>? Clicked;
+	private Label _slnPathLabel = null!;
+	private Label _slnNameLabel = null!;
+	private Panel _slnColourPanel = null!;
+	private Button _slnEntryButton = null!;
+	
+	public RecentSln RecentSln { get; set; } = null!;
+	public Action<string>? Clicked;
 
-    public override void _Ready()
-    {
-        if (RecentSln is null) return;
-        _slnNameLabel = GetNode<Label>("%SlnNameLabel");
-        _slnPathLabel = GetNode<Label>("%SlnPathLabel");
-        _slnColourPanel = GetNode<Panel>("%Panel");
-        _slnEntryButton = GetNode<Button>("Button");
-        _slnNameLabel.Text = RecentSln.Name;
-        _slnPathLabel.Text = RecentSln.FilePath;
-        _slnColourPanel.Modulate = RandomRecentSlnColours.GetColourForFilePath(RecentSln.FilePath);
-        _slnEntryButton.Pressed += () => Clicked?.Invoke(RecentSln.FilePath);
-    }
-}
\ No newline at end of file
+	public override void _Ready()
+	{
+		if (RecentSln is null) return;
+		_slnNameLabel = GetNode<Label>("%SlnNameLabel");
+		_slnPathLabel = GetNode<Label>("%SlnPathLabel");
+		_slnColourPanel = GetNode<Panel>("%Panel");
+		_slnEntryButton = GetNode<Button>("Button");
+		_slnNameLabel.Text = RecentSln.Name;
+		_slnPathLabel.Text = RecentSln.FilePath;
+		_slnColourPanel.Modulate = RandomRecentSlnColours.GetColourForFilePath(RecentSln.FilePath);
+		_slnEntryButton.Pressed += () => Clicked?.Invoke(RecentSln.FilePath);
+	}
+}
diff --git a/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn b/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn
index f9ffc96c..77efae9f 100644
--- a/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn
+++ b/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn
@@ -71,6 +71,13 @@ layout_mode = 2
 theme_override_colors/font_color = Color(0.5689727, 0.56897277, 0.5689727, 1)
 text = "v0.1.2"
 
+[node name="HSeparator" type="HSeparator" parent="VSplitContainer/Panel2/MarginContainer/VBoxContainer"]
+layout_mode = 2
+
+[node name="Button" type="Button" parent="VSplitContainer/Panel2/MarginContainer/VBoxContainer"]
+layout_mode = 2
+text = "Create New"
+
 [node name="Panel" type="Panel" parent="VSplitContainer"]
 layout_mode = 2
 
diff --git a/src/SharpIDE.Godot/Features/SolutionExplorer/SolutionExplorerPanel.cs b/src/SharpIDE.Godot/Features/SolutionExplorer/SolutionExplorerPanel.cs
index 5599ada6..06074b9e 100644
--- a/src/SharpIDE.Godot/Features/SolutionExplorer/SolutionExplorerPanel.cs
+++ b/src/SharpIDE.Godot/Features/SolutionExplorer/SolutionExplorerPanel.cs
@@ -141,83 +141,83 @@ public async Task BindToSolution(SharpIdeSolutionModel solution)
 		// the Tree has been removed from the scene tree in _Ready, so we can operate on it off the ui thread, then add it back
 		_tree.Clear();
 
-	    // Root
-	    var rootItem = _tree.CreateItem();
-	    rootItem.SetText(0, solution.Name);
-	    rootItem.SetIcon(0, SlnIcon);
-	    _rootItem = rootItem;
+		// Root
+		var rootItem = _tree.CreateItem();
+		rootItem.SetText(0, solution.Name);
+		rootItem.SetIcon(0, SlnIcon);
+		_rootItem = rootItem;
 
-	    // Observe Projects
-	    var projectsView = solution.Projects.CreateView(y => new TreeItemContainer());
+		// Observe Projects
+		var projectsView = solution.Projects.CreateView(y => new TreeItemContainer());
 		projectsView.Unfiltered.ToList().ForEach(s => s.View.Value = CreateProjectTreeItem(_tree, rootItem, s.Value));
-	        
-	    projectsView.ObserveChanged().SubscribeOnThreadPool().ObserveOnThreadPool()
-	        .SubscribeAwait(async (e, ct) => await (e.Action switch
-	        {
-			    NotifyCollectionChangedAction.Add => this.InvokeAsync(() => e.NewItem.View.Value = CreateProjectTreeItem(_tree, _rootItem, e.NewItem.Value)),
-	            NotifyCollectionChangedAction.Remove => FreeTreeItem(e.OldItem.View.Value),
-	            _ => Task.CompletedTask
-	        })).AddToDeferred(this);
+			
+		projectsView.ObserveChanged().SubscribeOnThreadPool().ObserveOnThreadPool()
+			.SubscribeAwait(async (e, ct) => await (e.Action switch
+			{
+				NotifyCollectionChangedAction.Add => this.InvokeAsync(() => e.NewItem.View.Value = CreateProjectTreeItem(_tree, _rootItem, e.NewItem.Value)),
+				NotifyCollectionChangedAction.Remove => FreeTreeItem(e.OldItem.View.Value),
+				_ => Task.CompletedTask
+			})).AddToDeferred(this);
 
-	    // Observe Solution Folders
-	    var foldersView = solution.SlnFolders.CreateView(y => new TreeItemContainer());
-	    foldersView.Unfiltered.ToList().ForEach(s => s.View.Value = CreateSlnFolderTreeItem(_tree, rootItem, s.Value));
-	    foldersView.ObserveChanged().SubscribeOnThreadPool().ObserveOnThreadPool()
-	        .SubscribeAwait(async (e, ct) => await (e.Action switch
-	        {
-	            NotifyCollectionChangedAction.Add => this.InvokeAsync(() => e.NewItem.View.Value = CreateSlnFolderTreeItem(_tree, _rootItem, e.NewItem.Value)),
-	            NotifyCollectionChangedAction.Remove => FreeTreeItem(e.OldItem.View.Value),
-	            _ => Task.CompletedTask
-	        })).AddToDeferred(this);
-	    
-	    rootItem.SetCollapsedRecursive(true);
-	    rootItem.Collapsed = false;
-	    await this.InvokeAsync(() =>
-	    {
-		    _panelContainer.AddChild(_tree);
-	    });
+		// Observe Solution Folders
+		var foldersView = solution.SlnFolders.CreateView(y => new TreeItemContainer());
+		foldersView.Unfiltered.ToList().ForEach(s => s.View.Value = CreateSlnFolderTreeItem(_tree, rootItem, s.Value));
+		foldersView.ObserveChanged().SubscribeOnThreadPool().ObserveOnThreadPool()
+			.SubscribeAwait(async (e, ct) => await (e.Action switch
+			{
+				NotifyCollectionChangedAction.Add => this.InvokeAsync(() => e.NewItem.View.Value = CreateSlnFolderTreeItem(_tree, _rootItem, e.NewItem.Value)),
+				NotifyCollectionChangedAction.Remove => FreeTreeItem(e.OldItem.View.Value),
+				_ => Task.CompletedTask
+			})).AddToDeferred(this);
+		
+		rootItem.SetCollapsedRecursive(true);
+		rootItem.Collapsed = false;
+		await this.InvokeAsync(() =>
+		{
+			_panelContainer.AddChild(_tree);
+		});
 	}
 
 	[RequiresGodotUiThread]
 	private TreeItem CreateSlnFolderTreeItem(Tree tree, TreeItem parent, SharpIdeSolutionFolder slnFolder)
 	{
-	    var folderItem = tree.CreateItem(parent);
-	        folderItem.SetText(0, slnFolder.Name);
-	        folderItem.SetIcon(0, SlnFolderIcon);
-	        folderItem.SetMetadata(0, new RefCountedContainer<SharpIdeSolutionFolder>(slnFolder));
+		var folderItem = tree.CreateItem(parent);
+			folderItem.SetText(0, slnFolder.Name);
+			folderItem.SetIcon(0, SlnFolderIcon);
+			folderItem.SetMetadata(0, new RefCountedContainer<SharpIdeSolutionFolder>(slnFolder));
 
-	        // Observe folder sub-collections
-	        var subFoldersView = slnFolder.Folders.CreateView(y => new TreeItemContainer());
-	        subFoldersView.Unfiltered.ToList().ForEach(s => s.View.Value = CreateSlnFolderTreeItem(_tree, folderItem, s.Value));
-	        
-	        subFoldersView.ObserveChanged().SubscribeOnThreadPool().ObserveOnThreadPool()
-	            .SubscribeAwait(async (innerEvent, ct) => await (innerEvent.Action switch
-	            {
-	                NotifyCollectionChangedAction.Add => this.InvokeAsync(() => innerEvent.NewItem.View.Value = CreateSlnFolderTreeItem(_tree, folderItem, innerEvent.NewItem.Value)),
-	                NotifyCollectionChangedAction.Remove => FreeTreeItem(innerEvent.OldItem.View.Value),
-	                _ => Task.CompletedTask
-	            })).AddToDeferred(this);
+			// Observe folder sub-collections
+			var subFoldersView = slnFolder.Folders.CreateView(y => new TreeItemContainer());
+			subFoldersView.Unfiltered.ToList().ForEach(s => s.View.Value = CreateSlnFolderTreeItem(_tree, folderItem, s.Value));
+			
+			subFoldersView.ObserveChanged().SubscribeOnThreadPool().ObserveOnThreadPool()
+				.SubscribeAwait(async (innerEvent, ct) => await (innerEvent.Action switch
+				{
+					NotifyCollectionChangedAction.Add => this.InvokeAsync(() => innerEvent.NewItem.View.Value = CreateSlnFolderTreeItem(_tree, folderItem, innerEvent.NewItem.Value)),
+					NotifyCollectionChangedAction.Remove => FreeTreeItem(innerEvent.OldItem.View.Value),
+					_ => Task.CompletedTask
+				})).AddToDeferred(this);
 
-	        var projectsView = slnFolder.Projects.CreateView(y => new TreeItemContainer());
-	        projectsView.Unfiltered.ToList().ForEach(s => s.View.Value = CreateProjectTreeItem(_tree, folderItem, s.Value));
-	        projectsView.ObserveChanged().SubscribeOnThreadPool().ObserveOnThreadPool()
-	            .SubscribeAwait(async (innerEvent, ct) => await (innerEvent.Action switch
-	            {
-	                NotifyCollectionChangedAction.Add => this.InvokeAsync(() => innerEvent.NewItem.View.Value = CreateProjectTreeItem(_tree, folderItem, innerEvent.NewItem.Value)),
-	                NotifyCollectionChangedAction.Remove => FreeTreeItem(innerEvent.OldItem.View.Value),
-	                _ => Task.CompletedTask
-	            })).AddToDeferred(this);
+			var projectsView = slnFolder.Projects.CreateView(y => new TreeItemContainer());
+			projectsView.Unfiltered.ToList().ForEach(s => s.View.Value = CreateProjectTreeItem(_tree, folderItem, s.Value));
+			projectsView.ObserveChanged().SubscribeOnThreadPool().ObserveOnThreadPool()
+				.SubscribeAwait(async (innerEvent, ct) => await (innerEvent.Action switch
+				{
+					NotifyCollectionChangedAction.Add => this.InvokeAsync(() => innerEvent.NewItem.View.Value = CreateProjectTreeItem(_tree, folderItem, innerEvent.NewItem.Value)),
+					NotifyCollectionChangedAction.Remove => FreeTreeItem(innerEvent.OldItem.View.Value),
+					_ => Task.CompletedTask
+				})).AddToDeferred(this);
 
-	        var filesView = slnFolder.Files.CreateView(y => new TreeItemContainer());
-	        filesView.Unfiltered.ToList().ForEach(s => s.View.Value = CreateFileTreeItem(_tree, folderItem, s.Value));
-	        filesView.ObserveChanged().SubscribeOnThreadPool().ObserveOnThreadPool()
-	            .SubscribeAwait(async (innerEvent, ct) => await (innerEvent.Action switch
-	            {
-	                NotifyCollectionChangedAction.Add => this.InvokeAsync(() => innerEvent.NewItem.View.Value = CreateFileTreeItem(_tree, folderItem, innerEvent.NewItem.Value, innerEvent.NewStartingIndex)),
-	                NotifyCollectionChangedAction.Remove => FreeTreeItem(innerEvent.OldItem.View.Value),
-	                _ => Task.CompletedTask
-	            })).AddToDeferred(this);
-	        return folderItem;
+			var filesView = slnFolder.Files.CreateView(y => new TreeItemContainer());
+			filesView.Unfiltered.ToList().ForEach(s => s.View.Value = CreateFileTreeItem(_tree, folderItem, s.Value));
+			filesView.ObserveChanged().SubscribeOnThreadPool().ObserveOnThreadPool()
+				.SubscribeAwait(async (innerEvent, ct) => await (innerEvent.Action switch
+				{
+					NotifyCollectionChangedAction.Add => this.InvokeAsync(() => innerEvent.NewItem.View.Value = CreateFileTreeItem(_tree, folderItem, innerEvent.NewItem.Value, innerEvent.NewStartingIndex)),
+					NotifyCollectionChangedAction.Remove => FreeTreeItem(innerEvent.OldItem.View.Value),
+					_ => Task.CompletedTask
+				})).AddToDeferred(this);
+			return folderItem;
 	}
 
 	[RequiresGodotUiThread]
@@ -348,6 +348,6 @@ await this.InvokeAsync(() =>
 
 	private async Task FreeTreeItem(TreeItem? item)
 	{
-	    await this.InvokeAsync(() => item?.Free());
+		await this.InvokeAsync(() => item?.Free());
 	}
 }

From 7557f0b354f1b5d37270a9ded85e35457882b50a Mon Sep 17 00:00:00 2001
From: RR-CodeBase <73562973+RR-CodeBase@users.noreply.github.com>
Date: Wed, 7 Jan 2026 14:23:23 +0200
Subject: [PATCH 02/17] Ne Solution Popup

Added New Solution Popup with basic buttons
---
 .../Features/SlnPicker/SlnPicker.cs           | 15 ++++
 .../Features/SlnPicker/SlnPicker.tscn         | 88 +++++++++++++++++--
 .../Features/SlnPicker/SolutionDialog.cs      | 15 ++++
 .../Features/SlnPicker/SolutionDialog.cs.uid  |  1 +
 src/SharpIDE.Godot/IdeRoot.cs                 | 14 +--
 5 files changed, 121 insertions(+), 12 deletions(-)
 create mode 100644 src/SharpIDE.Godot/Features/SlnPicker/SolutionDialog.cs
 create mode 100644 src/SharpIDE.Godot/Features/SlnPicker/SolutionDialog.cs.uid

diff --git a/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.cs b/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.cs
index 9966335d..7d7335f8 100644
--- a/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.cs
+++ b/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.cs
@@ -8,6 +8,8 @@ namespace SharpIDE.Godot.Features.SlnPicker;
 public partial class SlnPicker : Control
 {
     private FileDialog _fileDialog = null!;
+    private AcceptDialog _solutionDialog = null!;
+    private Button _newSolutionButton = null!;
     private Button _openSlnButton = null!;
     private VBoxContainer _previousSlnsVBoxContainer = null!;
     private Label _versionLabel = null!;
@@ -16,6 +18,8 @@ public partial class SlnPicker : Control
     private PackedScene _previousSlnEntryScene = ResourceLoader.Load<PackedScene>("res://Features/SlnPicker/PreviousSlnEntry.tscn");
 
     private readonly TaskCompletionSource<string?> _tcs = new TaskCompletionSource<string?>(TaskCreationOptions.RunContinuationsAsynchronously);
+    
+
 
     public override void _ExitTree()
     {
@@ -27,6 +31,17 @@ public override void _Ready()
         _previousSlnsVBoxContainer = GetNode<VBoxContainer>("%PreviousSlnsVBoxContainer");
         _versionLabel = GetNode<Label>("%VersionLabel");
         _fileDialog = GetNode<FileDialog>("%FileDialog");
+        _solutionDialog = GetNode<AcceptDialog>("%SolutionDialog");
+        _newSolutionButton = GetNode<Button>("%NewSolutionButton");
+        _newSolutionButton.Pressed += () => _solutionDialog.PopupCentered();
+        _solutionDialog.Confirmed += () => 
+        {
+            // GD.Print($"Creating project at: {_folderDialog.CurrentDir}");
+            // GD.Print($"Selected Template: {_templateDropdown.GetItemText(_templateDropdown.Selected)}");
+            // GD.Print($"Git enabled: {_gitCheckbox.ButtonPressed}");
+            //
+            // _tcs.SetResult(_folderDialog.CurrentDir);
+        };
         _openSlnButton = GetNode<Button>("%OpenSlnButton");
         _openSlnButton.Pressed += () => _fileDialog.PopupCentered();
         var windowParent = GetParentOrNull<Window>();
diff --git a/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn b/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn
index 77efae9f..02fb2a83 100644
--- a/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn
+++ b/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn
@@ -1,9 +1,10 @@
-[gd_scene load_steps=6 format=3 uid="uid://cwvhbsd1mdl2x"]
+[gd_scene load_steps=7 format=3 uid="uid://cwvhbsd1mdl2x"]
 
 [ext_resource type="Script" uid="uid://bjvwb6jg6jpsi" path="res://Features/SlnPicker/SlnPicker.cs" id="1_ciq0g"]
 [ext_resource type="Texture2D" uid="uid://tpjfx7mo6cwj" path="res://Resources/SharpIdeV3.svg" id="2_qs47j"]
 [ext_resource type="PackedScene" uid="uid://x5lhwvh5dium" path="res://Features/SlnPicker/PreviousSlnEntry.tscn" id="2_t7l5q"]
 [ext_resource type="Script" uid="uid://but0p7xwpfxtg" path="res://Features/SlnPicker/AutoOpenLastSlnButton.cs" id="4_qs47j"]
+[ext_resource type="Script" uid="uid://btuicqd4rg4at" path="res://Features/SlnPicker/SolutionDialog.cs" id="5_6t7l7"]
 
 [sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_qs47j"]
 
@@ -72,12 +73,9 @@ theme_override_colors/font_color = Color(0.5689727, 0.56897277, 0.5689727, 1)
 text = "v0.1.2"
 
 [node name="HSeparator" type="HSeparator" parent="VSplitContainer/Panel2/MarginContainer/VBoxContainer"]
+visible = false
 layout_mode = 2
 
-[node name="Button" type="Button" parent="VSplitContainer/Panel2/MarginContainer/VBoxContainer"]
-layout_mode = 2
-text = "Create New"
-
 [node name="Panel" type="Panel" parent="VSplitContainer"]
 layout_mode = 2
 
@@ -105,6 +103,11 @@ layout_mode = 2
 size_flags_horizontal = 3
 placeholder_text = "Search recent projects"
 
+[node name="NewSolutionButton" type="Button" parent="VSplitContainer/Panel/MarginContainer2/VBoxContainer2/HBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+text = "New Solution"
+
 [node name="OpenSlnButton" type="Button" parent="VSplitContainer/Panel/MarginContainer2/VBoxContainer2/HBoxContainer"]
 unique_name_in_owner = true
 layout_mode = 2
@@ -145,3 +148,78 @@ file_mode = 0
 access = 2
 filters = PackedStringArray("*.sln,*.slnx;Solution Files")
 use_native_dialog = true
+
+[node name="SolutionDialog" type="AcceptDialog" parent="."]
+unique_name_in_owner = true
+oversampling_override = 1.0
+title = "New Solution"
+size = Vector2i(900, 500)
+visible = true
+ok_button_text = "Create"
+script = ExtResource("5_6t7l7")
+
+[node name="HSplitContainer" type="HSplitContainer" parent="SolutionDialog"]
+offset_left = 8.0
+offset_top = 8.0
+offset_right = 892.0
+offset_bottom = 451.0
+split_offset = 245
+
+[node name="Panel" type="Panel" parent="SolutionDialog/HSplitContainer"]
+layout_mode = 2
+
+[node name="MarginContainer" type="MarginContainer" parent="SolutionDialog/HSplitContainer/Panel"]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+
+[node name="ScrollContainer" type="ScrollContainer" parent="SolutionDialog/HSplitContainer/Panel/MarginContainer"]
+layout_mode = 2
+
+[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel/MarginContainer/ScrollContainer"]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="SolutionDialog/HSplitContainer/Panel/MarginContainer/ScrollContainer/VBoxContainer"]
+layout_mode = 2
+theme_override_colors/font_color = Color(0.48570347, 0.48570353, 0.48570347, 1)
+text = "Project Type"
+
+[node name="BlazorButton" type="Button" parent="SolutionDialog/HSplitContainer/Panel/MarginContainer/ScrollContainer/VBoxContainer"]
+layout_mode = 2
+toggle_mode = true
+text = "Blazor"
+flat = true
+alignment = 0
+
+[node name="ConsoleButton" type="Button" parent="SolutionDialog/HSplitContainer/Panel/MarginContainer/ScrollContainer/VBoxContainer"]
+layout_mode = 2
+toggle_mode = true
+text = "Console"
+flat = true
+alignment = 0
+
+[node name="Panel2" type="Panel" parent="SolutionDialog/HSplitContainer"]
+layout_mode = 2
+
+[node name="MarginContainer2" type="MarginContainer" parent="SolutionDialog/HSplitContainer/Panel2"]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+
+[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2"]
+layout_mode = 2
+
+[node name="FolderDialog" type="FileDialog" parent="SolutionDialog"]
+unique_name_in_owner = true
+oversampling_override = 1.0
+title = "Open a Directory"
+dialog_hide_on_ok = true
+file_mode = 2
+access = 2
+use_native_dialog = true
diff --git a/src/SharpIDE.Godot/Features/SlnPicker/SolutionDialog.cs b/src/SharpIDE.Godot/Features/SlnPicker/SolutionDialog.cs
new file mode 100644
index 00000000..781eb195
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/SlnPicker/SolutionDialog.cs
@@ -0,0 +1,15 @@
+using Godot;
+using System;
+
+public partial class SolutionDialog : AcceptDialog
+{
+	
+	private FileDialog _folderDialog = null!;
+	private Tree _projectTypeList = null!;
+
+	// Called when the node enters the scene tree for the first time.
+	public override void _Ready()
+	{
+		_folderDialog = GetNode<FileDialog>("%FolderDialog");
+	}
+}
diff --git a/src/SharpIDE.Godot/Features/SlnPicker/SolutionDialog.cs.uid b/src/SharpIDE.Godot/Features/SlnPicker/SolutionDialog.cs.uid
new file mode 100644
index 00000000..719a3bf3
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/SlnPicker/SolutionDialog.cs.uid
@@ -0,0 +1 @@
+uid://btuicqd4rg4at
diff --git a/src/SharpIDE.Godot/IdeRoot.cs b/src/SharpIDE.Godot/IdeRoot.cs
index f194aa45..3dbdfb1d 100644
--- a/src/SharpIDE.Godot/IdeRoot.cs
+++ b/src/SharpIDE.Godot/IdeRoot.cs
@@ -45,12 +45,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()
 	{
@@ -208,4 +208,4 @@ public override void _UnhandledKeyInput(InputEvent @event)
 			_searchAllFilesWindow.Popup();
 		}
 	}
-}
\ No newline at end of file
+}

From 382e5b9444151edf7f537bc0fa3b74086f728812 Mon Sep 17 00:00:00 2001
From: RR-CodeBase <73562973+RR-CodeBase@users.noreply.github.com>
Date: Wed, 7 Jan 2026 16:40:56 +0200
Subject: [PATCH 03/17] Setting Page

Started with Settings Pages
---
 .../Features/SlnPicker/SlnPicker.tscn         | 127 +++++++++++++++++-
 .../Features/SlnPicker/SolutionDialog.cs      |  22 ++-
 2 files changed, 143 insertions(+), 6 deletions(-)

diff --git a/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn b/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn
index 02fb2a83..20d8ea55 100644
--- a/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn
+++ b/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=7 format=3 uid="uid://cwvhbsd1mdl2x"]
+[gd_scene load_steps=8 format=3 uid="uid://cwvhbsd1mdl2x"]
 
 [ext_resource type="Script" uid="uid://bjvwb6jg6jpsi" path="res://Features/SlnPicker/SlnPicker.cs" id="1_ciq0g"]
 [ext_resource type="Texture2D" uid="uid://tpjfx7mo6cwj" path="res://Resources/SharpIdeV3.svg" id="2_qs47j"]
@@ -8,6 +8,17 @@
 
 [sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_qs47j"]
 
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_6t7l7"]
+bg_color = Color(0.6, 0.6, 0.6, 0)
+border_width_left = 1
+border_width_top = 1
+border_width_right = 1
+border_width_bottom = 1
+corner_radius_top_left = 5
+corner_radius_top_right = 5
+corner_radius_bottom_right = 5
+corner_radius_bottom_left = 5
+
 [node name="SlnPicker" type="Control"]
 layout_mode = 3
 anchors_preset = 15
@@ -153,7 +164,8 @@ use_native_dialog = true
 unique_name_in_owner = true
 oversampling_override = 1.0
 title = "New Solution"
-size = Vector2i(900, 500)
+position = Vector2i(0, 36)
+size = Vector2i(1000, 500)
 visible = true
 ok_button_text = "Create"
 script = ExtResource("5_6t7l7")
@@ -161,7 +173,7 @@ script = ExtResource("5_6t7l7")
 [node name="HSplitContainer" type="HSplitContainer" parent="SolutionDialog"]
 offset_left = 8.0
 offset_top = 8.0
-offset_right = 892.0
+offset_right = 992.0
 offset_bottom = 451.0
 split_offset = 245
 
@@ -188,6 +200,7 @@ theme_override_colors/font_color = Color(0.48570347, 0.48570353, 0.48570347, 1)
 text = "Project Type"
 
 [node name="BlazorButton" type="Button" parent="SolutionDialog/HSplitContainer/Panel/MarginContainer/ScrollContainer/VBoxContainer"]
+unique_name_in_owner = true
 layout_mode = 2
 toggle_mode = true
 text = "Blazor"
@@ -195,6 +208,7 @@ flat = true
 alignment = 0
 
 [node name="ConsoleButton" type="Button" parent="SolutionDialog/HSplitContainer/Panel/MarginContainer/ScrollContainer/VBoxContainer"]
+unique_name_in_owner = true
 layout_mode = 2
 toggle_mode = true
 text = "Console"
@@ -212,8 +226,113 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 
-[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2"]
+[node name="TabContainer" type="TabContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2"]
+unique_name_in_owner = true
+layout_mode = 2
+current_tab = 1
+tabs_visible = false
+
+[node name="BlazorSettingsPanel" type="Panel" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer"]
+visible = false
+layout_mode = 2
+metadata/_tab_index = 0
+
+[node name="MarginContainer" type="MarginContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer/BlazorSettingsPanel"]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_left = 18.0
+offset_top = 12.0
+offset_right = -3.0
+grow_horizontal = 2
+grow_vertical = 2
+
+[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer/BlazorSettingsPanel/MarginContainer"]
+layout_mode = 2
+
+[node name="HBoxContainer" type="HBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer/BlazorSettingsPanel/MarginContainer/VBoxContainer"]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer/BlazorSettingsPanel/MarginContainer/VBoxContainer/HBoxContainer"]
+layout_mode = 2
+theme_override_colors/font_color = Color(0.4862745, 0.4862745, 0.4862745, 1)
+text = "Blazor Settings"
+
+[node name="ConsoleSettingsPanel" type="Panel" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer"]
+layout_mode = 2
+metadata/_tab_index = 1
+
+[node name="MarginContainer" type="MarginContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer/ConsoleSettingsPanel"]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_left = 18.0
+offset_top = 12.0
+offset_right = -3.0
+grow_horizontal = 2
+grow_vertical = 2
+
+[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer"]
+layout_mode = 2
+
+[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer"]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/VBoxContainer"]
+layout_mode = 2
+theme_override_colors/font_color = Color(0.4862745, 0.4862745, 0.4862745, 1)
+text = "Console Settings"
+
+[node name="HSeparator" type="HSeparator" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/VBoxContainer"]
+layout_mode = 2
+
+[node name="HSplitContainer" type="HSplitContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer"]
+layout_mode = 2
+split_offset = 196
+
+[node name="Panel" type="Panel" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer"]
+layout_mode = 2
+
+[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer/Panel"]
+layout_mode = 0
+offset_right = 40.0
+offset_bottom = 40.0
+theme_override_constants/separation = 20
+
+[node name="Label" type="Label" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer/Panel/VBoxContainer"]
+layout_mode = 2
+text = "Solution Name:"
+
+[node name="Label2" type="Label" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer/Panel/VBoxContainer"]
+layout_mode = 2
+text = "Project Name:"
+
+[node name="Label3" type="Label" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer/Panel/VBoxContainer"]
+layout_mode = 2
+text = "Solution Directory:"
+
+[node name="Panel2" type="Panel" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer"]
+layout_mode = 2
+
+[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer/Panel2"]
+layout_mode = 0
+offset_right = 40.0
+offset_bottom = 40.0
+theme_override_constants/separation = 10
+
+[node name="SlnNameLineEdit" type="LineEdit" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer/Panel2/VBoxContainer"]
+unique_name_in_owner = true
+custom_minimum_size = Vector2(350, 0)
+layout_mode = 2
+theme_override_styles/normal = SubResource("StyleBoxFlat_6t7l7")
+
+[node name="PrjNameLineEdit" type="LineEdit" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer/Panel2/VBoxContainer"]
+unique_name_in_owner = true
+custom_minimum_size = Vector2(350, 0)
 layout_mode = 2
+theme_override_styles/normal = SubResource("StyleBoxFlat_6t7l7")
 
 [node name="FolderDialog" type="FileDialog" parent="SolutionDialog"]
 unique_name_in_owner = true
diff --git a/src/SharpIDE.Godot/Features/SlnPicker/SolutionDialog.cs b/src/SharpIDE.Godot/Features/SlnPicker/SolutionDialog.cs
index 781eb195..a7b5ca0e 100644
--- a/src/SharpIDE.Godot/Features/SlnPicker/SolutionDialog.cs
+++ b/src/SharpIDE.Godot/Features/SlnPicker/SolutionDialog.cs
@@ -5,11 +5,29 @@ public partial class SolutionDialog : AcceptDialog
 {
 	
 	private FileDialog _folderDialog = null!;
-	private Tree _projectTypeList = null!;
+	private TabContainer _contentSwitcher = null!;
 
-	// Called when the node enters the scene tree for the first time.
 	public override void _Ready()
 	{
 		_folderDialog = GetNode<FileDialog>("%FolderDialog");
+		_contentSwitcher = GetNode<TabContainer>("%TabContainer");
+		
+		GetNode<Button>("%BlazorButton").Pressed += () => OnTypeSelected("BlazorSettingsPanel");
+		GetNode<Button>("%ConsoleButton").Pressed += () => OnTypeSelected("ConsoleSettingsPanel");
+	}
+
+	private void OnTypeSelected(string typeName)
+	{
+		_contentSwitcher.Visible = true;
+		for (int i = 0; i < _contentSwitcher.GetTabCount(); i++)
+		{
+			if (_contentSwitcher.GetTabTitle(i) == typeName)
+			{
+				_contentSwitcher.CurrentTab = i;
+				return;
+			}
+		}
+		
+		GD.Print($"Selected: {typeName}");
 	}
 }

From 01923bf44df30212aca59486dd0e7190a4faafc3 Mon Sep 17 00:00:00 2001
From: RR-CodeBase <73562973+RR-CodeBase@users.noreply.github.com>
Date: Thu, 8 Jan 2026 13:43:56 +0200
Subject: [PATCH 04/17] Added project creator

Added ProkectCreator
---
 .../Features/SlnPicker/ProjectCreator.cs      | 125 +++++++++++++++
 .../Features/SlnPicker/ProjectCreator.cs.uid  |   1 +
 .../Features/SlnPicker/SlnPicker.cs           | 139 ++++++++--------
 .../Features/SlnPicker/SlnPicker.tscn         | 150 ++++++++++--------
 4 files changed, 283 insertions(+), 132 deletions(-)
 create mode 100644 src/SharpIDE.Godot/Features/SlnPicker/ProjectCreator.cs
 create mode 100644 src/SharpIDE.Godot/Features/SlnPicker/ProjectCreator.cs.uid

diff --git a/src/SharpIDE.Godot/Features/SlnPicker/ProjectCreator.cs b/src/SharpIDE.Godot/Features/SlnPicker/ProjectCreator.cs
new file mode 100644
index 00000000..96917245
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/SlnPicker/ProjectCreator.cs
@@ -0,0 +1,125 @@
+using System.Diagnostics;
+using Godot;
+using Directory = System.IO.Directory;
+using Exception = System.Exception;
+using GD = Godot.GD;
+using Path = System.IO.Path;
+
+namespace SharpIDE.Godot.Features.SlnPicker;
+
+public partial class ProjectCreator : Node
+{
+	public void CreateProject(string basePath, string solutionName, string projectName, string template, string framework, string language, string extraArgs = "")
+	{
+		// Defaults matching screenshot; override via UI
+		solutionName = solutionName ?? "MySolution";
+		projectName = projectName ?? "MyProject";
+		template = template ?? "console"; // e.g., "blazor" for Blazor, "webapi" for API, etc.
+		framework = framework ?? "net8.0";
+		language = language ?? "C#";
+
+		// Normalize and resolve absolute paths for cross-platform reliability
+		basePath = Path.GetFullPath(basePath);
+		string solutionDir = Path.Combine(basePath, solutionName);
+		string projectDir = Path.Combine(solutionDir, projectName);
+
+		try
+		{
+			// Check if dotnet is available (cross-platform validation)
+			if (!IsDotnetAvailable())
+			{
+				throw new Exception("dotnet CLI not found. Ensure .NET SDK is installed and in PATH.");
+			}
+
+			// Step 1: Create solution directory
+			Directory.CreateDirectory(solutionDir);
+
+			// Step 2: Create solution file
+			ExecuteDotnetCommand(solutionDir, $"new sln -n {solutionName}");
+
+			// Step 3: Create project subdirectory
+			Directory.CreateDirectory(projectDir);
+
+			// Step 4: Create project with generic template
+			string projectArgs = $"new {template} -n {projectName} --framework {framework} --language {language} {extraArgs}";
+			ExecuteDotnetCommand(projectDir, projectArgs);
+
+			// Step 5: Add project to solution
+			ExecuteDotnetCommand(solutionDir, $"sln add {projectName}/{projectName}.csproj");
+
+			GD.Print($"Project ({template}) created successfully at {solutionDir}!");
+			// In SharpIDE: Refresh solution explorer, open the project, or trigger build.
+		}
+		catch (Exception ex)
+		{
+			GD.PrintErr($"Error creating project: {ex.Message}");
+			// In SharpIDE: Show error dialog or log to output panel.
+		}
+	}
+
+	// Helper to check if dotnet is available
+	private bool IsDotnetAvailable()
+	{
+		try
+		{
+			var processInfo = new ProcessStartInfo
+			{
+				FileName = "dotnet",
+				Arguments = "--version",
+				RedirectStandardOutput = true,
+				UseShellExecute = false,
+				CreateNoWindow = true
+			};
+			using (var process = Process.Start(processInfo))
+			{
+				process?.WaitForExit();
+				return process?.ExitCode == 0;
+			}
+		}
+		catch
+		{
+			return false;
+		}
+	}
+
+	// Helper for executing dotnet commands
+	private void ExecuteDotnetCommand(string workingDir, string arguments)
+	{
+		workingDir = Path.GetFullPath(workingDir); // Ensure absolute for OS consistency
+		var processInfo = new ProcessStartInfo
+		{
+			FileName = "dotnet",
+			Arguments = arguments,
+			WorkingDirectory = workingDir,
+			RedirectStandardOutput = true,
+			RedirectStandardError = true,
+			UseShellExecute = false,
+			CreateNoWindow = true
+		};
+
+		using (var process = new Process { StartInfo = processInfo })
+		{
+			process.Start();
+			string output = process.StandardOutput.ReadToEnd();
+			string error = process.StandardError.ReadToEnd();
+			process.WaitForExit();
+
+			if (process.ExitCode != 0)
+			{
+				throw new Exception($"dotnet command failed in {workingDir}: {error}");
+			}
+
+			GD.Print($"dotnet output in {workingDir}: {output}"); // Log for SharpIDE's console
+		}
+	}
+
+	// Example: Override _Ready for testing (remove in production)
+	public override void _Ready()
+	{
+		// Test console app
+		CreateProject("/path/to/projects", "ConsoleApp1", "ConsoleApp1", "console", "net8.0", "C#");
+
+		// Test Blazor (future expansion): Uncomment to try
+		// CreateProject("/path/to/projects", "BlazorApp1", "BlazorApp1", "blazor", "net8.0", "C#", "--no-https");
+	}
+}
diff --git a/src/SharpIDE.Godot/Features/SlnPicker/ProjectCreator.cs.uid b/src/SharpIDE.Godot/Features/SlnPicker/ProjectCreator.cs.uid
new file mode 100644
index 00000000..9cc4cbf4
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/SlnPicker/ProjectCreator.cs.uid
@@ -0,0 +1 @@
+uid://b07ijdcta2ixt
diff --git a/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.cs b/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.cs
index 7d7335f8..34775efe 100644
--- a/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.cs
+++ b/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.cs
@@ -7,77 +7,82 @@ namespace SharpIDE.Godot.Features.SlnPicker;
 // This is a bit of a mess intertwined with the optional popup window
 public partial class SlnPicker : Control
 {
-    private FileDialog _fileDialog = null!;
-    private AcceptDialog _solutionDialog = null!;
-    private Button _newSolutionButton = null!;
-    private Button _openSlnButton = null!;
-    private VBoxContainer _previousSlnsVBoxContainer = null!;
-    private Label _versionLabel = null!;
-    private static NuGetVersion? _version;
+	private FileDialog _fileDialog = null!;
+	private AcceptDialog _solutionDialog = null!;
+	private Button _newSolutionButton = null!;
+	private Button _openSlnButton = null!;
+	private VBoxContainer _previousSlnsVBoxContainer = null!;
+	private Label _versionLabel = null!;
+	private static NuGetVersion? _version;
 
-    private PackedScene _previousSlnEntryScene = ResourceLoader.Load<PackedScene>("res://Features/SlnPicker/PreviousSlnEntry.tscn");
+	private PackedScene _previousSlnEntryScene = ResourceLoader.Load<PackedScene>("res://Features/SlnPicker/PreviousSlnEntry.tscn");
 
-    private readonly TaskCompletionSource<string?> _tcs = new TaskCompletionSource<string?>(TaskCreationOptions.RunContinuationsAsynchronously);
-    
+	private readonly TaskCompletionSource<string?> _tcs = new TaskCompletionSource<string?>(TaskCreationOptions.RunContinuationsAsynchronously);
+	
 
 
-    public override void _ExitTree()
-    {
-        if (!_tcs.Task.IsCompleted) _tcs.SetResult(null);
-    }
+	public override void _ExitTree()
+	{
+		if (!_tcs.Task.IsCompleted) _tcs.SetResult(null);
+	}
 
-    public override void _Ready()
-    {
-        _previousSlnsVBoxContainer = GetNode<VBoxContainer>("%PreviousSlnsVBoxContainer");
-        _versionLabel = GetNode<Label>("%VersionLabel");
-        _fileDialog = GetNode<FileDialog>("%FileDialog");
-        _solutionDialog = GetNode<AcceptDialog>("%SolutionDialog");
-        _newSolutionButton = GetNode<Button>("%NewSolutionButton");
-        _newSolutionButton.Pressed += () => _solutionDialog.PopupCentered();
-        _solutionDialog.Confirmed += () => 
-        {
-            // GD.Print($"Creating project at: {_folderDialog.CurrentDir}");
-            // GD.Print($"Selected Template: {_templateDropdown.GetItemText(_templateDropdown.Selected)}");
-            // GD.Print($"Git enabled: {_gitCheckbox.ButtonPressed}");
-            //
-            // _tcs.SetResult(_folderDialog.CurrentDir);
-        };
-        _openSlnButton = GetNode<Button>("%OpenSlnButton");
-        _openSlnButton.Pressed += () => _fileDialog.PopupCentered();
-        var windowParent = GetParentOrNull<Window>();
-        _fileDialog.FileSelected += path => _tcs.SetResult(path);
-        windowParent?.CloseRequested += () => _tcs.SetResult(null);
-        if (_version is null)
-        {
-            var version = FileAccess.GetFileAsString("res://version.txt").Trim();
-            _version = NuGetVersion.Parse(version);
-        }
-        _versionLabel.Text = $"v{_version.ToNormalizedString()}";
-        if (Singletons.AppState.IdeSettings.AutoOpenLastSolution && GetParent() is not Window)
-        {
-            var lastSln = Singletons.AppState.RecentSlns.LastOrDefault();
-            if (lastSln is not null && File.Exists(lastSln.FilePath))
-            {
-                _tcs.TrySetResult(lastSln.FilePath);
-            }
-        }
-        PopulatePreviousSolutions();
-    }
-    
-    private void PopulatePreviousSolutions()
-    {
-        _previousSlnsVBoxContainer.QueueFreeChildren();
-        foreach (var previousSln in Singletons.AppState.RecentSlns.AsEnumerable().Reverse())
-        {
-            var node = _previousSlnEntryScene.Instantiate<PreviousSlnEntry>();
-            node.RecentSln = previousSln;
-            node.Clicked = path => _tcs.TrySetResult(path);
-            _previousSlnsVBoxContainer.AddChild(node);
-        }
-    }
+	public override void _Ready()
+	{
+		_previousSlnsVBoxContainer = GetNode<VBoxContainer>("%PreviousSlnsVBoxContainer");
+		_versionLabel = GetNode<Label>("%VersionLabel");
+		_fileDialog = GetNode<FileDialog>("%FileDialog");
+		_solutionDialog = GetNode<AcceptDialog>("%SolutionDialog");
+		_newSolutionButton = GetNode<Button>("%NewSolutionButton");
+		_newSolutionButton.Pressed += () => _solutionDialog.PopupCentered();
+		_solutionDialog.Confirmed += () => 
+		{
+			var creatorNode = new Node();
+			var projectCreator = new ProjectCreator();
+			creatorNode.AddChild(projectCreator);
+			
+			projectCreator.CreateProject("/Users/ruanroos/Projects/SharpSolutionCreator", "MyNewSolution", "MyNewProject", "console", "net8.0", "C#");
+			// GD.Print($"Creating project at: {_folderDialog.CurrentDir}");
+			// GD.Print($"Selected Template: {_templateDropdown.GetItemText(_templateDropdown.Selected)}");
+			// GD.Print($"Git enabled: {_gitCheckbox.ButtonPressed}");
+			//
+			// _tcs.SetResult(_folderDialog.CurrentDir);
+		};
+		_openSlnButton = GetNode<Button>("%OpenSlnButton");
+		_openSlnButton.Pressed += () => _fileDialog.PopupCentered();
+		var windowParent = GetParentOrNull<Window>();
+		_fileDialog.FileSelected += path => _tcs.SetResult(path);
+		windowParent?.CloseRequested += () => _tcs.SetResult(null);
+		if (_version is null)
+		{
+			var version = FileAccess.GetFileAsString("res://version.txt").Trim();
+			_version = NuGetVersion.Parse(version);
+		}
+		_versionLabel.Text = $"v{_version.ToNormalizedString()}";
+		if (Singletons.AppState.IdeSettings.AutoOpenLastSolution && GetParent() is not Window)
+		{
+			var lastSln = Singletons.AppState.RecentSlns.LastOrDefault();
+			if (lastSln is not null && File.Exists(lastSln.FilePath))
+			{
+				_tcs.TrySetResult(lastSln.FilePath);
+			}
+		}
+		PopulatePreviousSolutions();
+	}
+	
+	private void PopulatePreviousSolutions()
+	{
+		_previousSlnsVBoxContainer.QueueFreeChildren();
+		foreach (var previousSln in Singletons.AppState.RecentSlns.AsEnumerable().Reverse())
+		{
+			var node = _previousSlnEntryScene.Instantiate<PreviousSlnEntry>();
+			node.RecentSln = previousSln;
+			node.Clicked = path => _tcs.TrySetResult(path);
+			_previousSlnsVBoxContainer.AddChild(node);
+		}
+	}
 
-    public async Task<string?> GetSelectedSolutionPath()
-    {
-        return await _tcs.Task;
-    }
+	public async Task<string?> GetSelectedSolutionPath()
+	{
+		return await _tcs.Task;
+	}
 }
diff --git a/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn b/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn
index 20d8ea55..54cb97b4 100644
--- a/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn
+++ b/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn
@@ -1,10 +1,11 @@
-[gd_scene load_steps=8 format=3 uid="uid://cwvhbsd1mdl2x"]
+[gd_scene load_steps=10 format=3 uid="uid://cwvhbsd1mdl2x"]
 
 [ext_resource type="Script" uid="uid://bjvwb6jg6jpsi" path="res://Features/SlnPicker/SlnPicker.cs" id="1_ciq0g"]
 [ext_resource type="Texture2D" uid="uid://tpjfx7mo6cwj" path="res://Resources/SharpIdeV3.svg" id="2_qs47j"]
 [ext_resource type="PackedScene" uid="uid://x5lhwvh5dium" path="res://Features/SlnPicker/PreviousSlnEntry.tscn" id="2_t7l5q"]
 [ext_resource type="Script" uid="uid://but0p7xwpfxtg" path="res://Features/SlnPicker/AutoOpenLastSlnButton.cs" id="4_qs47j"]
 [ext_resource type="Script" uid="uid://btuicqd4rg4at" path="res://Features/SlnPicker/SolutionDialog.cs" id="5_6t7l7"]
+[ext_resource type="Texture2D" uid="uid://bbfxltr1fcomt" path="res://Features/SolutionExplorer/Resources/SlnFolderIcon.svg" id="6_ithdl"]
 
 [sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_qs47j"]
 
@@ -19,6 +20,9 @@ corner_radius_top_right = 5
 corner_radius_bottom_right = 5
 corner_radius_bottom_left = 5
 
+[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_0gtej"]
+content_margin_top = 176.0
+
 [node name="SlnPicker" type="Control"]
 layout_mode = 3
 anchors_preset = 15
@@ -166,7 +170,6 @@ oversampling_override = 1.0
 title = "New Solution"
 position = Vector2i(0, 36)
 size = Vector2i(1000, 500)
-visible = true
 ok_button_text = "Create"
 script = ExtResource("5_6t7l7")
 
@@ -226,114 +229,131 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 
-[node name="TabContainer" type="TabContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2"]
-unique_name_in_owner = true
+[node name="VBoxContainer2" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2"]
 layout_mode = 2
-current_tab = 1
-tabs_visible = false
 
-[node name="BlazorSettingsPanel" type="Panel" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer"]
-visible = false
+[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2"]
 layout_mode = 2
-metadata/_tab_index = 0
 
-[node name="MarginContainer" type="MarginContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer/BlazorSettingsPanel"]
-layout_mode = 1
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-offset_left = 18.0
-offset_top = 12.0
-offset_right = -3.0
-grow_horizontal = 2
-grow_vertical = 2
-
-[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer/BlazorSettingsPanel/MarginContainer"]
-layout_mode = 2
-
-[node name="HBoxContainer" type="HBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer/BlazorSettingsPanel/MarginContainer/VBoxContainer"]
+[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/VBoxContainer"]
 layout_mode = 2
 
-[node name="Label" type="Label" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer/BlazorSettingsPanel/MarginContainer/VBoxContainer/HBoxContainer"]
+[node name="Label" type="Label" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/VBoxContainer/VBoxContainer"]
 layout_mode = 2
 theme_override_colors/font_color = Color(0.4862745, 0.4862745, 0.4862745, 1)
-text = "Blazor Settings"
+text = "Solution Settings"
 
-[node name="ConsoleSettingsPanel" type="Panel" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer"]
+[node name="HSeparator" type="HSeparator" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/VBoxContainer/VBoxContainer"]
 layout_mode = 2
-metadata/_tab_index = 1
 
-[node name="MarginContainer" type="MarginContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer/ConsoleSettingsPanel"]
-layout_mode = 1
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-offset_left = 18.0
-offset_top = 12.0
-offset_right = -3.0
-grow_horizontal = 2
-grow_vertical = 2
-
-[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer"]
-layout_mode = 2
-
-[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer"]
-layout_mode = 2
-
-[node name="Label" type="Label" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/VBoxContainer"]
-layout_mode = 2
-theme_override_colors/font_color = Color(0.4862745, 0.4862745, 0.4862745, 1)
-text = "Console Settings"
-
-[node name="HSeparator" type="HSeparator" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/VBoxContainer"]
-layout_mode = 2
-
-[node name="HSplitContainer" type="HSplitContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer"]
+[node name="HSplitContainer" type="HSplitContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/VBoxContainer"]
 layout_mode = 2
 split_offset = 196
 
-[node name="Panel" type="Panel" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer"]
+[node name="Panel" type="Panel" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/VBoxContainer/HSplitContainer"]
 layout_mode = 2
 
-[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer/Panel"]
+[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/VBoxContainer/HSplitContainer/Panel"]
 layout_mode = 0
 offset_right = 40.0
 offset_bottom = 40.0
 theme_override_constants/separation = 20
 
-[node name="Label" type="Label" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer/Panel/VBoxContainer"]
+[node name="Label" type="Label" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/VBoxContainer/HSplitContainer/Panel/VBoxContainer"]
 layout_mode = 2
 text = "Solution Name:"
 
-[node name="Label2" type="Label" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer/Panel/VBoxContainer"]
+[node name="Label2" type="Label" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/VBoxContainer/HSplitContainer/Panel/VBoxContainer"]
 layout_mode = 2
 text = "Project Name:"
 
-[node name="Label3" type="Label" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer/Panel/VBoxContainer"]
+[node name="Label3" type="Label" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/VBoxContainer/HSplitContainer/Panel/VBoxContainer"]
 layout_mode = 2
 text = "Solution Directory:"
 
-[node name="Panel2" type="Panel" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer"]
+[node name="Panel2" type="Panel" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/VBoxContainer/HSplitContainer"]
 layout_mode = 2
 
-[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer/Panel2"]
+[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/VBoxContainer/HSplitContainer/Panel2"]
 layout_mode = 0
-offset_right = 40.0
-offset_bottom = 40.0
+offset_right = 505.0
+offset_bottom = 114.0
 theme_override_constants/separation = 10
 
-[node name="SlnNameLineEdit" type="LineEdit" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer/Panel2/VBoxContainer"]
+[node name="SlnNameLineEdit" type="LineEdit" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/VBoxContainer/HSplitContainer/Panel2/VBoxContainer"]
 unique_name_in_owner = true
 custom_minimum_size = Vector2(350, 0)
 layout_mode = 2
 theme_override_styles/normal = SubResource("StyleBoxFlat_6t7l7")
 
-[node name="PrjNameLineEdit" type="LineEdit" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer/Panel2/VBoxContainer"]
+[node name="PrjNameLineEdit" type="LineEdit" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/VBoxContainer/HSplitContainer/Panel2/VBoxContainer"]
 unique_name_in_owner = true
 custom_minimum_size = Vector2(350, 0)
 layout_mode = 2
 theme_override_styles/normal = SubResource("StyleBoxFlat_6t7l7")
 
+[node name="HBoxContainer" type="HBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/VBoxContainer/HSplitContainer/Panel2/VBoxContainer"]
+layout_mode = 2
+
+[node name="SlnDirLineEdit" type="LineEdit" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/VBoxContainer/HSplitContainer/Panel2/VBoxContainer/HBoxContainer"]
+custom_minimum_size = Vector2(350, 0)
+layout_mode = 2
+size_flags_horizontal = 3
+theme_override_styles/normal = SubResource("StyleBoxFlat_6t7l7")
+
+[node name="SlnDirOpenButton" type="Button" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/VBoxContainer/HSplitContainer/Panel2/VBoxContainer/HBoxContainer"]
+layout_mode = 2
+icon = ExtResource("6_ithdl")
+
+[node name="TabContainer" type="TabContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2"]
+unique_name_in_owner = true
+layout_mode = 2
+theme_override_styles/panel = SubResource("StyleBoxEmpty_0gtej")
+current_tab = 1
+tabs_visible = false
+
+[node name="BlazorSettingsPanel" type="Panel" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer"]
+visible = false
+layout_mode = 2
+metadata/_tab_index = 0
+
+[node name="MarginContainer" type="MarginContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer/BlazorSettingsPanel"]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_left = 18.0
+offset_top = 12.0
+offset_right = -3.0
+grow_horizontal = 2
+grow_vertical = 2
+
+[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer/BlazorSettingsPanel/MarginContainer"]
+layout_mode = 2
+
+[node name="HBoxContainer" type="HBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer/BlazorSettingsPanel/MarginContainer/VBoxContainer"]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer/BlazorSettingsPanel/MarginContainer/VBoxContainer/HBoxContainer"]
+layout_mode = 2
+theme_override_colors/font_color = Color(0.4862745, 0.4862745, 0.4862745, 1)
+text = "Blazor Settings"
+
+[node name="ConsoleSettingsPanel" type="Panel" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer"]
+layout_mode = 2
+metadata/_tab_index = 1
+
+[node name="MarginContainer" type="MarginContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer/ConsoleSettingsPanel"]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_left = 18.0
+offset_top = 12.0
+offset_right = -3.0
+grow_horizontal = 2
+grow_vertical = 2
+
 [node name="FolderDialog" type="FileDialog" parent="SolutionDialog"]
 unique_name_in_owner = true
 oversampling_override = 1.0

From fb1fad6495bc4ec3b738513530cc21a9394e14d6 Mon Sep 17 00:00:00 2001
From: RR-CodeBase <73562973+RR-CodeBase@users.noreply.github.com>
Date: Thu, 8 Jan 2026 15:13:51 +0200
Subject: [PATCH 05/17] Updated Project Creation

Updated Proj Create
---
 .../Features/SlnPicker/ProjectCreator.cs      | 238 ++++++++++++------
 .../Features/SlnPicker/SlnPicker.cs           |   2 +-
 2 files changed, 158 insertions(+), 82 deletions(-)

diff --git a/src/SharpIDE.Godot/Features/SlnPicker/ProjectCreator.cs b/src/SharpIDE.Godot/Features/SlnPicker/ProjectCreator.cs
index 96917245..00a5e61f 100644
--- a/src/SharpIDE.Godot/Features/SlnPicker/ProjectCreator.cs
+++ b/src/SharpIDE.Godot/Features/SlnPicker/ProjectCreator.cs
@@ -4,122 +4,198 @@
 using Exception = System.Exception;
 using GD = Godot.GD;
 using Path = System.IO.Path;
+using System.Text.RegularExpressions; // For parsing SDK list
+using System.Collections.Generic; // For lists
+using System.Linq; // For sorting and selecting
+using File = System.IO.File; // For File.Exists
 
 namespace SharpIDE.Godot.Features.SlnPicker;
 
 public partial class ProjectCreator : Node
 {
-	public void CreateProject(string basePath, string solutionName, string projectName, string template, string framework, string language, string extraArgs = "")
+	// Creates a new project with the specified parameters.
+	public void CreateProject(string basePath, string solutionName, string projectName, string template,
+		string framework, string language, string sdkVersion, string extraArgs = "")
 	{
-		// Defaults matching screenshot; override via UI
 		solutionName = solutionName ?? "MySolution";
 		projectName = projectName ?? "MyProject";
-		template = template ?? "console"; // e.g., "blazor" for Blazor, "webapi" for API, etc.
+		template = template ?? "console"; //"blazor" for Blazor, "webapi" for API, etc.
 		framework = framework ?? "net8.0";
-		language = language ?? "C#";
+	   language = language ?? "C#";
+
+	   // Normalize and resolve absolute paths for cross-platform reliability
+	   basePath = Path.GetFullPath(basePath);
+	   string solutionDir = Path.Combine(basePath, solutionName);
+	   string projectDir = Path.Combine(solutionDir, projectName);
+
+	   try
+	   {
+		  string dotnetPath = GetDotnetPath();
+		  GD.Print($"Using dotnet CLI path: {dotnetPath}");
+
+		  // Check if dotnet is available at the resolved path
+		  if (!IsDotnetAvailable(dotnetPath))
+		  {
+			 throw new Exception($"dotnet CLI not found at {dotnetPath}. Ensure .NET SDK is installed and update GetDotnetPath() if needed.");
+		  }
+
+		  // Require sdkVersion to be specified
+		  if (string.IsNullOrEmpty(sdkVersion))
+		  {
+			  throw new Exception("SDK version must be specified (e.g., '8.0.411').");
+		  }
+
+		  // Validate the specified SDK is installed using the system CLI
+		  string installedSdks = GetInstalledSdks(dotnetPath);
+		  if (!Regex.IsMatch(installedSdks, $@"\b{Regex.Escape(sdkVersion)}\b"))
+		  {
+			  throw new Exception($"Specified SDK {sdkVersion} not installed. Available: {installedSdks}. Install from https://dotnet.microsoft.com.");
+		  }
+
+		  // Create global.json to pin the specified SDK
+		  string globalJsonPath = Path.Combine(solutionDir, "global.json");
+		  string globalJsonContent = $@"{{
+  ""sdk"": {{
+	""version"": ""{sdkVersion}""
+  }}
+}}";
+		  Directory.CreateDirectory(solutionDir); // Create dir early for global.json
+		  File.WriteAllText(globalJsonPath, globalJsonContent);
+		  GD.Print($"Pinned SDK to {sdkVersion} via global.json in {solutionDir}");
+
+		  // Create solution file
+		  ExecuteDotnetCommand(dotnetPath, solutionDir, $"new sln -n {solutionName}");
+
+		  // Create project subdirectory
+		  Directory.CreateDirectory(projectDir);
+
+		  // Create project with generic template
+		  string projectArgs = $"new {template} -n {projectName} --framework {framework} --language {language} {extraArgs}";
+		  ExecuteDotnetCommand(dotnetPath, solutionDir, projectArgs);
+
+		  // Add project to solution
+		  ExecuteDotnetCommand(dotnetPath, solutionDir, $"sln add {projectName}/{projectName}.csproj");
+
+		  GD.Print($"Project ({template}) created successfully at {solutionDir}!");
+	   }
+	   catch (Exception ex)
+	   {
+		  GD.PrintErr($"Error creating project: {ex.Message}. Folder may be partially created at {solutionDir}. If access denied to template cache, try running 'sudo chown -R $(whoami) ~/.templateengine' or 'rm -rf ~/.templateengine/dotnetcli/<version>' in terminal.");
+	   }
+	}
 
-		// Normalize and resolve absolute paths for cross-platform reliability
-		basePath = Path.GetFullPath(basePath);
-		string solutionDir = Path.Combine(basePath, solutionName);
-		string projectDir = Path.Combine(solutionDir, projectName);
+	// Get platform-specific path to system dotnet CLI
+	private string GetDotnetPath()
+	{
+		string osName = OS.GetName();
+		string dotnetPath = "dotnet"; // Fallback
 
-		try
+		if (osName == "macOS")
 		{
-			// Check if dotnet is available (cross-platform validation)
-			if (!IsDotnetAvailable())
-			{
-				throw new Exception("dotnet CLI not found. Ensure .NET SDK is installed and in PATH.");
-			}
-
-			// Step 1: Create solution directory
-			Directory.CreateDirectory(solutionDir);
-
-			// Step 2: Create solution file
-			ExecuteDotnetCommand(solutionDir, $"new sln -n {solutionName}");
-
-			// Step 3: Create project subdirectory
-			Directory.CreateDirectory(projectDir);
-
-			// Step 4: Create project with generic template
-			string projectArgs = $"new {template} -n {projectName} --framework {framework} --language {language} {extraArgs}";
-			ExecuteDotnetCommand(projectDir, projectArgs);
-
-			// Step 5: Add project to solution
-			ExecuteDotnetCommand(solutionDir, $"sln add {projectName}/{projectName}.csproj");
-
-			GD.Print($"Project ({template}) created successfully at {solutionDir}!");
-			// In SharpIDE: Refresh solution explorer, open the project, or trigger build.
+			dotnetPath = "/usr/local/share/dotnet/dotnet";
 		}
-		catch (Exception ex)
+		else if (osName == "Linux")
 		{
-			GD.PrintErr($"Error creating project: {ex.Message}");
-			// In SharpIDE: Show error dialog or log to output panel.
+			dotnetPath = "/usr/share/dotnet/dotnet";
+		}
+		else if (osName == "Windows")
+		{
+			dotnetPath = @"C:\Program Files\dotnet\dotnet.exe";
 		}
-	}
 
-	// Helper to check if dotnet is available
-	private bool IsDotnetAvailable()
-	{
-		try
+		if (File.Exists(dotnetPath))
 		{
-			var processInfo = new ProcessStartInfo
-			{
-				FileName = "dotnet",
-				Arguments = "--version",
-				RedirectStandardOutput = true,
-				UseShellExecute = false,
-				CreateNoWindow = true
-			};
-			using (var process = Process.Start(processInfo))
-			{
-				process?.WaitForExit();
-				return process?.ExitCode == 0;
-			}
+			return dotnetPath;
 		}
-		catch
+		else
 		{
-			return false;
+			GD.PrintErr($"System dotnet not found at {dotnetPath}; falling back to 'dotnet'. Check your install.");
+			return "dotnet";
 		}
 	}
 
-	// Helper for executing dotnet commands
-	private void ExecuteDotnetCommand(string workingDir, string arguments)
+	// Get list of installed SDKs using specified dotnetPath
+	private string GetInstalledSdks(string dotnetPath)
 	{
-		workingDir = Path.GetFullPath(workingDir); // Ensure absolute for OS consistency
 		var processInfo = new ProcessStartInfo
 		{
-			FileName = "dotnet",
-			Arguments = arguments,
-			WorkingDirectory = workingDir,
+			FileName = dotnetPath,
+			Arguments = "--list-sdks",
 			RedirectStandardOutput = true,
-			RedirectStandardError = true,
 			UseShellExecute = false,
 			CreateNoWindow = true
 		};
 
-		using (var process = new Process { StartInfo = processInfo })
+		using (var process = Process.Start(processInfo))
 		{
-			process.Start();
-			string output = process.StandardOutput.ReadToEnd();
-			string error = process.StandardError.ReadToEnd();
-			process.WaitForExit();
-
-			if (process.ExitCode != 0)
-			{
-				throw new Exception($"dotnet command failed in {workingDir}: {error}");
-			}
-
-			GD.Print($"dotnet output in {workingDir}: {output}"); // Log for SharpIDE's console
+			process?.WaitForExit();
+			string output = process?.StandardOutput.ReadToEnd() ?? "";
+			// Parse versions (e.g., lines like "8.0.411 [/path]") with Multiline option
+			var versions = Regex.Matches(output, @"^(\d+\.\d+\.\d+)", RegexOptions.Multiline);
+			return string.Join(", ", versions.Select(m => m.Groups[1].Value));
 		}
 	}
 
-	// Example: Override _Ready for testing (remove in production)
-	public override void _Ready()
+	// Check if dotnet is available using specified dotnetPath
+	private bool IsDotnetAvailable(string dotnetPath)
 	{
-		// Test console app
-		CreateProject("/path/to/projects", "ConsoleApp1", "ConsoleApp1", "console", "net8.0", "C#");
+	   try
+	   {
+		  var processInfo = new ProcessStartInfo
+		  {
+			 FileName = dotnetPath,
+			 Arguments = "--version",
+			 RedirectStandardOutput = true,
+			 UseShellExecute = false,
+			 CreateNoWindow = true
+		  };
+		  using (var process = Process.Start(processInfo))
+		  {
+			 process?.WaitForExit();
+			 return process?.ExitCode == 0;
+		  }
+	   }
+	   catch
+	   {
+		  return false;
+	   }
+	}
 
-		// Test Blazor (future expansion): Uncomment to try
-		// CreateProject("/path/to/projects", "BlazorApp1", "BlazorApp1", "blazor", "net8.0", "C#", "--no-https");
+	// Execute dotnet commands using specified dotnetPath
+	private void ExecuteDotnetCommand(string dotnetPath, string workingDir, string arguments)
+	{
+	   workingDir = Path.GetFullPath(workingDir); // Ensure absolute for OS consistency
+	   var processInfo = new ProcessStartInfo
+	   {
+		  FileName = dotnetPath,
+		  Arguments = arguments,
+		  WorkingDirectory = workingDir,
+		  RedirectStandardOutput = true,
+		  RedirectStandardError = true,
+		  UseShellExecute = false,
+		  CreateNoWindow = true
+	   };
+
+	   using (var process = new Process { StartInfo = processInfo })
+	   {
+		  process.Start();
+		  string output = process.StandardOutput.ReadToEnd();
+		  string error = process.StandardError.ReadToEnd();
+		  process.WaitForExit();
+
+		  if (process.ExitCode != 0)
+		  {
+			 throw new Exception($"dotnet command failed in {workingDir}: {error}");
+		  }
+
+		  GD.Print($"dotnet output in {workingDir}: {output}"); // Log for SharpIDE's console
+	   }
 	}
+
+	// Example: Override _Ready for testing (remove in production)
+	// public override void _Ready()
+	// {
+	//     // Test console app with specific SDK
+	//     CreateProject("/Users/ruanroos/Projects/SharpSolutionCreator", "MyNewSolution", "MyNewProject", "console", "net8.0", "C#", "8.0.411");
+	// }
 }
diff --git a/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.cs b/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.cs
index 34775efe..04e95a7d 100644
--- a/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.cs
+++ b/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.cs
@@ -40,7 +40,7 @@ public override void _Ready()
 			var projectCreator = new ProjectCreator();
 			creatorNode.AddChild(projectCreator);
 			
-			projectCreator.CreateProject("/Users/ruanroos/Projects/SharpSolutionCreator", "MyNewSolution", "MyNewProject", "console", "net8.0", "C#");
+			projectCreator.CreateProject("/Users/ruanroos/Projects/SharpSolutionCreator", "MyNewSolution", "MyNewProject", "console", "net8.0", "C#", "8.0.411");
 			// GD.Print($"Creating project at: {_folderDialog.CurrentDir}");
 			// GD.Print($"Selected Template: {_templateDropdown.GetItemText(_templateDropdown.Selected)}");
 			// GD.Print($"Git enabled: {_gitCheckbox.ButtonPressed}");

From d70b9acbf917d9d872b1834083cfb350ef5451a4 Mon Sep 17 00:00:00 2001
From: RR-CodeBase <73562973+RR-CodeBase@users.noreply.github.com>
Date: Thu, 8 Jan 2026 16:30:50 +0200
Subject: [PATCH 06/17] Updated Project Creator

Updated Project Creator
---
 .../Features/SlnPicker/ProjectCreator.cs      | 65 +++++++++++--------
 1 file changed, 39 insertions(+), 26 deletions(-)

diff --git a/src/SharpIDE.Godot/Features/SlnPicker/ProjectCreator.cs b/src/SharpIDE.Godot/Features/SlnPicker/ProjectCreator.cs
index 00a5e61f..20347cd1 100644
--- a/src/SharpIDE.Godot/Features/SlnPicker/ProjectCreator.cs
+++ b/src/SharpIDE.Godot/Features/SlnPicker/ProjectCreator.cs
@@ -49,19 +49,11 @@ public void CreateProject(string basePath, string solutionName, string projectNa
 		  string installedSdks = GetInstalledSdks(dotnetPath);
 		  if (!Regex.IsMatch(installedSdks, $@"\b{Regex.Escape(sdkVersion)}\b"))
 		  {
-			  throw new Exception($"Specified SDK {sdkVersion} not installed. Available: {installedSdks}. Install from https://dotnet.microsoft.com.");
+			  OS.Alert($"Specified SDK {sdkVersion} not installed. Available: {installedSdks}. Install from https://dotnet.microsoft.com.","Error");
 		  }
 
-		  // Create global.json to pin the specified SDK
-		  string globalJsonPath = Path.Combine(solutionDir, "global.json");
-		  string globalJsonContent = $@"{{
-  ""sdk"": {{
-	""version"": ""{sdkVersion}""
-  }}
-}}";
-		  Directory.CreateDirectory(solutionDir); // Create dir early for global.json
-		  File.WriteAllText(globalJsonPath, globalJsonContent);
-		  GD.Print($"Pinned SDK to {sdkVersion} via global.json in {solutionDir}");
+		  Directory.CreateDirectory(solutionDir);
+		  PinGlobalConfig(solutionDir, sdkVersion);
 
 		  // Create solution file
 		  ExecuteDotnetCommand(dotnetPath, solutionDir, $"new sln -n {solutionName}");
@@ -74,13 +66,15 @@ public void CreateProject(string basePath, string solutionName, string projectNa
 		  ExecuteDotnetCommand(dotnetPath, solutionDir, projectArgs);
 
 		  // Add project to solution
-		  ExecuteDotnetCommand(dotnetPath, solutionDir, $"sln add {projectName}/{projectName}.csproj");
+		  var solutionArgs = $"sln add {projectName}/{projectName}.csproj";
+		  ExecuteDotnetCommand(dotnetPath, solutionDir, solutionArgs);
 
 		  GD.Print($"Project ({template}) created successfully at {solutionDir}!");
+		  PinGlobalConfig(solutionDir, sdkVersion,true);
 	   }
 	   catch (Exception ex)
 	   {
-		  GD.PrintErr($"Error creating project: {ex.Message}. Folder may be partially created at {solutionDir}. If access denied to template cache, try running 'sudo chown -R $(whoami) ~/.templateengine' or 'rm -rf ~/.templateengine/dotnetcli/<version>' in terminal.");
+		   OS.Alert($"Error creating project: {ex.Message}. Folder may be partially created at {solutionDir}. If access denied to template cache, try running 'sudo chown -R $(whoami) ~/.templateengine' or 'rm -rf ~/.templateengine/dotnetcli/<version>' in terminal.","Error");
 	   }
 	}
 
@@ -109,7 +103,7 @@ private string GetDotnetPath()
 		}
 		else
 		{
-			GD.PrintErr($"System dotnet not found at {dotnetPath}; falling back to 'dotnet'. Check your install.");
+			OS.Alert($"System dotnet not found at {dotnetPath}; falling back to 'dotnet'. Check your install.","Warning");
 			return "dotnet";
 		}
 	}
@@ -176,26 +170,45 @@ private void ExecuteDotnetCommand(string dotnetPath, string workingDir, string a
 		  CreateNoWindow = true
 	   };
 
+	   processInfo.EnvironmentVariables["DOTNET_MULTILEVEL_LOOKUP"] = "0";
+	   
 	   using (var process = new Process { StartInfo = processInfo })
 	   {
 		  process.Start();
 		  string output = process.StandardOutput.ReadToEnd();
 		  string error = process.StandardError.ReadToEnd();
 		  process.WaitForExit();
+		  
+		  if (process.ExitCode != 0) OS.Alert($"dotnet command failed in {workingDir}: {error}", "Error");
+		  // if (!string.IsNullOrEmpty(error)) OS.Alert($"Command Error: {error}", "Error");;
 
-		  if (process.ExitCode != 0)
-		  {
-			 throw new Exception($"dotnet command failed in {workingDir}: {error}");
-		  }
-
-		  GD.Print($"dotnet output in {workingDir}: {output}"); // Log for SharpIDE's console
+		  GD.Print($"dotnet output in {workingDir}: {output}");
 	   }
 	}
 
-	// Example: Override _Ready for testing (remove in production)
-	// public override void _Ready()
-	// {
-	//     // Test console app with specific SDK
-	//     CreateProject("/Users/ruanroos/Projects/SharpSolutionCreator", "MyNewSolution", "MyNewProject", "console", "net8.0", "C#", "8.0.411");
-	// }
+	private void PinGlobalConfig(string solutionDir, string sdkVersion, bool deleteExistingGlobalJson = false)
+	{
+		if (!deleteExistingGlobalJson)
+		{
+			// Create global.json to pin the specified SDK
+			string globalJsonPath = Path.Combine(solutionDir, "global.json");
+			string globalJsonContent = $@"{{
+""sdk"": {{
+	""version"": ""{sdkVersion}""
+	}}
+}}";
+			File.WriteAllText(globalJsonPath, globalJsonContent);
+			GD.Print($"Pinned SDK to {sdkVersion} via global.json in {solutionDir}");
+		}
+		else
+		{
+			string globalJsonPath = Path.Combine(solutionDir, "global.json");
+			if (File.Exists(globalJsonPath))
+			{
+				File.Delete(globalJsonPath);
+				GD.Print($"Deleted global.json from {solutionDir}");
+			}
+		}
+		
+	}
 }

From af2358f986ed990c512b4cd3c09f7ec7e3085adf Mon Sep 17 00:00:00 2001
From: RR-CodeBase <73562973+RR-CodeBase@users.noreply.github.com>
Date: Thu, 8 Jan 2026 17:26:36 +0200
Subject: [PATCH 07/17] Updating Projects

Projects Update
---
 .../Features/SlnPicker/SlnPicker.cs           |  6 +-
 .../Features/SlnPicker/SlnPicker.tscn         | 68 +++++++++++++++++--
 .../Features/SlnPicker/SolutionDialog.cs      |  7 ++
 src/SharpIDE.Godot/project.godot              |  2 +
 4 files changed, 75 insertions(+), 8 deletions(-)

diff --git a/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.cs b/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.cs
index 04e95a7d..64390ac7 100644
--- a/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.cs
+++ b/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.cs
@@ -36,11 +36,15 @@ public override void _Ready()
 		_newSolutionButton.Pressed += () => _solutionDialog.PopupCentered();
 		_solutionDialog.Confirmed += () => 
 		{
+			var solutionName = _solutionDialog.GetNode<LineEdit>("%SlnNameLineEdit").Text;
+			var projectName = _solutionDialog.GetNode<LineEdit>("%PrjNameLineEdit").Text;
+			var solutionDir = _solutionDialog.GetNode<LineEdit>("%SlnDirLineEdit").Text;
+			
 			var creatorNode = new Node();
 			var projectCreator = new ProjectCreator();
 			creatorNode.AddChild(projectCreator);
 			
-			projectCreator.CreateProject("/Users/ruanroos/Projects/SharpSolutionCreator", "MyNewSolution", "MyNewProject", "console", "net8.0", "C#", "8.0.411");
+			projectCreator.CreateProject(solutionDir, solutionName, projectName, "console", "net8.0", "C#", "8.0.411");
 			// GD.Print($"Creating project at: {_folderDialog.CurrentDir}");
 			// GD.Print($"Selected Template: {_templateDropdown.GetItemText(_templateDropdown.Selected)}");
 			// GD.Print($"Git enabled: {_gitCheckbox.ButtonPressed}");
diff --git a/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn b/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn
index 54cb97b4..f8c180ad 100644
--- a/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn
+++ b/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn
@@ -21,7 +21,7 @@ corner_radius_bottom_right = 5
 corner_radius_bottom_left = 5
 
 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_0gtej"]
-content_margin_top = 176.0
+content_margin_top = 154.0
 
 [node name="SlnPicker" type="Control"]
 layout_mode = 3
@@ -170,6 +170,7 @@ oversampling_override = 1.0
 title = "New Solution"
 position = Vector2i(0, 36)
 size = Vector2i(1000, 500)
+visible = true
 ok_button_text = "Create"
 script = ExtResource("5_6t7l7")
 
@@ -188,6 +189,8 @@ layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
+offset_left = 10.0
+offset_right = 10.0
 grow_horizontal = 2
 grow_vertical = 2
 
@@ -226,6 +229,8 @@ layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
+offset_left = 10.0
+offset_right = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 
@@ -296,18 +301,21 @@ theme_override_styles/normal = SubResource("StyleBoxFlat_6t7l7")
 layout_mode = 2
 
 [node name="SlnDirLineEdit" type="LineEdit" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/VBoxContainer/HSplitContainer/Panel2/VBoxContainer/HBoxContainer"]
+unique_name_in_owner = true
 custom_minimum_size = Vector2(350, 0)
 layout_mode = 2
 size_flags_horizontal = 3
 theme_override_styles/normal = SubResource("StyleBoxFlat_6t7l7")
 
 [node name="SlnDirOpenButton" type="Button" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/VBoxContainer/HSplitContainer/Panel2/VBoxContainer/HBoxContainer"]
+unique_name_in_owner = true
 layout_mode = 2
 icon = ExtResource("6_ithdl")
 
 [node name="TabContainer" type="TabContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2"]
 unique_name_in_owner = true
 layout_mode = 2
+mouse_filter = 2
 theme_override_styles/panel = SubResource("StyleBoxEmpty_0gtej")
 current_tab = 1
 tabs_visible = false
@@ -322,9 +330,9 @@ layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
-offset_left = 18.0
-offset_top = 12.0
-offset_right = -3.0
+offset_top = -5.5
+offset_right = -21.0
+offset_bottom = 17.5
 grow_horizontal = 2
 grow_vertical = 2
 
@@ -339,6 +347,9 @@ layout_mode = 2
 theme_override_colors/font_color = Color(0.4862745, 0.4862745, 0.4862745, 1)
 text = "Blazor Settings"
 
+[node name="HSeparator" type="HSeparator" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer/BlazorSettingsPanel/MarginContainer/VBoxContainer"]
+layout_mode = 2
+
 [node name="ConsoleSettingsPanel" type="Panel" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer"]
 layout_mode = 2
 metadata/_tab_index = 1
@@ -348,12 +359,55 @@ layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
-offset_left = 18.0
-offset_top = 12.0
-offset_right = -3.0
+offset_top = -9.5
+offset_right = -21.0
+offset_bottom = 21.5
 grow_horizontal = 2
 grow_vertical = 2
 
+[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer"]
+layout_mode = 2
+
+[node name="HBoxContainer" type="HBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer"]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HBoxContainer"]
+layout_mode = 2
+theme_override_colors/font_color = Color(0.4862745, 0.4862745, 0.4862745, 1)
+text = "Console Settings"
+
+[node name="HSeparator" type="HSeparator" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer"]
+layout_mode = 2
+
+[node name="HSplitContainer" type="HSplitContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer"]
+layout_mode = 2
+split_offset = 196
+
+[node name="Panel" type="Panel" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer"]
+layout_mode = 2
+
+[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer/Panel"]
+layout_mode = 0
+offset_right = 40.0
+offset_bottom = 40.0
+theme_override_constants/separation = 20
+
+[node name="Label" type="Label" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer/Panel/VBoxContainer"]
+layout_mode = 2
+text = "Create Git Repo"
+
+[node name="Panel2" type="Panel" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer"]
+layout_mode = 2
+
+[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer/Panel2"]
+layout_mode = 0
+offset_right = 505.0
+offset_bottom = 114.0
+theme_override_constants/separation = 10
+
+[node name="GitRepoCheckBox" type="CheckBox" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer/Panel2/VBoxContainer"]
+layout_mode = 2
+
 [node name="FolderDialog" type="FileDialog" parent="SolutionDialog"]
 unique_name_in_owner = true
 oversampling_override = 1.0
diff --git a/src/SharpIDE.Godot/Features/SlnPicker/SolutionDialog.cs b/src/SharpIDE.Godot/Features/SlnPicker/SolutionDialog.cs
index a7b5ca0e..270d4ac0 100644
--- a/src/SharpIDE.Godot/Features/SlnPicker/SolutionDialog.cs
+++ b/src/SharpIDE.Godot/Features/SlnPicker/SolutionDialog.cs
@@ -6,14 +6,21 @@ public partial class SolutionDialog : AcceptDialog
 	
 	private FileDialog _folderDialog = null!;
 	private TabContainer _contentSwitcher = null!;
+	private Button _slnDirOpenButton = null!;
 
 	public override void _Ready()
 	{
 		_folderDialog = GetNode<FileDialog>("%FolderDialog");
+		
 		_contentSwitcher = GetNode<TabContainer>("%TabContainer");
+		_slnDirOpenButton = GetNode<Button>("%SlnDirOpenButton");
+		
+		_slnDirOpenButton.Pressed += () => _folderDialog.PopupCentered();
 		
 		GetNode<Button>("%BlazorButton").Pressed += () => OnTypeSelected("BlazorSettingsPanel");
 		GetNode<Button>("%ConsoleButton").Pressed += () => OnTypeSelected("ConsoleSettingsPanel");
+		
+		
 	}
 
 	private void OnTypeSelected(string typeName)
diff --git a/src/SharpIDE.Godot/project.godot b/src/SharpIDE.Godot/project.godot
index 06c04bb7..20fae4fb 100644
--- a/src/SharpIDE.Godot/project.godot
+++ b/src/SharpIDE.Godot/project.godot
@@ -26,6 +26,8 @@ ObservableTrackerRuntimeHook="*res://addons/R3.Godot/ObservableTrackerRuntimeHoo
 
 [display]
 
+window/size/viewport_width=1920
+window/size/viewport_height=1080
 window/energy_saving/keep_screen_on=false
 
 [dotnet]

From 563e6bf9a71b0682541f603553df7e2baa08c440 Mon Sep 17 00:00:00 2001
From: RR-CodeBase <73562973+RR-CodeBase@users.noreply.github.com>
Date: Fri, 9 Jan 2026 10:46:30 +0200
Subject: [PATCH 08/17] Updated Solution Picker and Project Creator to include
 SDK selection and project type

---
 .../Features/SlnPicker/ProjectCreator.cs      |  14 +-
 .../Features/SlnPicker/SlnPicker.cs           |   9 +-
 .../Features/SlnPicker/SlnPicker.tscn         | 142 ++++++++++++------
 .../Features/SlnPicker/SolutionDialog.cs      |  43 ++++--
 4 files changed, 140 insertions(+), 68 deletions(-)

diff --git a/src/SharpIDE.Godot/Features/SlnPicker/ProjectCreator.cs b/src/SharpIDE.Godot/Features/SlnPicker/ProjectCreator.cs
index 20347cd1..efc8e13a 100644
--- a/src/SharpIDE.Godot/Features/SlnPicker/ProjectCreator.cs
+++ b/src/SharpIDE.Godot/Features/SlnPicker/ProjectCreator.cs
@@ -15,18 +15,16 @@ public partial class ProjectCreator : Node
 {
 	// Creates a new project with the specified parameters.
 	public void CreateProject(string basePath, string solutionName, string projectName, string template,
-		string framework, string language, string sdkVersion, string extraArgs = "")
+		string language, string sdkVersion, string extraArgs = "")
 	{
-		solutionName = solutionName ?? "MySolution";
-		projectName = projectName ?? "MyProject";
-		template = template ?? "console"; //"blazor" for Blazor, "webapi" for API, etc.
-		framework = framework ?? "net8.0";
-	   language = language ?? "C#";
+		//"blazor" for Blazor, "webapi" for API, etc.
 
 	   // Normalize and resolve absolute paths for cross-platform reliability
 	   basePath = Path.GetFullPath(basePath);
 	   string solutionDir = Path.Combine(basePath, solutionName);
 	   string projectDir = Path.Combine(solutionDir, projectName);
+	   string framework = "net" + sdkVersion.Split('.')[0] + ".0";
+	   
 
 	   try
 	   {
@@ -79,7 +77,7 @@ public void CreateProject(string basePath, string solutionName, string projectNa
 	}
 
 	// Get platform-specific path to system dotnet CLI
-	private string GetDotnetPath()
+	public string GetDotnetPath()
 	{
 		string osName = OS.GetName();
 		string dotnetPath = "dotnet"; // Fallback
@@ -109,7 +107,7 @@ private string GetDotnetPath()
 	}
 
 	// Get list of installed SDKs using specified dotnetPath
-	private string GetInstalledSdks(string dotnetPath)
+	public string GetInstalledSdks(string dotnetPath)
 	{
 		var processInfo = new ProcessStartInfo
 		{
diff --git a/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.cs b/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.cs
index 64390ac7..c84e3620 100644
--- a/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.cs
+++ b/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.cs
@@ -39,17 +39,14 @@ public override void _Ready()
 			var solutionName = _solutionDialog.GetNode<LineEdit>("%SlnNameLineEdit").Text;
 			var projectName = _solutionDialog.GetNode<LineEdit>("%PrjNameLineEdit").Text;
 			var solutionDir = _solutionDialog.GetNode<LineEdit>("%SlnDirLineEdit").Text;
+			var projectTemplate = _solutionDialog.GetNode<Label>("%PrjTypeLabel").Text;
+			var sdkVersion = _solutionDialog.GetNode<OptionButton>("%SdkVersionOptions").Text;
 			
 			var creatorNode = new Node();
 			var projectCreator = new ProjectCreator();
 			creatorNode.AddChild(projectCreator);
 			
-			projectCreator.CreateProject(solutionDir, solutionName, projectName, "console", "net8.0", "C#", "8.0.411");
-			// GD.Print($"Creating project at: {_folderDialog.CurrentDir}");
-			// GD.Print($"Selected Template: {_templateDropdown.GetItemText(_templateDropdown.Selected)}");
-			// GD.Print($"Git enabled: {_gitCheckbox.ButtonPressed}");
-			//
-			// _tcs.SetResult(_folderDialog.CurrentDir);
+			projectCreator.CreateProject(solutionDir, solutionName, projectName, projectTemplate, "C#", sdkVersion);
 		};
 		_openSlnButton = GetNode<Button>("%OpenSlnButton");
 		_openSlnButton.Pressed += () => _fileDialog.PopupCentered();
diff --git a/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn b/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn
index f8c180ad..42b22293 100644
--- a/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn
+++ b/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn
@@ -21,7 +21,7 @@ corner_radius_bottom_right = 5
 corner_radius_bottom_left = 5
 
 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_0gtej"]
-content_margin_top = 154.0
+content_margin_top = 175.0
 
 [node name="SlnPicker" type="Control"]
 layout_mode = 3
@@ -224,7 +224,8 @@ alignment = 0
 [node name="Panel2" type="Panel" parent="SolutionDialog/HSplitContainer"]
 layout_mode = 2
 
-[node name="MarginContainer2" type="MarginContainer" parent="SolutionDialog/HSplitContainer/Panel2"]
+[node name="Panel2MarginContainer" type="MarginContainer" parent="SolutionDialog/HSplitContainer/Panel2"]
+unique_name_in_owner = true
 layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
@@ -234,127 +235,180 @@ offset_right = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 
-[node name="VBoxContainer2" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2"]
+[node name="VBoxContainer2" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer"]
 layout_mode = 2
 
-[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2"]
+[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2"]
 layout_mode = 2
 
-[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/VBoxContainer"]
+[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/VBoxContainer"]
 layout_mode = 2
 
-[node name="Label" type="Label" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/VBoxContainer/VBoxContainer"]
+[node name="Label" type="Label" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/VBoxContainer/VBoxContainer"]
 layout_mode = 2
 theme_override_colors/font_color = Color(0.4862745, 0.4862745, 0.4862745, 1)
 text = "Solution Settings"
 
-[node name="HSeparator" type="HSeparator" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/VBoxContainer/VBoxContainer"]
+[node name="HSeparator" type="HSeparator" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/VBoxContainer/VBoxContainer"]
 layout_mode = 2
 
-[node name="HSplitContainer" type="HSplitContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/VBoxContainer"]
+[node name="HSplitContainer" type="HSplitContainer" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/VBoxContainer"]
 layout_mode = 2
 split_offset = 196
 
-[node name="Panel" type="Panel" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/VBoxContainer/HSplitContainer"]
+[node name="Panel" type="Panel" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/VBoxContainer/HSplitContainer"]
 layout_mode = 2
 
-[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/VBoxContainer/HSplitContainer/Panel"]
+[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/VBoxContainer/HSplitContainer/Panel"]
 layout_mode = 0
 offset_right = 40.0
 offset_bottom = 40.0
 theme_override_constants/separation = 20
 
-[node name="Label" type="Label" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/VBoxContainer/HSplitContainer/Panel/VBoxContainer"]
+[node name="Label" type="Label" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/VBoxContainer/HSplitContainer/Panel/VBoxContainer"]
 layout_mode = 2
 text = "Solution Name:"
 
-[node name="Label2" type="Label" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/VBoxContainer/HSplitContainer/Panel/VBoxContainer"]
+[node name="Label2" type="Label" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/VBoxContainer/HSplitContainer/Panel/VBoxContainer"]
 layout_mode = 2
 text = "Project Name:"
 
-[node name="Label3" type="Label" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/VBoxContainer/HSplitContainer/Panel/VBoxContainer"]
+[node name="Label3" type="Label" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/VBoxContainer/HSplitContainer/Panel/VBoxContainer"]
 layout_mode = 2
 text = "Solution Directory:"
 
-[node name="Panel2" type="Panel" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/VBoxContainer/HSplitContainer"]
+[node name="Label4" type="Label" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/VBoxContainer/HSplitContainer/Panel/VBoxContainer"]
+layout_mode = 2
+text = "Project Type:"
+
+[node name="Panel2" type="Panel" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/VBoxContainer/HSplitContainer"]
 layout_mode = 2
 
-[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/VBoxContainer/HSplitContainer/Panel2"]
+[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/VBoxContainer/HSplitContainer/Panel2"]
 layout_mode = 0
 offset_right = 505.0
 offset_bottom = 114.0
 theme_override_constants/separation = 10
 
-[node name="SlnNameLineEdit" type="LineEdit" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/VBoxContainer/HSplitContainer/Panel2/VBoxContainer"]
+[node name="SlnNameLineEdit" type="LineEdit" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/VBoxContainer/HSplitContainer/Panel2/VBoxContainer"]
 unique_name_in_owner = true
 custom_minimum_size = Vector2(350, 0)
 layout_mode = 2
 theme_override_styles/normal = SubResource("StyleBoxFlat_6t7l7")
 
-[node name="PrjNameLineEdit" type="LineEdit" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/VBoxContainer/HSplitContainer/Panel2/VBoxContainer"]
+[node name="PrjNameLineEdit" type="LineEdit" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/VBoxContainer/HSplitContainer/Panel2/VBoxContainer"]
 unique_name_in_owner = true
 custom_minimum_size = Vector2(350, 0)
 layout_mode = 2
 theme_override_styles/normal = SubResource("StyleBoxFlat_6t7l7")
 
-[node name="HBoxContainer" type="HBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/VBoxContainer/HSplitContainer/Panel2/VBoxContainer"]
+[node name="HBoxContainer" type="HBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/VBoxContainer/HSplitContainer/Panel2/VBoxContainer"]
 layout_mode = 2
 
-[node name="SlnDirLineEdit" type="LineEdit" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/VBoxContainer/HSplitContainer/Panel2/VBoxContainer/HBoxContainer"]
+[node name="SlnDirLineEdit" type="LineEdit" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/VBoxContainer/HSplitContainer/Panel2/VBoxContainer/HBoxContainer"]
 unique_name_in_owner = true
 custom_minimum_size = Vector2(350, 0)
 layout_mode = 2
 size_flags_horizontal = 3
 theme_override_styles/normal = SubResource("StyleBoxFlat_6t7l7")
 
-[node name="SlnDirOpenButton" type="Button" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/VBoxContainer/HSplitContainer/Panel2/VBoxContainer/HBoxContainer"]
+[node name="SlnDirOpenButton" type="Button" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/VBoxContainer/HSplitContainer/Panel2/VBoxContainer/HBoxContainer"]
 unique_name_in_owner = true
 layout_mode = 2
 icon = ExtResource("6_ithdl")
 
-[node name="TabContainer" type="TabContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2"]
+[node name="HBoxContainer2" type="HBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/VBoxContainer/HSplitContainer/Panel2/VBoxContainer"]
+custom_minimum_size = Vector2(0, 35)
+layout_mode = 2
+theme_override_constants/separation = 175
+
+[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/VBoxContainer/HSplitContainer/Panel2/VBoxContainer/HBoxContainer2"]
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="PrjTypeLabel" type="Label" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/VBoxContainer/HSplitContainer/Panel2/VBoxContainer/HBoxContainer2/VBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+text = "none"
+
+[node name="HBoxContainer" type="HBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/VBoxContainer/HSplitContainer/Panel2/VBoxContainer/HBoxContainer2"]
+custom_minimum_size = Vector2(245, 0)
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="Label" type="Label" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/VBoxContainer/HSplitContainer/Panel2/VBoxContainer/HBoxContainer2/HBoxContainer"]
+layout_mode = 2
+text = "Sdk Version:"
+
+[node name="SdkVersionOptions" type="OptionButton" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/VBoxContainer/HSplitContainer/Panel2/VBoxContainer/HBoxContainer2/HBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+
+[node name="PrjSettingsTabContainer" type="TabContainer" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2"]
 unique_name_in_owner = true
 layout_mode = 2
 mouse_filter = 2
 theme_override_styles/panel = SubResource("StyleBoxEmpty_0gtej")
-current_tab = 1
+current_tab = 0
 tabs_visible = false
 
-[node name="BlazorSettingsPanel" type="Panel" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer"]
-visible = false
+[node name="BlazorSettingsPanel" type="Panel" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/PrjSettingsTabContainer"]
 layout_mode = 2
 metadata/_tab_index = 0
 
-[node name="MarginContainer" type="MarginContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer/BlazorSettingsPanel"]
+[node name="MarginContainer" type="MarginContainer" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/PrjSettingsTabContainer/BlazorSettingsPanel"]
 layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
-offset_top = -5.5
+offset_top = -9.5
 offset_right = -21.0
-offset_bottom = 17.5
+offset_bottom = 21.5
 grow_horizontal = 2
 grow_vertical = 2
 
-[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer/BlazorSettingsPanel/MarginContainer"]
+[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/PrjSettingsTabContainer/BlazorSettingsPanel/MarginContainer"]
 layout_mode = 2
 
-[node name="HBoxContainer" type="HBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer/BlazorSettingsPanel/MarginContainer/VBoxContainer"]
+[node name="HBoxContainer" type="HBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/PrjSettingsTabContainer/BlazorSettingsPanel/MarginContainer/VBoxContainer"]
 layout_mode = 2
 
-[node name="Label" type="Label" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer/BlazorSettingsPanel/MarginContainer/VBoxContainer/HBoxContainer"]
+[node name="Label" type="Label" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/PrjSettingsTabContainer/BlazorSettingsPanel/MarginContainer/VBoxContainer/HBoxContainer"]
 layout_mode = 2
 theme_override_colors/font_color = Color(0.4862745, 0.4862745, 0.4862745, 1)
 text = "Blazor Settings"
 
-[node name="HSeparator" type="HSeparator" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer/BlazorSettingsPanel/MarginContainer/VBoxContainer"]
+[node name="HSeparator" type="HSeparator" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/PrjSettingsTabContainer/BlazorSettingsPanel/MarginContainer/VBoxContainer"]
+layout_mode = 2
+
+[node name="HSplitContainer" type="HSplitContainer" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/PrjSettingsTabContainer/BlazorSettingsPanel/MarginContainer/VBoxContainer"]
+layout_mode = 2
+split_offset = 196
+
+[node name="Panel" type="Panel" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/PrjSettingsTabContainer/BlazorSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer"]
+layout_mode = 2
+
+[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/PrjSettingsTabContainer/BlazorSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer/Panel"]
+layout_mode = 0
+offset_right = 40.0
+offset_bottom = 40.0
+theme_override_constants/separation = 20
+
+[node name="Panel2" type="Panel" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/PrjSettingsTabContainer/BlazorSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer"]
 layout_mode = 2
 
-[node name="ConsoleSettingsPanel" type="Panel" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer"]
+[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/PrjSettingsTabContainer/BlazorSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer/Panel2"]
+layout_mode = 0
+offset_right = 505.0
+offset_bottom = 114.0
+theme_override_constants/separation = 10
+
+[node name="ConsoleSettingsPanel" type="Panel" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/PrjSettingsTabContainer"]
+visible = false
 layout_mode = 2
 metadata/_tab_index = 1
 
-[node name="MarginContainer" type="MarginContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer/ConsoleSettingsPanel"]
+[node name="MarginContainer" type="MarginContainer" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/PrjSettingsTabContainer/ConsoleSettingsPanel"]
 layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
@@ -365,47 +419,47 @@ offset_bottom = 21.5
 grow_horizontal = 2
 grow_vertical = 2
 
-[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer"]
+[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/PrjSettingsTabContainer/ConsoleSettingsPanel/MarginContainer"]
 layout_mode = 2
 
-[node name="HBoxContainer" type="HBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer"]
+[node name="HBoxContainer" type="HBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/PrjSettingsTabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer"]
 layout_mode = 2
 
-[node name="Label" type="Label" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HBoxContainer"]
+[node name="Label" type="Label" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/PrjSettingsTabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HBoxContainer"]
 layout_mode = 2
 theme_override_colors/font_color = Color(0.4862745, 0.4862745, 0.4862745, 1)
 text = "Console Settings"
 
-[node name="HSeparator" type="HSeparator" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer"]
+[node name="HSeparator" type="HSeparator" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/PrjSettingsTabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer"]
 layout_mode = 2
 
-[node name="HSplitContainer" type="HSplitContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer"]
+[node name="HSplitContainer" type="HSplitContainer" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/PrjSettingsTabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer"]
 layout_mode = 2
 split_offset = 196
 
-[node name="Panel" type="Panel" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer"]
+[node name="Panel" type="Panel" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/PrjSettingsTabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer"]
 layout_mode = 2
 
-[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer/Panel"]
+[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/PrjSettingsTabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer/Panel"]
 layout_mode = 0
 offset_right = 40.0
 offset_bottom = 40.0
 theme_override_constants/separation = 20
 
-[node name="Label" type="Label" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer/Panel/VBoxContainer"]
+[node name="Label" type="Label" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/PrjSettingsTabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer/Panel/VBoxContainer"]
 layout_mode = 2
 text = "Create Git Repo"
 
-[node name="Panel2" type="Panel" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer"]
+[node name="Panel2" type="Panel" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/PrjSettingsTabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer"]
 layout_mode = 2
 
-[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer/Panel2"]
+[node name="VBoxContainer" type="VBoxContainer" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/PrjSettingsTabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer/Panel2"]
 layout_mode = 0
 offset_right = 505.0
 offset_bottom = 114.0
 theme_override_constants/separation = 10
 
-[node name="GitRepoCheckBox" type="CheckBox" parent="SolutionDialog/HSplitContainer/Panel2/MarginContainer2/VBoxContainer2/TabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer/Panel2/VBoxContainer"]
+[node name="GitRepoCheckBox" type="CheckBox" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/PrjSettingsTabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer/Panel2/VBoxContainer"]
 layout_mode = 2
 
 [node name="FolderDialog" type="FileDialog" parent="SolutionDialog"]
diff --git a/src/SharpIDE.Godot/Features/SlnPicker/SolutionDialog.cs b/src/SharpIDE.Godot/Features/SlnPicker/SolutionDialog.cs
index 270d4ac0..41de3dbd 100644
--- a/src/SharpIDE.Godot/Features/SlnPicker/SolutionDialog.cs
+++ b/src/SharpIDE.Godot/Features/SlnPicker/SolutionDialog.cs
@@ -1,5 +1,6 @@
 using Godot;
 using System;
+using SharpIDE.Godot.Features.SlnPicker;
 
 public partial class SolutionDialog : AcceptDialog
 {
@@ -7,34 +8,56 @@ public partial class SolutionDialog : AcceptDialog
 	private FileDialog _folderDialog = null!;
 	private TabContainer _contentSwitcher = null!;
 	private Button _slnDirOpenButton = null!;
+	private LineEdit _slnDirLineEdit = null!;
+	private Label _prjTypeLabel = null!;
+	private MarginContainer _panel2MarginContainer = null!;
+	private OptionButton _sdkVersionOptions = null!;
 
 	public override void _Ready()
 	{
-		_folderDialog = GetNode<FileDialog>("%FolderDialog");
+		var creatorNode = new Node();
+		var projectCreator = new ProjectCreator();
+		creatorNode.AddChild(projectCreator);
 		
-		_contentSwitcher = GetNode<TabContainer>("%TabContainer");
+		_folderDialog = GetNode<FileDialog>("%FolderDialog");
+		_panel2MarginContainer = GetNode<MarginContainer>("%Panel2MarginContainer");
+		_contentSwitcher = GetNode<TabContainer>("%PrjSettingsTabContainer");
 		_slnDirOpenButton = GetNode<Button>("%SlnDirOpenButton");
+		_slnDirLineEdit = GetNode<LineEdit>("%SlnDirLineEdit");
+		_prjTypeLabel = GetNode<Label>("%PrjTypeLabel");
+		_sdkVersionOptions = GetNode<OptionButton>("%SdkVersionOptions");
+		_panel2MarginContainer.Visible = false;
 		
 		_slnDirOpenButton.Pressed += () => _folderDialog.PopupCentered();
+		_folderDialog.DirSelected += (dir) => _slnDirLineEdit.Text = dir;
+		GetNode<Button>("%BlazorButton").Pressed += () => OnTypeSelected("BlazorSettingsPanel", "blazor");
+		GetNode<Button>("%ConsoleButton").Pressed += () => OnTypeSelected("ConsoleSettingsPanel", "console");
+
+		var dotnetPath = projectCreator.GetDotnetPath();
+		var installedSdks = projectCreator.GetInstalledSdks(dotnetPath);
 		
-		GetNode<Button>("%BlazorButton").Pressed += () => OnTypeSelected("BlazorSettingsPanel");
-		GetNode<Button>("%ConsoleButton").Pressed += () => OnTypeSelected("ConsoleSettingsPanel");
-		
-		
+		_sdkVersionOptions.Clear();
+		var sdkVersions = installedSdks.Split(',');
+		for (int i = sdkVersions.Length - 1; i >= 0; i--)
+		{
+			_sdkVersionOptions.AddItem(sdkVersions[i].Trim());
+		}
+
 	}
 
-	private void OnTypeSelected(string typeName)
+	private void OnTypeSelected(string panelName, string projectType)
 	{
-		_contentSwitcher.Visible = true;
+		_panel2MarginContainer.Visible = true;
 		for (int i = 0; i < _contentSwitcher.GetTabCount(); i++)
 		{
-			if (_contentSwitcher.GetTabTitle(i) == typeName)
+			if (_contentSwitcher.GetTabTitle(i) == panelName)
 			{
 				_contentSwitcher.CurrentTab = i;
+				_prjTypeLabel.Text = projectType;
 				return;
 			}
 		}
 		
-		GD.Print($"Selected: {typeName}");
+		
 	}
 }

From edce02fd5500ee8ac2a8de5d220a9267ffcf929f Mon Sep 17 00:00:00 2001
From: RR-CodeBase <73562973+RR-CodeBase@users.noreply.github.com>
Date: Fri, 9 Jan 2026 11:00:55 +0200
Subject: [PATCH 09/17] Update ProjectCreator to pin and clean up SDK
 configuration during solution creation

---
 src/SharpIDE.Godot/Features/SlnPicker/ProjectCreator.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/SharpIDE.Godot/Features/SlnPicker/ProjectCreator.cs b/src/SharpIDE.Godot/Features/SlnPicker/ProjectCreator.cs
index efc8e13a..29fbc58f 100644
--- a/src/SharpIDE.Godot/Features/SlnPicker/ProjectCreator.cs
+++ b/src/SharpIDE.Godot/Features/SlnPicker/ProjectCreator.cs
@@ -51,6 +51,7 @@ public void CreateProject(string basePath, string solutionName, string projectNa
 		  }
 
 		  Directory.CreateDirectory(solutionDir);
+		  // Pin dotnet conf for solution creation
 		  PinGlobalConfig(solutionDir, sdkVersion);
 
 		  // Create solution file
@@ -63,12 +64,14 @@ public void CreateProject(string basePath, string solutionName, string projectNa
 		  string projectArgs = $"new {template} -n {projectName} --framework {framework} --language {language} {extraArgs}";
 		  ExecuteDotnetCommand(dotnetPath, solutionDir, projectArgs);
 
+		  // Delete dotnet conf
+		  PinGlobalConfig(solutionDir, sdkVersion,true);
 		  // Add project to solution
 		  var solutionArgs = $"sln add {projectName}/{projectName}.csproj";
 		  ExecuteDotnetCommand(dotnetPath, solutionDir, solutionArgs);
 
 		  GD.Print($"Project ({template}) created successfully at {solutionDir}!");
-		  PinGlobalConfig(solutionDir, sdkVersion,true);
+		  
 	   }
 	   catch (Exception ex)
 	   {

From 733d3348ba5f5a829188047eb312bbe8b6eeefd4 Mon Sep 17 00:00:00 2001
From: RR-CodeBase <73562973+RR-CodeBase@users.noreply.github.com>
Date: Fri, 9 Jan 2026 11:10:54 +0200
Subject: [PATCH 10/17] View Update

Updated View
---
 src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn b/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn
index 42b22293..2f17d533 100644
--- a/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn
+++ b/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn
@@ -170,7 +170,6 @@ oversampling_override = 1.0
 title = "New Solution"
 position = Vector2i(0, 36)
 size = Vector2i(1000, 500)
-visible = true
 ok_button_text = "Create"
 script = ExtResource("5_6t7l7")
 

From b53cfd87f1363a540bdd1395015c3e460844c1c3 Mon Sep 17 00:00:00 2001
From: RR-CodeBase <73562973+RR-CodeBase@users.noreply.github.com>
Date: Mon, 26 Jan 2026 07:03:40 +0200
Subject: [PATCH 11/17] Updated Settings

---
 .../Features/CodeEditor/SharpIdeCodeEdit.cs   | 34 +++++++++----------
 .../Features/SlnPicker/SlnPicker.tscn         | 20 +++++++----
 2 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit.cs b/src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit.cs
index ecb06c21..ae3b1998 100644
--- a/src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit.cs
+++ b/src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit.cs
@@ -48,25 +48,25 @@ public partial class SharpIdeCodeEdit : CodeEdit
 	private bool _fileDeleted;
 	private IDisposable? _projectDiagnosticsObserveDisposable;
 	
-    [Inject] private readonly IdeOpenTabsFileManager _openTabsFileManager = null!;
-    [Inject] private readonly RunService _runService = null!;
-    [Inject] private readonly RoslynAnalysis _roslynAnalysis = null!;
-    [Inject] private readonly IdeCodeActionService _ideCodeActionService = null!;
-    [Inject] private readonly FileChangedService _fileChangedService = null!;
-    [Inject] private readonly IdeApplyCompletionService _ideApplyCompletionService = null!;
-    [Inject] private readonly IdeNavigationHistoryService _navigationHistoryService = null!;
-    [Inject] private readonly EditorCaretPositionService _editorCaretPositionService = null!;
-
-    private readonly List<string> _codeCompletionTriggers =
-    [
-	    "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z",
-	    "_", "<", ".", "#"
-    ];
-    private readonly List<string> _additionalCodeCompletionPrefixes =
+	[Inject] private readonly IdeOpenTabsFileManager _openTabsFileManager = null!;
+	[Inject] private readonly RunService _runService = null!;
+	[Inject] private readonly RoslynAnalysis _roslynAnalysis = null!;
+	[Inject] private readonly IdeCodeActionService _ideCodeActionService = null!;
+	[Inject] private readonly FileChangedService _fileChangedService = null!;
+	[Inject] private readonly IdeApplyCompletionService _ideApplyCompletionService = null!;
+	[Inject] private readonly IdeNavigationHistoryService _navigationHistoryService = null!;
+	[Inject] private readonly EditorCaretPositionService _editorCaretPositionService = null!;
+
+	private readonly List<string> _codeCompletionTriggers =
+	[
+		"a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z",
+		"_", "<", ".", "#"
+	];
+	private readonly List<string> _additionalCodeCompletionPrefixes =
 	[
 		//"A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z",
 		//"0", "1", "2", "3", "4", "5", "6", "7", "8", "9",
-	    "(", ",", "=", "\t", ":"
+		"(", ",", "=", "\t", ":"
 	];
 
 	public SharpIdeCodeEdit()
@@ -628,4 +628,4 @@ await this.InvokeAsync(() =>
 		}
 		return (caretLine, caretColumn);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn b/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn
index 2f17d533..140004fc 100644
--- a/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn
+++ b/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn
@@ -21,7 +21,7 @@ corner_radius_bottom_right = 5
 corner_radius_bottom_left = 5
 
 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_0gtej"]
-content_margin_top = 175.0
+content_margin_top = 212.0
 
 [node name="SlnPicker" type="Control"]
 layout_mode = 3
@@ -170,6 +170,7 @@ oversampling_override = 1.0
 title = "New Solution"
 position = Vector2i(0, 36)
 size = Vector2i(1000, 500)
+visible = true
 ok_button_text = "Create"
 script = ExtResource("5_6t7l7")
 
@@ -280,6 +281,10 @@ text = "Solution Directory:"
 layout_mode = 2
 text = "Project Type:"
 
+[node name="Label5" type="Label" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/VBoxContainer/HSplitContainer/Panel/VBoxContainer"]
+layout_mode = 2
+text = "Create Git Repo"
+
 [node name="Panel2" type="Panel" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/VBoxContainer/HSplitContainer"]
 layout_mode = 2
 
@@ -343,15 +348,20 @@ text = "Sdk Version:"
 unique_name_in_owner = true
 layout_mode = 2
 
+[node name="GitRepoCheckBox" type="CheckBox" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/VBoxContainer/HSplitContainer/Panel2/VBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+
 [node name="PrjSettingsTabContainer" type="TabContainer" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2"]
 unique_name_in_owner = true
 layout_mode = 2
 mouse_filter = 2
 theme_override_styles/panel = SubResource("StyleBoxEmpty_0gtej")
-current_tab = 0
+current_tab = 1
 tabs_visible = false
 
 [node name="BlazorSettingsPanel" type="Panel" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/PrjSettingsTabContainer"]
+visible = false
 layout_mode = 2
 metadata/_tab_index = 0
 
@@ -403,7 +413,6 @@ offset_bottom = 114.0
 theme_override_constants/separation = 10
 
 [node name="ConsoleSettingsPanel" type="Panel" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/PrjSettingsTabContainer"]
-visible = false
 layout_mode = 2
 metadata/_tab_index = 1
 
@@ -447,7 +456,7 @@ theme_override_constants/separation = 20
 
 [node name="Label" type="Label" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/PrjSettingsTabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer/Panel/VBoxContainer"]
 layout_mode = 2
-text = "Create Git Repo"
+text = "none"
 
 [node name="Panel2" type="Panel" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/PrjSettingsTabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer"]
 layout_mode = 2
@@ -458,9 +467,6 @@ offset_right = 505.0
 offset_bottom = 114.0
 theme_override_constants/separation = 10
 
-[node name="GitRepoCheckBox" type="CheckBox" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/PrjSettingsTabContainer/ConsoleSettingsPanel/MarginContainer/VBoxContainer/HSplitContainer/Panel2/VBoxContainer"]
-layout_mode = 2
-
 [node name="FolderDialog" type="FileDialog" parent="SolutionDialog"]
 unique_name_in_owner = true
 oversampling_override = 1.0

From 0e4922c8bd34b52a72f4d7883950dd109c61c290 Mon Sep 17 00:00:00 2001
From: RR-CodeBase <73562973+RR-CodeBase@users.noreply.github.com>
Date: Thu, 29 Jan 2026 16:44:52 +0200
Subject: [PATCH 12/17] Git Command

Added Git Command Line
---
 .../Features/SlnPicker/GitCommandLine.cs      | 84 +++++++++++++++++++
 .../Features/SlnPicker/GitCommandLine.cs.uid  |  1 +
 .../Features/SlnPicker/SlnPicker.cs           | 15 +++-
 .../Features/SlnPicker/SlnPicker.tscn         |  1 +
 4 files changed, 97 insertions(+), 4 deletions(-)
 create mode 100644 src/SharpIDE.Godot/Features/SlnPicker/GitCommandLine.cs
 create mode 100644 src/SharpIDE.Godot/Features/SlnPicker/GitCommandLine.cs.uid

diff --git a/src/SharpIDE.Godot/Features/SlnPicker/GitCommandLine.cs b/src/SharpIDE.Godot/Features/SlnPicker/GitCommandLine.cs
new file mode 100644
index 00000000..2de5223f
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/SlnPicker/GitCommandLine.cs
@@ -0,0 +1,84 @@
+using Godot;
+using System.Diagnostics;
+using System.Threading.Tasks;
+using System.IO; // For Path.GetFullPath
+
+namespace SharpIDE.Godot.Features.SlnPicker;
+
+public partial class GitCommandLine : Node
+{
+    /// <summary>
+    /// Initializes a Git repository in the specified base path by running 'git init'.
+    /// Runs asynchronously to avoid blocking the Godot main thread.
+    /// </summary>
+    /// <param name="basePath">The directory path where the repo should be created.</param>
+    /// <returns>A task that completes when the command finishes, with success indicator.</returns>
+    public async Task<bool> InitializeGitRepoAsync(string basePath)
+    {
+        // Normalize and resolve absolute path for cross-platform reliability
+        basePath = Path.GetFullPath(basePath);
+        // First, check if Git is installed
+        bool gitInstalled = await CheckGitInstalledAsync();
+        if (!gitInstalled)
+        {
+            GD.Print("Git is not installed or not found in PATH. Cannot initialize repo.");
+            return false;
+        }
+
+        // Run 'git init' asynchronously
+        (string output, string error, int exitCode) = await RunGitCommandAsync("init", basePath);
+
+        if (exitCode == 0)
+        {
+            GD.Print($"Git repo initialized successfully in {basePath}. Output: {output}");
+            return true;
+        }
+        else
+        {
+            GD.Print($"Failed to initialize Git repo. Error: {error}");
+            return false;
+        }
+    }
+
+    /// <summary>
+    /// Checks if Git is installed by running 'git --version'.
+    /// </summary>
+    private async Task<bool> CheckGitInstalledAsync()
+    {
+        (string output, string error, int exitCode) = await RunGitCommandAsync("--version", Directory.GetCurrentDirectory());
+        return exitCode == 0 && !string.IsNullOrEmpty(output);
+    }
+
+    /// <summary>
+    /// Helper to run any Git command asynchronously in a specified working directory.
+    /// Captures output and errors.
+    /// </summary>
+    private async Task<(string Output, string Error, int ExitCode)> RunGitCommandAsync(string arguments, string workingDirectory)
+    {
+        return await Task.Run(() =>
+        {
+            var process = new Process();
+            process.StartInfo.FileName = "git";
+            process.StartInfo.Arguments = arguments;
+            process.StartInfo.WorkingDirectory = workingDirectory;
+            process.StartInfo.UseShellExecute = false; // Required for redirection
+            process.StartInfo.RedirectStandardOutput = true;
+            process.StartInfo.RedirectStandardError = true;
+            process.StartInfo.CreateNoWindow = true; // Hide console window
+
+            try
+            {
+                process.Start();
+                string output = process.StandardOutput.ReadToEnd();
+                string error = process.StandardError.ReadToEnd();
+                process.WaitForExit();
+                return (output, error, process.ExitCode);
+            }
+            catch (Exception ex)
+            {
+                GD.Print($"Exception running Git command: {ex.Message}");
+                return (string.Empty, ex.Message, -1);
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/src/SharpIDE.Godot/Features/SlnPicker/GitCommandLine.cs.uid b/src/SharpIDE.Godot/Features/SlnPicker/GitCommandLine.cs.uid
new file mode 100644
index 00000000..48c98ded
--- /dev/null
+++ b/src/SharpIDE.Godot/Features/SlnPicker/GitCommandLine.cs.uid
@@ -0,0 +1 @@
+uid://btg7j07v7s3ni
diff --git a/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.cs b/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.cs
index c84e3620..220dc2a3 100644
--- a/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.cs
+++ b/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.cs
@@ -36,17 +36,24 @@ public override void _Ready()
 		_newSolutionButton.Pressed += () => _solutionDialog.PopupCentered();
 		_solutionDialog.Confirmed += () => 
 		{
+			// Proj Creator
+			var creatorNode = new Node();
+			var projectCreator = new ProjectCreator();
+			creatorNode.AddChild(projectCreator);
+			// Git Creator
+			var gitNode = new Node();
+			var gitCommandLine = new GitCommandLine();
+			gitNode.AddChild(gitCommandLine);
+			
 			var solutionName = _solutionDialog.GetNode<LineEdit>("%SlnNameLineEdit").Text;
 			var projectName = _solutionDialog.GetNode<LineEdit>("%PrjNameLineEdit").Text;
 			var solutionDir = _solutionDialog.GetNode<LineEdit>("%SlnDirLineEdit").Text;
 			var projectTemplate = _solutionDialog.GetNode<Label>("%PrjTypeLabel").Text;
 			var sdkVersion = _solutionDialog.GetNode<OptionButton>("%SdkVersionOptions").Text;
-			
-			var creatorNode = new Node();
-			var projectCreator = new ProjectCreator();
-			creatorNode.AddChild(projectCreator);
+			var gitCheckbox = _solutionDialog.GetNode<CheckBox>("%GitRepoCheckBox").ButtonPressed;
 			
 			projectCreator.CreateProject(solutionDir, solutionName, projectName, projectTemplate, "C#", sdkVersion);
+			if(gitCheckbox) _ = gitCommandLine.InitializeGitRepoAsync(solutionDir);
 		};
 		_openSlnButton = GetNode<Button>("%OpenSlnButton");
 		_openSlnButton.Pressed += () => _fileDialog.PopupCentered();
diff --git a/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn b/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn
index 140004fc..9f8028ea 100644
--- a/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn
+++ b/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn
@@ -207,6 +207,7 @@ text = "Project Type"
 
 [node name="BlazorButton" type="Button" parent="SolutionDialog/HSplitContainer/Panel/MarginContainer/ScrollContainer/VBoxContainer"]
 unique_name_in_owner = true
+visible = false
 layout_mode = 2
 toggle_mode = true
 text = "Blazor"

From f739139d66feb8f0290201f648537267e097e283 Mon Sep 17 00:00:00 2001
From: RR-CodeBase <73562973+RR-CodeBase@users.noreply.github.com>
Date: Thu, 29 Jan 2026 17:40:23 +0200
Subject: [PATCH 13/17] Final Changes For Console

---
 src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.cs   | 3 ++-
 src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.cs b/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.cs
index 220dc2a3..e3418e59 100644
--- a/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.cs
+++ b/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.cs
@@ -53,7 +53,8 @@ public override void _Ready()
 			var gitCheckbox = _solutionDialog.GetNode<CheckBox>("%GitRepoCheckBox").ButtonPressed;
 			
 			projectCreator.CreateProject(solutionDir, solutionName, projectName, projectTemplate, "C#", sdkVersion);
-			if(gitCheckbox) _ = gitCommandLine.InitializeGitRepoAsync(solutionDir);
+			if(gitCheckbox) _ = gitCommandLine.InitializeGitRepoAsync(solutionDir + "/" + solutionName);
+			_tcs.SetResult(solutionDir + "/" + solutionName + "/" + solutionName + ".sln");
 		};
 		_openSlnButton = GetNode<Button>("%OpenSlnButton");
 		_openSlnButton.Pressed += () => _fileDialog.PopupCentered();
diff --git a/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn b/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn
index 9f8028ea..8056344d 100644
--- a/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn
+++ b/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn
@@ -170,7 +170,6 @@ oversampling_override = 1.0
 title = "New Solution"
 position = Vector2i(0, 36)
 size = Vector2i(1000, 500)
-visible = true
 ok_button_text = "Create"
 script = ExtResource("5_6t7l7")
 
@@ -392,6 +391,7 @@ text = "Blazor Settings"
 layout_mode = 2
 
 [node name="HSplitContainer" type="HSplitContainer" parent="SolutionDialog/HSplitContainer/Panel2/Panel2MarginContainer/VBoxContainer2/PrjSettingsTabContainer/BlazorSettingsPanel/MarginContainer/VBoxContainer"]
+visible = false
 layout_mode = 2
 split_offset = 196
 

From 602f803da4de80e221791540f5db1480e75c2924 Mon Sep 17 00:00:00 2001
From: RR-CodeBase <73562973+RR-CodeBase@users.noreply.github.com>
Date: Thu, 29 Jan 2026 21:33:32 +0200
Subject: [PATCH 14/17] Reverted Code formatting adjustments in
 `SharpIdeCodeEdit.cs`

---
 .../Features/CodeEditor/SharpIdeCodeEdit.cs   | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit.cs b/src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit.cs
index ae3b1998..ecb06c21 100644
--- a/src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit.cs
+++ b/src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit.cs
@@ -48,25 +48,25 @@ public partial class SharpIdeCodeEdit : CodeEdit
 	private bool _fileDeleted;
 	private IDisposable? _projectDiagnosticsObserveDisposable;
 	
-	[Inject] private readonly IdeOpenTabsFileManager _openTabsFileManager = null!;
-	[Inject] private readonly RunService _runService = null!;
-	[Inject] private readonly RoslynAnalysis _roslynAnalysis = null!;
-	[Inject] private readonly IdeCodeActionService _ideCodeActionService = null!;
-	[Inject] private readonly FileChangedService _fileChangedService = null!;
-	[Inject] private readonly IdeApplyCompletionService _ideApplyCompletionService = null!;
-	[Inject] private readonly IdeNavigationHistoryService _navigationHistoryService = null!;
-	[Inject] private readonly EditorCaretPositionService _editorCaretPositionService = null!;
-
-	private readonly List<string> _codeCompletionTriggers =
-	[
-		"a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z",
-		"_", "<", ".", "#"
-	];
-	private readonly List<string> _additionalCodeCompletionPrefixes =
+    [Inject] private readonly IdeOpenTabsFileManager _openTabsFileManager = null!;
+    [Inject] private readonly RunService _runService = null!;
+    [Inject] private readonly RoslynAnalysis _roslynAnalysis = null!;
+    [Inject] private readonly IdeCodeActionService _ideCodeActionService = null!;
+    [Inject] private readonly FileChangedService _fileChangedService = null!;
+    [Inject] private readonly IdeApplyCompletionService _ideApplyCompletionService = null!;
+    [Inject] private readonly IdeNavigationHistoryService _navigationHistoryService = null!;
+    [Inject] private readonly EditorCaretPositionService _editorCaretPositionService = null!;
+
+    private readonly List<string> _codeCompletionTriggers =
+    [
+	    "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z",
+	    "_", "<", ".", "#"
+    ];
+    private readonly List<string> _additionalCodeCompletionPrefixes =
 	[
 		//"A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z",
 		//"0", "1", "2", "3", "4", "5", "6", "7", "8", "9",
-		"(", ",", "=", "\t", ":"
+	    "(", ",", "=", "\t", ":"
 	];
 
 	public SharpIdeCodeEdit()
@@ -628,4 +628,4 @@ await this.InvokeAsync(() =>
 		}
 		return (caretLine, caretColumn);
 	}
-}
+}
\ No newline at end of file

From 65e42bdd97ee933e46ede14e369a6e3d1ae5bedd Mon Sep 17 00:00:00 2001
From: RR-CodeBase <73562973+RR-CodeBase@users.noreply.github.com>
Date: Thu, 29 Jan 2026 21:38:32 +0200
Subject: [PATCH 15/17] Reverted Code formatting adjustments in `IdeRoot.cs`

---
 src/SharpIDE.Godot/IdeRoot.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/SharpIDE.Godot/IdeRoot.cs b/src/SharpIDE.Godot/IdeRoot.cs
index 3dbdfb1d..f194aa45 100644
--- a/src/SharpIDE.Godot/IdeRoot.cs
+++ b/src/SharpIDE.Godot/IdeRoot.cs
@@ -45,12 +45,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()
 	{
@@ -208,4 +208,4 @@ public override void _UnhandledKeyInput(InputEvent @event)
 			_searchAllFilesWindow.Popup();
 		}
 	}
-}
+}
\ No newline at end of file

From bdb294e73f4ff65e733c6a72ed9ac329d956b731 Mon Sep 17 00:00:00 2001
From: RR-CodeBase <73562973+RR-CodeBase@users.noreply.github.com>
Date: Thu, 29 Jan 2026 21:42:45 +0200
Subject: [PATCH 16/17] Reverted

Reverted Ide Code refactorings
---
 .../Features/BottomBar/RunningTasksDisplay.cs | 102 +++++++++---------
 src/SharpIDE.Godot/Features/Git/GitColours.cs |  56 +++++-----
 .../Features/LeftSideBar/LeftSideBar.cs       |  96 ++++++++---------
 3 files changed, 127 insertions(+), 127 deletions(-)

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/Git/GitColours.cs b/src/SharpIDE.Godot/Features/Git/GitColours.cs
index 03dee9b3..11501b32 100644
--- a/src/SharpIDE.Godot/Features/Git/GitColours.cs
+++ b/src/SharpIDE.Godot/Features/Git/GitColours.cs
@@ -1,35 +1,35 @@
-using Godot;
+using Godot;
 using SharpIDE.Application.Features.SolutionDiscovery.VsPersistence;
 
 namespace SharpIDE.Godot.Features.Git;
 
 public static class GitColours
 {
-	private const string NewFileColourHexCode = "50964c";
-	private const string EditedFileColourHexCode = "6496ba";
-	private const string UnalteredFileColourHexCode = "d4d4d4";
-	
-	public static readonly Color GitNewFileColour = new Color(NewFileColourHexCode);
-	public static readonly Color GitEditedFileColour = new Color(EditedFileColourHexCode);
-	public static readonly Color GitUnalteredFileColour = new Color(UnalteredFileColourHexCode);
+    private const string NewFileColourHexCode = "50964c";
+    private const string EditedFileColourHexCode = "6496ba";
+    private const string UnalteredFileColourHexCode = "d4d4d4";
+    
+    public static readonly Color GitNewFileColour = new Color(NewFileColourHexCode);
+    public static readonly Color GitEditedFileColour = new Color(EditedFileColourHexCode);
+    public static readonly Color GitUnalteredFileColour = new Color(UnalteredFileColourHexCode);
 
-	public static readonly Color GitNewFileTransparentColour = new Color(NewFileColourHexCode, 0.4f);
-	public static readonly Color GitEditedFileTransparentColour = new Color(EditedFileColourHexCode, 0.4f);
-	public static readonly Color GitUnalteredFileTransparentColour = new Color(UnalteredFileColourHexCode, 0.4f);
-	
-	public static Color GetColorForGitFileStatus(GitFileStatus fileStatus) => fileStatus switch
-	{
-		GitFileStatus.Added => GitNewFileColour,
-		GitFileStatus.Modified => GitEditedFileColour,
-		GitFileStatus.Unaltered => GitUnalteredFileColour,
-		_ => GitUnalteredFileColour
-	};
-	
-	public static Color GetColorForGitLineStatus(GitLineStatus lineStatus) => lineStatus switch
-	{
-		GitLineStatus.Added => GitNewFileTransparentColour,
-		GitLineStatus.Modified => GitEditedFileTransparentColour,
-		GitLineStatus.Unaltered => GitUnalteredFileTransparentColour,
-		_ => GitUnalteredFileTransparentColour
-	};
-}
+    public static readonly Color GitNewFileTransparentColour = new Color(NewFileColourHexCode, 0.4f);
+    public static readonly Color GitEditedFileTransparentColour = new Color(EditedFileColourHexCode, 0.4f);
+    public static readonly Color GitUnalteredFileTransparentColour = new Color(UnalteredFileColourHexCode, 0.4f);
+    
+    public static Color GetColorForGitFileStatus(GitFileStatus fileStatus) => fileStatus switch
+    {
+        GitFileStatus.Added => GitNewFileColour,
+        GitFileStatus.Modified => GitEditedFileColour,
+        GitFileStatus.Unaltered => GitUnalteredFileColour,
+        _ => GitUnalteredFileColour
+    };
+    
+    public static Color GetColorForGitLineStatus(GitLineStatus lineStatus) => lineStatus switch
+    {
+        GitLineStatus.Added => GitNewFileTransparentColour,
+        GitLineStatus.Modified => GitEditedFileTransparentColour,
+        GitLineStatus.Unaltered => GitUnalteredFileTransparentColour,
+        _ => GitUnalteredFileTransparentColour
+    };
+}
\ 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

From addc049cfda491bd5cd05886b40649d01e004b0b Mon Sep 17 00:00:00 2001
From: RR-CodeBase <73562973+RR-CodeBase@users.noreply.github.com>
Date: Thu, 29 Jan 2026 21:50:10 +0200
Subject: [PATCH 17/17] Reverted Code formatting adjustments in
 `SolutionExplorerPanel.cs` and `PreviousSlnEntry.cs`.

---
 .../Features/SlnPicker/PreviousSlnEntry.cs    |  40 +++---
 .../SolutionExplorer/SolutionExplorerPanel.cs | 134 +++++++++---------
 2 files changed, 87 insertions(+), 87 deletions(-)

diff --git a/src/SharpIDE.Godot/Features/SlnPicker/PreviousSlnEntry.cs b/src/SharpIDE.Godot/Features/SlnPicker/PreviousSlnEntry.cs
index 179fe445..a6a91195 100644
--- a/src/SharpIDE.Godot/Features/SlnPicker/PreviousSlnEntry.cs
+++ b/src/SharpIDE.Godot/Features/SlnPicker/PreviousSlnEntry.cs
@@ -5,24 +5,24 @@ namespace SharpIDE.Godot.Features.SlnPicker;
 
 public partial class PreviousSlnEntry : MarginContainer
 {
-	private Label _slnPathLabel = null!;
-	private Label _slnNameLabel = null!;
-	private Panel _slnColourPanel = null!;
-	private Button _slnEntryButton = null!;
-	
-	public RecentSln RecentSln { get; set; } = null!;
-	public Action<string>? Clicked;
+    private Label _slnPathLabel = null!;
+    private Label _slnNameLabel = null!;
+    private Panel _slnColourPanel = null!;
+    private Button _slnEntryButton = null!;
+    
+    public RecentSln RecentSln { get; set; } = null!;
+    public Action<string>? Clicked;
 
-	public override void _Ready()
-	{
-		if (RecentSln is null) return;
-		_slnNameLabel = GetNode<Label>("%SlnNameLabel");
-		_slnPathLabel = GetNode<Label>("%SlnPathLabel");
-		_slnColourPanel = GetNode<Panel>("%Panel");
-		_slnEntryButton = GetNode<Button>("Button");
-		_slnNameLabel.Text = RecentSln.Name;
-		_slnPathLabel.Text = RecentSln.FilePath;
-		_slnColourPanel.Modulate = RandomRecentSlnColours.GetColourForFilePath(RecentSln.FilePath);
-		_slnEntryButton.Pressed += () => Clicked?.Invoke(RecentSln.FilePath);
-	}
-}
+    public override void _Ready()
+    {
+        if (RecentSln is null) return;
+        _slnNameLabel = GetNode<Label>("%SlnNameLabel");
+        _slnPathLabel = GetNode<Label>("%SlnPathLabel");
+        _slnColourPanel = GetNode<Panel>("%Panel");
+        _slnEntryButton = GetNode<Button>("Button");
+        _slnNameLabel.Text = RecentSln.Name;
+        _slnPathLabel.Text = RecentSln.FilePath;
+        _slnColourPanel.Modulate = RandomRecentSlnColours.GetColourForFilePath(RecentSln.FilePath);
+        _slnEntryButton.Pressed += () => Clicked?.Invoke(RecentSln.FilePath);
+    }
+}
\ 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 06074b9e..5599ada6 100644
--- a/src/SharpIDE.Godot/Features/SolutionExplorer/SolutionExplorerPanel.cs
+++ b/src/SharpIDE.Godot/Features/SolutionExplorer/SolutionExplorerPanel.cs
@@ -141,83 +141,83 @@ public async Task BindToSolution(SharpIdeSolutionModel solution)
 		// the Tree has been removed from the scene tree in _Ready, so we can operate on it off the ui thread, then add it back
 		_tree.Clear();
 
-		// Root
-		var rootItem = _tree.CreateItem();
-		rootItem.SetText(0, solution.Name);
-		rootItem.SetIcon(0, SlnIcon);
-		_rootItem = rootItem;
+	    // Root
+	    var rootItem = _tree.CreateItem();
+	    rootItem.SetText(0, solution.Name);
+	    rootItem.SetIcon(0, SlnIcon);
+	    _rootItem = rootItem;
 
-		// Observe Projects
-		var projectsView = solution.Projects.CreateView(y => new TreeItemContainer());
+	    // Observe Projects
+	    var projectsView = solution.Projects.CreateView(y => new TreeItemContainer());
 		projectsView.Unfiltered.ToList().ForEach(s => s.View.Value = CreateProjectTreeItem(_tree, rootItem, s.Value));
-			
-		projectsView.ObserveChanged().SubscribeOnThreadPool().ObserveOnThreadPool()
-			.SubscribeAwait(async (e, ct) => await (e.Action switch
-			{
-				NotifyCollectionChangedAction.Add => this.InvokeAsync(() => e.NewItem.View.Value = CreateProjectTreeItem(_tree, _rootItem, e.NewItem.Value)),
-				NotifyCollectionChangedAction.Remove => FreeTreeItem(e.OldItem.View.Value),
-				_ => Task.CompletedTask
-			})).AddToDeferred(this);
+	        
+	    projectsView.ObserveChanged().SubscribeOnThreadPool().ObserveOnThreadPool()
+	        .SubscribeAwait(async (e, ct) => await (e.Action switch
+	        {
+			    NotifyCollectionChangedAction.Add => this.InvokeAsync(() => e.NewItem.View.Value = CreateProjectTreeItem(_tree, _rootItem, e.NewItem.Value)),
+	            NotifyCollectionChangedAction.Remove => FreeTreeItem(e.OldItem.View.Value),
+	            _ => Task.CompletedTask
+	        })).AddToDeferred(this);
 
-		// Observe Solution Folders
-		var foldersView = solution.SlnFolders.CreateView(y => new TreeItemContainer());
-		foldersView.Unfiltered.ToList().ForEach(s => s.View.Value = CreateSlnFolderTreeItem(_tree, rootItem, s.Value));
-		foldersView.ObserveChanged().SubscribeOnThreadPool().ObserveOnThreadPool()
-			.SubscribeAwait(async (e, ct) => await (e.Action switch
-			{
-				NotifyCollectionChangedAction.Add => this.InvokeAsync(() => e.NewItem.View.Value = CreateSlnFolderTreeItem(_tree, _rootItem, e.NewItem.Value)),
-				NotifyCollectionChangedAction.Remove => FreeTreeItem(e.OldItem.View.Value),
-				_ => Task.CompletedTask
-			})).AddToDeferred(this);
-		
-		rootItem.SetCollapsedRecursive(true);
-		rootItem.Collapsed = false;
-		await this.InvokeAsync(() =>
-		{
-			_panelContainer.AddChild(_tree);
-		});
+	    // Observe Solution Folders
+	    var foldersView = solution.SlnFolders.CreateView(y => new TreeItemContainer());
+	    foldersView.Unfiltered.ToList().ForEach(s => s.View.Value = CreateSlnFolderTreeItem(_tree, rootItem, s.Value));
+	    foldersView.ObserveChanged().SubscribeOnThreadPool().ObserveOnThreadPool()
+	        .SubscribeAwait(async (e, ct) => await (e.Action switch
+	        {
+	            NotifyCollectionChangedAction.Add => this.InvokeAsync(() => e.NewItem.View.Value = CreateSlnFolderTreeItem(_tree, _rootItem, e.NewItem.Value)),
+	            NotifyCollectionChangedAction.Remove => FreeTreeItem(e.OldItem.View.Value),
+	            _ => Task.CompletedTask
+	        })).AddToDeferred(this);
+	    
+	    rootItem.SetCollapsedRecursive(true);
+	    rootItem.Collapsed = false;
+	    await this.InvokeAsync(() =>
+	    {
+		    _panelContainer.AddChild(_tree);
+	    });
 	}
 
 	[RequiresGodotUiThread]
 	private TreeItem CreateSlnFolderTreeItem(Tree tree, TreeItem parent, SharpIdeSolutionFolder slnFolder)
 	{
-		var folderItem = tree.CreateItem(parent);
-			folderItem.SetText(0, slnFolder.Name);
-			folderItem.SetIcon(0, SlnFolderIcon);
-			folderItem.SetMetadata(0, new RefCountedContainer<SharpIdeSolutionFolder>(slnFolder));
+	    var folderItem = tree.CreateItem(parent);
+	        folderItem.SetText(0, slnFolder.Name);
+	        folderItem.SetIcon(0, SlnFolderIcon);
+	        folderItem.SetMetadata(0, new RefCountedContainer<SharpIdeSolutionFolder>(slnFolder));
 
-			// Observe folder sub-collections
-			var subFoldersView = slnFolder.Folders.CreateView(y => new TreeItemContainer());
-			subFoldersView.Unfiltered.ToList().ForEach(s => s.View.Value = CreateSlnFolderTreeItem(_tree, folderItem, s.Value));
-			
-			subFoldersView.ObserveChanged().SubscribeOnThreadPool().ObserveOnThreadPool()
-				.SubscribeAwait(async (innerEvent, ct) => await (innerEvent.Action switch
-				{
-					NotifyCollectionChangedAction.Add => this.InvokeAsync(() => innerEvent.NewItem.View.Value = CreateSlnFolderTreeItem(_tree, folderItem, innerEvent.NewItem.Value)),
-					NotifyCollectionChangedAction.Remove => FreeTreeItem(innerEvent.OldItem.View.Value),
-					_ => Task.CompletedTask
-				})).AddToDeferred(this);
+	        // Observe folder sub-collections
+	        var subFoldersView = slnFolder.Folders.CreateView(y => new TreeItemContainer());
+	        subFoldersView.Unfiltered.ToList().ForEach(s => s.View.Value = CreateSlnFolderTreeItem(_tree, folderItem, s.Value));
+	        
+	        subFoldersView.ObserveChanged().SubscribeOnThreadPool().ObserveOnThreadPool()
+	            .SubscribeAwait(async (innerEvent, ct) => await (innerEvent.Action switch
+	            {
+	                NotifyCollectionChangedAction.Add => this.InvokeAsync(() => innerEvent.NewItem.View.Value = CreateSlnFolderTreeItem(_tree, folderItem, innerEvent.NewItem.Value)),
+	                NotifyCollectionChangedAction.Remove => FreeTreeItem(innerEvent.OldItem.View.Value),
+	                _ => Task.CompletedTask
+	            })).AddToDeferred(this);
 
-			var projectsView = slnFolder.Projects.CreateView(y => new TreeItemContainer());
-			projectsView.Unfiltered.ToList().ForEach(s => s.View.Value = CreateProjectTreeItem(_tree, folderItem, s.Value));
-			projectsView.ObserveChanged().SubscribeOnThreadPool().ObserveOnThreadPool()
-				.SubscribeAwait(async (innerEvent, ct) => await (innerEvent.Action switch
-				{
-					NotifyCollectionChangedAction.Add => this.InvokeAsync(() => innerEvent.NewItem.View.Value = CreateProjectTreeItem(_tree, folderItem, innerEvent.NewItem.Value)),
-					NotifyCollectionChangedAction.Remove => FreeTreeItem(innerEvent.OldItem.View.Value),
-					_ => Task.CompletedTask
-				})).AddToDeferred(this);
+	        var projectsView = slnFolder.Projects.CreateView(y => new TreeItemContainer());
+	        projectsView.Unfiltered.ToList().ForEach(s => s.View.Value = CreateProjectTreeItem(_tree, folderItem, s.Value));
+	        projectsView.ObserveChanged().SubscribeOnThreadPool().ObserveOnThreadPool()
+	            .SubscribeAwait(async (innerEvent, ct) => await (innerEvent.Action switch
+	            {
+	                NotifyCollectionChangedAction.Add => this.InvokeAsync(() => innerEvent.NewItem.View.Value = CreateProjectTreeItem(_tree, folderItem, innerEvent.NewItem.Value)),
+	                NotifyCollectionChangedAction.Remove => FreeTreeItem(innerEvent.OldItem.View.Value),
+	                _ => Task.CompletedTask
+	            })).AddToDeferred(this);
 
-			var filesView = slnFolder.Files.CreateView(y => new TreeItemContainer());
-			filesView.Unfiltered.ToList().ForEach(s => s.View.Value = CreateFileTreeItem(_tree, folderItem, s.Value));
-			filesView.ObserveChanged().SubscribeOnThreadPool().ObserveOnThreadPool()
-				.SubscribeAwait(async (innerEvent, ct) => await (innerEvent.Action switch
-				{
-					NotifyCollectionChangedAction.Add => this.InvokeAsync(() => innerEvent.NewItem.View.Value = CreateFileTreeItem(_tree, folderItem, innerEvent.NewItem.Value, innerEvent.NewStartingIndex)),
-					NotifyCollectionChangedAction.Remove => FreeTreeItem(innerEvent.OldItem.View.Value),
-					_ => Task.CompletedTask
-				})).AddToDeferred(this);
-			return folderItem;
+	        var filesView = slnFolder.Files.CreateView(y => new TreeItemContainer());
+	        filesView.Unfiltered.ToList().ForEach(s => s.View.Value = CreateFileTreeItem(_tree, folderItem, s.Value));
+	        filesView.ObserveChanged().SubscribeOnThreadPool().ObserveOnThreadPool()
+	            .SubscribeAwait(async (innerEvent, ct) => await (innerEvent.Action switch
+	            {
+	                NotifyCollectionChangedAction.Add => this.InvokeAsync(() => innerEvent.NewItem.View.Value = CreateFileTreeItem(_tree, folderItem, innerEvent.NewItem.Value, innerEvent.NewStartingIndex)),
+	                NotifyCollectionChangedAction.Remove => FreeTreeItem(innerEvent.OldItem.View.Value),
+	                _ => Task.CompletedTask
+	            })).AddToDeferred(this);
+	        return folderItem;
 	}
 
 	[RequiresGodotUiThread]
@@ -348,6 +348,6 @@ await this.InvokeAsync(() =>
 
 	private async Task FreeTreeItem(TreeItem? item)
 	{
-		await this.InvokeAsync(() => item?.Free());
+	    await this.InvokeAsync(() => item?.Free());
 	}
 }