add: mainWindow v2, application theme, winui in modules

LuxoriaSoft · Dec 10, 2024 · 6c0c6b3 · 6c0c6b3
1 parent 27a78c4
commit 6c0c6b3
Show file tree

Hide file tree

Showing 89 changed files with 1,938 additions and 249 deletions.
diff --git a/Luxoria.App/Luxoria.App.sln b/Luxoria.App/Luxoria.App.sln
@@ -5,17 +5,11 @@ VisualStudioVersion = 17.11.35312.102
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Luxoria.App", "Luxoria.App\Luxoria.App.csproj", "{4D7BBDAD-CF00-44A9-AFC5-2CAFFD8A79D5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Luxoria.Modules", "Luxoria.Modules\Luxoria.Modules.csproj", "{14A3107C-67CD-47A4-89E1-791BEEFF4E85}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Luxoria.Core", "Luxoria.Core\Luxoria.Core.csproj", "{B3FDA9BD-F5B2-4C29-A333-39AA26EAE8D4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Luxoria.Core", "Luxoria.Core\Luxoria.Core.csproj", "{BB99251A-8DE6-47DA-9C1D-E13FAAC142FE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Luxoria.Modules", "Luxoria.Modules\Luxoria.Modules.csproj", "{24BCA716-0F5C-4C0E-837D-3D94108E18E0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Luxoria.SDK", "Luxoria.SDK\Luxoria.SDK.csproj", "{4150AFC8-62CC-4E3D-BD56-84BEEBFB3CD3}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Luxoria.SDK.Tests", "Luxoria.SDK.Tests\Luxoria.SDK.Tests.csproj", "{69348C36-EA1C-4CD1-9321-13B1FA6B3AAC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Luxoria.Modules.Tests", "Luxoria.Modules.Tests\Luxoria.Modules.Tests.csproj", "{3EECD352-F433-4684-94F8-347453DF431D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Luxoria.Core.Tests", "Luxoria.Core.Tests\Luxoria.Core.Tests.csproj", "{417447CF-93F5-41B1-B0E1-D8C443B67580}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Luxoria.SDK", "Luxoria.SDK\Luxoria.SDK.csproj", "{CA9F3FAE-E700-4097-ABF6-204CB72886EB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -53,102 +47,54 @@ Global
 		{4D7BBDAD-CF00-44A9-AFC5-2CAFFD8A79D5}.Release|x86.ActiveCfg = Release|x86
 		{4D7BBDAD-CF00-44A9-AFC5-2CAFFD8A79D5}.Release|x86.Build.0 = Release|x86
 		{4D7BBDAD-CF00-44A9-AFC5-2CAFFD8A79D5}.Release|x86.Deploy.0 = Release|x86
-		{14A3107C-67CD-47A4-89E1-791BEEFF4E85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{14A3107C-67CD-47A4-89E1-791BEEFF4E85}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{14A3107C-67CD-47A4-89E1-791BEEFF4E85}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{14A3107C-67CD-47A4-89E1-791BEEFF4E85}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{14A3107C-67CD-47A4-89E1-791BEEFF4E85}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{14A3107C-67CD-47A4-89E1-791BEEFF4E85}.Debug|x64.Build.0 = Debug|Any CPU
-		{14A3107C-67CD-47A4-89E1-791BEEFF4E85}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{14A3107C-67CD-47A4-89E1-791BEEFF4E85}.Debug|x86.Build.0 = Debug|Any CPU
-		{14A3107C-67CD-47A4-89E1-791BEEFF4E85}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{14A3107C-67CD-47A4-89E1-791BEEFF4E85}.Release|Any CPU.Build.0 = Release|Any CPU
-		{14A3107C-67CD-47A4-89E1-791BEEFF4E85}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{14A3107C-67CD-47A4-89E1-791BEEFF4E85}.Release|ARM64.Build.0 = Release|Any CPU
-		{14A3107C-67CD-47A4-89E1-791BEEFF4E85}.Release|x64.ActiveCfg = Release|Any CPU
-		{14A3107C-67CD-47A4-89E1-791BEEFF4E85}.Release|x64.Build.0 = Release|Any CPU
-		{14A3107C-67CD-47A4-89E1-791BEEFF4E85}.Release|x86.ActiveCfg = Release|Any CPU
-		{14A3107C-67CD-47A4-89E1-791BEEFF4E85}.Release|x86.Build.0 = Release|Any CPU
-		{BB99251A-8DE6-47DA-9C1D-E13FAAC142FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BB99251A-8DE6-47DA-9C1D-E13FAAC142FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BB99251A-8DE6-47DA-9C1D-E13FAAC142FE}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{BB99251A-8DE6-47DA-9C1D-E13FAAC142FE}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{BB99251A-8DE6-47DA-9C1D-E13FAAC142FE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BB99251A-8DE6-47DA-9C1D-E13FAAC142FE}.Debug|x64.Build.0 = Debug|Any CPU
-		{BB99251A-8DE6-47DA-9C1D-E13FAAC142FE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BB99251A-8DE6-47DA-9C1D-E13FAAC142FE}.Debug|x86.Build.0 = Debug|Any CPU
-		{BB99251A-8DE6-47DA-9C1D-E13FAAC142FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BB99251A-8DE6-47DA-9C1D-E13FAAC142FE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BB99251A-8DE6-47DA-9C1D-E13FAAC142FE}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{BB99251A-8DE6-47DA-9C1D-E13FAAC142FE}.Release|ARM64.Build.0 = Release|Any CPU
-		{BB99251A-8DE6-47DA-9C1D-E13FAAC142FE}.Release|x64.ActiveCfg = Release|Any CPU
-		{BB99251A-8DE6-47DA-9C1D-E13FAAC142FE}.Release|x64.Build.0 = Release|Any CPU
-		{BB99251A-8DE6-47DA-9C1D-E13FAAC142FE}.Release|x86.ActiveCfg = Release|Any CPU
-		{BB99251A-8DE6-47DA-9C1D-E13FAAC142FE}.Release|x86.Build.0 = Release|Any CPU
-		{4150AFC8-62CC-4E3D-BD56-84BEEBFB3CD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4150AFC8-62CC-4E3D-BD56-84BEEBFB3CD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4150AFC8-62CC-4E3D-BD56-84BEEBFB3CD3}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{4150AFC8-62CC-4E3D-BD56-84BEEBFB3CD3}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{4150AFC8-62CC-4E3D-BD56-84BEEBFB3CD3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4150AFC8-62CC-4E3D-BD56-84BEEBFB3CD3}.Debug|x64.Build.0 = Debug|Any CPU
-		{4150AFC8-62CC-4E3D-BD56-84BEEBFB3CD3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4150AFC8-62CC-4E3D-BD56-84BEEBFB3CD3}.Debug|x86.Build.0 = Debug|Any CPU
-		{4150AFC8-62CC-4E3D-BD56-84BEEBFB3CD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4150AFC8-62CC-4E3D-BD56-84BEEBFB3CD3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4150AFC8-62CC-4E3D-BD56-84BEEBFB3CD3}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{4150AFC8-62CC-4E3D-BD56-84BEEBFB3CD3}.Release|ARM64.Build.0 = Release|Any CPU
-		{4150AFC8-62CC-4E3D-BD56-84BEEBFB3CD3}.Release|x64.ActiveCfg = Release|Any CPU
-		{4150AFC8-62CC-4E3D-BD56-84BEEBFB3CD3}.Release|x64.Build.0 = Release|Any CPU
-		{4150AFC8-62CC-4E3D-BD56-84BEEBFB3CD3}.Release|x86.ActiveCfg = Release|Any CPU
-		{4150AFC8-62CC-4E3D-BD56-84BEEBFB3CD3}.Release|x86.Build.0 = Release|Any CPU
-		{69348C36-EA1C-4CD1-9321-13B1FA6B3AAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{69348C36-EA1C-4CD1-9321-13B1FA6B3AAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{69348C36-EA1C-4CD1-9321-13B1FA6B3AAC}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{69348C36-EA1C-4CD1-9321-13B1FA6B3AAC}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{69348C36-EA1C-4CD1-9321-13B1FA6B3AAC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{69348C36-EA1C-4CD1-9321-13B1FA6B3AAC}.Debug|x64.Build.0 = Debug|Any CPU
-		{69348C36-EA1C-4CD1-9321-13B1FA6B3AAC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{69348C36-EA1C-4CD1-9321-13B1FA6B3AAC}.Debug|x86.Build.0 = Debug|Any CPU
-		{69348C36-EA1C-4CD1-9321-13B1FA6B3AAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{69348C36-EA1C-4CD1-9321-13B1FA6B3AAC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{69348C36-EA1C-4CD1-9321-13B1FA6B3AAC}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{69348C36-EA1C-4CD1-9321-13B1FA6B3AAC}.Release|ARM64.Build.0 = Release|Any CPU
-		{69348C36-EA1C-4CD1-9321-13B1FA6B3AAC}.Release|x64.ActiveCfg = Release|Any CPU
-		{69348C36-EA1C-4CD1-9321-13B1FA6B3AAC}.Release|x64.Build.0 = Release|Any CPU
-		{69348C36-EA1C-4CD1-9321-13B1FA6B3AAC}.Release|x86.ActiveCfg = Release|Any CPU
-		{69348C36-EA1C-4CD1-9321-13B1FA6B3AAC}.Release|x86.Build.0 = Release|Any CPU
-		{3EECD352-F433-4684-94F8-347453DF431D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3EECD352-F433-4684-94F8-347453DF431D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3EECD352-F433-4684-94F8-347453DF431D}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{3EECD352-F433-4684-94F8-347453DF431D}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{3EECD352-F433-4684-94F8-347453DF431D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3EECD352-F433-4684-94F8-347453DF431D}.Debug|x64.Build.0 = Debug|Any CPU
-		{3EECD352-F433-4684-94F8-347453DF431D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3EECD352-F433-4684-94F8-347453DF431D}.Debug|x86.Build.0 = Debug|Any CPU
-		{3EECD352-F433-4684-94F8-347453DF431D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3EECD352-F433-4684-94F8-347453DF431D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3EECD352-F433-4684-94F8-347453DF431D}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{3EECD352-F433-4684-94F8-347453DF431D}.Release|ARM64.Build.0 = Release|Any CPU
-		{3EECD352-F433-4684-94F8-347453DF431D}.Release|x64.ActiveCfg = Release|Any CPU
-		{3EECD352-F433-4684-94F8-347453DF431D}.Release|x64.Build.0 = Release|Any CPU
-		{3EECD352-F433-4684-94F8-347453DF431D}.Release|x86.ActiveCfg = Release|Any CPU
-		{3EECD352-F433-4684-94F8-347453DF431D}.Release|x86.Build.0 = Release|Any CPU
-		{417447CF-93F5-41B1-B0E1-D8C443B67580}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{417447CF-93F5-41B1-B0E1-D8C443B67580}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{417447CF-93F5-41B1-B0E1-D8C443B67580}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{417447CF-93F5-41B1-B0E1-D8C443B67580}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{417447CF-93F5-41B1-B0E1-D8C443B67580}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{417447CF-93F5-41B1-B0E1-D8C443B67580}.Debug|x64.Build.0 = Debug|Any CPU
-		{417447CF-93F5-41B1-B0E1-D8C443B67580}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{417447CF-93F5-41B1-B0E1-D8C443B67580}.Debug|x86.Build.0 = Debug|Any CPU
-		{417447CF-93F5-41B1-B0E1-D8C443B67580}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{417447CF-93F5-41B1-B0E1-D8C443B67580}.Release|Any CPU.Build.0 = Release|Any CPU
-		{417447CF-93F5-41B1-B0E1-D8C443B67580}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{417447CF-93F5-41B1-B0E1-D8C443B67580}.Release|ARM64.Build.0 = Release|Any CPU
-		{417447CF-93F5-41B1-B0E1-D8C443B67580}.Release|x64.ActiveCfg = Release|Any CPU
-		{417447CF-93F5-41B1-B0E1-D8C443B67580}.Release|x64.Build.0 = Release|Any CPU
-		{417447CF-93F5-41B1-B0E1-D8C443B67580}.Release|x86.ActiveCfg = Release|Any CPU
-		{417447CF-93F5-41B1-B0E1-D8C443B67580}.Release|x86.Build.0 = Release|Any CPU
+		{B3FDA9BD-F5B2-4C29-A333-39AA26EAE8D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B3FDA9BD-F5B2-4C29-A333-39AA26EAE8D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B3FDA9BD-F5B2-4C29-A333-39AA26EAE8D4}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{B3FDA9BD-F5B2-4C29-A333-39AA26EAE8D4}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{B3FDA9BD-F5B2-4C29-A333-39AA26EAE8D4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B3FDA9BD-F5B2-4C29-A333-39AA26EAE8D4}.Debug|x64.Build.0 = Debug|Any CPU
+		{B3FDA9BD-F5B2-4C29-A333-39AA26EAE8D4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B3FDA9BD-F5B2-4C29-A333-39AA26EAE8D4}.Debug|x86.Build.0 = Debug|Any CPU
+		{B3FDA9BD-F5B2-4C29-A333-39AA26EAE8D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B3FDA9BD-F5B2-4C29-A333-39AA26EAE8D4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B3FDA9BD-F5B2-4C29-A333-39AA26EAE8D4}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{B3FDA9BD-F5B2-4C29-A333-39AA26EAE8D4}.Release|ARM64.Build.0 = Release|Any CPU
+		{B3FDA9BD-F5B2-4C29-A333-39AA26EAE8D4}.Release|x64.ActiveCfg = Release|Any CPU
+		{B3FDA9BD-F5B2-4C29-A333-39AA26EAE8D4}.Release|x64.Build.0 = Release|Any CPU
+		{B3FDA9BD-F5B2-4C29-A333-39AA26EAE8D4}.Release|x86.ActiveCfg = Release|Any CPU
+		{B3FDA9BD-F5B2-4C29-A333-39AA26EAE8D4}.Release|x86.Build.0 = Release|Any CPU
+		{24BCA716-0F5C-4C0E-837D-3D94108E18E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{24BCA716-0F5C-4C0E-837D-3D94108E18E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{24BCA716-0F5C-4C0E-837D-3D94108E18E0}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{24BCA716-0F5C-4C0E-837D-3D94108E18E0}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{24BCA716-0F5C-4C0E-837D-3D94108E18E0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{24BCA716-0F5C-4C0E-837D-3D94108E18E0}.Debug|x64.Build.0 = Debug|Any CPU
+		{24BCA716-0F5C-4C0E-837D-3D94108E18E0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{24BCA716-0F5C-4C0E-837D-3D94108E18E0}.Debug|x86.Build.0 = Debug|Any CPU
+		{24BCA716-0F5C-4C0E-837D-3D94108E18E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{24BCA716-0F5C-4C0E-837D-3D94108E18E0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{24BCA716-0F5C-4C0E-837D-3D94108E18E0}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{24BCA716-0F5C-4C0E-837D-3D94108E18E0}.Release|ARM64.Build.0 = Release|Any CPU
+		{24BCA716-0F5C-4C0E-837D-3D94108E18E0}.Release|x64.ActiveCfg = Release|Any CPU
+		{24BCA716-0F5C-4C0E-837D-3D94108E18E0}.Release|x64.Build.0 = Release|Any CPU
+		{24BCA716-0F5C-4C0E-837D-3D94108E18E0}.Release|x86.ActiveCfg = Release|Any CPU
+		{24BCA716-0F5C-4C0E-837D-3D94108E18E0}.Release|x86.Build.0 = Release|Any CPU
+		{CA9F3FAE-E700-4097-ABF6-204CB72886EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA9F3FAE-E700-4097-ABF6-204CB72886EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CA9F3FAE-E700-4097-ABF6-204CB72886EB}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{CA9F3FAE-E700-4097-ABF6-204CB72886EB}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{CA9F3FAE-E700-4097-ABF6-204CB72886EB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CA9F3FAE-E700-4097-ABF6-204CB72886EB}.Debug|x64.Build.0 = Debug|Any CPU
+		{CA9F3FAE-E700-4097-ABF6-204CB72886EB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CA9F3FAE-E700-4097-ABF6-204CB72886EB}.Debug|x86.Build.0 = Debug|Any CPU
+		{CA9F3FAE-E700-4097-ABF6-204CB72886EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CA9F3FAE-E700-4097-ABF6-204CB72886EB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CA9F3FAE-E700-4097-ABF6-204CB72886EB}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{CA9F3FAE-E700-4097-ABF6-204CB72886EB}.Release|ARM64.Build.0 = Release|Any CPU
+		{CA9F3FAE-E700-4097-ABF6-204CB72886EB}.Release|x64.ActiveCfg = Release|Any CPU
+		{CA9F3FAE-E700-4097-ABF6-204CB72886EB}.Release|x64.Build.0 = Release|Any CPU
+		{CA9F3FAE-E700-4097-ABF6-204CB72886EB}.Release|x86.ActiveCfg = Release|Any CPU
+		{CA9F3FAE-E700-4097-ABF6-204CB72886EB}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Luxoria.App/Luxoria.App/App.xaml b/Luxoria.App/Luxoria.App/App.xaml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <Application
     x:Class="Luxoria.App.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@@ -8,9 +7,33 @@
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
-                <!-- Other merged dictionaries here -->
             </ResourceDictionary.MergedDictionaries>
-            <!-- Other app resources here -->
+
+            <SolidColorBrush x:Key="SystemControlBackgroundBaseMediumBrush" Color="{ThemeResource SystemBaseLowColor}"/>
+            <SolidColorBrush x:Key="SystemControlBackgroundBaseLowBrush" Color="{ThemeResource SystemBaseLowColor}"/>
+            <SolidColorBrush x:Key="SystemControlHighlightAccentBrush" Color="{ThemeResource SystemAccentColor}"/>
+            <SolidColorBrush x:Key="SystemFillColorNeutralListLowBrush" Color="{ThemeResource SystemBaseLowColor}"/>
+
+            <Style TargetType="Button" x:Key="MenuButtonStyle">
+                <Setter Property="Background" Value="Transparent"/>
+                <Setter Property="Foreground" Value="{ThemeResource ApplicationForegroundThemeBrush}"/>
+                <Setter Property="FontSize" Value="14"/>
+                <Setter Property="Padding" Value="8,4"/>
+                <Setter Property="BorderThickness" Value="0"/>
+                <Setter Property="Margin" Value="0,0,10,0"/>
+            </Style>
+
+            <Style TargetType="ComboBoxItem">
+                <Setter Property="Foreground" Value="{ThemeResource ApplicationForegroundThemeBrush}"/>
+                <Setter Property="Background" Value="Transparent"/>
+                <Setter Property="FontSize" Value="14"/>
+                <Setter Property="Padding" Value="10,5"/>
+                <Setter Property="HorizontalContentAlignment" Value="Center"/>
+                <Setter Property="VerticalContentAlignment" Value="Center"/>
+                <Setter Property="Margin" Value="0,0,0,5"/>
+                <Setter Property="BorderThickness" Value="0"/>
+            </Style>
+
         </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/Luxoria.App/Luxoria.App/App.xaml.cs b/Luxoria.App/Luxoria.App/App.xaml.cs
@@ -22,7 +22,7 @@ namespace Luxoria.App
     public partial class App : Application
     {
         public Window Window => m_window;
-        private MainWindow m_window;
+        private NewMainWindow m_window;
 
         private readonly Startup _startup;
         private readonly IHost _host;
@@ -66,6 +66,10 @@ protected override async void OnLaunched(LaunchActivatedEventArgs args)
             await _logger.LogAsync("Modules loaded. Closing slasph screen...");
             await Task.Delay(500);
 
+            string modulesPath = GetOrCreateModulesDirectory();
+            _moduleService.LoadModules(modulesPath);
+            _moduleService.InitializeModules(new ModuleContext());
+
             // Load modules asynchronously and update the splash screen with the module names
             await LoadModulesAsync(splashScreen);
 
@@ -78,7 +82,7 @@ protected override async void OnLaunched(LaunchActivatedEventArgs args)
             var eventBus = _host.Services.GetRequiredService<IEventBus>();
             var loggerService = _host.Services.GetRequiredService<ILoggerService>();
 
-            m_window = new MainWindow(eventBus, loggerService);
+            m_window = new NewMainWindow();
             m_window.Activate();
         }