diff --git a/All.sln b/All.sln
index 76a51def05..2217c3ee71 100644
--- a/All.sln
+++ b/All.sln
@@ -187,6 +187,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ArchiCAD", "ArchiCAD", "{DF
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConnectorArchicad", "ConnectorArchicad\ConnectorArchicad\ConnectorArchicad.csproj", "{D163D710-B946-4D50-8833-BD8B9941033A}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorAutocad2023", "ConnectorAutocadCivil\ConnectorAutocad2023\ConnectorAutocad2023.csproj", "{F4BFB155-7BA9-4E46-8240-9C825060C904}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorCivil2023", "ConnectorAutocadCivil\ConnectorCivil2023\ConnectorCivil2023.csproj", "{2639E37D-80D3-415A-B4D1-20D7F321F27F}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		Objects\Converters\ConverterTeklaStructures\ConverterTeklaStructuresShared\ConverterTeklaStructuresShared.projitems*{02a24dd8-e0ca-4657-baa7-b033a4563709}*SharedItemsImports = 5
@@ -725,6 +729,22 @@ Global
 		{D163D710-B946-4D50-8833-BD8B9941033A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D163D710-B946-4D50-8833-BD8B9941033A}.Release|x64.ActiveCfg = Release|Any CPU
 		{D163D710-B946-4D50-8833-BD8B9941033A}.Release|x64.Build.0 = Release|Any CPU
+		{F4BFB155-7BA9-4E46-8240-9C825060C904}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4BFB155-7BA9-4E46-8240-9C825060C904}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F4BFB155-7BA9-4E46-8240-9C825060C904}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F4BFB155-7BA9-4E46-8240-9C825060C904}.Debug|x64.Build.0 = Debug|Any CPU
+		{F4BFB155-7BA9-4E46-8240-9C825060C904}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F4BFB155-7BA9-4E46-8240-9C825060C904}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F4BFB155-7BA9-4E46-8240-9C825060C904}.Release|x64.ActiveCfg = Release|Any CPU
+		{F4BFB155-7BA9-4E46-8240-9C825060C904}.Release|x64.Build.0 = Release|Any CPU
+		{2639E37D-80D3-415A-B4D1-20D7F321F27F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2639E37D-80D3-415A-B4D1-20D7F321F27F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2639E37D-80D3-415A-B4D1-20D7F321F27F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2639E37D-80D3-415A-B4D1-20D7F321F27F}.Debug|x64.Build.0 = Debug|Any CPU
+		{2639E37D-80D3-415A-B4D1-20D7F321F27F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2639E37D-80D3-415A-B4D1-20D7F321F27F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2639E37D-80D3-415A-B4D1-20D7F321F27F}.Release|x64.ActiveCfg = Release|Any CPU
+		{2639E37D-80D3-415A-B4D1-20D7F321F27F}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -818,6 +838,8 @@ Global
 		{586A5A37-93F6-427E-8DF8-C10DB4D6822A} = {42A86931-7497-4A34-B2FD-060231CD0A8F}
 		{DF1B3505-793C-4073-975B-04C81CC3CDC4} = {DD7DA7E3-FBB7-4216-852B-A4A5BF3AB9AB}
 		{D163D710-B946-4D50-8833-BD8B9941033A} = {DF1B3505-793C-4073-975B-04C81CC3CDC4}
+		{F4BFB155-7BA9-4E46-8240-9C825060C904} = {890F3257-FCC2-4ED8-9180-22B3641B494C}
+		{2639E37D-80D3-415A-B4D1-20D7F321F27F} = {890F3257-FCC2-4ED8-9180-22B3641B494C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1D43D91B-4F01-4A78-8250-CC6F9BD93A14}
diff --git a/DesktopUI2/DesktopUI2/DesktopUI2 - Backup.csproj b/DesktopUI2/DesktopUI2/DesktopUI2 - Backup.csproj
deleted file mode 100644
index c640a70757..0000000000
--- a/DesktopUI2/DesktopUI2/DesktopUI2 - Backup.csproj	
+++ /dev/null
@@ -1,259 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <LangVersion>8.0</LangVersion>
-    <ApplicationIcon />
-    <OutputType>Library</OutputType>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <StartupObject />
-    <PackageProjectUrl>https://speckle.systems</PackageProjectUrl>
-    <PackageIcon>logo.png</PackageIcon>
-    <Description>Cross platform Desktop UI for Speckle.</Description>
-    <Copyright>Copyright (c) AEC Systems Ltd</Copyright>
-    <RepositoryUrl>https://github.com/specklesystems/speckle-sharp</RepositoryUrl>
-    <PackageTags>speckle, ui, desktopui, dui</PackageTags>
-    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
-    <RepositoryType>git</RepositoryType>
-    <Product></Product>
-    <PackageId>Speckle.DesktopUI</PackageId>
-    <Authors>Speckle</Authors>
-    <Company>Speckle</Company>
-
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <WarningLevel>2</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <AvaloniaResource Include="Assets\**" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Remove="App.xaml" />
-    <None Remove="Controls\ReceiveButton.xaml" />
-    <None Remove="Controls\SendButton.xaml" />
-    <None Remove="Styles\Button.xaml" />
-    <None Remove="Styles\ChipListBox.xaml" />
-    <None Remove="Styles\ComboBox.xaml" />
-    <None Remove="Styles\Dialog.xaml" />
-    <None Remove="Styles\Expander.xaml" />
-    <None Remove="Styles\FloatingButton.xaml" />
-    <None Remove="Styles\ListBox.xaml" />
-    <None Remove="Styles\MenuItem.xaml" />
-    <None Remove="Styles\Playground.xaml" />
-    <None Remove="Styles\Styles.xaml" />
-    <None Remove="Styles\Text.xaml" />
-    <None Remove="Styles\TextBox.xaml" />
-    <None Remove="Views\Filters\AllFilterView.xaml" />
-    <None Remove="Views\Filters\ListFilterView.xaml" />
-    <None Remove="Views\Filters\ManualFilterView.xaml" />
-    <None Remove="Views\Filters\PropertyFilterView.xaml" />
-    <None Remove="Views\MainWindow.xaml" />
-    <None Remove="Views\Pages\HomeControls\SavedStreams.xaml" />
-    <None Remove="Views\Pages\HomeView.xaml" />
-    <None Remove="Views\Pages\StreamEditControls\Receive.xaml" />
-    <None Remove="Views\Pages\StreamEditControls\Send.xaml" />
-    <None Remove="Views\Pages\StreamEditView.xaml" />
-    <None Remove="Views\Scheduler.xaml" />
-    <None Remove="Views\Settings\ListBoxSettingView.xaml" />
-    <None Remove="Views\Windows\Dialogs\AddAccountDialog.xaml" />
-    <None Remove="Views\Windows\Dialogs\AddFromUrlDialog.xaml" />
-    <None Remove="Views\Windows\Dialogs\Dialog.xaml" />
-    <None Remove="Views\Windows\Dialogs\NewStreamDialog.xaml" />
-    <None Remove="Views\Windows\QuickOpsDialog.xaml" />
-    <None Remove="Views\Windows\Report.xaml" />
-    <None Remove="Views\Windows\Settings.xaml" />
-    <AvaloniaResource Include="Styles\Expander.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaResource>
-    <AvaloniaResource Include="Styles\Playground.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaResource>
-    <AvaloniaResource Include="Styles\Button.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaResource>
-    <AvaloniaResource Include="Styles\Dialog.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaResource>
-    <AvaloniaResource Include="Styles\ChipListBox.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaResource>
-    <AvaloniaResource Include="Styles\ListBox.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaResource>
-    <AvaloniaResource Include="Styles\ComboBox.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaResource>
-    <AvaloniaResource Include="Styles\FloatingButton.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaResource>
-    <AvaloniaResource Include="Styles\MenuItem.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaResource>
-    <AvaloniaResource Include="Styles\Styles.xaml">
-      <Generator></Generator>
-    </AvaloniaResource>
-    <AvaloniaResource Include="Styles\TextBox.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaResource>
-    <AvaloniaResource Include="Styles\Text.xaml">
-      <Generator></Generator>
-    </AvaloniaResource>
-    <AvaloniaXaml Include="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaXaml>
-    <AvaloniaXaml Include="Controls\ReceiveButton.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaXaml>
-    <AvaloniaXaml Include="Controls\SendButton.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaXaml>
-    <AvaloniaXaml Include="Styles\MenuItem.xaml" />
-    <AvaloniaXaml Include="Views\Filters\AllFilterView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaXaml>
-    <AvaloniaXaml Include="Views\Filters\ListFilterView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaXaml>
-    <AvaloniaXaml Include="Views\Filters\ManualFilterView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaXaml>
-    <AvaloniaXaml Include="Views\Filters\PropertyFilterView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaXaml>
-    <AvaloniaXaml Include="Views\Pages\StreamEditView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaXaml>
-    <AvaloniaXaml Include="Views\Scheduler.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaXaml>
-    <AvaloniaXaml Include="Views\MainWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaXaml>
-    <AvaloniaXaml Include="Views\Pages\HomeControls\SavedStreams.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaXaml>
-    <AvaloniaXaml Include="Views\Pages\HomeView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaXaml>
-    <AvaloniaXaml Include="Views\Pages\StreamEditControls\Receive.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaXaml>
-    <AvaloniaXaml Include="Views\Pages\StreamEditControls\Send.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaXaml>
-    <AvaloniaXaml Include="Views\Settings\ListBoxSettingView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaXaml>
-    <AvaloniaXaml Include="Views\Windows\Dialogs\AddAccountDialog.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaXaml>
-    <AvaloniaXaml Include="Views\Windows\Dialogs\AddFromUrlDialog.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaXaml>
-    <AvaloniaXaml Include="Views\Windows\Dialogs\Dialog.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaXaml>
-    <AvaloniaXaml Include="Views\Windows\Dialogs\NewStreamDialog.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaXaml>
-    <AvaloniaXaml Include="Views\Windows\Dialogs\QuickOpsDialog.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaXaml>
-    <AvaloniaXaml Include="Views\Windows\Report.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaXaml>
-    <AvaloniaXaml Include="Views\Windows\Settings.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </AvaloniaXaml>
-    <None Update="Native\libAvalonia.Native.OSX.dylib">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.15" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.15" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.15" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.15" />
-    <PackageReference Include="Material.Avalonia" Version="3.0.0-rc0" />
-    <PackageReference Include="Material.Icons.Avalonia" Version="1.0.2" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Native\" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="logo.png">
-      <Pack>True</Pack>
-      <PackagePath>\</PackagePath>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Update="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Controls\ReceiveButton.xaml.cs">
-      <DependentUpon>ReceiveButton.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Controls\SendButton.xaml.cs">
-      <DependentUpon>SendButton.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Views\Filters\AllFilterView.xaml.cs">
-      <DependentUpon>AllFilterView.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Views\Filters\ListFilterView.xaml.cs">
-      <DependentUpon>ListFilterView.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Views\Filters\ManualFilterView.xaml.cs">
-      <DependentUpon>ManualFilterView.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Views\Filters\PropertyFilterView.xaml.cs">
-      <DependentUpon>PropertyFilterView.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Views\Pages\StreamEditView.xaml.cs">
-      <DependentUpon>StreamEditView.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Views\Scheduler.xaml.cs">
-      <DependentUpon>Scheduler.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Views\MainWindow.xaml.cs">
-      <DependentUpon>MainWindow.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Views\Pages\HomeControls\SavedStreams.xaml.cs">
-      <DependentUpon>SavedStreams.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Views\Pages\HomeView.xaml.cs">
-      <DependentUpon>HomeView.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Views\Pages\StreamEditControls\Receive.xaml.cs">
-      <DependentUpon>Receive.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Views\Pages\StreamEditControls\Send.xaml.cs">
-      <DependentUpon>Send.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Views\Settings\ListBoxSettingView.xaml.cs">
-      <DependentUpon>ListBoxSettingView.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Views\Windows\Dialogs\AddAccountDialog.xaml.cs">
-      <DependentUpon>AddAccountDialog.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Views\Windows\Dialogs\AddFromUrlDialog.xaml.cs">
-      <DependentUpon>AddFromUrlDialog.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Views\Windows\Dialogs\Dialog.xaml.cs">
-      <DependentUpon>Dialog.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Views\Windows\Dialogs\NewStreamDialog.xaml.cs">
-      <DependentUpon>NewStreamDialog.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Views\Windows\Dialogs\QuickOpsDialog.xaml.cs">
-      <DependentUpon>QuickOpsDialog.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Views\Windows\Report.xaml.cs">
-      <DependentUpon>Report.xaml</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Core\Core\Core.csproj" />
-  </ItemGroup>
-</Project>