diff --git a/Directory.Packages.props b/Directory.Packages.props
index 6d1e81e99..41b329b4a 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -45,7 +45,7 @@
     <PackageVersion Include="System.Reflection.Metadata" Version="8.0.0" />
     <PackageVersion Include="System.Resources.Extensions" Version="8.0.0" />
     <PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
-    <PackageVersion Include="TomsToolbox.Wpf.Styles" Version="2.16.0" />
+    <PackageVersion Include="TomsToolbox.Wpf.Styles" Version="2.17.3" />
     <PackageVersion Include="coverlet.collector" Version="6.0.2" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpOutputVisitor.cs b/ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpOutputVisitor.cs
index c929888cf..96d591dab 100644
--- a/ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpOutputVisitor.cs
+++ b/ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpOutputVisitor.cs
@@ -2694,7 +2694,11 @@ namespace ICSharpCode.Decompiler.CSharp.OutputVisitor
 					propertyDeclaration.Initializer.AcceptVisitor(this);
 					Semicolon();
 				}
-				NewLine();
+				else
+				{
+					// The call to Semicolon() above prints a newline too
+					NewLine();
+				}
 			}
 			else
 			{
diff --git a/ICSharpCode.Decompiler/Metadata/MetadataFile.cs b/ICSharpCode.Decompiler/Metadata/MetadataFile.cs
index c92c0e061..b8c284027 100644
--- a/ICSharpCode.Decompiler/Metadata/MetadataFile.cs
+++ b/ICSharpCode.Decompiler/Metadata/MetadataFile.cs
@@ -61,6 +61,7 @@ namespace ICSharpCode.Decompiler.Metadata
 
 		public virtual int MetadataOffset { get; }
 		public virtual bool IsEmbedded { get; }
+		public virtual bool IsMetadataOnly { get; } = true;
 
 		public bool IsAssembly => Metadata.IsAssembly;
 
diff --git a/ICSharpCode.Decompiler/Metadata/PEFile.cs b/ICSharpCode.Decompiler/Metadata/PEFile.cs
index 9277ed71f..40e88534d 100644
--- a/ICSharpCode.Decompiler/Metadata/PEFile.cs
+++ b/ICSharpCode.Decompiler/Metadata/PEFile.cs
@@ -53,6 +53,7 @@ namespace ICSharpCode.Decompiler.Metadata
 
 		public override bool IsEmbedded => false;
 		public override int MetadataOffset => Reader.PEHeaders.MetadataStartOffset;
+		public override bool IsMetadataOnly => false;
 
 		public void Dispose()
 		{
diff --git a/ICSharpCode.Decompiler/Metadata/WebCilFile.cs b/ICSharpCode.Decompiler/Metadata/WebCilFile.cs
index d862c261b..b93033c32 100644
--- a/ICSharpCode.Decompiler/Metadata/WebCilFile.cs
+++ b/ICSharpCode.Decompiler/Metadata/WebCilFile.cs
@@ -183,6 +183,7 @@ namespace ICSharpCode.Decompiler.Metadata
 		}
 
 		public override int MetadataOffset { get; }
+		public override bool IsMetadataOnly => false;
 
 		private static int GetContainingSectionIndex(IEnumerable<SectionHeader> sections, int rva)
 		{
diff --git a/ICSharpCode.ILSpyX/Analyzers/AnalyzerScope.cs b/ICSharpCode.ILSpyX/Analyzers/AnalyzerScope.cs
index 8f01faf0f..290e225bf 100644
--- a/ICSharpCode.ILSpyX/Analyzers/AnalyzerScope.cs
+++ b/ICSharpCode.ILSpyX/Analyzers/AnalyzerScope.cs
@@ -72,7 +72,7 @@ namespace ICSharpCode.ILSpyX.Analyzers
 		{
 			return assemblyListSnapshot.GetAllAssembliesAsync().GetAwaiter().GetResult()
 				.Select(asm => asm.GetMetadataFileOrNull())
-				.Where(x => x != null)!;
+				.Where(x => x != null && !x.IsMetadataOnly)!;
 		}
 
 		public DecompilerTypeSystem ConstructTypeSystem(MetadataFile module)
@@ -207,7 +207,7 @@ namespace ICSharpCode.ILSpyX.Analyzers
 					if (friendAssemblies.Contains(assembly.ShortName))
 					{
 						var module = assembly.GetMetadataFileOrNull();
-						if (module == null)
+						if (module == null || module.IsMetadataOnly)
 							continue;
 						if (ModuleReferencesScopeType(module.Metadata, typeScope.Name, typeScope.Namespace))
 							yield return module;
diff --git a/ICSharpCode.ILSpyX/LoadedAssembly.cs b/ICSharpCode.ILSpyX/LoadedAssembly.cs
index 169012d44..8f7298c84 100644
--- a/ICSharpCode.ILSpyX/LoadedAssembly.cs
+++ b/ICSharpCode.ILSpyX/LoadedAssembly.cs
@@ -211,7 +211,7 @@ namespace ICSharpCode.ILSpyX
 		{
 			return LazyInitializer.EnsureInitialized(ref this.typeSystem, () => {
 				var module = GetMetadataFileOrNull();
-				if (module == null)
+				if (module == null || module.IsMetadataOnly)
 					return null!;
 				return new SimpleCompilation(
 					module.WithOptions(TypeSystemOptions.Default | TypeSystemOptions.Uncached | TypeSystemOptions.KeepModifiers),
@@ -230,7 +230,7 @@ namespace ICSharpCode.ILSpyX
 				if (typeSystemWithOptions != null && options == currentTypeSystemOptions)
 					return typeSystemWithOptions;
 				var module = GetMetadataFileOrNull();
-				if (module == null)
+				if (module == null || module.IsMetadataOnly)
 					return null;
 				currentTypeSystemOptions = options;
 				return typeSystemWithOptions = new SimpleCompilation(
diff --git a/ILSpy/App.xaml b/ILSpy/App.xaml
index 151558268..0cfda48ce 100644
--- a/ILSpy/App.xaml
+++ b/ILSpy/App.xaml
@@ -3,7 +3,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:styles="urn:TomsToolbox.Wpf.Styles"
              xmlns:toms="urn:TomsToolbox"
-             xmlns:ilSpy="clr-namespace:ICSharpCode.ILSpy"
              xmlns:themes="clr-namespace:ICSharpCode.ILSpy.Themes"
              StartupUri="MainWindow.xaml">
 	<Application.Resources>
@@ -25,5 +24,9 @@
 			<Setter Property="Padding" Value="9,1,9,1" />
 		</Style>
 
+		<Style TargetType="ScrollViewer">
+			<Setter Property="toms:AdvancedScrollWheelBehavior.Attach" Value="WithAnimation" />
+		</Style>
+
 	</Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/ILSpy/Controls/ZoomScrollViewer.xaml b/ILSpy/Controls/ZoomScrollViewer.xaml
index 4c72e7eab..509b8d636 100644
--- a/ILSpy/Controls/ZoomScrollViewer.xaml
+++ b/ILSpy/Controls/ZoomScrollViewer.xaml
@@ -1,8 +1,10 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	xmlns:Controls="clr-namespace:ICSharpCode.ILSpy.Controls">
+	xmlns:Controls="clr-namespace:ICSharpCode.ILSpy.Controls"
+	xmlns:toms="urn:TomsToolbox">
 	
 	<Style TargetType="{x:Type Controls:ZoomScrollViewer}">
+		<Setter Property="toms:AdvancedScrollWheelBehavior.Attach" Value="WithAnimation" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type Controls:ZoomScrollViewer}">
diff --git a/ILSpy/Metadata/Helpers.cs b/ILSpy/Metadata/Helpers.cs
index 792b73e1f..aee8137ac 100644
--- a/ILSpy/Metadata/Helpers.cs
+++ b/ILSpy/Metadata/Helpers.cs
@@ -42,6 +42,8 @@ using ICSharpCode.ILSpy.TextView;
 using ICSharpCode.ILSpy.TreeNodes;
 using ICSharpCode.ILSpy.ViewModels;
 
+using TomsToolbox.Wpf.Interactivity;
+
 namespace ICSharpCode.ILSpy.Metadata
 {
 	static class Helpers
@@ -69,6 +71,7 @@ namespace ICSharpCode.ILSpy.Metadata
 				ContextMenuProvider.Add(view);
 				DataGridFilter.SetIsAutoFilterEnabled(view, true);
 				DataGridFilter.SetContentFilterFactory(view, new RegexContentFilterFactory());
+				AdvancedScrollWheelBehavior.SetAttach(view, AdvancedScrollWheelMode.WithoutAnimation);
 			}
 			DataGridFilter.GetFilter(view).Clear();
 			view.RowDetailsTemplateSelector = null;
diff --git a/ILSpy/Options/DecompilerSettingsPanel.xaml b/ILSpy/Options/DecompilerSettingsPanel.xaml
index 4941e0142..2e16f5054 100644
--- a/ILSpy/Options/DecompilerSettingsPanel.xaml
+++ b/ILSpy/Options/DecompilerSettingsPanel.xaml
@@ -20,7 +20,7 @@
 			<ColumnDefinition Width="*" />
 		</Grid.ColumnDefinitions>
 		<TextBlock Margin="3" Grid.ColumnSpan="3" TextWrapping="Wrap" Text="{x:Static properties:Resources.DecompilerSettingsPanelLongText}" />
-		<ListBox Grid.Row="1" ItemsSource="{Binding Source={StaticResource SettingsCollection}}" toms:SmoothScrollingBehavior.Register="True">
+		<ListBox Grid.Row="1" ItemsSource="{Binding Source={StaticResource SettingsCollection}}">
 			<ListBox.ItemContainerStyle>
 				<Style TargetType="ListBoxItem">
 					<Setter Property="IsTabStop" Value="False"/>
diff --git a/ILSpy/Options/DisplaySettingsPanel.xaml b/ILSpy/Options/DisplaySettingsPanel.xaml
index 140cc0f59..846a33c06 100644
--- a/ILSpy/Options/DisplaySettingsPanel.xaml
+++ b/ILSpy/Options/DisplaySettingsPanel.xaml
@@ -12,7 +12,7 @@
 	<UserControl.Resources>
 		<local:FontSizeConverter x:Key="fontSizeConv" />
 	</UserControl.Resources>
-	<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" toms:SmoothScrollingBehavior.Register="True">
+	<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
 		<StackPanel Orientation="Vertical">
 			<DockPanel>
 				<Label DockPanel.Dock="Left" Content="{x:Static properties:Resources.DisplaySettingsPanel_Theme}" />
diff --git a/ILSpy/Search/SearchPane.xaml b/ILSpy/Search/SearchPane.xaml
index a77da7334..f08a8d014 100644
--- a/ILSpy/Search/SearchPane.xaml
+++ b/ILSpy/Search/SearchPane.xaml
@@ -4,6 +4,7 @@
 		xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	    xmlns:properties="clr-namespace:ICSharpCode.ILSpy.Properties"	
 		xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" x:Name="self" mc:Ignorable="d"
+		xmlns:toms="urn:TomsToolbox"
 		d:DesignHeight="300" d:DesignWidth="300">
 	<Grid>
 		<Grid.RowDefinitions>
@@ -42,7 +43,8 @@
 		<ListView Grid.Row="2" BorderThickness="0,1,0,0" HorizontalContentAlignment="Stretch" KeyDown="ListBox_KeyDown"
 				MouseDoubleClick="ListBox_MouseDoubleClick" Name="listBox" SelectionMode="Single" controls:SortableGridViewColumn.SortMode="Automatic" 
 				controls:GridViewColumnAutoSize.AutoWidth="40%;40%;20%" BorderBrush="{DynamicResource {x:Static SystemColors.ControlLightBrushKey}}"
-				ItemsSource="{Binding Results, ElementName=self}">
+				ItemsSource="{Binding Results, ElementName=self}"
+				toms:AdvancedScrollWheelBehavior.Attach="WithoutAnimation">
 			<ListView.View>
 				<GridView AllowsColumnReorder="False">
 					<controls:SortableGridViewColumn Header="{x:Static properties:Resources.Name}" SortBy="Name">
diff --git a/ILSpy/TextView/DecompilerTextView.xaml b/ILSpy/TextView/DecompilerTextView.xaml
index b44b703b7..0b9f701e5 100644
--- a/ILSpy/TextView/DecompilerTextView.xaml
+++ b/ILSpy/TextView/DecompilerTextView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="ICSharpCode.ILSpy.TextView.DecompilerTextView" x:ClassModifier="public" x:Name="self"
+<UserControl x:Class="ICSharpCode.ILSpy.TextView.DecompilerTextView" x:Name="self"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:properties="clr-namespace:ICSharpCode.ILSpy.Properties"
@@ -10,7 +10,6 @@
              xmlns:toms="urn:TomsToolbox"
              xmlns:themes="clr-namespace:ICSharpCode.ILSpy.Themes">
 	<UserControl.Resources>
-		<BooleanToVisibilityConverter x:Key="boolToVisibility" />
 		<SolidColorBrush x:Key="waitAdornerBackgoundBrush" Color="{DynamicResource {x:Static SystemColors.WindowColorKey}}" Opacity=".75" />
 		<Style TargetType="{x:Type editing:TextArea}">
 			<Setter Property="FocusVisualStyle" Value="{x:Null}" />
@@ -82,8 +81,7 @@
 								Padding="{TemplateBinding Padding}"
 								BorderBrush="{TemplateBinding BorderBrush}"
 								BorderThickness="{TemplateBinding BorderThickness}"
-								TextOptions.TextFormattingMode="{Binding CurrentZoom, ElementName=PART_ScrollViewer, Converter={x:Static local:ZoomLevelToTextFormattingModeConverter.Instance}}" 
-								toms:SmoothScrollingBehavior.Register="true"/>
+								TextOptions.TextFormattingMode="{Binding CurrentZoom, ElementName=PART_ScrollViewer, Converter={x:Static local:ZoomLevelToTextFormattingModeConverter.Instance}}"/>
 							<ControlTemplate.Triggers>
 								<Trigger Property="WordWrap"
 								         Value="True">
diff --git a/ILSpy/TreeNodes/AssemblyTreeNode.cs b/ILSpy/TreeNodes/AssemblyTreeNode.cs
index 44969d558..2449047c7 100644
--- a/ILSpy/TreeNodes/AssemblyTreeNode.cs
+++ b/ILSpy/TreeNodes/AssemblyTreeNode.cs
@@ -467,7 +467,16 @@ namespace ICSharpCode.ILSpy.TreeNodes
 				var loadResult = LoadedAssembly.GetLoadResultAsync().GetAwaiter().GetResult();
 				if (loadResult.MetadataFile != null)
 				{
-					language.DecompileAssembly(LoadedAssembly, output, options);
+					switch (loadResult.MetadataFile.Kind)
+					{
+						case MetadataFile.MetadataFileKind.ProgramDebugDatabase:
+						case MetadataFile.MetadataFileKind.Metadata:
+							output.WriteLine("// " + LoadedAssembly.FileName);
+							break;
+						default:
+							language.DecompileAssembly(LoadedAssembly, output, options);
+							break;
+					}
 				}
 				else if (loadResult.Package != null)
 				{