diff --git a/ADSKDashboard.ps1 b/ADSKDashboard.ps1
index 34e318f..d83fe4d 100644
--- a/ADSKDashboard.ps1
+++ b/ADSKDashboard.ps1
@@ -4,17 +4,11 @@ $ADSKDashboard = Get-Process ADSKDashboard* -ErrorAction SilentlyContinue
 Write-Host $ADSKDashboard.Id
 if ($ADSKDashboard.Length -gt 1) {
     Write-Host "Already Running!"
-
     $ButtonType = [System.Windows.Forms.MessageBoxButtons]::OK
-
     $MessageIcon = [System.Windows.Forms.MessageBoxIcon]::Information
-
     $MessageBody = "Already Running!"
-
     $MessageTitle = "Error"
-
     $Result = [System.Windows.Forms.MessageBox]::Show($MessageBody, $MessageTitle, $ButtonType, $MessageIcon)
-
     exit
 }
 
@@ -53,7 +47,7 @@ function New-Config {
     #Setup default preferences	
     #Creates hash table and .clixml config file
     $Config = @{
-        'ActiveYear'    = "2022"
+        'ActiveYear'    = "2023"
         'Always'        = $false
         'ThemeProperty' = "LightTheme"
         'AutoClose'     = $true
@@ -130,53 +124,59 @@ function Update-Config {
 #===========================================================================
 
 #AutoCAD German
-$RKeyACADDE2017 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{28B89EEF-0001-0407-1102-CF3F3A09B77D}"
+# $RKeyACADDE2017 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{28B89EEF-0001-0407-1102-CF3F3A09B77D}"
 $RKeyACADDE2018 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{28B89EEF-1001-0407-1102-CF3F3A09B77D}"
 $RKeyACADDE2019 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{28B89EEF-2001-0407-1102-CF3F3A09B77D}"
 $RKeyACADDE2020 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{28B89EEF-3001-0407-1102-CF3F3A09B77D}"
 $RKeyACADDE2021 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{28B89EEF-4101-0407-1102-CF3F3A09B77D}"
 $RKeyACADDE2022 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{28B89EEF-5101-0407-1102-CF3F3A09B77D}"
+$RKeyACADDE2023 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{28B89EEF-6101-0407-2102-CF3F3A09B77D}"
 
 #AutoCAD English
-$RKeyACADENU2017 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{28B89EEF-0001-0409-1102-CF3F3A09B77D}"
+# $RKeyACADENU2017 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{28B89EEF-0001-0409-1102-CF3F3A09B77D}"
 $RKeyACADENU2018 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{28B89EEF-1001-0409-1102-CF3F3A09B77D}"
 $RKeyACADENU2019 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{28B89EEF-2001-0409-1102-CF3F3A09B77D}" 
 $RKeyACADENU2020 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{28B89EEF-3001-0409-1102-CF3F3A09B77D}"
 $RKeyACADENU2021 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{28B89EEF-4101-0409-1102-CF3F3A09B77D}"
 $RKeyACADENU2022 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{28B89EEF-5101-0409-1102-CF3F3A09B77D}"
+$RKeyACADENU2023 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{28B89EEF-6101-0409-2102-CF3F3A09B77D}"
 
 #AutoCAD Mechanical German
-$RKeyACADMDE2017 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{28B89EEF-0005-0407-1102-CF3F3A09B77D}"
+# $RKeyACADMDE2017 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{28B89EEF-0005-0407-1102-CF3F3A09B77D}"
 $RKeyACADMDE2018 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{28B89EEF-1005-0407-1102-CF3F3A09B77D}"
 $RKeyACADMDE2019 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{28B89EEF-2005-0407-1102-CF3F3A09B77D}" 
 $RKeyACADMDE2020 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{28B89EEF-3005-0407-1102-CF3F3A09B77D}"
 $RKeyACADMDE2021 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{28B89EEF-4105-0407-1102-CF3F3A09B77D}"
 $RKeyACADMDE2022 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{28B89EEF-5105-0407-2102-CF3F3A09B77D}"
+$RKeyACADMDE2023 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{28B89EEF-6105-0407-2102-CF3F3A09B77D}"
 
 #AutoCAD Mechanical English 
-$RKeyACADMENU2017 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{28B89EEF-0005-0409-1102-CF3F3A09B77D}"
+# $RKeyACADMENU2017 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{28B89EEF-0005-0409-1102-CF3F3A09B77D}"
 $RKeyACADMENU2018 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{28B89EEF-1005-0409-1102-CF3F3A09B77D}"
 $RKeyACADMENU2019 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{28B89EEF-2005-0409-1102-CF3F3A09B77D}"
 $RKeyACADMENU2020 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{28B89EEF-3005-0409-1102-CF3F3A09B77D}"
 $RKeyACADMENU2021 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{28B89EEF-4105-0409-1102-CF3F3A09B77D}"
 $RKeyACADMENU2022 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{28B89EEF-5105-0409-2102-CF3F3A09B77D}"
+$RKeyACADMENU2023 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{28B89EEF-6105-0409-2102-CF3F3A09B77D}"
 
 #Inventor German
-$RKeyINVDE2017 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{7F4DD591-2164-0001-1031-7107D70F3DB4}"
+# $RKeyINVDE2017 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{7F4DD591-2164-0001-1031-7107D70F3DB4}"
 $RKeyINVDE2018 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{7F4DD591-2264-0001-1031-7107D70F3DB4}"
 $RKeyINVDE2019 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{7F4DD591-2364-0001-1031-7107D70F3DB4}"
 $RKeyINVDE2020 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{7F4DD591-2464-0001-1031-7107D70F3DB4}"
 $RKeyINVDE2021 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{7F4DD591-2564-0001-1031-7107D70F3DB4}"
 $RKeyINVDE2022 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{1752579C-F9B1-37F2-ACC4-CA7FC070AF54}"
+$RKeyINVDE2023 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{7F4DD591-2764-0001-1031-7107D70F3DB4}"
 
 #Inventor English
-$RKeyINVENU2017 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{7F4DD591-2164-0001-1033-7107D70F3DB4}"
+# $RKeyINVENU2017 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{7F4DD591-2164-0001-1033-7107D70F3DB4}"
 $RKeyINVENU2018 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{7F4DD591-2264-0001-1033-7107D70F3DB4}"
 $RKeyINVENU2019 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{7F4DD591-2364-0001-1033-7107D70F3DB4}"
 $RKeyINVENU2020 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{7F4DD591-2464-0001-1033-7107D70F3DB4}"
 $RKeyINVENU2021 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{7F4DD591-2564-0001-1033-7107D70F3DB4}"
 $RKeyINVENU2022 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{118C5CF4-9979-3199-80DA-9198A86DCCA5}"
 $RKeyINVENU2022_2 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{7F4DD591-2664-0001-1033-7107D70F3DB4}"
+$RKeyINVENU2023 = Test-Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\{7F4DD591-2764-0001-1033-7107D70F3DB4}"
 
 Function HideShow($Year) {
     #Set Active Year
@@ -336,12 +336,13 @@ function SetTheme($Themestr) {
 function InitializeAll {
     # Icon and Image Source
     $global:Form.Icon = $PathShell + "\res\ADSKDashboard_Icon.png"
+    $global:WPFY2023Tab_IMG.Source = $PathShell + "\res\YButton2023.png"
     $global:WPFY2022Tab_IMG.Source = $PathShell + "\res\YButton2022.png"
     $global:WPFY2021Tab_IMG.Source = $PathShell + "\res\YButton2021.png"
     $global:WPFY2020Tab_IMG.Source = $PathShell + "\res\YButton2020.png"
     $global:WPFY2019Tab_IMG.Source = $PathShell + "\res\YButton2019.png"
     $global:WPFY2018Tab_IMG.Source = $PathShell + "\res\YButton2018.png"
-    $global:WPFY2017Tab_IMG.Source = $PathShell + "\res\YButton2017.png"
+    # $global:WPFY2017Tab_IMG.Source = $PathShell + "\res\YButton2017.png"
 
     $global:WPFINVDE_IMG.Source = $PathShell + "\res\Inventor_DE.png"
     $global:WPFINVENU_IMG.Source = $PathShell + "\res\Inventor_ENU.png"
@@ -364,18 +365,20 @@ function InitializeAll {
     #Initialize / Import config
     Import-Config
 
-    if ($global:ActiveYear -eq "2022")
+    if ($global:ActiveYear -eq "2023")
+    { HideShow 2023 }
+    elseif ($global:ActiveYear -eq "2022")
     { HideShow 2022 }
-    if ($global:ActiveYear -eq "2021")
+    elseif ($global:ActiveYear -eq "2021")
     { HideShow 2021 }
-    if ($global:ActiveYear -eq "2020")
+    elseif ($global:ActiveYear -eq "2020")
     { HideShow 2020 }
     elseif ($global:ActiveYear -eq "2019")
     { HideShow 2019 }
     elseif ($global:ActiveYear -eq "2018")
     { HideShow 2018 }
-    elseif ($global:ActiveYear -eq "2017") 
-    { HideShow 2017 }
+    # elseif ($global:ActiveYear -eq "2017") 
+    # { HideShow 2017 }
 }
 
 #===========================================================================
@@ -457,16 +460,30 @@ InitializeAll
 #                            Button Click Events
 #===========================================================================
 #region Tabs
+$WPFY2023Tab.Add_click( {
+        Write-Host "2023"
+        HideShow 2023
+        $global:ActiveYear = "2023"
+        Update-Config
+        $WPFY2022Tab.IsChecked = $false
+        $WPFY2021Tab.IsChecked = $false
+        $WPFY2020Tab.IsChecked = $false
+        $WPFY2019Tab.IsChecked = $false
+        $WPFY2018Tab.IsChecked = $false
+        # $WPFY2017Tab.IsChecked = $false
+
+    })
 $WPFY2022Tab.Add_click( {
         Write-Host "2022"
         HideShow 2022
         $global:ActiveYear = "2022"
         Update-Config
+        $WPFY2023Tab.IsChecked = $false
         $WPFY2021Tab.IsChecked = $false
         $WPFY2020Tab.IsChecked = $false
         $WPFY2019Tab.IsChecked = $false
         $WPFY2018Tab.IsChecked = $false
-        $WPFY2017Tab.IsChecked = $false
+        # $WPFY2017Tab.IsChecked = $false
 
     })
 $WPFY2021Tab.Add_click( {
@@ -474,11 +491,12 @@ $WPFY2021Tab.Add_click( {
         HideShow 2021
         $global:ActiveYear = "2021"
         Update-Config
+        $WPFY2023Tab.IsChecked = $false
         $WPFY2022Tab.IsChecked = $false
         $WPFY2020Tab.IsChecked = $false
         $WPFY2019Tab.IsChecked = $false
         $WPFY2018Tab.IsChecked = $false
-        $WPFY2017Tab.IsChecked = $false
+        # $WPFY2017Tab.IsChecked = $false
 
     })
 
@@ -487,11 +505,12 @@ $WPFY2020Tab.Add_click( {
         HideShow 2020
         $global:ActiveYear = "2020"
         Update-Config
+        $WPFY2023Tab.IsChecked = $false
         $WPFY2022Tab.IsChecked = $false
         $WPFY2021Tab.IsChecked = $false
         $WPFY2019Tab.IsChecked = $false
         $WPFY2018Tab.IsChecked = $false
-        $WPFY2017Tab.IsChecked = $false
+        # $WPFY2017Tab.IsChecked = $false
     })
 
 $WPFY2019Tab.Add_click( {
@@ -499,11 +518,12 @@ $WPFY2019Tab.Add_click( {
         HideShow 2019
         $global:ActiveYear = "2019"
         Update-Config
+        $WPFY2023Tab.IsChecked = $false
         $WPFY2022Tab.IsChecked = $false
         $WPFY2021Tab.IsChecked = $false
         $WPFY2020Tab.IsChecked = $false
         $WPFY2018Tab.IsChecked = $false
-        $WPFY2017Tab.IsChecked = $false
+        # $WPFY2017Tab.IsChecked = $false
     })
 
 $WPFY2018Tab.Add_click( {
@@ -511,24 +531,26 @@ $WPFY2018Tab.Add_click( {
         HideShow 2018
         $global:ActiveYear = "2018"
         Update-Config
+        $WPFY2023Tab.IsChecked = $false
         $WPFY2022Tab.IsChecked = $false
         $WPFY2021Tab.IsChecked = $false
         $WPFY2020Tab.IsChecked = $false
         $WPFY2019Tab.IsChecked = $false
-        $WPFY2017Tab.IsChecked = $false
+        # $WPFY2017Tab.IsChecked = $false
     })
 
-$WPFY2017Tab.Add_click( {
-        Write-Host "2017"
-        HideShow 2017
-        $global:ActiveYear = "2017"
-        Update-Config
-        $WPFY2022Tab.IsChecked = $false
-        $WPFY2021Tab.IsChecked = $false
-        $WPFY2020Tab.IsChecked = $false
-        $WPFY2019Tab.IsChecked = $false
-        $WPFY2018Tab.IsChecked = $false
-    })
+# $WPFY2017Tab.Add_click( {
+#         Write-Host "2017"
+#         HideShow 2017
+#         $global:ActiveYear = "2017"
+#         Update-Config
+#         $WPFY2023Tab.IsChecked = $false
+#         $WPFY2022Tab.IsChecked = $false
+#         $WPFY2021Tab.IsChecked = $false
+#         $WPFY2020Tab.IsChecked = $false
+#         $WPFY2019Tab.IsChecked = $false
+#         # $WPFY2018Tab.IsChecked = $false
+#     })
 #endregion
 
 #region Software Buttons
diff --git a/builds/ADSKDashboard_095.exe b/builds/ADSKDashboard_095.exe
new file mode 100644
index 0000000..681df5a
Binary files /dev/null and b/builds/ADSKDashboard_095.exe differ
diff --git a/res/MainWindow.xaml b/res/MainWindow.xaml
index 9a35ad2..a93cc7f 100644
--- a/res/MainWindow.xaml
+++ b/res/MainWindow.xaml
@@ -1,35 +1,25 @@
-<Controls:MetroWindow xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
-    xmlns:Controls="http://metro.mahapps.com/winfx/xaml/controls" Title="ADSK Dashboard" TitleCaps="False" Height="190" Width="800"
-    ResizeMode ="NoResize" WindowStartupLocation="CenterScreen" IsCloseButtonEnabled="False" Topmost="False" RightWindowCommandsOverlayBehavior="Never" ShowCloseButton="False" GlowBrush="{DynamicResource AccentColorBrush}">
+<Controls:MetroWindow xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity" xmlns:Controls="http://metro.mahapps.com/winfx/xaml/controls" Title="ADSK Dashboard" TitleCaps="False" Height="190" Width="800" ResizeMode="NoResize" WindowStartupLocation="CenterScreen" IsCloseButtonEnabled="False" Topmost="False" RightWindowCommandsOverlayBehavior="Never" ShowCloseButton="False" GlowBrush="{DynamicResource AccentColorBrush}">
 
     <Controls:MetroWindow.Flyouts>
         <Controls:FlyoutsControl>
-            <Controls:Flyout 
-                x:Name = "InfoDialog"
-                Position = "Bottom"
-                AreAnimationsEnabled = "True" CloseButtonVisibility="Hidden" TitleVisibility="Hidden" IsModal="False" Width="400" Height="30" IsAutoCloseEnabled="True" AutoCloseInterval="3000">
-                <TextBlock x:Name="InfoText" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16" Text="Placeholder"/>
+            <Controls:Flyout x:Name="InfoDialog" Position="Bottom" AreAnimationsEnabled="True" CloseButtonVisibility="Hidden" TitleVisibility="Hidden" IsModal="False" Width="400" Height="30" IsAutoCloseEnabled="True" AutoCloseInterval="3000">
+                <TextBlock x:Name="InfoText" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16" Text="Placeholder" />
             </Controls:Flyout>
 
-            <Controls:Flyout
-                x:Name = "FlyOutContent"
-                Position = "Right"
-                AreAnimationsEnabled = "True" Header="Settings" IsModal="True" Width="360" FontSize="16">
+            <Controls:Flyout x:Name="FlyOutContent" Position="Right" AreAnimationsEnabled="True" Header="Settings" IsModal="True" Width="360" FontSize="16">
                 <StackPanel Orientation="Horizontal">
                     <StackPanel Orientation="Vertical">
                         <Label Tag="Choose Theme" FontSize="16" FontWeight="Bold">
                             <TextBlock TextDecorations="Underline" Margin="5,0,0,0">Choose Theme</TextBlock>
                         </Label>
-                        <Controls:ToggleSwitch x:Name="ThemeSwitch" OnLabel="DarkTheme" OffLabel="LightTheme" Width="160" Height="45" HorizontalAlignment="Left" Margin="10,0,0,0"/>
+                        <Controls:ToggleSwitch x:Name="ThemeSwitch" OnLabel="DarkTheme" OffLabel="LightTheme" Width="160" Height="45" HorizontalAlignment="Left" Margin="10,0,0,0" />
                     </StackPanel>
                     <StackPanel Orientation="Vertical">
                         <Label Tag="Other" FontSize="16" FontWeight="Bold">
                             <TextBlock TextDecorations="Underline" Margin="5,0,0,0">Other</TextBlock>
                         </Label>
-                        <Controls:ToggleSwitch x:Name="OnTop" OnLabel="Always on Top" OffLabel="Always on Top" Width="175" Height="45" HorizontalAlignment="Left" Margin="10,0,0,0"/>
-                        <Controls:ToggleSwitch x:Name="AutoClose" OnLabel="Auto Close On" OffLabel="Auto Close Off" Width="175" Height="45" HorizontalAlignment="Left" Margin="10,0,0,0"/>
+                        <Controls:ToggleSwitch x:Name="OnTop" OnLabel="Always on Top" OffLabel="Always on Top" Width="175" Height="45" HorizontalAlignment="Left" Margin="10,0,0,0" />
+                        <Controls:ToggleSwitch x:Name="AutoClose" OnLabel="Auto Close On" OffLabel="Auto Close Off" Width="175" Height="45" HorizontalAlignment="Left" Margin="10,0,0,0" />
                     </StackPanel>
                 </StackPanel>
             </Controls:Flyout>
@@ -43,8 +33,7 @@
             <Button x:Name="Close" ToolTip="Close to Systray">
                 <Image Width="12" Height="12">
                     <Image.Source>
-                        <DrawingImage xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                        <DrawingImage xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
                             <DrawingImage.Drawing>
                                 <GeometryDrawing Brush="Black" Geometry="M20 6.91L17.09 4L12 9.09L6.91 4L4 6.91L9.09 12L4 17.09L6.91 20L12 14.91L17.09 20L20 17.09L14.91 12L20 6.91Z" />
                             </DrawingImage.Drawing>
@@ -56,15 +45,14 @@
     </Controls:MetroWindow.RightWindowCommands>
 
 
-
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Colors.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Cobalt.xaml"/>
-                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseLight.xaml"/>
+                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Cobalt.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseLight.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/FlatButton.xaml" />
             </ResourceDictionary.MergedDictionaries>
 
@@ -75,7 +63,7 @@
                 <Setter Property="Width" Value="Auto" />
                 <Setter Property="BorderBrush" Value="Black" />
                 <Setter Property="BorderThickness" Value="1" />
-                <Setter Property="Margin" Value="1"/>
+                <Setter Property="Margin" Value="1" />
             </Style>
         </ResourceDictionary>
     </Window.Resources>
@@ -84,40 +72,46 @@
     <Grid Margin="0,0,0,0">
         <Grid.Resources>
             <Style x:Key="ToggleButtonStyleYear" TargetType="{x:Type ToggleButton}">
-                <Setter Property="HorizontalContentAlignment" Value="Right"/>
+                <Setter Property="HorizontalContentAlignment" Value="Right" />
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="{x:Type ToggleButton}">
                             <Border x:Name="border" Background="#FFFFFF" BorderBrush="#FF000000" BorderThickness="1,1,1,1" CornerRadius="2">
-                                <ContentPresenter x:Name="contentPresenter" HorizontalAlignment="Center" Width="120" Height="35"/>
+                                <ContentPresenter x:Name="contentPresenter" HorizontalAlignment="Center" Width="120" Height="35" />
                             </Border>
 
 
                             <ControlTemplate.Triggers>
                                 <Trigger Property="IsChecked" Value="true">
-                                    <Setter Property="Background" TargetName="border" Value="#41B1E1"/>
+                                    <Setter Property="Background" TargetName="border" Value="#41B1E1" />
                                 </Trigger>
                             </ControlTemplate.Triggers>
                         </ControlTemplate>
                     </Setter.Value>
                 </Setter>
-                <Setter Property="FontSize" Value="20"/>
-                <Setter Property="FontWeight" Value="Bold"/>
-                <Setter Property="Height" Value="35"/>
+                <Setter Property="FontSize" Value="20" />
+                <Setter Property="FontWeight" Value="Bold" />
+                <Setter Property="Height" Value="35" />
 
             </Style>
         </Grid.Resources>
         <StackPanel Orientation="Horizontal" VerticalAlignment="Top">
+            <!-- 2023 -->
+            <ToggleButton x:Name="Y2023Tab" Margin="5" Style="{StaticResource ToggleButtonStyleYear}">
+                <ToggleButton.Content>
+                    <Image x:Name="Y2023Tab_IMG" Source="res/YButton2023.png" Stretch="UniformToFill" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5" />
+                </ToggleButton.Content>
+            </ToggleButton>
             <!-- 2022 -->
             <ToggleButton x:Name="Y2022Tab" Margin="5" Style="{StaticResource ToggleButtonStyleYear}">
                 <ToggleButton.Content>
-                    <Image x:Name="Y2022Tab_IMG" Source="res/YButton2022.png" Stretch="UniformToFill" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5"/>
+                    <Image x:Name="Y2022Tab_IMG" Source="res/YButton2022.png" Stretch="UniformToFill" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5" />
                 </ToggleButton.Content>
             </ToggleButton>
             <!-- 2021 -->
             <ToggleButton x:Name="Y2021Tab" Margin="5" Style="{StaticResource ToggleButtonStyleYear}">
                 <ToggleButton.Content>
-                    <Image x:Name="Y2021Tab_IMG" Source="res/YButton2021.png" Stretch="UniformToFill" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5"/>
+                    <Image x:Name="Y2021Tab_IMG" Source="res/YButton2021.png" Stretch="UniformToFill" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5" />
                 </ToggleButton.Content>
             </ToggleButton>
             <!-- 2020 -->
@@ -139,11 +133,11 @@
                 </ToggleButton.Content>
             </ToggleButton>
             <!-- 2017 -->
-            <ToggleButton x:Name="Y2017Tab" Margin="5" Style="{StaticResource ToggleButtonStyleYear}">
+            <!-- <ToggleButton x:Name="Y2017Tab" Margin="5" Style="{StaticResource ToggleButtonStyleYear}">
                 <ToggleButton.Content>
                     <Image x:Name="Y2017Tab_IMG" Source="res/YButton2017.png" Stretch="UniformToFill" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5" />
                 </ToggleButton.Content>
-            </ToggleButton>
+            </ToggleButton> -->
         </StackPanel>
 
         <StackPanel Orientation="Horizontal" VerticalAlignment="Bottom" Margin="0,0,0,5">
@@ -160,7 +154,7 @@
                 <Label FontWeight="Bold" Margin="0,0,0,0" Grid.Column="0" Grid.Row="0" HorizontalAlignment="Left" FontSize="14">Inventor</Label>
                 <Button x:Name="INVDE_BT" Grid.Column="0" Grid.Row="1" Background="Transparent">
                     <Button.Content>
-                        <Image x:Name="INVDE_IMG" Source="res/Inventor_DE.png" Width="60" Height="60"/>
+                        <Image x:Name="INVDE_IMG" Source="res/Inventor_DE.png" Width="60" Height="60" />
                     </Button.Content>
                 </Button>
                 <Button x:Name="INVENU_BT" Grid.Column="1" Grid.Row="1" Background="Transparent">
diff --git a/res/YButton2017.png b/res/YButton2017.png
index c8edf0f..ec11c1f 100644
Binary files a/res/YButton2017.png and b/res/YButton2017.png differ
diff --git a/res/YButton2023.png b/res/YButton2023.png
new file mode 100644
index 0000000..ef87db8
Binary files /dev/null and b/res/YButton2023.png differ
diff --git a/res/YearButton.afdesign b/res/YearButton.afdesign
index 34bf939..b14fcc0 100644
Binary files a/res/YearButton.afdesign and b/res/YearButton.afdesign differ
diff --git a/res/settings/options.config b/res/settings/options.config
index 82db255..33a85c0 100644
Binary files a/res/settings/options.config and b/res/settings/options.config differ