diff --git a/Libraries/DSharpPlus b/Libraries/DSharpPlus
index 01930ec3..8e079380 160000
--- a/Libraries/DSharpPlus
+++ b/Libraries/DSharpPlus
@@ -1 +1 @@
-Subproject commit 01930ec35e0465437c168f74ff1c3ede0f0e4561
+Subproject commit 8e0793805f85f826ed0014022f2e4f6b720ba89a
diff --git a/Unicord.Universal.Background.Tasks/PeriodicNotificationsTask.cs b/Unicord.Universal.Background.Tasks/PeriodicNotificationsTask.cs
index dae67704..21051923 100644
--- a/Unicord.Universal.Background.Tasks/PeriodicNotificationsTask.cs
+++ b/Unicord.Universal.Background.Tasks/PeriodicNotificationsTask.cs
@@ -25,6 +25,8 @@ public async void Run(IBackgroundTaskInstance taskInstance)
                 var toastNotifier = ToastNotificationManager.CreateToastNotifier();
 
                 var restClient = new DiscordRestClient(new DiscordConfiguration() { Token = token, TokenType = TokenType.User });
+                await restClient.InitializeAsync();
+
                 var mentions = await restClient.GetUserMentionsAsync(25, true, true);
 
                 foreach (var mention in mentions)
diff --git a/Unicord.Universal.Package/Package.appxmanifest b/Unicord.Universal.Package/Package.appxmanifest
index d0487591..aceabcaa 100644
--- a/Unicord.Universal.Package/Package.appxmanifest
+++ b/Unicord.Universal.Package/Package.appxmanifest
@@ -9,7 +9,7 @@
          xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
          xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
 				 IgnorableNamespaces="uap mp uap2 uap3 uap4 uap5 rescap">
-  <Identity Name="24101WamWooWamRD.Unicord" Publisher="CN=0F22111D-EDF0-42F0-B58D-26C4C5C5054B" Version="2.0.34.0" />
+  <Identity Name="24101WamWooWamRD.Unicord" Publisher="CN=0F22111D-EDF0-42F0-B58D-26C4C5C5054B" Version="2.0.43.0" />
   <mp:PhoneIdentity PhoneProductId="5783aabf-3049-421f-ae1d-e88bd89018f2" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>ms-resource:AppDisplayName</DisplayName>
diff --git a/Unicord.Universal.Package/Unicord.Universal.Package.wapproj b/Unicord.Universal.Package/Unicord.Universal.Package.wapproj
index fb985026..7b750e74 100644
--- a/Unicord.Universal.Package/Unicord.Universal.Package.wapproj
+++ b/Unicord.Universal.Package/Unicord.Universal.Package.wapproj
@@ -58,7 +58,6 @@
     <EntryPointProjectUniqueName>..\Unicord.Universal\Unicord.Universal.csproj</EntryPointProjectUniqueName>
     <AppxOSMinVersionReplaceManifestVersion>false</AppxOSMinVersionReplaceManifestVersion>
     <AppxOSMaxVersionTestedReplaceManifestVersion>false</AppxOSMaxVersionTestedReplaceManifestVersion>
-    <PackageCertificateThumbprint>2C5F1F6080F0648BF786147323B846D8D0BA1638</PackageCertificateThumbprint>
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
@@ -69,6 +68,7 @@
     <AppInstallerUri>https://wamwoowam.co.uk/unicord/download</AppInstallerUri>
     <!-- lol, lmao -->
     <SkipMicrosoftUIXamlCheckTargetPlatformVersion>true</SkipMicrosoftUIXamlCheckTargetPlatformVersion>
+    <PackageCertificateThumbprint>2C5F1F6080F0648BF786147323B846D8D0BA1638</PackageCertificateThumbprint>
   </PropertyGroup>
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest">
diff --git a/Unicord.Universal.Shared/Constants.cs b/Unicord.Universal.Shared/Constants.cs
index 04b248cf..92ecf92a 100644
--- a/Unicord.Universal.Shared/Constants.cs
+++ b/Unicord.Universal.Shared/Constants.cs
@@ -46,7 +46,7 @@ internal static partial class Constants
 
         public const string GIF_AUTOPLAY = "AutoPlayGifs";
         public const string SAVE_CAPTURED_PHOTOS = "SavedPhotos";
-        public const string TIMESTAMP_STYLE = "TimestampStyle1";
+        public const string TIMESTAMP_STYLE = "TimestampStyle_1";
 
         public const string BACKGROUND_NOTIFICATIONS = "BackgroundNotifications";
 
diff --git a/Unicord.Universal.Shared/MutedExtensions.cs b/Unicord.Universal.Shared/MutedExtensions.cs
index 84995363..a161d258 100644
--- a/Unicord.Universal.Shared/MutedExtensions.cs
+++ b/Unicord.Universal.Shared/MutedExtensions.cs
@@ -52,7 +52,9 @@ public static bool IsMuted(this DiscordGuild guild)
 
         public static bool IsUnread(this DiscordChannel channel)
         {
-            var discord = (DiscordClient)channel.Discord;
+            if (!(channel.Discord is DiscordClient discord))
+                return false;
+
             var readState = channel.ReadState;
 
             // this shit should never happen but apparently it does sometimes, don't question it
diff --git a/Unicord.Universal.Shared/NotificationUtils.cs b/Unicord.Universal.Shared/NotificationUtils.cs
index dd01a23f..ca7c69e1 100644
--- a/Unicord.Universal.Shared/NotificationUtils.cs
+++ b/Unicord.Universal.Shared/NotificationUtils.cs
@@ -25,7 +25,7 @@ public static bool WillShowToast(BaseDiscordClient client, DiscordMessage messag
             if (client is DiscordClient discord && discord.UserSettings?.Status == "dnd")
                 return false;
 
-            if (message.Channel.IsMuted() || (message.Channel.Guild != null && message.Channel.Guild.IsMuted()) || !message.Channel.IsUnread())
+            if (message.Channel.IsMuted() || (message.Channel.Guild != null && message.Channel.Guild.IsMuted()))
                 return false;
 
             bool willNotify = false;
@@ -136,7 +136,7 @@ public static string GetChannelHeaderName(DiscordChannel channel)
             {
                 if (dmChannel.Type == ChannelType.Private)
                 {
-                    if (dmChannel.Recipients.Count == 0)
+                    if (dmChannel.Recipients == null || dmChannel.Recipients.Count == 0)
                         return "Invalid DM channel";
 
                     return $"@{dmChannel.Recipients[0].DisplayName}";
diff --git a/Unicord.Universal/Controls/Channels/ChannelPageHeaderControl.xaml b/Unicord.Universal/Controls/Channels/ChannelPageHeaderControl.xaml
index 6c1af40f..7caa29b9 100644
--- a/Unicord.Universal/Controls/Channels/ChannelPageHeaderControl.xaml
+++ b/Unicord.Universal/Controls/Channels/ChannelPageHeaderControl.xaml
@@ -61,50 +61,50 @@
                     </Grid>
 
                     <users:AvatarControl x:Name="UserImage"
-                                        x:Load="{x:Bind ViewModel.IsDM}"
-                                        Source="{Binding ChannelIconUrl}"
-                                        Grid.Column="1"
-                                        Width="24"
-                                        Height="24"
-                                        Margin="12,0,0,0"
-                                        VerticalAlignment="Center"/>
+                                         x:Load="{x:Bind ViewModel.IsDM}"
+                                         Source="{Binding ChannelIconUrl}"
+                                         Grid.Column="1"
+                                         Width="24"
+                                         Height="24"
+                                         Margin="12,0,0,0"
+                                         VerticalAlignment="Center"/>
 
                     <TextBlock x:Name="Icon"
-                           x:Load="{x:Bind ViewModel.IsNotDM}"
-                           Grid.Column="1"
-                           Foreground="{ThemeResource SystemControlForegroundBaseMediumBrush}"
-                           Text="{x:Bind ViewModel.Channel, Converter={StaticResource ChannelSymbolConverter}}" 
-                           FontFamily="{StaticResource FluentSystemIcons}"
-                           VerticalAlignment="Center"
-                           Margin="16,0,8,0"
-                           FontSize="20"/>
+                               x:Load="{x:Bind ViewModel.IsNotDM}"
+                               Grid.Column="1"
+                               Foreground="{ThemeResource SystemControlForegroundBaseMediumBrush}"
+                               Text="{x:Bind ViewModel.Channel, Converter={StaticResource ChannelSymbolConverter}}" 
+                               FontFamily="{StaticResource FluentSystemIcons}"
+                               VerticalAlignment="Center"
+                               Margin="16,0,8,0"
+                               FontSize="20"/>
 
                     <TextBlock x:Name="Header"
-                           Grid.Column="2"
-                           Margin="8,0,8,0"
-                           VerticalAlignment="Center"
-                           FontSize="15"
-                           FontWeight="Bold"
-                           Foreground="{ThemeResource SystemControlForegroundBaseHighBrush}"
-                           TextTrimming="Clip"
-                           TextWrapping="NoWrap"
-                           Text="{x:Bind ViewModel.DisplayName}"/>
+                               Grid.Column="2"
+                               Margin="8,0,8,0"
+                               VerticalAlignment="Center"
+                               FontSize="15"
+                               FontWeight="Bold"
+                               Foreground="{ThemeResource SystemControlForegroundBaseHighBrush}"
+                               TextTrimming="Clip"
+                               TextWrapping="NoWrap"
+                               Text="{x:Bind ViewModel.DisplayName}"/>
 
                     <presence:StatusIndicator x:Name="RecipientStatusIndicator" 
-                                          x:Load="{x:Bind ViewModel.IsDM}"
-                                          Grid.Column="3" 
-                                          Width="10" 
-                                          Height="10" 
-                                          Margin="-4,0,8,0"
-                                          Presence="{x:Bind ViewModel.Recipient.Presence}"/>
+                                              x:Load="{x:Bind ViewModel.IsDM}"
+                                              Grid.Column="3" 
+                                              Width="10" 
+                                              Height="10" 
+                                              Margin="-4,0,8,0"
+                                              Presence="{x:Bind ViewModel.Recipient.Presence}"/>
 
                     <controls:MarkdownTextBlock x:Name="TopicText"
-                                            Grid.Column="4"
-                                            HorizontalAlignment="Stretch"
-                                            VerticalAlignment="Center"
-                                            Channel="{x:Bind ViewModel.Channel}"
-                                            Text="{x:Bind ViewModel.Topic}"
-                                            TextWrapping="NoWrap" />
+                                                Grid.Column="4"
+                                                HorizontalAlignment="Stretch"
+                                                VerticalAlignment="Center"
+                                                Channel="{x:Bind ViewModel.Channel}"
+                                                Text="{x:Bind ViewModel.Topic}"
+                                                TextWrapping="NoWrap" />
                 </StackPanel>
             </Grid>
 
diff --git a/Unicord.Universal/Controls/Channels/ChannelPageHeaderControl.xaml.cs b/Unicord.Universal/Controls/Channels/ChannelPageHeaderControl.xaml.cs
index bf88138c..dd17ceed 100644
--- a/Unicord.Universal/Controls/Channels/ChannelPageHeaderControl.xaml.cs
+++ b/Unicord.Universal/Controls/Channels/ChannelPageHeaderControl.xaml.cs
@@ -40,8 +40,8 @@ public ChannelPageHeaderControl()
         private void OnLoaded(object sender, RoutedEventArgs e)
         {
             var windowHandle = WindowingService.Current.GetHandle(this);
-            if (AnalyticsInfo.VersionInfo.DeviceFamily == "Windows.Phone")
-                WindowingService.Current.HandleTitleBarForControl(TopGrid);
+            //if (SystemPlatform.Mobile)
+            //    WindowingService.Current.HandleTitleBarForControl(TopGrid);
 
             if (!WindowingService.Current.IsMainWindow(windowHandle))
             {
diff --git a/Unicord.Universal/Controls/Flyouts/MessageContextFlyout.xaml b/Unicord.Universal/Controls/Flyouts/MessageContextFlyout.xaml
index 020bb577..49f6ccde 100644
--- a/Unicord.Universal/Controls/Flyouts/MessageContextFlyout.xaml
+++ b/Unicord.Universal/Controls/Flyouts/MessageContextFlyout.xaml
@@ -69,7 +69,7 @@
         </AppBarButton>
 
         <AppBarButton Label="Edit"
-                      Click="EditFlyoutItem_Click"
+                      Command="{Binding EditCommand}"
                       IsEnabled="{Binding Author.IsCurrent}">
             <AppBarButton.Icon>
                 <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xe70f;" />
diff --git a/Unicord.Universal/Controls/Flyouts/MessageContextFlyout.xaml.cs b/Unicord.Universal/Controls/Flyouts/MessageContextFlyout.xaml.cs
index feebc6fb..1817846d 100644
--- a/Unicord.Universal/Controls/Flyouts/MessageContextFlyout.xaml.cs
+++ b/Unicord.Universal/Controls/Flyouts/MessageContextFlyout.xaml.cs
@@ -20,28 +20,12 @@ namespace Unicord.Universal.Controls.Flyouts
 {
     public sealed partial class MessageContextFlyout : MUXC.CommandBarFlyout
     {
-        public MessageControl Parent
-        {
-            get => (MessageControl)GetValue(ParentProperty);
-            set => SetValue(ParentProperty, value);
-        }
-
-        public static readonly DependencyProperty ParentProperty =
-            DependencyProperty.Register("Parent", typeof(MessageControl), typeof(MessageContextFlyout), new PropertyMetadata(null));
-
         public MessageContextFlyout()
         {
             this.InitializeComponent();
         }
 
         // todo: is there a less shit way of doing this?
-        private void EditFlyoutItem_Click(object sender, RoutedEventArgs e)
-        {
-            this.Hide();
-            this.Target.FindParent<MessageControl>().BeginEdit();
-        }
-
-        // ditto
         private void AddReactionButton_Click(object sender, RoutedEventArgs e)
         {
             this.Hide();
diff --git a/Unicord.Universal/Controls/Messages/AttachmentMediaControl.cs b/Unicord.Universal/Controls/Messages/AttachmentMediaControl.cs
index 43eebbf1..db5ae762 100644
--- a/Unicord.Universal/Controls/Messages/AttachmentMediaControl.cs
+++ b/Unicord.Universal/Controls/Messages/AttachmentMediaControl.cs
@@ -86,19 +86,9 @@ private void OnAttachmentChanged(DependencyPropertyChangedEventArgs e)
             //}
         }
 
-        private async void OnFullWindowRequested(object sender, EventArgs e)
+        private void OnFullWindowRequested(object sender, EventArgs e)
         {
-            var service = FullscreenService.GetForCurrentView();
-            if (_mediaPlayerElement.IsFullWindow)
-            {
-                _mediaPlayerElement.IsFullWindow = false;
-                await service.LeaveFullscreenAsync(_mediaPlayerElement, _mediaPlayerBorder);
-            }
-            else
-            {
-                await service.EnterFullscreenAsync(_mediaPlayerElement, _mediaPlayerBorder);
-                _mediaPlayerElement.IsFullWindow = true;
-            }
+            _mediaPlayerElement.IsFullWindow = !_mediaPlayerElement.IsFullWindow;
         }
     }
 }
diff --git a/Unicord.Universal/Controls/Messages/Embeds/EmbedControl.xaml b/Unicord.Universal/Controls/Messages/Embeds/EmbedControl.xaml
index bbc40005..a3a33266 100644
--- a/Unicord.Universal/Controls/Messages/Embeds/EmbedControl.xaml
+++ b/Unicord.Universal/Controls/Messages/Embeds/EmbedControl.xaml
@@ -9,164 +9,8 @@
     xmlns:messages="using:Unicord.Universal.Models.Messages"
     xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
     mc:Ignorable="d"
-    MaxWidth="480"
-    Margin="0,4,0,0"
     d:DesignHeight="300"
     d:DesignWidth="400">
 
-    <Border BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-            Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-            BorderThickness="1"
-            CornerRadius="4">
-        <Grid>
-            <Border Background="{x:Bind ViewModel.Color}" 
-                    CornerRadius="3">
-                <Border.Clip>
-                    <RectangleGeometry Rect="0,0,4,1000" />
-                </Border.Clip>
-            </Border>
-            <Grid Padding="16,12,12,12">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*"/>
-                    <ColumnDefinition Width="Auto"/>
-                </Grid.ColumnDefinitions>
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="*"/>
-                        <RowDefinition Height="Auto"/>
-                    </Grid.RowDefinitions>
-                    <StackPanel>
-                        <Grid x:Name="ProviderGrid"
-                              x:Load="{x:Bind ViewModel.HasProvider}"
-                              Margin="0,0,0,4">
-                            <TextBlock VerticalAlignment="Center" FontSize="12">
-                                <Hyperlink NavigateUri="{x:Bind ViewModel.ProviderUrl, Mode=OneWay}" UnderlineStyle="None">
-                                    <Run Text="{x:Bind ViewModel.ProviderName, Mode=OneWay}"/>
-                                </Hyperlink>
-                            </TextBlock>
-                        </Grid>
-
-                        <Grid x:Name="AuthorGrid"
-                              x:Load="{x:Bind ViewModel.HasAuthor}"
-                              Margin="0,0,0,4">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="*" />
-                            </Grid.ColumnDefinitions>
-
-                            <Ellipse x:Name="AuthorIcon" 
-                                     x:Load="{x:Bind ViewModel.Author.HasIconUrl}"
-                                     Width="20"
-                                     Height="20"
-                                     Margin="0,0,8,0">
-                                <Ellipse.Fill>
-                                    <ImageBrush>
-                                        <ImageBrush.ImageSource>
-                                            <BitmapImage 
-                                                DecodePixelHeight="20"
-                                                DecodePixelWidth="20"
-                                                DecodePixelType="Logical"
-                                                UriSource="{x:Bind ViewModel.Author.IconUrl}" />
-                                        </ImageBrush.ImageSource>
-                                    </ImageBrush>
-                                </Ellipse.Fill>
-                            </Ellipse>
-                            <TextBlock Grid.Column="1" VerticalAlignment="Center" FontWeight="Bold" Text="{x:Bind ViewModel.Author.Name}"/>
-                        </Grid>
-
-                        <wam:MarkdownTextBlock x:Name="TitleText"
-                                               x:Load="{x:Bind ViewModel.HasTitle}"
-                                               Channel="{x:Bind ViewModel.Channel}"
-                                               FontWeight="Bold"
-                                               TextWrapping="WrapWholeWords"
-                                               InlineOnly="True"
-                                               Text="{x:Bind ViewModel.Title}" />
-
-                        <wam:MarkdownTextBlock x:Name="DescriptionText"
-                                               x:Load="{x:Bind ViewModel.HasDescription}"
-                                               Channel="{x:Bind ViewModel.Channel}"
-                                               Margin="0,4,0,0"
-                                               TextWrapping="WrapWholeWords"
-                                               InlineOnly="False"
-                                               Text="{x:Bind ViewModel.Description}"/>                     
-                    </StackPanel>
-
-                    <local:EmbedFieldsView x:Name="FieldsList"
-                                           x:Load="{x:Bind ViewModel.HasFields}"
-                                           Grid.Row="1"
-                                           ItemsSource="{x:Bind ViewModel.Fields}"
-                                           HorizontalAlignment="Stretch"
-                                           HorizontalContentAlignment="Stretch">
-                        <ItemsControl.ItemsPanel>
-                            <ItemsPanelTemplate>
-                                <wam:UniformGrid Columns="3" HorizontalAlignment="Stretch" RowSpacing="2" ColumnSpacing="4" />
-                            </ItemsPanelTemplate>
-                        </ItemsControl.ItemsPanel>
-                        <ItemsControl.ItemTemplate>
-                            <DataTemplate x:DataType="messages:EmbedFieldViewModel">
-                                <StackPanel>
-                                    <wam:MarkdownTextBlock x:Name="EmbedFieldTitle" Channel="{x:Bind Channel}" Text="{x:Bind Title}" FontWeight="Bold"/>
-                                    <wam:MarkdownTextBlock x:Name="EmbedFieldContent" Channel="{x:Bind Channel}" Grid.Row="1" Text="{x:Bind Text}" />
-                                </StackPanel>
-                            </DataTemplate>
-                        </ItemsControl.ItemTemplate>
-                    </local:EmbedFieldsView>
-
-                    <local:ImageEmbedControl 
-                            x:Name="PART_LargeThumbnail"
-                            x:Load="{x:Bind ViewModel.HasLargeThumbnail, Mode=OneWay}"
-                        Grid.Row="2"
-                            Margin="0,8,0,0"
-                            ViewModel="{x:Bind ViewModel.Thumbnail, Mode=OneWay}"/>
-
-                    <local:VideoEmbedControl 
-                            x:Name="EmbedVideo"
-                            x:Load="{x:Bind ViewModel.HasVideo, Mode=OneWay}"
-                        Grid.Row="2"
-                            Margin="0,8,0,0"
-                            ViewModel="{x:Bind ViewModel.Video, Mode=OneWay}"/>
-
-                    <Grid x:Name="FooterGrid"
-                              x:Load="{x:Bind ViewModel.HasFooter}"
-                        Grid.Row="3"
-                              Margin="0,4,0,0">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="*" />
-                        </Grid.ColumnDefinitions>
-
-                        <Rectangle x:Name="FooterIcon"
-                                       x:Load="{x:Bind ViewModel.Footer.HasIconUrl}"
-                                       Width="20" Height="20"
-                                       RadiusX="2" RadiusY="2"
-                                       Margin="0,0,12,0">
-                            <Rectangle.Fill>
-                                <ImageBrush>
-                                    <ImageBrush.ImageSource>
-                                        <BitmapImage DecodePixelHeight="20"
-                                                         DecodePixelWidth="20"
-                                                         UriSource="{x:Bind ViewModel.Author.IconUrl}" />
-                                    </ImageBrush.ImageSource>
-                                </ImageBrush>
-                            </Rectangle.Fill>
-                        </Rectangle>
-                        <TextBlock Grid.Column="1" FontSize="12pt" TextWrapping="Wrap" VerticalAlignment="Center" Text="{x:Bind ViewModel.Footer.Text}"/>
-                    </Grid>
-                </Grid>
-
-                <Grid Grid.Column="1">
-                    <local:ImageEmbedControl 
-                        x:Name="PART_Thumbnail"
-                        x:Load="{x:Bind ViewModel.HasSmallThumbnail, Mode=OneWay}"
-                        Width="96"
-                        MaxHeight="96"
-                        Margin="12,0,0,0"
-                        VerticalAlignment="Top"
-                        ViewModel="{x:Bind ViewModel.Thumbnail, Mode=OneWay}" />
-                </Grid>
-            </Grid>
-        </Grid>
-    </Border>
+    <ContentControl Content="{x:Bind ViewModel}" ContentTemplate="{StaticResource RichEmbedTemplate}"/>
 </UserControl>
diff --git a/Unicord.Universal/Controls/Messages/Embeds/EmbedFieldsView.cs b/Unicord.Universal/Controls/Messages/Embeds/EmbedFieldsView.cs
index b972710b..b3aa56fa 100644
--- a/Unicord.Universal/Controls/Messages/Embeds/EmbedFieldsView.cs
+++ b/Unicord.Universal/Controls/Messages/Embeds/EmbedFieldsView.cs
@@ -11,10 +11,10 @@ public sealed class EmbedFieldsView : ItemsControl
     {
         protected override void PrepareContainerForItemOverride(DependencyObject element, object item)
         {
+            base.PrepareContainerForItemOverride(element, item);
+
             if (item is EmbedFieldViewModel field)
                 Grid.SetColumnSpan((FrameworkElement)element, field.ColumnSpan);
-
-            base.PrepareContainerForItemOverride(element, item);
         }
     }
 }
diff --git a/Unicord.Universal/Controls/Messages/Embeds/ImageEmbedControl.xaml b/Unicord.Universal/Controls/Messages/Embeds/ImageEmbedControl.xaml
index c56a67f1..28fcb083 100644
--- a/Unicord.Universal/Controls/Messages/Embeds/ImageEmbedControl.xaml
+++ b/Unicord.Universal/Controls/Messages/Embeds/ImageEmbedControl.xaml
@@ -11,10 +11,10 @@
     d:DesignHeight="300"
     d:DesignWidth="400">
 
-    <Border BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-            Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}"
-            BorderThickness="1"
-            CornerRadius="2">
+    <Border BorderBrush="{ThemeResource ImageEmbed_BorderBrush}"
+            Background="{ThemeResource ImageEmbed_Background}"
+            BorderThickness="{ThemeResource ImageEmbed_BorderThickness}"
+            CornerRadius="{ThemeResource ImageEmbed_CornerRadius}">
         <controls:ScaledContentControl TargetWidth="{x:Bind ViewModel.NaturalWidth}" TargetHeight="{x:Bind ViewModel.NaturalHeight}">
             <controls:ImageElement x:Name="Image"
                                    Tapped="Image_Tapped"
diff --git a/Unicord.Universal/Controls/Messages/Embeds/VideoEmbedControl.xaml b/Unicord.Universal/Controls/Messages/Embeds/VideoEmbedControl.xaml
index f7c9998b..5ac8c66b 100644
--- a/Unicord.Universal/Controls/Messages/Embeds/VideoEmbedControl.xaml
+++ b/Unicord.Universal/Controls/Messages/Embeds/VideoEmbedControl.xaml
@@ -15,16 +15,15 @@
     <UserControl.Resources>
         <ui:AttachedDropShadow x:Key="PlayButtonShadow" CastTo="{x:Bind posterImage}" BlurRadius="16" Opacity="1" Color="Black"/>
     </UserControl.Resources>
-    <Border BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-            Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}"
-            BorderThickness="1"
-            CornerRadius="2">
+    <Border BorderBrush="{ThemeResource ImageEmbed_BorderBrush}"
+            Background="{ThemeResource ImageEmbed_Background}"
+            BorderThickness="{ThemeResource ImageEmbed_BorderThickness}"
+            CornerRadius="{ThemeResource ImageEmbed_CornerRadius}">
         <Grid x:Name="content">
             <Grid x:Name="posterContainer" Tapped="Canvas_Tapped">
                 <controls:ImageEx x:Name="posterImage" 
                               IsCacheEnabled="True" 
                               Source="{x:Bind ViewModel.Thumbnail.Source}" 
-                              Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}"
                               VerticalContentAlignment="Center"
                               HorizontalContentAlignment="Center"
                               Stretch="UniformToFill"/>
diff --git a/Unicord.Universal/Controls/Messages/MessageControl.cs b/Unicord.Universal/Controls/Messages/MessageControl.cs
index 5da1b989..3430533a 100644
--- a/Unicord.Universal/Controls/Messages/MessageControl.cs
+++ b/Unicord.Universal/Controls/Messages/MessageControl.cs
@@ -4,10 +4,6 @@
 using System.Runtime.InteropServices.WindowsRuntime;
 using System.ServiceModel.Channels;
 using System.Threading.Tasks;
-using DSharpPlus;
-using DSharpPlus.Entities;
-using DSharpPlus.EventArgs;
-using Microsoft.Toolkit.Uwp.Helpers;
 using Unicord.Universal.Models.Messages;
 using Unicord.Universal.Pages;
 using Windows.System;
@@ -26,7 +22,6 @@ namespace Unicord.Universal.Controls.Messages
 {
     public class MessageControl : Control
     {
-        private bool _addedEditHandlers;
         private ImageBrush _imageBrush;
 
         #region Dependency Properties
@@ -62,17 +57,15 @@ protected override void OnApplyTemplate()
 
         protected virtual void OnMessageChanged(DependencyPropertyChangedEventArgs e)
         {
+            this.ApplyTemplate();
+
             if (e.NewValue is MessageViewModel message)
             {
-                this.DataContext = message;
                 this.UpdateProfileImage(message);
-                this.UpdateCollapsedState();
             }
             else
             {
-                this.DataContext = null;
                 this.ClearProfileImage();
-                // reset
             }
         }
 
@@ -105,134 +98,5 @@ private void UpdateProfileImage(MessageViewModel message)
                 DecodePixelType = DecodePixelType.Physical
             };
         }
-
-        // TODO: Could prolly move this somewhere better
-        // bro what was i thinking :skull:
-        private void UpdateCollapsedState()
-        {
-            if (MessageViewModel == null || !IsEnabled)
-                return;
-
-            VisualStateManager.GoToState(this, "NotEditing", false);
-            VisualStateManager.GoToState(this, "NoMention", false);
-
-            if (MessageViewModel.Parent == null)
-            {
-                VisualStateManager.GoToState(this, "None", false);
-                return;
-            }
-
-            if (MessageViewModel.Parent.IsEditMode)
-            {
-                VisualStateManager.GoToState(this, "EditMode", false);
-                return;
-            }
-
-            if (MessageViewModel.IsMention)
-            {
-                VisualStateManager.GoToState(this, "Mention", false);
-            }
-
-            if (MessageViewModel.IsCollapsed)
-            {
-                VisualStateManager.GoToState(this, "Collapsed", false);
-            }
-            else
-            {
-                VisualStateManager.GoToState(this, "Normal", false);
-            }
-        }
-
-        public virtual void BeginEdit()
-        {
-            VisualStateManager.GoToState(this, "Editing", true);
-
-            var control = GetTemplateChild("MessageEditTools") as MessageEditTools;
-            control.ApplyTemplate();
-
-            var editBox = control.FindChild<TextBox>("MessageEditBox");
-
-            if (!_addedEditHandlers)
-            {
-                var editFinishButton = control.FindChild<Button>("MessageEditFinishButton");
-                var editCancelButton = control.FindChild<Button>("MessageEditCancelButton");
-
-                editBox.KeyDown += this.OnEditKeyDown;
-                editFinishButton.Click += this.OnEditFinishClick;
-                editCancelButton.Click += this.OnEditCancelClick;
-
-                _addedEditHandlers = true;
-            }
-
-            editBox.Focus(FocusState.Keyboard);
-            editBox.SelectionStart = editBox.Text.Length;
-        }
-
-        private async Task SaveEditAsync()
-        {
-            try
-            {
-                // TODO: this is horrible
-                var control = this.FindChild<MessageEditTools>();
-                var editBox = control.FindChild<TextBox>("MessageEditBox");
-                var message = MessageViewModel.Message;
-                if (!string.IsNullOrWhiteSpace(editBox.Text) && editBox.Text != message.Content)
-                {
-                    await message.ModifyAsync(editBox.Text);
-                }
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError(ex);
-            }
-        }
-
-        public virtual void EndEdit()
-        {
-            VisualStateManager.GoToState(this, "NotEditing", true);
-
-            var page = this.FindParent<ChannelPage>();
-            if (page != null)
-            {
-                page.FocusTextBox();
-            }
-        }
-
-        private async void OnEditKeyDown(object sender, KeyRoutedEventArgs e)
-        {
-            var textBox = (sender as TextBox);
-            var shift = Window.Current.CoreWindow.GetKeyState(VirtualKey.Shift);
-            if (e.Key == VirtualKey.Enter)
-            {
-                e.Handled = true;
-                if (shift.HasFlag(CoreVirtualKeyStates.Down))
-                {
-                    var start = textBox.SelectionStart;
-                    textBox.Text = textBox.Text.Insert(start, "\r\n");
-                    textBox.SelectionStart = start + 1;
-                }
-                else
-                {
-                    EndEdit();
-                    await SaveEditAsync();
-                }
-            }
-
-            if (e.Key == VirtualKey.Escape)
-            {
-                EndEdit();
-            }
-        }
-
-        private async void OnEditFinishClick(object sender, RoutedEventArgs e)
-        {
-            EndEdit();
-            await SaveEditAsync();
-        }
-
-        private void OnEditCancelClick(object sender, RoutedEventArgs e)
-        {
-            EndEdit();
-        }
     }
 }
diff --git a/Unicord.Universal/Controls/Messages/MessageEditTools.cs b/Unicord.Universal/Controls/Messages/MessageEditTools.cs
index 8502872a..cc6adb4c 100644
--- a/Unicord.Universal/Controls/Messages/MessageEditTools.cs
+++ b/Unicord.Universal/Controls/Messages/MessageEditTools.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices.WindowsRuntime;
+using Unicord.Universal.Models.Messages;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Data;
@@ -15,6 +16,15 @@ namespace Unicord.Universal.Controls.Messages
 {
     public sealed class MessageEditTools : Control
     {
+        public MessageEditViewModel ViewModel
+        {
+            get { return (MessageEditViewModel)GetValue(ViewModelProperty); }
+            set { SetValue(ViewModelProperty, value); }
+        }
+
+        public static readonly DependencyProperty ViewModelProperty =
+            DependencyProperty.Register("ViewModel", typeof(MessageEditViewModel), typeof(MessageEditTools), new PropertyMetadata(null));
+
         public MessageEditTools()
         {
             this.DefaultStyleKey = typeof(MessageEditTools);
diff --git a/Unicord.Universal/Controls/Messages/SystemMessageControl.cs b/Unicord.Universal/Controls/Messages/SystemMessageControl.cs
index f72db52e..649ed825 100644
--- a/Unicord.Universal/Controls/Messages/SystemMessageControl.cs
+++ b/Unicord.Universal/Controls/Messages/SystemMessageControl.cs
@@ -19,15 +19,5 @@ public SystemMessageControl()
         {
             this.DefaultStyleKey = typeof(SystemMessageControl);
         }
-
-        public override void BeginEdit()
-        {
-            // not editable
-        }
-
-        public override void EndEdit()
-        {
-            // not editable
-        }
     }
 }
diff --git a/Unicord.Universal/Controls/UniformGrid/UniformGrid.cs b/Unicord.Universal/Controls/UniformGrid/UniformGrid.cs
index b8d1ec58..cf35dc86 100644
--- a/Unicord.Universal/Controls/UniformGrid/UniformGrid.cs
+++ b/Unicord.Universal/Controls/UniformGrid/UniformGrid.cs
@@ -83,8 +83,8 @@ protected override Size MeasureOverride(Size availableSize)
             double columnSpacingSize = 0;
             double rowSpacingSize = 0;
 
-            columnSpacingSize = ColumnSpacing * (columns - 1);
-            rowSpacingSize = RowSpacing * (rows - 1);
+            columnSpacingSize = 0 * (columns - 1);
+            rowSpacingSize = 0 * (rows - 1);
 
             Size childSize = new Size(
                 (availableSize.Width - columnSpacingSize) / columns,
diff --git a/Unicord.Universal/Converters/DateTimeConverter.cs b/Unicord.Universal/Converters/DateTimeConverter.cs
index 749cad9e..79b7aa14 100644
--- a/Unicord.Universal/Converters/DateTimeConverter.cs
+++ b/Unicord.Universal/Converters/DateTimeConverter.cs
@@ -7,34 +7,34 @@ namespace Unicord.Universal.Converters
 {
     class DateTimeConverter : IValueConverter
     {
-        public object Convert(object value, Type targetType, object parameter, string language)
+        public static string Convert(TimestampStyle style, DateTime dt)
         {
-            var setting = parameter is TimestampStyle ? (TimestampStyle)parameter : (TimestampStyle)App.RoamingSettings.Read(Constants.TIMESTAMP_STYLE, (int)TimestampStyle.Absolute);
+            dt = dt.ToUniversalTime();
 
-            if (value is not DateTime t)
+            switch (style)
             {
-                t = value is DateTimeOffset dto ? dto.LocalDateTime : default;
+                case TimestampStyle.Relative:
+                    return dt.Humanize(true);
+                case TimestampStyle.Absolute:
+                    return new Moment(dt).Calendar();
+                case TimestampStyle.Both:
+                    return $"{dt.Humanize(true)} - {new Moment(dt).Calendar()}";
+                default:
+                    return dt.ToShortDateString();
             }
+        }
 
-            t = t.ToUniversalTime();
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (parameter is not TimestampStyle style)
+                style = (TimestampStyle)App.RoamingSettings.Read(Constants.TIMESTAMP_STYLE, (int)TimestampStyle.Absolute);
 
-            var moment = new Moment(t);
-            if (t != default)
-            {
-                switch (setting)
-                {
-                    case TimestampStyle.Relative:
-                        return t.Humanize(true);
-                    case TimestampStyle.Absolute:
-                        return moment.Calendar();
-                    case TimestampStyle.Both:
-                        return $"{t.Humanize(true)} - {moment.Calendar()}";
-                }
-            }
+            if (value is not DateTime dt)
+                dt = ((DateTimeOffset)value).DateTime;
 
-            return "";
+            return Convert(style, dt);
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, string language) => throw new NotImplementedException();
     }
-}
+}
\ No newline at end of file
diff --git a/Unicord.Universal/Converters/Static.cs b/Unicord.Universal/Converters/Static.cs
new file mode 100644
index 00000000..60d5f7b8
--- /dev/null
+++ b/Unicord.Universal/Converters/Static.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Unicord.Universal.Models.Messages;
+
+namespace Unicord.Universal.Converters
+{
+    public class Static
+    {
+        public static bool NotNull(object obj)
+            => obj != null;
+
+        public static bool Not(bool b)
+            => !b;
+
+        public static bool Is(MessageViewModelState state, MessageViewModelState other)
+            => state == other;
+
+        public static bool IsNot(MessageViewModelState state, MessageViewModelState other)
+            => state != other;
+    }
+}
diff --git a/Unicord.Universal/Extensions/GuildExtensions.cs b/Unicord.Universal/Extensions/AvatarExtensions.cs
similarity index 52%
rename from Unicord.Universal/Extensions/GuildExtensions.cs
rename to Unicord.Universal/Extensions/AvatarExtensions.cs
index 3569dfb9..003a531f 100644
--- a/Unicord.Universal/Extensions/GuildExtensions.cs
+++ b/Unicord.Universal/Extensions/AvatarExtensions.cs
@@ -1,92 +1,167 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Numerics;
-using System.Text;
-using System.Threading.Tasks;
-using DSharpPlus;
-using DSharpPlus.Entities;
-using Windows.Graphics.Display;
-
-namespace Unicord.Universal.Extensions
-{
-    public static class GuildExtensions
-    {
-        public static string GetIconUrl(this DiscordGuild guild, int size)
-        {
-            if (size < 16 || size > 2048)
-                throw new ArgumentOutOfRangeException(nameof(size));
-
-            var displayInfo = DisplayInformation.GetForCurrentView();
-            size = (int)BitOperations.RoundUpToPowerOf2((uint)(size * (displayInfo.LogicalDpi / 96.0f)));
-
-            var fmt = Tools.ShouldUseWebP ? ImageFormat.WebP : ImageFormat.Png;
-            var sfmt = fmt switch
-            {
-                ImageFormat.Gif => "gif",
-                ImageFormat.Jpeg => "jpg",
-                ImageFormat.Png => "png",
-                ImageFormat.WebP => "webp",
-                _ => throw new ArgumentOutOfRangeException(nameof(fmt)),
-            };
-
-            var ssize = size.ToString(CultureInfo.InvariantCulture);
-            if (!string.IsNullOrWhiteSpace(guild.IconHash))
-            {
-                var id = guild.Id.ToString(CultureInfo.InvariantCulture);
-                return $"https://cdn.discordapp.com/icons/{id}/{guild.IconHash}.{sfmt}?size={ssize}";
-            }
-            else
-            {
-                return null;
-            }
-        }
-
-        public static string GetBannerUrl(this DiscordGuild guild)
-        {
-            var fmt = Tools.ShouldUseWebP ? ImageFormat.WebP : ImageFormat.Png;
-            var sfmt = fmt switch
-            {
-                ImageFormat.Gif => "gif",
-                ImageFormat.Jpeg => "jpg",
-                ImageFormat.Png => "png",
-                ImageFormat.WebP => "webp",
-                _ => throw new ArgumentOutOfRangeException(nameof(fmt)),
-            };
-
-            if (!string.IsNullOrWhiteSpace(guild.Banner))
-            {
-                var id = guild.Id.ToString(CultureInfo.InvariantCulture);
-                return $"https://cdn.discordapp.com/banners/{id}/{guild.Banner}.{sfmt}?size=512";
-            }
-            else
-            {
-                return null;
-            }
-        }
-
-        public static string GetSplashUrl(this DiscordGuild guild)
-        {
-            var fmt = Tools.ShouldUseWebP ? ImageFormat.WebP : ImageFormat.Png;
-            var sfmt = fmt switch
-            {
-                ImageFormat.Gif => "gif",
-                ImageFormat.Jpeg => "jpg",
-                ImageFormat.Png => "png",
-                ImageFormat.WebP => "webp",
-                _ => throw new ArgumentOutOfRangeException(nameof(fmt)),
-            };
-
-            if (!string.IsNullOrWhiteSpace(guild.SplashHash))
-            {
-                var id = guild.Id.ToString(CultureInfo.InvariantCulture);
-                return $"https://cdn.discordapp.com/splashes/{id}/{guild.SplashHash}.{sfmt}";
-            }
-            else
-            {
-                return null;
-            }
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Numerics;
+using System.Text;
+using System.Threading.Tasks;
+using DSharpPlus;
+using DSharpPlus.Entities;
+using Windows.Graphics.Display;
+
+namespace Unicord.Universal.Extensions
+{
+    public static class AvatarExtensions
+    {
+        private static float logicalDpi;
+
+        static AvatarExtensions()
+        {
+            var info = DisplayInformation.GetForCurrentView();
+            info.DpiChanged += OnDpiChanged;
+
+            logicalDpi = info.LogicalDpi;
+        }
+
+        private static void OnDpiChanged(DisplayInformation sender, object args)
+        {
+            logicalDpi = sender.LogicalDpi;
+        }
+
+        public static string GetIconUrl(this DiscordGuild guild, int size)
+        {
+            if (size < 16 || size > 2048)
+                throw new ArgumentOutOfRangeException(nameof(size));
+
+            size = (int)BitOperations.RoundUpToPowerOf2((uint)(size * (logicalDpi / 96.0f)));
+
+            var fmt = Tools.ShouldUseWebP ? ImageFormat.WebP : ImageFormat.Png;
+            var sfmt = fmt switch
+            {
+                ImageFormat.Gif => "gif",
+                ImageFormat.Jpeg => "jpg",
+                ImageFormat.Png => "png",
+                ImageFormat.WebP => "webp",
+                _ => throw new ArgumentOutOfRangeException(nameof(fmt)),
+            };
+
+            var ssize = size.ToString(CultureInfo.InvariantCulture);
+            if (!string.IsNullOrWhiteSpace(guild.IconHash))
+            {
+                var id = guild.Id.ToString(CultureInfo.InvariantCulture);
+                return $"https://cdn.discordapp.com/icons/{id}/{guild.IconHash}.{sfmt}?size={ssize}";
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+        public static string GetBannerUrl(this DiscordGuild guild)
+        {
+            var fmt = Tools.ShouldUseWebP ? ImageFormat.WebP : ImageFormat.Png;
+            var sfmt = fmt switch
+            {
+                ImageFormat.Gif => "gif",
+                ImageFormat.Jpeg => "jpg",
+                ImageFormat.Png => "png",
+                ImageFormat.WebP => "webp",
+                _ => throw new ArgumentOutOfRangeException(nameof(fmt)),
+            };
+
+            if (!string.IsNullOrWhiteSpace(guild.Banner))
+            {
+                var id = guild.Id.ToString(CultureInfo.InvariantCulture);
+                return $"https://cdn.discordapp.com/banners/{id}/{guild.Banner}.{sfmt}?size=512";
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+        public static string GetSplashUrl(this DiscordGuild guild)
+        {
+            var fmt = Tools.ShouldUseWebP ? ImageFormat.WebP : ImageFormat.Png;
+            var sfmt = fmt switch
+            {
+                ImageFormat.Gif => "gif",
+                ImageFormat.Jpeg => "jpg",
+                ImageFormat.Png => "png",
+                ImageFormat.WebP => "webp",
+                _ => throw new ArgumentOutOfRangeException(nameof(fmt)),
+            };
+
+            if (!string.IsNullOrWhiteSpace(guild.SplashHash))
+            {
+                var id = guild.Id.ToString(CultureInfo.InvariantCulture);
+                return $"https://cdn.discordapp.com/splashes/{id}/{guild.SplashHash}.{sfmt}";
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+
+        /// <summary>
+        /// Gets the user's avatar URL, in requested format and size.
+        /// </summary>
+        /// <param name="fmt">Format of the avatar to get.</param>
+        /// <param name="size">Maximum size of the avatar. Must be a power of two, minimum 16, maximum 2048.</param>
+        /// <returns>URL of the user's avatar.</returns>
+        public static string GetAvatarUrl(this DiscordUser user, ushort size = 1024)
+        {
+            if (size < 16 || size > 2048)
+                throw new ArgumentOutOfRangeException(nameof(size));
+
+            size = (ushort)BitOperations.RoundUpToPowerOf2((uint)(size * (logicalDpi / 96.0f)));
+
+            var fmt = Tools.ShouldUseWebP ? ImageFormat.WebP : ImageFormat.Png;
+
+            var sfmt = "";
+            switch (fmt)
+            {
+                case ImageFormat.Gif:
+                    sfmt = "gif";
+                    break;
+
+                case ImageFormat.Jpeg:
+                    sfmt = "jpg";
+                    break;
+
+                case ImageFormat.Png:
+                    sfmt = "png";
+                    break;
+
+                case ImageFormat.WebP:
+                    sfmt = "webp";
+                    break;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(fmt));
+            }
+
+            var ssize = size.ToString(CultureInfo.InvariantCulture);
+            if (!string.IsNullOrWhiteSpace(user.AvatarHash))
+            {
+                var id = user.Id.ToString(CultureInfo.InvariantCulture);
+                return $"https://cdn.discordapp.com/avatars/{id}/{user.AvatarHash}.{sfmt}?size={ssize}";
+            }
+            else
+            {
+                string type;
+                if (string.IsNullOrWhiteSpace(user.Discriminator) || user.Discriminator == "0")
+                {
+                    type = ((user.Id >> 22) % 6).ToString(CultureInfo.InvariantCulture);
+                }
+                else
+                {
+                    type = (int.Parse(user.Discriminator, CultureInfo.InvariantCulture) % 5)
+                        .ToString(CultureInfo.InvariantCulture);
+                }
+                return $"https://cdn.discordapp.com/embed/avatars/{type}.{sfmt}?size={ssize}";
+            }
+        }
+    }
+}
diff --git a/Unicord.Universal/Extensions/FocusExtensions.cs b/Unicord.Universal/Extensions/FocusExtensions.cs
new file mode 100644
index 00000000..c71285dc
--- /dev/null
+++ b/Unicord.Universal/Extensions/FocusExtensions.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+
+namespace Unicord.Universal.Extensions
+{
+    public static class FocusExtensions
+    {
+        public static bool GetIsFocused(DependencyObject obj)
+        {
+            return (bool)obj.GetValue(IsFocusedProperty);
+        }
+
+        public static void SetIsFocused(DependencyObject obj, bool value)
+        {
+            obj.SetValue(IsFocusedProperty, value);
+        }
+
+        public static readonly DependencyProperty IsFocusedProperty =
+            DependencyProperty.RegisterAttached("IsFocused", typeof(bool), typeof(FocusExtensions), new PropertyMetadata(false, OnIsFocusedPropertyChanged));
+
+        private static void OnIsFocusedPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            void OnLoaded(object sender, RoutedEventArgs e)
+            {
+                var control = (Control)d;
+                control.Focus(FocusState.Programmatic);
+                control.Loaded -= OnLoaded;
+            }
+
+            var control = (Control)d;
+            if ((bool)e.NewValue)
+            {
+                control.Loaded += OnLoaded;
+                control.Focus(FocusState.Programmatic);
+            }
+        }
+    }
+}
diff --git a/Unicord.Universal/Extensions/ShiftEnterExtensions.cs b/Unicord.Universal/Extensions/ShiftEnterExtensions.cs
new file mode 100644
index 00000000..62d3de7b
--- /dev/null
+++ b/Unicord.Universal/Extensions/ShiftEnterExtensions.cs
@@ -0,0 +1,114 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Input;
+using Windows.System;
+using Windows.UI.Core;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Input;
+
+namespace Unicord.Universal.Extensions
+{
+    public static class ShiftEnterExtensions
+    {
+        public static bool GetIsEnabled(DependencyObject obj)
+        {
+            return (bool)obj.GetValue(IsEnabledProperty);
+        }
+
+        public static void SetIsEnabled(DependencyObject obj, bool value)
+        {
+            obj.SetValue(IsEnabledProperty, value);
+        }
+
+        public static readonly DependencyProperty IsEnabledProperty =
+            DependencyProperty.RegisterAttached("IsEnabled", typeof(bool), typeof(ShiftEnterExtensions), new PropertyMetadata(false, OnIsEnabledPropertyChanged));
+
+        public static ICommand GetShiftEnterCommand(DependencyObject obj)
+        {
+            return (ICommand)obj.GetValue(ShiftEnterCommandProperty);
+        }
+
+        public static void SetShiftEnterCommand(DependencyObject obj, ICommand value)
+        {
+            obj.SetValue(ShiftEnterCommandProperty, value);
+        }
+
+        public static readonly DependencyProperty ShiftEnterCommandProperty =
+            DependencyProperty.RegisterAttached("ShiftEnterCommand", typeof(ICommand), typeof(ShiftEnterExtensions), new PropertyMetadata(null));
+
+        public static ICommand GetEnterCommand(DependencyObject obj)
+        {
+            return (ICommand)obj.GetValue(EnterCommandProperty);
+        }
+
+        public static void SetEnterCommand(DependencyObject obj, ICommand value)
+        {
+            obj.SetValue(EnterCommandProperty, value);
+        }
+
+        public static readonly DependencyProperty EnterCommandProperty =
+            DependencyProperty.RegisterAttached("EnterCommand", typeof(ICommand), typeof(ShiftEnterExtensions), new PropertyMetadata(null));
+
+        public static ICommand GetEscapeCommand(DependencyObject obj)
+        {
+            return (ICommand)obj.GetValue(EscapeCommandProperty);
+        }
+
+        public static void SetEscapeCommand(DependencyObject obj, ICommand value)
+        {
+            obj.SetValue(EscapeCommandProperty, value);
+        }
+
+        public static readonly DependencyProperty EscapeCommandProperty =
+            DependencyProperty.RegisterAttached("EscapeCommand", typeof(ICommand), typeof(ShiftEnterExtensions), new PropertyMetadata(null));
+
+        private static void OnIsEnabledPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var textBox = (TextBox)d;
+            if ((bool)e.NewValue)
+            {
+                textBox.KeyDown += OnPreviewKeyDown;
+            }
+            else
+            {
+                textBox.KeyDown -= OnPreviewKeyDown;
+            }
+        }
+
+        private static void OnPreviewKeyDown(object sender, KeyRoutedEventArgs e)
+        {
+            var textBox = (TextBox)sender;
+
+            var shiftEnter = GetShiftEnterCommand(textBox);
+            var enter = GetEnterCommand(textBox);
+            var escape = GetEscapeCommand(textBox);
+
+            var shift = Window.Current.CoreWindow.GetKeyState(VirtualKey.Shift);
+            if (e.Key == VirtualKey.Enter)
+            {
+                e.Handled = true;
+
+                if (shift.HasFlag(CoreVirtualKeyStates.Down))
+                {
+                    if (shiftEnter.CanExecute(textBox))
+                        shiftEnter.Execute(textBox);
+                }
+                else
+                {
+                    if (enter.CanExecute(textBox))
+                        enter.Execute(textBox);
+                }
+            }
+
+            if (e.Key == VirtualKey.Escape)
+            {
+                if (escape.CanExecute(textBox))
+                    escape.Execute(textBox);
+            }
+        }
+    }
+}
diff --git a/Unicord.Universal/Extensions/UserExtensions.cs b/Unicord.Universal/Extensions/UserExtensions.cs
deleted file mode 100644
index b2d73ba1..00000000
--- a/Unicord.Universal/Extensions/UserExtensions.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Numerics;
-using System.Text;
-using System.Threading.Tasks;
-using DSharpPlus;
-using DSharpPlus.Entities;
-using Windows.Graphics.Display;
-
-namespace Unicord.Universal.Extensions
-{
-    public static class UserExtensions
-    {
-        /// <summary>
-        /// Gets the user's avatar URL, in requested format and size.
-        /// </summary>
-        /// <param name="fmt">Format of the avatar to get.</param>
-        /// <param name="size">Maximum size of the avatar. Must be a power of two, minimum 16, maximum 2048.</param>
-        /// <returns>URL of the user's avatar.</returns>
-        public static string GetAvatarUrl(this DiscordUser user, ushort size = 1024)
-        {
-            if (size < 16 || size > 2048)
-                throw new ArgumentOutOfRangeException(nameof(size));
-
-            var displayInfo = DisplayInformation.GetForCurrentView();
-            size = (ushort)BitOperations.RoundUpToPowerOf2((uint)(size * (displayInfo.LogicalDpi / 96.0f)));
-
-            var fmt = Tools.ShouldUseWebP ? ImageFormat.WebP : ImageFormat.Png;
-
-            var sfmt = "";
-            switch (fmt)
-            {
-                case ImageFormat.Gif:
-                    sfmt = "gif";
-                    break;
-
-                case ImageFormat.Jpeg:
-                    sfmt = "jpg";
-                    break;
-
-                case ImageFormat.Png:
-                    sfmt = "png";
-                    break;
-
-                case ImageFormat.WebP:
-                    sfmt = "webp";
-                    break;
-
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(fmt));
-            }
-
-            var ssize = size.ToString(CultureInfo.InvariantCulture);
-            if (!string.IsNullOrWhiteSpace(user.AvatarHash))
-            {
-                var id = user.Id.ToString(CultureInfo.InvariantCulture);
-                return $"https://cdn.discordapp.com/avatars/{id}/{user.AvatarHash}.{sfmt}?size={ssize}";
-            }
-            else
-            {
-                string type;
-                if (string.IsNullOrWhiteSpace(user.Discriminator) || user.Discriminator == "0")
-                {
-                    type = ((user.Id >> 22) % 6).ToString(CultureInfo.InvariantCulture);
-                }
-                else
-                {
-                    type = (int.Parse(user.Discriminator, CultureInfo.InvariantCulture) % 5)
-                        .ToString(CultureInfo.InvariantCulture);
-                }
-                return $"https://cdn.discordapp.com/embed/avatars/{type}.{sfmt}?size={ssize}";
-            }
-        }
-    }
-}
diff --git a/Unicord.Universal/Integration/ContactListManager.cs b/Unicord.Universal/Integration/ContactListManager.cs
index 4a619be0..e365b9ed 100644
--- a/Unicord.Universal/Integration/ContactListManager.cs
+++ b/Unicord.Universal/Integration/ContactListManager.cs
@@ -11,10 +11,12 @@
 using Windows.Storage;
 using Windows.Storage.Streams;
 using Unicord.Universal.Services;
+using System.Collections.Frozen;
+using Microsoft.Extensions.Logging;
 
 namespace Unicord.Universal.Integration
 {
-    internal static class ContactListManager
+    internal class ContactListManager
     {
 #if RELEASE
         private const string REMOTE_ID_PREFIX = "Unicord_";
@@ -47,6 +49,9 @@ public static async Task<ulong> TryGetChannelIdAsync(Contact contact)
 
         public static async Task UpdateContactsListAsync()
         {
+            var logger = Logger.GetLogger<ContactListManager>();
+            var relationships = DiscordManager.Discord.Relationships.ToFrozenDictionary();
+
             try
             {
                 var folder = await ApplicationData.Current.LocalFolder.CreateFolderAsync("AvatarCache", CreationCollisionOption.OpenIfExists);
@@ -62,7 +67,7 @@ public static async Task UpdateContactsListAsync()
                     var allContacts = await store.FindContactsAsync();
 
                     // remove all contacts no longer in the user's friends list
-                    var removed = allContacts.Where(c => c.RemoteId.StartsWith(REMOTE_ID_PREFIX) && !DiscordManager.Discord.Relationships.ContainsKey(ulong.TryParse(c.RemoteId.Split('_').Last(), out var id) ? id : 0));
+                    var removed = allContacts.Where(c => c.RemoteId.StartsWith(REMOTE_ID_PREFIX) && !relationships.ContainsKey(ulong.TryParse(c.RemoteId.Split('_').Last(), out var id) ? id : 0));
                     foreach (var cont in removed)
                     {
                         try
@@ -73,57 +78,40 @@ public static async Task UpdateContactsListAsync()
                     }
 
                     // update all contacts
-                    var relationships = DiscordManager.Discord.Relationships.Values.Where(r => r.RelationshipType == DiscordRelationshipType.Friend);
-                    foreach (var relationship in relationships)
+                    //var relationships = DiscordManager.Discord.Relationships.Values.Where(r => r.RelationshipType == DiscordRelationshipType.Friend);
+                    foreach (var relationship in relationships.Values.Where(r => r.RelationshipType == DiscordRelationshipType.Friend))
                     {
-                        await AddOrUpdateContactAsync(relationship, list, annotationList, folder);
+                        await AddOrUpdateContactAsync(logger, relationship, list, annotationList, folder);
                     }
 
-                    App.LocalSettings.Save<string>("ContactAvatarHashes", relationships.ToDictionary(k => k.User.Id.ToString(), v => v.User.AvatarHash));
+                    App.LocalSettings.Save<string>("ContactAvatarHashes", relationships.ToDictionary(k => k.Key.ToString(), v => v.Value.User.AvatarHash));
                 }
             }
             catch (Exception ex)
             {
-                Logger.LogError(ex);
-                Logger.Log("Failed to sync contacts!");
-                Logger.Log(ex.ToString());
+                logger.LogError(ex, "Failde to sync contacts!");
             }
         }
 
-        public static async Task<Contact> AddOrUpdateContactAsync(DiscordRelationship relationship, ContactList list = null, ContactAnnotationList annotationList = null, StorageFolder folder = null)
+        private static async Task<Contact> AddOrUpdateContactAsync(ILogger<ContactListManager> logger, DiscordRelationship relationship, ContactList list, ContactAnnotationList annotationList, StorageFolder folder)
         {
-            if (list == null)
-            {
-                var store = await ContactManager.RequestStoreAsync(ContactStoreAccessType.AppContactsReadWrite); // requests contact permissions
-                var lists = await store.FindContactListsAsync();
-                list = lists.FirstOrDefault(l => l.DisplayName == CONTACT_LIST_NAME) ?? (await store.CreateContactListAsync(CONTACT_LIST_NAME));
-            }
-
-            if (annotationList == null)
-            {
-                var annotationStore = await ContactManager.RequestAnnotationStoreAsync(ContactAnnotationStoreAccessType.AppAnnotationsReadWrite);
-                annotationList = await GetAnnotationListAsync(annotationStore);
-            }
-
-            folder = folder ?? await ApplicationData.Current.LocalFolder.CreateFolderAsync("AvatarCache", CreationCollisionOption.OpenIfExists);
-
             Contact contact;
             if ((contact = await list.GetContactFromRemoteIdAsync(string.Format(REMOTE_ID_FORMAT, relationship.User.Id))) == null)
             {
-                Logger.Log($"Creating new contact for user {relationship.User}");
+                logger.LogInformation("Creating new contact for user {User}", relationship.User);
                 contact = new Contact { RemoteId = string.Format(REMOTE_ID_FORMAT, relationship.User.Id) };
             }
 
             if (contact.Name != relationship.User.DisplayName)
             {
-                Logger.Log($"Updating contact username for {relationship.User} ({contact.Name} => {relationship.User.DisplayName})");
+                logger.LogDebug("Updating contact username for {User} ({OldName} => {NewName})", relationship.User, contact.Name, relationship.User.DisplayName);
                 contact.Name = relationship.User.DisplayName;
             }
 
             var currentHash = App.LocalSettings.Read<string>("ContactAvatarHashes", relationship.User.Id.ToString(), null);
-            if (currentHash == null || relationship.User.AvatarHash != currentHash)
+            if ((currentHash == null && relationship.User.AvatarHash != null) || relationship.User.AvatarHash != currentHash)
             {
-                Logger.Log($"Updating contact avatar for {relationship.User}");
+                logger.LogDebug("Updating contact avatar for {User}", relationship.User);
                 contact.SourceDisplayPicture = await GetAvatarReferenceAsync(relationship.User, folder);
             }
 
@@ -132,13 +120,18 @@ public static async Task<Contact> AddOrUpdateContactAsync(DiscordRelationship re
             var annotations = await annotationList.FindAnnotationsByRemoteIdAsync(contact.RemoteId);
             if (!annotations.Any())
             {
-                Logger.Log($"Creating new contact annotation for user {relationship.User}");
+                logger.LogDebug("Creating new contact annotation for user {User}", relationship.User);
 
                 var annotation = new ContactAnnotation()
                 {
                     ContactId = contact.Id,
                     RemoteId = string.Format(REMOTE_ID_FORMAT, relationship.User.Id),
-                    SupportedOperations = ContactAnnotationOperations.Share | ContactAnnotationOperations.AudioCall | ContactAnnotationOperations.Message | ContactAnnotationOperations.ContactProfile | ContactAnnotationOperations.SocialFeeds | ContactAnnotationOperations.VideoCall,
+                    SupportedOperations = ContactAnnotationOperations.Share |
+                        ContactAnnotationOperations.AudioCall | 
+                        ContactAnnotationOperations.Message | 
+                        ContactAnnotationOperations.ContactProfile | 
+                        ContactAnnotationOperations.SocialFeeds |
+                        ContactAnnotationOperations.VideoCall,
                     ProviderProperties = { ["ContactPanelAppID"] = APP_ID, ["ContactShareAppID"] = APP_ID }
                 };
 
@@ -165,16 +158,19 @@ public static async Task ClearContactsAsync()
 
         private static async Task<RandomAccessStreamReference> GetAvatarReferenceAsync(DiscordUser user, StorageFolder folder)
         {
-            var tempFile = await folder.TryGetItemAsync($"{user.AvatarHash}.jpeg") as StorageFile;
+            if (string.IsNullOrWhiteSpace(user.AvatarHash))
+            {
+                return RandomAccessStreamReference.CreateFromUri(new Uri("ms-appx:///Assets/example-avatar.png"));
+            }
+
+            var tempFile = await folder.TryGetItemAsync($"{user.AvatarHash}.jpg") as StorageFile;
             if (tempFile == null)
             {
-                tempFile = await folder.CreateFileAsync($"{user.AvatarHash}.jpeg", CreationCollisionOption.FailIfExists);
+                tempFile = await folder.CreateFileAsync($"{user.AvatarHash}.jpg", CreationCollisionOption.FailIfExists);
 
-                using (var fileStream = await tempFile.OpenAsync(FileAccessMode.ReadWrite))
-                using (var stream = await Tools.HttpClient.GetInputStreamAsync(new Uri(user.GetAvatarUrl(ImageFormat.Jpeg, 256))))
-                {
-                    await RandomAccessStream.CopyAndCloseAsync(stream, fileStream);
-                }
+                var fileStream = await tempFile.OpenAsync(FileAccessMode.ReadWrite);
+                var stream = await Tools.HttpClient.GetInputStreamAsync(new Uri(user.GetAvatarUrl(ImageFormat.Jpeg, 256)));
+                await RandomAccessStream.CopyAndCloseAsync(stream, fileStream);
             }
 
             return RandomAccessStreamReference.CreateFromFile(tempFile);
diff --git a/Unicord.Universal/Integration/JumpListManager.cs b/Unicord.Universal/Integration/JumpListManager.cs
index ea20164b..9097028c 100644
--- a/Unicord.Universal/Integration/JumpListManager.cs
+++ b/Unicord.Universal/Integration/JumpListManager.cs
@@ -1,77 +1,98 @@
 using DSharpPlus;
-using DSharpPlus.Entities;
+using Microsoft.Extensions.Logging;
 using System;
-using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
+using Unicord.Universal.Extensions;
+using Unicord.Universal.Models.Channels;
 using Windows.Storage;
 using Windows.UI.StartScreen;
 
 namespace Unicord.Universal.Integration
 {
-    internal static class JumpListManager
+    internal class JumpListManager
     {
-        public static async Task AddToListAsync(DiscordChannel channel)
+        public static async Task AddToListAsync(ChannelViewModel channel)
         {
+            channel = channel ?? throw new ArgumentNullException(nameof(channel));
+
+            if (!JumpList.IsSupported())
+                return;
+
+            var logger = Logger.GetLogger<JumpListManager>();
+            var list = await JumpList.LoadCurrentAsync();
             try
             {
-                if (JumpList.IsSupported())
-                {
-                    var list = await JumpList.LoadCurrentAsync();
-                    var data = ApplicationData.Current.LocalFolder;
-                    var folder = await data.CreateFolderAsync("recents", CreationCollisionOption.OpenIfExists);
+                var data = ApplicationData.Current.LocalFolder;
+                var folder = await data.CreateFolderAsync("recents", CreationCollisionOption.OpenIfExists);
 
-                    string title = null;
-                    string group = null;
-                    StorageFile file = null;
+                string title = null;
+                string group = null;
+                StorageFile file = null;
 
-                    var arguments = $"-channelId={channel.Id}";
+                var arguments = $"-channelId={channel.Id}";
 
-                    if (channel.Guild != null)
-                    {
-                        group = "ms-resource:///Resources/RecentChannelsJumpListGroup";
-                        title = $"#{channel.Name} - {channel.Guild.Name}";
+                if (channel.Guild != null && channel.Channel.IsText())
+                {
+                    group = "ms-resource:///Resources/RecentChannelsJumpListGroup";
+                    title = $"#{channel.Name} - {channel.Guild.Name}";
 
-                        file = await folder.CreateFileAsync($"server-{channel.Guild.IconHash}.png", CreationCollisionOption.ReplaceExisting);
-                        await Tools.DownloadToFileAsync(new Uri(channel.Guild.IconUrl + "?size=64"), file);
-                    }
-                    else if (channel is DiscordDmChannel dm && dm.Type == ChannelType.Private)
+                    if (!string.IsNullOrWhiteSpace(channel.Guild.Guild.IconHash))
                     {
-                        group = "ms-resource:///Resources/RecentPeopleJumpListGroup";
-                        title = $"@{dm.Recipients.FirstOrDefault().Username}";
+                        file = await folder.CreateFileAsync($"server-{channel.Guild.Guild.IconHash}.png", CreationCollisionOption.ReplaceExisting);
+                        await Tools.DownloadToFileAsync(new Uri(channel.Guild.IconUrl + "?size=128"), file);
+                    }
+                }
+                else if (channel.ChannelType == ChannelType.Private)
+                {
+                    var recipient = channel.Recipient;
+                    group = "ms-resource:///Resources/RecentPeopleJumpListGroup";
+                    title = $"{recipient.DisplayName}";
 
-                        file = await folder.CreateFileAsync($"user-{dm.Recipients.FirstOrDefault().AvatarHash}.png", CreationCollisionOption.ReplaceExisting);
-                        await Tools.DownloadToFileAsync(new Uri(dm.Recipients.FirstOrDefault().GetAvatarUrl(ImageFormat.Png, 64)), file);
+                    if (!string.IsNullOrWhiteSpace(recipient.User.AvatarHash))
+                    {
+                        file = await folder.CreateFileAsync($"user-{recipient.User.AvatarHash}.png", CreationCollisionOption.ReplaceExisting);
+                        await Tools.DownloadToFileAsync(new Uri(recipient.User.GetAvatarUrl(ImageFormat.Png, 128)), file);
                     }
+                }
+                else
+                {
+                    return;
+                }
 
-                    if (group != null && arguments != null && file != null)
+                if (group != null && arguments != null)
+                {
+                    logger.LogInformation("Adding jump list item for {Channel}, group {Group}", channel.Channel, group);
+
+                    var item = list.Items.FirstOrDefault(i => i.Arguments == arguments);
+                    if (item == null)
                     {
-                        var item = list.Items.FirstOrDefault(i => i.Arguments == arguments);
-                        if (item == null)
-                        {
-                            item = JumpListItem.CreateWithArguments(arguments, title);
-                            item.GroupName = group;
+                        item = JumpListItem.CreateWithArguments(arguments, title);
+                        item.GroupName = group;
+                        if (file != null)
                             item.Logo = new Uri($"ms-appdata:///local/recents/{file.Name}");
-                            list.Items.Add(item);
-                        }
                         else
-                        {
-                            list.Items.Remove(item);
-                            list.Items.Insert(0, item);
-                        }
+                            item.Logo = new Uri($"ms-appx:///Assets/example-avatar.png");
 
-                        if (list.Items.Count > 10)
-                        {
-                            list.Items.Remove(list.Items.Last());
-                        }
+                        list.Items.Add(item);
+                    }
+                    else
+                    {
+                        list.Items.Remove(item);
+                        list.Items.Insert(0, item);
                     }
-
-                    await list.SaveAsync();
                 }
             }
             catch (Exception ex)
             {
-                Logger.LogError(ex);
+                logger.LogError(ex, "Failed to add jump list item for {Channel}", channel.Channel);
+            }
+            finally
+            {
+                while (list.Items.Count > 10)
+                    list.Items.Remove(list.Items.Last());
+
+                await list.SaveAsync();
             }
         }
     }
diff --git a/Unicord.Universal/Integration/WindowsHelloManager.cs b/Unicord.Universal/Integration/WindowsHelloManager.cs
index 8b86f241..38737a32 100644
--- a/Unicord.Universal/Integration/WindowsHelloManager.cs
+++ b/Unicord.Universal/Integration/WindowsHelloManager.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.AppCenter.Analytics;
+using Windows.ApplicationModel.Resources;
 using Windows.Security.Credentials.UI;
 using static Unicord.Constants;
 
@@ -10,7 +11,7 @@ internal static class WindowsHelloManager
     {
         public static async Task<bool> VerifyAsync(string setting, string displayReason)
         {
-            if ((DateTimeOffset.Now - App.RoamingSettings.Read("LastVerified", DateTimeOffset.MinValue)) 
+            if ((DateTimeOffset.Now - App.RoamingSettings.Read("LastVerified", DateTimeOffset.MinValue))
                 <= App.RoamingSettings.Read(AUTHENTICATION_TIME, TimeSpan.FromMinutes(5)))
             {
                 return true;
@@ -23,10 +24,14 @@ public static async Task<bool> VerifyAsync(string setting, string displayReason)
 
             Analytics.TrackEvent("WindowsHelloManager_Verify");
 
+            var resourceLoader = ResourceLoader.GetForViewIndependentUse();
+            var actualReason = resourceLoader.GetString(displayReason);
+            actualReason = string.IsNullOrWhiteSpace(actualReason) ? displayReason : actualReason;
+
             var available = await UserConsentVerifier.CheckAvailabilityAsync();
             if (available == UserConsentVerifierAvailability.Available)
             {
-                var consentResult = await UserConsentVerifier.RequestVerificationAsync(displayReason);
+                var consentResult = await UserConsentVerifier.RequestVerificationAsync(actualReason);
                 if (consentResult == UserConsentVerificationResult.Verified)
                 {
                     App.RoamingSettings.Save("LastVerified", DateTimeOffset.Now);
diff --git a/Unicord.Universal/MainPage.xaml b/Unicord.Universal/MainPage.xaml
index d7d7c21f..558ee79f 100644
--- a/Unicord.Universal/MainPage.xaml
+++ b/Unicord.Universal/MainPage.xaml
@@ -32,35 +32,35 @@
                              Storyboard.TargetName="ConnectingOverlay"
                              Storyboard.TargetProperty="Opacity"
                              Duration="0:0:0.50"
-                             EasingFunction="{StaticResource CircleEase}"/>
+                             EasingFunction="{StaticResource EaseEnter}"/>
 
             <DoubleAnimation From="1" To="0"
                              Storyboard.TargetName="ContentRoot"
                              Storyboard.TargetProperty="Opacity"
                              Duration="0:0:0.50"
-                             EasingFunction="{StaticResource CircleEase}"/>
+                             EasingFunction="{StaticResource EaseEnter}"/>
 
             <DoubleAnimation From="1" To="0.85" 
                              Storyboard.TargetName="MainScale"
                              Storyboard.TargetProperty="(ScaleTransform.ScaleX)"
                              Duration="0:0:0.40"
-                             EasingFunction="{StaticResource CircleEase}"/>
+                             EasingFunction="{StaticResource EaseExit}"/>
             <DoubleAnimation From="1" To="0.85" 
                              Storyboard.TargetName="MainScale"
                              Storyboard.TargetProperty="(ScaleTransform.ScaleY)"
                              Duration="0:0:0.40"
-                             EasingFunction="{StaticResource CircleEase}"/>
+                             EasingFunction="{StaticResource EaseExit}"/>
 
             <DoubleAnimation From="1.15" To="1" 
                              Storyboard.TargetName="ConnectingScale"
                              Storyboard.TargetProperty="(ScaleTransform.ScaleX)"
                              Duration="0:0:0.40"
-                             EasingFunction="{StaticResource CircleEase}"/>
+                             EasingFunction="{StaticResource EaseEnter}"/>
             <DoubleAnimation From="1.15" To="1" 
                              Storyboard.TargetName="ConnectingScale"
                              Storyboard.TargetProperty="(ScaleTransform.ScaleY)"
                              Duration="0:0:0.40"
-                             EasingFunction="{StaticResource CircleEase}"/>
+                             EasingFunction="{StaticResource EaseEnter}"/>
 
         </Storyboard>
         <Storyboard x:Name="hideConnecting" x:Key="hideConnecting"
diff --git a/Unicord.Universal/MainPage.xaml.cs b/Unicord.Universal/MainPage.xaml.cs
index 4a38ee5c..34c2271b 100644
--- a/Unicord.Universal/MainPage.xaml.cs
+++ b/Unicord.Universal/MainPage.xaml.cs
@@ -103,6 +103,8 @@ private async void Page_Loaded(object sender, RoutedEventArgs e)
 
                 if (result != null)
                 {
+                    rootFrame.Navigate(typeof(DiscordPage));
+
                     ConnectingOverlay.Visibility = Visibility.Visible;
                     ConnectingOverlay.Opacity = 1;
                     ContentRoot.Opacity = 0;
diff --git a/Unicord.Universal/Misc/Logger.cs b/Unicord.Universal/Misc/Logger.cs
index e7489253..44f1e1e6 100644
--- a/Unicord.Universal/Misc/Logger.cs
+++ b/Unicord.Universal/Misc/Logger.cs
@@ -107,6 +107,9 @@ private static WinRTLoggerProvider WinRTProvider
         private static readonly ILogger InternalLogger
             = LoggerFactory.CreateLogger("Unicord");
 
+        public static ILogger<T> GetLogger<T>() where T : class
+            => LoggerFactory.CreateLogger<T>();
+
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static void Log(object message, [CallerMemberName] string source = "General")
         {
diff --git a/Unicord.Universal/Models/Channels/ChannelListViewModel.cs b/Unicord.Universal/Models/Channels/ChannelListViewModel.cs
index 2fbd46f7..7cf99761 100644
--- a/Unicord.Universal/Models/Channels/ChannelListViewModel.cs
+++ b/Unicord.Universal/Models/Channels/ChannelListViewModel.cs
@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Unicord.Universal.Models.Guild;
 
 namespace Unicord.Universal.Models.Channels
 {
diff --git a/Unicord.Universal/Models/Channels/ChannelViewModel.cs b/Unicord.Universal/Models/Channels/ChannelViewModel.cs
index 86df9b8c..dab15c51 100644
--- a/Unicord.Universal/Models/Channels/ChannelViewModel.cs
+++ b/Unicord.Universal/Models/Channels/ChannelViewModel.cs
@@ -17,6 +17,7 @@
 using Unicord.Universal.Models.Guild;
 using Unicord.Universal.Models.User;
 using Windows.UI.StartScreen;
+using Windows.Networking.Sockets;
 
 namespace Unicord.Universal.Models.Channels
 {
@@ -38,7 +39,7 @@ internal ChannelViewModel(ulong channelId, bool isTransient = false, ViewModelBa
         {
             this._channelId = channelId;
 
-            // BUGBUG: PERF, this doesn't appreciate being used objects with short lifetimes
+            // BUGBUG: PERF, this doesn't appreciate being used by objects with short lifetimes
             if (!isTransient)
             {
                 AcknowledgeCommand = new AcknowledgeChannelCommand(this);
@@ -129,7 +130,7 @@ public UserViewModel Recipient
         public bool Muted
             => Channel.IsMuted();
         public int? NullableMentionCount
-            => ReadState.MentionCount == 0 ? null : ReadState.MentionCount;
+            => ReadState.MentionCount == 0 ? -1 : ReadState.MentionCount;
         public double MutedOpacity
             => Muted ? 0.5 : 1.0;
         public bool HasTopic
@@ -141,25 +142,25 @@ public bool IsDM
         public bool IsNotDM
             => !IsDM;
 
-        public string IconUrl
+        public Uri IconUrl
         {
             get
             {
                 if (Channel is not DiscordDmChannel dm)
-                    return "";
+                    return null;
 
                 if (dm.Type == ChannelType.Private && dm.Recipients.Count == 1 && dm.Recipients[0] != null)
                 {
-                    return dm.Recipients[0].GetAvatarUrl(64);
+                    return new Uri(dm.Recipients[0].GetAvatarUrl(64));
                 }
 
                 if (dm.Type == ChannelType.Group)
                 {
-                    if (dm.IconUrl != null) return dm.IconUrl + "?size=64";
+                    if (dm.IconUrl != null) return new Uri(dm.IconUrl + "?size=64");
                     // TODO: default icons?
                 }
 
-                return "";
+                return null;
             }
         }
 
@@ -190,7 +191,7 @@ public bool ShouldShowNotificaitonIndicator
             {
                 if (Channel is DiscordDmChannel dm)
                 {
-                    return NullableMentionCount != null;
+                    return NullableMentionCount != -1;
                 }
 
                 return Unread;
diff --git a/Unicord.Universal/Models/Channels/ForumChannelViewModel.cs b/Unicord.Universal/Models/Channels/ForumChannelViewModel.cs
index 1c917d57..87a080c0 100644
--- a/Unicord.Universal/Models/Channels/ForumChannelViewModel.cs
+++ b/Unicord.Universal/Models/Channels/ForumChannelViewModel.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading;
@@ -9,121 +8,9 @@
 using DSharpPlus.Entities;
 using Unicord.Universal.Models.Messages;
 using Unicord.Universal.Models.User;
-using Windows.Foundation;
-using Windows.UI.Core;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Data;
 
 namespace Unicord.Universal.Models.Channels
 {
-    public class ForumThreadsCollection : ObservableCollection<ForumThreadViewModel>, ISupportIncrementalLoading
-    {
-        private readonly ForumChannelViewModel viewModel;
-        private readonly DiscordClient client;
-        private int fetched = 0;
-        private int total = 1;
-
-        public ForumThreadsCollection(
-            ForumChannelViewModel viewModel,
-            DiscordClient client)
-        {
-            this.viewModel = viewModel;
-            this.client = client;
-            this.HasMoreItems = true;
-        }
-
-        public bool HasMoreItems { get; private set; }
-
-        public IAsyncOperation<LoadMoreItemsResult> LoadMoreItemsAsync(uint count)
-        {
-            var dispatcher = Window.Current.Dispatcher;
-            return Task.Run(async () =>
-            {
-                viewModel.IsLoading = true;
-                var toFetch = (int)Math.Min(Math.Min(count, 25), total - fetched);
-                if (toFetch <= 0)
-                {
-                    HasMoreItems = false;
-                    viewModel.IsLoading = false;
-                    return new LoadMoreItemsResult() { Count = 0 };
-                }
-
-                var forum = viewModel.ForumChannel;
-                var search = await client.SearchForumChannelAsync(forum, true, false, toFetch, fetched, []);
-
-                await dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
-                {
-                    foreach (var item in search.Threads)
-                    {
-                        var firstMessage = search.FirstMessages.FirstOrDefault(m => m.ChannelId == item.Id);
-                        this.Add(new ForumThreadViewModel(item, firstMessage, viewModel));
-                    }
-
-                    HasMoreItems = search.HasMore;
-                    total = search.TotalResults.Value;
-                    fetched += search.Threads.Count;
-                    viewModel.IsLoading = false;
-                });
-
-                return new LoadMoreItemsResult() { Count = (uint)search.Threads.Count };
-            }).AsAsyncOperation();
-        }
-    }
-
-    public class ForumThreadViewModel : ChannelPageViewModelBase
-    {
-        private MessageViewModel firstMessage;
-        private UserViewModel creator;
-
-        internal ForumThreadViewModel(DiscordThreadChannel channel, DiscordMessage firstMessage, ViewModelBase parent = null)
-            : base(channel, false, parent)
-        {
-            if (Channel is not DiscordThreadChannel thread)
-                throw new InvalidOperationException();
-
-            if (thread.FirstMessage != null)
-                this.firstMessage = new MessageViewModel(thread.FirstMessage);
-            else if (firstMessage != null)
-                this.firstMessage = new MessageViewModel(firstMessage);
-
-
-            creator = new UserViewModel(thread.CreatorId, thread.GuildId, this);
-        }
-
-        public DiscordThreadChannel Thread
-            => (DiscordThreadChannel)Channel;
-
-        public MessageViewModel FirstMessage
-        {
-            get => firstMessage;
-            internal set
-            {
-                OnPropertySet(ref firstMessage, value);
-                InvokePropertyChanged(nameof(ShowAttachment));
-                InvokePropertyChanged(nameof(DisplayAttachment));
-            }
-        }
-
-        public UserViewModel Creator
-        {
-            get => creator;
-            internal set
-            {
-                OnPropertySet(ref creator, value);
-                InvokePropertyChanged(nameof(HasValidCreator));
-            }
-        }
-
-        public bool HasValidCreator
-            => !string.IsNullOrWhiteSpace(Creator.DisplayName);
-
-        public bool ShowAttachment
-            => DisplayAttachment != null;
-
-        public AttachmentViewModel DisplayAttachment
-            => FirstMessage?.Attachments.FirstOrDefault(a => !double.IsNaN(a.NaturalWidth));
-    }
-
     public class ForumChannelViewModel : ChannelPageViewModelBase
     {
         internal ForumChannelViewModel(ulong channelId, ViewModelBase parent = null)
diff --git a/Unicord.Universal/Models/Channels/ForumThreadViewModel.cs b/Unicord.Universal/Models/Channels/ForumThreadViewModel.cs
new file mode 100644
index 00000000..ac41daae
--- /dev/null
+++ b/Unicord.Universal/Models/Channels/ForumThreadViewModel.cs
@@ -0,0 +1,62 @@
+using System;
+using System.Linq;
+using DSharpPlus.Entities;
+using Unicord.Universal.Models.Messages;
+using Unicord.Universal.Models.User;
+
+namespace Unicord.Universal.Models.Channels
+{
+    public class ForumThreadViewModel : ChannelPageViewModelBase
+    {
+        private MessageViewModel firstMessage;
+        private UserViewModel creator;
+
+        internal ForumThreadViewModel(DiscordThreadChannel channel, DiscordMessage firstMessage, ViewModelBase parent = null)
+            : base(channel, false, parent)
+        {
+            if (Channel is not DiscordThreadChannel thread)
+                throw new InvalidOperationException();
+
+            if (thread.FirstMessage != null)
+                this.firstMessage = new MessageViewModel(thread.FirstMessage);
+            else if (firstMessage != null)
+                this.firstMessage = new MessageViewModel(firstMessage);
+
+
+            creator = new UserViewModel(thread.CreatorId, thread.GuildId, this);
+        }
+
+        public DiscordThreadChannel Thread
+            => (DiscordThreadChannel)Channel;
+
+        public MessageViewModel FirstMessage
+        {
+            get => firstMessage;
+            internal set
+            {
+                OnPropertySet(ref firstMessage, value);
+                InvokePropertyChanged(nameof(ShowAttachment));
+                InvokePropertyChanged(nameof(DisplayAttachment));
+            }
+        }
+
+        public UserViewModel Creator
+        {
+            get => creator;
+            internal set
+            {
+                OnPropertySet(ref creator, value);
+                InvokePropertyChanged(nameof(HasValidCreator));
+            }
+        }
+
+        public bool HasValidCreator
+            => !string.IsNullOrWhiteSpace(Creator.DisplayName);
+
+        public bool ShowAttachment
+            => DisplayAttachment != null;
+
+        public AttachmentViewModel DisplayAttachment
+            => FirstMessage?.Attachments.FirstOrDefault(a => !double.IsNaN(a.NaturalWidth));
+    }
+}
diff --git a/Unicord.Universal/Models/Channels/ForumThreadsCollection.cs b/Unicord.Universal/Models/Channels/ForumThreadsCollection.cs
new file mode 100644
index 00000000..cc58c80a
--- /dev/null
+++ b/Unicord.Universal/Models/Channels/ForumThreadsCollection.cs
@@ -0,0 +1,66 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading.Tasks;
+using DSharpPlus;
+using Windows.Foundation;
+using Windows.UI.Core;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Data;
+
+namespace Unicord.Universal.Models.Channels
+{
+    public class ForumThreadsCollection : ObservableCollection<ForumThreadViewModel>, ISupportIncrementalLoading
+    {
+        private readonly ForumChannelViewModel viewModel;
+        private readonly DiscordClient client;
+        private int fetched = 0;
+        private int total = 1;
+
+        public ForumThreadsCollection(
+            ForumChannelViewModel viewModel,
+            DiscordClient client)
+        {
+            this.viewModel = viewModel;
+            this.client = client;
+            this.HasMoreItems = true;
+        }
+
+        public bool HasMoreItems { get; private set; }
+
+        public IAsyncOperation<LoadMoreItemsResult> LoadMoreItemsAsync(uint count)
+        {
+            var dispatcher = Window.Current.Dispatcher;
+            return Task.Run(async () =>
+            {
+                viewModel.IsLoading = true;
+                var toFetch = (int)Math.Min(Math.Min(count, 25), total - fetched);
+                if (toFetch <= 0)
+                {
+                    HasMoreItems = false;
+                    viewModel.IsLoading = false;
+                    return new LoadMoreItemsResult() { Count = 0 };
+                }
+
+                var forum = viewModel.ForumChannel;
+                var search = await client.SearchForumChannelAsync(forum, true, false, toFetch, fetched, []);
+
+                await dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
+                {
+                    foreach (var item in search.Threads)
+                    {
+                        var firstMessage = search.FirstMessages.FirstOrDefault(m => m.ChannelId == item.Id);
+                        this.Add(new ForumThreadViewModel(item, firstMessage, viewModel));
+                    }
+
+                    HasMoreItems = search.HasMore;
+                    total = search.TotalResults.Value;
+                    fetched += search.Threads.Count;
+                    viewModel.IsLoading = false;
+                });
+
+                return new LoadMoreItemsResult() { Count = (uint)search.Threads.Count };
+            }).AsAsyncOperation();
+        }
+    }
+}
diff --git a/Unicord.Universal/Models/Channels/PinsPageViewModel.cs b/Unicord.Universal/Models/Channels/PinsPageViewModel.cs
new file mode 100644
index 00000000..6b5e8063
--- /dev/null
+++ b/Unicord.Universal/Models/Channels/PinsPageViewModel.cs
@@ -0,0 +1,124 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.Messaging;
+using DSharpPlus.Entities;
+using DSharpPlus.EventArgs;
+using DSharpPlus.Exceptions;
+using Microsoft.Extensions.Logging;
+using Unicord.Universal.Models.Messages;
+
+namespace Unicord.Universal.Models.Channels
+{
+    internal class PinsPageViewModel : ViewModelBase
+    {
+        private bool isLoading;
+        private bool isErrored;
+        private bool isRateLimited;
+
+        private readonly DiscordChannel _channel;
+        private readonly ILogger<PinsPageViewModel> _logger
+            = Logger.GetLogger<PinsPageViewModel>();
+
+        public PinsPageViewModel()
+        {
+
+        }
+
+        public PinsPageViewModel(ChannelViewModel channel)
+            : base(channel)
+        {
+            this._channel = channel.Channel;
+
+            Messages.CollectionChanged += (o, e) =>
+            {
+                if (!IsLoading)
+                    UnsafeInvokePropertyChanged(nameof(NoMessages));
+            };
+
+            WeakReferenceMessenger.Default.Register<PinsPageViewModel, MessageUpdateEventArgs>(this, static (r, m) => r.OnMessageUpdated(m.Event));
+
+            Task.Run(LoadAsync);
+        }
+
+        public ObservableCollection<MessageViewModel> Messages { get; } = [];
+
+        public bool NoMessages
+            => !IsErrored && !IsLoading && !IsRateLimited && Messages.Count == 0;
+
+        public bool IsLoading
+        {
+            get => isLoading;
+            set => OnPropertySet(ref isLoading, value, nameof(IsLoading), nameof(NoMessages));
+        }
+
+        public bool IsRateLimited
+        {
+            get => isRateLimited;
+            set => OnPropertySet(ref isRateLimited, value, nameof(IsRateLimited), nameof(NoMessages));
+        }
+
+        public bool IsErrored
+        {
+            get => isErrored;
+            set => OnPropertySet(ref isErrored, value, nameof(IsErrored), nameof(NoMessages));
+        }
+
+        private async Task LoadAsync()
+        {
+            IsLoading = true;
+            IsRateLimited = false;
+            IsErrored = false;
+            try
+            {
+                var pinnedMessages = await _channel.GetPinnedMessagesAsync();
+                syncContext.Post((o) =>
+                {
+                    foreach (var message in pinnedMessages)
+                    {
+                        Messages.Add(new MessageViewModel(message));
+                    }
+                }, null);
+            }
+            catch (RateLimitException ex)
+            {
+                _logger.LogWarning(ex, "Rate limited when loading pinned messages for channel {Channel}", _channel);
+                IsRateLimited = true;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Failed to load pinned messages for channel {Channel}", _channel);
+                IsErrored = true;
+            }
+            finally
+            {
+                IsLoading = false;
+            }
+        }
+
+        private void OnMessageUpdated(MessageUpdateEventArgs ev)
+        {
+            if (ev.Channel.Id != _channel.Id)
+                return;
+
+            syncContext.Post((o) =>
+            {
+                var vm = Messages.FirstOrDefault(m => m.Id == ev.Message.Id);
+
+                if (ev.Message.Pinned)
+                {
+                    if (vm == null)
+                        Messages.Add(new MessageViewModel(ev.Message));
+                }
+                else
+                {
+                    if (vm != null)
+                        Messages.Remove(vm);
+                }
+            }, null);
+        }
+    }
+}
diff --git a/Unicord.Universal/Models/SearchPageViewModel.cs b/Unicord.Universal/Models/Channels/SearchPageViewModel.cs
similarity index 87%
rename from Unicord.Universal/Models/SearchPageViewModel.cs
rename to Unicord.Universal/Models/Channels/SearchPageViewModel.cs
index cffe2391..bad0f662 100644
--- a/Unicord.Universal/Models/SearchPageViewModel.cs
+++ b/Unicord.Universal/Models/Channels/SearchPageViewModel.cs
@@ -6,16 +6,19 @@
 using System.Threading;
 using System.Threading.Tasks;
 using DSharpPlus.Entities;
-using Unicord.Universal.Models.Channels;
+using Microsoft.Extensions.Logging;
 using Unicord.Universal.Models.Messages;
 using Windows.UI.Xaml.Data;
 
-namespace Unicord.Universal.Models
+namespace Unicord.Universal.Models.Channels
 {
     public class SearchPageViewModel : ViewModelBase
     {
-        private SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);
-        private ChannelViewModel _channel;
+        private readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);
+        private readonly ChannelViewModel _channel;
+        private readonly ILogger<SearchPageViewModel> _logger
+            = Logger.GetLogger<SearchPageViewModel>();
+
         private int _currentPage = 1;
         private int _totalPages = 1;
         private bool _waitingForIndex;
@@ -66,8 +69,7 @@ public int TotalPages
         public SearchPageViewModel(ChannelViewModel channel)
         {
             _channel = channel;
-            ViewSource = new CollectionViewSource();
-            ViewSource.IsSourceGrouped = false;
+            ViewSource = new CollectionViewSource { IsSourceGrouped = false };
             WaitingForIndex = false;
         }
 
@@ -90,7 +92,6 @@ public async Task SearchAsync(string content)
                 {
                     WaitingForIndex = true;
                     TotalMessages = 0;
-                    return;
                 }
                 else
                 {
@@ -104,7 +105,7 @@ public async Task SearchAsync(string content)
             }
             catch (Exception ex)
             {
-                Logger.LogError(ex);
+                _logger.LogError(ex, "Failed to load search results");
             }
             finally
             {
diff --git a/Unicord.Universal/Models/DMChannelsViewModel.cs b/Unicord.Universal/Models/DMChannelsViewModel.cs
index 65bd9c99..070d9baa 100644
--- a/Unicord.Universal/Models/DMChannelsViewModel.cs
+++ b/Unicord.Universal/Models/DMChannelsViewModel.cs
@@ -25,6 +25,8 @@ public DMChannelsViewModel() : base(null)
             WeakReferenceMessenger.Default.Register<DMChannelsViewModel, DmChannelCreateEventArgs>(this, (r, e) => r.OnDmCreated(e.Event));
             WeakReferenceMessenger.Default.Register<DMChannelsViewModel, DmChannelDeleteEventArgs>(this, (r, e) => r.OnDmDeleted(e.Event));
             WeakReferenceMessenger.Default.Register<DMChannelsViewModel, MessageCreateEventArgs>(this, (r, e) => r.OnMessageCreated(e.Event));
+
+            WeakReferenceMessenger.Default.Register<DMChannelsViewModel, ReadyEventArgs>(this, (r, e) => r.OnReady(e.Event));
         }
 
         public ObservableCollection<DmChannelListViewModel> DMChannels { get; set; }
@@ -32,6 +34,23 @@ public DMChannelsViewModel() : base(null)
         public int SelectedIndex { get => _selectedItem; set => OnPropertySet(ref _selectedItem, value); }
         public bool UpdatingIndex { get; set; }
 
+        private Task OnReady(ReadyEventArgs e)
+        {
+            syncContext.Post((o) =>
+            {
+                DMChannels.Clear();
+                foreach (var vm in discord.PrivateChannels
+                    .OrderByDescending(r => r.Value.LastMessageId ?? 0)
+                    .Select(s => new DmChannelListViewModel(s.Value)))
+                {
+                    DMChannels.Add(vm);
+                }
+
+            }, null);
+
+            return Task.CompletedTask;
+        }
+
         private Task OnDmCreated(DmChannelCreateEventArgs e)
         {
             syncContext.Post(o => DMChannels.Insert(0, new DmChannelListViewModel(o as DiscordDmChannel)), e.Channel);
diff --git a/Unicord.Universal/Models/DiscordPageViewModel.cs b/Unicord.Universal/Models/DiscordPageViewModel.cs
index f3684065..1428239c 100644
--- a/Unicord.Universal/Models/DiscordPageViewModel.cs
+++ b/Unicord.Universal/Models/DiscordPageViewModel.cs
@@ -16,6 +16,7 @@
 using Unicord.Universal.Models.Messaging;
 using Unicord.Universal.Models.Voice;
 using Windows.ApplicationModel;
+using System.Collections.Frozen;
 
 namespace Unicord.Universal.Models
 {
@@ -32,11 +33,28 @@ class DiscordPageViewModel : ViewModelBase
 
         public DiscordPageViewModel()
         {
-            Guilds = new ObservableCollection<IGuildListViewModel>();
-            UnreadDMs = new ObservableCollection<ChannelViewModel>();
+            Guilds = [];
+            UnreadDMs = [];
+
+            WeakReferenceMessenger.Default.Register<DiscordPageViewModel, ReadyEventArgs>(this, (t, v) => t.OnReady(v.Event));
+            WeakReferenceMessenger.Default.Register<DiscordPageViewModel, GuildCreateEventArgs>(this, (t, v) => t.OnGuildCreated(v.Event));
+            WeakReferenceMessenger.Default.Register<DiscordPageViewModel, GuildDeleteEventArgs>(this, (t, v) => t.OnGuildDeleted(v.Event));
+            WeakReferenceMessenger.Default.Register<DiscordPageViewModel, MessageCreateEventArgs>(this, (t, v) => t.OnMessageCreated(v.Event));
+            WeakReferenceMessenger.Default.Register<DiscordPageViewModel, MessageAcknowledgeEventArgs>(this, (t, v) => t.OnMessageAcknowledged(v.Event));
+            WeakReferenceMessenger.Default.Register<DiscordPageViewModel, UserSettingsUpdateEventArgs>(this, (t, v) => t.OnUserSettingsUpdated(v.Event));
+
+            Load();
+        }
+
+        private void Load()
+        {
+            Guilds.Clear();
+            UnreadDMs.Clear();
             CurrentUser = discord.CurrentUser;
 
-            var guilds = discord.Guilds;
+            var guilds = discord.Guilds.ToFrozenDictionary();
+            var dms = discord.PrivateChannels.ToFrozenDictionary();
+
             var folders = discord.UserSettings?.GuildFolders;
             var ids = new HashSet<ulong>();
             if (folders != null)
@@ -47,11 +65,11 @@ public DiscordPageViewModel()
                     {
                         foreach (var id in folder.GuildIds)
                         {
-                            if (guilds.TryGetValue(id, out var server))
-                            {
-                                Guilds.Add(new GuildListViewModel(server));
-                                ids.Add(id);
-                            }
+                            if (!guilds.TryGetValue(id, out var server))
+                                continue;
+
+                            Guilds.Add(new GuildListViewModel(server));
+                            ids.Add(id);
                         }
 
                         continue;
@@ -67,24 +85,17 @@ public DiscordPageViewModel()
                 }
             }
 
-            foreach (var guild in discord.Guilds.Values)
+            foreach (var (id, guild) in guilds)
             {
-                if (!ids.Contains(guild.Id))
+                if (!ids.Contains(id))
                     Guilds.Insert(0, new GuildListViewModel(guild));
             }
 
-            var dms = discord.PrivateChannels.Values;
-            foreach (var dm in dms.Where(d => d.ReadState?.MentionCount > 0)
-                                  .OrderByDescending(d => d.LastMessageId))
+            foreach (var (id, dm) in dms.Where(d => d.Value.ReadState?.MentionCount > 0)
+                                        .OrderByDescending(d => d.Value.LastMessageId))
             {
-                UnreadDMs.Add(new ChannelViewModel(dm.Id));
+                UnreadDMs.Add(new ChannelViewModel(dm.Id, parent: this));
             }
-
-            WeakReferenceMessenger.Default.Register<DiscordPageViewModel, GuildCreateEventArgs>(this, (t, v) => t.OnGuildCreated(v.Event));
-            WeakReferenceMessenger.Default.Register<DiscordPageViewModel, GuildDeleteEventArgs>(this, (t, v) => t.OnGuildDeleted(v.Event));
-            WeakReferenceMessenger.Default.Register<DiscordPageViewModel, MessageCreateEventArgs>(this, (t, v) => t.OnMessageCreated(v.Event));
-            WeakReferenceMessenger.Default.Register<DiscordPageViewModel, MessageAcknowledgeEventArgs>(this, (t, v) => t.OnMessageAcknowledged(v.Event));
-            WeakReferenceMessenger.Default.Register<DiscordPageViewModel, UserSettingsUpdateEventArgs>(this, (t, v) => t.OnUserSettingsUpdated(v.Event));
         }
 
         public bool Navigating { get; internal set; }
@@ -129,6 +140,12 @@ public GuildListViewModel ViewModelFromGuild(DiscordGuild guild)
             return null;
         }
 
+        private Task OnReady(ReadyEventArgs e)
+        {
+            syncContext.Post((o) => Load(), null);
+            return Task.CompletedTask;
+        }
+
         private Task OnMessageCreated(MessageCreateEventArgs e)
         {
             if (e.Channel is DiscordDmChannel dm)
diff --git a/Unicord.Universal/Models/FriendsPageViewModel.cs b/Unicord.Universal/Models/FriendsPageViewModel.cs
index 174c0d88..501ea72d 100644
--- a/Unicord.Universal/Models/FriendsPageViewModel.cs
+++ b/Unicord.Universal/Models/FriendsPageViewModel.cs
@@ -18,12 +18,27 @@ public class FriendsPageViewModel : ViewModelBase
     {
         public FriendsPageViewModel()
         {
-            All = new ObservableCollection<RelationshipViewModel>();
-            Online = new ObservableCollection<RelationshipViewModel>();
-            Blocked = new ObservableCollection<RelationshipViewModel>();
-            Pending = new ObservableCollection<RelationshipViewModel>();
+            All = [];
+            Online = [];
+            Blocked = [];
+            Pending = [];
 
-            foreach (var rel in discord.Relationships.Values.OrderBy(r => r.User?.DisplayName))
+            Load();
+
+            WeakReferenceMessenger.Default.Register<FriendsPageViewModel, ReadyEventArgs>(this, (t, v) => t.OnReady(v.Event));
+            WeakReferenceMessenger.Default.Register<FriendsPageViewModel, RelationshipAddEventArgs>(this, (t, v) => t.OnRelationshipAdded(v.Event));
+            WeakReferenceMessenger.Default.Register<FriendsPageViewModel, RelationshipRemoveEventArgs>(this, (t, v) => t.OnRelationshipRemoved(v.Event));
+            WeakReferenceMessenger.Default.Register<FriendsPageViewModel, PresenceUpdateEventArgs>(this, (t, v) => t.OnPresenceUpdated(v.Event));
+        }
+
+        private void Load()
+        {
+            All.Clear();
+            Online.Clear();
+            Blocked.Clear();
+            Pending.Clear();
+
+            foreach (var (id, rel) in discord.Relationships.OrderBy(r => r.Value.User?.DisplayName))
             {
                 var vm = new RelationshipViewModel(rel, this);
                 switch (rel.RelationshipType)
@@ -44,10 +59,6 @@ public FriendsPageViewModel()
                         break;
                 }
             }
-
-            WeakReferenceMessenger.Default.Register<FriendsPageViewModel, RelationshipAddEventArgs>(this, (t, v) => t.OnRelationshipAdded(v.Event));
-            WeakReferenceMessenger.Default.Register<FriendsPageViewModel, RelationshipRemoveEventArgs>(this, (t, v) => t.OnRelationshipRemoved(v.Event));
-            WeakReferenceMessenger.Default.Register<FriendsPageViewModel, PresenceUpdateEventArgs>(this, (t, v) => t.OnPresenceUpdated(v.Event));
         }
 
         public DiscordUser CurrentUser => discord.CurrentUser;
@@ -121,6 +132,12 @@ private void RemoreRelationship(ICollection<RelationshipViewModel> collection, D
                 collection.Remove(old);
         }
 
+        private Task OnReady(ReadyEventArgs e)
+        {
+            syncContext.Post((o) => Load(), null);
+            return Task.CompletedTask;
+        }
+
         private Task OnPresenceUpdated(PresenceUpdateEventArgs e)
         {
             if (e.User != null && e.PresenceBefore?.Status != e.Status)
diff --git a/Unicord.Universal/Models/GuildChannelListViewModel.cs b/Unicord.Universal/Models/Guild/GuildChannelListViewModel.cs
similarity index 78%
rename from Unicord.Universal/Models/GuildChannelListViewModel.cs
rename to Unicord.Universal/Models/Guild/GuildChannelListViewModel.cs
index 5e873ce0..fb1c1083 100644
--- a/Unicord.Universal/Models/GuildChannelListViewModel.cs
+++ b/Unicord.Universal/Models/Guild/GuildChannelListViewModel.cs
@@ -1,95 +1,103 @@
-using DSharpPlus;
-using DSharpPlus.Entities;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Unicord.Universal.Extensions;
-using Unicord.Universal.Models.Channels;
-using Unicord.Universal.Models.Messaging;
-using Unicord.Universal.Services;
-using Windows.UI.Xaml.Controls;
-
-namespace Unicord.Universal.Models
-{
-    public class GuildChannelListViewModel : ViewModelBase
-    {
-        private bool _canEdit;
-
-        public GuildChannelListViewModel(DiscordGuild guild)
-            : base(null)
-        {
-            Guild = guild;
-            InitialiseLists();
-        }
-
-        public DiscordGuild Guild { get; }
-        public string Name => Guild.Name;
-        public string HeaderImage => Guild.GetBannerUrl();
-        public ObservableCollection<ChannelListViewModel> Channels { get; set; }
-        public ListViewReorderMode ReorderMode => CanEdit ? ListViewReorderMode.Enabled : ListViewReorderMode.Disabled;
-
-        public bool CanEdit
-        {
-            get => _canEdit;
-            set
-            {
-                OnPropertySet(ref _canEdit, value);
-                InvokePropertyChanged(nameof(ReorderMode));
-            }
-        }
-
-        /// <summary>
-        /// Initially populates the server list
-        /// </summary>
-        private void InitialiseLists()
-        {
-            Channels = null;
-
-            var currentMember = Guild.CurrentMember;
-            Debug.Assert(currentMember != null);
-
-            var permissions = currentMember.PermissionsIn(null);
-            CanEdit = permissions.HasPermission(Permissions.ManageChannels);
-
-            var channels = Guild.Channels.Values;
-
-            static bool FilterChannels(DiscordChannel channel, DiscordMember currentMember)
-            {
-                if (currentMember.IsOwner)
-                    return true;
-
-                return channel.IsCategory ?
-                    channel.Children.Any(x => x.PermissionsFor(currentMember).HasPermission(Permissions.AccessChannels)) :
-                    channel.PermissionsFor(currentMember).HasPermission(Permissions.AccessChannels);
-            }
-
-            static bool FilterThreads(DiscordThreadChannel channel)
-            {
-                var currentUserId = DiscordManager.Discord.CurrentUser.Id;
-                return (channel.CurrentMember != null || 
-                        channel.CreatorId == currentUserId ||
-                        (channel.MemberIdsPreview != null && channel.MemberIdsPreview.Contains(currentUserId))) 
-                    && !(channel.ThreadMetadata?.IsArchived ?? true);
-            }
-
-            // Use new discord channel category behaviour (new as of 2017 KEKW)
-            var orderedChannels = channels.Where(c => c.Type != ChannelType.Category)
-                .Where(c => FilterChannels(c, currentMember))
-                .OrderBy(c => c.Type == ChannelType.Voice)
-                .ThenBy(c => c.Position)
-                .GroupBy(g => g.Parent)
-                .OrderBy(g => g.Key?.Position)
-                .SelectMany(g => g.Key != null ? g.Prepend(g.Key) : g)
-                .SelectMany<DiscordChannel, DiscordChannel>(c => [c, .. c.Threads.Where(FilterThreads).Cast<DiscordChannel>()])
-                .Select(c => new ChannelListViewModel(c, this));
-
-            Channels = new ObservableCollection<ChannelListViewModel>(orderedChannels);
-        }
-    }
-}
+using CommunityToolkit.Mvvm.Messaging;
+using DSharpPlus;
+using DSharpPlus.Entities;
+using DSharpPlus.EventArgs;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Unicord.Universal.Extensions;
+using Unicord.Universal.Models.Channels;
+using Unicord.Universal.Services;
+using Windows.UI.Xaml.Controls;
+
+namespace Unicord.Universal.Models.Guild
+{
+    public class GuildChannelListViewModel : GuildViewModel
+    {
+        private bool _canEdit;
+
+        public GuildChannelListViewModel(DiscordGuild guild)
+            : base(guild.Id)
+        {
+            Channels = [];
+            InitialiseLists();
+
+            WeakReferenceMessenger.Default.Register<GuildChannelListViewModel, ReadyEventArgs>(this, (t, e) => t.OnReady(e.Event));
+        }
+
+        public string HeaderImage => Guild.GetBannerUrl();
+        public ObservableCollection<ChannelListViewModel> Channels { get; set; }
+        public ListViewReorderMode ReorderMode => CanEdit ? ListViewReorderMode.Enabled : ListViewReorderMode.Disabled;
+
+        public bool CanEdit
+        {
+            get => _canEdit;
+            set
+            {
+                OnPropertySet(ref _canEdit, value);
+                InvokePropertyChanged(nameof(ReorderMode));
+            }
+        }
+
+        private Task OnReady(ReadyEventArgs e)
+        {
+            syncContext.Post(o => InitialiseLists(), null);
+            return Task.CompletedTask;
+        }
+
+        /// <summary>
+        /// Initially populates the server list
+        /// </summary>
+        private void InitialiseLists()
+        {
+            Channels.Clear();
+
+            var currentMember = Guild.CurrentMember;
+            Debug.Assert(currentMember != null);
+
+            var permissions = currentMember.PermissionsIn(null);
+            CanEdit = permissions.HasPermission(Permissions.ManageChannels);
+
+            var channels = Guild.Channels;
+            static bool FilterChannels(DiscordChannel channel, DiscordMember currentMember)
+            {
+                if (currentMember.IsOwner)
+                    return true;
+
+                return channel.IsCategory ?
+                    channel.Children.Any(x => x.PermissionsFor(currentMember).HasPermission(Permissions.AccessChannels)) :
+                    channel.PermissionsFor(currentMember).HasPermission(Permissions.AccessChannels);
+            }
+
+            static bool FilterThreads(DiscordThreadChannel channel)
+            {
+                var currentUserId = DiscordManager.Discord.CurrentUser.Id;
+                return (channel.CurrentMember != null || 
+                        channel.CreatorId == currentUserId ||
+                        (channel.MemberIdsPreview != null && channel.MemberIdsPreview.Contains(currentUserId))) 
+                    && !(channel.ThreadMetadata?.IsArchived ?? true);
+            }
+
+            // Use new discord channel category behaviour (new as of 2017 KEKW)
+            var orderedChannels = channels.Select(t => t.Value)
+                .Where(c => c.Type != ChannelType.Category)
+                .Where(c => FilterChannels(c, currentMember))
+                .OrderBy(c => c.Type == ChannelType.Voice)
+                .ThenBy(c => c.Position)
+                .GroupBy(g => g.Parent)
+                .OrderBy(g => g.Key?.Position)
+                .SelectMany(g => g.Key != null ? g.Prepend(g.Key) : g)
+                .SelectMany<DiscordChannel, DiscordChannel>(c => [c, .. c.Threads.Where(FilterThreads).Cast<DiscordChannel>()])
+                .Select(c => new ChannelListViewModel(c, this));
+
+            foreach (var channel in orderedChannels)
+                Channels.Add(channel);
+        }
+    }
+}
diff --git a/Unicord.Universal/Models/Guild/GuildListViewModel.cs b/Unicord.Universal/Models/Guild/GuildListViewModel.cs
index 4fd2cdc8..f7c75364 100644
--- a/Unicord.Universal/Models/Guild/GuildListViewModel.cs
+++ b/Unicord.Universal/Models/Guild/GuildListViewModel.cs
@@ -18,8 +18,8 @@ internal class GuildListViewModel : GuildViewModel, IGuildListViewModel
         private GuildListFolderViewModel _parent;
         private bool _isSelected;
 
-        public GuildListViewModel(DiscordGuild guild, GuildListFolderViewModel parent = null) :
-            base(guild.Id)
+        public GuildListViewModel(DiscordGuild guild, GuildListFolderViewModel parent = null) 
+            : base(guild.Id)
         {
             _parent = parent;
         }
diff --git a/Unicord.Universal/Models/Guild/GuildViewModel.cs b/Unicord.Universal/Models/Guild/GuildViewModel.cs
index 511e209c..2acf02c5 100644
--- a/Unicord.Universal/Models/Guild/GuildViewModel.cs
+++ b/Unicord.Universal/Models/Guild/GuildViewModel.cs
@@ -47,11 +47,11 @@ public DiscordGuild Guild
 
         public UserViewModel CurrentMember { get; }
 
-        public string Name =>
-            Guild.Name;
+        public string Name
+            => Guild.Name;
 
-        public string IconUrl =>
-            Guild.GetIconUrl(64);
+        public string IconUrl
+            => Guild.GetIconUrl(64);
 
         public ImageSource Icon
             => IconUrl != null ? new BitmapImage(new Uri(IconUrl)) : null;
@@ -59,8 +59,8 @@ public ImageSource Icon
         public bool Muted
             => Guild.IsMuted();
 
-        public bool Unread =>
-            !Muted && AccessibleChannels.Any(r => !r.NotificationMuted && r.Unread);
+        public bool Unread
+            => !Muted && AccessibleChannels.Any(r => !r.NotificationMuted && r.Unread);
 
         internal IEnumerable<ChannelViewModel> AccessibleChannels
         {
diff --git a/Unicord.Universal/Models/Messages/AttachmentViewModel.cs b/Unicord.Universal/Models/Messages/AttachmentViewModel.cs
index 14ceeafb..56090c7b 100644
--- a/Unicord.Universal/Models/Messages/AttachmentViewModel.cs
+++ b/Unicord.Universal/Models/Messages/AttachmentViewModel.cs
@@ -184,13 +184,13 @@ public static AttachmentType GetAttachmentType(DiscordAttachment attachment)
             {
                 // discord doesn't return proper width/height information for some video formats
                 // as such, once the media is loaded this may change.
-                if (attachment.Width != 0 && attachment.Height != 0)
+                if (attachment.Width is (0 or null) && attachment.Height is (0 or null))
                     return AttachmentType.Video;
 
                 return AttachmentType.Audio;
             }
 
-            if (attachment.Width != 0 && attachment.Height != 0)
+            if (attachment.Width is not (0 or null) && attachment.Height is not (0 or null))
                 return AttachmentType.Image;
 
             return AttachmentType.Generic;
diff --git a/Unicord.Universal/Models/Messages/MessageEditViewModel.cs b/Unicord.Universal/Models/Messages/MessageEditViewModel.cs
new file mode 100644
index 00000000..60170243
--- /dev/null
+++ b/Unicord.Universal/Models/Messages/MessageEditViewModel.cs
@@ -0,0 +1,102 @@
+using System;
+using System.Threading.Tasks;
+using System.Windows.Input;
+using CommunityToolkit.Mvvm.Input;
+using Unicord.Universal.Dialogs;
+using Windows.UI.Xaml.Controls;
+using Microsoft.Extensions.Logging;
+using Unicord.Universal.Pages;
+using Windows.UI.Xaml;
+
+namespace Unicord.Universal.Models.Messages
+{
+    // TODO: this
+    public class MessageEditViewModel : ViewModelBase
+    {
+        private MessageViewModel _parent;
+        private string _content;
+        private ILogger<MessageEditViewModel> _logger
+            = Logger.GetLogger<MessageEditViewModel>();
+        private int _selectionStart;
+
+        public MessageEditViewModel(MessageViewModel viewModel)
+            : base(viewModel)
+        {
+            this._parent = viewModel;
+            this.Content = viewModel.Content;
+            this.SelectionStart = viewModel.Content.Length;
+            this.CommitCommand = new AsyncRelayCommand<TextBox>(CommitAsync);
+            this.DiscardCommand = new RelayCommand(Discard);
+            this.InsertNewLineCommand = new RelayCommand<TextBox>(InsertNewLine);
+
+            InvokePropertyChanged(nameof(IsFocused));
+        }
+
+        // these properties, unlike most VM properties, are NOT THREAD SAFE, this helps when handling focus
+        public string Content { get => _content; set => UnsafeOnPropertySet(ref _content, value); }
+        public int SelectionStart { get => _selectionStart; set => UnsafeOnPropertySet(ref _selectionStart, value); }
+
+        public ICommand CommitCommand { get; }
+        public ICommand DiscardCommand { get; }
+        public ICommand InsertNewLineCommand { get; }
+
+        public bool IsFocused => true;
+
+        public void InsertNewLine(TextBox textBox)
+        {
+            var start = textBox.SelectionStart;
+            Content = textBox.Text.Insert(start, "\r");
+            textBox.SelectionStart = start + 1;
+        }
+
+        private async Task CommitAsync(TextBox textBox)
+        {
+            try
+            {
+                if (textBox != null)
+                    Content = textBox.Text;
+
+                // prompt for deletion
+                if (string.IsNullOrWhiteSpace(Content))
+                {
+                    var deleteDialog = new DeleteMessageDialog();
+                    deleteDialog.Message = _parent.Message;
+
+                    var result = await deleteDialog.ShowAsync();
+                    if (result == ContentDialogResult.Primary)
+                        await _parent.Message.DeleteAsync();
+
+                    return;
+                }
+
+                if (Content != _parent.Content)
+                {
+                    await _parent.Message.ModifyAsync(Content);
+                }
+
+
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Failed to edit message");
+            }
+            finally
+            {
+                _parent.IsEditing = false;
+
+                var page = Window.Current.Content.FindChild<ChannelPage>();
+                if (page != null)
+                    page.FocusTextBox();
+            }
+        }
+
+        private void Discard()
+        {
+            _parent.IsEditing = false;
+
+            var page = Window.Current.Content.FindChild<ChannelPage>();
+            if (page != null)
+                page.FocusTextBox();
+        }
+    }
+}
diff --git a/Unicord.Universal/Models/Messages/MessageViewModel.cs b/Unicord.Universal/Models/Messages/MessageViewModel.cs
index 7ecfd651..7feca0d5 100644
--- a/Unicord.Universal/Models/Messages/MessageViewModel.cs
+++ b/Unicord.Universal/Models/Messages/MessageViewModel.cs
@@ -20,9 +20,21 @@
 using Unicord.Universal.Models.User;
 using Unicord.Universal.Services;
 using Windows.ApplicationModel.Resources;
+using CommunityToolkit.Mvvm.Input;
+using Newtonsoft.Json.Bson;
 
 namespace Unicord.Universal.Models.Messages
 {
+    public enum MessageViewModelState
+    {
+        // not in a channel list
+        Default = -1,
+        // in a channel list
+        Normal,
+        Collapsed,
+        Editing
+    }
+
     public partial class MessageViewModel : ViewModelBase, ISnowflake
     {
         private static readonly ResourceLoader _strings
@@ -31,6 +43,10 @@ private static readonly ResourceLoader _strings
         private ChannelViewModel _channelViewModelCache;
         private UserViewModel _userViewModelCache;
         private bool _isSelected;
+        private bool _isEditing;
+
+        private MessageViewModel _referencedMessage;
+        private MessageEditViewModel _editViewModel;
 
         public MessageViewModel(DiscordMessage discordMessage, ChannelPageViewModel parent = null, MessageViewModel parentMessage = null)
             : base((ViewModelBase)parentMessage ?? parent)
@@ -40,6 +56,9 @@ public MessageViewModel(DiscordMessage discordMessage, ChannelPageViewModel pare
 
             _channelViewModelCache = parent;
 
+            if (discordMessage.ReferencedMessage != null)
+                _referencedMessage = new MessageViewModel(discordMessage.ReferencedMessage, null, this);
+
             WeakReferenceMessenger.Default.Register<MessageViewModel, MessageUpdateEventArgs>(this, (t, e) => t.OnMessageUpdated(e.Event));
 
             // we dont wanna do this for replies
@@ -52,6 +71,7 @@ public MessageViewModel(DiscordMessage discordMessage, ChannelPageViewModel pare
                 PinCommand = new PinMessageCommand(this);
                 DeleteCommand = new DeleteMessageCommand(this);
                 ReactCommand = new ReactCommand(this);
+                EditCommand = new RelayCommand(() => this.IsEditing = true);
 
                 var embedModels = GetGroupedEmbeds(Message);
                 Embeds = new ObservableCollection<EmbedViewModel>(embedModels);
@@ -97,9 +117,7 @@ private List<EmbedViewModel> GetGroupedEmbeds(DiscordMessage message)
         public ulong Id
             => Message.Id;
         public MessageViewModel ReferencedMessage
-            => Message.ReferencedMessage != null ?
-                new MessageViewModel(Message.ReferencedMessage, Parent, this) :
-                null;
+            => _referencedMessage;
         public ChannelViewModel Channel
             => _channelViewModelCache ??=
                 (Message.Channel != null ? new ChannelViewModel(Message.Channel, true, this) : new ChannelViewModel(Message.ChannelId, true, this));
@@ -201,6 +219,37 @@ public bool IsCollapsed
 
         public bool IsSelected { get => _isSelected; set => OnPropertySet(ref _isSelected, value); }
 
+        public bool IsEditing
+        {
+            get => _isEditing;
+            set
+            {
+                OnPropertySet(ref _isEditing, value, nameof(IsEditing), nameof(State));
+                if (_isEditing)
+                    EditViewModel = new MessageEditViewModel(this);
+            }
+        }
+
+        public MessageEditViewModel EditViewModel
+        {
+            get => _editViewModel;
+            set => OnPropertySet(ref _editViewModel, value);
+        }
+
+        public MessageViewModelState State
+        {
+            get
+            {
+                if (Parent == null)
+                    return MessageViewModelState.Default;
+
+                if (IsEditing)
+                    return MessageViewModelState.Editing;
+
+                return IsCollapsed ? MessageViewModelState.Collapsed : MessageViewModelState.Normal;
+            }
+        }
+
         public ObservableCollection<EmbedViewModel> Embeds { get; }
         public ObservableCollection<AttachmentViewModel> Attachments { get; }
         public ObservableCollection<StickerViewModel> Stickers { get; }
@@ -214,6 +263,7 @@ public bool IsCollapsed
         public ICommand PinCommand { get; }
         public ICommand DeleteCommand { get; }
         public ICommand ReactCommand { get; }
+        public ICommand EditCommand { get; }
 
         private Task OnReactionAdded(MessageReactionAddEventArgs e)
         {
diff --git a/Unicord.Universal/Models/PinsPageViewModel.cs b/Unicord.Universal/Models/PinsPageViewModel.cs
deleted file mode 100644
index b7b1274b..00000000
--- a/Unicord.Universal/Models/PinsPageViewModel.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Unicord.Universal.Models
-{
-    public class PinsPageViewModel : ViewModelBase
-    {
-    }
-}
diff --git a/Unicord.Universal/Models/Settings/NotificationsSettingsModel.cs b/Unicord.Universal/Models/Settings/NotificationsSettingsModel.cs
index 4f8f9687..b3bff84b 100644
--- a/Unicord.Universal/Models/Settings/NotificationsSettingsModel.cs
+++ b/Unicord.Universal/Models/Settings/NotificationsSettingsModel.cs
@@ -1,5 +1,8 @@
 using System.Collections.Generic;
 using DSharpPlus.Entities;
+using Unicord.Universal.Services;
+using Windows.ApplicationModel;
+using Windows.Foundation.Metadata;
 using Windows.Media.Transcoding;
 using Windows.System.Profile;
 using static Unicord.Constants;
@@ -8,12 +11,7 @@ namespace Unicord.Universal.Models
 {
     public class NotificationsSettingsModel : ViewModelBase
     {
-        private bool isPageEnabled;
-
-        public NotificationsSettingsModel()
-        {
-            IsPageEnabled = AnalyticsInfo.VersionInfo.DeviceFamily == "Windows.Desktop";
-        }
+        private bool isPageEnabled = ApiInformation.IsApiContractPresent(typeof(FullTrustAppContract).FullName, 1);
 
         public bool IsPageEnabled
         {
diff --git a/Unicord.Universal/Models/User/UserViewModel.cs b/Unicord.Universal/Models/User/UserViewModel.cs
index d59edcbe..a4baf293 100644
--- a/Unicord.Universal/Models/User/UserViewModel.cs
+++ b/Unicord.Universal/Models/User/UserViewModel.cs
@@ -69,7 +69,7 @@ public ulong Id
             => id;
 
         public DiscordUser User
-            => discord.TryGetCachedUser(Id, out var user) ? user : _userCache;
+            => discord.TryGetCachedUser(Id, out var user) && !string.IsNullOrWhiteSpace(user.Username) ? user : _userCache;
 
         public DiscordMember Member
         {
diff --git a/Unicord.Universal/Models/ViewModelbase.cs b/Unicord.Universal/Models/ViewModelbase.cs
index 242f811d..0c9bc333 100644
--- a/Unicord.Universal/Models/ViewModelbase.cs
+++ b/Unicord.Universal/Models/ViewModelbase.cs
@@ -8,6 +8,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using DSharpPlus;
+using Newtonsoft.Json.Bson;
 using Unicord.Universal.Services;
 
 namespace Unicord.Universal.Models
@@ -57,10 +58,40 @@ protected void OnPropertySet<T>(ref T oldValue, T newValue, params string[] addi
             }
         }
 
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        protected void UnsafeOnPropertySet<T>(ref T oldValue, T newValue, [CallerMemberName] string property = null)
+        {
+            if (oldValue == null || newValue == null || !newValue.Equals(oldValue))
+            {
+                oldValue = newValue;
+                UnsafeInvokePropertyChanged(property);
+            }
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        protected void UnsafeOnPropertySet<T>(ref T oldValue, T newValue, params string[] additionalProperties)
+        {
+            if (oldValue == null || newValue == null || !newValue.Equals(oldValue))
+            {
+                oldValue = newValue;
+                foreach (var property in additionalProperties)
+                {
+                    UnsafeInvokePropertyChanged(property);
+                }
+            }
+        }
+
         public virtual void InvokePropertyChanged([CallerMemberName] string property = null)
         {
             var args = new PropertyChangedEventArgs(property);
             syncContext.Post((o) => PropertyChanged?.Invoke(this, (PropertyChangedEventArgs)o), args);
         }
+
+        protected void UnsafeInvokePropertyChanged([CallerMemberName] string property = null)
+        {
+            var args = new PropertyChangedEventArgs(property);
+            PropertyChanged?.Invoke(this, args);
+        }
     }
 }
diff --git a/Unicord.Universal/Package.appxmanifest b/Unicord.Universal/Package.appxmanifest
index f264de31..573f1e44 100644
--- a/Unicord.Universal/Package.appxmanifest
+++ b/Unicord.Universal/Package.appxmanifest
@@ -44,6 +44,13 @@
 				<uap:SplashScreen Image="Assets\Store\SplashScreen.png" uap5:Optional="true" />
 			</uap:VisualElements>
 			<Extensions>
+        <Extension Category="windows.backgroundTasks" EntryPoint="Unicord.Universal.Background.Tasks.PeriodicNotificationsTask">
+          <BackgroundTasks>
+            <Task Type="general"/>
+            <Task Type="timer"/>
+          </BackgroundTasks>
+        </Extension>
+        
 				<uap:Extension Category="windows.shareTarget">
 					<uap:ShareTarget Description="Share to Discord">
 						<uap:SupportedFileTypes>
diff --git a/Unicord.Universal/Pages/ChannelPage.xaml b/Unicord.Universal/Pages/ChannelPage.xaml
index 1c269eaf..4f06f36d 100644
--- a/Unicord.Universal/Pages/ChannelPage.xaml
+++ b/Unicord.Universal/Pages/ChannelPage.xaml
@@ -171,7 +171,7 @@
         </DataTemplate>
 
         <converters:MessageTemplateSelector x:Key="MessageTemplateSelector" 
-                                            MessageTemplate="{StaticResource DefaultMessageTemplate}" 
+                                            MessageTemplate="{StaticResource MessageContentTemplate}" 
                                             SystemMessageTemplate="{StaticResource SystemMessageTemplate}"/>
 
         <converters:MessageTemplateSelector x:Key="EditingMessageTemplateSelector" 
diff --git a/Unicord.Universal/Pages/ChannelPage.xaml.cs b/Unicord.Universal/Pages/ChannelPage.xaml.cs
index e4e590d4..89121f5c 100644
--- a/Unicord.Universal/Pages/ChannelPage.xaml.cs
+++ b/Unicord.Universal/Pages/ChannelPage.xaml.cs
@@ -33,6 +33,7 @@
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Input;
 using Windows.UI.Xaml.Navigation;
+using Windows.Foundation;
 
 namespace Unicord.Universal.Pages
 {
@@ -63,9 +64,9 @@ public ChannelPage()
             InitializeComponent();
             NavigationCacheMode = NavigationCacheMode.Enabled;
 
-            if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 5))
+            if (ApiInformation.IsApiContractPresent(typeof(UniversalApiContract).FullName, 5))
             {
-                if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 6))
+                if (ApiInformation.IsApiContractPresent(typeof(UniversalApiContract).FullName, 6))
                     KeyboardAcceleratorPlacementMode = KeyboardAcceleratorPlacementMode.Hidden;
 
                 this.AddAccelerator(VirtualKey.D, VirtualKeyModifiers.Control | VirtualKeyModifiers.Shift, EditMode_Invoked);
@@ -130,7 +131,8 @@ protected override async void OnNavigatedTo(NavigationEventArgs e)
             ViewModel = model;
             DataContext = ViewModel;
 
-            if (AnalyticsInfo.VersionInfo.DeviceFamily == "Windows.Desktop")
+            // TODO: this check should be for the input method, not platform
+            if (SystemPlatform.Desktop)
                 MessageTextBox.Focus(FocusState.Keyboard);
 
             while (_channelHistory.Count > 10)
@@ -186,9 +188,12 @@ private async void Navigation_BackRequested(object sender, BackRequestedEventArg
 
                 _channelHistory.Remove(last);
 
+                var old = ViewModel;
                 ViewModel = last;
                 DataContext = ViewModel;
 
+                old.Dispose();
+
                 await Load().ConfigureAwait(false);
             }
         }
@@ -224,7 +229,7 @@ await Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
                 }
             });
 
-            await JumpListManager.AddToListAsync(_viewModel.Channel);
+            await JumpListManager.AddToListAsync(_viewModel);
         }
 
         private async void ScrollViewer_ViewChanged(object sender, ScrollViewerViewChangedEventArgs e)
@@ -560,13 +565,8 @@ private void MessageTextBox_EditInvoked(object sender, EventArgs e)
             var lastMessage = _viewModel.Messages.LastOrDefault(m => m.Author.IsCurrent);
             if (lastMessage != null)
             {
-                var container = MessageList.ContainerFromItem(lastMessage);
-                if (container != null)
-                {
-                    MessageList.ScrollIntoView(lastMessage, ScrollIntoViewAlignment.Leading);
-                    var viewer = container.FindChild<MessageControl>();
-                    viewer?.BeginEdit();
-                }
+                MessageList.ScrollIntoView(lastMessage, ScrollIntoViewAlignment.Leading);
+                lastMessage.IsEditing = true;
             }
         }
 
diff --git a/Unicord.Universal/Pages/DiscordPage.xaml b/Unicord.Universal/Pages/DiscordPage.xaml
index a52506c1..8ee28340 100644
--- a/Unicord.Universal/Pages/DiscordPage.xaml
+++ b/Unicord.Universal/Pages/DiscordPage.xaml
@@ -25,56 +25,6 @@
     </Page.DataContext>
     <Page.Resources>
         <CircleEase x:Key="Ease" EasingMode="EaseInOut" />
-
-        <Storyboard x:Key="OpenLeftPaneMobileStoryboard" 
-                    x:Name="OpenLeftPaneMobileStoryboard">
-            <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="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
-                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>
-
-
     </Page.Resources>
     <Grid>
         <Grid x:Name="TitleBarGrid"
@@ -331,13 +281,8 @@
                                                Tapped="Notification_Tapped"
                                                VerticalOffset="-120"
                                                MaxHeight="200"
-                                               Style="{ThemeResource CustomInAppNotificationsStyle}">
-                        <toolkit:InAppNotification.ContentTemplate>
-                            <DataTemplate x:DataType="messagesVMs:MessageViewModel">
-                                <messages:MessageControl MessageViewModel="{x:Bind}"/>
-                            </DataTemplate>
-                        </toolkit:InAppNotification.ContentTemplate>
-                    </toolkit:InAppNotification>
+                                               Style="{ThemeResource CustomInAppNotificationsStyle}"
+                                               ContentTemplate="{StaticResource MessageContentTemplate}"/>
                 </Grid>
             </Grid>
 
diff --git a/Unicord.Universal/Pages/DiscordPage.xaml.cs b/Unicord.Universal/Pages/DiscordPage.xaml.cs
index f21cb88d..9ff86ba7 100644
--- a/Unicord.Universal/Pages/DiscordPage.xaml.cs
+++ b/Unicord.Universal/Pages/DiscordPage.xaml.cs
@@ -36,6 +36,7 @@
 using Windows.UI.Xaml.Media.Animation;
 using Windows.UI.Xaml.Navigation;
 using MUXC = Microsoft.UI.Xaml.Controls;
+using Microsoft.Extensions.Logging;
 
 namespace Unicord.Universal.Pages
 {
@@ -45,9 +46,11 @@ public sealed partial class DiscordPage : Page
         public Frame LeftSidebarFrame => leftSidebarFrame;
         public Frame RightSidebarFrame => rightSidebarFrame;
 
-
+        private ILogger<DiscordPage> _logger
+            = Logger.GetLogger<DiscordPage>();
         private MainPageArgs _args;
         private bool _loaded;
+        private bool _ready;
 
         internal DiscordPageViewModel Model { get; }
         internal bool IsWindowVisible { get; private set; }
@@ -60,6 +63,7 @@ public DiscordPage()
             IsWindowVisible = Window.Current.Visible;
             Window.Current.VisibilityChanged += Current_VisibilityChanged;
 
+            WeakReferenceMessenger.Default.Register<DiscordPage, ReadyEventArgs>(this, (r, e) => r.OnReady(e.Event));
             WeakReferenceMessenger.Default.Register<DiscordPage, MessageCreateEventArgs>(this, (r, e) => r.Notification_MessageCreated(e.Event));
         }
 
@@ -78,7 +82,7 @@ protected override async void OnNavigatedTo(NavigationEventArgs e)
             {
                 _args = args;
 
-                if (_loaded && _args.ChannelId != 0)
+                if (_loaded && _ready && _args.ChannelId != 0)
                 {
                     if (DiscordManager.Discord.TryGetCachedChannel(_args.ChannelId, out var channel))
                     {
@@ -89,21 +93,11 @@ protected override async void OnNavigatedTo(NavigationEventArgs e)
             }
         }
 
-        private void UpdateTitleBar()
+        private async Task OnReady(ReadyEventArgs e)
         {
-            if (ApiInformation.IsTypePresent("Windows.UI.ViewManagement.StatusBar"))
-            {
-                WindowingService.Current.HandleTitleBarForControl(sidebarMainGrid, true);
-                WindowingService.Current.HandleTitleBarForControl(sidebarSecondaryGrid, true);
-                WindowingService.Current.HandleTitleBarForControl(MainContent, true);
-                TitleBarGrid.Visibility = Visibility.Collapsed;
-            }
-            else
-            {
-                WindowingService.Current.HandleTitleBarForControl(sidebarSecondaryGrid, true);
-                WindowingService.Current.HandleTitleBarForControl(MainContent, true);
-                TitleBarGrid.Visibility = Visibility.Visible;
-            }
+            if (_ready) return;
+
+            await Dispatcher.RunAsync(CoreDispatcherPriority.Normal, async () => await LoadAsync());
         }
 
         private async void Page_Loaded(object sender, RoutedEventArgs e)
@@ -113,18 +107,34 @@ private async void Page_Loaded(object sender, RoutedEventArgs e)
 
             Analytics.TrackEvent("DiscordPage_Loaded");
 
+            if (_loaded) return;
+            _loaded = true;
+
             try
             {
                 UpdateTitleBar();
 
-                _loaded = true;
-
                 SplitPaneService.GetForCurrentView()
                     .ToggleLeftPane();
 
-                this.FindParent<MainPage>()
-                    .HideConnectingOverlay();
+                LeftSidebarFrame.Navigate(typeof(DMChannelsPage));
+                MainFrame.Navigate(typeof(FriendsPage));
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Something went wrong when loading DiscordPage");
+                await UIUtilities.ShowErrorDialogAsync("An error has occured.", ex.Message);
+            }
+        }
+
+        private async Task LoadAsync()
+        {
+            _ready = true;
 
+            this.FindParent<MainPage>()
+                .HideConnectingOverlay();
+            try
+            {
                 var service = DiscordNavigationService.GetForCurrentView();
                 if (_args != null && _args.ChannelId != 0 && DiscordManager.Discord.TryGetCachedChannel(_args.ChannelId, out var channel))
                 {
@@ -135,8 +145,8 @@ private async void Page_Loaded(object sender, RoutedEventArgs e)
                 {
                     Analytics.TrackEvent("DiscordPage_NavigateToFriendsPage");
                     Model.IsFriendsSelected = true;
-                    LeftSidebarFrame.Navigate(typeof(DMChannelsPage));
-                    MainFrame.Navigate(typeof(FriendsPage));
+                    //LeftSidebarFrame.Navigate(typeof(DMChannelsPage));
+                    //MainFrame.Navigate(typeof(FriendsPage));
                 }
 
                 var possibleConnection = await VoiceConnectionModel.FindExistingConnectionAsync();
@@ -152,7 +162,7 @@ private async void Page_Loaded(object sender, RoutedEventArgs e)
             }
             catch (Exception ex)
             {
-                Logger.LogError(ex);
+                _logger.LogError(ex, "Failure when processing READY");
                 await UIUtilities.ShowErrorDialogAsync("An error has occured.", ex.Message);
             }
         }
@@ -164,8 +174,8 @@ private void Page_Unloaded(object sender, RoutedEventArgs e)
 
         private async Task Notification_MessageCreated(MessageCreateEventArgs e)
         {
-            if (!WindowingService.Current.IsChannelVisible(e.Channel.Id) && 
-                NotificationUtils.WillShowToast(DiscordManager.Discord, e.Message) && 
+            if (!WindowingService.Current.IsChannelVisible(e.Channel.Id) &&
+                NotificationUtils.WillShowToast(DiscordManager.Discord, e.Message) &&
                 IsWindowVisible)
             {
                 await Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () => ShowNotification(e.Message));
@@ -179,7 +189,8 @@ private void ShowNotification(DiscordMessage message)
 
         private async void Notification_Tapped(object sender, TappedRoutedEventArgs e)
         {
-            var message = (((InAppNotification)sender).Content as MessageControl)?.MessageViewModel;
+            //var message = (((InAppNotification)sender).Content as MessageControl)?.MessageViewModel;
+            var message = notification.Content as MessageViewModel;
             if (message != null)
             {
                 var service = DiscordNavigationService.GetForCurrentView();
@@ -259,16 +270,33 @@ private async void TreeView_ItemInvoked(MUXC.TreeView sender, MUXC.TreeViewItemI
             sender.SelectedItem = null;
         }
 
+        private void CloseItem_Tapped(object sender, TappedRoutedEventArgs e)
+        {
+            SplitPaneService.GetForCurrentView()
+                .ToggleLeftPane();
+        }
+
         internal void SetViewMode(ViewMode viewMode)
         {
             Debug.WriteLine(viewMode);
             VisualStateManager.GoToState(this, viewMode.ToString(), true);
         }
 
-        private void CloseItem_Tapped(object sender, TappedRoutedEventArgs e)
+        private void UpdateTitleBar()
         {
-            SplitPaneService.GetForCurrentView()
-                .ToggleLeftPane();
+            if (ApiInformation.IsTypePresent("Windows.UI.ViewManagement.StatusBar"))
+            {
+                WindowingService.Current.HandleTitleBarForControl(sidebarMainGrid, true);
+                WindowingService.Current.HandleTitleBarForControl(sidebarSecondaryGrid, true);
+                WindowingService.Current.HandleTitleBarForControl(MainContent, true);
+                TitleBarGrid.Visibility = Visibility.Collapsed;
+            }
+            else
+            {
+                WindowingService.Current.HandleTitleBarForControl(sidebarSecondaryGrid, true);
+                WindowingService.Current.HandleTitleBarForControl(MainContent, true);
+                TitleBarGrid.Visibility = Visibility.Visible;
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/Unicord.Universal/Pages/Settings/MessagingSettingsPage.xaml b/Unicord.Universal/Pages/Settings/MessagingSettingsPage.xaml
index 0f86c974..ee20eaeb 100644
--- a/Unicord.Universal/Pages/Settings/MessagingSettingsPage.xaml
+++ b/Unicord.Universal/Pages/Settings/MessagingSettingsPage.xaml
@@ -10,6 +10,7 @@
     xmlns:models="using:Unicord.Universal.Models"
     xmlns:messages="using:Unicord.Universal.Controls.Messages"
     xmlns:settings="using:SettingsControl"
+    xmlns:converters="using:Unicord.Universal.Converters"
     mc:Ignorable="d">
     <Page.DataContext>
         <models:MessagingSettingsModel />
@@ -94,10 +95,14 @@
                       HorizontalAlignment="Right"
                       MinWidth="200">
                 <ComboBox.ItemTemplate>
-                    <DataTemplate>
+                    <DataTemplate x:DataType="models:TimestampStyleModel">
                         <StackPanel Orientation="Horizontal">
-                            <TextBlock Text="{Binding Style}" />
-                            <TextBlock Text="{Binding Timestamp, Converter={StaticResource DateTimeConverter}, ConverterParameter={Binding Style}}"  Margin="4,0" VerticalAlignment="Center" FontSize="12" Foreground="{StaticResource ApplicationSecondaryForegroundThemeBrush}" />
+                            <TextBlock Text="{x:Bind Style}" />
+                            <TextBlock Text="{x:Bind converters:DateTimeConverter.Convert(Style, Timestamp)}" 
+                                       Margin="4,0" 
+                                       VerticalAlignment="Center" 
+                                       FontSize="12"
+                                       Foreground="{StaticResource ApplicationSecondaryForegroundThemeBrush}" />
                         </StackPanel>
                     </DataTemplate>
                 </ComboBox.ItemTemplate>
diff --git a/Unicord.Universal/Pages/Settings/MessagingSettingsPage.xaml.cs b/Unicord.Universal/Pages/Settings/MessagingSettingsPage.xaml.cs
index 4c427530..f8aa4712 100644
--- a/Unicord.Universal/Pages/Settings/MessagingSettingsPage.xaml.cs
+++ b/Unicord.Universal/Pages/Settings/MessagingSettingsPage.xaml.cs
@@ -29,7 +29,7 @@ public MessagingSettingsPage()
         private void ComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             // dirty hack to work around databinding fuckery
-            App.RoamingSettings.Save("TimestampStyle", (sender as ComboBox).SelectedIndex);
+            App.RoamingSettings.Save(Constants.TIMESTAMP_STYLE, (sender as ComboBox).SelectedIndex);
         }
 
         private async void ContrastLearnMoreButton_Click(object sender, RoutedEventArgs e)
diff --git a/Unicord.Universal/Pages/Subpages/DMChannelsPage.xaml b/Unicord.Universal/Pages/Subpages/DMChannelsPage.xaml
index a068216a..5e04d9a0 100644
--- a/Unicord.Universal/Pages/Subpages/DMChannelsPage.xaml
+++ b/Unicord.Universal/Pages/Subpages/DMChannelsPage.xaml
@@ -17,8 +17,8 @@
 
     <Page.Resources>
         <converters:ChannelTypeTemplateSelector x:Key="ChannelTemplateSelector"
-                                                DMChannelTemplate="{StaticResource DMChannelListTemplate}"
-                                                GroupChannelTemplate="{StaticResource GroupChannelListTemplate}" />
+                                                DMChannelTemplate="{StaticResource DirectMessageChannelListContentTemplate}"
+                                                GroupChannelTemplate="{StaticResource GroupChannelListContentTemplate}" />
     </Page.Resources>
 
     <Page.DataContext>
diff --git a/Unicord.Universal/Pages/Subpages/ForumChannelPage.xaml b/Unicord.Universal/Pages/Subpages/ForumChannelPage.xaml
index e434bc97..82d89389 100644
--- a/Unicord.Universal/Pages/Subpages/ForumChannelPage.xaml
+++ b/Unicord.Universal/Pages/Subpages/ForumChannelPage.xaml
@@ -65,6 +65,7 @@
 
                                 <Ellipse x:Name="ImageContainer"
                                          x:Load="{x:Bind HasValidCreator}"
+                                         x:Phase="2"
                                          Width="32"
                                          Height="32"
                                          Margin="0,4,8,0"
@@ -81,17 +82,18 @@
                                     </Ellipse.Fill>
                                 </Ellipse>
 
-                                
+
                                 <StackPanel Grid.Column="1">
                                     <controls:UsernameControl x:Name="Username"
+                                                              x:Phase="2"
                                                               x:Load="{x:Bind HasValidCreator}"
                                                               User="{x:Bind Creator}" 
                                                               FontSize="12"/>
                                     <TextBlock FontSize="16"
-                                           FontWeight="Bold"
-                                           TextWrapping="Wrap"
-                                           MaxLines="2"
-                                           Text="{x:Bind Name}"/>
+                                               FontWeight="Bold"
+                                               TextWrapping="Wrap"
+                                               MaxLines="2"
+                                               Text="{x:Bind Name}"/>
                                 </StackPanel>
                             </Grid>
 
@@ -102,11 +104,13 @@
                                      HorizontalAlignment="Center" 
                                      VerticalAlignment="Center">
                                 <messages:AttachmentControl x:Name="Attachment"
+                                                            x:Phase="3"
                                                             Visibility="{x:Bind DisplayAttachment, Converter={StaticResource HideOnNullConverter}}"
                                                             ViewModel="{x:Bind DisplayAttachment}" />
                             </Viewbox>
 
                             <ItemsControl x:Name="Reactions"
+                                          x:Phase="4"
                                           Visibility="{x:Bind FirstMessage.Reactions, Converter={StaticResource BoolVisibilityConverter}}"
                                           Grid.Row="2"
                                           Margin="0,8,0,0"
diff --git a/Unicord.Universal/Pages/Subpages/FriendsPage.xaml b/Unicord.Universal/Pages/Subpages/FriendsPage.xaml
index 24c4a445..ca275f04 100644
--- a/Unicord.Universal/Pages/Subpages/FriendsPage.xaml
+++ b/Unicord.Universal/Pages/Subpages/FriendsPage.xaml
@@ -14,7 +14,7 @@
     xmlns:models="using:Unicord.Universal.Models" 
     xmlns:presence="using:Unicord.Universal.Controls.Presence"
     xmlns:users="using:Unicord.Universal.Controls.Users"
-    xmlns:relationships="using:Unicord.Universal.Models.Relationships"
+    xmlns:relationships="using:Unicord.Universal.Models.Relationships" xmlns:converters="using:Unicord.Universal.Converters"
     NavigationCacheMode="Required"
     mc:Ignorable="d" x:DefaultBindMode="OneWay">
     <Page.DataContext>
@@ -35,11 +35,8 @@
                   CornerRadius="{ThemeResource FriendsPage_RelationshipItem_CornerRadius}"
                   Background="{ThemeResource FriendsPage_RelationshipItem_Background}"
                   BorderBrush="{ThemeResource FriendsPage_RelationshipItem_BorderBrush}"
-                  BorderThickness="1"
-                  PointerCanceled="Grid_PointerCanceled" 
-                  PointerEntered="Grid_PointerEntered"
-                  PointerExited="Grid_PointerExited">
-                <Grid.Resources>
+                  BorderThickness="1">
+                <!--<Grid.Resources>
                     <Storyboard x:Key="pointerEntered" Duration="00:00:00.20">
                         <DoubleAnimation Storyboard.TargetName="mainContent" Storyboard.TargetProperty="Opacity" Duration="00:00:00.20" To="0"/>
                         <DoubleAnimation Storyboard.TargetName="overlayContent" Storyboard.TargetProperty="Opacity" Duration="00:00:00.20" To="1"/>
@@ -48,22 +45,22 @@
                         <DoubleAnimation Storyboard.TargetName="mainContent" Storyboard.TargetProperty="Opacity" Duration="00:00:00.20" To="1"/>
                         <DoubleAnimation Storyboard.TargetName="overlayContent" Storyboard.TargetProperty="Opacity" Duration="00:00:00.20" To="0"/>
                     </Storyboard>
-                </Grid.Resources>
+                </Grid.Resources>-->
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto"/>
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
-                <users:AvatarControl Width="64" Height="64" Margin="0,0,12,0" Style="{ThemeResource MediumAvatarWithPresenceStyle}" Source="{Binding User.AvatarUrl}" Presence="{Binding User.Presence}" />
+                <users:AvatarControl x:Phase="1" Width="64" Height="64" Margin="0,0,12,0" Style="{ThemeResource MediumAvatarWithPresenceStyle}" Source="{x:Bind User.AvatarUrl}" Presence="{x:Bind User.Presence}" />
                 <Grid Grid.Column="1" HorizontalAlignment="Stretch">
                     <Grid x:Name="mainContent" VerticalAlignment="Center" Opacity="1">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto"/>
                             <RowDefinition Height="Auto"/>
                         </Grid.RowDefinitions>
-                        <TextBlock Name="text" Text="{Binding User.DisplayName}" FontSize="16" FontWeight="SemiBold" />
-                        <presence:InlinePresenceControl Presence="{Binding User.Presence}" TextWrapping="Wrap" Grid.Row="1" />
+                        <TextBlock Name="text" Text="{x:Bind User.DisplayName}" FontSize="16" FontWeight="SemiBold" />
+                        <presence:InlinePresenceControl x:Name="PresenceControl" x:Load="{x:Bind converters:Static.NotNull(User.Presence)}" x:Phase="3" Presence="{x:Bind User.Presence}" TextWrapping="Wrap" Grid.Row="1" />
                     </Grid>
-                    <StackPanel x:Name="overlayContent" DataContext="{Binding}" Orientation="Horizontal" Opacity="0" VerticalAlignment="Center" HorizontalAlignment="Right">
+                    <!--<StackPanel x:Name="overlayContent" x:Phase="4" DataContext="{x:Bind}" Orientation="Horizontal" Opacity="0" VerticalAlignment="Center" HorizontalAlignment="Right">
                         <Button Style="{ThemeResource IconButtonStyle}" Margin="4,0">
                             <SymbolIcon Symbol="VideoChat"/>
                         </Button>
@@ -73,7 +70,7 @@
                         <Button Style="{ThemeResource IconButtonStyle}" Command="{Binding User.MessageCommand}" Margin="4,0">
                             <SymbolIcon Symbol="Message"/>
                         </Button>
-                    </StackPanel>
+                    </StackPanel>-->
                 </Grid>
             </Grid>
         </DataTemplate>
diff --git a/Unicord.Universal/Pages/Subpages/FriendsPage.xaml.cs b/Unicord.Universal/Pages/Subpages/FriendsPage.xaml.cs
index d7742d4e..9fbb50fd 100644
--- a/Unicord.Universal/Pages/Subpages/FriendsPage.xaml.cs
+++ b/Unicord.Universal/Pages/Subpages/FriendsPage.xaml.cs
@@ -41,36 +41,6 @@ await OverlayService.GetForCurrentView()
             }
         }
 
-        private void Grid_PointerEntered(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs e)
-        {
-            var grid = sender as FrameworkElement;
-            var enter = grid.Resources["pointerEntered"] as Storyboard;
-            var exited = grid.Resources["pointerLeft"] as Storyboard;
-
-            exited?.Stop();
-            enter?.Begin();
-        }
-
-        private void Grid_PointerExited(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs e)
-        {
-            var grid = sender as FrameworkElement;
-            var enter = grid.Resources["pointerEntered"] as Storyboard;
-            var exited = grid.Resources["pointerLeft"] as Storyboard;
-
-            enter?.Stop();
-            exited?.Begin();
-        }
-
-        private void Grid_PointerCanceled(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs e)
-        {
-            var grid = sender as FrameworkElement;
-            var enter = grid.Resources["pointerEntered"] as Storyboard;
-            var exited = grid.Resources["pointerLeft"] as Storyboard;
-
-            enter?.Stop();
-            exited?.Begin();
-        }
-
         private void ShowSidebarButton_Click(object sender, RoutedEventArgs e)
         {
             SplitPaneService.GetForCurrentView()
diff --git a/Unicord.Universal/Pages/Subpages/GuildChannelListPage.xaml b/Unicord.Universal/Pages/Subpages/GuildChannelListPage.xaml
index 08bc3160..fd161fdb 100644
--- a/Unicord.Universal/Pages/Subpages/GuildChannelListPage.xaml
+++ b/Unicord.Universal/Pages/Subpages/GuildChannelListPage.xaml
@@ -14,8 +14,8 @@
     <Page.Resources>
         <converters:ChannelTypeTemplateSelector x:Key="ChannelTemplateSelector" 
                                                 CategoryTemplate="{StaticResource ChannelListCategoryTemplate}" 
-                                                TextChannelTemplate="{StaticResource ChannelListTemplate}" 
-                                                ThreadTemplate="{StaticResource ChannelListThreadTemplate}"
+                                                TextChannelTemplate="{StaticResource ChannelListContentTemplate}" 
+                                                ThreadTemplate="{StaticResource ThreadChannelListContentTemplate}"
                                                 VoiceChannelTemplate="{StaticResource ChannelListVoiceTemplate}"/>
     </Page.Resources>
     <Grid>
diff --git a/Unicord.Universal/Pages/Subpages/GuildChannelListPage.xaml.cs b/Unicord.Universal/Pages/Subpages/GuildChannelListPage.xaml.cs
index 2f2b96ff..1ee8b67a 100644
--- a/Unicord.Universal/Pages/Subpages/GuildChannelListPage.xaml.cs
+++ b/Unicord.Universal/Pages/Subpages/GuildChannelListPage.xaml.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using Unicord.Universal.Models;
 using Unicord.Universal.Models.Channels;
+using Unicord.Universal.Models.Guild;
 using Unicord.Universal.Services;
 using Windows.Foundation.Metadata;
 using Windows.UI.ViewManagement;
diff --git a/Unicord.Universal/Pages/Subpages/PinsPage.xaml b/Unicord.Universal/Pages/Subpages/PinsPage.xaml
index 4c756110..61ed1255 100644
--- a/Unicord.Universal/Pages/Subpages/PinsPage.xaml
+++ b/Unicord.Universal/Pages/Subpages/PinsPage.xaml
@@ -9,8 +9,14 @@
     xmlns:insider="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract, 7)"
     xmlns:local="using:Unicord.Universal.Pages.Subpages"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:messages="using:Unicord.Universal.Controls.Messages" xmlns:lib="using:Microsoft.UI.Xaml.Controls" xmlns:messages1="using:Unicord.Universal.Models.Messages"
+    xmlns:messages="using:Unicord.Universal.Controls.Messages" 
+    xmlns:lib="using:Microsoft.UI.Xaml.Controls" 
+    xmlns:messages1="using:Unicord.Universal.Models.Messages"
+    xmlns:models="using:Unicord.Universal.Models.Channels"
     mc:Ignorable="d">
+    <d:Page.DataContext>
+        <models:PinsPageViewModel/>
+    </d:Page.DataContext>
 
     <Grid>
         <Grid.RowDefinitions>
@@ -27,38 +33,46 @@
                 FontWeight="Bold"/>
         </Grid>
 
-        <StackPanel
-            x:Name="noMessages"
-            Grid.Row="1"
-            Margin="15"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            Visibility="Collapsed">
+        <StackPanel x:Name="noMessages"
+                    Grid.Row="1"
+                    Margin="15"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Visibility="{Binding NoMessages, Converter={StaticResource BoolVisibilityConverter}}">
             <TextBlock FontSize="110" Text=":(" />
             <TextBlock x:Uid="/PinsPage/NoPinsHeader" Style="{ThemeResource SubheaderTextBlockStyle}"/>
             <TextBlock x:Uid="/PinsPage/NoPinsSubheader" TextWrapping="Wrap"/>
         </StackPanel>
 
-        <StackPanel
-            x:Name="ratelimited"
-            Grid.Row="1"
-            Margin="15"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            Visibility="Collapsed">
+        <StackPanel x:Name="ratelimited"
+                    Grid.Row="1"
+                    Margin="15"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Visibility="{Binding IsRateLimited, Converter={StaticResource BoolVisibilityConverter}}">
             <TextBlock FontSize="110" Text=":/" />
             <TextBlock x:Uid="/PinsPage/RatelimitedHeader" Style="{ThemeResource SubheaderTextBlockStyle}"/>
             <TextBlock x:Uid="/PinsPage/RatelimitedSubheader" TextWrapping="Wrap"/>
         </StackPanel>
 
-        <ListView
-            x:Name="messages"
-            Grid.Row="1"
-            Padding="0,0,0,20"
-            SelectionMode="None">
+        <StackPanel x:Name="errored"
+                    Grid.Row="1"
+                    Margin="15"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Visibility="{Binding IsErrored, Converter={StaticResource BoolVisibilityConverter}}">
+            <TextBlock FontSize="110" Text=":/" />
+            <TextBlock x:Uid="/PinsPage/ErroredHeader" Style="{ThemeResource SubheaderTextBlockStyle}"/>
+            <TextBlock x:Uid="/PinsPage/ErroredSubheader" TextWrapping="Wrap"/>
+        </StackPanel>
 
+        <ListView Grid.Row="1"
+                  Padding="0,0,0,20"
+                  IsItemClickEnabled="True"
+                  SelectionMode="None"
+                  ItemsSource="{Binding Messages}">
             <ListView.ItemContainerStyle>
-                <Style TargetType="ListViewItem">
+                <Style TargetType="ListViewItem" BasedOn="{StaticResource DefaultListViewItemStyle}">
                     <Setter Property="Padding" Value="0" />
                     <Setter Property="Margin" Value="0" />
                     <Setter Property="MinHeight" Value="0" />
@@ -72,18 +86,17 @@
                         Background="Transparent"
                         BorderBrush="Transparent"
                         IsEnabled="False"
-                        Margin="4,8"
                         MessageViewModel="{x:Bind}" />
                 </DataTemplate>
             </ListView.ItemTemplate>
         </ListView>
 
-        <lib:ProgressRing
-            x:Name="progress"
-            Grid.Row="1"
-            Width="48"
-            Height="48"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Center" />
+        <lib:ProgressRing x:Name="progress"
+                          Grid.Row="1"
+                          Width="48"
+                          Height="48"
+                          HorizontalAlignment="Center"
+                          VerticalAlignment="Center"
+                          IsActive="{Binding IsLoading}"/>
     </Grid>
 </Page>
diff --git a/Unicord.Universal/Pages/Subpages/PinsPage.xaml.cs b/Unicord.Universal/Pages/Subpages/PinsPage.xaml.cs
index 23a3c561..060be1e2 100644
--- a/Unicord.Universal/Pages/Subpages/PinsPage.xaml.cs
+++ b/Unicord.Universal/Pages/Subpages/PinsPage.xaml.cs
@@ -11,6 +11,7 @@
 using DSharpPlus.EventArgs;
 using DSharpPlus.Exceptions;
 using Unicord.Universal.Controls;
+using Unicord.Universal.Models.Channels;
 using Unicord.Universal.Models.Messages;
 using Unicord.Universal.Services;
 using Windows.Foundation;
@@ -28,93 +29,17 @@ namespace Unicord.Universal.Pages.Subpages
 {
     public sealed partial class PinsPage : Page
     {
-        private DiscordChannel _channel;
-
-        private static bool _hasHandler;
-        private static ConcurrentDictionary<ulong, ObservableCollection<DiscordMessage>> _pinsCache
-            = new ConcurrentDictionary<ulong, ObservableCollection<DiscordMessage>>();
-
         public PinsPage()
         {
             InitializeComponent();
-            if (!_hasHandler)
-            {
-                _hasHandler = true;
-                DiscordManager.Discord.MessageUpdated += Discord_MessageUpdated;
-            }
         }
 
-        // TODO: this is awful
-        private async Task Discord_MessageUpdated(DiscordClient client, MessageUpdateEventArgs e)
+        protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            if (_pinsCache.TryGetValue(e.Channel.Id, out var pins))
+            if (e.Parameter is ChannelViewModel channel)
             {
-                if (e.Message.Pinned)
-                {
-                    if (!pins.Contains(e.Message))
-                    {
-                        await Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () => pins.Add(e.Message));
-                    }
-                }
-                else
-                {
-                    if (pins.Contains(e.Message))
-                    {
-                        await Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () => pins.Remove(e.Message));
-                    }
-                }
-
-                if (e.Channel.Id == _channel.Id)
-                {
-                    await Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () => noMessages.Visibility = pins.Any() ? Visibility.Collapsed : Visibility.Visible);
-                }
+                DataContext = new PinsPageViewModel(channel);
             }
         }
-
-        protected override async void OnNavigatedTo(NavigationEventArgs e)
-        {
-            messages.ItemsSource = Enumerable.Empty<MessageViewModel>();
-
-            if (e.Parameter is DiscordChannel channel)
-            {
-                //_channel = channel;
-
-                //try
-                //{
-                //    noMessages.Visibility = Visibility.Collapsed;
-                //    ratelimited.Visibility = Visibility.Collapsed;
-                //    progress.IsActive = true;
-
-                //    if (!_pinsCache.TryGetValue(channel.Id, out var pins))
-                //    {
-                //        var p = await channel.GetPinnedMessagesAsync();
-                //        pins = new ObservableCollection<DiscordMessage>();
-                //        foreach (var m in p)
-                //        {
-                //            pins.Add(m);
-                //        }
-
-                //        _pinsCache[channel.Id] = pins;
-                //    }
-
-                //    messages.ItemsSource = pins;
-
-                //    if (!pins.Any())
-                //    {
-                //        noMessages.Visibility = Visibility.Visible;
-                //    }
-                //}
-                //catch (RateLimitException)
-                //{
-                //    ratelimited.Visibility = Visibility.Visible;
-                //}
-                //catch (Exception ex)
-                //{
-                //    Logger.LogError(ex);
-                //}
-            }
-
-            progress.IsActive = false;
-        }
     }
 }
diff --git a/Unicord.Universal/Pages/Subpages/SearchPage.xaml b/Unicord.Universal/Pages/Subpages/SearchPage.xaml
index 6bf4f48d..7fdc4363 100644
--- a/Unicord.Universal/Pages/Subpages/SearchPage.xaml
+++ b/Unicord.Universal/Pages/Subpages/SearchPage.xaml
@@ -21,18 +21,18 @@
         </Grid.RowDefinitions>
 
         <!-- too much vertical space? idk -->
-        <!--
-            <Grid x:Name="TopGrid" Height="42">
-                <TextBlock
-                    x:Uid="/SearchPage/SearchHeader"
-                    Margin="12,0"
-                    VerticalAlignment="Center"
-                    FontSize="16"
-                    FontWeight="Bold"/>
-            </Grid
-        >-->
-
-        <Grid Grid.Row="1" Margin="0">
+
+        <Grid x:Name="TopGrid" Height="42">
+            <TextBlock x:Uid="/SearchPage/SearchHeader"
+                       Text="Search"
+                       Margin="12,0"
+                       VerticalAlignment="Center"
+                       FontSize="16"
+                       FontWeight="Bold"/>
+        </Grid>
+
+        <Grid Grid.Row="1" 
+              Margin="8,0,8,8">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*"/>
                 <ColumnDefinition Width="Auto"/>
@@ -43,21 +43,23 @@
                      x:Uid="/SearchPage/SearchBox" 
                      InputScope="Search" 
                      VerticalAlignment="Center" 
-                     Style="{ThemeResource MessageTextBoxStyle}"
                      KeyDown="SearchBox_KeyDown" />
 
             <Button x:Name="SearchButton" 
                     Grid.Column="1" 
-                    Margin="2,0,0,0"
-                    Style="{ThemeResource IconButtonStyle}" 
+                    Margin="4,0,0,0"
                     Content="&#xE721;"
+                    FontFamily="{StaticResource SymbolThemeFontFamily}"
+                    Padding="8"
                     Click="SearchButton_Click" />
 
             <Button x:Name="ExpandOptionsButton" 
                     Grid.Column="2" 
-                    Margin="2,0,0,0"
-                    Style="{ThemeResource IconButtonStyle}" 
-                    Content="&#xE70D;" />
+                    Margin="4,0,0,0"
+                    FontFamily="{StaticResource SymbolThemeFontFamily}"
+                    Padding="8"
+                    Content="&#xE70D;"
+                    Visibility="Collapsed" />
         </Grid>
 
         <Grid x:Name="ExtraOptionsGrid"
@@ -65,12 +67,15 @@
         </Grid>
 
         <ListView x:Name="SearchResultsView"
+                  BorderThickness="0,1"
+                  BorderBrush="{ThemeResource ChannelPage_Header_BorderBrush}"
                   Grid.Row="3"
                   SelectionMode="None"
+                  IsItemClickEnabled="True"
                   ItemsSource="{Binding ViewSource.View}">
 
             <ListView.ItemContainerStyle>
-                <Style TargetType="ListViewItem">
+                <Style TargetType="ListViewItem" BasedOn="{StaticResource DefaultListViewItemStyle}">
                     <Setter Property="Padding" Value="0" />
                     <Setter Property="Margin" Value="0" />
                     <Setter Property="MinHeight" Value="0" />
@@ -80,29 +85,13 @@
             </ListView.ItemContainerStyle>
             <ListView.ItemTemplate>
                 <DataTemplate x:DataType="messages1:MessageViewModel">
-                    <messages:MessageControl
-                        Background="Transparent"
-                        BorderBrush="Transparent"
-                        Opacity="{Binding Hit, Converter={StaticResource BoolOpacityConverter}}"
-                        IsEnabled="False"
-                        Margin="4,8"
-                        MessageViewModel="{x:Bind}" />
+                    <messages:MessageControl Background="Transparent"
+                                             BorderBrush="Transparent" 
+                                             IsEnabled="False" 
+                                             Margin="0,4"
+                                             MessageViewModel="{x:Bind}" />
                 </DataTemplate>
             </ListView.ItemTemplate>
-            <ListView.GroupStyle>
-                <GroupStyle HidesIfEmpty="True">
-                    <GroupStyle.HeaderTemplate>
-                        <DataTemplate>
-                            <TextBlock
-                                FontSize="14"
-                                FontWeight="Bold"
-                                Text="{Binding Key.Channel.Name}"
-                                TextTrimming="CharacterEllipsis"
-                                TextWrapping="NoWrap" />
-                        </DataTemplate>
-                    </GroupStyle.HeaderTemplate>
-                </GroupStyle>
-            </ListView.GroupStyle>
         </ListView>
 
         <lib:ProgressRing
@@ -114,7 +103,8 @@
             HorizontalAlignment="Center"
             VerticalAlignment="Center" />
 
-        <Grid Grid.Row="4" Padding="0,4,0,0">
+        <Grid Grid.Row="4" 
+              Padding="4">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto"/>
                 <ColumnDefinition Width="*"/>
diff --git a/Unicord.Universal/Pages/Subpages/UserListPage.xaml b/Unicord.Universal/Pages/Subpages/UserListPage.xaml
index d5c00da8..1c10bd2f 100644
--- a/Unicord.Universal/Pages/Subpages/UserListPage.xaml
+++ b/Unicord.Universal/Pages/Subpages/UserListPage.xaml
@@ -45,8 +45,8 @@
             ItemTemplate="{ThemeResource UserListTemplate}"
             IsSynchronizedWithCurrentItem="False"
             ItemsSource="{Binding Source={StaticResource ViewSource}}"
-            SelectionChanged="UserList_SelectionChanged"
-            SelectionMode="Single">
+            IsItemClickEnabled="True"
+            ItemClick="userList_ItemClick">
 
             <ListView.GroupStyle>
                 <GroupStyle HidesIfEmpty="True">
diff --git a/Unicord.Universal/Pages/Subpages/UserListPage.xaml.cs b/Unicord.Universal/Pages/Subpages/UserListPage.xaml.cs
index 2a65d602..d3049a42 100644
--- a/Unicord.Universal/Pages/Subpages/UserListPage.xaml.cs
+++ b/Unicord.Universal/Pages/Subpages/UserListPage.xaml.cs
@@ -71,15 +71,15 @@ await Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
             }
         }
 
-        private void UserList_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        private void userList_ItemClick(object sender, ItemClickEventArgs e)
         {
-            var item = e.AddedItems.FirstOrDefault();
-            if (item != null)
-            {
-                var element = (sender as ListView).ContainerFromItem(item);
-                //AdaptiveFlyoutUtilities.ShowAdaptiveFlyout<UserFlyout>(item, element as FrameworkElement);
-                userList.SelectedItem = null;
-            }
+            //var item = e.ClickedItem;
+            //if (item != null)
+            //{
+            //    var element = (sender as ListView).ContainerFromItem(item);
+            //    //AdaptiveFlyoutUtilities.ShowAdaptiveFlyout<UserFlyout>(item, element as FrameworkElement);
+            //    userList.SelectedItem = null;
+            //}
         }
     }
 }
diff --git a/Unicord.Universal/Resources/en-GB/PinsPage.resw b/Unicord.Universal/Resources/en-GB/PinsPage.resw
index 8306b46c..3e11d1ee 100644
--- a/Unicord.Universal/Resources/en-GB/PinsPage.resw
+++ b/Unicord.Universal/Resources/en-GB/PinsPage.resw
@@ -132,4 +132,10 @@
   <data name="RatelimitedSubheader.Text" xml:space="preserve">
     <value>Hey! Slow down there, you're being ratelimited!</value>
   </data>
+  <data name="ErroredHeader.Text" xml:space="preserve">
+    <value>Whoops!</value>
+  </data>
+  <data name="ErroredSubheader.Text" xml:space="preserve">
+    <value>Something went wrong loading pinned messages.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Unicord.Universal/Services/BackgroundNotificationService.cs b/Unicord.Universal/Services/BackgroundNotificationService.cs
index 6faa267f..fb396332 100644
--- a/Unicord.Universal/Services/BackgroundNotificationService.cs
+++ b/Unicord.Universal/Services/BackgroundNotificationService.cs
@@ -4,6 +4,7 @@
 using CommunityToolkit.Mvvm.Messaging;
 using DSharpPlus.EventArgs;
 using Microsoft.AppCenter.Crashes;
+using Microsoft.Extensions.Logging;
 using Unicord.Universal.Background.Tasks;
 using Unicord.Universal.Shared;
 using Windows.ApplicationModel;
@@ -16,39 +17,59 @@ namespace Unicord.Universal.Services
 {
     class BackgroundNotificationService : BaseService<BackgroundNotificationService>
     {
+        private readonly ILogger<BackgroundNotificationService> _logger 
+            = Logger.GetLogger<BackgroundNotificationService>();
+
         private BadgeManager _badgeManager;
         private TileManager _tileManager;
         private SecondaryTileManager _secondaryTileManager;
 
         internal async Task StartupAsync()
         {
-            if (!await StartFullTrustBackgroundTaskAsync())
+            if (await StartFullTrustBackgroundTaskAsync())
+            {
+                
+            }
+            else
             {
-                await RegisterPeriodicBackgroundTaskAsync();
+                //await RegisterPeriodicBackgroundTaskAsync();
                 await StartInProcTaskAsync();
             }
+
+            var periodicTask = BackgroundTaskRegistration.AllTasks.Values.FirstOrDefault(i => i.Name.Equals(PERIODIC_BACKGROUND_TASK_NAME));
+            if (periodicTask != null)
+            {
+                _logger.LogInformation("Disabling periodic background task because full-trust task is running.");
+                periodicTask.Unregister(true);
+            }
         }
 
-        private async Task<bool> RegisterBackgroundTaskAsync()
+        private async Task<bool> RegisterToastActivationBackgroundTaskAsync()
         {
             try
             {
                 if (BackgroundTaskRegistration.AllTasks.Values.Any(i => i.Name.Equals(TOAST_BACKGROUND_TASK_NAME)))
                     return true;
 
+
                 var status = await BackgroundExecutionManager.RequestAccessAsync();
                 if (status is BackgroundAccessStatus.Denied or BackgroundAccessStatus.DeniedBySystemPolicy or BackgroundAccessStatus.DeniedByUser)
+                {
+                    _logger.LogError("Failed to register background task for toast notification because {Reason}", status.ToString());
                     return false;
+                }
 
                 var builder = new BackgroundTaskBuilder() { Name = TOAST_BACKGROUND_TASK_NAME };
                 builder.SetTrigger(new ToastNotificationActionTrigger());
-
                 var registration = builder.Register();
+
+                _logger.LogInformation("Registered background task for toast activation.");
+
                 return true;
             }
             catch (Exception ex)
             {
-                Logger.LogError(ex);
+                _logger.LogError(ex, "Failed to register background task for toast activation.");
             }
 
             return false;
@@ -57,44 +78,56 @@ private async Task<bool> RegisterBackgroundTaskAsync()
         private async Task<bool> StartFullTrustBackgroundTaskAsync()
         {
             if (!App.LocalSettings.Read(BACKGROUND_NOTIFICATIONS, true))
+            {
+                _logger.LogDebug("Not starting full-trust notifications process, disabled by user.");
                 return false;
+            }
 
+            // disable this prior to FCU because it seems to just crash, and inbuilt notifications work better
             if (!ApiInformation.IsApiContractPresent(typeof(UniversalApiContract).FullName, 5))
-                return false; // disable this prior to FCU because it seems to just crash, and inbuilt notifications work better
+            {
+                _logger.LogDebug("Not starting full-trust notifications process, disabled by OS version check.");
+                return false;
+            }
 
-            if (!await RegisterBackgroundTaskAsync())
+            if (!await RegisterToastActivationBackgroundTaskAsync())
+            {
+                _logger.LogDebug("Not starting full-trust notifications process, failed to register toast activation task.");
                 return false;
+            }
 
             try
             {
-                if (ApiInformation.IsApiContractPresent(typeof(StartupTaskContract).FullName, 1))
+                if (ApiInformation.IsApiContractPresent(typeof(FullTrustAppContract).FullName, 1))
                 {
-                    var notifyTask = await StartupTask.GetAsync("UnicordBackgroundTask");
-                    await notifyTask.RequestEnableAsync();
+                    await FullTrustProcessLauncher.LaunchFullTrustProcessForCurrentAppAsync();
+                    _logger.LogInformation("Launched full-trust notifications process.");
                 }
             }
             catch (Exception ex)
             {
-                Logger.LogError(ex);
+                _logger.LogError(ex, "Failed to launch full-trust notifications process.");
+                return false;
             }
 
             try
             {
-                if (ApiInformation.IsApiContractPresent(typeof(FullTrustAppContract).FullName, 1))
+                if (ApiInformation.IsApiContractPresent(typeof(StartupTaskContract).FullName, 1))
                 {
-                    await FullTrustProcessLauncher.LaunchFullTrustProcessForCurrentAppAsync();
-                    return true;
+                    var notifyTask = await StartupTask.GetAsync("UnicordBackgroundTask");
+                    var state = await notifyTask.RequestEnableAsync();
+
+                    _logger.LogInformation("Full-trust notifications startup task state -> {State}", state);
                 }
             }
             catch (Exception ex)
             {
-                Logger.LogError(ex);
+                _logger.LogError(ex, "Failed to enable startup task for full-trust notifications process.");
             }
 
-            return false;
+            return true;
         }
 
-
         private async Task<bool> RegisterPeriodicBackgroundTaskAsync()
         {
             try
@@ -113,7 +146,6 @@ private async Task<bool> RegisterPeriodicBackgroundTaskAsync()
                     IsNetworkRequested = true
                 };
 
-                builder.AddCondition(new SystemCondition(SystemConditionType.InternetAvailable));
                 builder.SetTrigger(new TimeTrigger(15, false));
 
                 var registration = builder.Register();
diff --git a/Unicord.Universal/Services/DiscordManager.cs b/Unicord.Universal/Services/DiscordManager.cs
index eb77967e..644f1e19 100644
--- a/Unicord.Universal/Services/DiscordManager.cs
+++ b/Unicord.Universal/Services/DiscordManager.cs
@@ -35,7 +35,7 @@ internal static void KickoffConnectionAsync()
             _ = Task.Run(async () =>
             {
                 if (TryGetToken(out var token))
-                    await LoginAsync(token, null, null, false);
+                    await LoginAsync(token, null, null, true);
             });
         }
 
@@ -46,13 +46,9 @@ internal static async Task LoginAsync(
             bool background,
             UserStatus status = UserStatus.Online)
         {
-            Exception taskEx = null;
-
             await _connectSemaphore.WaitAsync();
             try
             {
-                //var loader = ResourceLoader.GetForViewIndependentUse();
-
                 if (Discord != null)
                 {
                     try
@@ -61,21 +57,24 @@ internal static async Task LoginAsync(
                         if (onReady != null)
                             await onReady(Discord, res);
                     }
-                    catch
+                    catch (Exception ex)
                     {
                         if (onError != null)
-                            await onError(taskEx);
+                            await onError(ex);
                     }
 
                     return;
                 }
 
-                //if (!background && !await WindowsHelloManager.VerifyAsync(Constants.VERIFY_LOGIN, loader.GetString("VerifyLoginDisplayReason")))
-                //{
-                //    if (onError != null)
-                //        await onError(null);
-                //    return;
-                //}
+                if (App.RoamingSettings.Read(Constants.VERIFY_LOGIN, false))
+                {
+                    if (background || !(await WindowsHelloManager.VerifyAsync(Constants.VERIFY_LOGIN, "VerifyLoginDisplayReason")))
+                    {
+                        if (onError != null)
+                            await onError(null);
+                        return;
+                    }
+                }
 
                 try
                 {
@@ -136,7 +135,7 @@ Task ClientErrored(DiscordClient sender, ClientErrorEventArgs e)
                     DiscordClientMessenger.Register(Discord);
 
                     await Discord.ConnectAsync(status: status,
-                        idlesince: AnalyticsInfo.VersionInfo.DeviceFamily == "Windows.Desktop" ? null : DateTimeOffset.Now);
+                        idlesince: SystemPlatform.Desktop ? null : DateTimeOffset.Now);
                 }
                 catch (Exception ex)
                 {
@@ -200,6 +199,7 @@ internal static async Task LogoutAsync()
                 Logger.LogError(ex);
             }
         }
+
         internal static bool TryGetToken(out string token)
         {
             try
diff --git a/Unicord.Universal/Services/Platform.cs b/Unicord.Universal/Services/Platform.cs
new file mode 100644
index 00000000..6c6311fc
--- /dev/null
+++ b/Unicord.Universal/Services/Platform.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Windows.System.Profile;
+
+namespace Unicord.Universal.Services
+{
+    /// <summary>
+    /// This class contains helper methods for determining the current platform.
+    /// It should only be used for specific behavioural changes that depend on the current device form-factor,
+    /// e.g. to mark the user as idle on mobile to ensure they get push notifications to other platforms
+    /// </summary>
+    internal static class SystemPlatform
+    {
+        private static string _platform;
+        static SystemPlatform()
+        {
+            _platform = AnalyticsInfo.VersionInfo.DeviceFamily;
+        }
+
+        public static bool Desktop
+            => _platform == "Windows.Desktop";
+        public static bool Mobile
+            => _platform == "Windows.Mobile";
+        public static bool Xbox
+            => _platform == "Windows.Xbox";
+    }
+}
diff --git a/Unicord.Universal/Themes/Controls/Channels.xaml b/Unicord.Universal/Themes/Controls/Channels.xaml
index 73ff3af2..1b6ac495 100644
--- a/Unicord.Universal/Themes/Controls/Channels.xaml
+++ b/Unicord.Universal/Themes/Controls/Channels.xaml
@@ -1,4 +1,5 @@
 <ResourceDictionary
+    x:Class="Unicord.Universal.Resources.Controls.Channels"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:Unicord.Universal.Controls.Channels" 
@@ -6,8 +7,9 @@
     xmlns:lib="using:Microsoft.UI.Xaml.Controls" 
     xmlns:users="using:Unicord.Universal.Controls.Users"
     xmlns:presence="using:Unicord.Universal.Controls.Presence"
-    xmlns:emoji="using:Unicord.Universal.Controls.Emoji">
-
+    xmlns:emoji="using:Unicord.Universal.Controls.Emoji" 
+    xmlns:channels="using:Unicord.Universal.Models.Channels" 
+    xmlns:converters="using:Unicord.Universal.Converters">
 
     <Style TargetType="local:ChannelIconControl" >
         <Setter Property="Template">
@@ -39,183 +41,220 @@
         </Setter>
     </Style>
 
-    <Style x:Key="GroupChannelListStyle" TargetType="local:ChannelListControl">
+    <DataTemplate x:Name="GroupChannelListContentTemplate" x:DataType="channels:DmChannelListViewModel">
+        <Grid ContextFlyout="{StaticResource ChannelContextFlyout}"
+              VerticalAlignment="Stretch" 
+              Background="Transparent" 
+              Padding="0,8">
+            <Grid Margin="0,0,8,0" Opacity="{x:Bind MutedOpacity}">
+                <ToolTipService.ToolTip>
+                    <ToolTip IsEnabled="{x:Bind HasTopic}">
+                        <controls:MarkdownTextBlock Text="{x:Bind Topic}" FontSize="{ThemeResource ToolTipContentThemeFontSize}" Channel="{x:Bind Channel}" />
+                    </ToolTip>
+                </ToolTipService.ToolTip>
+
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="auto"/>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="Auto" MinWidth="16"/>
+                </Grid.ColumnDefinitions>
+
+                <lib:PersonPicture x:Name="Avatar"
+                                   x:Phase="1"
+                                   x:Load="True" 
+                                   Margin="2,0,0,0" 
+                                   Width="32" 
+                                   Height="32" 
+                                   DisplayName="{x:Bind Name}">
+                    <lib:PersonPicture.ProfilePicture>
+                        <BitmapImage UriSource="{x:Bind IconUrl}" DecodePixelWidth="32" DecodePixelHeight="32" DecodePixelType="Logical"/>
+                    </lib:PersonPicture.ProfilePicture>
+                </lib:PersonPicture>
+
+                <TextBlock Text="{x:Bind Name}" Grid.Column="1" VerticalAlignment="Center" Margin="8,0" TextTrimming="CharacterEllipsis"/>
+
+                <lib:InfoBadge x:Name="unreadIndicator" 
+                               x:Load="{x:Bind ShouldShowNotificaitonIndicator, Mode=OneWay}"
+                               x:Phase="2"
+                               Grid.Column="2" 
+                               HorizontalAlignment="Center" 
+                               VerticalAlignment="Center"
+                               MinWidth="8"
+                               MinHeight="8"
+                               Margin="0"
+                               Value="{x:Bind NullableMentionCount.Value, Mode=OneWay}" />
+            </Grid>
+        </Grid>
+    </DataTemplate>
+    
+    <DataTemplate x:Name="DirectMessageChannelListContentTemplate" x:DataType="channels:DmChannelListViewModel">
+        <Grid ContextFlyout="{StaticResource ChannelContextFlyout}"
+              VerticalAlignment="Stretch" 
+              Background="Transparent" 
+              Padding="0,8">
+            <Grid Margin="0,0,8,0" Opacity="{x:Bind MutedOpacity}">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="auto"/>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="Auto" MinWidth="16"/>
+                </Grid.ColumnDefinitions>
+
+                <users:AvatarControl x:Name="Avatar"
+                                  x:Phase="1"
+                                  x:Load="True"
+                                  Margin="2,0,0,0"
+                                  Style="{ThemeResource SmallAvatarWithPresenceStyle}" 
+                                  Width="32" 
+                                  Height="32"
+                                  Source="{x:Bind IconUrl}" 
+                                  Presence="{x:Bind Recipient.Presence}" />
+
+                <StackPanel Grid.Column="1" VerticalAlignment="Center" Margin="8,0">
+                    <TextBlock Text="{Binding Name}" TextTrimming="CharacterEllipsis"/>
+                    <presence:InlinePresenceControl x:Name="InlinePresence" x:Load="{x:Bind converters:Static.NotNull(Recipient.Presence)}" x:Phase="3" Presence="{Binding Recipient.Presence, Mode=OneWay}" />
+                </StackPanel>
+
+                <lib:InfoBadge x:Name="unreadIndicator" 
+                            x:Load="{x:Bind ShouldShowNotificaitonIndicator, Mode=OneWay}"
+                            x:Phase="3"
+                            Grid.Column="2" 
+                            HorizontalAlignment="Center" 
+                            VerticalAlignment="Center"
+                            MinWidth="8"
+                            MinHeight="8"
+                            Margin="0"
+                            Value="{x:Bind NullableMentionCount.Value, Mode=OneWay}" />
+            </Grid>
+        </Grid>
+    </DataTemplate>
+
+    <DataTemplate x:Key="ThreadChannelListContentTemplate" x:DataType="channels:ChannelListViewModel">
+        <Grid ContextFlyout="{StaticResource ChannelContextFlyout}"
+              VerticalAlignment="Stretch" 
+              Background="Transparent" 
+              Padding="0,4">
+            <Grid Margin="4,0,16,0" Opacity="{x:Bind MutedOpacity}">
+                <ToolTipService.ToolTip>
+                    <ToolTip IsEnabled="{x:Bind HasTopic}">
+                        <controls:MarkdownTextBlock Text="{x:Bind Topic}" FontSize="{ThemeResource ToolTipContentThemeFontSize}" Channel="{x:Bind Channel}" />
+                    </ToolTip>
+                </ToolTipService.ToolTip>
+
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="auto"/>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="Auto" MinWidth="16"/>
+                </Grid.ColumnDefinitions>
+
+                <TextBlock x:Name="Icon"
+                           FontSize="16"
+                           RenderTransformOrigin="0.5,0.5"
+                           VerticalAlignment="Center" 
+                           Margin="16,0,4,0" 
+                           FontFamily="{StaticResource FluentSystemIcons}"
+                           Text="&#xF176;">
+                    <TextBlock.RenderTransform>
+                        <RotateTransform Angle="180"/>
+                    </TextBlock.RenderTransform>
+                </TextBlock>
+
+                <TextBlock Text="{x:Bind Name}"
+                           Grid.Column="1" 
+                           VerticalAlignment="Center" 
+                           HorizontalAlignment="Stretch" 
+                           TextWrapping="NoWrap" 
+                           Margin="0,0,4,0" />
+
+                <lib:InfoBadge x:Name="unreadIndicator" 
+                               x:Load="{x:Bind ShouldShowNotificaitonIndicator, Mode=OneWay}"
+                               Grid.Column="2" 
+                               HorizontalAlignment="Center" 
+                               VerticalAlignment="Center"
+                               MinWidth="8"
+                               MinHeight="8"
+                               Margin="0"
+                               Value="{x:Bind NullableMentionCount.Value, Mode=OneWay}" />
+            </Grid>
+        </Grid>
+    </DataTemplate>
+
+    <DataTemplate x:Key="ChannelListContentTemplate" x:DataType="channels:ChannelListViewModel">
+        <Grid ContextFlyout="{StaticResource ChannelContextFlyout}"
+              VerticalAlignment="Stretch" 
+              Background="Transparent" 
+              Padding="0,8">
+            <Grid Margin="0,0,16,0" Opacity="{x:Bind MutedOpacity}">
+                <ToolTipService.ToolTip>
+                    <ToolTip IsEnabled="{x:Bind HasTopic}">
+                        <controls:MarkdownTextBlock Text="{x:Bind Topic}" FontSize="{ThemeResource ToolTipContentThemeFontSize}" Channel="{x:Bind Channel}" />
+                    </ToolTip>
+                </ToolTipService.ToolTip>
+
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="auto"/>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="Auto" MinWidth="16"/>
+                </Grid.ColumnDefinitions>
+
+                <TextBlock x:Name="Icon"
+                           FontSize="16"
+                           VerticalAlignment="Center" 
+                           Margin="16,0,8,0"
+                           FontFamily="{StaticResource FluentSystemIcons}" 
+                           Text="{Binding Converter={StaticResource ChannelSymbolConverter}}"/>
+
+                <TextBlock Text="{x:Bind Name}" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Stretch" TextWrapping="NoWrap" Margin="0,0,4,0" />
+
+                <lib:InfoBadge x:Name="unreadIndicator" 
+                               x:Load="{x:Bind ShouldShowNotificaitonIndicator, Mode=OneWay}"
+                               x:Phase="3"
+                               Grid.Column="2" 
+                               HorizontalAlignment="Center" 
+                               VerticalAlignment="Center"
+                               MinWidth="8"
+                               MinHeight="8"
+                               Margin="0"
+                               Value="{x:Bind NullableMentionCount.Value, Mode=OneWay}" />
+            </Grid>
+        </Grid>
+    </DataTemplate>
+
+    <Style TargetType="local:ChannelListControl">
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="local:ChannelListControl">
-                    <Grid DataContext="{TemplateBinding Channel}"
-                          ContextFlyout="{StaticResource ChannelContextFlyout}"
-                          VerticalAlignment="Stretch" 
-                          Background="Transparent" 
-                          Padding="0,8">
-                        <Grid Margin="0,0,8,0" Opacity="{Binding MutedOpacity}">
-                            <ToolTipService.ToolTip>
-                                <ToolTip IsEnabled="{Binding HasTopic}">
-                                    <controls:MarkdownTextBlock Text="{Binding Topic}" FontSize="{ThemeResource ToolTipContentThemeFontSize}" Channel="{Binding Channel}" />
-                                </ToolTip>
-                            </ToolTipService.ToolTip>
-
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="auto"/>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="Auto" MinWidth="16"/>
-                            </Grid.ColumnDefinitions>
-                            
-                            <lib:PersonPicture Margin="2,0,0,0" 
-                                               Width="32" 
-                                               Height="32" 
-                                               DisplayName="{Binding Name}"
-                                               ProfilePicture="{Binding IconUrl}"/>
-
-                            <StackPanel Grid.Column="1" VerticalAlignment="Center" Margin="8,0">
-                                <TextBlock Text="{Binding Name}" TextTrimming="CharacterEllipsis"/>
-                            </StackPanel>
-
-                            <lib:InfoBadge x:Name="unreadIndicator" 
-                                   Visibility="{Binding ShouldShowNotificaitonIndicator, Mode=OneWay, Converter={StaticResource BoolVisibilityConverter}}"
-                                   Grid.Column="2" 
-                                   HorizontalAlignment="Center" 
-                                   VerticalAlignment="Center"
-                                   MinWidth="8"
-                                   MinHeight="8"
-                                   Margin="0"
-                                   Value="{Binding NullableMentionCount, Mode=OneWay}" />
-                        </Grid>
-                    </Grid>
+                    <ContentControl Content="{TemplateBinding Channel}" ContentTemplate="{StaticResource ChannelListContentTemplate}"/>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style x:Key="DirectMessageChannelListStyle" TargetType="local:ChannelListControl">
+
+    <Style x:Key="GroupChannelListStyle" TargetType="local:ChannelListControl">
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="local:ChannelListControl">
-                    <Grid DataContext="{TemplateBinding Channel}"
-                          ContextFlyout="{StaticResource ChannelContextFlyout}"
-                          VerticalAlignment="Stretch" 
-                          Background="Transparent" 
-                          Padding="0,8">
-                        <Grid Margin="0,0,8,0" Opacity="{Binding MutedOpacity}">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="auto"/>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="Auto" MinWidth="16"/>
-                            </Grid.ColumnDefinitions>
-
-                            <users:AvatarControl Margin="2,0,0,0"
-                                 Style="{ThemeResource SmallAvatarWithPresenceStyle}" 
-                                 Width="32" 
-                                 Height="32"
-                                 Source="{Binding IconUrl}" 
-                                 Presence="{Binding Recipient.Presence}" />
-
-                            <StackPanel Grid.Column="1" VerticalAlignment="Center" Margin="8,0">
-                                <TextBlock Text="{Binding Name}" TextTrimming="CharacterEllipsis"/>
-                                <presence:InlinePresenceControl Presence="{Binding Recipient.Presence, Mode=OneWay}" />
-                            </StackPanel>
-
-                            <lib:InfoBadge x:Name="unreadIndicator" 
-                                   Visibility="{Binding ShouldShowNotificaitonIndicator, Mode=OneWay, Converter={StaticResource BoolVisibilityConverter}}"
-                                   Grid.Column="2" 
-                                   HorizontalAlignment="Center" 
-                                   VerticalAlignment="Center"
-                                   MinWidth="8"
-                                   MinHeight="8"
-                                   Margin="0"
-                                   Value="{Binding NullableMentionCount, Mode=OneWay}" />
-                        </Grid>
-                    </Grid>
+                    <ContentControl Content="{TemplateBinding Channel}" ContentTemplate="{StaticResource GroupChannelListContentTemplate}"/>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style x:Key="ThreadChannelListStyle" TargetType="local:ChannelListControl">
+    <Style x:Key="DirectMessageChannelListStyle" TargetType="local:ChannelListControl">
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="local:ChannelListControl">
-                    <Grid DataContext="{TemplateBinding Channel}"
-                        ContextFlyout="{StaticResource ChannelContextFlyout}"
-                        VerticalAlignment="Stretch" 
-                        Background="Transparent" 
-                        Padding="0,4">
-                        <Grid Margin="4,0,16,0" Opacity="{Binding MutedOpacity}">
-                            <ToolTipService.ToolTip>
-                                <ToolTip IsEnabled="{Binding HasTopic}">
-                                    <controls:MarkdownTextBlock Text="{Binding Topic}" FontSize="{ThemeResource ToolTipContentThemeFontSize}" Channel="{Binding Channel}" />
-                                </ToolTip>
-                            </ToolTipService.ToolTip>
-
-
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="auto"/>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="Auto" MinWidth="16"/>
-                            </Grid.ColumnDefinitions>
-
-                            <TextBlock FontSize="16" RenderTransformOrigin="0.5,0.5" VerticalAlignment="Center" Margin="16,0,4,0" FontFamily="{StaticResource FluentSystemIcons}" Text="&#xF176;">
-                                <TextBlock.RenderTransform>
-                                    <RotateTransform Angle="180"/>
-                                </TextBlock.RenderTransform>
-                            </TextBlock>
-
-                            <TextBlock Text="{Binding Name}" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Stretch" TextWrapping="NoWrap" Margin="0,0,4,0" />
-
-                            <lib:InfoBadge x:Name="unreadIndicator" 
-                                 Visibility="{Binding ShouldShowNotificaitonIndicator, Mode=OneWay, Converter={StaticResource BoolVisibilityConverter}}"
-                                 Grid.Column="2" 
-                                 HorizontalAlignment="Center" 
-                                 VerticalAlignment="Center"
-                                 MinWidth="8"
-                                 MinHeight="8"
-                                 Margin="0"
-                                 Value="{Binding NullableMentionCount, Mode=OneWay}" />
-                        </Grid>
-                    </Grid>
+                    <ContentControl Content="{TemplateBinding Channel}" ContentTemplate="{StaticResource DirectMessageChannelListContentTemplate}"/>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style TargetType="local:ChannelListControl">
+    <Style x:Key="ThreadChannelListStyle" TargetType="local:ChannelListControl">
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="local:ChannelListControl">
-                    <Grid DataContext="{TemplateBinding Channel}"
-                          ContextFlyout="{StaticResource ChannelContextFlyout}"
-                          VerticalAlignment="Stretch" 
-                          Background="Transparent" 
-                          Padding="0,8">
-                        <Grid Margin="0,0,16,0" Opacity="{Binding MutedOpacity}">
-                            <ToolTipService.ToolTip>
-                                <ToolTip IsEnabled="{Binding HasTopic}">
-                                    <controls:MarkdownTextBlock Text="{Binding Topic}" FontSize="{ThemeResource ToolTipContentThemeFontSize}" Channel="{Binding Channel}" />
-                                </ToolTip>
-                            </ToolTipService.ToolTip>
-
-
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="auto"/>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="Auto" MinWidth="16"/>
-                            </Grid.ColumnDefinitions>
-
-                            <TextBlock FontSize="16" VerticalAlignment="Center" Margin="16,0,8,0" FontFamily="{StaticResource FluentSystemIcons}" Text="{Binding Converter={StaticResource ChannelSymbolConverter}}"/>
-                            
-                            <TextBlock Text="{Binding Name}" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Stretch" TextWrapping="NoWrap" Margin="0,0,4,0" />
-
-                            <lib:InfoBadge x:Name="unreadIndicator" 
-                                   Visibility="{Binding ShouldShowNotificaitonIndicator, Mode=OneWay, Converter={StaticResource BoolVisibilityConverter}}"
-                                   Grid.Column="2" 
-                                   HorizontalAlignment="Center" 
-                                   VerticalAlignment="Center"
-                                   MinWidth="8"
-                                   MinHeight="8"
-                                   Margin="0"
-                                   Value="{Binding NullableMentionCount, Mode=OneWay}" />
-                        </Grid>
-                    </Grid>
+                    <ContentControl Content="{TemplateBinding Channel}" ContentTemplate="{StaticResource ThreadChannelListContentTemplate}"/>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
diff --git a/Unicord.Universal/Themes/Controls/Channels.xaml.cs b/Unicord.Universal/Themes/Controls/Channels.xaml.cs
new file mode 100644
index 00000000..d430d3b9
--- /dev/null
+++ b/Unicord.Universal/Themes/Controls/Channels.xaml.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Unicord.Universal.Resources.Controls
+{
+    public partial class Channels
+    {
+        public Channels()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Unicord.Universal/Themes/Controls/Messages.xaml b/Unicord.Universal/Themes/Controls/Messages.xaml
index da1b17cb..1dc5b9c6 100644
--- a/Unicord.Universal/Themes/Controls/Messages.xaml
+++ b/Unicord.Universal/Themes/Controls/Messages.xaml
@@ -12,6 +12,7 @@
     xmlns:media="using:Microsoft.Toolkit.Uwp.UI.Media" 
     xmlns:messages="using:Unicord.Universal.Models.Messages" 
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls" 
+    xmlns:extensions="using:Unicord.Universal.Extensions"
     xmlns:w1809="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract, 7)" xmlns:components="using:Unicord.Universal.Models.Messages.Components"
     x:DefaultBindMode="OneWay">
 
@@ -31,10 +32,10 @@
     <media:BackdropBlurBrush x:Key="SpoilerBrush" Amount="64" />
 
     <Style TargetType="local:AttachmentControl">
-        <Setter Property="Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}"/>
-        <Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}"/>
+        <Setter Property="Background" Value="{ThemeResource Attachment_Background}"/>
+        <Setter Property="BorderBrush" Value="{ThemeResource Attachment_BorderBrush}"/>
         <Setter Property="Margin" Value="0,4,0,0"/>
-        <Setter Property="BorderThickness" Value="1,1,1,1"/>
+        <Setter Property="BorderThickness" Value="{ThemeResource Attachment_BorderThickness}"/>
         <Setter Property="HorizontalAlignment" Value="Left"/>
         <Setter Property="HorizontalContentAlignment" Value="Left"/>
         <Setter Property="Template">
@@ -44,7 +45,7 @@
                         <Border Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{ThemeResource ControlCornerRadius}">
+                                CornerRadius="{ThemeResource Attachment_CornerRadius}">
 
                             <ContentControl ContentTemplateSelector="{StaticResource AttachmentTemplateSelector}"
                                         Content="{TemplateBinding ViewModel}"
@@ -251,7 +252,7 @@
                         </Grid>
 
                         <Border x:Name="MediaPlayerBorder" Grid.Row="1">
-                            <MediaPlayerElement x:Name="MediaPlayer" MaxHeight="46" Source="{Binding Source}" PosterSource="{Binding PosterSource}" AreTransportControlsEnabled="True">
+                            <MediaPlayerElement x:Name="MediaPlayer" MaxHeight="52" Source="{Binding Source}" PosterSource="{Binding PosterSource}" AreTransportControlsEnabled="True">
                                 <MediaPlayerElement.TransportControls>
                                     <controls:CustomMediaTransportControls Style="{StaticResource AudioMediaTransportControlsStyle}"/>
                                 </MediaPlayerElement.TransportControls>
@@ -420,8 +421,169 @@
         </ToggleButton>
     </DataTemplate>
 
-    <DataTemplate x:Key="RichEmbedTemplate">
-        <local:EmbedControl ViewModel="{Binding}"/>
+    <DataTemplate x:Key="RichEmbedTemplate" x:DataType="messages:EmbedViewModel">
+        <Border BorderBrush="{ThemeResource RichEmbed_BorderBrush}"
+                Background="{ThemeResource RichEmbed_Background}"
+                BorderThickness="{ThemeResource RichEmbed_BorderThickness}"
+                CornerRadius="{ThemeResource RichEmbed_CornerRadius}"
+                MaxWidth="480"
+                Margin="0,4,0,0">
+            <Grid>
+                <Border Background="{x:Bind Color}" 
+                        CornerRadius="{ThemeResource RichEmbed_Inner_CornerRadius}">
+                    <Border.Clip>
+                        <RectangleGeometry Rect="0,0,4,1000" />
+                    </Border.Clip>
+                </Border>
+                <Grid Padding="{ThemeResource RichEmbed_InnerPadding}">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="*"/>
+                            <RowDefinition Height="Auto"/>
+                        </Grid.RowDefinitions>
+                        <StackPanel>
+                            <Grid x:Name="ProviderGrid"
+                                  x:Load="{x:Bind HasProvider}"
+                                  x:Phase="2"
+                                  Margin="0,0,0,4">
+                                <TextBlock VerticalAlignment="Center" FontSize="12">
+                                    <Hyperlink NavigateUri="{x:Bind ProviderUrl, Mode=OneWay}" UnderlineStyle="None">
+                                        <Run Text="{x:Bind ProviderName, Mode=OneWay}"/>
+                                    </Hyperlink>
+                                </TextBlock>
+                            </Grid>
+
+                            <Grid x:Name="AuthorGrid"
+                                  x:Load="{x:Bind HasAuthor}"
+                                  x:Phase="1"
+                                  Margin="0,0,0,4">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+
+                                <Ellipse x:Name="AuthorIcon" 
+                                         x:Load="{x:Bind Author.HasIconUrl}"
+                                         Width="20"
+                                         Height="20"
+                                         Margin="0,0,8,0">
+                                    <Ellipse.Fill>
+                                        <ImageBrush>
+                                            <ImageBrush.ImageSource>
+                                                <BitmapImage DecodePixelHeight="20"
+                                                             DecodePixelWidth="20"
+                                                             DecodePixelType="Logical"
+                                                             UriSource="{x:Bind Author.IconUrl}" />
+                                            </ImageBrush.ImageSource>
+                                        </ImageBrush>
+                                    </Ellipse.Fill>
+                                </Ellipse>
+                                <TextBlock Grid.Column="1" VerticalAlignment="Center" FontWeight="Bold" Text="{x:Bind Author.Name}"/>
+                            </Grid>
+
+                            <controls:MarkdownTextBlock x:Name="TitleText"
+                                                        x:Load="{x:Bind HasTitle}"
+                                                        x:Phase="0"
+                                                        Channel="{x:Bind Channel}"
+                                                        FontWeight="Bold"
+                                                        TextWrapping="WrapWholeWords"
+                                                        InlineOnly="True"
+                                                        Text="{x:Bind Title}" />
+
+                            <controls:MarkdownTextBlock x:Name="DescriptionText"
+                                                        x:Load="{x:Bind HasDescription}"
+                                                        x:Phase="0"
+                                                        Channel="{x:Bind Channel}"
+                                                        Margin="0,4,0,0"
+                                                        TextWrapping="WrapWholeWords"
+                                                        InlineOnly="False"
+                                                        Text="{x:Bind Description}"/>
+                        </StackPanel>
+
+                        <local:EmbedFieldsView x:Name="FieldsList"
+                                               x:Load="{x:Bind HasFields}"
+                                               x:Phase="3"
+                                               Grid.Row="1"
+                                               ItemsSource="{x:Bind Fields}"
+                                               HorizontalAlignment="Stretch"
+                                               HorizontalContentAlignment="Stretch">
+                            <ItemsControl.ItemsPanel>
+                                <ItemsPanelTemplate>
+                                    <controls:UniformGrid Columns="3" HorizontalAlignment="Stretch"  />
+                                </ItemsPanelTemplate>
+                            </ItemsControl.ItemsPanel>
+                            <ItemsControl.ItemTemplate>
+                                <DataTemplate x:DataType="messages:EmbedFieldViewModel">
+                                    <StackPanel Margin="0,0,4,2">
+                                        <controls:MarkdownTextBlock x:Name="EmbedFieldTitle" Channel="{x:Bind Channel}" Text="{x:Bind Title}" FontWeight="Bold"/>
+                                        <controls:MarkdownTextBlock x:Name="EmbedFieldContent" Channel="{x:Bind Channel}" Grid.Row="1" Text="{x:Bind Text}" />
+                                    </StackPanel>
+                                </DataTemplate>
+                            </ItemsControl.ItemTemplate>
+                        </local:EmbedFieldsView>
+
+                        <local:ImageEmbedControl x:Name="PART_LargeThumbnail"
+                                                 x:Load="{x:Bind HasLargeThumbnail, Mode=OneWay}"
+                                                 x:Phase="1"
+                                                 Grid.Row="2"
+                                                 Margin="0,8,0,0"
+                                                 ViewModel="{x:Bind Thumbnail, Mode=OneWay}"/>
+                        
+                        <local:VideoEmbedControl x:Name="EmbedVideo"
+                                                 x:Load="{x:Bind HasVideo, Mode=OneWay}"
+                                                 x:Phase="1"
+                                                 Grid.Row="2"
+                                                 Margin="0,8,0,0"
+                                                 ViewModel="{x:Bind Video, Mode=OneWay}"/>
+
+                        <Grid x:Name="FooterGrid"
+                              x:Load="{x:Bind HasFooter}"
+                              x:Phase="4"
+                              Grid.Row="3"
+                              Margin="0,4,0,0">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+
+                            <Rectangle x:Name="FooterIcon"
+                                       x:Load="{x:Bind Footer.HasIconUrl}"
+                                       Width="20" Height="20"
+                                       RadiusX="2" RadiusY="2"
+                                       Margin="0,0,12,0">
+                                <Rectangle.Fill>
+                                    <ImageBrush>
+                                        <ImageBrush.ImageSource>
+                                            <BitmapImage DecodePixelHeight="20"
+                                                      DecodePixelWidth="20"
+                                                      UriSource="{x:Bind Footer.IconUrl}" />
+                                        </ImageBrush.ImageSource>
+                                    </ImageBrush>
+                                </Rectangle.Fill>
+                            </Rectangle>
+                            <TextBlock Grid.Column="1" FontSize="12pt" TextWrapping="Wrap" VerticalAlignment="Center" Text="{x:Bind Footer.Text}"/>
+                        </Grid>
+                    </Grid>
+
+                    <Grid Grid.Column="1">
+                        <local:ImageEmbedControl x:Name="PART_Thumbnail"
+                                                 x:Load="{x:Bind HasSmallThumbnail, Mode=OneWay}"
+                                                 x:Phase="1"
+                                                 Width="96"
+                                                 MaxHeight="96"
+                                                 Margin="12,0,0,0"
+                                                 VerticalAlignment="Top"
+                                                 ViewModel="{x:Bind Thumbnail, Mode=OneWay}" />
+                    </Grid>
+                </Grid>
+            </Grid>
+        </Border>
     </DataTemplate>
 
     <DataTemplate x:Key="ImageEmbedTemplate" x:DataType="messages:EmbedViewModel">
@@ -463,7 +625,7 @@
     <DataTemplate x:Key="ButtonComponentContentTemplate"
                   x:DataType="components:ButtonComponentViewModel">
         <StackPanel Orientation="Horizontal">
-            <!--<emoji:EmojiControl x:Name="PART_ButtonEmoji" x:Load="{x:Bind Emoji.IsValid}" Emoji="{x:Bind Emoji}" Size="20" />
+            <emoji:EmojiControl x:Name="PART_ButtonEmoji" x:Load="{x:Bind Emoji.IsValid}" Emoji="{x:Bind Emoji}" Size="20" />
 
             <TextBlock x:Name="PART_ButtonLabel" x:Load="{x:Bind HasLabel}" VerticalAlignment="Center" Text="{x:Bind Label}" Padding="12,0"/>
 
@@ -471,7 +633,7 @@
                        x:Load="{x:Bind ShowExternalLinkIcon}"
                        FontFamily="{ThemeResource SymbolThemeFontFamily}"
                        FontSize="16" 
-                       VerticalAlignment="Center">&#xE8A7;</TextBlock>-->
+                       VerticalAlignment="Center">&#xE8A7;</TextBlock>
         </StackPanel>
     </DataTemplate>
 
@@ -564,536 +726,300 @@
         </Setter>
     </Style>
 
+    <DataTemplate x:Key="MessageEditControlsTemplate" x:DataType="messages:MessageEditViewModel">
+        <Grid x:Name="EditTools"
+           Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+           BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+           BorderThickness="1"
+           CornerRadius="4"
+           Padding="4"
+           Margin="0,4,0,0">
+
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1*" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+            
+            <TextBox x:Name="MessageEditBox"
+                  extensions:FocusExtensions.IsFocused="{x:Bind IsFocused}"
+                  extensions:ShiftEnterExtensions.IsEnabled="True"
+                  extensions:ShiftEnterExtensions.EnterCommand="{x:Bind CommitCommand}"
+                  extensions:ShiftEnterExtensions.ShiftEnterCommand="{x:Bind InsertNewLineCommand}"
+                  extensions:ShiftEnterExtensions.EscapeCommand="{x:Bind DiscardCommand}"
+                  MaxHeight="100"
+                  AcceptsReturn="False"
+                  Style="{ThemeResource MessageTextBoxStyle}"
+                  Text="{x:Bind Content, Mode=TwoWay}"
+                  SelectionStart="{x:Bind SelectionStart, Mode=OneTime}"
+                  TextWrapping="Wrap" />
+
+            <Button x:Name="MessageEditFinishButton"
+                 Grid.Column="1"
+                 Content="&#xe8fb;"
+                 Margin="4,0,0,0"
+                 Style="{ThemeResource IconButtonStyle}"
+                 Command="{x:Bind CommitCommand}"/>
+
+            <Button x:Name="MessageEditCancelButton"       
+                 Grid.Column="2"
+                 Content="&#xe8bb;"                                            
+                 Margin="4,0,0,0"
+                 Style="{ThemeResource IconButtonStyle}"
+                 Command="{x:Bind DiscardCommand}"/>
+        </Grid>
+    </DataTemplate>
+
     <Style TargetType="local:MessageEditTools">
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="local:MessageEditTools">
-                    <Grid x:Name="EditTools"
-                          Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-                          BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-                          BorderThickness="1"
-                          CornerRadius="4"
-                          Padding="4"
-                          Margin="0,4,0,0">
-
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="1*" />
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-
-                        <!-- Note to Theme Developers: -->
-                        <!-- It's important to keep these tools setup about the same as they are here in order to add -->
-                        <!-- event handlers and such. -->
-
-                        <TextBox x:Name="MessageEditBox"
-                                 MaxHeight="100"
-                                 AcceptsReturn="False"
-                                 Style="{ThemeResource MessageTextBoxStyle}"
-                                 Text="{Binding Content, Mode=OneWay}"
-                                 TextWrapping="Wrap" />
-
-                        <Button x:Name="MessageEditFinishButton"
-                                Grid.Column="1"
-                                Content="&#xe8fb;"
-                                Margin="4,0,0,0"
-                                Style="{ThemeResource IconButtonStyle}"/>
-
-                        <Button x:Name="MessageEditCancelButton"
-                                Grid.Column="2"
-                                Content="&#xe8bb;"
-                                Margin="4,0,0,0"
-                                Style="{ThemeResource IconButtonStyle}"/>
-                    </Grid>
+                    <ContentPresenter Content="{TemplateBinding ViewModel}"
+                                      ContentTemplate="{StaticResource MessageEditControlsTemplate}"
+                                      HorizontalAlignment="Stretch"
+                                      HorizontalContentAlignment="Stretch"/>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
     <SolidColorBrush x:Key="MentionedMessageBackgroundBrush" Color="{ThemeResource SystemAccentColor}" Opacity="0.16666"/>
-    <!--<LinearGradientBrush x:Key="MentionedMessageBackgroundBrush">
-        <GradientStop Color="#600078d7"/>
-        <GradientStop Color="#00000000" Offset="0.75"/>
-    </LinearGradientBrush>-->
-
-    <Style TargetType="local:MessageControl">
-        <!--<Setter Property="BorderBrush" Value="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}"/>-->
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="local:MessageControl">
-                    <Border x:Name="MainBorder"
-                            ContextFlyout="{StaticResource MessageContextFlyout}"
-                            Padding="{TemplateBinding Padding}"
-                            Background="Transparent"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="4,0,0,0">
-
-                        <!--<Border.ContextFlyout>
-                            <flyouts:MessageContextFlyout />
-                        </Border.ContextFlyout>-->
-
-                        <Grid>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="Auto"/>
-                            </Grid.RowDefinitions>
-
-                            <Grid Margin="56,-8,0,4" Visibility="{Binding ReferencedMessage, Converter={StaticResource HideOnNullConverter}, FallbackValue=Collapsed}">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto"/>
-                                    <ColumnDefinition Width="Auto"/>
-                                    <ColumnDefinition Width="Auto"/>
-                                    <ColumnDefinition Width="Auto"/>
-                                </Grid.ColumnDefinitions>
-
-                                <TextBlock Text="&#xE97A;" Margin="0,0,4,0" VerticalAlignment="Center" FontFamily="{StaticResource SymbolThemeFontFamily}" Foreground="{ThemeResource SystemControlForegroundAccentBrush}"/>
-
-                                <Ellipse x:Name="ReplyAvatarContainer"
-                                         Width="16"
-                                         Height="16"
-                                         Margin="0,0,4,0"
-                                         Grid.Column="1">
-                                    <Ellipse.Fill>
-                                        <ImageBrush>
-                                            <ImageBrush.ImageSource>
-                                                <BitmapImage DecodePixelWidth="16"
-                                                         DecodePixelHeight="16"
-                                                         DecodePixelType="Logical" 
-                                                         UriSource="{Binding ReferencedMessage.Author.AvatarUrl}" />
-                                            </ImageBrush.ImageSource>
-                                        </ImageBrush>
-                                    </Ellipse.Fill>
-                                </Ellipse>
-
-                                <controls:UsernameControl Grid.Column="2" FontWeight="Bold" User="{Binding ReferencedMessage.Author}" FontSize="12" IconSize="12"/>
-
-                                <controls:MarkdownTextBlock x:Name="ReplyMarkdown"
-                                                       Grid.Column="3"
-                                                       FontSize="12"
-                                                       InlineOnly="True"
-                                                       Foreground="{ThemeResource ApplicationSecondaryForegroundThemeBrush}"
-                                                       Channel="{Binding Channel.Channel}"
-                                                       Text="{Binding ReferencedMessage.Content}" 
-                                                       IsTextSelectionEnabled="True"
-                                                       IsEnabled="False"
-                                                       VerticalAlignment="Center"
-                                                       Margin="6,0" />
-
-                            </Grid>
-
-                            <Grid Grid.Row="2">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="48"/>
-                                    <ColumnDefinition Width="*"/>
-                                </Grid.ColumnDefinitions>
-
-                                <Ellipse x:Name="ImageContainer"
-                                     Width="36"
-                                     Height="36"
-                                     VerticalAlignment="Top">
-                                    <Ellipse.Fill>
-                                        <ImageBrush x:Name="ProfileImageBrush">
-                                            <ImageBrush.ImageSource>
-                                                <BitmapImage DecodePixelWidth="36"
-                                                         DecodePixelHeight="36"
-                                                         DecodePixelType="Logical" 
-                                                         UriSource="{Binding Author.AvatarUrl}" />
-                                            </ImageBrush.ImageSource>
-                                        </ImageBrush>
-                                    </Ellipse.Fill>
-                                </Ellipse>
-
-                                <Grid x:Name="Content" Grid.Column="1" Margin="8,0,0,0">
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition Height="Auto"/>
-                                        <RowDefinition Height="Auto"/>
-                                        <RowDefinition Height="Auto"/>
-                                    </Grid.RowDefinitions>
-                                    <StackPanel x:Name="AuthorContainer" Orientation="Horizontal" Grid.Row="0">
-                                        <controls:UsernameControl FontWeight="Bold" User="{Binding Author}" FontSize="14" IconSize="14" />
-
-                                        <!--<StackPanel DataContext="{Binding ReferencedMessage}" Visibility="{Binding Converter={StaticResource HideOnNullConverter}, FallbackValue=Collapsed}" Orientation="Horizontal">
-                                            <TextBlock x:Uid="/Controls/ReplyingTo" Margin="4,0"/>
-                                            <controls:UsernameControl FontWeight="Bold" User="{Binding Author}" FontSize="14" IconSize="14"/>
-                                        </StackPanel>-->
-
-                                        <TextBlock Margin="8,1" 
-                                               FontSize="11"
-                                               VerticalAlignment="Bottom" 
-                                               Text="{Binding Timestamp, Converter={StaticResource DateTimeConverter}, Mode=OneWay}" 
-                                               Opacity="0.4"/>
-                                    </StackPanel>
-
-                                    <controls:MarkdownTextBlock x:Name="Markdown"
-                                                                Grid.Row="1"
-                                                           Channel="{Binding Channel.Channel}"
-                                                           Text="{Binding Content}" 
-                                                           AllowHugeEmoji="True"
-                                                           IsTextSelectionEnabled="True" 
-                                                           WrapCodeBlock="True" 
-                                                           Margin="0,0,2,0" />
-
-                                    <local:MessageEditTools x:Name="MessageEditTools" x:DeferLoadStrategy="Lazy" Grid.Row="1" Visibility="Collapsed"/>
-
-                                    <StackPanel x:Name="AdditionalContent"
-                                                Grid.Row="2">
-                                        <ItemsControl x:Name="Embeds"
-                                                      ItemTemplateSelector="{ThemeResource EmbedTemplateSelector}" 
-                                                      ItemsSource="{Binding Embeds}"
-                                                      HorizontalAlignment="Left"/>
-
-                                        <ItemsControl x:Name="Attachments"
-                                                      ItemTemplate="{ThemeResource DefaultAttachmentTemplate}" 
-                                                      ItemsSource="{Binding Attachments}"
-                                                      HorizontalAlignment="Left"/>
-
-                                        <ItemsControl x:Name="Stickers"
-                                                      ItemTemplate="{ThemeResource DefaultStickerTemplate}" 
-                                                      ItemsSource="{Binding Stickers}"
-                                                      HorizontalAlignment="Left"/>
-
-                                        <ItemsControl x:Name="Reactions"
-                                                      Margin="0,4,0,0"
-                                                      ItemTemplate="{ThemeResource DefaultReactionTemplate}" 
-                                                      ItemsSource="{Binding Reactions}">
-                                            <ItemsControl.ItemsPanel>
-                                                <ItemsPanelTemplate>
-                                                    <toolkit:WrapPanel Orientation="Horizontal" HorizontalSpacing="4" VerticalSpacing="4"/>
-                                                </ItemsPanelTemplate>
-                                            </ItemsControl.ItemsPanel>
-                                        </ItemsControl>
-                                        
-                                        <ItemsControl x:Name="Components"
-                                                      ItemTemplateSelector="{StaticResource ComponentTemplateSelector}" 
-                                                      ItemsSource="{Binding Components}"
-                                                      HorizontalAlignment="Left"/>
-                                    </StackPanel>
-                                </Grid>
-
-                            </Grid>
-                        </Grid>
-
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="Mentions">
-                                <VisualState x:Name="NoMention">
-                                    <VisualState.Setters>
-                                        <Setter Target="MainBorder.Background" Value="Transparent"/>
-                                        <Setter Target="MainBorder.BorderBrush" Value="Transparent"/>
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="Mention">
-                                    <VisualState.Setters>
-                                        <Setter Target="MainBorder.BorderBrush" Value="{ThemeResource SystemControlBackgroundAccentBrush}"/>
-                                        <Setter Target="MainBorder.Background" Value="{ThemeResource MentionedMessageBackgroundBrush}" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="Edit">
-                                <VisualState x:Name="NotEditing">
-                                    <VisualState.Setters>
-                                        <Setter Target="Markdown.Visibility" Value="Visible"/>
-                                        <Setter Target="MessageEditTools.Visibility" Value="Collapsed"/>
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="Editing">
-                                    <VisualState.Setters>
-                                        <Setter Target="Markdown.Visibility" Value="Collapsed"/>
-                                        <Setter Target="MessageEditTools.Visibility" Value="Visible"/>
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="Size">
-                                <VisualState x:Name="Normal">
-                                    <VisualState.Setters>
-                                        <Setter Target="Embeds.Visibility" Value="Visible"/>
-                                        <Setter Target="Attachments.Visibility" Value="Visible"/>
-                                        <Setter Target="ImageContainer.Visibility" Value="Visible"/>
-                                        <Setter Target="AuthorContainer.Visibility" Value="Visible"/>
-                                        <Setter Target="MainBorder.Padding" Value="8,8,16,0"/>
-                                        <Setter Target="MainBorder.Margin" Value="0,12,0,0"/>
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="Collapsed">
-                                    <VisualState.Setters>
-                                        <Setter Target="Embeds.Visibility" Value="Visible"/>
-                                        <Setter Target="Attachments.Visibility" Value="Visible"/>
-                                        <Setter Target="ImageContainer.Visibility" Value="Collapsed"/>
-                                        <Setter Target="AuthorContainer.Visibility" Value="Collapsed"/>
-                                        <Setter Target="MainBorder.Padding" Value="8,2,16,0"/>
-                                        <Setter Target="MainBorder.Margin" Value="0,0,0,0"/>
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="EditMode">
-                                    <VisualState.Setters>
-                                        <Setter Target="ImageContainer.Visibility" Value="Visible"/>
-                                        <Setter Target="AuthorContainer.Visibility" Value="Visible"/>
-                                        <Setter Target="Embeds.Visibility" Value="Collapsed"/>
-                                        <Setter Target="Attachments.Visibility" Value="Collapsed"/>
-                                        <Setter Target="MainBorder.Padding" Value="4,8,8,8"/>
-                                        <Setter Target="MainBorder.Margin" Value="0,0,0,0"/>
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="None">
-                                    <VisualState.Setters>
-                                        <Setter Target="ImageContainer.Visibility" Value="Visible"/>
-                                        <Setter Target="AuthorContainer.Visibility" Value="Visible"/>
-                                        <Setter Target="Embeds.Visibility" Value="Visible"/>
-                                        <Setter Target="Attachments.Visibility" Value="Visible"/>
-                                        <Setter Target="MainBorder.Padding" Value="0,0,0,0"/>
-                                        <Setter Target="MainBorder.Margin" Value="0,0,0,0"/>
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
 
+    <DataTemplate x:Key="MessageContentTemplate" x:DataType="messages:MessageViewModel">
+        <UserControl HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch"
+                     VerticalAlignment="Stretch" VerticalContentAlignment="Stretch">
+            <Grid x:Name="MainBorder"
+                     ContextFlyout="{StaticResource MessageContextFlyout}"
+                     Background="Transparent"
+                     BorderBrush="Transparent"
+                     BorderThickness="4,0,0,0">
+                <VisualStateManager.VisualStateGroups>
+                    <VisualStateGroup x:Name="Mentions">
+                        <VisualState x:Name="NoMention">
+                            <VisualState.StateTriggers>
+                                <StateTrigger x:Name="NoMentionStateTrigger" IsActive="{x:Bind converters:Static.Not(IsMention), Mode=OneWay}"/>
+                            </VisualState.StateTriggers>
+                            <VisualState.Setters>
+                                <Setter Target="MainBorder.Background" Value="Transparent"/>
+                                <Setter Target="MainBorder.BorderBrush" Value="Transparent"/>
+                            </VisualState.Setters>
+                        </VisualState>
+                        <VisualState x:Name="Mention">
+                            <VisualState.StateTriggers>
+                                <StateTrigger x:Name="MentionStateTrigger" IsActive="{x:Bind IsMention, Mode=OneWay}"/>
+                            </VisualState.StateTriggers>
+                            <VisualState.Setters>
+                                <Setter Target="MainBorder.BorderBrush" Value="{ThemeResource SystemControlBackgroundAccentBrush}"/>
+                                <Setter Target="MainBorder.Background" Value="{ThemeResource MentionedMessageBackgroundBrush}" />
+                            </VisualState.Setters>
+                        </VisualState>
+                    </VisualStateGroup>
+                    <VisualStateGroup x:Name="Size">
+                        <VisualState x:Name="DefaultState">
+                            <VisualState.StateTriggers>
+                                <StateTrigger x:Name="DefaultSizeTrigger" IsActive="{x:Bind converters:Static.Is(State, messages:MessageViewModelState.Default), Mode=OneWay}"/>
+                            </VisualState.StateTriggers>
+                            <VisualState.Setters>
+                                <Setter Target="MainBorder.Padding" Value="8,8,16,0"/>
+                                <Setter Target="MainBorder.Margin" Value="0,0,0,0"/>
+                            </VisualState.Setters>
+                        </VisualState>
+                        <VisualState x:Name="NormalState">
+                            <VisualState.StateTriggers>
+                                <StateTrigger x:Name="NormalSizeTrigger" IsActive="{x:Bind converters:Static.Is(State, messages:MessageViewModelState.Normal), Mode=OneWay}"/>
+                            </VisualState.StateTriggers>
+                            <VisualState.Setters>
+                                <Setter Target="MainBorder.Padding" Value="8,8,16,0"/>
+                                <Setter Target="MainBorder.Margin" Value="0,12,0,0"/>
+                            </VisualState.Setters>
+                        </VisualState>
+                        <VisualState x:Name="CollapsedState">
+                            <VisualState.StateTriggers>
+                                <StateTrigger x:Name="CollapsedSizeTrigger" IsActive="{x:Bind converters:Static.Is(State, messages:MessageViewModelState.Collapsed), Mode=OneWay}"/>
+                            </VisualState.StateTriggers>
+                            <VisualState.Setters>
+                                <Setter Target="MainBorder.Padding" Value="8,2,16,0"/>
+                                <Setter Target="MainBorder.Margin" Value="0,0,0,0"/>
+                            </VisualState.Setters>
+                        </VisualState>
+                        <VisualState x:Name="EditingState">
+                            <VisualState.StateTriggers>
+                                <StateTrigger x:Name="EditingSizeTrigger" IsActive="{x:Bind converters:Static.Is(State, messages:MessageViewModelState.Editing), Mode=OneWay}"/>
+                            </VisualState.StateTriggers>
+                            <VisualState.Setters>
+                                <Setter Target="MainBorder.Padding" Value="8,8,16,0"/>
+                                <Setter Target="MainBorder.Margin" Value="0,12,0,0"/>
+                            </VisualState.Setters>
+                        </VisualState>
+                    </VisualStateGroup>
+                </VisualStateManager.VisualStateGroups>
+
+                <Grid x:Name="RootGrid">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                    </Grid.RowDefinitions>                    
+
+                    <Grid x:Name="ReferencedMessageContainer"
+                          x:Load="{x:Bind converters:Static.NotNull(ReferencedMessage)}"
+                          x:Phase="5"
+                          Margin="56,-8,0,4" >
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
 
-    <Style x:Key="CompactWithAvatarsMessageControl" TargetType="local:MessageControl">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="local:MessageControl">
-                    <Border x:Name="MainBorder"
-                            Padding="{TemplateBinding Padding}"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="0,1,0,0">
+                        <TextBlock Text="&#xE97A;" Margin="0,0,4,0" VerticalAlignment="Center" FontFamily="{StaticResource SymbolThemeFontFamily}" Foreground="{ThemeResource SystemControlForegroundAccentBrush}"/>
+
+                        <Ellipse x:Name="ReplyAvatarContainer"
+                                        Width="16"
+                                        Height="16"
+                                        Margin="0,0,4,0"
+                                        Grid.Column="1">
+                            <Ellipse.Fill>
+                                <ImageBrush>
+                                    <ImageBrush.ImageSource>
+                                        <BitmapImage DecodePixelWidth="16"
+                                                     DecodePixelHeight="16"
+                                                     DecodePixelType="Logical" 
+                                                     UriSource="{x:Bind ReferencedMessage.Author.AvatarUrl}" />
+                                    </ImageBrush.ImageSource>
+                                </ImageBrush>
+                            </Ellipse.Fill>
+                        </Ellipse>
+
+                        <controls:UsernameControl Grid.Column="2" FontWeight="Bold" User="{x:Bind ReferencedMessage.Author}" FontSize="12" IconSize="12"/>
+
+                        <controls:MarkdownTextBlock x:Name="ReplyMarkdown"
+                                                Grid.Column="3"
+                                                FontSize="12"
+                                                InlineOnly="True"
+                                                Foreground="{ThemeResource ApplicationSecondaryForegroundThemeBrush}"
+                                                Channel="{x:Bind Channel.Channel}"
+                                                Text="{x:Bind ReferencedMessage.Content}" 
+                                                IsTextSelectionEnabled="True"
+                                                IsEnabled="False"
+                                                VerticalAlignment="Center"
+                                                Margin="6,0" />
 
-                        <!--<Border.ContextFlyout>
-                            <flyouts:MessageContextFlyout />
-                        </Border.ContextFlyout>-->
+                    </Grid>
 
-                        <Grid DataContext="{TemplateBinding MessageViewModel}">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition x:Name="AutoColumn" Width="90" />
-                                <ColumnDefinition Width="*"/>
-                            </Grid.ColumnDefinitions>
+                    <Grid Grid.Row="2">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="48"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
 
-                            <StackPanel x:Name="AuthorContainer" Width="{Binding ActualWidth, ElementName=AutoColumn}" Orientation="Horizontal" VerticalAlignment="Top">
-                                <Ellipse Name="ImageContainer"
-                                     Width="24"
-                                     Height="24">
-                                    <Ellipse.Fill>
-                                        <ImageBrush x:Name="ProfileImageBrush">
-                                            <ImageBrush.ImageSource>
-                                                <BitmapImage DecodePixelWidth="24"
-                                                         DecodePixelHeight="24"
-                                                         DecodePixelType="Logical" 
-                                                         UriSource="{Binding Author.AvatarUrl}" />
-                                            </ImageBrush.ImageSource>
-                                        </ImageBrush>
-                                    </Ellipse.Fill>
-                                </Ellipse>
-                                <controls:UsernameControl FontWeight="Bold" User="{Binding Author}" FontSize="14" IconSize="14" Margin="8,0,0,0" VerticalAlignment="Center" />
+                        <Ellipse x:Name="ImageContainer"
+                                 x:Load="{x:Bind converters:Static.IsNot(State, messages:MessageViewModelState.Collapsed),Mode=OneWay}"   
+                                 DataContextChanged="ImageContainer_DataContextChanged"
+                                 Width="36"
+                                 Height="36"
+                                 VerticalAlignment="Top">
+                            <Ellipse.Fill>
+                                <ImageBrush x:Name="ProfileImageBrush">
+                                    <ImageBrush.ImageSource>
+                                        <BitmapImage DecodePixelWidth="36"
+                                                     DecodePixelHeight="36"
+                                                     DecodePixelType="Logical" 
+                                                     UriSource="{x:Bind Author.AvatarUrl}" />
+                                    </ImageBrush.ImageSource>
+                                </ImageBrush>
+                            </Ellipse.Fill>
+                        </Ellipse>
+
+                        <Grid x:Name="MessageContent" Grid.Column="1" Margin="8,0,0,0">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
+                            </Grid.RowDefinitions>
+                            <StackPanel x:Name="AuthorContainer" 
+                                        x:Load="{x:Bind converters:Static.IsNot(State, messages:MessageViewModelState.Collapsed),Mode=OneWay}"   
+                                        Orientation="Horizontal" Grid.Row="0">
+                                <controls:UsernameControl FontWeight="Bold" User="{x:Bind Author}" FontSize="14" IconSize="14" />
+
+                                <TextBlock Margin="8,1" 
+                                           x:Phase="4"                               
+                                           FontSize="11"
+                                           VerticalAlignment="Bottom" 
+                                           Text="{x:Bind Timestamp, Converter={StaticResource DateTimeConverter}, Mode=OneWay}" 
+                                           Opacity="0.4"/>
                             </StackPanel>
 
-                            <StackPanel x:Name="Content" VerticalAlignment="Center" Grid.Column="1" Margin="8,0,0,0">
-
-                                <controls:MarkdownTextBlock x:Name="Markdown"
-                                                           Channel="{Binding Channel}"
-                                                           Text="{Binding Content}" 
-                                                           AllowHugeEmoji="True"
-                                                           IsTextSelectionEnabled="False" 
-                                                           WrapCodeBlock="True" 
-                                                           Margin="0,0,2,0" />
-
-
-                                <local:MessageEditTools x:Name="MessageEditTools" x:DeferLoadStrategy="Lazy" Visibility="Collapsed"/>
-
-                                <ItemsControl x:Name="Embeds"                                               
-                                              Visibility="{Binding Embeds, Converter={StaticResource BoolVisibilityConverter}}" 
+                            <controls:MarkdownTextBlock x:Name="Markdown"
+                                                        x:Load="{x:Bind converters:Static.IsNot(State, messages:MessageViewModelState.Editing),Mode=OneWay}"   
+                                                        Grid.Row="1"
+                                                        Channel="{x:Bind Channel.Channel}"
+                                                        Text="{x:Bind Content}" 
+                                                        AllowHugeEmoji="True"
+                                                        IsTextSelectionEnabled="True" 
+                                                        WrapCodeBlock="True" 
+                                                        Margin="0,0,2,0" />
+
+                            <ContentControl x:Name="MessageEditTools" 
+                                             x:Load="{x:Bind converters:Static.Is(State, messages:MessageViewModelState.Editing),Mode=OneWay}"   
+                                             Content="{x:Bind EditViewModel, Mode=OneWay}"
+                                             ContentTemplate="{StaticResource MessageEditControlsTemplate}"
+                                             HorizontalAlignment="Stretch"
+                                             HorizontalContentAlignment="Stretch"
+                                             Grid.Row="1"/>
+
+                            <StackPanel x:Name="AdditionalContent" 
+                                        Grid.Row="2">
+                                <ItemsControl x:Name="EmbedsContainer"
+                                              x:Phase="3"
                                               ItemTemplateSelector="{ThemeResource EmbedTemplateSelector}" 
-                                              ItemsSource="{Binding Embeds}"/>
+                                              ItemsSource="{x:Bind Embeds}"
+                                              HorizontalAlignment="Left"/>
 
-                                <ItemsControl x:Name="Attachments"
-                                              Visibility="{Binding Attachments, Converter={StaticResource BoolVisibilityConverter}}" 
+                                <ItemsControl x:Name="AttachmentsContainer"
+                                              x:Phase="3"
                                               ItemTemplate="{ThemeResource DefaultAttachmentTemplate}" 
-                                              ItemsSource="{Binding Attachments}"/>
-
-                                <ItemsControl x:Name="Reactions"
+                                              ItemsSource="{x:Bind Attachments}"
+                                              HorizontalAlignment="Left"/>
+
+                                <ItemsControl x:Name="StickersContainer"
+                                              x:Phase="4"
+                                              ItemTemplate="{ThemeResource DefaultStickerTemplate}" 
+                                              ItemsSource="{x:Bind Stickers}"
+                                              HorizontalAlignment="Left"/>
+
+                                <ItemsControl x:Name="ComponentsContainer"
+                                              x:Phase="4"
+                                              ItemTemplateSelector="{StaticResource ComponentTemplateSelector}" 
+                                              ItemsSource="{x:Bind Components}"
+                                              HorizontalAlignment="Left"/>
+
+                                <ItemsControl x:Name="ReactionsContainer"
+                                              x:Phase="3"
                                               Margin="0,4,0,0"
-                                              Visibility="{Binding Reactions, Converter={StaticResource BoolVisibilityConverter}}" 
                                               ItemTemplate="{ThemeResource DefaultReactionTemplate}" 
-                                              ItemsSource="{Binding Reactions}">
+                                              ItemsSource="{x:Bind Reactions}">
                                     <ItemsControl.ItemsPanel>
                                         <ItemsPanelTemplate>
-                                            <toolkit:WrapPanel Orientation="Horizontal" HorizontalSpacing="4" VerticalSpacing="4" />
+                                            <toolkit:WrapPanel Orientation="Horizontal" HorizontalSpacing="4" VerticalSpacing="4"/>
                                         </ItemsPanelTemplate>
                                     </ItemsControl.ItemsPanel>
                                 </ItemsControl>
                             </StackPanel>
-
                         </Grid>
+                    </Grid>
 
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="Edit">
-                                <VisualState x:Name="NotEditing">
-                                    <VisualState.Setters>
-                                        <Setter Target="Markdown.Visibility" Value="Visible"/>
-                                        <Setter Target="MessageEditTools.Visibility" Value="Collapsed"/>
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="Editing">
-                                    <VisualState.Setters>
-                                        <Setter Target="Markdown.Visibility" Value="Collapsed"/>
-                                        <Setter Target="MessageEditTools.Visibility" Value="Visible"/>
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="Size">
-                                <VisualState x:Name="Normal">
-                                    <VisualState.Setters>
-                                        <Setter Target="AuthorContainer.Opacity" Value="1"/>
-                                        <Setter Target="ImageContainer.Visibility" Value="Visible"/>
-                                        <Setter Target="Content.Margin" Value="8,0,0,0"/>
-                                        <Setter Target="Embeds.Visibility" Value="Visible"/>
-                                        <Setter Target="Attachments.Visibility" Value="Visible"/>
-                                        <Setter Target="MainBorder.Padding" Value="4,8,8,0"/>
-                                        <Setter Target="MainBorder.Margin" Value="8,8,8,0"/>
-                                        <Setter Target="MainBorder.BorderThickness" Value="0,1,0,0"/>
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="Collapsed">
-                                    <VisualState.Setters>
-                                        <Setter Target="AuthorContainer.Opacity" Value="0"/>
-                                        <Setter Target="ImageContainer.Visibility" Value="Collapsed"/>
-                                        <Setter Target="Content.Margin" Value="32,0,0,0"/>
-                                        <Setter Target="Embeds.Visibility" Value="Visible"/>
-                                        <Setter Target="Attachments.Visibility" Value="Visible"/>
-                                        <Setter Target="MainBorder.Padding" Value="4,2,8,0"/>
-                                        <Setter Target="MainBorder.Margin" Value="8,0,8,0"/>
-                                        <Setter Target="MainBorder.BorderThickness" Value="0"/>
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="EditMode">
-                                    <VisualState.Setters>
-                                        <Setter Target="AuthorContainer.Opacity" Value="1"/>
-                                        <Setter Target="Embeds.Visibility" Value="Collapsed"/>
-                                        <Setter Target="Attachments.Visibility" Value="Collapsed"/>
-                                        <Setter Target="MainBorder.Padding" Value="8"/>
-                                        <Setter Target="MainBorder.BorderThickness" Value="0"/>
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+                </Grid>
+            </Grid>
+        </UserControl>
+    </DataTemplate>
 
-    <Style x:Key="CompactMessageControl" TargetType="local:MessageControl">
+    <Style TargetType="local:MessageControl">
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="local:MessageControl">
-                    <Border x:Name="MainBorder"
-                            Padding="{TemplateBinding Padding}"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="0,1,0,0">
-
-                        <!--<Border.ContextFlyout>
-                            <flyouts:MessageContextFlyout />
-                        </Border.ContextFlyout>-->
-
-                        <Grid DataContext="{TemplateBinding MessageViewModel}">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="90" />
-                                <ColumnDefinition Width="*"/>
-                            </Grid.ColumnDefinitions>
-
-                            <StackPanel x:Name="AuthorContainer" Orientation="Horizontal" VerticalAlignment="Top">
-                                <controls:UsernameControl FontWeight="Bold" User="{Binding Author}" FontSize="14" IconSize="14" />
-                            </StackPanel>
-
-                            <StackPanel x:Name="Content" Grid.Column="1" Margin="8,0,0,0">
-
-                                <controls:MarkdownTextBlock x:Name="Markdown"
-                                                           Channel="{Binding Channel}"
-                                                           Text="{Binding Content}" 
-                                                           AllowHugeEmoji="True"
-                                                           IsTextSelectionEnabled="False" 
-                                                           WrapCodeBlock="True" 
-                                                           Margin="0,0,2,0" />
-
-                                <local:MessageEditTools x:Name="MessageEditTools" x:DeferLoadStrategy="Lazy" Visibility="Collapsed"/>
-
-                                <ItemsControl x:Name="Embeds" 
-                                              Visibility="{Binding Embeds, Converter={StaticResource BoolVisibilityConverter}}" 
-                                              ItemTemplateSelector="{ThemeResource EmbedTemplateSelector}" 
-                                              ItemsSource="{Binding Embeds}"/>
-
-                                <ItemsControl x:Name="Attachments"
-                                              Visibility="{Binding Attachments, Converter={StaticResource BoolVisibilityConverter}}" 
-                                              ItemTemplate="{ThemeResource DefaultAttachmentTemplate}" 
-                                              ItemsSource="{Binding Attachments}"/>
-
-                                <ItemsControl x:Name="Reactions"
-                                              Margin="0,4,0,0"
-                                              Visibility="{Binding Reactions, Converter={StaticResource BoolVisibilityConverter}}" 
-                                              ItemTemplate="{ThemeResource DefaultReactionTemplate}" 
-                                              ItemsSource="{Binding Reactions}">
-                                    <ItemsControl.ItemsPanel>
-                                        <ItemsPanelTemplate>
-                                            <toolkit:WrapPanel Orientation="Horizontal" HorizontalSpacing="4" VerticalSpacing="4" />
-                                        </ItemsPanelTemplate>
-                                    </ItemsControl.ItemsPanel>
-                                </ItemsControl>
-                            </StackPanel>
-
-                        </Grid>
-
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="Edit">
-                                <VisualState x:Name="NotEditing">
-                                    <VisualState.Setters>
-                                        <Setter Target="Markdown.Visibility" Value="Visible"/>
-                                        <Setter Target="MessageEditTools.Visibility" Value="Collapsed"/>
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="Editing">
-                                    <VisualState.Setters>
-                                        <Setter Target="Markdown.Visibility" Value="Collapsed"/>
-                                        <Setter Target="MessageEditTools.Visibility" Value="Visible"/>
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="Size">
-                                <VisualState x:Name="Normal">
-                                    <VisualState.Setters>
-                                        <Setter Target="AuthorContainer.Opacity" Value="1"/>
-                                        <Setter Target="Embeds.Visibility" Value="Visible"/>
-                                        <Setter Target="Attachments.Visibility" Value="Visible"/>
-                                        <Setter Target="MainBorder.Padding" Value="4,4,8,0"/>
-                                        <Setter Target="MainBorder.Margin" Value="8,8,8,0"/>
-                                        <Setter Target="MainBorder.BorderThickness" Value="0,1,0,0"/>
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="Collapsed">
-                                    <VisualState.Setters>
-                                        <Setter Target="AuthorContainer.Opacity" Value="0"/>
-                                        <Setter Target="Embeds.Visibility" Value="Visible"/>
-                                        <Setter Target="Attachments.Visibility" Value="Visible"/>
-                                        <Setter Target="MainBorder.Padding" Value="4,2,8,0"/>
-                                        <Setter Target="MainBorder.Margin" Value="8,0,8,0"/>
-                                        <Setter Target="MainBorder.BorderThickness" Value="0"/>
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="EditMode">
-                                    <VisualState.Setters>
-                                        <Setter Target="AuthorContainer.Opacity" Value="1"/>
-                                        <Setter Target="Embeds.Visibility" Value="Collapsed"/>
-                                        <Setter Target="Attachments.Visibility" Value="Collapsed"/>
-                                        <Setter Target="MainBorder.Padding" Value="8"/>
-                                        <Setter Target="MainBorder.BorderThickness" Value="0"/>
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                    </Border>
+                    <ContentControl ContentTemplate="{StaticResource MessageContentTemplate}"
+                                    Content="{TemplateBinding MessageViewModel}" 
+                                    Padding="{TemplateBinding Padding}"/>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -1122,8 +1048,4 @@
         </Setter>
     </Style>
 
-
-    
-
-
 </ResourceDictionary>
diff --git a/Unicord.Universal/Themes/Controls/Messages.xaml.cs b/Unicord.Universal/Themes/Controls/Messages.xaml.cs
index 88527416..691329f1 100644
--- a/Unicord.Universal/Themes/Controls/Messages.xaml.cs
+++ b/Unicord.Universal/Themes/Controls/Messages.xaml.cs
@@ -1,9 +1,18 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.ServiceModel.Channels;
 using System.Text;
 using System.Threading.Tasks;
+using Unicord.Universal.Models.Messages;
+using Windows.System;
+using Windows.UI.Core;
 using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Media.Imaging;
+using Windows.UI.Xaml.Shapes;
 
 namespace Unicord.Universal.Resources.Controls
 {
@@ -15,5 +24,31 @@ public Messages()
         }
 
         public Uri ToUri(object obj) => (Uri)obj;
+
+        private void ImageContainer_DataContextChanged(FrameworkElement sender, DataContextChangedEventArgs args)
+        {
+            ImageBrush imageBrush = null;
+            if (imageBrush == null)
+            {
+                var container = (Ellipse)sender;
+                if (container == null || container.Fill == null)
+                    return;
+
+                imageBrush = (ImageBrush)container.Fill;
+            }
+
+            imageBrush.ImageSource = null;
+
+            if (args.NewValue is not MessageViewModel message || message.Author == null || message.Author.AvatarUrl == null)
+                return;
+
+            imageBrush.ImageSource = new BitmapImage
+            {
+                UriSource = new Uri(message.Author.AvatarUrl),
+                DecodePixelHeight = 36,
+                DecodePixelWidth = 36,
+                DecodePixelType = DecodePixelType.Logical
+            };
+        }
     }
 }
diff --git a/Unicord.Universal/Themes/Controls/Presences.xaml b/Unicord.Universal/Themes/Controls/Presences.xaml
index e1e83e3d..c9885131 100644
--- a/Unicord.Universal/Themes/Controls/Presences.xaml
+++ b/Unicord.Universal/Themes/Controls/Presences.xaml
@@ -1,71 +1,71 @@
 <ResourceDictionary
-    x:Class="Unicord.Universal.Resources.Controls.Presences"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Unicord.Universal.Controls.Presence" 
-    xmlns:converters="using:Unicord.Universal.Converters">
-
-    <Color x:Key="OfflinePresenceColour">#FF808080</Color>
-    <Color x:Key="OnlinePresenceColour">#FF33CC87</Color>
-    <Color x:Key="IdlePresenceColour">#FFFFA500</Color>
-    <Color x:Key="DoNotDisturbPresenceColour">#FFEE4447</Color>
-    <Color x:Key="FallbackPresenceColour">#FF000000</Color>
-
-    <!-- src: https://www.youtube.com/about/brand-resources/ -->
-    <Color x:Key="StreamingYouTubePresenceColour">#FFFF0000</Color>
-
-    <!-- src: https://brand.twitch.tv/ -->
-    <Color x:Key="StreamingTwitchPresenceColour">#FF9146FF</Color>
-
-    <!-- /Assets/Online.svg -->
-    <x:String x:Key="OnlinePresenceGeometry">M 0 16 C 0 7.169 7.169 0 16 0 C 24.831 0 32 7.169 32 16 C 32 24.831 24.831 32 16 32 C 7.169 32 0 24.831 0 16 Z</x:String>
-    <!-- /Assets/Away.svg -->
-    <x:String x:Key="IdlePresenceGeometry">M 22.579 1.421 C 28.134 3.926 32 9.515 32 16 C 32 24.831 24.831 32 16 32 C 9.515 32 3.926 28.134 1.421 22.579 C 3.426 23.494 5.654 24 8 24 C 16.831 24 24 16.831 24 8 C 24 5.654 23.494 3.426 22.579 1.421 Z</x:String>
-    <!-- /Assets/DoNotDisturb.svg -->
-    <x:String x:Key="DoNotDisturbPresenceGeometry">M 0 16 C 0 7.169 7.169 0 16 0 C 24.831 0 32 7.169 32 16 C 32 24.831 24.831 32 16 32 C 7.169 32 0 24.831 0 16 Z  M 3 13 L 29 13 L 29 19 L 3 19 L 3 13 Z</x:String>
-    <!-- /Assets/Streaming.svg -->
-    <x:String x:Key="StreamingPresenceGeometry">M 0 16 C 0 7.169 7.169 0 16 0 C 24.831 0 32 7.169 32 16 C 32 24.831 24.831 32 16 32 C 7.169 32 0 24.831 0 16 Z  M 28 16 L 19 21.196 L 10 26.392 L 10 16 L 10 5.608 L 19 10.804 L 28 16 Z</x:String>
-    <!-- /Assets/Offline.svg -->
-    <x:String x:Key="OfflinePresenceGeometry">M 0 16 C 0 7.169 7.169 0 16 0 C 24.831 0 32 7.169 32 16 C 32 24.831 24.831 32 16 32 C 7.169 32 0 24.831 0 16 Z  M 8 16 C 8 11.585 11.585 8 16 8 C 20.415 8 24 11.585 24 16 C 24 20.415 20.415 24 16 24 C 11.585 24 8 20.415 8 16 Z</x:String>
-
-
-    <converters:PresenceColourConverter x:Key="PresenceColourConverter" x:Name="PresenceColourConverter" 
-                                        Offline="{StaticResource OfflinePresenceColour}"
-                                        Online="{StaticResource OnlinePresenceColour}"
-                                        Idle="{StaticResource IdlePresenceColour}"
-                                        DoNotDisturb="{StaticResource DoNotDisturbPresenceColour}"
-                                        StreamingTwitch="{StaticResource StreamingTwitchPresenceColour}"
-                                        StreamingYouTube="{StaticResource StreamingYouTubePresenceColour}"
-                                        Fallback="{StaticResource FallbackPresenceColour}"/>
-
-    <converters:PresenceGeometryConverter x:Key="PresenceGeometryConverter" x:Name="PresenceGeometryConverter"
-                                            Offline="{StaticResource OfflinePresenceGeometry}"
-                                            Online="{StaticResource OnlinePresenceGeometry}"
-                                            Idle="{StaticResource IdlePresenceGeometry}"
-                                            DoNotDisturb="{StaticResource DoNotDisturbPresenceGeometry}"
-                                            Streaming="{StaticResource StreamingPresenceGeometry}"
-                                            Fallback="{StaticResource OnlinePresenceGeometry}"/>
-    
-    <Style TargetType="local:StatusIndicator">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="local:StatusIndicator">
-                    <Viewbox x:Name="PresenceViewBox"
-                             Width="{TemplateBinding Width}"
-                             Height="{TemplateBinding Height}"
-                             DataContext="{TemplateBinding Presence}">
-                        <Path x:Name="PresenceEllipse"
-                                      Width="32"
-                                      Height="32"
-                                      Data="{Binding PresenceGeometry}">
-                            <Path.Fill>
-                                <SolidColorBrush Color="{Binding Colour}"/>
-                            </Path.Fill>
-                        </Path>
-                    </Viewbox>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-</ResourceDictionary>
+    x:Class="Unicord.Universal.Resources.Controls.Presences"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:Unicord.Universal.Controls.Presence" 
+    xmlns:converters="using:Unicord.Universal.Converters">
+
+    <Color x:Key="OfflinePresenceColour">#FF808080</Color>
+    <Color x:Key="OnlinePresenceColour">#FF33CC87</Color>
+    <Color x:Key="IdlePresenceColour">#FFFFA500</Color>
+    <Color x:Key="DoNotDisturbPresenceColour">#FFEE4447</Color>
+    <Color x:Key="FallbackPresenceColour">#FF000000</Color>
+
+    <!-- src: https://www.youtube.com/about/brand-resources/ -->
+    <Color x:Key="StreamingYouTubePresenceColour">#FFFF0000</Color>
+
+    <!-- src: https://brand.twitch.tv/ -->
+    <Color x:Key="StreamingTwitchPresenceColour">#FF9146FF</Color>
+
+    <!-- /Assets/Online.svg -->
+    <x:String x:Key="OnlinePresenceGeometry">M 0 16 C 0 7.169 7.169 0 16 0 C 24.831 0 32 7.169 32 16 C 32 24.831 24.831 32 16 32 C 7.169 32 0 24.831 0 16 Z</x:String>
+    <!-- /Assets/Away.svg -->
+    <x:String x:Key="IdlePresenceGeometry">M 22.579 1.421 C 28.134 3.926 32 9.515 32 16 C 32 24.831 24.831 32 16 32 C 9.515 32 3.926 28.134 1.421 22.579 C 3.426 23.494 5.654 24 8 24 C 16.831 24 24 16.831 24 8 C 24 5.654 23.494 3.426 22.579 1.421 Z</x:String>
+    <!-- /Assets/DoNotDisturb.svg -->
+    <x:String x:Key="DoNotDisturbPresenceGeometry">M 0 16 C 0 7.169 7.169 0 16 0 C 24.831 0 32 7.169 32 16 C 32 24.831 24.831 32 16 32 C 7.169 32 0 24.831 0 16 Z  M 3 13 L 29 13 L 29 19 L 3 19 L 3 13 Z</x:String>
+    <!-- /Assets/Streaming.svg -->
+    <x:String x:Key="StreamingPresenceGeometry">M 0 16 C 0 7.169 7.169 0 16 0 C 24.831 0 32 7.169 32 16 C 32 24.831 24.831 32 16 32 C 7.169 32 0 24.831 0 16 Z  M 28 16 L 19 21.196 L 10 26.392 L 10 16 L 10 5.608 L 19 10.804 L 28 16 Z</x:String>
+    <!-- /Assets/Offline.svg -->
+    <x:String x:Key="OfflinePresenceGeometry">M 0 16 C 0 7.169 7.169 0 16 0 C 24.831 0 32 7.169 32 16 C 32 24.831 24.831 32 16 32 C 7.169 32 0 24.831 0 16 Z  M 8 16 C 8 11.585 11.585 8 16 8 C 20.415 8 24 11.585 24 16 C 24 20.415 20.415 24 16 24 C 11.585 24 8 20.415 8 16 Z</x:String>
+
+
+    <converters:PresenceColourConverter x:Key="PresenceColourConverter" x:Name="PresenceColourConverter" 
+                                        Offline="{StaticResource OfflinePresenceColour}"
+                                        Online="{StaticResource OnlinePresenceColour}"
+                                        Idle="{StaticResource IdlePresenceColour}"
+                                        DoNotDisturb="{StaticResource DoNotDisturbPresenceColour}"
+                                        StreamingTwitch="{StaticResource StreamingTwitchPresenceColour}"
+                                        StreamingYouTube="{StaticResource StreamingYouTubePresenceColour}"
+                                        Fallback="{StaticResource FallbackPresenceColour}"/>
+
+    <converters:PresenceGeometryConverter x:Key="PresenceGeometryConverter" x:Name="PresenceGeometryConverter"
+                                            Offline="{StaticResource OfflinePresenceGeometry}"
+                                            Online="{StaticResource OnlinePresenceGeometry}"
+                                            Idle="{StaticResource IdlePresenceGeometry}"
+                                            DoNotDisturb="{StaticResource DoNotDisturbPresenceGeometry}"
+                                            Streaming="{StaticResource StreamingPresenceGeometry}"
+                                            Fallback="{StaticResource OnlinePresenceGeometry}"/>
+    
+    <Style TargetType="local:StatusIndicator">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="local:StatusIndicator">
+                    <Viewbox x:Name="PresenceViewBox"
+                             Width="{TemplateBinding Width}"
+                             Height="{TemplateBinding Height}"
+                             DataContext="{TemplateBinding Presence}">
+                        <Path x:Name="PresenceEllipse"
+                                      Width="32"
+                                      Height="32"
+                                      Data="{Binding PresenceGeometry}">
+                            <Path.Fill>
+                                <SolidColorBrush Color="{Binding Colour}"/>
+                            </Path.Fill>
+                        </Path>
+                    </Viewbox>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/Unicord.Universal/Themes/CustomStyles.xaml b/Unicord.Universal/Themes/CustomStyles.xaml
index cadf7da9..2cf4abee 100644
--- a/Unicord.Universal/Themes/CustomStyles.xaml
+++ b/Unicord.Universal/Themes/CustomStyles.xaml
@@ -214,7 +214,7 @@
                                     </LinearGradientBrush>
                                 </Grid.Background>
 
-                                <Grid VerticalAlignment="Bottom" Padding="4">
+                                <Grid VerticalAlignment="Bottom" Padding="{ThemeResource AudioMediaTransportControls_ControlPanel_Padding}">
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="Auto"/>
                                         <ColumnDefinition Width="*"/>
@@ -292,7 +292,7 @@
                                             <Button Grid.Column="5" Style="{ThemeResource IconButtonStyle}" Margin="2,0,0,0" x:Name="CCSelectionButton" Visibility="Collapsed">
                                                 <TextBlock Text="&#xED1F;" Style="{StaticResource SymbolTextBlockStyle}" />
                                             </Button>
-                                            <Button Grid.Column="6" Style="{ThemeResource IconButtonStyle}" Margin="2,0,0,0" x:Name="CustomFullWindowButton">
+                                            <Button Grid.Column="6" Style="{ThemeResource IconButtonStyle}" Margin="2,0,0,0" x:Name="FullWindowButton">
                                                 <TextBlock x:Name="FullWindowSymbol" Text="&#xE740;" Style="{StaticResource SymbolTextBlockStyle}" />
                                             </Button>
 
@@ -444,12 +444,12 @@
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
                         <Border x:Name="ControlPanel_ControlPanelVisibilityStates_Border"
-                                CornerRadius="4"
-                                BorderThickness="1"
-                                BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-                                Background="{ThemeResource CardBackgroundFillColorDefaultBrush}">
+                                CornerRadius="{ThemeResource AudioMediaTransportControls_ControlPanel_CornerRadius}"
+                                BorderThickness="{ThemeResource AudioMediaTransportControls_ControlPanel_BorderThickness}"
+                                BorderBrush="{ThemeResource AudioMediaTransportControls_ControlPanel_BorderBrush}"
+                                Background="{ThemeResource AudioMediaTransportControls_ControlPanel_Background}">
                             <Grid x:Name="ControlPanelGrid" RenderTransformOrigin="0.5,0.5">
-                                <Grid Padding="4">
+                                <Grid Padding="{ThemeResource AudioMediaTransportControls_ControlPanel_Padding}">
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="Auto"/>
                                         <ColumnDefinition Width="*"/>
@@ -485,9 +485,7 @@
                                         </Button>
                                     </Border>
                                     <Border x:Name="MediaTransportControls_Command_Border" Grid.Column="1" Grid.Row="2">
-
                                         <Grid x:Name="MediaControlsCommandBar" Margin="0,0">
-
                                             <Grid.ColumnDefinitions>
                                                 <ColumnDefinition Width="Auto"/>
                                                 <ColumnDefinition Width="*"/>
@@ -528,7 +526,6 @@
                                             <Button Grid.Column="6" Style="{ThemeResource IconButtonStyle}" Margin="2,0,0,0" x:Name="FullWindowButton">
                                                 <TextBlock x:Name="FullWindowSymbol" Text="&#xE740;" Style="{StaticResource SymbolTextBlockStyle}" />
                                             </Button>
-
                                         </Grid>
                                     </Border>
                                 </Grid>
diff --git a/Unicord.Universal/Themes/Styles/Fluent.xaml b/Unicord.Universal/Themes/Styles/Fluent.xaml
index 7d04d264..966b629c 100644
--- a/Unicord.Universal/Themes/Styles/Fluent.xaml
+++ b/Unicord.Universal/Themes/Styles/Fluent.xaml
@@ -186,6 +186,30 @@
                     <Thickness x:Key="ChannelPage_MessageInput_Margin">0</Thickness>
 
                     <StaticResource x:Key="SettingsPage_MainBorder_Background" ResourceKey="General_Page_BackgroundBrush"/>
+
+                    <StaticResource x:Key="RichEmbed_Background" ResourceKey="SystemControlBackgroundChromeMediumBrush"/>
+                    <SolidColorBrush x:Key="RichEmbed_BorderBrush" Color="Transparent"/>
+                    <Thickness x:Key="RichEmbed_BorderThickness">0</Thickness>
+                    <CornerRadius x:Key="RichEmbed_CornerRadius">0</CornerRadius>
+                    <CornerRadius x:Key="RichEmbed_Inner_CornerRadius">0</CornerRadius>
+
+                    <Thickness x:Key="RichEmbed_InnerPadding">12,8,8,8</Thickness>
+
+                    <StaticResource x:Key="ImageEmbed_Background" ResourceKey="SystemControlBackgroundChromeMediumBrush"/>
+                    <SolidColorBrush x:Key="ImageEmbed_BorderBrush" Color="Transparent"/>
+                    <Thickness x:Key="ImageEmbed_BorderThickness">0</Thickness>
+                    <CornerRadius x:Key="ImageEmbed_CornerRadius">0</CornerRadius>
+
+                    <StaticResource x:Key="Attachment_Background" ResourceKey="SystemControlBackgroundChromeMediumBrush"/>
+                    <SolidColorBrush x:Key="Attachment_BorderBrush" Color="Transparent"/>
+                    <Thickness x:Key="Attachment_BorderThickness">0</Thickness>
+                    <CornerRadius x:Key="Attachment_CornerRadius">0</CornerRadius>
+
+                    <SolidColorBrush x:Key="AudioMediaTransportControls_ControlPanel_Background" Color="Transparent"/>
+                    <SolidColorBrush x:Key="AudioMediaTransportControls_ControlPanel_BorderBrush" Color="Transparent"/>
+                    <Thickness x:Key="AudioMediaTransportControls_ControlPanel_BorderThickness">0</Thickness>
+                    <CornerRadius x:Key="AudioMediaTransportControls_ControlPanel_CornerRadius">0</CornerRadius>
+                    <Thickness x:Key="AudioMediaTransportControls_ControlPanel_Padding">0</Thickness>                    
                 </ResourceDictionary>
             </lib:XamlControlsResources.MergedDictionaries>
         </lib:XamlControlsResources>
diff --git a/Unicord.Universal/Themes/Styles/Performance.xaml b/Unicord.Universal/Themes/Styles/Performance.xaml
index b279e88e..e7ca60e8 100644
--- a/Unicord.Universal/Themes/Styles/Performance.xaml
+++ b/Unicord.Universal/Themes/Styles/Performance.xaml
@@ -193,6 +193,30 @@
                     <Thickness x:Key="ChannelPage_MessageInput_Margin">0</Thickness>
 
                     <StaticResource x:Key="SettingsPage_MainBorder_Background" ResourceKey="General_Page_BackgroundBrush"/>
+
+                    <StaticResource x:Key="RichEmbed_Background" ResourceKey="SystemControlBackgroundChromeMediumBrush"/>
+                    <SolidColorBrush x:Key="RichEmbed_BorderBrush" Color="Transparent"/>
+                    <Thickness x:Key="RichEmbed_BorderThickness">0</Thickness>
+                    <CornerRadius x:Key="RichEmbed_CornerRadius">0</CornerRadius>
+                    <CornerRadius x:Key="RichEmbed_Inner_CornerRadius">0</CornerRadius>
+
+                    <Thickness x:Key="RichEmbed_InnerPadding">12,8,8,8</Thickness>
+
+                    <StaticResource x:Key="ImageEmbed_Background" ResourceKey="SystemControlBackgroundChromeMediumLowBrush"/>
+                    <SolidColorBrush x:Key="ImageEmbed_BorderBrush" Color="Transparent"/>
+                    <Thickness x:Key="ImageEmbed_BorderThickness">0</Thickness>
+                    <CornerRadius x:Key="ImageEmbed_CornerRadius">0</CornerRadius>
+
+                    <StaticResource x:Key="Attachment_Background" ResourceKey="SystemControlBackgroundChromeMediumBrush"/>
+                    <SolidColorBrush x:Key="Attachment_BorderBrush" Color="Transparent"/>
+                    <Thickness x:Key="Attachment_BorderThickness">0</Thickness>
+                    <CornerRadius x:Key="Attachment_CornerRadius">0</CornerRadius>
+                    
+                    <SolidColorBrush x:Key="AudioMediaTransportControls_ControlPanel_Background" Color="Transparent"/>
+                    <SolidColorBrush x:Key="AudioMediaTransportControls_ControlPanel_BorderBrush" Color="Transparent"/>
+                    <Thickness x:Key="AudioMediaTransportControls_ControlPanel_BorderThickness">0</Thickness>
+                    <CornerRadius x:Key="AudioMediaTransportControls_ControlPanel_CornerRadius">0</CornerRadius>
+                    <Thickness x:Key="AudioMediaTransportControls_ControlPanel_Padding">0</Thickness>
                 </ResourceDictionary>
             </lib:XamlControlsResources.MergedDictionaries>
         </lib:XamlControlsResources>
diff --git a/Unicord.Universal/Themes/Styles/SunValley.xaml b/Unicord.Universal/Themes/Styles/SunValley.xaml
index 2771c5a7..9794f77f 100644
--- a/Unicord.Universal/Themes/Styles/SunValley.xaml
+++ b/Unicord.Universal/Themes/Styles/SunValley.xaml
@@ -112,6 +112,30 @@
 
                     <StaticResource x:Key="SettingsPage_MainBorder_Background" ResourceKey="AcrylicInAppFillColorBaseBrush"/>
 
+                    <StaticResource x:Key="RichEmbed_Background" ResourceKey="CardBackgroundFillColorDefaultBrush"/>
+                    <StaticResource x:Key="RichEmbed_BorderBrush" ResourceKey="CardStrokeColorDefaultBrush"/>
+                    <Thickness x:Key="RichEmbed_BorderThickness">1</Thickness>
+                    <CornerRadius x:Key="RichEmbed_CornerRadius">4</CornerRadius>
+                    <CornerRadius x:Key="RichEmbed_Inner_CornerRadius">3</CornerRadius>
+
+                    <Thickness x:Key="RichEmbed_InnerPadding">16,12,12,12</Thickness>
+
+                    <StaticResource x:Key="ImageEmbed_Background" ResourceKey="CardBackgroundFillColorSecondaryBrush"/>
+                    <StaticResource x:Key="ImageEmbed_BorderBrush" ResourceKey="CardStrokeColorDefaultBrush"/>
+                    <Thickness x:Key="ImageEmbed_BorderThickness">1</Thickness>
+                    <CornerRadius x:Key="ImageEmbed_CornerRadius">2</CornerRadius>
+
+                    <StaticResource x:Key="Attachment_Background" ResourceKey="CardBackgroundFillColorDefaultBrush"/>
+                    <StaticResource x:Key="Attachment_BorderBrush" ResourceKey="CardStrokeColorDefaultBrush"/>
+                    <Thickness x:Key="Attachment_BorderThickness">1</Thickness>
+                    <CornerRadius x:Key="Attachment_CornerRadius">4</CornerRadius>
+
+                    <StaticResource x:Key="AudioMediaTransportControls_ControlPanel_Background" ResourceKey="CardBackgroundFillColorDefaultBrush"/>
+                    <StaticResource x:Key="AudioMediaTransportControls_ControlPanel_BorderBrush" ResourceKey="CardStrokeColorDefaultBrush"/>
+                    <Thickness x:Key="AudioMediaTransportControls_ControlPanel_BorderThickness">1</Thickness>
+                    <CornerRadius x:Key="AudioMediaTransportControls_ControlPanel_CornerRadius">4</CornerRadius>
+                    <Thickness x:Key="AudioMediaTransportControls_ControlPanel_Padding">4</Thickness>
+
                 </ResourceDictionary>
             </lib:XamlControlsResources.MergedDictionaries>
         </lib:XamlControlsResources>
diff --git a/Unicord.Universal/Themes/Templates.xaml b/Unicord.Universal/Themes/Templates.xaml
index 02d77478..cae37b0e 100644
--- a/Unicord.Universal/Themes/Templates.xaml
+++ b/Unicord.Universal/Themes/Templates.xaml
@@ -29,7 +29,7 @@
         <ResourceDictionary Source="Controls/Permissions.xaml"/>
         <ResourceDictionary Source="Controls/UniversalWebView.xaml"/>
         <ResourceDictionary Source="Controls/Flyouts.xaml"/>
-        <ResourceDictionary Source="Controls/Channels.xaml"/>
+        <Channels xmlns="using:Unicord.Universal.Resources.Controls"/>
     </ResourceDictionary.MergedDictionaries>
 
     <Style x:Key="ChannelNameTextBoxStyle" TargetType="TextBox">
@@ -218,7 +218,7 @@
     <DataTemplate x:Key="ChannelListTemplate" x:DataType="channelVMs:ChannelListViewModel">
         <channels:ChannelListControl Channel="{Binding}" />
     </DataTemplate>
-    
+
     <DataTemplate x:Key="ChannelListThreadTemplate" x:DataType="channelVMs:ChannelListViewModel">
         <channels:ChannelListControl Channel="{Binding}" Style="{StaticResource ThreadChannelListStyle}" />
     </DataTemplate>
@@ -231,14 +231,17 @@
         <channels:ChannelListControl Channel="{Binding}" Style="{StaticResource GroupChannelListStyle}"/>
     </DataTemplate>
 
-
-    <DataTemplate x:Key="ChannelListCategoryTemplate">
+    <DataTemplate x:Key="ChannelListCategoryTemplate" x:DataType="channelVMs:ChannelListViewModel">
         <Border ContextFlyout="{StaticResource ChannelContextFlyout}"
                 VerticalAlignment="Stretch" 
                 Background="Transparent" 
                 Margin="10,8,8,2"
-                Opacity="{Binding MutedOpacity}">
-            <TextBlock FontSize="12" Foreground="{ThemeResource ApplicationSecondaryForegroundThemeBrush}" FontWeight="SemiBold" Text="{Binding Name, Converter={StaticResource TitleCaseConverter}}" TextWrapping="NoWrap" />
+                Opacity="{x:Bind MutedOpacity}">
+            <TextBlock FontSize="12"
+                       Foreground="{ThemeResource ApplicationSecondaryForegroundThemeBrush}"
+                       FontWeight="SemiBold"
+                       Text="{x:Bind Name, Converter={StaticResource TitleCaseConverter}}" 
+                       TextWrapping="NoWrap" />
         </Border>
     </DataTemplate>
 
@@ -283,15 +286,15 @@
               ContextFlyout="{StaticResource GuildContextFlyout}"
               ToolTipService.ToolTip="{x:Bind Name}"
               ToolTipService.Placement="Left">
-                <lib:PersonPicture Margin="0,4" Width="42" Height="42" DisplayName="{x:Bind Name}" ProfilePicture="{Binding IconUrl}"/>
-                <lib:InfoBadge VerticalAlignment="Top"
+            <lib:PersonPicture x:Phase="1" Margin="0,4" Width="42" Height="42" DisplayName="{x:Bind Name}" ProfilePicture="{Binding IconUrl}"/>
+            <lib:InfoBadge x:Phase="2" VerticalAlignment="Top"
                            HorizontalAlignment="Right"
                            Margin="8,4"
                            MinWidth="8"
                            MinHeight="8"
                            Value="{x:Bind MentionCount}"
                            Visibility="{Binding Unread, Converter={StaticResource BoolVisibilityConverter}}"/>
-            </Grid>
+        </Grid>
         <!--</lib:TreeViewItem>-->
     </DataTemplate>
 
@@ -301,127 +304,129 @@
         <Grid ToolTipService.ToolTip="{x:Bind Name}"
               ToolTipService.Placement="Left"
               Loaded="OnGuildsListFolderLoaded">
-                <Ellipse Margin="0,4" 
+            <Ellipse Margin="0,4" 
                          Width="42" 
                          Height="42"
                          Opacity="0.3"
                          Fill="{Binding Color, Converter={StaticResource ColourBrushConverter}}"/>
 
-                <FontIcon x:Name="ExpandedGlyph" 
+            <FontIcon x:Name="ExpandedGlyph" 
                             FontFamily="{StaticResource SymbolThemeFontFamily}" 
                             Glyph="&#xE70D;" 
                             RenderTransformOrigin="0.5,0.5"
                             Opacity="0">
-                    <FontIcon.RenderTransform>
-                        <RotateTransform x:Name="ExpandedGlyphTransform" />
-                    </FontIcon.RenderTransform>
-                </FontIcon>
-
-                <Grid Margin="0,4" Width="36" Height="36">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="*"/>
-                    </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="*"/>
-                        <RowDefinition Height="*"/>
-                    </Grid.RowDefinitions>
-
-                    <Ellipse x:Name="Ellipse1" Grid.Column="0" Grid.Row="0" Margin="1">
-                        <Ellipse.RenderTransform>
-                            <TranslateTransform x:Name="EllipseTransform1" />
-                        </Ellipse.RenderTransform>
-                        <Ellipse.Fill>
-                            <ImageBrush ImageSource="{Binding Icon1}"/>
-                        </Ellipse.Fill>
-                    </Ellipse>
-                    <Ellipse x:Name="Ellipse2" Grid.Column="0" Grid.Row="1" Margin="1">
-                        <Ellipse.RenderTransform>
-                            <TranslateTransform x:Name="EllipseTransform2" />
-                        </Ellipse.RenderTransform>
-                        <Ellipse.Fill>
-                            <ImageBrush ImageSource="{Binding Icon2}"/>
-                        </Ellipse.Fill>
-                    </Ellipse>
-                    <Ellipse x:Name="Ellipse3" Grid.Column="1" Grid.Row="0" Margin="1">
-                        <Ellipse.RenderTransform>
-                            <TranslateTransform x:Name="EllipseTransform3" />
-                        </Ellipse.RenderTransform>
-                        <Ellipse.Fill>
-                            <ImageBrush ImageSource="{Binding Icon3}"/>
-                        </Ellipse.Fill>
-                    </Ellipse>
-                    <Ellipse x:Name="Ellipse4" Grid.Column="1" Grid.Row="1" Margin="1">
-                        <Ellipse.RenderTransform>
-                            <TranslateTransform x:Name="EllipseTransform4" />
-                        </Ellipse.RenderTransform>
-                        <Ellipse.Fill>
-                            <ImageBrush ImageSource="{Binding Icon4}"/>
-                        </Ellipse.Fill>
-                    </Ellipse>
-                </Grid>
-
-                <lib:InfoBadge Grid.ColumnSpan="2"
-                               Grid.RowSpan="2"
-                               VerticalAlignment="Top"
-                               HorizontalAlignment="Right"
-                               Margin="8,4"
-                               MinWidth="8"
-                               MinHeight="8"
-                               Value="{Binding MentionCount}"
-                               Visibility="{Binding Unread, Converter={StaticResource BoolVisibilityConverter}}"/>
-
-                <i:Interaction.Behaviors>
-                    <core:DataTriggerBehavior Binding="{Binding IsExpanded}"
+                <FontIcon.RenderTransform>
+                    <RotateTransform x:Name="ExpandedGlyphTransform" />
+                </FontIcon.RenderTransform>
+            </FontIcon>
+
+            <Grid Margin="0,4" Width="36" Height="36">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="*"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*"/>
+                    <RowDefinition Height="*"/>
+                </Grid.RowDefinitions>
+
+                <Ellipse x:Name="Ellipse1" Grid.Column="0" Grid.Row="0" Margin="1">
+                    <Ellipse.RenderTransform>
+                        <TranslateTransform x:Name="EllipseTransform1" />
+                    </Ellipse.RenderTransform>
+                    <Ellipse.Fill>
+                        <ImageBrush ImageSource="{Binding Icon1}"/>
+                    </Ellipse.Fill>
+                </Ellipse>
+                <Ellipse x:Name="Ellipse2" Grid.Column="0" Grid.Row="1" Margin="1">
+                    <Ellipse.RenderTransform>
+                        <TranslateTransform x:Name="EllipseTransform2" />
+                    </Ellipse.RenderTransform>
+                    <Ellipse.Fill>
+                        <ImageBrush ImageSource="{Binding Icon2}"/>
+                    </Ellipse.Fill>
+                </Ellipse>
+                <Ellipse x:Name="Ellipse3" Grid.Column="1" Grid.Row="0" Margin="1">
+                    <Ellipse.RenderTransform>
+                        <TranslateTransform x:Name="EllipseTransform3" />
+                    </Ellipse.RenderTransform>
+                    <Ellipse.Fill>
+                        <ImageBrush ImageSource="{Binding Icon3}"/>
+                    </Ellipse.Fill>
+                </Ellipse>
+                <Ellipse x:Name="Ellipse4" Grid.Column="1" Grid.Row="1" Margin="1">
+                    <Ellipse.RenderTransform>
+                        <TranslateTransform x:Name="EllipseTransform4" />
+                    </Ellipse.RenderTransform>
+                    <Ellipse.Fill>
+                        <ImageBrush ImageSource="{Binding Icon4}"/>
+                    </Ellipse.Fill>
+                </Ellipse>
+            </Grid>
+
+            <lib:InfoBadge x:Name="UnreadIndicator"
+                           x:Load="{x:Bind Unread}" 
+                           x:Phase="2"
+                           Grid.ColumnSpan="2"
+                           Grid.RowSpan="2"
+                           VerticalAlignment="Top"
+                           HorizontalAlignment="Right"
+                           Margin="8,4"
+                           MinWidth="8"
+                           MinHeight="8"
+                           Value="{x:Bind MentionCount}"/>
+
+            <i:Interaction.Behaviors>
+                <core:DataTriggerBehavior Binding="{x:Bind IsExpanded}"
                                               ComparisonCondition="Equal"
                                               Value="True">
-                        <media1:ControlStoryboardAction>
-                            <media1:ControlStoryboardAction.Storyboard>
-                                <Storyboard>
-                                    <DoubleAnimation From="0" To="1" Storyboard.TargetName="ExpandedGlyph" Storyboard.TargetProperty="Opacity" Duration="0:0:0.25"/>
-                                    <DoubleAnimation From="359" To="0" Storyboard.TargetName="ExpandedGlyphTransform" Storyboard.TargetProperty="Angle" Duration="0:0:0.5" EasingFunction="{StaticResource EaseEnter}"/>
-
-                                    <DoubleAnimation From="0" To="200" Storyboard.TargetName="EllipseTransform1" Storyboard.TargetProperty="Y" Duration="0:0:0.2" BeginTime="0:0:0.15" EasingFunction="{StaticResource EaseExit}"/>
-                                    <DoubleAnimation From="1" To="0" Storyboard.TargetName="Ellipse1" Storyboard.TargetProperty="Opacity" Duration="0:0:0.2" BeginTime="0:0:0.15"/>
-
-                                    <DoubleAnimation From="0" To="200" Storyboard.TargetName="EllipseTransform2" Storyboard.TargetProperty="Y" Duration="0:0:0.2"  BeginTime="0:0:0.1" EasingFunction="{StaticResource EaseExit}"/>
-                                    <DoubleAnimation From="1" To="0" Storyboard.TargetName="Ellipse2" Storyboard.TargetProperty="Opacity" Duration="0:0:0.2" BeginTime="0:0:0.1"/>
-
-                                    <DoubleAnimation From="0" To="200" Storyboard.TargetName="EllipseTransform3" Storyboard.TargetProperty="Y" Duration="0:0:0.2" BeginTime="0:0:0.05" EasingFunction="{StaticResource EaseExit}"/>
-                                    <DoubleAnimation From="1" To="0" Storyboard.TargetName="Ellipse3" Storyboard.TargetProperty="Opacity" Duration="0:0:0.2" BeginTime="0:0:0.05"/>
-
-                                    <DoubleAnimation From="0" To="200" Storyboard.TargetName="EllipseTransform4" Storyboard.TargetProperty="Y" Duration="0:0:0.2" EasingFunction="{StaticResource EaseExit}"/>
-                                    <DoubleAnimation From="1" To="0" Storyboard.TargetName="Ellipse4" Storyboard.TargetProperty="Opacity" Duration="0:0:0.2"/>
-                                </Storyboard>
-                            </media1:ControlStoryboardAction.Storyboard>
-                        </media1:ControlStoryboardAction>
-                    </core:DataTriggerBehavior>
-                    <core:DataTriggerBehavior Binding="{Binding IsExpanded}"
+                    <media1:ControlStoryboardAction>
+                        <media1:ControlStoryboardAction.Storyboard>
+                            <Storyboard>
+                                <DoubleAnimation From="0" To="1" Storyboard.TargetName="ExpandedGlyph" Storyboard.TargetProperty="Opacity" Duration="0:0:0.25"/>
+                                <DoubleAnimation From="359" To="0" Storyboard.TargetName="ExpandedGlyphTransform" Storyboard.TargetProperty="Angle" Duration="0:0:0.5" EasingFunction="{StaticResource EaseEnter}"/>
+
+                                <DoubleAnimation From="0" To="200" Storyboard.TargetName="EllipseTransform1" Storyboard.TargetProperty="Y" Duration="0:0:0.2" BeginTime="0:0:0.15" EasingFunction="{StaticResource EaseExit}"/>
+                                <DoubleAnimation From="1" To="0" Storyboard.TargetName="Ellipse1" Storyboard.TargetProperty="Opacity" Duration="0:0:0.2" BeginTime="0:0:0.15"/>
+
+                                <DoubleAnimation From="0" To="200" Storyboard.TargetName="EllipseTransform2" Storyboard.TargetProperty="Y" Duration="0:0:0.2"  BeginTime="0:0:0.1" EasingFunction="{StaticResource EaseExit}"/>
+                                <DoubleAnimation From="1" To="0" Storyboard.TargetName="Ellipse2" Storyboard.TargetProperty="Opacity" Duration="0:0:0.2" BeginTime="0:0:0.1"/>
+
+                                <DoubleAnimation From="0" To="200" Storyboard.TargetName="EllipseTransform3" Storyboard.TargetProperty="Y" Duration="0:0:0.2" BeginTime="0:0:0.05" EasingFunction="{StaticResource EaseExit}"/>
+                                <DoubleAnimation From="1" To="0" Storyboard.TargetName="Ellipse3" Storyboard.TargetProperty="Opacity" Duration="0:0:0.2" BeginTime="0:0:0.05"/>
+
+                                <DoubleAnimation From="0" To="200" Storyboard.TargetName="EllipseTransform4" Storyboard.TargetProperty="Y" Duration="0:0:0.2" EasingFunction="{StaticResource EaseExit}"/>
+                                <DoubleAnimation From="1" To="0" Storyboard.TargetName="Ellipse4" Storyboard.TargetProperty="Opacity" Duration="0:0:0.2"/>
+                            </Storyboard>
+                        </media1:ControlStoryboardAction.Storyboard>
+                    </media1:ControlStoryboardAction>
+                </core:DataTriggerBehavior>
+                <core:DataTriggerBehavior Binding="{x:Bind IsExpanded}"
                                               ComparisonCondition="Equal"
                                               Value="False">
-                        <media1:ControlStoryboardAction>
-                            <media1:ControlStoryboardAction.Storyboard>
-                                <Storyboard>
-                                    <DoubleAnimation From="1" To="0" Storyboard.TargetName="ExpandedGlyph" Storyboard.TargetProperty="Opacity" Duration="0:0:0.25"/>
-                                    <DoubleAnimation From="0" To="270" Storyboard.TargetName="ExpandedGlyphTransform" Storyboard.TargetProperty="Angle" Duration="0:0:0.25" EasingFunction="{StaticResource EaseExit}"/>
-
-                                    <DoubleAnimation From="200" To="0" Storyboard.TargetName="EllipseTransform4" Storyboard.TargetProperty="Y" Duration="0:0:0.2" BeginTime="0:0:0.15" EasingFunction="{StaticResource EaseEnter}"/>
-                                    <DoubleAnimation From="0" To="1" Storyboard.TargetName="Ellipse4" Storyboard.TargetProperty="Opacity" Duration="0:0:0.2" BeginTime="0:0:0.15"/>
-
-                                    <DoubleAnimation From="200" To="0" Storyboard.TargetName="EllipseTransform3" Storyboard.TargetProperty="Y" Duration="0:0:0.2"  BeginTime="0:0:0.1" EasingFunction="{StaticResource EaseEnter}"/>
-                                    <DoubleAnimation From="0" To="1" Storyboard.TargetName="Ellipse3" Storyboard.TargetProperty="Opacity" Duration="0:0:0.2" BeginTime="0:0:0.1"/>
-
-                                    <DoubleAnimation From="200" To="0" Storyboard.TargetName="EllipseTransform2" Storyboard.TargetProperty="Y" Duration="0:0:0.2" BeginTime="0:0:0.05" EasingFunction="{StaticResource EaseEnter}"/>
-                                    <DoubleAnimation From="0" To="1" Storyboard.TargetName="Ellipse2" Storyboard.TargetProperty="Opacity" Duration="0:0:0.2" BeginTime="0:0:0.05"/>
-
-                                    <DoubleAnimation From="200" To="0" Storyboard.TargetName="EllipseTransform1" Storyboard.TargetProperty="Y" Duration="0:0:0.2" EasingFunction="{StaticResource EaseEnter}"/>
-                                    <DoubleAnimation From="0" To="1" Storyboard.TargetName="Ellipse1" Storyboard.TargetProperty="Opacity" Duration="0:0:0.2"/>
-                                </Storyboard>
-                            </media1:ControlStoryboardAction.Storyboard>
-                        </media1:ControlStoryboardAction>
-                    </core:DataTriggerBehavior>
-                </i:Interaction.Behaviors>
-            </Grid>
+                    <media1:ControlStoryboardAction>
+                        <media1:ControlStoryboardAction.Storyboard>
+                            <Storyboard>
+                                <DoubleAnimation From="1" To="0" Storyboard.TargetName="ExpandedGlyph" Storyboard.TargetProperty="Opacity" Duration="0:0:0.25"/>
+                                <DoubleAnimation From="0" To="270" Storyboard.TargetName="ExpandedGlyphTransform" Storyboard.TargetProperty="Angle" Duration="0:0:0.25" EasingFunction="{StaticResource EaseExit}"/>
+
+                                <DoubleAnimation From="200" To="0" Storyboard.TargetName="EllipseTransform4" Storyboard.TargetProperty="Y" Duration="0:0:0.2" BeginTime="0:0:0.15" EasingFunction="{StaticResource EaseEnter}"/>
+                                <DoubleAnimation From="0" To="1" Storyboard.TargetName="Ellipse4" Storyboard.TargetProperty="Opacity" Duration="0:0:0.2" BeginTime="0:0:0.15"/>
+
+                                <DoubleAnimation From="200" To="0" Storyboard.TargetName="EllipseTransform3" Storyboard.TargetProperty="Y" Duration="0:0:0.2"  BeginTime="0:0:0.1" EasingFunction="{StaticResource EaseEnter}"/>
+                                <DoubleAnimation From="0" To="1" Storyboard.TargetName="Ellipse3" Storyboard.TargetProperty="Opacity" Duration="0:0:0.2" BeginTime="0:0:0.1"/>
+
+                                <DoubleAnimation From="200" To="0" Storyboard.TargetName="EllipseTransform2" Storyboard.TargetProperty="Y" Duration="0:0:0.2" BeginTime="0:0:0.05" EasingFunction="{StaticResource EaseEnter}"/>
+                                <DoubleAnimation From="0" To="1" Storyboard.TargetName="Ellipse2" Storyboard.TargetProperty="Opacity" Duration="0:0:0.2" BeginTime="0:0:0.05"/>
+
+                                <DoubleAnimation From="200" To="0" Storyboard.TargetName="EllipseTransform1" Storyboard.TargetProperty="Y" Duration="0:0:0.2" EasingFunction="{StaticResource EaseEnter}"/>
+                                <DoubleAnimation From="0" To="1" Storyboard.TargetName="Ellipse1" Storyboard.TargetProperty="Opacity" Duration="0:0:0.2"/>
+                            </Storyboard>
+                        </media1:ControlStoryboardAction.Storyboard>
+                    </media1:ControlStoryboardAction>
+                </core:DataTriggerBehavior>
+            </i:Interaction.Behaviors>
+        </Grid>
         <!--</lib:TreeViewItem>-->
     </DataTemplate>
 
@@ -444,7 +449,7 @@
                 <TextBlock Text="{x:Bind Name}"/>
                 <presence:InlinePresenceControl Presence="{x:Bind Recipient.Presence, Mode=OneWay}" />
             </StackPanel>
-            
+
             <lib:InfoBadge x:Name="unreadIndicator" 
                            x:Load="{x:Bind Unread, Mode=OneWay}" 
                            Grid.Column="2" 
diff --git a/Unicord.Universal/Unicord.Universal.csproj b/Unicord.Universal/Unicord.Universal.csproj
index 4ecf5370..f81b1b88 100644
--- a/Unicord.Universal/Unicord.Universal.csproj
+++ b/Unicord.Universal/Unicord.Universal.csproj
@@ -25,7 +25,8 @@
     <!-- lol, lmao -->
     <SkipMicrosoftUIXamlCheckTargetPlatformVersion>true</SkipMicrosoftUIXamlCheckTargetPlatformVersion>
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
-    <PackageCertificateKeyFile>Unicord.Universal_TemporaryKey.pfx</PackageCertificateKeyFile>
+    <PackageCertificateKeyFile>
+    </PackageCertificateKeyFile>
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
@@ -33,8 +34,7 @@
     <AppxBundlePlatforms>arm</AppxBundlePlatforms>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
     <GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
-    <PackageCertificateThumbprint>
-    </PackageCertificateThumbprint>
+    <PackageCertificateThumbprint>001AA11011A8DE018049B0B614F2E6733355A7A1</PackageCertificateThumbprint>
     <IncludeSourceRevisionInInformationalVersion>true</IncludeSourceRevisionInInformationalVersion>
     <IlcParameters>/ExtraNutcArguments:"/d2threads8"</IlcParameters>
   </PropertyGroup>
@@ -191,17 +191,22 @@
     <Compile Include="Controls\UniformGrid\UniformGrid.Helpers.cs" />
     <Compile Include="Controls\UniformGrid\UniformGrid.Properties.cs" />
     <Compile Include="Converters\Messages\EmbedTemplateSelector.cs" />
+    <Compile Include="Converters\Static.cs" />
     <Compile Include="Dialogs\CaptchaRequestDialog.xaml.cs">
       <DependentUpon>CaptchaRequestDialog.xaml</DependentUpon>
     </Compile>
     <Compile Include="Extensions\ChannelTypeExtensions.cs" />
     <Compile Include="Extensions\CollectionExtensions.cs" />
     <Compile Include="Extensions\DiscordColorExtensions.cs" />
-    <Compile Include="Extensions\GuildExtensions.cs" />
-    <Compile Include="Extensions\UserExtensions.cs" />
+    <Compile Include="Extensions\AvatarExtensions.cs" />
+    <Compile Include="Extensions\ShiftEnterExtensions.cs" />
+    <Compile Include="Extensions\FocusExtensions.cs" />
     <Compile Include="Models\Channels\ChannelPageViewModelBase.cs" />
     <Compile Include="Models\Channels\ChannelViewModel.cs" />
     <Compile Include="Models\Channels\ForumChannelViewModel.cs" />
+    <Compile Include="Models\Channels\ForumThreadsCollection.cs" />
+    <Compile Include="Models\Channels\ForumThreadViewModel.cs" />
+    <Compile Include="Models\Channels\PinsPageViewModel.cs" />
     <Compile Include="Models\Channels\ReadStateViewModel.cs" />
     <Compile Include="Controls\CustomMediaTransportControls.cs" />
     <Compile Include="Controls\Emoji\EmojiControl.cs" />
@@ -419,7 +424,7 @@
     <Compile Include="Models\Emoji\EmojiViewModel.cs" />
     <Compile Include="Models\FileUploadModel.cs" />
     <Compile Include="Models\FriendsPageViewModel.cs" />
-    <Compile Include="Models\GuildChannelListViewModel.cs" />
+    <Compile Include="Models\Guild\GuildChannelListViewModel.cs" />
     <Compile Include="Models\Guild\GuildViewModel.cs" />
     <Compile Include="Models\Guild\GuildListFolderViewModel.cs" />
     <Compile Include="Models\Guild\GuildListViewModel.cs" />
@@ -437,15 +442,15 @@
     <Compile Include="Models\Messages\Embeds\EmbedImageViewModel.cs" />
     <Compile Include="Models\Messages\Embeds\EmbedVideoViewModel.cs" />
     <Compile Include="Models\Messages\EmbedViewModel.cs" />
+    <Compile Include="Models\Messages\MessageEditViewModel.cs" />
     <Compile Include="Models\Messages\MessageViewModel.cs" />
     <Compile Include="Models\Messages\MessageViewModel.WelcomeStrings.cs" />
     <Compile Include="Models\Messages\ReactionViewModel.cs" />
     <Compile Include="Models\Messages\StickerViewModel.cs" />
     <Compile Include="Models\Messaging\DiscordClientMessenger.cs" />
     <Compile Include="Models\Messaging\DiscordMessages.cs" />
-    <Compile Include="Models\PinsPageViewModel.cs" />
     <Compile Include="Models\Relationships\RelationshipViewModel.cs" />
-    <Compile Include="Models\SearchPageViewModel.cs" />
+    <Compile Include="Models\Channels\SearchPageViewModel.cs" />
     <Compile Include="Models\Settings\AccountsSettingsModel.cs" />
     <Compile Include="Models\Settings\NotificationsSettingsModel.cs" />
     <Compile Include="Models\Settings\MediaSettingsModel.cs" />
@@ -549,8 +554,12 @@
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Services\DiscordManager.cs" />
+    <Compile Include="Services\Platform.cs" />
     <Compile Include="Services\SplitPaneService.cs" />
     <Compile Include="Services\ThemeService.cs" />
+    <Compile Include="Themes\Controls\Channels.xaml.cs">
+      <DependentUpon>Channels.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Themes\Controls\Messages.xaml.cs">
       <DependentUpon>Messages.xaml</DependentUpon>
     </Compile>