diff --git a/Readme.md b/Readme.md
index 12496c4..b16e042 100644
--- a/Readme.md
+++ b/Readme.md
@@ -1,5 +1,4 @@
 <!-- default badges list -->
-![](https://img.shields.io/endpoint?url=https://codecentral.devexpress.com/api/v1/VersionRange/128595998/13.2.5%2B)
 [![](https://img.shields.io/badge/Open_in_DevExpress_Support_Center-FF7200?style=flat-square&logo=DevExpress&logoColor=white)](https://supportcenter.devexpress.com/ticket/details/E2942)
 [![](https://img.shields.io/badge/📖_How_to_use_DevExpress_Examples-e9f6fc?style=flat-square)](https://docs.devexpress.com/GeneralInformation/403183)
 <!-- default badges end -->
diff --git a/VB/Application.xaml b/VB/Application.xaml
index 4b5051f..be9d5a3 100644
--- a/VB/Application.xaml
+++ b/VB/Application.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="PrintDocumentFromUIWpf.App" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" StartupUri="MainWindow.xaml">
+<Application x:Class="PrintDocumentFromUIWpf.App" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" StartupUri="MainWindow.xaml">
     <Application.Resources>
          
     </Application.Resources>
diff --git a/VB/Application.xaml.vb b/VB/Application.xaml.vb
index afb9a0c..2384605 100644
--- a/VB/Application.xaml.vb
+++ b/VB/Application.xaml.vb
@@ -1,5 +1,4 @@
-Imports Microsoft.VisualBasic
-Imports System
+Imports System
 Imports System.Collections.Generic
 Imports System.Configuration
 Imports System.Data
@@ -12,5 +11,6 @@ Namespace PrintDocumentFromUIWpf
 	''' </summary>
 	Partial Public Class App
 		Inherits Application
+
 	End Class
 End Namespace
diff --git a/VB/MainWindow.xaml b/VB/MainWindow.xaml
index 680957e..5202f0f 100644
--- a/VB/MainWindow.xaml
+++ b/VB/MainWindow.xaml
@@ -1,4 +1,4 @@
-<dxc:DXWindow x:Class="PrintDocumentFromUIWpf.MainWindow" 
+<dxc:DXWindow x:Class="PrintDocumentFromUIWpf.MainWindow" 
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
     xmlns:dxc="http://schemas.devexpress.com/winfx/2008/xaml/core" 
@@ -6,9 +6,9 @@
     xmlns:dxp="http://schemas.devexpress.com/winfx/2008/xaml/printing" 
     Title="MainWindow" dxc:ThemeManager.ThemeName="Azure" 
     Height="330" Width="280" Loaded="DXWindow_Loaded">
-
+    
     <dxc:DXWindow.Resources>
-
+        
         <BooleanToVisibilityConverter x:Key="booleanToVisibilityConverter" />
 
         <DataTemplate x:Key="detailTemplate">
@@ -34,7 +34,7 @@
             </StackPanel>
         </DataTemplate>
     </dxc:DXWindow.Resources>
-
+    
     <StackPanel>
         <GroupBox Header="Document Elements">
             <Grid>
@@ -55,29 +55,29 @@
 
                 <Label Margin="5">Report Header:</Label>
                 <dxe:TextEdit Name="teReportHeader" Grid.Column="2" Margin="5" />
-
+        
                 <Label Grid.Row="1" Margin="5">Page Header:</Label>
                 <dxe:TextEdit Name="tePageHeader" Grid.Column="2" Grid.Row="1" Margin="5" />
-
+                
                 <Label Grid.Row="2" Margin="5">Detail Content:</Label>
                 <dxe:TextEdit Name="teDetail" Grid.Column="2" Grid.Row="2" Margin="5" />
-
+        
                 <Label Grid.Row="3" Margin="5">Page Footer:</Label>
                 <dxe:TextEdit Name="tePageFooter" Grid.Column="2" Grid.Row="3" Margin="5" />
-
+                
                 <Label Grid.Row="4" Margin="5">Report Footer:</Label>
                 <dxe:TextEdit Name="teReportFooter" Grid.Column="2" Grid.Row="4" Margin="5" />
-
+        
                 <Label Grid.Row="5" Margin="5">Detail Count:</Label>
                 <dxe:SpinEdit Name="seDetail" Grid.Column="2" Grid.Row="5" Margin="5" MinValue="0" IsFloatValue="False" IsTextEditable="False" />
-
+        
                 <Label Grid.Row="6" Margin="5">Print Page Info:</Label>
                 <dxe:CheckEdit Name="cePageInfo" Grid.Column="2" Grid.Row="6" Margin="5" HorizontalAlignment="Center" />
-
+            
             </Grid>
         </GroupBox>
-
+        
         <Button Width="100" Margin="5" Content="Print Preview" Click="btnPrint_Click" />
-
+        
     </StackPanel>
 </dxc:DXWindow>
diff --git a/VB/MainWindow.xaml.vb b/VB/MainWindow.xaml.vb
index ae7c305..f9a7233 100644
--- a/VB/MainWindow.xaml.vb
+++ b/VB/MainWindow.xaml.vb
@@ -4,59 +4,59 @@ Imports DevExpress.Xpf.Core
 Imports DevExpress.Xpf.Printing
 
 Namespace PrintDocumentFromUIWpf
-    Partial Public Class MainWindow
-        Inherits DXWindow
-        Public Sub New()
-            InitializeComponent()
-        End Sub
-
-        Sub DXWindow_Loaded(ByVal sender As Object, ByVal e As RoutedEventArgs)
-            InitDefaultVlaues()
-        End Sub
-
-        Sub btnPrint_Click(ByVal sender As Object, ByVal e As RoutedEventArgs)
-            CreateAndPreviewLink()
-        End Sub
-
-        Sub InitDefaultVlaues()
-            teReportHeader.EditValue = "Report Header"
-            tePageHeader.EditValue = "Page Header"
-            teDetail.EditValue = "Detail"
-            tePageFooter.EditValue = "Page Footer"
-            teReportFooter.EditValue = "Report Footer"
-            seDetail.EditValue = 400
-            cePageInfo.EditValue = True
-        End Sub
-
-        Sub CreateAndPreviewLink()
-            Dim link As New SimpleLink With {
-                .ReportHeaderTemplate = CType(Resources("reportHeaderTemplate"), DataTemplate),
-                .PageHeaderTemplate = CType(Resources("pageHeaderTemplate"), DataTemplate),
-                .DetailTemplate = CType(Resources("detailTemplate"), DataTemplate),
-                .PageFooterTemplate = CType(Resources("pageFooterTemplate"), DataTemplate),
-                .ReportFooterTemplate = CType(Resources("reportFooterTemplate"), DataTemplate),
-                .ReportHeaderData = teReportHeader,
-                .PageHeaderData = tePageHeader,
-                .PageFooterData = New PageFooterDataContext With {
-                    .Title = tePageFooter.EditValue.ToString(),
-                    .PrintPageInfo = CBool(cePageInfo.IsChecked)
-                },
-                .ReportFooterData = teReportFooter,
-                .DetailCount = CInt(seDetail.EditValue)
-            }
-
-            AddHandler link.CreateDetail, AddressOf link_CreateDetail
-
-            link.ShowPrintPreviewDialog(Me)
-        End Sub
-
-        Sub link_CreateDetail(ByVal sender As Object, ByVal e As CreateAreaEventArgs)
-            e.Data = String.Format("{0} (Row {1})", teDetail.EditValue, e.DetailIndex)
-        End Sub
-    End Class
-
-    Public Class PageFooterDataContext
-        Public Property Title() As String
-        Public Property PrintPageInfo() As Boolean
-    End Class
+	Partial Public Class MainWindow
+		Inherits DXWindow
+
+		Public Sub New()
+			InitializeComponent()
+		End Sub
+
+		Private Sub DXWindow_Loaded(ByVal sender As Object, ByVal e As RoutedEventArgs)
+			InitDefaultVlaues()
+		End Sub
+
+		Private Sub btnPrint_Click(ByVal sender As Object, ByVal e As RoutedEventArgs)
+			CreateAndPreviewLink()
+		End Sub
+
+		Private Sub InitDefaultVlaues()
+			teReportHeader.EditValue = "Report Header"
+			tePageHeader.EditValue = "Page Header"
+			teDetail.EditValue = "Detail"
+			tePageFooter.EditValue = "Page Footer"
+			teReportFooter.EditValue = "Report Footer"
+			seDetail.EditValue = 400
+			cePageInfo.EditValue = True
+		End Sub
+
+		Private Sub CreateAndPreviewLink()
+			Dim link = New SimpleLink With {
+				.ReportHeaderTemplate = CType(Resources("reportHeaderTemplate"), DataTemplate),
+				.PageHeaderTemplate = CType(Resources("pageHeaderTemplate"), DataTemplate),
+				.DetailTemplate = CType(Resources("detailTemplate"), DataTemplate),
+				.PageFooterTemplate = CType(Resources("pageFooterTemplate"), DataTemplate),
+				.ReportFooterTemplate = CType(Resources("reportFooterTemplate"), DataTemplate),
+				.ReportHeaderData = teReportHeader,
+				.PageHeaderData = tePageHeader,
+				.PageFooterData = New PageFooterDataContext With {
+					.Title = tePageFooter.EditValue.ToString(),
+					.PrintPageInfo = CBool(cePageInfo.IsChecked)
+				},
+				.ReportFooterData = teReportFooter,
+				.DetailCount = CInt(Math.Truncate(seDetail.EditValue))
+			}
+
+			AddHandler link.CreateDetail, AddressOf link_CreateDetail
+			link.ShowPrintPreviewDialog(Me)
+		End Sub
+
+		Private Sub link_CreateDetail(ByVal sender As Object, ByVal e As CreateAreaEventArgs)
+			e.Data = String.Format("{0} (Row {1})", teDetail.EditValue, e.DetailIndex)
+		End Sub
+	End Class
+
+	Public Class PageFooterDataContext
+		Public Property Title() As String
+		Public Property PrintPageInfo() As Boolean
+	End Class
 End Namespace
diff --git a/VB/My Project/AssemblyInfo.vb b/VB/My Project/AssemblyInfo.vb
index 61e733d..1674600 100644
--- a/VB/My Project/AssemblyInfo.vb	
+++ b/VB/My Project/AssemblyInfo.vb	
@@ -1,5 +1,4 @@
-Imports Microsoft.VisualBasic
-Imports System.Reflection
+Imports System.Reflection
 Imports System.Resources
 Imports System.Runtime.CompilerServices
 Imports System.Runtime.InteropServices
@@ -32,10 +31,6 @@ Imports System.Windows
 '[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
 
 
-	'(used if a resource is not found in the page, 
-	' or application resource dictionaries)
-	'(used if a resource is not found in the page, 
-	' app, or any theme specific resource dictionaries)
 <Assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)>
 
 
diff --git a/VB/My Project/Resources.Designer.vb b/VB/My Project/Resources.Designer.vb
index 5cdcf74..659bf70 100644
--- a/VB/My Project/Resources.Designer.vb	
+++ b/VB/My Project/Resources.Designer.vb	
@@ -1,4 +1,6 @@
-'------------------------------------------------------------------------------
+Imports System
+
+'------------------------------------------------------------------------------
 ' <auto-generated>
 '     This code was generated by a tool.
 '     Runtime Version:4.0.30319.1
@@ -8,10 +10,7 @@
 ' </auto-generated>
 '------------------------------------------------------------------------------
 
-
-Imports Microsoft.VisualBasic
-	Imports System
-Namespace My
+Namespace My.Resources
 
 
 	''' <summary>
@@ -21,25 +20,28 @@ Namespace My
 	' class via a tool like ResGen or Visual Studio.
 	' To add or remove a member, edit your .ResX file then rerun ResGen
 	' with the /str option, or rebuild your VS project.
-	<Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"), Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()> _
-	Friend Class Resources
+	<System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")>
+	<System.Diagnostics.DebuggerNonUserCodeAttribute()>
+	<System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
+	Global.Microsoft.VisualBasic.HideModuleNameAttribute()>
+	Friend Module Resources
 
-		Private Shared resourceMan As Global.System.Resources.ResourceManager
+		Private resourceMan As System.Resources.ResourceManager
 
-		Private Shared resourceCulture As Global.System.Globalization.CultureInfo
+		Private resourceCulture As System.Globalization.CultureInfo
 
-		<Global.System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")> _
-		Friend Sub New()
-		End Sub
+'		internal Resources()
+'		{
+'		}
 
 		''' <summary>
 		'''   Returns the cached ResourceManager instance used by this class.
 		''' </summary>
-		<Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
-		Friend Shared ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
+		<System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)>
+		Friend ReadOnly Property ResourceManager() As System.Resources.ResourceManager
 			Get
 				If Object.ReferenceEquals(resourceMan, Nothing) Then
-					Dim temp As New Global.System.Resources.ResourceManager("Resources", GetType(Resources).Assembly)
+					Dim temp As New System.Resources.ResourceManager("Resources", GetType(Resources).Assembly)
 					resourceMan = temp
 				End If
 				Return resourceMan
@@ -50,8 +52,8 @@ Namespace My
 		'''   Overrides the current thread's CurrentUICulture property for all
 		'''   resource lookups using this strongly typed resource class.
 		''' </summary>
-		<Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
-		Friend Shared Property Culture() As Global.System.Globalization.CultureInfo
+		<System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)>
+		Friend Property Culture() As System.Globalization.CultureInfo
 			Get
 				Return resourceCulture
 			End Get
@@ -59,5 +61,5 @@ Namespace My
 				resourceCulture = value
 			End Set
 		End Property
-	End Class
+	End Module
 End Namespace
diff --git a/VB/My Project/Settings.Designer.vb b/VB/My Project/Settings.Designer.vb
index cb36f88..0fb29a3 100644
--- a/VB/My Project/Settings.Designer.vb	
+++ b/VB/My Project/Settings.Designer.vb	
@@ -8,17 +8,15 @@
 ' </auto-generated>
 '------------------------------------------------------------------------------
 
-
-Imports Microsoft.VisualBasic
-Imports System
 Namespace My
 
 
-	<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")> _
+	<System.Runtime.CompilerServices.CompilerGeneratedAttribute()>
+	<System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")>
 	Friend NotInheritable Partial Class Settings
 		Inherits System.Configuration.ApplicationSettingsBase
 
-		Private Shared defaultInstance As Settings = (CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New Settings()), Settings))
+		Private Shared defaultInstance As Settings = (CType(System.Configuration.ApplicationSettingsBase.Synchronized(New Settings()), Settings))
 
 		Public Shared ReadOnly Property [Default]() As Settings
 			Get
diff --git a/VB/PrintDocumentFromUIWpf.Net5.sln b/VB/PrintDocumentFromUIWpf.Net5.sln
index f8f020b..4a6f99f 100644
--- a/VB/PrintDocumentFromUIWpf.Net5.sln
+++ b/VB/PrintDocumentFromUIWpf.Net5.sln
@@ -1,4 +1,4 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
+Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 16
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "PrintDocumentFromUIWpf", "PrintDocumentFromUIWpf.Net5.vbproj", "{5189D128-734D-4046-81BE-F12C8A650FFD}"
 EndProject
diff --git a/VB/PrintDocumentFromUIWpf.Net5.vbproj b/VB/PrintDocumentFromUIWpf.Net5.vbproj
index a9fb485..fc08fe8 100644
--- a/VB/PrintDocumentFromUIWpf.Net5.vbproj
+++ b/VB/PrintDocumentFromUIWpf.Net5.vbproj
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net5.0-windows</TargetFramework>
@@ -11,9 +12,14 @@
     <Platforms>x86;AnyCPU</Platforms>
     <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
     <DefaultItemExcludes>obj*/**</DefaultItemExcludes>
+    <OptionExplicit>On</OptionExplicit>
+    <OptionCompare>Binary</OptionCompare>
+    <OptionStrict>Off</OptionStrict>
+    <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <RemoveIntegerChecks>true</RemoveIntegerChecks>
   </PropertyGroup>
   <ItemGroup>
     <AppDesigner Include="My Project\" />
@@ -28,6 +34,7 @@
     <PackageReference Include="DevExpress.RichEdit.Core" Version="21.1.*-*" />
     <PackageReference Include="DevExpress.RichEdit.Export" Version="21.1.*-*" />
     <PackageReference Include="DevExpress.Wpf.Core" Version="21.1.*-*" />
+    <PackageReference Include="DevExpress.Wpf.Docking" Version="21.1.*-*" />
     <PackageReference Include="DevExpress.Wpf.Printing" Version="21.1.*-*" />
     <PackageReference Include="DevExpress.Wpf.Reporting" Version="21.1.*-*" />
     <PackageReference Include="DevExpress.Wpf.Ribbon" Version="21.1.*-*" />
diff --git a/VB/PrintDocumentFromUIWpf.sln b/VB/PrintDocumentFromUIWpf.sln
index ded8b38..122a8f0 100644
--- a/VB/PrintDocumentFromUIWpf.sln
+++ b/VB/PrintDocumentFromUIWpf.sln
@@ -1,4 +1,4 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
+Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2012
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "PrintDocumentFromUIWpf", "PrintDocumentFromUIWpf.vbproj", "{5189D128-734D-4046-81BE-F12C8A650FFD}"
 EndProject
diff --git a/VB/PrintDocumentFromUIWpf.vbproj b/VB/PrintDocumentFromUIWpf.vbproj
index c97aa04..eebd861 100644
--- a/VB/PrintDocumentFromUIWpf.vbproj
+++ b/VB/PrintDocumentFromUIWpf.vbproj
@@ -11,10 +11,6 @@
     </RootNamespace>
     <AssemblyName>PrintDocumentFromUIWpf</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <OptionExplicit>On</OptionExplicit>
-    <OptionCompare>Binary</OptionCompare>
-    <OptionStrict>Off</OptionStrict>
-    <OptionInfer>On</OptionInfer>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>
     <FileUpgradeFlags>
@@ -22,6 +18,10 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation />
     <BaseIntermediateOutputPath>obj.NetFX</BaseIntermediateOutputPath>
+    <OptionExplicit>On</OptionExplicit>
+    <OptionCompare>Binary</OptionCompare>
+    <OptionStrict>Off</OptionStrict>
+    <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -33,6 +33,7 @@
     <ErrorReport>prompt</ErrorReport>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <UseVSHostingProcess>false</UseVSHostingProcess>
+    <RemoveIntegerChecks>true</RemoveIntegerChecks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -41,43 +42,85 @@
     <DefineDebug>false</DefineDebug>
     <DefineTrace>true</DefineTrace>
     <ErrorReport>prompt</ErrorReport>
+    <RemoveIntegerChecks>true</RemoveIntegerChecks>
   </PropertyGroup>
+  <ItemGroup>
+    <Import Include="Microsoft.VisualBasic" />
+    <Import Include="System" />
+    <Import Include="System.Collections" />
+    <Import Include="System.Collections.Generic" />
+    <Import Include="System.Diagnostics" />
+    <Import Include="System.Linq" />
+    <Import Include="System.Xml.Linq" />
+    <Import Include="System.Threading.Tasks" />
+    <Import Include="System.Data" />
+    <Import Include="System.Drawing" />
+    <Import Include="System.Windows.Forms" />
+    <Import Include="System.Windows" />
+    <Import Include="System.Windows.Controls" />
+    <Import Include="System.Windows.Data" />
+    <Import Include="System.Windows.Documents" />
+    <Import Include="System.Windows.Input" />
+    <Import Include="System.Windows.Media" />
+    <Import Include="System.Windows.Media.Imaging" />
+    <Import Include="System.Windows.Navigation" />
+    <Import Include="System.Windows.Shapes" />
+  </ItemGroup>
   <ItemGroup>
     <Reference Include="DevExpress.Pdf.v21.1.Core, Version=21.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
       <Private>True</Private>
+      <HintPath>C:\DXDlls\21.1.5\DevExpress.Pdf.v21.1.Core.dll</HintPath>
     </Reference>
     <Reference Include="DevExpress.Office.v21.1.Core, Version=21.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
       <Private>True</Private>
+      <HintPath>C:\DXDlls\21.1.5\DevExpress.Office.v21.1.Core.dll</HintPath>
     </Reference>
     <Reference Include="DevExpress.RichEdit.v21.1.Core, Version=21.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
       <Private>True</Private>
+      <HintPath>C:\DXDlls\21.1.5\DevExpress.RichEdit.v21.1.Core.dll</HintPath>
     </Reference>
     <Reference Include="DevExpress.RichEdit.v21.1.Export, Version=21.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
       <Private>True</Private>
+      <HintPath>C:\DXDlls\21.1.5\DevExpress.RichEdit.v21.1.Export.dll</HintPath>
     </Reference>
     <Reference Include="DevExpress.Printing.v21.1.Core, Version=21.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
       <Private>True</Private>
+      <HintPath>C:\DXDlls\21.1.5\DevExpress.Printing.v21.1.Core.dll</HintPath>
     </Reference>
     <Reference Include="DevExpress.Data.v21.1, Version=21.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
       <Private>True</Private>
-    </Reference>
-    <Reference Include="DevExpress.Mvvm.v21.1, Version=21.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
-      <Private>True</Private>
+      <HintPath>C:\DXDlls\21.1.5\DevExpress.Data.v21.1.dll</HintPath>
     </Reference>
     <Reference Include="DevExpress.Xpf.CodeView.v21.1, Version=21.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
       <Private>True</Private>
+      <HintPath>C:\DXDlls\21.1.5\DevExpress.Xpf.CodeView.v21.1.dll</HintPath>
     </Reference>
     <Reference Include="DevExpress.Data.Desktop.v21.1, Version=21.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
       <Private>True</Private>
+      <HintPath>C:\DXDlls\21.1.5\DevExpress.Data.Desktop.v21.1.dll</HintPath>
     </Reference>
     <Reference Include="DevExpress.Xpf.Core.v21.1, Version=21.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
       <Private>True</Private>
+      <HintPath>C:\DXDlls\21.1.5\DevExpress.Xpf.Core.v21.1.dll</HintPath>
+    </Reference>
+    <Reference Include="DevExpress.Xpf.Docking.v21.1, Version=21.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <Private>True</Private>
+      <HintPath>C:\DXDlls\21.1.5\DevExpress.Xpf.Docking.v21.1.dll</HintPath>
+    </Reference>
+    <Reference Include="DevExpress.Mvvm.v21.1, Version=21.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <Private>True</Private>
+      <HintPath>C:\DXDlls\21.1.5\DevExpress.Mvvm.v21.1.dll</HintPath>
     </Reference>
     <Reference Include="DevExpress.Xpf.Printing.v21.1, Version=21.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
       <Private>True</Private>
+      <HintPath>C:\DXDlls\21.1.5\DevExpress.Xpf.Printing.v21.1.dll</HintPath>
     </Reference>
     <Reference Include="DevExpress.Xpf.Ribbon.v21.1, Version=21.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
+      <Private>True</Private>
+      <HintPath>C:\DXDlls\21.1.5\DevExpress.Xpf.Ribbon.v21.1.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -143,22 +186,24 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
     <EmbeddedResource Include="My Project\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
+      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.vb</LastGenOutput>
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
     </EmbeddedResource>
     <None Include="app.config" />
     <None Include="My Project\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.vb</LastGenOutput>
+      <CustomToolNamespace>My</CustomToolNamespace>
     </None>
     <AppDesigner Include="My Project\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
   -->
 </Project>
\ No newline at end of file
diff --git a/VB/app.config b/VB/app.config
index 1a54f4d..2b6ecb7 100644
--- a/VB/app.config
+++ b/VB/app.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <configSections>
     <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">