From a1c76a8787cc1d3bfc47d91b730921e7b13fe8d6 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Sun, 10 Nov 2024 15:42:05 -0500
Subject: [PATCH 01/14] Merge pull request #884 from ionite34/fix-markdown

(cherry picked from commit 7deeb065aa95754eb621f074b26dd495cfa6724e)

# Conflicts:
#	CHANGELOG.md
---
 CHANGELOG.md                                  |  57 +++++
 .../Controls/BetterMarkdownScrollViewer.cs    |  16 ++
 StabilityMatrix.Avalonia/DialogHelper.cs      |  10 +-
 .../StabilityMatrix.Avalonia.csproj           |   2 +-
 .../MarkdownStyleFluentAvalonia.axaml         | 210 ++++++++++++++++++
 .../MarkdownStyleFluentAvalonia.axaml.cs      |  11 +
 .../Views/Dialogs/LykosLoginDialog.axaml      | 110 +++++----
 .../Views/Dialogs/UpdateDialog.axaml          | 195 ++++++++--------
 8 files changed, 459 insertions(+), 152 deletions(-)
 create mode 100644 StabilityMatrix.Avalonia/Controls/BetterMarkdownScrollViewer.cs
 create mode 100644 StabilityMatrix.Avalonia/Styles/Markdown/MarkdownStyleFluentAvalonia.axaml
 create mode 100644 StabilityMatrix.Avalonia/Styles/Markdown/MarkdownStyleFluentAvalonia.axaml.cs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1bc6d699d..515c72895 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,63 @@ All notable changes to Stability Matrix will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2.0.0.html).
 
+<<<<<<< HEAD
+=======
+## v2.13.0-dev.3
+### Added
+- Added support for SD3.5 in Inference
+- Added CLIP_G to HuggingFace model browser
+- Added search bar to the Installed Workflows tab
+- Added "Search with Google" and "Search with ChatGPT" to the console output context menu
+- Added "Date Created" and "Date Last Modified" sorting options to the Checkpoints tab
+### Changed
+- Text Encoder / CLIP selection in Inference is now enabled via the cogwheel ⚙️ button next to the model selector 
+- Added more base model types to the CivitAI Model Browser & Checkpoint Manager
+- Updated Russian translations thanks to @vanja-san
+- Updated Simplified Chinese translations thanks to @QL-boy
+### Fixed
+- Fixed some instances of Civitai model browser not loading new results
+- Fixed "Unsupported Torch Version: Cuda" errors when installing a1111
+- Fixed crash when clicking "Remind me Later" on the update dialog
+
+## v2.13.0-dev.2
+### Added
+- Added new package - [SimpleSDXL](https://github.com/metercai/SimpleSDXL) - many thanks to @NullDev for the contribution!
+- Added new package - [FluxGym](https://github.com/cocktailpeanut/fluxgym) - many thanks to @NullDev for the contribution!
+- Added a new "Extension Packs" section to the extension manager, allowing you to create packs for easier installation of multiple extensions at once
+- Added "Search by Creator" command to Civitai browser context menu
+- Added Beta scheduler to the scheduler selector in Inference
+- Added zipping of log files and "Show Log in Explorer" button on exceptions dialog for easier support
+- Added max concurrent downloads option & download queueing for most downloads
+### Changed
+- (Internal) Updated to Avalonia 11.1.4
+- Adjusted the Branch/Release toggle during package install flow to be a little more obvious
+- Updated the Dock library used for Inference - fixes some weirdness with resizing / rearranging panels
+### Fixed
+- Fixed ComfyUI NF4 extension not installing properly when prompted in Inference
+- Fixed [#932](https://github.com/LykosAI/StabilityMatrix/issues/932), [#935](https://github.com/LykosAI/StabilityMatrix/issues/935), [#939](https://github.com/LykosAI/StabilityMatrix/issues/939) - InvokeAI failing to update
+- Fixed repeated nested folders being created in `Models/StableDiffusion` when using Forge in Symlink mode in certain conditions. Existing folders will be repaired to their original structure on launch.
+- Fixed minimize button not working on macOS
+- Fixed InvokeAI model sharing spamming the console with "This may take awhile" in certain conditions
+- Fixed text alignment issues in the Downloads tab for certain long names / progress infos
+### Supporters
+#### Visionaries
+- A big thank you to our amazing Visionary-tier Patreon supporter, **Waterclouds**! Your continued support is invaluable!
+
+## v2.13.0-dev.1
+### Added
+- Added the ability to change the Models directory separately from the rest of the Data directory. This can be set in `Settings > Select new Models Folder`
+- Added "Copy" menu to the Inference gallery context menu, allowing you to copy the image or the seed (other params coming soon™️)
+- Added InvokeAI model sharing option
+### Supporters
+#### Visionaries
+- A heartfelt thank you to our incredible Visionary-tier Patreon supporter, **Waterclouds**! Your ongoing support means a lot to us, and we’re grateful to have you with us on this journey!
+
+## v2.12.4
+### Fixed
+- Fixed crash when clicking "Remind me Later" on the update dialog
+
+>>>>>>> 7deeb065 (Merge pull request #884 from ionite34/fix-markdown)
 ## v2.12.3
 ### Added
 - Added new package - [SimpleSDXL](https://github.com/metercai/SimpleSDXL) - many thanks to @NullDev for the contribution!
diff --git a/StabilityMatrix.Avalonia/Controls/BetterMarkdownScrollViewer.cs b/StabilityMatrix.Avalonia/Controls/BetterMarkdownScrollViewer.cs
new file mode 100644
index 000000000..024bef8fa
--- /dev/null
+++ b/StabilityMatrix.Avalonia/Controls/BetterMarkdownScrollViewer.cs
@@ -0,0 +1,16 @@
+using Markdown.Avalonia;
+using StabilityMatrix.Avalonia.Styles.Markdown;
+
+namespace StabilityMatrix.Avalonia.Controls;
+
+/// <summary>
+/// Fix MarkdownScrollViewer IBrush errors and not working with Avalonia 11.2.0
+/// </summary>
+public class BetterMarkdownScrollViewer : MarkdownScrollViewer
+{
+    public BetterMarkdownScrollViewer()
+    {
+        MarkdownStyleName = "Empty";
+        MarkdownStyle = new MarkdownStyleFluentAvalonia();
+    }
+}
diff --git a/StabilityMatrix.Avalonia/DialogHelper.cs b/StabilityMatrix.Avalonia/DialogHelper.cs
index 0b98ddf13..f4c79278c 100644
--- a/StabilityMatrix.Avalonia/DialogHelper.cs
+++ b/StabilityMatrix.Avalonia/DialogHelper.cs
@@ -81,7 +81,11 @@ public static BetterContentDialog CreateTextEntryDialog(
         IReadOnlyList<TextBoxField> textFields
     )
     {
-        return CreateTextEntryDialog(title, new MarkdownScrollViewer { Markdown = description }, textFields);
+        return CreateTextEntryDialog(
+            title,
+            new BetterMarkdownScrollViewer { Markdown = description },
+            textFields
+        );
     }
 
     /// <summary>
@@ -94,7 +98,7 @@ public static BetterContentDialog CreateTextEntryDialog(
         IReadOnlyList<TextBoxField> textFields
     )
     {
-        var markdown = new MarkdownScrollViewer { Markdown = description };
+        var markdown = new BetterMarkdownScrollViewer { Markdown = description };
         var image = new BetterAdvancedImage((Uri?)null)
         {
             Source = imageSource,
@@ -235,7 +239,7 @@ public static BetterContentDialog CreateMarkdownDialog(
     {
         Dispatcher.UIThread.VerifyAccess();
 
-        var viewer = new MarkdownScrollViewer { Markdown = markdown };
+        var viewer = new BetterMarkdownScrollViewer { Markdown = markdown };
 
         // Apply syntax highlighting to code blocks if preset is provided
         if (editorPreset != default)
diff --git a/StabilityMatrix.Avalonia/StabilityMatrix.Avalonia.csproj b/StabilityMatrix.Avalonia/StabilityMatrix.Avalonia.csproj
index 3a8b64f4d..d99372018 100644
--- a/StabilityMatrix.Avalonia/StabilityMatrix.Avalonia.csproj
+++ b/StabilityMatrix.Avalonia/StabilityMatrix.Avalonia.csproj
@@ -113,7 +113,7 @@
         <PackageReference Include="FuzzySharp" Version="2.0.2" />
         <PackageReference Include="JetBrains.Annotations" Version="2024.2.0" />
         <PackageReference Include="KeyedSemaphores" Version="5.0.0" />
-        <PackageReference Include="Markdown.Avalonia" Version="11.0.2" />
+        <PackageReference Include="Markdown.Avalonia" Version="11.0.3-a1" />
         <PackageReference Include="MessagePipe" Version="1.8.1" />
         <PackageReference Include="MessagePipe.Interprocess" Version="1.8.1" />
         <PackageReference Include="MetadataExtractor" Version="2.8.1" />
diff --git a/StabilityMatrix.Avalonia/Styles/Markdown/MarkdownStyleFluentAvalonia.axaml b/StabilityMatrix.Avalonia/Styles/Markdown/MarkdownStyleFluentAvalonia.axaml
new file mode 100644
index 000000000..cf02c7d3e
--- /dev/null
+++ b/StabilityMatrix.Avalonia/Styles/Markdown/MarkdownStyleFluentAvalonia.axaml
@@ -0,0 +1,210 @@
+<Styles
+    x:Class="StabilityMatrix.Avalonia.Styles.Markdown.MarkdownStyleFluentAvalonia"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:avaloniaEdit="https://github.com/avaloniaui/avaloniaedit"
+    xmlns:ctxt="clr-namespace:ColorTextBlock.Avalonia;assembly=ColorTextBlock.Avalonia"
+    xmlns:extensions="clr-namespace:Markdown.Avalonia.SyntaxHigh.Extensions;assembly=Markdown.Avalonia.SyntaxHigh"
+    xmlns:md="clr-namespace:Markdown.Avalonia;assembly=Markdown.Avalonia"
+    xmlns:mdc="clr-namespace:Markdown.Avalonia.Controls;assembly=Markdown.Avalonia"
+    xmlns:mde="clr-namespace:Markdown.Avalonia.Extensions;assembly=Markdown.Avalonia">
+    <Styles.Resources>
+        <SolidColorBrush x:Key="MarkdownScrollViewer.SelectionBrush" Color="{DynamicResource SystemAccentColor}" />
+    </Styles.Resources>
+
+    <!--  Added: default one didn't set appendix styles for fluent avalonia  -->
+    <!--  partly from: https://github.com/whistyun/Markdown.Avalonia/blob/master/Markdown.Avalonia.SyntaxHigh/StyleCollections/AppendixOfFluentAvalonia.axaml  -->
+    <Style Selector=".CodeBlock avaloniaEdit|TextEditor">
+        <Setter Property="MinHeight" Value="30" />
+        <Setter Property="SyntaxHighlighting" Value="{extensions:SyntaxHighlightWrapper TextFillColorPrimaryBrush}" />
+        <Setter Property="VerticalScrollBarVisibility" Value="Disabled" />
+        <Setter Property="CornerRadius" Value="8" />
+    </Style>
+
+    <Style Selector=".CodeBlock Label.LangInfo">
+        <Setter Property="IsVisible" Value="False" />
+    </Style>
+
+    <Style Selector=".CodeBlock Button.CopyButton TextBlock">
+        <Setter Property="Text" Value="Copy" />
+    </Style>
+    <!--  end of added appendix styles  -->
+
+    <Style Selector=":is(md|MarkdownScrollViewer)">
+        <Style.Setters>
+            <Setter Property="SelectionBrush" Value="{DynamicResource TextControlSelectionHighlightColor}" />
+        </Style.Setters>
+    </Style>
+
+    <Style Selector=".Markdown_Avalonia_MarkdownViewer ctxt|CTextBlock">
+        <Style.Setters>
+            <Setter Property="SelectionBrush" Value="{DynamicResource TextControlSelectionHighlightColor}" />
+            <Setter Property="FontSize" Value="{mde:Multiply ControlContentThemeFontSize, 1}" />
+            <Setter Property="Margin" Value="0,5" />
+        </Style.Setters>
+    </Style>
+    <Style Selector=".Markdown_Avalonia_MarkdownViewer TextBlock">
+        <Style.Setters>
+            <Setter Property="FontSize" Value="{mde:Multiply ControlContentThemeFontSize, 1}" />
+        </Style.Setters>
+    </Style>
+
+    <Style Selector=".Markdown_Avalonia_MarkdownViewer ctxt|CTextBlock.Heading1">
+        <Style.Setters>
+            <Setter Property="FontSize" Value="{mde:Multiply ControlContentThemeFontSize, 3.2}" />
+            <Setter Property="Foreground" Value="{mde:Alpha TextFillColorPrimaryBrush}" />
+            <Setter Property="FontWeight" Value="Light" />
+        </Style.Setters>
+    </Style>
+
+    <Style Selector=".Markdown_Avalonia_MarkdownViewer ctxt|CTextBlock.Heading2">
+        <Style.Setters>
+            <Setter Property="FontSize" Value="{mde:Multiply ControlContentThemeFontSize, 1.6}" />
+            <Setter Property="Foreground" Value="{mde:Alpha TextFillColorPrimaryBrush}" />
+            <Setter Property="FontWeight" Value="Light" />
+        </Style.Setters>
+    </Style>
+
+    <Style Selector=".Markdown_Avalonia_MarkdownViewer ctxt|CTextBlock.Heading3">
+        <Style.Setters>
+            <Setter Property="FontSize" Value="{mde:Multiply ControlContentThemeFontSize, 1.6}" />
+            <Setter Property="Foreground" Value="{mde:Alpha TextFillColorPrimaryBrush, 0.7}" />
+            <Setter Property="FontWeight" Value="Light" />
+        </Style.Setters>
+    </Style>
+
+    <Style Selector=".Markdown_Avalonia_MarkdownViewer ctxt|CTextBlock.Heading4">
+        <Style.Setters>
+            <Setter Property="FontSize" Value="{mde:Multiply ControlContentThemeFontSize, 1.2}" />
+            <Setter Property="Foreground" Value="{mde:Alpha TextFillColorPrimaryBrush, 0.7}" />
+            <Setter Property="FontWeight" Value="Light" />
+        </Style.Setters>
+    </Style>
+
+    <Style Selector=".Markdown_Avalonia_MarkdownViewer ctxt|CHyperlink">
+        <Style.Setters>
+            <Setter Property="IsUnderline" Value="true" />
+            <Setter Property="Foreground" Value="{StaticResource SystemAccentColor}" />
+        </Style.Setters>
+    </Style>
+    <Style Selector=".Markdown_Avalonia_MarkdownViewer ctxt|CHyperlink:pointerover">
+        <Setter Property="Foreground" Value="{mde:Complementary SystemAccentColor}" />
+    </Style>
+
+    <Style Selector=".Markdown_Avalonia_MarkdownViewer Border.Table">
+        <Style.Setters>
+            <Setter Property="Margin" Value="5" />
+            <Setter Property="BorderThickness" Value="0,0,1,1" />
+            <Setter Property="BorderBrush" Value="{mde:Alpha TextFillColorPrimaryBrush, 0.7}" />
+        </Style.Setters>
+    </Style>
+
+    <Style Selector=".Markdown_Avalonia_MarkdownViewer Border.TightTable">
+        <Style.Setters>
+            <Setter Property="HorizontalAlignment" Value="Left" />
+        </Style.Setters>
+    </Style>
+
+    <Style Selector=".Markdown_Avalonia_MarkdownViewer Grid.Table &gt; Border">
+        <Style.Setters>
+            <Setter Property="Margin" Value="0" />
+            <Setter Property="BorderThickness" Value="1,1,0,0" />
+            <Setter Property="BorderBrush" Value="{mde:Alpha TextFillColorPrimaryBrush, 0.7}" />
+            <Setter Property="Padding" Value="2" />
+        </Style.Setters>
+    </Style>
+
+    <Style Selector=".Markdown_Avalonia_MarkdownViewer Border.TableHeader">
+        <Style.Setters>
+            <Setter Property="Background" Value="{mde:Alpha TextFillColorPrimaryBrush, 0.3}" />
+        </Style.Setters>
+    </Style>
+    <Style Selector=".Markdown_Avalonia_MarkdownViewer Border.TableHeader ctxt|CTextBlock">
+        <Style.Setters>
+            <Setter Property="FontWeight" Value="DemiBold" />
+        </Style.Setters>
+    </Style>
+
+    <Style Selector=".Markdown_Avalonia_MarkdownViewer Border.EvenTableRow">
+        <Style.Setters>
+            <Setter Property="Background" Value="{mde:Alpha ControlFillColorDefaultBrush, 0.9}" />
+        </Style.Setters>
+    </Style>
+
+    <Style Selector=".Markdown_Avalonia_MarkdownViewer Border.CodeBlock">
+        <Style.Setters>
+            <!--<Setter Property="BorderBrush"     Value="{mde:Alpha TextFillColorPrimaryBrush, 0.2}"/>-->
+            <!--<Setter Property="BorderThickness" Value="0,5,0,5"/>-->
+            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="CornerRadius" Value="4" />
+            <Setter Property="Margin" Value="5,0,5,0" />
+            <Setter Property="Background" Value="{mde:Alpha ControlFillColorDefaultBrush, 0.9}" />
+        </Style.Setters>
+    </Style>
+    <Style Selector=".Markdown_Avalonia_MarkdownViewer TextBlock.CodeBlock">
+        <Style.Setters>
+            <Setter Property="FontFamily" Value="menlo,monaco,consolas,droid sans mono,inconsolata,courier new,monospace,dejavu sans mono" />
+            <!--  Changed: DivideColor binding bork  -->
+            <!--<Setter Property="Foreground"      Value="{mde:DivideColor Blue, TextFillColorPrimary, 0.4}"/>-->
+            <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimary}" />
+        </Style.Setters>
+    </Style>
+    <Style Selector=".Markdown_Avalonia_MarkdownViewer Border.NoContainer">
+        <Style.Setters>
+            <Setter Property="BorderBrush" Value="Red" />
+        </Style.Setters>
+    </Style>
+
+    <Style Selector=".Markdown_Avalonia_MarkdownViewer ctxt|CCode">
+        <Style.Setters>
+            <!--  Changed: DivideColor binding bork  -->
+            <!--<Setter Property="Foreground" Value="{mde:DivideColor Blue, TextFillColorPrimary, 0.4}" />-->
+            <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimary}" />
+            <Setter Property="Background" Value="{mde:Alpha ControlFillColorDefaultBrush, 0.9}" />
+        </Style.Setters>
+    </Style>
+
+    <Style Selector=".Markdown_Avalonia_MarkdownViewer Border.Note">
+        <Style.Setters>
+            <Setter Property="Margin" Value="5,0,5,0" />
+            <Setter Property="BorderBrush" Value="{mde:Alpha TextFillColorPrimaryBrush, 0.2}" />
+            <Setter Property="BorderThickness" Value="3,3,3,3" />
+            <Setter Property="Background" Value="{mde:Alpha ControlFillColorDefaultBrush, 0.9}" />
+        </Style.Setters>
+    </Style>
+    <Style Selector=".Markdown_Avalonia_MarkdownViewer ctxt|CTextBlock.Note">
+        <Style.Setters>
+            <Setter Property="Margin" Value="10, 5" />
+        </Style.Setters>
+    </Style>
+
+    <Style Selector=".Markdown_Avalonia_MarkdownViewer Grid.List">
+        <Style.Setters>
+            <Setter Property="Margin" Value="40,0,0,0" />
+        </Style.Setters>
+    </Style>
+    <Style Selector=".Markdown_Avalonia_MarkdownViewer ctxt|CTextBlock.ListMarker">
+        <Style.Setters>
+            <Setter Property="Margin" Value="0,5,5,5" />
+        </Style.Setters>
+    </Style>
+
+    <Style Selector=".Markdown_Avalonia_MarkdownViewer Border.Blockquote">
+        <Style.Setters>
+            <Setter Property="BorderBrush" Value="{mde:Alpha TextFillColorPrimaryBrush, 0.2}" />
+            <Setter Property="BorderThickness" Value="5,0,0,0" />
+        </Style.Setters>
+    </Style>
+
+    <Style Selector=".Markdown_Avalonia_MarkdownViewer StackPanel.Blockquote">
+        <Style.Setters>
+            <Setter Property="Margin" Value="10, 5" />
+        </Style.Setters>
+    </Style>
+
+    <Style Selector=".Markdown_Avalonia_MarkdownViewer mdc|Rule">
+        <Style.Setters>
+            <Setter Property="Margin" Value="0,3" />
+        </Style.Setters>
+    </Style>
+</Styles>
diff --git a/StabilityMatrix.Avalonia/Styles/Markdown/MarkdownStyleFluentAvalonia.axaml.cs b/StabilityMatrix.Avalonia/Styles/Markdown/MarkdownStyleFluentAvalonia.axaml.cs
new file mode 100644
index 000000000..e8ece0398
--- /dev/null
+++ b/StabilityMatrix.Avalonia/Styles/Markdown/MarkdownStyleFluentAvalonia.axaml.cs
@@ -0,0 +1,11 @@
+using Avalonia.Markup.Xaml;
+
+namespace StabilityMatrix.Avalonia.Styles.Markdown;
+
+public partial class MarkdownStyleFluentAvalonia : global::Avalonia.Styling.Styles
+{
+    public MarkdownStyleFluentAvalonia()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
+}
diff --git a/StabilityMatrix.Avalonia/Views/Dialogs/LykosLoginDialog.axaml b/StabilityMatrix.Avalonia/Views/Dialogs/LykosLoginDialog.axaml
index 905a5cd39..e958b96d2 100644
--- a/StabilityMatrix.Avalonia/Views/Dialogs/LykosLoginDialog.axaml
+++ b/StabilityMatrix.Avalonia/Views/Dialogs/LykosLoginDialog.axaml
@@ -3,132 +3,128 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="clr-namespace:StabilityMatrix.Avalonia.Controls"
+    xmlns:ctxt="clr-namespace:ColorTextBlock.Avalonia;assembly=ColorTextBlock.Avalonia"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:lang="clr-namespace:StabilityMatrix.Avalonia.Languages"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:mdxaml="https://github.com/whistyun/Markdown.Avalonia.Tight"
     xmlns:mocks="clr-namespace:StabilityMatrix.Avalonia.DesignData"
     xmlns:sg="clr-namespace:SpacedGridControl.Avalonia;assembly=SpacedGridControl.Avalonia"
+    xmlns:sm="clr-namespace:StabilityMatrix.Avalonia"
     xmlns:ui="using:FluentAvalonia.UI.Controls"
     xmlns:vmDialogs="clr-namespace:StabilityMatrix.Avalonia.ViewModels.Dialogs"
-    xmlns:lang="clr-namespace:StabilityMatrix.Avalonia.Languages"
-    xmlns:sm="clr-namespace:StabilityMatrix.Avalonia"
-    xmlns:mdxaml="https://github.com/whistyun/Markdown.Avalonia.Tight"
-    xmlns:ctxt="clr-namespace:ColorTextBlock.Avalonia;assembly=ColorTextBlock.Avalonia"
-    Focusable="True"
     MaxWidth="400"
     d:DataContext="{x:Static mocks:DesignData.LykosLoginViewModel}"
     d:DesignHeight="350"
     d:DesignWidth="400"
     x:DataType="vmDialogs:LykosLoginViewModel"
+    Focusable="True"
     mc:Ignorable="d">
 
     <sg:SpacedGrid MinWidth="400" MinHeight="300">
         <!--<TextBlock Text="Log in or sign up" Theme="{DynamicResource SubtitleTextBlockStyle}" />-->
         <TabControl SelectedIndex="{Binding IsSignupMode}">
-            <TabItem
-                FontSize="20"
-                Header="Login">
-                
+            <TabItem FontSize="20" Header="Login">
+
                 <sg:SpacedGrid
                     Margin="-4,32,-4,8"
                     RowDefinitions="Auto,Auto,Auto,*,*"
                     RowSpacing="8">
                     <!--  Username  -->
                     <TextBox
-                        Watermark="{x:Static lang:Resources.Label_Email}"
+                        Grid.Row="0"
                         Text="{Binding Email}"
                         UseFloatingWatermark="True"
-                        Grid.Row="0" />
+                        Watermark="{x:Static lang:Resources.Label_Email}" />
                     <!--  Password  -->
-                    <MaskedTextBox 
+                    <MaskedTextBox
+                        Grid.Row="1"
                         PasswordChar="*"
                         Text="{Binding Password}"
-                        Watermark="{x:Static lang:Resources.Label_Password}"
-                        Grid.Row="1" />
-                    
-                    <ui:InfoBar 
-                        Severity="Error"
-                        IsOpen="{Binding LoginError, Converter={x:Static ObjectConverters.IsNotNull}}"
+                        Watermark="{x:Static lang:Resources.Label_Password}" />
+
+                    <ui:InfoBar
                         Title="{Binding LoginError.Message}"
+                        Grid.Row="2"
+                        IsOpen="{Binding LoginError, Converter={x:Static ObjectConverters.IsNotNull}}"
                         Message="{Binding LoginError.Details}"
-                        Grid.Row="2"/>
-                    
+                        Severity="Error" />
+
                     <controls:HyperlinkIconButton
+                        Grid.Row="3"
                         VerticalAlignment="Bottom"
                         Content="Forgot Password?"
-                        NavigateUri="{x:Static sm:Assets.LykosForgotPasswordUrl}"
-                        Grid.Row="3"/>
-                    
+                        NavigateUri="{x:Static sm:Assets.LykosForgotPasswordUrl}" />
+
                     <controls:HyperlinkIconButton
+                        Grid.Row="4"
                         VerticalAlignment="Bottom"
-                        Content="Sign in with Google"
                         Command="{Binding GoogleOAuthButtonClickCommand}"
-                        Grid.Row="4"/>
+                        Content="Sign in with Google" />
                 </sg:SpacedGrid>
-                
+
             </TabItem>
-            <TabItem
-                FontSize="20"
-                Header="Sign up">
-                
+            <TabItem FontSize="20" Header="Sign up">
+
                 <sg:SpacedGrid
                     Margin="-4,32,-4,8"
                     RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto"
                     RowSpacing="8">
                     <!--  Email  -->
                     <TextBox
-                        Watermark="{x:Static lang:Resources.Label_Email}"
+                        Grid.Row="0"
                         Text="{Binding Email}"
                         UseFloatingWatermark="True"
-                        Grid.Row="0" />
+                        Watermark="{x:Static lang:Resources.Label_Email}" />
                     <!--  Username  -->
                     <TextBox
-                        Watermark="{x:Static lang:Resources.Label_Username}"
+                        Grid.Row="1"
                         Text="{Binding Username}"
                         UseFloatingWatermark="True"
-                        Grid.Row="1" />
+                        Watermark="{x:Static lang:Resources.Label_Username}" />
                     <!--  Password  -->
-                    <TextBox 
+                    <TextBox
+                        Grid.Row="2"
                         PasswordChar="*"
                         Text="{Binding Password}"
-                        Watermark="{x:Static lang:Resources.Label_Password}"
                         UseFloatingWatermark="True"
-                        Grid.Row="2" />
+                        Watermark="{x:Static lang:Resources.Label_Password}" />
                     <!--  Confirm Password  -->
-                    <TextBox 
+                    <TextBox
+                        Grid.Row="3"
                         PasswordChar="*"
                         Text="{Binding ConfirmPassword}"
-                        Watermark="{x:Static lang:Resources.Label_ConfirmPassword}"
                         UseFloatingWatermark="True"
-                        Grid.Row="3" />
-                    
-                    <ui:InfoBar 
-                        Severity="Error"
-                        IsOpen="{Binding SignupError, Converter={x:Static ObjectConverters.IsNotNull}}"
+                        Watermark="{x:Static lang:Resources.Label_ConfirmPassword}" />
+
+                    <ui:InfoBar
                         Title="{Binding SignupError.Message}"
+                        Grid.Row="4"
+                        IsOpen="{Binding SignupError, Converter={x:Static ObjectConverters.IsNotNull}}"
                         Message="{Binding SignupError.Details}"
-                        Grid.Row="4"/>
-                    
-                    <mdxaml:MarkdownScrollViewer
+                        Severity="Error" />
+
+                    <controls:BetterMarkdownScrollViewer
                         Grid.Row="5"
+                        MaxWidth="380"
                         Margin="4,0"
                         VerticalAlignment="Bottom"
-                        MaxWidth="380"
-                        TextElement.Foreground="{DynamicResource TextFillColorTertiaryBrush}"
-                        Markdown="{Binding SignupFooterMarkdown}">
-                        <mdxaml:MarkdownScrollViewer.Styles>
+                        Markdown="{Binding SignupFooterMarkdown}"
+                        TextElement.Foreground="{DynamicResource TextFillColorTertiaryBrush}">
+                        <controls:BetterMarkdownScrollViewer.Styles>
                             <Style Selector="ctxt|CHyperlink">
                                 <Style.Setters>
-                                    <Setter Property="IsUnderline" Value="False"/>
+                                    <Setter Property="IsUnderline" Value="False" />
                                 </Style.Setters>
                             </Style>
                             <Style Selector="ctxt|CHyperlink:pointerover">
-                                <Setter Property="IsUnderline" Value="True"/>
-                                <Setter Property="Foreground" Value="{StaticResource ThemeEldenRingOrangeColor}"/>
+                                <Setter Property="IsUnderline" Value="True" />
+                                <Setter Property="Foreground" Value="{StaticResource ThemeEldenRingOrangeColor}" />
                             </Style>
-                        </mdxaml:MarkdownScrollViewer.Styles>
-                    </mdxaml:MarkdownScrollViewer>
+                        </controls:BetterMarkdownScrollViewer.Styles>
+                    </controls:BetterMarkdownScrollViewer>
                 </sg:SpacedGrid>
-                
+
             </TabItem>
         </TabControl>
     </sg:SpacedGrid>
diff --git a/StabilityMatrix.Avalonia/Views/Dialogs/UpdateDialog.axaml b/StabilityMatrix.Avalonia/Views/Dialogs/UpdateDialog.axaml
index c463e833c..88aa3a8be 100644
--- a/StabilityMatrix.Avalonia/Views/Dialogs/UpdateDialog.axaml
+++ b/StabilityMatrix.Avalonia/Views/Dialogs/UpdateDialog.axaml
@@ -1,107 +1,120 @@
-<controls:UserControlBase xmlns="https://github.com/avaloniaui"
-                          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                          xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                          xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                          xmlns:dialogs="clr-namespace:StabilityMatrix.Avalonia.ViewModels.Dialogs"
-                          xmlns:ui="using:FluentAvalonia.UI.Controls"
-                          xmlns:mocks="clr-namespace:StabilityMatrix.Avalonia.DesignData"
-                          xmlns:controls="clr-namespace:StabilityMatrix.Avalonia.Controls"
-                          xmlns:mdxaml="https://github.com/whistyun/Markdown.Avalonia.Tight"
-                          xmlns:lang="clr-namespace:StabilityMatrix.Avalonia.Languages"
-                          xmlns:fluentIcons="clr-namespace:FluentIcons.Avalonia.Fluent;assembly=FluentIcons.Avalonia.Fluent"
-                          d:DataContext="{x:Static mocks:DesignData.UpdateViewModel}"
-                          x:DataType="dialogs:UpdateViewModel"
-                          mc:Ignorable="d" d:DesignWidth="700" d:DesignHeight="550"
-                          x:Class="StabilityMatrix.Avalonia.Views.Dialogs.UpdateDialog">
+<controls:UserControlBase
+    x:Class="StabilityMatrix.Avalonia.Views.Dialogs.UpdateDialog"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:StabilityMatrix.Avalonia.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:dialogs="clr-namespace:StabilityMatrix.Avalonia.ViewModels.Dialogs"
+    xmlns:fluentIcons="clr-namespace:FluentIcons.Avalonia.Fluent;assembly=FluentIcons.Avalonia.Fluent"
+    xmlns:lang="clr-namespace:StabilityMatrix.Avalonia.Languages"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:mdxaml="https://github.com/whistyun/Markdown.Avalonia.Tight"
+    xmlns:mocks="clr-namespace:StabilityMatrix.Avalonia.DesignData"
+    xmlns:ui="using:FluentAvalonia.UI.Controls"
+    d:DataContext="{x:Static mocks:DesignData.UpdateViewModel}"
+    d:DesignHeight="550"
+    d:DesignWidth="700"
+    x:DataType="dialogs:UpdateViewModel"
+    mc:Ignorable="d">
     <Grid RowDefinitions="Auto,Auto,Auto,Auto,*,Auto,Auto">
-        
+
         <!--<TitleBar Background="{ui:ThemeResource ApplicationBackgroundBrush}">
             <TitleBar.Header>
                 <TextBlock Margin="16,8" Text="Stability Matrix - Update Available" />
             </TitleBar.Header>
         </TitleBar>-->
-        
-        <TextBlock Grid.Row="0" 
-                   Text="{x:Static lang:Resources.Label_NewVersionAvailable}"
-                   HorizontalAlignment="Center"
-                   FontWeight="Thin"
-                   Margin="0,16,0,0"
-                   FontSize="28"/>
-        
-        <StackPanel Grid.Row="1" 
-                    Margin="0,4"
-                    Orientation="Horizontal" 
-                    IsVisible="{Binding UpdateText, Converter={x:Static StringConverters.IsNullOrEmpty}}"
-                    HorizontalAlignment="Center">
+
+        <TextBlock
+            Grid.Row="0"
+            Margin="0,16,0,0"
+            HorizontalAlignment="Center"
+            FontSize="28"
+            FontWeight="Thin"
+            Text="{x:Static lang:Resources.Label_NewVersionAvailable}" />
+
+        <StackPanel
+            Grid.Row="1"
+            Margin="0,4"
+            HorizontalAlignment="Center"
+            IsVisible="{Binding UpdateText, Converter={x:Static StringConverters.IsNullOrEmpty}}"
+            Orientation="Horizontal">
             <TextBlock
-                Foreground="{StaticResource ThemeGreyColor}"
                 FontSize="18"
-                Text="{Binding CurrentVersionText}"/>
-            <fluentIcons:SymbolIcon 
-                FontSize="15"
+                Foreground="{StaticResource ThemeGreyColor}"
+                Text="{Binding CurrentVersionText}" />
+            <fluentIcons:SymbolIcon
                 Margin="8,0"
                 VerticalAlignment="Center"
-                Symbol="ArrowRight" 
-                IconVariant="Filled"/>
-            <TextBlock
-                FontSize="18"
-                Text="{Binding NewVersionText}"/>
+                FontSize="15"
+                IconVariant="Filled"
+                Symbol="ArrowRight" />
+            <TextBlock FontSize="18" Text="{Binding NewVersionText}" />
         </StackPanel>
-        
-        <TextBlock Grid.Row="1" 
-                   HorizontalAlignment="Center"
-                   FontSize="18"
-                   TextWrapping="Wrap"
-                   TextAlignment="Center"
-                   IsVisible="{Binding UpdateText, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
-                   Text="{Binding UpdateText}"
-                   Margin="16,32,16,0"/>
-        
-        <TextBlock Grid.Row="2" 
-                   Text="{x:Static lang:Resources.Label_ReleaseNotes}" 
-                   FontSize="16"
-                   IsVisible="{Binding !ShowProgressBar}"
-                   Margin="32,16,32,0"/>
-        
-        <ProgressBar Grid.Row="3" 
-                     Height="200"
-                     Value="{Binding ProgressValue}"
-                     IsIndeterminate="{Binding IsProgressIndeterminate}"
-                     IsVisible="{Binding ShowProgressBar}"
-                     Margin="32"/>
-        
-        <Grid Grid.Row="4" 
-              Margin="8"
-              IsVisible="{Binding !ShowProgressBar}">
-            <Border Margin="32, 16"
-                    CornerRadius="8"
-                    Background="{DynamicResource ButtonBackgroundPressed}">
-                <mdxaml:MarkdownScrollViewer
-                    Margin="16"
-                    Markdown="{Binding ReleaseNotes, Mode=OneWay}"/>
+
+        <TextBlock
+            Grid.Row="1"
+            Margin="16,32,16,0"
+            HorizontalAlignment="Center"
+            FontSize="18"
+            IsVisible="{Binding UpdateText, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
+            Text="{Binding UpdateText}"
+            TextAlignment="Center"
+            TextWrapping="Wrap" />
+
+        <TextBlock
+            Grid.Row="2"
+            Margin="32,16,32,0"
+            FontSize="16"
+            IsVisible="{Binding !ShowProgressBar}"
+            Text="{x:Static lang:Resources.Label_ReleaseNotes}" />
+
+        <ProgressBar
+            Grid.Row="3"
+            Height="200"
+            Margin="32"
+            IsIndeterminate="{Binding IsProgressIndeterminate}"
+            IsVisible="{Binding ShowProgressBar}"
+            Value="{Binding ProgressValue}" />
+
+        <Grid
+            Grid.Row="4"
+            Margin="8"
+            IsVisible="{Binding !ShowProgressBar}">
+            <Border
+                Margin="32,16"
+                Background="{DynamicResource ButtonBackgroundPressed}"
+                CornerRadius="8">
+                <controls:BetterMarkdownScrollViewer Margin="16" Markdown="{Binding ReleaseNotes, Mode=OneWay}" />
             </Border>
         </Grid>
-        
-        <ui:InfoBar Grid.Row="5" 
-                    Margin="64,0,64,16"
-                    IsOpen="True"
-                    IsClosable="False"
-                    Title="{x:Static lang:Resources.Text_AppWillRelaunchAfterUpdate}" /> 
-        
-        <StackPanel Grid.Row="6" Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,0,0,16">
-            <Button Content="{x:Static lang:Resources.Action_RemindMeLater}"
-                    Classes="info"
-                    Margin="0,0,8,0"
-                    FontSize="15"
-                    Command="{Binding OnCloseButtonClick}"
-                    IsEnabled="{Binding !InstallUpdateCommand.IsRunning}" />
-            
-            <Button Content="{x:Static lang:Resources.Action_InstallNow}"
-                    Classes="success"
-                       Margin="8,0,0,0"
-                       FontSize="15"
-                       Command="{Binding InstallUpdateCommand}" />
+
+        <ui:InfoBar
+            Title="{x:Static lang:Resources.Text_AppWillRelaunchAfterUpdate}"
+            Grid.Row="5"
+            Margin="64,0,64,16"
+            IsClosable="False"
+            IsOpen="True" />
+
+        <StackPanel
+            Grid.Row="6"
+            Margin="0,0,0,16"
+            HorizontalAlignment="Center"
+            Orientation="Horizontal">
+            <Button
+                Margin="0,0,8,0"
+                Classes="info"
+                Command="{Binding OnCloseButtonClick}"
+                Content="{x:Static lang:Resources.Action_RemindMeLater}"
+                FontSize="15"
+                IsEnabled="{Binding !InstallUpdateCommand.IsRunning}" />
+
+            <Button
+                Margin="8,0,0,0"
+                Classes="success"
+                Command="{Binding InstallUpdateCommand}"
+                Content="{x:Static lang:Resources.Action_InstallNow}"
+                FontSize="15" />
         </StackPanel>
-        
+
     </Grid>
 </controls:UserControlBase>

From 12e16518e74b534a8fb67cd68e00fef700240816 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Sun, 10 Nov 2024 15:46:00 -0500
Subject: [PATCH 02/14] Fix merge

---
 CHANGELOG.md | 53 ----------------------------------------------------
 1 file changed, 53 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 515c72895..a46fb7ede 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,63 +5,10 @@ All notable changes to Stability Matrix will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2.0.0.html).
 
-<<<<<<< HEAD
-=======
-## v2.13.0-dev.3
-### Added
-- Added support for SD3.5 in Inference
-- Added CLIP_G to HuggingFace model browser
-- Added search bar to the Installed Workflows tab
-- Added "Search with Google" and "Search with ChatGPT" to the console output context menu
-- Added "Date Created" and "Date Last Modified" sorting options to the Checkpoints tab
-### Changed
-- Text Encoder / CLIP selection in Inference is now enabled via the cogwheel ⚙️ button next to the model selector 
-- Added more base model types to the CivitAI Model Browser & Checkpoint Manager
-- Updated Russian translations thanks to @vanja-san
-- Updated Simplified Chinese translations thanks to @QL-boy
-### Fixed
-- Fixed some instances of Civitai model browser not loading new results
-- Fixed "Unsupported Torch Version: Cuda" errors when installing a1111
-- Fixed crash when clicking "Remind me Later" on the update dialog
-
-## v2.13.0-dev.2
-### Added
-- Added new package - [SimpleSDXL](https://github.com/metercai/SimpleSDXL) - many thanks to @NullDev for the contribution!
-- Added new package - [FluxGym](https://github.com/cocktailpeanut/fluxgym) - many thanks to @NullDev for the contribution!
-- Added a new "Extension Packs" section to the extension manager, allowing you to create packs for easier installation of multiple extensions at once
-- Added "Search by Creator" command to Civitai browser context menu
-- Added Beta scheduler to the scheduler selector in Inference
-- Added zipping of log files and "Show Log in Explorer" button on exceptions dialog for easier support
-- Added max concurrent downloads option & download queueing for most downloads
-### Changed
-- (Internal) Updated to Avalonia 11.1.4
-- Adjusted the Branch/Release toggle during package install flow to be a little more obvious
-- Updated the Dock library used for Inference - fixes some weirdness with resizing / rearranging panels
-### Fixed
-- Fixed ComfyUI NF4 extension not installing properly when prompted in Inference
-- Fixed [#932](https://github.com/LykosAI/StabilityMatrix/issues/932), [#935](https://github.com/LykosAI/StabilityMatrix/issues/935), [#939](https://github.com/LykosAI/StabilityMatrix/issues/939) - InvokeAI failing to update
-- Fixed repeated nested folders being created in `Models/StableDiffusion` when using Forge in Symlink mode in certain conditions. Existing folders will be repaired to their original structure on launch.
-- Fixed minimize button not working on macOS
-- Fixed InvokeAI model sharing spamming the console with "This may take awhile" in certain conditions
-- Fixed text alignment issues in the Downloads tab for certain long names / progress infos
-### Supporters
-#### Visionaries
-- A big thank you to our amazing Visionary-tier Patreon supporter, **Waterclouds**! Your continued support is invaluable!
-
-## v2.13.0-dev.1
-### Added
-- Added the ability to change the Models directory separately from the rest of the Data directory. This can be set in `Settings > Select new Models Folder`
-- Added "Copy" menu to the Inference gallery context menu, allowing you to copy the image or the seed (other params coming soon™️)
-- Added InvokeAI model sharing option
-### Supporters
-#### Visionaries
-- A heartfelt thank you to our incredible Visionary-tier Patreon supporter, **Waterclouds**! Your ongoing support means a lot to us, and we’re grateful to have you with us on this journey!
-
 ## v2.12.4
 ### Fixed
 - Fixed crash when clicking "Remind me Later" on the update dialog
 
->>>>>>> 7deeb065 (Merge pull request #884 from ionite34/fix-markdown)
 ## v2.12.3
 ### Added
 - Added new package - [SimpleSDXL](https://github.com/metercai/SimpleSDXL) - many thanks to @NullDev for the contribution!

From 95b085c083309d22c51a4febaa0d22e5b8d02d0f Mon Sep 17 00:00:00 2001
From: JT <mohnjiles@gmail.com>
Date: Wed, 13 Nov 2024 21:04:48 -0800
Subject: [PATCH 03/14] Merge pull request #887 from
 ionite34/dynamic-base-model-types

Get base model types from civit dynamically

(cherry picked from commit 5db87ce925b2163feb7e5c7448d54cf67767ba4e)

# Conflicts:
#	CHANGELOG.md
---
 CHANGELOG.md                                  | 67 +++++++++++++
 .../CivitAiBrowserViewModel.cs                | 95 ++++++++++++++++++-
 .../Views/CivitAiBrowserPage.axaml            | 10 +-
 StabilityMatrix.Core/Api/ICivitApi.cs         |  6 +-
 .../Models/Api/CivitBaseModelType.cs          | 12 +++
 .../Models/Api/CivitFileType.cs               |  1 +
 .../Models/Api/CivitModelFormat.cs            |  1 +
 .../Models/Packages/BaseGitPackage.cs         | 23 ++++-
 .../Models/Packages/BasePackage.cs            |  2 +-
 9 files changed, 203 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a46fb7ede..61bc543b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,9 +5,76 @@ All notable changes to Stability Matrix will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2.0.0.html).
 
+<<<<<<< HEAD
+=======
+## v2.13.0-dev.3
+### Added
+- Added support for SD3.5 in Inference
+- Added CLIP_G to HuggingFace model browser
+- Added search bar to the Installed Workflows tab
+- Added "Search with Google" and "Search with ChatGPT" to the console output context menu
+- Added "Date Created" and "Date Last Modified" sorting options to the Checkpoints tab
+### Changed
+- Text Encoder / CLIP selection in Inference is now enabled via the cogwheel ⚙️ button next to the model selector 
+- Added more base model types to the CivitAI Model Browser & Checkpoint Manager
+- Model browser base model types are now loaded dynamically from CivitAI, reducing the need for updates to add new types
+- Updated Russian translations thanks to @vanja-san
+- Updated Simplified Chinese translations thanks to @QL-boy
+- (Internal) Updated to Avalonia 11.2.0
+### Fixed
+- Fixed some instances of Civitai model browser not loading new results
+- Fixed "Unsupported Torch Version: Cuda" errors when installing a1111
+- Fixed crash when clicking "Remind me Later" on the update dialog
+- Fixed some cases of crashing when GitHub API rate limits are exceeded
+### Supporters
+#### Visionaries
+- Big shoutout to our amazing Visionary-tier Patreon supporter, **Waterclouds**! We are very grateful for your continued support!
+
+## v2.13.0-dev.2
+### Added
+- Added new package - [SimpleSDXL](https://github.com/metercai/SimpleSDXL) - many thanks to @NullDev for the contribution!
+- Added new package - [FluxGym](https://github.com/cocktailpeanut/fluxgym) - many thanks to @NullDev for the contribution!
+- Added a new "Extension Packs" section to the extension manager, allowing you to create packs for easier installation of multiple extensions at once
+- Added "Search by Creator" command to Civitai browser context menu
+- Added Beta scheduler to the scheduler selector in Inference
+- Added zipping of log files and "Show Log in Explorer" button on exceptions dialog for easier support
+- Added max concurrent downloads option & download queueing for most downloads
+### Changed
+- (Internal) Updated to Avalonia 11.1.4
+- Adjusted the Branch/Release toggle during package install flow to be a little more obvious
+- Updated the Dock library used for Inference - fixes some weirdness with resizing / rearranging panels
+### Fixed
+- Fixed ComfyUI NF4 extension not installing properly when prompted in Inference
+- Fixed [#932](https://github.com/LykosAI/StabilityMatrix/issues/932), [#935](https://github.com/LykosAI/StabilityMatrix/issues/935), [#939](https://github.com/LykosAI/StabilityMatrix/issues/939) - InvokeAI failing to update
+- Fixed repeated nested folders being created in `Models/StableDiffusion` when using Forge in Symlink mode in certain conditions. Existing folders will be repaired to their original structure on launch.
+- Fixed minimize button not working on macOS
+- Fixed InvokeAI model sharing spamming the console with "This may take awhile" in certain conditions
+- Fixed text alignment issues in the Downloads tab for certain long names / progress infos
+### Supporters
+#### Visionaries
+- A big thank you to our amazing Visionary-tier Patreon supporter, **Waterclouds**! Your continued support is invaluable!
+
+## v2.13.0-dev.1
+### Added
+- Added the ability to change the Models directory separately from the rest of the Data directory. This can be set in `Settings > Select new Models Folder`
+- Added "Copy" menu to the Inference gallery context menu, allowing you to copy the image or the seed (other params coming soon™️)
+- Added InvokeAI model sharing option
+### Supporters
+#### Visionaries
+- A heartfelt thank you to our incredible Visionary-tier Patreon supporter, **Waterclouds**! Your ongoing support means a lot to us, and we’re grateful to have you with us on this journey!
+
+>>>>>>> 5db87ce9 (Merge pull request #887 from ionite34/dynamic-base-model-types)
 ## v2.12.4
+### Changed
+- Model browser base model types are now loaded dynamically from CivitAI, reducing the need for updates to add new types
 ### Fixed
 - Fixed crash when clicking "Remind me Later" on the update dialog
+- Fixed some cases of crashing when GitHub API rate limits are exceeded
+### Supporters
+#### Visionaries
+- A huge thank you to our dedicated Visionary-tier Patreon supporter, **Waterclouds**! We’re thrilled to have your ongoing support!
+#### Pioneers
+- Shoutout to our great Pioneer-tier patrons: **tankfox**, **tanangular**, **Mr. Unknown**, **Szir777**, and our newest Pioneer, **Tigon**!. Your continued support is greatly appreciated!
 
 ## v2.12.3
 ### Added
diff --git a/StabilityMatrix.Avalonia/ViewModels/CheckpointBrowser/CivitAiBrowserViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/CheckpointBrowser/CivitAiBrowserViewModel.cs
index e08626b6b..e163e8821 100644
--- a/StabilityMatrix.Avalonia/ViewModels/CheckpointBrowser/CivitAiBrowserViewModel.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/CheckpointBrowser/CivitAiBrowserViewModel.cs
@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Net.Http;
 using System.Reactive.Linq;
+using System.Text.Json.Nodes;
 using System.Threading.Tasks;
 using AsyncAwaitBestPractices;
 using Avalonia.Controls;
@@ -42,6 +43,7 @@ public sealed partial class CivitAiBrowserViewModel : TabViewModelBase, IInfinit
     private readonly ISettingsManager settingsManager;
     private readonly ILiteDbContext liteDbContext;
     private readonly INotificationService notificationService;
+    private bool dontSearch = false;
 
     private readonly SourceCache<OrderedValue<CivitModel>, int> modelCache = new(static ov => ov.Value.Id);
 
@@ -80,7 +82,7 @@ public sealed partial class CivitAiBrowserViewModel : TabViewModelBase, IInfinit
     private string noResultsText = string.Empty;
 
     [ObservableProperty]
-    private string selectedBaseModelType = "All";
+    private string selectedBaseModelType;
 
     [ObservableProperty]
     private bool showSantaHats = true;
@@ -98,6 +100,11 @@ public sealed partial class CivitAiBrowserViewModel : TabViewModelBase, IInfinit
     [NotifyPropertyChangedFor(nameof(StatsResizeFactor))]
     private double resizeFactor;
 
+    private readonly SourceCache<string, string> baseModelCache = new(static s => s);
+
+    [ObservableProperty]
+    private IObservableCollection<string> allBaseModels = new ObservableCollectionExtended<string>();
+
     public double StatsResizeFactor => Math.Clamp(ResizeFactor, 0.75d, 1.25d);
 
     public IEnumerable<CivitPeriod> AllCivitPeriods =>
@@ -111,9 +118,6 @@ public sealed partial class CivitAiBrowserViewModel : TabViewModelBase, IInfinit
             .Where(t => t == CivitModelType.All || t.ConvertTo<SharedFolderType>() > 0)
             .OrderBy(t => t.ToString());
 
-    public IEnumerable<string> BaseModelOptions =>
-        Enum.GetValues<CivitBaseModelType>().Select(t => t.GetStringValue());
-
     public CivitAiBrowserViewModel(
         ICivitApi civitApi,
         IDownloadService downloadService,
@@ -165,6 +169,10 @@ or nameof(HideEarlyAccessModels)
             .SortAndBind(ModelCards, sortPredicate)
             .Subscribe();
 
+        baseModelCache.Connect().DeferUntilLoaded().SortAndBind(AllBaseModels).Subscribe();
+
+        baseModelCache.AddOrUpdate(Enum.GetValues<CivitBaseModelType>().Select(t => t.GetStringValue()));
+
         settingsManager.RelayPropertyFor(
             this,
             model => model.ShowNsfw,
@@ -234,6 +242,34 @@ public override void OnLoaded()
         {
             SearchModelsCommand.ExecuteAsync(false);
         }
+
+        base.OnLoaded();
+    }
+
+    protected override async Task OnInitialLoadedAsync()
+    {
+        await base.OnInitialLoadedAsync();
+        var baseModels = await GetBaseModelList();
+        if (baseModels.Count == 0)
+        {
+            LoadSelectedBaseModelType();
+            return;
+        }
+
+        dontSearch = true;
+        baseModelCache.AddOrUpdate(baseModels);
+        dontSearch = false;
+
+        LoadSelectedBaseModelType();
+    }
+
+    private void LoadSelectedBaseModelType()
+    {
+        var searchOptions = settingsManager.Settings.ModelSearchOptions;
+        dontSearch = true;
+        SelectedBaseModelType = "All";
+        SelectedBaseModelType = searchOptions is null ? "All" : searchOptions.SelectedBaseModelType;
+        dontSearch = false;
     }
 
     /// <summary>
@@ -340,7 +376,22 @@ private async Task CivitModelQuery(CivitModelsRequest request, bool isInfiniteSc
                 }
             );
 
-            UpdateModelCards(models, isInfiniteScroll);
+            if (cacheNew)
+            {
+                var doesBaseModelTypeMatch =
+                    SelectedBaseModelType == "All"
+                        ? string.IsNullOrWhiteSpace(request.BaseModel)
+                        : SelectedBaseModelType == request.BaseModel;
+                var doesModelTypeMatch =
+                    SelectedModelType == CivitModelType.All
+                        ? request.Types == null || request.Types.Length == 0
+                        : SelectedModelType == request.Types?.FirstOrDefault();
+
+                if (doesBaseModelTypeMatch && doesModelTypeMatch)
+                {
+                    UpdateModelCards(models, isInfiniteScroll);
+                }
+            }
 
             NextPageCursor = modelsResponse?.Metadata?.NextCursor;
         }
@@ -615,6 +666,9 @@ partial void OnSelectedModelTypeChanged(CivitModelType value)
 
     partial void OnSelectedBaseModelTypeChanged(string value)
     {
+        if (dontSearch)
+            return;
+
         TrySearchAgain().SafeFireAndForget();
         settingsManager.Transaction(
             s =>
@@ -632,6 +686,7 @@ private async Task TrySearchAgain(bool shouldUpdatePageNumber = true)
     {
         if (!HasSearched)
             return;
+
         modelCache.Clear();
 
         if (shouldUpdatePageNumber)
@@ -649,5 +704,35 @@ private void UpdateResultsText()
         NoResultsText = "No results found";
     }
 
+    [Localizable(false)]
+    private async Task<List<string>> GetBaseModelList()
+    {
+        try
+        {
+            var baseModelsResponse = await civitApi.GetBaseModelList();
+            var jsonContent = await baseModelsResponse.Content.ReadAsStringAsync();
+            var baseModels = JsonNode.Parse(jsonContent);
+
+            var jArray =
+                baseModels?["error"]?["issues"]?[0]?["unionErrors"]?[0]?["issues"]?[0]?["options"]
+                as JsonArray;
+            var civitBaseModels = jArray?.GetValues<string>().ToList() ?? [];
+
+            civitBaseModels.Insert(0, CivitBaseModelType.All.ToString());
+
+            var filteredResults = civitBaseModels
+                .Where(s => s.Equals("odor", StringComparison.OrdinalIgnoreCase) == false)
+                .OrderBy(s => s)
+                .ToList();
+
+            return filteredResults;
+        }
+        catch (Exception e)
+        {
+            Logger.Error(e, "Failed to get base model list");
+            return [];
+        }
+    }
+
     public override string Header => Resources.Label_CivitAi;
 }
diff --git a/StabilityMatrix.Avalonia/Views/CivitAiBrowserPage.axaml b/StabilityMatrix.Avalonia/Views/CivitAiBrowserPage.axaml
index 2e6f01856..7d7cda10d 100644
--- a/StabilityMatrix.Avalonia/Views/CivitAiBrowserPage.axaml
+++ b/StabilityMatrix.Avalonia/Views/CivitAiBrowserPage.axaml
@@ -492,8 +492,14 @@
                     Grid.Column="3"
                     MinWidth="100"
                     Margin="4,0,4,8"
-                    ItemsSource="{Binding BaseModelOptions}"
-                    SelectedItem="{Binding SelectedBaseModelType}" />
+                    ItemsSource="{Binding AllBaseModels}"
+                    SelectedItem="{Binding SelectedBaseModelType}">
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate x:DataType="system:String">
+                            <TextBlock MinWidth="100" Text="{Binding .}" />
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                </ComboBox>
 
                 <ui:CommandBar
                     Grid.Row="0"
diff --git a/StabilityMatrix.Core/Api/ICivitApi.cs b/StabilityMatrix.Core/Api/ICivitApi.cs
index b2d87371f..b0dd41338 100644
--- a/StabilityMatrix.Core/Api/ICivitApi.cs
+++ b/StabilityMatrix.Core/Api/ICivitApi.cs
@@ -1,4 +1,5 @@
-using Refit;
+using System.Text.Json.Nodes;
+using Refit;
 using StabilityMatrix.Core.Models.Api;
 
 namespace StabilityMatrix.Core.Api;
@@ -16,4 +17,7 @@ public interface ICivitApi
 
     [Get("/api/v1/model-versions/{id}")]
     Task<CivitModelVersion> GetModelVersionById(int id);
+
+    [Get("/api/v1/models?baseModels=gimmethelist")]
+    Task<HttpResponseMessage> GetBaseModelList();
 }
diff --git a/StabilityMatrix.Core/Models/Api/CivitBaseModelType.cs b/StabilityMatrix.Core/Models/Api/CivitBaseModelType.cs
index 27ff7cae6..66b584c0e 100644
--- a/StabilityMatrix.Core/Models/Api/CivitBaseModelType.cs
+++ b/StabilityMatrix.Core/Models/Api/CivitBaseModelType.cs
@@ -29,6 +29,9 @@ public enum CivitBaseModelType
     [StringValue("Lumina")]
     Lumina,
 
+    [StringValue("Mochi")]
+    Mochi,
+
     [StringValue("PixArt a")]
     PixArtA,
 
@@ -53,6 +56,15 @@ public enum CivitBaseModelType
     [StringValue("SD 3.5")]
     Sd35,
 
+    [StringValue("SD 3.5 Large")]
+    Sd35Large,
+
+    [StringValue("SD 3.5 Large Turbo")]
+    Sd35LargeTurbo,
+
+    [StringValue("SD 3.5 Medium")]
+    Sd35Medium,
+
     [StringValue("SDXL 0.9")]
     Sdxl09,
 
diff --git a/StabilityMatrix.Core/Models/Api/CivitFileType.cs b/StabilityMatrix.Core/Models/Api/CivitFileType.cs
index ef142a8c7..314c39504 100644
--- a/StabilityMatrix.Core/Models/Api/CivitFileType.cs
+++ b/StabilityMatrix.Core/Models/Api/CivitFileType.cs
@@ -11,6 +11,7 @@ public enum CivitFileType
     Model,
     VAE,
     Config,
+    Archive,
 
     [EnumMember(Value = "Pruned Model")]
     PrunedModel,
diff --git a/StabilityMatrix.Core/Models/Api/CivitModelFormat.cs b/StabilityMatrix.Core/Models/Api/CivitModelFormat.cs
index d2e910bf7..6c11a3cce 100644
--- a/StabilityMatrix.Core/Models/Api/CivitModelFormat.cs
+++ b/StabilityMatrix.Core/Models/Api/CivitModelFormat.cs
@@ -10,5 +10,6 @@ public enum CivitModelFormat
     SafeTensor,
     PickleTensor,
     Diffusers,
+    GGUF,
     Other
 }
diff --git a/StabilityMatrix.Core/Models/Packages/BaseGitPackage.cs b/StabilityMatrix.Core/Models/Packages/BaseGitPackage.cs
index b559f6695..e20fa1864 100644
--- a/StabilityMatrix.Core/Models/Packages/BaseGitPackage.cs
+++ b/StabilityMatrix.Core/Models/Packages/BaseGitPackage.cs
@@ -76,7 +76,9 @@ IPrerequisiteHelper prerequisiteHelper
         PrerequisiteHelper = prerequisiteHelper;
     }
 
-    public override async Task<DownloadPackageVersionOptions> GetLatestVersion(bool includePrerelease = false)
+    public override async Task<DownloadPackageVersionOptions?> GetLatestVersion(
+        bool includePrerelease = false
+    )
     {
         if (ShouldIgnoreReleases)
         {
@@ -88,12 +90,23 @@ public override async Task<DownloadPackageVersionOptions> GetLatestVersion(bool
                 IsLatest = true,
                 IsPrerelease = false,
                 BranchName = MainBranch,
-                CommitHash = commits?.FirstOrDefault()?.Sha ?? "unknown"
+                CommitHash = commits?.FirstOrDefault()?.Sha
             };
         }
 
         var releases = await GithubApi.GetAllReleases(RepositoryAuthor, RepositoryName).ConfigureAwait(false);
-        var latestRelease = includePrerelease ? releases.First() : releases.First(x => !x.Prerelease);
+        var releaseList = releases.ToList();
+        if (releaseList.Count == 0)
+        {
+            return new DownloadPackageVersionOptions
+            {
+                IsLatest = true,
+                IsPrerelease = false,
+                BranchName = MainBranch
+            };
+        }
+
+        var latestRelease = includePrerelease ? releaseList.First() : releaseList.First(x => !x.Prerelease);
 
         return new DownloadPackageVersionOptions
         {
@@ -319,7 +332,7 @@ public override async Task<bool> CheckForUpdates(InstalledPackage package)
                 await GetAllCommits(currentVersion.InstalledBranch!).ConfigureAwait(false)
             )?.ToList();
 
-            if (allCommits == null || !allCommits.Any())
+            if (allCommits == null || allCommits.Count == 0)
             {
                 Logger.Warn("No commits found for {Package}", package.PackageName);
                 return false;
@@ -363,7 +376,7 @@ await GetAllCommits(currentVersion.InstalledBranch!).ConfigureAwait(false)
                 await GetAllCommits(currentVersion.InstalledBranch!).ConfigureAwait(false)
             )?.ToList();
 
-            if (allCommits == null || !allCommits.Any())
+            if (allCommits == null || allCommits.Count == 0)
             {
                 Logger.Warn("No commits found for {Package}", installedPackage.PackageName);
                 return null;
diff --git a/StabilityMatrix.Core/Models/Packages/BasePackage.cs b/StabilityMatrix.Core/Models/Packages/BasePackage.cs
index 7164a41ca..c1cff82d8 100644
--- a/StabilityMatrix.Core/Models/Packages/BasePackage.cs
+++ b/StabilityMatrix.Core/Models/Packages/BasePackage.cs
@@ -188,7 +188,7 @@ public virtual TorchIndex GetRecommendedTorchVersion()
         int page = 1,
         int perPage = 10
     );
-    public abstract Task<DownloadPackageVersionOptions> GetLatestVersion(bool includePrerelease = false);
+    public abstract Task<DownloadPackageVersionOptions?> GetLatestVersion(bool includePrerelease = false);
     public abstract string MainBranch { get; }
     public event EventHandler<int>? Exited;
     public event EventHandler<string>? StartupComplete;

From 97ce099238f02217cfa6ed06f5a7d6b273ea4d6f Mon Sep 17 00:00:00 2001
From: JT <mohnjiles@gmail.com>
Date: Wed, 13 Nov 2024 21:07:51 -0800
Subject: [PATCH 04/14] fix chagenlog

---
 CHANGELOG.md | 59 ----------------------------------------------------
 1 file changed, 59 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61bc543b8..214e72bee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,65 +5,6 @@ All notable changes to Stability Matrix will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2.0.0.html).
 
-<<<<<<< HEAD
-=======
-## v2.13.0-dev.3
-### Added
-- Added support for SD3.5 in Inference
-- Added CLIP_G to HuggingFace model browser
-- Added search bar to the Installed Workflows tab
-- Added "Search with Google" and "Search with ChatGPT" to the console output context menu
-- Added "Date Created" and "Date Last Modified" sorting options to the Checkpoints tab
-### Changed
-- Text Encoder / CLIP selection in Inference is now enabled via the cogwheel ⚙️ button next to the model selector 
-- Added more base model types to the CivitAI Model Browser & Checkpoint Manager
-- Model browser base model types are now loaded dynamically from CivitAI, reducing the need for updates to add new types
-- Updated Russian translations thanks to @vanja-san
-- Updated Simplified Chinese translations thanks to @QL-boy
-- (Internal) Updated to Avalonia 11.2.0
-### Fixed
-- Fixed some instances of Civitai model browser not loading new results
-- Fixed "Unsupported Torch Version: Cuda" errors when installing a1111
-- Fixed crash when clicking "Remind me Later" on the update dialog
-- Fixed some cases of crashing when GitHub API rate limits are exceeded
-### Supporters
-#### Visionaries
-- Big shoutout to our amazing Visionary-tier Patreon supporter, **Waterclouds**! We are very grateful for your continued support!
-
-## v2.13.0-dev.2
-### Added
-- Added new package - [SimpleSDXL](https://github.com/metercai/SimpleSDXL) - many thanks to @NullDev for the contribution!
-- Added new package - [FluxGym](https://github.com/cocktailpeanut/fluxgym) - many thanks to @NullDev for the contribution!
-- Added a new "Extension Packs" section to the extension manager, allowing you to create packs for easier installation of multiple extensions at once
-- Added "Search by Creator" command to Civitai browser context menu
-- Added Beta scheduler to the scheduler selector in Inference
-- Added zipping of log files and "Show Log in Explorer" button on exceptions dialog for easier support
-- Added max concurrent downloads option & download queueing for most downloads
-### Changed
-- (Internal) Updated to Avalonia 11.1.4
-- Adjusted the Branch/Release toggle during package install flow to be a little more obvious
-- Updated the Dock library used for Inference - fixes some weirdness with resizing / rearranging panels
-### Fixed
-- Fixed ComfyUI NF4 extension not installing properly when prompted in Inference
-- Fixed [#932](https://github.com/LykosAI/StabilityMatrix/issues/932), [#935](https://github.com/LykosAI/StabilityMatrix/issues/935), [#939](https://github.com/LykosAI/StabilityMatrix/issues/939) - InvokeAI failing to update
-- Fixed repeated nested folders being created in `Models/StableDiffusion` when using Forge in Symlink mode in certain conditions. Existing folders will be repaired to their original structure on launch.
-- Fixed minimize button not working on macOS
-- Fixed InvokeAI model sharing spamming the console with "This may take awhile" in certain conditions
-- Fixed text alignment issues in the Downloads tab for certain long names / progress infos
-### Supporters
-#### Visionaries
-- A big thank you to our amazing Visionary-tier Patreon supporter, **Waterclouds**! Your continued support is invaluable!
-
-## v2.13.0-dev.1
-### Added
-- Added the ability to change the Models directory separately from the rest of the Data directory. This can be set in `Settings > Select new Models Folder`
-- Added "Copy" menu to the Inference gallery context menu, allowing you to copy the image or the seed (other params coming soon™️)
-- Added InvokeAI model sharing option
-### Supporters
-#### Visionaries
-- A heartfelt thank you to our incredible Visionary-tier Patreon supporter, **Waterclouds**! Your ongoing support means a lot to us, and we’re grateful to have you with us on this journey!
-
->>>>>>> 5db87ce9 (Merge pull request #887 from ionite34/dynamic-base-model-types)
 ## v2.12.4
 ### Changed
 - Model browser base model types are now loaded dynamically from CivitAI, reducing the need for updates to add new types

From 6be6147b30893d4dd11d6c87073406d25a0f08bd Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Tue, 19 Nov 2024 17:24:30 -0500
Subject: [PATCH 05/14] Merge pull request #889 from ionite34/fix-the-thing

(cherry picked from commit c12906227650fcd218a4f7136462cbaa7437fd17)
---
 .../CheckpointBrowser/CivitAiBrowserViewModel.cs       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/StabilityMatrix.Avalonia/ViewModels/CheckpointBrowser/CivitAiBrowserViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/CheckpointBrowser/CivitAiBrowserViewModel.cs
index e163e8821..19303f5c7 100644
--- a/StabilityMatrix.Avalonia/ViewModels/CheckpointBrowser/CivitAiBrowserViewModel.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/CheckpointBrowser/CivitAiBrowserViewModel.cs
@@ -238,17 +238,17 @@ public override void OnLoaded()
         SelectedModelType = searchOptions?.SelectedModelType ?? CivitModelType.Checkpoint;
         SelectedBaseModelType = searchOptions?.SelectedBaseModelType ?? "All";
 
-        if (settingsManager.Settings.AutoLoadCivitModels)
-        {
-            SearchModelsCommand.ExecuteAsync(false);
-        }
-
         base.OnLoaded();
     }
 
     protected override async Task OnInitialLoadedAsync()
     {
         await base.OnInitialLoadedAsync();
+        if (settingsManager.Settings.AutoLoadCivitModels)
+        {
+            await SearchModelsCommand.ExecuteAsync(false);
+        }
+
         var baseModels = await GetBaseModelList();
         if (baseModels.Count == 0)
         {

From 9f7f1f3b69353efeef76ade6c687e5ae5a9de61b Mon Sep 17 00:00:00 2001
From: JT <mohnjiles@gmail.com>
Date: Tue, 19 Nov 2024 16:58:44 -0800
Subject: [PATCH 06/14] Merge pull request #891 from ionite34/swarm-env-vars

add git and other path stuff to env vars for swarm

(cherry picked from commit 649986e94c19039b4323763a9e8dd77f322fb66d)

# Conflicts:
#	CHANGELOG.md
---
 CHANGELOG.md                                  | 62 +++++++++++++++++++
 .../Models/Packages/StableSwarm.cs            | 13 +++-
 2 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 214e72bee..4046a352a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,12 +5,74 @@ All notable changes to Stability Matrix will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2.0.0.html).
 
+<<<<<<< HEAD
+=======
+## v2.13.0-dev.3
+### Added
+- Added support for SD3.5 in Inference
+- Added CLIP_G to HuggingFace model browser
+- Added search bar to the Installed Workflows tab
+- Added "Search with Google" and "Search with ChatGPT" to the console output context menu
+- Added "Date Created" and "Date Last Modified" sorting options to the Checkpoints tab
+### Changed
+- Text Encoder / CLIP selection in Inference is now enabled via the cogwheel ⚙️ button next to the model selector 
+- Added more base model types to the CivitAI Model Browser & Checkpoint Manager
+- Model browser base model types are now loaded dynamically from CivitAI, reducing the need for updates to add new types
+- Updated Civitai model descriptions to properly render the interactive elements
+- Updated Russian translations thanks to @vanja-san
+- Updated Simplified Chinese translations thanks to @QL-boy
+- (Internal) Updated to Avalonia 11.2.0
+### Fixed
+- Fixed some instances of Civitai model browser not loading new results
+- Fixed "Unsupported Torch Version: Cuda" errors when installing a1111
+- Fixed crash when clicking "Remind me Later" on the update dialog
+- Fixed some cases of crashing when GitHub API rate limits are exceeded
+- Fixed Git missing from env vars when running SwarmUI
+### Supporters
+#### Visionaries
+- Big shoutout to our amazing Visionary-tier Patreon supporter, **Waterclouds**! We are very grateful for your continued support!
+
+## v2.13.0-dev.2
+### Added
+- Added new package - [SimpleSDXL](https://github.com/metercai/SimpleSDXL) - many thanks to @NullDev for the contribution!
+- Added new package - [FluxGym](https://github.com/cocktailpeanut/fluxgym) - many thanks to @NullDev for the contribution!
+- Added a new "Extension Packs" section to the extension manager, allowing you to create packs for easier installation of multiple extensions at once
+- Added "Search by Creator" command to Civitai browser context menu
+- Added Beta scheduler to the scheduler selector in Inference
+- Added zipping of log files and "Show Log in Explorer" button on exceptions dialog for easier support
+- Added max concurrent downloads option & download queueing for most downloads
+### Changed
+- (Internal) Updated to Avalonia 11.1.4
+- Adjusted the Branch/Release toggle during package install flow to be a little more obvious
+- Updated the Dock library used for Inference - fixes some weirdness with resizing / rearranging panels
+### Fixed
+- Fixed ComfyUI NF4 extension not installing properly when prompted in Inference
+- Fixed [#932](https://github.com/LykosAI/StabilityMatrix/issues/932), [#935](https://github.com/LykosAI/StabilityMatrix/issues/935), [#939](https://github.com/LykosAI/StabilityMatrix/issues/939) - InvokeAI failing to update
+- Fixed repeated nested folders being created in `Models/StableDiffusion` when using Forge in Symlink mode in certain conditions. Existing folders will be repaired to their original structure on launch.
+- Fixed minimize button not working on macOS
+- Fixed InvokeAI model sharing spamming the console with "This may take awhile" in certain conditions
+- Fixed text alignment issues in the Downloads tab for certain long names / progress infos
+### Supporters
+#### Visionaries
+- A big thank you to our amazing Visionary-tier Patreon supporter, **Waterclouds**! Your continued support is invaluable!
+
+## v2.13.0-dev.1
+### Added
+- Added the ability to change the Models directory separately from the rest of the Data directory. This can be set in `Settings > Select new Models Folder`
+- Added "Copy" menu to the Inference gallery context menu, allowing you to copy the image or the seed (other params coming soon™️)
+- Added InvokeAI model sharing option
+### Supporters
+#### Visionaries
+- A heartfelt thank you to our incredible Visionary-tier Patreon supporter, **Waterclouds**! Your ongoing support means a lot to us, and we’re grateful to have you with us on this journey!
+
+>>>>>>> 649986e9 (Merge pull request #891 from ionite34/swarm-env-vars)
 ## v2.12.4
 ### Changed
 - Model browser base model types are now loaded dynamically from CivitAI, reducing the need for updates to add new types
 ### Fixed
 - Fixed crash when clicking "Remind me Later" on the update dialog
 - Fixed some cases of crashing when GitHub API rate limits are exceeded
+- Fixed Git missing from env vars when running SwarmUI
 ### Supporters
 #### Visionaries
 - A huge thank you to our dedicated Visionary-tier Patreon supporter, **Waterclouds**! We’re thrilled to have your ongoing support!
diff --git a/StabilityMatrix.Core/Models/Packages/StableSwarm.cs b/StabilityMatrix.Core/Models/Packages/StableSwarm.cs
index 950c398b7..1194f06c9 100644
--- a/StabilityMatrix.Core/Models/Packages/StableSwarm.cs
+++ b/StabilityMatrix.Core/Models/Packages/StableSwarm.cs
@@ -257,13 +257,24 @@ public override async Task RunPackage(
         CancellationToken cancellationToken = default
     )
     {
+        var portableGitBin = new DirectoryPath(PrerequisiteHelper.GitBinPath);
         var aspEnvVars = new Dictionary<string, string>
         {
             ["ASPNETCORE_ENVIRONMENT"] = "Production",
-            ["ASPNETCORE_URLS"] = "http://*:7801"
+            ["ASPNETCORE_URLS"] = "http://*:7801",
+            ["GIT"] = portableGitBin.JoinFile("git.exe")
         };
         aspEnvVars.Update(settingsManager.Settings.EnvironmentVariables);
 
+        if (aspEnvVars.TryGetValue("PATH", out var pathValue))
+        {
+            aspEnvVars["PATH"] = Compat.GetEnvPathWithExtensions(portableGitBin, pathValue);
+        }
+        else
+        {
+            aspEnvVars["PATH"] = Compat.GetEnvPathWithExtensions(portableGitBin);
+        }
+
         void HandleConsoleOutput(ProcessOutput s)
         {
             onConsoleOutput?.Invoke(s);

From 75de84336daacfee8b6897931edafcaed62dcb8e Mon Sep 17 00:00:00 2001
From: JT <mohnjiles@gmail.com>
Date: Tue, 19 Nov 2024 17:00:08 -0800
Subject: [PATCH 07/14] fix chagenlog

---
 CHANGELOG.md | 61 ----------------------------------------------------
 1 file changed, 61 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4046a352a..c62b6a485 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,67 +5,6 @@ All notable changes to Stability Matrix will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2.0.0.html).
 
-<<<<<<< HEAD
-=======
-## v2.13.0-dev.3
-### Added
-- Added support for SD3.5 in Inference
-- Added CLIP_G to HuggingFace model browser
-- Added search bar to the Installed Workflows tab
-- Added "Search with Google" and "Search with ChatGPT" to the console output context menu
-- Added "Date Created" and "Date Last Modified" sorting options to the Checkpoints tab
-### Changed
-- Text Encoder / CLIP selection in Inference is now enabled via the cogwheel ⚙️ button next to the model selector 
-- Added more base model types to the CivitAI Model Browser & Checkpoint Manager
-- Model browser base model types are now loaded dynamically from CivitAI, reducing the need for updates to add new types
-- Updated Civitai model descriptions to properly render the interactive elements
-- Updated Russian translations thanks to @vanja-san
-- Updated Simplified Chinese translations thanks to @QL-boy
-- (Internal) Updated to Avalonia 11.2.0
-### Fixed
-- Fixed some instances of Civitai model browser not loading new results
-- Fixed "Unsupported Torch Version: Cuda" errors when installing a1111
-- Fixed crash when clicking "Remind me Later" on the update dialog
-- Fixed some cases of crashing when GitHub API rate limits are exceeded
-- Fixed Git missing from env vars when running SwarmUI
-### Supporters
-#### Visionaries
-- Big shoutout to our amazing Visionary-tier Patreon supporter, **Waterclouds**! We are very grateful for your continued support!
-
-## v2.13.0-dev.2
-### Added
-- Added new package - [SimpleSDXL](https://github.com/metercai/SimpleSDXL) - many thanks to @NullDev for the contribution!
-- Added new package - [FluxGym](https://github.com/cocktailpeanut/fluxgym) - many thanks to @NullDev for the contribution!
-- Added a new "Extension Packs" section to the extension manager, allowing you to create packs for easier installation of multiple extensions at once
-- Added "Search by Creator" command to Civitai browser context menu
-- Added Beta scheduler to the scheduler selector in Inference
-- Added zipping of log files and "Show Log in Explorer" button on exceptions dialog for easier support
-- Added max concurrent downloads option & download queueing for most downloads
-### Changed
-- (Internal) Updated to Avalonia 11.1.4
-- Adjusted the Branch/Release toggle during package install flow to be a little more obvious
-- Updated the Dock library used for Inference - fixes some weirdness with resizing / rearranging panels
-### Fixed
-- Fixed ComfyUI NF4 extension not installing properly when prompted in Inference
-- Fixed [#932](https://github.com/LykosAI/StabilityMatrix/issues/932), [#935](https://github.com/LykosAI/StabilityMatrix/issues/935), [#939](https://github.com/LykosAI/StabilityMatrix/issues/939) - InvokeAI failing to update
-- Fixed repeated nested folders being created in `Models/StableDiffusion` when using Forge in Symlink mode in certain conditions. Existing folders will be repaired to their original structure on launch.
-- Fixed minimize button not working on macOS
-- Fixed InvokeAI model sharing spamming the console with "This may take awhile" in certain conditions
-- Fixed text alignment issues in the Downloads tab for certain long names / progress infos
-### Supporters
-#### Visionaries
-- A big thank you to our amazing Visionary-tier Patreon supporter, **Waterclouds**! Your continued support is invaluable!
-
-## v2.13.0-dev.1
-### Added
-- Added the ability to change the Models directory separately from the rest of the Data directory. This can be set in `Settings > Select new Models Folder`
-- Added "Copy" menu to the Inference gallery context menu, allowing you to copy the image or the seed (other params coming soon™️)
-- Added InvokeAI model sharing option
-### Supporters
-#### Visionaries
-- A heartfelt thank you to our incredible Visionary-tier Patreon supporter, **Waterclouds**! Your ongoing support means a lot to us, and we’re grateful to have you with us on this journey!
-
->>>>>>> 649986e9 (Merge pull request #891 from ionite34/swarm-env-vars)
 ## v2.12.4
 ### Changed
 - Model browser base model types are now loaded dynamically from CivitAI, reducing the need for updates to add new types

From 929ec2c9622f28df9f4fc377357f832e26a2fe02 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Wed, 4 Dec 2024 15:59:28 -0500
Subject: [PATCH 08/14] Merge pull request #902 from
 ionite34/fix-package-images

(cherry picked from commit 746ee01a7e0692c9199b743e7714ba6a64ab3f65)

# Conflicts:
#	CHANGELOG.md
---
 CHANGELOG.md                                  | 70 +++++++++++++++++++
 Directory.Build.props                         |  6 ++
 .../Models/Packages/ComfyUI.cs                |  3 +-
 .../Models/Packages/KohyaSs.cs                |  5 +-
 .../Models/Packages/Mashb1tFooocus.cs         |  3 -
 .../Models/Packages/Reforge.cs                |  5 +-
 .../Models/Packages/SDWebForge.cs             |  5 +-
 .../Models/Packages/SimpleSDXL.cs             |  3 +-
 .../Models/Packages/VladAutomatic.cs          |  3 +-
 .../Models/Packages/VoltaML.cs                |  5 +-
 .../Models/Packages/PackageHelper.cs          | 42 +++++++++++
 .../Models/Packages/PackageLinkTests.cs       | 56 +++++++++++++++
 12 files changed, 181 insertions(+), 25 deletions(-)
 create mode 100644 StabilityMatrix.Tests/Models/Packages/PackageHelper.cs
 create mode 100644 StabilityMatrix.Tests/Models/Packages/PackageLinkTests.cs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 932906cd2..6c9da1e06 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,75 @@ All notable changes to Stability Matrix will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2.0.0.html).
 
+<<<<<<< HEAD
+=======
+## v2.13.0-pre.1
+### Added
+- Added file sizes to the Checkpoint Manager tab
+### Changed
+- Improved Packages Page grid layout to dynamically stretch to fill available space
+### Fixed
+- Fixed missing package thumbnails due to moved or inaccessible urls
+
+## v2.13.0-dev.3
+### Added
+- Added support for SD3.5 in Inference
+- Added CLIP_G to HuggingFace model browser
+- Added search bar to the Installed Workflows tab
+- Added "Search with Google" and "Search with ChatGPT" to the package console output & install progress console output context menus
+- Added "Date Created" and "Date Last Modified" sorting options to the Checkpoints tab
+### Changed
+- Text Encoder / CLIP selection in Inference is now enabled via the cogwheel ⚙️ button next to the model selector 
+- Added more base model types to the CivitAI Model Browser & Checkpoint Manager
+- Model browser base model types are now loaded dynamically from CivitAI, reducing the need for updates to add new types
+- Updated Civitai model descriptions to properly render the interactive elements
+- Updated Russian translations thanks to @vanja-san
+- Updated Simplified Chinese translations thanks to @QL-boy
+- (Internal) Updated to Avalonia 11.2.0
+### Fixed
+- Fixed some instances of Civitai model browser not loading new results
+- Fixed "Unsupported Torch Version: Cuda" errors when installing a1111
+- Fixed crash when clicking "Remind me Later" on the update dialog
+- Fixed some cases of crashing when GitHub API rate limits are exceeded
+- Fixed Git missing from env vars when running SwarmUI
+### Supporters
+#### Visionaries
+- Big shoutout to our amazing Visionary-tier Patreon supporter, **Waterclouds**! We are very grateful for your continued support!
+
+## v2.13.0-dev.2
+### Added
+- Added new package - [SimpleSDXL](https://github.com/metercai/SimpleSDXL) - many thanks to @NullDev for the contribution!
+- Added new package - [FluxGym](https://github.com/cocktailpeanut/fluxgym) - many thanks to @NullDev for the contribution!
+- Added a new "Extension Packs" section to the extension manager, allowing you to create packs for easier installation of multiple extensions at once
+- Added "Search by Creator" command to Civitai browser context menu
+- Added Beta scheduler to the scheduler selector in Inference
+- Added zipping of log files and "Show Log in Explorer" button on exceptions dialog for easier support
+- Added max concurrent downloads option & download queueing for most downloads
+### Changed
+- (Internal) Updated to Avalonia 11.1.4
+- Adjusted the Branch/Release toggle during package install flow to be a little more obvious
+- Updated the Dock library used for Inference - fixes some weirdness with resizing / rearranging panels
+### Fixed
+- Fixed ComfyUI NF4 extension not installing properly when prompted in Inference
+- Fixed [#932](https://github.com/LykosAI/StabilityMatrix/issues/932), [#935](https://github.com/LykosAI/StabilityMatrix/issues/935), [#939](https://github.com/LykosAI/StabilityMatrix/issues/939) - InvokeAI failing to update
+- Fixed repeated nested folders being created in `Models/StableDiffusion` when using Forge in Symlink mode in certain conditions. Existing folders will be repaired to their original structure on launch.
+- Fixed minimize button not working on macOS
+- Fixed InvokeAI model sharing spamming the console with "This may take awhile" in certain conditions
+- Fixed text alignment issues in the Downloads tab for certain long names / progress infos
+### Supporters
+#### Visionaries
+- A big thank you to our amazing Visionary-tier Patreon supporter, **Waterclouds**! Your continued support is invaluable!
+
+## v2.13.0-dev.1
+### Added
+- Added the ability to change the Models directory separately from the rest of the Data directory. This can be set in `Settings > Select new Models Folder`
+- Added "Copy" menu to the Inference gallery context menu, allowing you to copy the image or the seed (other params coming soon™️)
+- Added InvokeAI model sharing option
+### Supporters
+#### Visionaries
+- A heartfelt thank you to our incredible Visionary-tier Patreon supporter, **Waterclouds**! Your ongoing support means a lot to us, and we’re grateful to have you with us on this journey!
+
+>>>>>>> 746ee01a (Merge pull request #902 from ionite34/fix-package-images)
 ## v2.12.4
 ### Changed
 - Model browser base model types are now loaded dynamically from CivitAI, reducing the need for updates to add new types
@@ -12,6 +81,7 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 - Fixed crash when clicking "Remind me Later" on the update dialog
 - Fixed some cases of crashing when GitHub API rate limits are exceeded
 - Fixed Git missing from env vars when running SwarmUI
+- Fixed missing package thumbnails due to moved or inaccessible urls
 ### Supporters
 #### Visionaries
 - A huge thank you to our dedicated Visionary-tier Patreon supporter, **Waterclouds**! We’re thrilled to have your ongoing support!
diff --git a/Directory.Build.props b/Directory.Build.props
index ebef34b63..3b07e6b68 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -2,4 +2,10 @@
     <PropertyGroup>
         <AvaloniaVersion>11.1.4</AvaloniaVersion>
     </PropertyGroup>
+    
+    <PropertyGroup>
+        <!--Some bug with SDK 8.0.403 
+        https://github.com/dotnet/sdk/issues/44026-->
+        <NoWarn>$(NoWarn);CsWinRT1028</NoWarn>
+    </PropertyGroup>
 </Project>
diff --git a/StabilityMatrix.Core/Models/Packages/ComfyUI.cs b/StabilityMatrix.Core/Models/Packages/ComfyUI.cs
index dc5a99f8f..f049050db 100644
--- a/StabilityMatrix.Core/Models/Packages/ComfyUI.cs
+++ b/StabilityMatrix.Core/Models/Packages/ComfyUI.cs
@@ -37,8 +37,7 @@ IPrerequisiteHelper prerequisiteHelper
     public override string Blurb => "A powerful and modular stable diffusion GUI and backend";
     public override string LaunchCommand => "main.py";
 
-    public override Uri PreviewImageUri =>
-        new("https://github.com/comfyanonymous/ComfyUI/raw/master/comfyui_screenshot.png");
+    public override Uri PreviewImageUri => new("https://cdn.lykos.ai/sm/packages/comfyui/preview.webp");
     public override bool ShouldIgnoreReleases => true;
     public override bool IsInferenceCompatible => true;
     public override string OutputFolderName => "output";
diff --git a/StabilityMatrix.Core/Models/Packages/KohyaSs.cs b/StabilityMatrix.Core/Models/Packages/KohyaSs.cs
index 12f4d5f19..bb1b0ed7e 100644
--- a/StabilityMatrix.Core/Models/Packages/KohyaSs.cs
+++ b/StabilityMatrix.Core/Models/Packages/KohyaSs.cs
@@ -27,10 +27,7 @@ IPyRunner runner
     public override string LicenseUrl => "https://github.com/bmaltais/kohya_ss/blob/master/LICENSE.md";
     public override string LaunchCommand => "kohya_gui.py";
 
-    public override Uri PreviewImageUri =>
-        new(
-            "https://camo.githubusercontent.com/5154eea62c113d5c04393e51a0d0f76ef25a723aad29d256dcc85ead1961cd41/68747470733a2f2f696d672e796f75747562652e636f6d2f76692f6b35696d713031757655592f302e6a7067"
-        );
+    public override Uri PreviewImageUri => new("https://cdn.lykos.ai/sm/packages/kohyass/preview.webp");
     public override string OutputFolderName => string.Empty;
 
     public override bool IsCompatible => HardwareHelper.HasNvidiaGpu();
diff --git a/StabilityMatrix.Core/Models/Packages/Mashb1tFooocus.cs b/StabilityMatrix.Core/Models/Packages/Mashb1tFooocus.cs
index 02e501196..eabdb3ab1 100644
--- a/StabilityMatrix.Core/Models/Packages/Mashb1tFooocus.cs
+++ b/StabilityMatrix.Core/Models/Packages/Mashb1tFooocus.cs
@@ -23,8 +23,5 @@ IPrerequisiteHelper prerequisiteHelper
 
     public override string LicenseUrl => "https://github.com/mashb1t/Fooocus/blob/main/LICENSE";
 
-    public override Uri PreviewImageUri =>
-        new("https://github.com/lllyasviel/Fooocus/assets/19834515/483fb86d-c9a2-4c20-997c-46dafc124f25");
-
     public override bool ShouldIgnoreReleases => false;
 }
diff --git a/StabilityMatrix.Core/Models/Packages/Reforge.cs b/StabilityMatrix.Core/Models/Packages/Reforge.cs
index a40237071..913fea8c7 100644
--- a/StabilityMatrix.Core/Models/Packages/Reforge.cs
+++ b/StabilityMatrix.Core/Models/Packages/Reforge.cs
@@ -21,10 +21,7 @@ IPrerequisiteHelper prerequisiteHelper
         "Stable Diffusion WebUI reForge is a platform on top of Stable Diffusion WebUI (based on Gradio) to make development easier, optimize resource management, speed up inference, and study experimental features.";
     public override string LicenseUrl =>
         "https://github.com/Panchovix/stable-diffusion-webui-reForge/blob/main/LICENSE.txt";
-    public override Uri PreviewImageUri =>
-        new(
-            "https://github.com/lllyasviel/stable-diffusion-webui-forge/assets/19834515/de1a2d05-344a-44d7-bab8-9ecc0a58a8d3"
-        );
+    public override Uri PreviewImageUri => new("https://cdn.lykos.ai/sm/packages/reforge/preview.webp");
 
     public override PackageDifficulty InstallerSortOrder => PackageDifficulty.ReallyRecommended;
 }
diff --git a/StabilityMatrix.Core/Models/Packages/SDWebForge.cs b/StabilityMatrix.Core/Models/Packages/SDWebForge.cs
index aa1599ba8..f4c0cd503 100644
--- a/StabilityMatrix.Core/Models/Packages/SDWebForge.cs
+++ b/StabilityMatrix.Core/Models/Packages/SDWebForge.cs
@@ -29,10 +29,7 @@ IPrerequisiteHelper prerequisiteHelper
     public override string LicenseUrl =>
         "https://github.com/lllyasviel/stable-diffusion-webui-forge/blob/main/LICENSE.txt";
 
-    public override Uri PreviewImageUri =>
-        new(
-            "https://github.com/lllyasviel/stable-diffusion-webui-forge/assets/19834515/ca5e05ed-bd86-4ced-8662-f41034648e8c"
-        );
+    public override Uri PreviewImageUri => new("https://cdn.lykos.ai/sm/packages/sdwebforge/preview.webp");
 
     public override string MainBranch => "main";
     public override bool ShouldIgnoreReleases => true;
diff --git a/StabilityMatrix.Core/Models/Packages/SimpleSDXL.cs b/StabilityMatrix.Core/Models/Packages/SimpleSDXL.cs
index 830cc3f0a..31f6ae13b 100644
--- a/StabilityMatrix.Core/Models/Packages/SimpleSDXL.cs
+++ b/StabilityMatrix.Core/Models/Packages/SimpleSDXL.cs
@@ -24,8 +24,7 @@ IPrerequisiteHelper prerequisiteHelper
     public override string Blurb =>
         "Enhanced version of Fooocus for SDXL, more suitable for Chinese and Cloud. Supports Flux.";
     public override string LicenseUrl => "https://github.com/metercai/SimpleSDXL/blob/SimpleSDXL/LICENSE";
-    public override Uri PreviewImageUri =>
-        new("https://github.com/user-attachments/assets/98715a4d-9f4a-4846-ae62-eb8d69793d31");
+    public override Uri PreviewImageUri => new("https://cdn.lykos.ai/sm/packages/simplesdxl/preview.webp");
     public override PackageDifficulty InstallerSortOrder => PackageDifficulty.Expert;
     public override IEnumerable<SharedFolderMethod> AvailableSharedFolderMethods =>
         [SharedFolderMethod.Configuration, SharedFolderMethod.Symlink, SharedFolderMethod.None];
diff --git a/StabilityMatrix.Core/Models/Packages/VladAutomatic.cs b/StabilityMatrix.Core/Models/Packages/VladAutomatic.cs
index 0a1491a2c..543b8a9f4 100644
--- a/StabilityMatrix.Core/Models/Packages/VladAutomatic.cs
+++ b/StabilityMatrix.Core/Models/Packages/VladAutomatic.cs
@@ -36,8 +36,7 @@ IPrerequisiteHelper prerequisiteHelper
     public override string Blurb => "Stable Diffusion implementation with advanced features and modern UI";
     public override string LaunchCommand => "launch.py";
 
-    public override Uri PreviewImageUri =>
-        new("https://github.com/vladmandic/automatic/raw/master/html/screenshot-modernui.jpg");
+    public override Uri PreviewImageUri => new("https://cdn.lykos.ai/sm/packages/vladautomatic/preview.webp");
     public override bool ShouldIgnoreReleases => true;
 
     public override SharedFolderMethod RecommendedSharedFolderMethod => SharedFolderMethod.Symlink;
diff --git a/StabilityMatrix.Core/Models/Packages/VoltaML.cs b/StabilityMatrix.Core/Models/Packages/VoltaML.cs
index 415d99b25..d4c88ed3b 100644
--- a/StabilityMatrix.Core/Models/Packages/VoltaML.cs
+++ b/StabilityMatrix.Core/Models/Packages/VoltaML.cs
@@ -26,10 +26,7 @@ IPrerequisiteHelper prerequisiteHelper
     public override string Blurb => "Fast Stable Diffusion with support for AITemplate";
     public override string LaunchCommand => "main.py";
 
-    public override Uri PreviewImageUri =>
-        new(
-            "https://github.com/LykosAI/StabilityMatrix/assets/13956642/d9a908ed-5665-41a5-a380-98458f4679a8"
-        );
+    public override Uri PreviewImageUri => new("https://cdn.lykos.ai/sm/packages/voltaml/preview.webp");
 
     public override PackageDifficulty InstallerSortOrder => PackageDifficulty.Simple;
 
diff --git a/StabilityMatrix.Tests/Models/Packages/PackageHelper.cs b/StabilityMatrix.Tests/Models/Packages/PackageHelper.cs
new file mode 100644
index 000000000..dc9bcf8d8
--- /dev/null
+++ b/StabilityMatrix.Tests/Models/Packages/PackageHelper.cs
@@ -0,0 +1,42 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using NSubstitute;
+using StabilityMatrix.Core.Helper;
+using StabilityMatrix.Core.Helper.Cache;
+using StabilityMatrix.Core.Models.Packages;
+using StabilityMatrix.Core.Python;
+using StabilityMatrix.Core.Services;
+
+namespace StabilityMatrix.Tests.Models.Packages;
+
+public static class PackageHelper
+{
+    /// <summary>
+    /// Get all BasePackage implementations in the assembly.
+    /// </summary>
+    public static IEnumerable<BasePackage> GetPackages()
+    {
+        var services = new ServiceCollection();
+        services
+            .AddSingleton(Substitute.For<IGithubApiCache>())
+            .AddSingleton(Substitute.For<ISettingsManager>())
+            .AddSingleton(Substitute.For<IDownloadService>())
+            .AddSingleton(Substitute.For<IPyRunner>())
+            .AddSingleton(Substitute.For<IPrerequisiteHelper>());
+
+        var assembly = typeof(BasePackage).Assembly;
+        var packageTypes = assembly
+            .GetTypes()
+            .Where(t => t.IsSubclassOf(typeof(BasePackage)) && !t.IsAbstract)
+            .Where(t => t != typeof(DankDiffusion) && t != typeof(UnknownPackage))
+            .ToList();
+
+        // Register all package types
+        services.TryAddEnumerable(
+            packageTypes.Select(t => ServiceDescriptor.Singleton(typeof(BasePackage), t))
+        );
+
+        var serviceProvider = services.BuildServiceProvider();
+        return serviceProvider.GetServices<BasePackage>();
+    }
+}
diff --git a/StabilityMatrix.Tests/Models/Packages/PackageLinkTests.cs b/StabilityMatrix.Tests/Models/Packages/PackageLinkTests.cs
new file mode 100644
index 000000000..9bdbf6f24
--- /dev/null
+++ b/StabilityMatrix.Tests/Models/Packages/PackageLinkTests.cs
@@ -0,0 +1,56 @@
+using System.Net.Http.Headers;
+using StabilityMatrix.Core.Models.Packages;
+
+namespace StabilityMatrix.Tests.Models.Packages;
+
+/// <summary>
+/// Tests that URL links on Packages should be valid. Requires internet connection.
+/// </summary>
+[TestClass]
+public sealed class PackageLinkTests
+{
+    private static HttpClient HttpClient { get; } =
+        new() { DefaultRequestHeaders = { { "User-Agent", "StabilityMatrix/2.0" } } };
+
+    private static IEnumerable<object[]> PackagesData =>
+        PackageHelper.GetPackages().Select(p => new object[] { p });
+
+    [TestMethod]
+    [DynamicData(nameof(PackagesData))]
+    public async Task TestPreviewImageUri(BasePackage package)
+    {
+        var imageUri = package.PreviewImageUri;
+
+        // Test http head is successful
+        var response = await HttpClient.SendAsync(new HttpRequestMessage(HttpMethod.Head, imageUri));
+
+        Assert.IsTrue(
+            response.IsSuccessStatusCode,
+            "Failed to get PreviewImageUri at {0}: {1}",
+            imageUri,
+            response
+        );
+    }
+
+    [TestMethod]
+    [DynamicData(nameof(PackagesData))]
+    public async Task TestLicenseUrl(BasePackage package)
+    {
+        if (string.IsNullOrEmpty(package.LicenseUrl))
+        {
+            Assert.Inconclusive();
+        }
+
+        var licenseUri = package.LicenseUrl;
+
+        // Test http head is successful
+        var response = await HttpClient.SendAsync(new HttpRequestMessage(HttpMethod.Head, licenseUri));
+
+        Assert.IsTrue(
+            response.IsSuccessStatusCode,
+            "Failed to get LicenseUrl at {0}: {1}",
+            licenseUri,
+            response
+        );
+    }
+}

From 4da4c0a7e6d8afcae8e8498658f942b5c71e8393 Mon Sep 17 00:00:00 2001
From: JT <mohnjiles@gmail.com>
Date: Wed, 4 Dec 2024 18:46:42 -0800
Subject: [PATCH 09/14] Merge pull request #906 from ionite34/chagenloggg

update chagenlog

(cherry picked from commit f7a06c403603492d2e987f92a1a321e17dc7d178)

# Conflicts:
#	CHANGELOG.md
---
 CHANGELOG.md | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 932906cd2..9c72a0043 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,13 +5,97 @@ All notable changes to Stability Matrix will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2.0.0.html).
 
+<<<<<<< HEAD
+=======
+## v2.13.0-pre.1
+### Added
+- Added new package - [CogVideo](https://github.com/THUDM/CogVideo) - many thanks to @NullDev for the contribution!
+- Added file sizes to the Checkpoint Manager tab
+- Added more formatting options for Inference output filenames - thanks to @yansigit!
+### Changed
+- Improved Packages Page grid layout to dynamically stretch to fill available space
+### Fixed
+- Fixed a typo in the Japanese translation - thanks to @mattyatea!
+- Fixed missing package thumbnails due to moved or inaccessible urls
+### Supporters
+#### Visionaries
+- Huge thank you to our incredible Visionary-tier Patreon supporter, **Waterclouds**! Your unwavering support is very much appreciated!
+
+## v2.13.0-dev.3
+### Added
+- Added support for SD3.5 in Inference
+- Added CLIP_G to HuggingFace model browser
+- Added search bar to the Installed Workflows tab
+- Added "Search with Google" and "Search with ChatGPT" to the package console output & install progress console output context menus
+- Added "Date Created" and "Date Last Modified" sorting options to the Checkpoints tab
+### Changed
+- Text Encoder / CLIP selection in Inference is now enabled via the cogwheel ⚙️ button next to the model selector 
+- Added more base model types to the CivitAI Model Browser & Checkpoint Manager
+- Model browser base model types are now loaded dynamically from CivitAI, reducing the need for updates to add new types
+- Updated Civitai model descriptions to properly render the interactive elements
+- Updated Russian translations thanks to @vanja-san
+- Updated Simplified Chinese translations thanks to @QL-boy
+- (Internal) Updated to Avalonia 11.2.0
+### Fixed
+- Fixed some instances of Civitai model browser not loading new results
+- Fixed "Unsupported Torch Version: Cuda" errors when installing a1111
+- Fixed crash when clicking "Remind me Later" on the update dialog
+- Fixed some cases of crashing when GitHub API rate limits are exceeded
+- Fixed Git missing from env vars when running SwarmUI
+### Supporters
+#### Visionaries
+- Big shoutout to our amazing Visionary-tier Patreon supporter, **Waterclouds**! We are very grateful for your continued support!
+
+## v2.13.0-dev.2
+### Added
+- Added new package - [SimpleSDXL](https://github.com/metercai/SimpleSDXL) - many thanks to @NullDev for the contribution!
+- Added new package - [FluxGym](https://github.com/cocktailpeanut/fluxgym) - many thanks to @NullDev for the contribution!
+- Added a new "Extension Packs" section to the extension manager, allowing you to create packs for easier installation of multiple extensions at once
+- Added "Search by Creator" command to Civitai browser context menu
+- Added Beta scheduler to the scheduler selector in Inference
+- Added zipping of log files and "Show Log in Explorer" button on exceptions dialog for easier support
+- Added max concurrent downloads option & download queueing for most downloads
+### Changed
+- (Internal) Updated to Avalonia 11.1.4
+- Adjusted the Branch/Release toggle during package install flow to be a little more obvious
+- Updated the Dock library used for Inference - fixes some weirdness with resizing / rearranging panels
+### Fixed
+- Fixed ComfyUI NF4 extension not installing properly when prompted in Inference
+- Fixed [#932](https://github.com/LykosAI/StabilityMatrix/issues/932), [#935](https://github.com/LykosAI/StabilityMatrix/issues/935), [#939](https://github.com/LykosAI/StabilityMatrix/issues/939) - InvokeAI failing to update
+- Fixed repeated nested folders being created in `Models/StableDiffusion` when using Forge in Symlink mode in certain conditions. Existing folders will be repaired to their original structure on launch.
+- Fixed minimize button not working on macOS
+- Fixed InvokeAI model sharing spamming the console with "This may take awhile" in certain conditions
+- Fixed text alignment issues in the Downloads tab for certain long names / progress infos
+### Supporters
+#### Visionaries
+- A big thank you to our amazing Visionary-tier Patreon supporter, **Waterclouds**! Your continued support is invaluable!
+
+## v2.13.0-dev.1
+### Added
+- Added the ability to change the Models directory separately from the rest of the Data directory. This can be set in `Settings > Select new Models Folder`
+- Added "Copy" menu to the Inference gallery context menu, allowing you to copy the image or the seed (other params coming soon™️)
+- Added InvokeAI model sharing option
+### Supporters
+#### Visionaries
+- A heartfelt thank you to our incredible Visionary-tier Patreon supporter, **Waterclouds**! Your ongoing support means a lot to us, and we’re grateful to have you with us on this journey!
+
+>>>>>>> f7a06c40 (Merge pull request #906 from ionite34/chagenloggg)
 ## v2.12.4
+### Added
+- Added new package - [CogVideo](https://github.com/THUDM/CogVideo) - many thanks to @NullDev for the contribution!
+- Added more formatting options for Inference output filenames - thanks to @yansigit!
 ### Changed
 - Model browser base model types are now loaded dynamically from CivitAI, reducing the need for updates to add new types
 ### Fixed
 - Fixed crash when clicking "Remind me Later" on the update dialog
 - Fixed some cases of crashing when GitHub API rate limits are exceeded
 - Fixed Git missing from env vars when running SwarmUI
+<<<<<<< HEAD
+=======
+- Fixed missing package thumbnails due to moved or inaccessible urls
+- Fixed an issue with updating FluxGym in certain cases - thanks to @NullDev!
+- Fixed a typo in the Japanese translation - thanks to @mattyatea!
+>>>>>>> f7a06c40 (Merge pull request #906 from ionite34/chagenloggg)
 ### Supporters
 #### Visionaries
 - A huge thank you to our dedicated Visionary-tier Patreon supporter, **Waterclouds**! We’re thrilled to have your ongoing support!

From c8b406d0c07b08af1d71f99f5706a88caa49531e Mon Sep 17 00:00:00 2001
From: JT <mohnjiles@gmail.com>
Date: Wed, 4 Dec 2024 18:52:19 -0800
Subject: [PATCH 10/14] chagenlog

---
 CHANGELOG.md | 78 ----------------------------------------------------
 1 file changed, 78 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c72a0043..0a2669171 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,81 +5,6 @@ All notable changes to Stability Matrix will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2.0.0.html).
 
-<<<<<<< HEAD
-=======
-## v2.13.0-pre.1
-### Added
-- Added new package - [CogVideo](https://github.com/THUDM/CogVideo) - many thanks to @NullDev for the contribution!
-- Added file sizes to the Checkpoint Manager tab
-- Added more formatting options for Inference output filenames - thanks to @yansigit!
-### Changed
-- Improved Packages Page grid layout to dynamically stretch to fill available space
-### Fixed
-- Fixed a typo in the Japanese translation - thanks to @mattyatea!
-- Fixed missing package thumbnails due to moved or inaccessible urls
-### Supporters
-#### Visionaries
-- Huge thank you to our incredible Visionary-tier Patreon supporter, **Waterclouds**! Your unwavering support is very much appreciated!
-
-## v2.13.0-dev.3
-### Added
-- Added support for SD3.5 in Inference
-- Added CLIP_G to HuggingFace model browser
-- Added search bar to the Installed Workflows tab
-- Added "Search with Google" and "Search with ChatGPT" to the package console output & install progress console output context menus
-- Added "Date Created" and "Date Last Modified" sorting options to the Checkpoints tab
-### Changed
-- Text Encoder / CLIP selection in Inference is now enabled via the cogwheel ⚙️ button next to the model selector 
-- Added more base model types to the CivitAI Model Browser & Checkpoint Manager
-- Model browser base model types are now loaded dynamically from CivitAI, reducing the need for updates to add new types
-- Updated Civitai model descriptions to properly render the interactive elements
-- Updated Russian translations thanks to @vanja-san
-- Updated Simplified Chinese translations thanks to @QL-boy
-- (Internal) Updated to Avalonia 11.2.0
-### Fixed
-- Fixed some instances of Civitai model browser not loading new results
-- Fixed "Unsupported Torch Version: Cuda" errors when installing a1111
-- Fixed crash when clicking "Remind me Later" on the update dialog
-- Fixed some cases of crashing when GitHub API rate limits are exceeded
-- Fixed Git missing from env vars when running SwarmUI
-### Supporters
-#### Visionaries
-- Big shoutout to our amazing Visionary-tier Patreon supporter, **Waterclouds**! We are very grateful for your continued support!
-
-## v2.13.0-dev.2
-### Added
-- Added new package - [SimpleSDXL](https://github.com/metercai/SimpleSDXL) - many thanks to @NullDev for the contribution!
-- Added new package - [FluxGym](https://github.com/cocktailpeanut/fluxgym) - many thanks to @NullDev for the contribution!
-- Added a new "Extension Packs" section to the extension manager, allowing you to create packs for easier installation of multiple extensions at once
-- Added "Search by Creator" command to Civitai browser context menu
-- Added Beta scheduler to the scheduler selector in Inference
-- Added zipping of log files and "Show Log in Explorer" button on exceptions dialog for easier support
-- Added max concurrent downloads option & download queueing for most downloads
-### Changed
-- (Internal) Updated to Avalonia 11.1.4
-- Adjusted the Branch/Release toggle during package install flow to be a little more obvious
-- Updated the Dock library used for Inference - fixes some weirdness with resizing / rearranging panels
-### Fixed
-- Fixed ComfyUI NF4 extension not installing properly when prompted in Inference
-- Fixed [#932](https://github.com/LykosAI/StabilityMatrix/issues/932), [#935](https://github.com/LykosAI/StabilityMatrix/issues/935), [#939](https://github.com/LykosAI/StabilityMatrix/issues/939) - InvokeAI failing to update
-- Fixed repeated nested folders being created in `Models/StableDiffusion` when using Forge in Symlink mode in certain conditions. Existing folders will be repaired to their original structure on launch.
-- Fixed minimize button not working on macOS
-- Fixed InvokeAI model sharing spamming the console with "This may take awhile" in certain conditions
-- Fixed text alignment issues in the Downloads tab for certain long names / progress infos
-### Supporters
-#### Visionaries
-- A big thank you to our amazing Visionary-tier Patreon supporter, **Waterclouds**! Your continued support is invaluable!
-
-## v2.13.0-dev.1
-### Added
-- Added the ability to change the Models directory separately from the rest of the Data directory. This can be set in `Settings > Select new Models Folder`
-- Added "Copy" menu to the Inference gallery context menu, allowing you to copy the image or the seed (other params coming soon™️)
-- Added InvokeAI model sharing option
-### Supporters
-#### Visionaries
-- A heartfelt thank you to our incredible Visionary-tier Patreon supporter, **Waterclouds**! Your ongoing support means a lot to us, and we’re grateful to have you with us on this journey!
-
->>>>>>> f7a06c40 (Merge pull request #906 from ionite34/chagenloggg)
 ## v2.12.4
 ### Added
 - Added new package - [CogVideo](https://github.com/THUDM/CogVideo) - many thanks to @NullDev for the contribution!
@@ -90,12 +15,9 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 - Fixed crash when clicking "Remind me Later" on the update dialog
 - Fixed some cases of crashing when GitHub API rate limits are exceeded
 - Fixed Git missing from env vars when running SwarmUI
-<<<<<<< HEAD
-=======
 - Fixed missing package thumbnails due to moved or inaccessible urls
 - Fixed an issue with updating FluxGym in certain cases - thanks to @NullDev!
 - Fixed a typo in the Japanese translation - thanks to @mattyatea!
->>>>>>> f7a06c40 (Merge pull request #906 from ionite34/chagenloggg)
 ### Supporters
 #### Visionaries
 - A huge thank you to our dedicated Visionary-tier Patreon supporter, **Waterclouds**! We’re thrilled to have your ongoing support!

From 09dc2400cc9d958a999ae207efe06d7347535bd8 Mon Sep 17 00:00:00 2001
From: JT <mohnjiles@gmail.com>
Date: Sat, 30 Nov 2024 14:06:39 -0800
Subject: [PATCH 11/14] Merge pull request #899 from ionite34/observe-on

O B S E R V E

(cherry picked from commit 64b44ab1227b51c15061bc1638c3e24d55712508)

# Conflicts:
#	StabilityMatrix.Avalonia/ViewModels/InstalledWorkflowsViewModel.cs
#	StabilityMatrix.Avalonia/ViewModels/PackageManager/PackageExtensionBrowserViewModel.cs
---
 .../Behaviors/TextEditorToolTipBehavior.cs    | 17 +++------
 .../Collections/SearchCollection.cs           |  3 ++
 .../Controls/BetterComboBox.cs                |  5 ++-
 .../Inference/SelectImageCard.axaml.cs        |  3 ++
 .../Controls/Painting/PaintCanvas.axaml.cs    |  3 ++
 .../Services/InferenceClientManager.cs        | 38 +++++++++++++++++--
 .../CivitAiBrowserViewModel.cs                | 10 ++++-
 .../HuggingFacePageViewModel.cs               |  2 +
 .../ViewModels/CheckpointsPageViewModel.cs    |  7 ++++
 .../Dialogs/NewOneClickInstallViewModel.cs    |  3 ++
 .../Dialogs/RecommendedModelsViewModel.cs     |  4 ++
 .../HuggingFacePage/CategoryViewModel.cs      |  3 ++
 .../Inference/ControlNetCardViewModel.cs      |  3 ++
 .../Inference/ImageFolderCardViewModel.cs     |  4 ++
 .../InferenceTextToImageViewModel.cs          |  2 +
 .../ViewModels/InstalledWorkflowsViewModel.cs | 17 +++++++++
 .../ViewModels/OpenArtBrowserViewModel.cs     |  9 ++++-
 .../ViewModels/OutputsPageViewModel.cs        | 10 ++++-
 .../MainPackageManagerViewModel.cs            |  3 ++
 .../PackageExtensionBrowserViewModel.cs       | 24 ++++++++++++
 .../PackageInstallBrowserViewModel.cs         |  5 +++
 .../Settings/InferenceSettingsViewModel.cs    |  2 +
 .../Models/IndexCollection.cs                 | 13 +++----
 23 files changed, 163 insertions(+), 27 deletions(-)

diff --git a/StabilityMatrix.Avalonia/Behaviors/TextEditorToolTipBehavior.cs b/StabilityMatrix.Avalonia/Behaviors/TextEditorToolTipBehavior.cs
index d04e2f741..90c860db2 100644
--- a/StabilityMatrix.Avalonia/Behaviors/TextEditorToolTipBehavior.cs
+++ b/StabilityMatrix.Avalonia/Behaviors/TextEditorToolTipBehavior.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using System.Reactive.Linq;
+using System.Threading;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
@@ -29,9 +31,7 @@ public class TextEditorToolTipBehavior : Behavior<TextEditor>
     private ToolTip? toolTip;
 
     public static readonly StyledProperty<ITokenizerProvider?> TokenizerProviderProperty =
-        AvaloniaProperty.Register<TextEditorCompletionBehavior, ITokenizerProvider?>(
-            "TokenizerProvider"
-        );
+        AvaloniaProperty.Register<TextEditorCompletionBehavior, ITokenizerProvider?>("TokenizerProvider");
 
     public ITokenizerProvider? TokenizerProvider
     {
@@ -137,6 +137,7 @@ private void TextEditor_OnPointerHover(object? sender, PointerEventArgs e)
 
             toolTip
                 .GetPropertyChangedObservable(ToolTip.IsOpenProperty)
+                .ObserveOn(SynchronizationContext.Current)
                 .Subscribe(c =>
                 {
                     if (c.NewValue as bool? != true)
@@ -159,10 +160,7 @@ private void TextEditor_OnPointerHover(object? sender, PointerEventArgs e)
     private ToolTipData? GetCaretToolTipData(TextViewPosition position)
     {
         var logicalPosition = position.Location;
-        var pointerOffset = textEditor.Document.GetOffset(
-            logicalPosition.Line,
-            logicalPosition.Column
-        );
+        var pointerOffset = textEditor.Document.GetOffset(logicalPosition.Line, logicalPosition.Column);
 
         var line = textEditor.Document.GetLineByOffset(pointerOffset);
         var lineText = textEditor.Document.GetText(line.Offset, line.Length);
@@ -227,10 +225,7 @@ private void TextEditor_OnPointerHover(object? sender, PointerEventArgs e)
             if (result.Tokens.ElementAtOrDefault(currentTokenIndex + tokenOffset) is { } token)
             {
                 // Check supported scopes
-                if (
-                    token.Scopes.Where(s => s.Contains("invalid")).ToArray() is
-                    { Length: > 0 } results
-                )
+                if (token.Scopes.Where(s => s.Contains("invalid")).ToArray() is { Length: > 0 } results)
                 {
                     // Special cases
                     if (results.Contains("invalid.illegal.mismatched.parenthesis.closing.prompt"))
diff --git a/StabilityMatrix.Avalonia/Collections/SearchCollection.cs b/StabilityMatrix.Avalonia/Collections/SearchCollection.cs
index 6a268ec2f..c2b4b9531 100644
--- a/StabilityMatrix.Avalonia/Collections/SearchCollection.cs
+++ b/StabilityMatrix.Avalonia/Collections/SearchCollection.cs
@@ -3,6 +3,7 @@
 using System.Reactive;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
+using System.Threading;
 using DynamicData;
 using DynamicData.Binding;
 using JetBrains.Annotations;
@@ -72,6 +73,7 @@ public SearchCollection(
             .Filter(dynamicPredicate)
             .Sort(SortComparer)
             .Bind(FilteredItems)
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe();
     }
 
@@ -114,6 +116,7 @@ public SearchCollection(
                 .Sort(SearchItemSortComparer, SortOptimisations.ComparesImmutableValuesOnly)
                 .Transform(searchItem => searchItem.Item)
                 .Bind(FilteredItems)
+                .ObserveOn(SynchronizationContext.Current)
                 .Subscribe()
         );
     }
diff --git a/StabilityMatrix.Avalonia/Controls/BetterComboBox.cs b/StabilityMatrix.Avalonia/Controls/BetterComboBox.cs
index 2c54ac385..b6bbbf370 100644
--- a/StabilityMatrix.Avalonia/Controls/BetterComboBox.cs
+++ b/StabilityMatrix.Avalonia/Controls/BetterComboBox.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
+using System.Threading;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
@@ -48,7 +49,9 @@ public BetterComboBox()
             .Select(_ => currentInput);
 
         // Subscribe to the observable to filter the ComboBox items
-        subscription = inputObservable.Subscribe(OnInputReceived, _ => ResetPopupText());
+        subscription = inputObservable
+            .ObserveOn(SynchronizationContext.Current)
+            .Subscribe(OnInputReceived, _ => ResetPopupText());
 
         // Initialize the popup
         inputPopup = new Popup
diff --git a/StabilityMatrix.Avalonia/Controls/Inference/SelectImageCard.axaml.cs b/StabilityMatrix.Avalonia/Controls/Inference/SelectImageCard.axaml.cs
index d7890c9ed..c743b028e 100644
--- a/StabilityMatrix.Avalonia/Controls/Inference/SelectImageCard.axaml.cs
+++ b/StabilityMatrix.Avalonia/Controls/Inference/SelectImageCard.axaml.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Reactive.Linq;
+using System.Threading;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
 using DynamicData.Binding;
@@ -24,6 +26,7 @@ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
 
         imageControl
             .WhenPropertyChanged(x => x.CurrentImage)
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe(propertyValue =>
             {
                 if (propertyValue.Value is { } image)
diff --git a/StabilityMatrix.Avalonia/Controls/Painting/PaintCanvas.axaml.cs b/StabilityMatrix.Avalonia/Controls/Painting/PaintCanvas.axaml.cs
index 57012561b..85cd915e9 100644
--- a/StabilityMatrix.Avalonia/Controls/Painting/PaintCanvas.axaml.cs
+++ b/StabilityMatrix.Avalonia/Controls/Painting/PaintCanvas.axaml.cs
@@ -3,6 +3,8 @@
 using System.Collections.Immutable;
 using System.Diagnostics;
 using System.Linq;
+using System.Reactive.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Controls;
@@ -108,6 +110,7 @@ protected override void OnDataContextChanged(EventArgs e)
             viewModelSubscription?.Dispose();
             viewModelSubscription = viewModel
                 .WhenPropertyChanged(vm => vm.CanvasSize)
+                .ObserveOn(SynchronizationContext.Current)
                 .Subscribe(change =>
                 {
                     if (MainCanvas is not null && !change.Value.IsEmpty)
diff --git a/StabilityMatrix.Avalonia/Services/InferenceClientManager.cs b/StabilityMatrix.Avalonia/Services/InferenceClientManager.cs
index 21aa70245..352e8c983 100644
--- a/StabilityMatrix.Avalonia/Services/InferenceClientManager.cs
+++ b/StabilityMatrix.Avalonia/Services/InferenceClientManager.cs
@@ -3,6 +3,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
+using System.Reactive.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using AsyncAwaitBestPractices;
@@ -164,6 +165,7 @@ ICompletionProvider completionProvider
             )
             .DeferUntilLoaded()
             .Bind(Models)
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe();
 
         controlNetModelsSource
@@ -176,6 +178,7 @@ ICompletionProvider completionProvider
             )
             .DeferUntilLoaded()
             .Bind(ControlNetModels)
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe();
 
         loraModelsSource
@@ -185,6 +188,7 @@ ICompletionProvider completionProvider
                 LoraModels,
                 SortExpressionComparer<HybridModelFile>.Ascending(f => f.Type).ThenByAscending(f => f.SortKey)
             )
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe();
 
         promptExpansionModelsSource
@@ -197,6 +201,7 @@ ICompletionProvider completionProvider
             )
             .DeferUntilLoaded()
             .Bind(PromptExpansionModels)
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe();
 
         ultralyticsModelsSource
@@ -209,6 +214,7 @@ ICompletionProvider completionProvider
             )
             .DeferUntilLoaded()
             .Bind(UltralyticsModels)
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe();
 
         samModelsSource
@@ -221,6 +227,7 @@ ICompletionProvider completionProvider
             )
             .DeferUntilLoaded()
             .Bind(SamModels)
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe();
 
         unetModelsSource
@@ -232,6 +239,7 @@ ICompletionProvider completionProvider
             )
             .DeferUntilLoaded()
             .Bind(UnetModels)
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe();
 
         clipModelsSource
@@ -244,13 +252,24 @@ ICompletionProvider completionProvider
             )
             .DeferUntilLoaded()
             .Bind(ClipModels)
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe();
 
         vaeModelsDefaults.AddOrUpdate(HybridModelFile.Default);
 
-        vaeModelsDefaults.Connect().Or(vaeModelsSource.Connect()).Bind(VaeModels).Subscribe();
+        vaeModelsDefaults
+            .Connect()
+            .Or(vaeModelsSource.Connect())
+            .Bind(VaeModels)
+            .ObserveOn(SynchronizationContext.Current)
+            .Subscribe();
 
-        samplersSource.Connect().DeferUntilLoaded().Bind(Samplers).Subscribe();
+        samplersSource
+            .Connect()
+            .DeferUntilLoaded()
+            .Bind(Samplers)
+            .ObserveOn(SynchronizationContext.Current)
+            .Subscribe();
 
         latentUpscalersSource
             .Connect()
@@ -258,11 +277,22 @@ ICompletionProvider completionProvider
             .Or(downloadableUpscalersSource.Connect())
             .Sort(SortExpressionComparer<ComfyUpscaler>.Ascending(f => f.Type).ThenByAscending(f => f.Name))
             .Bind(Upscalers)
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe();
 
-        schedulersSource.Connect().DeferUntilLoaded().Bind(Schedulers).Subscribe();
+        schedulersSource
+            .Connect()
+            .DeferUntilLoaded()
+            .Bind(Schedulers)
+            .ObserveOn(SynchronizationContext.Current)
+            .Subscribe();
 
-        preprocessorsSource.Connect().DeferUntilLoaded().Bind(Preprocessors).Subscribe();
+        preprocessorsSource
+            .Connect()
+            .DeferUntilLoaded()
+            .Bind(Preprocessors)
+            .ObserveOn(SynchronizationContext.Current)
+            .Subscribe();
 
         settingsManager.RegisterOnLibraryDirSet(_ =>
         {
diff --git a/StabilityMatrix.Avalonia/ViewModels/CheckpointBrowser/CivitAiBrowserViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/CheckpointBrowser/CivitAiBrowserViewModel.cs
index 19303f5c7..d0126e7a7 100644
--- a/StabilityMatrix.Avalonia/ViewModels/CheckpointBrowser/CivitAiBrowserViewModel.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/CheckpointBrowser/CivitAiBrowserViewModel.cs
@@ -6,6 +6,7 @@
 using System.Net.Http;
 using System.Reactive.Linq;
 using System.Text.Json.Nodes;
+using System.Threading;
 using System.Threading.Tasks;
 using AsyncAwaitBestPractices;
 using Avalonia.Controls;
@@ -146,6 +147,7 @@ or nameof(HideEarlyAccessModels)
             .Throttle(TimeSpan.FromMilliseconds(50))
             .Select(_ => (Func<CheckpointBrowserCardViewModel, bool>)FilterModelCardsPredicate)
             .StartWith(FilterModelCardsPredicate)
+            .ObserveOn(SynchronizationContext.Current)
             .AsObservable();
 
         var sortPredicate = SortExpressionComparer<CheckpointBrowserCardViewModel>.Ascending(
@@ -167,9 +169,15 @@ or nameof(HideEarlyAccessModels)
             .DisposeMany()
             .Filter(filterPredicate)
             .SortAndBind(ModelCards, sortPredicate)
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe();
 
-        baseModelCache.Connect().DeferUntilLoaded().SortAndBind(AllBaseModels).Subscribe();
+        baseModelCache
+            .Connect()
+            .DeferUntilLoaded()
+            .SortAndBind(AllBaseModels)
+            .ObserveOn(SynchronizationContext.Current)
+            .Subscribe();
 
         baseModelCache.AddOrUpdate(Enum.GetValues<CivitBaseModelType>().Select(t => t.GetStringValue()));
 
diff --git a/StabilityMatrix.Avalonia/ViewModels/CheckpointBrowser/HuggingFacePageViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/CheckpointBrowser/HuggingFacePageViewModel.cs
index 3ab3c6b44..58c0e86eb 100644
--- a/StabilityMatrix.Avalonia/ViewModels/CheckpointBrowser/HuggingFacePageViewModel.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/CheckpointBrowser/HuggingFacePageViewModel.cs
@@ -6,6 +6,7 @@
 using System.Reactive.Linq;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using System.Threading;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Controls.Notifications;
@@ -86,6 +87,7 @@ INotificationService notificationService
             .Bind(Categories)
             .WhenAnyPropertyChanged()
             .Throttle(TimeSpan.FromMilliseconds(50))
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe(_ => NumSelected = Categories.Sum(c => c.NumSelected));
 
         progressTimer.Tick += (_, _) =>
diff --git a/StabilityMatrix.Avalonia/ViewModels/CheckpointsPageViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/CheckpointsPageViewModel.cs
index f9ce925a7..1083f9a5c 100644
--- a/StabilityMatrix.Avalonia/ViewModels/CheckpointsPageViewModel.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/CheckpointsPageViewModel.cs
@@ -6,6 +6,7 @@
 using System.IO;
 using System.Linq;
 using System.Reactive.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using AsyncAwaitBestPractices;
 using Avalonia.Controls;
@@ -196,6 +197,7 @@ protected override void OnInitialLoaded()
                             )
                     )
             )
+            .ObserveOn(SynchronizationContext.Current)
             .AsObservable();
 
         var filterPredicate = Observable
@@ -209,6 +211,7 @@ or nameof(SelectedBaseModels)
             )
             .Throttle(TimeSpan.FromMilliseconds(50))
             .Select(_ => (Func<LocalModelFile, bool>)FilterModels)
+            .ObserveOn(SynchronizationContext.Current)
             .AsObservable();
 
         var comparerObservable = Observable
@@ -282,6 +285,7 @@ or nameof(SortConnectedModelsFirst)
 
                 return comparer;
             })
+            .ObserveOn(SynchronizationContext.Current)
             .AsObservable();
 
         ModelsCache
@@ -304,6 +308,7 @@ or nameof(SortConnectedModelsFirst)
             .SortAndBind(Models, comparerObservable)
             .WhenPropertyChanged(p => p.IsSelected)
             .Throttle(TimeSpan.FromMilliseconds(50))
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe(_ =>
             {
                 NumItemsSelected = Models.Count(o => o.IsSelected);
@@ -315,6 +320,7 @@ or nameof(SortConnectedModelsFirst)
             .Throttle(TimeSpan.FromMilliseconds(50))
             .Select(_ => (Func<CheckpointCategory, bool>)FilterCategories)
             .StartWith(FilterCategories)
+            .ObserveOn(SynchronizationContext.Current)
             .AsObservable();
 
         categoriesCache
@@ -327,6 +333,7 @@ or nameof(SortConnectedModelsFirst)
                     .Descending(x => x.Name == "All Models")
                     .ThenByAscending(x => x.Name)
             )
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe();
 
         settingsManager.RelayPropertyFor(
diff --git a/StabilityMatrix.Avalonia/ViewModels/Dialogs/NewOneClickInstallViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/Dialogs/NewOneClickInstallViewModel.cs
index f390b3fd7..f8da3be6a 100644
--- a/StabilityMatrix.Avalonia/ViewModels/Dialogs/NewOneClickInstallViewModel.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/Dialogs/NewOneClickInstallViewModel.cs
@@ -3,6 +3,7 @@
 using System.IO;
 using System.Linq;
 using System.Reactive.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using AsyncAwaitBestPractices;
 using Avalonia.Threading;
@@ -70,6 +71,7 @@ INotificationService notificationService
 
         var incompatiblePredicate = this.WhenPropertyChanged(vm => vm.ShowIncompatiblePackages)
             .Select(_ => new Func<BasePackage, bool>(p => p.IsCompatible || ShowIncompatiblePackages))
+            .ObserveOn(SynchronizationContext.Current)
             .AsObservable();
 
         AllPackagesCache
@@ -83,6 +85,7 @@ INotificationService notificationService
                     .Ascending(p => p.InstallerSortOrder)
                     .ThenByAscending(p => p.DisplayName)
             )
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe();
 
         AllPackagesCache.AddOrUpdate(packageFactory.GetAllAvailablePackages());
diff --git a/StabilityMatrix.Avalonia/ViewModels/Dialogs/RecommendedModelsViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/Dialogs/RecommendedModelsViewModel.cs
index b91336c86..97ada3ec4 100644
--- a/StabilityMatrix.Avalonia/ViewModels/Dialogs/RecommendedModelsViewModel.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/Dialogs/RecommendedModelsViewModel.cs
@@ -1,6 +1,8 @@
 using System;
 using System.IO;
 using System.Linq;
+using System.Reactive.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using CommunityToolkit.Mvvm.ComponentModel;
@@ -73,6 +75,7 @@ IModelImportService modelImportService
             .DeferUntilLoaded()
             .Filter(f => f.ModelVersion.BaseModel == "SD 1.5")
             .Bind(Sd15Models)
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe();
 
         CivitModels
@@ -80,6 +83,7 @@ IModelImportService modelImportService
             .DeferUntilLoaded()
             .Filter(f => f.ModelVersion.BaseModel == "SDXL 1.0" || f.ModelVersion.BaseModel == "Pony")
             .Bind(SdxlModels)
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe();
     }
 
diff --git a/StabilityMatrix.Avalonia/ViewModels/HuggingFacePage/CategoryViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/HuggingFacePage/CategoryViewModel.cs
index 755153f70..7a46dc116 100644
--- a/StabilityMatrix.Avalonia/ViewModels/HuggingFacePage/CategoryViewModel.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/HuggingFacePage/CategoryViewModel.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reactive.Linq;
+using System.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
 using DynamicData;
 using DynamicData.Binding;
@@ -35,6 +37,7 @@ public CategoryViewModel(IEnumerable<HuggingfaceItem> items, string modelsDir)
             .Transform(i => new HuggingfaceItemViewModel { Item = i, ModelsDir = modelsDir })
             .Bind(Items)
             .WhenPropertyChanged(p => p.IsSelected)
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe(_ => NumSelected = Items.Count(i => i.IsSelected));
 
         ItemsCache.EditDiff(items, (a, b) => a.RepositoryPath == b.RepositoryPath);
diff --git a/StabilityMatrix.Avalonia/ViewModels/Inference/ControlNetCardViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/Inference/ControlNetCardViewModel.cs
index ae75414fb..41eaa811c 100644
--- a/StabilityMatrix.Avalonia/ViewModels/Inference/ControlNetCardViewModel.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/Inference/ControlNetCardViewModel.cs
@@ -1,5 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
+using System.Reactive.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
@@ -75,6 +77,7 @@ ServiceManager<ViewModelBase> vmFactory
         // Update our width and height when the image changes
         SelectImageCardViewModel
             .WhenPropertyChanged(card => card.CurrentBitmapSize)
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe(propertyValue =>
             {
                 if (!propertyValue.Value.IsEmpty)
diff --git a/StabilityMatrix.Avalonia/ViewModels/Inference/ImageFolderCardViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/Inference/ImageFolderCardViewModel.cs
index d92bed140..84dc2fc51 100644
--- a/StabilityMatrix.Avalonia/ViewModels/Inference/ImageFolderCardViewModel.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/Inference/ImageFolderCardViewModel.cs
@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Reactive.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using AsyncAwaitBestPractices;
 using AsyncImageLoader;
@@ -76,6 +77,7 @@ ServiceManager<ViewModelBase> vmFactory
         var searchPredicate = this.WhenPropertyChanged(vm => vm.SearchQuery)
             .Throttle(TimeSpan.FromMilliseconds(50))!
             .Select(property => searcher.GetPredicate(property.Value))
+            .ObserveOn(SynchronizationContext.Current)
             .AsObservable();
 
         imageIndexService
@@ -84,6 +86,7 @@ ServiceManager<ViewModelBase> vmFactory
             .Filter(searchPredicate)
             .SortBy(file => file.LastModifiedAt, SortDirection.Descending)
             .Bind(LocalImages)
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe();
 
         AddDisposable(
@@ -191,6 +194,7 @@ private async Task OnImageClick(LocalImageFile item)
                 vm,
                 nameof(ImageViewerViewModel.NavigationRequested)
             )
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe(ctx =>
             {
                 Dispatcher
diff --git a/StabilityMatrix.Avalonia/ViewModels/Inference/InferenceTextToImageViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/Inference/InferenceTextToImageViewModel.cs
index daf355508..dc49664de 100644
--- a/StabilityMatrix.Avalonia/ViewModels/Inference/InferenceTextToImageViewModel.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/Inference/InferenceTextToImageViewModel.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reactive.Linq;
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 using System.Threading;
@@ -114,6 +115,7 @@ RunningPackageService runningPackageService
         AddDisposable(
             ModelCardViewModel
                 .WhenPropertyChanged(x => x.IsRefinerSelectionEnabled)
+                .ObserveOn(SynchronizationContext.Current)
                 .Subscribe(e =>
                 {
                     SamplerCardViewModel.IsRefinerStepsEnabled =
diff --git a/StabilityMatrix.Avalonia/ViewModels/InstalledWorkflowsViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/InstalledWorkflowsViewModel.cs
index c821d305a..e3e1bc42b 100644
--- a/StabilityMatrix.Avalonia/ViewModels/InstalledWorkflowsViewModel.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/InstalledWorkflowsViewModel.cs
@@ -2,6 +2,7 @@
 using System.IO;
 using System.Linq;
 using System.Text.Json;
+using System.Threading;
 using System.Threading.Tasks;
 using AsyncAwaitBestPractices;
 using Avalonia.Controls;
@@ -45,7 +46,23 @@ protected override async Task OnInitialLoadedAsync()
     {
         await base.OnInitialLoadedAsync();
 
+<<<<<<< HEAD
         workflowsCache.Connect().DeferUntilLoaded().Bind(DisplayedWorkflows).Subscribe();
+=======
+        var searchPredicate = this.WhenPropertyChanged(vm => vm.SearchQuery)
+            .Throttle(TimeSpan.FromMilliseconds(100))
+            .DistinctUntilChanged()
+            .Select(_ => (Func<OpenArtMetadata, bool>)FilterWorkflows);
+
+        workflowsCache
+            .Connect()
+            .DeferUntilLoaded()
+            .Filter(searchPredicate)
+            .SortBy(x => x.Index)
+            .Bind(DisplayedWorkflows)
+            .ObserveOn(SynchronizationContext.Current)
+            .Subscribe();
+>>>>>>> 64b44ab1 (Merge pull request #899 from ionite34/observe-on)
 
         if (Design.IsDesignMode)
             return;
diff --git a/StabilityMatrix.Avalonia/ViewModels/OpenArtBrowserViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/OpenArtBrowserViewModel.cs
index cc13e869a..0897932a6 100644
--- a/StabilityMatrix.Avalonia/ViewModels/OpenArtBrowserViewModel.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/OpenArtBrowserViewModel.cs
@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
+using System.Reactive.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using AsyncAwaitBestPractices;
 using Avalonia.Controls.Notifications;
@@ -86,7 +88,12 @@ IPackageFactory packageFactory
 
     protected override void OnInitialLoaded()
     {
-        searchResultsCache.Connect().DeferUntilLoaded().Bind(SearchResults).Subscribe();
+        searchResultsCache
+            .Connect()
+            .DeferUntilLoaded()
+            .Bind(SearchResults)
+            .ObserveOn(SynchronizationContext.Current)
+            .Subscribe();
         SelectedSortMode = AllSortModes.First();
         DoSearch().SafeFireAndForget();
     }
diff --git a/StabilityMatrix.Avalonia/ViewModels/OutputsPageViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/OutputsPageViewModel.cs
index c35b94984..f53c8844f 100644
--- a/StabilityMatrix.Avalonia/ViewModels/OutputsPageViewModel.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/OutputsPageViewModel.cs
@@ -134,6 +134,7 @@ ServiceManager<ViewModelBase> vmFactory
         var searchPredicate = this.WhenPropertyChanged(vm => vm.SearchQuery)
             .Throttle(TimeSpan.FromMilliseconds(100))!
             .Select(property => searcher.GetPredicate(property.Value))
+            .ObserveOn(SynchronizationContext.Current)
             .AsObservable();
 
         OutputsCache
@@ -149,12 +150,18 @@ ServiceManager<ViewModelBase> vmFactory
             .Bind(Outputs)
             .WhenPropertyChanged(p => p.IsSelected)
             .Throttle(TimeSpan.FromMilliseconds(50))
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe(_ =>
             {
                 NumItemsSelected = Outputs.Count(o => o.IsSelected);
             });
 
-        categoriesCache.Connect().DeferUntilLoaded().Bind(Categories).Subscribe();
+        categoriesCache
+            .Connect()
+            .DeferUntilLoaded()
+            .Bind(Categories)
+            .ObserveOn(SynchronizationContext.Current)
+            .Subscribe();
 
         settingsManager.RelayPropertyFor(
             this,
@@ -268,6 +275,7 @@ public async Task ShowImageDialog(OutputImageViewModel item)
                 vm,
                 nameof(ImageViewerViewModel.NavigationRequested)
             )
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe(ctx =>
             {
                 Dispatcher
diff --git a/StabilityMatrix.Avalonia/ViewModels/PackageManager/MainPackageManagerViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/PackageManager/MainPackageManagerViewModel.cs
index ca4527e30..65dd3b763 100644
--- a/StabilityMatrix.Avalonia/ViewModels/PackageManager/MainPackageManagerViewModel.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/PackageManager/MainPackageManagerViewModel.cs
@@ -3,6 +3,8 @@
 using System.Collections.Immutable;
 using System.IO;
 using System.Linq;
+using System.Reactive.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using AsyncAwaitBestPractices;
 using Avalonia.Controls;
@@ -101,6 +103,7 @@ RunningPackageService runningPackageService
                     })
             )
             .Bind(PackageCards)
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe();
 
         timer = new DispatcherTimer { Interval = TimeSpan.FromMinutes(60), IsEnabled = true };
diff --git a/StabilityMatrix.Avalonia/ViewModels/PackageManager/PackageExtensionBrowserViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/PackageManager/PackageExtensionBrowserViewModel.cs
index b4951cdb8..f7eae2de2 100644
--- a/StabilityMatrix.Avalonia/ViewModels/PackageManager/PackageExtensionBrowserViewModel.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/PackageManager/PackageExtensionBrowserViewModel.cs
@@ -102,6 +102,7 @@ ServiceManager<ViewModelBase> vmFactory
             .AutoRefresh(item => item.IsSelected)
             .Filter(item => item.IsSelected)
             .Bind(SelectedAvailableItems)
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe();
 
         var installedItemsChangeSet = installedExtensionsSource
@@ -114,8 +115,31 @@ ServiceManager<ViewModelBase> vmFactory
             .AutoRefresh(item => item.IsSelected)
             .Filter(item => item.IsSelected)
             .Bind(SelectedInstalledItems)
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe();
 
+<<<<<<< HEAD
+=======
+        extensionPackSource
+            .Connect()
+            .Bind(ExtensionPacks)
+            .ObserveOn(SynchronizationContext.Current)
+            .Subscribe();
+
+        var extensionPackExtensionsChangeSet = extensionPackExtensionsSource
+            .Connect()
+            .Transform(ext => new SelectableItem<SavedPackageExtension>(ext))
+            .ObserveOn(SynchronizationContext.Current!)
+            .Publish();
+
+        extensionPackExtensionsChangeSet
+            .AutoRefresh(item => item.IsSelected)
+            .Filter(item => item.IsSelected)
+            .Bind(SelectedExtensionPackExtensions)
+            .ObserveOn(SynchronizationContext.Current)
+            .Subscribe();
+
+>>>>>>> 64b44ab1 (Merge pull request #899 from ionite34/observe-on)
         cleanUp = new CompositeDisposable(
             AvailableItemsSearchCollection = new SearchCollection<
                 SelectableItem<PackageExtension>,
diff --git a/StabilityMatrix.Avalonia/ViewModels/PackageManager/PackageInstallBrowserViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/PackageManager/PackageInstallBrowserViewModel.cs
index 841c7408f..e3bfeaa8a 100644
--- a/StabilityMatrix.Avalonia/ViewModels/PackageManager/PackageInstallBrowserViewModel.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/PackageManager/PackageInstallBrowserViewModel.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Reactive.Linq;
+using System.Threading;
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
 using DynamicData;
@@ -71,6 +72,7 @@ IAnalyticsHelper analyticsHelper
 
         var incompatiblePredicate = this.WhenPropertyChanged(vm => vm.ShowIncompatiblePackages)
             .Select(_ => new Func<BasePackage, bool>(p => p.IsCompatible || ShowIncompatiblePackages))
+            .ObserveOn(SynchronizationContext.Current)
             .AsObservable();
 
         var searchPredicate = this.WhenPropertyChanged(vm => vm.SearchFilter)
@@ -80,6 +82,7 @@ IAnalyticsHelper analyticsHelper
                         p => p.DisplayName.Contains(SearchFilter, StringComparison.OrdinalIgnoreCase)
                     )
             )
+            .ObserveOn(SynchronizationContext.Current)
             .AsObservable();
 
         packageSource
@@ -94,6 +97,7 @@ IAnalyticsHelper analyticsHelper
                     .ThenByAscending(p => p.DisplayName)
             )
             .Bind(InferencePackages)
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe();
 
         packageSource
@@ -108,6 +112,7 @@ IAnalyticsHelper analyticsHelper
                     .ThenByAscending(p => p.DisplayName)
             )
             .Bind(TrainingPackages)
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe();
 
         packageSource.EditDiff(
diff --git a/StabilityMatrix.Avalonia/ViewModels/Settings/InferenceSettingsViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/Settings/InferenceSettingsViewModel.cs
index 55e8b488c..dc5cc078b 100644
--- a/StabilityMatrix.Avalonia/ViewModels/Settings/InferenceSettingsViewModel.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/Settings/InferenceSettingsViewModel.cs
@@ -4,6 +4,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Reactive.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using Avalonia.Controls.Notifications;
 using Avalonia.Platform.Storage;
@@ -122,6 +123,7 @@ ISettingsManager settingsManager
 
         this.WhenPropertyChanged(vm => vm.OutputImageFileNameFormat)
             .Throttle(TimeSpan.FromMilliseconds(50))
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe(formatProperty =>
             {
                 var provider = FileNameFormatProvider.GetSample();
diff --git a/StabilityMatrix.Core/Models/IndexCollection.cs b/StabilityMatrix.Core/Models/IndexCollection.cs
index b91ed50fe..3160214e6 100644
--- a/StabilityMatrix.Core/Models/IndexCollection.cs
+++ b/StabilityMatrix.Core/Models/IndexCollection.cs
@@ -1,4 +1,5 @@
-using DynamicData;
+using System.Reactive.Linq;
+using DynamicData;
 using DynamicData.Binding;
 using StabilityMatrix.Core.Services;
 
@@ -16,16 +17,12 @@ public class IndexCollection<TObject, TKey>
     /// <summary>
     /// Observable Collection of indexed items
     /// </summary>
-    public IObservableCollection<TObject> Items { get; } =
-        new ObservableCollectionExtended<TObject>();
+    public IObservableCollection<TObject> Items { get; } = new ObservableCollectionExtended<TObject>();
 
     public IndexCollection(
         IImageIndexService imageIndexService,
         Func<TObject, TKey> keySelector,
-        Func<
-            IObservable<IChangeSet<TObject, TKey>>,
-            IObservable<IChangeSet<TObject, TKey>>
-        >? transform = null
+        Func<IObservable<IChangeSet<TObject, TKey>>, IObservable<IChangeSet<TObject, TKey>>>? transform = null
     )
     {
         this.imageIndexService = imageIndexService;
@@ -39,7 +36,7 @@ public IndexCollection(
             source = transform(source);
         }
 
-        source.Bind(Items).Subscribe();
+        source.Bind(Items).ObserveOn(SynchronizationContext.Current).Subscribe();
     }
 
     public void Add(TObject item)

From d8475dc37ba7377d7aa7b537e115e540cc78292a Mon Sep 17 00:00:00 2001
From: JT <mohnjiles@gmail.com>
Date: Wed, 4 Dec 2024 19:31:50 -0800
Subject: [PATCH 12/14] Fix conflict in InstalledWorkflowsViewModel.cs

---
 .../ViewModels/InstalledWorkflowsViewModel.cs  | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/StabilityMatrix.Avalonia/ViewModels/InstalledWorkflowsViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/InstalledWorkflowsViewModel.cs
index e3e1bc42b..c199a6052 100644
--- a/StabilityMatrix.Avalonia/ViewModels/InstalledWorkflowsViewModel.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/InstalledWorkflowsViewModel.cs
@@ -46,23 +46,7 @@ protected override async Task OnInitialLoadedAsync()
     {
         await base.OnInitialLoadedAsync();
 
-<<<<<<< HEAD
-        workflowsCache.Connect().DeferUntilLoaded().Bind(DisplayedWorkflows).Subscribe();
-=======
-        var searchPredicate = this.WhenPropertyChanged(vm => vm.SearchQuery)
-            .Throttle(TimeSpan.FromMilliseconds(100))
-            .DistinctUntilChanged()
-            .Select(_ => (Func<OpenArtMetadata, bool>)FilterWorkflows);
-
-        workflowsCache
-            .Connect()
-            .DeferUntilLoaded()
-            .Filter(searchPredicate)
-            .SortBy(x => x.Index)
-            .Bind(DisplayedWorkflows)
-            .ObserveOn(SynchronizationContext.Current)
-            .Subscribe();
->>>>>>> 64b44ab1 (Merge pull request #899 from ionite34/observe-on)
+        workflowsCache.Connect().DeferUntilLoaded().Bind(DisplayedWorkflows).ObserveOn(SynchronizationContext.Current).Subscribe();
 
         if (Design.IsDesignMode)
             return;

From 387041b1b22a4fd441ddfbd8120449166d6db1c0 Mon Sep 17 00:00:00 2001
From: JT <mohnjiles@gmail.com>
Date: Wed, 4 Dec 2024 19:32:25 -0800
Subject: [PATCH 13/14] Fix conflict in PackageExtensionBrowserViewModel.cs

---
 .../PackageExtensionBrowserViewModel.cs       | 22 -------------------
 1 file changed, 22 deletions(-)

diff --git a/StabilityMatrix.Avalonia/ViewModels/PackageManager/PackageExtensionBrowserViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/PackageManager/PackageExtensionBrowserViewModel.cs
index f7eae2de2..3a6db87bc 100644
--- a/StabilityMatrix.Avalonia/ViewModels/PackageManager/PackageExtensionBrowserViewModel.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/PackageManager/PackageExtensionBrowserViewModel.cs
@@ -118,28 +118,6 @@ ServiceManager<ViewModelBase> vmFactory
             .ObserveOn(SynchronizationContext.Current)
             .Subscribe();
 
-<<<<<<< HEAD
-=======
-        extensionPackSource
-            .Connect()
-            .Bind(ExtensionPacks)
-            .ObserveOn(SynchronizationContext.Current)
-            .Subscribe();
-
-        var extensionPackExtensionsChangeSet = extensionPackExtensionsSource
-            .Connect()
-            .Transform(ext => new SelectableItem<SavedPackageExtension>(ext))
-            .ObserveOn(SynchronizationContext.Current!)
-            .Publish();
-
-        extensionPackExtensionsChangeSet
-            .AutoRefresh(item => item.IsSelected)
-            .Filter(item => item.IsSelected)
-            .Bind(SelectedExtensionPackExtensions)
-            .ObserveOn(SynchronizationContext.Current)
-            .Subscribe();
-
->>>>>>> 64b44ab1 (Merge pull request #899 from ionite34/observe-on)
         cleanUp = new CompositeDisposable(
             AvailableItemsSearchCollection = new SearchCollection<
                 SelectableItem<PackageExtension>,

From bdf423d5802b21eb473e47bae4140ebf77195c1b Mon Sep 17 00:00:00 2001
From: JT <mohnjiles@gmail.com>
Date: Wed, 4 Dec 2024 19:34:54 -0800
Subject: [PATCH 14/14] Fix build maybe?

---
 .../ViewModels/InstalledWorkflowsViewModel.cs                    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/StabilityMatrix.Avalonia/ViewModels/InstalledWorkflowsViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/InstalledWorkflowsViewModel.cs
index c199a6052..0cd1a8564 100644
--- a/StabilityMatrix.Avalonia/ViewModels/InstalledWorkflowsViewModel.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/InstalledWorkflowsViewModel.cs
@@ -4,6 +4,7 @@
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Reactive.Linq;
 using AsyncAwaitBestPractices;
 using Avalonia.Controls;
 using Avalonia.Platform.Storage;