diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a7ae755..fee2f0b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -88,7 +88,7 @@ build_windows:
       }
   artifacts:
     paths:
-      - "**/bin/$BUILD_CONFIG/net10.0-windows/**"
+      - "imagecatalog/bin/$BUILD_CONFIG/net10.0-windows/**"
     expire_in: 1 hour
 
 # Publish and create GitLab Release when building a tag. This job expects a Windows runner with PowerShell and curl available.
@@ -112,7 +112,7 @@ publish_release:
           $dotnetExe = 'dotnet'
         }
 
-        & $dotnetExe publish "imagecatalog\ImageCatalog 2.csproj" -c $env:BUILD_CONFIG -r win-x64 --self-contained false -o publish
+        & $dotnetExe publish "imagecatalog\ImageCatalog 2.csproj" -c $env:BUILD_CONFIG -f net10.0-windows -r win-x64 --self-contained false /p:PublishSingleFile=true /p:PublishReadyToRun=true -o publish
         Write-Host "Published to $(pwd)\\publish"
 
         # Configure private NuGet source from GitLab Packages using CI_JOB_TOKEN
@@ -130,8 +130,10 @@ publish_release:
           Write-Host 'No credentials available; skipping private NuGet source configuration.'
         }
 
-        # Find first file in publish folder
-        $file = Get-ChildItem -Path publish -File | Select-Object -First 1; Write-Host "Uploading $($file.FullName)"
+        # Find the produced EXE in publish folder (fallback to first file if no exe found)
+        $file = Get-ChildItem -Path publish -Filter *.exe -File | Select-Object -First 1
+        if (-not $file) { $file = Get-ChildItem -Path publish -File | Select-Object -First 1 }
+        Write-Host "Uploading $($file.FullName)"
         # Upload to GitLab project uploads API to get a public URL for the artifact
         $uploadUrl = "$env:CI_API_V4_URL/projects/$env:CI_PROJECT_ID/uploads"
         $formData = "file=@$($file.FullName)"
@@ -145,7 +147,7 @@ publish_release:
       }
   artifacts:
     paths:
-      - publish/*
+      - publish/*.exe
     expire_in: 1 day
   only:
     - tags
diff --git a/MaddoLibrary b/MaddoLibrary
deleted file mode 160000
index 5987cc2..0000000
--- a/MaddoLibrary
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5987cc26521d839bf81bdaab19d101488294da19
diff --git a/MaddoShared/Properties/AssemblyInfo.cs b/MaddoShared/Properties/AssemblyInfo.cs
index 52a601e..6af8d79 100644
--- a/MaddoShared/Properties/AssemblyInfo.cs
+++ b/MaddoShared/Properties/AssemblyInfo.cs
@@ -8,10 +8,10 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTitle("MaddoShared")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("Maddo")]
 [assembly: AssemblyProduct("MaddoShared")]
-[assembly: AssemblyCopyright("Copyright ©  2021")]
-[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCopyright("Copyright ©  2021-2026")]
+[assembly: AssemblyTrademark("Maddo")]
 [assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible
diff --git a/imagecatalog/AssemblyInfo.cs b/imagecatalog/AssemblyInfo.cs
index 4767298..e5b467a 100644
--- a/imagecatalog/AssemblyInfo.cs
+++ b/imagecatalog/AssemblyInfo.cs
@@ -11,8 +11,8 @@ using System.Runtime.InteropServices;
 
 [assembly: AssemblyDescription("")]
 
-[assembly: AssemblyCopyright("(C) 2002-08")]
-[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCopyright("(C) 2012-2026")]
+[assembly: AssemblyTrademark("Maddo")]
 [assembly: CLSCompliant(true)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
diff --git a/imagecatalog/Logo.png b/imagecatalog/Logo.png
new file mode 100644
index 0000000..849b093
Binary files /dev/null and b/imagecatalog/Logo.png differ
diff --git a/log.txt b/log.txt
deleted file mode 100644
index aa7e6df..0000000
--- a/log.txt
+++ /dev/null
@@ -1,135 +0,0 @@
-2021-03-06 10:04:44.068 +01:00 [INF] MSBuild registered from C:\Program Files\dotnet\sdk\5.0.200\
-2021-03-06 10:04:44.120 +01:00 [INF] Registered 1 extensions:
-	Default extension
-2021-03-06 10:04:50.740 +01:00 [INF] Initializing upgrade step Select an entrypoint
-2021-03-06 10:05:37.931 +01:00 [INF] Applying upgrade step Select an entrypoint
-2021-03-06 10:05:56.095 +01:00 [INF] Upgrade step Select an entrypoint applied successfully
-2021-03-06 10:05:59.578 +01:00 [INF] Initializing upgrade step Select project to upgrade
-2021-03-06 10:06:53.914 +01:00 [INF] Applying upgrade step Select project to upgrade
-2021-03-06 10:07:00.961 +01:00 [INF] Upgrade step Select project to upgrade applied successfully
-2021-03-06 10:07:03.582 +01:00 [INF] Initializing upgrade step Back up project
-2021-03-06 10:07:22.200 +01:00 [INF] Applying upgrade step Back up project
-2021-03-06 10:07:26.114 +01:00 [INF] Backing up H:\dev\vs\Catalog\MaddoShared to H:\dev\vs\Catalog\MaddoShared.backup
-2021-03-06 10:07:31.549 +01:00 [INF] Project backed up to H:\dev\vs\Catalog\MaddoShared.backup
-2021-03-06 10:07:31.550 +01:00 [INF] Upgrade step Back up project applied successfully
-2021-03-06 10:07:40.695 +01:00 [INF] Initializing upgrade step Convert project file to SDK style
-2021-03-06 10:07:40.696 +01:00 [FTL] Try-Convert not found. This tool depends on the Try-Convert CLI tool. Please ensure that Try-Convert is installed and that the correct location for the tool is specified (in configuration, for example). https://github.com/dotnet/try-convert
-2021-03-06 10:09:23.887 +01:00 [INF] Applying upgrade step Convert project file to SDK style
-2021-03-06 10:09:23.889 +01:00 [INF] Converting project file format with try-convert
-2021-03-06 10:09:27.336 +01:00 [INF] [try-convert] Conversion complete!
-2021-03-06 10:09:27.915 +01:00 [INF] Project file converted successfully! The project may require additional changes to build successfully against the new .NET target.
-2021-03-06 10:09:30.087 +01:00 [INF] Upgrade step Convert project file to SDK style applied successfully
-2021-03-06 10:09:36.050 +01:00 [INF] Initializing upgrade step Update TFM
-2021-03-06 10:09:48.944 +01:00 [INF] Applying upgrade step Update TFM
-2021-03-06 10:09:54.879 +01:00 [INF] Upgrade step Update TFM applied successfully
-2021-03-06 10:10:10.865 +01:00 [INF] Initializing upgrade step Update NuGet packages
-2021-03-06 10:10:12.295 +01:00 [INF] Marking package System.Reflection.Metadata for removal because it appears to be a transitive dependency
-2021-03-06 10:10:13.789 +01:00 [INF] Reference to .NET Upgrade Assistant analyzer package (Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers, version 0.2.212405) needs added
-2021-03-06 10:10:15.101 +01:00 [INF] Adding Microsoft.Windows.Compatibility 5.0.2
-2021-03-06 10:10:15.104 +01:00 [INF] Packages to be removed:
-System.Reflection.Metadata, Version=5.0.0
-2021-03-06 10:10:15.105 +01:00 [INF] Packages to be addded:
-Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers, Version=0.2.212405
-Microsoft.Windows.Compatibility, Version=5.0.2
-2021-03-06 10:10:18.926 +01:00 [INF] Applying upgrade step Update NuGet packages
-2021-03-06 10:10:18.932 +01:00 [INF] Removing outdated package reference: System.Reflection.Metadata, Version=5.0.0
-2021-03-06 10:10:18.935 +01:00 [INF] Adding package reference: Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers, Version=0.2.212405
-2021-03-06 10:10:18.937 +01:00 [INF] Adding package reference: Microsoft.Windows.Compatibility, Version=5.0.2
-2021-03-06 10:10:24.287 +01:00 [INF] Marking package System.Data.DataSetExtensions for removal because it appears to be a transitive dependency
-2021-03-06 10:10:24.292 +01:00 [INF] Marking package System.Numerics.Vectors for removal because it appears to be a transitive dependency
-2021-03-06 10:10:24.706 +01:00 [INF] Removing outdated package reference: System.Data.DataSetExtensions, Version=4.5.0
-2021-03-06 10:10:24.707 +01:00 [INF] Removing outdated package reference: System.Numerics.Vectors, Version=4.5.0
-2021-03-06 10:10:27.413 +01:00 [INF] Upgrade step Update NuGet packages applied successfully
-2021-03-06 10:10:36.907 +01:00 [INF] Initializing upgrade step Add template files
-2021-03-06 10:10:36.924 +01:00 [INF] 0 expected template items needed
-2021-03-06 10:10:36.926 +01:00 [INF] Initializing upgrade step Upgrade app config files
-2021-03-06 10:10:36.944 +01:00 [INF] Found 0 app settings for upgrade: 
-2021-03-06 10:10:36.950 +01:00 [INF] 0 web page namespace imports need upgraded: 
-2021-03-06 10:10:36.951 +01:00 [INF] Initializing upgrade step Update C# source
-2021-03-06 10:10:38.659 +01:00 [INF] Initializing upgrade step Move to next project
-2021-03-06 10:10:43.824 +01:00 [INF] Applying upgrade step Move to next project
-2021-03-06 10:10:43.825 +01:00 [INF] Upgrade step Move to next project applied successfully
-2021-03-06 10:11:07.545 +01:00 [INF] Initializing upgrade step Select project to upgrade
-2021-03-06 10:11:10.510 +01:00 [INF] Applying upgrade step Select project to upgrade
-2021-03-06 10:11:14.382 +01:00 [INF] Upgrade step Select project to upgrade applied successfully
-2021-03-06 10:11:17.877 +01:00 [INF] Initializing upgrade step Back up project
-2021-03-06 10:11:21.030 +01:00 [INF] Applying upgrade step Back up project
-2021-03-06 10:11:22.810 +01:00 [INF] Backing up H:\dev\vs\Catalog\imagecatalog to H:\dev\vs\Catalog\imagecatalog.backup
-2021-03-06 10:11:37.349 +01:00 [INF] Project backed up to H:\dev\vs\Catalog\imagecatalog.backup
-2021-03-06 10:11:37.350 +01:00 [INF] Upgrade step Back up project applied successfully
-2021-03-06 10:11:47.584 +01:00 [INF] Initializing upgrade step Convert project file to SDK style
-2021-03-06 10:11:49.609 +01:00 [INF] Applying upgrade step Convert project file to SDK style
-2021-03-06 10:11:49.610 +01:00 [INF] Converting project file format with try-convert
-2021-03-06 10:11:52.238 +01:00 [INF] [try-convert] Conversion complete!
-2021-03-06 10:11:52.666 +01:00 [INF] Project file converted successfully! The project may require additional changes to build successfully against the new .NET target.
-2021-03-06 10:11:55.581 +01:00 [INF] Upgrade step Convert project file to SDK style applied successfully
-2021-03-06 10:12:00.489 +01:00 [INF] Initializing upgrade step Update TFM
-2021-03-06 10:12:03.093 +01:00 [INF] Applying upgrade step Update TFM
-2021-03-06 10:12:06.038 +01:00 [INF] Upgrade step Update TFM applied successfully
-2021-03-06 10:12:10.906 +01:00 [INF] Initializing upgrade step Update NuGet packages
-2021-03-06 10:12:12.592 +01:00 [INF] Marking package Ben.Demystifier for removal because it appears to be a transitive dependency
-2021-03-06 10:12:12.607 +01:00 [INF] Marking package System.Buffers for removal because it appears to be a transitive dependency
-2021-03-06 10:12:12.624 +01:00 [INF] Marking package System.Collections.Immutable for removal because it appears to be a transitive dependency
-2021-03-06 10:12:12.628 +01:00 [INF] Marking package System.Memory for removal because it appears to be a transitive dependency
-2021-03-06 10:12:12.630 +01:00 [INF] Marking package System.Numerics.Vectors for removal because it appears to be a transitive dependency
-2021-03-06 10:12:12.633 +01:00 [INF] Marking package System.Reflection.Metadata for removal because it appears to be a transitive dependency
-2021-03-06 10:12:12.637 +01:00 [INF] Marking package System.Runtime.CompilerServices.Unsafe for removal because it appears to be a transitive dependency
-2021-03-06 10:12:12.640 +01:00 [INF] Marking package System.Threading.Tasks.Extensions for removal because it appears to be a transitive dependency
-2021-03-06 10:12:14.097 +01:00 [INF] Reference to .NET Upgrade Assistant analyzer package (Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers, version 0.2.212405) needs added
-2021-03-06 10:12:14.104 +01:00 [INF] Packages to be removed:
-Ben.Demystifier, Version=0.3.0
-System.Buffers, Version=4.5.1
-System.Collections.Immutable, Version=5.0.0
-System.Memory, Version=4.5.4
-System.Numerics.Vectors, Version=4.5.0
-System.Reflection.Metadata, Version=5.0.0
-System.Runtime.CompilerServices.Unsafe, Version=5.0.0
-System.Threading.Tasks.Extensions, Version=4.5.4
-2021-03-06 10:12:14.104 +01:00 [INF] Packages to be addded:
-Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers, Version=0.2.212405
-2021-03-06 10:12:16.572 +01:00 [INF] Applying upgrade step Update NuGet packages
-2021-03-06 10:12:16.573 +01:00 [INF] Removing outdated package reference: Ben.Demystifier, Version=0.3.0
-2021-03-06 10:12:16.573 +01:00 [INF] Removing outdated package reference: System.Buffers, Version=4.5.1
-2021-03-06 10:12:16.574 +01:00 [INF] Removing outdated package reference: System.Collections.Immutable, Version=5.0.0
-2021-03-06 10:12:16.575 +01:00 [INF] Removing outdated package reference: System.Memory, Version=4.5.4
-2021-03-06 10:12:16.576 +01:00 [INF] Removing outdated package reference: System.Numerics.Vectors, Version=4.5.0
-2021-03-06 10:12:16.578 +01:00 [INF] Removing outdated package reference: System.Reflection.Metadata, Version=5.0.0
-2021-03-06 10:12:16.578 +01:00 [INF] Removing outdated package reference: System.Runtime.CompilerServices.Unsafe, Version=5.0.0
-2021-03-06 10:12:16.580 +01:00 [INF] Removing outdated package reference: System.Threading.Tasks.Extensions, Version=4.5.4
-2021-03-06 10:12:16.581 +01:00 [INF] Adding package reference: Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers, Version=0.2.212405
-2021-03-06 10:12:19.366 +01:00 [INF] Upgrade step Update NuGet packages applied successfully
-2021-03-06 10:12:35.849 +01:00 [INF] Initializing upgrade step Add template files
-2021-03-06 10:12:35.850 +01:00 [INF] 0 expected template items needed
-2021-03-06 10:12:35.851 +01:00 [INF] Initializing upgrade step Upgrade app config files
-2021-03-06 10:12:35.852 +01:00 [INF] Found 0 app settings for upgrade: 
-2021-03-06 10:12:35.853 +01:00 [INF] system.diagnostics is not supported in .NET 5. See https://github.com/dotnet/runtime/issues/23937 for details. For now, it will be disabled.
-2021-03-06 10:12:35.854 +01:00 [INF] 0 web page namespace imports need upgraded: 
-2021-03-06 10:12:40.725 +01:00 [INF] Applying upgrade step Disable unsupported configuration sections
-2021-03-06 10:12:40.727 +01:00 [INF] system.diagnostics is not supported in .NET 5. See https://github.com/dotnet/runtime/issues/23937 for details. For now, it will be disabled.
-2021-03-06 10:12:40.730 +01:00 [INF] Configuration file H:\dev\vs\Catalog\imagecatalog\app.config has been updated
-2021-03-06 10:12:40.737 +01:00 [INF] Upgrade step Disable unsupported configuration sections applied successfully
-2021-03-06 10:12:40.739 +01:00 [INF] Applying upgrade step Upgrade app config files
-2021-03-06 10:12:40.740 +01:00 [INF] Upgrade step Upgrade app config files applied successfully
-2021-03-06 10:12:43.598 +01:00 [INF] Initializing upgrade step Update C# source
-2021-03-06 10:12:44.173 +01:00 [INF] Initializing upgrade step Move to next project
-2021-03-06 10:12:47.488 +01:00 [INF] Applying upgrade step Move to next project
-2021-03-06 10:12:47.489 +01:00 [INF] Upgrade step Move to next project applied successfully
-2021-03-06 10:12:48.833 +01:00 [INF] Initializing upgrade step Select project to upgrade
-2021-03-06 10:12:50.361 +01:00 [INF] Applying upgrade step Select project to upgrade
-2021-03-06 10:12:54.374 +01:00 [ERR] Unknown selection: ''
-2021-03-06 10:13:02.205 +01:00 [ERR] Unknown selection: ''
-2021-03-06 10:13:04.059 +01:00 [ERR] Unknown selection: 'exit'
-2021-03-06 10:13:06.542 +01:00 [ERR] Unknown selection: '0'
-2021-03-06 10:13:08.242 +01:00 [INF] Saving upgrade progress file at H:\dev\vs\Catalog\.upgrade-assistant
-2021-03-06 10:13:13.625 +01:00 [INF] MSBuild registered from C:\Program Files\dotnet\sdk\5.0.200\
-2021-03-06 10:13:13.651 +01:00 [INF] Registered 1 extensions:
-	Default extension
-2021-03-06 10:13:15.795 +01:00 [INF] Loading upgrade progress file at H:\dev\vs\Catalog\.upgrade-assistant
-2021-03-06 10:13:17.819 +01:00 [INF] Initializing upgrade step Select project to upgrade
-2021-03-06 10:13:29.438 +01:00 [INF] Skipping upgrade step Select project to upgrade
-2021-03-06 10:13:29.440 +01:00 [INF] Upgrade step Select project to upgrade skipped
-2021-03-06 10:13:31.325 +01:00 [INF] Initializing upgrade step Finalize Solution
-2021-03-06 10:13:34.820 +01:00 [INF] Applying upgrade step Finalize Solution
-2021-03-06 10:13:34.821 +01:00 [INF] Upgrade step Finalize Solution applied successfully
-2021-03-06 10:13:36.563 +01:00 [INF] Upgrade has completed. Please review any changes.
-2021-03-06 10:13:36.565 +01:00 [INF] Saving upgrade progress file at H:\dev\vs\Catalog\.upgrade-assistant