From 765a06121e6056479b9f522ff4c6c2c8b89a4273 Mon Sep 17 00:00:00 2001
From: Thomas May <wamwoowam@gmail.com>
Date: Tue, 10 Sep 2024 15:57:06 +0100
Subject: [PATCH] Initial Themes 2.0 work

---
 Unicord.Universal/App.xaml                    |  37 +-
 Unicord.Universal/App.xaml.cs                 |   6 +-
 .../Commands/Users/ShowUserOverlayCommand.cs  |  12 +-
 .../Channels/ChannelPageHeaderControl.xaml    |  35 +-
 .../Channels/ChannelPageHeaderControl.xaml.cs |   8 +-
 .../Dialogs/ProfileOverlay.xaml.cs            |   4 +-
 Unicord.Universal/MainPage.xaml               |  99 ++--
 Unicord.Universal/MainPage.xaml.cs            |  80 +---
 .../Models/Channels/ChannelPageViewModel.cs   |   2 +-
 .../Channels/ChannelPageViewModelBase.cs      |  41 ++
 .../Models/Channels/ForumChannelViewModel.cs  |   4 +-
 .../Models/Messages/MessageViewModel.cs       |   2 +
 .../Models/SearchPageViewModel.cs             |  39 +-
 Unicord.Universal/Models/ViewModelbase.cs     |  21 +-
 Unicord.Universal/Pages/ChannelPage.xaml      |  10 +-
 Unicord.Universal/Pages/ChannelPage.xaml.cs   |  10 +-
 Unicord.Universal/Pages/DiscordPage.xaml      | 424 ++++++++++--------
 Unicord.Universal/Pages/DiscordPage.xaml.cs   |  69 +--
 .../Pages/Overlay/UserInfoOverlayPage.xaml    |  13 +
 .../Pages/Overlay/UserInfoOverlayPage.xaml.cs |  42 ++
 .../Pages/Settings/SettingsPage.xaml          |   3 +-
 .../Pages/Subpages/FriendsPage.xaml           |  17 +-
 .../Pages/Subpages/FriendsPage.xaml.cs        |  15 +-
 .../Pages/Subpages/SearchPage.xaml.cs         |   3 +-
 .../Pages/Subpages/UserListPage.xaml.cs       |  14 +-
 .../Services/DiscordNavigationService.cs      |   8 +-
 .../Services/SplitPaneService.cs              | 160 +++++++
 .../Services/SwipeOpenService.cs              |   2 +-
 Unicord.Universal/Services/ThemeService.cs    |  47 ++
 Unicord.Universal/Themes/RS2.xaml             |   9 -
 .../Themes/RS2/ContentDialog.xaml             | 315 -------------
 Unicord.Universal/Themes/Styles/Fluent.xaml   | 114 +++++
 .../Themes/Styles/Performance.xaml            | 185 ++++++++
 .../Themes/Styles/SunValley.xaml              | 108 +++++
 Unicord.Universal/Themes/ThemeResources.cs    |  36 ++
 Unicord.Universal/Unicord.Universal.csproj    |  24 +-
 36 files changed, 1174 insertions(+), 844 deletions(-)
 create mode 100644 Unicord.Universal/Models/Channels/ChannelPageViewModelBase.cs
 create mode 100644 Unicord.Universal/Pages/Overlay/UserInfoOverlayPage.xaml
 create mode 100644 Unicord.Universal/Pages/Overlay/UserInfoOverlayPage.xaml.cs
 create mode 100644 Unicord.Universal/Services/SplitPaneService.cs
 create mode 100644 Unicord.Universal/Services/ThemeService.cs
 delete mode 100644 Unicord.Universal/Themes/RS2.xaml
 delete mode 100644 Unicord.Universal/Themes/RS2/ContentDialog.xaml
 create mode 100644 Unicord.Universal/Themes/Styles/Fluent.xaml
 create mode 100644 Unicord.Universal/Themes/Styles/Performance.xaml
 create mode 100644 Unicord.Universal/Themes/Styles/SunValley.xaml
 create mode 100644 Unicord.Universal/Themes/ThemeResources.cs

diff --git a/Unicord.Universal/App.xaml b/Unicord.Universal/App.xaml
index 2d8efb63..3a60be30 100644
--- a/Unicord.Universal/App.xaml
+++ b/Unicord.Universal/App.xaml
@@ -30,14 +30,11 @@
                 </ResourceDictionary>
             </ResourceDictionary.ThemeDictionaries>
             <ResourceDictionary.MergedDictionaries>
-                <!-- TODO: V1/V2 resources globally -->
-                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" ControlsResourcesVersion="Version2"/>
+                <ThemeResources xmlns="using:Unicord.Universal.Themes"/>
 
                 <ResourceDictionary Source="Themes/Colours.xaml"/>
                 <ResourceDictionary Source="Themes/Generic.xaml"/>
                 <ResourceDictionary Source="Themes/CustomStyles.xaml"/>
-
-                <ResourceDictionary Source="Themes/RS2.xaml"/>
                 
                 <!-- Resource dictionaries with code behinds must be instantated like this for InitializeComponent to be called -->
                 <Templates xmlns="using:Unicord.Universal.Resources"/>
@@ -84,37 +81,7 @@
 
             <FontFamily x:Key="FluentSystemIcons">/Assets/FluentSystemIcons-Regular.ttf#FluentSystemIcons-Regular</FontFamily>
             <FontFamily x:Key="SymbolThemeFontFamily">/Assets/SegoeIcons.ttf#Segoe Fluent Icons</FontFamily>
-            <StaticResource x:Key="SegoeMDL2Assets" ResourceKey="SymbolThemeFontFamily"/>
-            
-            <Style x:Key="CleanButtonStyle" TargetType="Button" BasedOn="{StaticResource DefaultButtonStyle}">
-                <Setter Property="Background" Value="Transparent"/>
-            </Style>
-
-            <Style x:Key="StretchyIconButtonStyle" TargetType="Button" BasedOn="{StaticResource CleanButtonStyle}">
-                <Setter Property="BorderBrush" Value="Transparent" />
-                <Setter Property="FontFamily" Value="{StaticResource SymbolThemeFontFamily}"/>
-                <Setter Property="FontSize" Value="16"/>
-            </Style>
-
-            <Style x:Key="IconButtonStyle" TargetType="Button" BasedOn="{StaticResource StretchyIconButtonStyle}">
-                <!--<Setter Property="MinWidth" Value="32"/>
-                <Setter Property="Height" Value="32"/>-->
-                <Setter Property="Padding" Value="8" />
-            </Style>
-
-            <Style x:Key="StretchyIconToggleButtonStyle" TargetType="ToggleButton" BasedOn="{StaticResource DefaultToggleButtonStyle}">
-                <Setter Property="Background" Value="Transparent"/>
-                <Setter Property="FontFamily" Value="{StaticResource SymbolThemeFontFamily}"/>
-                <Setter Property="FontSize" Value="16"/>
-                <Setter Property="BorderThickness" Value="1"/>
-                <Setter Property="UseLayoutRounding" Value="True"/>
-                <Setter Property="BorderBrush" Value="Transparent" />
-            </Style>
-
-            <Style x:Key="IconToggleButtonStyle" TargetType="ToggleButton" BasedOn="{StaticResource StretchyIconToggleButtonStyle}">
-                <Setter Property="Padding" Value="8" />
-            </Style>
-            
+            <StaticResource x:Key="SegoeMDL2Assets" ResourceKey="SymbolThemeFontFamily"/>                        
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/Unicord.Universal/App.xaml.cs b/Unicord.Universal/App.xaml.cs
index 7c05b320..41d3aac1 100644
--- a/Unicord.Universal/App.xaml.cs
+++ b/Unicord.Universal/App.xaml.cs
@@ -55,8 +55,10 @@ sealed partial class App : Application
         private static TaskCompletionSource<ReadyEventArgs> _readySource = new TaskCompletionSource<ReadyEventArgs>();
 
         internal static DiscordClient Discord { get; set; }
-        internal static ApplicationDataStorageHelper LocalSettings { get; } = ApplicationDataStorageHelper.GetCurrent();
-        internal static ApplicationDataStorageHelper RoamingSettings { get; } = ApplicationDataStorageHelper.GetCurrent();
+        internal static ApplicationDataStorageHelper LocalSettings { get; } 
+            = ApplicationDataStorageHelper.GetCurrent();
+        internal static ApplicationDataStorageHelper RoamingSettings { get; } 
+            = ApplicationDataStorageHelper.GetCurrent();
 
         public App()
         {
diff --git a/Unicord.Universal/Commands/Users/ShowUserOverlayCommand.cs b/Unicord.Universal/Commands/Users/ShowUserOverlayCommand.cs
index d19be548..f6e1de7d 100644
--- a/Unicord.Universal/Commands/Users/ShowUserOverlayCommand.cs
+++ b/Unicord.Universal/Commands/Users/ShowUserOverlayCommand.cs
@@ -7,6 +7,8 @@
 using DSharpPlus.Entities;
 using Microsoft.AppCenter.Analytics;
 using Unicord.Universal.Models.User;
+using Unicord.Universal.Pages.Overlay;
+using Unicord.Universal.Services;
 using Windows.UI.Xaml;
 
 namespace Unicord.Universal.Commands.Users
@@ -17,15 +19,11 @@ public ShowUserOverlayCommand(UserViewModel viewModel) : base(viewModel)
         {
         }
 
-        public override void Execute(object parameter)
+        public override async void Execute(object parameter)
         {
             // TODO: will probably be reworked
-            var page = Window.Current.Content.FindChild<MainPage>();
-            if (page != null)
-            {
-                Analytics.TrackEvent("ShowUserOverlayCommand_Invoked");
-                page.ShowUserOverlay(viewModel, true);
-            }
+            await OverlayService.GetForCurrentView()
+                .ShowOverlayAsync<UserInfoOverlayPage>(viewModel);
         }
     }
 }
diff --git a/Unicord.Universal/Controls/Channels/ChannelPageHeaderControl.xaml b/Unicord.Universal/Controls/Channels/ChannelPageHeaderControl.xaml
index c1e857a7..6c1af40f 100644
--- a/Unicord.Universal/Controls/Channels/ChannelPageHeaderControl.xaml
+++ b/Unicord.Universal/Controls/Channels/ChannelPageHeaderControl.xaml
@@ -24,8 +24,9 @@
 
     <Grid x:Name="TopGrid"
           VerticalAlignment="Top"
-          BorderThickness="0,0,0,1"
-          BorderBrush="{ThemeResource DividerStrokeColorDefaultBrush}">
+          Background="{ThemeResource ChannelPage_Header_Background}"
+          BorderBrush="{ThemeResource ChannelPage_Header_BorderBrush}"
+          BorderThickness="{StaticResource ChannelPage_Header_BorderThickness}">
         <Grid.RowDefinitions>
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
@@ -54,9 +55,9 @@
                     <!--  because VisualStateManager is wank  -->
                     <Grid x:Name="ShowSidebarButtonContainer" Margin="4,0,-4,0">
                         <Button x:Name="ShowSidebarButton"
-                                    Click="ShowSidebarButton_Click"
-                                    Content="&#xE700;"
-                                    Style="{ThemeResource IconButtonStyle}" />
+                                Content="&#xE700;"
+                                Command="{x:Bind ViewModel.LeftPaneCommand}"
+                                Style="{ThemeResource IconButtonStyle}" />
                     </Grid>
 
                     <users:AvatarControl x:Name="UserImage"
@@ -121,18 +122,17 @@
                     <ToggleButton x:Name="MuteButton"
                                   x:Uid="/ChannelPage/MuteButton"
                                   Content="&#xE74F;"
-                                  Margin="2,4"
                                   IsChecked="{x:Bind ViewModel.Muted, Mode=OneWay}"
-                                  Style="{ThemeResource IconToggleButtonStyle}">
+                                  Style="{ThemeResource ChannelPageHeaderToggleButtonStyle}">
                         <w1709:ToggleButton.KeyboardAccelerators>
                             <w1709:KeyboardAccelerator Modifiers="Control" Key="M"/>
                         </w1709:ToggleButton.KeyboardAccelerators>
                     </ToggleButton>
                     <Button x:Name="SearchButton"
                             x:Uid="/ChannelPage/SearchButton"
+                            Command="{x:Bind ViewModel.SearchCommand}"
                             Content="&#xE721;"
-                            Margin="2,4"
-                            Style="{ThemeResource IconButtonStyle}">
+                            Style="{ThemeResource ChannelPageHeaderButtonStyle}">
                         <w1709:Button.KeyboardAccelerators>
                             <w1709:KeyboardAccelerator Modifiers="Control" Key="S"/>
                         </w1709:Button.KeyboardAccelerators>
@@ -140,9 +140,9 @@
                     <Button x:Name="PinsButton"
                             x:Uid="/ChannelPage/PinsButton"
                             x:Load="{x:Bind ViewModel.ShowPinsButton}"
+                            Command="{x:Bind ViewModel.PinsCommand}"
                             Content="&#xE718;"
-                            Margin="2,4"
-                            Style="{ThemeResource IconButtonStyle}">
+                            Style="{ThemeResource ChannelPageHeaderButtonStyle}">
                         <w1709:Button.KeyboardAccelerators>
                             <w1709:KeyboardAccelerator Modifiers="Control" Key="P"/>
                         </w1709:Button.KeyboardAccelerators>
@@ -150,9 +150,9 @@
                     <Button x:Name="UserListButton"
                             x:Uid="/ChannelPage/UserListButton"
                             x:Load="{x:Bind ViewModel.ShowUserlistButton}"
+                            Command="{x:Bind ViewModel.UserListCommand}"
                             Content="&#xE716;"
-                            Margin="4"
-                            Style="{ThemeResource IconButtonStyle}">
+                            Style="{ThemeResource ChannelPageHeaderButtonStyle}">
                         <w1709:Button.KeyboardAccelerators>
                             <w1709:KeyboardAccelerator Modifiers="Control" Key="U"/>
                         </w1709:Button.KeyboardAccelerators>
@@ -163,8 +163,7 @@
                         x:Uid="/ChannelPage/MoreOptionsButton"
                         x:Load="{x:Bind ViewModel.ShowExtendedItems}"
                         Content="&#xE712;"
-                        Margin="2,4"
-                        Style="{ThemeResource IconButtonStyle}">
+                        Style="{ThemeResource ChannelPageHeaderButtonStyle}">
                         <lib:DropDownButton.Flyout>
                             <lib:MenuBarItemFlyout>
                                 <MenuFlyoutItem x:Name="PinToStartItem"
@@ -210,14 +209,12 @@
                             x:Uid="/ChannelPage/DeleteAllButton"
                             Command="{Binding MassDeleteCommand}"
                             Content="&#xE74D;"
-                            Margin="2,4"
-                            Style="{ThemeResource IconButtonStyle}"/>
+                            Style="{ThemeResource ChannelPageHeaderButtonStyle}"/>
                     <Button x:Name="CloseEditButton"
                             x:Uid="/ChannelPage/CloseEditButton"
                             Command="{Binding ExitEditModeCommand}"
                             Content="&#xE711;"
-                            Margin="2,4"
-                            Style="{ThemeResource IconButtonStyle}"/>
+                            Style="{ThemeResource ChannelPageHeaderButtonStyle}"/>
                 </StackPanel>
 
                 <Border Margin="0,8,-24,8" BorderBrush="{ThemeResource DividerStrokeColorDefaultBrush}" BorderThickness="0,0,1,0" />
diff --git a/Unicord.Universal/Controls/Channels/ChannelPageHeaderControl.xaml.cs b/Unicord.Universal/Controls/Channels/ChannelPageHeaderControl.xaml.cs
index 8161a0eb..bf88138c 100644
--- a/Unicord.Universal/Controls/Channels/ChannelPageHeaderControl.xaml.cs
+++ b/Unicord.Universal/Controls/Channels/ChannelPageHeaderControl.xaml.cs
@@ -23,14 +23,14 @@ namespace Unicord.Universal.Controls.Channels
 {
     public sealed partial class ChannelPageHeaderControl : UserControl
     {
-        public ChannelViewModel ViewModel
+        public ChannelPageViewModelBase ViewModel
         {
-            get { return (ChannelViewModel)GetValue(ViewModelProperty); }
+            get { return (ChannelPageViewModelBase)GetValue(ViewModelProperty); }
             set { SetValue(ViewModelProperty, value); }
         }
 
         public static readonly DependencyProperty ViewModelProperty =
-            DependencyProperty.Register("ViewModel", typeof(ChannelViewModel), typeof(ChannelPageHeaderControl), new PropertyMetadata(null));
+            DependencyProperty.Register("ViewModel", typeof(ChannelPageViewModelBase), typeof(ChannelPageHeaderControl), new PropertyMetadata(null));
 
         public ChannelPageHeaderControl()
         {
@@ -55,7 +55,7 @@ private void OnLoaded(object sender, RoutedEventArgs e)
 
         private void ShowSidebarButton_Click(object sender, RoutedEventArgs e)
         {
-            this.FindParent<DiscordPage>()?.ToggleSplitPane();
+
         }
     }
 }
diff --git a/Unicord.Universal/Dialogs/ProfileOverlay.xaml.cs b/Unicord.Universal/Dialogs/ProfileOverlay.xaml.cs
index 58fed80f..fb9560c9 100644
--- a/Unicord.Universal/Dialogs/ProfileOverlay.xaml.cs
+++ b/Unicord.Universal/Dialogs/ProfileOverlay.xaml.cs
@@ -4,6 +4,7 @@
 using DSharpPlus.Entities;
 using Unicord.Universal.Commands;
 using Unicord.Universal.Models.User;
+using Unicord.Universal.Services;
 using Windows.Foundation;
 using Windows.Foundation.Collections;
 using Windows.System;
@@ -43,7 +44,8 @@ private void DropShadowPanel_PreviewKeyUp(object sender, KeyRoutedEventArgs e)
         {
             if (e.Key == VirtualKey.Escape)
             {
-                this.FindParent<MainPage>().HideUserOverlay();
+                OverlayService.GetForCurrentView()
+                    .CloseOverlay();
             }
         }
     }
diff --git a/Unicord.Universal/MainPage.xaml b/Unicord.Universal/MainPage.xaml
index 30fa77ad..5eb6a591 100644
--- a/Unicord.Universal/MainPage.xaml
+++ b/Unicord.Universal/MainPage.xaml
@@ -1,23 +1,22 @@
-<Page
-    x:Class="Unicord.Universal.MainPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Unicord.Universal"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:p="using:Unicord.Universal.Pages"    
-    xmlns:fc="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,5)"
-    xmlns:not1709="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,5)"
-    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
-    xmlns:dialogs="using:Unicord.Universal.Dialogs"
-    xmlns:controls1="using:Unicord.Universal.Controls"
-    xmlns:lib="using:Microsoft.UI.Xaml.Controls"
-    xmlns:media="using:Microsoft.UI.Xaml.Media" 
-    xmlns:media1="using:Microsoft.Toolkit.Uwp.UI.Media"
-    mc:Ignorable="d" 
-    Loaded="Page_Loaded" 
-    Unloaded="Page_Unloaded" 
-    NavigationCacheMode="Required">
+<Page x:Class="Unicord.Universal.MainPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:local="using:Unicord.Universal"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      xmlns:p="using:Unicord.Universal.Pages"    
+      xmlns:fc="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,5)"
+      xmlns:not1709="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,5)"
+      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+      xmlns:dialogs="using:Unicord.Universal.Dialogs"
+      xmlns:controls1="using:Unicord.Universal.Controls"
+      xmlns:lib="using:Microsoft.UI.Xaml.Controls"
+      xmlns:media="using:Microsoft.UI.Xaml.Media" 
+      xmlns:media1="using:Microsoft.Toolkit.Uwp.UI.Media"
+      mc:Ignorable="d" 
+      Loaded="Page_Loaded" 
+      Unloaded="Page_Unloaded" 
+      NavigationCacheMode="Required">
     <Page.Resources>
         <CircleEase x:Key="CircleEase" EasingMode="EaseInOut"/>
 
@@ -98,45 +97,7 @@
                              EasingFunction="{StaticResource EaseExit}"/>
         </Storyboard>
 
-        <Storyboard x:Name="showUserOverlay" x:Key="showUserOverlay">
-
-            <DoubleAnimation From="0" To="1"
-                             Storyboard.TargetName="userInfoPopup"
-                             Storyboard.TargetProperty="Opacity"
-                             Duration="0:0:0.30"
-                             EasingFunction="{StaticResource EaseEnter}"/>
-
-            <DoubleAnimation From="0.85" To="1" 
-                             Storyboard.TargetName="userInfoScale"
-                             Storyboard.TargetProperty="(ScaleTransform.ScaleX)"
-                             Duration="0:0:0.30"
-                             EasingFunction="{StaticResource EaseEnter}"/>
-            <DoubleAnimation From="0.85" To="1" 
-                             Storyboard.TargetName="userInfoScale"
-                             Storyboard.TargetProperty="(ScaleTransform.ScaleY)"
-                             Duration="0:0:0.30"
-                             EasingFunction="{StaticResource EaseEnter}"/>
-
-        </Storyboard>
-        <Storyboard x:Name="hideUserOverlay" x:Key="hideUserOverlay"
-                    Completed="hideUserOverlay_Completed">
-            <DoubleAnimation From="1" To="0"
-                             Storyboard.TargetName="userInfoPopup"
-                             Storyboard.TargetProperty="Opacity"
-                             Duration="0:0:0.15"
-                             EasingFunction="{StaticResource EaseExit}"/>
-
-            <DoubleAnimation From="1" To="0.85" 
-                             Storyboard.TargetName="userInfoScale"
-                             Storyboard.TargetProperty="(ScaleTransform.ScaleX)"
-                             Duration="0:0:0.15"
-                             EasingFunction="{StaticResource EaseExit}"/>
-            <DoubleAnimation From="1" To="0.85" 
-                             Storyboard.TargetName="userInfoScale"
-                             Storyboard.TargetProperty="(ScaleTransform.ScaleY)"
-                             Duration="0:0:0.15"
-                             EasingFunction="{StaticResource EaseExit}"/>
-        </Storyboard>
+  
 
         <Storyboard x:Name="ShowOverlayStoryboard" x:Key="ShowOverlayStoryboard">
 
@@ -201,23 +162,15 @@
                 <Grid x:Name="overlayGrid"/>
             </Grid>
 
-            <Grid x:Name="userInfoPopup" Visibility="Collapsed" Opacity="0">
-                <Canvas Tapped="userInfoPopup_Tapped" Background="{ThemeResource SmokeFillColorDefaultBrush}"/>
-                <Grid RenderTransformOrigin="0.5, 0.5" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
-                    <Grid.RenderTransform>
-                        <ScaleTransform x:Name="userInfoScale" ScaleX="1" ScaleY="1"/>
-                    </Grid.RenderTransform>
-
-                    <dialogs:ProfileOverlay x:Name="userInfoOverlay" Visibility="Visible"/>
-                </Grid>
-            </Grid>
-
             <Grid x:Name="CustomOverlayGrid"
                   Opacity="0"
                   Visibility="Collapsed">
-                <Grid.Background>
-                    <SolidColorBrush Color="Black" Opacity="0.66"/>
-                </Grid.Background>
+                <Grid x:Name="OverlayBackdrop"
+                      Tapped="OverlayBackdrop_Tapped">
+                    <Grid.Background>
+                        <SolidColorBrush Color="Black" Opacity="0.66"/>
+                    </Grid.Background>
+                </Grid>
                 <Grid x:Name="CustomContainer"
                       RenderTransformOrigin="0.5,0.5"
                       CornerRadius="8">
diff --git a/Unicord.Universal/MainPage.xaml.cs b/Unicord.Universal/MainPage.xaml.cs
index 0b8a7ba7..626800d9 100644
--- a/Unicord.Universal/MainPage.xaml.cs
+++ b/Unicord.Universal/MainPage.xaml.cs
@@ -71,31 +71,23 @@ protected override async void OnNavigatedTo(NavigationEventArgs e)
 
         private async void Page_Loaded(object sender, RoutedEventArgs e)
         {
-            if (WindowingService.Current.IsMainWindow(WindowingService.Current.GetHandle(this)))
-            {
+            var handle = WindowingService.Current.GetHandle(this);
+            if (WindowingService.Current.IsMainWindow(handle))
                 WindowingService.Current.HandleTitleBarForWindow(TitleBar, this);
-            }
-
-            //BackdropMaterial.SetApplyToRootOrPageBackground(this, true);
 
-            var brush = new TenMicaBrush();
-            if (WindowingService.Current.IsCompactOverlay(WindowingService.Current.GetHandle(this)))
+            if (ThemeService.GetForCurrentView().GetTheme() == AppTheme.SunValley)
             {
-                brush.EnabledInActivatedNotForeground = true;
-            }
-
-            Background = brush;
+                var brush = new TenMicaBrush();
+                if (WindowingService.Current.IsCompactOverlay(handle))
+                    brush.EnabledInActivatedNotForeground = true;
 
-            //var engagementManager = StoreServicesEngagementManager.GetDefault();
-            //await engagementManager.RegisterNotificationChannelAsync();
+                Background = brush;
+            }
 
             var pane = InputPane.GetForCurrentView();
             pane.Showing += Pane_Showing;
             pane.Hiding += Pane_Hiding;
 
-            var navigation = SystemNavigationManager.GetForCurrentView();
-            navigation.BackRequested += Navigation_BackRequested;
-
             if (Arguments?.SplashScreen != null)
             {
                 PositionSplash(Arguments.SplashScreen);
@@ -105,7 +97,8 @@ private async void Page_Loaded(object sender, RoutedEventArgs e)
             try
             {
                 var vault = new PasswordVault();
-                var result = vault.FindAllByResource(Constants.TOKEN_IDENTIFIER).FirstOrDefault(t => t.UserName == "Default");
+                var result = vault.FindAllByResource(Constants.TOKEN_IDENTIFIER)
+                    .FirstOrDefault(t => t.UserName == "Default");
 
                 if (result != null)
                 {
@@ -161,9 +154,6 @@ private void RemoveEventHandlers()
             var pane = InputPane.GetForCurrentView();
             pane.Showing -= Pane_Showing;
             pane.Hiding -= Pane_Hiding;
-
-            var navigation = SystemNavigationManager.GetForCurrentView();
-            navigation.BackRequested -= Navigation_BackRequested;
         }
 
         private void Page_Unloaded(object sender, RoutedEventArgs e)
@@ -186,15 +176,6 @@ private static async Task ClearJumpListAsync()
             }
         }
 
-        internal void ShowUserOverlay(UserViewModel user, bool animate)
-        {
-            userInfoOverlay.User = user;
-            userInfoOverlay.Visibility = Visibility.Visible;
-            userInfoPopup.Visibility = Visibility.Visible;
-
-            showUserOverlay.Begin();
-        }
-
         private async Task OnFirstDiscordReady(DiscordClient client, ReadyEventArgs e)
         {
             if (!_isReady)
@@ -290,8 +271,6 @@ internal async Task GoToChannelAsync(MainPageArgs args)
                 {
                     if (App.Discord.TryGetCachedChannel(args.ChannelId, out var channel) && channel.IsAccessible())
                     {
-                        //await Dispatcher.AwaitableRunAsync(() => rootFrame.Navigate(typeof(ChannelPage), channel));
-
                         await DiscordNavigationService.GetForCurrentView()
                             .NavigateAsync(channel);
                     }
@@ -301,11 +280,6 @@ await DiscordNavigationService.GetForCurrentView()
                     var dm = App.Discord.PrivateChannels.Values
                         .FirstOrDefault(c => c.Type == ChannelType.Private && c.Recipients.Count == 1 && c.Recipients[0].Id == args.UserId);
 
-                    if (dm == null && args.UserId != 0)
-                    {
-                        // dm = await App.Discord.CreateDmChannelAsync(args.UserId);
-                    }
-
                     await DiscordNavigationService.GetForCurrentView()
                         .NavigateAsync(dm);
                 }
@@ -355,25 +329,6 @@ internal void Nagivate(Type type)
             rootFrame.Navigate(type);
         }
 
-        public void HideUserOverlay()
-        {
-            if (userInfoOverlay.Visibility == Visibility.Visible)
-            {
-                hideUserOverlay.Begin();
-            }
-        }
-
-        private void hideUserOverlay_Completed(object sender, object e)
-        {
-            userInfoOverlay.Visibility = Visibility.Collapsed;
-            userInfoPopup.Visibility = Visibility.Collapsed;
-        }
-
-        private void userInfoPopup_Tapped(object sender, TappedRoutedEventArgs e)
-        {
-            hideUserOverlay.Begin();
-        }
-
         private void Pane_Showing(InputPane sender, InputPaneVisibilityEventArgs args)
         {
             Everything.Margin = new Thickness(0, 0, 0, args.OccludedRect.Height);
@@ -386,15 +341,6 @@ private void Pane_Hiding(InputPane sender, InputPaneVisibilityEventArgs args)
             args.EnsuredFocusedElementInView = true;
         }
 
-        private void Navigation_BackRequested(object sender, BackRequestedEventArgs e)
-        {
-            if (userInfoOverlay.Visibility == Visibility.Visible)
-            {
-                e.Handled = true;
-                hideUserOverlay.Begin();
-            }
-        }
-
         public void ShowCustomOverlay()
         {
             WindowingService.Current.HandleTitleBarForControl(CustomOverlayGrid);
@@ -406,5 +352,11 @@ public void HideCustomOverlay()
             if (CustomOverlayGrid.Visibility != Visibility.Collapsed)
                 HideOverlayStoryboard.Begin();
         }
+
+        private void OverlayBackdrop_Tapped(object sender, TappedRoutedEventArgs e)
+        {
+            OverlayService.GetForCurrentView()
+                .CloseOverlay();
+        }
     }
 }
diff --git a/Unicord.Universal/Models/Channels/ChannelPageViewModel.cs b/Unicord.Universal/Models/Channels/ChannelPageViewModel.cs
index 44681ecb..e82e5ad4 100644
--- a/Unicord.Universal/Models/Channels/ChannelPageViewModel.cs
+++ b/Unicord.Universal/Models/Channels/ChannelPageViewModel.cs
@@ -33,7 +33,7 @@
 
 namespace Unicord.Universal.Models
 {
-    public class ChannelPageViewModel : ChannelViewModel, IDisposable
+    public class ChannelPageViewModel : ChannelPageViewModelBase, IDisposable
     {
         private const int INITIAL_LOAD_LIMIT = 50;
 
diff --git a/Unicord.Universal/Models/Channels/ChannelPageViewModelBase.cs b/Unicord.Universal/Models/Channels/ChannelPageViewModelBase.cs
new file mode 100644
index 00000000..81ee9356
--- /dev/null
+++ b/Unicord.Universal/Models/Channels/ChannelPageViewModelBase.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Input;
+using DSharpPlus.Entities;
+using Microsoft.Toolkit.Mvvm.Input;
+using Unicord.Universal.Pages.Subpages;
+using Unicord.Universal.Services;
+
+namespace Unicord.Universal.Models.Channels
+{
+    public class ChannelPageViewModelBase : ChannelViewModel
+    {
+        internal ChannelPageViewModelBase(DiscordChannel channel, bool isTransient = false, ViewModelBase parent = null) 
+            : base(channel, isTransient, parent)
+        {
+            CreateCommands();
+        }
+
+        internal ChannelPageViewModelBase(ulong channelId, bool isTransient = false, ViewModelBase parent = null)
+            : base(channelId, isTransient, parent)
+        {
+            CreateCommands();
+        }
+
+        private void CreateCommands()
+        {
+            LeftPaneCommand = new RelayCommand(() => SplitPaneService.GetForCurrentView().ToggleLeftPane());
+            SearchCommand = new RelayCommand(() => { SplitPaneService.GetForCurrentView().ToggleRightPane<SearchPage>(this); });
+            PinsCommand = new RelayCommand(() => { SplitPaneService.GetForCurrentView().ToggleRightPane<PinsPage>(this); });
+            UserListCommand = new RelayCommand(() => { SplitPaneService.GetForCurrentView().ToggleRightPane<UserListPage>(this); });
+        }
+
+        public ICommand LeftPaneCommand { get; private set; }
+        public ICommand SearchCommand { get; private set; }            
+        public ICommand PinsCommand { get; private set; }
+        public ICommand UserListCommand { get; private set; }
+    }
+}
diff --git a/Unicord.Universal/Models/Channels/ForumChannelViewModel.cs b/Unicord.Universal/Models/Channels/ForumChannelViewModel.cs
index f8e2877a..1c917d57 100644
--- a/Unicord.Universal/Models/Channels/ForumChannelViewModel.cs
+++ b/Unicord.Universal/Models/Channels/ForumChannelViewModel.cs
@@ -70,7 +70,7 @@ await dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
         }
     }
 
-    public class ForumThreadViewModel : ChannelViewModel
+    public class ForumThreadViewModel : ChannelPageViewModelBase
     {
         private MessageViewModel firstMessage;
         private UserViewModel creator;
@@ -124,7 +124,7 @@ public AttachmentViewModel DisplayAttachment
             => FirstMessage?.Attachments.FirstOrDefault(a => !double.IsNaN(a.NaturalWidth));
     }
 
-    public class ForumChannelViewModel : ChannelViewModel
+    public class ForumChannelViewModel : ChannelPageViewModelBase
     {
         internal ForumChannelViewModel(ulong channelId, ViewModelBase parent = null)
             : base(channelId, false, parent)
diff --git a/Unicord.Universal/Models/Messages/MessageViewModel.cs b/Unicord.Universal/Models/Messages/MessageViewModel.cs
index 67243d3a..6173bc41 100644
--- a/Unicord.Universal/Models/Messages/MessageViewModel.cs
+++ b/Unicord.Universal/Models/Messages/MessageViewModel.cs
@@ -72,6 +72,8 @@ public MessageViewModel(DiscordMessage discordMessage, ChannelPageViewModel pare
 
         private List<EmbedViewModel> GetGroupedEmbeds(DiscordMessage message)
         {
+            if (message.Embeds == null) return [];
+
             var embedGroups = message.Embeds
                 .GroupBy(g => g.Url);
 
diff --git a/Unicord.Universal/Models/SearchPageViewModel.cs b/Unicord.Universal/Models/SearchPageViewModel.cs
index b9027740..d0d3e5f5 100644
--- a/Unicord.Universal/Models/SearchPageViewModel.cs
+++ b/Unicord.Universal/Models/SearchPageViewModel.cs
@@ -6,39 +6,16 @@
 using System.Threading;
 using System.Threading.Tasks;
 using DSharpPlus.Entities;
+using Unicord.Universal.Models.Channels;
 using Unicord.Universal.Models.Messages;
 using Windows.UI.Xaml.Data;
 
 namespace Unicord.Universal.Models
 {
-    public class SearchMessageGrouping :
-        IGrouping<MessageViewModel, MessageViewModel>,
-        IReadOnlyCollection<MessageViewModel>,
-        IReadOnlyList<MessageViewModel>,
-        IEnumerable<MessageViewModel>
-    {
-        private IReadOnlyList<MessageViewModel> _value;
-
-        public SearchMessageGrouping(MessageViewModel key, IReadOnlyList<MessageViewModel> value)
-        {
-            Key = key;
-            _value = value;
-        }
-
-        public MessageViewModel this[int index] => _value[index];
-
-        public MessageViewModel Key { get; }
-
-        public int Count => _value.Count;
-
-        public IEnumerator<MessageViewModel> GetEnumerator() => _value.GetEnumerator();
-        IEnumerator IEnumerable.GetEnumerator() => ((IEnumerable)_value).GetEnumerator();
-    }
-
-    public class SearchPageViewModel : NotifyPropertyChangeImpl
+    public class SearchPageViewModel : ViewModelBase
     {
         private SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);
-        private DiscordChannel _channel;
+        private ChannelViewModel _channel;
         private int _currentPage = 1;
         private int _totalPages = 1;
         private bool _waitingForIndex;
@@ -86,11 +63,11 @@ public int TotalPages
 
         public CollectionViewSource ViewSource { get; set; }
 
-        public SearchPageViewModel(DiscordChannel channel)
+        public SearchPageViewModel(ChannelViewModel channel)
         {
             _channel = channel;
             ViewSource = new CollectionViewSource();
-            ViewSource.IsSourceGrouped = true;
+            ViewSource.IsSourceGrouped = false;
             WaitingForIndex = false;
         }
 
@@ -105,9 +82,9 @@ public async Task SearchAsync(string content)
             {
                 DiscordSearchResult result = null;
                 if (_channel.Guild != null)
-                    result = await App.Discord.SearchAsync(_channel.Guild, content, offset: (CurrentPage - 1) * 25);
+                    result = await App.Discord.SearchAsync(_channel.Guild.Guild, content, offset: (CurrentPage - 1) * 25);
                 else
-                    result = await App.Discord.SearchAsync(_channel, content, offset: (CurrentPage - 1) * 25);
+                    result = await App.Discord.SearchAsync(_channel.Channel, content, offset: (CurrentPage - 1) * 25);
 
                 if (!result.IsIndexed)
                 {
@@ -121,7 +98,7 @@ public async Task SearchAsync(string content)
                     TotalMessages = result.TotalResults;
                     TotalPages = (int)Math.Ceiling(result.TotalResults / 25d);
                     ViewSource.Source = result.Messages
-                                              .Select(g => new SearchMessageGrouping(new MessageViewModel(g.FirstOrDefault(g => g.Hit.HasValue && g.Hit.Value)), g.Select(v => new MessageViewModel(v)).ToList()))
+                                              .Select(v => new MessageViewModel(v[0]))
                                               .ToList();
                 }
             }
diff --git a/Unicord.Universal/Models/ViewModelbase.cs b/Unicord.Universal/Models/ViewModelbase.cs
index 653f8cbd..e79a6026 100644
--- a/Unicord.Universal/Models/ViewModelbase.cs
+++ b/Unicord.Universal/Models/ViewModelbase.cs
@@ -31,6 +31,7 @@ public ViewModelBase(ViewModelBase parent = null)
 
         // Holy hell is the C# Discord great.
         // Y'all should join https://aka.ms/csharp-discord
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         protected void OnPropertySet<T>(ref T oldValue, T newValue, [CallerMemberName] string property = null)
         {
             if (oldValue == null || newValue == null || !newValue.Equals(oldValue))
@@ -39,7 +40,25 @@ protected void OnPropertySet<T>(ref T oldValue, T newValue, [CallerMemberName] s
                 InvokePropertyChanged(property);
             }
         }
-        
+
+        // overload might avoid boxing?
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        protected void OnPropertySet<T>(ref T oldValue, T newValue, params string[] additionalProperties)
+        {
+            if (oldValue == null || newValue == null || !newValue.Equals(oldValue))
+            {
+                oldValue = newValue;
+                syncContext.Post((o) =>
+                {
+                    foreach (var str in additionalProperties)
+                    {
+                        var args = new PropertyChangedEventArgs(str);
+                        PropertyChanged?.Invoke(this, args);
+                    }
+                }, null);
+            }
+        }
+
         public virtual void InvokePropertyChanged([CallerMemberName] string property = null)
         {
             var args = new PropertyChangedEventArgs(property);
diff --git a/Unicord.Universal/Pages/ChannelPage.xaml b/Unicord.Universal/Pages/ChannelPage.xaml
index ac40596a..1c269eaf 100644
--- a/Unicord.Universal/Pages/ChannelPage.xaml
+++ b/Unicord.Universal/Pages/ChannelPage.xaml
@@ -242,11 +242,11 @@
                 </Grid>
 
                 <Grid Grid.Row="2" 
-                          Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-                          BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"                          
-                          BorderThickness="1"
-                          CornerRadius="4"
-                          Margin="12,0,12,12">
+                      Background="{ThemeResource ChannelPage_MessageInput_Background}"
+                      BorderBrush="{ThemeResource ChannelPage_MessageInput_BorderBrush}"                          
+                      BorderThickness="{ThemeResource ChannelPage_MessageInput_BorderThickness}"
+                      CornerRadius="{ThemeResource ChannelPage_MessageInput_CornerRadius}"
+                      Margin="{ThemeResource ChannelPage_MessageInput_Margin}">
 
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto"/>
diff --git a/Unicord.Universal/Pages/ChannelPage.xaml.cs b/Unicord.Universal/Pages/ChannelPage.xaml.cs
index a6500137..496250d6 100644
--- a/Unicord.Universal/Pages/ChannelPage.xaml.cs
+++ b/Unicord.Universal/Pages/ChannelPage.xaml.cs
@@ -534,11 +534,11 @@ private void MessageList_SelectionChanged(object sender, SelectionChangedEventAr
 
         private void MessageList_Tapped(object sender, TappedRoutedEventArgs e)
         {
-            var page = this.FindParent<DiscordPage>();
-            if (page != null)
-            {
-                page.CloseSplitPane();
-            }
+            //var page = this.FindParent<DiscordPage>();
+            //if (page != null)
+            //{
+            //    page.CloseSplitPane();
+            //}
 
             if (Window.Current.CoreWindow.GetKeyState(VirtualKey.Control) == CoreVirtualKeyStates.Down)
             {
diff --git a/Unicord.Universal/Pages/DiscordPage.xaml b/Unicord.Universal/Pages/DiscordPage.xaml
index e3cac98e..1517ddea 100644
--- a/Unicord.Universal/Pages/DiscordPage.xaml
+++ b/Unicord.Universal/Pages/DiscordPage.xaml
@@ -5,7 +5,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:controls="using:Unicord.Universal.Controls"
-    xmlns:controls1="using:Microsoft.Toolkit.Uwp.UI.Controls"
+    xmlns:toolkit="using:Microsoft.Toolkit.Uwp.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:lib="using:Microsoft.UI.Xaml.Controls"
     xmlns:sub="using:Unicord.Universal.Pages.Subpages"
@@ -14,6 +14,8 @@
     xmlns:converters="using:Unicord.Universal.Converters"
     xmlns:voice="using:Unicord.Universal.Controls.Voice"
     xmlns:triggers="using:WindowsStateTriggers" 
+    xmlns:media="using:Microsoft.Toolkit.Uwp.UI.Media"
+    xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
     NavigationCacheMode="Required"
     Loaded="Page_Loaded"
     Unloaded="Page_Unloaded"
@@ -23,9 +25,9 @@
     </Page.DataContext>
     <Page.Resources>
         <CircleEase x:Key="Ease" EasingMode="EaseInOut" />
-        
-        <Storyboard x:Key="OpenPaneMobileStoryboard" 
-                    x:Name="OpenPaneMobileStoryboard">
+
+        <Storyboard x:Key="OpenLeftPaneMobileStoryboard" 
+                    x:Name="OpenLeftPaneMobileStoryboard">
             <DoubleAnimation
                 EasingFunction="{StaticResource EaseEnter}"
                 Storyboard.TargetName="MainGridTransform"
@@ -39,6 +41,23 @@
                 To="12"
                 Duration="00:00:00.25" />
         </Storyboard>
+        
+        <Storyboard x:Key="OpenRightPaneMobileStoryboard" 
+                    x:Name="OpenRightPaneMobileStoryboard">
+            <DoubleAnimation
+                EasingFunction="{StaticResource EaseEnter}"
+                Storyboard.TargetName="MainGridTransform"
+                Storyboard.TargetProperty="X"
+                To="-292"
+                Duration="00:00:00.25" />
+            <DoubleAnimation
+                EasingFunction="{StaticResource EaseEnter}"
+                Storyboard.TargetName="CaptionTransform"
+                Storyboard.TargetProperty="X"
+                To="12"
+                Duration="00:00:00.25" />
+        </Storyboard>
+
         <Storyboard x:Key="ClosePaneMobileStoryboard"
                     x:Name="ClosePaneMobileStoryboard">
             <DoubleAnimation
@@ -54,12 +73,14 @@
                 To="0"
                 Duration="00:00:00.25" />
         </Storyboard>
-        
+
+
     </Page.Resources>
     <Grid>
         <Grid x:Name="TitleBarGrid"
               VerticalAlignment="Top" 
-              Height="32">
+              Height="32"
+              Background="{ThemeResource DiscordPage_PrimarySidebar_BackgroundBrush}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="64"/>
                 <ColumnDefinition Width="*"/>
@@ -86,16 +107,17 @@
             </TextBlock>
         </Grid>
 
-        <Grid x:Name="MainGrid">
+        <Grid x:Name="MainGrid"
+              Margin="-292,0,-292,0">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="292" />
                 <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="292" />
             </Grid.ColumnDefinitions>
 
             <Grid.RenderTransform>
                 <TransformGroup>
                     <TranslateTransform x:Name="MainGridTransform" />
-                    <TranslateTransform x:Name="MainGridTransform2" />
                 </TransformGroup>
             </Grid.RenderTransform>
 
@@ -108,15 +130,17 @@
                     <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
 
-                <Grid x:Name="sidebarMainGrid" Margin="0,32,0,0">
+                <Grid x:Name="sidebarMainGrid" 
+                      Margin="0,32,0,0"
+                      Background="{ThemeResource DiscordPage_PrimarySidebar_BackgroundBrush}">
                     <ScrollViewer>
                         <StackPanel>
-
                             <ListViewItem x:Name="CloseItem"
-                                              MinWidth="0"
-                                              Padding="0"
-                                              HorizontalContentAlignment="Stretch"
-                                              Tapped="CloseItem_Tapped">
+                                          MinWidth="0"
+                                          Padding="0"
+                                          HorizontalContentAlignment="Stretch"
+                                          Tapped="CloseItem_Tapped"
+                                          Style="{StaticResource DefaultListViewItemStyle}">
                                 <FontIcon Width="36" Height="36" Glyph="&#xE700;" />
                             </ListViewItem>
                             <ListViewItem x:Name="FriendsItem"
@@ -124,7 +148,8 @@
                                               Padding="0"
                                               IsSelected="{Binding IsFriendsSelected}"
                                               HorizontalContentAlignment="Stretch"
-                                              Tapped="friendsItem_Tapped">
+                                              Tapped="friendsItem_Tapped"
+                                              Style="{StaticResource DefaultListViewItemStyle}">
                                 <SymbolIcon Width="36" Height="36" Symbol="People" />
                             </ListViewItem>
 
@@ -185,37 +210,29 @@
                             </lib:TreeView>
 
                             <lib:NavigationViewItemSeparator Margin="16,0" />
-                            <ListViewItem
-                                    x:Name="createServerItem"
-                                    MinWidth="0"
-                                    Padding="0"
-                                    HorizontalContentAlignment="Stretch">
-                                <SymbolIcon
-                                        Width="36"
-                                        Height="36"
-                                        Symbol="Add" />
+
+                            <ListViewItem x:Name="createServerItem"
+                                          MinWidth="0"
+                                          Padding="0"
+                                          HorizontalContentAlignment="Stretch"
+                                          Style="{StaticResource DefaultListViewItemStyle}">
+                                <SymbolIcon Width="36" Height="36" Symbol="Add" />
                             </ListViewItem>
-                            <ListViewItem
-                                    x:Name="findServerIcon"
-                                    MinWidth="0"
-                                    Padding="0"
-                                    HorizontalContentAlignment="Stretch">
-                                <SymbolIcon
-                                        Width="36"
-                                        Height="36"
-                                        Symbol="Find" />
+                            <ListViewItem x:Name="findServerIcon"
+                                          MinWidth="0"
+                                          Padding="0"
+                                          HorizontalContentAlignment="Stretch"
+                                          Style="{StaticResource DefaultListViewItemStyle}">
+                                <SymbolIcon Width="36" Height="36" Symbol="Find" />
                             </ListViewItem>
                             <lib:NavigationViewItemSeparator Margin="16,0" />
-                            <ListViewItem
-                                    x:Name="settingsItem"
-                                    MinWidth="0"
-                                    Padding="0"
-                                    HorizontalContentAlignment="Stretch"
-                                    Tapped="SettingsItem_Tapped">
-                                <SymbolIcon
-                                        Width="36"
-                                        Height="36"
-                                        Symbol="Setting" />
+                            <ListViewItem x:Name="settingsItem"
+                                          MinWidth="0"
+                                          Padding="0"
+                                          HorizontalContentAlignment="Stretch"
+                                          Tapped="SettingsItem_Tapped"
+                                          Style="{StaticResource DefaultListViewItemStyle}">
+                                <SymbolIcon Width="36" Height="36" Symbol="Setting" />
                             </ListViewItem>
 
                         </StackPanel>
@@ -223,37 +240,38 @@
                 </Grid>
 
                 <Grid x:Name="sidebarSecondaryGrid"
+                      Style="{StaticResource DiscordPage_SidebarSecondaryStyle}"
                       Grid.Column="1">
-                    <Grid Margin="0,0,8,0">
+                    <Grid Margin="{ThemeResource DiscordPage_SecondaryGridMargin}">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="*" />
                             <RowDefinition Height="auto" />
                             <RowDefinition Height="auto" />
                         </Grid.RowDefinitions>
 
-                        <Grid Background="{ThemeResource LayerFillColorDefaultBrush}"
-                              BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-                              BorderThickness="1"
-                              CornerRadius="4"
-                              Margin="0,0,0,8">
+                        <Grid Background="{ThemeResource DiscordPage_SecondaryGrid_Background}"
+                              BorderBrush="{ThemeResource DiscordPage_SecondaryGrid_BorderBrush}"
+                              BorderThickness="{ThemeResource DiscordPage_SecondaryGrid_BorderThickness}"
+                              CornerRadius="{ThemeResource DiscordPage_SecondaryGrid_CornerRadius}"
+                              Margin="{ThemeResource DiscordPage_SecondaryGrid_SplitMargin}">
                             <Frame x:Name="leftSidebarFrame"/>
                         </Grid>
 
                         <Grid Grid.Row="1"
-                              CornerRadius="4"
-                              Margin="0,0,0,8"
-                              Background="{ThemeResource LayerFillColorDefaultBrush}"
-                              BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-                              BorderThickness="1"
+                              Margin="{ThemeResource DiscordPage_SecondaryGrid_SplitMargin}"
+                              Background="{ThemeResource DiscordPage_SecondaryGrid_Background}"
+                              BorderBrush="{ThemeResource DiscordPage_SecondaryGrid_BorderBrush}"
+                              BorderThickness="{ThemeResource DiscordPage_SecondaryGrid_BorderThickness}"
+                              CornerRadius="{ThemeResource DiscordPage_SecondaryGrid_CornerRadius}"
                               Visibility="{Binding VoiceModel, Converter={StaticResource HideOnNullConverter}, FallbackValue=Collapsed}">
                             <voice:VoiceConnectionControl ConnectionModel="{Binding VoiceModel}"/>
                         </Grid>
 
                         <Grid Grid.Row="2"
-                              CornerRadius="4,4,0,0"
-                              Background="{ThemeResource LayerFillColorDefaultBrush}"                              
-                              BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-                              BorderThickness="1,1,1,0">
+                              Background="{ThemeResource DiscordPage_SecondaryGrid_Background}"
+                              BorderBrush="{ThemeResource DiscordPage_SecondaryGrid_BorderBrush}"
+                              BorderThickness="{ThemeResource DiscordPage_SecondaryGrid_BottomItem_BorderThickness}"
+                              CornerRadius="{ThemeResource DiscordPage_SecondaryGrid_BottomItem_CornerRadius}">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto"/>
                                 <ColumnDefinition Width="*"/>
@@ -282,150 +300,182 @@
                 </Grid>
             </Grid>
 
-            <Grid x:Name="RightMainGrid"
+            <Grid x:Name="MainContent"
                   Grid.Column="1"
-                  Margin="0,0,-292,0">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-
-                <Grid x:Name="MainContent"
-                      Grid.Column="0"
-                      MinWidth="250"
-                      CornerRadius="4,0,0,0"
-                      Background="{ThemeResource LayerFillColorDefaultBrush}"
-                      BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-                      BorderThickness="1,1,0,0">
-                    <Grid>
-                        <Frame x:Name="mainFrame"
-                               HorizontalAlignment="Stretch"
-                               Navigated="mainFrame_Navigated"
-                               SourcePageType="sub:FriendsPage" />
-                    </Grid>
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition />
-                            <ColumnDefinition MinWidth="375" MaxWidth="520" />
-                        </Grid.ColumnDefinitions>
-
-                        <controls1:InAppNotification x:Name="notification"
-                                                     Grid.Column="1"
-                                                     Margin="0,24,4,0"
-                                                     Padding="16"
-                                                     HorizontalAlignment="Stretch"
-                                                     VerticalAlignment="Top"
-                                                     AnimationDuration="00:00:00.3"
-                                                     StackMode="Replace"
-                                                     Tapped="Notification_Tapped"
-                                                     VerticalOffset="-120"
-                                                     Style="{ThemeResource CustomInAppNotificationsStyle}">
-                        </controls1:InAppNotification>
-                    </Grid>
+                  MinWidth="250"
+                  Style="{StaticResource DiscordPage_RightMainGridStyle}"
+                  CornerRadius="{ThemeResource DiscordPage_MainContent_CornerRadius}"
+                  Background="{ThemeResource DiscordPage_MainContent_Background}"
+                  BorderBrush="{ThemeResource DiscordPage_MainContent_BorderBrush}"
+                  BorderThickness="{ThemeResource DiscordPage_MainContent_BorderThickness}">
+                <Frame x:Name="mainFrame"
+                       HorizontalAlignment="Stretch"
+                       Navigated="mainFrame_Navigated"
+                       SourcePageType="sub:FriendsPage" />
+
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition />
+                        <ColumnDefinition MinWidth="375" MaxWidth="520" />
+                    </Grid.ColumnDefinitions>
+
+                    <toolkit:InAppNotification x:Name="notification"
+                                               Grid.Column="1"
+                                               Margin="0,24,4,0"
+                                               Padding="16"
+                                               HorizontalAlignment="Stretch"
+                                               VerticalAlignment="Top"
+                                               AnimationDuration="00:00:00.3"
+                                               StackMode="Replace"
+                                               Tapped="Notification_Tapped"
+                                               VerticalOffset="-120"
+                                               MaxHeight="200"
+                                               Style="{ThemeResource CustomInAppNotificationsStyle}"/>
                 </Grid>
+            </Grid>
 
-                <Grid x:Name="RightSplitPane"
-                      HorizontalAlignment="Right"
-                      Grid.Column="1"                  
-                      Width="292"
-                      Visibility="Visible"
-                      Margin="0,32,0,0">
-                    <Grid Background="{ThemeResource LayerFillColorDefaultBrush}"
-                          BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-                          BorderThickness="1,1,0,0"
-                          CornerRadius="4,0,0,0"
-                          Margin="8,0,0,0">
-
-                        <Frame x:Name="rightSidebarFrame" />
-                    </Grid>
+            <Grid x:Name="RightSplitPane"
+                  HorizontalAlignment="Right"
+                  Grid.Column="2"                  
+                  Width="292"
+                  Margin="0,32,0,0">
+                <Grid Background="{ThemeResource DiscordPage_RightSplitPaneGrid_Background}"
+                      BorderBrush="{ThemeResource DiscordPage_RightSplitPaneGrid_BorderBrush}"
+                      BorderThickness="{ThemeResource DiscordPage_RightSplitPaneGrid_BorderThickness}"
+                      CornerRadius="{ThemeResource DiscordPage_RightSplitPaneGrid_CornerRadius}"
+                      Margin="{ThemeResource DiscordPage_RightSplitPaneGrid_Margin}"
+                      Style="{ThemeResource DiscordPage_RightSplitPaneStyle}">
+
+                    <Frame x:Name="rightSidebarFrame" />
                 </Grid>
             </Grid>
         </Grid>
-        
+
         <VisualStateManager.VisualStateGroups>
-            <VisualStateGroup x:Name="RightPaneStates">
-                <VisualState x:Name="PaneClosedLarge">
-                    <VisualState.StateTriggers>
-                        <triggers:CompositeStateTrigger Operator="And">
-                            <triggers:EqualsStateTrigger Value="{x:Bind Model.IsRightPaneOpen, Mode=OneWay}"
-                                                         EqualTo="False"/>
-                            <triggers:AdaptiveTrigger MinWindowWidth="1279"/>
-                        </triggers:CompositeStateTrigger>
-                    </VisualState.StateTriggers>
-                    <Storyboard>
-                        <DoubleAnimation EasingFunction="{StaticResource EaseEnter}"
-                                         Storyboard.TargetName="MainGridTransform2" 
-                                         Storyboard.TargetProperty="X"
-                                         To="0"
-                                         Duration="00:00:00.25" />
-                    </Storyboard>
+            <VisualStateGroup x:Name="PaneStates">
+                <VisualState x:Name="SinglePaneLeft">
+                    <VisualState.Storyboard>
+                        <Storyboard>
+                            <DoubleAnimation
+                                 EasingFunction="{StaticResource EaseEnter}"
+                                 Storyboard.TargetName="MainGridTransform"
+                                 Storyboard.TargetProperty="X"
+                                 To="292"
+                                 Duration="00:00:00.25" />
+                            <DoubleAnimation
+                                 EasingFunction="{StaticResource EaseEnter}"
+                                 Storyboard.TargetName="CaptionTransform"
+                                 Storyboard.TargetProperty="X"
+                                 To="12"
+                                 Duration="00:00:00.25" />
+                        </Storyboard>
+                    </VisualState.Storyboard>
+                    <VisualState.Setters>
+                        <Setter Target="CloseItem.Visibility" Value="Visible"/>
+                        <Setter Target="MainGrid.Margin" Value="-292,0,-292,0"/>
+                        <Setter Target="MainContent.CornerRadius" Value="{StaticResource DiscordPage_MainContent_CornerRadius}"/>
+                        <Setter Target="MainContent.BorderThickness" Value="{StaticResource DiscordPage_MainContent_BorderThickness}"/>
+                    </VisualState.Setters>
                 </VisualState>
-
-                <VisualState x:Name="PaneClosedSmall">
-                    <VisualState.StateTriggers>
-                        <triggers:CompositeStateTrigger Operator="And">
-                            <triggers:EqualsStateTrigger Value="{x:Bind Model.IsRightPaneOpen, Mode=OneWay}"
-                                                         EqualTo="False"/>
-                            <triggers:AdaptiveTrigger MinWindowWidth="0"/>
-                        </triggers:CompositeStateTrigger>
-                    </VisualState.StateTriggers>
-                    <Storyboard>
-                        <DoubleAnimation EasingFunction="{StaticResource EaseEnter}"
-                                         Storyboard.TargetName="MainGridTransform2" 
-                                         Storyboard.TargetProperty="X"
-                                         To="0"
-                                         Duration="00:00:00.25" />
-                    </Storyboard>
+                <VisualState x:Name="SinglePaneCentre">
+                    <VisualState.Storyboard>
+                        <Storyboard>
+                            <DoubleAnimation
+                                 EasingFunction="{StaticResource EaseEnter}"
+                                 Storyboard.TargetName="MainGridTransform"
+                                 Storyboard.TargetProperty="X"
+                                 To="0"
+                                 Duration="00:00:00.25" />
+                            <DoubleAnimation
+                                 EasingFunction="{StaticResource EaseEnter}"
+                                 Storyboard.TargetName="CaptionTransform"
+                                 Storyboard.TargetProperty="X"
+                                 To="0"
+                                 Duration="00:00:00.25" />
+                        </Storyboard>
+                    </VisualState.Storyboard>
+                    <VisualState.Setters>
+                        <Setter Target="CloseItem.Visibility" Value="Visible"/>
+                        <Setter Target="MainGrid.Margin" Value="-292,0,-292,0"/>
+                        <Setter Target="MainContent.CornerRadius" Value="{StaticResource DiscordPage_MainContent_CornerRadius}"/>
+                        <Setter Target="MainContent.BorderThickness" Value="{StaticResource DiscordPage_MainContent_BorderThickness}"/>
+                    </VisualState.Setters>
                 </VisualState>
-
-                <VisualState x:Name="PaneOpen">
-                    <VisualState.StateTriggers>
-                        <triggers:EqualsStateTrigger Value="{x:Bind Model.IsRightPaneOpen, Mode=OneWay}"
-                                                     EqualTo="True"/>
-                    </VisualState.StateTriggers>
+                <VisualState x:Name="SinglePaneRight">
+                    <VisualState.Storyboard>
+                        <Storyboard>
+                            <DoubleAnimation
+                                 EasingFunction="{StaticResource EaseEnter}"
+                                 Storyboard.TargetName="MainGridTransform"
+                                 Storyboard.TargetProperty="X"
+                                 To="-292"
+                                 Duration="00:00:00.25" />
+                        </Storyboard>
+                    </VisualState.Storyboard>
                     <VisualState.Setters>
-                        <Setter Target="MainContent.CornerRadius" Value="4,4,0,0" />
-                        <Setter Target="MainContent.BorderThickness" Value="1,1,1,0" />
+                        <Setter Target="CloseItem.Visibility" Value="Visible"/>
+                        <Setter Target="MainGrid.Margin" Value="-292,0,-292,0"/>
+                        <Setter Target="CaptionTransform.X" Value="12"/>
+                        <Setter Target="MainContent.CornerRadius" Value="{StaticResource DiscordPage_MainContent_CornerRadius}"/>
+                        <Setter Target="MainContent.BorderThickness" Value="{StaticResource DiscordPage_MainContent_BorderThickness}"/>
                     </VisualState.Setters>
-
-
-                    <Storyboard>
-                        <DoubleAnimation EasingFunction="{StaticResource EaseEnter}"
-                                         Storyboard.TargetName="MainGridTransform2" 
-                                         Storyboard.TargetProperty="X"
-                                         To="-292"
-                                         Duration="00:00:00.25" />
-                    </Storyboard>
                 </VisualState>
-
-            </VisualStateGroup>
-
-            <VisualStateGroup x:Name="AdaptiveStates">
-                <VisualState x:Name="WideState">
-                    <VisualState.StateTriggers>
-                        <AdaptiveTrigger MinWindowWidth="769" />
-                    </VisualState.StateTriggers>
-
+                <VisualState x:Name="TwoPaneLeft">
+                    <VisualState.Storyboard>
+                        <Storyboard>
+                            <DoubleAnimation
+                                 EasingFunction="{StaticResource EaseEnter}"
+                                 Storyboard.TargetName="MainGridTransform"
+                                 Storyboard.TargetProperty="X"
+                                 To="0"
+                                 Duration="00:00:00.25" />
+                        </Storyboard>
+                    </VisualState.Storyboard>
                     <VisualState.Setters>
-                        <Setter Target="CaptionTransform.X" Value="12" />
-                        <Setter Target="MainGrid.Margin" Value="0,0,0,0" />
-                        <Setter Target="CloseItem.Visibility" Value="Collapsed" />
-                        <Setter Target="MainContent.CornerRadius" Value="4,0,0,0" />
-                        <Setter Target="MainContent.BorderThickness" Value="1,1,0,0" />
+                        <Setter Target="CloseItem.Visibility" Value="Collapsed"/>
+                        <Setter Target="MainGrid.Margin" Value="0,0,-292,0"/>
+                        <Setter Target="CaptionTransform.X" Value="12"/>
+                        <Setter Target="MainContent.CornerRadius" Value="{StaticResource DiscordPage_MainContent_CornerRadius_TwoPaneLeft}"/>
+                        <Setter Target="MainContent.BorderThickness" Value="{StaticResource DiscordPage_MainContent_BorderThickness_TwoPaneLeft}"/>
                     </VisualState.Setters>
                 </VisualState>
-
-                <VisualState x:Name="NarrowState">
-                    <VisualState.StateTriggers>
-                        <AdaptiveTrigger MinWindowWidth="0" />
-                    </VisualState.StateTriggers>
-
+                <VisualState x:Name="TwoPaneRight">
+                    <VisualState.Storyboard>
+                        <Storyboard>
+                            <DoubleAnimation
+                                 EasingFunction="{StaticResource EaseEnter}"
+                                 Storyboard.TargetName="MainGridTransform"
+                                 Storyboard.TargetProperty="X"
+                                 To="-292"
+                                 Duration="00:00:00.25" />
+                        </Storyboard>
+                    </VisualState.Storyboard>
+                    <VisualState.Setters>
+                        <Setter Target="CloseItem.Visibility" Value="Collapsed"/>
+                        <Setter Target="MainGrid.Margin" Value="0,0,-292,0"/>
+                        <Setter Target="CaptionTransform.X" Value="12"/>
+                        <Setter Target="MainContent.CornerRadius" Value="{StaticResource DiscordPage_MainContent_CornerRadius_TwoPaneRight}"/>
+                        <Setter Target="MainContent.BorderThickness" Value="{StaticResource DiscordPage_MainContent_BorderThickness_TwoPaneRight}"/>
+                    </VisualState.Setters>
+                </VisualState>
+                <VisualState x:Name="ThreePane">
+                    <VisualState.Storyboard>
+                        <Storyboard>
+                            <DoubleAnimation
+                                 EasingFunction="{StaticResource EaseEnter}"
+                                 Storyboard.TargetName="CaptionTransform"
+                                 Storyboard.TargetProperty="X"
+                                 To="0"
+                                 Duration="00:00:00.25" />
+                        </Storyboard>
+                    </VisualState.Storyboard>
                     <VisualState.Setters>
-                        <Setter Target="CaptionTransform.X" Value="0" />
-                        <Setter Target="MainGrid.Margin" Value="-292,0,0,0" />
-                        <Setter Target="CloseItem.Visibility" Value="Visible" />
-                        <Setter Target="MainContent.CornerRadius" Value="4,4,0,0" />
-                        <Setter Target="MainContent.BorderThickness" Value="0,1,0,0" />
+                        <Setter Target="CloseItem.Visibility" Value="Collapsed"/>
+                        <Setter Target="MainGridTransform.X" Value="0"/>
+                        <Setter Target="CaptionTransform.X" Value="12"/>
+                        <Setter Target="MainGrid.Margin" Value="0,0,0,0"/>
+                        <Setter Target="MainContent.CornerRadius" Value="{StaticResource DiscordPage_MainContent_CornerRadius_ThreePane}"/>
+                        <Setter Target="MainContent.BorderThickness" Value="{StaticResource DiscordPage_MainContent_BorderThickness_ThreePane}"/>
                     </VisualState.Setters>
                 </VisualState>
             </VisualStateGroup>
diff --git a/Unicord.Universal/Pages/DiscordPage.xaml.cs b/Unicord.Universal/Pages/DiscordPage.xaml.cs
index 5e21f71a..a0fa1815 100644
--- a/Unicord.Universal/Pages/DiscordPage.xaml.cs
+++ b/Unicord.Universal/Pages/DiscordPage.xaml.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.Linq;
 using System.Runtime.InteropServices.WindowsRuntime;
 using System.Threading.Tasks;
@@ -42,6 +43,8 @@ public sealed partial class DiscordPage : Page
     {
         public Frame MainFrame => mainFrame;
         public Frame LeftSidebarFrame => leftSidebarFrame;
+        public Frame RightSidebarFrame => rightSidebarFrame;
+
 
         private MainPageArgs _args;
         private bool _loaded;
@@ -49,25 +52,15 @@ public sealed partial class DiscordPage : Page
         internal DiscordPageViewModel Model { get; }
         internal bool IsWindowVisible { get; private set; }
 
-        internal SwipeOpenHelper _helper;
-
-        private bool _isPaneOpen => MainGridTransform.X != 0;
-
         public DiscordPage()
         {
             InitializeComponent();
             Model = DataContext as DiscordPageViewModel;
 
-            _helper = new SwipeOpenHelper(Content, this, OpenPaneMobileStoryboard, ClosePaneMobileStoryboard);
-            _helper.IsEnabled = false;
-
             IsWindowVisible = Window.Current.Visible;
             Window.Current.VisibilityChanged += Current_VisibilityChanged;
 
             WeakReferenceMessenger.Default.Register<DiscordPage, MessageCreateEventArgs>(this, (r, e) => r.Notification_MessageCreated(e.Event));
-
-            //GuildsView.RegisterPropertyChangedCallback(MUXC.TreeView.SelectedItemProperty, )
-            //this.AddAccelerator(Windows.System.VirtualKey.O, Windows.System.VirtualKeyModifiers.Control, (_, _) => Model.IsRightPaneOpen = !Model.IsRightPaneOpen);
         }
 
         private void Current_VisibilityChanged(object sender, VisibilityChangedEventArgs e)
@@ -126,7 +119,11 @@ private async void Page_Loaded(object sender, RoutedEventArgs e)
 
                 _loaded = true;
 
-                this.FindParent<MainPage>().HideConnectingOverlay();
+                SplitPaneService.GetForCurrentView()
+                    .ToggleLeftPane();
+
+                this.FindParent<MainPage>()
+                    .HideConnectingOverlay();
 
                 var service = DiscordNavigationService.GetForCurrentView();
                 if (_args != null && _args.ChannelId != 0 && App.Discord.TryGetCachedChannel(_args.ChannelId, out var channel))
@@ -142,9 +139,6 @@ private async void Page_Loaded(object sender, RoutedEventArgs e)
                     MainFrame.Navigate(typeof(FriendsPage));
                 }
 
-                //var helper = SwipeOpenService.GetForCurrentView();
-                //helper.AddAdditionalElement(SwipeHelper);
-
                 var notificationService = BackgroundNotificationService.GetForCurrentView();
                 await notificationService.StartupAsync();
 
@@ -181,36 +175,6 @@ private void ShowNotification(DiscordMessage message)
             notification.Show(new MessageControl() { MessageViewModel = new MessageViewModel(message) }, 7_000);
         }
 
-        public void ToggleSplitPane()
-        {
-            if (_isPaneOpen)
-            {
-                CloseSplitPane();
-            }
-            else
-            {
-                OpenSplitPane();
-            }
-        }
-
-        public void OpenSplitPane()
-        {
-            if (ActualWidth <= 768)
-            {
-                _helper.Cancel();
-                OpenPaneMobileStoryboard.Begin();
-            }
-        }
-
-        public void CloseSplitPane()
-        {
-            if (ActualWidth <= 768 || MainGridTransform.X < 0)
-            {
-                _helper.Cancel();
-                ClosePaneMobileStoryboard.Begin();
-            }
-        }
-
         private async void Notification_Tapped(object sender, TappedRoutedEventArgs e)
         {
             var message = (((InAppNotification)sender).Content as MessageControl)?.MessageViewModel;
@@ -253,11 +217,6 @@ private async void SettingsItem_Tapped(object sender, TappedRoutedEventArgs e)
             await service.OpenAsync();
         }
 
-        private void CloseItem_Tapped(object sender, TappedRoutedEventArgs e)
-        {
-            CloseSplitPane();
-        }
-
         private async void TreeView_ItemInvoked(MUXC.TreeView sender, MUXC.TreeViewItemInvokedEventArgs args)
         {
             if (args.InvokedItem is GuildListFolderViewModel viewModel)
@@ -297,5 +256,17 @@ private async void TreeView_ItemInvoked(MUXC.TreeView sender, MUXC.TreeViewItemI
 
             sender.SelectedItem = null;
         }
+
+        internal void SetViewMode(ViewMode viewMode)
+        {
+            Debug.WriteLine(viewMode);
+            VisualStateManager.GoToState(this, viewMode.ToString(), true);
+        }
+
+        private void CloseItem_Tapped(object sender, TappedRoutedEventArgs e)
+        {
+            SplitPaneService.GetForCurrentView()
+                .ToggleLeftPane();
+        }
     }
 }
\ No newline at end of file
diff --git a/Unicord.Universal/Pages/Overlay/UserInfoOverlayPage.xaml b/Unicord.Universal/Pages/Overlay/UserInfoOverlayPage.xaml
new file mode 100644
index 00000000..0e4e955c
--- /dev/null
+++ b/Unicord.Universal/Pages/Overlay/UserInfoOverlayPage.xaml
@@ -0,0 +1,13 @@
+<Page
+    x:Class="Unicord.Universal.Pages.Overlay.UserInfoOverlayPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:Unicord.Universal.Pages.Overlay"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+    xmlns:dialogs="using:Unicord.Universal.Dialogs"
+    mc:Ignorable="d">
+
+
+    <dialogs:ProfileOverlay x:Name="userInfoOverlay" Visibility="Visible"/>
+</Page>
diff --git a/Unicord.Universal/Pages/Overlay/UserInfoOverlayPage.xaml.cs b/Unicord.Universal/Pages/Overlay/UserInfoOverlayPage.xaml.cs
new file mode 100644
index 00000000..e1f20c5e
--- /dev/null
+++ b/Unicord.Universal/Pages/Overlay/UserInfoOverlayPage.xaml.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Unicord.Universal.Models.User;
+using Unicord.Universal.Services;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace Unicord.Universal.Pages.Overlay
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class UserInfoOverlayPage : Page, IOverlay
+    {
+        public UserInfoOverlayPage()
+        {
+            this.InitializeComponent();
+        }
+
+        public Size PreferredSize =>
+            new Size(550, 400);
+
+        protected override void OnNavigatedTo(NavigationEventArgs e)
+        {
+            base.OnNavigatedTo(e);
+
+            userInfoOverlay.User = (UserViewModel)e.Parameter;
+        }
+    }
+}
diff --git a/Unicord.Universal/Pages/Settings/SettingsPage.xaml b/Unicord.Universal/Pages/Settings/SettingsPage.xaml
index 01e4eea4..3bf306bb 100644
--- a/Unicord.Universal/Pages/Settings/SettingsPage.xaml
+++ b/Unicord.Universal/Pages/Settings/SettingsPage.xaml
@@ -112,8 +112,7 @@
                     </VisualState.StateTriggers>
 
                     <VisualState.Setters>
-                        <Setter Target="MainBorder.Margin" Value="32" />
-                        <Setter Target="MainBorder.CornerRadius" Value="8" />
+                        <Setter Target="MainBorder.CornerRadius" Value="8,8,0,0" />
                     </VisualState.Setters>
                 </VisualState>
 
diff --git a/Unicord.Universal/Pages/Subpages/FriendsPage.xaml b/Unicord.Universal/Pages/Subpages/FriendsPage.xaml
index a5eecd04..24c4a445 100644
--- a/Unicord.Universal/Pages/Subpages/FriendsPage.xaml
+++ b/Unicord.Universal/Pages/Subpages/FriendsPage.xaml
@@ -21,10 +21,7 @@
         <models:FriendsPageViewModel/>
     </Page.DataContext>
 
-    <Page.Resources>
-        <FontFamily x:Key="PivotHeaderItemFontFamily">Segoe UI Variable</FontFamily>
-        <FontWeight x:Key="PivotHeaderItemThemeFontWeight">Semibold</FontWeight>
-        
+    <Page.Resources>        
         <Style x:Key="RelationshipItemContainerStyle" BasedOn="{StaticResource DefaultGridViewItemStyle}" TargetType="GridViewItem">
             <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
             <Setter Property="HorizontalAlignment" Value="Stretch"/>
@@ -35,9 +32,9 @@
         <DataTemplate x:Key="FriendRelationshipTemplate" x:DataType="relationships:RelationshipViewModel">
             <Grid Padding="8"
                   HorizontalAlignment="Stretch" 
-                  CornerRadius="4"
-                  Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-                  BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                  CornerRadius="{ThemeResource FriendsPage_RelationshipItem_CornerRadius}"
+                  Background="{ThemeResource FriendsPage_RelationshipItem_Background}"
+                  BorderBrush="{ThemeResource FriendsPage_RelationshipItem_BorderBrush}"
                   BorderThickness="1"
                   PointerCanceled="Grid_PointerCanceled" 
                   PointerEntered="Grid_PointerEntered"
@@ -67,13 +64,13 @@
                         <presence:InlinePresenceControl Presence="{Binding User.Presence}" TextWrapping="Wrap" Grid.Row="1" />
                     </Grid>
                     <StackPanel x:Name="overlayContent" DataContext="{Binding}" Orientation="Horizontal" Opacity="0" VerticalAlignment="Center" HorizontalAlignment="Right">
-                        <Button Style="{ThemeResource IconButtonStyle}" BorderThickness="0" Margin="4,0">
+                        <Button Style="{ThemeResource IconButtonStyle}" Margin="4,0">
                             <SymbolIcon Symbol="VideoChat"/>
                         </Button>
-                        <Button Style="{ThemeResource IconButtonStyle}" BorderThickness="0" Margin="4,0">
+                        <Button Style="{ThemeResource IconButtonStyle}" Margin="4,0">
                             <SymbolIcon Symbol="Phone"/>
                         </Button>
-                        <Button Style="{ThemeResource IconButtonStyle}" Command="{Binding User.MessageCommand}" BorderThickness="0" Margin="4,0">
+                        <Button Style="{ThemeResource IconButtonStyle}" Command="{Binding User.MessageCommand}" Margin="4,0">
                             <SymbolIcon Symbol="Message"/>
                         </Button>
                     </StackPanel>
diff --git a/Unicord.Universal/Pages/Subpages/FriendsPage.xaml.cs b/Unicord.Universal/Pages/Subpages/FriendsPage.xaml.cs
index 4e24fe33..d7742d4e 100644
--- a/Unicord.Universal/Pages/Subpages/FriendsPage.xaml.cs
+++ b/Unicord.Universal/Pages/Subpages/FriendsPage.xaml.cs
@@ -4,6 +4,8 @@
 using Microsoft.Toolkit.Uwp.UI.Animations;
 using Unicord.Universal.Behaviours;
 using Unicord.Universal.Models.Relationships;
+using Unicord.Universal.Pages.Overlay;
+using Unicord.Universal.Services;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Media.Animation;
@@ -29,11 +31,13 @@ public FriendsPage()
 #endif
         }
 
-        private void OnItemClick(object sender, ItemClickEventArgs e)
+        private async void OnItemClick(object sender, ItemClickEventArgs e)
         {
             if (e.ClickedItem is RelationshipViewModel rel)
             {
-                this.FindParent<MainPage>().ShowUserOverlay(rel.User, true);
+                //this.FindParent<MainPage>().ShowUserOverlay(rel.User, true);
+                await OverlayService.GetForCurrentView()
+                    .ShowOverlayAsync<UserInfoOverlayPage>(rel.User);
             }
         }
 
@@ -69,11 +73,8 @@ private void Grid_PointerCanceled(object sender, Windows.UI.Xaml.Input.PointerRo
 
         private void ShowSidebarButton_Click(object sender, RoutedEventArgs e)
         {
-            var page = this.FindParent<DiscordPage>();
-            if (page != null)
-            {
-                page.ToggleSplitPane();
-            }
+            SplitPaneService.GetForCurrentView()
+                .ToggleLeftPane();
         }
     }
 }
diff --git a/Unicord.Universal/Pages/Subpages/SearchPage.xaml.cs b/Unicord.Universal/Pages/Subpages/SearchPage.xaml.cs
index 84b40424..b9f8423a 100644
--- a/Unicord.Universal/Pages/Subpages/SearchPage.xaml.cs
+++ b/Unicord.Universal/Pages/Subpages/SearchPage.xaml.cs
@@ -1,5 +1,6 @@
 using DSharpPlus.Entities;
 using Unicord.Universal.Models;
+using Unicord.Universal.Models.Channels;
 using Windows.System;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
@@ -19,7 +20,7 @@ public SearchPage()
 
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            if (e.Parameter is DiscordChannel channel)
+            if (e.Parameter is ChannelViewModel channel)
             {
                 ViewModel = new SearchPageViewModel(channel);
                 Root.DataContext = ViewModel;
diff --git a/Unicord.Universal/Pages/Subpages/UserListPage.xaml.cs b/Unicord.Universal/Pages/Subpages/UserListPage.xaml.cs
index 62c4a6c0..2a65d602 100644
--- a/Unicord.Universal/Pages/Subpages/UserListPage.xaml.cs
+++ b/Unicord.Universal/Pages/Subpages/UserListPage.xaml.cs
@@ -9,6 +9,8 @@
 using DSharpPlus.Entities;
 using Unicord.Universal.Controls;
 using Unicord.Universal.Misc;
+using Unicord.Universal.Models.Channels;
+using Unicord.Universal.Models.User;
 using Unicord.Universal.Utilities;
 using Windows.Foundation;
 using Windows.Foundation.Collections;
@@ -38,22 +40,24 @@ protected override async void OnNavigatedTo(NavigationEventArgs e)
                 progress.IsActive = true;
                 viewSource.Source = null;
 
-                if (e.Parameter is DiscordChannel channel)
+                if (e.Parameter is ChannelViewModel channel)
                 {
                     await Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
                     {
-                        if (channel is DiscordDmChannel dm)
+                        if (channel.Channel is DiscordDmChannel dm)
                         {
                             viewSource.IsSourceGrouped = false;
-                            viewSource.Source = dm.Recipients.OrderBy(r => r.Username);
+                            viewSource.Source = dm.Recipients.OrderBy(r => r.DisplayName)
+                               .Select(s => new UserViewModel(s, channel.Guild.Id));
                         }
                         else
                         {
                             viewSource.IsSourceGrouped = true;
-                            viewSource.Source = channel.Users
+                            viewSource.Source = channel.Channel.Users
                                .Distinct()
                                .OrderBy(g => g.DisplayName)
-                               .GroupBy(g => g.Roles.OrderByDescending(r => r.Position).FirstOrDefault(r => r.IsHoisted))
+                               .Select(s => new UserViewModel(s, channel.Guild.Id))
+                               .GroupBy(g => g.Member.Roles.OrderByDescending(r => r.Position).FirstOrDefault(r => r.IsHoisted))
                                .OrderByDescending(g => g.Key?.Position);
                         }
 
diff --git a/Unicord.Universal/Services/DiscordNavigationService.cs b/Unicord.Universal/Services/DiscordNavigationService.cs
index d9690fb1..768780ca 100644
--- a/Unicord.Universal/Services/DiscordNavigationService.cs
+++ b/Unicord.Universal/Services/DiscordNavigationService.cs
@@ -92,14 +92,12 @@ internal async Task NavigateAsync(DiscordChannel channel, bool skipPreviousDm =
                         _mainPage.RootFrame.Navigate(typeof(ChannelPage), channel);
                 }
 
-                _mainPage.HideUserOverlay();
                 _mainPage.HideCustomOverlay();
                 _mainPage.HideConnectingOverlay();
 
                 return;
             }
 
-            _mainPage.HideUserOverlay();
             _mainPage.HideCustomOverlay();
 
             var page = _discordPage.MainFrame.Content as ChannelPage;
@@ -134,7 +132,11 @@ internal async Task NavigateAsync(DiscordChannel channel, bool skipPreviousDm =
                 Analytics.TrackEvent("DiscordNavigationService_NavigateToTextChannel");
 
                 _discordPageModel.Navigating = true;
-                _discordPage.CloseSplitPane(); // pane service?
+
+                SplitPaneService.GetForCurrentView()
+                    .CloseAllPanes();
+
+                //_discordPage.CloseSplitPane(); // pane service?
 
                 if (_discordPageModel.SelectedGuild != null)
                     _discordPageModel.SelectedGuild.IsSelected = false;
diff --git a/Unicord.Universal/Services/SplitPaneService.cs b/Unicord.Universal/Services/SplitPaneService.cs
new file mode 100644
index 00000000..3f73514e
--- /dev/null
+++ b/Unicord.Universal/Services/SplitPaneService.cs
@@ -0,0 +1,160 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Unicord.Universal.Pages;
+using Windows.UI.Core;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+
+namespace Unicord.Universal.Services
+{
+    public enum ViewMode
+    {
+        SinglePaneLeft,
+        SinglePaneCentre,
+        SinglePaneRight,
+        TwoPaneLeft,
+        TwoPaneRight,
+        ThreePane
+    }
+
+    internal class SplitPaneService : BaseService<SplitPaneService>
+    {
+        // <= this point, show a single pane
+        public const int TWO_PANE_BREAKPOINT = 767;
+        // <= this point, show the two panes
+        public const int THREE_PANE_BREAKPOINT = 1279;
+
+        private DiscordPage _discordPage;
+        private bool _isRightOpen;
+        private bool _isLeftOpen;
+
+        public ViewMode ViewMode { get; private set; } = (ViewMode)(-1);
+
+        protected override void Initialise()
+        {
+            base.Initialise();
+
+            _discordPage = Window.Current.Content.FindChild<DiscordPage>();
+            if (_discordPage != null)
+                Window.Current.SizeChanged += OnSizeChanged;
+        }
+
+        private void OnSizeChanged(object sender, WindowSizeChangedEventArgs e)
+        {
+            AdjustSize();
+        }
+
+        internal void ToggleLeftPane()
+        {
+            if (_isLeftOpen)
+            {
+                CloseLeftPane();
+            }
+            else
+            {
+                OpenLeftPane();
+            }
+
+            AdjustSize();
+        }
+
+        internal void ToggleRightPane<T>(object param) where T : Page
+        {
+            if (_isRightOpen)
+            {
+                if (_discordPage.RightSidebarFrame.SourcePageType == typeof(T))
+                {
+                    CloseRightPane();
+                }
+                else
+                {
+                    _discordPage.RightSidebarFrame.Navigate(typeof(T), param);
+                }
+            }
+            else
+            {
+                OpenRightPane();
+                _discordPage.RightSidebarFrame.Navigate(typeof(T), param);
+            }
+
+            AdjustSize();
+        }
+
+        internal void AdjustSize()
+        {
+            var previousViewMode = ViewMode;
+
+            ViewMode = (Window.Current.Bounds.Width) switch
+            {
+                > THREE_PANE_BREAKPOINT => _isRightOpen ? ViewMode.ThreePane : ViewMode.TwoPaneLeft,
+                > TWO_PANE_BREAKPOINT => _isRightOpen ? ViewMode.TwoPaneRight : ViewMode.TwoPaneLeft,
+                _ => _isRightOpen ? ViewMode.SinglePaneRight : _isLeftOpen && (previousViewMode != ViewMode.TwoPaneLeft) ? ViewMode.SinglePaneLeft : ViewMode.SinglePaneCentre
+            };
+
+            // ensure these sync
+            if (ViewMode == ViewMode.SinglePaneCentre)
+            {
+                _isLeftOpen = false;
+                _isRightOpen = false;
+            }
+
+            if (ViewMode == ViewMode.TwoPaneLeft || ViewMode == ViewMode.SinglePaneLeft)
+            {
+                _isLeftOpen = true;
+                _isRightOpen = false;
+            }
+
+            if (ViewMode == ViewMode.TwoPaneRight || ViewMode == ViewMode.SinglePaneRight)
+            {
+                _isRightOpen = true;
+                _isLeftOpen = false;
+            }
+
+            if (ViewMode == ViewMode.ThreePane)
+            {
+                _isLeftOpen = true;
+                _isRightOpen = true;
+            }
+
+            if (_discordPage != null && previousViewMode != ViewMode)
+                _discordPage.SetViewMode(ViewMode);
+        }
+
+        public void CloseAllPanes()
+        {
+            CloseRightPane();
+            CloseLeftPane();
+
+            AdjustSize();
+        }
+
+        private void OpenLeftPane()
+        {
+            _isLeftOpen = true;
+        }
+
+        private void CloseLeftPane()
+        {
+            _isLeftOpen = false;
+        }
+
+        private void OpenRightPane()
+        {
+            _isRightOpen = true;
+        }
+
+        private void CloseRightPane()
+        {
+            _isRightOpen = false;
+        }
+
+        private void OnBackRequested(object sender, BackRequestedEventArgs e)
+        {
+            if (_isRightOpen)
+                CloseRightPane();
+        }
+    }
+}
diff --git a/Unicord.Universal/Services/SwipeOpenService.cs b/Unicord.Universal/Services/SwipeOpenService.cs
index e907b71a..7f254d26 100644
--- a/Unicord.Universal/Services/SwipeOpenService.cs
+++ b/Unicord.Universal/Services/SwipeOpenService.cs
@@ -16,7 +16,7 @@ internal class SwipeOpenService : BaseService<SwipeOpenService>
 
         protected override void Initialise()
         {
-            Helper = Window.Current.Content.FindChild<DiscordPage>()?._helper;
+            //Helper = Window.Current.Content.FindChild<DiscordPage>()?._helper;
         }
 
         public void AddAdditionalElement(UIElement element) => Helper?.AddAdditionalElement(element);
diff --git a/Unicord.Universal/Services/ThemeService.cs b/Unicord.Universal/Services/ThemeService.cs
new file mode 100644
index 00000000..046dd53f
--- /dev/null
+++ b/Unicord.Universal/Services/ThemeService.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Toolkit.Uwp.Helpers;
+
+namespace Unicord.Universal.Services
+{
+    public enum AppTheme
+    {
+        OLED,
+        Fluent,
+        Performance,
+        SunValley
+    }
+
+    internal class ThemeService : BaseService<ThemeService>
+    {
+        public AppTheme GetTheme()
+        {
+#if true
+            return GetDefaultAppTheme();
+#else
+            if (App.LocalSettings.TryRead<int>("AppTheme", out var theme))
+                return (AppTheme)theme;
+
+            var defaultTheme = GetDefaultAppTheme();
+            App.LocalSettings.Save("AppTheme", (int)defaultTheme);
+
+            return defaultTheme;
+#endif
+        }
+
+        public AppTheme GetDefaultAppTheme()
+        {
+            var osBuild = SystemInformation.Instance.OperatingSystemVersion.Build;
+            if (osBuild >= 22000)
+                return AppTheme.SunValley;
+
+            if (SystemInformation.Instance.DeviceFamily == "Windows.Mobile")
+                return AppTheme.Performance;
+
+            return AppTheme.Fluent;
+        }
+    }
+}
diff --git a/Unicord.Universal/Themes/RS2.xaml b/Unicord.Universal/Themes/RS2.xaml
deleted file mode 100644
index 82996d42..00000000
--- a/Unicord.Universal/Themes/RS2.xaml
+++ /dev/null
@@ -1,9 +0,0 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:contract5NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,5)"
-    xmlns:contract4Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,4)">
-    <ResourceDictionary.MergedDictionaries>
-        <contract5NotPresent:ResourceDictionary Source="RS2/ContentDialog.xaml"/>
-    </ResourceDictionary.MergedDictionaries>
-</ResourceDictionary>
diff --git a/Unicord.Universal/Themes/RS2/ContentDialog.xaml b/Unicord.Universal/Themes/RS2/ContentDialog.xaml
deleted file mode 100644
index 9695ddf6..00000000
--- a/Unicord.Universal/Themes/RS2/ContentDialog.xaml
+++ /dev/null
@@ -1,315 +0,0 @@
-<!-- 
-    Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. 
- -->
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:contract5Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,5)"
-    xmlns:contract5NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,5)">
-
-    <contract5NotPresent:Style x:Key="DefaultContentDialogStyle" 
-                               TargetType="ContentDialog"
-                               BasedOn="{StaticResource DefaultContentDialogStyleRS2}" />
-
-    <contract5NotPresent:StaticResource x:Key="ContentDialogDimmingThemeBrush"
-                                        ResourceKey="SmokeFillColorDefaultBrush"/>
-
-    <Style x:Key="DefaultContentDialogStyleRS2" TargetType="ContentDialog">
-        <Setter Property="Foreground" Value="{ThemeResource ContentDialogForeground}" />
-        <Setter Property="Background" Value="{ThemeResource ContentDialogBackground}" />
-        <Setter Property="BorderThickness" Value="{ThemeResource ContentDialogBorderWidth}" />
-        <Setter Property="BorderBrush" Value="{ThemeResource ContentDialogBorderBrush}" />
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="PrimaryButtonStyle" Value="{ThemeResource DefaultButtonStyle}" />
-        <Setter Property="SecondaryButtonStyle" Value="{ThemeResource DefaultButtonStyle}" />
-        <Setter Property="CloseButtonStyle" Value="{ThemeResource DefaultButtonStyle}" />
-        <Setter Property="HorizontalAlignment" Value="Left"/>
-        <Setter Property="VerticalAlignment" Value="Top"/>
-        <!--<contract7Present:Setter Property="CornerRadius" Value="{ThemeResource OverlayCornerRadius}" />-->
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ContentDialog">
-                    <Border x:Name="Container">
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="DialogShowingStates">
-                                <VisualStateGroup.Transitions>
-                                    <VisualTransition To="DialogHidden">
-                                        <Storyboard>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="LayoutRoot" Storyboard.TargetProperty="Visibility">
-                                                <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="Visible" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="LayoutRoot" Storyboard.TargetProperty="IsHitTestVisible">
-                                                <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="False" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ScaleTransform" Storyboard.TargetProperty="ScaleX">
-                                                <DiscreteDoubleKeyFrame KeyTime="0:0:0" Value="1.0" />
-                                                <SplineDoubleKeyFrame KeyTime="{StaticResource ControlFastAnimationDuration}" KeySpline="{StaticResource ControlFastOutSlowInKeySpline}" Value="1.05" />
-                                            </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ScaleTransform" Storyboard.TargetProperty="ScaleY">
-                                                <DiscreteDoubleKeyFrame KeyTime="0:0:0" Value="1.0" />
-                                                <SplineDoubleKeyFrame KeyTime="{StaticResource ControlFastAnimationDuration}" KeySpline="{StaticResource ControlFastOutSlowInKeySpline}" Value="1.05" />
-                                            </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="LayoutRoot" Storyboard.TargetProperty="Opacity">
-                                                <DiscreteDoubleKeyFrame KeyTime="0:0:0" Value="1.0" />
-                                                <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="0.0" />
-                                            </DoubleAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualTransition>
-                                    <VisualTransition To="DialogShowing">
-                                        <Storyboard>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="LayoutRoot" Storyboard.TargetProperty="Visibility">
-                                                <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="Visible" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ScaleTransform" Storyboard.TargetProperty="ScaleX">
-                                                <DiscreteDoubleKeyFrame KeyTime="0:0:0" Value="1.05" />
-                                                <SplineDoubleKeyFrame KeyTime="{StaticResource ControlNormalAnimationDuration}" KeySpline="{StaticResource ControlFastOutSlowInKeySpline}" Value="1.0" />
-                                            </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ScaleTransform" Storyboard.TargetProperty="ScaleY">
-                                                <DiscreteDoubleKeyFrame KeyTime="0:0:0" Value="1.05" />
-                                                <SplineDoubleKeyFrame KeyTime="{StaticResource ControlNormalAnimationDuration}" KeySpline="{StaticResource ControlFastOutSlowInKeySpline}" Value="1.0" />
-                                            </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="LayoutRoot" Storyboard.TargetProperty="Opacity">
-                                                <DiscreteDoubleKeyFrame KeyTime="0:0:0" Value="0.0" />
-                                                <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="1.0" />
-                                            </DoubleAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualTransition>
-                                </VisualStateGroup.Transitions>
-                                <VisualState x:Name="DialogHidden" />
-                                <VisualState x:Name="DialogShowing">
-                                    <VisualState.Setters>
-                                        <Setter Target="PrimaryButton.IsTabStop" Value="True"/>
-                                        <Setter Target="SecondaryButton.IsTabStop" Value="True"/>
-                                        <Setter Target="CloseButton.IsTabStop" Value="True"/>
-                                        <Setter Target="LayoutRoot.Visibility" Value="Visible" />
-                                        <Setter Target="BackgroundElement.TabFocusNavigation" Value="Cycle" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="DialogShowingWithoutSmokeLayer">
-                                    <!--<VisualState.Setters>
-                                        <Setter Target="PrimaryButton.IsTabStop" Value="True"/>
-                                        <Setter Target="SecondaryButton.IsTabStop" Value="True"/>
-                                        <Setter Target="CloseButton.IsTabStop" Value="True"/>
-                                        <Setter Target="LayoutRoot.Visibility" Value="Visible" />
-                                        <Setter Target="LayoutRoot.Background" Value="{x:Null}" />
-                                    </VisualState.Setters>-->
-                                    <VisualState.Setters>
-                                        <Setter Target="PrimaryButton.IsTabStop" Value="True"/>
-                                        <Setter Target="SecondaryButton.IsTabStop" Value="True"/>
-                                        <Setter Target="CloseButton.IsTabStop" Value="True"/>
-                                        <Setter Target="LayoutRoot.Visibility" Value="Visible" />
-                                        <Setter Target="BackgroundElement.TabFocusNavigation" Value="Cycle" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="DialogSizingStates">
-                                <VisualState x:Name="DefaultDialogSizing" />
-                                <VisualState x:Name="FullDialogSizing">
-                                    <VisualState.Setters>
-                                        <Setter Target="BackgroundElement.VerticalAlignment" Value="Stretch" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="ButtonsVisibilityStates">
-                                <VisualState x:Name="AllVisible" >
-                                    <VisualState.Setters>
-                                        <Setter Target="FirstSpacer.Width" Value="{StaticResource ContentDialogButtonSpacing}" />
-                                        <Setter Target="SecondaryColumn.Width" Value="*" />
-                                        <Setter Target="SecondaryButton.(Grid.Column)" Value="2" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="NoneVisible">
-                                    <VisualState.Setters>
-                                        <Setter Target="CommandSpace.Visibility" Value="Collapsed" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="PrimaryVisible">
-                                    <VisualState.Setters>
-                                        <Setter Target="PrimaryButton.(Grid.Column)" Value="4" />
-                                        <Setter Target="SecondaryButton.Visibility" Value="Collapsed" />
-                                        <Setter Target="CloseButton.Visibility" Value="Collapsed" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="SecondaryVisible">
-                                    <VisualState.Setters>
-                                        <Setter Target="SecondaryButton.(Grid.Column)" Value="4" />
-                                        <Setter Target="PrimaryButton.Visibility" Value="Collapsed" />
-                                        <Setter Target="CloseButton.Visibility" Value="Collapsed" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="CloseVisible">
-                                    <VisualState.Setters>
-                                        <Setter Target="PrimaryButton.Visibility" Value="Collapsed" />
-                                        <Setter Target="SecondaryButton.Visibility" Value="Collapsed" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="PrimaryAndSecondaryVisible">
-                                    <VisualState.Setters>
-                                        <Setter Target="SecondaryButton.(Grid.Column)" Value="4" />
-                                        <Setter Target="CloseButton.Visibility" Value="Collapsed" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="PrimaryAndCloseVisible">
-                                    <VisualState.Setters>
-                                        <Setter Target="SecondaryButton.Visibility" Value="Collapsed" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="SecondaryAndCloseVisible">
-                                    <VisualState.Setters>
-                                        <Setter Target="PrimaryButton.Visibility" Value="Collapsed" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="DefaultButtonStates">
-                                <VisualState x:Name="NoDefaultButton" />
-                                <VisualState x:Name="PrimaryAsDefaultButton">
-                                    <VisualState.Setters>
-                                        <Setter Target="PrimaryButton.Style" Value="{StaticResource AccentButtonStyle}" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="SecondaryAsDefaultButton">
-                                    <VisualState.Setters>
-                                        <Setter Target="SecondaryButton.Style" Value="{StaticResource AccentButtonStyle}" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="CloseAsDefaultButton">
-                                    <VisualState.Setters>
-                                        <Setter Target="CloseButton.Style" Value="{StaticResource AccentButtonStyle}" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="DialogBorderStates">
-                                <VisualState x:Name="NoBorder" />
-                                <VisualState x:Name="AccentColorBorder">
-                                    <VisualState.Setters>
-                                        <Setter Target="BackgroundElement.BorderBrush" Value="{ThemeResource SystemControlForegroundAccentBrush}" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                        <Grid x:Name="LayoutRoot"
-                              HorizontalAlignment="Stretch"
-                              VerticalAlignment="Stretch">
-                            <Border
-                                x:Name="BackgroundElement"
-                                Background="{TemplateBinding Background}"
-                                FlowDirection="{TemplateBinding FlowDirection}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                CornerRadius="{ThemeResource OverlayCornerRadius}"
-                                MinWidth="{ThemeResource ContentDialogMinWidth}"
-                                MaxWidth="{ThemeResource ContentDialogMaxWidth}"
-                                MinHeight="{ThemeResource ContentDialogMinHeight}"
-                                MaxHeight="{ThemeResource ContentDialogMaxHeight}"
-                                HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                                VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                                RenderTransformOrigin="0.5,0.5">
-                                <Border.RenderTransform>
-                                    <ScaleTransform x:Name="ScaleTransform" />
-                                </Border.RenderTransform>
-                                <Grid x:Name="DialogSpace">
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition Height="*" />
-                                        <RowDefinition Height="Auto" />
-                                    </Grid.RowDefinitions>
-                                    <Border Background="{ThemeResource LayerFillColorAltBrush}"
-                                            Padding="{StaticResource ContentDialogPadding}"
-                                            BorderThickness="{StaticResource ContentDialogSeparatorThickness}"
-                                            BorderBrush="{ThemeResource ContentDialogSeparatorBorderBrush}"
-                                            CornerRadius="8,8,0,0">
-                                        <ScrollViewer x:Name="ContentScrollViewer"
-                                                      HorizontalScrollBarVisibility="Disabled"
-                                                      VerticalScrollBarVisibility="Disabled"
-                                                      ZoomMode="Disabled"
-                                                      IsTabStop="False">
-                                            <Grid>
-                                                <Grid.RowDefinitions>
-                                                    <RowDefinition Height="Auto" />
-                                                    <RowDefinition Height="*" />
-                                                </Grid.RowDefinitions>
-                                                <ContentControl
-                                                    x:Name="Title"
-                                                    Margin="{StaticResource ContentDialogTitleMargin}"
-                                                    Content="{TemplateBinding Title}"
-                                                    ContentTemplate="{TemplateBinding TitleTemplate}"
-                                                    FontSize="20"
-                                                    FontFamily="XamlAutoFontFamily"
-                                                    FontWeight="SemiBold"
-                                                    Foreground="{TemplateBinding Foreground}"
-                                                    HorizontalAlignment="Left"
-                                                    VerticalAlignment="Top"
-                                                    IsTabStop="False">
-                                                    <ContentControl.Template>
-                                                        <ControlTemplate TargetType="ContentControl">
-                                                            <ContentPresenter
-                                                                Content="{TemplateBinding Content}"
-                                                                MaxLines="2"
-                                                                TextWrapping="Wrap"
-                                                                ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                                Margin="{TemplateBinding Padding}"
-                                                                ContentTransitions="{TemplateBinding ContentTransitions}"
-                                                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-                                                        </ControlTemplate>
-                                                    </ContentControl.Template>
-                                                </ContentControl>
-                                                <ContentPresenter
-                                                    x:Name="Content"
-                                                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                    Content="{TemplateBinding Content}"
-                                                    FontSize="{StaticResource ControlContentThemeFontSize}"
-                                                    FontFamily="{StaticResource ContentControlThemeFontFamily}"
-                                                    Foreground="{TemplateBinding Foreground}"
-                                                    Grid.Row="1"
-                                                    TextWrapping="Wrap" />
-                                            </Grid>
-                                        </ScrollViewer>
-                                    </Border>
-                                    <Grid
-                                        x:Name="CommandSpace"
-                                        Grid.Row="1"
-                                        HorizontalAlignment="Stretch"
-                                        VerticalAlignment="Bottom"
-                                        XYFocusKeyboardNavigation="Enabled"
-                                        Padding="{StaticResource ContentDialogPadding}">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition x:Name="PrimaryColumn" Width="*" />
-                                            <ColumnDefinition x:Name="FirstSpacer" Width="0" />
-                                            <ColumnDefinition x:Name="SecondaryColumn" Width="0" />
-                                            <ColumnDefinition x:Name="SecondSpacer" Width="{StaticResource ContentDialogButtonSpacing}" />
-                                            <ColumnDefinition x:Name="CloseColumn" Width="*" />
-                                        </Grid.ColumnDefinitions>
-                                        <Button
-                                            x:Name="PrimaryButton"
-                                            IsTabStop="False"
-                                            Content="{TemplateBinding PrimaryButtonText}"
-                                            IsEnabled="{TemplateBinding IsPrimaryButtonEnabled}"
-                                            Style="{TemplateBinding PrimaryButtonStyle}"
-                                            ElementSoundMode="FocusOnly"
-                                            HorizontalAlignment="Stretch" />
-                                        <Button
-                                            x:Name="SecondaryButton"
-                                            IsTabStop="False"
-                                            Content="{TemplateBinding SecondaryButtonText}"
-                                            IsEnabled="{TemplateBinding IsSecondaryButtonEnabled}"
-                                            Style="{TemplateBinding SecondaryButtonStyle}"
-                                            ElementSoundMode="FocusOnly"
-                                            HorizontalAlignment="Stretch" />
-                                        <Button
-                                            x:Name="CloseButton"
-                                            IsTabStop="False"
-                                            Grid.Column="4" 
-                                            Content="{TemplateBinding CloseButtonText}"
-                                            Style="{TemplateBinding CloseButtonStyle}"
-                                            ElementSoundMode="FocusOnly"
-                                            HorizontalAlignment="Stretch" />
-                                    </Grid>
-                                </Grid>
-                            </Border>
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-</ResourceDictionary>
diff --git a/Unicord.Universal/Themes/Styles/Fluent.xaml b/Unicord.Universal/Themes/Styles/Fluent.xaml
new file mode 100644
index 00000000..45cbb3cf
--- /dev/null
+++ b/Unicord.Universal/Themes/Styles/Fluent.xaml
@@ -0,0 +1,114 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+    xmlns:media="using:Microsoft.UI.Xaml.Media"
+    xmlns:toolkit_media="using:Microsoft.Toolkit.Uwp.UI.Media"
+    xmlns:ui="using:Microsoft.Toolkit.Uwp.UI" 
+    xmlns:w1803="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract, 7)">
+    <!-- Windows 10 circa 1709 Styling -->
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="./Performance.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style x:Key="CleanButtonStyle" TargetType="Button" BasedOn="{StaticResource ButtonRevealStyle}">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Foreground" Value="{ThemeResource ButtonForeground}" />
+        <Setter Property="BorderBrush" Value="{ThemeResource ButtonRevealBorderBrush}" />
+        <Setter Property="BorderThickness" Value="{ThemeResource ButtonRevealBorderThemeThickness}" />
+        <Setter Property="w1803:Control.CornerRadius" Value="0"/>
+    </Style>
+
+    <Style x:Key="StretchyIconButtonStyle" TargetType="Button" BasedOn="{StaticResource CleanButtonStyle}">
+        <Setter Property="BorderBrush" Value="{ThemeResource ButtonRevealBorderBrush}" />
+        <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}"/>
+        <Setter Property="FontSize" Value="16"/>
+    </Style>
+
+    <Style x:Key="IconButtonStyle" TargetType="Button" BasedOn="{StaticResource StretchyIconButtonStyle}">
+        <Setter Property="MinWidth" Value="40"/>
+        <Setter Property="MinHeight" Value="40"/>
+        <Setter Property="Padding" Value="8" />
+    </Style>
+
+    <Style x:Key="StretchyIconToggleButtonStyle" TargetType="ToggleButton" BasedOn="{StaticResource ToggleButtonRevealStyle}">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}"/>
+        <Setter Property="FontSize" Value="16"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="UseLayoutRounding" Value="True"/>
+        <Setter Property="Foreground" Value="{ThemeResource ButtonForeground}" />
+        <Setter Property="BorderBrush" Value="{ThemeResource ButtonRevealBorderBrush}" />
+        <Setter Property="BorderThickness" Value="{ThemeResource ButtonRevealBorderThemeThickness}" />
+        <Setter Property="w1803:Control.CornerRadius" Value="0"/>
+    </Style>
+
+    <Style x:Key="IconToggleButtonStyle" TargetType="ToggleButton" BasedOn="{StaticResource StretchyIconToggleButtonStyle}">
+        <Setter Property="MinWidth" Value="40"/>
+        <Setter Property="MinHeight" Value="40"/>
+        <Setter Property="Padding" Value="8" />
+    </Style>
+    
+    <media:AcrylicBrush x:Key="SidebarPrimaryAcrylicElementBrush" 
+                        BackgroundSource="Backdrop" 
+                        TintOpacity="0.60" 
+                        FallbackColor="{ThemeResource BackgroundPrimaryColour}" 
+                        TintColor="{ThemeResource BackgroundPrimaryColour}" />
+
+
+    <media:AcrylicBrush x:Key="SidebarSecondaryAcrylicElementBrush" 
+                        BackgroundSource="Backdrop" 
+                        TintOpacity="0.80" 
+                        FallbackColor="{ThemeResource BackgroundSecondaryColour}" 
+                        TintColor="{ThemeResource BackgroundSecondaryColour}" />
+
+    <StaticResource x:Key="DefaultGridViewItemStyle" ResourceKey="GridViewItemRevealStyle"/>
+    <StaticResource x:Key="DefaultListViewItemStyle" ResourceKey="ListViewItemRevealStyle"/>
+
+    <!-- DiscordPage -->
+
+    <media:AcrylicBrush x:Key="DiscordPage_PrimarySidebar_BackgroundBrush" 
+                        BackgroundSource="HostBackdrop" 
+                        TintOpacity="0.60" 
+                        FallbackColor="{ThemeResource BackgroundPrimaryColour}" 
+                        TintColor="{ThemeResource BackgroundPrimaryColour}" />
+
+    <Thickness x:Key="DiscordPage_SecondaryGridMargin">0,0,0,0</Thickness>
+
+    <media:AcrylicBrush x:Key="DiscordPage_SecondaryGrid_Background" 
+                        BackgroundSource="HostBackdrop" 
+                        TintOpacity="0.80" 
+                        FallbackColor="{ThemeResource BackgroundSecondaryColour}" 
+                        TintColor="{ThemeResource BackgroundSecondaryColour}" />
+    
+    <media:AcrylicBrush x:Key="DiscordPage_RightSplitPaneGrid_Background" 
+                        BackgroundSource="HostBackdrop" 
+                        TintOpacity="0.80" 
+                        FallbackColor="{ThemeResource BackgroundSecondaryColour}" 
+                        TintColor="{ThemeResource BackgroundSecondaryColour}" />
+
+    <toolkit_media:AttachedCardShadow x:Key="DiscordPage_SidebarSecondaryShadow" 
+                              Color="{ThemeResource SystemChromeBlackMediumLowColor}" 
+                              BlurRadius="8"
+                              CornerRadius="0"/>
+
+    <Style x:Key="DiscordPage_RightMainGridStyle" TargetType="Grid">
+        <Setter Property="ui:Effects.Shadow" Value="{StaticResource DiscordPage_SidebarSecondaryShadow}"/>
+    </Style>
+
+    <Style x:Key="DiscordPage_SidebarSecondaryStyle" TargetType="Grid">
+        <Setter Property="ui:Effects.Shadow" Value="{StaticResource DiscordPage_SidebarSecondaryShadow}"/>
+    </Style>
+
+    <Style x:Key="DiscordPage_RightSplitPaneStyle" TargetType="Grid">
+        <Setter Property="ui:Effects.Shadow" Value="{StaticResource DiscordPage_SidebarSecondaryShadow}"/>
+    </Style>
+
+    <Style x:Key="ChannelPageHeaderButtonStyle" TargetType="Button" BasedOn="{StaticResource IconButtonStyle}">
+        <Setter Property="Margin" Value="2,0,0,0"/>
+    </Style>
+
+    <Style x:Key="ChannelPageHeaderToggleButtonStyle" TargetType="ToggleButton" BasedOn="{StaticResource IconToggleButtonStyle}">
+        <Setter Property="Margin" Value="2,0,0,0"/>
+    </Style>
+    
+</ResourceDictionary>
diff --git a/Unicord.Universal/Themes/Styles/Performance.xaml b/Unicord.Universal/Themes/Styles/Performance.xaml
new file mode 100644
index 00000000..82c587d5
--- /dev/null
+++ b/Unicord.Universal/Themes/Styles/Performance.xaml
@@ -0,0 +1,185 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+    xmlns:media="using:Microsoft.UI.Xaml.Media"
+    xmlns:toolkit_media="using:Microsoft.Toolkit.Uwp.UI.Media"
+    xmlns:ui="using:Microsoft.Toolkit.Uwp.UI" 
+    xmlns:w1803="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract, 7)">
+    <!-- Windows 10 circa 1709 Styling -->
+    <ResourceDictionary.MergedDictionaries>
+        <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls"
+                               ControlsResourcesVersion="Version1"/>
+    </ResourceDictionary.MergedDictionaries>
+    <ResourceDictionary.ThemeDictionaries>
+        <ResourceDictionary x:Key="Light">
+            <Color x:Key="BackgroundPrimaryColour">#FFF5F5F5</Color>
+            <Color x:Key="BackgroundSecondaryColour">#FFF0F0F0</Color>
+            <Color x:Key="BackgroundTertiaryColour">#FFEEEEEE</Color>
+        </ResourceDictionary>
+        <ResourceDictionary x:Key="Dark">
+            <Color x:Key="BackgroundPrimaryColour">#FF0F0F0F</Color>
+            <Color x:Key="BackgroundSecondaryColour">#FF181818</Color>
+            <Color x:Key="BackgroundTertiaryColour">#FF1C1C1C</Color>
+        </ResourceDictionary>
+    </ResourceDictionary.ThemeDictionaries>
+
+    <!-- General -->
+    <CornerRadius x:Key="ControlCornerRadius">0,0,0,0</CornerRadius>
+    <CornerRadius x:Key="OverlayCornerRadius">0,0,0,0</CornerRadius>
+
+    <Style x:Key="CleanButtonStyle" TargetType="Button">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Foreground" Value="{ThemeResource ButtonForeground}" />
+        <Setter Property="w1803:Control.CornerRadius" Value="0"/>
+    </Style>
+
+    <Style x:Key="StretchyIconButtonStyle" TargetType="Button" BasedOn="{StaticResource CleanButtonStyle}">
+        <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}"/>
+        <Setter Property="FontSize" Value="16"/>
+    </Style>
+
+    <Style x:Key="IconButtonStyle" TargetType="Button" BasedOn="{StaticResource StretchyIconButtonStyle}">
+        <Setter Property="MinWidth" Value="40"/>
+        <Setter Property="MinHeight" Value="40"/>
+        <Setter Property="Padding" Value="8" />
+    </Style>
+
+    <Style x:Key="StretchyIconToggleButtonStyle" TargetType="ToggleButton">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}"/>
+        <Setter Property="FontSize" Value="16"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="UseLayoutRounding" Value="True"/>
+        <Setter Property="Foreground" Value="{ThemeResource ButtonForeground}" />
+        <Setter Property="w1803:Control.CornerRadius" Value="0"/>
+    </Style>
+
+    <Style x:Key="IconToggleButtonStyle" TargetType="ToggleButton" BasedOn="{StaticResource StretchyIconToggleButtonStyle}">
+        <Setter Property="MinWidth" Value="40"/>
+        <Setter Property="MinHeight" Value="40"/>
+        <Setter Property="Padding" Value="8" />
+    </Style>
+
+    <Style TargetType="GridViewItem" x:Key="DefaultGridViewItemStyle">
+        <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
+        <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
+        <Setter Property="Background" Value="{ThemeResource GridViewItemBackground}" />
+        <Setter Property="Foreground" Value="{ThemeResource GridViewItemForeground}" />
+        <Setter Property="TabNavigation" Value="Local" />
+        <Setter Property="IsHoldingEnabled" Value="True" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Margin" Value="0,0,4,4" />
+        <Setter Property="MinWidth" Value="{ThemeResource GridViewItemMinWidth}" />
+        <Setter Property="MinHeight" Value="{ThemeResource GridViewItemMinHeight}" />
+        <Setter Property="AllowDrop" Value="False" />
+        <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
+        <Setter Property="FocusVisualMargin" Value="-2" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="GridViewItem">
+                    <ListViewItemPresenter ContentTransitions="{TemplateBinding ContentTransitions}" 
+                                           x:Name="Root" 
+                                           Control.IsTemplateFocusTarget="True" 
+                                           FocusVisualMargin="{TemplateBinding FocusVisualMargin}"
+                                           SelectionCheckMarkVisualEnabled="{ThemeResource GridViewItemSelectionCheckMarkVisualEnabled}" 
+                                           CheckBrush="{ThemeResource GridViewItemCheckBrush}" 
+                                           CheckBoxBrush="{ThemeResource GridViewItemCheckBoxBrush}"
+                                           DragBackground="{ThemeResource GridViewItemDragBackground}" 
+                                           DragForeground="{ThemeResource GridViewItemDragForeground}" 
+                                           FocusBorderBrush="{ThemeResource GridViewItemFocusBorderBrush}" 
+                                           FocusSecondaryBorderBrush="{ThemeResource GridViewItemFocusSecondaryBorderBrush}" 
+                                           PlaceholderBackground="{ThemeResource GridViewItemPlaceholderBackground}" 
+                                           PointerOverBackground="{ThemeResource GridViewItemBackgroundPointerOver}" 
+                                           PointerOverForeground="{ThemeResource GridViewItemForegroundPointerOver}" 
+                                           SelectedBackground="{ThemeResource GridViewItemBackgroundSelected}" 
+                                           SelectedForeground="{ThemeResource GridViewItemForegroundSelected}" 
+                                           SelectedPointerOverBackground="{ThemeResource GridViewItemBackgroundSelectedPointerOver}" 
+                                           PressedBackground="{ThemeResource GridViewItemBackgroundPressed}" 
+                                           SelectedPressedBackground="{ThemeResource GridViewItemBackgroundSelectedPressed}" 
+                                           DisabledOpacity="{ThemeResource ListViewItemDisabledThemeOpacity}" 
+                                           DragOpacity="{ThemeResource ListViewItemDragThemeOpacity}" 
+                                           ReorderHintOffset="{ThemeResource GridViewItemReorderHintThemeOffset}" 
+                                           HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" 
+                                           VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" 
+                                           ContentMargin="{TemplateBinding Padding}" 
+                                           CheckMode="{ThemeResource GridViewItemCheckMode}" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <SolidColorBrush x:Key="BackgroundPrimaryBrush" Color="{ThemeResource BackgroundPrimaryColour}"/>
+    <SolidColorBrush x:Key="BackgroundSecondaryBrush" Color="{ThemeResource BackgroundSecondaryColour}"/>
+    <SolidColorBrush x:Key="BackgroundTertiaryBrush" Color="{ThemeResource BackgroundTertiaryColour}"/>
+    <SolidColorBrush x:Key="MainBackgroundBrush" Color="{ThemeResource BackgroundTertiaryColour}"/>
+
+    <CornerRadius x:Key="ZeroCornerRadius">0</CornerRadius>
+    <Thickness x:Key="ZeroThickness">0</Thickness>
+
+    <!-- DiscordPage -->
+
+    <SolidColorBrush x:Key="DiscordPage_PrimarySidebar_BackgroundBrush" 
+                     Color="{ThemeResource BackgroundPrimaryColour}" />
+
+    <Thickness x:Key="DiscordPage_SecondaryGridMargin">0,0,0,0</Thickness>
+
+    <SolidColorBrush x:Key="DiscordPage_SecondaryGrid_Background" 
+                     Color="{ThemeResource BackgroundSecondaryColour}" />
+    <SolidColorBrush x:Key="DiscordPage_SecondaryGrid_BorderBrush" Color="Transparent"/>
+
+    <Thickness x:Key="DiscordPage_SecondaryGrid_BorderThickness">0</Thickness>
+    <Thickness x:Key="DiscordPage_SecondaryGrid_BottomItem_BorderThickness">0</Thickness>
+    <CornerRadius x:Key="DiscordPage_SecondaryGrid_CornerRadius">0</CornerRadius>
+    <CornerRadius x:Key="DiscordPage_SecondaryGrid_BottomItem_CornerRadius">0</CornerRadius>
+    <Thickness x:Key="DiscordPage_SecondaryGrid_SplitMargin">0</Thickness>
+
+    <Thickness x:Key="DiscordPage_MainContent_BorderThickness">0,0,0,0</Thickness>
+    <Thickness x:Key="DiscordPage_MainContent_BorderThickness_TwoPaneLeft">0,0,0,0</Thickness>
+    <Thickness x:Key="DiscordPage_MainContent_BorderThickness_TwoPaneRight">0,0,0,0</Thickness>
+    <Thickness x:Key="DiscordPage_MainContent_BorderThickness_ThreePane">0,0,0,0</Thickness>
+
+    <CornerRadius x:Key="DiscordPage_MainContent_CornerRadius">0,0,0,0</CornerRadius>
+    <CornerRadius x:Key="DiscordPage_MainContent_CornerRadius_TwoPaneLeft">0,0,0,0</CornerRadius>
+    <CornerRadius x:Key="DiscordPage_MainContent_CornerRadius_TwoPaneRight">0,0,0,0</CornerRadius>
+    <CornerRadius x:Key="DiscordPage_MainContent_CornerRadius_ThreePane">0,0,0,0</CornerRadius>
+
+    <SolidColorBrush x:Key="DiscordPage_MainContent_Background" Color="{ThemeResource BackgroundTertiaryColour}"/>
+    <SolidColorBrush x:Key="DiscordPage_MainContent_BorderBrush" Color="Transparent"/>
+
+    <SolidColorBrush x:Key="DiscordPage_RightSplitPaneGrid_Background" 
+                     Color="{ThemeResource BackgroundSecondaryColour}" />
+
+    <Thickness x:Key="DiscordPage_RightSplitPaneGrid_Margin">0</Thickness>
+    <SolidColorBrush x:Key="DiscordPage_RightSplitPaneGrid_BorderBrush" Color="Transparent"/>
+    <Thickness x:Key="DiscordPage_RightSplitPaneGrid_BorderThickness">0</Thickness>
+    <CornerRadius x:Key="DiscordPage_RightSplitPaneGrid_CornerRadius">0</CornerRadius>
+
+    <Style x:Key="DiscordPage_RightMainGridStyle" TargetType="Grid"/>
+    <Style x:Key="DiscordPage_SidebarSecondaryStyle" TargetType="Grid"/>
+    <Style x:Key="DiscordPage_RightSplitPaneStyle" TargetType="Grid"/>
+
+    <SolidColorBrush x:Key="FriendsPage_RelationshipItem_Background" Color="Transparent"/>
+    <SolidColorBrush x:Key="FriendsPage_RelationshipItem_BorderBrush" Color="Transparent"/>
+    <CornerRadius x:Key="FriendsPage_RelationshipItem_CornerRadius">0</CornerRadius>
+
+    <!-- ChannelPage -->
+
+    <Style x:Key="ChannelPageHeaderButtonStyle" TargetType="Button" BasedOn="{StaticResource IconButtonStyle}">
+        <Setter Property="Margin" Value="2,0,0,0"/>
+    </Style>
+
+    <Style x:Key="ChannelPageHeaderToggleButtonStyle" TargetType="ToggleButton" BasedOn="{StaticResource IconToggleButtonStyle}">
+        <Setter Property="Margin" Value="2,0,0,0"/>
+    </Style>
+
+    <StaticResource x:Key="ChannelPage_Header_Background" ResourceKey="SystemControlBackgroundChromeMediumBrush"/>
+    <SolidColorBrush x:Key="ChannelPage_Header_BorderBrush" Color="Transparent"/>
+    <Thickness x:Key="ChannelPage_Header_BorderThickness">0</Thickness>
+
+    <StaticResource x:Key="ChannelPage_MessageInput_Background" ResourceKey="SystemControlBackgroundChromeMediumBrush"/>
+    <SolidColorBrush x:Key="ChannelPage_MessageInput_BorderBrush" Color="Transparent"/>
+    <Thickness x:Key="ChannelPage_MessageInput_BorderThickness">0</Thickness>
+    <CornerRadius x:Key="ChannelPage_MessageInput_CornerRadius">0</CornerRadius>
+    <Thickness x:Key="ChannelPage_MessageInput_Margin">0</Thickness>
+</ResourceDictionary>
diff --git a/Unicord.Universal/Themes/Styles/SunValley.xaml b/Unicord.Universal/Themes/Styles/SunValley.xaml
new file mode 100644
index 00000000..e3b78764
--- /dev/null
+++ b/Unicord.Universal/Themes/Styles/SunValley.xaml
@@ -0,0 +1,108 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+    xmlns:media="using:Microsoft.Toolkit.Uwp.UI.Media"
+    xmlns:ui="using:Microsoft.Toolkit.Uwp.UI">
+    <!-- Windows 11 Styling -->
+    <ResourceDictionary.MergedDictionaries>
+        <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls"
+                               ControlsResourcesVersion="Version2"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <!-- General -->
+
+    <FontFamily x:Key="PivotHeaderItemFontFamily">Segoe UI Variable</FontFamily>
+    <FontWeight x:Key="PivotHeaderItemThemeFontWeight">Semibold</FontWeight>
+
+    <Style x:Key="CleanButtonStyle" TargetType="Button" BasedOn="{StaticResource DefaultButtonStyle}">
+        <Setter Property="Background" Value="Transparent"/>
+    </Style>
+
+    <Style x:Key="StretchyIconButtonStyle" TargetType="Button" BasedOn="{StaticResource CleanButtonStyle}">
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="FontFamily" Value="{StaticResource SymbolThemeFontFamily}"/>
+        <Setter Property="FontSize" Value="16"/>
+    </Style>
+
+    <Style x:Key="IconButtonStyle" TargetType="Button" BasedOn="{StaticResource StretchyIconButtonStyle}">
+        <Setter Property="Padding" Value="8" />
+    </Style>
+
+    <Style x:Key="StretchyIconToggleButtonStyle" TargetType="ToggleButton" BasedOn="{StaticResource DefaultToggleButtonStyle}">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="FontFamily" Value="{StaticResource SymbolThemeFontFamily}"/>
+        <Setter Property="FontSize" Value="16"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="UseLayoutRounding" Value="True"/>
+        <Setter Property="BorderBrush" Value="Transparent" />
+    </Style>
+
+    <Style x:Key="IconToggleButtonStyle" TargetType="ToggleButton" BasedOn="{StaticResource StretchyIconToggleButtonStyle}">
+        <Setter Property="Padding" Value="8" />
+    </Style>
+
+    <!-- DiscordPage -->
+    
+    <SolidColorBrush x:Key="DiscordPage_PrimarySidebar_BackgroundBrush" Color="Transparent"/>
+
+    <Thickness x:Key="DiscordPage_SecondaryGridMargin">0,0,8,0</Thickness>
+    <StaticResource x:Key="DiscordPage_SecondaryGrid_Background" ResourceKey="LayerFillColorDefaultBrush"/>
+    <StaticResource x:Key="DiscordPage_SecondaryGrid_BorderBrush" ResourceKey="CardStrokeColorDefaultBrush"/>
+
+    <Thickness x:Key="DiscordPage_SecondaryGrid_BorderThickness">1</Thickness>
+    <Thickness x:Key="DiscordPage_SecondaryGrid_BottomItem_BorderThickness">1,1,1,0</Thickness>
+
+    <CornerRadius x:Key="DiscordPage_SecondaryGrid_CornerRadius">4</CornerRadius>
+    <CornerRadius x:Key="DiscordPage_SecondaryGrid_BottomItem_CornerRadius">4,4,0,0</CornerRadius>
+
+    <Thickness x:Key="DiscordPage_SecondaryGrid_SplitMargin">0,0,0,8</Thickness>
+
+    <Thickness x:Key="DiscordPage_MainContent_BorderThickness">0,1,0,0</Thickness>
+    <Thickness x:Key="DiscordPage_MainContent_BorderThickness_TwoPaneLeft">1,1,0,0</Thickness>
+    <Thickness x:Key="DiscordPage_MainContent_BorderThickness_TwoPaneRight">0,1,1,0</Thickness>
+    <Thickness x:Key="DiscordPage_MainContent_BorderThickness_ThreePane">1,1,1,0</Thickness>
+
+    <CornerRadius x:Key="DiscordPage_MainContent_CornerRadius">4,4,0,0</CornerRadius>
+    <CornerRadius x:Key="DiscordPage_MainContent_CornerRadius_TwoPaneLeft">4,0,0,0</CornerRadius>
+    <CornerRadius x:Key="DiscordPage_MainContent_CornerRadius_TwoPaneRight">0,4,0,0</CornerRadius>
+    <CornerRadius x:Key="DiscordPage_MainContent_CornerRadius_ThreePane">4,4,0,0</CornerRadius>    
+
+    <StaticResource x:Key="DiscordPage_MainContent_Background" ResourceKey="LayerFillColorDefaultBrush"/>
+    <StaticResource x:Key="DiscordPage_MainContent_BorderBrush" ResourceKey="CardStrokeColorDefaultBrush"/>
+
+    <Style x:Key="DiscordPage_RightMainGridStyle" TargetType="Grid"/>
+    <Style x:Key="DiscordPage_SidebarSecondaryStyle" TargetType="Grid"/>
+    <Style x:Key="DiscordPage_RightSplitPaneStyle" TargetType="Grid"/>
+
+    <Thickness x:Key="DiscordPage_RightSplitPaneGrid_Margin">8,0,0,0</Thickness>
+    <StaticResource x:Key="DiscordPage_RightSplitPaneGrid_Background" ResourceKey="LayerFillColorDefaultBrush"/>
+    <StaticResource x:Key="DiscordPage_RightSplitPaneGrid_BorderBrush" ResourceKey="CardStrokeColorDefaultBrush"/>
+    <Thickness x:Key="DiscordPage_RightSplitPaneGrid_BorderThickness">1,1,0,0</Thickness>
+    <CornerRadius x:Key="DiscordPage_RightSplitPaneGrid_CornerRadius">4,0,0,0</CornerRadius>
+
+    <!-- FriendsPage -->
+
+    <StaticResource x:Key="FriendsPage_RelationshipItem_Background" ResourceKey="LayerFillColorDefaultBrush"/>
+    <StaticResource x:Key="FriendsPage_RelationshipItem_BorderBrush" ResourceKey="CardStrokeColorDefaultBrush"/>
+    <CornerRadius x:Key="FriendsPage_RelationshipItem_CornerRadius">4</CornerRadius>
+
+    <!-- ChannelPage -->
+
+    <Style x:Key="ChannelPageHeaderButtonStyle" TargetType="Button" BasedOn="{StaticResource IconButtonStyle}">
+        <Setter Property="Margin" Value="4,2"/>
+    </Style>
+
+    <Style x:Key="ChannelPageHeaderToggleButtonStyle" TargetType="ToggleButton" BasedOn="{StaticResource IconToggleButtonStyle}">
+        <Setter Property="Margin" Value="4,2"/>
+    </Style>
+
+    <SolidColorBrush x:Key="ChannelPage_Header_Background" Color="Transparent"/>
+    <StaticResource x:Key="ChannelPage_Header_BorderBrush" ResourceKey="DividerStrokeColorDefaultBrush"/>
+    <Thickness x:Key="ChannelPage_Header_BorderThickness">0,0,0,1</Thickness>
+    
+    <StaticResource x:Key="ChannelPage_MessageInput_Background" ResourceKey="LayerFillColorDefaultBrush"/>
+    <StaticResource x:Key="ChannelPage_MessageInput_BorderBrush" ResourceKey="CardStrokeColorDefaultBrush"/>
+    <Thickness x:Key="ChannelPage_MessageInput_BorderThickness">1</Thickness>
+    <CornerRadius x:Key="ChannelPage_MessageInput_CornerRadius">4</CornerRadius>
+    <Thickness x:Key="ChannelPage_MessageInput_Margin">12,0,12,12</Thickness>
+</ResourceDictionary>
diff --git a/Unicord.Universal/Themes/ThemeResources.cs b/Unicord.Universal/Themes/ThemeResources.cs
new file mode 100644
index 00000000..90409537
--- /dev/null
+++ b/Unicord.Universal/Themes/ThemeResources.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Unicord.Universal.Services;
+using Windows.UI.Xaml;
+
+namespace Unicord.Universal.Themes
+{
+    internal class ThemeResources : ResourceDictionary
+    {
+        public ThemeResources()
+        {
+            var theme = ThemeService.GetForCurrentView()
+                .GetTheme();
+
+            switch (theme)
+            {
+                case AppTheme.OLED:
+                    this.Source = new Uri("ms-appx:///Themes/Styles/OLED.xaml");
+                    break;
+                case AppTheme.Fluent:
+                    this.Source = new Uri("ms-appx:///Themes/Styles/Fluent.xaml");
+                    break;
+                case AppTheme.Performance:
+                    this.Source = new Uri("ms-appx:///Themes/Styles/Performance.xaml");
+                    break;
+                case AppTheme.SunValley:
+                    this.Source = new Uri("ms-appx:///Themes/Styles/SunValley.xaml");
+                    break;
+            }
+
+        }
+    }
+}
diff --git a/Unicord.Universal/Unicord.Universal.csproj b/Unicord.Universal/Unicord.Universal.csproj
index 9bbfd066..5c4051ad 100644
--- a/Unicord.Universal/Unicord.Universal.csproj
+++ b/Unicord.Universal/Unicord.Universal.csproj
@@ -157,7 +157,6 @@
     <Compile Include="Commands\Messages\DeleteMessageCommand.cs" />
     <Compile Include="Commands\DiscordCommand.cs" />
     <Compile Include="Commands\EditChannelCommand.cs" />
-    <Compile Include="Commands\EditModeCommand.cs" />
     <Compile Include="Commands\Generic\DownloadCommand.cs" />
     <Compile Include="Commands\Generic\ShareCommand.cs" />
     <Compile Include="Commands\Member\KickCommand.cs" />
@@ -198,6 +197,7 @@
     <Compile Include="Extensions\DiscordColorExtensions.cs" />
     <Compile Include="Extensions\GuildExtensions.cs" />
     <Compile Include="Extensions\UserExtensions.cs" />
+    <Compile Include="Models\Channels\ChannelPageViewModelBase.cs" />
     <Compile Include="Models\Channels\ChannelViewModel.cs" />
     <Compile Include="Models\Channels\ForumChannelViewModel.cs" />
     <Compile Include="Models\Channels\ReadStateViewModel.cs" />
@@ -480,6 +480,9 @@
     <Compile Include="Pages\Overlay\AttachmentOverlayPage.xaml.cs">
       <DependentUpon>AttachmentOverlayPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Pages\Overlay\UserInfoOverlayPage.xaml.cs">
+      <DependentUpon>UserInfoOverlayPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Pages\Settings\AboutSettingsPage.xaml.cs">
       <DependentUpon>AboutSettingsPage.xaml</DependentUpon>
     </Compile>
@@ -541,6 +544,8 @@
       <DependentUpon>VideoEditor.xaml</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Services\SplitPaneService.cs" />
+    <Compile Include="Services\ThemeService.cs" />
     <Compile Include="Themes\Controls\Messages.xaml.cs">
       <DependentUpon>Messages.xaml</DependentUpon>
     </Compile>
@@ -559,6 +564,7 @@
     <Compile Include="Services\SwipeOpenService.cs" />
     <Compile Include="Services\Windowing\ApplicationViewWindowingService.cs" />
     <Compile Include="Services\Windowing\WindowingService.cs" />
+    <Compile Include="Themes\ThemeResources.cs" />
     <Compile Include="Tools.cs" />
     <Compile Include="Utilities\AdaptiveFlyout.cs" />
     <Compile Include="Utilities\EmojiUtilities.cs" />
@@ -869,6 +875,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Pages\Overlay\UserInfoOverlayPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Pages\Settings\AboutSettingsPage.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -989,17 +999,21 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\RS2.xaml">
+    <Page Include="Themes\Controls\Flyouts.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\RS2\ContentDialog.xaml">
-      <Generator>MSBuild:Compile</Generator>
+    <Page Include="Themes\Styles\Fluent.xaml">
       <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Themes\Controls\Flyouts.xaml">
+    <Page Include="Themes\Styles\Performance.xaml">
+      <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Styles\SunValley.xaml">
       <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="Themes\Templates.xaml">
       <Generator>MSBuild:Compile</Generator>