diff --git a/DiffPlex.Wpf.Demo/MainWindow.xaml b/DiffPlex.Wpf.Demo/MainWindow.xaml
index bf0dd294..c6e5f360 100644
--- a/DiffPlex.Wpf.Demo/MainWindow.xaml
+++ b/DiffPlex.Wpf.Demo/MainWindow.xaml
@@ -19,6 +19,7 @@
             <Button Width="100" Height="20" x:Name="DiffButton" Content="Switch Mode" Click="DiffButton_Click" BorderBrush="{x:Null}" BorderThickness="0" Margin="16,0,1,0" />
             <Button Width="20" Height="20" x:Name="FutherActionsButton" Content="…" Click="FutherActionsButton_Click" BorderBrush="{x:Null}" BorderThickness="0" Margin="0,0,31,0" />
             <CheckBox Width="120" Height="20" VerticalContentAlignment="Center" IsChecked="{Binding IsSideBySide, ElementName=DiffView}" Content="Is_SideBySide" Foreground="{Binding Foreground, ElementName=DiffView}" />
+            <CheckBox Width="120" Height="20" VerticalContentAlignment="Center" IsChecked="{Binding IsTextWrapEnabled, ElementName=DiffView}" Content="Is_Wrapped" Foreground="{Binding Foreground, ElementName=DiffView}" />
             <CheckBox Height="20" VerticalContentAlignment="Center" x:Name="IgnoreUnchangedCheckBox" IsChecked="{Binding IgnoreUnchanged, ElementName=DiffView}" Content="IgnoreUnchanged" Margin="0,0,24,0" Foreground="{Binding Foreground, ElementName=DiffView}" />
             <Label Height="20" VerticalContentAlignment="Center" Padding="0,0,8,0" x:Name="MarginLineCountLabel" Target="{Binding ElementName=MarginLineCount}" Foreground="{Binding Foreground, ElementName=DiffView}">LinesContext</Label>
             <TextBox Width="100" Height="20" VerticalContentAlignment="Center" x:Name="MarginLineCount" Padding="8,0,8,0" Text="{Binding LinesContext, ElementName=DiffView, UpdateSourceTrigger=PropertyChanged}" Foreground="{Binding Foreground, ElementName=DiffView}" Background="{x:Null}" Margin="0,0,32,0" />
diff --git a/DiffPlex.Wpf/Controls/BooleanToScrollBarVisibilityConverter.cs b/DiffPlex.Wpf/Controls/BooleanToScrollBarVisibilityConverter.cs
new file mode 100644
index 00000000..cfc1be80
--- /dev/null
+++ b/DiffPlex.Wpf/Controls/BooleanToScrollBarVisibilityConverter.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Globalization;
+using System.Windows.Controls;
+using System.Windows.Data;
+
+namespace DiffPlex.Wpf.Controls
+{
+    public class BooleanToScrollBarVisibilityConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is bool isTextWrapEnabled)
+            {
+                return isTextWrapEnabled ? ScrollBarVisibility.Hidden : ScrollBarVisibility.Auto;
+            }
+            return ScrollBarVisibility.Auto;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/DiffPlex.Wpf/Controls/DiffViewer.xaml b/DiffPlex.Wpf/Controls/DiffViewer.xaml
index 2dbeb933..84950593 100644
--- a/DiffPlex.Wpf/Controls/DiffViewer.xaml
+++ b/DiffPlex.Wpf/Controls/DiffViewer.xaml
@@ -129,4 +129,4 @@
         <TextBlock x:Name="RightHeaderText" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="1" Grid.Column="1" />
         <local:InternalLinesViewer x:Name="RightContentPanel" ScrollChanged="RightContentPanel_ScrollChanged" Grid.Row="2" Grid.Column="1" />
     </Grid>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/DiffPlex.Wpf/Controls/DiffViewer.xaml.cs b/DiffPlex.Wpf/Controls/DiffViewer.xaml.cs
index eda23517..1272c897 100644
--- a/DiffPlex.Wpf/Controls/DiffViewer.xaml.cs
+++ b/DiffPlex.Wpf/Controls/DiffViewer.xaml.cs
@@ -27,7 +27,7 @@ namespace DiffPlex.Wpf.Controls;
 /// <summary>
 /// The diff control for text.
 /// </summary>
-public partial class DiffViewer : UserControl
+public partial class DiffViewer : UserControl, IDiffViewer
 {
     /// <summary>
     /// The event arguments of view mode changed.
@@ -80,6 +80,11 @@ public ViewModeChangedEventArgs(bool isSideBySide)
     /// </summary>
     public static readonly DependencyProperty LineNumberForegroundProperty = RegisterDependencyProperty<Brush>(nameof(LineNumberForeground), new SolidColorBrush(Color.FromArgb(255, 64, 128, 160)));
 
+    /// <summary>
+    /// The property of text wrapping state.
+    /// </summary>
+    public static readonly DependencyProperty IsTextWrapEnabledProperty = RegisterRefreshDependencyProperty(nameof(IsTextWrapEnabled), false);
+
     /// <summary>
     /// The property of line number width.
     /// </summary>
@@ -651,6 +656,17 @@ public int LinesContext
         set => SetValue(LinesContextProperty, value);
     }
 
+    /// <summary>
+    /// Gets or sets the value indicating whether is wrap text.
+    /// </summary>
+    [Bindable(true)]
+    [Category("Appearance")]
+    public bool IsTextWrapEnabled
+    {
+        get => (bool)GetValue(IsTextWrapEnabledProperty);
+        set => SetValue(IsTextWrapEnabledProperty, value);
+    }
+
     /// <summary>
     /// Gets or sets the display name of inline mode toggle.
     /// </summary>
@@ -1142,7 +1158,7 @@ private void RenderSideBySideDiffs()
         var m = sideBySideResult;
         CollapseUnchangedSectionsToggle.IsChecked = IgnoreUnchanged;
         if (m == null) return;
-        var contextLineCount = IgnoreUnchanged ? LinesContext: -1;
+        var contextLineCount = IgnoreUnchanged ? LinesContext : -1;
         Helper.InsertLines(LeftContentPanel, m.OldText?.Lines, true, this, contextLineCount);
         Helper.InsertLines(RightContentPanel, m.NewText.Lines, false, this, contextLineCount);
     }
@@ -1306,6 +1322,13 @@ public DiffPiece NextDiff()
         return line;
     }
 
+    public void ToggleTextWrapping()
+    {
+       IsTextWrapEnabled = !IsTextWrapEnabled; 
+
+        this.Refresh();
+    }
+
     private string GenerateHeader(FileInfo file)
     {
         if (file == null || !file.Exists) return Resource.Empty;
@@ -1488,4 +1511,4 @@ private static DependencyProperty RegisterRefreshDependencyProperty<T>(string na
             c.Refresh();
         }));
     }
-}
+}
\ No newline at end of file
diff --git a/DiffPlex.Wpf/Controls/Helper.cs b/DiffPlex.Wpf/Controls/Helper.cs
index 47723981..14f0ac5f 100644
--- a/DiffPlex.Wpf/Controls/Helper.cs
+++ b/DiffPlex.Wpf/Controls/Helper.cs
@@ -38,9 +38,11 @@ internal static class Helper
     /// <summary>
     /// Updates the inline diffs view.
     /// </summary>
-    internal static void RenderInlineDiffs(InternalLinesViewer viewer, ICollection<DiffPiece> lines, UIElement source, int contextLineCount)
+    internal static void RenderInlineDiffs(InternalLinesViewer viewer, ICollection<DiffPiece> lines, IDiffViewer source, int contextLineCount)
     {
         viewer.Clear();
+        var diffViewer = source as DiffViewer;
+
         if (lines == null) return;
         if (lines.Any() == false) return;
         var disableSubPieces = lines.Count > MaxCount;    // For performance.
@@ -50,6 +52,7 @@ internal static void RenderInlineDiffs(InternalLinesViewer viewer, ICollection<D
             {
                 var c = viewer.Add(null, null, null as string, ChangeType.Unchanged.ToString(), source);
                 c.Tag = line;
+
                 continue;
             }
 
@@ -65,8 +68,10 @@ internal static void RenderInlineDiffs(InternalLinesViewer viewer, ICollection<D
                     if (line.SubPieces != null && line.SubPieces.Count > 1 && !disableSubPieces)
                     {
                         var details = GetSubPiecesInfo(line, true);
+
                         var c = viewer.Add(line.Position, "+", details, changeType.ToString(), source);
                         c.Tag = line;
+
                         hasAdded = true;
                     }
 
@@ -75,8 +80,10 @@ internal static void RenderInlineDiffs(InternalLinesViewer viewer, ICollection<D
                     if (line.SubPieces != null && line.SubPieces.Count > 1 && !disableSubPieces)
                     {
                         var details = GetSubPiecesInfo(line, false);
+
                         var c = viewer.Add(line.Position, "-", details, changeType.ToString(), source);
                         c.Tag = line;
+
                         hasAdded = true;
                     }
 
@@ -105,7 +112,7 @@ internal static void RenderInlineDiffs(InternalLinesViewer viewer, ICollection<D
         viewer.AdjustScrollView();
     }
 
-    internal static void InsertLines(InternalLinesViewer panel, List<DiffPiece> lines, bool isOld, UIElement source, int contextLineCount)
+    internal static void InsertLines(InternalLinesViewer panel, List<DiffPiece> lines, bool isOld, IDiffViewer source, int contextLineCount)
     {
         if (lines == null || panel == null) return;
         var guid = panel.TrackingId = Guid.NewGuid();
@@ -119,7 +126,7 @@ internal static void InsertLines(InternalLinesViewer panel, List<DiffPiece> line
         _ = InsertLinesAsync(guid, panel, lines, isOld, source, contextLineCount);
     }
 
-    private static async Task InsertLinesAsync(Guid guid, InternalLinesViewer panel, List<DiffPiece> lines, bool isOld, UIElement source, int contextLineCount)
+    private static async Task InsertLinesAsync(Guid guid, InternalLinesViewer panel, List<DiffPiece> lines, bool isOld, IDiffViewer source, int contextLineCount)
     {   // For performance.
         if (lines == null || panel == null) return;
         var disablePieces = lines.Count > MaxCount;
@@ -231,7 +238,7 @@ internal static bool GoTo(InternalLinesViewer panel, int lineIndex)
         catch (InvalidOperationException)
         {
         }
-        
+
         return false;
     }
 
@@ -476,14 +483,17 @@ private static List<KeyValuePair<string, string>> GetSubPiecesInfo(DiffPiece lin
         return details;
     }
 
-    private static void InsertLinesInteral(InternalLinesViewer panel, List<DiffPiece> lines, bool isOld, UIElement source, bool disableSubPieces = false)
+    private static void InsertLinesInteral(InternalLinesViewer panel, List<DiffPiece> lines, bool isOld, IDiffViewer source, bool disableSubPieces = false)
     {
+        var diffViewer = source as DiffViewer;
+
         foreach (var line in lines)
         {
             if (line == null)
             {
                 var c = panel.Add(null, null, null as string, ChangeType.Unchanged.ToString(), source);
                 c.Tag = line;
+
                 continue;
             }
 
@@ -497,8 +507,10 @@ private static void InsertLinesInteral(InternalLinesViewer panel, List<DiffPiece
                     if (line.SubPieces != null && line.SubPieces.Count > 1 && !disableSubPieces)
                     {
                         var details = GetSubPiecesInfo(line, isOld);
+
                         var c = panel.Add(line.Position, isOld ? "-" : "+", details, changeType.ToString(), source);
                         c.Tag = line;
+
                         hasAdded = true;
                     }
 
@@ -527,4 +539,4 @@ private static void InsertLinesInteral(InternalLinesViewer panel, List<DiffPiece
 
         panel.AdjustScrollView();
     }
-}
+}
\ No newline at end of file
diff --git a/DiffPlex.Wpf/Controls/IDiffViewer.cs b/DiffPlex.Wpf/Controls/IDiffViewer.cs
new file mode 100644
index 00000000..ec9738c0
--- /dev/null
+++ b/DiffPlex.Wpf/Controls/IDiffViewer.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+
+namespace DiffPlex.Wpf.Controls
+{
+    public interface IDiffViewer
+    {
+        bool IsTextWrapEnabled { get; set; }
+    }
+
+}
diff --git a/DiffPlex.Wpf/Controls/InlineDiffViewer.xaml.cs b/DiffPlex.Wpf/Controls/InlineDiffViewer.xaml.cs
index 85b11c98..0a55b723 100644
--- a/DiffPlex.Wpf/Controls/InlineDiffViewer.xaml.cs
+++ b/DiffPlex.Wpf/Controls/InlineDiffViewer.xaml.cs
@@ -24,7 +24,7 @@ namespace DiffPlex.Wpf.Controls;
 /// The inline diff control for text.
 /// Interaction logic for InlineDiffViewer.xaml
 /// </summary>
-public partial class InlineDiffViewer : UserControl
+public partial class InlineDiffViewer : UserControl, IDiffViewer
 {
     /// <summary>
     /// The property of diff model.
@@ -58,6 +58,11 @@ public partial class InlineDiffViewer : UserControl
         c.ContentPanel.LineNumberWidth = n;
     });
 
+    /// <summary>
+    /// The property of text wrapping state.
+    /// </summary>
+    public static readonly DependencyProperty IsTextWrapEnabledProperty = RegisterDependencyProperty(nameof(IsTextWrapEnabled), false);
+
     /// <summary>
     /// The property of change type symbol foreground brush.
     /// </summary>
@@ -339,6 +344,14 @@ public int LinesContext
         set => SetValue(LinesContextProperty, value);
     }
 
+    [Bindable(true)]
+    [Category("Appearance")]
+    public bool IsTextWrapEnabled
+    {
+        get => (bool)GetValue(IsTextWrapEnabledProperty);
+        set => SetValue(IsTextWrapEnabledProperty, value);
+    }
+
     /// <summary>
     /// Sets a new diff model.
     /// </summary>
diff --git a/DiffPlex.Wpf/Controls/InternalLinesViewer.xaml b/DiffPlex.Wpf/Controls/InternalLinesViewer.xaml
index 440f5f3d..f844d0f8 100644
--- a/DiffPlex.Wpf/Controls/InternalLinesViewer.xaml
+++ b/DiffPlex.Wpf/Controls/InternalLinesViewer.xaml
@@ -1,126 +1,199 @@
-<UserControl x:Class="DiffPlex.Wpf.Controls.InternalLinesViewer"
-             x:ClassModifier="internal"
-             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" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:DiffPlex.Wpf.Controls"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
+<UserControl
+    x:Class="DiffPlex.Wpf.Controls.InternalLinesViewer"
+    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:local="clr-namespace:DiffPlex.Wpf.Controls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    x:ClassModifier="internal"
+    mc:Ignorable="d">
     <UserControl.Resources>
+        <local:BooleanToScrollBarVisibilityConverter x:Key="BooleanToScrollBarVisibilityConverter" />
         <ControlTemplate x:Key="LocalScrollViewerTemplate" TargetType="{x:Type ScrollViewer}">
             <Grid x:Name="Grid" Background="{TemplateBinding Background}">
-                <ScrollContentPresenter x:Name="PART_ScrollContentPresenter" CanContentScroll="{TemplateBinding CanContentScroll}" CanHorizontallyScroll="False" CanVerticallyScroll="False" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="0" Margin="{TemplateBinding Padding}" Grid.Row="0"/>
-                <ScrollBar x:Name="PART_VerticalScrollBar" AutomationProperties.AutomationId="VerticalScrollBar" Cursor="Arrow" HorizontalAlignment="Right" Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}" Style="{DynamicResource LocalScrollBarStyle}" Background="#99808080" BorderBrush="#99808080" Foreground="#FF808080"/>
-                <ScrollBar x:Name="PART_HorizontalScrollBar" AutomationProperties.AutomationId="HorizontalScrollBar" Cursor="Arrow" VerticalAlignment="Bottom" Margin="0,0,20,0" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}" Style="{DynamicResource LocalScrollBarStyle}" Background="#99808080" BorderBrush="#99808080" Foreground="#FF808080"/>
+                <ScrollContentPresenter
+                    x:Name="PART_ScrollContentPresenter"
+                    Grid.Row="0"
+                    Grid.Column="0"
+                    Margin="{TemplateBinding Padding}"
+                    CanContentScroll="{TemplateBinding CanContentScroll}"
+                    CanHorizontallyScroll="False"
+                    CanVerticallyScroll="False"
+                    Content="{TemplateBinding Content}"
+                    ContentTemplate="{TemplateBinding ContentTemplate}" />
+                <ScrollBar
+                    x:Name="PART_VerticalScrollBar"
+                    HorizontalAlignment="Right"
+                    AutomationProperties.AutomationId="VerticalScrollBar"
+                    Background="#99808080"
+                    BorderBrush="#99808080"
+                    Cursor="Arrow"
+                    Foreground="#FF808080"
+                    Maximum="{TemplateBinding ScrollableHeight}"
+                    Minimum="0"
+                    Style="{DynamicResource LocalScrollBarStyle}"
+                    ViewportSize="{TemplateBinding ViewportHeight}"
+                    Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"
+                    Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" />
+                <ScrollBar
+                    x:Name="PART_HorizontalScrollBar"
+                    Margin="0,0,20,0"
+                    VerticalAlignment="Bottom"
+                    AutomationProperties.AutomationId="HorizontalScrollBar"
+                    Background="#99808080"
+                    BorderBrush="#99808080"
+                    Cursor="Arrow"
+                    Foreground="#FF808080"
+                    Maximum="{TemplateBinding ScrollableWidth}"
+                    Minimum="0"
+                    Orientation="Horizontal"
+                    Style="{DynamicResource LocalScrollBarStyle}"
+                    ViewportSize="{TemplateBinding ViewportWidth}"
+                    Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"
+                    Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" />
             </Grid>
         </ControlTemplate>
         <Style x:Key="ScrollBarButton" TargetType="{x:Type RepeatButton}">
-            <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="HorizontalContentAlignment" Value="Center"/>
-            <Setter Property="VerticalContentAlignment" Value="Center"/>
-            <Setter Property="Padding" Value="1"/>
-            <Setter Property="Focusable" Value="false"/>
-            <Setter Property="IsTabStop" Value="false"/>
+            <Setter Property="BorderThickness" Value="1" />
+            <Setter Property="HorizontalContentAlignment" Value="Center" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="Padding" Value="1" />
+            <Setter Property="Focusable" Value="false" />
+            <Setter Property="IsTabStop" Value="false" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type RepeatButton}">
-                        <Grid x:Name="grid" HorizontalAlignment="Stretch" Height="Auto" Margin="0" VerticalAlignment="Stretch" Opacity="0.6">
+                        <Grid
+                            x:Name="grid"
+                            Height="Auto"
+                            Margin="0"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Stretch"
+                            Opacity="0.6">
+                            <Rectangle
+                                x:Name="rectangle"
+                                Width="Auto"
+                                Height="Auto"
+                                Margin="0"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                Fill="{TemplateBinding Background}"
+                                Opacity="0"
+                                RadiusX="8"
+                                RadiusY="8" />
+                            <ContentPresenter
+                                x:Name="contentPresenter"
+                                Margin="0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                Focusable="False" />
                             <VisualStateManager.VisualStateGroups>
                                 <VisualStateGroup x:Name="CommonStates">
                                     <VisualState x:Name="Normal">
                                         <Storyboard>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="rectangle">
-                                                <EasingDoubleKeyFrame KeyTime="0:0:0.4" Value="0"/>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="rectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                                <EasingDoubleKeyFrame KeyTime="0:0:0.4" Value="0" />
                                             </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="grid">
-                                                <EasingDoubleKeyFrame KeyTime="0:0:0.4" Value="0.8"/>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="grid" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                                <EasingDoubleKeyFrame KeyTime="0:0:0.4" Value="0.8" />
                                             </DoubleAnimationUsingKeyFrames>
                                         </Storyboard>
                                     </VisualState>
                                     <VisualState x:Name="MouseOver">
                                         <Storyboard>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="rectangle">
-                                                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="0.2"/>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="rectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="0.2" />
                                             </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="grid">
-                                                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="1"/>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="grid" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="1" />
                                             </DoubleAnimationUsingKeyFrames>
                                         </Storyboard>
                                     </VisualState>
                                     <VisualState x:Name="Pressed">
                                         <Storyboard>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="rectangle">
-                                                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="0.4"/>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="rectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="0.4" />
                                             </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="grid">
-                                                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="0.9"/>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="grid" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="0.9" />
                                             </DoubleAnimationUsingKeyFrames>
                                         </Storyboard>
                                     </VisualState>
                                     <VisualState x:Name="Disabled">
                                         <Storyboard>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="grid">
-                                                <EasingDoubleKeyFrame KeyTime="0:0:0.6" Value="0.4"/>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="grid" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                                <EasingDoubleKeyFrame KeyTime="0:0:0.6" Value="0.4" />
                                             </DoubleAnimationUsingKeyFrames>
                                         </Storyboard>
                                     </VisualState>
                                 </VisualStateGroup>
                             </VisualStateManager.VisualStateGroups>
-                            <Rectangle x:Name="rectangle" Fill="{TemplateBinding Background}" HorizontalAlignment="Stretch" Height="Auto" Margin="0" RadiusY="8" RadiusX="8" VerticalAlignment="Stretch" Width="Auto" Opacity="0"/>
-                            <ContentPresenter x:Name="contentPresenter" Focusable="False" Margin="0" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                         </Grid>
                     </ControlTemplate>
                 </Setter.Value>
             </Setter>
         </Style>
         <Style x:Key="RepeatButtonTransparent" TargetType="{x:Type RepeatButton}">
-            <Setter Property="OverridesDefaultStyle" Value="true"/>
-            <Setter Property="Background" Value="Transparent"/>
-            <Setter Property="Focusable" Value="false"/>
-            <Setter Property="IsTabStop" Value="false"/>
+            <Setter Property="OverridesDefaultStyle" Value="true" />
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="Focusable" Value="false" />
+            <Setter Property="IsTabStop" Value="false" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type RepeatButton}">
-                        <Rectangle Fill="{TemplateBinding Background}" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}"/>
+                        <Rectangle
+                            Width="{TemplateBinding Width}"
+                            Height="{TemplateBinding Height}"
+                            Fill="{TemplateBinding Background}" />
                     </ControlTemplate>
                 </Setter.Value>
             </Setter>
         </Style>
         <Style x:Key="ScrollBarThumbVertical" TargetType="{x:Type Thumb}">
-            <Setter Property="OverridesDefaultStyle" Value="true"/>
-            <Setter Property="IsTabStop" Value="false"/>
+            <Setter Property="OverridesDefaultStyle" Value="true" />
+            <Setter Property="IsTabStop" Value="false" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type Thumb}">
-                        <Rectangle x:Name="rectangle" Fill="{TemplateBinding Foreground}" Height="{TemplateBinding Height}" StrokeThickness="0" SnapsToDevicePixels="True" Width="{TemplateBinding Width}" Opacity="0.3" RadiusX="8" RadiusY="4">
+                        <Rectangle
+                            x:Name="rectangle"
+                            Width="{TemplateBinding Width}"
+                            Height="{TemplateBinding Height}"
+                            Fill="{TemplateBinding Foreground}"
+                            Opacity="0.3"
+                            RadiusX="8"
+                            RadiusY="4"
+                            SnapsToDevicePixels="True"
+                            StrokeThickness="0">
                             <VisualStateManager.VisualStateGroups>
                                 <VisualStateGroup x:Name="CommonStates">
                                     <VisualState x:Name="Normal">
                                         <Storyboard>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="rectangle">
-                                                <EasingDoubleKeyFrame KeyTime="0:0:0.4" Value="0.6"/>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="rectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                                <EasingDoubleKeyFrame KeyTime="0:0:0.4" Value="0.6" />
                                             </DoubleAnimationUsingKeyFrames>
                                         </Storyboard>
                                     </VisualState>
                                     <VisualState x:Name="MouseOver">
                                         <Storyboard>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="rectangle">
-                                                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="1"/>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="rectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="1" />
                                             </DoubleAnimationUsingKeyFrames>
                                         </Storyboard>
                                     </VisualState>
                                     <VisualState x:Name="Pressed">
                                         <Storyboard>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="rectangle">
-                                                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="0.8"/>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="rectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="0.8" />
                                             </DoubleAnimationUsingKeyFrames>
                                         </Storyboard>
                                     </VisualState>
                                     <VisualState x:Name="Disabled">
                                         <Storyboard>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="rectangle">
-                                                <EasingDoubleKeyFrame KeyTime="0:0:0.4" Value="0.3"/>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="rectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                                <EasingDoubleKeyFrame KeyTime="0:0:0.4" Value="0.3" />
                                             </DoubleAnimationUsingKeyFrames>
                                         </Storyboard>
                                     </VisualState>
@@ -132,39 +205,48 @@
             </Setter>
         </Style>
         <Style x:Key="ScrollBarThumbHorizontal" TargetType="{x:Type Thumb}">
-            <Setter Property="OverridesDefaultStyle" Value="true"/>
-            <Setter Property="IsTabStop" Value="false"/>
+            <Setter Property="OverridesDefaultStyle" Value="true" />
+            <Setter Property="IsTabStop" Value="false" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type Thumb}">
-                        <Rectangle x:Name="rectangle" Fill="{TemplateBinding Foreground}" Height="{TemplateBinding Height}" SnapsToDevicePixels="True" Width="{TemplateBinding Width}" StrokeThickness="0" Opacity="0.3" RadiusX="4" RadiusY="8">
+                        <Rectangle
+                            x:Name="rectangle"
+                            Width="{TemplateBinding Width}"
+                            Height="{TemplateBinding Height}"
+                            Fill="{TemplateBinding Foreground}"
+                            Opacity="0.3"
+                            RadiusX="4"
+                            RadiusY="8"
+                            SnapsToDevicePixels="True"
+                            StrokeThickness="0">
                             <VisualStateManager.VisualStateGroups>
                                 <VisualStateGroup x:Name="CommonStates">
                                     <VisualState x:Name="Normal">
                                         <Storyboard>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="rectangle">
-                                                <EasingDoubleKeyFrame KeyTime="0:0:0.4" Value="0.6"/>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="rectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                                <EasingDoubleKeyFrame KeyTime="0:0:0.4" Value="0.6" />
                                             </DoubleAnimationUsingKeyFrames>
                                         </Storyboard>
                                     </VisualState>
                                     <VisualState x:Name="MouseOver">
                                         <Storyboard>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="rectangle">
-                                                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="1"/>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="rectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="1" />
                                             </DoubleAnimationUsingKeyFrames>
                                         </Storyboard>
                                     </VisualState>
                                     <VisualState x:Name="Pressed">
                                         <Storyboard>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="rectangle">
-                                                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="0.8"/>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="rectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="0.8" />
                                             </DoubleAnimationUsingKeyFrames>
                                         </Storyboard>
                                     </VisualState>
                                     <VisualState x:Name="Disabled">
                                         <Storyboard>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="rectangle">
-                                                <EasingDoubleKeyFrame KeyTime="0:0:0.6" Value="0.3"/>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="rectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                                <EasingDoubleKeyFrame KeyTime="0:0:0.6" Value="0.3" />
                                             </DoubleAnimationUsingKeyFrames>
                                         </Storyboard>
                                     </VisualState>
@@ -176,40 +258,71 @@
             </Setter>
         </Style>
         <Style x:Key="LocalScrollBarStyle" TargetType="{x:Type ScrollBar}">
-            <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false"/>
-            <Setter Property="Stylus.IsFlicksEnabled" Value="false"/>
-            <Setter Property="Background" Value="#44808080"/>
-            <Setter Property="BorderBrush" Value="#44808080"/>
-            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
-            <Setter Property="BorderThickness" Value="1,0"/>
-            <Setter Property="Width" Value="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}"/>
-            <Setter Property="MinWidth" Value="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}"/>
+            <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
+            <Setter Property="Stylus.IsFlicksEnabled" Value="false" />
+            <Setter Property="Background" Value="#44808080" />
+            <Setter Property="BorderBrush" Value="#44808080" />
+            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+            <Setter Property="BorderThickness" Value="1,0" />
+            <Setter Property="Width" Value="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" />
+            <Setter Property="MinWidth" Value="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type ScrollBar}">
                         <Grid x:Name="Bg" SnapsToDevicePixels="true">
                             <Grid.RowDefinitions>
-                                <RowDefinition MaxHeight="{DynamicResource {x:Static SystemParameters.VerticalScrollBarButtonHeightKey}}"/>
-                                <RowDefinition Height="0.00001*"/>
-                                <RowDefinition MaxHeight="{DynamicResource {x:Static SystemParameters.VerticalScrollBarButtonHeightKey}}"/>
+                                <RowDefinition MaxHeight="{DynamicResource {x:Static SystemParameters.VerticalScrollBarButtonHeightKey}}" />
+                                <RowDefinition Height="0.00001*" />
+                                <RowDefinition MaxHeight="{DynamicResource {x:Static SystemParameters.VerticalScrollBarButtonHeightKey}}" />
                             </Grid.RowDefinitions>
-                            <Border Grid.Row="1"/>
-                            <RepeatButton x:Name="PART_LineUpButton" Command="{x:Static ScrollBar.LineUpCommand}" Style="{StaticResource ScrollBarButton}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" Foreground="{TemplateBinding Foreground}">
-                                <Path x:Name="ArrowTop" Data="M 0,4 C0,4 0,6 0,6 0,6 3.5,2.5 3.5,2.5 3.5,2.5 7,6 7,6 7,6 7,4 7,4 7,4 3.5,0.5 3.5,0.5 3.5,0.5 0,4 0,4 z" Fill="{TemplateBinding Foreground}" Margin="3" Stretch="Uniform"/>
+                            <Border Grid.Row="1" />
+                            <RepeatButton
+                                x:Name="PART_LineUpButton"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                Command="{x:Static ScrollBar.LineUpCommand}"
+                                Foreground="{TemplateBinding Foreground}"
+                                Style="{StaticResource ScrollBarButton}">
+                                <Path
+                                    x:Name="ArrowTop"
+                                    Margin="3"
+                                    Data="M 0,4 C0,4 0,6 0,6 0,6 3.5,2.5 3.5,2.5 3.5,2.5 7,6 7,6 7,6 7,4 7,4 7,4 3.5,0.5 3.5,0.5 3.5,0.5 0,4 0,4 z"
+                                    Fill="{TemplateBinding Foreground}"
+                                    Stretch="Uniform" />
                             </RepeatButton>
-                            <Track x:Name="PART_Track" IsDirectionReversed="true" Grid.Row="1">
+                            <Track
+                                x:Name="PART_Track"
+                                Grid.Row="1"
+                                IsDirectionReversed="true">
                                 <Track.DecreaseRepeatButton>
-                                    <RepeatButton Command="{x:Static ScrollBar.PageUpCommand}" Style="{StaticResource RepeatButtonTransparent}"/>
+                                    <RepeatButton Command="{x:Static ScrollBar.PageUpCommand}" Style="{StaticResource RepeatButtonTransparent}" />
                                 </Track.DecreaseRepeatButton>
                                 <Track.IncreaseRepeatButton>
-                                    <RepeatButton Command="{x:Static ScrollBar.PageDownCommand}" Style="{StaticResource RepeatButtonTransparent}"/>
+                                    <RepeatButton Command="{x:Static ScrollBar.PageDownCommand}" Style="{StaticResource RepeatButtonTransparent}" />
                                 </Track.IncreaseRepeatButton>
                                 <Track.Thumb>
-                                    <Thumb Style="{StaticResource ScrollBarThumbVertical}" Background="{TemplateBinding Foreground}" Foreground="{TemplateBinding Foreground}" Margin="3,0" Opacity="0.8"/>
+                                    <Thumb
+                                        Margin="3,0"
+                                        Background="{TemplateBinding Foreground}"
+                                        Foreground="{TemplateBinding Foreground}"
+                                        Opacity="0.8"
+                                        Style="{StaticResource ScrollBarThumbVertical}" />
                                 </Track.Thumb>
                             </Track>
-                            <RepeatButton x:Name="PART_LineDownButton" Command="{x:Static ScrollBar.LineDownCommand}" Grid.Row="2" Style="{StaticResource ScrollBarButton}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" Foreground="{TemplateBinding Foreground}">
-                                <Path x:Name="ArrowBottom" Data="M 0,2.5 C0,2.5 0,0.5 0,0.5 0,0.5 3.5,4 3.5,4 3.5,4 7,0.5 7,0.5 7,0.5 7,2.5 7,2.5 7,2.5 3.5,6 3.5,6 3.5,6 0,2.5 0,2.5 z" Fill="{TemplateBinding Foreground}" Margin="3" Stretch="Uniform"/>
+                            <RepeatButton
+                                x:Name="PART_LineDownButton"
+                                Grid.Row="2"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                Command="{x:Static ScrollBar.LineDownCommand}"
+                                Foreground="{TemplateBinding Foreground}"
+                                Style="{StaticResource ScrollBarButton}">
+                                <Path
+                                    x:Name="ArrowBottom"
+                                    Margin="3"
+                                    Data="M 0,2.5 C0,2.5 0,0.5 0,0.5 0,0.5 3.5,4 3.5,4 3.5,4 7,0.5 7,0.5 7,0.5 7,2.5 7,2.5 7,2.5 3.5,6 3.5,6 3.5,6 0,2.5 0,2.5 z"
+                                    Fill="{TemplateBinding Foreground}"
+                                    Stretch="Uniform" />
                             </RepeatButton>
                         </Grid>
                     </ControlTemplate>
@@ -217,37 +330,65 @@
             </Setter>
             <Style.Triggers>
                 <Trigger Property="Orientation" Value="Horizontal">
-                    <Setter Property="Width" Value="Auto"/>
-                    <Setter Property="MinWidth" Value="0"/>
-                    <Setter Property="Height" Value="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarHeightKey}}"/>
-                    <Setter Property="MinHeight" Value="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarHeightKey}}"/>
-                    <Setter Property="BorderThickness" Value="0,1"/>
+                    <Setter Property="Width" Value="Auto" />
+                    <Setter Property="MinWidth" Value="0" />
+                    <Setter Property="Height" Value="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarHeightKey}}" />
+                    <Setter Property="MinHeight" Value="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarHeightKey}}" />
+                    <Setter Property="BorderThickness" Value="0,1" />
                     <Setter Property="Template">
                         <Setter.Value>
                             <ControlTemplate TargetType="{x:Type ScrollBar}">
                                 <Grid x:Name="Bg" SnapsToDevicePixels="true">
                                     <Grid.ColumnDefinitions>
-                                        <ColumnDefinition MaxWidth="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarButtonWidthKey}}"/>
-                                        <ColumnDefinition Width="0.00001*"/>
-                                        <ColumnDefinition MaxWidth="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarButtonWidthKey}}"/>
+                                        <ColumnDefinition MaxWidth="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarButtonWidthKey}}" />
+                                        <ColumnDefinition Width="0.00001*" />
+                                        <ColumnDefinition MaxWidth="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarButtonWidthKey}}" />
                                     </Grid.ColumnDefinitions>
-                                    <Border Grid.Row="1"/>
-                                    <RepeatButton x:Name="PART_LineLeftButton" Command="{x:Static ScrollBar.LineLeftCommand}" Style="{StaticResource ScrollBarButton}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" Foreground="{TemplateBinding Foreground}">
-                                        <Path x:Name="ArrowLeft" Data="M 3.18,7 C3.18,7 5,7 5,7 5,7 1.81,3.5 1.81,3.5 1.81,3.5 5,0 5,0 5,0 3.18,0 3.18,0 3.18,0 0,3.5 0,3.5 0,3.5 3.18,7 3.18,7 z" Fill="{TemplateBinding Foreground}" Margin="3" Stretch="Uniform"/>
+                                    <Border Grid.Row="1" />
+                                    <RepeatButton
+                                        x:Name="PART_LineLeftButton"
+                                        Background="{TemplateBinding Background}"
+                                        BorderBrush="{TemplateBinding BorderBrush}"
+                                        Command="{x:Static ScrollBar.LineLeftCommand}"
+                                        Foreground="{TemplateBinding Foreground}"
+                                        Style="{StaticResource ScrollBarButton}">
+                                        <Path
+                                            x:Name="ArrowLeft"
+                                            Margin="3"
+                                            Data="M 3.18,7 C3.18,7 5,7 5,7 5,7 1.81,3.5 1.81,3.5 1.81,3.5 5,0 5,0 5,0 3.18,0 3.18,0 3.18,0 0,3.5 0,3.5 0,3.5 3.18,7 3.18,7 z"
+                                            Fill="{TemplateBinding Foreground}"
+                                            Stretch="Uniform" />
                                     </RepeatButton>
                                     <Track x:Name="PART_Track" Grid.Column="1">
                                         <Track.DecreaseRepeatButton>
-                                            <RepeatButton Command="{x:Static ScrollBar.PageLeftCommand}" Style="{StaticResource RepeatButtonTransparent}"/>
+                                            <RepeatButton Command="{x:Static ScrollBar.PageLeftCommand}" Style="{StaticResource RepeatButtonTransparent}" />
                                         </Track.DecreaseRepeatButton>
                                         <Track.IncreaseRepeatButton>
-                                            <RepeatButton Command="{x:Static ScrollBar.PageRightCommand}" Style="{StaticResource RepeatButtonTransparent}"/>
+                                            <RepeatButton Command="{x:Static ScrollBar.PageRightCommand}" Style="{StaticResource RepeatButtonTransparent}" />
                                         </Track.IncreaseRepeatButton>
                                         <Track.Thumb>
-                                            <Thumb Style="{StaticResource ScrollBarThumbHorizontal}" Background="{TemplateBinding Foreground}" Foreground="{TemplateBinding Foreground}" Margin="0,3" Opacity="0.8"/>
+                                            <Thumb
+                                                Margin="0,3"
+                                                Background="{TemplateBinding Foreground}"
+                                                Foreground="{TemplateBinding Foreground}"
+                                                Opacity="0.8"
+                                                Style="{StaticResource ScrollBarThumbHorizontal}" />
                                         </Track.Thumb>
                                     </Track>
-                                    <RepeatButton x:Name="PART_LineRightButton" Grid.Column="2" Command="{x:Static ScrollBar.LineRightCommand}" Style="{StaticResource ScrollBarButton}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" Foreground="{TemplateBinding Foreground}">
-                                        <Path x:Name="ArrowRight" Data="M 1.81,7 C1.81,7 0,7 0,7 0,7 3.18,3.5 3.18,3.5 3.18,3.5 0,0 0,0 0,0 1.81,0 1.81,0 1.81,0 5,3.5 5,3.5 5,3.5 1.81,7 1.81,7 z" Fill="{TemplateBinding Foreground}" Margin="3" Stretch="Uniform"/>
+                                    <RepeatButton
+                                        x:Name="PART_LineRightButton"
+                                        Grid.Column="2"
+                                        Background="{TemplateBinding Background}"
+                                        BorderBrush="{TemplateBinding BorderBrush}"
+                                        Command="{x:Static ScrollBar.LineRightCommand}"
+                                        Foreground="{TemplateBinding Foreground}"
+                                        Style="{StaticResource ScrollBarButton}">
+                                        <Path
+                                            x:Name="ArrowRight"
+                                            Margin="3"
+                                            Data="M 1.81,7 C1.81,7 0,7 0,7 0,7 3.18,3.5 3.18,3.5 3.18,3.5 0,0 0,0 0,0 1.81,0 1.81,0 1.81,0 5,3.5 5,3.5 5,3.5 1.81,7 1.81,7 z"
+                                            Fill="{TemplateBinding Foreground}"
+                                            Stretch="Uniform" />
                                     </RepeatButton>
                                 </Grid>
                             </ControlTemplate>
@@ -257,21 +398,36 @@
             </Style.Triggers>
         </Style>
     </UserControl.Resources>
-    
+
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition x:Name="NumberColumn" Width="40"/>
-            <ColumnDefinition x:Name="OperationColumn" Width="20"/>
-            <ColumnDefinition x:Name="ValueColumn" Width="1*"/>
+            <ColumnDefinition x:Name="NumberColumn" Width="40" />
+            <ColumnDefinition x:Name="OperationColumn" Width="20" />
+            <ColumnDefinition x:Name="ValueColumn" Width="1*" />
         </Grid.ColumnDefinitions>
-        <ScrollViewer x:Name="NumberScrollViewer" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" ScrollChanged="NumberScrollViewer_ScrollChanged">
-            <StackPanel x:Name="NumberPanel"/>
+        <ScrollViewer
+            x:Name="NumberScrollViewer"
+            HorizontalScrollBarVisibility="Hidden"
+            ScrollChanged="NumberScrollViewer_ScrollChanged"
+            VerticalScrollBarVisibility="Hidden">
+            <StackPanel x:Name="NumberPanel" />
         </ScrollViewer>
-        <ScrollViewer x:Name="OperationScrollViewer" Grid.Column="1" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" ScrollChanged="OperationScrollViewer_ScrollChanged">
-            <StackPanel x:Name="OperationPanel"/>
+        <ScrollViewer
+            x:Name="OperationScrollViewer"
+            Grid.Column="1"
+            HorizontalScrollBarVisibility="Hidden"
+            ScrollChanged="OperationScrollViewer_ScrollChanged"
+            VerticalScrollBarVisibility="Hidden">
+            <StackPanel x:Name="OperationPanel" />
         </ScrollViewer>
-        <ScrollViewer Template="{DynamicResource LocalScrollViewerTemplate}" x:Name="ValueScrollViewer" Grid.Column="2" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" ScrollChanged="ValueScrollViewer_ScrollChanged" SizeChanged="ValueScrollViewer_SizeChanged">
-            <StackPanel x:Name="ValuePanel"/>
+        <ScrollViewer
+            x:Name="ValueScrollViewer"
+            Grid.Column="2"
+            ScrollChanged="ValueScrollViewer_ScrollChanged"
+            SizeChanged="ValueScrollViewer_SizeChanged"
+            Template="{DynamicResource LocalScrollViewerTemplate}"
+            VerticalScrollBarVisibility="Auto">
+            <StackPanel x:Name="ValuePanel" />
         </ScrollViewer>
     </Grid>
 </UserControl>
diff --git a/DiffPlex.Wpf/Controls/InternalLinesViewer.xaml.cs b/DiffPlex.Wpf/Controls/InternalLinesViewer.xaml.cs
index 2e35e263..b758d4fb 100644
--- a/DiffPlex.Wpf/Controls/InternalLinesViewer.xaml.cs
+++ b/DiffPlex.Wpf/Controls/InternalLinesViewer.xaml.cs
@@ -42,6 +42,8 @@ public ScrollBarVisibility VerticalScrollBarVisibility
 
     public ContextMenu LineContextMenu { get; set; }
 
+    public bool IsTextWrapEnabled { get; set; }
+
     public double VerticalOffset => ValueScrollViewer.VerticalOffset;
 
     public int LineNumberWidth
@@ -67,88 +69,138 @@ public void Clear()
         OperationPanel.Children.Clear();
         ValuePanel.Children.Clear();
     }
+    
+
+    public Panel Add(int? number, string operation, string value, string changeType, IDiffViewer diffViewer)
+    {       
+        IsTextWrapEnabled = diffViewer.IsTextWrapEnabled;
+
+        Panel panel = IsTextWrapEnabled ? new WrapPanel { Orientation = Orientation.Horizontal }
+                                        : new StackPanel { Orientation = Orientation.Horizontal };
+
+        var grid = new Grid();
+        grid.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
+        grid.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
+        grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
 
-    public StackPanel Add(int? number, string operation, string value, string changeType, UIElement source)
-    {
         var index = new TextBlock
         {
             Text = number.HasValue ? number.ToString() : string.Empty,
-            TextAlignment = TextAlignment.Right
+            TextAlignment = TextAlignment.Right,
+            VerticalAlignment = IsTextWrapEnabled ? VerticalAlignment.Top : VerticalAlignment.Stretch,
+            Margin =  IsTextWrapEnabled ? new Thickness(2) : new Thickness(0)
         };
-        index.SetBinding(TextBlock.ForegroundProperty, GetBindings("LineNumberForeground", source, Foreground));
-        index.SetBinding(TextBlock.BackgroundProperty, GetBindings(changeType + "Background", source));
-        ApplyTextBlockProperties(index, source);
-        NumberPanel.Children.Add(index);
+        index.SetBinding(TextBlock.ForegroundProperty, GetBindings("LineNumberForeground", diffViewer, Foreground));
+        index.SetBinding(TextBlock.BackgroundProperty, GetBindings(changeType + "Background", diffViewer));
+        ApplyTextBlockProperties(index, diffViewer);
+        if(!IsTextWrapEnabled)
+            NumberPanel.Children.Add(index);
 
         var op = new TextBlock
         {
             Text = operation,
-            TextAlignment = TextAlignment.Center
+            TextAlignment = TextAlignment.Center,
+            VerticalAlignment = IsTextWrapEnabled ? VerticalAlignment.Top : VerticalAlignment.Stretch,
+            Margin = IsTextWrapEnabled ? new Thickness(2) : new Thickness(0)
         };
-        op.SetBinding(TextBlock.ForegroundProperty, GetBindings("ChangeTypeForeground", source, Foreground));
-        op.SetBinding(TextBlock.BackgroundProperty, GetBindings(changeType + "Background", source));
-        ApplyTextBlockProperties(op, source);
-        OperationPanel.Children.Add(op);
+        op.SetBinding(TextBlock.ForegroundProperty, GetBindings("ChangeTypeForeground", diffViewer, Foreground));
+        op.SetBinding(TextBlock.BackgroundProperty, GetBindings(changeType + "Background", diffViewer));
+        ApplyTextBlockProperties(op, diffViewer);
+        if (!IsTextWrapEnabled)
+            OperationPanel.Children.Add(op);
+
+        if(IsTextWrapEnabled)
+        {
+            Grid.SetColumn(index, 0);
+            Grid.SetColumn(op, 1);
+            grid.Children.Add(index);
+            grid.Children.Add(op);
+        }
 
-        var panel = new StackPanel { Orientation = Orientation.Horizontal };
-        panel.SetBinding(BackgroundProperty, GetBindings(changeType + "Background", source));
         var text = new TextBlock
         {
-            Text = value
+            Text = value,
+            TextWrapping = IsTextWrapEnabled ? TextWrapping.Wrap : TextWrapping.NoWrap,
+            VerticalAlignment = IsTextWrapEnabled ? VerticalAlignment.Top : VerticalAlignment.Stretch,
+            Margin = IsTextWrapEnabled ? new Thickness(5, 0, 5, 0) : new Thickness(0)
         };
         if (!string.IsNullOrEmpty(value))
         {
-            text.SetBinding(TextBlock.ForegroundProperty, GetBindings(changeType + "Foreground", source, Foreground));
-            text.SetBinding(TextBlock.BackgroundProperty, GetBindings(changeType + "Background", source));
-            ApplyTextBlockProperties(text, source);
-            panel.ContextMenu = LineContextMenu;
+            text.SetBinding(TextBlock.ForegroundProperty, GetBindings(changeType + "Foreground", diffViewer, Foreground));
+            text.SetBinding(TextBlock.BackgroundProperty, GetBindings(changeType + "Background", diffViewer));
+            ApplyTextBlockProperties(text, diffViewer);
+            if (IsTextWrapEnabled)
+                grid.ContextMenu = LineContextMenu;
+            else
+                panel.ContextMenu = LineContextMenu;
         }
 
-        panel.Children.Add(text);
+        if(IsTextWrapEnabled)
+        {
+            Grid.SetColumn(text, 2);
+            grid.Children.Add(text);
+        }
+
+        if (IsTextWrapEnabled)
+            panel.Children.Add(grid);
+        else
+            panel.Children.Add(text);
+
         ValuePanel.Children.Add(panel);
+        ValuePanel.CanHorizontallyScroll = false;
+        ValueScrollViewer.HorizontalScrollBarVisibility =  IsTextWrapEnabled ? ScrollBarVisibility.Disabled : ScrollBarVisibility.Visible;
+
         return panel;
     }
 
-    public StackPanel Add(int? number, string operation, List<KeyValuePair<string, string>> value, string changeType, UIElement source)
+    public Panel Add(int? number, string operation, List<KeyValuePair<string, string>> value, string changeType, IDiffViewer diffViewer)
     {
+        IsTextWrapEnabled = diffViewer.IsTextWrapEnabled;
+
         var index = new TextBlock
         {
             Text = number.HasValue ? number.ToString() : string.Empty,
-            TextAlignment = TextAlignment.Right
+            TextAlignment = IsTextWrapEnabled ? TextAlignment.Center : TextAlignment.Right,
+            VerticalAlignment = VerticalAlignment.Top
         };
-        index.SetBinding(TextBlock.ForegroundProperty, GetBindings("LineNumberForeground", source, Foreground));
-        index.SetBinding(TextBlock.BackgroundProperty, GetBindings(changeType + "Background", source));
-        ApplyTextBlockProperties(index, source);
+        index.SetBinding(TextBlock.ForegroundProperty, GetBindings("LineNumberForeground", diffViewer, Foreground));
+        index.SetBinding(TextBlock.BackgroundProperty, GetBindings(changeType + "Background", diffViewer));
+        ApplyTextBlockProperties(index, diffViewer);
         NumberPanel.Children.Add(index);
 
         var op = new TextBlock
         {
             Text = operation,
-            TextAlignment = TextAlignment.Center
+            TextAlignment = IsTextWrapEnabled ? TextAlignment.Center : TextAlignment.Right,
+            VerticalAlignment = VerticalAlignment.Top
         };
-        op.SetBinding(TextBlock.ForegroundProperty, GetBindings("ChangeTypeForeground", source, Foreground));
-        op.SetBinding(TextBlock.BackgroundProperty, GetBindings(changeType + "Background", source));
-        ApplyTextBlockProperties(op, source);
+        op.SetBinding(TextBlock.ForegroundProperty, GetBindings("ChangeTypeForeground", diffViewer, Foreground));
+        op.SetBinding(TextBlock.BackgroundProperty, GetBindings(changeType + "Background", diffViewer));
+        ApplyTextBlockProperties(op, diffViewer);
         OperationPanel.Children.Add(op);
 
-        var panel = new StackPanel { Orientation = Orientation.Horizontal };
-        panel.SetBinding(BackgroundProperty, GetBindings(changeType + "Background", source));
+        Panel panel = IsTextWrapEnabled ? new WrapPanel { Orientation = Orientation.Horizontal }
+                                 : new StackPanel { Orientation = Orientation.Horizontal };
+
+        panel.SetBinding(BackgroundProperty, GetBindings(changeType + "Background", diffViewer));
         value ??= new List<KeyValuePair<string, string>>();
         foreach (var ele in value)
         {
             if (string.IsNullOrEmpty(ele.Key)) continue;
             var text = new TextBlock
             {
-                Text = ele.Key
+                Text = ele.Key,
+                VerticalAlignment = VerticalAlignment.Top,
+                TextWrapping = IsTextWrapEnabled ? TextWrapping.Wrap : TextWrapping.NoWrap
             };
             if (!string.IsNullOrEmpty(ele.Value))
             {
                 if (!string.IsNullOrEmpty(ele.Key))
-                    text.SetBinding(TextBlock.ForegroundProperty, GetBindings(ele.Value + "Foreground", source, Foreground));
-                text.SetBinding(TextBlock.BackgroundProperty, GetBindings(ele.Value + "Background", source));
+                    text.SetBinding(TextBlock.ForegroundProperty, GetBindings(ele.Value + "Foreground", diffViewer, Foreground));
+                text.SetBinding(TextBlock.BackgroundProperty, GetBindings(ele.Value + "Background", diffViewer));
             }
 
-            ApplyTextBlockProperties(text, source);
+            ApplyTextBlockProperties(text, diffViewer);
             panel.Children.Add(text);
         }
 
@@ -162,6 +214,9 @@ public StackPanel Add(int? number, string operation, List<KeyValuePair<string, s
         }
 
         ValuePanel.Children.Add(panel);
+        ValuePanel.CanHorizontallyScroll = false;
+        ValueScrollViewer.HorizontalScrollBarVisibility = IsTextWrapEnabled ? ScrollBarVisibility.Disabled : ScrollBarVisibility.Visible;
+
         return panel;
     }
 
@@ -187,13 +242,13 @@ public IEnumerable<object> GetTagsOfEachLine()
         }
     }
 
-    private Binding GetBindings(string key, UIElement source)
+    private Binding GetBindings(string key, IDiffViewer source)
     {
         if (bindings.TryGetValue(key, out var r) && r.Source == source) return r;
         return bindings[key] = new Binding(key) { Source = source, Mode = BindingMode.OneWay };
     }
 
-    private Binding GetBindings(string key, UIElement source, object defaultValue)
+    private Binding GetBindings(string key, IDiffViewer source, object defaultValue)
     {
         if (bindings.TryGetValue(key, out var r) && r.Source == source) return r;
         return bindings[key] = new Binding(key) { Source = source, Mode = BindingMode.OneWay, TargetNullValue = defaultValue };
@@ -218,10 +273,10 @@ internal void AdjustScrollView()
         }
     }
 
-    private void ApplyTextBlockProperties(TextBlock text, UIElement source)
+    private void ApplyTextBlockProperties(TextBlock text, IDiffViewer source)
     {
         text.SetBinding(TextBlock.FontSizeProperty, GetBindings("FontSize", source));
-        text.SetBinding(TextBlock.FontFamilyProperty, GetBindings("FontFamily", source, Helper.FontFamily ));
+        text.SetBinding(TextBlock.FontFamilyProperty, GetBindings("FontFamily", source, Helper.FontFamily));
         text.SetBinding(TextBlock.FontWeightProperty, GetBindings("FontWeight", source));
         text.SetBinding(TextBlock.FontStretchProperty, GetBindings("FontStretch", source));
         text.SetBinding(TextBlock.FontStyleProperty, GetBindings("FontStyle", source));
diff --git a/DiffPlex.Wpf/Controls/SideBySideDiffViewer.xaml.cs b/DiffPlex.Wpf/Controls/SideBySideDiffViewer.xaml.cs
index 4bf069c4..eb6c4972 100644
--- a/DiffPlex.Wpf/Controls/SideBySideDiffViewer.xaml.cs
+++ b/DiffPlex.Wpf/Controls/SideBySideDiffViewer.xaml.cs
@@ -24,7 +24,7 @@ namespace DiffPlex.Wpf.Controls;
 /// The side by side diff control for text.
 /// Interaction logic for SideBySideDiffViewer.xaml
 /// </summary>
-public partial class SideBySideDiffViewer : UserControl
+public partial class SideBySideDiffViewer : UserControl, IDiffViewer
 {
     /// <summary>
     /// The property of diff model.
@@ -58,6 +58,11 @@ public partial class SideBySideDiffViewer : UserControl
         c.LeftContentPanel.LineNumberWidth = c.RightContentPanel.LineNumberWidth = n;
     });
 
+    /// <summary>
+    /// The property of text wrapping state.
+    /// </summary>
+    public static readonly DependencyProperty IsTextWrapEnabledProperty = RegisterDependencyProperty(nameof(IsTextWrapEnabled), false);
+
     /// <summary>
     /// The property of change type symbol foreground brush.
     /// </summary>
@@ -398,6 +403,7 @@ public int LinesContext
         get => (int)GetValue(LinesContextProperty);
         set => SetValue(LinesContextProperty, value);
     }
+    public bool IsTextWrapEnabled { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
 
     /// <summary>
     /// Sets a new diff model.
diff --git a/DiffPlex.Wpf/DiffWindow.xaml.cs b/DiffPlex.Wpf/DiffWindow.xaml.cs
index 06e67744..fe2807ed 100644
--- a/DiffPlex.Wpf/DiffWindow.xaml.cs
+++ b/DiffPlex.Wpf/DiffWindow.xaml.cs
@@ -296,5 +296,11 @@ public void SetMenuTextBoxStyle(Style style)
         /// <param name="template">The control template to set.</param>
         public void SetMenuTextBoxTemlate(ControlTemplate template)
             => DiffView.SetMenuTextBoxTemlate(template);
+
+        /// <summary>
+        /// Enables text wrapping for the text blocks in the diff viewer.
+        /// </summary>
+        public void ToggleTextWrapping()
+            => DiffView.ToggleTextWrapping();
     }
 }