diff --git a/WeeXnes/Core/Globals.cs b/WeeXnes/Core/Globals.cs
index bedbdcc..d623a2f 100644
--- a/WeeXnes/Core/Globals.cs
+++ b/WeeXnes/Core/Globals.cs
@@ -16,7 +16,7 @@ namespace WeeXnes.Core
         public static string encryptionKey = "8zf5#RdyQ]$4x4_";
         public static string AppDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "WeeXnes");
         public static string SettingsFileName = "settings.ini";
-        public static string version = "3.6.8";
+        public static string version = "3.6.9";
         public static bool   info_isRpcRunning = false;
         public static bool   info_RpcAutoStart;
         public static string apiUrl = "https://api.github.com/repos/weexnes/weexnessuite/releases/latest";
diff --git a/WeeXnes/MVVM/View/DiscordRpcView.xaml b/WeeXnes/MVVM/View/DiscordRpcView.xaml
index 60b4822..b05ba3f 100644
--- a/WeeXnes/MVVM/View/DiscordRpcView.xaml
+++ b/WeeXnes/MVVM/View/DiscordRpcView.xaml
@@ -151,7 +151,8 @@
                         Margin="20,0,0,5"
                         Foreground="DarkGray"
                         Background="#212329"
-                        Content="Save">
+                        Content="Save"
+                        Cursor="Hand">
                     <Button.Triggers>
       
                         <!-- Animate the button's Width property. -->
@@ -192,7 +193,7 @@
 
 
                 <StackPanel Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Center">
-                    <Button Height="30" Cursor="Hand"
+                    <Button Height="30" 
                             Width="65"
                             Style="{StaticResource UniversalMaterialButton}"
                             Name="DiscordRpcStart"
@@ -202,7 +203,8 @@
                             Margin="0,0,5,5"
                             Foreground="DarkGray"
                             Background="#212329"
-                            Content="Start">
+                            Content="Start"
+                            Cursor="Hand">
                         <Button.Triggers>
       
                             <!-- Animate the button's Width property. -->
@@ -247,7 +249,8 @@
                             Margin="5,0,5,5"
                             Foreground="DarkGray"
                             Background="#212329"
-                            Content="Stop">
+                            Content="Stop"
+                            Cursor="Hand">
                         <Button.Triggers>
       
                             <!-- Animate the button's Width property. -->
@@ -292,7 +295,8 @@
                             Margin="5,0,0,5"
                             Foreground="DarkGray"
                             Background="#212329"
-                            Content="New">
+                            Content="New"
+                            Cursor="Hand">
                         <Button.Triggers>
       
                             <!-- Animate the button's Width property. -->
diff --git a/WeeXnes/MVVM/View/KeyManagerView.xaml b/WeeXnes/MVVM/View/KeyManagerView.xaml
index 0a9bde3..8beeeec 100644
--- a/WeeXnes/MVVM/View/KeyManagerView.xaml
+++ b/WeeXnes/MVVM/View/KeyManagerView.xaml
@@ -85,7 +85,41 @@
                     Foreground="DarkGray"
                     Background="#1c1e23"
                     Style="{StaticResource UniversalMaterialButton}"
-            />
+                        Cursor="Hand">
+                    <Button.Triggers>
+      
+                        <!-- Animate the button's Width property. -->
+                        <EventTrigger RoutedEvent="Button.MouseEnter">
+                            <BeginStoryboard>
+                                <Storyboard>
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)"
+                                        To="DarkGray" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Foreground).(SolidColorBrush.Color)"
+                                        To="#212329" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                </Storyboard>
+                            </BeginStoryboard> 
+                        </EventTrigger>
+                        <EventTrigger RoutedEvent="Button.MouseLeave">
+                            <BeginStoryboard>
+                                <Storyboard>
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)"
+                                        To="#212329" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Foreground).(SolidColorBrush.Color)"
+                                        To="DarkGray" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                </Storyboard>
+                            </BeginStoryboard> 
+                        </EventTrigger>
+                                                        
+                    </Button.Triggers>
+                </Button>
 
         </StackPanel>
     </Grid>
diff --git a/WeeXnes/MVVM/View/SettingView.xaml b/WeeXnes/MVVM/View/SettingView.xaml
index fbecb0a..e0883e0 100644
--- a/WeeXnes/MVVM/View/SettingView.xaml
+++ b/WeeXnes/MVVM/View/SettingView.xaml
@@ -69,7 +69,42 @@
                             Foreground="DarkGray"
                             Height="25"
                             Click="CheckForUpdateBtn_OnClick"
-                            Margin="4,10,4,0"/>
+                            Margin="4,10,4,0"
+                        Cursor="Hand">
+                    <Button.Triggers>
+      
+                        <!-- Animate the button's Width property. -->
+                        <EventTrigger RoutedEvent="Button.MouseEnter">
+                            <BeginStoryboard>
+                                <Storyboard>
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)"
+                                        To="DarkGray" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Foreground).(SolidColorBrush.Color)"
+                                        To="#212329" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                </Storyboard>
+                            </BeginStoryboard> 
+                        </EventTrigger>
+                        <EventTrigger RoutedEvent="Button.MouseLeave">
+                            <BeginStoryboard>
+                                <Storyboard>
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)"
+                                        To="#2f313b" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Foreground).(SolidColorBrush.Color)"
+                                        To="DarkGray" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                </Storyboard>
+                            </BeginStoryboard> 
+                        </EventTrigger>
+                                                        
+                    </Button.Triggers>
+                </Button>
                     
                     <Button Name="createShortcut"
                             Style="{StaticResource UniversalMaterialButton}"
@@ -78,7 +113,42 @@
                             Foreground="DarkGray"
                             Height="25"
                             Click="CreateShortcut_OnClick"
-                            Margin="4,10,4,0"/>
+                            Margin="4,10,4,0"
+                        Cursor="Hand">
+                    <Button.Triggers>
+      
+                        <!-- Animate the button's Width property. -->
+                        <EventTrigger RoutedEvent="Button.MouseEnter">
+                            <BeginStoryboard>
+                                <Storyboard>
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)"
+                                        To="DarkGray" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Foreground).(SolidColorBrush.Color)"
+                                        To="#212329" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                </Storyboard>
+                            </BeginStoryboard> 
+                        </EventTrigger>
+                        <EventTrigger RoutedEvent="Button.MouseLeave">
+                            <BeginStoryboard>
+                                <Storyboard>
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)"
+                                        To="#2f313b" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Foreground).(SolidColorBrush.Color)"
+                                        To="DarkGray" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                </Storyboard>
+                            </BeginStoryboard> 
+                        </EventTrigger>
+                                                        
+                    </Button.Triggers>
+                </Button>
                     
                     <Button Name="OpenAppdataFolder" Grid.Row="1"
                             Style="{StaticResource UniversalMaterialButton}"
@@ -87,7 +157,42 @@
                             Foreground="DarkGray"
                             Height="25"
                             Margin="4,10,4,0"
-                            Click="OpenAppdataFolder_Click"/>
+                            Click="OpenAppdataFolder_Click"
+                        Cursor="Hand">
+                    <Button.Triggers>
+      
+                        <!-- Animate the button's Width property. -->
+                        <EventTrigger RoutedEvent="Button.MouseEnter">
+                            <BeginStoryboard>
+                                <Storyboard>
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)"
+                                        To="DarkGray" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Foreground).(SolidColorBrush.Color)"
+                                        To="#212329" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                </Storyboard>
+                            </BeginStoryboard> 
+                        </EventTrigger>
+                        <EventTrigger RoutedEvent="Button.MouseLeave">
+                            <BeginStoryboard>
+                                <Storyboard>
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)"
+                                        To="#2f313b" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Foreground).(SolidColorBrush.Color)"
+                                        To="DarkGray" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                </Storyboard>
+                            </BeginStoryboard> 
+                        </EventTrigger>
+                                                        
+                    </Button.Triggers>
+                </Button>
 
                     
                 </StackPanel>
@@ -145,7 +250,42 @@
                         Foreground="DarkGray"
                             Height="25"
                         Click="SaveDefaultID_Click"
-                            Margin="4,10,4,0"/>
+                            Margin="4,10,4,0"
+                        Cursor="Hand">
+                    <Button.Triggers>
+      
+                        <!-- Animate the button's Width property. -->
+                        <EventTrigger RoutedEvent="Button.MouseEnter">
+                            <BeginStoryboard>
+                                <Storyboard>
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)"
+                                        To="DarkGray" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Foreground).(SolidColorBrush.Color)"
+                                        To="#212329" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                </Storyboard>
+                            </BeginStoryboard> 
+                        </EventTrigger>
+                        <EventTrigger RoutedEvent="Button.MouseLeave">
+                            <BeginStoryboard>
+                                <Storyboard>
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)"
+                                        To="#2f313b" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Foreground).(SolidColorBrush.Color)"
+                                        To="DarkGray" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                </Storyboard>
+                            </BeginStoryboard> 
+                        </EventTrigger>
+                                                        
+                    </Button.Triggers>
+                </Button>
                     <CheckBox VerticalAlignment="Top"
                   VerticalContentAlignment="Center"
                       HorizontalContentAlignment="Center"
@@ -173,7 +313,42 @@
                             Foreground="DarkGray"
                             Height="25"
                             Click="SetRpcLocation_OnClick"
-                            Margin="4,10,4,0"/>
+                            Margin="4,10,4,0"
+                        Cursor="Hand">
+                    <Button.Triggers>
+      
+                        <!-- Animate the button's Width property. -->
+                        <EventTrigger RoutedEvent="Button.MouseEnter">
+                            <BeginStoryboard>
+                                <Storyboard>
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)"
+                                        To="DarkGray" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Foreground).(SolidColorBrush.Color)"
+                                        To="#212329" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                </Storyboard>
+                            </BeginStoryboard> 
+                        </EventTrigger>
+                        <EventTrigger RoutedEvent="Button.MouseLeave">
+                            <BeginStoryboard>
+                                <Storyboard>
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)"
+                                        To="#2f313b" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Foreground).(SolidColorBrush.Color)"
+                                        To="DarkGray" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                </Storyboard>
+                            </BeginStoryboard> 
+                        </EventTrigger>
+                                                        
+                    </Button.Triggers>
+                </Button>
                     <Button Name="SetRpcLocationDefault"
                             Style="{StaticResource UniversalMaterialButton}"
                             Content="Set Default Path"
@@ -181,7 +356,42 @@
                             Foreground="DarkGray"
                             Height="25"
                             Click="SetRpcLocationDefault_OnClick"
-                            Margin="4,10,4,0"/>
+                            Margin="4,10,4,0"
+                        Cursor="Hand">
+                    <Button.Triggers>
+      
+                        <!-- Animate the button's Width property. -->
+                        <EventTrigger RoutedEvent="Button.MouseEnter">
+                            <BeginStoryboard>
+                                <Storyboard>
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)"
+                                        To="DarkGray" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Foreground).(SolidColorBrush.Color)"
+                                        To="#212329" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                </Storyboard>
+                            </BeginStoryboard> 
+                        </EventTrigger>
+                        <EventTrigger RoutedEvent="Button.MouseLeave">
+                            <BeginStoryboard>
+                                <Storyboard>
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)"
+                                        To="#2f313b" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Foreground).(SolidColorBrush.Color)"
+                                        To="DarkGray" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                </Storyboard>
+                            </BeginStoryboard> 
+                        </EventTrigger>
+                                                        
+                    </Button.Triggers>
+                </Button>
                 </StackPanel>
 
                 
@@ -242,7 +452,42 @@
                             Foreground="DarkGray"
                             Height="25"
                             Click="SetKeyLocation_OnClick"
-                            Margin="4,10,4,0"/>
+                            Margin="4,10,4,0"
+                        Cursor="Hand">
+                    <Button.Triggers>
+      
+                        <!-- Animate the button's Width property. -->
+                        <EventTrigger RoutedEvent="Button.MouseEnter">
+                            <BeginStoryboard>
+                                <Storyboard>
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)"
+                                        To="DarkGray" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Foreground).(SolidColorBrush.Color)"
+                                        To="#212329" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                </Storyboard>
+                            </BeginStoryboard> 
+                        </EventTrigger>
+                        <EventTrigger RoutedEvent="Button.MouseLeave">
+                            <BeginStoryboard>
+                                <Storyboard>
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)"
+                                        To="#2f313b" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Foreground).(SolidColorBrush.Color)"
+                                        To="DarkGray" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                </Storyboard>
+                            </BeginStoryboard> 
+                        </EventTrigger>
+                                                        
+                    </Button.Triggers>
+                </Button>
                     <Button Name="SetKeyLocationDefault"
                             Style="{StaticResource UniversalMaterialButton}"
                             Content="Set Default Path"
@@ -250,7 +495,42 @@
                             Foreground="DarkGray"
                             Height="25"
                             Click="SetKeyLocationDefault_OnClick"
-                            Margin="4,10,4,0"/>
+                            Margin="4,10,4,0"
+                        Cursor="Hand">
+                    <Button.Triggers>
+      
+                        <!-- Animate the button's Width property. -->
+                        <EventTrigger RoutedEvent="Button.MouseEnter">
+                            <BeginStoryboard>
+                                <Storyboard>
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)"
+                                        To="DarkGray" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Foreground).(SolidColorBrush.Color)"
+                                        To="#212329" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                </Storyboard>
+                            </BeginStoryboard> 
+                        </EventTrigger>
+                        <EventTrigger RoutedEvent="Button.MouseLeave">
+                            <BeginStoryboard>
+                                <Storyboard>
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)"
+                                        To="#2f313b" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                    <ColorAnimation
+                                        Storyboard.TargetProperty="(Button.Foreground).(SolidColorBrush.Color)"
+                                        To="DarkGray" Duration="0:0:00.1" AutoReverse="False" 
+                                    />
+                                </Storyboard>
+                            </BeginStoryboard> 
+                        </EventTrigger>
+                                                        
+                    </Button.Triggers>
+                </Button>
                 </StackPanel>
 
                 
diff --git a/WeeXnes/MVVM/View/SettingView.xaml.cs b/WeeXnes/MVVM/View/SettingView.xaml.cs
index 73b068b..3722287 100644
--- a/WeeXnes/MVVM/View/SettingView.xaml.cs
+++ b/WeeXnes/MVVM/View/SettingView.xaml.cs
@@ -306,7 +306,7 @@ namespace WeeXnes.MVVM.View
             }
             catch (Exception ex)
             {
-                Misc.Message error = new Misc.Message(ex.ToString());
+                Misc.CriticalMessage error = new Misc.CriticalMessage(ex.ToString());
                 error.Show();
             }
             
diff --git a/WeeXnes/WeeXnes.csproj b/WeeXnes/WeeXnes.csproj
index 9102a7c..2f57a2e 100644
--- a/WeeXnes/WeeXnes.csproj
+++ b/WeeXnes/WeeXnes.csproj
@@ -4,7 +4,7 @@
     <PropertyGroup>
         <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
         <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-        <Version>3.6.8</Version>
+        <Version>3.6.9</Version>
         <ProjectGuid>{4B33CEE7-C74D-43B9-B99A-8B273D5195BC}</ProjectGuid>
         <OutputType>WinExe</OutputType>
         <RootNamespace>WeeXnes</RootNamespace>