diff --git a/Setup/obj/Release/net9.0-windows/win-x64/App.g.cs b/Setup/obj/Release/net9.0-windows/win-x64/App.g.cs
new file mode 100644
index 0000000..43c4b22
--- /dev/null
+++ b/Setup/obj/Release/net9.0-windows/win-x64/App.g.cs
@@ -0,0 +1,76 @@
+#pragma checksum "..\..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2F55484CCDC4F93150C83267DEA1BE82F9151116"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Controls.Ribbon;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using System.Windows.Shell;
+
+
+namespace DeskCoreSetup {
+    
+    
+    /// <summary>
+    /// App
+    /// </summary>
+    public partial class App : System.Windows.Application {
+        
+        private bool _contentLoaded;
+        
+        /// <summary>
+        /// InitializeComponent
+        /// </summary>
+        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "10.0.12.0")]
+        public void InitializeComponent() {
+            if (_contentLoaded) {
+                return;
+            }
+            _contentLoaded = true;
+            System.Uri resourceLocater = new System.Uri("/DeskCore-Setup;component/app.xaml", System.UriKind.Relative);
+            
+            #line 1 "..\..\..\..\App.xaml"
+            System.Windows.Application.LoadComponent(this, resourceLocater);
+            
+            #line default
+            #line hidden
+        }
+        
+        /// <summary>
+        /// Application Entry Point.
+        /// </summary>
+        [System.STAThreadAttribute()]
+        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "10.0.12.0")]
+        public static void Main() {
+            DeskCoreSetup.App app = new DeskCoreSetup.App();
+            app.InitializeComponent();
+            app.Run();
+        }
+    }
+}
+
diff --git a/Setup/obj/Release/net9.0-windows/win-x64/Colors.Dark.baml b/Setup/obj/Release/net9.0-windows/win-x64/Colors.Dark.baml
new file mode 100644
index 0000000..b0e11be
Binary files /dev/null and b/Setup/obj/Release/net9.0-windows/win-x64/Colors.Dark.baml differ
diff --git a/Setup/obj/Release/net9.0-windows/win-x64/Colors.Light.baml b/Setup/obj/Release/net9.0-windows/win-x64/Colors.Light.baml
new file mode 100644
index 0000000..335a885
Binary files /dev/null and b/Setup/obj/Release/net9.0-windows/win-x64/Colors.Light.baml differ
diff --git a/Setup/obj/Release/net9.0-windows/win-x64/Controls.baml b/Setup/obj/Release/net9.0-windows/win-x64/Controls.baml
new file mode 100644
index 0000000..bcb64b8
Binary files /dev/null and b/Setup/obj/Release/net9.0-windows/win-x64/Controls.baml differ
diff --git a/Setup/obj/Release/net9.0-windows/win-x64/DeskCore-Setup.deps.json b/Setup/obj/Release/net9.0-windows/win-x64/DeskCore-Setup.deps.json
new file mode 100644
index 0000000..8f40fa4
--- /dev/null
+++ b/Setup/obj/Release/net9.0-windows/win-x64/DeskCore-Setup.deps.json
@@ -0,0 +1,24 @@
+{
+  "runtimeTarget": {
+    "name": ".NETCoreApp,Version=v9.0/win-x64",
+    "signature": ""
+  },
+  "compilationOptions": {},
+  "targets": {
+    ".NETCoreApp,Version=v9.0": {},
+    ".NETCoreApp,Version=v9.0/win-x64": {
+      "DeskCore-Setup/1.0.0": {
+        "runtime": {
+          "DeskCore-Setup.dll": {}
+        }
+      }
+    }
+  },
+  "libraries": {
+    "DeskCore-Setup/1.0.0": {
+      "type": "project",
+      "serviceable": false,
+      "sha512": ""
+    }
+  }
+}
\ No newline at end of file
diff --git a/Setup/obj/Release/net9.0-windows/win-x64/DeskCore-Setup.dll b/Setup/obj/Release/net9.0-windows/win-x64/DeskCore-Setup.dll
new file mode 100644
index 0000000..ecd1209
Binary files /dev/null and b/Setup/obj/Release/net9.0-windows/win-x64/DeskCore-Setup.dll differ
diff --git a/Setup/obj/Release/net9.0-windows/win-x64/DeskCore-Setup.g.resources b/Setup/obj/Release/net9.0-windows/win-x64/DeskCore-Setup.g.resources
new file mode 100644
index 0000000..f6860b8
Binary files /dev/null and b/Setup/obj/Release/net9.0-windows/win-x64/DeskCore-Setup.g.resources differ
diff --git a/Setup/obj/Release/net9.0-windows/win-x64/DeskCore-Setup_MarkupCompile.cache b/Setup/obj/Release/net9.0-windows/win-x64/DeskCore-Setup_MarkupCompile.cache
new file mode 100644
index 0000000..6337326
--- /dev/null
+++ b/Setup/obj/Release/net9.0-windows/win-x64/DeskCore-Setup_MarkupCompile.cache
@@ -0,0 +1,20 @@
+DeskCore-Setup
+
+
+winexe
+C#
+.cs
+C:\Users\Viper\Desktop\Programme\DeskCore-Source\Setup\obj\Release\net9.0-windows\win-x64\
+DeskCoreSetup
+none
+false
+TRACE;RELEASE;NET;NET9_0;NETCOREAPP;WINDOWS;WINDOWS7_0;NET5_0_OR_GREATER;NET6_0_OR_GREATER;NET7_0_OR_GREATER;NET8_0_OR_GREATER;NET9_0_OR_GREATER;NETCOREAPP1_0_OR_GREATER;NETCOREAPP1_1_OR_GREATER;NETCOREAPP2_0_OR_GREATER;NETCOREAPP2_1_OR_GREATER;NETCOREAPP2_2_OR_GREATER;NETCOREAPP3_0_OR_GREATER;NETCOREAPP3_1_OR_GREATER;WINDOWS7_0_OR_GREATER
+C:\Users\Viper\Desktop\Programme\DeskCore-Source\Setup\App.xaml
+4-1182040411
+
+4647195960
+200-1670248436
+MainWindow.xaml;..\Themes\Colors.Light.xaml;..\Themes\Colors.Dark.xaml;..\Themes\Controls.xaml;
+
+False
+
diff --git a/Setup/obj/Release/net9.0-windows/win-x64/DeskCoreSetup.AssemblyInfo.cs b/Setup/obj/Release/net9.0-windows/win-x64/DeskCoreSetup.AssemblyInfo.cs
new file mode 100644
index 0000000..246ebe8
--- /dev/null
+++ b/Setup/obj/Release/net9.0-windows/win-x64/DeskCoreSetup.AssemblyInfo.cs
@@ -0,0 +1,27 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Reflection;
+
+[assembly: System.Reflection.AssemblyCompanyAttribute("M_Viper")]
+[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
+[assembly: System.Reflection.AssemblyCopyrightAttribute("Copyright (c) M_Viper. Alle Rechte vorbehalten.")]
+[assembly: System.Reflection.AssemblyDescriptionAttribute("Installiert DeskCore")]
+[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
+[assembly: System.Reflection.AssemblyProductAttribute("DeskCore Setup")]
+[assembly: System.Reflection.AssemblyTitleAttribute("DeskCore Setup")]
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+[assembly: System.Resources.NeutralResourcesLanguageAttribute("de-DE")]
+[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")]
+[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")]
+
+// Von der MSBuild WriteCodeFragment-Klasse generiert.
+
diff --git a/Setup/obj/Release/net9.0-windows/win-x64/DeskCoreSetup.AssemblyInfoInputs.cache b/Setup/obj/Release/net9.0-windows/win-x64/DeskCoreSetup.AssemblyInfoInputs.cache
new file mode 100644
index 0000000..e410dd4
--- /dev/null
+++ b/Setup/obj/Release/net9.0-windows/win-x64/DeskCoreSetup.AssemblyInfoInputs.cache
@@ -0,0 +1 @@
+aa9cb945fc0e24f2fe5d76e4d4c638a76152e98407d3ea2108dbe178b58b4abf
diff --git a/Setup/obj/Release/net9.0-windows/win-x64/DeskCoreSetup.GeneratedMSBuildEditorConfig.editorconfig b/Setup/obj/Release/net9.0-windows/win-x64/DeskCoreSetup.GeneratedMSBuildEditorConfig.editorconfig
new file mode 100644
index 0000000..b67da7b
--- /dev/null
+++ b/Setup/obj/Release/net9.0-windows/win-x64/DeskCoreSetup.GeneratedMSBuildEditorConfig.editorconfig
@@ -0,0 +1,22 @@
+is_global = true
+build_property.EnableAotAnalyzer = 
+build_property.EnableSingleFileAnalyzer = true
+build_property.EnableTrimAnalyzer = 
+build_property.IncludeAllContentForSelfExtract = 
+build_property.TargetFramework = net9.0-windows
+build_property.TargetFrameworkIdentifier = .NETCoreApp
+build_property.TargetFrameworkVersion = v9.0
+build_property.TargetPlatformMinVersion = 7.0
+build_property.UsingMicrosoftNETSdkWeb = 
+build_property.ProjectTypeGuids = 
+build_property.InvariantGlobalization = 
+build_property.PlatformNeutralAssembly = 
+build_property.EnforceExtendedAnalyzerRules = 
+build_property._SupportedPlatformList = Linux,macOS,Windows
+build_property.RootNamespace = DeskCoreSetup
+build_property.ProjectDir = C:\Users\Viper\Desktop\Programme\DeskCore-Source\Setup\
+build_property.EnableComHosting = 
+build_property.EnableGeneratedComInterfaceComImportInterop = 
+build_property.CsWinRTUseWindowsUIXamlProjections = false
+build_property.EffectiveAnalysisLevelStyle = 9.0
+build_property.EnableCodeStyleSeverity = 
diff --git a/Setup/obj/Release/net9.0-windows/win-x64/DeskCoreSetup.GlobalUsings.g.cs b/Setup/obj/Release/net9.0-windows/win-x64/DeskCoreSetup.GlobalUsings.g.cs
new file mode 100644
index 0000000..4a15929
--- /dev/null
+++ b/Setup/obj/Release/net9.0-windows/win-x64/DeskCoreSetup.GlobalUsings.g.cs
@@ -0,0 +1,6 @@
+// <auto-generated/>
+global using System;
+global using System.Collections.Generic;
+global using System.Linq;
+global using System.Threading;
+global using System.Threading.Tasks;
diff --git a/Setup/obj/Release/net9.0-windows/win-x64/DeskCoreSetup.assets.cache b/Setup/obj/Release/net9.0-windows/win-x64/DeskCoreSetup.assets.cache
new file mode 100644
index 0000000..86be58e
Binary files /dev/null and b/Setup/obj/Release/net9.0-windows/win-x64/DeskCoreSetup.assets.cache differ
diff --git a/Setup/obj/Release/net9.0-windows/win-x64/DeskCoreSetup.csproj.CoreCompileInputs.cache b/Setup/obj/Release/net9.0-windows/win-x64/DeskCoreSetup.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..df89d0f
--- /dev/null
+++ b/Setup/obj/Release/net9.0-windows/win-x64/DeskCoreSetup.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+2b200cd0f14b4e4eb4b4885f0e8b3c56c346fd55b4f74f792b3cdc502d3e8cbb
diff --git a/Setup/obj/Release/net9.0-windows/win-x64/DeskCoreSetup.csproj.FileListAbsolute.txt b/Setup/obj/Release/net9.0-windows/win-x64/DeskCoreSetup.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..bd67c81
--- /dev/null
+++ b/Setup/obj/Release/net9.0-windows/win-x64/DeskCoreSetup.csproj.FileListAbsolute.txt
@@ -0,0 +1,21 @@
+C:\Users\Viper\Desktop\Programme\DeskCore-Source\Setup\bin\Release\net9.0-windows\win-x64\DeskCore-Setup.exe
+C:\Users\Viper\Desktop\Programme\DeskCore-Source\Setup\bin\Release\net9.0-windows\win-x64\DeskCore-Setup.deps.json
+C:\Users\Viper\Desktop\Programme\DeskCore-Source\Setup\bin\Release\net9.0-windows\win-x64\DeskCore-Setup.runtimeconfig.json
+C:\Users\Viper\Desktop\Programme\DeskCore-Source\Setup\bin\Release\net9.0-windows\win-x64\DeskCore-Setup.dll
+C:\Users\Viper\Desktop\Programme\DeskCore-Source\Setup\obj\Release\net9.0-windows\win-x64\MainWindow.baml
+C:\Users\Viper\Desktop\Programme\DeskCore-Source\Setup\obj\Release\net9.0-windows\win-x64\Colors.Light.baml
+C:\Users\Viper\Desktop\Programme\DeskCore-Source\Setup\obj\Release\net9.0-windows\win-x64\Colors.Dark.baml
+C:\Users\Viper\Desktop\Programme\DeskCore-Source\Setup\obj\Release\net9.0-windows\win-x64\Controls.baml
+C:\Users\Viper\Desktop\Programme\DeskCore-Source\Setup\obj\Release\net9.0-windows\win-x64\App.baml
+C:\Users\Viper\Desktop\Programme\DeskCore-Source\Setup\obj\Release\net9.0-windows\win-x64\MainWindow.g.cs
+C:\Users\Viper\Desktop\Programme\DeskCore-Source\Setup\obj\Release\net9.0-windows\win-x64\App.g.cs
+C:\Users\Viper\Desktop\Programme\DeskCore-Source\Setup\obj\Release\net9.0-windows\win-x64\DeskCore-Setup_MarkupCompile.cache
+C:\Users\Viper\Desktop\Programme\DeskCore-Source\Setup\obj\Release\net9.0-windows\win-x64\DeskCore-Setup.g.resources
+C:\Users\Viper\Desktop\Programme\DeskCore-Source\Setup\obj\Release\net9.0-windows\win-x64\DeskCoreSetup.GeneratedMSBuildEditorConfig.editorconfig
+C:\Users\Viper\Desktop\Programme\DeskCore-Source\Setup\obj\Release\net9.0-windows\win-x64\DeskCoreSetup.AssemblyInfoInputs.cache
+C:\Users\Viper\Desktop\Programme\DeskCore-Source\Setup\obj\Release\net9.0-windows\win-x64\DeskCoreSetup.AssemblyInfo.cs
+C:\Users\Viper\Desktop\Programme\DeskCore-Source\Setup\obj\Release\net9.0-windows\win-x64\DeskCoreSetup.csproj.CoreCompileInputs.cache
+C:\Users\Viper\Desktop\Programme\DeskCore-Source\Setup\obj\Release\net9.0-windows\win-x64\DeskCore-Setup.dll
+C:\Users\Viper\Desktop\Programme\DeskCore-Source\Setup\obj\Release\net9.0-windows\win-x64\refint\DeskCore-Setup.dll
+C:\Users\Viper\Desktop\Programme\DeskCore-Source\Setup\obj\Release\net9.0-windows\win-x64\DeskCoreSetup.genruntimeconfig.cache
+C:\Users\Viper\Desktop\Programme\DeskCore-Source\Setup\obj\Release\net9.0-windows\win-x64\ref\DeskCore-Setup.dll
diff --git a/Setup/obj/Release/net9.0-windows/win-x64/DeskCoreSetup.genbundle.cache b/Setup/obj/Release/net9.0-windows/win-x64/DeskCoreSetup.genbundle.cache
new file mode 100644
index 0000000..39fe93e
--- /dev/null
+++ b/Setup/obj/Release/net9.0-windows/win-x64/DeskCoreSetup.genbundle.cache
@@ -0,0 +1 @@
+914b6a259056b8c0f6c3227ea7cdf35b8381c900fbf78428cfcb5446fdb60624
diff --git a/Setup/obj/Release/net9.0-windows/win-x64/DeskCoreSetup.genpublishdeps.cache b/Setup/obj/Release/net9.0-windows/win-x64/DeskCoreSetup.genpublishdeps.cache
new file mode 100644
index 0000000..f8cbcb6
--- /dev/null
+++ b/Setup/obj/Release/net9.0-windows/win-x64/DeskCoreSetup.genpublishdeps.cache
@@ -0,0 +1 @@
+c41825f0c5957fff8272ec718c138cd0a31afc83a6d3eab90859164c0e911ccf
diff --git a/Setup/obj/Release/net9.0-windows/win-x64/DeskCoreSetup.genruntimeconfig.cache b/Setup/obj/Release/net9.0-windows/win-x64/DeskCoreSetup.genruntimeconfig.cache
new file mode 100644
index 0000000..00c46b6
--- /dev/null
+++ b/Setup/obj/Release/net9.0-windows/win-x64/DeskCoreSetup.genruntimeconfig.cache
@@ -0,0 +1 @@
+94e9cde7f02f6a1624bb951dc6d8d1cb1351d8ca9035e4dbef6cd3f5efea400c
diff --git a/Setup/obj/Release/net9.0-windows/win-x64/MainWindow.baml b/Setup/obj/Release/net9.0-windows/win-x64/MainWindow.baml
new file mode 100644
index 0000000..05e53a4
Binary files /dev/null and b/Setup/obj/Release/net9.0-windows/win-x64/MainWindow.baml differ
diff --git a/Setup/obj/Release/net9.0-windows/win-x64/MainWindow.g.cs b/Setup/obj/Release/net9.0-windows/win-x64/MainWindow.g.cs
new file mode 100644
index 0000000..16cd821
--- /dev/null
+++ b/Setup/obj/Release/net9.0-windows/win-x64/MainWindow.g.cs
@@ -0,0 +1,503 @@
+#pragma checksum "..\..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "6F090F12111B2DA7E86EB9B4D3E7CE46DAE44931"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Controls.Ribbon;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using System.Windows.Shell;
+
+
+namespace DeskCoreSetup {
+    
+    
+    /// <summary>
+    /// MainWindow
+    /// </summary>
+    public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
+        
+        
+        #line 48 "..\..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBlock WindowTitle;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 53 "..\..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button CloseButton;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 62 "..\..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBlock VersionText;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 63 "..\..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.StackPanel Steps;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 64 "..\..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBlock Step0;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 65 "..\..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBlock Step1;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 66 "..\..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBlock Step2;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 67 "..\..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBlock Step3;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 76 "..\..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.StackPanel PageWelcome;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 82 "..\..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Border UpdateHint;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 87 "..\..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBlock UpdateHintText;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 93 "..\..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.DockPanel PageLicense;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 95 "..\..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.CheckBox AcceptLicense;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 100 "..\..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBlock LicenseText;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 106 "..\..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.StackPanel PageOptions;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 111 "..\..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBox DirBox;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 113 "..\..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.CheckBox DesktopLinkBox;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 114 "..\..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.CheckBox StartMenuBox;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 115 "..\..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.CheckBox AutostartBox;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 119 "..\..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.StackPanel PageProgress;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 120 "..\..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBlock ProgressTitle;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 121 "..\..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBlock ProgressText;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 122 "..\..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Border ProgressTrack;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 123 "..\..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Border ProgressFill;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 125 "..\..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.StackPanel DonePanel;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 131 "..\..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBlock DoneText;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 133 "..\..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.CheckBox LaunchBox;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 138 "..\..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.StackPanel PageUninstall;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 146 "..\..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBlock DataInfo;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 147 "..\..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.CheckBox RemoveDataBox;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 149 "..\..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBlock RemoveDataWarning;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 160 "..\..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button BackButton;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 161 "..\..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button NextButton;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 162 "..\..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button CancelButton;
+        
+        #line default
+        #line hidden
+        
+        private bool _contentLoaded;
+        
+        /// <summary>
+        /// InitializeComponent
+        /// </summary>
+        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "10.0.12.0")]
+        public void InitializeComponent() {
+            if (_contentLoaded) {
+                return;
+            }
+            _contentLoaded = true;
+            System.Uri resourceLocater = new System.Uri("/DeskCore-Setup;component/mainwindow.xaml", System.UriKind.Relative);
+            
+            #line 1 "..\..\..\..\MainWindow.xaml"
+            System.Windows.Application.LoadComponent(this, resourceLocater);
+            
+            #line default
+            #line hidden
+        }
+        
+        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "10.0.12.0")]
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
+        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
+            switch (connectionId)
+            {
+            case 1:
+            this.WindowTitle = ((System.Windows.Controls.TextBlock)(target));
+            return;
+            case 2:
+            
+            #line 51 "..\..\..\..\MainWindow.xaml"
+            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Minimize_Click);
+            
+            #line default
+            #line hidden
+            return;
+            case 3:
+            this.CloseButton = ((System.Windows.Controls.Button)(target));
+            
+            #line 53 "..\..\..\..\MainWindow.xaml"
+            this.CloseButton.Click += new System.Windows.RoutedEventHandler(this.Cancel_Click);
+            
+            #line default
+            #line hidden
+            return;
+            case 4:
+            this.VersionText = ((System.Windows.Controls.TextBlock)(target));
+            return;
+            case 5:
+            this.Steps = ((System.Windows.Controls.StackPanel)(target));
+            return;
+            case 6:
+            this.Step0 = ((System.Windows.Controls.TextBlock)(target));
+            return;
+            case 7:
+            this.Step1 = ((System.Windows.Controls.TextBlock)(target));
+            return;
+            case 8:
+            this.Step2 = ((System.Windows.Controls.TextBlock)(target));
+            return;
+            case 9:
+            this.Step3 = ((System.Windows.Controls.TextBlock)(target));
+            return;
+            case 10:
+            this.PageWelcome = ((System.Windows.Controls.StackPanel)(target));
+            return;
+            case 11:
+            this.UpdateHint = ((System.Windows.Controls.Border)(target));
+            return;
+            case 12:
+            this.UpdateHintText = ((System.Windows.Controls.TextBlock)(target));
+            return;
+            case 13:
+            this.PageLicense = ((System.Windows.Controls.DockPanel)(target));
+            return;
+            case 14:
+            this.AcceptLicense = ((System.Windows.Controls.CheckBox)(target));
+            
+            #line 95 "..\..\..\..\MainWindow.xaml"
+            this.AcceptLicense.Click += new System.Windows.RoutedEventHandler(this.AcceptLicense_Click);
+            
+            #line default
+            #line hidden
+            return;
+            case 15:
+            this.LicenseText = ((System.Windows.Controls.TextBlock)(target));
+            return;
+            case 16:
+            this.PageOptions = ((System.Windows.Controls.StackPanel)(target));
+            return;
+            case 17:
+            
+            #line 110 "..\..\..\..\MainWindow.xaml"
+            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.ChangeDir_Click);
+            
+            #line default
+            #line hidden
+            return;
+            case 18:
+            this.DirBox = ((System.Windows.Controls.TextBox)(target));
+            return;
+            case 19:
+            this.DesktopLinkBox = ((System.Windows.Controls.CheckBox)(target));
+            return;
+            case 20:
+            this.StartMenuBox = ((System.Windows.Controls.CheckBox)(target));
+            return;
+            case 21:
+            this.AutostartBox = ((System.Windows.Controls.CheckBox)(target));
+            return;
+            case 22:
+            this.PageProgress = ((System.Windows.Controls.StackPanel)(target));
+            return;
+            case 23:
+            this.ProgressTitle = ((System.Windows.Controls.TextBlock)(target));
+            return;
+            case 24:
+            this.ProgressText = ((System.Windows.Controls.TextBlock)(target));
+            return;
+            case 25:
+            this.ProgressTrack = ((System.Windows.Controls.Border)(target));
+            return;
+            case 26:
+            this.ProgressFill = ((System.Windows.Controls.Border)(target));
+            return;
+            case 27:
+            this.DonePanel = ((System.Windows.Controls.StackPanel)(target));
+            return;
+            case 28:
+            this.DoneText = ((System.Windows.Controls.TextBlock)(target));
+            return;
+            case 29:
+            this.LaunchBox = ((System.Windows.Controls.CheckBox)(target));
+            return;
+            case 30:
+            this.PageUninstall = ((System.Windows.Controls.StackPanel)(target));
+            return;
+            case 31:
+            this.DataInfo = ((System.Windows.Controls.TextBlock)(target));
+            return;
+            case 32:
+            this.RemoveDataBox = ((System.Windows.Controls.CheckBox)(target));
+            
+            #line 148 "..\..\..\..\MainWindow.xaml"
+            this.RemoveDataBox.Click += new System.Windows.RoutedEventHandler(this.RemoveDataBox_Click);
+            
+            #line default
+            #line hidden
+            return;
+            case 33:
+            this.RemoveDataWarning = ((System.Windows.Controls.TextBlock)(target));
+            return;
+            case 34:
+            this.BackButton = ((System.Windows.Controls.Button)(target));
+            
+            #line 160 "..\..\..\..\MainWindow.xaml"
+            this.BackButton.Click += new System.Windows.RoutedEventHandler(this.Back_Click);
+            
+            #line default
+            #line hidden
+            return;
+            case 35:
+            this.NextButton = ((System.Windows.Controls.Button)(target));
+            
+            #line 161 "..\..\..\..\MainWindow.xaml"
+            this.NextButton.Click += new System.Windows.RoutedEventHandler(this.Next_Click);
+            
+            #line default
+            #line hidden
+            return;
+            case 36:
+            this.CancelButton = ((System.Windows.Controls.Button)(target));
+            
+            #line 162 "..\..\..\..\MainWindow.xaml"
+            this.CancelButton.Click += new System.Windows.RoutedEventHandler(this.Cancel_Click);
+            
+            #line default
+            #line hidden
+            return;
+            }
+            this._contentLoaded = true;
+        }
+    }
+}
+
diff --git a/Setup/obj/Release/net9.0-windows/win-x64/PublishOutputs.02abb2eb9c.txt b/Setup/obj/Release/net9.0-windows/win-x64/PublishOutputs.02abb2eb9c.txt
new file mode 100644
index 0000000..8327966
--- /dev/null
+++ b/Setup/obj/Release/net9.0-windows/win-x64/PublishOutputs.02abb2eb9c.txt
@@ -0,0 +1 @@
+C:\Users\Viper\Desktop\Programme\DeskCore-Installer\DeskCore-Setup.exe
diff --git a/Setup/obj/Release/net9.0-windows/win-x64/apphost.exe b/Setup/obj/Release/net9.0-windows/win-x64/apphost.exe
new file mode 100644
index 0000000..8132198
Binary files /dev/null and b/Setup/obj/Release/net9.0-windows/win-x64/apphost.exe differ
diff --git a/Setup/obj/Release/net9.0-windows/win-x64/ref/DeskCore-Setup.dll b/Setup/obj/Release/net9.0-windows/win-x64/ref/DeskCore-Setup.dll
new file mode 100644
index 0000000..48365de
Binary files /dev/null and b/Setup/obj/Release/net9.0-windows/win-x64/ref/DeskCore-Setup.dll differ
diff --git a/Setup/obj/Release/net9.0-windows/win-x64/refint/DeskCore-Setup.dll b/Setup/obj/Release/net9.0-windows/win-x64/refint/DeskCore-Setup.dll
new file mode 100644
index 0000000..48365de
Binary files /dev/null and b/Setup/obj/Release/net9.0-windows/win-x64/refint/DeskCore-Setup.dll differ
diff --git a/Themes/Colors.Dark.xaml b/Themes/Colors.Dark.xaml
index 162283c..f6250a8 100644
--- a/Themes/Colors.Dark.xaml
+++ b/Themes/Colors.Dark.xaml
@@ -1,27 +1,27 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="BaseBrush" Color="#202020"/>
-    <SolidColorBrush x:Key="LayerBrush" Color="#282828"/>
-    <SolidColorBrush x:Key="LayerStrokeBrush" Color="#1A1A1A"/>
-    <SolidColorBrush x:Key="SubtleHoverBrush" Color="#0FFFFFFF"/>
-    <SolidColorBrush x:Key="SubtlePressedBrush" Color="#0AFFFFFF"/>
-    <SolidColorBrush x:Key="SubtleSelectedBrush" Color="#14FFFFFF"/>
-    <SolidColorBrush x:Key="ControlFillBrush" Color="#2D2D2D"/>
-    <SolidColorBrush x:Key="ControlHoverBrush" Color="#323232"/>
-    <SolidColorBrush x:Key="ControlPressedBrush" Color="#272727"/>
-    <SolidColorBrush x:Key="ControlStrokeBrush" Color="#353535"/>
-    <SolidColorBrush x:Key="ControlStrongStrokeBrush" Color="#8A8A8A"/>
-    <SolidColorBrush x:Key="InputFocusBrush" Color="#1F1F1F"/>
-    <SolidColorBrush x:Key="TextBrush" Color="#FFFFFF"/>
-    <SolidColorBrush x:Key="TextSecondaryBrush" Color="#C8C8C8"/>
-    <SolidColorBrush x:Key="TextTertiaryBrush" Color="#9A9A9A"/>
-    <SolidColorBrush x:Key="FlyoutBrush" Color="#2C2C2C"/>
-    <SolidColorBrush x:Key="FlyoutStrokeBrush" Color="#404040"/>
-    <SolidColorBrush x:Key="DialogFooterBrush" Color="#202020"/>
-    <SolidColorBrush x:Key="ScrollThumbBrush" Color="#9F9F9F"/>
-    <SolidColorBrush x:Key="OverlayBrush" Color="#66000000"/>
-    <SolidColorBrush x:Key="SuccessBrush" Color="#4CAF50"/>
-    <SolidColorBrush x:Key="DangerBrush" Color="#FF99A4"/>
-    <SolidColorBrush x:Key="FenceBrush" Color="#F21C1C1C"/>
-    <Color x:Key="ShadowColor">#000000</Color>
-</ResourceDictionary>
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="BaseBrush" Color="#202020"/>
+    <SolidColorBrush x:Key="LayerBrush" Color="#282828"/>
+    <SolidColorBrush x:Key="LayerStrokeBrush" Color="#1A1A1A"/>
+    <SolidColorBrush x:Key="SubtleHoverBrush" Color="#0FFFFFFF"/>
+    <SolidColorBrush x:Key="SubtlePressedBrush" Color="#0AFFFFFF"/>
+    <SolidColorBrush x:Key="SubtleSelectedBrush" Color="#14FFFFFF"/>
+    <SolidColorBrush x:Key="ControlFillBrush" Color="#2D2D2D"/>
+    <SolidColorBrush x:Key="ControlHoverBrush" Color="#323232"/>
+    <SolidColorBrush x:Key="ControlPressedBrush" Color="#272727"/>
+    <SolidColorBrush x:Key="ControlStrokeBrush" Color="#353535"/>
+    <SolidColorBrush x:Key="ControlStrongStrokeBrush" Color="#8A8A8A"/>
+    <SolidColorBrush x:Key="InputFocusBrush" Color="#1F1F1F"/>
+    <SolidColorBrush x:Key="TextBrush" Color="#FFFFFF"/>
+    <SolidColorBrush x:Key="TextSecondaryBrush" Color="#C8C8C8"/>
+    <SolidColorBrush x:Key="TextTertiaryBrush" Color="#9A9A9A"/>
+    <SolidColorBrush x:Key="FlyoutBrush" Color="#2C2C2C"/>
+    <SolidColorBrush x:Key="FlyoutStrokeBrush" Color="#404040"/>
+    <SolidColorBrush x:Key="DialogFooterBrush" Color="#202020"/>
+    <SolidColorBrush x:Key="ScrollThumbBrush" Color="#9F9F9F"/>
+    <SolidColorBrush x:Key="OverlayBrush" Color="#66000000"/>
+    <SolidColorBrush x:Key="SuccessBrush" Color="#4CAF50"/>
+    <SolidColorBrush x:Key="DangerBrush" Color="#FF99A4"/>
+    <SolidColorBrush x:Key="FenceBrush" Color="#F21C1C1C"/>
+    <Color x:Key="ShadowColor">#000000</Color>
+</ResourceDictionary>
diff --git a/Themes/Colors.Light.xaml b/Themes/Colors.Light.xaml
index f6a4c1b..e311b00 100644
--- a/Themes/Colors.Light.xaml
+++ b/Themes/Colors.Light.xaml
@@ -1,27 +1,27 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="BaseBrush" Color="#F3F3F3"/>
-    <SolidColorBrush x:Key="LayerBrush" Color="#FAFAFA"/>
-    <SolidColorBrush x:Key="LayerStrokeBrush" Color="#E5E5E5"/>
-    <SolidColorBrush x:Key="SubtleHoverBrush" Color="#0A000000"/>
-    <SolidColorBrush x:Key="SubtlePressedBrush" Color="#06000000"/>
-    <SolidColorBrush x:Key="SubtleSelectedBrush" Color="#0F000000"/>
-    <SolidColorBrush x:Key="ControlFillBrush" Color="#FDFDFD"/>
-    <SolidColorBrush x:Key="ControlHoverBrush" Color="#F6F6F6"/>
-    <SolidColorBrush x:Key="ControlPressedBrush" Color="#F2F2F2"/>
-    <SolidColorBrush x:Key="ControlStrokeBrush" Color="#E3E3E3"/>
-    <SolidColorBrush x:Key="ControlStrongStrokeBrush" Color="#C4C4C4"/>
-    <SolidColorBrush x:Key="InputFocusBrush" Color="#FFFFFF"/>
-    <SolidColorBrush x:Key="TextBrush" Color="#1B1B1B"/>
-    <SolidColorBrush x:Key="TextSecondaryBrush" Color="#5D5D5D"/>
-    <SolidColorBrush x:Key="TextTertiaryBrush" Color="#8B8B8B"/>
-    <SolidColorBrush x:Key="FlyoutBrush" Color="#F9F9F9"/>
-    <SolidColorBrush x:Key="FlyoutStrokeBrush" Color="#DCDCDC"/>
-    <SolidColorBrush x:Key="DialogFooterBrush" Color="#F3F3F3"/>
-    <SolidColorBrush x:Key="ScrollThumbBrush" Color="#8A8A8A"/>
-    <SolidColorBrush x:Key="OverlayBrush" Color="#4D000000"/>
-    <SolidColorBrush x:Key="SuccessBrush" Color="#0F7B0F"/>
-    <SolidColorBrush x:Key="DangerBrush" Color="#C42B1C"/>
-    <SolidColorBrush x:Key="FenceBrush" Color="#F5F7F7F7"/>
-    <Color x:Key="ShadowColor">#000000</Color>
-</ResourceDictionary>
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="BaseBrush" Color="#F3F3F3"/>
+    <SolidColorBrush x:Key="LayerBrush" Color="#FAFAFA"/>
+    <SolidColorBrush x:Key="LayerStrokeBrush" Color="#E5E5E5"/>
+    <SolidColorBrush x:Key="SubtleHoverBrush" Color="#0A000000"/>
+    <SolidColorBrush x:Key="SubtlePressedBrush" Color="#06000000"/>
+    <SolidColorBrush x:Key="SubtleSelectedBrush" Color="#0F000000"/>
+    <SolidColorBrush x:Key="ControlFillBrush" Color="#FDFDFD"/>
+    <SolidColorBrush x:Key="ControlHoverBrush" Color="#F6F6F6"/>
+    <SolidColorBrush x:Key="ControlPressedBrush" Color="#F2F2F2"/>
+    <SolidColorBrush x:Key="ControlStrokeBrush" Color="#E3E3E3"/>
+    <SolidColorBrush x:Key="ControlStrongStrokeBrush" Color="#C4C4C4"/>
+    <SolidColorBrush x:Key="InputFocusBrush" Color="#FFFFFF"/>
+    <SolidColorBrush x:Key="TextBrush" Color="#1B1B1B"/>
+    <SolidColorBrush x:Key="TextSecondaryBrush" Color="#5D5D5D"/>
+    <SolidColorBrush x:Key="TextTertiaryBrush" Color="#8B8B8B"/>
+    <SolidColorBrush x:Key="FlyoutBrush" Color="#F9F9F9"/>
+    <SolidColorBrush x:Key="FlyoutStrokeBrush" Color="#DCDCDC"/>
+    <SolidColorBrush x:Key="DialogFooterBrush" Color="#F3F3F3"/>
+    <SolidColorBrush x:Key="ScrollThumbBrush" Color="#8A8A8A"/>
+    <SolidColorBrush x:Key="OverlayBrush" Color="#4D000000"/>
+    <SolidColorBrush x:Key="SuccessBrush" Color="#0F7B0F"/>
+    <SolidColorBrush x:Key="DangerBrush" Color="#C42B1C"/>
+    <SolidColorBrush x:Key="FenceBrush" Color="#F5F7F7F7"/>
+    <Color x:Key="ShadowColor">#000000</Color>
+</ResourceDictionary>
diff --git a/Themes/Controls.xaml b/Themes/Controls.xaml
index 3af73a2..9d6865a 100644
--- a/Themes/Controls.xaml
+++ b/Themes/Controls.xaml
@@ -1,651 +1,651 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-    <!-- Schriften: Windows 11 nutzt "Segoe UI Variable" / "Segoe Fluent Icons", Windows 10 fällt auf Segoe UI / MDL2 zurück -->
-    <FontFamily x:Key="UiFont">Segoe UI Variable Text, Segoe UI</FontFamily>
-    <FontFamily x:Key="DisplayFont">Segoe UI Variable Display, Segoe UI</FontFamily>
-    <FontFamily x:Key="IconFont">Segoe Fluent Icons, Segoe MDL2 Assets</FontFamily>
-
-    <DropShadowEffect x:Key="FlyoutShadow" BlurRadius="24" ShadowDepth="6" Direction="270" Opacity="0.18"
-                      Color="Black"/>
-    <DropShadowEffect x:Key="DialogShadow" BlurRadius="40" ShadowDepth="12" Direction="270" Opacity="0.28"
-                      Color="Black"/>
-
-    <!-- ===== Buttons ===== -->
-    <Style TargetType="Button">
-        <Setter Property="FontFamily" Value="{DynamicResource UiFont}"/>
-        <Setter Property="FontSize" Value="14"/>
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
-        <Setter Property="Background" Value="{DynamicResource ControlFillBrush}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource ControlStrokeBrush}"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Padding" Value="14,5"/>
-        <Setter Property="MinHeight" Value="32"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Button">
-                    <Border x:Name="Bd" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="4" Padding="{TemplateBinding Padding}"
-                            SnapsToDevicePixels="True">
-                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                          VerticalAlignment="Center" RecognizesAccessKey="True"/>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource ControlHoverBrush}"/>
-                        </Trigger>
-                        <Trigger Property="IsPressed" Value="True">
-                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource ControlPressedBrush}"/>
-                            <Setter Property="Opacity" Value="0.85"/>
-                        </Trigger>
-                        <Trigger Property="IsKeyboardFocused" Value="True">
-                            <Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource TextBrush}"/>
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Opacity" Value="0.4"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="AccentButton" TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
-        <Setter Property="Foreground" Value="{DynamicResource OnAccentBrush}"/>
-        <Setter Property="Background" Value="{DynamicResource AccentBrush}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource AccentBrush}"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Button">
-                    <Border x:Name="Bd" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="1" CornerRadius="4" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
-                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                          VerticalAlignment="Center" RecognizesAccessKey="True"/>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource AccentHoverBrush}"/>
-                            <Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource AccentHoverBrush}"/>
-                        </Trigger>
-                        <Trigger Property="IsPressed" Value="True">
-                            <Setter Property="Opacity" Value="0.8"/>
-                        </Trigger>
-                        <Trigger Property="IsKeyboardFocused" Value="True">
-                            <Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource TextBrush}"/>
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Opacity" Value="0.4"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!-- Transparenter Button (Symbolleisten, Sidebar) -->
-    <Style x:Key="SubtleButton" TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="BorderThickness" Value="0"/>
-        <Setter Property="Padding" Value="9,6"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Button">
-                    <Border x:Name="Bd" Background="{TemplateBinding Background}" CornerRadius="4" Padding="{TemplateBinding Padding}">
-                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="Center"/>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource SubtleHoverBrush}"/>
-                        </Trigger>
-                        <Trigger Property="IsPressed" Value="True">
-                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource SubtlePressedBrush}"/>
-                            <Setter Property="Opacity" Value="0.75"/>
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Opacity" Value="0.35"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!-- Titelleisten-Buttons -->
-    <Style x:Key="CaptionButton" TargetType="Button">
-        <Setter Property="Width" Value="46"/>
-        <Setter Property="Height" Value="32"/>
-        <Setter Property="FontFamily" Value="{DynamicResource IconFont}"/>
-        <Setter Property="FontSize" Value="10"/>
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-        <Setter Property="IsTabStop" Value="False"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Button">
-                    <Border x:Name="Bd" Background="{TemplateBinding Background}">
-                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource SubtleHoverBrush}"/>
-                        </Trigger>
-                        <Trigger Property="IsPressed" Value="True">
-                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource SubtlePressedBrush}"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="CloseCaptionButton" TargetType="Button" BasedOn="{StaticResource CaptionButton}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Button">
-                    <Border x:Name="Bd" Background="Transparent">
-                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Bd" Property="Background" Value="#C42B1C"/>
-                            <Setter Property="Foreground" Value="White"/>
-                        </Trigger>
-                        <Trigger Property="IsPressed" Value="True">
-                            <Setter TargetName="Bd" Property="Background" Value="#C83C30"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!-- ===== TextBox ===== -->
-    <Style TargetType="TextBox">
-        <Setter Property="FontFamily" Value="{DynamicResource UiFont}"/>
-        <Setter Property="FontSize" Value="14"/>
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
-        <Setter Property="CaretBrush" Value="{DynamicResource TextBrush}"/>
-        <Setter Property="SelectionBrush" Value="{DynamicResource AccentBrush}"/>
-        <Setter Property="Background" Value="{DynamicResource ControlFillBrush}"/>
-        <Setter Property="Padding" Value="10,6"/>
-        <Setter Property="MinHeight" Value="32"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="TextBox">
-                    <Grid>
-                        <Border x:Name="Bd" Background="{TemplateBinding Background}" CornerRadius="4"
-                                BorderBrush="{DynamicResource ControlStrokeBrush}" BorderThickness="1"/>
-                        <!-- Unterstrich wie bei Windows 11 -->
-                        <Border x:Name="Line" Height="1" VerticalAlignment="Bottom" Margin="3,0" CornerRadius="0,0,4,4"
-                                Background="{DynamicResource ControlStrongStrokeBrush}"/>
-                        <ScrollViewer x:Name="PART_ContentHost" Margin="{TemplateBinding Padding}" VerticalAlignment="Center"
-                                      Focusable="False" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource ControlHoverBrush}"/>
-                        </Trigger>
-                        <Trigger Property="IsKeyboardFocused" Value="True">
-                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource InputFocusBrush}"/>
-                            <Setter TargetName="Line" Property="Height" Value="2"/>
-                            <Setter TargetName="Line" Property="Margin" Value="1,0"/>
-                            <Setter TargetName="Line" Property="Background" Value="{DynamicResource AccentBrush}"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!-- ===== Scrollbar (schmal, wird beim Überfahren breiter) ===== -->
-    <Style x:Key="ScrollThumb" TargetType="Thumb">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Thumb">
-                    <Border Background="{DynamicResource ScrollThumbBrush}" CornerRadius="3"/>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="ScrollBar">
-        <Setter Property="Width" Value="12"/>
-        <Setter Property="MinWidth" Value="12"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ScrollBar">
-                    <Grid Background="Transparent">
-                        <Track x:Name="PART_Track" IsDirectionReversed="True">
-                            <Track.Thumb>
-                                <Thumb x:Name="Th" Style="{StaticResource ScrollThumb}" Width="3" HorizontalAlignment="Center" Opacity="0.7"/>
-                            </Track.Thumb>
-                        </Track>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Th" Property="Width" Value="6"/>
-                            <Setter TargetName="Th" Property="Opacity" Value="1"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Style.Triggers>
-            <Trigger Property="Orientation" Value="Horizontal">
-                <Setter Property="Width" Value="Auto"/>
-                <Setter Property="MinWidth" Value="0"/>
-                <Setter Property="Height" Value="12"/>
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="ScrollBar">
-                            <Grid Background="Transparent">
-                                <Track x:Name="PART_Track">
-                                    <Track.Thumb>
-                                        <Thumb x:Name="Th" Style="{StaticResource ScrollThumb}" Height="3" VerticalAlignment="Center" Opacity="0.7"/>
-                                    </Track.Thumb>
-                                </Track>
-                            </Grid>
-                            <ControlTemplate.Triggers>
-                                <Trigger Property="IsMouseOver" Value="True">
-                                    <Setter TargetName="Th" Property="Height" Value="6"/>
-                                    <Setter TargetName="Th" Property="Opacity" Value="1"/>
-                                </Trigger>
-                            </ControlTemplate.Triggers>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-
-    <!-- ===== ToolTip ===== -->
-    <Style TargetType="ToolTip">
-        <Setter Property="FontFamily" Value="{DynamicResource UiFont}"/>
-        <Setter Property="FontSize" Value="12"/>
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
-        <Setter Property="HasDropShadow" Value="False"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ToolTip">
-                    <Border Margin="8,4,8,12" Padding="9,6" CornerRadius="4" MaxWidth="320"
-                            Background="{DynamicResource FlyoutBrush}" BorderBrush="{DynamicResource FlyoutStrokeBrush}" BorderThickness="1"
-                            Effect="{StaticResource FlyoutShadow}">
-                        <ContentPresenter>
-                            <ContentPresenter.Resources>
-                                <Style TargetType="TextBlock">
-                                    <Setter Property="TextWrapping" Value="Wrap"/>
-                                </Style>
-                            </ContentPresenter.Resources>
-                        </ContentPresenter>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!-- ===== Kontextmenü ===== -->
-    <Style TargetType="ContextMenu">
-        <Setter Property="FontFamily" Value="{DynamicResource UiFont}"/>
-        <Setter Property="FontSize" Value="14"/>
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
-        <Setter Property="HasDropShadow" Value="False"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ContextMenu">
-                    <Border Margin="12,4,12,16" Padding="0,4" CornerRadius="8" MinWidth="200"
-                            Background="{DynamicResource FlyoutBrush}" BorderBrush="{DynamicResource FlyoutStrokeBrush}" BorderThickness="1"
-                            Effect="{StaticResource FlyoutShadow}">
-                        <ItemsPresenter KeyboardNavigation.DirectionalNavigation="Cycle"/>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="{x:Static MenuItem.SeparatorStyleKey}" TargetType="Separator">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Separator">
-                    <Border Height="1" Margin="0,4" Background="{DynamicResource FlyoutStrokeBrush}"/>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="MenuItem">
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="MenuItem">
-                    <Border x:Name="Bd" Background="Transparent" CornerRadius="4" Margin="4,1" Padding="11,0" Height="34">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="28"/>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="Auto"/>
-                            </Grid.ColumnDefinitions>
-                            <ContentPresenter ContentSource="Icon" VerticalAlignment="Center" HorizontalAlignment="Left"
-                                              TextElement.FontFamily="{DynamicResource IconFont}" TextElement.FontSize="16"/>
-                            <ContentPresenter Grid.Column="1" ContentSource="Header" VerticalAlignment="Center" RecognizesAccessKey="True"/>
-                            <TextBlock x:Name="Gesture" Grid.Column="2" Text="{TemplateBinding InputGestureText}" FontSize="12"
-                                       VerticalAlignment="Center" Margin="24,0,0,0" Foreground="{DynamicResource TextTertiaryBrush}"/>
-                            <TextBlock x:Name="Arrow" Grid.Column="2" Text="&#xE76C;" FontFamily="{DynamicResource IconFont}" FontSize="11"
-                                       VerticalAlignment="Center" Margin="24,0,0,0" Visibility="Collapsed"
-                                       Foreground="{DynamicResource TextSecondaryBrush}"/>
-                            <Popup x:Name="PART_Popup" Placement="Right" HorizontalOffset="-4" VerticalOffset="-12"
-                                   IsOpen="{Binding IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}"
-                                   AllowsTransparency="True" Focusable="False" PopupAnimation="Fade">
-                                <Border Margin="12,4,12,16" Padding="0,4" CornerRadius="8" MinWidth="180"
-                                        Background="{DynamicResource FlyoutBrush}" BorderBrush="{DynamicResource FlyoutStrokeBrush}"
-                                        BorderThickness="1" Effect="{StaticResource FlyoutShadow}">
-                                    <ScrollViewer MaxHeight="420" VerticalScrollBarVisibility="Auto">
-                                        <ItemsPresenter KeyboardNavigation.DirectionalNavigation="Cycle"/>
-                                    </ScrollViewer>
-                                </Border>
-                            </Popup>
-                        </Grid>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsHighlighted" Value="True">
-                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource SubtleHoverBrush}"/>
-                        </Trigger>
-                        <Trigger Property="Role" Value="SubmenuHeader">
-                            <Setter TargetName="Arrow" Property="Visibility" Value="Visible"/>
-                            <Setter TargetName="Gesture" Property="Visibility" Value="Collapsed"/>
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Opacity" Value="0.4"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!-- ===== Listen ===== -->
-    <Style TargetType="ListBox">
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="BorderThickness" Value="0"/>
-        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ListBox">
-                    <ScrollViewer Focusable="False" Padding="{TemplateBinding Padding}">
-                        <ItemsPresenter/>
-                    </ScrollViewer>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!-- Navigationseintrag in der Seitenleiste -->
-    <Style x:Key="NavItem" TargetType="ListBoxItem">
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-        <Setter Property="Height" Value="38"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ListBoxItem">
-                    <Grid Margin="4,1" Background="Transparent">
-                        <Border x:Name="Bd" CornerRadius="4" BorderThickness="1" BorderBrush="Transparent" Background="Transparent"/>
-                        <Rectangle x:Name="Pill" Width="3" Height="16" RadiusX="1.5" RadiusY="1.5" HorizontalAlignment="Left"
-                                   Fill="{DynamicResource AccentBrush}" Visibility="Collapsed"/>
-                        <ContentPresenter Margin="14,0,12,0" VerticalAlignment="Center"/>
-                        <!-- Einfügelinie beim Umsortieren -->
-                        <Border x:Name="InsertTop" Height="2" CornerRadius="1" VerticalAlignment="Top" Margin="6,-2,6,0"
-                                Background="{DynamicResource AccentBrush}" Visibility="Collapsed"/>
-                        <Border x:Name="InsertBottom" Height="2" CornerRadius="1" VerticalAlignment="Bottom" Margin="6,0,6,-2"
-                                Background="{DynamicResource AccentBrush}" Visibility="Collapsed"/>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource SubtleHoverBrush}"/>
-                        </Trigger>
-                        <Trigger Property="IsSelected" Value="True">
-                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource SubtleSelectedBrush}"/>
-                            <Setter TargetName="Pill" Property="Visibility" Value="Visible"/>
-                        </Trigger>
-                        <Trigger Property="Tag" Value="before">
-                            <Setter TargetName="InsertTop" Property="Visibility" Value="Visible"/>
-                        </Trigger>
-                        <Trigger Property="Tag" Value="after">
-                            <Setter TargetName="InsertBottom" Property="Visibility" Value="Visible"/>
-                        </Trigger>
-                        <Trigger Property="Tag" Value="drop">
-                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource AccentSubtleBrush}"/>
-                            <Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource AccentBrush}"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!-- Icon-Kachel -->
-    <Style x:Key="TileItem" TargetType="ListBoxItem">
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ListBoxItem">
-                    <Border x:Name="Bd" Margin="2" CornerRadius="6" BorderThickness="1" BorderBrush="Transparent" Background="Transparent">
-                        <ContentPresenter/>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource SubtleHoverBrush}"/>
-                        </Trigger>
-                        <Trigger Property="IsSelected" Value="True">
-                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource AccentSubtleBrush}"/>
-                            <Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource AccentSubtleStrokeBrush}"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!-- ===== Listenansicht-Zeile ===== -->
-    <Style x:Key="RowItem" TargetType="ListBoxItem">
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ListBoxItem">
-                    <Grid Margin="0,1">
-                        <Border x:Name="Bd" CornerRadius="4" Background="Transparent"/>
-                        <Rectangle x:Name="Pill" Width="3" Height="16" RadiusX="1.5" RadiusY="1.5" HorizontalAlignment="Left"
-                                   Fill="{DynamicResource AccentBrush}" Visibility="Collapsed"/>
-                        <ContentPresenter/>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource SubtleHoverBrush}"/>
-                        </Trigger>
-                        <Trigger Property="IsSelected" Value="True">
-                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource AccentSubtleBrush}"/>
-                            <Setter TargetName="Pill" Property="Visibility" Value="Visible"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!-- ===== Karte (Einstellungen) ===== -->
-    <Style x:Key="Card" TargetType="Border">
-        <Setter Property="Background" Value="{DynamicResource ControlFillBrush}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource ControlStrokeBrush}"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="CornerRadius" Value="6"/>
-        <Setter Property="Padding" Value="18,14"/>
-        <Setter Property="Margin" Value="0,0,0,4"/>
-    </Style>
-
-    <Style x:Key="SectionTitle" TargetType="TextBlock">
-        <Setter Property="FontSize" Value="14"/>
-        <Setter Property="FontWeight" Value="SemiBold"/>
-        <Setter Property="Margin" Value="2,24,0,8"/>
-    </Style>
-
-    <!-- ===== Kippschalter (Windows 11) ===== -->
-    <Style x:Key="ToggleSwitch" TargetType="CheckBox">
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-        <Setter Property="Cursor" Value="Hand"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="CheckBox">
-                    <StackPanel Orientation="Horizontal" Background="Transparent">
-                        <TextBlock x:Name="State" Text="Aus" VerticalAlignment="Center" Margin="0,0,12,0" MinWidth="24" TextAlignment="Right"/>
-                        <Grid Width="40" Height="20">
-                            <Border x:Name="Track" CornerRadius="10" BorderThickness="1"
-                                    Background="{DynamicResource SubtleSelectedBrush}" BorderBrush="{DynamicResource ControlStrongStrokeBrush}"/>
-                            <Ellipse x:Name="Knob" Width="12" Height="12" HorizontalAlignment="Left" Margin="4,0,0,0"
-                                     Fill="{DynamicResource TextSecondaryBrush}"/>
-                        </Grid>
-                    </StackPanel>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsChecked" Value="True">
-                            <Setter TargetName="Track" Property="Background" Value="{DynamicResource AccentBrush}"/>
-                            <Setter TargetName="Track" Property="BorderBrush" Value="{DynamicResource AccentBrush}"/>
-                            <Setter TargetName="Knob" Property="Fill" Value="{DynamicResource OnAccentBrush}"/>
-                            <Setter TargetName="Knob" Property="HorizontalAlignment" Value="Right"/>
-                            <Setter TargetName="Knob" Property="Margin" Value="0,0,4,0"/>
-                            <Setter TargetName="State" Property="Text" Value="Ein"/>
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Knob" Property="Width" Value="14"/>
-                            <Setter TargetName="Knob" Property="Height" Value="14"/>
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Opacity" Value="0.4"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!-- ===== Kontrollkästchen ===== -->
-    <Style TargetType="CheckBox">
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
-        <Setter Property="FontFamily" Value="{DynamicResource UiFont}"/>
-        <Setter Property="FontSize" Value="14"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="CheckBox">
-                    <StackPanel Orientation="Horizontal" Background="Transparent">
-                        <Border x:Name="Box" Width="20" Height="20" CornerRadius="4" BorderThickness="1" VerticalAlignment="Center"
-                                Background="{DynamicResource ControlFillBrush}" BorderBrush="{DynamicResource ControlStrongStrokeBrush}">
-                            <TextBlock x:Name="Check" Text="&#xE73E;" FontFamily="{DynamicResource IconFont}" FontSize="12"
-                                       Foreground="{DynamicResource OnAccentBrush}" HorizontalAlignment="Center" VerticalAlignment="Center"
-                                       Visibility="Collapsed"/>
-                        </Border>
-                        <ContentPresenter Margin="10,0,0,0" VerticalAlignment="Center"/>
-                    </StackPanel>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsChecked" Value="True">
-                            <Setter TargetName="Box" Property="Background" Value="{DynamicResource AccentBrush}"/>
-                            <Setter TargetName="Box" Property="BorderBrush" Value="{DynamicResource AccentBrush}"/>
-                            <Setter TargetName="Check" Property="Visibility" Value="Visible"/>
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Box" Property="Opacity" Value="0.85"/>
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Opacity" Value="0.4"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!-- ===== Segment-Auswahl (z. B. Hell | Dunkel | System) ===== -->
-    <Style x:Key="SegmentRadio" TargetType="RadioButton">
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-        <Setter Property="Padding" Value="14,6"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="RadioButton">
-                    <Border x:Name="Bd" CornerRadius="4" Padding="{TemplateBinding Padding}" Margin="2" Background="Transparent">
-                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource SubtleHoverBrush}"/>
-                        </Trigger>
-                        <Trigger Property="IsChecked" Value="True">
-                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource AccentBrush}"/>
-                            <Setter Property="Foreground" Value="{DynamicResource OnAccentBrush}"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="SegmentGroup" TargetType="Border">
-        <Setter Property="Background" Value="{DynamicResource SubtlePressedBrush}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource ControlStrokeBrush}"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="CornerRadius" Value="6"/>
-        <Setter Property="Padding" Value="1"/>
-    </Style>
-
-    <!-- ===== Farb- und Symbolauswahl ===== -->
-    <Style x:Key="SwatchRadio" TargetType="RadioButton">
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-        <Setter Property="Cursor" Value="Hand"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="RadioButton">
-                    <Grid Width="34" Height="34" Margin="0,0,6,6" Background="Transparent">
-                        <Ellipse x:Name="Ring" Stroke="{DynamicResource TextBrush}" StrokeThickness="2" Visibility="Collapsed"/>
-                        <Ellipse Margin="5" Fill="{TemplateBinding Background}" Stroke="{DynamicResource ControlStrokeBrush}"/>
-                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsChecked" Value="True">
-                            <Setter TargetName="Ring" Property="Visibility" Value="Visible"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="GlyphRadio" TargetType="RadioButton">
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
-        <Setter Property="FontFamily" Value="{DynamicResource IconFont}"/>
-        <Setter Property="FontSize" Value="16"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="RadioButton">
-                    <Border x:Name="Bd" Width="36" Height="36" Margin="0,0,4,4" CornerRadius="4" BorderThickness="1"
-                            BorderBrush="Transparent" Background="Transparent">
-                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource SubtleHoverBrush}"/>
-                        </Trigger>
-                        <Trigger Property="IsChecked" Value="True">
-                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource AccentSubtleBrush}"/>
-                            <Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource AccentBrush}"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-</ResourceDictionary>
-
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <!-- Schriften: Windows 11 nutzt "Segoe UI Variable" / "Segoe Fluent Icons", Windows 10 fällt auf Segoe UI / MDL2 zurück -->
+    <FontFamily x:Key="UiFont">Segoe UI Variable Text, Segoe UI</FontFamily>
+    <FontFamily x:Key="DisplayFont">Segoe UI Variable Display, Segoe UI</FontFamily>
+    <FontFamily x:Key="IconFont">Segoe Fluent Icons, Segoe MDL2 Assets</FontFamily>
+
+    <DropShadowEffect x:Key="FlyoutShadow" BlurRadius="24" ShadowDepth="6" Direction="270" Opacity="0.18"
+                      Color="Black"/>
+    <DropShadowEffect x:Key="DialogShadow" BlurRadius="40" ShadowDepth="12" Direction="270" Opacity="0.28"
+                      Color="Black"/>
+
+    <!-- ===== Buttons ===== -->
+    <Style TargetType="Button">
+        <Setter Property="FontFamily" Value="{DynamicResource UiFont}"/>
+        <Setter Property="FontSize" Value="14"/>
+        <Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
+        <Setter Property="Background" Value="{DynamicResource ControlFillBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource ControlStrokeBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="14,5"/>
+        <Setter Property="MinHeight" Value="32"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border x:Name="Bd" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="4" Padding="{TemplateBinding Padding}"
+                            SnapsToDevicePixels="True">
+                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="Center" RecognizesAccessKey="True"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource ControlHoverBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource ControlPressedBrush}"/>
+                            <Setter Property="Opacity" Value="0.85"/>
+                        </Trigger>
+                        <Trigger Property="IsKeyboardFocused" Value="True">
+                            <Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource TextBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.4"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="AccentButton" TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="Foreground" Value="{DynamicResource OnAccentBrush}"/>
+        <Setter Property="Background" Value="{DynamicResource AccentBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource AccentBrush}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border x:Name="Bd" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="1" CornerRadius="4" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
+                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="Center" RecognizesAccessKey="True"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource AccentHoverBrush}"/>
+                            <Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource AccentHoverBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter Property="Opacity" Value="0.8"/>
+                        </Trigger>
+                        <Trigger Property="IsKeyboardFocused" Value="True">
+                            <Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource TextBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.4"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Transparenter Button (Symbolleisten, Sidebar) -->
+    <Style x:Key="SubtleButton" TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Padding" Value="9,6"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border x:Name="Bd" Background="{TemplateBinding Background}" CornerRadius="4" Padding="{TemplateBinding Padding}">
+                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource SubtleHoverBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource SubtlePressedBrush}"/>
+                            <Setter Property="Opacity" Value="0.75"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.35"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Titelleisten-Buttons -->
+    <Style x:Key="CaptionButton" TargetType="Button">
+        <Setter Property="Width" Value="46"/>
+        <Setter Property="Height" Value="32"/>
+        <Setter Property="FontFamily" Value="{DynamicResource IconFont}"/>
+        <Setter Property="FontSize" Value="10"/>
+        <Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="IsTabStop" Value="False"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border x:Name="Bd" Background="{TemplateBinding Background}">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource SubtleHoverBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource SubtlePressedBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="CloseCaptionButton" TargetType="Button" BasedOn="{StaticResource CaptionButton}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border x:Name="Bd" Background="Transparent">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="#C42B1C"/>
+                            <Setter Property="Foreground" Value="White"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="#C83C30"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ===== TextBox ===== -->
+    <Style TargetType="TextBox">
+        <Setter Property="FontFamily" Value="{DynamicResource UiFont}"/>
+        <Setter Property="FontSize" Value="14"/>
+        <Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
+        <Setter Property="CaretBrush" Value="{DynamicResource TextBrush}"/>
+        <Setter Property="SelectionBrush" Value="{DynamicResource AccentBrush}"/>
+        <Setter Property="Background" Value="{DynamicResource ControlFillBrush}"/>
+        <Setter Property="Padding" Value="10,6"/>
+        <Setter Property="MinHeight" Value="32"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="TextBox">
+                    <Grid>
+                        <Border x:Name="Bd" Background="{TemplateBinding Background}" CornerRadius="4"
+                                BorderBrush="{DynamicResource ControlStrokeBrush}" BorderThickness="1"/>
+                        <!-- Unterstrich wie bei Windows 11 -->
+                        <Border x:Name="Line" Height="1" VerticalAlignment="Bottom" Margin="3,0" CornerRadius="0,0,4,4"
+                                Background="{DynamicResource ControlStrongStrokeBrush}"/>
+                        <ScrollViewer x:Name="PART_ContentHost" Margin="{TemplateBinding Padding}" VerticalAlignment="Center"
+                                      Focusable="False" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource ControlHoverBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsKeyboardFocused" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource InputFocusBrush}"/>
+                            <Setter TargetName="Line" Property="Height" Value="2"/>
+                            <Setter TargetName="Line" Property="Margin" Value="1,0"/>
+                            <Setter TargetName="Line" Property="Background" Value="{DynamicResource AccentBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ===== Scrollbar (schmal, wird beim Überfahren breiter) ===== -->
+    <Style x:Key="ScrollThumb" TargetType="Thumb">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Thumb">
+                    <Border Background="{DynamicResource ScrollThumbBrush}" CornerRadius="3"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="ScrollBar">
+        <Setter Property="Width" Value="12"/>
+        <Setter Property="MinWidth" Value="12"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ScrollBar">
+                    <Grid Background="Transparent">
+                        <Track x:Name="PART_Track" IsDirectionReversed="True">
+                            <Track.Thumb>
+                                <Thumb x:Name="Th" Style="{StaticResource ScrollThumb}" Width="3" HorizontalAlignment="Center" Opacity="0.7"/>
+                            </Track.Thumb>
+                        </Track>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Th" Property="Width" Value="6"/>
+                            <Setter TargetName="Th" Property="Opacity" Value="1"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="Orientation" Value="Horizontal">
+                <Setter Property="Width" Value="Auto"/>
+                <Setter Property="MinWidth" Value="0"/>
+                <Setter Property="Height" Value="12"/>
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="ScrollBar">
+                            <Grid Background="Transparent">
+                                <Track x:Name="PART_Track">
+                                    <Track.Thumb>
+                                        <Thumb x:Name="Th" Style="{StaticResource ScrollThumb}" Height="3" VerticalAlignment="Center" Opacity="0.7"/>
+                                    </Track.Thumb>
+                                </Track>
+                            </Grid>
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="IsMouseOver" Value="True">
+                                    <Setter TargetName="Th" Property="Height" Value="6"/>
+                                    <Setter TargetName="Th" Property="Opacity" Value="1"/>
+                                </Trigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <!-- ===== ToolTip ===== -->
+    <Style TargetType="ToolTip">
+        <Setter Property="FontFamily" Value="{DynamicResource UiFont}"/>
+        <Setter Property="FontSize" Value="12"/>
+        <Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
+        <Setter Property="HasDropShadow" Value="False"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ToolTip">
+                    <Border Margin="8,4,8,12" Padding="9,6" CornerRadius="4" MaxWidth="320"
+                            Background="{DynamicResource FlyoutBrush}" BorderBrush="{DynamicResource FlyoutStrokeBrush}" BorderThickness="1"
+                            Effect="{StaticResource FlyoutShadow}">
+                        <ContentPresenter>
+                            <ContentPresenter.Resources>
+                                <Style TargetType="TextBlock">
+                                    <Setter Property="TextWrapping" Value="Wrap"/>
+                                </Style>
+                            </ContentPresenter.Resources>
+                        </ContentPresenter>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ===== Kontextmenü ===== -->
+    <Style TargetType="ContextMenu">
+        <Setter Property="FontFamily" Value="{DynamicResource UiFont}"/>
+        <Setter Property="FontSize" Value="14"/>
+        <Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
+        <Setter Property="HasDropShadow" Value="False"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ContextMenu">
+                    <Border Margin="12,4,12,16" Padding="0,4" CornerRadius="8" MinWidth="200"
+                            Background="{DynamicResource FlyoutBrush}" BorderBrush="{DynamicResource FlyoutStrokeBrush}" BorderThickness="1"
+                            Effect="{StaticResource FlyoutShadow}">
+                        <ItemsPresenter KeyboardNavigation.DirectionalNavigation="Cycle"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="{x:Static MenuItem.SeparatorStyleKey}" TargetType="Separator">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Separator">
+                    <Border Height="1" Margin="0,4" Background="{DynamicResource FlyoutStrokeBrush}"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="MenuItem">
+        <Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="MenuItem">
+                    <Border x:Name="Bd" Background="Transparent" CornerRadius="4" Margin="4,1" Padding="11,0" Height="34">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="28"/>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+                            <ContentPresenter ContentSource="Icon" VerticalAlignment="Center" HorizontalAlignment="Left"
+                                              TextElement.FontFamily="{DynamicResource IconFont}" TextElement.FontSize="16"/>
+                            <ContentPresenter Grid.Column="1" ContentSource="Header" VerticalAlignment="Center" RecognizesAccessKey="True"/>
+                            <TextBlock x:Name="Gesture" Grid.Column="2" Text="{TemplateBinding InputGestureText}" FontSize="12"
+                                       VerticalAlignment="Center" Margin="24,0,0,0" Foreground="{DynamicResource TextTertiaryBrush}"/>
+                            <TextBlock x:Name="Arrow" Grid.Column="2" Text="&#xE76C;" FontFamily="{DynamicResource IconFont}" FontSize="11"
+                                       VerticalAlignment="Center" Margin="24,0,0,0" Visibility="Collapsed"
+                                       Foreground="{DynamicResource TextSecondaryBrush}"/>
+                            <Popup x:Name="PART_Popup" Placement="Right" HorizontalOffset="-4" VerticalOffset="-12"
+                                   IsOpen="{Binding IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                                   AllowsTransparency="True" Focusable="False" PopupAnimation="Fade">
+                                <Border Margin="12,4,12,16" Padding="0,4" CornerRadius="8" MinWidth="180"
+                                        Background="{DynamicResource FlyoutBrush}" BorderBrush="{DynamicResource FlyoutStrokeBrush}"
+                                        BorderThickness="1" Effect="{StaticResource FlyoutShadow}">
+                                    <ScrollViewer MaxHeight="420" VerticalScrollBarVisibility="Auto">
+                                        <ItemsPresenter KeyboardNavigation.DirectionalNavigation="Cycle"/>
+                                    </ScrollViewer>
+                                </Border>
+                            </Popup>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsHighlighted" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource SubtleHoverBrush}"/>
+                        </Trigger>
+                        <Trigger Property="Role" Value="SubmenuHeader">
+                            <Setter TargetName="Arrow" Property="Visibility" Value="Visible"/>
+                            <Setter TargetName="Gesture" Property="Visibility" Value="Collapsed"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.4"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ===== Listen ===== -->
+    <Style TargetType="ListBox">
+        <Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ListBox">
+                    <ScrollViewer Focusable="False" Padding="{TemplateBinding Padding}">
+                        <ItemsPresenter/>
+                    </ScrollViewer>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Navigationseintrag in der Seitenleiste -->
+    <Style x:Key="NavItem" TargetType="ListBoxItem">
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="Height" Value="38"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ListBoxItem">
+                    <Grid Margin="4,1" Background="Transparent">
+                        <Border x:Name="Bd" CornerRadius="4" BorderThickness="1" BorderBrush="Transparent" Background="Transparent"/>
+                        <Rectangle x:Name="Pill" Width="3" Height="16" RadiusX="1.5" RadiusY="1.5" HorizontalAlignment="Left"
+                                   Fill="{DynamicResource AccentBrush}" Visibility="Collapsed"/>
+                        <ContentPresenter Margin="14,0,12,0" VerticalAlignment="Center"/>
+                        <!-- Einfügelinie beim Umsortieren -->
+                        <Border x:Name="InsertTop" Height="2" CornerRadius="1" VerticalAlignment="Top" Margin="6,-2,6,0"
+                                Background="{DynamicResource AccentBrush}" Visibility="Collapsed"/>
+                        <Border x:Name="InsertBottom" Height="2" CornerRadius="1" VerticalAlignment="Bottom" Margin="6,0,6,-2"
+                                Background="{DynamicResource AccentBrush}" Visibility="Collapsed"/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource SubtleHoverBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource SubtleSelectedBrush}"/>
+                            <Setter TargetName="Pill" Property="Visibility" Value="Visible"/>
+                        </Trigger>
+                        <Trigger Property="Tag" Value="before">
+                            <Setter TargetName="InsertTop" Property="Visibility" Value="Visible"/>
+                        </Trigger>
+                        <Trigger Property="Tag" Value="after">
+                            <Setter TargetName="InsertBottom" Property="Visibility" Value="Visible"/>
+                        </Trigger>
+                        <Trigger Property="Tag" Value="drop">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource AccentSubtleBrush}"/>
+                            <Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource AccentBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Icon-Kachel -->
+    <Style x:Key="TileItem" TargetType="ListBoxItem">
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ListBoxItem">
+                    <Border x:Name="Bd" Margin="2" CornerRadius="6" BorderThickness="1" BorderBrush="Transparent" Background="Transparent">
+                        <ContentPresenter/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource SubtleHoverBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource AccentSubtleBrush}"/>
+                            <Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource AccentSubtleStrokeBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ===== Listenansicht-Zeile ===== -->
+    <Style x:Key="RowItem" TargetType="ListBoxItem">
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ListBoxItem">
+                    <Grid Margin="0,1">
+                        <Border x:Name="Bd" CornerRadius="4" Background="Transparent"/>
+                        <Rectangle x:Name="Pill" Width="3" Height="16" RadiusX="1.5" RadiusY="1.5" HorizontalAlignment="Left"
+                                   Fill="{DynamicResource AccentBrush}" Visibility="Collapsed"/>
+                        <ContentPresenter/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource SubtleHoverBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource AccentSubtleBrush}"/>
+                            <Setter TargetName="Pill" Property="Visibility" Value="Visible"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ===== Karte (Einstellungen) ===== -->
+    <Style x:Key="Card" TargetType="Border">
+        <Setter Property="Background" Value="{DynamicResource ControlFillBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource ControlStrokeBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="CornerRadius" Value="6"/>
+        <Setter Property="Padding" Value="18,14"/>
+        <Setter Property="Margin" Value="0,0,0,4"/>
+    </Style>
+
+    <Style x:Key="SectionTitle" TargetType="TextBlock">
+        <Setter Property="FontSize" Value="14"/>
+        <Setter Property="FontWeight" Value="SemiBold"/>
+        <Setter Property="Margin" Value="2,24,0,8"/>
+    </Style>
+
+    <!-- ===== Kippschalter (Windows 11) ===== -->
+    <Style x:Key="ToggleSwitch" TargetType="CheckBox">
+        <Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="CheckBox">
+                    <StackPanel Orientation="Horizontal" Background="Transparent">
+                        <TextBlock x:Name="State" Text="Aus" VerticalAlignment="Center" Margin="0,0,12,0" MinWidth="24" TextAlignment="Right"/>
+                        <Grid Width="40" Height="20">
+                            <Border x:Name="Track" CornerRadius="10" BorderThickness="1"
+                                    Background="{DynamicResource SubtleSelectedBrush}" BorderBrush="{DynamicResource ControlStrongStrokeBrush}"/>
+                            <Ellipse x:Name="Knob" Width="12" Height="12" HorizontalAlignment="Left" Margin="4,0,0,0"
+                                     Fill="{DynamicResource TextSecondaryBrush}"/>
+                        </Grid>
+                    </StackPanel>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter TargetName="Track" Property="Background" Value="{DynamicResource AccentBrush}"/>
+                            <Setter TargetName="Track" Property="BorderBrush" Value="{DynamicResource AccentBrush}"/>
+                            <Setter TargetName="Knob" Property="Fill" Value="{DynamicResource OnAccentBrush}"/>
+                            <Setter TargetName="Knob" Property="HorizontalAlignment" Value="Right"/>
+                            <Setter TargetName="Knob" Property="Margin" Value="0,0,4,0"/>
+                            <Setter TargetName="State" Property="Text" Value="Ein"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Knob" Property="Width" Value="14"/>
+                            <Setter TargetName="Knob" Property="Height" Value="14"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.4"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ===== Kontrollkästchen ===== -->
+    <Style TargetType="CheckBox">
+        <Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
+        <Setter Property="FontFamily" Value="{DynamicResource UiFont}"/>
+        <Setter Property="FontSize" Value="14"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="CheckBox">
+                    <StackPanel Orientation="Horizontal" Background="Transparent">
+                        <Border x:Name="Box" Width="20" Height="20" CornerRadius="4" BorderThickness="1" VerticalAlignment="Center"
+                                Background="{DynamicResource ControlFillBrush}" BorderBrush="{DynamicResource ControlStrongStrokeBrush}">
+                            <TextBlock x:Name="Check" Text="&#xE73E;" FontFamily="{DynamicResource IconFont}" FontSize="12"
+                                       Foreground="{DynamicResource OnAccentBrush}" HorizontalAlignment="Center" VerticalAlignment="Center"
+                                       Visibility="Collapsed"/>
+                        </Border>
+                        <ContentPresenter Margin="10,0,0,0" VerticalAlignment="Center"/>
+                    </StackPanel>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter TargetName="Box" Property="Background" Value="{DynamicResource AccentBrush}"/>
+                            <Setter TargetName="Box" Property="BorderBrush" Value="{DynamicResource AccentBrush}"/>
+                            <Setter TargetName="Check" Property="Visibility" Value="Visible"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Box" Property="Opacity" Value="0.85"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.4"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ===== Segment-Auswahl (z. B. Hell | Dunkel | System) ===== -->
+    <Style x:Key="SegmentRadio" TargetType="RadioButton">
+        <Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="Padding" Value="14,6"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="RadioButton">
+                    <Border x:Name="Bd" CornerRadius="4" Padding="{TemplateBinding Padding}" Margin="2" Background="Transparent">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource SubtleHoverBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource AccentBrush}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource OnAccentBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="SegmentGroup" TargetType="Border">
+        <Setter Property="Background" Value="{DynamicResource SubtlePressedBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource ControlStrokeBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="CornerRadius" Value="6"/>
+        <Setter Property="Padding" Value="1"/>
+    </Style>
+
+    <!-- ===== Farb- und Symbolauswahl ===== -->
+    <Style x:Key="SwatchRadio" TargetType="RadioButton">
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="RadioButton">
+                    <Grid Width="34" Height="34" Margin="0,0,6,6" Background="Transparent">
+                        <Ellipse x:Name="Ring" Stroke="{DynamicResource TextBrush}" StrokeThickness="2" Visibility="Collapsed"/>
+                        <Ellipse Margin="5" Fill="{TemplateBinding Background}" Stroke="{DynamicResource ControlStrokeBrush}"/>
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter TargetName="Ring" Property="Visibility" Value="Visible"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="GlyphRadio" TargetType="RadioButton">
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
+        <Setter Property="FontFamily" Value="{DynamicResource IconFont}"/>
+        <Setter Property="FontSize" Value="16"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="RadioButton">
+                    <Border x:Name="Bd" Width="36" Height="36" Margin="0,0,4,4" CornerRadius="4" BorderThickness="1"
+                            BorderBrush="Transparent" Background="Transparent">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource SubtleHoverBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource AccentSubtleBrush}"/>
+                            <Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource AccentBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
+