diff --git a/WeeXnes/App.xaml b/WeeXnes/App.xaml
index ba8bfd3..101d171 100644
--- a/WeeXnes/App.xaml
+++ b/WeeXnes/App.xaml
@@ -13,7 +13,6 @@
                 <ResourceDictionary Source="Theme/TextBoxTheme.xaml"/>
                 <ResourceDictionary Source="Theme/ControlButtonTheme.xaml"/>
                 <ResourceDictionary Source="Theme/ModernCheckbox.xaml"/>
-                <ResourceDictionary Source="Theme/DiscordRpcTheme.xaml"/>
             </ResourceDictionary.MergedDictionaries>
             
             <DataTemplate DataType="{x:Type viewModel:HomeViewModel}">
diff --git a/WeeXnes/MVVM/View/DiscordRpcView.xaml b/WeeXnes/MVVM/View/DiscordRpcView.xaml
index e3ae5eb..236b65b 100644
--- a/WeeXnes/MVVM/View/DiscordRpcView.xaml
+++ b/WeeXnes/MVVM/View/DiscordRpcView.xaml
@@ -36,95 +36,115 @@
 
 
                 <TextBox Grid.Column="1"
-                         Style="{StaticResource RpcFormName}"
+                         Style="{StaticResource MaterialTextBox}"
                          Height="33"
                          Width="220"
                          HorizontalAlignment="Left"
                          VerticalAlignment="Top"
                          Margin="20,20,0,0"
-                         Name="tb_FormName"/>
+                         Name="tb_FormName"
+                         Background="#353340"
+                         Tag="Name (for List)"/>
 
                 <TextBox Grid.Column="1"
-                         Style="{StaticResource RpcFormPName}"
+                         Style="{StaticResource MaterialTextBox}"
                          Height="33"
                          Width="220"
                          HorizontalAlignment="Left"
                          VerticalAlignment="Top"
                          Margin="20,60,0,0"
-                         Name="tb_FormPName"/>
+                         Name="tb_FormPName"
+                         Background="#353340"
+                         Tag="Process Name"/>
                 <Label Content=".exe"
                        Foreground="White"
                        FontSize="20" Grid.Column="1"
                          Margin="240,56,0,0"/>
 
                 <TextBox Grid.Column="1"
-                         Style="{StaticResource RpcFormClient}"
+                         Style="{StaticResource MaterialTextBox}"
                          Height="33"
                          Width="220"
                          HorizontalAlignment="Left"
                          VerticalAlignment="Top"
                          Margin="20,100,0,0"
-                         Name="tb_FormClient"/>
+                         Name="tb_FormClient"
+                         Background="#353340"
+                         Tag="ClientID"/>
                 <TextBox Grid.Column="1"
-                         Style="{StaticResource RpcFormState}"
+                         Style="{StaticResource MaterialTextBox}"
                          Height="33"
                          Width="220"
                          HorizontalAlignment="Left"
                          VerticalAlignment="Top"
                          Margin="20,180,0,0"
-                         Name="tb_FormState"/>
+                         Name="tb_FormState"
+                         Background="#353340"
+                         Tag="State"/>
                 <TextBox Grid.Column="1"
-                         Style="{StaticResource RpcFormDetails}"
+                         Style="{StaticResource MaterialTextBox}"
                          Height="33"
                          Width="220"
                          HorizontalAlignment="Left"
                          VerticalAlignment="Top"
                          Margin="20,140,0,0"
-                         Name="tb_FormDetails"/>
+                         Name="tb_FormDetails"
+                         Background="#353340"
+                         Tag="Details"/>
                 
                 
                 <TextBox Grid.Column="1"
-                         Style="{StaticResource RpcFormLargeImgKey}"
+                         Style="{StaticResource MaterialTextBox}"
                          Height="33"
                          Width="220"
                          HorizontalAlignment="Left"
                          VerticalAlignment="Top"
                          Margin="20,220,0,0"
-                         Name="tb_FormLargeImgKey"/>
+                         Name="tb_FormLargeImgKey"
+                         Background="#353340"
+                         Tag="Large Image Key"/>
                 <TextBox Grid.Column="1"
-                         Style="{StaticResource RpcFormLargeImgTXT}"
+                         Style="{StaticResource MaterialTextBox}"
                          Height="33"
                          Width="220"
                          HorizontalAlignment="Left"
                          VerticalAlignment="Top"
                          Margin="250,220,0,0"
-                         Name="tb_FormLargeImgTxt"/>
+                         Name="tb_FormLargeImgTxt"
+                         Background="#353340"
+                         Tag="Large Image Text"/>
 
                 <TextBox Grid.Column="1"
-                         Style="{StaticResource RpcFormSmallImgKey}"
+                         Style="{StaticResource MaterialTextBox}"
                          Height="33"
                          Width="220"
                          HorizontalAlignment="Left"
                          VerticalAlignment="Top"
                          Margin="20,260,0,0"
-                         Name="tb_FormSmallImgKey"/>
+                         Name="tb_FormSmallImgKey"
+                         Background="#353340"
+                         Tag="Small Image Key"/>
                 <TextBox Grid.Column="1"
-                         Style="{StaticResource RpcFormSmallImgTXT}"
+                         Style="{StaticResource MaterialTextBox}"
                          Height="33"
                          Width="220"
                          HorizontalAlignment="Left"
                          VerticalAlignment="Top"
                          Margin="250,260,0,0"
-                         Name="tb_FormSmallImgTxt"/>
+                         Name="tb_FormSmallImgTxt"
+                         Background="#353340"
+                         Tag="Small Image Text"/>
                 <Button Height="30"
                         Width="65"
-                        Style="{StaticResource DiscordRpcSaveButton}"
+                        Style="{StaticResource UniversalMaterialButton}"
                         Name="DiscordRpcSave"
                         Click="DiscordRpcSave_Click"
                         VerticalAlignment="Bottom"
                         HorizontalAlignment="Left"
                         Grid.Column="1"
-                        Margin="20,0,0,5"/>
+                        Margin="20,0,0,5"
+                        Background="#353340"
+                        Content="Save"/>
 
 
 
@@ -132,28 +152,34 @@
 
                 <Button Height="30"
                         Width="65"
-                        Style="{StaticResource DiscordRpcStopButton}"
+                        Style="{StaticResource UniversalMaterialButton}"
                         Name="DiscordRpcStop"
                         Click="DiscordRpcStop_Click"
                         VerticalAlignment="Bottom"
                         HorizontalAlignment="Left"
-                        Margin="70,0,0,5"/>
+                        Margin="70,0,0,5"
+                        Background="#353340"
+                        Content="Stop"/>
                 <Button Height="30"
                         Width="65"
-                        Style="{StaticResource DiscordRpcStartButton}"
+                        Style="{StaticResource UniversalMaterialButton}"
                         Name="DiscordRpcStart"
                         Click="DiscordRpcStart_Click"
                         VerticalAlignment="Bottom"
                         HorizontalAlignment="Left"
-                        Margin="0,0,0,5"/>
+                        Margin="0,0,0,5"
+                        Background="#353340"
+                        Content="Start"/>
                 <Button Height="30"
                         Width="65"
-                        Style="{StaticResource DiscordRpcNewButton}"
+                        Style="{StaticResource UniversalMaterialButton}"
                         Name="DiscordRpcNew"
                         Click="DiscordRpcNew_Click"
                         VerticalAlignment="Bottom"
                         HorizontalAlignment="Left"
-                        Margin="140,0,0,5"/>
+                        Margin="140,0,0,5"
+                        Background="#353340"
+                        Content="New"/>
 
 
 
diff --git a/WeeXnes/MVVM/View/KeyManagerView.xaml b/WeeXnes/MVVM/View/KeyManagerView.xaml
index 8391125..61e941b 100644
--- a/WeeXnes/MVVM/View/KeyManagerView.xaml
+++ b/WeeXnes/MVVM/View/KeyManagerView.xaml
@@ -42,7 +42,7 @@
                                     <TextBlock Text="{Binding value}"
                                         Grid.Column="1"
                                         Name="monkeman"
-                                        Loaded="Monkeman_OnLoaded"/>
+                                        Loaded="Key_OnLoaded"/>
                                 </Grid>
                             </DataTemplate>
                         </ListView.ItemTemplate>
@@ -58,13 +58,15 @@
                     Height="30"
                      HorizontalAlignment="Left"
                      Width="250"
-                     Style="{StaticResource KeyNameTextbox}"/>
+                     Style="{StaticResource MaterialTextBox}"
+                    Background="#353340" Tag="Name"/>
             <TextBox Name="Textbox_Value"
                     Height="30"
                      HorizontalAlignment="Right"
                      Width="250"
                      Margin="15,0,0,0"
-                     Style="{StaticResource KeyValTextbox}"/>
+                     Style="{StaticResource MaterialTextBox}"
+                    Background="#353340" Tag="Value"/>
             <Button Width="90"
                     Height="30"
                     Name="AddButton"
diff --git a/WeeXnes/MVVM/View/KeyManagerView.xaml.cs b/WeeXnes/MVVM/View/KeyManagerView.xaml.cs
index dd8bc4d..8bf604d 100644
--- a/WeeXnes/MVVM/View/KeyManagerView.xaml.cs
+++ b/WeeXnes/MVVM/View/KeyManagerView.xaml.cs
@@ -237,7 +237,7 @@ namespace WeeXnes.MVVM.View
         }
 
 
-        private void Monkeman_OnLoaded(object sender, RoutedEventArgs e)
+        private void Key_OnLoaded(object sender, RoutedEventArgs e)
         {
             if (Globals.settings_KeyManagerCensorKeys.Value)
             {
diff --git a/WeeXnes/MVVM/View/SettingView.xaml b/WeeXnes/MVVM/View/SettingView.xaml
index 60575b4..daf72e6 100644
--- a/WeeXnes/MVVM/View/SettingView.xaml
+++ b/WeeXnes/MVVM/View/SettingView.xaml
@@ -5,40 +5,26 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:WeeXnes.MVVM.View"
              mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
-    <Grid >
+             d:DesignHeight="2000" d:DesignWidth="800">
+    <ScrollViewer>
+        <Grid >
         <Grid.RowDefinitions>
-            <RowDefinition Height="440"/>
+            <RowDefinition/>
+            <RowDefinition/>
             <RowDefinition/>
         </Grid.RowDefinitions>
-        <Grid >
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition/>
-                <ColumnDefinition/>
-                <ColumnDefinition/>
-            </Grid.ColumnDefinitions>
-            <Label Content="General"
-               Foreground="White"
-               HorizontalAlignment="Center"
-               FontSize="23"
-               Grid.Column="0"/>
-            <Label Content="RPC"
-               Foreground="White"
-               HorizontalAlignment="Center"
-               FontSize="23"
-               Grid.Column="2"/>
-            <Label Content="Key Manager"
-               Foreground="White"
-               HorizontalAlignment="Center"
-               FontSize="23"
-               Grid.Column="1"/>
-            <Border Grid.Column="0"
-                Background="#22202f"
-                CornerRadius="10"
-                Margin="10,40,10,10">
+            
+            <Border Grid.Row="0"
+                    Background="#22202f"
+                    CornerRadius="10"
+                    Margin="10,10,10,10"
+                    Padding="0,0,0,5">
                 
                 <StackPanel Orientation="Vertical">
-                    
+                    <Label Content="General"
+                           Foreground="White"
+                           HorizontalAlignment="Center"
+                           FontSize="23"/>
                     <CheckBox VerticalAlignment="Top"
                               VerticalContentAlignment="Center"
                               HorizontalContentAlignment="Center"
@@ -69,17 +55,30 @@
                             Height="25"
                             Click="CreateShortcut_OnClick"
                             Margin="4,10,4,0"/>
+                    
+                    <Button Name="OpenAppdataFolder" Grid.Row="1"
+                            Style="{StaticResource UniversalMaterialButton}"
+                            Content="Open AppData Folder"
+                            Background="#353340"
+                            Height="25"
+                            Margin="4,10,4,0"
+                            Click="OpenAppdataFolder_Click"/>
 
                     
                 </StackPanel>
 
                 
             </Border>
-            <Border Grid.Column="2"
-                Background="#22202f"
-                CornerRadius="10"
-                Margin="10,40,10,10">
+            <Border Grid.Row="1"
+                    Background="#22202f"
+                    CornerRadius="10"
+                    Margin="10,10,10,10"
+                    Padding="0,0,0,5">
                 <StackPanel Orientation="Vertical">
+                    <Label Content="RPC"
+                           Foreground="White"
+                           HorizontalAlignment="Center"
+                           FontSize="23"/>
                     <CheckBox VerticalAlignment="Top"
                   VerticalContentAlignment="Center"
                       HorizontalContentAlignment="Center"
@@ -100,9 +99,11 @@
                             FontSize="13" 
                            Foreground="White"
                            HorizontalAlignment="Center"/>
-                    <TextBox Style="{StaticResource RpcSettingDefault}"
+                    <TextBox Style="{StaticResource MaterialTextBox}"
                              Margin="4,0,4,0"
-                             Name="tb_DefaultClientID"/>
+                             Name="tb_DefaultClientID"
+                             Background="#353340"
+                             Tag="Default Client ID"/>
                     <Button Name="SaveDefaultID"
                         Style="{StaticResource UniversalMaterialButton}"
                         Content="Set Default ClientID"
@@ -127,7 +128,7 @@
                     
                     
                     <Label Content="Placeholder" HorizontalAlignment="Center"
-                           FontSize="8"
+                           FontSize="13"
                            Foreground="White"
                            Name="RpcPathLabel"/>
                     <Button Name="SetRpcLocation"
@@ -150,12 +151,17 @@
 
 
             </Border>
-            <Border Grid.Column="1"
-                Background="#22202f"
-                CornerRadius="10"
-                Margin="10,40,10,10">
+            <Border Grid.Row="2"
+                    Background="#22202f"
+                    CornerRadius="10"
+                    Margin="10,10,10,10"
+                    Padding="0,0,0,5">
                 
                 <StackPanel Orientation="Vertical">
+                    <Label Content="Key Manager"
+                           Foreground="White"
+                           HorizontalAlignment="Center"
+                           FontSize="23"/>
                     <CheckBox VerticalAlignment="Top"
                               VerticalContentAlignment="Center"
                               HorizontalContentAlignment="Center"
@@ -183,7 +189,7 @@
                             Foreground="White"/>
                     </CheckBox>
                     <Label Content="Placeholder" HorizontalAlignment="Center"
-                           FontSize="8"
+                           FontSize="13"
                            Foreground="White"
                            Name="KeyPathLabel"/>
                     <Button Name="SetKeyLocation"
@@ -206,12 +212,6 @@
                 
             </Border>
         </Grid>
-        <Button Name="OpenAppdataFolder" Grid.Row="1"
-                Style="{StaticResource UniversalMaterialButton}"
-                Content="Open AppData Folder"
-                Background="#353340"
-                Height="30"
-                Width="130"
-                Click="OpenAppdataFolder_Click"/>
-    </Grid>
+    </ScrollViewer>
+    
 </UserControl>
diff --git a/WeeXnes/MainWindow.xaml b/WeeXnes/MainWindow.xaml
index 332d14f..c5c8954 100644
--- a/WeeXnes/MainWindow.xaml
+++ b/WeeXnes/MainWindow.xaml
@@ -25,7 +25,8 @@
     
     <Border Background="#272537"
             CornerRadius="10"
-            MouseDown="Border_MouseDown">
+            MouseDown="Border_MouseDown"
+            Name="window_border">
         <Grid>
             
             <Grid.ColumnDefinitions>
@@ -93,7 +94,8 @@
                      VerticalAlignment="Center"
                      HorizontalAlignment="Left"
                      Margin="5"
-                     Style="{StaticResource ModernTextbox}"
+                     Style="{StaticResource MaterialTextBox}"
+                     Background="#353340" Tag="Search..."
                      TextChanged="Searchbox_TextChanged"
                      Name="Searchbox"
                      />
diff --git a/WeeXnes/MainWindow.xaml.cs b/WeeXnes/MainWindow.xaml.cs
index b3c5860..d005d5d 100644
--- a/WeeXnes/MainWindow.xaml.cs
+++ b/WeeXnes/MainWindow.xaml.cs
@@ -5,6 +5,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Forms;
 using System.Windows.Input;
+using System.Windows.Media;
 using WeeXnes.Core;
 using WeeXnes.MVVM.View;
 
diff --git a/WeeXnes/Theme/DiscordRpcTheme.xaml b/WeeXnes/Theme/DiscordRpcTheme.xaml
deleted file mode 100644
index ccc75b0..0000000
--- a/WeeXnes/Theme/DiscordRpcTheme.xaml
+++ /dev/null
@@ -1,559 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Style TargetType="{x:Type Button}"
-           x:Key="DiscordRpcStartButton">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Button}">
-                    <Border CornerRadius="10"
-                            Background="#353340">
-                        <Grid>
-                            <Rectangle StrokeThickness="1"/>
-                            <TextBlock Text="Start"
-                                       HorizontalAlignment="Center"
-                                       VerticalAlignment="Center"
-                                       Foreground="DarkGray"/>
-                        </Grid>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" Value="Transparent" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="{x:Type Button}"
-           x:Key="DiscordRpcNewButton">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Button}">
-                    <Border CornerRadius="10"
-                            Background="#353340">
-                        <Grid>
-                            <Rectangle StrokeThickness="1"/>
-                            <TextBlock Text="New"
-                                       HorizontalAlignment="Center"
-                                       VerticalAlignment="Center"
-                                       Foreground="DarkGray"/>
-                        </Grid>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" Value="Transparent" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="{x:Type Button}"
-           x:Key="DiscordRpcSaveButton">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Button}">
-                    <Border CornerRadius="10"
-                            Background="#353340">
-                        <Grid>
-                            <Rectangle StrokeThickness="1"/>
-                            <TextBlock Text="Save"
-                                       HorizontalAlignment="Center"
-                                       VerticalAlignment="Center"
-                                       Foreground="DarkGray"/>
-                        </Grid>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" Value="Transparent" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="{x:Type Button}"
-           x:Key="DiscordRpcStopButton">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Button}">
-                    <Border CornerRadius="10"
-                            Background="#353340">
-                        <Grid>
-                            <Rectangle StrokeThickness="1"/>
-                            <TextBlock Text="Stop"
-                                       HorizontalAlignment="Center"
-                                       VerticalAlignment="Center"
-                                       Foreground="DarkGray"/>
-                        </Grid>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" Value="Transparent" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-    <Style TargetType="{x:Type TextBox}"
-           x:Key="RpcFormName">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type TextBox}">
-                    <Border CornerRadius="10"
-                            Background="#353340">
-                        <Grid>
-                            <Rectangle StrokeThickness="1"/>
-                            <TextBox Margin="1"
-                                     Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Text, UpdateSourceTrigger=PropertyChanged}"
-                                     BorderThickness="0"
-                                     Background="Transparent"
-                                     VerticalAlignment="Center"
-                                     Padding="5"
-                                     Foreground="#cfcfcf"
-                                     x:Name="SearchBox"/>
-                            <TextBlock IsHitTestVisible="False"
-                                       Text="Name (for List)"
-                                       VerticalAlignment="Center"
-                                       HorizontalAlignment="Left"
-                                       Margin="10,0,0,0"
-                                       FontSize="11"
-                                       Foreground="DarkGray"
-                                       Grid.Column="1">
-
-                                <TextBlock.Style>
-                                    <Style TargetType="{x:Type TextBlock}">
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding Text, ElementName=SearchBox}" Value="">
-                                                <Setter Property="Visibility" Value="Visible"/>
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                        <Setter Property="Visibility" Value="Hidden"/>
-                                    </Style>
-                                </TextBlock.Style>
-
-                            </TextBlock>
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-
-    </Style>
-    <Style TargetType="{x:Type TextBox}"
-           x:Key="RpcFormPName">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type TextBox}">
-                    <Border CornerRadius="10"
-                            Background="#353340">
-                        <Grid>
-                            <Rectangle StrokeThickness="1"/>
-                            <TextBox Margin="1"
-                                     Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Text, UpdateSourceTrigger=PropertyChanged}"
-                                     BorderThickness="0"
-                                     Background="Transparent"
-                                     VerticalAlignment="Center"
-                                     Padding="5"
-                                     Foreground="#cfcfcf"
-                                     x:Name="SearchBox"/>
-                            <TextBlock IsHitTestVisible="False"
-                                       Text="Process Name"
-                                       VerticalAlignment="Center"
-                                       HorizontalAlignment="Left"
-                                       Margin="10,0,0,0"
-                                       FontSize="11"
-                                       Foreground="DarkGray"
-                                       Grid.Column="1">
-
-                                <TextBlock.Style>
-                                    <Style TargetType="{x:Type TextBlock}">
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding Text, ElementName=SearchBox}" Value="">
-                                                <Setter Property="Visibility" Value="Visible"/>
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                        <Setter Property="Visibility" Value="Hidden"/>
-                                    </Style>
-                                </TextBlock.Style>
-
-                            </TextBlock>
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-
-    </Style>
-    <Style TargetType="{x:Type TextBox}"
-           x:Key="RpcFormClient">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type TextBox}">
-                    <Border CornerRadius="10"
-                            Background="#353340">
-                        <Grid>
-                            <Rectangle StrokeThickness="1"/>
-                            <TextBox Margin="1"
-                                     Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Text, UpdateSourceTrigger=PropertyChanged}"
-                                     BorderThickness="0"
-                                     Background="Transparent"
-                                     VerticalAlignment="Center"
-                                     Padding="5"
-                                     Foreground="#cfcfcf"
-                                     x:Name="SearchBox"/>
-                            <TextBlock IsHitTestVisible="False"
-                                       Text="Client ID"
-                                       VerticalAlignment="Center"
-                                       HorizontalAlignment="Left"
-                                       Margin="10,0,0,0"
-                                       FontSize="11"
-                                       Foreground="DarkGray"
-                                       Grid.Column="1">
-
-                                <TextBlock.Style>
-                                    <Style TargetType="{x:Type TextBlock}">
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding Text, ElementName=SearchBox}" Value="">
-                                                <Setter Property="Visibility" Value="Visible"/>
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                        <Setter Property="Visibility" Value="Hidden"/>
-                                    </Style>
-                                </TextBlock.Style>
-
-                            </TextBlock>
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-
-    </Style>
-    <Style TargetType="{x:Type TextBox}"
-           x:Key="RpcFormDetails">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type TextBox}">
-                    <Border CornerRadius="10"
-                            Background="#353340">
-                        <Grid>
-                            <Rectangle StrokeThickness="1"/>
-                            <TextBox Margin="1"
-                                     Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Text, UpdateSourceTrigger=PropertyChanged}"
-                                     BorderThickness="0"
-                                     Background="Transparent"
-                                     VerticalAlignment="Center"
-                                     Padding="5"
-                                     Foreground="#cfcfcf"
-                                     x:Name="SearchBox"/>
-                            <TextBlock IsHitTestVisible="False"
-                                       Text="Details"
-                                       VerticalAlignment="Center"
-                                       HorizontalAlignment="Left"
-                                       Margin="10,0,0,0"
-                                       FontSize="11"
-                                       Foreground="DarkGray"
-                                       Grid.Column="1">
-
-                                <TextBlock.Style>
-                                    <Style TargetType="{x:Type TextBlock}">
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding Text, ElementName=SearchBox}" Value="">
-                                                <Setter Property="Visibility" Value="Visible"/>
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                        <Setter Property="Visibility" Value="Hidden"/>
-                                    </Style>
-                                </TextBlock.Style>
-
-                            </TextBlock>
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-
-    </Style>
-
-    <Style TargetType="{x:Type TextBox}"
-           x:Key="RpcFormState">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type TextBox}">
-                    <Border CornerRadius="10"
-                            Background="#353340">
-                        <Grid>
-                            <Rectangle StrokeThickness="1"/>
-                            <TextBox Margin="1"
-                                     Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Text, UpdateSourceTrigger=PropertyChanged}"
-                                     BorderThickness="0"
-                                     Background="Transparent"
-                                     VerticalAlignment="Center"
-                                     Padding="5"
-                                     Foreground="#cfcfcf"
-                                     x:Name="SearchBox"/>
-                            <TextBlock IsHitTestVisible="False"
-                                       Text="State"
-                                       VerticalAlignment="Center"
-                                       HorizontalAlignment="Left"
-                                       Margin="10,0,0,0"
-                                       FontSize="11"
-                                       Foreground="DarkGray"
-                                       Grid.Column="1">
-
-                                <TextBlock.Style>
-                                    <Style TargetType="{x:Type TextBlock}">
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding Text, ElementName=SearchBox}" Value="">
-                                                <Setter Property="Visibility" Value="Visible"/>
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                        <Setter Property="Visibility" Value="Hidden"/>
-                                    </Style>
-                                </TextBlock.Style>
-
-                            </TextBlock>
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-
-    </Style>
-    <Style TargetType="{x:Type TextBox}"
-           x:Key="RpcFormLargeImgKey">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type TextBox}">
-                    <Border CornerRadius="10"
-                            Background="#353340">
-                        <Grid>
-                            <Rectangle StrokeThickness="1"/>
-                            <TextBox Margin="1"
-                                     Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Text, UpdateSourceTrigger=PropertyChanged}"
-                                     BorderThickness="0"
-                                     Background="Transparent"
-                                     VerticalAlignment="Center"
-                                     Padding="5"
-                                     Foreground="#cfcfcf"
-                                     x:Name="SearchBox"/>
-                            <TextBlock IsHitTestVisible="False"
-                                       Text="Large Image Key"
-                                       VerticalAlignment="Center"
-                                       HorizontalAlignment="Left"
-                                       Margin="10,0,0,0"
-                                       FontSize="11"
-                                       Foreground="DarkGray"
-                                       Grid.Column="1">
-
-                                <TextBlock.Style>
-                                    <Style TargetType="{x:Type TextBlock}">
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding Text, ElementName=SearchBox}" Value="">
-                                                <Setter Property="Visibility" Value="Visible"/>
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                        <Setter Property="Visibility" Value="Hidden"/>
-                                    </Style>
-                                </TextBlock.Style>
-
-                            </TextBlock>
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-
-    </Style>
-
-    <Style TargetType="{x:Type TextBox}"
-           x:Key="RpcFormLargeImgTXT">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type TextBox}">
-                    <Border CornerRadius="10"
-                            Background="#353340">
-                        <Grid>
-                            <Rectangle StrokeThickness="1"/>
-                            <TextBox Margin="1"
-                                     Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Text, UpdateSourceTrigger=PropertyChanged}"
-                                     BorderThickness="0"
-                                     Background="Transparent"
-                                     VerticalAlignment="Center"
-                                     Padding="5"
-                                     Foreground="#cfcfcf"
-                                     x:Name="SearchBox"/>
-                            <TextBlock IsHitTestVisible="False"
-                                       Text="Large Image Text"
-                                       VerticalAlignment="Center"
-                                       HorizontalAlignment="Left"
-                                       Margin="10,0,0,0"
-                                       FontSize="11"
-                                       Foreground="DarkGray"
-                                       Grid.Column="1">
-
-                                <TextBlock.Style>
-                                    <Style TargetType="{x:Type TextBlock}">
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding Text, ElementName=SearchBox}" Value="">
-                                                <Setter Property="Visibility" Value="Visible"/>
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                        <Setter Property="Visibility" Value="Hidden"/>
-                                    </Style>
-                                </TextBlock.Style>
-
-                            </TextBlock>
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-
-    </Style>
-
-
-    <Style TargetType="{x:Type TextBox}"
-           x:Key="RpcFormSmallImgKey">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type TextBox}">
-                    <Border CornerRadius="10"
-                            Background="#353340">
-                        <Grid>
-                            <Rectangle StrokeThickness="1"/>
-                            <TextBox Margin="1"
-                                     Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Text, UpdateSourceTrigger=PropertyChanged}"
-                                     BorderThickness="0"
-                                     Background="Transparent"
-                                     VerticalAlignment="Center"
-                                     Padding="5"
-                                     Foreground="#cfcfcf"
-                                     x:Name="SearchBox"/>
-                            <TextBlock IsHitTestVisible="False"
-                                       Text="Small Image Key"
-                                       VerticalAlignment="Center"
-                                       HorizontalAlignment="Left"
-                                       Margin="10,0,0,0"
-                                       FontSize="11"
-                                       Foreground="DarkGray"
-                                       Grid.Column="1">
-
-                                <TextBlock.Style>
-                                    <Style TargetType="{x:Type TextBlock}">
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding Text, ElementName=SearchBox}" Value="">
-                                                <Setter Property="Visibility" Value="Visible"/>
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                        <Setter Property="Visibility" Value="Hidden"/>
-                                    </Style>
-                                </TextBlock.Style>
-
-                            </TextBlock>
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-
-    </Style>
-
-    <Style TargetType="{x:Type TextBox}"
-           x:Key="RpcFormSmallImgTXT">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type TextBox}">
-                    <Border CornerRadius="10"
-                            Background="#353340">
-                        <Grid>
-                            <Rectangle StrokeThickness="1"/>
-                            <TextBox Margin="1"
-                                     Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Text, UpdateSourceTrigger=PropertyChanged}"
-                                     BorderThickness="0"
-                                     Background="Transparent"
-                                     VerticalAlignment="Center"
-                                     Padding="5"
-                                     Foreground="#cfcfcf"
-                                     x:Name="SearchBox"/>
-                            <TextBlock IsHitTestVisible="False"
-                                       Text="Small Image Text"
-                                       VerticalAlignment="Center"
-                                       HorizontalAlignment="Left"
-                                       Margin="10,0,0,0"
-                                       FontSize="11"
-                                       Foreground="DarkGray"
-                                       Grid.Column="1">
-
-                                <TextBlock.Style>
-                                    <Style TargetType="{x:Type TextBlock}">
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding Text, ElementName=SearchBox}" Value="">
-                                                <Setter Property="Visibility" Value="Visible"/>
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                        <Setter Property="Visibility" Value="Hidden"/>
-                                    </Style>
-                                </TextBlock.Style>
-
-                            </TextBlock>
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-
-    </Style>
-
-    <Style TargetType="{x:Type TextBox}"
-           x:Key="RpcSettingDefault">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type TextBox}">
-                    <Border CornerRadius="10"
-                            Background="#353340">
-                        <Grid>
-                            <Rectangle StrokeThickness="1"/>
-                            <TextBox Margin="1"
-                                     Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Text, UpdateSourceTrigger=PropertyChanged}"
-                                     BorderThickness="0"
-                                     Background="Transparent"
-                                     VerticalAlignment="Center"
-                                     Padding="5"
-                                     Foreground="#cfcfcf"
-                                     x:Name="SearchBox"/>
-                            <TextBlock IsHitTestVisible="False"
-                                       Text="Default ClientID"
-                                       VerticalAlignment="Center"
-                                       HorizontalAlignment="Left"
-                                       Margin="10,0,0,0"
-                                       FontSize="11"
-                                       Foreground="DarkGray"
-                                       Grid.Column="1">
-
-                                <TextBlock.Style>
-                                    <Style TargetType="{x:Type TextBlock}">
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding Text, ElementName=SearchBox}" Value="">
-                                                <Setter Property="Visibility" Value="Visible"/>
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                        <Setter Property="Visibility" Value="Hidden"/>
-                                    </Style>
-                                </TextBlock.Style>
-
-                            </TextBlock>
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-
-    </Style>
-
-</ResourceDictionary>
\ No newline at end of file
diff --git a/WeeXnes/Theme/TextBoxTheme.xaml b/WeeXnes/Theme/TextBoxTheme.xaml
index ef57196..633797b 100644
--- a/WeeXnes/Theme/TextBoxTheme.xaml
+++ b/WeeXnes/Theme/TextBoxTheme.xaml
@@ -1,12 +1,12 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Style TargetType="{x:Type TextBox}"
-           x:Key="ModernTextbox">
+           x:Key="MaterialTextBox">
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TextBox}">
                     <Border CornerRadius="10"
-                            Background="#353340">
+                            Background="{TemplateBinding Background}">
                         <Grid>
                             <Rectangle StrokeThickness="1"/>
                             <TextBox Margin="1"
@@ -18,100 +18,7 @@
                                      Foreground="#cfcfcf"
                                      x:Name="SearchBox"/>
                             <TextBlock IsHitTestVisible="False"
-                                       Text="Search..."
-                                       VerticalAlignment="Center"
-                                       HorizontalAlignment="Left"
-                                       Margin="10,0,0,0"
-                                       FontSize="11"
-                                       Foreground="DarkGray"
-                                       Grid.Column="1">
-
-                                <TextBlock.Style>
-                                    <Style TargetType="{x:Type TextBlock}">
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding Text, ElementName=SearchBox}" Value="">
-                                                <Setter Property="Visibility" Value="Visible"/>
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                        <Setter Property="Visibility" Value="Hidden"/>
-                                    </Style>
-                                </TextBlock.Style>
-                                
-                            </TextBlock>
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        
-    </Style>
-
-    <Style TargetType="{x:Type TextBox}"
-           x:Key="KeyNameTextbox">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type TextBox}">
-                    <Border CornerRadius="10"
-                            Background="#353340">
-                        <Grid>
-                            <Rectangle StrokeThickness="1"/>
-                            <TextBox Margin="1"
-                                     Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Text, UpdateSourceTrigger=PropertyChanged}"
-                                     BorderThickness="0"
-                                     Background="Transparent"
-                                     VerticalAlignment="Center"
-                                     Padding="5"
-                                     Foreground="#cfcfcf"
-                                     x:Name="SearchBox"/>
-                            <TextBlock IsHitTestVisible="False"
-                                       Text="Key Name..."
-                                       VerticalAlignment="Center"
-                                       HorizontalAlignment="Left"
-                                       Margin="10,0,0,0"
-                                       FontSize="11"
-                                       Foreground="DarkGray"
-                                       Grid.Column="1">
-
-                                <TextBlock.Style>
-                                    <Style TargetType="{x:Type TextBlock}">
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding Text, ElementName=SearchBox}" Value="">
-                                                <Setter Property="Visibility" Value="Visible"/>
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                        <Setter Property="Visibility" Value="Hidden"/>
-                                    </Style>
-                                </TextBlock.Style>
-
-                            </TextBlock>
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-
-    </Style>
-
-
-    <Style TargetType="{x:Type TextBox}"
-           x:Key="KeyValTextbox">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type TextBox}">
-                    <Border CornerRadius="10"
-                            Background="#353340">
-                        <Grid>
-                            <Rectangle StrokeThickness="1"/>
-                            <TextBox Margin="1"
-                                     Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Text, UpdateSourceTrigger=PropertyChanged}"
-                                     BorderThickness="0"
-                                     Background="Transparent"
-                                     VerticalAlignment="Center"
-                                     Padding="5"
-                                     Foreground="#cfcfcf"
-                                     x:Name="SearchBox"/>
-                            <TextBlock IsHitTestVisible="False"
-                                       Text="Key Value"
+                                       Text="{TemplateBinding Tag}"
                                        VerticalAlignment="Center"
                                        HorizontalAlignment="Left"
                                        Margin="10,0,0,0"
diff --git a/WeeXnes/WeeXnes.csproj b/WeeXnes/WeeXnes.csproj
index 1131c4b..0d97fb6 100644
--- a/WeeXnes/WeeXnes.csproj
+++ b/WeeXnes/WeeXnes.csproj
@@ -88,7 +88,6 @@
         <Page Include="MVVM\View\KeyManagerView.xaml" />
         <Page Include="MVVM\View\SettingView.xaml" />
         <Page Include="Theme\ControlButtonTheme.xaml" />
-        <Page Include="Theme\DiscordRpcTheme.xaml" />
         <Page Include="Theme\MenuButtonTheme.xaml" />
         <Page Include="Theme\ModernCheckbox.xaml" />
         <Page Include="Theme\TextBoxTheme.xaml" />