From f8b553b0be5f673ece78b7e819d3211ea0d2f3e1 Mon Sep 17 00:00:00 2001
From: ld892012 <ld892012@gmail.com>
Date: Sun, 28 Apr 2024 18:30:45 +0200
Subject: [PATCH] Add 2.0.0 source code

---
 README.md                          |   9 +-
 Revisited/App.xaml                 | 110 +++++++++---
 Revisited/ControlGalleryView.xaml  | 174 ++++++++++++++++++-
 Revisited/GlobalResources.xaml     |  12 +-
 Revisited/LocSource.xaml           |  26 ++-
 Revisited/Theme.csproj             | 264 +++++++++++++++++++++++++----
 Revisited/Theme.sln                |  10 +-
 Revisited/Views/GameDetails.xaml   | 117 ++++++++++++-
 Revisited/Views/MainMenu.xaml      |  24 ++-
 Revisited/Views/SettingsMenus.xaml |   3 +
 Revisited/theme.yaml               |   4 +-
 11 files changed, 650 insertions(+), 103 deletions(-)

diff --git a/README.md b/README.md
index eaddefb..0eb2b0c 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # PlayniteRevisitedSkin
 It's just a Playnite default Fullscreen skin with some modifications inspired by PlayOS and DH_Blur.
+This skin supports [BackgroundChanger](https://github.com/Lacro59/playnite-backgroundchanger-plugin) and [ExtraMetadata](https://github.com/darklinkpower/PlayniteExtensionsCollection) logos.
 
 ## Main :
 
@@ -14,10 +15,10 @@ You can change appearance of Details view by changing Item spacing value (the re
 
 ![Settings](https://raw.githubusercontent.com/ld892012/PlayniteRevisitedSkin/main/Media/Options.png)
 
-0 : Show icon only\
+0 : Show icon/logo only\
 ![IconOnly](https://raw.githubusercontent.com/ld892012/PlayniteRevisitedSkin/main/Media/0_Icon.png)
 
-1 : Show icon and title\
+1 : Show icon/logo and title\
 ![IconOnly](https://raw.githubusercontent.com/ld892012/PlayniteRevisitedSkin/main/Media/1_IconTitle.png)
 
 Everything else : Show title only
@@ -39,9 +40,9 @@ By default, only the background is shown, if you want to close this window just
 - [x] Transform Status view to add it game background
 - [x] Add advanced infos to detail view by pressing a key
 - [x] Add possibility to show icon in Detail view
+- [x] Add BackgroundChanger support
+- [x] Add Extra Metadata Loader support (Logos)
 - [ ] Add some modifiable skin settings (icon show, title show, Play item position, theme color, ...)
 - [ ] Add tools to Playnite menu (if possible)
-- [ ] Add BackgroundChanger support
-- [ ] Add Extra Metadata Loader support
 - [ ] Add SuccessStory entry to Advanced details
 - [ ] Add HowLongToBeat entry to Advanced details
diff --git a/Revisited/App.xaml b/Revisited/App.xaml
index 98218ef..71e7315 100644
--- a/Revisited/App.xaml
+++ b/Revisited/App.xaml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Application x:Class="Playnite.FullscreenApp.App" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=mscorlib">
+<Application x:Class="Playnite.DesktopApp.App" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=mscorlib">
+  <!--
+    THIS FILE IS NOT PART OF THE THEME, DO NOT MODIFY!
+    -->
   <Application.Resources>
     <ResourceDictionary>
       <ResourceDictionary.MergedDictionaries>
@@ -7,42 +10,93 @@
         <ResourceDictionary Source="GlobalResources.xaml" />
         <ResourceDictionary Source="ControlGalleryView.xaml" />
         <ResourceDictionary Source="Constants.xaml" />
+        <ResourceDictionary Source="Common.xaml" />
         <ResourceDictionary Source="Media.xaml" />
-        <ResourceDictionary Source="Images/ButtonPrompts/Xbox/Xbox.xaml" />
         <!--Default Controls-->
+        <ResourceDictionary Source="DefaultControls/Border.xaml" />
+        <ResourceDictionary Source="DefaultControls/TextBlock.xaml" />
         <ResourceDictionary Source="DefaultControls/TextBox.xaml" />
-        <ResourceDictionary Source="DefaultControls/Slider.xaml" />
-        <ResourceDictionary Source="DefaultControls/CheckBox.xaml" />
-        <ResourceDictionary Source="DefaultControls/ComboBox.xaml" />
         <ResourceDictionary Source="DefaultControls/Button.xaml" />
-        <ResourceDictionary Source="DefaultControls/ScrollViewer.xaml" />
-        <ResourceDictionary Source="DefaultControls/ToolTip.xaml" />
+        <ResourceDictionary Source="DefaultControls/ComboBox.xaml" />
+        <ResourceDictionary Source="DefaultControls/ContextMenu.xaml" />
+        <ResourceDictionary Source="DefaultControls/DatePicker.xaml" />
+        <ResourceDictionary Source="DefaultControls/Expander.xaml" />
+        <ResourceDictionary Source="DefaultControls/GridSplitter.xaml" />
+        <ResourceDictionary Source="DefaultControls/GroupBox.xaml" />
+        <ResourceDictionary Source="DefaultControls/Hyperlink.xaml" />
+        <ResourceDictionary Source="DefaultControls/CheckBox.xaml" />
+        <ResourceDictionary Source="DefaultControls/Label.xaml" />
+        <ResourceDictionary Source="DefaultControls/ListBox.xaml" />
+        <ResourceDictionary Source="DefaultControls/ListView.xaml" />
+        <ResourceDictionary Source="DefaultControls/Menu.xaml" />
+        <ResourceDictionary Source="DefaultControls/PasswordBox.xaml" />
+        <ResourceDictionary Source="DefaultControls/Popup.xaml" />
         <ResourceDictionary Source="DefaultControls/ProgressBar.xaml" />
+        <ResourceDictionary Source="DefaultControls/RadioButton.xaml" />
+        <ResourceDictionary Source="DefaultControls/RepeatButton.xaml" />
+        <ResourceDictionary Source="DefaultControls/RichTextBox.xaml" />
+        <ResourceDictionary Source="DefaultControls/ScrollViewer.xaml" />
+        <ResourceDictionary Source="DefaultControls/Slider.xaml" />
+        <ResourceDictionary Source="DefaultControls/TabControl.xaml" />
+        <ResourceDictionary Source="DefaultControls/Thumb.xaml" />
         <ResourceDictionary Source="DefaultControls/ToggleButton.xaml" />
+        <ResourceDictionary Source="DefaultControls/ToolTip.xaml" />
+        <ResourceDictionary Source="DefaultControls/TreeView.xaml" />
+        <ResourceDictionary Source="DefaultControls/DataGrid.xaml" />
         <!--Custom Controls-->
-        <ResourceDictionary Source="CustomControls/FilterEnumListSelection.xaml" />
-        <ResourceDictionary Source="CustomControls/FilterStringListSelection.xaml" />
-        <ResourceDictionary Source="CustomControls/FilterDbItemtSelection.xaml" />
-        <ResourceDictionary Source="CustomControls/FilterPresetSelector.xaml" />
+        <ResourceDictionary Source="CustomControls/ExtendedListBox.xaml" />
+        <ResourceDictionary Source="CustomControls/ExtendedListView.xaml" />
+        <ResourceDictionary Source="CustomControls/ExtendedDataGrid.xaml" />
+        <ResourceDictionary Source="CustomControls/GameMenu.xaml" />
+        <ResourceDictionary Source="CustomControls/GameGroupMenu.xaml" />
+        <ResourceDictionary Source="CustomControls/HtmlTextView.xaml" />
+        <ResourceDictionary Source="CustomControls/TrayContextMenu.xaml" />
+        <ResourceDictionary Source="CustomControls/NumericBoxes.xaml" />
+        <ResourceDictionary Source="CustomControls/SliderEx.xaml" />
+        <ResourceDictionary Source="CustomControls/ExpanderEx.xaml" />
+        <ResourceDictionary Source="CustomControls/WindowBase.xaml" />
+        <ResourceDictionary Source="CustomControls/SidebarItem.xaml" />
+        <ResourceDictionary Source="CustomControls/ComboBoxList.xaml" />
+        <ResourceDictionary Source="CustomControls/FilterSelectionBox.xaml" />
+        <ResourceDictionary Source="CustomControls/SearchBox.xaml" />
+        <ResourceDictionary Source="CustomControls/TopPanelItem.xaml" />
+        <ResourceDictionary Source="CustomControls/PathSelectionBox.xaml" />
+        <ResourceDictionary Source="CustomControls/HotKeyBox.xaml" />
         <!--Derived Styles-->
-        <ResourceDictionary Source="DerivedStyles/ListGameItemStyle.xaml" />
-        <ResourceDictionary Source="DerivedStyles/ListGameItemTemplate.xaml" />
-        <ResourceDictionary Source="DerivedStyles/ButtonBottomMenu.xaml" />
-        <ResourceDictionary Source="DerivedStyles/ButtonTopMenu.xaml" />
+        <ResourceDictionary Source="DerivedStyles/TextBlockGameScore.xaml" />
+        <ResourceDictionary Source="DerivedStyles/PropertyItemButton.xaml" />
+        <ResourceDictionary Source="DerivedStyles/DetailsScrollViewer.xaml" />
+        <ResourceDictionary Source="DerivedStyles/Simplebutton.xaml" />
+        <ResourceDictionary Source="DerivedStyles/GridViewGroupStyle.xaml" />
+        <ResourceDictionary Source="DerivedStyles/GridViewItemStyle.xaml" />
+        <ResourceDictionary Source="DerivedStyles/GridViewItemTemplate.xaml" />
+        <ResourceDictionary Source="DerivedStyles/DetailsViewItemTemplate.xaml" />
+        <ResourceDictionary Source="DerivedStyles/DetailsViewGroupStyle.xaml" />
+        <ResourceDictionary Source="DerivedStyles/DetailsViewItemStyle.xaml" />
+        <ResourceDictionary Source="DerivedStyles/ListViewGroupStyle.xaml" />
+        <ResourceDictionary Source="DerivedStyles/StandardWindowStyle.xaml" />
+        <ResourceDictionary Source="DerivedStyles/WindowBarButton.xaml" />
+        <ResourceDictionary Source="DerivedStyles/BottomButton.xaml" />
+        <ResourceDictionary Source="DerivedStyles/DetailsHyperlink.xaml" />
+        <ResourceDictionary Source="DerivedStyles/HighlightBorder.xaml" />
+        <ResourceDictionary Source="DerivedStyles/ImageHighlightButton.xaml" />
+        <ResourceDictionary Source="DerivedStyles/MainWindowStyle.xaml" />
+        <ResourceDictionary Source="DerivedStyles/PlayButton.xaml" />
+        <ResourceDictionary Source="DerivedStyles/NotificationMessage.xaml" />
         <!--Views-->
-        <ResourceDictionary Source="Views/FiltersAdditional.xaml" />
-        <ResourceDictionary Source="Views/FiltersView.xaml" />
-        <ResourceDictionary Source="Views/GameDetails.xaml" />
-        <ResourceDictionary Source="Views/GameMenu.xaml" />
-        <ResourceDictionary Source="Views/GameStatus.xaml" />
-        <ResourceDictionary Source="Views/Main.xaml" />
-        <ResourceDictionary Source="Views/MainMenu.xaml" />
-        <ResourceDictionary Source="Views/HelpMenu.xaml" />
-        <ResourceDictionary Source="Views/MessageBox.xaml" />
-        <ResourceDictionary Source="Views/NotificationsMenu.xaml" />
-        <ResourceDictionary Source="Views/SettingsMenus.xaml" />
-        <ResourceDictionary Source="Views/TextInput.xaml" />
-        <ResourceDictionary Source="Views/ItemSelection.xaml" />
+        <ResourceDictionary Source="Views/Sidebar.xaml" />
+        <ResourceDictionary Source="Views/ExplorerPanel.xaml" />
+        <ResourceDictionary Source="Views/FilterPanelView.xaml" />
+        <ResourceDictionary Source="Views/TopPanel.xaml" />
+        <ResourceDictionary Source="Views/NotificationPanel.xaml" />
+        <ResourceDictionary Source="Views/DetailsViewGameOverview.xaml" />
+        <ResourceDictionary Source="Views/GridViewGameOverview.xaml" />
+        <ResourceDictionary Source="Views/LibraryDetailsView.xaml" />
+        <ResourceDictionary Source="Views/LibraryGridView.xaml" />
+        <ResourceDictionary Source="Views/LibraryListView.xaml" />
+        <ResourceDictionary Source="Views/Library.xaml" />
+        <ResourceDictionary Source="Views/MainWindow.xaml" />
+        <ResourceDictionary Source="Views/SearchView.xaml" />
       </ResourceDictionary.MergedDictionaries>
     </ResourceDictionary>
   </Application.Resources>
diff --git a/Revisited/ControlGalleryView.xaml b/Revisited/ControlGalleryView.xaml
index 83959ca..dad112f 100644
--- a/Revisited/ControlGalleryView.xaml
+++ b/Revisited/ControlGalleryView.xaml
@@ -2,22 +2,178 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                    xmlns:pctrls="clr-namespace:Playnite.FullscreenApp.Controls;assembly=Playnite.FullscreenApp" 
+                    xmlns:pctrls="clr-namespace:Playnite.DesktopApp.Controls;assembly=Playnite.DesktopApp" 
                     mc:Ignorable="d">
 
     <Style x:Key="ControlGalleryContentStyle" TargetType="{x:Type ContentControl}">        
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ContentControl}">
-                    <DockPanel Background="{DynamicResource MainBackgourndBrush}"
+                    <DockPanel Background="{DynamicResource WindowBackgourndBrush}"
                                d:DesignWidth="800" d:DesignHeight="700">
-                        <StackPanel>
-                            <pctrls:ButtonEx Content="Test" Margin="10" />
-                            <pctrls:CheckBoxEx Content="Test" Margin="10" />
-                            <pctrls:ComboBoxEx Margin="10" />
-                            <pctrls:SliderEx Minimum="0" MaxHeight="10" Value="5" Margin="10" />
-                            <pctrls:ToggleButtonEx Content="Test" Margin="10" />
-                        </StackPanel>
+                        <Menu DockPanel.Dock="Top">
+                            <MenuItem Header="_File">
+                                <MenuItem Header="_New" />
+                                <MenuItem Header="Open" IsEnabled="False" />
+                                <MenuItem Header="Save" IsChecked="True" IsCheckable="True"/>
+                                <Separator />
+                                <MenuItem Header="Exit">
+                                    <MenuItem Header="Test" />
+                                    <MenuItem Header="Test2" />
+                                </MenuItem>
+                            </MenuItem>
+
+                            <MenuItem Header="Test" IsEnabled="False">
+                                <MenuItem Header="_New" />
+                            </MenuItem>
+
+                            <MenuItem Header="Test2" >
+                                <MenuItem Header="New" />
+                            </MenuItem>
+                        </Menu>
+
+                        <TabControl TabStripPlacement="Top">
+                            <TabItem Header="Test">
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition />
+                                        <ColumnDefinition />
+                                    </Grid.ColumnDefinitions>
+                                    <StackPanel Margin="10" Grid.Column="0">
+                                        <StackPanel Orientation="Horizontal">
+                                            <Button Content="Button" HorizontalAlignment="Left" Margin="5">
+                                                <Button.ContextMenu>
+                                                    <ContextMenu>
+                                                        <MenuItem Header="Test1" />
+                                                        <Separator />
+                                                        <MenuItem Header="Test2">
+                                                            <MenuItem Header="Test1" />
+                                                        </MenuItem>
+                                                    </ContextMenu>
+                                                </Button.ContextMenu>
+                                            </Button>
+                                            <RepeatButton Content="RepeatButton" HorizontalAlignment="Left" Margin="5"
+                                    ToolTip="Testing tooltip for a button"/>
+                                            <ToggleButton Content="ToggleButton"
+                                HorizontalAlignment="Left" Margin="5" />
+                                        </StackPanel>
+
+                                        <UniformGrid Columns="2">
+                                            <CheckBox Content="TestCheckbox" IsChecked="True" HorizontalAlignment="Left" IsThreeState="True" Margin="5"/>
+                                            <TextBlock VerticalAlignment="Center">           
+                        <Hyperlink>
+                            Hyperlink Click here
+                        </Hyperlink>
+                                            </TextBlock>
+                                        </UniformGrid>
+                                        <UniformGrid Columns="2">
+                                            <ComboBox IsEditable="True" Text="Test2" Margin="5"
+                                HorizontalAlignment="Stretch"/>
+                                            <ComboBox SelectedIndex="1" Margin="5"
+                                HorizontalAlignment="Stretch">
+                                                <ComboBoxItem Content="Test1"/>
+                                                <ComboBoxItem Content="Test2"/>
+                                                <ComboBoxItem Content="Test3"/>
+                                                <ComboBoxItem Content="Test1"/>
+                                                <ComboBoxItem Content="Test2"/>
+                                                <ComboBoxItem Content="Test3"/>
+                                                <ComboBoxItem Content="Test1"/>
+                                                <ComboBoxItem Content="Test2"/>
+                                                <ComboBoxItem Content="Test3"/>
+                                                <ComboBoxItem Content="Test1"/>
+                                                <ComboBoxItem Content="Test2"/>
+                                                <ComboBoxItem Content="Test3"/>
+                                                <ComboBoxItem Content="Test1"/>
+                                                <ComboBoxItem Content="Test2"/>
+                                                <ComboBoxItem Content="Test3"/>
+                                                <ComboBoxItem Content="Test1"/>
+                                                <ComboBoxItem Content="Test2"/>
+                                                <ComboBoxItem Content="Test3"/>
+                                                <ComboBoxItem Content="Test3"/>
+                                                <ComboBoxItem Content="Test1"/>
+                                                <ComboBoxItem Content="Test2"/>
+                                                <ComboBoxItem Content="Test3"/>
+                                                <ComboBoxItem Content="Test1"/>
+                                                <ComboBoxItem Content="Test2"/>
+                                                <ComboBoxItem Content="Test3"/>
+                                                <ComboBoxItem Content="Test3"/>
+                                                <ComboBoxItem Content="Test1"/>
+                                            </ComboBox>
+                                        </UniformGrid>
+                                        <TextBlock Text="Test text just test text" Margin="5"/>
+                                        <TextBox Text="Test text just test text" Margin="5" />
+                                        <TextBox Height="50" TextWrapping="Wrap"  AcceptsReturn="True" Text="This TextBox will allow the user to enter multiple lines of text.  When the RETURN key is pressed, 
+or when typed text reaches the edge of the text box, a new line is automatically inserted." VerticalScrollBarVisibility="Auto" Margin="5"/>
+                                        <PasswordBox Password="test" Margin="5"/>
+                                        <Expander Header="TestExpander" IsExpanded="True" Margin="5">
+                                            <ListView Height="100"
+                                Name="listview"
+                                SelectedIndex="1"  Margin="5">
+                                                <ListView.View>
+                                                    <GridView>
+                                                        <GridViewColumn Header="Name" Width="120" DisplayMemberBinding="{Binding Name}" />
+                                                        <GridViewColumn Header="Age" Width="50" DisplayMemberBinding="{Binding Age}" />
+                                                        <GridViewColumn Header="Mail" Width="150" DisplayMemberBinding="{Binding Mail}" />
+                                                    </GridView>
+                                                </ListView.View>
+                                                <ListViewItem Content="Tea"></ListViewItem>
+                                                <ListViewItem Content="Test"></ListViewItem>
+                                            </ListView>
+                                        </Expander>
+                                        <ListBox SelectedIndex="1" Margin="5" Height="100">
+                                            <ListBoxItem Content="ListItem 1" />
+                                            <ListBoxItem Content="ListItem 2" />
+                                            <ListBoxItem Content="ListItem 3" />
+                                            <ListBoxItem Content="ListItem 1" />
+                                            <ListBoxItem Content="ListItem 2" />
+                                            <ListBoxItem Content="ListItem 3" />
+                                            <ListBoxItem Content="ListItem 1" />
+                                            <ListBoxItem Content="ListItem 2" />
+                                            <ListBoxItem Content="ListItem 3" />
+                                        </ListBox>
+
+                                    </StackPanel>
+                                    <StackPanel Grid.Column="1">
+                                        <pctrls:NullIntNumericBox Margin="5" />
+                                        <pctrls:LongNumericBox Margin="5" />
+                                        <pctrls:SearchBox Margin="5" />
+                                        <pctrls:FilterSelectionBox Margin="5" />
+                                        <pctrls:DdItemListSelectionBox Margin="5" />
+
+                                        <GroupBox Header="Test Groubox" Margin="5">
+                                            <StackPanel>
+                                                <ProgressBar Value="30" Margin="5" Width="342" Height="20" />
+                                                <RadioButton Content="RadioButton1" IsChecked="True" GroupName="test"  Margin="5"/>
+                                                <RadioButton Content="RadioButton2" GroupName="test" Margin="5" />
+                                            </StackPanel>
+                                        </GroupBox>
+
+                                        <TreeView Margin="5">
+                                            <TreeViewItem Header="Level 1" IsExpanded="True">
+                                                <TreeViewItem Header="Level 2.1" IsSelected="True" />
+                                                <TreeViewItem Header="Level 2.2" IsExpanded="True" >
+                                                    <TreeViewItem Header="Level 3.1" />
+                                                    <TreeViewItem Header="Level 3.2" />
+                                                </TreeViewItem>
+                                                <TreeViewItem Header="Level 2.2" IsExpanded="False" >
+                                                    <TreeViewItem Header="Level 3.1" />
+                                                    <TreeViewItem Header="Level 3.2" />
+                                                </TreeViewItem>
+                                            </TreeViewItem>
+                                        </TreeView>
+
+                                        <ScrollViewer Width="100" Height="100"
+                                HorizontalScrollBarVisibility="Auto" Margin="5">
+                                            <Viewbox Width="200" Height="200">
+                                                <TextBlock Text="R" />
+                                            </Viewbox>
+                                        </ScrollViewer>
+                                    </StackPanel>
+                                </Grid>
+                            </TabItem>
+                            <TabItem Header="Test2">
+                            </TabItem>
+                        </TabControl>
                     </DockPanel>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/Revisited/GlobalResources.xaml b/Revisited/GlobalResources.xaml
index cbce27c..5d193cf 100644
--- a/Revisited/GlobalResources.xaml
+++ b/Revisited/GlobalResources.xaml
@@ -9,17 +9,12 @@
 
     <sys:Double x:Key="DesignWidth">1920</sys:Double>
     <sys:Double x:Key="DesignHeight">1080</sys:Double>
-
+    
     <sys:Boolean x:Key="True">True</sys:Boolean>
     <sys:Boolean x:Key="False">False</sys:Boolean>
-
-    <FontFamily x:Key="FontXboxOneController">/Fonts/XBOXONE.ttf#XBOXONE</FontFamily>
-    <FontFamily x:Key="FontPlayStation4Controller">/Fonts/PlayStation4.ttf#PlayStation4</FontFamily>
-    <FontFamily x:Key="FontTitilliumWeb">/Fonts/TitilliumWeb-Regular.ttf#Titillium Web</FontFamily>
-    <FontFamily x:Key="FontTitilliumWebLight">/Fonts/TitilliumWeb-Light.ttf#Titillium Web</FontFamily>
-    <FontFamily x:Key="FontTitilliumWebBold">/Fonts/TitilliumWeb-Bold.ttf#Titillium Web</FontFamily>
+    
     <FontFamily x:Key="FontIcoFont">/Fonts/icofont.ttf#icofont</FontFamily>
-
+    
     <pcon:BidirectionalEnumAndNumberConverter x:Key="BidirectionalEnumAndNumberConverter" />
     <pcon:BooleanToHiddenConverter x:Key="BooleanToHiddenConverter" />
     <pcon:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
@@ -62,4 +57,5 @@
     <pcon:ObjectEqualityToVisibilityConverter x:Key="ObjectEqualityToVisibilityConverter" />
     <pcon:InvertedObjectEqualityToBoolConverter x:Key="InvertedObjectEqualityToBoolConverter" />
     <pcon:InvertedObjectEqualityToVisibilityConverter x:Key="InvertedObjectEqualityToVisibilityConverter" />
+    <pcon:PluginIconSourceToElementConverter x:Key="PluginIconSourceToElementConverter" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Revisited/LocSource.xaml b/Revisited/LocSource.xaml
index ad6f8c1..34c1f0d 100644
--- a/Revisited/LocSource.xaml
+++ b/Revisited/LocSource.xaml
@@ -1,4 +1,5 @@
-    <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=mscorlib">
+
+    <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=mscorlib">
     <!--
     THIS FILE IS NOT PART OF THE THEME, DO NOT MODIFY!
     -->
@@ -100,6 +101,7 @@ Selecting "add to exclusion list" option will prevent games from being imported
     <sys:String x:Key="LOCErrorStartupNoController">Couldn't determine how to start the game.</sys:String>
     <!--General-->
     <sys:String x:Key="LOCEnabledTitle">Enabled</sys:String>
+    <sys:String x:Key="LOCDisabledTitle">Disabled</sys:String>
     <sys:String x:Key="LOCRemoveTitle">Remove</sys:String>
     <sys:String x:Key="LOCRemoveUnusedTitle">Remove unused</sys:String>
     <sys:String x:Key="LOCRenameTitle">Rename</sys:String>
@@ -168,7 +170,7 @@ Selecting "add to exclusion list" option will prevent games from being imported
     <sys:String x:Key="LOCDetailsViewLabel">Details View</sys:String>
     <sys:String x:Key="LOCCustomLabel">Custom</sys:String>
     <sys:String x:Key="LOCURLLabel">URL</sys:String>
-    <sys:String x:Key="LOCPatronsLabel">Patrons</sys:String>
+    <sys:String x:Key="LOCSpecialThanks">Special thanks</sys:String>
     <sys:String x:Key="LOCLicenseLabel">License</sys:String>
     <sys:String x:Key="LOCContributorsLabel">Contributors</sys:String>
     <sys:String x:Key="LOCClosingPlaynite">Exiting Playnite…</sys:String>
@@ -250,11 +252,15 @@ Selecting "add to exclusion list" option will prevent games from being imported
     <sys:String x:Key="LOCMenuLinksTitle">Links</sys:String>
     <sys:String x:Key="LOCMenuHelpTitle">Help</sys:String>
     <sys:String x:Key="LOCMenuPatreonSupport">Support on Patreon</sys:String>
+    <sys:String x:Key="LOCMenuKofiSupport">Support on Ko-fi</sys:String>
+    <sys:String x:Key="LOCUserManual">User manual</sys:String>
     <sys:String x:Key="LOCSDKDocumentation">SDK Documentation</sys:String>
     <sys:String x:Key="LOCMenuRestartSystem">Restart System</sys:String>
     <sys:String x:Key="LOCMenuShutdownSystem">Turn Off System</sys:String>
     <sys:String x:Key="LOCMenuSuspendSystem">Suspend System</sys:String>
     <sys:String x:Key="LOCMenuHibernateSystem">Hibernate System</sys:String>
+    <sys:String x:Key="LOCMenuLockSystem">Lock System</sys:String>
+    <sys:String x:Key="LOCMenuLogoutUser">Log Out User</sys:String>
     <sys:String x:Key="LOCMenuSelectRandomGame">Pick a Random Game</sys:String>
     <!--Settings Window-->
     <sys:String x:Key="LOCSettingsDetailsPanelItems">Game fields to be displayed on details panel:</sys:String>
@@ -601,11 +607,9 @@ Please attach the following ID to your issue report:</sys:String>
 
 More information at https://playnite.link/cefstartup</sys:String>
     <sys:String x:Key="LOCEmulatorImportNoDefinitionsError">Cannot import emulators due to missing or corrupted definition file.</sys:String>
-    <sys:String x:Key="LOCXInputInitErrorMessage">Failed to initialize XInput interface.</sys:String>
     <sys:String x:Key="LOCMenuActionExecError">Failed to execute menu action.</sys:String>
     <!--GameEdit-->
     <sys:String x:Key="LOCGameEditWindowTitle">Edit Game Details</sys:String>
-    <sys:String x:Key="LOCUseExeIcon">From Play action</sys:String>
     <sys:String x:Key="LOCImageURL">Image URL</sys:String>
     <sys:String x:Key="LOCAddLinkButton">Add Link</sys:String>
     <sys:String x:Key="LOCAddRom">Add ROM</sys:String>
@@ -643,6 +647,7 @@ More information at https://playnite.link/cefstartup</sys:String>
     <sys:String x:Key="LOCDoNothing">Do nothing</sys:String>
     <sys:String x:Key="LOCMinimize">Minimize</sys:String>
     <sys:String x:Key="LOCRestoreWindow">Restore window</sys:String>
+    <sys:String x:Key="LOCRestoreWindowOnlyFromUI">Restore window only when launched from UI</sys:String>
     <sys:String x:Key="LOCClose">Close</sys:String>
     <sys:String x:Key="LOCChange">Change</sys:String>
     <sys:String x:Key="LOCAdvanced">Advanced</sys:String>
@@ -776,7 +781,7 @@ More information at https://playnite.link/cefstartup</sys:String>
     <sys:String x:Key="LOCDescriptionSizeBytes">Install size is indicated in bytes.</sys:String>
     <sys:String x:Key="LOCReleaseDateTooltip">Release date must be set in 'year-month-day' format. Month and Day values can be omitted.</sys:String>
     <sys:String x:Key="LOCDescriptionScoreValues">Values from 0 to 100 or empty for no score.</sys:String>
-    <sys:String x:Key="LOCPatreonDevelopMessage">Playnite's development is supported by these patrons:</sys:String>
+    <sys:String x:Key="LOCPatreonDevelopMessage">Playnite's development is supported by these patrons and Ko-fi members:</sys:String>
     <sys:String x:Key="LOCAboutContributorsMessage">Code, localization and other contributors in no particular order:</sys:String>
     <sys:String x:Key="LOCCancelMonitoringAskTitle">Cancel game monitoring?</sys:String>
     <sys:String x:Key="LOCCancelMonitoringSetupAsk">Installation monitoring is currently running. Do you want to cancel the process and return the game to the previous state?</sys:String>
@@ -955,6 +960,8 @@ If you want to install or uninstall additional integrations, use "Add-ons" optio
     <sys:String x:Key="LOCSelectActionTitle">Select action</sys:String>
     <sys:String x:Key="LOCActionTrackingMode">Tracking Mode</sys:String>
     <sys:String x:Key="LOCActionTrackingPath">Tracking Path</sys:String>
+    <sys:String x:Key="LOCActionTrackingTrackingDelay">Initial tracking delay</sys:String>
+    <sys:String x:Key="LOCActionTrackingFrequency">Tracking frequency</sys:String>
     <sys:String x:Key="LOCGameActionTypeLink">Link</sys:String>
     <sys:String x:Key="LOCGameActionTypeFile">File</sys:String>
     <sys:String x:Key="LOCGameActionTypeEmulator">Emulator</sys:String>
@@ -1000,10 +1007,10 @@ If you want to install or uninstall additional integrations, use "Add-ons" optio
 Disabling this can lead to issues with games not getting input focus on startup!</sys:String>
     <sys:String x:Key="LOCSettingsFontSize">Font Size</sys:String>
     <sys:String x:Key="LOCSettingsFontSizeSmall">Font Size Small</sys:String>
-    <sys:String x:Key="LOCSettingsXInputProcessing">XInput Device Support</sys:String>
-    <sys:String x:Key="LOCSettingsXInputProcessingDescription" xml:space="preserve">If disabled, Playnite won't accept any XInput interface inputs.
+    <sys:String x:Key="LOCSettingsXInputProcessing">Game controller support</sys:String>
+    <sys:String x:Key="LOCSettingsXInputProcessingDescription" xml:space="preserve">If disabled, Playnite won't accept any game controller inputs.
         
-Disable if you use tools that translate XInput inputs to mouse/keyboards inputs and you are getting double inputs in Playnite.</sys:String>
+Disable if you use tools that translates game controller inputs to mouse/keyboards inputs and you are getting double inputs in Playnite.</sys:String>
     <sys:String x:Key="LOCSettingsShowItemsMainMenuHeader">Show items on main menu:</sys:String>
     <sys:String x:Key="LOCSettingsSwapMainViewXAButtons">Inverted X/A main view button binding</sys:String>
     <sys:String x:Key="LOCSettingsSwapMainViewXAButtonsDescriptions">Swaps button bindings for starting a game and showing game details page on main view.</sys:String>
@@ -1246,4 +1253,7 @@ The specified date format will be used for all other dates.</sys:String>
     <sys:String x:Key="LOCDBCorruptionCrashMessage" xml:space="preserve">Library file corruption has been detected, Playnite will now shutdown.
     
 Open new issue on Playnite's GitHub page with a request to fix corruption in your files.</sys:String>
+    <sys:String x:Key="LOCUnsavedChangesAskMessage">Do you want to save changes you made?</sys:String>
+    <sys:String x:Key="LOCPortableInstallation">Portable installation</sys:String>
+    <sys:String x:Key="LOCNoControllersDetected">No controllers detected</sys:String>
 </ResourceDictionary>
diff --git a/Revisited/Theme.csproj b/Revisited/Theme.csproj
index c4eb28f..68d34d2 100644
--- a/Revisited/Theme.csproj
+++ b/Revisited/Theme.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{DEFEF902-318F-4568-AEDB-4F681A2D1D9A}</ProjectGuid>
+    <ProjectGuid>{DEFEF902-318F-4568-AEDB-4F681A2D1D9B}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Theme</RootNamespace>
@@ -41,8 +41,8 @@
     <Reference Include="Playnite.SDK">
       <HintPath>..\..\..\Playnite.SDK.dll</HintPath>
     </Reference>
-    <Reference Include="Playnite.FullscreenApp">
-      <HintPath>..\..\..\Playnite.FullscreenApp.exe</HintPath>
+    <Reference Include="Playnite.DesktopApp">
+      <HintPath>..\..\..\Playnite.DesktopApp.exe</HintPath>
     </Reference>
     <Reference Include="HtmlRenderer">
       <SpecificVersion>False</SpecificVersion>
@@ -99,11 +99,19 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Content>
+    <Content Include="Common.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
     <Content Include="Media.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="Images\ButtonPrompts\Xbox\Xbox.xaml">
+    <Content Include="DefaultControls\Border.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="DefaultControls\TextBlock.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Content>
@@ -111,7 +119,35 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="DefaultControls\Slider.xaml">
+    <Content Include="DefaultControls\Button.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="DefaultControls\ComboBox.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="DefaultControls\ContextMenu.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="DefaultControls\DatePicker.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="DefaultControls\Expander.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="DefaultControls\GridSplitter.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="DefaultControls\GroupBox.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="DefaultControls\Hyperlink.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Content>
@@ -119,19 +155,27 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="DefaultControls\ComboBox.xaml">
+    <Content Include="DefaultControls\Label.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="DefaultControls\Button.xaml">
+    <Content Include="DefaultControls\ListBox.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="DefaultControls\ScrollViewer.xaml">
+    <Content Include="DefaultControls\ListView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="DefaultControls\ToolTip.xaml">
+    <Content Include="DefaultControls\Menu.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="DefaultControls\PasswordBox.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="DefaultControls\Popup.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Content>
@@ -139,91 +183,251 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Content>
+    <Content Include="DefaultControls\RadioButton.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="DefaultControls\RepeatButton.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="DefaultControls\RichTextBox.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="DefaultControls\ScrollViewer.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="DefaultControls\Slider.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="DefaultControls\TabControl.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="DefaultControls\Thumb.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
     <Content Include="DefaultControls\ToggleButton.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="CustomControls\FilterEnumListSelection.xaml">
+    <Content Include="DefaultControls\ToolTip.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="DefaultControls\TreeView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="DefaultControls\DataGrid.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="CustomControls\ExtendedListBox.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="CustomControls\ExtendedListView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="CustomControls\ExtendedDataGrid.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="CustomControls\GameMenu.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="CustomControls\GameGroupMenu.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="CustomControls\HtmlTextView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="CustomControls\TrayContextMenu.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="CustomControls\NumericBoxes.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="CustomControls\SliderEx.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="CustomControls\ExpanderEx.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="CustomControls\WindowBase.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="CustomControls\SidebarItem.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="CustomControls\ComboBoxList.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="CustomControls\FilterSelectionBox.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="CustomControls\SearchBox.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="CustomControls\TopPanelItem.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="CustomControls\PathSelectionBox.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="CustomControls\HotKeyBox.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="DerivedStyles\TextBlockGameScore.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="DerivedStyles\PropertyItemButton.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="DerivedStyles\DetailsScrollViewer.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="DerivedStyles\Simplebutton.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="DerivedStyles\GridViewGroupStyle.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="DerivedStyles\GridViewItemStyle.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="DerivedStyles\GridViewItemTemplate.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="DerivedStyles\DetailsViewItemTemplate.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="DerivedStyles\DetailsViewGroupStyle.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="DerivedStyles\DetailsViewItemStyle.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="DerivedStyles\ListViewGroupStyle.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="DerivedStyles\StandardWindowStyle.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="DerivedStyles\WindowBarButton.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="CustomControls\FilterStringListSelection.xaml">
+    <Content Include="DerivedStyles\BottomButton.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="CustomControls\FilterDbItemtSelection.xaml">
+    <Content Include="DerivedStyles\DetailsHyperlink.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="CustomControls\FilterPresetSelector.xaml">
+    <Content Include="DerivedStyles\HighlightBorder.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="DerivedStyles\ListGameItemStyle.xaml">
+    <Content Include="DerivedStyles\ImageHighlightButton.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="DerivedStyles\ListGameItemTemplate.xaml">
+    <Content Include="DerivedStyles\MainWindowStyle.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="DerivedStyles\ButtonBottomMenu.xaml">
+    <Content Include="DerivedStyles\PlayButton.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="DerivedStyles\ButtonTopMenu.xaml">
+    <Content Include="DerivedStyles\NotificationMessage.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="Views\FiltersAdditional.xaml">
+    <Content Include="Views\Sidebar.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="Views\FiltersView.xaml">
+    <Content Include="Views\ExplorerPanel.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="Views\GameDetails.xaml">
+    <Content Include="Views\FilterPanelView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="Views\GameMenu.xaml">
+    <Content Include="Views\TopPanel.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="Views\GameStatus.xaml">
+    <Content Include="Views\NotificationPanel.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="Views\Main.xaml">
+    <Content Include="Views\DetailsViewGameOverview.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="Views\MainMenu.xaml">
+    <Content Include="Views\GridViewGameOverview.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="Views\HelpMenu.xaml">
+    <Content Include="Views\LibraryDetailsView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="Views\MessageBox.xaml">
+    <Content Include="Views\LibraryGridView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="Views\NotificationsMenu.xaml">
+    <Content Include="Views\LibraryListView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="Views\SettingsMenus.xaml">
+    <Content Include="Views\Library.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="Views\TextInput.xaml">
+    <Content Include="Views\MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="Views\ItemSelection.xaml">
+    <Content Include="Views\SearchView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Content>
diff --git a/Revisited/Theme.sln b/Revisited/Theme.sln
index 575cad8..32f8ea3 100644
--- a/Revisited/Theme.sln
+++ b/Revisited/Theme.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.28307.539
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBD}") = "Theme", "Theme.csproj", "{DEFEF902-318F-4568-AEDB-4F681A2D1D9A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Theme", "Theme.csproj", "{DEFEF902-318F-4568-AEDB-4F681A2D1D9B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -11,10 +11,10 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DEFEF902-318F-4568-AEDB-4F681A2D1D9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DEFEF902-318F-4568-AEDB-4F681A2D1D9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DEFEF902-318F-4568-AEDB-4F681A2D1D9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DEFEF902-318F-4568-AEDB-4F681A2D1D9A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DEFEF902-318F-4568-AEDB-4F681A2D1D9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DEFEF902-318F-4568-AEDB-4F681A2D1D9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DEFEF902-318F-4568-AEDB-4F681A2D1D9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DEFEF902-318F-4568-AEDB-4F681A2D1D9B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Revisited/Views/GameDetails.xaml b/Revisited/Views/GameDetails.xaml
index 2b40339..5fecebb 100644
--- a/Revisited/Views/GameDetails.xaml
+++ b/Revisited/Views/GameDetails.xaml
@@ -25,12 +25,36 @@
                             <RowDefinition Height="1.5*" />
                         </Grid.RowDefinitions>
 
-                        <FadeImage HorizontalAlignment="Center" VerticalAlignment="Top" Grid.RowSpan="4" x:Name="PART_ImageBackground" />
+                        <ContentControl x:Name="BackgroundChanger_PluginBackgroundImage" HorizontalAlignment="Center" VerticalAlignment="Top" Grid.RowSpan="4" >
+                            <ContentControl.Style>
+                                <Style>
+                                    <Setter Property="ItemsControl.Visibility" Value="Collapsed" />
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{PluginSettings Plugin=BackgroundChanger, Path=HasDataBackground, FallbackValue=False}" Value="True">
+                                            <Setter Property="ItemsControl.Visibility" Value="Visible" />
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </ContentControl.Style>
+                        </ContentControl>
 
-                        <Image Grid.Row="1" Margin="50,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" Source="{Binding IconObjectCached}" MaxHeight="630" MaxWidth="650">
+                        <Image HorizontalAlignment="Center" VerticalAlignment="Top" Grid.RowSpan="4"  Stretch="Uniform" Source="{Binding BackgroundImage, Converter={StaticResource ImageStringToImageConverter}, IsAsync=False}">
                             <Image.Style>
                                 <Style>
                                     <Setter Property="ItemsControl.Visibility" Value="Collapsed" />
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding ElementName=BackgroundChanger_PluginBackgroundImage, Path=Visibility}" Value="Collapsed" >
+                                            <Setter Property="ItemsControl.Visibility" Value="Visible" />
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </Image.Style>
+                        </Image>
+
+                        <StackPanel x:Name="AffLogo" Grid.Row="1" Margin="50,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" MaxHeight="630" MaxWidth="650">
+                            <StackPanel.Style>
+                                <Style TargetType="StackPanel">
+                                    <Setter Property="Visibility" Value="Collapsed" />
                                     <Style.Triggers>
                                         <DataTrigger Binding="{Settings FullscreenItemSpacingMargin}" Value="0,0,0,0">
                                             <Setter Property="ItemsControl.Visibility" Value="Visible" />
@@ -40,8 +64,39 @@
                                         </DataTrigger>
                                     </Style.Triggers>
                                 </Style>
-                            </Image.Style>
-						</Image>
+                            </StackPanel.Style>
+
+                            <StackPanel x:Name="LogoExtension">
+                                <StackPanel.Style>
+                                    <Style TargetType="StackPanel">
+                                        <Setter Property="Visibility" Value="Collapsed" />
+                                        <Style.Triggers>
+                                            <DataTrigger Binding="{PluginSettings Plugin=ExtraMetadataLoader, Path=IsLogoAvailable, FallbackValue=False}" Value="True">
+                                                <Setter Property="Visibility" Value="Visible" />
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </StackPanel.Style>
+                                <ContentControl x:Name="ExtraMetadataLoader_LogoLoaderControl" />
+                            </StackPanel>
+
+                            <Image x:Name="LogoIcone" Source="{Binding IconObjectCached}">
+                                <Image.Style>
+                                    <Style>
+                                        <Setter Property="ItemsControl.Visibility" Value="Collapsed"/>
+                                        <Style.Triggers>
+                                            <MultiDataTrigger>
+                                                <MultiDataTrigger.Conditions>
+                                                    <Condition Binding="{Binding IconObjectCached, Converter={StaticResource NullToBoolConverter}}" Value="True"/>
+                                                    <Condition Binding="{Binding ElementName=LogoExtension, Path=Visibility}" Value="Collapsed" />
+                                                </MultiDataTrigger.Conditions>
+                                                <Setter Property="ItemsControl.Visibility" Value="Visible" />
+                                            </MultiDataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </Image.Style>
+                            </Image>
+                        </StackPanel>
 
                         <StackPanel x:Name="LeTest" Grid.Row="2" Margin="80,5,5,5" HorizontalAlignment="Left" VerticalAlignment="Bottom" Opacity="1.0" 
                                     FocusManager.FocusedElement="{Binding ElementName=PART_ButtonContext}">
@@ -54,14 +109,21 @@
                                 </TextBlock.Effect>
                                 <TextBlock.Style>
                                     <Style TargetType="TextBlock" BasedOn="{StaticResource TextBlockBaseStyle}">
-                                        <Setter Property="ItemsControl.Visibility" Value="Visible" />
+                                        <Setter Property="ItemsControl.Visibility" Value="Collapsed" />
                                         <Style.Triggers>
-                                            <DataTrigger Binding="{Settings FullscreenItemSpacingMargin}" Value="0,0,0,0">
-                                                <Setter Property="ItemsControl.Visibility" Value="Collapsed" />
+                                            <DataTrigger Binding="{Binding ElementName=AffLogo, Path=Visibility}" Value="Collapsed">
+                                                <Setter Property="ItemsControl.Visibility" Value="Visible" />
                                             </DataTrigger>
-                                            <DataTrigger Binding="{Binding IconObjectCached}" Value="{x:Null}">
+                                            <DataTrigger Binding="{Settings FullscreenItemSpacingMargin}" Value="0.1875,0,0.1875,0">
                                                 <Setter Property="ItemsControl.Visibility" Value="Visible" />
                                             </DataTrigger>
+                                            <MultiDataTrigger>
+                                                <MultiDataTrigger.Conditions>
+                                                    <Condition Binding="{Binding ElementName=LogoIcone, Path=Visibility}" Value="Collapsed" />
+                                                    <Condition Binding="{Binding ElementName=LogoExtension, Path=Visibility}" Value="Collapsed" />
+                                                </MultiDataTrigger.Conditions>
+                                                <Setter Property="ItemsControl.Visibility" Value="Visible" />
+                                            </MultiDataTrigger>
                                         </Style.Triggers>
                                     </Style>
                                 </TextBlock.Style>
@@ -174,6 +236,15 @@
 
 
                     <ControlTemplate.Triggers>
+                        <DataTrigger Binding="{Binding ElementName=PART_ElemGameDetails, Path=Visibility}" Value="Visible">
+                            <DataTrigger.EnterActions>
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetProperty="Opacity" BeginTime="0:0:0" Duration="0:0:0.3" From="0" To="1"/>
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </DataTrigger.EnterActions>
+                        </DataTrigger>
                         <Trigger Property="IsFocused" SourceName="MasqTout" Value="True">
                             <Trigger.EnterActions>
                                 <BeginStoryboard>
@@ -186,6 +257,10 @@
                                             <LinearDoubleKeyFrame Value = "0.7" KeyTime = "0:0:0"/>
                                             <LinearDoubleKeyFrame Value = "0.0" KeyTime = "0:0:1"/>
                                         </DoubleAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="AffLogo" Storyboard.TargetProperty="Opacity" Duration="0:0:1">
+                                            <LinearDoubleKeyFrame Value = "1.0" KeyTime = "0:0:0"/>
+                                            <LinearDoubleKeyFrame Value = "0.0" KeyTime = "0:0:1"/>
+                                        </DoubleAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </BeginStoryboard>
                             </Trigger.EnterActions>
@@ -200,6 +275,10 @@
                                             <LinearDoubleKeyFrame Value = "0.0" KeyTime = "0:0:0"/>
                                             <LinearDoubleKeyFrame Value = "0.7" KeyTime = "0:0:1"/>
                                         </DoubleAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="AffLogo" Storyboard.TargetProperty="Opacity" Duration="0:0:1">
+                                            <LinearDoubleKeyFrame Value = "0.0" KeyTime = "0:0:0"/>
+                                            <LinearDoubleKeyFrame Value = "1.0" KeyTime = "0:0:1"/>
+                                        </DoubleAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </BeginStoryboard>
                             </Trigger.ExitActions>
@@ -239,6 +318,17 @@
                                                 <Thickness>0,0,0,-50</Thickness>
                                             </ThicknessAnimation.To>
                                         </ThicknessAnimation>
+                                        <ThicknessAnimation Duration="0:0:1" 
+                                                            Storyboard.TargetName="AffLogo" 
+                                                            Storyboard.TargetProperty="Margin"
+                                                            >
+                                            <ThicknessAnimation.To>
+                                                <Thickness>206,0,0,200</Thickness>
+                                            </ThicknessAnimation.To>
+                                            <ThicknessAnimation.EasingFunction>
+                                                <CircleEase EasingMode="EaseOut"/>
+                                            </ThicknessAnimation.EasingFunction>
+                                        </ThicknessAnimation>
                                     </Storyboard>
                                 </BeginStoryboard>
                             </Trigger.EnterActions>
@@ -276,6 +366,17 @@
                                                 <CircleEase EasingMode="EaseOut"/>
                                             </ThicknessAnimation.EasingFunction>
                                         </ThicknessAnimation>
+                                        <ThicknessAnimation Duration="0:0:1" 
+                                                            Storyboard.TargetName="AffLogo" 
+                                                            Storyboard.TargetProperty="Margin"
+                                                            >
+                                            <ThicknessAnimation.To>
+                                                <Thickness>50,0,0,0</Thickness>
+                                            </ThicknessAnimation.To>
+                                            <ThicknessAnimation.EasingFunction>
+                                                <CircleEase EasingMode="EaseOut"/>
+                                            </ThicknessAnimation.EasingFunction>
+                                        </ThicknessAnimation>
                                     </Storyboard>
                                 </BeginStoryboard>
                             </Trigger.ExitActions>
diff --git a/Revisited/Views/MainMenu.xaml b/Revisited/Views/MainMenu.xaml
index dc6c5c1..5660e5f 100644
--- a/Revisited/Views/MainMenu.xaml
+++ b/Revisited/Views/MainMenu.xaml
@@ -116,10 +116,32 @@
             <TextBlock Text="{DynamicResource LOCMenuPatreonSupport}" VerticalAlignment="Center" />
         </StackPanel>
     </DataTemplate>
-    
+
+    <DataTemplate x:Key="MainMenuKofiButtonTemplate">
+        <StackPanel Orientation="Horizontal">
+            <TextBlock Text="{DynamicResource LOCMenuKofiSupport}" VerticalAlignment="Center" />
+        </StackPanel>
+    </DataTemplate>
+
     <DataTemplate x:Key="MainMenuMinimizeButtonTemplate">
         <StackPanel Orientation="Horizontal">
             <TextBlock Text="{DynamicResource LOCMinimize}" VerticalAlignment="Center" />
         </StackPanel>
     </DataTemplate>
+
+    <DataTemplate x:Key="MainMenuLockSystemButtonTemplate">
+        <StackPanel Orientation="Horizontal">
+            <TextBlock Text="&#xef7a;" FontFamily="{DynamicResource FontIcoFont}" FontSize="24"
+                       VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0,0,10,0"/>
+            <TextBlock Text="{DynamicResource LOCMenuLockSystem}" VerticalAlignment="Center" />
+        </StackPanel>
+    </DataTemplate>
+
+    <DataTemplate x:Key="MainMenuLogoutUserButtonTemplate">
+        <StackPanel Orientation="Horizontal">
+            <TextBlock Text="&#xefe9;" FontFamily="{DynamicResource FontIcoFont}" FontSize="24"
+                       VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0,0,10,0"/>
+            <TextBlock Text="{DynamicResource LOCMenuLogoutUser}" VerticalAlignment="Center" />
+        </StackPanel>
+    </DataTemplate>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Revisited/Views/SettingsMenus.xaml b/Revisited/Views/SettingsMenus.xaml
index 0bcef08..a92443c 100644
--- a/Revisited/Views/SettingsMenus.xaml
+++ b/Revisited/Views/SettingsMenus.xaml
@@ -73,6 +73,9 @@
                         </Grid>
                     </Grid>
                     <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.5" />
+                        </Trigger>
                         <Trigger Property="IsChecked" Value="True">
                             <Setter Property="Visibility" Value="Visible" TargetName="CheckIcon" />
                         </Trigger>
diff --git a/Revisited/theme.yaml b/Revisited/theme.yaml
index 0b9c35d..ced2e3f 100644
--- a/Revisited/theme.yaml
+++ b/Revisited/theme.yaml
@@ -1,6 +1,6 @@
-ThemeApiVersion: 2.1.0
+ThemeApiVersion: 2.6.0
 Mode: Fullscreen
 Id: Revisited_75824c9b-aa0e-43ad-a98c-9b4c44f07848
 Name: Revisited
 Author: ld892012
-Version: 1.7.3
+Version: 2.0.0