diff --git a/app/Sentinel.NLogViewer.App/ImportDestinationWindow.xaml b/app/Sentinel.NLogViewer.App/ImportDestinationWindow.xaml
new file mode 100644
index 0000000..0dbdbef
--- /dev/null
+++ b/app/Sentinel.NLogViewer.App/ImportDestinationWindow.xaml
@@ -0,0 +1,66 @@
+<Window x:Class="Sentinel.NLogViewer.App.ImportDestinationWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        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:helpers="clr-namespace:Sentinel.NLogViewer.App.Helpers"
+        mc:Ignorable="d"
+        Title="{helpers:Resource Key=ImportDestination_Title, DefaultValue=Import destination}"
+        Height="440"
+        Width="480"
+        MinHeight="340"
+        MinWidth="380"
+        WindowStartupLocation="CenterOwner"
+        ResizeMode="CanResize">
+    <Grid Margin="16">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+
+        <TextBlock Grid.Row="0"
+                   TextWrapping="Wrap"
+                   Margin="0,0,0,12"
+                   Text="{helpers:Resource Key=ImportDestination_Instructions, DefaultValue=Choose where to load the selected file(s).}" />
+
+        <StackPanel Grid.Row="1">
+            <RadioButton x:Name="ExistingTabRadio"
+                         GroupName="ImportDest"
+                         Margin="0,0,0,8"
+                         Content="{helpers:Resource Key=ImportDestination_ExistingTab, DefaultValue=Append to an existing tab}"
+                         Checked="ModeRadio_Checked" />
+            <ListBox x:Name="TabsListBox"
+                     DisplayMemberPath="Header"
+                     MinHeight="120"
+                     Margin="24,0,0,12"
+                     SelectionChanged="TabsListBox_SelectionChanged" />
+            <RadioButton x:Name="SingleNewTabRadio"
+                         GroupName="ImportDest"
+                         Margin="0,0,0,8"
+                         Content="{helpers:Resource Key=ImportDestination_SingleNewTab, DefaultValue=One new tab for all file(s)}"
+                         Checked="ModeRadio_Checked" />
+            <RadioButton x:Name="PerFileNewTabRadio"
+                         GroupName="ImportDest"
+                         Margin="0,0,0,0"
+                         Content="{helpers:Resource Key=ImportDestination_PerFileNewTab, DefaultValue=New tab for each file}"
+                         Checked="ModeRadio_Checked" />
+        </StackPanel>
+
+        <StackPanel Grid.Row="3"
+                    Orientation="Horizontal"
+                    HorizontalAlignment="Right"
+                    Margin="0,16,0,0">
+            <Button x:Name="OkButton"
+                    Content="{helpers:Resource Key=ImportDestination_OK, DefaultValue=_OK}"
+                    Width="92"
+                    Margin="0,0,8,0"
+                    IsDefault="True"
+                    Click="OkButton_Click" />
+            <Button Content="{helpers:Resource Key=ImportDestination_Cancel, DefaultValue=_Cancel}"
+                    Width="92"
+                    IsCancel="True" />
+        </StackPanel>
+    </Grid>
+</Window>
diff --git a/app/Sentinel.NLogViewer.App/ImportDestinationWindow.xaml.cs b/app/Sentinel.NLogViewer.App/ImportDestinationWindow.xaml.cs
new file mode 100644
index 0000000..0af17dd
--- /dev/null
+++ b/app/Sentinel.NLogViewer.App/ImportDestinationWindow.xaml.cs
@@ -0,0 +1,176 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using Microsoft.Extensions.DependencyInjection;
+using Sentinel.NLogViewer.App.Models;
+using Sentinel.NLogViewer.App.Services;
+
+namespace Sentinel.NLogViewer.App;
+
+/// <summary>
+/// Dialog for choosing how imported log files are routed to tabs.
+/// </summary>
+public partial class ImportDestinationWindow : Window
+{
+	private readonly IList<LogTabViewModel> _tabs;
+	private readonly bool _showExistingTabOption;
+	private readonly bool _showPerFileNewTabOption;
+	private readonly LogTabViewModel? _preferredExistingTab;
+
+	/// <summary>
+	/// The user's choice when <see cref="Window.DialogResult"/> is true.
+	/// </summary>
+	public LogFileImportBatchContext.DestinationMode SelectedMode { get; private set; }
+
+	/// <summary>
+	/// When <see cref="SelectedMode"/> is <see cref="LogFileImportBatchContext.DestinationMode.ExistingTab"/>, the tab to append to.
+	/// </summary>
+	public LogTabViewModel? SelectedExistingTab { get; private set; }
+
+	/// <summary>
+	/// Creates the import destination picker.
+	/// </summary>
+	/// <param name="tabs">Open tabs used for "existing tab" mode.</param>
+	/// <param name="preferredExistingTab">Tab to pre-select when enabling existing-tab mode.</param>
+	/// <param name="showExistingTabOption">When false (no open tabs yet), hides existing-tab UI.</param>
+	/// <param name="showPerFileNewTabOption">When false (single file only), hides the "new tab per file" choice.</param>
+	public ImportDestinationWindow(IList<LogTabViewModel> tabs, LogTabViewModel? preferredExistingTab,
+		bool showExistingTabOption, bool showPerFileNewTabOption = true)
+	{
+		if (tabs == null)
+			throw new ArgumentNullException(nameof(tabs));
+
+		_tabs = tabs;
+		_showExistingTabOption = showExistingTabOption;
+		_showPerFileNewTabOption = showPerFileNewTabOption;
+		_preferredExistingTab = preferredExistingTab;
+
+		InitializeComponent();
+
+		TabsListBox.ItemsSource = _tabs;
+		UpdateExistingTabAvailability();
+		UpdatePerFileNewTabOptionVisibility();
+		ApplyInitialSelection();
+		UpdateOkEnabled();
+
+		KeyDown += (_, e) =>
+		{
+			if (e.Key == System.Windows.Input.Key.Escape)
+				DialogResult = false;
+		};
+	}
+
+	private void ApplyInitialSelection()
+	{
+		if (_showExistingTabOption && _tabs.Count > 0)
+		{
+			var fallback = _tabs.First();
+			TabsListBox.SelectedItem =
+				_preferredExistingTab != null && _tabs.Contains(_preferredExistingTab)
+					? _preferredExistingTab
+					: fallback;
+			ExistingTabRadio.IsChecked = true;
+			TabsListBox.IsEnabled = true;
+			SingleNewTabRadio.IsChecked = false;
+			PerFileNewTabRadio.IsChecked = false;
+		}
+		else
+		{
+			SingleNewTabRadio.IsChecked = true;
+			ExistingTabRadio.IsChecked = false;
+			PerFileNewTabRadio.IsChecked = false;
+			TabsListBox.IsEnabled = false;
+			if (_tabs.Count > 0 && TabsListBox.SelectedItem == null)
+				TabsListBox.SelectedItem = _tabs.First();
+		}
+	}
+
+	private void UpdateExistingTabAvailability()
+	{
+		if (!_showExistingTabOption)
+		{
+			ExistingTabRadio.Visibility = Visibility.Collapsed;
+			TabsListBox.Visibility = Visibility.Collapsed;
+			return;
+		}
+
+		ExistingTabRadio.Visibility = Visibility.Visible;
+		TabsListBox.Visibility = Visibility.Visible;
+		TabsListBox.IsEnabled = ExistingTabRadio.IsChecked == true;
+	}
+
+	/// <summary>
+	/// Hides "new tab per file" when only one file is being imported (option is redundant).
+	/// </summary>
+	private void UpdatePerFileNewTabOptionVisibility()
+	{
+		PerFileNewTabRadio.Visibility = _showPerFileNewTabOption ? Visibility.Visible : Visibility.Collapsed;
+	}
+
+	private void ModeRadio_Checked(object sender, RoutedEventArgs e)
+	{
+		if (TabsListBox == null || ExistingTabRadio == null || OkButton == null)
+			return;
+
+		TabsListBox.IsEnabled = ExistingTabRadio.IsChecked == true;
+		if (!TabsListBox.IsEnabled && TabsListBox.Items.Count > 0 && TabsListBox.SelectedItem == null)
+			TabsListBox.SelectedIndex = 0;
+
+		UpdateOkEnabled();
+	}
+
+	private void TabsListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+	{
+		UpdateOkEnabled();
+	}
+
+	private void UpdateOkEnabled()
+	{
+		var existingMode = ExistingTabRadio.IsChecked == true;
+		OkButton.IsEnabled = !existingMode || TabsListBox.SelectedItem is LogTabViewModel;
+	}
+
+	private void OkButton_Click(object sender, RoutedEventArgs e)
+	{
+		if (ExistingTabRadio.IsChecked == true)
+		{
+			if (TabsListBox.SelectedItem is not LogTabViewModel tab)
+			{
+				MessageBox.Show(
+					this,
+					GetMessage("ImportDestination_SelectTab", "Please select a tab."));
+				return;
+			}
+
+			SelectedMode = LogFileImportBatchContext.DestinationMode.ExistingTab;
+			SelectedExistingTab = tab;
+		}
+		else if (_showPerFileNewTabOption && PerFileNewTabRadio.IsChecked == true)
+		{
+			SelectedMode = LogFileImportBatchContext.DestinationMode.PerFileNewTab;
+			SelectedExistingTab = null;
+		}
+		else
+		{
+			SelectedMode = LogFileImportBatchContext.DestinationMode.SingleNewTab;
+			SelectedExistingTab = null;
+		}
+
+		DialogResult = true;
+	}
+
+	private static string GetMessage(string key, string fallback)
+	{
+		try
+		{
+			var loc = App.ServiceProvider?.GetService<LocalizationService>();
+			return loc != null ? loc.GetString(key, fallback) : fallback;
+		}
+		catch
+		{
+			return fallback;
+		}
+	}
+}
diff --git a/app/Sentinel.NLogViewer.App/MainWindow.xaml b/app/Sentinel.NLogViewer.App/MainWindow.xaml
index 3b6378f..3098502 100644
--- a/app/Sentinel.NLogViewer.App/MainWindow.xaml
+++ b/app/Sentinel.NLogViewer.App/MainWindow.xaml
@@ -18,11 +18,11 @@
         <Grid.Resources>
             <DataTemplate x:Key="TabControlContentTemplate" DataType="models:LogTabViewModel">
                 <!-- ReSharper disable once Xaml.BindingWithContextNotResolved -->
-                <dj:NLogViewer 
+                <dj:NLogViewerBase 
                     x:Name="NLogViewer1"
                     Tag="{Binding ElementName=NLogViewer1}"
-                    CacheTarget="{Binding DataContext, RelativeSource={RelativeSource AncestorType=ContentPresenter}}"
-                    DataContext="{Binding DataContext.NLogViewer, Mode=OneWayToSource, RelativeSource={RelativeSource AncestorType=ContentPresenter}}"/>
+                    ItemsSource="{Binding DataContext.LogEntries, RelativeSource={RelativeSource AncestorType=ContentPresenter}}"
+                    MaxCount="{Binding DataContext.MaxCount, RelativeSource={RelativeSource AncestorType=ContentPresenter}}"/>
             </DataTemplate>
         </Grid.Resources>
         <Grid.RowDefinitions>
@@ -48,6 +48,12 @@
                           InputGestureText="Ctrl+,"/>
             </MenuItem>
             <MenuItem Header="{helpers:Resource Key=Menu_Logs, DefaultValue=_Logs}">
+                <MenuItem Header="{helpers:Resource Key=Menu_Logs_Tabs, DefaultValue=_Tabs}">
+                    <MenuItem Header="{helpers:Resource Key=Menu_CloseCurrentTab, DefaultValue=Close _current tab}"
+                              Command="{Binding CloseCurrentTabCommand}"/>
+                    <MenuItem Header="{helpers:Resource Key=Menu_CloseAllTabs, DefaultValue=Close _all tabs}"
+                              Command="{Binding CloseAllTabsCommand}"/>
+                </MenuItem>
                 <MenuItem Header="{helpers:Resource Key=Menu_Export, DefaultValue=_Export}">
                     <MenuItem Header="{helpers:Resource Key=Menu_ExportLogFormat, DefaultValue=*.log format}" 
                               Command="{Binding ExportLogsCommand}"/>
@@ -76,11 +82,25 @@
         </ToolBar>
         
         <!-- Main Content: TabControl with NLogViewers -->
-        <TabControl Grid.Row="1" 
+        <TabControl x:Name="LogTabsControl"
+                    Grid.Row="1"
                     ItemsSource="{Binding LogTabs}"
                     SelectedItem="{Binding SelectedTab}"
+                    AllowDrop="True"
+                    PreviewDragOver="LogTabsArea_PreviewDragOver"
+                    Drop="LogTabsArea_Drop"
                     attachedProperties:TabContent.IsCached="True"
                     attachedProperties:TabContent.Template="{StaticResource TabControlContentTemplate}">
+            <TabControl.ItemContainerStyle>
+                <Style TargetType="TabItem">
+                    <Setter Property="AllowDrop" Value="True"/>
+                    <EventSetter Event="PreviewMouseLeftButtonDown" Handler="LogTabItem_PreviewMouseLeftButtonDown"/>
+                    <EventSetter Event="PreviewMouseLeftButtonUp" Handler="LogTabItem_PreviewMouseLeftButtonUp"/>
+                    <EventSetter Event="PreviewMouseMove" Handler="LogTabItem_PreviewMouseMove"/>
+                    <EventSetter Event="PreviewDragOver" Handler="LogTabItem_PreviewDragOver"/>
+                    <EventSetter Event="Drop" Handler="LogTabItem_Drop"/>
+                </Style>
+            </TabControl.ItemContainerStyle>
             <TabControl.ItemTemplate>
                 <DataTemplate>
                     <StackPanel Orientation="Horizontal">
diff --git a/app/Sentinel.NLogViewer.App/MainWindow.xaml.cs b/app/Sentinel.NLogViewer.App/MainWindow.xaml.cs
index 0038472..bb1e376 100644
--- a/app/Sentinel.NLogViewer.App/MainWindow.xaml.cs
+++ b/app/Sentinel.NLogViewer.App/MainWindow.xaml.cs
@@ -1,9 +1,12 @@
 using System;
+using System.Linq;
 using System.Reflection;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
+using System.Windows.Media;
 using Microsoft.Extensions.DependencyInjection;
+using Sentinel.NLogViewer.App.Models;
 using Sentinel.NLogViewer.App.ViewModels;
 
 namespace Sentinel.NLogViewer.App
@@ -15,6 +18,9 @@ public partial class MainWindow : Window
     {
         private readonly MainViewModel _viewModel;
 
+        private Point _logTabDragStart;
+        private LogTabViewModel? _logTabDragSource;
+
         public MainWindow(MainViewModel viewModel)
         {
             _viewModel = viewModel ?? throw new ArgumentNullException(nameof(viewModel));
@@ -35,6 +41,144 @@ public MainWindow(MainViewModel viewModel)
 #endif
         }
 
+        /// <summary>
+        /// Accept file drops onto the tab area (and tab headers via <see cref="LogTabItem_Drop"/>).
+        /// </summary>
+        private void LogTabsArea_PreviewDragOver(object sender, DragEventArgs e)
+        {
+	        if (e.Data.GetDataPresent(DataFormats.FileDrop))
+	        {
+		        e.Effects = DragDropEffects.Copy;
+		        e.Handled = true;
+	        }
+	        else if (e.Data.GetDataPresent(typeof(LogTabViewModel)))
+	        {
+		        e.Effects = DragDropEffects.Move;
+		        e.Handled = true;
+	        }
+	        else
+	        {
+		        e.Effects = DragDropEffects.None;
+		        // Do not mark Handled so drag routing can reach tab headers for tab reorder.
+	        }
+        }
+
+        /// <summary>
+        /// Imports dropped paths using the same flow as Open File.
+        /// </summary>
+        private void LogTabsArea_Drop(object sender, DragEventArgs e)
+        {
+	        TryHandleFileDrop(e);
+        }
+
+        /// <summary>
+        /// Imports dropped files when the drop hits a tab header.
+        /// </summary>
+        private bool TryHandleFileDrop(DragEventArgs e)
+        {
+	        if (!e.Data.GetDataPresent(DataFormats.FileDrop))
+		        return false;
+
+	        if (e.Data.GetData(DataFormats.FileDrop) is not string[] rawPaths)
+		        return false;
+
+	        var paths = rawPaths.Where(p => !string.IsNullOrWhiteSpace(p)).ToArray();
+	        if (paths.Length == 0)
+		        return false;
+
+	        _viewModel.BeginImportPathsFromUi(paths);
+	        e.Handled = true;
+	        return true;
+        }
+
+        /// <summary>
+        /// Begins tracking a possible tab-header drag for reordering.
+        /// </summary>
+        private void LogTabItem_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+	        if (sender is not TabItem tabItem)
+		        return;
+
+	        if (tabItem.DataContext is LogTabViewModel vm)
+	        {
+		        _logTabDragStart = e.GetPosition(null);
+		        _logTabDragSource = vm;
+	        }
+        }
+
+        /// <summary>
+        /// Clears tab drag tracking when the mouse button is released without starting a drag.
+        /// </summary>
+        private void LogTabItem_PreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+        {
+	        _logTabDragSource = null;
+        }
+
+        /// <summary>
+        /// Starts a tab reorder drag once the cursor moves past the drag threshold.
+        /// </summary>
+        private void LogTabItem_PreviewMouseMove(object sender, MouseEventArgs e)
+        {
+	        if (_logTabDragSource == null || e.LeftButton != MouseButtonState.Pressed)
+		        return;
+
+	        if (_viewModel.LogTabs.Count < 2)
+		        return;
+
+	        var pos = e.GetPosition(null);
+	        var diff = pos - _logTabDragStart;
+	        if (Math.Abs(diff.X) < SystemParameters.MinimumHorizontalDragDistance &&
+	            Math.Abs(diff.Y) < SystemParameters.MinimumVerticalDragDistance)
+		        return;
+
+	        if (sender is not TabItem tabItem)
+		        return;
+
+	        var data = new DataObject(typeof(LogTabViewModel), _logTabDragSource);
+	        DragDrop.DoDragDrop(tabItem, data, DragDropEffects.Move);
+	        _logTabDragSource = null;
+        }
+
+        /// <summary>
+        /// Shows copy vs move cursor when dragging files or tab headers over a tab.
+        /// </summary>
+        private void LogTabItem_PreviewDragOver(object sender, DragEventArgs e)
+        {
+	        if (e.Data.GetDataPresent(DataFormats.FileDrop))
+	        {
+		        e.Effects = DragDropEffects.Copy;
+		        e.Handled = true;
+	        }
+	        else if (e.Data.GetDataPresent(typeof(LogTabViewModel)))
+	        {
+		        e.Effects = DragDropEffects.Move;
+		        e.Handled = true;
+	        }
+        }
+
+        /// <summary>
+        /// Handles file import or tab reorder when dropping onto a tab header.
+        /// </summary>
+        private void LogTabItem_Drop(object sender, DragEventArgs e)
+        {
+	        if (TryHandleFileDrop(e))
+		        return;
+
+	        if (!e.Data.GetDataPresent(typeof(LogTabViewModel)))
+		        return;
+
+	        var source = e.Data.GetData(typeof(LogTabViewModel)) as LogTabViewModel;
+	        if (source == null || sender is not TabItem targetItem)
+		        return;
+
+	        if (targetItem.DataContext is not LogTabViewModel target)
+		        return;
+
+	        var insertBefore = e.GetPosition(targetItem).X < targetItem.ActualWidth * 0.5;
+	        _viewModel.MoveTab(source, target, insertBefore);
+	        e.Handled = true;
+        }
+
 #if DEBUG
         private void AddDebugMenu()
         {
diff --git a/app/Sentinel.NLogViewer.App/Models/LogFileImportBatchContext.cs b/app/Sentinel.NLogViewer.App/Models/LogFileImportBatchContext.cs
new file mode 100644
index 0000000..df6a0f6
--- /dev/null
+++ b/app/Sentinel.NLogViewer.App/Models/LogFileImportBatchContext.cs
@@ -0,0 +1,39 @@
+namespace Sentinel.NLogViewer.App.Models;
+
+/// <summary>
+/// User-chosen destination for importing one or more log files in a batch.
+/// </summary>
+public sealed class LogFileImportBatchContext
+{
+	/// <summary>
+	/// How parsed log entries should be routed to tabs.
+	/// </summary>
+	public enum DestinationMode
+	{
+		PerFileNewTab,
+		SingleNewTab,
+		ExistingTab
+	}
+
+	public LogFileImportBatchContext(DestinationMode mode, LogTabViewModel? existingTargetTab,
+		string? sharedTabHeaderWhenSingleNewTab)
+	{
+		Mode = mode;
+		ExistingTargetTab = existingTargetTab;
+		SharedTabHeaderWhenSingleNewTab = sharedTabHeaderWhenSingleNewTab;
+	}
+
+	public DestinationMode Mode { get; }
+
+	public LogTabViewModel? ExistingTargetTab { get; }
+
+	/// <summary>
+	/// Display name for <see cref="DestinationMode.SingleNewTab"/> before the shared tab exists.
+	/// </summary>
+	public string? SharedTabHeaderWhenSingleNewTab { get; }
+
+	/// <summary>
+	/// Lazily assigned when the first parsed file is applied in <see cref="DestinationMode.SingleNewTab"/>.
+	/// </summary>
+	public LogTabViewModel? SharedNewTab { get; set; }
+}
diff --git a/app/Sentinel.NLogViewer.App/Models/LogTabViewModel.cs b/app/Sentinel.NLogViewer.App/Models/LogTabViewModel.cs
index 395a02a..a31ba6b 100644
--- a/app/Sentinel.NLogViewer.App/Models/LogTabViewModel.cs
+++ b/app/Sentinel.NLogViewer.App/Models/LogTabViewModel.cs
@@ -1,23 +1,25 @@
-using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using NLog;
-using Sentinel.NLogViewer.Wpf.Targets;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
 
 namespace Sentinel.NLogViewer.App.Models
 {
     /// <summary>
     /// ViewModel for a log tab in the TabControl
     /// </summary>
-    public class LogTabViewModel : INotifyPropertyChanged, ICacheTarget
+    public class LogTabViewModel : INotifyPropertyChanged
     {
         private string _header = string.Empty;
         private string _targetName = string.Empty;
         private int _logCount;
         private int _maxCount = 10000;
 
+        /// <summary>
+        /// Backing collection bound to <see cref="Sentinel.NLogViewer.Wpf.NLogViewerBase.ItemsSource"/>.
+        /// </summary>
+        public ObservableCollection<LogEventInfo> LogEntries { get; } = new();
+
         public string Header
         {
             get => _header;
@@ -70,60 +72,23 @@ public int MaxCount
             }
         }
 
-		public event PropertyChangedEventHandler? PropertyChanged;
+        public event PropertyChangedEventHandler? PropertyChanged;
 
         protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
         {
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
 
-        private readonly object _gate = new();
-        private readonly List<LogEventInfo> _buffer = new();
-        private Subject<LogEventInfo>? _liveSubject;
-        private bool _hasConnected;
-
-        /// <summary>
-        /// Observable stream of log events. Replays buffered events only to the first subscriber; later subscribers receive only new events from subscription time.
-        /// </summary>
-        public IObservable<LogEventInfo> Cache => Observable.Defer(() =>
-        {
-            lock (_gate)
-            {
-                if (!_hasConnected)
-                {
-                    _hasConnected = true;
-                    _liveSubject = new Subject<LogEventInfo>();
-                    var snapshot = _buffer.ToList();
-                    _buffer.Clear();
-                    return snapshot.ToObservable().Concat(_liveSubject);
-                }
-                return _liveSubject!;
-            }
-        }).Publish().RefCount();
-
         /// <summary>
-        /// Pushes a log event into the cache. Subscribers (e.g. NLogViewer) receive it immediately or via replay when they subscribe later.
+        /// Adds a log event to <see cref="LogEntries"/> (same reference the viewer binds to).
         /// </summary>
-        /// <param name="logEvent">The log event to add.</param>
         public void AddLogEvent(LogEventInfo logEvent)
         {
-            lock (_gate)
-            {
-                if (_liveSubject != null)
-                {
-                    _liveSubject.OnNext(logEvent);
-                }
-                else
-                {
-                    _buffer.Add(logEvent);
-                    while (_buffer.Count > MaxCount)
-                    {
-                        _buffer.RemoveAt(0);
-                    }
-                }
-            }
+            LogEntries.Add(logEvent);
+            while (MaxCount >= 0 && LogEntries.Count > MaxCount)
+                LogEntries.RemoveAt(0);
+
             LogCount++;
         }
     }
 }
-
diff --git a/app/Sentinel.NLogViewer.App/Resources/Resources.de.resx b/app/Sentinel.NLogViewer.App/Resources/Resources.de.resx
index 9dbe962..93b7f1e 100644
--- a/app/Sentinel.NLogViewer.App/Resources/Resources.de.resx
+++ b/app/Sentinel.NLogViewer.App/Resources/Resources.de.resx
@@ -88,6 +88,27 @@
   <data name="Menu_ExportLogFormat" xml:space="preserve">
     <value>*.log Format</value>
   </data>
+  <data name="Menu_Logs_Tabs" xml:space="preserve">
+    <value>_Tabs</value>
+  </data>
+  <data name="Menu_CloseCurrentTab" xml:space="preserve">
+    <value>Aktuelles _Tab schließen</value>
+  </data>
+  <data name="Menu_CloseAllTabs" xml:space="preserve">
+    <value>Alle Tabs _schließen</value>
+  </data>
+  <data name="Confirm_CloseCurrentTab_Caption" xml:space="preserve">
+    <value>Tab schließen</value>
+  </data>
+  <data name="Confirm_CloseCurrentTab_Message" xml:space="preserve">
+    <value>Möchten Sie das aktuelle Tab wirklich schließen?</value>
+  </data>
+  <data name="Confirm_CloseAllTabs_Caption" xml:space="preserve">
+    <value>Alle Tabs schließen</value>
+  </data>
+  <data name="Confirm_CloseAllTabs_Message" xml:space="preserve">
+    <value>Möchten Sie wirklich alle Tabs schließen?</value>
+  </data>
   <data name="Button_StartListening" xml:space="preserve">
     <value>Lauschen starten</value>
   </data>
@@ -103,5 +124,65 @@
   <data name="Status_Stopped" xml:space="preserve">
     <value>Gestoppt</value>
   </data>
+  <data name="ImportDestination_Title" xml:space="preserve">
+    <value>Importziel</value>
+  </data>
+  <data name="ImportDestination_Instructions" xml:space="preserve">
+    <value>Wählen Sie, wohin die ausgewählte(n) Datei(en) geladen werden sollen.</value>
+  </data>
+  <data name="ImportDestination_ExistingTab" xml:space="preserve">
+    <value>An vorhandenen Reiter anhängen</value>
+  </data>
+  <data name="ImportDestination_SingleNewTab" xml:space="preserve">
+    <value>Ein neuer Reiter für alle Datei(en)</value>
+  </data>
+  <data name="ImportDestination_PerFileNewTab" xml:space="preserve">
+    <value>Pro Datei ein neuer Reiter</value>
+  </data>
+  <data name="ImportDestination_OK" xml:space="preserve">
+    <value>_OK</value>
+  </data>
+  <data name="ImportDestination_Cancel" xml:space="preserve">
+    <value>_Abbrechen</value>
+  </data>
+  <data name="ImportDestination_SelectTab" xml:space="preserve">
+    <value>Bitte einen Reiter auswählen.</value>
+  </data>
+  <data name="Import_OpenTitle" xml:space="preserve">
+    <value>Logdatei öffnen</value>
+  </data>
+  <data name="Import_NoSupportedFiles" xml:space="preserve">
+    <value>Keine unterstützten Logdatei(en) gefunden.</value>
+  </data>
+  <data name="Import_TabMerged" xml:space="preserve">
+    <value>Zusammengeführter Import</value>
+  </data>
+  <data name="Import_Starting" xml:space="preserve">
+    <value>Wird gestartet...</value>
+  </data>
+  <data name="Import_InProgress" xml:space="preserve">
+    <value>Import läuft...</value>
+  </data>
+  <data name="Import_FileError_Format" xml:space="preserve">
+    <value>Fehler beim Importieren von {0}: {1}</value>
+  </data>
+  <data name="Import_BatchComplete" xml:space="preserve">
+    <value>Import abgeschlossen.</value>
+  </data>
+  <data name="Import_FormatDetectError" xml:space="preserve">
+    <value>Fehler bei der Formerkennung</value>
+  </data>
+  <data name="Import_ParseProgress_Format" xml:space="preserve">
+    <value>Datei {0}/{1} — {2}: {3} / {4} ({5}%)</value>
+  </data>
+  <data name="Import_LoadedFromFile_Format" xml:space="preserve">
+    <value>{0} Logeinträge aus {1} geladen</value>
+  </data>
+  <data name="Import_ApplyProgress_Format" xml:space="preserve">
+    <value>Ansicht wird befüllt: {0}%</value>
+  </data>
+  <data name="Import_ParseError" xml:space="preserve">
+    <value>Fehler beim Parsen der Datei</value>
+  </data>
 </root>
 
diff --git a/app/Sentinel.NLogViewer.App/Resources/Resources.en.resx b/app/Sentinel.NLogViewer.App/Resources/Resources.en.resx
index 13446d5..e600550 100644
--- a/app/Sentinel.NLogViewer.App/Resources/Resources.en.resx
+++ b/app/Sentinel.NLogViewer.App/Resources/Resources.en.resx
@@ -88,6 +88,27 @@
   <data name="Menu_ExportLogFormat" xml:space="preserve">
     <value>*.log format</value>
   </data>
+  <data name="Menu_Logs_Tabs" xml:space="preserve">
+    <value>_Tabs</value>
+  </data>
+  <data name="Menu_CloseCurrentTab" xml:space="preserve">
+    <value>Close _current tab</value>
+  </data>
+  <data name="Menu_CloseAllTabs" xml:space="preserve">
+    <value>Close _all tabs</value>
+  </data>
+  <data name="Confirm_CloseCurrentTab_Caption" xml:space="preserve">
+    <value>Close tab</value>
+  </data>
+  <data name="Confirm_CloseCurrentTab_Message" xml:space="preserve">
+    <value>Do you really want to close the current tab?</value>
+  </data>
+  <data name="Confirm_CloseAllTabs_Caption" xml:space="preserve">
+    <value>Close all tabs</value>
+  </data>
+  <data name="Confirm_CloseAllTabs_Message" xml:space="preserve">
+    <value>Do you really want to close all tabs?</value>
+  </data>
   <data name="Button_StartListening" xml:space="preserve">
     <value>Start Listening</value>
   </data>
@@ -103,5 +124,65 @@
   <data name="Status_Stopped" xml:space="preserve">
     <value>Stopped</value>
   </data>
+  <data name="ImportDestination_Title" xml:space="preserve">
+    <value>Import destination</value>
+  </data>
+  <data name="ImportDestination_Instructions" xml:space="preserve">
+    <value>Choose where to load the selected file(s).</value>
+  </data>
+  <data name="ImportDestination_ExistingTab" xml:space="preserve">
+    <value>Append to an existing tab</value>
+  </data>
+  <data name="ImportDestination_SingleNewTab" xml:space="preserve">
+    <value>One new tab for all file(s)</value>
+  </data>
+  <data name="ImportDestination_PerFileNewTab" xml:space="preserve">
+    <value>New tab for each file</value>
+  </data>
+  <data name="ImportDestination_OK" xml:space="preserve">
+    <value>_OK</value>
+  </data>
+  <data name="ImportDestination_Cancel" xml:space="preserve">
+    <value>_Cancel</value>
+  </data>
+  <data name="ImportDestination_SelectTab" xml:space="preserve">
+    <value>Please select a tab.</value>
+  </data>
+  <data name="Import_OpenTitle" xml:space="preserve">
+    <value>Open Log File</value>
+  </data>
+  <data name="Import_NoSupportedFiles" xml:space="preserve">
+    <value>No supported log file(s) were found.</value>
+  </data>
+  <data name="Import_TabMerged" xml:space="preserve">
+    <value>Merged import</value>
+  </data>
+  <data name="Import_Starting" xml:space="preserve">
+    <value>Starting...</value>
+  </data>
+  <data name="Import_InProgress" xml:space="preserve">
+    <value>Importing...</value>
+  </data>
+  <data name="Import_FileError_Format" xml:space="preserve">
+    <value>Error importing {0}: {1}</value>
+  </data>
+  <data name="Import_BatchComplete" xml:space="preserve">
+    <value>Import finished.</value>
+  </data>
+  <data name="Import_FormatDetectError" xml:space="preserve">
+    <value>Error detecting file format</value>
+  </data>
+  <data name="Import_ParseProgress_Format" xml:space="preserve">
+    <value>File {0}/{1} — {2}: {3} / {4} ({5}%)</value>
+  </data>
+  <data name="Import_LoadedFromFile_Format" xml:space="preserve">
+    <value>Loaded {0} log entries from {1}</value>
+  </data>
+  <data name="Import_ApplyProgress_Format" xml:space="preserve">
+    <value>Adding to view: {0}%</value>
+  </data>
+  <data name="Import_ParseError" xml:space="preserve">
+    <value>Error parsing file</value>
+  </data>
 </root>
 
diff --git a/app/Sentinel.NLogViewer.App/Resources/Resources.es.resx b/app/Sentinel.NLogViewer.App/Resources/Resources.es.resx
index f195c24..9263785 100644
--- a/app/Sentinel.NLogViewer.App/Resources/Resources.es.resx
+++ b/app/Sentinel.NLogViewer.App/Resources/Resources.es.resx
@@ -88,6 +88,27 @@
   <data name="Menu_ExportLogFormat" xml:space="preserve">
     <value>formato *.log</value>
   </data>
+  <data name="Menu_Logs_Tabs" xml:space="preserve">
+    <value>_Pestañas</value>
+  </data>
+  <data name="Menu_CloseCurrentTab" xml:space="preserve">
+    <value>Cerrar pestaña _actual</value>
+  </data>
+  <data name="Menu_CloseAllTabs" xml:space="preserve">
+    <value>Cerrar _todas las pestañas</value>
+  </data>
+  <data name="Confirm_CloseCurrentTab_Caption" xml:space="preserve">
+    <value>Cerrar pestaña</value>
+  </data>
+  <data name="Confirm_CloseCurrentTab_Message" xml:space="preserve">
+    <value>¿Desea cerrar realmente la pestaña actual?</value>
+  </data>
+  <data name="Confirm_CloseAllTabs_Caption" xml:space="preserve">
+    <value>Cerrar todas las pestañas</value>
+  </data>
+  <data name="Confirm_CloseAllTabs_Message" xml:space="preserve">
+    <value>¿Desea cerrar realmente todas las pestañas?</value>
+  </data>
   <data name="Button_StartListening" xml:space="preserve">
     <value>Iniciar escucha</value>
   </data>
@@ -103,5 +124,65 @@
   <data name="Status_Stopped" xml:space="preserve">
     <value>Detenido</value>
   </data>
+  <data name="ImportDestination_Title" xml:space="preserve">
+    <value>Import destination</value>
+  </data>
+  <data name="ImportDestination_Instructions" xml:space="preserve">
+    <value>Elija dónde cargar el/los archivo(s) seleccionado(s).</value>
+  </data>
+  <data name="ImportDestination_ExistingTab" xml:space="preserve">
+    <value>Append to an existing tab</value>
+  </data>
+  <data name="ImportDestination_SingleNewTab" xml:space="preserve">
+    <value>Una pestaña nueva para todos los archivo(s)</value>
+  </data>
+  <data name="ImportDestination_PerFileNewTab" xml:space="preserve">
+    <value>New tab for each file</value>
+  </data>
+  <data name="ImportDestination_OK" xml:space="preserve">
+    <value>_OK</value>
+  </data>
+  <data name="ImportDestination_Cancel" xml:space="preserve">
+    <value>_Cancel</value>
+  </data>
+  <data name="ImportDestination_SelectTab" xml:space="preserve">
+    <value>Please select a tab.</value>
+  </data>
+  <data name="Import_OpenTitle" xml:space="preserve">
+    <value>Open Log File</value>
+  </data>
+  <data name="Import_NoSupportedFiles" xml:space="preserve">
+    <value>No se encontraron archivo(s) de registro compatibles.</value>
+  </data>
+  <data name="Import_TabMerged" xml:space="preserve">
+    <value>Merged import</value>
+  </data>
+  <data name="Import_Starting" xml:space="preserve">
+    <value>Starting...</value>
+  </data>
+  <data name="Import_InProgress" xml:space="preserve">
+    <value>Importing...</value>
+  </data>
+  <data name="Import_FileError_Format" xml:space="preserve">
+    <value>Error importing {0}: {1}</value>
+  </data>
+  <data name="Import_BatchComplete" xml:space="preserve">
+    <value>Import finished.</value>
+  </data>
+  <data name="Import_FormatDetectError" xml:space="preserve">
+    <value>Error detecting file format</value>
+  </data>
+  <data name="Import_ParseProgress_Format" xml:space="preserve">
+    <value>File {0}/{1} — {2}: {3} / {4} ({5}%)</value>
+  </data>
+  <data name="Import_LoadedFromFile_Format" xml:space="preserve">
+    <value>Loaded {0} log entries from {1}</value>
+  </data>
+  <data name="Import_ApplyProgress_Format" xml:space="preserve">
+    <value>Adding to view: {0}%</value>
+  </data>
+  <data name="Import_ParseError" xml:space="preserve">
+    <value>Error parsing file</value>
+  </data>
 </root>
 
diff --git a/app/Sentinel.NLogViewer.App/Resources/Resources.fr.resx b/app/Sentinel.NLogViewer.App/Resources/Resources.fr.resx
index 0cda2ad..5b27567 100644
--- a/app/Sentinel.NLogViewer.App/Resources/Resources.fr.resx
+++ b/app/Sentinel.NLogViewer.App/Resources/Resources.fr.resx
@@ -88,6 +88,27 @@
   <data name="Menu_ExportLogFormat" xml:space="preserve">
     <value>format *.log</value>
   </data>
+  <data name="Menu_Logs_Tabs" xml:space="preserve">
+    <value>_Onglets</value>
+  </data>
+  <data name="Menu_CloseCurrentTab" xml:space="preserve">
+    <value>Fermer l'onglet _actuel</value>
+  </data>
+  <data name="Menu_CloseAllTabs" xml:space="preserve">
+    <value>Fermer _tous les onglets</value>
+  </data>
+  <data name="Confirm_CloseCurrentTab_Caption" xml:space="preserve">
+    <value>Fermer l'onglet</value>
+  </data>
+  <data name="Confirm_CloseCurrentTab_Message" xml:space="preserve">
+    <value>Voulez-vous vraiment fermer l'onglet actuel ?</value>
+  </data>
+  <data name="Confirm_CloseAllTabs_Caption" xml:space="preserve">
+    <value>Fermer tous les onglets</value>
+  </data>
+  <data name="Confirm_CloseAllTabs_Message" xml:space="preserve">
+    <value>Voulez-vous vraiment fermer tous les onglets ?</value>
+  </data>
   <data name="Button_StartListening" xml:space="preserve">
     <value>Démarrer l'écoute</value>
   </data>
@@ -103,5 +124,65 @@
   <data name="Status_Stopped" xml:space="preserve">
     <value>Arrêté</value>
   </data>
+  <data name="ImportDestination_Title" xml:space="preserve">
+    <value>Import destination</value>
+  </data>
+  <data name="ImportDestination_Instructions" xml:space="preserve">
+    <value>Choisissez où charger le(s) fichier(s) sélectionné(s).</value>
+  </data>
+  <data name="ImportDestination_ExistingTab" xml:space="preserve">
+    <value>Append to an existing tab</value>
+  </data>
+  <data name="ImportDestination_SingleNewTab" xml:space="preserve">
+    <value>Un nouvel onglet pour tous les fichier(s)</value>
+  </data>
+  <data name="ImportDestination_PerFileNewTab" xml:space="preserve">
+    <value>New tab for each file</value>
+  </data>
+  <data name="ImportDestination_OK" xml:space="preserve">
+    <value>_OK</value>
+  </data>
+  <data name="ImportDestination_Cancel" xml:space="preserve">
+    <value>_Cancel</value>
+  </data>
+  <data name="ImportDestination_SelectTab" xml:space="preserve">
+    <value>Please select a tab.</value>
+  </data>
+  <data name="Import_OpenTitle" xml:space="preserve">
+    <value>Open Log File</value>
+  </data>
+  <data name="Import_NoSupportedFiles" xml:space="preserve">
+    <value>Aucun fichier journal pris en charge n'a été trouvé.</value>
+  </data>
+  <data name="Import_TabMerged" xml:space="preserve">
+    <value>Merged import</value>
+  </data>
+  <data name="Import_Starting" xml:space="preserve">
+    <value>Starting...</value>
+  </data>
+  <data name="Import_InProgress" xml:space="preserve">
+    <value>Importing...</value>
+  </data>
+  <data name="Import_FileError_Format" xml:space="preserve">
+    <value>Error importing {0}: {1}</value>
+  </data>
+  <data name="Import_BatchComplete" xml:space="preserve">
+    <value>Import finished.</value>
+  </data>
+  <data name="Import_FormatDetectError" xml:space="preserve">
+    <value>Error detecting file format</value>
+  </data>
+  <data name="Import_ParseProgress_Format" xml:space="preserve">
+    <value>File {0}/{1} — {2}: {3} / {4} ({5}%)</value>
+  </data>
+  <data name="Import_LoadedFromFile_Format" xml:space="preserve">
+    <value>Loaded {0} log entries from {1}</value>
+  </data>
+  <data name="Import_ApplyProgress_Format" xml:space="preserve">
+    <value>Adding to view: {0}%</value>
+  </data>
+  <data name="Import_ParseError" xml:space="preserve">
+    <value>Error parsing file</value>
+  </data>
 </root>
 
diff --git a/app/Sentinel.NLogViewer.App/Resources/Resources.hu.resx b/app/Sentinel.NLogViewer.App/Resources/Resources.hu.resx
index 11c76b0..62da51b 100644
--- a/app/Sentinel.NLogViewer.App/Resources/Resources.hu.resx
+++ b/app/Sentinel.NLogViewer.App/Resources/Resources.hu.resx
@@ -88,6 +88,27 @@
   <data name="Menu_ExportLogFormat" xml:space="preserve">
     <value>*.log formátum</value>
   </data>
+  <data name="Menu_Logs_Tabs" xml:space="preserve">
+    <value>_Lapok</value>
+  </data>
+  <data name="Menu_CloseCurrentTab" xml:space="preserve">
+    <value>Aktuális _lap bezárása</value>
+  </data>
+  <data name="Menu_CloseAllTabs" xml:space="preserve">
+    <value>Összes lap _bezárása</value>
+  </data>
+  <data name="Confirm_CloseCurrentTab_Caption" xml:space="preserve">
+    <value>Lap bezárása</value>
+  </data>
+  <data name="Confirm_CloseCurrentTab_Message" xml:space="preserve">
+    <value>Biztosan bezárja az aktuális lapot?</value>
+  </data>
+  <data name="Confirm_CloseAllTabs_Caption" xml:space="preserve">
+    <value>Összes lap bezárása</value>
+  </data>
+  <data name="Confirm_CloseAllTabs_Message" xml:space="preserve">
+    <value>Biztosan bezárja az összes lapot?</value>
+  </data>
   <data name="Button_StartListening" xml:space="preserve">
     <value>Figyelés indítása</value>
   </data>
@@ -103,6 +124,66 @@
   <data name="Status_Stopped" xml:space="preserve">
     <value>Leállítva</value>
   </data>
+  <data name="ImportDestination_Title" xml:space="preserve">
+    <value>Import destination</value>
+  </data>
+  <data name="ImportDestination_Instructions" xml:space="preserve">
+    <value>Válassza ki, hová töltse a kiválasztott fájl(oka)t.</value>
+  </data>
+  <data name="ImportDestination_ExistingTab" xml:space="preserve">
+    <value>Append to an existing tab</value>
+  </data>
+  <data name="ImportDestination_SingleNewTab" xml:space="preserve">
+    <value>One new tab for all file(s)</value>
+  </data>
+  <data name="ImportDestination_PerFileNewTab" xml:space="preserve">
+    <value>New tab for each file</value>
+  </data>
+  <data name="ImportDestination_OK" xml:space="preserve">
+    <value>_OK</value>
+  </data>
+  <data name="ImportDestination_Cancel" xml:space="preserve">
+    <value>_Cancel</value>
+  </data>
+  <data name="ImportDestination_SelectTab" xml:space="preserve">
+    <value>Please select a tab.</value>
+  </data>
+  <data name="Import_OpenTitle" xml:space="preserve">
+    <value>Open Log File</value>
+  </data>
+  <data name="Import_NoSupportedFiles" xml:space="preserve">
+    <value>No supported log file(s) were found.</value>
+  </data>
+  <data name="Import_TabMerged" xml:space="preserve">
+    <value>Merged import</value>
+  </data>
+  <data name="Import_Starting" xml:space="preserve">
+    <value>Starting...</value>
+  </data>
+  <data name="Import_InProgress" xml:space="preserve">
+    <value>Importing...</value>
+  </data>
+  <data name="Import_FileError_Format" xml:space="preserve">
+    <value>Error importing {0}: {1}</value>
+  </data>
+  <data name="Import_BatchComplete" xml:space="preserve">
+    <value>Import finished.</value>
+  </data>
+  <data name="Import_FormatDetectError" xml:space="preserve">
+    <value>Error detecting file format</value>
+  </data>
+  <data name="Import_ParseProgress_Format" xml:space="preserve">
+    <value>File {0}/{1} — {2}: {3} / {4} ({5}%)</value>
+  </data>
+  <data name="Import_LoadedFromFile_Format" xml:space="preserve">
+    <value>Loaded {0} log entries from {1}</value>
+  </data>
+  <data name="Import_ApplyProgress_Format" xml:space="preserve">
+    <value>Adding to view: {0}%</value>
+  </data>
+  <data name="Import_ParseError" xml:space="preserve">
+    <value>Error parsing file</value>
+  </data>
 </root>
 
 
diff --git a/app/Sentinel.NLogViewer.App/Resources/Resources.pl.resx b/app/Sentinel.NLogViewer.App/Resources/Resources.pl.resx
index 57285f6..5bc3a03 100644
--- a/app/Sentinel.NLogViewer.App/Resources/Resources.pl.resx
+++ b/app/Sentinel.NLogViewer.App/Resources/Resources.pl.resx
@@ -88,6 +88,27 @@
   <data name="Menu_ExportLogFormat" xml:space="preserve">
     <value>format *.log</value>
   </data>
+  <data name="Menu_Logs_Tabs" xml:space="preserve">
+    <value>_Karty</value>
+  </data>
+  <data name="Menu_CloseCurrentTab" xml:space="preserve">
+    <value>Zamknij _bieżącą kartę</value>
+  </data>
+  <data name="Menu_CloseAllTabs" xml:space="preserve">
+    <value>Zamknij _wszystkie karty</value>
+  </data>
+  <data name="Confirm_CloseCurrentTab_Caption" xml:space="preserve">
+    <value>Zamknij kartę</value>
+  </data>
+  <data name="Confirm_CloseCurrentTab_Message" xml:space="preserve">
+    <value>Czy na pewno chcesz zamknąć bieżącą kartę?</value>
+  </data>
+  <data name="Confirm_CloseAllTabs_Caption" xml:space="preserve">
+    <value>Zamknij wszystkie karty</value>
+  </data>
+  <data name="Confirm_CloseAllTabs_Message" xml:space="preserve">
+    <value>Czy na pewno chcesz zamknąć wszystkie karty?</value>
+  </data>
   <data name="Button_StartListening" xml:space="preserve">
     <value>Rozpocznij nasłuchiwanie</value>
   </data>
@@ -103,6 +124,66 @@
   <data name="Status_Stopped" xml:space="preserve">
     <value>Zatrzymany</value>
   </data>
+  <data name="ImportDestination_Title" xml:space="preserve">
+    <value>Import destination</value>
+  </data>
+  <data name="ImportDestination_Instructions" xml:space="preserve">
+    <value>Wybierz, gdzie wczytać wybrany(e) plik(i).</value>
+  </data>
+  <data name="ImportDestination_ExistingTab" xml:space="preserve">
+    <value>Append to an existing tab</value>
+  </data>
+  <data name="ImportDestination_SingleNewTab" xml:space="preserve">
+    <value>Jedna nowa karta dla wybranych plik(ów)</value>
+  </data>
+  <data name="ImportDestination_PerFileNewTab" xml:space="preserve">
+    <value>New tab for each file</value>
+  </data>
+  <data name="ImportDestination_OK" xml:space="preserve">
+    <value>_OK</value>
+  </data>
+  <data name="ImportDestination_Cancel" xml:space="preserve">
+    <value>_Cancel</value>
+  </data>
+  <data name="ImportDestination_SelectTab" xml:space="preserve">
+    <value>Please select a tab.</value>
+  </data>
+  <data name="Import_OpenTitle" xml:space="preserve">
+    <value>Open Log File</value>
+  </data>
+  <data name="Import_NoSupportedFiles" xml:space="preserve">
+    <value>Nie znaleziono obsługiwanych plik(ów) dziennika.</value>
+  </data>
+  <data name="Import_TabMerged" xml:space="preserve">
+    <value>Merged import</value>
+  </data>
+  <data name="Import_Starting" xml:space="preserve">
+    <value>Starting...</value>
+  </data>
+  <data name="Import_InProgress" xml:space="preserve">
+    <value>Importing...</value>
+  </data>
+  <data name="Import_FileError_Format" xml:space="preserve">
+    <value>Error importing {0}: {1}</value>
+  </data>
+  <data name="Import_BatchComplete" xml:space="preserve">
+    <value>Import finished.</value>
+  </data>
+  <data name="Import_FormatDetectError" xml:space="preserve">
+    <value>Error detecting file format</value>
+  </data>
+  <data name="Import_ParseProgress_Format" xml:space="preserve">
+    <value>File {0}/{1} — {2}: {3} / {4} ({5}%)</value>
+  </data>
+  <data name="Import_LoadedFromFile_Format" xml:space="preserve">
+    <value>Loaded {0} log entries from {1}</value>
+  </data>
+  <data name="Import_ApplyProgress_Format" xml:space="preserve">
+    <value>Adding to view: {0}%</value>
+  </data>
+  <data name="Import_ParseError" xml:space="preserve">
+    <value>Error parsing file</value>
+  </data>
 </root>
 
 
diff --git a/app/Sentinel.NLogViewer.App/Resources/Resources.resx b/app/Sentinel.NLogViewer.App/Resources/Resources.resx
index 0e10014..64da012 100644
--- a/app/Sentinel.NLogViewer.App/Resources/Resources.resx
+++ b/app/Sentinel.NLogViewer.App/Resources/Resources.resx
@@ -88,6 +88,27 @@
   <data name="Menu_ExportLogFormat" xml:space="preserve">
     <value>*.log format</value>
   </data>
+  <data name="Menu_Logs_Tabs" xml:space="preserve">
+    <value>_Tabs</value>
+  </data>
+  <data name="Menu_CloseCurrentTab" xml:space="preserve">
+    <value>Close _current tab</value>
+  </data>
+  <data name="Menu_CloseAllTabs" xml:space="preserve">
+    <value>Close _all tabs</value>
+  </data>
+  <data name="Confirm_CloseCurrentTab_Caption" xml:space="preserve">
+    <value>Close tab</value>
+  </data>
+  <data name="Confirm_CloseCurrentTab_Message" xml:space="preserve">
+    <value>Do you really want to close the current tab?</value>
+  </data>
+  <data name="Confirm_CloseAllTabs_Caption" xml:space="preserve">
+    <value>Close all tabs</value>
+  </data>
+  <data name="Confirm_CloseAllTabs_Message" xml:space="preserve">
+    <value>Do you really want to close all tabs?</value>
+  </data>
   <data name="Button_StartListening" xml:space="preserve">
     <value>Start Listening</value>
   </data>
@@ -115,5 +136,65 @@
   <data name="Error_StartingListenerCaption" xml:space="preserve">
     <value>Error starting listener</value>
   </data>
+  <data name="ImportDestination_Title" xml:space="preserve">
+    <value>Import destination</value>
+  </data>
+  <data name="ImportDestination_Instructions" xml:space="preserve">
+    <value>Choose where to load the selected file(s).</value>
+  </data>
+  <data name="ImportDestination_ExistingTab" xml:space="preserve">
+    <value>Append to an existing tab</value>
+  </data>
+  <data name="ImportDestination_SingleNewTab" xml:space="preserve">
+    <value>One new tab for all file(s)</value>
+  </data>
+  <data name="ImportDestination_PerFileNewTab" xml:space="preserve">
+    <value>New tab for each file</value>
+  </data>
+  <data name="ImportDestination_OK" xml:space="preserve">
+    <value>_OK</value>
+  </data>
+  <data name="ImportDestination_Cancel" xml:space="preserve">
+    <value>_Cancel</value>
+  </data>
+  <data name="ImportDestination_SelectTab" xml:space="preserve">
+    <value>Please select a tab.</value>
+  </data>
+  <data name="Import_OpenTitle" xml:space="preserve">
+    <value>Open Log File</value>
+  </data>
+  <data name="Import_NoSupportedFiles" xml:space="preserve">
+    <value>No supported log file(s) were found.</value>
+  </data>
+  <data name="Import_TabMerged" xml:space="preserve">
+    <value>Merged import</value>
+  </data>
+  <data name="Import_Starting" xml:space="preserve">
+    <value>Starting...</value>
+  </data>
+  <data name="Import_InProgress" xml:space="preserve">
+    <value>Importing...</value>
+  </data>
+  <data name="Import_FileError_Format" xml:space="preserve">
+    <value>Error importing {0}: {1}</value>
+  </data>
+  <data name="Import_BatchComplete" xml:space="preserve">
+    <value>Import finished.</value>
+  </data>
+  <data name="Import_FormatDetectError" xml:space="preserve">
+    <value>Error detecting file format</value>
+  </data>
+  <data name="Import_ParseProgress_Format" xml:space="preserve">
+    <value>File {0}/{1} — {2}: {3} / {4} ({5}%)</value>
+  </data>
+  <data name="Import_LoadedFromFile_Format" xml:space="preserve">
+    <value>Loaded {0} log entries from {1}</value>
+  </data>
+  <data name="Import_ApplyProgress_Format" xml:space="preserve">
+    <value>Adding to view: {0}%</value>
+  </data>
+  <data name="Import_ParseError" xml:space="preserve">
+    <value>Error parsing file</value>
+  </data>
 </root>
 
diff --git a/app/Sentinel.NLogViewer.App/Resources/Resources.ro.resx b/app/Sentinel.NLogViewer.App/Resources/Resources.ro.resx
index a51be71..b1c8809 100644
--- a/app/Sentinel.NLogViewer.App/Resources/Resources.ro.resx
+++ b/app/Sentinel.NLogViewer.App/Resources/Resources.ro.resx
@@ -88,6 +88,27 @@
   <data name="Menu_ExportLogFormat" xml:space="preserve">
     <value>format *.log</value>
   </data>
+  <data name="Menu_Logs_Tabs" xml:space="preserve">
+    <value>_File</value>
+  </data>
+  <data name="Menu_CloseCurrentTab" xml:space="preserve">
+    <value>Închide fila _curentă</value>
+  </data>
+  <data name="Menu_CloseAllTabs" xml:space="preserve">
+    <value>Închide _toate filele</value>
+  </data>
+  <data name="Confirm_CloseCurrentTab_Caption" xml:space="preserve">
+    <value>Închide fila</value>
+  </data>
+  <data name="Confirm_CloseCurrentTab_Message" xml:space="preserve">
+    <value>Sigur doriți să închideți fila curentă?</value>
+  </data>
+  <data name="Confirm_CloseAllTabs_Caption" xml:space="preserve">
+    <value>Închide toate filele</value>
+  </data>
+  <data name="Confirm_CloseAllTabs_Message" xml:space="preserve">
+    <value>Sigur doriți să închideți toate filele?</value>
+  </data>
   <data name="Button_StartListening" xml:space="preserve">
     <value>Începe ascultarea</value>
   </data>
@@ -103,6 +124,66 @@
   <data name="Status_Stopped" xml:space="preserve">
     <value>Oprit</value>
   </data>
+  <data name="ImportDestination_Title" xml:space="preserve">
+    <value>Import destination</value>
+  </data>
+  <data name="ImportDestination_Instructions" xml:space="preserve">
+    <value>Selectați unde se încarcă fișierul(ele) selectat(e).</value>
+  </data>
+  <data name="ImportDestination_ExistingTab" xml:space="preserve">
+    <value>Append to an existing tab</value>
+  </data>
+  <data name="ImportDestination_SingleNewTab" xml:space="preserve">
+    <value>One new tab for all file(s)</value>
+  </data>
+  <data name="ImportDestination_PerFileNewTab" xml:space="preserve">
+    <value>New tab for each file</value>
+  </data>
+  <data name="ImportDestination_OK" xml:space="preserve">
+    <value>_OK</value>
+  </data>
+  <data name="ImportDestination_Cancel" xml:space="preserve">
+    <value>_Cancel</value>
+  </data>
+  <data name="ImportDestination_SelectTab" xml:space="preserve">
+    <value>Please select a tab.</value>
+  </data>
+  <data name="Import_OpenTitle" xml:space="preserve">
+    <value>Open Log File</value>
+  </data>
+  <data name="Import_NoSupportedFiles" xml:space="preserve">
+    <value>No supported log file(s) were found.</value>
+  </data>
+  <data name="Import_TabMerged" xml:space="preserve">
+    <value>Merged import</value>
+  </data>
+  <data name="Import_Starting" xml:space="preserve">
+    <value>Starting...</value>
+  </data>
+  <data name="Import_InProgress" xml:space="preserve">
+    <value>Importing...</value>
+  </data>
+  <data name="Import_FileError_Format" xml:space="preserve">
+    <value>Error importing {0}: {1}</value>
+  </data>
+  <data name="Import_BatchComplete" xml:space="preserve">
+    <value>Import finished.</value>
+  </data>
+  <data name="Import_FormatDetectError" xml:space="preserve">
+    <value>Error detecting file format</value>
+  </data>
+  <data name="Import_ParseProgress_Format" xml:space="preserve">
+    <value>File {0}/{1} — {2}: {3} / {4} ({5}%)</value>
+  </data>
+  <data name="Import_LoadedFromFile_Format" xml:space="preserve">
+    <value>Loaded {0} log entries from {1}</value>
+  </data>
+  <data name="Import_ApplyProgress_Format" xml:space="preserve">
+    <value>Adding to view: {0}%</value>
+  </data>
+  <data name="Import_ParseError" xml:space="preserve">
+    <value>Error parsing file</value>
+  </data>
 </root>
 
 
diff --git a/app/Sentinel.NLogViewer.App/ViewModels/MainViewModel.cs b/app/Sentinel.NLogViewer.App/ViewModels/MainViewModel.cs
index 1f89f18..2565223 100644
--- a/app/Sentinel.NLogViewer.App/ViewModels/MainViewModel.cs
+++ b/app/Sentinel.NLogViewer.App/ViewModels/MainViewModel.cs
@@ -1,13 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Collections.Specialized;
 using System.ComponentModel;
 using System.IO;
 using System.Linq;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using System.Runtime.CompilerServices;
-using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Input;
 using System.Windows.Threading;
@@ -18,11 +18,9 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Win32;
 using NLog;
-using NLog.Config;
 using Sentinel.NLogViewer.App.Models;
 using Sentinel.NLogViewer.App.Services;
 using Sentinel.NLogViewer.App;
-using Sentinel.NLogViewer.Wpf.Targets;
 
 namespace Sentinel.NLogViewer.App.ViewModels;
 
@@ -59,6 +57,7 @@ public MainViewModel(
 		_localizationService = localizationService ?? throw new ArgumentNullException(nameof(localizationService));
 
 		LogTabs = new ObservableCollection<LogTabViewModel>();
+		LogTabs.CollectionChanged += OnLogTabsCollectionChanged;
 
 		// Initialize commands
 		StartListeningCommand = new AsyncRelayCommand(StartListeningAsync, () => !_isListening);
@@ -69,6 +68,8 @@ public MainViewModel(
 		AboutCommand = new RelayCommand(ShowAbout);
 		ChangeLanguageCommand = new RelayCommand<string>(ChangeLanguage);
 		ExportLogsCommand = new RelayCommand(ExportLogs, () => SelectedTab != null);
+		CloseCurrentTabCommand = new RelayCommand(CloseCurrentTab, () => SelectedTab != null && LogTabs.Count > 0);
+		CloseAllTabsCommand = new RelayCommand(CloseAllTabs, () => LogTabs.Count > 0);
 
 		// Initialize current language flag
 		UpdateLanguageFlag();
@@ -140,10 +141,94 @@ public LogTabViewModel? SelectedTab
 				OnPropertyChanged();
 				// Update ExportLogsCommand CanExecute
 				((RelayCommand)ExportLogsCommand).RaiseCanExecuteChanged();
+				((RelayCommand)CloseCurrentTabCommand).RaiseCanExecuteChanged();
+				((RelayCommand)CloseAllTabsCommand).RaiseCanExecuteChanged();
 			}
 		}
 	}
 
+	private void OnLogTabsCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
+	{
+		((RelayCommand)CloseCurrentTabCommand).RaiseCanExecuteChanged();
+		((RelayCommand)CloseAllTabsCommand).RaiseCanExecuteChanged();
+	}
+
+	/// <summary>
+	/// Removes the selected tab after user confirms.
+	/// </summary>
+	private void CloseCurrentTab()
+	{
+		if (SelectedTab == null)
+			return;
+
+		var caption = _localizationService.GetString("Confirm_CloseCurrentTab_Caption", "Close tab");
+		var message = _localizationService.GetString(
+			"Confirm_CloseCurrentTab_Message",
+			"Do you really want to close the current tab?");
+		var owner = System.Windows.Application.Current.MainWindow;
+		if (MessageBox.Show(owner, message, caption, MessageBoxButton.YesNo, MessageBoxImage.Question) !=
+		    MessageBoxResult.Yes)
+			return;
+
+		var index = LogTabs.IndexOf(SelectedTab);
+		if (index < 0)
+			return;
+
+		LogTabs.RemoveAt(index);
+
+		if (LogTabs.Count == 0)
+			SelectedTab = null;
+		else
+			SelectedTab = LogTabs[Math.Min(index, LogTabs.Count - 1)];
+	}
+
+	/// <summary>
+	/// Clears all tabs after user confirms.
+	/// </summary>
+	private void CloseAllTabs()
+	{
+		var caption = _localizationService.GetString("Confirm_CloseAllTabs_Caption", "Close all tabs");
+		var message = _localizationService.GetString(
+			"Confirm_CloseAllTabs_Message",
+			"Do you really want to close all tabs?");
+		var owner = System.Windows.Application.Current.MainWindow;
+		if (MessageBox.Show(owner, message, caption, MessageBoxButton.YesNo, MessageBoxImage.Question) !=
+		    MessageBoxResult.Yes)
+			return;
+
+		LogTabs.Clear();
+		SelectedTab = null;
+	}
+
+	/// <summary>
+	/// Moves the given tab next to a target tab (e.g. after a header drag-and-drop).
+	/// </summary>
+	/// <param name="source">Tab being dragged.</param>
+	/// <param name="target">Tab header that was dropped on.</param>
+	/// <param name="insertBefore">
+	/// When true, the source is inserted before the target; when false, after the target.
+	/// </param>
+	public void MoveTab(LogTabViewModel source, LogTabViewModel target, bool insertBefore)
+	{
+		if (source == null || target == null || ReferenceEquals(source, target))
+			return;
+
+		var oldIndex = LogTabs.IndexOf(source);
+		var targetIndex = LogTabs.IndexOf(target);
+		if (oldIndex < 0 || targetIndex < 0)
+			return;
+
+		var newIndex = insertBefore ? targetIndex : targetIndex + 1;
+		if (oldIndex < newIndex)
+			newIndex--;
+
+		if (oldIndex == newIndex)
+			return;
+
+		newIndex = Math.Clamp(newIndex, 0, LogTabs.Count - 1);
+		LogTabs.Move(oldIndex, newIndex);
+	}
+
 	public bool IsListening
 	{
 		get => _isListening;
@@ -206,6 +291,8 @@ public string LastLogTimestamp
 	public ICommand AboutCommand { get; }
 	public ICommand ChangeLanguageCommand { get; }
 	public ICommand ExportLogsCommand { get; }
+	public ICommand CloseCurrentTabCommand { get; }
+	public ICommand CloseAllTabsCommand { get; }
 
 	/// <summary>
 	/// Gets the flag emoji for the current language
@@ -334,239 +421,389 @@ private void OpenFile()
 		var dialog = new OpenFileDialog
 		{
 			Filter = "Log Files (*.xml;*.log;*.txt;*.json)|*.xml;*.log;*.txt;*.json|XML Files (*.xml)|*.xml|Text Files (*.txt;*.log)|*.txt;*.log|JSON Files (*.json)|*.json|All Files (*.*)|*.*",
-			Title = "Open Log File"
+			Title = _localizationService.GetString("Import_OpenTitle", "Open Log File"),
+			Multiselect = true
 		};
 
-		if (dialog.ShowDialog() == true)
+		if (dialog.ShowDialog() == true && dialog.FileNames.Length > 0)
+			BeginImportPathsFromUi(dialog.FileNames);
+	}
+
+	/// <summary>
+	/// Starts unified import for paths given by the open-file dialog or drag-drop (filters and asks destination).
+	/// </summary>
+	public void BeginImportPathsFromUi(IEnumerable<string> rawPaths)
+	{
+		var filtered = (rawPaths ?? Enumerable.Empty<string>())
+			.Where(IsSupportedImportPath)
+			.Distinct(StringComparer.OrdinalIgnoreCase)
+			.ToList();
+
+		if (filtered.Count == 0)
 		{
-			var filePath = dialog.FileName;
-			var extension = Path.GetExtension(filePath).ToLowerInvariant();
+			StatusMessage = _localizationService.GetString("Import_NoSupportedFiles", "No supported log files were found.");
+			return;
+		}
 
-			// For text files, check format detection
-			if (extension == ".txt" || extension == ".log" || extension == "")
-			{
-				HandleTextFileWithFormatDetection(filePath);
-			}
-			else
-			{
-				// For XML/JSON, parse directly
-				ParseFileDirectly(filePath);
-			}
+		if (IsLoading)
+			return;
+
+		if (!TryResolveImportBatchContext(filtered, out var ctx) || ctx == null)
+			return;
+
+		_ = RunImportBatchAsync(filtered, ctx);
+	}
+
+	/// <summary>
+	/// Returns whether the path is a supported regular file for import (aligned with the open-file filter).
+	/// </summary>
+	private static bool IsSupportedImportPath(string path)
+	{
+		if (string.IsNullOrWhiteSpace(path))
+			return false;
+
+		try
+		{
+			var attributes = File.GetAttributes(path);
+			if ((attributes & FileAttributes.Directory) != 0 || (attributes & FileAttributes.Device) != 0)
+				return false;
+		}
+		catch
+		{
+			return false;
 		}
+
+		var extension = Path.GetExtension(path);
+		return extension.Equals(".xml", StringComparison.OrdinalIgnoreCase)
+		       || extension.Equals(".log", StringComparison.OrdinalIgnoreCase)
+		       || extension.Equals(".txt", StringComparison.OrdinalIgnoreCase)
+		       || extension.Equals(".json", StringComparison.OrdinalIgnoreCase)
+		       || extension.Length == 0;
 	}
 
 	/// <summary>
-	/// Handles text file opening with format detection and optional mapping dialog
+	/// Shows the destination dialog when needed and builds the batch context.
 	/// </summary>
-	private void HandleTextFileWithFormatDetection(string filePath)
+	private bool TryResolveImportBatchContext(IReadOnlyList<string> paths, out LogFileImportBatchContext? ctx)
 	{
-		Task.Run(() =>
+		ctx = null;
+		if (paths.Count == 0)
+			return false;
+
+		if (LogTabs.Count == 0 && paths.Count == 1)
 		{
-			try
+			ctx = new LogFileImportBatchContext(LogFileImportBatchContext.DestinationMode.PerFileNewTab, null, null);
+			return true;
+		}
+
+		var owner = System.Windows.Application.Current.MainWindow;
+		var sharedHeader = paths.Count > 1
+			? _localizationService.GetString("Import_TabMerged", "Merged import")
+			: Path.GetFileName(paths[0]);
+
+		if (LogTabs.Count == 0)
+		{
+			var dlgMinimal = new ImportDestinationWindow(LogTabs.ToList(), null, showExistingTabOption: false,
+					showPerFileNewTabOption: paths.Count > 1)
 			{
-				// Get format configuration
-				var format = _fileParserService.GetTextFileFormat(filePath);
+				Owner = owner
+			};
+			if (dlgMinimal.ShowDialog() != true)
+				return false;
 
-				// If format detection failed or auto-mapping is incomplete, show dialog
-				if (format == null || !format.ColumnMapping.IsValid())
-				{
-					// Read sample lines for the dialog
-					var sampleLines = File.ReadLines(filePath).Take(20).ToList();
+			ctx = dlgMinimal.SelectedMode == LogFileImportBatchContext.DestinationMode.SingleNewTab
+				? new LogFileImportBatchContext(LogFileImportBatchContext.DestinationMode.SingleNewTab, null, sharedHeader)
+				: new LogFileImportBatchContext(LogFileImportBatchContext.DestinationMode.PerFileNewTab, null, null);
+			return true;
+		}
 
-					// If format is null, create a basic one for detection
-					if (format == null)
-					{
-						var detector = App.ServiceProvider?.GetRequiredService<TextFileFormatDetector>();
-						format = detector?.DetectFormat(filePath);
-					}
+		var dlgFull = new ImportDestinationWindow(LogTabs.ToList(), SelectedTab, showExistingTabOption: true,
+				showPerFileNewTabOption: paths.Count > 1)
+		{
+			Owner = owner
+		};
+		if (dlgFull.ShowDialog() != true)
+			return false;
 
-					// Show dialog on UI thread
-					System.Windows.Application.Current.Dispatcher.Invoke(() =>
-					{
-						if (format != null)
-						{
-							var viewModel = new ColumnMappingViewModel(format, sampleLines, filePath);
-							var mappingWindow = new ColumnMappingWindow(viewModel);
-							var mainWindow = System.Windows.Application.Current.MainWindow;
-
-							if (mappingWindow.ShowDialog(mainWindow) == true)
-							{
-								var finalFormat = mappingWindow.FinalFormat;
-
-								// Save format if requested
-								if (mappingWindow.SaveForPattern && !string.IsNullOrEmpty(mappingWindow.FilePattern))
-								{
-									_fileParserService.SaveTextFileFormat(mappingWindow.FilePattern, finalFormat);
-								}
-
-								// Parse with the configured format
-								ParseFileWithFormat(filePath, finalFormat);
-							}
-							else
-							{
-								// User cancelled, try parsing with detected format or fallback
-								ParseFileDirectly(filePath);
-							}
-						}
-						else
-						{
-							// Format detection completely failed, use fallback parsing
-							ParseFileDirectly(filePath);
-						}
-					});
-				}
-				else
+		switch (dlgFull.SelectedMode)
+		{
+			case LogFileImportBatchContext.DestinationMode.ExistingTab:
+				var tab = dlgFull.SelectedExistingTab;
+				if (tab == null)
+					return false;
+				ctx = new LogFileImportBatchContext(LogFileImportBatchContext.DestinationMode.ExistingTab, tab, null);
+				return true;
+			case LogFileImportBatchContext.DestinationMode.SingleNewTab:
+				ctx = new LogFileImportBatchContext(LogFileImportBatchContext.DestinationMode.SingleNewTab, null, sharedHeader);
+				return true;
+			default:
+				ctx = new LogFileImportBatchContext(LogFileImportBatchContext.DestinationMode.PerFileNewTab, null, null);
+				return true;
+		}
+	}
+
+	/// <summary>
+	/// Parses each file in order and applies logs according to <paramref name="ctx"/>.
+	/// </summary>
+	private async Task RunImportBatchAsync(IReadOnlyList<string> paths, LogFileImportBatchContext ctx)
+	{
+		IsLoading = true;
+		LoadingProgress = _localizationService.GetString("Import_Starting", "Starting...");
+		StatusMessage = _localizationService.GetString("Import_InProgress", "Importing...");
+
+		try
+		{
+			for (var i = 0; i < paths.Count; i++)
+			{
+				var path = paths[i];
+				try
 				{
-					// Format is valid, parse directly
-					ParseFileDirectly(filePath);
+					await ImportSinglePathAsync(path, ctx, i + 1, paths.Count).ConfigureAwait(true);
 				}
-			}
 			catch (Exception ex)
 			{
-				System.Windows.Application.Current.Dispatcher.Invoke(() =>
-				{
-					StatusMessage = $"Error detecting file format: {ex.Message}";
-					// Fallback to direct parsing
-					ParseFileDirectly(filePath);
-				});
+				var pathName = Path.GetFileName(path);
+				var tpl = _localizationService.GetString(
+					"Import_FileError_Format",
+					"Error importing {0}: {1}");
+				StatusMessage = string.Format(System.Globalization.CultureInfo.CurrentCulture, tpl, pathName, ex.Message);
 			}
-		});
+			}
+
+			StatusMessage = _localizationService.GetString("Import_BatchComplete", "Import finished.");
+		}
+		finally
+		{
+			IsLoading = false;
+			LoadingProgress = string.Empty;
+		}
 	}
 
 	/// <summary>
-	/// Parses a file directly without format configuration
+	/// Runs format detection (if needed) and parsing for a single path in a batch.
 	/// </summary>
-	private void ParseFileDirectly(string filePath)
+	private async Task ImportSinglePathAsync(string filePath, LogFileImportBatchContext ctx, int index, int total)
 	{
-		IsLoading = true;
-		LoadingProgress = "Starting...";
-		StatusMessage = "Parsing file...";
+		var extension = Path.GetExtension(filePath).ToLowerInvariant();
+		if (extension == ".txt" || extension == ".log" || extension == "")
+			await ImportTextFormatFlowAsync(filePath, ctx, index, total).ConfigureAwait(true);
+		else
+			await ImportDirectParseFlowAsync(filePath, ctx, index, total).ConfigureAwait(true);
+	}
 
-		Task.Run(async () =>
+	/// <summary>
+	/// Text / extensionless log paths: detect format, optionally show column-mapping, then parse.
+	/// </summary>
+	private async Task ImportTextFormatFlowAsync(string filePath, LogFileImportBatchContext ctx, int index, int total)
+	{
+		var dispatcher = System.Windows.Application.Current.Dispatcher;
+		TextFileFormat? format;
+		try
+		{
+			format = await Task.Run(() => _fileParserService.GetTextFileFormat(filePath)).ConfigureAwait(false);
+		}
+		catch (Exception ex)
 		{
-			try
+			await dispatcher.InvokeAsync(() =>
 			{
-				var progress = new Progress<(int current, int total)>(p =>
-				{
-					var percentage = p.total > 0 ? (p.current * 100 / p.total) : 0;
-					System.Windows.Application.Current.Dispatcher.Invoke(() =>
-					{
-						LoadingProgress = $"Processing: {p.current} / {p.total} ({percentage}%)";
-					});
-				});
+				StatusMessage = _localizationService.GetString("Import_FormatDetectError", "Error detecting file format") +
+				                $": {ex.Message}";
+			}).Task.ConfigureAwait(false);
+			await ImportDirectParseFlowAsync(filePath, ctx, index, total).ConfigureAwait(true);
+			return;
+		}
 
-				var logEvents = await _fileParserService.ParseFileAsync(filePath, progress);
+		if (format != null && format.ColumnMapping.IsValid())
+		{
+			await ImportDirectParseFlowAsync(filePath, ctx, index, total).ConfigureAwait(true);
+			return;
+		}
 
-				// Batch-add logs to CacheTarget for better performance
-				System.Windows.Application.Current.Dispatcher.Invoke(() =>
-				{
-					ProcessParsedLogs(logEvents, filePath);
-					IsLoading = false;
-					LoadingProgress = string.Empty;
-					StatusMessage = $"Loaded {logEvents.Count} log entries from {Path.GetFileName(filePath)}";
-				});
-			}
-			catch (Exception ex)
-			{
-				System.Windows.Application.Current.Dispatcher.Invoke(() =>
-				{
-					IsLoading = false;
-					LoadingProgress = string.Empty;
-					StatusMessage = $"Error parsing file: {ex.Message}";
-				});
-			}
-		});
+		var sampleLines =
+			await Task.Run(() => File.ReadLines(filePath).Take(20).ToList()).ConfigureAwait(false);
+
+		if (format == null)
+		{
+			var detector = App.ServiceProvider?.GetRequiredService<TextFileFormatDetector>();
+			format = detector?.DetectFormat(filePath);
+		}
+
+		TextFileFormat? mappedFormat = await dispatcher.InvokeAsync(() =>
+		{
+			if (format == null)
+				return null;
+
+			var viewModel = new ColumnMappingViewModel(format, sampleLines, filePath);
+			var mappingWindow = new ColumnMappingWindow(viewModel);
+			var mainWindow = System.Windows.Application.Current.MainWindow;
+
+			if (mappingWindow.ShowDialog(mainWindow) != true)
+				return null;
+
+			var userFormat = mappingWindow.FinalFormat;
+
+			if (mappingWindow.SaveForPattern && !string.IsNullOrEmpty(mappingWindow.FilePattern))
+				_fileParserService.SaveTextFileFormat(mappingWindow.FilePattern, userFormat);
+
+			return userFormat;
+		}).Task.ConfigureAwait(false);
+
+		if (mappedFormat != null)
+			await ParseAndApplyWithFormatAsync(filePath, mappedFormat, ctx, index, total).ConfigureAwait(true);
+		else
+			await ImportDirectParseFlowAsync(filePath, ctx, index, total).ConfigureAwait(true);
 	}
 
 	/// <summary>
-	/// Parses a file with a specific format configuration
+	/// Parses using an explicit text format and applies to the tab batch target.
 	/// </summary>
-	private void ParseFileWithFormat(string filePath, TextFileFormat format)
+	private async Task ParseAndApplyWithFormatAsync(string filePath, TextFileFormat format,
+		LogFileImportBatchContext ctx, int index, int total)
 	{
-		IsLoading = true;
-		LoadingProgress = "Starting...";
-		StatusMessage = "Parsing file...";
+		var dispatcher = System.Windows.Application.Current.Dispatcher;
+
+		var progress = new Progress<(int current, int total)>(p =>
+		{
+			var percentage = p.total > 0 ? p.current * 100 / p.total : 0;
+			dispatcher.Invoke(() => { LoadingProgress = FormatParseProgress(filePath, index, total, p.current, p.total, percentage); });
+		});
+
+		await Task.Run(() => _fileParserService.SaveTextFileFormat(Path.GetFileName(filePath), format)).ConfigureAwait(false);
 
-		Task.Run(async () =>
+		List<LogEventInfo> logEvents;
+		try
 		{
-			try
+			logEvents = await _fileParserService.ParseFileAsync(filePath, progress).ConfigureAwait(false);
+		}
+		catch (Exception ex)
+		{
+			await dispatcher.InvokeAsync(() =>
 			{
-				var progress = new Progress<(int current, int total)>(p =>
-				{
-					var percentage = p.total > 0 ? (p.current * 100 / p.total) : 0;
-					System.Windows.Application.Current.Dispatcher.Invoke(() =>
-					{
-						LoadingProgress = $"Processing: {p.current} / {p.total} ({percentage}%)";
-					});
-				});
+				StatusMessage = _localizationService.GetString("Import_ParseError", "Error parsing file") + $": {ex.Message}";
+			}).Task.ConfigureAwait(false);
+			return;
+		}
 
-				// Temporarily save format for this parsing session
-				_fileParserService.SaveTextFileFormat(Path.GetFileName(filePath), format);
+		await dispatcher.InvokeAsync(() =>
+		{
+			ApplyParsedLogs(logEvents, filePath, ctx);
+			StatusMessage = FormatLoadedStatus(filePath, logEvents.Count);
+			LastLogTimestamp = DateTime.Now.ToString("HH:mm:ss");
+		}).Task.ConfigureAwait(false);
+	}
 
-				var logEvents = await _fileParserService.ParseFileAsync(filePath, progress);
+	/// <summary>
+	/// Parses without injecting a new text format and applies to the batch target.
+	/// </summary>
+	private async Task ImportDirectParseFlowAsync(string filePath, LogFileImportBatchContext ctx, int index, int total)
+	{
+		var dispatcher = System.Windows.Application.Current.Dispatcher;
 
-				// Batch-add logs to CacheTarget for better performance
-				System.Windows.Application.Current.Dispatcher.Invoke(() =>
-				{
-					ProcessParsedLogs(logEvents, filePath);
-					IsLoading = false;
-					LoadingProgress = string.Empty;
-					StatusMessage = $"Loaded {logEvents.Count} log entries from {Path.GetFileName(filePath)}";
-				});
-			}
-			catch (Exception ex)
-			{
-				System.Windows.Application.Current.Dispatcher.Invoke(() =>
-				{
-					IsLoading = false;
-					LoadingProgress = string.Empty;
-					StatusMessage = $"Error parsing file: {ex.Message}";
-				});
-			}
+		var progress = new Progress<(int current, int total)>(p =>
+		{
+			var percentage = p.total > 0 ? p.current * 100 / p.total : 0;
+			dispatcher.Invoke(() => { LoadingProgress = FormatParseProgress(filePath, index, total, p.current, p.total, percentage); });
 		});
+
+		List<LogEventInfo> logEvents;
+		try
+		{
+			logEvents = await _fileParserService.ParseFileAsync(filePath, progress).ConfigureAwait(false);
+		}
+		catch (Exception ex)
+		{
+			await dispatcher.InvokeAsync(() =>
+			{
+				StatusMessage = _localizationService.GetString("Import_ParseError", "Error parsing file") + $": {ex.Message}";
+			}).Task.ConfigureAwait(false);
+			return;
+		}
+
+		await dispatcher.InvokeAsync(() =>
+		{
+			ApplyParsedLogs(logEvents, filePath, ctx);
+			StatusMessage = FormatLoadedStatus(filePath, logEvents.Count);
+			LastLogTimestamp = DateTime.Now.ToString("HH:mm:ss");
+		}).Task.ConfigureAwait(false);
+	}
+
+	private string FormatParseProgress(string filePath, int fileIndex, int fileTotal, int current, int parsedTotal,
+		int percentage)
+	{
+		var name = Path.GetFileName(filePath);
+		var tpl = _localizationService.GetString(
+			"Import_ParseProgress_Format",
+			"File {0}/{1} — {2}: {3} / {4} ({5}%)");
+		return string.Format(System.Globalization.CultureInfo.CurrentCulture, tpl, fileIndex, fileTotal, name,
+			current, parsedTotal, percentage);
+	}
+
+	private string FormatLoadedStatus(string filePath, int count)
+	{
+		var name = Path.GetFileName(filePath);
+		var tpl = _localizationService.GetString(
+			"Import_LoadedFromFile_Format",
+			"Loaded {0} log entries from {1}");
+		return string.Format(System.Globalization.CultureInfo.CurrentCulture, tpl, count, name);
 	}
 
 	/// <summary>
-	/// Processes parsed log events and adds them to the appropriate tab
+	/// Appends parsed rows to the tab chosen for this import batch.
 	/// </summary>
-	private void ProcessParsedLogs(List<LogEventInfo> logEvents, string fileName)
+	private void ApplyParsedLogs(List<LogEventInfo> logEvents, string filePath, LogFileImportBatchContext ctx)
 	{
-		// We're already on the Dispatcher thread, no need to invoke
 		if (logEvents == null || logEvents.Count == 0)
 			return;
-		
-		// Find or create tab for this file
-		var tab = LogTabs.FirstOrDefault(t => t.TargetName == $"File_{Path.GetFileName(fileName)}");
-		if (tab == null)
+
+		LogTabViewModel tab;
+		switch (ctx.Mode)
 		{
-			tab = new LogTabViewModel
-			{
-				Header = Path.GetFileName(fileName),
-				TargetName = $"File_{Path.GetFileName(fileName)}",
-				MaxCount = int.MaxValue
-			};
-			LogTabs.Add(tab);
-			SelectedTab = tab;
+			case LogFileImportBatchContext.DestinationMode.ExistingTab:
+				tab = ctx.ExistingTargetTab
+				      ?? throw new InvalidOperationException("Existing tab target is not set.");
+				break;
+			case LogFileImportBatchContext.DestinationMode.SingleNewTab:
+				if (ctx.SharedNewTab == null)
+				{
+					ctx.SharedNewTab = new LogTabViewModel
+					{
+						Header = ctx.SharedTabHeaderWhenSingleNewTab ?? Path.GetFileName(filePath),
+						TargetName = $"FileImport_{Guid.NewGuid()}",
+						MaxCount = int.MaxValue
+					};
+					LogTabs.Add(ctx.SharedNewTab);
+					SelectedTab = ctx.SharedNewTab;
+				}
+
+				tab = ctx.SharedNewTab;
+				break;
+			default:
+				tab = new LogTabViewModel
+				{
+					Header = Path.GetFileName(filePath),
+					TargetName = $"FileImport_{Guid.NewGuid()}",
+					MaxCount = int.MaxValue
+				};
+				LogTabs.Add(tab);
+				SelectedTab = tab;
+				break;
 		}
 
-		// Add all log events in batches to avoid UI freezing (Cache replays to NLogViewer when it subscribes)
 		const int batchSize = 500;
-		for (int i = 0; i < logEvents.Count; i += batchSize)
+		for (var i = 0; i < logEvents.Count; i += batchSize)
 		{
 			var batch = logEvents.Skip(i).Take(batchSize).ToList();
-			
 			foreach (var logEvent in batch)
-			{
 				tab.AddLogEvent(logEvent);
-			}
-			
-			// Update progress during batch writing
+
 			if (i + batchSize < logEvents.Count)
 			{
 				var progress = (i + batchSize) * 100 / logEvents.Count;
-				LoadingProgress = $"Adding to view: {progress}%";
+				LoadingProgress = string.Format(System.Globalization.CultureInfo.CurrentCulture,
+					_localizationService.GetString("Import_ApplyProgress_Format", "Adding to view: {0}%"), progress);
 			}
 		}
+
 		LastLogTimestamp = DateTime.Now.ToString("HH:mm:ss");
 	}
 
@@ -663,7 +900,7 @@ private void ExportLogs()
 	/// Finds the NLogViewer instance in the currently selected tab's visual tree
 	/// </summary>
 	/// <returns>The NLogViewer instance if found, null otherwise</returns>
-	private Wpf.NLogViewer? FindNLogViewerInTab()
+	private Wpf.NLogViewerBase? FindNLogViewerInTab()
 	{
 		if (SelectedTab == null)
 			return null;
@@ -689,14 +926,14 @@ private void ExportLogs()
 			if (contentControl != null && contentControl.DataContext == SelectedTab)
 			{
 				// Found the content control for the selected tab, now find NLogViewer
-				var nLogViewer = FindVisualChild<Wpf.NLogViewer>(contentControl);
+				var nLogViewer = FindVisualChild<Wpf.NLogViewerBase>(contentControl);
 				if (nLogViewer != null)
 					return nLogViewer;
 			}
 		}
 
 		// Fallback: Search directly in TabControl for NLogViewer
-		return FindVisualChild<Wpf.NLogViewer>(tabControl);
+		return FindVisualChild<Wpf.NLogViewerBase>(tabControl);
 	}
 
 	/// <summary>
@@ -764,6 +1001,7 @@ protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName
 
 	public void Dispose()
 	{
+		LogTabs.CollectionChanged -= OnLogTabsCollectionChanged;
 		StopListening();
 		//_udpReceiverService.LogReceived -= OnLogReceived;
 		//_fileParserService.LogParsed -= OnLogReceived;
diff --git a/ui/Sentinel.NLogViewer.Wpf/Helper/MessageHighlighter.cs b/ui/Sentinel.NLogViewer.Wpf/Helper/MessageHighlighter.cs
index 3800792..23a0200 100644
--- a/ui/Sentinel.NLogViewer.Wpf/Helper/MessageHighlighter.cs
+++ b/ui/Sentinel.NLogViewer.Wpf/Helper/MessageHighlighter.cs
@@ -11,7 +11,7 @@ namespace Sentinel.NLogViewer.Wpf.Helper
 {
     /// <summary>
     /// Attached behavior to render a TextBlock with highlighted segments based on ActiveSearchTerms.
-    /// It uses the ancestor NLogViewer to access resolvers and highlight brush.
+    /// It uses an ancestor <see cref="NLogViewerBase"/> to access resolvers and highlight brush.
     /// </summary>
     public static class MessageHighlighter
     {
@@ -58,7 +58,7 @@ private static void TextBlockOnUnloaded(object sender, RoutedEventArgs e)
         /// </summary>
         private static void TryUpdate(TextBlock textBlock)
         {
-            var nlogViewer = FindAncestor<NLogViewer>(textBlock);
+            var nlogViewer = FindAncestor<NLogViewerBase>(textBlock);
             if (nlogViewer == null)
                 return;
 
diff --git a/ui/Sentinel.NLogViewer.Wpf/NLogViewer.xaml b/ui/Sentinel.NLogViewer.Wpf/NLogViewer.xaml
index 4247e6d..ccff646 100644
--- a/ui/Sentinel.NLogViewer.Wpf/NLogViewer.xaml
+++ b/ui/Sentinel.NLogViewer.Wpf/NLogViewer.xaml
@@ -1,4 +1,4 @@
-<Control x:Class="Sentinel.NLogViewer.Wpf.NLogViewer"
+<dj:NLogViewerBase x:Class="Sentinel.NLogViewer.Wpf.NLogViewer"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -7,4 +7,4 @@
              mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800"
              d:DataContext="{d:DesignInstance dj:NLogViewer}">
-</Control>
\ No newline at end of file
+</dj:NLogViewerBase>
\ No newline at end of file
diff --git a/ui/Sentinel.NLogViewer.Wpf/NLogViewer.xaml.cs b/ui/Sentinel.NLogViewer.Wpf/NLogViewer.xaml.cs
index c0c1058..bdd4bf9 100644
--- a/ui/Sentinel.NLogViewer.Wpf/NLogViewer.xaml.cs
+++ b/ui/Sentinel.NLogViewer.Wpf/NLogViewer.xaml.cs
@@ -1,511 +1,24 @@
 using System;
-using System.Collections.ObjectModel;
 using System.ComponentModel;
-using System.Linq;
 using System.Reactive.Concurrency;
 using System.Reactive.Linq;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Input;
-using System.Windows.Media;
 using System.Windows.Threading;
-using Sentinel.NLogViewer.Wpf.Extensions;
-using Sentinel.NLogViewer.Wpf.Helper;
-using Sentinel.NLogViewer.Wpf.Resolver;
-using Sentinel.NLogViewer.Wpf.Targets;
 using NLog;
-using System.IO;
-using System.Collections.Generic;
-using Sentinel.NLogViewer.App.Models;
+using Sentinel.NLogViewer.Wpf.Targets;
 
 namespace Sentinel.NLogViewer.Wpf
 {
     /// <summary>
-    /// Base class for search terms that can match against text
-    /// </summary>
-    public abstract class SearchTerm
-    {
-        public string Text { get; protected set; }
-        
-        protected SearchTerm(string text)
-        {
-            Text = text ?? throw new ArgumentNullException(nameof(text));
-        }
-        
-        /// <summary>
-        /// Determines if the search term matches the given text
-        /// </summary>
-        /// <param name="text">The text to match against</param>
-        /// <returns>True if the text matches the search term</returns>
-        public abstract bool Match(string text);
-        
-        /// <summary>
-        /// Determines if the search term matches any of the given texts
-        /// </summary>
-        /// <param name="texts">The texts to match against</param>
-        /// <returns>True if any text matches the search term</returns>
-        public bool MatchAny(params string[] texts)
-        {
-            if (texts == null) return false;
-            return texts.Any(text => !string.IsNullOrEmpty(text) && Match(text));
-        }
-        
-        public override string ToString()
-        {
-            return Text;
-        }
-    }
-
-    /// <summary>
-    /// A search term that performs case-insensitive substring matching
-    /// </summary>
-    public class TextSearchTerm : SearchTerm
-    {
-        private readonly string _lowercaseText;
-        
-        public TextSearchTerm(string text) : base(text)
-        {
-            _lowercaseText = text.ToLowerInvariant();
-        }
-        
-        public override bool Match(string text)
-        {
-            if (string.IsNullOrEmpty(text)) return false;
-            if (string.IsNullOrEmpty(_lowercaseText)) return false;
-            return text.ToLowerInvariant().Contains(_lowercaseText);
-        }
-        
-        public override string ToString()
-        {
-            return Text;
-        }
-    }
-
-    /// <summary>
-    /// A search term that performs regex pattern matching
-    /// </summary>
-    public class RegexSearchTerm : SearchTerm
-    {
-        private readonly Regex _regex;
-
-        public RegexSearchTerm(string pattern) : base(pattern)
-        {
-            try
-            {
-                _regex = new Regex(pattern, RegexOptions.Compiled);
-            }
-            catch (ArgumentException ex)
-            {
-                throw new ArgumentException($"Invalid regex pattern: {ex.Message}", nameof(pattern), ex);
-            }
-        }
-        
-        public override bool Match(string text)
-        {
-            if (string.IsNullOrEmpty(text)) return false;
-            return _regex.IsMatch(text);
-        }
-        
-        public override string ToString()
-        {
-            return $"/{Text}/";
-        }
-    }
-
-    /// <summary>
-    /// A customizable control for viewing NLog events with filtering and styling capabilities.
+    /// Log viewer that subscribes to NLog <see cref="CacheTarget"/> via configuration or the <see cref="CacheTarget"/> property.
     /// </summary>
-    public partial class NLogViewer : Control
+    public partial class NLogViewer : NLogViewerBase
     {
-        // ##############################################################################################################################
-        // Dependency Properties
-        // ##############################################################################################################################
-
-        #region Dependency Properties
-            
-        // ##########################################################################################
-        // Colors
-        // ##########################################################################################
-
-        #region Colors
-
-        /// <summary>
-        /// The background for the trace output
-        /// </summary>
-        [Category("NLogViewerColors")]
-        [Description("Background brush for Trace level log entries")] 
-        public Brush TraceBackground
-        {
-            get => (Brush) GetValue(TraceBackgroundProperty);
-            set => SetValue(TraceBackgroundProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="TraceBackground"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty TraceBackgroundProperty =
-            DependencyProperty.Register(nameof(TraceBackground), typeof(Brush), typeof(NLogViewer),
-                new PropertyMetadata((Brush) (new BrushConverter().ConvertFrom("#D3D3D3"))));
-
-        /// <summary>
-        /// The foreground for the trace output
-        /// </summary>
-        [Category("NLogViewerColors")]
-        [Description("Foreground brush for Trace level log entries")] 
-        public Brush TraceForeground
-        {
-            get => (Brush) GetValue(TraceForegroundProperty);
-            set => SetValue(TraceForegroundProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="TraceForeground"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty TraceForegroundProperty =
-            DependencyProperty.Register(nameof(TraceForeground), typeof(Brush), typeof(NLogViewer),
-                new PropertyMetadata((Brush) (new BrushConverter().ConvertFrom("#042271"))));
-
-        /// <summary>
-        /// The background for the debug output
-        /// </summary>
-        [Category("NLogViewerColors")]
-        [Description("Background brush for Debug level log entries")] 
-        public Brush DebugBackground
-        {
-            get => (Brush) GetValue(DebugBackgroundProperty);
-            set => SetValue(DebugBackgroundProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="DebugBackground"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty DebugBackgroundProperty =
-            DependencyProperty.Register(nameof(DebugBackground), typeof(Brush), typeof(NLogViewer),
-                new PropertyMetadata((Brush) (new BrushConverter().ConvertFrom("#90EE90"))));
-
-        /// <summary>
-        /// The foreground for the debug output
-        /// </summary>
-        [Category("NLogViewerColors")]
-        [Description("Foreground brush for Debug level log entries")] 
-        public Brush DebugForeground
-        {
-            get => (Brush) GetValue(DebugForegroundProperty);
-            set => SetValue(DebugForegroundProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="DebugForeground"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty DebugForegroundProperty =
-            DependencyProperty.Register(nameof(DebugForeground), typeof(Brush), typeof(NLogViewer),
-                new PropertyMetadata((Brush) (new BrushConverter().ConvertFrom("#042271"))));
-
-        /// <summary>
-        /// The background for the info output
-        /// </summary>
-        [Category("NLogViewerColors")]
-        [Description("Background brush for Info level log entries")] 
-        public Brush InfoBackground
-        {
-            get => (Brush) GetValue(InfoBackgroundProperty);
-            set => SetValue(InfoBackgroundProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="InfoBackground"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty InfoBackgroundProperty = DependencyProperty.Register(nameof(InfoBackground),
-            typeof(Brush), typeof(NLogViewer),
-            new PropertyMetadata((Brush) (new BrushConverter().ConvertFrom("#0000FF"))));
-
-        /// <summary>
-        /// The foreground for the info output
-        /// </summary>
-        [Category("NLogViewerColors")]
-        [Description("Foreground brush for Info level log entries")] 
-        public Brush InfoForeground
-        {
-            get => (Brush) GetValue(InfoForegroundProperty);
-            set => SetValue(InfoForegroundProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="InfoForeground"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty InfoForegroundProperty = DependencyProperty.Register(nameof(InfoForeground),
-            typeof(Brush), typeof(NLogViewer), new PropertyMetadata(Brushes.White));
-
-        /// <summary>
-        /// The background for the warn output
-        /// </summary>
-        [Category("NLogViewerColors")]
-        [Description("Background brush for Warn level log entries")] 
-        public Brush WarnBackground
-        {
-            get => (Brush) GetValue(WarnBackgroundProperty);
-            set => SetValue(WarnBackgroundProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="WarnBackground"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty WarnBackgroundProperty = DependencyProperty.Register(nameof(WarnBackground),
-            typeof(Brush), typeof(NLogViewer),
-            new PropertyMetadata((Brush) (new BrushConverter().ConvertFrom("#FFFF00"))));
-
-        /// <summary>
-        /// The foreground for the warn output
-        /// </summary>
-        [Category("NLogViewerColors")]
-        [Description("Foreground brush for Warn level log entries")] 
-        public Brush WarnForeground
-        {
-            get => (Brush) GetValue(WarnForegroundProperty);
-            set => SetValue(WarnForegroundProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="WarnForeground"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty WarnForegroundProperty = DependencyProperty.Register(nameof(WarnForeground),
-            typeof(Brush), typeof(NLogViewer),
-            new PropertyMetadata((Brush) (new BrushConverter().ConvertFrom("#324B5C"))));
-
-        /// <summary>
-        /// The background for the error output
-        /// </summary>
-        [Category("NLogViewerColors")]
-        [Description("Background brush for Error level log entries")] 
-        public Brush ErrorBackground
-        {
-            get => (Brush) GetValue(ErrorBackgroundProperty);
-            set => SetValue(ErrorBackgroundProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="ErrorBackground"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty ErrorBackgroundProperty =
-            DependencyProperty.Register(nameof(ErrorBackground), typeof(Brush), typeof(NLogViewer),
-                new PropertyMetadata(Brushes.Red));
-
-        /// <summary>
-        /// The foreground for the error output
-        /// </summary>
-        [Category("NLogViewerColors")]
-        [Description("Foreground brush for Error level log entries")] 
-        public Brush ErrorForeground
-        {
-            get => (Brush) GetValue(ErrorForegroundProperty);
-            set => SetValue(ErrorForegroundProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="ErrorForeground"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty ErrorForegroundProperty =
-            DependencyProperty.Register(nameof(ErrorForeground), typeof(Brush), typeof(NLogViewer),
-                new PropertyMetadata(Brushes.White));
-
-        /// <summary>
-        /// The background for the fatal output
-        /// </summary>
-        [Category("NLogViewerColors")]
-        [Description("Background brush for Fatal level log entries")] 
-        public Brush FatalBackground
-        {
-            get => (Brush) GetValue(FatalBackgroundProperty);
-            set => SetValue(FatalBackgroundProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="FatalBackground"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty FatalBackgroundProperty =
-            DependencyProperty.Register(nameof(FatalBackground), typeof(Brush), typeof(NLogViewer),
-                new PropertyMetadata(Brushes.Black));
-
-        /// <summary>
-        /// The foreground for the fatal output
-        /// </summary>
-        [Category("NLogViewerColors")]
-        [Description("Foreground brush for Fatal level log entries")] 
-        public Brush FatalForeground
-        {
-            get => (Brush) GetValue(FatalForegroundProperty);
-            set => SetValue(FatalForegroundProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="FatalForeground"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty FatalForegroundProperty =
-            DependencyProperty.Register(nameof(FatalForeground), typeof(Brush), typeof(NLogViewer),
-                new PropertyMetadata(Brushes.Yellow));
-
-        // ------------------------------------------------------------------------------------------
-        // Search Term Chip Colors
-        // ------------------------------------------------------------------------------------------
-
-        /// <summary>
-        /// Background brush for plain text search term chips
-        /// </summary>
-        [Category("NLogViewerColors")]
-        [Description("Background brush for plain text search term chips")] 
-        public Brush TextSearchTermBackground
-        {
-            get => (Brush)GetValue(TextSearchTermBackgroundProperty);
-            set => SetValue(TextSearchTermBackgroundProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="TextSearchTermBackground"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty TextSearchTermBackgroundProperty =
-            DependencyProperty.Register(nameof(TextSearchTermBackground), typeof(Brush), typeof(NLogViewer),
-                new PropertyMetadata((Brush)(new BrushConverter().ConvertFrom("#FFFFFBE6"))));
-
-        /// <summary>
-        /// Border brush for plain text search term chips
-        /// </summary>
-        [Category("NLogViewerColors")]
-        [Description("Border brush for plain text search term chips")] 
-        public Brush TextSearchTermBorderBrush
-        {
-            get => (Brush)GetValue(TextSearchTermBorderBrushProperty);
-            set => SetValue(TextSearchTermBorderBrushProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="TextSearchTermBorderBrush"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty TextSearchTermBorderBrushProperty =
-            DependencyProperty.Register(nameof(TextSearchTermBorderBrush), typeof(Brush), typeof(NLogViewer),
-                new PropertyMetadata((Brush)(new BrushConverter().ConvertFrom("#FFFFC107"))));
-
-        /// <summary>
-        /// Foreground brush for plain text search term chips
-        /// </summary>
-        [Category("NLogViewerColors")]
-        [Description("Foreground brush for plain text search term chips")] 
-        public Brush TextSearchTermForeground
-        {
-            get => (Brush)GetValue(TextSearchTermForegroundProperty);
-            set => SetValue(TextSearchTermForegroundProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="TextSearchTermForeground"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty TextSearchTermForegroundProperty =
-            DependencyProperty.Register(nameof(TextSearchTermForeground), typeof(Brush), typeof(NLogViewer),
-                new PropertyMetadata(Brushes.Black));
-
-        /// <summary>
-        /// Background brush for regex search term chips
-        /// </summary>
-        [Category("NLogViewerColors")]
-        [Description("Background brush for regex search term chips")] 
-        public Brush RegexSearchTermBackground
-        {
-            get => (Brush)GetValue(RegexSearchTermBackgroundProperty);
-            set => SetValue(RegexSearchTermBackgroundProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="RegexSearchTermBackground"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty RegexSearchTermBackgroundProperty =
-            DependencyProperty.Register(nameof(RegexSearchTermBackground), typeof(Brush), typeof(NLogViewer),
-                new PropertyMetadata((Brush)(new BrushConverter().ConvertFrom("#FFFFFBE6"))));
-
-        /// <summary>
-        /// Border brush for regex search term chips
-        /// </summary>
-        [Category("NLogViewerColors")]
-        [Description("Border brush for regex search term chips")] 
-        public Brush RegexSearchTermBorderBrush
-        {
-            get => (Brush)GetValue(RegexSearchTermBorderBrushProperty);
-            set => SetValue(RegexSearchTermBorderBrushProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="RegexSearchTermBorderBrush"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty RegexSearchTermBorderBrushProperty =
-            DependencyProperty.Register(nameof(RegexSearchTermBorderBrush), typeof(Brush), typeof(NLogViewer),
-                new PropertyMetadata((Brush)(new BrushConverter().ConvertFrom("#FFFFC107"))));
-
-        /// <summary>
-        /// Foreground brush for regex search term chips
-        /// </summary>
-        [Category("NLogViewerColors")]
-        [Description("Foreground brush for regex search term chips")] 
-        public Brush RegexSearchTermForeground
-        {
-            get => (Brush)GetValue(RegexSearchTermForegroundProperty);
-            set => SetValue(RegexSearchTermForegroundProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="RegexSearchTermForeground"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty RegexSearchTermForegroundProperty =
-            DependencyProperty.Register(nameof(RegexSearchTermForeground), typeof(Brush), typeof(NLogViewer),
-                new PropertyMetadata(Brushes.Black));
-
-        /// <summary>
-        /// Foreground brush for the "Regex:" prefix label
-        /// </summary>
-        [Category("NLogViewerColors")]
-        [Description("Foreground brush for the 'Regex:' prefix label")] 
-        public Brush RegexPrefixForeground
-        {
-            get => (Brush)GetValue(RegexPrefixForegroundProperty);
-            set => SetValue(RegexPrefixForegroundProperty, value);
-        }
+        private IDisposable _subscription;
+        private bool _isListening;
 
         /// <summary>
-        /// The <see cref="RegexPrefixForeground"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty RegexPrefixForegroundProperty =
-            DependencyProperty.Register(nameof(RegexPrefixForeground), typeof(Brush), typeof(NLogViewer),
-                new PropertyMetadata((Brush)(new BrushConverter().ConvertFrom("#FFFF8F00"))));
-
-        /// <summary>
-        /// Background brush used to highlight matched search text in the message
-        /// </summary>
-        [Category("NLogViewerColors")]
-        [Description("Background brush used to highlight matched search text in the message")] 
-        public Brush SearchHighlightBackground
-        {
-            get => (Brush)GetValue(SearchHighlightBackgroundProperty);
-            set => SetValue(SearchHighlightBackgroundProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="SearchHighlightBackground"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty SearchHighlightBackgroundProperty =
-            DependencyProperty.Register(nameof(SearchHighlightBackground), typeof(Brush), typeof(NLogViewer),
-                new PropertyMetadata((Brush)(new BrushConverter().ConvertFrom("#FFFF80C0"))));
-
-        #endregion
-        
-        // ##########################################################################################
-        // NLogViewer
-        // ##########################################################################################
-
-        #region NLogViewer
-
-        /// <summary>
-        /// Is looking if any target with this name is configured and tries to link it
+        /// Looks up a target with this name in the NLog configuration and links it via <see cref="CacheTarget.GetInstance"/>.
         /// </summary>
         [Category("NLogViewer")]
         public string TargetName
@@ -517,10 +30,11 @@ public string TargetName
         /// <summary>
         /// The <see cref="TargetName"/> DependencyProperty.
         /// </summary>
-        public static readonly DependencyProperty TargetNameProperty = DependencyProperty.Register(nameof(TargetName), typeof(string), typeof(NLogViewer), new PropertyMetadata(null));
+        public static readonly DependencyProperty TargetNameProperty =
+            DependencyProperty.Register(nameof(TargetName), typeof(string), typeof(NLogViewer), new PropertyMetadata(null));
 
         /// <summary>
-        /// Cache target to subscribe to for log events. When set to a non-null value, StartListen is called with this target.
+        /// Cache target to subscribe to. When set, <see cref="StartListen"/> is invoked with this instance.
         /// </summary>
         [Category("NLogViewer")]
         [Browsable(true)]
@@ -546,1330 +60,79 @@ private static void OnCacheTargetChanged(DependencyObject d, DependencyPropertyC
                 instance.StartListen(target);
         }
 
-        /// <summary>
-        /// Private DP to bind to the gui
-        /// </summary>
-        [Category("NLogViewer")]
-        public CollectionViewSource LogEvents
+        static NLogViewer()
         {
-            get => (CollectionViewSource) GetValue(LogEventsProperty);
-            private set => SetValue(LogEventsProperty, value);
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(NLogViewer),
+                new FrameworkPropertyMetadata(typeof(NLogViewerBase)));
         }
 
         /// <summary>
-        /// The <see cref="LogEvents"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty LogEventsProperty = DependencyProperty.Register(nameof(LogEvents),
-            typeof(CollectionViewSource), typeof(NLogViewer), new PropertyMetadata(null));
-        
-        /// <summary>
-        /// Automatically scroll to the newest entry
+        /// Initializes a viewer wired for NLog <see cref="CacheTarget"/> subscriptions.
         /// </summary>
-        [Category("NLogViewerControls")]
-        [Browsable(true)]
-        [Description("Automatically scroll to the newest log entry when new entries are added")]
-        public bool AutoScroll
+        public NLogViewer()
         {
-            get => (bool)GetValue(AutoScrollProperty);
-            set => SetValue(AutoScrollProperty, value);
         }
 
         /// <summary>
-        /// The <see cref="AutoScroll"/> DependencyProperty.
+        /// Starts listening by subscribing to the cache observable (explicit target or <see cref="CacheTarget.GetInstance"/>).
         /// </summary>
-        public static readonly DependencyProperty AutoScrollProperty = DependencyProperty.Register(nameof(AutoScroll), typeof(bool), typeof(NLogViewer), new PropertyMetadata(true, AutoScrollChangedCallback));
-
-        private static void AutoScrollChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs args)
-        {
-            if (d is NLogViewer instance)
-            {
-                instance.OnAutoScrollChanged();
-            }
-        }
-
-        protected virtual void OnAutoScrollChanged()
-        {
-            if (AutoScroll)
-                PART_ListView?.ScrollToEnd();
-        }
-		
-        private void UpdateFilter()
+        public void StartListen(ICacheTarget? target = null)
         {
-            if (LogEvents?.View is not CollectionView collectionView) return;
-
-            collectionView.Filter = item =>
-            {
-                if (item is not LogEventInfo logEvent) return true;
+            if (_isListening || DesignerProperties.GetIsInDesignMode(this))
+                return;
 
-                // Apply level filters first
-                var levelFilterPassed = logEvent.Level.Name switch
-                {
-                    "Trace" => !TraceFilter,  // If TraceFilter is true, hide Trace entries (!true = false)
-                    "Debug" => !DebugFilter,  // If DebugFilter is true, hide Debug entries (!true = false)
-                    "Info" => !InfoFilter,    // If InfoFilter is true, hide Info entries (!true = false)
-                    "Warn" => !WarnFilter,     // If WarnFilter is true, hide Warn entries (!true = false)
-                    "Error" => !ErrorFilter,   // If ErrorFilter is true, hide Error entries (!true = false)
-                    "Fatal" => !FatalFilter,   // If FatalFilter is true, hide Fatal entries (!true = false)
-                    _ => true
-                };
+            var dispatcher = Window.GetWindow(this)?.Dispatcher
+                ?? Application.Current?.Dispatcher
+                ?? Dispatcher.CurrentDispatcher;
+            if (dispatcher == null)
+                return;
 
-                if (!levelFilterPassed) return false;
+            target ??= global::Sentinel.NLogViewer.Wpf.Targets.CacheTarget.GetInstance(targetName: TargetName);
 
-                // Apply search filters if any active search terms exist
-                if (ActiveSearchTerms?.Count > 0)
-                {
-                    var loggerName = logEvent.LoggerName ?? string.Empty;
-                    var message = MessageResolver?.Resolve(logEvent) ?? string.Empty;
-                    
-                    // Separate include and exclude terms based on regex pattern
-                    // Exclude patterns start with "^(?!.*" (negative lookahead)
-                    var includeTerms = ActiveSearchTerms.Where(t => 
-                        !(t is RegexSearchTerm regexTerm && regexTerm.Text.StartsWith("^(?!.*", StringComparison.Ordinal))).ToList();
-                    var excludeTerms = ActiveSearchTerms.Where(t => 
-                        t is RegexSearchTerm regexTerm && regexTerm.Text.StartsWith("^(?!.*", StringComparison.Ordinal)).ToList();
-                    
-                    // AND logic: ALL include terms must match
-                    foreach (var searchTerm in includeTerms)
-                    {
-                        if (!searchTerm.MatchAny(loggerName, message))
-                            return false;
-                    }
-                    
-                    // Exclude logic: Hide entry if ANY string (loggerName OR message) contains the excluded pattern
-                    // Note: For exclude patterns (negative lookahead ^(?!.*pattern)), if the pattern matches,
-                    // it means the text does NOT contain the excluded pattern. If it doesn't match, the text contains it.
-                    // We need to check each string individually because MatchAny would return true if ANY string matches,
-                    // but we want to hide if ANY string contains the pattern.
-                    foreach (var searchTerm in excludeTerms)
-                    {
-                        // Check each string individually: if either contains the pattern, hide the entry
-                        var loggerContainsPattern = !searchTerm.Match(loggerName);
-                        var messageContainsPattern = !searchTerm.Match(message);
-                        
-                        if (loggerContainsPattern || messageContainsPattern)
-                            return false; // Hide entry if either string contains the excluded pattern
-                    }
-                    
-                    // All include terms matched and no exclude terms matched
-                    return true;
-                }
+            _subscription = target.Cache.SubscribeOn(Scheduler.Default)
+                .Buffer(TimeSpan.FromMilliseconds(100))
+                .Where(x => x.Any())
+                .ObserveOn(new DispatcherSynchronizationContext(dispatcher))
+                .Subscribe(AppendLogEntriesBatch);
 
-                return true;
-            };
-            
-            // Refresh the view to apply the filter
-            collectionView.Refresh();
+            _isListening = true;
         }
-        
+
         /// <summary>
-        /// Delete all entries
+        /// Stops listening by disposing the cache subscription.
         /// </summary>
-        [Category("NLogViewerControls")]
-        [Browsable(true)]
-        [Description("Command to clear all log entries from the viewer")]
-        public ICommand ClearCommand
+        public void StopListen()
         {
-            get => (ICommand) GetValue(ClearCommandProperty);
-            set => SetValue(ClearCommandProperty, value);
-        }
+            if (!_isListening)
+                return;
 
-        /// <summary>
-        /// The <see cref="ClearCommand"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty ClearCommandProperty = DependencyProperty.Register(nameof(ClearCommand),
-            typeof(ICommand), typeof(NLogViewer), new PropertyMetadata(null));
+            _subscription?.Dispose();
+            _subscription = null;
+            _isListening = false;
+        }
 
-        /// <summary>
-        /// Command to add a new search term
-        /// </summary>
-        [Category("NLogViewerControls")]
-        [Browsable(true)]
-        [Description("Command to add a new search term")]
-        public ICommand AddSearchTermCommand
+        /// <inheritdoc />
+        protected override void OnPausePropertyChanged(bool isPaused)
         {
-            get => (ICommand) GetValue(AddSearchTermCommandProperty);
-            set => SetValue(AddSearchTermCommandProperty, value);
-        }
+            if (DesignerProperties.GetIsInDesignMode(this))
+                return;
 
-        /// <summary>
-        /// The <see cref="AddSearchTermCommand"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty AddSearchTermCommandProperty = DependencyProperty.Register(nameof(AddSearchTermCommand),
-            typeof(ICommand), typeof(NLogViewer), new PropertyMetadata(null));
+            if (isPaused)
+                StopListen();
+            else
+                StartListen(CacheTarget);
+        }
 
-        /// <summary>
-        /// Command to clear all search terms
-        /// </summary>
-        [Category("NLogViewerControls")]
-        [Browsable(true)]
-        [Description("Command to clear all search terms")]
-        public ICommand ClearAllSearchTermsCommand
+        /// <inheritdoc />
+        protected override void OnViewerLoaded()
         {
-            get => (ICommand) GetValue(ClearAllSearchTermsCommandProperty);
-            set => SetValue(ClearAllSearchTermsCommandProperty, value);
+            StartListen();
         }
 
-        /// <summary>
-        /// The <see cref="ClearAllSearchTermsCommand"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty ClearAllSearchTermsCommandProperty = DependencyProperty.Register(nameof(ClearAllSearchTermsCommand),
-            typeof(ICommand), typeof(NLogViewer), new PropertyMetadata(null));
-
-        /// <summary>
-        /// Command to add a regex search term from a provided text
-        /// </summary>
-        [Category("NLogViewerControls")]
-        [Browsable(true)]
-        [Description("Command to add a regex search term from the provided text")]
-        public ICommand AddRegexSearchTermCommand
-        {
-            get => (ICommand) GetValue(AddRegexSearchTermCommandProperty);
-            set => SetValue(AddRegexSearchTermCommandProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="AddRegexSearchTermCommand"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty AddRegexSearchTermCommandProperty = DependencyProperty.Register(nameof(AddRegexSearchTermCommand),
-            typeof(ICommand), typeof(NLogViewer), new PropertyMetadata(null));
-
-        /// <summary>
-        /// Command to add a regex search term as an exclude filter from a provided text
-        /// </summary>
-        [Category("NLogViewerControls")]
-        [Browsable(true)]
-        [Description("Command to add a regex search term as an exclude filter from the provided text")]
-        public ICommand AddRegexSearchTermExcludeCommand
-        {
-            get => (ICommand) GetValue(AddRegexSearchTermExcludeCommandProperty);
-            set => SetValue(AddRegexSearchTermExcludeCommandProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="AddRegexSearchTermExcludeCommand"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty AddRegexSearchTermExcludeCommandProperty = DependencyProperty.Register(nameof(AddRegexSearchTermExcludeCommand),
-            typeof(ICommand), typeof(NLogViewer), new PropertyMetadata(null));
-
-        /// <summary>
-        /// Command to remove a specific search term
-        /// </summary>
-        [Category("NLogViewerControls")]
-        [Browsable(true)]
-        [Description("Command to remove a specific search term")]
-        public ICommand RemoveSearchTermCommand
-        {
-            get => (ICommand) GetValue(RemoveSearchTermCommandProperty);
-            set => SetValue(RemoveSearchTermCommandProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="RemoveSearchTermCommand"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty RemoveSearchTermCommandProperty = DependencyProperty.Register(nameof(RemoveSearchTermCommand),
-            typeof(ICommand), typeof(NLogViewer), new PropertyMetadata(null));
-
-        /// <summary>
-        /// Command to edit a search term by copying it to the current search text
-        /// </summary>
-        [Category("NLogViewerControls")]
-        [Browsable(true)]
-        [Description("Command to edit a search term by copying it to the current search text")]
-        public ICommand EditSearchTermCommand
-        {
-            get => (ICommand) GetValue(EditSearchTermCommandProperty);
-            set => SetValue(EditSearchTermCommandProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="EditSearchTermCommand"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty EditSearchTermCommandProperty = DependencyProperty.Register(nameof(EditSearchTermCommand),
-            typeof(ICommand), typeof(NLogViewer), new PropertyMetadata(null));
-
-        /// <summary>
-        /// Command to copy text to clipboard
-        /// </summary>
-        [Category("NLogViewerControls")]
-        [Browsable(true)]
-        [Description("Command to copy text to clipboard")]
-        public ICommand CopyToClipboardCommand
-        {
-            get => (ICommand) GetValue(CopyToClipboardCommandProperty);
-            set => SetValue(CopyToClipboardCommandProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="CopyToClipboardCommand"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty CopyToClipboardCommandProperty = DependencyProperty.Register(nameof(CopyToClipboardCommand),
-            typeof(ICommand), typeof(NLogViewer), new PropertyMetadata(null));
-
-        /// <summary>
-        /// Command to export filtered log entries to a file
-        /// </summary>
-        [Category("NLogViewerControls")]
-        [Browsable(true)]
-        [Description("Command to export filtered log entries to a file")]
-        public ICommand ExportCommand
-        {
-            get => (ICommand) GetValue(ExportCommandProperty);
-            set => SetValue(ExportCommandProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="ExportCommand"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty ExportCommandProperty = DependencyProperty.Register(nameof(ExportCommand),
-            typeof(ICommand), typeof(NLogViewer), new PropertyMetadata(null));
-
-        /// <summary>
-        /// Command to scroll to the end of the log entries
-        /// </summary>
-        [Category("NLogViewerControls")]
-        [Browsable(true)]
-        [Description("Command to scroll to the end of the log entries")]
-        public ICommand ScrollToEndCommand
-        {
-            get => (ICommand) GetValue(ScrollToEndCommandProperty);
-            set => SetValue(ScrollToEndCommandProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="ScrollToEndCommand"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty ScrollToEndCommandProperty = DependencyProperty.Register(nameof(ScrollToEndCommand),
-            typeof(ICommand), typeof(NLogViewer), new FrameworkPropertyMetadata
-            {
-	            BindsTwoWayByDefault = true,
-	            DefaultUpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged
-            });
-        
-        /// <summary>
-        /// Stop logging
-        /// </summary>
-        [Category("NLogViewerControls")]
-        [Browsable(true)]
-        [Description("Pause or resume logging to improve performance when not actively monitoring")]
-        public bool Pause
-        {
-            get => (bool)GetValue(PauseProperty);
-            set => SetValue(PauseProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="Pause"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty PauseProperty = DependencyProperty.Register(nameof(Pause), typeof(bool), typeof(NLogViewer), new PropertyMetadata(false, OnPauseChanged));
-
-        private static void OnPauseChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (d is NLogViewer viewer && !DesignerProperties.GetIsInDesignMode(viewer))
-            {
-                if ((bool)e.NewValue)
-                {
-                    // Pause: Stop listening for better performance
-                    viewer.StopListen();
-                }
-                else
-                {
-                    // Resume: Start listening again
-                    viewer.StartListen(viewer.CacheTarget);
-                }
-            }
-        }
-        
-        /// <summary>
-        /// The maximum number of entries before automatic cleaning is performed. There is a hysteresis of 100 entries which must be exceeded.
-        /// Example: <see cref="MaxCount"/> is '1000'. Then after '1100' entries, everything until '1000' is deleted.
-        /// If set to '0' or less, it is deactivated
-        /// </summary>
-        [Category("NLogViewer")]
-        public int MaxCount
-        {
-            get => (int)GetValue(MaxCountProperty);
-            set => SetValue(MaxCountProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="MaxCount"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty MaxCountProperty = DependencyProperty.Register(nameof(MaxCount), typeof(int), typeof(NLogViewer), new PropertyMetadata(5000));
-
-
-        #endregion
-
-        // ##########################################################################################
-        // Resolver
-        // ##########################################################################################
-
-        #region Resolver
-        
-        /// <summary>
-        /// The <see cref="ILogEventInfoResolver"/> to format the id
-        /// </summary>
-        [Category("NLogViewerResolver")]
-        public ILogEventInfoResolver IdResolver
-        {
-            get => (ILogEventInfoResolver)GetValue(IdResolverProperty);
-            set => SetValue(IdResolverProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="IdResolver"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty IdResolverProperty = DependencyProperty.Register(nameof(IdResolver), typeof(ILogEventInfoResolver), typeof(NLogViewer), new PropertyMetadata(new IdResolver()));
-        
-        /// <summary>
-        /// The <see cref="ILogEventInfoResolver"/> to format the timestamp output
-        /// </summary>
-        [Category("NLogViewerResolver")]
-        public ILogEventInfoResolver TimeStampResolver
-        {
-            get => (ILogEventInfoResolver)GetValue(TimeStampResolverProperty);
-            set => SetValue(TimeStampResolverProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="TimeStampResolver"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty TimeStampResolverProperty = DependencyProperty.Register(nameof(TimeStampResolver), typeof(ILogEventInfoResolver), typeof(NLogViewer), new PropertyMetadata(new TimeStampResolver()));
-        
-        /// <summary>
-        /// The <see cref="ILogEventInfoResolver"/> to format the loggername
-        /// </summary>
-        [Category("NLogViewerResolver")]
-        public ILogEventInfoResolver LoggerNameResolver
-        {
-            get => (ILogEventInfoResolver)GetValue(LoggerNameResolverProperty);
-            set => SetValue(LoggerNameResolverProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="LoggerNameResolver"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty LoggerNameResolverProperty = DependencyProperty.Register(nameof(LoggerNameResolver), typeof(ILogEventInfoResolver), typeof(NLogViewer), new PropertyMetadata(new LoggerNameResolver()));
-        
-        /// <summary>
-        /// The <see cref="ILogEventInfoResolver"/> to format the message
-        /// </summary>
-        [Category("NLogViewerResolver")]
-        public ILogEventInfoResolver MessageResolver
-        {
-            get => (ILogEventInfoResolver)GetValue(MessageResolverProperty);
-            set => SetValue(MessageResolverProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="MessageResolver"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty MessageResolverProperty = DependencyProperty.Register(nameof(MessageResolver), typeof(ILogEventInfoResolver), typeof(NLogViewer), new PropertyMetadata(new MessageResolver()));
-
-        /// <summary>
-        /// The <see cref="ILogExportFormatter"/> to format log entries for export
-        /// </summary>
-        [Category("NLogViewerResolver")]
-        public ILogExportFormatter ExportFormatter
-        {
-            get => (ILogExportFormatter)GetValue(ExportFormatterProperty);
-            set => SetValue(ExportFormatterProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="ExportFormatter"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty ExportFormatterProperty = DependencyProperty.Register(nameof(ExportFormatter), typeof(ILogExportFormatter), typeof(NLogViewer), new PropertyMetadata(new DefaultLogExportFormatter()));
-        
-        #endregion
-
-        // ##########################################################################################
-        // Column Visibility
-        // ##########################################################################################
-
-        #region Column Visibility
-
-        /// <summary>
-        /// Controls the visibility of the ID column
-        /// </summary>
-        [Category("NLogViewerColumns")]
-        public bool ShowIdColumn
-        {
-            get => (bool)GetValue(ShowIdColumnProperty);
-            set => SetValue(ShowIdColumnProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="ShowIdColumn"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty ShowIdColumnProperty = 
-            DependencyProperty.Register(nameof(ShowIdColumn), typeof(bool), typeof(NLogViewer), 
-                new PropertyMetadata(true, OnColumnVisibilityChanged));
-
-        /// <summary>
-        /// Controls the visibility of the Level column
-        /// </summary>
-        [Category("NLogViewerColumns")]
-        public bool ShowLevelColumn
-        {
-            get => (bool)GetValue(ShowLevelColumnProperty);
-            set => SetValue(ShowLevelColumnProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="ShowLevelColumn"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty ShowLevelColumnProperty = 
-            DependencyProperty.Register(nameof(ShowLevelColumn), typeof(bool), typeof(NLogViewer), 
-                new PropertyMetadata(true, OnColumnVisibilityChanged));
-
-        /// <summary>
-        /// Controls the visibility of the TimeStamp column
-        /// </summary>
-        [Category("NLogViewerColumns")]
-        public bool ShowTimeStampColumn
-        {
-            get => (bool)GetValue(ShowTimeStampColumnProperty);
-            set => SetValue(ShowTimeStampColumnProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="ShowTimeStampColumn"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty ShowTimeStampColumnProperty = 
-            DependencyProperty.Register(nameof(ShowTimeStampColumn), typeof(bool), typeof(NLogViewer), 
-                new PropertyMetadata(true, OnColumnVisibilityChanged));
-
-        /// <summary>
-        /// Controls the visibility of the LoggerName column
-        /// </summary>
-        [Category("NLogViewerColumns")]
-        public bool ShowLoggerNameColumn
-        {
-            get => (bool)GetValue(ShowLoggerNameColumnProperty);
-            set => SetValue(ShowLoggerNameColumnProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="ShowLoggerNameColumn"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty ShowLoggerNameColumnProperty = 
-            DependencyProperty.Register(nameof(ShowLoggerNameColumn), typeof(bool), typeof(NLogViewer), 
-                new PropertyMetadata(true, OnColumnVisibilityChanged));
-
-
-        private static void OnColumnVisibilityChanged(DependencyObject d, DependencyPropertyChangedEventArgs args)
-        {
-            if (d is NLogViewer instance)
-            {
-                instance.UpdateColumnVisibility();
-            }
-        }
-
-        /// <summary>
-        /// Updates column visibility by removing or adding columns based on the Show properties.
-        /// When a column is hidden, it's removed from the grid. When shown again, it's added back at its original position.
-        /// </summary>
-        private void UpdateColumnVisibility()
-        {
-	        if (PART_ListView?.View is not AutoSizedGridView gridView) return;
-
-	        // Update ID column visibility (original index 0)
-	        UpdateColumnVisibility(gridView, _originalIdColumn, ShowIdColumn, _originalIdColumnWidth, 0);
-
-	        // Update Level column visibility (original index 1)
-	        UpdateColumnVisibility(gridView, _originalLevelColumn, ShowLevelColumn, _originalLevelColumnWidth, 1);
-
-	        // Update TimeStamp column visibility (original index 2)
-	        UpdateColumnVisibility(gridView, _originalTimeStampColumn, ShowTimeStampColumn, _originalTimeStampColumnWidth, 2);
-
-	        // Update LoggerName column visibility (original index 3)
-	        UpdateColumnVisibility(gridView, _originalLoggerNameColumn, ShowLoggerNameColumn, _originalLoggerNameColumnWidth, 3);
-
-	        // Message column is always visible (no visibility control)
-        }
-
-        /// <summary>
-        /// Helper method to update individual column visibility by removing or adding the column.
-        /// Calculates the correct insertion position based on which columns are currently visible.
-        /// </summary>
-        /// <param name="gridView">The GridView containing the columns</param>
-        /// <param name="originalColumn">The original column reference to add/remove</param>
-        /// <param name="showColumn">Whether the column should be visible</param>
-        /// <param name="originalWidth">The original width of the column</param>
-        /// <param name="originalIndex">The original index of the column (0=ID, 1=Level, 2=TimeStamp, 3=LoggerName)</param>
-        private void UpdateColumnVisibility(AutoSizedGridView gridView, GridViewColumn originalColumn, bool showColumn, double originalWidth, int originalIndex)
-        {
-	        if (originalColumn == null) return;
-
-	        // Check if column is currently in the grid
-	        var columnExists = gridView.Columns.Contains(originalColumn);
-
-	        if (showColumn && !columnExists)
-	        {
-		        // Column should be visible but is not in the grid - add it back
-		        originalColumn.Width = originalWidth;
-		        
-		        // Calculate the correct insertion index based on which columns are currently visible
-		        var insertionIndex = CalculateInsertionIndex(gridView, originalIndex);
-		        gridView.Columns.Insert(insertionIndex, originalColumn);
-	        }
-	        else if (!showColumn && columnExists)
-	        {
-		        // Column should be hidden but is in the grid - remove it
-		        gridView.Columns.Remove(originalColumn);
-	        }
-        }
-
-        /// <summary>
-        /// Calculates the correct insertion index for a column based on its original position
-        /// and which columns are currently visible.
-        /// </summary>
-        /// <param name="gridView">The GridView containing the columns</param>
-        /// <param name="originalIndex">The original index of the column to insert</param>
-        /// <returns>The correct insertion index</returns>
-        private int CalculateInsertionIndex(AutoSizedGridView gridView, int originalIndex)
-        {
-	        // Count how many visible columns come before this one in the original order
-	        var insertionIndex = 0;
-	        
-	        // Check ID column (original index 0)
-	        if (originalIndex > 0 && ShowIdColumn && gridView.Columns.Contains(_originalIdColumn))
-	        {
-		        insertionIndex++;
-	        }
-	        
-	        // Check Level column (original index 1)
-	        if (originalIndex > 1 && ShowLevelColumn && gridView.Columns.Contains(_originalLevelColumn))
-	        {
-		        insertionIndex++;
-	        }
-	        
-	        // Check TimeStamp column (original index 2)
-	        if (originalIndex > 2 && ShowTimeStampColumn && gridView.Columns.Contains(_originalTimeStampColumn))
-	        {
-		        insertionIndex++;
-	        }
-	        
-	        // Check LoggerName column (original index 3)
-	        if (originalIndex > 3 && ShowLoggerNameColumn && gridView.Columns.Contains(_originalLoggerNameColumn))
-	        {
-		        insertionIndex++;
-	        }
-	        
-	        return insertionIndex;
-        }
-
-		#endregion
-
-		// ##########################################################################################
-		// Filter Properties
-		// ##########################################################################################
-
-		#region Filter Properties
-
-		/// <summary>
-		/// Filter for Trace log level
-		/// </summary>
-		[Category("NLogViewerFilters")]
-        [Browsable(true)]
-        [Description("Hide/show Trace level log entries")]
-        public bool TraceFilter
-        {
-            get => (bool)GetValue(TraceFilterProperty);
-            set => SetValue(TraceFilterProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="TraceFilter"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty TraceFilterProperty = 
-            DependencyProperty.Register(nameof(TraceFilter), typeof(bool), typeof(NLogViewer), 
-                new PropertyMetadata(false, OnFilterChanged));
-
-        /// <summary>
-        /// Filter for Debug log level
-        /// </summary>
-        [Category("NLogViewerFilters")]
-        [Browsable(true)]
-        [Description("Hide/show Debug level log entries")]
-        public bool DebugFilter
-        {
-            get => (bool)GetValue(DebugFilterProperty);
-            set => SetValue(DebugFilterProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="DebugFilter"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty DebugFilterProperty = 
-            DependencyProperty.Register(nameof(DebugFilter), typeof(bool), typeof(NLogViewer), 
-                new PropertyMetadata(false, OnFilterChanged));
-
-        /// <summary>
-        /// Filter for Info log level
-        /// </summary>
-        [Category("NLogViewerFilters")]
-        [Browsable(true)]
-        [Description("Hide/show Info level log entries")]
-        public bool InfoFilter
-        {
-            get => (bool)GetValue(InfoFilterProperty);
-            set => SetValue(InfoFilterProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="InfoFilter"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty InfoFilterProperty = 
-            DependencyProperty.Register(nameof(InfoFilter), typeof(bool), typeof(NLogViewer), 
-                new PropertyMetadata(false, OnFilterChanged));
-
-        /// <summary>
-        /// Filter for Warn log level
-        /// </summary>
-        [Category("NLogViewerFilters")]
-        [Browsable(true)]
-        [Description("Hide/show Warn level log entries")]
-        public bool WarnFilter
-        {
-            get => (bool)GetValue(WarnFilterProperty);
-            set => SetValue(WarnFilterProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="WarnFilter"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty WarnFilterProperty = 
-            DependencyProperty.Register(nameof(WarnFilter), typeof(bool), typeof(NLogViewer), 
-                new PropertyMetadata(false, OnFilterChanged));
-
-        /// <summary>
-        /// Filter for Error log level
-        /// </summary>
-        [Category("NLogViewerFilters")]
-        [Browsable(true)]
-        [Description("Hide/show Error level log entries")]
-        public bool ErrorFilter
-        {
-            get => (bool)GetValue(ErrorFilterProperty);
-            set => SetValue(ErrorFilterProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="ErrorFilter"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty ErrorFilterProperty = 
-            DependencyProperty.Register(nameof(ErrorFilter), typeof(bool), typeof(NLogViewer), 
-                new PropertyMetadata(false, OnFilterChanged));
-
-        /// <summary>
-        /// Filter for Fatal log level
-        /// </summary>
-        [Category("NLogViewerFilters")]
-        [Browsable(true)]
-        [Description("Hide/show Fatal level log entries")]
-        public bool FatalFilter
-        {
-            get => (bool)GetValue(FatalFilterProperty);
-            set => SetValue(FatalFilterProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="FatalFilter"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty FatalFilterProperty = 
-            DependencyProperty.Register(nameof(FatalFilter), typeof(bool), typeof(NLogViewer), 
-                new PropertyMetadata(false, OnFilterChanged));
-
-        /// <summary>
-        /// Current search text being typed (not yet activated)
-        /// </summary>
-        [Category("NLogViewerFilters")]
-        [Browsable(true)]
-        [Description("Current search text being typed (activated with Enter key)")]
-        public string CurrentSearchText
-        {
-            get => (string)GetValue(CurrentSearchTextProperty);
-            set => SetValue(CurrentSearchTextProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="CurrentSearchText"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty CurrentSearchTextProperty = 
-            DependencyProperty.Register(nameof(CurrentSearchText), typeof(string), typeof(NLogViewer), 
-                new PropertyMetadata(string.Empty));
-
-        /// <summary>
-        /// Whether to use regex pattern matching for search
-        /// </summary>
-        [Category("NLogViewerFilters")]
-        [Browsable(true)]
-        [Description("Use regex pattern matching instead of free text search")]
-        public bool UseRegexSearch
-        {
-            get => (bool)GetValue(UseRegexSearchProperty);
-            set => SetValue(UseRegexSearchProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="UseRegexSearch"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty UseRegexSearchProperty = 
-            DependencyProperty.Register(nameof(UseRegexSearch), typeof(bool), typeof(NLogViewer), 
-                new PropertyMetadata(false));
-
-        /// <summary>
-        /// Collection of active search terms
-        /// </summary>
-        [Category("NLogViewerFilters")]
-        [Browsable(false)]
-        [Description("Collection of active search terms")]
-        public ObservableCollection<SearchTerm> ActiveSearchTerms
-        {
-            get => (ObservableCollection<SearchTerm>)GetValue(ActiveSearchTermsProperty);
-            private set => SetValue(ActiveSearchTermsProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="ActiveSearchTerms"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty ActiveSearchTermsProperty = 
-            DependencyProperty.Register(nameof(ActiveSearchTerms), typeof(ObservableCollection<SearchTerm>), typeof(NLogViewer), 
-                new PropertyMetadata(null));
-
-        private static void OnFilterChanged(DependencyObject d, DependencyPropertyChangedEventArgs args)
-        {
-            if (d is NLogViewer instance)
-            {
-                instance.UpdateFilter();
-            }
-        }
-
-
-        /// <summary>
-        /// Adds a new search term to the active search terms collection
-        /// </summary>
-        public void AddSearchTerm()
-        {
-            if (string.IsNullOrWhiteSpace(CurrentSearchText))
-                return;
-
-            SearchTerm searchTerm;
-            
-            if (UseRegexSearch)
-            {
-                try
-                {
-                    searchTerm = new RegexSearchTerm(CurrentSearchText);
-                }
-                catch (ArgumentException ex)
-                {
-                    MessageBox.Show($"Invalid regex pattern: {ex.Message}", "Regex Error", 
-                        MessageBoxButton.OK, MessageBoxImage.Warning);
-                    return;
-                }
-            }
-            else
-            {
-                searchTerm = new TextSearchTerm(CurrentSearchText);
-            }
-            
-            ActiveSearchTerms.Add(searchTerm);
-            
-            // Clear the input
-            CurrentSearchText = string.Empty;
-            
-            // Update filter
-            UpdateFilter();
-        }
-
-        /// <summary>
-        /// Removes a search term from the active search terms collection
-        /// </summary>
-        public void RemoveSearchTerm(SearchTerm searchTerm)
-        {
-            ActiveSearchTerms.Remove(searchTerm);
-            UpdateFilter();
-        }
-
-        /// <summary>
-        /// Clears all active search terms
-        /// </summary>
-        public void ClearAllSearchTerms()
-        {
-            ActiveSearchTerms.Clear();
-            UpdateFilter();
-        }
-
-        /// <summary>
-        /// Adds a RegexSearchTerm from a provided text and updates the filter
-        /// Special regex characters are escaped to treat the text as a literal string
-        /// </summary>
-        /// <param name="text">The text to use as regex pattern (will be escaped)</param>
-        public void AddRegexSearchTerm(string text)
-        {
-            if (string.IsNullOrWhiteSpace(text))
-                return;
-
-            try
-            {
-                // Escape special regex characters to treat the text as a literal string
-                var escapedPattern = Regex.Escape(text);
-                var term = new RegexSearchTerm(escapedPattern);
-                ActiveSearchTerms.Add(term);
-                UpdateFilter();
-            }
-            catch (ArgumentException ex)
-            {
-                MessageBox.Show($"Invalid regex pattern: {ex.Message}", "Regex Error",
-                    MessageBoxButton.OK, MessageBoxImage.Warning);
-            }
-        }
-
-        /// <summary>
-        /// Adds a RegexSearchTerm as an exclude filter from a provided text and updates the filter
-        /// Special regex characters are escaped and wrapped in a negative lookahead pattern
-        /// </summary>
-        /// <param name="text">The text to use as regex pattern (will be escaped and wrapped in negative lookahead)</param>
-        public void AddRegexSearchTermExclude(string text)
-        {
-            if (string.IsNullOrWhiteSpace(text))
-                return;
-
-            try
-            {
-                // Escape special regex characters to treat the text as a literal string
-                var escapedPattern = Regex.Escape(text);
-                // Wrap in negative lookahead: matches any text that does NOT contain the pattern
-                var negativeLookaheadPattern = $"^(?!.*{escapedPattern}$)";
-                var term = new RegexSearchTerm(negativeLookaheadPattern);
-                ActiveSearchTerms.Add(term);
-                UpdateFilter();
-            }
-            catch (ArgumentException ex)
-            {
-                MessageBox.Show($"Invalid regex pattern: {ex.Message}", "Regex Error",
-                    MessageBoxButton.OK, MessageBoxImage.Warning);
-            }
-        }
-
-        /// <summary>
-        /// Edits a search term by copying its text to the current search text field
-        /// </summary>
-        /// <param name="searchTerm">The search term to edit</param>
-        public void EditSearchTerm(SearchTerm searchTerm)
-        {
-            if (searchTerm == null)
-                return;
-
-            // Copy the search term text to the current search text field
-            CurrentSearchText = searchTerm.Text;
-            
-            // Set the regex checkbox based on the search term type
-            UseRegexSearch = searchTerm is RegexSearchTerm;
-            
-            // Remove the original search term
-            ActiveSearchTerms.Remove(searchTerm);
-            UpdateFilter();
-        }
-
-        /// <summary>
-        /// Copies text to the clipboard
-        /// </summary>
-        /// <param name="text">The text to copy to clipboard</param>
-        public void CopyToClipboard(string text)
-        {
-            if (string.IsNullOrEmpty(text))
-                return;
-
-            try
-            {
-                Clipboard.SetText(text);
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show($"Failed to copy to clipboard: {ex.Message}", "Clipboard Error",
-                    MessageBoxButton.OK, MessageBoxImage.Warning);
-            }
-        }
-
-        /// <summary>
-        /// Gets all filtered log entries from the current view
-        /// </summary>
-        /// <returns>An enumerable collection of filtered LogEventInfo entries</returns>
-        public IEnumerable<LogEventInfo> GetFilteredLogEntries()
-        {
-            if (LogEvents?.View == null)
-                return Enumerable.Empty<LogEventInfo>();
-
-            return LogEvents.View.Cast<LogEventInfo>();
-        }
-
-        /// <summary>
-        /// Exports filtered log entries to a file in the specified format
-        /// </summary>
-        /// <param name="parameter">Export parameters containing file path and format</param>
-        public void ExportLogs(ExportParameter parameter)
-        {
-            if (parameter == null)
-                throw new ArgumentNullException(nameof(parameter));
-
-            if (string.IsNullOrWhiteSpace(parameter.FilePath))
-                throw new ArgumentException("File path cannot be empty", nameof(parameter));
-
-            try
-            {
-                var filteredEntries = GetFilteredLogEntries().ToList();
-                
-                if (filteredEntries.Count == 0)
-                {
-                    MessageBox.Show("No log entries to export.", "Export", 
-                        MessageBoxButton.OK, MessageBoxImage.Information);
-                    return;
-                }
-
-                switch (parameter.Format)
-                {
-                    case ExportFormat.Log:
-                        ExportToLogFormat(parameter.FilePath, filteredEntries, parameter.CustomFormatter);
-                        break;
-                    default:
-                        throw new NotSupportedException($"Export format {parameter.Format} is not supported.");
-                }
-
-                MessageBox.Show($"Successfully exported {filteredEntries.Count} log entry(ies) to {parameter.FilePath}", 
-                    "Export Complete", MessageBoxButton.OK, MessageBoxImage.Information);
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show($"Failed to export logs: {ex.Message}", "Export Error",
-                    MessageBoxButton.OK, MessageBoxImage.Error);
-            }
-        }
-
-        /// <summary>
-        /// Exports log entries to a standard log file format
-        /// </summary>
-        /// <param name="filePath">Target file path</param>
-        /// <param name="logEntries">Log entries to export</param>
-        /// <param name="customFormatter">Optional custom formatter to override the default formatter</param>
-        private void ExportToLogFormat(string filePath, IEnumerable<LogEventInfo> logEntries, ILogExportFormatter? customFormatter = null)
-        {
-            using var writer = new StreamWriter(filePath, false, System.Text.Encoding.UTF8);
-            
-            // Use custom formatter if provided, otherwise use ExportFormatter, fall back to default formatter
-            var formatter = customFormatter ?? ExportFormatter ?? new DefaultLogExportFormatter();
-            
-            foreach (var logEvent in logEntries)
-            {
-                var formattedLine = formatter.Format(
-                    logEvent,
-                    TimeStampResolver ?? new TimeStampResolver(),
-                    LoggerNameResolver ?? new LoggerNameResolver(),
-                    MessageResolver ?? new MessageResolver());
-                
-                writer.WriteLine(formattedLine);
-            }
-        }
-
-        #endregion
-
-        // ##########################################################################################
-        // Filter Visibility
-        // ##########################################################################################
-
-        #region Filter Visibility
-
-        /// <summary>
-        /// Controls the visibility of the filter buttons
-        /// </summary>
-        [Category("NLogViewerFilters")]
-        [Browsable(true)]
-        [Description("Show/hide the filter buttons")]
-        public bool ShowFilterButtons
-        {
-            get => (bool)GetValue(ShowFilterButtonsProperty);
-            set => SetValue(ShowFilterButtonsProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="ShowFilterButtons"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty ShowFilterButtonsProperty = 
-            DependencyProperty.Register(nameof(ShowFilterButtons), typeof(bool), typeof(NLogViewer), 
-                new PropertyMetadata(true));
-
-        /// <summary>
-        /// Controls the visibility of the search controls
-        /// </summary>
-        [Category("NLogViewerFilters")]
-        [Browsable(true)]
-        [Description("Show/hide the search controls")]
-        public bool ShowSearchControls
-        {
-            get => (bool)GetValue(ShowSearchControlsProperty);
-            set => SetValue(ShowSearchControlsProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="ShowSearchControls"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty ShowSearchControlsProperty = 
-            DependencyProperty.Register(nameof(ShowSearchControls), typeof(bool), typeof(NLogViewer), 
-                new PropertyMetadata(true));
-
-        #endregion
-
-        // ##########################################################################################
-        // Controls Visibility
-        // ##########################################################################################
-
-        #region Controls Visibility
-
-        /// <summary>
-        /// Controls the visibility of the control buttons (Auto-Scroll, Clear, Pause)
-        /// </summary>
-        [Category("NLogViewerControls")]
-        [Browsable(true)]
-        [Description("Show/hide the control buttons (Auto-Scroll, Clear, Pause)")]
-        public bool ShowControlButtons
-        {
-            get => (bool)GetValue(ShowControlButtonsProperty);
-            set => SetValue(ShowControlButtonsProperty, value);
-        }
-
-        /// <summary>
-        /// The <see cref="ShowControlButtons"/> DependencyProperty.
-        /// </summary>
-        public static readonly DependencyProperty ShowControlButtonsProperty = 
-            DependencyProperty.Register(nameof(ShowControlButtons), typeof(bool), typeof(NLogViewer), 
-                new PropertyMetadata(true));
-
-        #endregion
-
-        #endregion
-
-        // ##############################################################################################################################
-        // Properties
-        // ##############################################################################################################################
-
-        #region Properties
-
-        // ##########################################################################################
-        // Public Properties
-        // ##########################################################################################
-
-
-
-        // ##########################################################################################
-        // Private Properties
-        // ##########################################################################################
-
-        private ObservableCollection<LogEventInfo> _LogEventInfos { get; } = new ObservableCollection<LogEventInfo>();
-        private IDisposable _Subscription;
-        private Window? _ParentWindow;
-        private bool _isListening = false;
-        
-        // Store original column references and widths for restoration
-        private GridViewColumn _originalIdColumn;
-        private GridViewColumn _originalLevelColumn;
-        private GridViewColumn _originalTimeStampColumn;
-        private GridViewColumn _originalLoggerNameColumn;
-        private double _originalIdColumnWidth = 40;
-        private double _originalLevelColumnWidth = double.NaN; // Auto
-        private double _originalTimeStampColumnWidth = double.NaN; // Auto
-        private double _originalLoggerNameColumnWidth = double.NaN; // Auto
-        
-        /// <summary>
-        /// Reference to the ListView template part for programmatic access
-        /// </summary>
-        private ListView PART_ListView => GetTemplateChild("PART_ListView") as ListView;
-        
-        #endregion
-
-        // ##############################################################################################################################
-        // Public Methods
-        // ##############################################################################################################################
-
-        #region Public Methods
-
-        /// <summary>
-        /// Starts listening for log events by subscribing to the cache target.
-        /// Subscribes to <see cref="CacheTarget"/> when set, otherwise uses <see cref="CacheTarget.GetInstance"/> and subscribes to that.
-        /// Call when the control needs to resume listening (e.g. when undocking or when the window loads again).
-        /// </summary>
-        public void StartListen(ICacheTarget? target = null)
-        {
-            if (_isListening || DesignerProperties.GetIsInDesignMode(this))
-                return;
-
-			// Resolve Dispatcher: prefer parent window (for cleanup on Closed/Unloaded), else Application/Current (e.g. unit tests without Window).
-			var window = Window.GetWindow(this);
-			if (_ParentWindow == null && window != null)
-			{
-				_ParentWindow = window;
-				_ParentWindow.Closed += _ParentWindowOnClosed;
-			}
-
-			var dispatcher = window?.Dispatcher ?? Application.Current?.Dispatcher ?? Dispatcher.CurrentDispatcher;
-			if (dispatcher == null)
-				return;
-
-			target ??= Targets.CacheTarget.GetInstance(targetName: TargetName);
-
-			_Subscription = target.Cache.SubscribeOn(Scheduler.Default)
-                .Buffer(TimeSpan.FromMilliseconds(100))
-                .Where(x => x.Any())
-                .ObserveOn(new DispatcherSynchronizationContext(dispatcher))
-                .Subscribe(infos =>
-                {
-                    using (LogEvents.DeferRefresh())
-                    {
-                        foreach (var info in infos)
-                        {
-                            _LogEventInfos.Add(info);
-                        }
-                        if (MaxCount >= 0 & _LogEventInfos.Count - 100 > MaxCount)
-                        {
-                            for (var i = 0; i < _LogEventInfos.Count - MaxCount; i++)
-                            {
-                                _LogEventInfos.RemoveAt(0);
-                            }
-                        }   
-                    }
-
-                    if (AutoScroll)
-                    {
-                        PART_ListView?.ScrollToEnd();
-                    }
-                });
-
-            _isListening = true;
-        }
-
-        /// <summary>
-        /// Stops listening for log events by disposing the subscription.
-        /// This method should be called when the control needs to stop listening for logs,
-        /// such as when docking in a docking system or when the window is unloaded.
-        /// </summary>
-        public void StopListen()
-        {
-            if (!_isListening)
-                return;
-
-            _Subscription?.Dispose();
-            _Subscription = null;
-            _isListening = false;
-        }
-
-        #endregion
-
-        // ##############################################################################################################################
-        // Constructor
-        // ##############################################################################################################################
-
-        #region Constructor
-
-        static NLogViewer()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(NLogViewer), new FrameworkPropertyMetadata(typeof(NLogViewer)));
-        }
-
-        public NLogViewer()
-        {
-            DataContext = this;
-            
-            // save instance UID
-            Uid = GetHashCode().ToString();
-
-            if (DesignerProperties.GetIsInDesignMode(this))
-                return;
-
-            // Initialize with internal collection (filled from CacheTarget subscription; target is CacheTargetProperty when set, else CacheTarget.GetInstance).
-            LogEvents = new CollectionViewSource {Source = _LogEventInfos};
-            ActiveSearchTerms = new ObservableCollection<SearchTerm>();
-            UpdateFilter(); // Initialize filter
-            
-            Loaded += _OnLoaded;
-            Unloaded += _OnUnloaded;
-            
-            // ClearCommand: clears the internal collection (data comes from CacheTarget or GetInstance).
-            ClearCommand = new RelayCommand(() => _LogEventInfos.Clear());
-            AddSearchTermCommand = new RelayCommand(AddSearchTerm);
-            ClearAllSearchTermsCommand = new RelayCommand(ClearAllSearchTerms);
-            RemoveSearchTermCommand = new RelayCommand<SearchTerm>(RemoveSearchTerm);
-            AddRegexSearchTermCommand = new RelayCommand<string>(AddRegexSearchTerm);
-            AddRegexSearchTermExcludeCommand = new RelayCommand<string>(AddRegexSearchTermExclude);
-            EditSearchTermCommand = new RelayCommand<SearchTerm>(EditSearchTerm);
-            CopyToClipboardCommand = new RelayCommand<string>(CopyToClipboard);
-            ExportCommand = new RelayCommand<ExportParameter>(ExportLogs);
-            ScrollToEndCommand = new RelayCommand(() =>
-            {
-	            PART_ListView?.ScrollToEnd();
-            });
-        }
-
-        private void _OnUnloaded(object sender, RoutedEventArgs e)
-        {
-            // look in logical and visual tree if the control has been removed
-            // If there is no parent window found before, we have a special case (https://github.com/dojo90/NLogViewer/issues/30) and just dispose it anyway
-            if (_ParentWindow.FindChildByUid<NLogViewer>(Uid) == null)
-            {
-                _Dispose();
-            }
-        }
-        
-        private void _ParentWindowOnClosed(object sender, EventArgs e)
-        {
-            _Dispose();
-        }
-
-        private void _Dispose()
+        /// <inheritdoc />
+        protected override void DisposeViewerResources()
         {
             StopListen();
         }
-        
-        private void _OnLoaded(object sender, RoutedEventArgs e)
-        {
-            // removed loaded handler to prevent duplicate subscribing
-            Loaded -= _OnLoaded;
-
-            PART_ListView?.ScrollToEnd();
-            
-            // Store original column references and widths for visibility management
-            if (PART_ListView?.View is AutoSizedGridView gridView)
-            {
-                if (gridView.Columns.Count > 0) 
-                {
-                    _originalIdColumn = gridView.Columns[0];
-                    _originalIdColumnWidth = gridView.Columns[0].Width;
-                }
-                if (gridView.Columns.Count > 1) 
-                {
-                    _originalLevelColumn = gridView.Columns[1];
-                    _originalLevelColumnWidth = gridView.Columns[1].Width;
-                }
-                if (gridView.Columns.Count > 2) 
-                {
-                    _originalTimeStampColumn = gridView.Columns[2];
-                    _originalTimeStampColumnWidth = gridView.Columns[2].Width;
-                }
-                if (gridView.Columns.Count > 3) 
-                {
-                    _originalLoggerNameColumn = gridView.Columns[3];
-                    _originalLoggerNameColumnWidth = gridView.Columns[3].Width;
-                }
-                // Message column (index 4) is always visible, no need to store its reference
-                
-                // Apply initial column visibility
-                UpdateColumnVisibility();
-            }
-            
-            // Start listening: subscribe to CacheTarget if set, else to CacheTarget.GetInstance().
-            StartListen();
-        }
-
-        #endregion
     }
 }
diff --git a/ui/Sentinel.NLogViewer.Wpf/NLogViewerBase.cs b/ui/Sentinel.NLogViewer.Wpf/NLogViewerBase.cs
new file mode 100644
index 0000000..91b9cae
--- /dev/null
+++ b/ui/Sentinel.NLogViewer.Wpf/NLogViewerBase.cs
@@ -0,0 +1,1878 @@
+using System;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Threading;
+using Sentinel.NLogViewer.App.Models;
+using Sentinel.NLogViewer.Wpf.Extensions;
+using Sentinel.NLogViewer.Wpf.Helper;
+using Sentinel.NLogViewer.Wpf.Resolver;
+using NLog;
+using System.IO;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+
+namespace Sentinel.NLogViewer.Wpf
+{
+    /// <summary>
+    /// Base class for search terms that can match against text
+    /// </summary>
+    public abstract class SearchTerm
+    {
+        public string Text { get; protected set; }
+        
+        protected SearchTerm(string text)
+        {
+            Text = text ?? throw new ArgumentNullException(nameof(text));
+        }
+        
+        /// <summary>
+        /// Determines if the search term matches the given text
+        /// </summary>
+        /// <param name="text">The text to match against</param>
+        /// <returns>True if the text matches the search term</returns>
+        public abstract bool Match(string text);
+        
+        /// <summary>
+        /// Determines if the search term matches any of the given texts
+        /// </summary>
+        /// <param name="texts">The texts to match against</param>
+        /// <returns>True if any text matches the search term</returns>
+        public bool MatchAny(params string[] texts)
+        {
+            if (texts == null) return false;
+            return texts.Any(text => !string.IsNullOrEmpty(text) && Match(text));
+        }
+        
+        public override string ToString()
+        {
+            return Text;
+        }
+    }
+
+    /// <summary>
+    /// A search term that performs case-insensitive substring matching
+    /// </summary>
+    public class TextSearchTerm : SearchTerm
+    {
+        private readonly string _lowercaseText;
+        
+        public TextSearchTerm(string text) : base(text)
+        {
+            _lowercaseText = text.ToLowerInvariant();
+        }
+        
+        public override bool Match(string text)
+        {
+            if (string.IsNullOrEmpty(text)) return false;
+            if (string.IsNullOrEmpty(_lowercaseText)) return false;
+            return text.ToLowerInvariant().Contains(_lowercaseText);
+        }
+        
+        public override string ToString()
+        {
+            return Text;
+        }
+    }
+
+    /// <summary>
+    /// A search term that performs regex pattern matching
+    /// </summary>
+    public class RegexSearchTerm : SearchTerm
+    {
+        private readonly Regex _regex;
+
+        public RegexSearchTerm(string pattern) : base(pattern)
+        {
+            try
+            {
+                _regex = new Regex(pattern, RegexOptions.Compiled);
+            }
+            catch (ArgumentException ex)
+            {
+                throw new ArgumentException($"Invalid regex pattern: {ex.Message}", nameof(pattern), ex);
+            }
+        }
+        
+        public override bool Match(string text)
+        {
+            if (string.IsNullOrEmpty(text)) return false;
+            return _regex.IsMatch(text);
+        }
+        
+        public override string ToString()
+        {
+            return $"/{Text}/";
+        }
+    }
+
+    /// <summary>
+    /// Base log viewer control: filtering, styling, and optional external <see cref="ItemsSource"/>.
+    /// Use <see cref="NLogViewer"/> to subscribe to NLog <see cref="Targets.CacheTarget"/>.
+    /// </summary>
+    public class NLogViewerBase : Control
+    {
+        // ##############################################################################################################################
+        // Dependency Properties
+        // ##############################################################################################################################
+
+        #region Dependency Properties
+            
+        // ##########################################################################################
+        // Colors
+        // ##########################################################################################
+
+        #region Colors
+
+        /// <summary>
+        /// The background for the trace output
+        /// </summary>
+        [Category("NLogViewerColors")]
+        [Description("Background brush for Trace level log entries")] 
+        public Brush TraceBackground
+        {
+            get => (Brush) GetValue(TraceBackgroundProperty);
+            set => SetValue(TraceBackgroundProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="TraceBackground"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty TraceBackgroundProperty =
+            DependencyProperty.Register(nameof(TraceBackground), typeof(Brush), typeof(NLogViewerBase),
+                new PropertyMetadata((Brush) (new BrushConverter().ConvertFrom("#D3D3D3"))));
+
+        /// <summary>
+        /// The foreground for the trace output
+        /// </summary>
+        [Category("NLogViewerColors")]
+        [Description("Foreground brush for Trace level log entries")] 
+        public Brush TraceForeground
+        {
+            get => (Brush) GetValue(TraceForegroundProperty);
+            set => SetValue(TraceForegroundProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="TraceForeground"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty TraceForegroundProperty =
+            DependencyProperty.Register(nameof(TraceForeground), typeof(Brush), typeof(NLogViewerBase),
+                new PropertyMetadata((Brush) (new BrushConverter().ConvertFrom("#042271"))));
+
+        /// <summary>
+        /// The background for the debug output
+        /// </summary>
+        [Category("NLogViewerColors")]
+        [Description("Background brush for Debug level log entries")] 
+        public Brush DebugBackground
+        {
+            get => (Brush) GetValue(DebugBackgroundProperty);
+            set => SetValue(DebugBackgroundProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="DebugBackground"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty DebugBackgroundProperty =
+            DependencyProperty.Register(nameof(DebugBackground), typeof(Brush), typeof(NLogViewerBase),
+                new PropertyMetadata((Brush) (new BrushConverter().ConvertFrom("#90EE90"))));
+
+        /// <summary>
+        /// The foreground for the debug output
+        /// </summary>
+        [Category("NLogViewerColors")]
+        [Description("Foreground brush for Debug level log entries")] 
+        public Brush DebugForeground
+        {
+            get => (Brush) GetValue(DebugForegroundProperty);
+            set => SetValue(DebugForegroundProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="DebugForeground"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty DebugForegroundProperty =
+            DependencyProperty.Register(nameof(DebugForeground), typeof(Brush), typeof(NLogViewerBase),
+                new PropertyMetadata((Brush) (new BrushConverter().ConvertFrom("#042271"))));
+
+        /// <summary>
+        /// The background for the info output
+        /// </summary>
+        [Category("NLogViewerColors")]
+        [Description("Background brush for Info level log entries")] 
+        public Brush InfoBackground
+        {
+            get => (Brush) GetValue(InfoBackgroundProperty);
+            set => SetValue(InfoBackgroundProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="InfoBackground"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty InfoBackgroundProperty = DependencyProperty.Register(nameof(InfoBackground),
+            typeof(Brush), typeof(NLogViewerBase),
+            new PropertyMetadata((Brush) (new BrushConverter().ConvertFrom("#0000FF"))));
+
+        /// <summary>
+        /// The foreground for the info output
+        /// </summary>
+        [Category("NLogViewerColors")]
+        [Description("Foreground brush for Info level log entries")] 
+        public Brush InfoForeground
+        {
+            get => (Brush) GetValue(InfoForegroundProperty);
+            set => SetValue(InfoForegroundProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="InfoForeground"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty InfoForegroundProperty = DependencyProperty.Register(nameof(InfoForeground),
+            typeof(Brush), typeof(NLogViewerBase), new PropertyMetadata(Brushes.White));
+
+        /// <summary>
+        /// The background for the warn output
+        /// </summary>
+        [Category("NLogViewerColors")]
+        [Description("Background brush for Warn level log entries")] 
+        public Brush WarnBackground
+        {
+            get => (Brush) GetValue(WarnBackgroundProperty);
+            set => SetValue(WarnBackgroundProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="WarnBackground"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty WarnBackgroundProperty = DependencyProperty.Register(nameof(WarnBackground),
+            typeof(Brush), typeof(NLogViewerBase),
+            new PropertyMetadata((Brush) (new BrushConverter().ConvertFrom("#FFFF00"))));
+
+        /// <summary>
+        /// The foreground for the warn output
+        /// </summary>
+        [Category("NLogViewerColors")]
+        [Description("Foreground brush for Warn level log entries")] 
+        public Brush WarnForeground
+        {
+            get => (Brush) GetValue(WarnForegroundProperty);
+            set => SetValue(WarnForegroundProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="WarnForeground"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty WarnForegroundProperty = DependencyProperty.Register(nameof(WarnForeground),
+            typeof(Brush), typeof(NLogViewerBase),
+            new PropertyMetadata((Brush) (new BrushConverter().ConvertFrom("#324B5C"))));
+
+        /// <summary>
+        /// The background for the error output
+        /// </summary>
+        [Category("NLogViewerColors")]
+        [Description("Background brush for Error level log entries")] 
+        public Brush ErrorBackground
+        {
+            get => (Brush) GetValue(ErrorBackgroundProperty);
+            set => SetValue(ErrorBackgroundProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="ErrorBackground"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty ErrorBackgroundProperty =
+            DependencyProperty.Register(nameof(ErrorBackground), typeof(Brush), typeof(NLogViewerBase),
+                new PropertyMetadata(Brushes.Red));
+
+        /// <summary>
+        /// The foreground for the error output
+        /// </summary>
+        [Category("NLogViewerColors")]
+        [Description("Foreground brush for Error level log entries")] 
+        public Brush ErrorForeground
+        {
+            get => (Brush) GetValue(ErrorForegroundProperty);
+            set => SetValue(ErrorForegroundProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="ErrorForeground"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty ErrorForegroundProperty =
+            DependencyProperty.Register(nameof(ErrorForeground), typeof(Brush), typeof(NLogViewerBase),
+                new PropertyMetadata(Brushes.White));
+
+        /// <summary>
+        /// The background for the fatal output
+        /// </summary>
+        [Category("NLogViewerColors")]
+        [Description("Background brush for Fatal level log entries")] 
+        public Brush FatalBackground
+        {
+            get => (Brush) GetValue(FatalBackgroundProperty);
+            set => SetValue(FatalBackgroundProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="FatalBackground"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty FatalBackgroundProperty =
+            DependencyProperty.Register(nameof(FatalBackground), typeof(Brush), typeof(NLogViewerBase),
+                new PropertyMetadata(Brushes.Black));
+
+        /// <summary>
+        /// The foreground for the fatal output
+        /// </summary>
+        [Category("NLogViewerColors")]
+        [Description("Foreground brush for Fatal level log entries")] 
+        public Brush FatalForeground
+        {
+            get => (Brush) GetValue(FatalForegroundProperty);
+            set => SetValue(FatalForegroundProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="FatalForeground"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty FatalForegroundProperty =
+            DependencyProperty.Register(nameof(FatalForeground), typeof(Brush), typeof(NLogViewerBase),
+                new PropertyMetadata(Brushes.Yellow));
+
+        // ------------------------------------------------------------------------------------------
+        // Search Term Chip Colors
+        // ------------------------------------------------------------------------------------------
+
+        /// <summary>
+        /// Background brush for plain text search term chips
+        /// </summary>
+        [Category("NLogViewerColors")]
+        [Description("Background brush for plain text search term chips")] 
+        public Brush TextSearchTermBackground
+        {
+            get => (Brush)GetValue(TextSearchTermBackgroundProperty);
+            set => SetValue(TextSearchTermBackgroundProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="TextSearchTermBackground"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty TextSearchTermBackgroundProperty =
+            DependencyProperty.Register(nameof(TextSearchTermBackground), typeof(Brush), typeof(NLogViewerBase),
+                new PropertyMetadata((Brush)(new BrushConverter().ConvertFrom("#FFFFFBE6"))));
+
+        /// <summary>
+        /// Border brush for plain text search term chips
+        /// </summary>
+        [Category("NLogViewerColors")]
+        [Description("Border brush for plain text search term chips")] 
+        public Brush TextSearchTermBorderBrush
+        {
+            get => (Brush)GetValue(TextSearchTermBorderBrushProperty);
+            set => SetValue(TextSearchTermBorderBrushProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="TextSearchTermBorderBrush"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty TextSearchTermBorderBrushProperty =
+            DependencyProperty.Register(nameof(TextSearchTermBorderBrush), typeof(Brush), typeof(NLogViewerBase),
+                new PropertyMetadata((Brush)(new BrushConverter().ConvertFrom("#FFFFC107"))));
+
+        /// <summary>
+        /// Foreground brush for plain text search term chips
+        /// </summary>
+        [Category("NLogViewerColors")]
+        [Description("Foreground brush for plain text search term chips")] 
+        public Brush TextSearchTermForeground
+        {
+            get => (Brush)GetValue(TextSearchTermForegroundProperty);
+            set => SetValue(TextSearchTermForegroundProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="TextSearchTermForeground"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty TextSearchTermForegroundProperty =
+            DependencyProperty.Register(nameof(TextSearchTermForeground), typeof(Brush), typeof(NLogViewerBase),
+                new PropertyMetadata(Brushes.Black));
+
+        /// <summary>
+        /// Background brush for regex search term chips
+        /// </summary>
+        [Category("NLogViewerColors")]
+        [Description("Background brush for regex search term chips")] 
+        public Brush RegexSearchTermBackground
+        {
+            get => (Brush)GetValue(RegexSearchTermBackgroundProperty);
+            set => SetValue(RegexSearchTermBackgroundProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="RegexSearchTermBackground"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty RegexSearchTermBackgroundProperty =
+            DependencyProperty.Register(nameof(RegexSearchTermBackground), typeof(Brush), typeof(NLogViewerBase),
+                new PropertyMetadata((Brush)(new BrushConverter().ConvertFrom("#FFFFFBE6"))));
+
+        /// <summary>
+        /// Border brush for regex search term chips
+        /// </summary>
+        [Category("NLogViewerColors")]
+        [Description("Border brush for regex search term chips")] 
+        public Brush RegexSearchTermBorderBrush
+        {
+            get => (Brush)GetValue(RegexSearchTermBorderBrushProperty);
+            set => SetValue(RegexSearchTermBorderBrushProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="RegexSearchTermBorderBrush"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty RegexSearchTermBorderBrushProperty =
+            DependencyProperty.Register(nameof(RegexSearchTermBorderBrush), typeof(Brush), typeof(NLogViewerBase),
+                new PropertyMetadata((Brush)(new BrushConverter().ConvertFrom("#FFFFC107"))));
+
+        /// <summary>
+        /// Foreground brush for regex search term chips
+        /// </summary>
+        [Category("NLogViewerColors")]
+        [Description("Foreground brush for regex search term chips")] 
+        public Brush RegexSearchTermForeground
+        {
+            get => (Brush)GetValue(RegexSearchTermForegroundProperty);
+            set => SetValue(RegexSearchTermForegroundProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="RegexSearchTermForeground"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty RegexSearchTermForegroundProperty =
+            DependencyProperty.Register(nameof(RegexSearchTermForeground), typeof(Brush), typeof(NLogViewerBase),
+                new PropertyMetadata(Brushes.Black));
+
+        /// <summary>
+        /// Foreground brush for the "Regex:" prefix label
+        /// </summary>
+        [Category("NLogViewerColors")]
+        [Description("Foreground brush for the 'Regex:' prefix label")] 
+        public Brush RegexPrefixForeground
+        {
+            get => (Brush)GetValue(RegexPrefixForegroundProperty);
+            set => SetValue(RegexPrefixForegroundProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="RegexPrefixForeground"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty RegexPrefixForegroundProperty =
+            DependencyProperty.Register(nameof(RegexPrefixForeground), typeof(Brush), typeof(NLogViewerBase),
+                new PropertyMetadata((Brush)(new BrushConverter().ConvertFrom("#FFFF8F00"))));
+
+        /// <summary>
+        /// Background brush used to highlight matched search text in the message
+        /// </summary>
+        [Category("NLogViewerColors")]
+        [Description("Background brush used to highlight matched search text in the message")] 
+        public Brush SearchHighlightBackground
+        {
+            get => (Brush)GetValue(SearchHighlightBackgroundProperty);
+            set => SetValue(SearchHighlightBackgroundProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="SearchHighlightBackground"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty SearchHighlightBackgroundProperty =
+            DependencyProperty.Register(nameof(SearchHighlightBackground), typeof(Brush), typeof(NLogViewerBase),
+                new PropertyMetadata((Brush)(new BrushConverter().ConvertFrom("#FFFF80C0"))));
+
+        #endregion
+        
+        // ##########################################################################################
+        // NLogViewer
+        // ##########################################################################################
+
+        #region NLogViewer
+
+        /// <summary>
+        /// When set, the viewer binds its list to this collection so callers can push <see cref="LogEventInfo"/> directly.
+        /// When null, an internal collection is used.
+        /// </summary>
+        [Category("NLogViewer")]
+        [Browsable(true)]
+        [Description("Observable collection of log entries displayed by the viewer.")]
+        public ObservableCollection<LogEventInfo>? ItemsSource
+        {
+            get => (ObservableCollection<LogEventInfo>?)GetValue(ItemsSourceProperty);
+            set => SetValue(ItemsSourceProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="ItemsSource"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.Register(
+            nameof(ItemsSource),
+            typeof(ObservableCollection<LogEventInfo>),
+            typeof(NLogViewerBase),
+            new PropertyMetadata(null, OnItemsSourceChanged));
+
+        private static void OnItemsSourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is not NLogViewerBase viewer)
+                return;
+            viewer.SyncItemsSourceToView();
+        }
+
+        /// <summary>
+        /// Private DP to bind to the gui
+        /// </summary>
+        [Category("NLogViewer")]
+        public CollectionViewSource LogEvents
+        {
+            get => (CollectionViewSource) GetValue(LogEventsProperty);
+            private set => SetValue(LogEventsProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="LogEvents"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty LogEventsProperty = DependencyProperty.Register(nameof(LogEvents),
+            typeof(CollectionViewSource), typeof(NLogViewerBase), new PropertyMetadata(null));
+        
+        /// <summary>
+        /// Automatically scroll to the newest entry
+        /// </summary>
+        [Category("NLogViewerControls")]
+        [Browsable(true)]
+        [Description("Automatically scroll to the newest log entry when new entries are added")]
+        public bool AutoScroll
+        {
+            get => (bool)GetValue(AutoScrollProperty);
+            set => SetValue(AutoScrollProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="AutoScroll"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty AutoScrollProperty = DependencyProperty.Register(nameof(AutoScroll), typeof(bool), typeof(NLogViewerBase), new PropertyMetadata(true, AutoScrollChangedCallback));
+
+        private static void AutoScrollChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs args)
+        {
+            if (d is NLogViewerBase instance)
+            {
+                instance.OnAutoScrollChanged();
+            }
+        }
+
+        protected virtual void OnAutoScrollChanged()
+        {
+            if (AutoScroll)
+                PART_ListView?.ScrollToEnd();
+        }
+		
+        private void UpdateFilter()
+        {
+            if (LogEvents?.View is not CollectionView collectionView) return;
+
+            collectionView.Filter = item =>
+            {
+                if (item is not LogEventInfo logEvent) return true;
+
+                // Apply level filters first
+                var levelFilterPassed = logEvent.Level.Name switch
+                {
+                    "Trace" => !TraceFilter,  // If TraceFilter is true, hide Trace entries (!true = false)
+                    "Debug" => !DebugFilter,  // If DebugFilter is true, hide Debug entries (!true = false)
+                    "Info" => !InfoFilter,    // If InfoFilter is true, hide Info entries (!true = false)
+                    "Warn" => !WarnFilter,     // If WarnFilter is true, hide Warn entries (!true = false)
+                    "Error" => !ErrorFilter,   // If ErrorFilter is true, hide Error entries (!true = false)
+                    "Fatal" => !FatalFilter,   // If FatalFilter is true, hide Fatal entries (!true = false)
+                    _ => true
+                };
+
+                if (!levelFilterPassed) return false;
+
+                // Apply search filters if any active search terms exist
+                if (ActiveSearchTerms?.Count > 0)
+                {
+                    var loggerName = logEvent.LoggerName ?? string.Empty;
+                    var message = MessageResolver?.Resolve(logEvent) ?? string.Empty;
+                    
+                    // Separate include and exclude terms based on regex pattern
+                    // Exclude patterns start with "^(?!.*" (negative lookahead)
+                    var includeTerms = ActiveSearchTerms.Where(t => 
+                        !(t is RegexSearchTerm regexTerm && regexTerm.Text.StartsWith("^(?!.*", StringComparison.Ordinal))).ToList();
+                    var excludeTerms = ActiveSearchTerms.Where(t => 
+                        t is RegexSearchTerm regexTerm && regexTerm.Text.StartsWith("^(?!.*", StringComparison.Ordinal)).ToList();
+                    
+                    // AND logic: ALL include terms must match
+                    foreach (var searchTerm in includeTerms)
+                    {
+                        if (!searchTerm.MatchAny(loggerName, message))
+                            return false;
+                    }
+                    
+                    // Exclude logic: Hide entry if ANY string (loggerName OR message) contains the excluded pattern
+                    // Note: For exclude patterns (negative lookahead ^(?!.*pattern)), if the pattern matches,
+                    // it means the text does NOT contain the excluded pattern. If it doesn't match, the text contains it.
+                    // We need to check each string individually because MatchAny would return true if ANY string matches,
+                    // but we want to hide if ANY string contains the pattern.
+                    foreach (var searchTerm in excludeTerms)
+                    {
+                        // Check each string individually: if either contains the pattern, hide the entry
+                        var loggerContainsPattern = !searchTerm.Match(loggerName);
+                        var messageContainsPattern = !searchTerm.Match(message);
+                        
+                        if (loggerContainsPattern || messageContainsPattern)
+                            return false; // Hide entry if either string contains the excluded pattern
+                    }
+                    
+                    // All include terms matched and no exclude terms matched
+                    return true;
+                }
+
+                return true;
+            };
+            
+            // Refresh the view to apply the filter
+            collectionView.Refresh();
+        }
+        
+        /// <summary>
+        /// Delete all entries
+        /// </summary>
+        [Category("NLogViewerControls")]
+        [Browsable(true)]
+        [Description("Command to clear all log entries from the viewer")]
+        public ICommand ClearCommand
+        {
+            get => (ICommand) GetValue(ClearCommandProperty);
+            set => SetValue(ClearCommandProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="ClearCommand"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty ClearCommandProperty = DependencyProperty.Register(nameof(ClearCommand),
+            typeof(ICommand), typeof(NLogViewerBase), new PropertyMetadata(null));
+
+        /// <summary>
+        /// Command to add a new search term
+        /// </summary>
+        [Category("NLogViewerControls")]
+        [Browsable(true)]
+        [Description("Command to add a new search term")]
+        public ICommand AddSearchTermCommand
+        {
+            get => (ICommand) GetValue(AddSearchTermCommandProperty);
+            set => SetValue(AddSearchTermCommandProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="AddSearchTermCommand"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty AddSearchTermCommandProperty = DependencyProperty.Register(nameof(AddSearchTermCommand),
+            typeof(ICommand), typeof(NLogViewerBase), new PropertyMetadata(null));
+
+        /// <summary>
+        /// Command to clear all search terms
+        /// </summary>
+        [Category("NLogViewerControls")]
+        [Browsable(true)]
+        [Description("Command to clear all search terms")]
+        public ICommand ClearAllSearchTermsCommand
+        {
+            get => (ICommand) GetValue(ClearAllSearchTermsCommandProperty);
+            set => SetValue(ClearAllSearchTermsCommandProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="ClearAllSearchTermsCommand"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty ClearAllSearchTermsCommandProperty = DependencyProperty.Register(nameof(ClearAllSearchTermsCommand),
+            typeof(ICommand), typeof(NLogViewerBase), new PropertyMetadata(null));
+
+        /// <summary>
+        /// Command to add a regex search term from a provided text
+        /// </summary>
+        [Category("NLogViewerControls")]
+        [Browsable(true)]
+        [Description("Command to add a regex search term from the provided text")]
+        public ICommand AddRegexSearchTermCommand
+        {
+            get => (ICommand) GetValue(AddRegexSearchTermCommandProperty);
+            set => SetValue(AddRegexSearchTermCommandProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="AddRegexSearchTermCommand"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty AddRegexSearchTermCommandProperty = DependencyProperty.Register(nameof(AddRegexSearchTermCommand),
+            typeof(ICommand), typeof(NLogViewerBase), new PropertyMetadata(null));
+
+        /// <summary>
+        /// Command to add a regex search term as an exclude filter from a provided text
+        /// </summary>
+        [Category("NLogViewerControls")]
+        [Browsable(true)]
+        [Description("Command to add a regex search term as an exclude filter from the provided text")]
+        public ICommand AddRegexSearchTermExcludeCommand
+        {
+            get => (ICommand) GetValue(AddRegexSearchTermExcludeCommandProperty);
+            set => SetValue(AddRegexSearchTermExcludeCommandProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="AddRegexSearchTermExcludeCommand"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty AddRegexSearchTermExcludeCommandProperty = DependencyProperty.Register(nameof(AddRegexSearchTermExcludeCommand),
+            typeof(ICommand), typeof(NLogViewerBase), new PropertyMetadata(null));
+
+        /// <summary>
+        /// Command to remove a specific search term
+        /// </summary>
+        [Category("NLogViewerControls")]
+        [Browsable(true)]
+        [Description("Command to remove a specific search term")]
+        public ICommand RemoveSearchTermCommand
+        {
+            get => (ICommand) GetValue(RemoveSearchTermCommandProperty);
+            set => SetValue(RemoveSearchTermCommandProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="RemoveSearchTermCommand"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty RemoveSearchTermCommandProperty = DependencyProperty.Register(nameof(RemoveSearchTermCommand),
+            typeof(ICommand), typeof(NLogViewerBase), new PropertyMetadata(null));
+
+        /// <summary>
+        /// Command to edit a search term by copying it to the current search text
+        /// </summary>
+        [Category("NLogViewerControls")]
+        [Browsable(true)]
+        [Description("Command to edit a search term by copying it to the current search text")]
+        public ICommand EditSearchTermCommand
+        {
+            get => (ICommand) GetValue(EditSearchTermCommandProperty);
+            set => SetValue(EditSearchTermCommandProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="EditSearchTermCommand"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty EditSearchTermCommandProperty = DependencyProperty.Register(nameof(EditSearchTermCommand),
+            typeof(ICommand), typeof(NLogViewerBase), new PropertyMetadata(null));
+
+        /// <summary>
+        /// Command to copy text to clipboard
+        /// </summary>
+        [Category("NLogViewerControls")]
+        [Browsable(true)]
+        [Description("Command to copy text to clipboard")]
+        public ICommand CopyToClipboardCommand
+        {
+            get => (ICommand) GetValue(CopyToClipboardCommandProperty);
+            set => SetValue(CopyToClipboardCommandProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="CopyToClipboardCommand"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty CopyToClipboardCommandProperty = DependencyProperty.Register(nameof(CopyToClipboardCommand),
+            typeof(ICommand), typeof(NLogViewerBase), new PropertyMetadata(null));
+
+        /// <summary>
+        /// Command to export filtered log entries to a file
+        /// </summary>
+        [Category("NLogViewerControls")]
+        [Browsable(true)]
+        [Description("Command to export filtered log entries to a file")]
+        public ICommand ExportCommand
+        {
+            get => (ICommand) GetValue(ExportCommandProperty);
+            set => SetValue(ExportCommandProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="ExportCommand"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty ExportCommandProperty = DependencyProperty.Register(nameof(ExportCommand),
+            typeof(ICommand), typeof(NLogViewerBase), new PropertyMetadata(null));
+
+        /// <summary>
+        /// Command to scroll to the end of the log entries
+        /// </summary>
+        [Category("NLogViewerControls")]
+        [Browsable(true)]
+        [Description("Command to scroll to the end of the log entries")]
+        public ICommand ScrollToEndCommand
+        {
+            get => (ICommand) GetValue(ScrollToEndCommandProperty);
+            set => SetValue(ScrollToEndCommandProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="ScrollToEndCommand"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty ScrollToEndCommandProperty = DependencyProperty.Register(nameof(ScrollToEndCommand),
+            typeof(ICommand), typeof(NLogViewerBase), new FrameworkPropertyMetadata
+            {
+	            BindsTwoWayByDefault = true,
+	            DefaultUpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged
+            });
+        
+        /// <summary>
+        /// Stop logging
+        /// </summary>
+        [Category("NLogViewerControls")]
+        [Browsable(true)]
+        [Description("Pause or resume logging to improve performance when not actively monitoring")]
+        public bool Pause
+        {
+            get => (bool)GetValue(PauseProperty);
+            set => SetValue(PauseProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="Pause"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty PauseProperty = DependencyProperty.Register(nameof(Pause), typeof(bool), typeof(NLogViewerBase), new PropertyMetadata(false, OnPauseChanged));
+
+        private static void OnPauseChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is NLogViewerBase viewer && !DesignerProperties.GetIsInDesignMode(viewer))
+                viewer.OnPausePropertyChanged((bool)e.NewValue);
+        }
+
+        /// <summary>
+        /// Called when <see cref="Pause"/> changes. Default does nothing (external <see cref="ItemsSource"/> is unaffected).
+        /// </summary>
+        protected virtual void OnPausePropertyChanged(bool isPaused)
+        {
+        }
+        
+        /// <summary>
+        /// The maximum number of entries before automatic cleaning is performed. There is a hysteresis of 100 entries which must be exceeded.
+        /// Example: <see cref="MaxCount"/> is '1000'. Then after '1100' entries, everything until '1000' is deleted.
+        /// If set to '0' or less, it is deactivated
+        /// </summary>
+        [Category("NLogViewer")]
+        public int MaxCount
+        {
+            get => (int)GetValue(MaxCountProperty);
+            set => SetValue(MaxCountProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="MaxCount"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty MaxCountProperty = DependencyProperty.Register(nameof(MaxCount), typeof(int), typeof(NLogViewerBase),
+            new PropertyMetadata(5000, OnMaxCountChanged));
+
+        private static void OnMaxCountChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is not NLogViewerBase viewer || DesignerProperties.GetIsInDesignMode(viewer))
+                return;
+            viewer.ApplyMaxCountTrim(viewer.GetEffectiveEntries());
+        }
+
+
+        #endregion
+
+        // ##########################################################################################
+        // Resolver
+        // ##########################################################################################
+
+        #region Resolver
+        
+        /// <summary>
+        /// The <see cref="ILogEventInfoResolver"/> to format the id
+        /// </summary>
+        [Category("NLogViewerResolver")]
+        public ILogEventInfoResolver IdResolver
+        {
+            get => (ILogEventInfoResolver)GetValue(IdResolverProperty);
+            set => SetValue(IdResolverProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="IdResolver"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty IdResolverProperty = DependencyProperty.Register(nameof(IdResolver), typeof(ILogEventInfoResolver), typeof(NLogViewerBase), new PropertyMetadata(new IdResolver()));
+        
+        /// <summary>
+        /// The <see cref="ILogEventInfoResolver"/> to format the timestamp output
+        /// </summary>
+        [Category("NLogViewerResolver")]
+        public ILogEventInfoResolver TimeStampResolver
+        {
+            get => (ILogEventInfoResolver)GetValue(TimeStampResolverProperty);
+            set => SetValue(TimeStampResolverProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="TimeStampResolver"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty TimeStampResolverProperty = DependencyProperty.Register(nameof(TimeStampResolver), typeof(ILogEventInfoResolver), typeof(NLogViewerBase), new PropertyMetadata(new TimeStampResolver()));
+        
+        /// <summary>
+        /// The <see cref="ILogEventInfoResolver"/> to format the loggername
+        /// </summary>
+        [Category("NLogViewerResolver")]
+        public ILogEventInfoResolver LoggerNameResolver
+        {
+            get => (ILogEventInfoResolver)GetValue(LoggerNameResolverProperty);
+            set => SetValue(LoggerNameResolverProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="LoggerNameResolver"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty LoggerNameResolverProperty = DependencyProperty.Register(nameof(LoggerNameResolver), typeof(ILogEventInfoResolver), typeof(NLogViewerBase), new PropertyMetadata(new LoggerNameResolver()));
+        
+        /// <summary>
+        /// The <see cref="ILogEventInfoResolver"/> to format the message
+        /// </summary>
+        [Category("NLogViewerResolver")]
+        public ILogEventInfoResolver MessageResolver
+        {
+            get => (ILogEventInfoResolver)GetValue(MessageResolverProperty);
+            set => SetValue(MessageResolverProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="MessageResolver"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty MessageResolverProperty = DependencyProperty.Register(nameof(MessageResolver), typeof(ILogEventInfoResolver), typeof(NLogViewerBase), new PropertyMetadata(new MessageResolver()));
+
+        /// <summary>
+        /// The <see cref="ILogExportFormatter"/> to format log entries for export
+        /// </summary>
+        [Category("NLogViewerResolver")]
+        public ILogExportFormatter ExportFormatter
+        {
+            get => (ILogExportFormatter)GetValue(ExportFormatterProperty);
+            set => SetValue(ExportFormatterProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="ExportFormatter"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty ExportFormatterProperty = DependencyProperty.Register(nameof(ExportFormatter), typeof(ILogExportFormatter), typeof(NLogViewerBase), new PropertyMetadata(new DefaultLogExportFormatter()));
+        
+        #endregion
+
+        // ##########################################################################################
+        // Column Visibility
+        // ##########################################################################################
+
+        #region Column Visibility
+
+        /// <summary>
+        /// Controls the visibility of the ID column
+        /// </summary>
+        [Category("NLogViewerColumns")]
+        public bool ShowIdColumn
+        {
+            get => (bool)GetValue(ShowIdColumnProperty);
+            set => SetValue(ShowIdColumnProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="ShowIdColumn"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty ShowIdColumnProperty = 
+            DependencyProperty.Register(nameof(ShowIdColumn), typeof(bool), typeof(NLogViewerBase), 
+                new PropertyMetadata(true, OnColumnVisibilityChanged));
+
+        /// <summary>
+        /// Controls the visibility of the Level column
+        /// </summary>
+        [Category("NLogViewerColumns")]
+        public bool ShowLevelColumn
+        {
+            get => (bool)GetValue(ShowLevelColumnProperty);
+            set => SetValue(ShowLevelColumnProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="ShowLevelColumn"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty ShowLevelColumnProperty = 
+            DependencyProperty.Register(nameof(ShowLevelColumn), typeof(bool), typeof(NLogViewerBase), 
+                new PropertyMetadata(true, OnColumnVisibilityChanged));
+
+        /// <summary>
+        /// Controls the visibility of the TimeStamp column
+        /// </summary>
+        [Category("NLogViewerColumns")]
+        public bool ShowTimeStampColumn
+        {
+            get => (bool)GetValue(ShowTimeStampColumnProperty);
+            set => SetValue(ShowTimeStampColumnProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="ShowTimeStampColumn"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty ShowTimeStampColumnProperty = 
+            DependencyProperty.Register(nameof(ShowTimeStampColumn), typeof(bool), typeof(NLogViewerBase), 
+                new PropertyMetadata(true, OnColumnVisibilityChanged));
+
+        /// <summary>
+        /// Controls the visibility of the LoggerName column
+        /// </summary>
+        [Category("NLogViewerColumns")]
+        public bool ShowLoggerNameColumn
+        {
+            get => (bool)GetValue(ShowLoggerNameColumnProperty);
+            set => SetValue(ShowLoggerNameColumnProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="ShowLoggerNameColumn"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty ShowLoggerNameColumnProperty = 
+            DependencyProperty.Register(nameof(ShowLoggerNameColumn), typeof(bool), typeof(NLogViewerBase), 
+                new PropertyMetadata(true, OnColumnVisibilityChanged));
+
+
+        private static void OnColumnVisibilityChanged(DependencyObject d, DependencyPropertyChangedEventArgs args)
+        {
+            if (d is NLogViewerBase instance)
+            {
+                instance.UpdateColumnVisibility();
+            }
+        }
+
+        /// <summary>
+        /// Updates column visibility by removing or adding columns based on the Show properties.
+        /// When a column is hidden, it's removed from the grid. When shown again, it's added back at its original position.
+        /// </summary>
+        private void UpdateColumnVisibility()
+        {
+	        if (PART_ListView?.View is not AutoSizedGridView gridView) return;
+
+	        // Update ID column visibility (original index 0)
+	        UpdateColumnVisibility(gridView, _originalIdColumn, ShowIdColumn, _originalIdColumnWidth, 0);
+
+	        // Update Level column visibility (original index 1)
+	        UpdateColumnVisibility(gridView, _originalLevelColumn, ShowLevelColumn, _originalLevelColumnWidth, 1);
+
+	        // Update TimeStamp column visibility (original index 2)
+	        UpdateColumnVisibility(gridView, _originalTimeStampColumn, ShowTimeStampColumn, _originalTimeStampColumnWidth, 2);
+
+	        // Update LoggerName column visibility (original index 3)
+	        UpdateColumnVisibility(gridView, _originalLoggerNameColumn, ShowLoggerNameColumn, _originalLoggerNameColumnWidth, 3);
+
+	        // Message column is always visible (no visibility control)
+        }
+
+        /// <summary>
+        /// Helper method to update individual column visibility by removing or adding the column.
+        /// Calculates the correct insertion position based on which columns are currently visible.
+        /// </summary>
+        /// <param name="gridView">The GridView containing the columns</param>
+        /// <param name="originalColumn">The original column reference to add/remove</param>
+        /// <param name="showColumn">Whether the column should be visible</param>
+        /// <param name="originalWidth">The original width of the column</param>
+        /// <param name="originalIndex">The original index of the column (0=ID, 1=Level, 2=TimeStamp, 3=LoggerName)</param>
+        private void UpdateColumnVisibility(AutoSizedGridView gridView, GridViewColumn originalColumn, bool showColumn, double originalWidth, int originalIndex)
+        {
+	        if (originalColumn == null) return;
+
+	        // Check if column is currently in the grid
+	        var columnExists = gridView.Columns.Contains(originalColumn);
+
+	        if (showColumn && !columnExists)
+	        {
+		        // Column should be visible but is not in the grid - add it back
+		        originalColumn.Width = originalWidth;
+		        
+		        // Calculate the correct insertion index based on which columns are currently visible
+		        var insertionIndex = CalculateInsertionIndex(gridView, originalIndex);
+		        gridView.Columns.Insert(insertionIndex, originalColumn);
+	        }
+	        else if (!showColumn && columnExists)
+	        {
+		        // Column should be hidden but is in the grid - remove it
+		        gridView.Columns.Remove(originalColumn);
+	        }
+        }
+
+        /// <summary>
+        /// Calculates the correct insertion index for a column based on its original position
+        /// and which columns are currently visible.
+        /// </summary>
+        /// <param name="gridView">The GridView containing the columns</param>
+        /// <param name="originalIndex">The original index of the column to insert</param>
+        /// <returns>The correct insertion index</returns>
+        private int CalculateInsertionIndex(AutoSizedGridView gridView, int originalIndex)
+        {
+	        // Count how many visible columns come before this one in the original order
+	        var insertionIndex = 0;
+	        
+	        // Check ID column (original index 0)
+	        if (originalIndex > 0 && ShowIdColumn && gridView.Columns.Contains(_originalIdColumn))
+	        {
+		        insertionIndex++;
+	        }
+	        
+	        // Check Level column (original index 1)
+	        if (originalIndex > 1 && ShowLevelColumn && gridView.Columns.Contains(_originalLevelColumn))
+	        {
+		        insertionIndex++;
+	        }
+	        
+	        // Check TimeStamp column (original index 2)
+	        if (originalIndex > 2 && ShowTimeStampColumn && gridView.Columns.Contains(_originalTimeStampColumn))
+	        {
+		        insertionIndex++;
+	        }
+	        
+	        // Check LoggerName column (original index 3)
+	        if (originalIndex > 3 && ShowLoggerNameColumn && gridView.Columns.Contains(_originalLoggerNameColumn))
+	        {
+		        insertionIndex++;
+	        }
+	        
+	        return insertionIndex;
+        }
+
+		#endregion
+
+		// ##########################################################################################
+		// Filter Properties
+		// ##########################################################################################
+
+		#region Filter Properties
+
+		/// <summary>
+		/// Filter for Trace log level
+		/// </summary>
+		[Category("NLogViewerFilters")]
+        [Browsable(true)]
+        [Description("Hide/show Trace level log entries")]
+        public bool TraceFilter
+        {
+            get => (bool)GetValue(TraceFilterProperty);
+            set => SetValue(TraceFilterProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="TraceFilter"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty TraceFilterProperty = 
+            DependencyProperty.Register(nameof(TraceFilter), typeof(bool), typeof(NLogViewerBase), 
+                new PropertyMetadata(false, OnFilterChanged));
+
+        /// <summary>
+        /// Filter for Debug log level
+        /// </summary>
+        [Category("NLogViewerFilters")]
+        [Browsable(true)]
+        [Description("Hide/show Debug level log entries")]
+        public bool DebugFilter
+        {
+            get => (bool)GetValue(DebugFilterProperty);
+            set => SetValue(DebugFilterProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="DebugFilter"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty DebugFilterProperty = 
+            DependencyProperty.Register(nameof(DebugFilter), typeof(bool), typeof(NLogViewerBase), 
+                new PropertyMetadata(false, OnFilterChanged));
+
+        /// <summary>
+        /// Filter for Info log level
+        /// </summary>
+        [Category("NLogViewerFilters")]
+        [Browsable(true)]
+        [Description("Hide/show Info level log entries")]
+        public bool InfoFilter
+        {
+            get => (bool)GetValue(InfoFilterProperty);
+            set => SetValue(InfoFilterProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="InfoFilter"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty InfoFilterProperty = 
+            DependencyProperty.Register(nameof(InfoFilter), typeof(bool), typeof(NLogViewerBase), 
+                new PropertyMetadata(false, OnFilterChanged));
+
+        /// <summary>
+        /// Filter for Warn log level
+        /// </summary>
+        [Category("NLogViewerFilters")]
+        [Browsable(true)]
+        [Description("Hide/show Warn level log entries")]
+        public bool WarnFilter
+        {
+            get => (bool)GetValue(WarnFilterProperty);
+            set => SetValue(WarnFilterProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="WarnFilter"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty WarnFilterProperty = 
+            DependencyProperty.Register(nameof(WarnFilter), typeof(bool), typeof(NLogViewerBase), 
+                new PropertyMetadata(false, OnFilterChanged));
+
+        /// <summary>
+        /// Filter for Error log level
+        /// </summary>
+        [Category("NLogViewerFilters")]
+        [Browsable(true)]
+        [Description("Hide/show Error level log entries")]
+        public bool ErrorFilter
+        {
+            get => (bool)GetValue(ErrorFilterProperty);
+            set => SetValue(ErrorFilterProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="ErrorFilter"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty ErrorFilterProperty = 
+            DependencyProperty.Register(nameof(ErrorFilter), typeof(bool), typeof(NLogViewerBase), 
+                new PropertyMetadata(false, OnFilterChanged));
+
+        /// <summary>
+        /// Filter for Fatal log level
+        /// </summary>
+        [Category("NLogViewerFilters")]
+        [Browsable(true)]
+        [Description("Hide/show Fatal level log entries")]
+        public bool FatalFilter
+        {
+            get => (bool)GetValue(FatalFilterProperty);
+            set => SetValue(FatalFilterProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="FatalFilter"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty FatalFilterProperty = 
+            DependencyProperty.Register(nameof(FatalFilter), typeof(bool), typeof(NLogViewerBase), 
+                new PropertyMetadata(false, OnFilterChanged));
+
+        /// <summary>
+        /// Current search text being typed (not yet activated)
+        /// </summary>
+        [Category("NLogViewerFilters")]
+        [Browsable(true)]
+        [Description("Current search text being typed (activated with Enter key)")]
+        public string CurrentSearchText
+        {
+            get => (string)GetValue(CurrentSearchTextProperty);
+            set => SetValue(CurrentSearchTextProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="CurrentSearchText"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty CurrentSearchTextProperty = 
+            DependencyProperty.Register(nameof(CurrentSearchText), typeof(string), typeof(NLogViewerBase), 
+                new PropertyMetadata(string.Empty));
+
+        /// <summary>
+        /// Whether to use regex pattern matching for search
+        /// </summary>
+        [Category("NLogViewerFilters")]
+        [Browsable(true)]
+        [Description("Use regex pattern matching instead of free text search")]
+        public bool UseRegexSearch
+        {
+            get => (bool)GetValue(UseRegexSearchProperty);
+            set => SetValue(UseRegexSearchProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="UseRegexSearch"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty UseRegexSearchProperty = 
+            DependencyProperty.Register(nameof(UseRegexSearch), typeof(bool), typeof(NLogViewerBase), 
+                new PropertyMetadata(false));
+
+        /// <summary>
+        /// Collection of active search terms
+        /// </summary>
+        [Category("NLogViewerFilters")]
+        [Browsable(false)]
+        [Description("Collection of active search terms")]
+        public ObservableCollection<SearchTerm> ActiveSearchTerms
+        {
+            get => (ObservableCollection<SearchTerm>)GetValue(ActiveSearchTermsProperty);
+            private set => SetValue(ActiveSearchTermsProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="ActiveSearchTerms"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty ActiveSearchTermsProperty = 
+            DependencyProperty.Register(nameof(ActiveSearchTerms), typeof(ObservableCollection<SearchTerm>), typeof(NLogViewerBase), 
+                new PropertyMetadata(null));
+
+        private static void OnFilterChanged(DependencyObject d, DependencyPropertyChangedEventArgs args)
+        {
+            if (d is NLogViewerBase instance)
+            {
+                instance.UpdateFilter();
+            }
+        }
+
+
+        /// <summary>
+        /// Adds a new search term to the active search terms collection
+        /// </summary>
+        public void AddSearchTerm()
+        {
+            if (string.IsNullOrWhiteSpace(CurrentSearchText))
+                return;
+
+            SearchTerm searchTerm;
+            
+            if (UseRegexSearch)
+            {
+                try
+                {
+                    searchTerm = new RegexSearchTerm(CurrentSearchText);
+                }
+                catch (ArgumentException ex)
+                {
+                    MessageBox.Show($"Invalid regex pattern: {ex.Message}", "Regex Error", 
+                        MessageBoxButton.OK, MessageBoxImage.Warning);
+                    return;
+                }
+            }
+            else
+            {
+                searchTerm = new TextSearchTerm(CurrentSearchText);
+            }
+            
+            ActiveSearchTerms.Add(searchTerm);
+            
+            // Clear the input
+            CurrentSearchText = string.Empty;
+            
+            // Update filter
+            UpdateFilter();
+        }
+
+        /// <summary>
+        /// Removes a search term from the active search terms collection
+        /// </summary>
+        public void RemoveSearchTerm(SearchTerm searchTerm)
+        {
+            ActiveSearchTerms.Remove(searchTerm);
+            UpdateFilter();
+        }
+
+        /// <summary>
+        /// Clears all active search terms
+        /// </summary>
+        public void ClearAllSearchTerms()
+        {
+            ActiveSearchTerms.Clear();
+            UpdateFilter();
+        }
+
+        /// <summary>
+        /// Adds a RegexSearchTerm from a provided text and updates the filter
+        /// Special regex characters are escaped to treat the text as a literal string
+        /// </summary>
+        /// <param name="text">The text to use as regex pattern (will be escaped)</param>
+        public void AddRegexSearchTerm(string text)
+        {
+            if (string.IsNullOrWhiteSpace(text))
+                return;
+
+            try
+            {
+                // Escape special regex characters to treat the text as a literal string
+                var escapedPattern = Regex.Escape(text);
+                var term = new RegexSearchTerm(escapedPattern);
+                ActiveSearchTerms.Add(term);
+                UpdateFilter();
+            }
+            catch (ArgumentException ex)
+            {
+                MessageBox.Show($"Invalid regex pattern: {ex.Message}", "Regex Error",
+                    MessageBoxButton.OK, MessageBoxImage.Warning);
+            }
+        }
+
+        /// <summary>
+        /// Adds a RegexSearchTerm as an exclude filter from a provided text and updates the filter
+        /// Special regex characters are escaped and wrapped in a negative lookahead pattern
+        /// </summary>
+        /// <param name="text">The text to use as regex pattern (will be escaped and wrapped in negative lookahead)</param>
+        public void AddRegexSearchTermExclude(string text)
+        {
+            if (string.IsNullOrWhiteSpace(text))
+                return;
+
+            try
+            {
+                // Escape special regex characters to treat the text as a literal string
+                var escapedPattern = Regex.Escape(text);
+                // Wrap in negative lookahead: matches any text that does NOT contain the pattern
+                var negativeLookaheadPattern = $"^(?!.*{escapedPattern}$)";
+                var term = new RegexSearchTerm(negativeLookaheadPattern);
+                ActiveSearchTerms.Add(term);
+                UpdateFilter();
+            }
+            catch (ArgumentException ex)
+            {
+                MessageBox.Show($"Invalid regex pattern: {ex.Message}", "Regex Error",
+                    MessageBoxButton.OK, MessageBoxImage.Warning);
+            }
+        }
+
+        /// <summary>
+        /// Edits a search term by copying its text to the current search text field
+        /// </summary>
+        /// <param name="searchTerm">The search term to edit</param>
+        public void EditSearchTerm(SearchTerm searchTerm)
+        {
+            if (searchTerm == null)
+                return;
+
+            // Copy the search term text to the current search text field
+            CurrentSearchText = searchTerm.Text;
+            
+            // Set the regex checkbox based on the search term type
+            UseRegexSearch = searchTerm is RegexSearchTerm;
+            
+            // Remove the original search term
+            ActiveSearchTerms.Remove(searchTerm);
+            UpdateFilter();
+        }
+
+        /// <summary>
+        /// Copies text to the clipboard
+        /// </summary>
+        /// <param name="text">The text to copy to clipboard</param>
+        public void CopyToClipboard(string text)
+        {
+            if (string.IsNullOrEmpty(text))
+                return;
+
+            try
+            {
+                Clipboard.SetText(text);
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"Failed to copy to clipboard: {ex.Message}", "Clipboard Error",
+                    MessageBoxButton.OK, MessageBoxImage.Warning);
+            }
+        }
+
+        /// <summary>
+        /// Gets all filtered log entries from the current view
+        /// </summary>
+        /// <returns>An enumerable collection of filtered LogEventInfo entries</returns>
+        public IEnumerable<LogEventInfo> GetFilteredLogEntries()
+        {
+            if (LogEvents?.View == null)
+                return Enumerable.Empty<LogEventInfo>();
+
+            return LogEvents.View.Cast<LogEventInfo>();
+        }
+
+        /// <summary>
+        /// Exports filtered log entries to a file in the specified format
+        /// </summary>
+        /// <param name="parameter">Export parameters containing file path and format</param>
+        public void ExportLogs(ExportParameter parameter)
+        {
+            if (parameter == null)
+                throw new ArgumentNullException(nameof(parameter));
+
+            if (string.IsNullOrWhiteSpace(parameter.FilePath))
+                throw new ArgumentException("File path cannot be empty", nameof(parameter));
+
+            try
+            {
+                var filteredEntries = GetFilteredLogEntries().ToList();
+                
+                if (filteredEntries.Count == 0)
+                {
+                    MessageBox.Show("No log entries to export.", "Export", 
+                        MessageBoxButton.OK, MessageBoxImage.Information);
+                    return;
+                }
+
+                switch (parameter.Format)
+                {
+                    case ExportFormat.Log:
+                        ExportToLogFormat(parameter.FilePath, filteredEntries, parameter.CustomFormatter);
+                        break;
+                    default:
+                        throw new NotSupportedException($"Export format {parameter.Format} is not supported.");
+                }
+
+                MessageBox.Show($"Successfully exported {filteredEntries.Count} log entry(ies) to {parameter.FilePath}", 
+                    "Export Complete", MessageBoxButton.OK, MessageBoxImage.Information);
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"Failed to export logs: {ex.Message}", "Export Error",
+                    MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+        /// <summary>
+        /// Exports log entries to a standard log file format
+        /// </summary>
+        /// <param name="filePath">Target file path</param>
+        /// <param name="logEntries">Log entries to export</param>
+        /// <param name="customFormatter">Optional custom formatter to override the default formatter</param>
+        private void ExportToLogFormat(string filePath, IEnumerable<LogEventInfo> logEntries, ILogExportFormatter? customFormatter = null)
+        {
+            using var writer = new StreamWriter(filePath, false, System.Text.Encoding.UTF8);
+            
+            // Use custom formatter if provided, otherwise use ExportFormatter, fall back to default formatter
+            var formatter = customFormatter ?? ExportFormatter ?? new DefaultLogExportFormatter();
+            
+            foreach (var logEvent in logEntries)
+            {
+                var formattedLine = formatter.Format(
+                    logEvent,
+                    TimeStampResolver ?? new TimeStampResolver(),
+                    LoggerNameResolver ?? new LoggerNameResolver(),
+                    MessageResolver ?? new MessageResolver());
+                
+                writer.WriteLine(formattedLine);
+            }
+        }
+
+        #endregion
+
+        // ##########################################################################################
+        // Filter Visibility
+        // ##########################################################################################
+
+        #region Filter Visibility
+
+        /// <summary>
+        /// Controls the visibility of the filter buttons
+        /// </summary>
+        [Category("NLogViewerFilters")]
+        [Browsable(true)]
+        [Description("Show/hide the filter buttons")]
+        public bool ShowFilterButtons
+        {
+            get => (bool)GetValue(ShowFilterButtonsProperty);
+            set => SetValue(ShowFilterButtonsProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="ShowFilterButtons"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty ShowFilterButtonsProperty = 
+            DependencyProperty.Register(nameof(ShowFilterButtons), typeof(bool), typeof(NLogViewerBase), 
+                new PropertyMetadata(true));
+
+        /// <summary>
+        /// Controls the visibility of the search controls
+        /// </summary>
+        [Category("NLogViewerFilters")]
+        [Browsable(true)]
+        [Description("Show/hide the search controls")]
+        public bool ShowSearchControls
+        {
+            get => (bool)GetValue(ShowSearchControlsProperty);
+            set => SetValue(ShowSearchControlsProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="ShowSearchControls"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty ShowSearchControlsProperty = 
+            DependencyProperty.Register(nameof(ShowSearchControls), typeof(bool), typeof(NLogViewerBase), 
+                new PropertyMetadata(true));
+
+        #endregion
+
+        // ##########################################################################################
+        // Controls Visibility
+        // ##########################################################################################
+
+        #region Controls Visibility
+
+        /// <summary>
+        /// Controls the visibility of the control buttons (Auto-Scroll, Clear, Pause)
+        /// </summary>
+        [Category("NLogViewerControls")]
+        [Browsable(true)]
+        [Description("Show/hide the control buttons (Auto-Scroll, Clear, Pause)")]
+        public bool ShowControlButtons
+        {
+            get => (bool)GetValue(ShowControlButtonsProperty);
+            set => SetValue(ShowControlButtonsProperty, value);
+        }
+
+        /// <summary>
+        /// The <see cref="ShowControlButtons"/> DependencyProperty.
+        /// </summary>
+        public static readonly DependencyProperty ShowControlButtonsProperty = 
+            DependencyProperty.Register(nameof(ShowControlButtons), typeof(bool), typeof(NLogViewerBase), 
+                new PropertyMetadata(true));
+
+        #endregion
+
+        #endregion
+
+        // ##############################################################################################################################
+        // Properties
+        // ##############################################################################################################################
+
+        #region Properties
+
+        // ##########################################################################################
+        // Public Properties
+        // ##########################################################################################
+
+
+
+        // ##########################################################################################
+        // Private Properties
+        // ##########################################################################################
+
+        private readonly ObservableCollection<LogEventInfo> _internalLogEntries = new();
+        private ObservableCollection<LogEventInfo>? _collectionChangedSubscriber;
+        private Window? _ParentWindow;
+
+        // Store original column references and widths for restoration
+        private GridViewColumn _originalIdColumn;
+        private GridViewColumn _originalLevelColumn;
+        private GridViewColumn _originalTimeStampColumn;
+        private GridViewColumn _originalLoggerNameColumn;
+        private double _originalIdColumnWidth = 40;
+        private double _originalLevelColumnWidth = double.NaN; // Auto
+        private double _originalTimeStampColumnWidth = double.NaN; // Auto
+        private double _originalLoggerNameColumnWidth = double.NaN; // Auto
+
+        /// <summary>
+        /// Reference to the ListView template part for programmatic access
+        /// </summary>
+        private ListView PART_ListView => GetTemplateChild("PART_ListView") as ListView;
+
+        #endregion
+
+        // ##############################################################################################################################
+        // Collection / ItemsSource
+        // ##############################################################################################################################
+
+        /// <summary>
+        /// Returns the collection currently feeding <see cref="LogEvents"/> (external <see cref="ItemsSource"/> or the internal list).
+        /// </summary>
+        protected ObservableCollection<LogEventInfo> GetEffectiveEntries()
+            => ItemsSource ?? _internalLogEntries;
+
+        /// <summary>
+        /// Adds log entries on the UI thread batch path (used by <see cref="NLogViewer"/> when subscribing to <see cref="Targets.ICacheTarget"/>).
+        /// </summary>
+        protected internal void AppendLogEntriesBatch(IEnumerable<LogEventInfo> infos)
+        {
+            if (LogEvents == null)
+                return;
+
+            var coll = GetEffectiveEntries();
+            using (LogEvents.DeferRefresh())
+            {
+                foreach (var info in infos)
+                    coll.Add(info);
+                ApplyMaxCountTrim(coll);
+            }
+
+            if (AutoScroll)
+                PART_ListView?.ScrollToEnd();
+        }
+
+        private void SyncItemsSourceToView()
+        {
+            if (LogEvents != null)
+                LogEvents.Source = GetEffectiveEntries();
+
+            AttachEffectiveCollectionChangedHandler();
+            LogEvents?.View?.Refresh();
+            UpdateFilter();
+        }
+
+        private void AttachEffectiveCollectionChangedHandler()
+        {
+            var effective = GetEffectiveEntries();
+            if (_collectionChangedSubscriber == effective)
+                return;
+
+            if (_collectionChangedSubscriber != null)
+                _collectionChangedSubscriber.CollectionChanged -= OnLogEntriesCollectionChanged;
+
+            _collectionChangedSubscriber = effective;
+            _collectionChangedSubscriber.CollectionChanged += OnLogEntriesCollectionChanged;
+        }
+
+        private void OnLogEntriesCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (sender is not ObservableCollection<LogEventInfo> coll)
+                return;
+
+            if (e.Action is NotifyCollectionChangedAction.Add or NotifyCollectionChangedAction.Reset or NotifyCollectionChangedAction.Replace)
+                ApplyMaxCountTrim(coll);
+
+            if (AutoScroll)
+                PART_ListView?.ScrollToEnd();
+        }
+
+        private void ApplyMaxCountTrim(ObservableCollection<LogEventInfo> coll)
+        {
+            if (MaxCount < 0 || LogEvents == null)
+                return;
+
+            if (coll.Count - 100 <= MaxCount)
+                return;
+
+            using (LogEvents.DeferRefresh())
+            {
+                while (coll.Count > MaxCount)
+                    coll.RemoveAt(0);
+            }
+        }
+
+        // ##############################################################################################################################
+        // Constructor
+        // ##############################################################################################################################
+
+        #region Constructor
+
+        static NLogViewerBase()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(NLogViewerBase), new FrameworkPropertyMetadata(typeof(NLogViewerBase)));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the log viewer base control.
+        /// </summary>
+        public NLogViewerBase()
+        {
+            DataContext = this;
+
+            Uid = GetHashCode().ToString();
+
+            if (DesignerProperties.GetIsInDesignMode(this))
+                return;
+
+            LogEvents = new CollectionViewSource { Source = _internalLogEntries };
+            ActiveSearchTerms = new ObservableCollection<SearchTerm>();
+            UpdateFilter();
+
+            AttachEffectiveCollectionChangedHandler();
+
+            Loaded += _OnLoaded;
+            Unloaded += _OnUnloaded;
+
+            ClearCommand = new RelayCommand(() => GetEffectiveEntries().Clear());
+            AddSearchTermCommand = new RelayCommand(AddSearchTerm);
+            ClearAllSearchTermsCommand = new RelayCommand(ClearAllSearchTerms);
+            RemoveSearchTermCommand = new RelayCommand<SearchTerm>(RemoveSearchTerm);
+            AddRegexSearchTermCommand = new RelayCommand<string>(AddRegexSearchTerm);
+            AddRegexSearchTermExcludeCommand = new RelayCommand<string>(AddRegexSearchTermExclude);
+            EditSearchTermCommand = new RelayCommand<SearchTerm>(EditSearchTerm);
+            CopyToClipboardCommand = new RelayCommand<string>(CopyToClipboard);
+            ExportCommand = new RelayCommand<ExportParameter>(ExportLogs);
+            ScrollToEndCommand = new RelayCommand(() =>
+            {
+                PART_ListView?.ScrollToEnd();
+            });
+        }
+
+        private void _OnUnloaded(object sender, RoutedEventArgs e)
+        {
+            var window = _ParentWindow ?? Window.GetWindow(this);
+            if (window == null || window.FindChildByUid<NLogViewerBase>(Uid) == null)
+                DisposeViewerResources();
+        }
+
+        private void _ParentWindowOnClosed(object sender, EventArgs e)
+        {
+            DisposeViewerResources();
+        }
+
+        /// <summary>
+        /// Releases listener-specific resources (overridden by <see cref="NLogViewer"/> for cache subscription disposal).
+        /// </summary>
+        protected virtual void DisposeViewerResources()
+        {
+        }
+
+        private void _OnLoaded(object sender, RoutedEventArgs e)
+        {
+            Loaded -= _OnLoaded;
+
+            var window = Window.GetWindow(this);
+            if (_ParentWindow == null && window != null)
+            {
+                _ParentWindow = window;
+                _ParentWindow.Closed += _ParentWindowOnClosed;
+            }
+
+            PART_ListView?.ScrollToEnd();
+
+            if (PART_ListView?.View is AutoSizedGridView gridView)
+            {
+                if (gridView.Columns.Count > 0)
+                {
+                    _originalIdColumn = gridView.Columns[0];
+                    _originalIdColumnWidth = gridView.Columns[0].Width;
+                }
+
+                if (gridView.Columns.Count > 1)
+                {
+                    _originalLevelColumn = gridView.Columns[1];
+                    _originalLevelColumnWidth = gridView.Columns[1].Width;
+                }
+
+                if (gridView.Columns.Count > 2)
+                {
+                    _originalTimeStampColumn = gridView.Columns[2];
+                    _originalTimeStampColumnWidth = gridView.Columns[2].Width;
+                }
+
+                if (gridView.Columns.Count > 3)
+                {
+                    _originalLoggerNameColumn = gridView.Columns[3];
+                    _originalLoggerNameColumnWidth = gridView.Columns[3].Width;
+                }
+
+                UpdateColumnVisibility();
+            }
+
+            OnViewerLoaded();
+        }
+
+        /// <summary>
+        /// Called once after the template is applied and columns are initialized.
+        /// </summary>
+        protected virtual void OnViewerLoaded()
+        {
+        }
+
+        #endregion
+    }
+}
diff --git a/ui/Sentinel.NLogViewer.Wpf/Themes/Generic.xaml b/ui/Sentinel.NLogViewer.Wpf/Themes/Generic.xaml
index 09a6919..c234d96 100644
--- a/ui/Sentinel.NLogViewer.Wpf/Themes/Generic.xaml
+++ b/ui/Sentinel.NLogViewer.Wpf/Themes/Generic.xaml
@@ -13,10 +13,10 @@
     <xamlMultiValueConverter:ILogEventResolverToStringConverter x:Key="ILogEventResolverToStringConverter"/>
     <xamlConverter:ContextMenuHeaderConverter x:Key="ContextMenuHeaderConverter"/>
 
-    <Style TargetType="{x:Type local:NLogViewer}">
+    <Style TargetType="{x:Type local:NLogViewerBase}">
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:NLogViewer}">
+                <ControlTemplate TargetType="{x:Type local:NLogViewerBase}">
                     <Grid>
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto"/>
@@ -198,22 +198,22 @@
                                         <ItemsControl.Resources>
                                             <!-- Template for plain text terms -->
                                             <DataTemplate DataType="{x:Type local:TextSearchTerm}">
-                                                <Border Background="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewer}, Path=TextSearchTermBackground}" 
-                                                        BorderBrush="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewer}, Path=TextSearchTermBorderBrush}" 
+                                                <Border Background="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewerBase}, Path=TextSearchTermBackground}" 
+                                                        BorderBrush="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewerBase}, Path=TextSearchTermBorderBrush}" 
                                                         BorderThickness="1" 
                                                         CornerRadius="3" 
                                                         Margin="2" 
                                                         Padding="4,2">
                                                     <StackPanel Orientation="Horizontal">
                                                         <TextBlock Text="{Binding Text}" Margin="0,0,4,0" 
-                                                                   Foreground="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewer}, Path=TextSearchTermForeground}"/>
+                                                                   Foreground="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewerBase}, Path=TextSearchTermForeground}"/>
                                                         <Button Content="✏" 
                                                                 Width="16" 
                                                                 Height="16" 
                                                                 FontSize="10" 
                                                                 Padding="0" 
                                                                 Margin="0,0,2,0"
-                                                                Command="{Binding EditSearchTermCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewer}}"
+                                                                Command="{Binding EditSearchTermCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewerBase}}"
                                                                 CommandParameter="{Binding}"
                                                                 ToolTip="Edit search term"/>
                                                         <Button Content="×" 
@@ -222,7 +222,7 @@
                                                                 FontSize="10" 
                                                                 Padding="0" 
                                                                 Margin="0"
-                                                                Command="{Binding RemoveSearchTermCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewer}}"
+                                                                Command="{Binding RemoveSearchTermCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewerBase}}"
                                                                 CommandParameter="{Binding}"
                                                                 ToolTip="Remove search term"/>
                                                     </StackPanel>
@@ -231,24 +231,24 @@
 
                                             <!-- Template for regex terms -->
                                             <DataTemplate DataType="{x:Type local:RegexSearchTerm}">
-                                                <Border Background="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewer}, Path=RegexSearchTermBackground}" 
-                                                        BorderBrush="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewer}, Path=RegexSearchTermBorderBrush}" 
+                                                <Border Background="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewerBase}, Path=RegexSearchTermBackground}" 
+                                                        BorderBrush="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewerBase}, Path=RegexSearchTermBorderBrush}" 
                                                         BorderThickness="1" 
                                                         CornerRadius="3" 
                                                         Margin="2" 
                                                         Padding="4,2">
                                                     <StackPanel Orientation="Horizontal">
                                                         <TextBlock Text="Regex:" FontWeight="Bold" Margin="0,0,4,0"
-                                                                   Foreground="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewer}, Path=RegexPrefixForeground}"/>
+                                                                   Foreground="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewerBase}, Path=RegexPrefixForeground}"/>
                                                         <TextBlock Text="{Binding Text}" Margin="0,0,4,0"
-                                                                   Foreground="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewer}, Path=RegexSearchTermForeground}"/>
+                                                                   Foreground="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewerBase}, Path=RegexSearchTermForeground}"/>
                                                         <Button Content="✏" 
                                                                 Width="16" 
                                                                 Height="16" 
                                                                 FontSize="10" 
                                                                 Padding="0" 
                                                                 Margin="0,0,2,0"
-                                                                Command="{Binding EditSearchTermCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewer}}"
+                                                                Command="{Binding EditSearchTermCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewerBase}}"
                                                                 CommandParameter="{Binding}"
                                                                 ToolTip="Edit search term"/>
                                                         <Button Content="×" 
@@ -257,7 +257,7 @@
                                                                 FontSize="10" 
                                                                 Padding="0" 
                                                                 Margin="0"
-                                                                Command="{Binding RemoveSearchTermCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewer}}"
+                                                                Command="{Binding RemoveSearchTermCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewerBase}}"
                                                                 CommandParameter="{Binding}"
                                                                 ToolTip="Remove search term"/>
                                                     </StackPanel>
@@ -284,44 +284,44 @@
                                         <DataTrigger Binding="{Binding Path=Level}"
                                                      Value="{x:Static nLog:LogLevel.Trace}">
                                             <Setter Property="Background"
-                                                    Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewer}, Path=TraceBackground}" />
+                                                    Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewerBase}, Path=TraceBackground}" />
                                             <Setter Property="Foreground"
-                                                    Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewer}, Path=TraceForeground}" />
+                                                    Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewerBase}, Path=TraceForeground}" />
                                         </DataTrigger>
                                         <DataTrigger Binding="{Binding Path=Level}"
                                                      Value="{x:Static nLog:LogLevel.Debug}">
                                             <Setter Property="Foreground"
-                                                    Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewer}, Path=DebugForeground}" />
+                                                    Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewerBase}, Path=DebugForeground}" />
                                             <Setter Property="Background"
-                                                    Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewer}, Path=DebugBackground}" />
+                                                    Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewerBase}, Path=DebugBackground}" />
                                         </DataTrigger>
                                         <DataTrigger Binding="{Binding Path=Level}"
                                                      Value="{x:Static nLog:LogLevel.Info}">
                                             <Setter Property="Foreground"
-                                                    Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewer}, Path=InfoForeground}" />
+                                                    Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewerBase}, Path=InfoForeground}" />
                                             <Setter Property="Background"
-                                                    Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewer}, Path=InfoBackground}" />
+                                                    Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewerBase}, Path=InfoBackground}" />
                                         </DataTrigger>
                                         <DataTrigger Binding="{Binding Path=Level}"
                                                      Value="{x:Static nLog:LogLevel.Warn}">
                                             <Setter Property="Foreground"
-                                                    Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewer}, Path=WarnForeground}" />
+                                                    Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewerBase}, Path=WarnForeground}" />
                                             <Setter Property="Background"
-                                                    Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewer}, Path=WarnBackground}" />
+                                                    Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewerBase}, Path=WarnBackground}" />
                                         </DataTrigger>
                                         <DataTrigger Binding="{Binding Path=Level}"
                                                      Value="{x:Static nLog:LogLevel.Error}">
                                             <Setter Property="Foreground"
-                                                    Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewer}, Path=ErrorForeground}" />
+                                                    Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewerBase}, Path=ErrorForeground}" />
                                             <Setter Property="Background"
-                                                    Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewer}, Path=ErrorBackground}" />
+                                                    Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewerBase}, Path=ErrorBackground}" />
                                         </DataTrigger>
                                         <DataTrigger Binding="{Binding Path=Level}"
                                                      Value="{x:Static nLog:LogLevel.Fatal}">
                                             <Setter Property="Foreground"
-                                                    Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewer}, Path=FatalForeground}" />
+                                                    Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewerBase}, Path=FatalForeground}" />
                                             <Setter Property="Background"
-                                                    Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewer}, Path=FatalBackground}" />
+                                                    Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewerBase}, Path=FatalBackground}" />
                                         </DataTrigger>
                                     </Style.Triggers>
                                 </Style>
@@ -332,7 +332,7 @@
                                         <GridViewColumn.DisplayMemberBinding>
                                             <MultiBinding Converter="{StaticResource ILogEventResolverToStringConverter}">
                                                 <Binding Path="."/>
-                                                <Binding RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewer}" Path="IdResolver"/>
+                                                <Binding RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewerBase}" Path="IdResolver"/>
                                             </MultiBinding>
                                         </GridViewColumn.DisplayMemberBinding>
                                     </GridViewColumn>
@@ -380,7 +380,7 @@
                                         <GridViewColumn.DisplayMemberBinding>
                                             <MultiBinding Converter="{StaticResource ILogEventResolverToStringConverter}">
                                                 <Binding Path="."/>
-                                                <Binding RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewer}" Path="TimeStampResolver"/>
+                                                <Binding RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewerBase}" Path="TimeStampResolver"/>
                                             </MultiBinding>
                                         </GridViewColumn.DisplayMemberBinding>
                                     </GridViewColumn>
@@ -388,10 +388,10 @@
                                         <GridViewColumn.CellTemplate>
                                             <DataTemplate>
                                                 <TextBlock
-                                                    helper:MessageHighlighter.Resolver="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewer}, Path=LoggerNameResolver}"
+                                                    helper:MessageHighlighter.Resolver="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewerBase}, Path=LoggerNameResolver}"
                                                     Background="Transparent"
                                                     TextWrapping="Wrap"
-                                                    Tag="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewer}}"
+                                                    Tag="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewerBase}}"
                                                     Foreground="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ListViewItem}, Path=Foreground}">
                                                     <TextBlock.ContextMenu>
                                                         <ContextMenu>
@@ -439,10 +439,10 @@
                                             <DataTemplate>
                                                 <TextBlock
                                                     x:Name="TextBlock1"
-                                                    helper:MessageHighlighter.Resolver="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewer}, Path=MessageResolver}"
+                                                    helper:MessageHighlighter.Resolver="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewerBase}, Path=MessageResolver}"
                                                     Background="Transparent"
                                                     TextWrapping="Wrap"
-                                                    Tag="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewer}}"
+                                                    Tag="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:NLogViewerBase}}"
                                                     Foreground="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ListViewItem}, Path=Foreground}">
                                                     <TextBlock.ContextMenu>
                                                         <ContextMenu>