diff --git a/OneWare.GhdlExtension.sln b/OneWare.GhdlExtension.sln
deleted file mode 100644
index aa82f1a..0000000
--- a/OneWare.GhdlExtension.sln
+++ /dev/null
@@ -1,31 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OneWare.GhdlExtension", "src\OneWare.GhdlExtension\OneWare.GhdlExtension.csproj", "{BA2D8280-AD1A-42E6-8D31-3111FB92173C}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Actions", "Actions", "{D55CBF2C-7D56-4D64-A673-68EFE9FFCE37}"
-	ProjectSection(SolutionItems) = preProject
-		.github\workflows\publish.yml = .github\workflows\publish.yml
-		.github\workflows\test.yml = .github\workflows\test.yml
-		.github\workflows\publish-nuget.yml = .github\workflows\publish-nuget.yml
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Properties", "Properties", "{6CD6D5E8-78A9-4F90-9DD7-D27B896431A5}"
-	ProjectSection(SolutionItems) = preProject
-		oneware-extension.json = oneware-extension.json
-		Extension.md = Extension.md
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{BA2D8280-AD1A-42E6-8D31-3111FB92173C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BA2D8280-AD1A-42E6-8D31-3111FB92173C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BA2D8280-AD1A-42E6-8D31-3111FB92173C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BA2D8280-AD1A-42E6-8D31-3111FB92173C}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-	EndGlobalSection
-EndGlobal
diff --git a/OneWare.GhdlExtension.slnx b/OneWare.GhdlExtension.slnx
new file mode 100644
index 0000000..b90ae97
--- /dev/null
+++ b/OneWare.GhdlExtension.slnx
@@ -0,0 +1,7 @@
+<Solution>
+  <Folder Name="/Properties/">
+    <File Path="Extension.md" />
+    <File Path="oneware-extension.json" />
+  </Folder>
+  <Project Path="src/OneWare.GhdlExtension/OneWare.GhdlExtension.csproj" />
+</Solution>
diff --git a/src/OneWare.GhdlExtension/GhdlExtensionModule.cs b/src/OneWare.GhdlExtension/GhdlExtensionModule.cs
index 52c5536..13f2eb7 100644
--- a/src/OneWare.GhdlExtension/GhdlExtensionModule.cs
+++ b/src/OneWare.GhdlExtension/GhdlExtensionModule.cs
@@ -277,6 +277,8 @@ public void OnInitialized(IContainerProvider containerProvider)
 
         var ghdlService = containerProvider.Resolve<GhdlService>();
         var ghdlToolchainService = containerProvider.Resolve<GhdlToolchainService>();
+        
+        containerProvider.Resolve<GhdlToolchainService>().SubscribeToSettings();
 
 
         // containerProvider.Resolve<IWindowService>().RegisterMenuItem("MainWindow_MainMenu/Ghdl",
diff --git a/src/OneWare.GhdlExtension/GhdlYosysToolchain.cs b/src/OneWare.GhdlExtension/GhdlYosysToolchain.cs
index 652b30f..3ed8447 100644
--- a/src/OneWare.GhdlExtension/GhdlYosysToolchain.cs
+++ b/src/OneWare.GhdlExtension/GhdlYosysToolchain.cs
@@ -15,6 +15,7 @@ public class GhdlYosysToolchain(GhdlToolchainService ghdlToolchainService, Yosys
     
     public void OnProjectCreated(UniversalFpgaProjectRoot project)
     {
+        yosysToolchain.OnProjectCreated(project);
     }
 
     public void LoadConnections(UniversalFpgaProjectRoot project, FpgaModel fpga)
diff --git a/src/OneWare.GhdlExtension/Services/GhdlToolchainService.cs b/src/OneWare.GhdlExtension/Services/GhdlToolchainService.cs
index 06d2aaa..2b23cd1 100644
--- a/src/OneWare.GhdlExtension/Services/GhdlToolchainService.cs
+++ b/src/OneWare.GhdlExtension/Services/GhdlToolchainService.cs
@@ -10,14 +10,13 @@ public class GhdlToolchainService
     private static string? _val;
     private readonly GhdlVhdlToVerilogPreCompileStep _ghdlPreCompiler;
     private readonly YosysService _yosysService;
+    private readonly ISettingsService _settingsService;
 
     public GhdlToolchainService(GhdlVhdlToVerilogPreCompileStep ghdlPreCompiler, YosysService yosysService, ISettingsService settingsService)
     {
         _ghdlPreCompiler = ghdlPreCompiler;
         _yosysService = yosysService;
-        
-        settingsService.GetSettingObservable<string>("OssCadSuite_Path").Subscribe(x => _val = x);
-
+        _settingsService = settingsService;
     }
     
     
@@ -67,4 +66,9 @@ public async Task<bool> AssembleAsync(UniversalFpgaProjectRoot project, FpgaMode
     {
         return await _yosysService.AssembleAsync(project, fpga);
     }
+
+    public void SubscribeToSettings()
+    {
+        _settingsService.GetSettingObservable<string>("OssCadSuite_Path").Subscribe(x => _val = x);
+    }
 }
\ No newline at end of file