diff --git a/FileItem.cs b/FileItem.cs
index 3662f68..dae6260 100644
--- a/FileItem.cs
+++ b/FileItem.cs
@@ -1,3 +1,8 @@
+using System.Linq;
+using MetadataExtractor;
+using MetadataExtractor.Formats.Exif;
+using SkiaSharp;
+
 namespace SelectSight;
 
 using System;
@@ -8,12 +13,11 @@ namespace SelectSight;
 using System.Threading.Tasks;
 using Avalonia.Media.Imaging;
 
-public class FileItem : INotifyPropertyChanged
+public class FileItem(string fullPath) : INotifyPropertyChanged
 {
-    public string FullPath { get; }
-    public string Name { get; }
-    public string SizeString { get; }
-    
+    public string FullPath { get; } = fullPath;
+    public string Name { get; } = Path.GetFileName(fullPath);
+
     private Bitmap? _thumbnail;
     public Bitmap? Thumbnail
     {
@@ -21,17 +25,7 @@ public Bitmap? Thumbnail
         private set => SetField(ref _thumbnail, value);
     }
 
-    public FileItem(string fullPath)
-    {
-        FullPath = fullPath;
-        Name = Path.GetFileName(fullPath);
-        SizeString = new FileInfo(fullPath).Length.ToString("N0") + " bytes";
-
-        // Start loading thumbnail asynchronously
-        _ = LoadThumbnailAsync();
-    }
-
-    private async Task LoadThumbnailAsync()
+    public async Task LoadThumbnailAsync()
     {
         try
         {
@@ -40,10 +34,7 @@ private async Task LoadThumbnailAsync()
             {
                 // Attempt to load image thumbnail
                 await using var stream = new FileStream(FullPath, FileMode.Open, FileAccess.Read);
-                
-                // Decode to a specific width for performance (e.g., 100 pixels)
-                Thumbnail = await Task.Run(() => Bitmap.DecodeToWidth(stream, 300));
-                return;
+                Thumbnail = await ThumbnailUtils.GenerateBitmap(stream);
             }
         }
         catch (Exception ex)
@@ -53,7 +44,7 @@ private async Task LoadThumbnailAsync()
 
         Thumbnail ??= GetDefaultIcon();
     }
-
+    
     private static Bitmap? _defaultIcon;
     private static Bitmap GetDefaultIcon()
     {
diff --git a/MainWindow.axaml b/MainWindow.axaml
index 6f695d4..0dab3ec 100644
--- a/MainWindow.axaml
+++ b/MainWindow.axaml
@@ -9,12 +9,13 @@
         Icon="avares://SelectSight/Assets/icon.ico">
 
     <Grid RowDefinitions="*,Auto" Background="WhiteSmoke">
-        <Grid Grid.Row="0" ColumnDefinitions="5*,1*">
+        <Grid Grid.Row="0" ColumnDefinitions="8*,1*">
             <Border Grid.Column="0" BorderBrush="LightGray" BorderThickness="0,0,1,0" Background="Transparent">
                 <Grid RowDefinitions="Auto,*">
                     <ListBox Grid.Row="1" 
                              x:Name="AllFilesListBox" 
                              Background="Transparent"
+                             AutoScrollToSelectedItem="False"
                              SelectionMode="Multiple">
 
                         <ListBox.ItemsPanel>
@@ -73,7 +74,7 @@
                 Background="Transparent" Padding="10">
             <Grid ColumnDefinitions="*,*">
                 <Grid Grid.Column="0" ColumnDefinitions="Auto,*" HorizontalAlignment="Stretch">
-                    <TextBlock Grid.Column="0" x:Name="SelectedFilesText" HorizontalAlignment="Left" VerticalAlignment="Center"/>
+                    <TextBlock Grid.Column="0" x:Name="FilesInfoText" HorizontalAlignment="Left" VerticalAlignment="Center"/>
                     <TextBlock Grid.Column="1" x:Name="FeedbackText" HorizontalAlignment="Right" VerticalAlignment="Center"/>
                 </Grid>
                 <StackPanel Grid.Column="1"
@@ -81,7 +82,7 @@
                     <Button Content="Select All"
                             HorizontalContentAlignment="Left"
                             Background="DeepSkyBlue"
-                            Click="SelectAllFiles"
+                            Click="SelectAllBtnClick"
                             x:Name="SelectAllButton"
                             Padding="15,8" Margin="0,0,10,0">
                         <Button.Styles>
@@ -93,7 +94,7 @@
                     <Button Content="Copy Selected"
                             Background="YellowGreen"
                             IsEnabled="False"
-                            Click="CopySelectedFiles"
+                            Click="CopySelectedBtnClick"
                             x:Name="CopyButton"
                             Padding="15,8" Margin="0,0,10,0">
                         <Button.Styles>
@@ -104,7 +105,7 @@
                     </Button>
                     <Button Content="Clear Selected"
                             Background="DarkRed"
-                            Click="ClearSelectedFiles"
+                            Click="ClearSelectedBtnClick"
                             IsEnabled="False"
                             x:Name="ClearButton"
                             Padding="15,8">
diff --git a/MainWindow.axaml.cs b/MainWindow.axaml.cs
index 1d23c9b..e2c3ac8 100644
--- a/MainWindow.axaml.cs
+++ b/MainWindow.axaml.cs
@@ -23,7 +23,7 @@ namespace SelectSight;
 
 public partial class MainWindow : Window
 {
-    private HashSet<FileItem> _allFiles = [];
+    private readonly ObservableCollection<FileItem> _allFiles = [];
     private readonly ObservableCollection<FileItem> _selectedFiles = [];
     
     private Point _dragStartPosition;
@@ -34,136 +34,150 @@ public partial class MainWindow : Window
     public MainWindow()
     {
         InitializeComponent();
-        Activated += OnActivated;
-        SetupDragAndDrop();
-    }
-    
-    private async void OnActivated(object? sender, EventArgs e)
-    {
-        Activated -= OnActivated;
-        
-        var topLevel = GetTopLevel(this);
-        if (topLevel is not null)
-        {
-            var folders = await topLevel.StorageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions
-            {
-                Title = "Select a folder",
-                AllowMultiple = false
-            });
-            if (folders.Any()) await LoadFilesFromDirectory(folders[0].Path.LocalPath);
-            else Dispatcher.UIThread.Post(() =>
-            {
-                if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
-                    desktop.Shutdown();
-            });
-        }
         
         AllFilesListBox.ItemsSource = _allFiles;
-        AllFilesListBox.SelectedItems = _selectedFiles;
-        
         SelectedFilesListBox.ItemsSource = _selectedFiles;
+        AllFilesListBox.SelectedItems = _selectedFiles;
         
-        InitializeFilePersistence();
-        UpdateUiControlStates();
-    }
-    
-    private void SetupDragAndDrop()
-    {
-        AllFilesListBox.AddHandler(PointerPressedEvent, OnListBoxClick, RoutingStrategies.Tunnel);
-        AllFilesListBox.AddHandler(PointerMovedEvent, OnListBoxPointerMoved, RoutingStrategies.Tunnel);
-        AllFilesListBox.AddHandler(PointerReleasedEvent, SelectedFilesListBox_PointerReleased, RoutingStrategies.Tunnel);
+        _ = Initialize(); // Start the initialization process asynchronously
     }
 
-    private async Task LoadFilesFromDirectory(string directoryPath)
+    private async Task Initialize()
     {
-        if (!Directory.Exists(directoryPath))
+        var topLevel = GetTopLevel(this);
+        if (topLevel is null)
         {
-            Console.WriteLine($"Directory not found: {directoryPath}");
+            // Handle shutdown if no top-level window -- Should not happen in normal use
+            Dispatcher.UIThread.Post(() =>
+            {
+                if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+                    desktop.Shutdown();
+            });
             return;
         }
-
-        var files = Directory.GetFiles(directoryPath);
-        ShowFeedback("Loading files. Thumbnails may take a moment to appear...");
-        await Task.Delay(5); // Allow UI to update before loading thumbnails
-        _allFiles = files.Select(p => new FileItem(p)).ToHashSet();
-    }
-    
-    private void InitializeFilePersistence()
-    {
-        const string selectSightTempFolder = "SelectSightData";
-        const string selectSightSelectedFilesFile = "SelectedFiles.ss";
         
-        var selectSightTemp = Path.Combine(Path.GetTempPath(), selectSightTempFolder);
-        if (!Directory.Exists(selectSightTemp)) Directory.CreateDirectory(selectSightTemp);
-        var selectedFilesFile = Path.Combine(selectSightTemp, selectSightSelectedFilesFile);
-
-        if (File.Exists(selectedFilesFile))
+        var folders = await topLevel.StorageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions
         {
-            var oldSelections = File.ReadAllLines(selectedFilesFile).Select(p => new FileItem(p)).ToHashSet();
-            foreach (var oldSelection in oldSelections) 
-                if (_allFiles.TryGetValue(oldSelection, out var fileItem)) _selectedFiles.Add(fileItem);
-        }
+            Title = "Select a folder",
+            AllowMultiple = false
+        });
 
-        _selectedFiles.CollectionChanged += SelectedFilesOnCollectionChanged;
-        return;
-        
-        void SelectedFilesOnCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
+        SetupDragAndDrop();
+
+        await Task.Run(async () =>
         {
-            File.WriteAllLines(selectedFilesFile, _selectedFiles.Select(f => f.FullPath));
+            if (folders.Count > 0)
+            {
+                var directoryPath = folders[0].Path.LocalPath;
+                if (!Directory.Exists(directoryPath))
+                {
+                    Console.WriteLine($"Directory not found: {directoryPath}");
+                    return;
+                }
+                
+                const string selectSightTempFolder = "SelectSightData";
+                const string selectSightSelectedFilesFile = "SelectedFiles.ss";
+                
+                var selectSightTemp = Path.Combine(Path.GetTempPath(), selectSightTempFolder);
+                if (!Directory.Exists(selectSightTemp)) Directory.CreateDirectory(selectSightTemp);
+                var selectedFilesFile = Path.Combine(selectSightTemp, selectSightSelectedFilesFile);
             
-            UpdateUiControlStates(); // Ensure UI reflects the current state of selected files
-        }
+                var oldSelections = File.Exists(selectedFilesFile)
+                    ? (await File.ReadAllLinesAsync(selectedFilesFile)).ToHashSet()
+                    : [];
+            
+                _selectedFiles.CollectionChanged += SelectedFilesOnCollectionChanged;
+                _allFiles.CollectionChanged += AllFilesOnCollectionChanged;
+                
+                var directoryInfo = new DirectoryInfo(directoryPath);
+                var files = directoryInfo.GetFiles().OrderBy(p => p.CreationTime).ToArray();
+                var totalFiles = files.Length;
+                var currentFileIndex = 0;
+                foreach (var fileInfo in files)
+                {
+                    var filePath = fileInfo.FullName;
+                    var fileItem = new FileItem(filePath);
+                    _allFiles.Add(fileItem);
+                    
+                    // If the file was previously selected, add it to the selected files
+                    // (Queue on UI Thread to avoid issues with collection modification due to modification above that also affects AllFilesListBox)
+                    if (oldSelections.Contains(filePath)) Dispatcher.UIThread.Post(() => _selectedFiles.Add(fileItem)); 
+                    
+                    await fileItem.LoadThumbnailAsync();
+                    currentFileIndex++;
+                    ShowFeedback($"Loading files and creating thumbnails {currentFileIndex/(float)totalFiles:P} ({currentFileIndex}/{totalFiles})", -1, false);
+                }
+                ShowFeedback("Files loaded successfully", 4, false);
+                return;
+                
+                void SelectedFilesOnCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
+                {
+                    File.WriteAllLines(selectedFilesFile, _selectedFiles.Select(f => f.FullPath));
+                    RefreshUiButtonStates(); // Ensure the UI reflects the current state of selected files
+                }
+                void AllFilesOnCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e) => RefreshFilesInfoText();
+            }
+            
+            Dispatcher.UIThread.Post(() =>
+            {
+                if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+                    desktop.Shutdown();
+            });
+        });
     }
     
+    private void SetupDragAndDrop()
+    {
+        AllFilesListBox.AddHandler(PointerPressedEvent, OnAllFilesListBoxClick, RoutingStrategies.Tunnel);
+        AllFilesListBox.AddHandler(PointerMovedEvent, OnAllFilesListBoxPointerMoved, RoutingStrategies.Tunnel);
+        AllFilesListBox.AddHandler(PointerReleasedEvent, OnAllFilesListBoxPointerReleased, RoutingStrategies.Tunnel);
+    }
+
+    #region Refreshing UI
+
     private void ToggleFileSelection(FileItem fileItem)
     {
         if (!_selectedFiles.Remove(fileItem)) _selectedFiles.Add(fileItem);
     }
     
-    private void ShowFeedback(string message) => Task.Run(async () =>
+    private void ShowFeedback(string message, long durationSeconds = -1, bool resetTextAfterTimeout = true) => Task.Run(async () =>
     {
-        Dispatcher.UIThread.Post(() => FeedbackText.Text = message);
-        await Task.Delay(TimeSpan.FromSeconds(3));
-        Dispatcher.UIThread.Post(() => FeedbackText.Text = string.Empty);
+        var currentMessage = string.Empty;
+        Dispatcher.UIThread.Post(() =>
+        {
+            currentMessage = FeedbackText.Text;
+            FeedbackText.Text = message;
+        });
+        if (durationSeconds <= 0) return; // Don't reset feedback if duration is 0 or negative
+        
+        await Task.Delay(TimeSpan.FromSeconds(durationSeconds));
+        
+        Dispatcher.UIThread.Post(() => FeedbackText.Text = resetTextAfterTimeout ? currentMessage : string.Empty);
     });
     
-    private void UpdateUiControlStates()
+    private void RefreshUiButtonStates() => Dispatcher.UIThread.Post(() =>
     {
         var hasSelections = _selectedFiles.Count > 0;
         CopyButton.IsEnabled = hasSelections;
         ClearButton.IsEnabled = hasSelections;
-
+    });
+    
+    private void RefreshFilesInfoText()
+    {
         var sb = new StringBuilder($"{_allFiles.Count} files | ");
         if (_selectedFiles.Count == 0) sb.Append("No files selected");
         else sb.Append($"{_selectedFiles.Count} file{(_selectedFiles.Count == 1 ? string.Empty : "s")} selected");
-        SelectedFilesText.Text = sb.ToString();
+        var newText = sb.ToString();
+        Dispatcher.UIThread.Post(() => FilesInfoText.Text = newText);
     }
 
-    private async Task<DataObject> CreateFilesDataObject(IEnumerable<string> filePaths)
-    {
-        var data = new DataObject();
-        
-        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-        {
-            var topLevel = GetTopLevel(this);
-            if (topLevel == null) return data;
-            var storageFiles = new List<IStorageFile>();
-            foreach (var filePath in filePaths)
-            {
-                var storageFile = await topLevel.StorageProvider.TryGetFileFromPathAsync(filePath);
-                if (storageFile is not null) storageFiles.Add(storageFile);
-            }
-            data.Set(DataFormats.Files, storageFiles);
-        }
-        else
-            data.Set("text/uri-list", string.Join(Environment.NewLine, filePaths.Select(f => new Uri(f).AbsoluteUri)));
+    #endregion
+    
+    #region Eventhandlers
 
-        return data;
-    }
+    #region AllFile
 
-    #region Eventhandlers
-    
-    private void SelectedFilesListBox_PointerReleased(object? sender, PointerReleasedEventArgs e)
+    private void OnAllFilesListBoxPointerReleased(object? sender, PointerReleasedEventArgs e)
     {
         // Release pointer capture if we were still holding it
         if (ReferenceEquals(e.Pointer.Captured, _pressedListBoxItem)) e.Pointer.Capture(null);
@@ -177,7 +191,7 @@ private void SelectedFilesListBox_PointerReleased(object? sender, PointerRelease
         e.Handled = true;
     }
 
-    private async void OnListBoxPointerMoved(object? sender, PointerEventArgs e)
+    private async void OnAllFilesListBoxPointerMoved(object? sender, PointerEventArgs e)
     {
         if (_pressedListBoxItem == null || !ReferenceEquals(e.Pointer.Captured, _pressedListBoxItem)) return;
         
@@ -211,7 +225,7 @@ private async void OnListBoxPointerMoved(object? sender, PointerEventArgs e)
         _pressedListBoxItem = null;
     }
 
-    private void OnListBoxClick(object? sender, PointerPressedEventArgs e)
+    private void OnAllFilesListBoxClick(object? sender, PointerPressedEventArgs e)
     {
         if (!e.GetCurrentPoint(this).Properties.IsLeftButtonPressed) return;
         _dragStartPosition = e.GetPosition(this);
@@ -222,7 +236,11 @@ private void OnListBoxClick(object? sender, PointerPressedEventArgs e)
         e.Handled = true;
     }
 
-    private async void CopySelectedFiles(object? sender, RoutedEventArgs e)
+    #endregion
+
+    #region Buttons
+
+    private async void CopySelectedBtnClick(object? sender, RoutedEventArgs e)
     {
         if (_selectedFiles.Count == 0) return;
 
@@ -240,7 +258,7 @@ private async void CopySelectedFiles(object? sender, RoutedEventArgs e)
             var dataObject = await CreateFilesDataObject(filePaths);
   
             await topLevel.Clipboard.SetDataObjectAsync(dataObject);
-            ShowFeedback($"{_selectedFiles.Count} {(_selectedFiles.Count == 1 ? "file was" : "files were")} copied to the clipboard");
+            ShowFeedback($"{_selectedFiles.Count} {(_selectedFiles.Count == 1 ? "file was" : "files were")} copied to the clipboard", 3);
         }
         catch (Exception ex)
         {
@@ -248,7 +266,7 @@ private async void CopySelectedFiles(object? sender, RoutedEventArgs e)
         }
     }
     
-    private async void SelectAllFiles(object? sender, RoutedEventArgs e)
+    private async void SelectAllBtnClick(object? sender, RoutedEventArgs e)
     {
         if (_selectedFiles.Count > 0)
         {
@@ -262,7 +280,7 @@ private async void SelectAllFiles(object? sender, RoutedEventArgs e)
         foreach (var fileItem in _allFiles) _selectedFiles.Add(fileItem);
     }
     
-    private async void ClearSelectedFiles(object? sender, RoutedEventArgs e)
+    private async void ClearSelectedBtnClick(object? sender, RoutedEventArgs e)
     {
         if (_selectedFiles.Count == 0) return;
         var box = MessageBoxManager
@@ -272,8 +290,32 @@ private async void ClearSelectedFiles(object? sender, RoutedEventArgs e)
         if (await box.ShowAsync() != ButtonResult.Yes) return;
         
         _selectedFiles.Clear();
-        ShowFeedback("Cleared all selected files");
+        ShowFeedback("Cleared all selected files", 3);
     }
 
     #endregion
+
+    #endregion
+    
+    private async Task<DataObject> CreateFilesDataObject(IEnumerable<string> filePaths)
+    {
+        var data = new DataObject();
+        
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        {
+            var topLevel = GetTopLevel(this);
+            if (topLevel == null) return data;
+            var storageFiles = new List<IStorageFile>();
+            foreach (var filePath in filePaths)
+            {
+                var storageFile = await topLevel.StorageProvider.TryGetFileFromPathAsync(filePath);
+                if (storageFile is not null) storageFiles.Add(storageFile);
+            }
+            data.Set(DataFormats.Files, storageFiles);
+        }
+        else
+            data.Set("text/uri-list", string.Join(Environment.NewLine, filePaths.Select(f => new Uri(f).AbsoluteUri)));
+
+        return data;
+    }
 }
\ No newline at end of file
diff --git a/SelectSight.csproj b/SelectSight.csproj
index c7b25fc..af579ec 100644
--- a/SelectSight.csproj
+++ b/SelectSight.csproj
@@ -23,6 +23,8 @@
         </PackageReference>
         
         <PackageReference Include="MessageBox.Avalonia" Version="3.2.0" />
+        
+        <PackageReference Include="MetadataExtractor" Version="2.8.1" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/ThumbnailUtils.cs b/ThumbnailUtils.cs
new file mode 100644
index 0000000..641207b
--- /dev/null
+++ b/ThumbnailUtils.cs
@@ -0,0 +1,121 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Avalonia.Media.Imaging;
+using MetadataExtractor;
+using MetadataExtractor.Formats.Exif;
+using SkiaSharp;
+
+namespace SelectSight;
+
+public static class ThumbnailUtils
+{
+    private const int TargetThumbnailSize = 300; // Define target size once
+    
+    public static async Task<Bitmap?> GenerateBitmap(Stream fileStream)
+    {
+        var skEncodedOrigin = GetSkiaEncodedOrigin(fileStream);
+        fileStream.Position = 0; // Reset stream position to the beginning for decoding
+        
+        // If no adjustment is needed, decode directly to the target size
+        if (skEncodedOrigin == SKEncodedOrigin.Default) return Bitmap.DecodeToWidth(fileStream, TargetThumbnailSize);
+
+        // Needs adjustment for orientation
+        using var originalDecodedBitmap = SKBitmap.Decode(fileStream);
+        if (originalDecodedBitmap is null) return null;
+
+        // Determine dimensions *after* orientation if it's 90/270 degrees
+        var orientedWidth = originalDecodedBitmap.Width;
+        var orientedHeight = originalDecodedBitmap.Height;
+
+        // For 90/270 degree rotations, swap width and height for the new bitmap
+        if (skEncodedOrigin is SKEncodedOrigin.LeftTop or SKEncodedOrigin.RightTop or SKEncodedOrigin.LeftBottom or SKEncodedOrigin.RightBottom)
+        {
+            (orientedWidth, orientedHeight) = (orientedHeight, orientedWidth); // Swap
+        }
+
+        // Create a new bitmap for the oriented image
+        using var orientedBitmap = new SKBitmap(orientedWidth, orientedHeight, originalDecodedBitmap.ColorType, originalDecodedBitmap.AlphaType);
+        using var canvas = new SKCanvas(orientedBitmap);
+
+        var rotationMatrix = GetOrientationMatrix(skEncodedOrigin, originalDecodedBitmap.Width, originalDecodedBitmap.Height);
+        canvas.SetMatrix(rotationMatrix);
+
+        // Draw the original bitmap onto the transformed canvas
+        canvas.DrawBitmap(originalDecodedBitmap, 0, 0);
+        
+        // 3. Resize the finalSkBitmap (which is now correctly oriented)
+        // Calculate target dimensions maintaining aspect ratio
+        var scale = Math.Min((float)TargetThumbnailSize / orientedBitmap.Width, (float)TargetThumbnailSize / orientedBitmap.Height);
+        var finalScaledWidth = (int)(orientedBitmap.Width * scale);
+        var finalScaledHeight = (int)(orientedBitmap.Height * scale);
+        
+        using var resizedBitmap = orientedBitmap.Resize(new SKImageInfo(finalScaledWidth, finalScaledHeight), SKFilterQuality.Medium);
+        if (resizedBitmap is null) return null;
+
+        // 4. Encode the final resized SKBitmap directly to a MemoryStream for Avalonia
+        using var image = SKImage.FromBitmap(resizedBitmap);
+        using var encoded = image.Encode(SKEncodedImageFormat.Png, 80); // PNG is lossless, 80 quality for JPEG is common
+        await using var skBitmapStream = encoded.AsStream();
+        return new Bitmap(skBitmapStream);
+    }
+
+    private static SKEncodedOrigin GetSkiaEncodedOrigin(Stream stream)
+     {
+         var metaData = ImageMetadataReader.ReadMetadata(stream);
+         var subIfdDirectory = metaData.OfType<ExifIfd0Directory>().FirstOrDefault();
+         if (subIfdDirectory is null) return SKEncodedOrigin.Default;
+         
+         return subIfdDirectory.GetInt32(ExifDirectoryBase.TagOrientation) switch
+         {
+             1 => SKEncodedOrigin.TopLeft,      // 0 degrees, normal
+             2 => SKEncodedOrigin.TopRight,     // Horizontal flip
+             3 => SKEncodedOrigin.BottomRight,  // 180 degrees
+             4 => SKEncodedOrigin.BottomLeft,   // Vertical flip
+             5 => SKEncodedOrigin.LeftTop,      // Transpose (flip across diagonal + 90 deg)
+             6 => SKEncodedOrigin.RightTop,     // 90 degrees clockwise
+             7 => SKEncodedOrigin.RightBottom,  // Transverse (flip across other diagonal + 270 deg)
+             8 => SKEncodedOrigin.LeftBottom,   // 270 degrees clockwise
+             _ => SKEncodedOrigin.Default       // Fallback to default if unknown or 0
+         };
+     }
+    
+    private static SKMatrix GetOrientationMatrix(SKEncodedOrigin origin, int width, int height)
+    {
+        var matrix = SKMatrix.Identity;
+        switch (origin)
+        {
+            case SKEncodedOrigin.TopRight: // horizontal flip
+                matrix = SKMatrix.CreateScale(-1.0f, 1.0f, width / 2f, height / 2f);
+                break;
+            case SKEncodedOrigin.BottomRight: // 180 degrees
+                matrix = SKMatrix.CreateRotationDegrees(180, width / 2f, height / 2f);
+                break;
+            case SKEncodedOrigin.BottomLeft: // vertical flip
+                matrix = SKMatrix.CreateScale(1.0f, -1.0f, width / 2f, height / 2f);
+                break;
+            case SKEncodedOrigin.TopLeft: // no rotation or flip (identity)
+                break;
+            case SKEncodedOrigin.LeftTop: // rotate 90 counter-clockwise + transpose
+                matrix = SKMatrix.CreateRotationDegrees(90);
+                matrix = matrix.PostConcat(SKMatrix.CreateTranslation(height, 0)); // Adjust translation based on new dimensions
+                break;
+            case SKEncodedOrigin.RightTop: // rotate 90 clockwise
+                matrix = SKMatrix.CreateRotationDegrees(90);
+                matrix = matrix.PostConcat(SKMatrix.CreateTranslation(0, width)); // Adjust translation based on new dimensions
+                break;
+            case SKEncodedOrigin.RightBottom: // rotate 270 counter-clockwise
+                matrix = SKMatrix.CreateRotationDegrees(270);
+                matrix = matrix.PostConcat(SKMatrix.CreateTranslation(height, width)); // Adjust translation based on new dimensions
+                break;
+            case SKEncodedOrigin.LeftBottom: // rotate 270 clockwise + transpose
+                matrix = SKMatrix.CreateRotationDegrees(270);
+                matrix = matrix.PostConcat(SKMatrix.CreateTranslation(0, width)); // Adjust translation based on new dimensions
+                break;
+            default: break;
+        }
+
+        return matrix;
+    }
+}
\ No newline at end of file