diff --git a/examples/Examples.vb b/examples/Examples.vb
index ef4b7c9c..05878c60 100644
--- a/examples/Examples.vb
+++ b/examples/Examples.vb
@@ -151,7 +151,7 @@ Public Class Examples
 
         'set some custom display options
         ts.DisplayOptions.Color = Color.Red
-        ts.DisplayOptions.LineStyle = Drawing2D.DashStyle.Dash
+        ts.DisplayOptions.LineStyle = ScottPlot.LineStyle.Dash
         ts.DisplayOptions.LineWidth = 1
         ts.DisplayOptions.ShowPoints = True
 
diff --git a/examples/Wave.Examples.vbproj b/examples/Wave.Examples.vbproj
index 29162676..d0da6056 100644
--- a/examples/Wave.Examples.vbproj
+++ b/examples/Wave.Examples.vbproj
@@ -150,6 +150,11 @@
       <Name>Wave</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="ScottPlot.WinForms">
+      <Version>4.1.69</Version>
+    </PackageReference>
+  </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.
diff --git a/source/Analysis/Analysis.vb b/source/Analysis/Analysis.vb
index 4356d802..d297cbc7 100644
--- a/source/Analysis/Analysis.vb
+++ b/source/Analysis/Analysis.vb
@@ -65,7 +65,7 @@ Friend MustInherit Class Analysis
     ''' is shown in a separate window if `hasResultChart` is True
     ''' </summary>
     ''' <remarks>Optional</remarks>
-    Protected ResultChart As Steema.TeeChart.Chart
+    Protected ResultChart As ScottPlot.Plot
 
     ''' <summary>
     ''' List of result series
@@ -144,7 +144,7 @@ Friend MustInherit Class Analysis
     ''' Analysis result chart
     ''' </summary>
     ''' <remarks>Optional</remarks>
-    Public ReadOnly Property getResultChart() As Steema.TeeChart.Chart
+    Public ReadOnly Property getResultChart() As ScottPlot.Plot
         Get
             Return Me.ResultChart
         End Get
diff --git a/source/Analysis/AnalysisResultChart.Designer.vb b/source/Analysis/AnalysisResultChart.Designer.vb
index 8b2ced16..ace11da0 100644
--- a/source/Analysis/AnalysisResultChart.Designer.vb
+++ b/source/Analysis/AnalysisResultChart.Designer.vb
@@ -1,9 +1,9 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class AnalysisResultChart
     Inherits System.Windows.Forms.Form
 
     'Form overrides dispose to clean up the component list.
-    <System.Diagnostics.DebuggerNonUserCode()> _
+    <System.Diagnostics.DebuggerNonUserCode()>
     Protected Overrides Sub Dispose(disposing As Boolean)
         Try
             If disposing AndAlso components IsNot Nothing Then
@@ -20,16 +20,17 @@ Partial Class AnalysisResultChart
     'NOTE: The following procedure is required by the Windows Form Designer
     'It can be modified using the Windows Form Designer.  
     'Do not modify it using the code editor.
-    <System.Diagnostics.DebuggerStepThrough()> _
+    <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Dim ToolStrip1 As System.Windows.Forms.ToolStrip
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(AnalysisResultChart))
-        Dim Margins1 As Steema.TeeChart.Margins = New Steema.TeeChart.Margins()
         Me.ToolStripButton_Copy = New System.Windows.Forms.ToolStripButton()
         Me.ToolStripButton_EditChart = New System.Windows.Forms.ToolStripButton()
-        Me.TChart1 = New Steema.TeeChart.TChart()
+        Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.ResultPlot = New ScottPlot.FormsPlot()
         ToolStrip1 = New System.Windows.Forms.ToolStrip()
         ToolStrip1.SuspendLayout()
+        Me.Panel1.SuspendLayout()
         Me.SuspendLayout()
         '
         'ToolStrip1
@@ -59,1238 +60,43 @@ Partial Class AnalysisResultChart
         Me.ToolStripButton_EditChart.Size = New System.Drawing.Size(23, 22)
         Me.ToolStripButton_EditChart.Text = "Edit chart"
         '
-        'TChart1
+        'Panel1
         '
-        Me.TChart1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-            Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Panel1.Controls.Add(Me.ResultPlot)
+        Me.Panel1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.Panel1.Location = New System.Drawing.Point(0, 25)
+        Me.Panel1.Name = "Panel1"
+        Me.Panel1.Size = New System.Drawing.Size(784, 425)
+        Me.Panel1.TabIndex = 3
         '
+        'ResultPlot
         '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Bottom.Labels.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Axes.Bottom.Labels.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Axes.Bottom.Labels.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Axes.Bottom.Labels.Brush.Color = System.Drawing.Color.White
-        Me.TChart1.Axes.Bottom.Labels.Brush.Solid = True
-        Me.TChart1.Axes.Bottom.Labels.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Axes.Bottom.Labels.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart1.Axes.Bottom.Labels.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Axes.Bottom.Labels.Font.Brush.Solid = True
-        Me.TChart1.Axes.Bottom.Labels.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Bottom.Labels.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Bottom.Labels.Font.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Bottom.Labels.Font.Shadow.Brush.Visible = True
-        Me.TChart1.Axes.Bottom.Labels.Font.Size = 9
-        Me.TChart1.Axes.Bottom.Labels.Font.SizeFloat = 9.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Bottom.Labels.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Axes.Bottom.Labels.ImageBevel.Brush.Solid = True
-        Me.TChart1.Axes.Bottom.Labels.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Bottom.Labels.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Bottom.Labels.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Bottom.Labels.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Axes.Bottom.Title.Angle = 0
-        '
-        '
-        '
-        Me.TChart1.Axes.Bottom.Title.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Axes.Bottom.Title.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Axes.Bottom.Title.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Axes.Bottom.Title.Brush.Color = System.Drawing.Color.Silver
-        Me.TChart1.Axes.Bottom.Title.Brush.Solid = True
-        Me.TChart1.Axes.Bottom.Title.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Axes.Bottom.Title.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart1.Axes.Bottom.Title.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
-        Me.TChart1.Axes.Bottom.Title.Font.Brush.Solid = True
-        Me.TChart1.Axes.Bottom.Title.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Bottom.Title.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Bottom.Title.Font.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Bottom.Title.Font.Shadow.Brush.Visible = True
-        Me.TChart1.Axes.Bottom.Title.Font.Size = 11
-        Me.TChart1.Axes.Bottom.Title.Font.SizeFloat = 11.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Bottom.Title.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Axes.Bottom.Title.ImageBevel.Brush.Solid = True
-        Me.TChart1.Axes.Bottom.Title.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Bottom.Title.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Bottom.Title.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Bottom.Title.Shadow.Brush.Visible = True
-        Me.TChart1.Axes.Bottom.UseMaxPixelPos = True
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Depth.Labels.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Axes.Depth.Labels.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Axes.Depth.Labels.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Axes.Depth.Labels.Brush.Color = System.Drawing.Color.White
-        Me.TChart1.Axes.Depth.Labels.Brush.Solid = True
-        Me.TChart1.Axes.Depth.Labels.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Axes.Depth.Labels.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart1.Axes.Depth.Labels.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Axes.Depth.Labels.Font.Brush.Solid = True
-        Me.TChart1.Axes.Depth.Labels.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Depth.Labels.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Depth.Labels.Font.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Depth.Labels.Font.Shadow.Brush.Visible = True
-        Me.TChart1.Axes.Depth.Labels.Font.Size = 9
-        Me.TChart1.Axes.Depth.Labels.Font.SizeFloat = 9.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Depth.Labels.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Axes.Depth.Labels.ImageBevel.Brush.Solid = True
-        Me.TChart1.Axes.Depth.Labels.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Depth.Labels.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Depth.Labels.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Depth.Labels.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Axes.Depth.Title.Angle = 0
-        '
-        '
-        '
-        Me.TChart1.Axes.Depth.Title.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Axes.Depth.Title.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Axes.Depth.Title.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Axes.Depth.Title.Brush.Color = System.Drawing.Color.Silver
-        Me.TChart1.Axes.Depth.Title.Brush.Solid = True
-        Me.TChart1.Axes.Depth.Title.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Axes.Depth.Title.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart1.Axes.Depth.Title.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
-        Me.TChart1.Axes.Depth.Title.Font.Brush.Solid = True
-        Me.TChart1.Axes.Depth.Title.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Depth.Title.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Depth.Title.Font.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Depth.Title.Font.Shadow.Brush.Visible = True
-        Me.TChart1.Axes.Depth.Title.Font.Size = 11
-        Me.TChart1.Axes.Depth.Title.Font.SizeFloat = 11.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Depth.Title.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Axes.Depth.Title.ImageBevel.Brush.Solid = True
-        Me.TChart1.Axes.Depth.Title.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Depth.Title.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Depth.Title.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Depth.Title.Shadow.Brush.Visible = True
-        Me.TChart1.Axes.Depth.UseMaxPixelPos = True
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.DepthTop.Labels.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Axes.DepthTop.Labels.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Axes.DepthTop.Labels.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Axes.DepthTop.Labels.Brush.Color = System.Drawing.Color.White
-        Me.TChart1.Axes.DepthTop.Labels.Brush.Solid = True
-        Me.TChart1.Axes.DepthTop.Labels.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Axes.DepthTop.Labels.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart1.Axes.DepthTop.Labels.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Axes.DepthTop.Labels.Font.Brush.Solid = True
-        Me.TChart1.Axes.DepthTop.Labels.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.DepthTop.Labels.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.DepthTop.Labels.Font.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.DepthTop.Labels.Font.Shadow.Brush.Visible = True
-        Me.TChart1.Axes.DepthTop.Labels.Font.Size = 9
-        Me.TChart1.Axes.DepthTop.Labels.Font.SizeFloat = 9.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.DepthTop.Labels.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Axes.DepthTop.Labels.ImageBevel.Brush.Solid = True
-        Me.TChart1.Axes.DepthTop.Labels.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.DepthTop.Labels.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.DepthTop.Labels.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.DepthTop.Labels.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Axes.DepthTop.Title.Angle = 0
-        '
-        '
-        '
-        Me.TChart1.Axes.DepthTop.Title.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Axes.DepthTop.Title.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Axes.DepthTop.Title.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Axes.DepthTop.Title.Brush.Color = System.Drawing.Color.Silver
-        Me.TChart1.Axes.DepthTop.Title.Brush.Solid = True
-        Me.TChart1.Axes.DepthTop.Title.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Axes.DepthTop.Title.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart1.Axes.DepthTop.Title.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
-        Me.TChart1.Axes.DepthTop.Title.Font.Brush.Solid = True
-        Me.TChart1.Axes.DepthTop.Title.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.DepthTop.Title.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.DepthTop.Title.Font.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.DepthTop.Title.Font.Shadow.Brush.Visible = True
-        Me.TChart1.Axes.DepthTop.Title.Font.Size = 11
-        Me.TChart1.Axes.DepthTop.Title.Font.SizeFloat = 11.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.DepthTop.Title.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Axes.DepthTop.Title.ImageBevel.Brush.Solid = True
-        Me.TChart1.Axes.DepthTop.Title.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.DepthTop.Title.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.DepthTop.Title.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.DepthTop.Title.Shadow.Brush.Visible = True
-        Me.TChart1.Axes.DepthTop.UseMaxPixelPos = True
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Left.Labels.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Axes.Left.Labels.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Axes.Left.Labels.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Axes.Left.Labels.Brush.Color = System.Drawing.Color.White
-        Me.TChart1.Axes.Left.Labels.Brush.Solid = True
-        Me.TChart1.Axes.Left.Labels.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Axes.Left.Labels.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart1.Axes.Left.Labels.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Axes.Left.Labels.Font.Brush.Solid = True
-        Me.TChart1.Axes.Left.Labels.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Left.Labels.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Left.Labels.Font.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Left.Labels.Font.Shadow.Brush.Visible = True
-        Me.TChart1.Axes.Left.Labels.Font.Size = 9
-        Me.TChart1.Axes.Left.Labels.Font.SizeFloat = 9.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Left.Labels.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Axes.Left.Labels.ImageBevel.Brush.Solid = True
-        Me.TChart1.Axes.Left.Labels.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Left.Labels.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Left.Labels.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Left.Labels.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Axes.Left.Title.Angle = 90
-        '
-        '
-        '
-        Me.TChart1.Axes.Left.Title.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Axes.Left.Title.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Axes.Left.Title.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Axes.Left.Title.Brush.Color = System.Drawing.Color.Silver
-        Me.TChart1.Axes.Left.Title.Brush.Solid = True
-        Me.TChart1.Axes.Left.Title.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Axes.Left.Title.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart1.Axes.Left.Title.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
-        Me.TChart1.Axes.Left.Title.Font.Brush.Solid = True
-        Me.TChart1.Axes.Left.Title.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Left.Title.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Left.Title.Font.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Left.Title.Font.Shadow.Brush.Visible = True
-        Me.TChart1.Axes.Left.Title.Font.Size = 11
-        Me.TChart1.Axes.Left.Title.Font.SizeFloat = 11.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Left.Title.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Axes.Left.Title.ImageBevel.Brush.Solid = True
-        Me.TChart1.Axes.Left.Title.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Left.Title.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Left.Title.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Left.Title.Shadow.Brush.Visible = True
-        Me.TChart1.Axes.Left.UseMaxPixelPos = True
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Right.Labels.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Axes.Right.Labels.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Axes.Right.Labels.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Axes.Right.Labels.Brush.Color = System.Drawing.Color.White
-        Me.TChart1.Axes.Right.Labels.Brush.Solid = True
-        Me.TChart1.Axes.Right.Labels.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Axes.Right.Labels.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart1.Axes.Right.Labels.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Axes.Right.Labels.Font.Brush.Solid = True
-        Me.TChart1.Axes.Right.Labels.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Right.Labels.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Right.Labels.Font.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Right.Labels.Font.Shadow.Brush.Visible = True
-        Me.TChart1.Axes.Right.Labels.Font.Size = 9
-        Me.TChart1.Axes.Right.Labels.Font.SizeFloat = 9.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Right.Labels.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Axes.Right.Labels.ImageBevel.Brush.Solid = True
-        Me.TChart1.Axes.Right.Labels.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Right.Labels.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Right.Labels.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Right.Labels.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Axes.Right.Title.Angle = 270
-        '
-        '
-        '
-        Me.TChart1.Axes.Right.Title.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Axes.Right.Title.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Axes.Right.Title.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Axes.Right.Title.Brush.Color = System.Drawing.Color.Silver
-        Me.TChart1.Axes.Right.Title.Brush.Solid = True
-        Me.TChart1.Axes.Right.Title.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Axes.Right.Title.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart1.Axes.Right.Title.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
-        Me.TChart1.Axes.Right.Title.Font.Brush.Solid = True
-        Me.TChart1.Axes.Right.Title.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Right.Title.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Right.Title.Font.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Right.Title.Font.Shadow.Brush.Visible = True
-        Me.TChart1.Axes.Right.Title.Font.Size = 11
-        Me.TChart1.Axes.Right.Title.Font.SizeFloat = 11.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Right.Title.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Axes.Right.Title.ImageBevel.Brush.Solid = True
-        Me.TChart1.Axes.Right.Title.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Right.Title.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Right.Title.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Right.Title.Shadow.Brush.Visible = True
-        Me.TChart1.Axes.Right.UseMaxPixelPos = True
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Top.Labels.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Axes.Top.Labels.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Axes.Top.Labels.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Axes.Top.Labels.Brush.Color = System.Drawing.Color.White
-        Me.TChart1.Axes.Top.Labels.Brush.Solid = True
-        Me.TChart1.Axes.Top.Labels.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Axes.Top.Labels.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart1.Axes.Top.Labels.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Axes.Top.Labels.Font.Brush.Solid = True
-        Me.TChart1.Axes.Top.Labels.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Top.Labels.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Top.Labels.Font.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Top.Labels.Font.Shadow.Brush.Visible = True
-        Me.TChart1.Axes.Top.Labels.Font.Size = 9
-        Me.TChart1.Axes.Top.Labels.Font.SizeFloat = 9.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Top.Labels.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Axes.Top.Labels.ImageBevel.Brush.Solid = True
-        Me.TChart1.Axes.Top.Labels.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Top.Labels.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Top.Labels.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Top.Labels.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Axes.Top.Title.Angle = 0
-        '
-        '
-        '
-        Me.TChart1.Axes.Top.Title.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Axes.Top.Title.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Axes.Top.Title.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Axes.Top.Title.Brush.Color = System.Drawing.Color.Silver
-        Me.TChart1.Axes.Top.Title.Brush.Solid = True
-        Me.TChart1.Axes.Top.Title.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Axes.Top.Title.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart1.Axes.Top.Title.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
-        Me.TChart1.Axes.Top.Title.Font.Brush.Solid = True
-        Me.TChart1.Axes.Top.Title.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Top.Title.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Top.Title.Font.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Top.Title.Font.Shadow.Brush.Visible = True
-        Me.TChart1.Axes.Top.Title.Font.Size = 11
-        Me.TChart1.Axes.Top.Title.Font.SizeFloat = 11.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Top.Title.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Axes.Top.Title.ImageBevel.Brush.Solid = True
-        Me.TChart1.Axes.Top.Title.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Top.Title.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Top.Title.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Top.Title.Shadow.Brush.Visible = True
-        Me.TChart1.Axes.Top.UseMaxPixelPos = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Footer.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Footer.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Footer.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Footer.Brush.Color = System.Drawing.Color.Silver
-        Me.TChart1.Footer.Brush.Solid = True
-        Me.TChart1.Footer.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Footer.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart1.Footer.Font.Brush.Color = System.Drawing.Color.Red
-        Me.TChart1.Footer.Font.Brush.Solid = True
-        Me.TChart1.Footer.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Footer.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Footer.Font.Shadow.Brush.Solid = True
-        Me.TChart1.Footer.Font.Shadow.Brush.Visible = True
-        Me.TChart1.Footer.Font.Size = 8
-        Me.TChart1.Footer.Font.SizeFloat = 8.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Footer.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Footer.ImageBevel.Brush.Solid = True
-        Me.TChart1.Footer.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Footer.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Footer.Shadow.Brush.Solid = True
-        Me.TChart1.Footer.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Header.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Header.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Header.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Header.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.TChart1.Header.Brush.Solid = True
-        Me.TChart1.Header.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Header.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart1.Header.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Header.Font.Brush.Solid = True
-        Me.TChart1.Header.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Header.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Header.Font.Shadow.Brush.Solid = True
-        Me.TChart1.Header.Font.Shadow.Brush.Visible = True
-        Me.TChart1.Header.Font.Size = 12
-        Me.TChart1.Header.Font.SizeFloat = 12.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Header.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Header.ImageBevel.Brush.Solid = True
-        Me.TChart1.Header.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Header.Shadow.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(169, Byte), Integer), CType(CType(169, Byte), Integer), CType(CType(169, Byte), Integer))
-        Me.TChart1.Header.Shadow.Brush.Solid = True
-        Me.TChart1.Header.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Legend.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Legend.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Legend.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Legend.Brush.Color = System.Drawing.Color.White
-        Me.TChart1.Legend.Brush.Solid = True
-        Me.TChart1.Legend.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Legend.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart1.Legend.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
-        Me.TChart1.Legend.Font.Brush.Solid = True
-        Me.TChart1.Legend.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Legend.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Legend.Font.Shadow.Brush.Solid = True
-        Me.TChart1.Legend.Font.Shadow.Brush.Visible = True
-        Me.TChart1.Legend.Font.Size = 9
-        Me.TChart1.Legend.Font.SizeFloat = 9.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Legend.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Legend.ImageBevel.Brush.Solid = True
-        Me.TChart1.Legend.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Legend.Shadow.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer))
-        Me.TChart1.Legend.Shadow.Brush.Solid = True
-        Me.TChart1.Legend.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Legend.Symbol.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Legend.Symbol.Shadow.Brush.Solid = True
-        Me.TChart1.Legend.Symbol.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Legend.Title.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Legend.Title.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Legend.Title.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Legend.Title.Brush.Color = System.Drawing.Color.White
-        Me.TChart1.Legend.Title.Brush.Solid = True
-        Me.TChart1.Legend.Title.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Legend.Title.Font.Bold = True
-        '
-        '
-        '
-        Me.TChart1.Legend.Title.Font.Brush.Color = System.Drawing.Color.Black
-        Me.TChart1.Legend.Title.Font.Brush.Solid = True
-        Me.TChart1.Legend.Title.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Legend.Title.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Legend.Title.Font.Shadow.Brush.Solid = True
-        Me.TChart1.Legend.Title.Font.Shadow.Brush.Visible = True
-        Me.TChart1.Legend.Title.Font.Size = 8
-        Me.TChart1.Legend.Title.Font.SizeFloat = 8.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Legend.Title.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Legend.Title.ImageBevel.Brush.Solid = True
-        Me.TChart1.Legend.Title.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Legend.Title.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Legend.Title.Shadow.Brush.Solid = True
-        Me.TChart1.Legend.Title.Shadow.Brush.Visible = True
-        Me.TChart1.Location = New System.Drawing.Point(0, 25)
-        Me.TChart1.Margin = New System.Windows.Forms.Padding(0)
-        Me.TChart1.Name = "TChart1"
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Panel.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Panel.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Panel.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Panel.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Panel.Brush.Solid = True
-        Me.TChart1.Panel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Panel.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Panel.ImageBevel.Brush.Solid = True
-        Me.TChart1.Panel.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Panel.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Panel.Shadow.Brush.Solid = True
-        Me.TChart1.Panel.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        Margins1.Bottom = 100
-        Margins1.Left = 100
-        Margins1.Right = 100
-        Margins1.Top = 100
-        Me.TChart1.Printer.Margins = Margins1
-        Me.TChart1.Size = New System.Drawing.Size(784, 424)
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.SubFooter.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.SubFooter.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.SubFooter.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.SubFooter.Brush.Color = System.Drawing.Color.Silver
-        Me.TChart1.SubFooter.Brush.Solid = True
-        Me.TChart1.SubFooter.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.SubFooter.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart1.SubFooter.Font.Brush.Color = System.Drawing.Color.Red
-        Me.TChart1.SubFooter.Font.Brush.Solid = True
-        Me.TChart1.SubFooter.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.SubFooter.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.SubFooter.Font.Shadow.Brush.Solid = True
-        Me.TChart1.SubFooter.Font.Shadow.Brush.Visible = True
-        Me.TChart1.SubFooter.Font.Size = 8
-        Me.TChart1.SubFooter.Font.SizeFloat = 8.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.SubFooter.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.SubFooter.ImageBevel.Brush.Solid = True
-        Me.TChart1.SubFooter.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.SubFooter.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.SubFooter.Shadow.Brush.Solid = True
-        Me.TChart1.SubFooter.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.SubHeader.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.SubHeader.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.SubHeader.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.SubHeader.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.TChart1.SubHeader.Brush.Solid = True
-        Me.TChart1.SubHeader.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.SubHeader.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart1.SubHeader.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.SubHeader.Font.Brush.Solid = True
-        Me.TChart1.SubHeader.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.SubHeader.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.SubHeader.Font.Shadow.Brush.Solid = True
-        Me.TChart1.SubHeader.Font.Shadow.Brush.Visible = True
-        Me.TChart1.SubHeader.Font.Size = 12
-        Me.TChart1.SubHeader.Font.SizeFloat = 12.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.SubHeader.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.SubHeader.ImageBevel.Brush.Solid = True
-        Me.TChart1.SubHeader.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.SubHeader.Shadow.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(169, Byte), Integer), CType(CType(169, Byte), Integer), CType(CType(169, Byte), Integer))
-        Me.TChart1.SubHeader.Shadow.Brush.Solid = True
-        Me.TChart1.SubHeader.Shadow.Brush.Visible = True
-        Me.TChart1.TabIndex = 0
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Walls.Back.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Walls.Back.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Walls.Back.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Walls.Back.Brush.Color = System.Drawing.Color.Silver
-        Me.TChart1.Walls.Back.Brush.Solid = True
-        Me.TChart1.Walls.Back.Brush.Visible = False
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Walls.Back.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Walls.Back.ImageBevel.Brush.Solid = True
-        Me.TChart1.Walls.Back.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Walls.Back.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Walls.Back.Shadow.Brush.Solid = True
-        Me.TChart1.Walls.Back.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Walls.Bottom.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Walls.Bottom.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Walls.Bottom.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Walls.Bottom.Brush.Color = System.Drawing.Color.White
-        Me.TChart1.Walls.Bottom.Brush.Solid = True
-        Me.TChart1.Walls.Bottom.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Walls.Bottom.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Walls.Bottom.ImageBevel.Brush.Solid = True
-        Me.TChart1.Walls.Bottom.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Walls.Bottom.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Walls.Bottom.Shadow.Brush.Solid = True
-        Me.TChart1.Walls.Bottom.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Walls.Left.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Walls.Left.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Walls.Left.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Walls.Left.Brush.Color = System.Drawing.Color.LightYellow
-        Me.TChart1.Walls.Left.Brush.Solid = True
-        Me.TChart1.Walls.Left.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Walls.Left.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Walls.Left.ImageBevel.Brush.Solid = True
-        Me.TChart1.Walls.Left.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Walls.Left.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Walls.Left.Shadow.Brush.Solid = True
-        Me.TChart1.Walls.Left.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Walls.Right.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Walls.Right.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Walls.Right.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Walls.Right.Brush.Color = System.Drawing.Color.LightYellow
-        Me.TChart1.Walls.Right.Brush.Solid = True
-        Me.TChart1.Walls.Right.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Walls.Right.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Walls.Right.ImageBevel.Brush.Solid = True
-        Me.TChart1.Walls.Right.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Walls.Right.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Walls.Right.Shadow.Brush.Solid = True
-        Me.TChart1.Walls.Right.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Zoom.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(127, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Zoom.Brush.Solid = True
-        Me.TChart1.Zoom.Brush.Visible = False
+        Me.ResultPlot.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.ResultPlot.Location = New System.Drawing.Point(0, 0)
+        Me.ResultPlot.Name = "ResultPlot"
+        Me.ResultPlot.Size = New System.Drawing.Size(784, 425)
+        Me.ResultPlot.TabIndex = 0
         '
         'AnalysisResultChart
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(784, 450)
+        Me.Controls.Add(Me.Panel1)
         Me.Controls.Add(ToolStrip1)
-        Me.Controls.Add(Me.TChart1)
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
         Me.MinimumSize = New System.Drawing.Size(400, 200)
         Me.Name = "AnalysisResultChart"
         Me.Text = "Analysis Result Chart"
         ToolStrip1.ResumeLayout(False)
         ToolStrip1.PerformLayout()
+        Me.Panel1.ResumeLayout(False)
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
     End Sub
-
-    Friend WithEvents TChart1 As Steema.TeeChart.TChart
     Friend WithEvents ToolStripButton_Copy As ToolStripButton
     Friend WithEvents ToolStripButton_EditChart As ToolStripButton
+    Friend WithEvents Panel1 As Panel
+    Friend WithEvents ResultPlot As ScottPlot.FormsPlot
 End Class
diff --git a/source/Analysis/AnalysisResultChart.vb b/source/Analysis/AnalysisResultChart.vb
index de7d1e70..1f12061d 100644
--- a/source/Analysis/AnalysisResultChart.vb
+++ b/source/Analysis/AnalysisResultChart.vb
@@ -17,17 +17,28 @@
 '
 ''' <summary>
 ''' Form to display an analysis result chart
-''' TODO: unlike the main chart, this chart uses the inbuilt TeeChart zoom and pan behaviour, which may be unexpected for users
 ''' </summary>
 Friend Class AnalysisResultChart
 
+    Public Sub New(plot As ScottPlot.Plot)
+
+        ' This call is required by the designer.
+        InitializeComponent()
+
+        ' Add any initialization after the InitializeComponent() call.
+
+        'replace the plot
+        Me.ResultPlot.Reset(plot)
+
+    End Sub
+
     ''' <summary>
     ''' Copy chart to clipboard as PNG image
     ''' </summary>
     ''' <param name="sender"></param>
     ''' <param name="e"></param>
     Private Sub ToolStripButton_Copy_Click(sender As Object, e As EventArgs) Handles ToolStripButton_Copy.Click
-        Call Me.TChart1.Export.Image.PNG.CopyToClipboard()
+        Clipboard.SetImage(Me.ResultPlot.Plot.Render())
     End Sub
 
     ''' <summary>
@@ -35,8 +46,13 @@ Friend Class AnalysisResultChart
     ''' </summary>
     ''' <param name="sender"></param>
     ''' <param name="e"></param>
-    Private Sub ToolStripButton_EditChart_Click(sender As Object, e As EventArgs) Handles ToolStripButton_EditChart.Click, TChart1.DoubleClick
-        TChart1.ShowEditor()
+    Private Sub ToolStripButton_EditChart_Click(sender As Object, e As EventArgs) Handles ToolStripButton_EditChart.Click
+        'TODO: TChart
+        MsgBox("Not yet implemented!", MsgBoxStyle.Critical)
+    End Sub
+
+    Private Sub AnalysisResultChart_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        Me.ResultPlot.Refresh()
     End Sub
 
 End Class
\ No newline at end of file
diff --git a/source/Analysis/AnnualRecurrenceProbability.vb b/source/Analysis/AnnualRecurrenceProbability.vb
index 01f6b6db..2a4c20dd 100644
--- a/source/Analysis/AnnualRecurrenceProbability.vb
+++ b/source/Analysis/AnnualRecurrenceProbability.vb
@@ -228,44 +228,45 @@ Friend Class AnnualRecurrenceProbability
             )
         Next
 
-        'Chart
-        ResultChart = New Steema.TeeChart.Chart()
+        'result chart
+        ResultChart = New ScottPlot.Plot()
         Call Helpers.FormatChart(ResultChart)
-        ResultChart.Walls.Back.Visible = True
-
-        'Legend
-        ResultChart.Legend.CheckBoxes = False
-        ResultChart.Legend.Alignment = Steema.TeeChart.LegendAlignments.Top
-
-        'x-Axis
-        ResultChart.Axes.Bottom.Labels.Style = Steema.TeeChart.AxisLabelStyle.Value
-        ResultChart.Axes.Bottom.Title.Caption = "Return period [years]"
-        ResultChart.Axes.Bottom.Labels.Angle = 90
-        ResultChart.Axes.Bottom.Logarithmic = True
-        ResultChart.Axes.Bottom.LogarithmicBase = 10
-        ResultChart.Axes.Bottom.Automatic = False
-        ResultChart.Axes.Bottom.Minimum = 1
-        ResultChart.Axes.Bottom.Maximum = 100
-        ResultChart.Axes.Bottom.Increment = 1
-        ResultChart.Axes.Bottom.Grid.DrawEvery = 1
-
-        'y-Axis
-        ResultChart.Axes.Left.AutomaticMaximum = True
-        ResultChart.Axes.Left.AutomaticMinimum = False
-        ResultChart.Axes.Left.Minimum = 0
-        ResultChart.Axes.Left.MaximumRound = True
-        ResultChart.Axes.Left.Grid.DrawEvery = 1
-        ResultChart.Axes.Left.Title.Caption = Me.InputTimeSeries(0).Unit
+
+        'legend
+        ResultChart.Legend.Location = ScottPlot.Alignment.LowerRight
+
+        'X axis
+        ResultChart.XLabel("Return period [years]")
+        ResultChart.XAxis.DateTimeFormat(False)
+        ResultChart.XAxis.TickLabelStyle(rotation:=90)
+        'logarithmic labels and ticks
+        ResultChart.XAxis.TickLabelFormat(Function(x As Double) Math.Pow(10, x).ToString("N0"))
+        ResultChart.XAxis.MinorLogScale(True)
+        ResultChart.XAxis.MajorGrid(True, Color.FromArgb(80, Color.Black))
+        ResultChart.XAxis.MinorGrid(True, Color.FromArgb(20, Color.Black))
+
+        'Y axis
+        ResultChart.YLabel(Me.InputTimeSeries(0).Unit)
 
         'point series
-        Dim points As New Steema.TeeChart.Styles.Points(ResultChart)
-        points.Title = $"Plotting Position ({InputTimeSeries(0).Title})"
+        Dim Xs As New List(Of Double)
+        Dim Ys As New List(Of Double)
+        Dim labels As New List(Of String)
         For Each ev As AnnualEvent In Me.events
-            points.Add(ev.returnPeriod, ev.maxValue, ev.year.ToString())
+            Xs.Add(Math.Log10(ev.returnPeriod)) 'plot the log value
+            Ys.Add(ev.maxValue)
+            labels.Add(ev.year.ToString())
         Next
-        'prepare year label as mark, but hide it by default
-        points.Marks.Style = Steema.TeeChart.Styles.MarksStyles.Label
-        points.Marks.Visible = False
+        Dim points As ScottPlot.Plottable.ScatterPlot
+        points = ResultChart.AddScatterPoints(Xs.ToArray(), Ys.ToArray())
+        points.Label = $"Plotting Position ({InputTimeSeries(0).Title})"
+        points.MarkerSize = 10
+        points.MarkerShape = ScottPlot.MarkerShape.filledSquare
+        'add data point labels
+        points.DataPointLabels = labels.ToArray()
+
+        'set Y axis limits
+        ResultChart.YAxis.Dims.SetAxis(0, Ys.Max() * 1.1)
 
         'result series (annual maxima)
         Dim ts As New TimeSeries(Me.InputTimeSeries(0).Title + " (annual maxima)")
diff --git a/source/Analysis/Autocorrelation.vb b/source/Analysis/Autocorrelation.vb
index 05b9db6a..a3ebc8c8 100644
--- a/source/Analysis/Autocorrelation.vb
+++ b/source/Analysis/Autocorrelation.vb
@@ -197,51 +197,67 @@ Friend Class Autocorrelation
             $"Assumed periodicity: {periode_avg} time steps" & eol &
             raMaxAuswertung
 
-        'Ergebnisdiagramm
-        Me.ResultChart = New Steema.TeeChart.Chart()
+        'Result chart
+        Me.ResultChart = New ScottPlot.Plot()
         Call Helpers.FormatChart(Me.ResultChart)
-        Me.ResultChart.Header.Text = "Autocorrelation for " & ts_in.Title
 
-        'X-Achse
-        Me.ResultChart.Axes.Bottom.Labels.Style = Steema.TeeChart.AxisLabelStyle.Value
-        Me.ResultChart.Axes.Bottom.Title.Caption = "Offset (Lag) [number of time steps]"
+        Me.ResultChart.Title($"Autocorrelation for {ts_in.Title}")
 
-        'Y-Achse
-        Me.ResultChart.Axes.Left.Title.Caption = "Autocorrelation coefficient (-1 < ra < 1)"
-        Me.ResultChart.Axes.Left.Automatic = False
-        Me.ResultChart.Axes.Left.Minimum = -1
-        Me.ResultChart.Axes.Left.Maximum = 1
+        'X axis
+        Me.ResultChart.XLabel("Offset (Lag) [number of time steps]")
+        Me.ResultChart.XAxis.DateTimeFormat(False)
 
-        'Linie instanzieren und benennen
-        Dim line_ra As New Steema.TeeChart.Styles.Bar(Me.ResultChart)
-        line_ra.Title = "Autocorrelogram"
-        Dim line_raMax As New Steema.TeeChart.Styles.Points(Me.ResultChart)
-        line_raMax.Title = "Peaks (guessed)"
+        'Y axis
+        Me.ResultChart.YLabel("Autocorrelation coefficient (-1 < ra < 1)")
+        Me.ResultChart.YAxis.Dims.SetAxis(-1, 1)
 
-        'Linie befüllen
+        'series
+        Dim Xs, Ys As List(Of Double)
+        Dim labels As List(Of String)
+
+        'add bar plot
+        Xs = New List(Of Double)
+        Ys = New List(Of Double)
+        labels = New List(Of String)
         For i = 0 To Me.lagCount
-            Dim mark As String = $"Lag {i * lagSize}, ra = {raList.Item(i)}"
-            line_ra.Add(i * lagSize, raList.Item(i), mark)
+            Xs.Add(i * lagSize)
+            Ys.Add(raList.Item(i))
+            labels.Add($"Lag {i * lagSize}, ra = {Math.Round(raList.Item(i), 3)}")
         Next
-
+        Dim bars As ScottPlot.Plottable.BarPlot
+        bars = Me.ResultChart.AddBar(values:=Ys.ToArray(), positions:=Xs.ToArray())
+        bars.Label = "Autocorrelogram"
+        bars.BarWidth = lagSize
+        bars.PositionOffset = -0.5 * lagSize 'center bars
+        bars.FillColorNegative = bars.FillColor 'use same color for positive and negative values
+        'TODO: TChart
+        'show labels on hover
+        'Dim markstips As New Steema.TeeChart.Tools.MarksTip(Me.ResultChart)
+        'markstips.MouseAction = Steema.TeeChart.Tools.MarksTipMouseAction.Move
+
+        'add point series
+        Xs = New List(Of Double)
+        Ys = New List(Of Double)
+        labels = New List(Of String)
         For i = 0 To Me.periodeList.Count - 1
-            Dim mark As String = $"Lag {periodeList.Item(i)}, ra = {raMaxlist.Item(i)}"
-            line_raMax.Add(periodeList.Item(i), raMaxlist.Item(i), mark)
+            Xs.Add(periodeList.Item(i))
+            Ys.Add(raMaxlist.Item(i))
+            labels.Add($"Lag {periodeList.Item(i)}, ra = {Math.Round(raMaxlist.Item(i), 3)}")
         Next
-
-        'Marks nicht anzeigen
-        line_ra.Marks.Visible = False
-
-        'Markstips bei Mausaktion anzeigen
-        Dim markstips As New Steema.TeeChart.Tools.MarksTip(Me.ResultChart)
-        markstips.MouseAction = Steema.TeeChart.Tools.MarksTipMouseAction.Move
-
-        'Textfeld in Diagramm einfügen und Position bestimmen
-        Dim annot As New Steema.TeeChart.Tools.Annotation(Me.ResultChart)
-        annot.Text =
+        Dim points As ScottPlot.Plottable.ScatterPlot
+        points = Me.ResultChart.AddScatterPoints(Xs.ToArray(), Ys.ToArray(), label:="Peaks (guessed)")
+        points.MarkerShape = ScottPlot.MarkerShape.filledSquare
+        points.MarkerSize = 10
+        points.DataPointLabels = labels.ToArray()
+
+        'add annotation
+        Dim annot As New ScottPlot.Plottable.Annotation()
+        annot.Label =
             $"Time series was offset {lagCount} times by {lagSize} time steps." & eol &
             $"Assumed periodicity: {periode_avg}"
-        annot.Position = Steema.TeeChart.Tools.AnnotationPositions.RightTop
+        annot.Alignment = ScottPlot.Alignment.LowerRight
+        annot.BackgroundColor = Color.White
+        Me.ResultChart.Add(annot)
 
         'Announce finish
         MyBase.AnalysisProgressFinish()
diff --git a/source/Analysis/Comparison.vb b/source/Analysis/Comparison.vb
index 2bb8b9be..97f0e60d 100644
--- a/source/Analysis/Comparison.vb
+++ b/source/Analysis/Comparison.vb
@@ -149,63 +149,51 @@ Friend Class Comparison
         Dim x_unit As String = Me.ts_x.Unit
         Dim y_unit As String = Me.ts_y.Unit
 
-        'Text:
-        '-----
+        'Result text
         Me.ResultText = $"The analysis is based on {Me.ts_x.Length} coincident data points between {Me.ts_x.StartDate.ToString(Helpers.CurrentDateFormat)} and {Me.ts_x.EndDate.ToString(Helpers.CurrentDateFormat)}"
 
-        'Diagramm:
-        '---------
-        Dim series_points As Steema.TeeChart.Styles.Points
-        Dim regression_line As Steema.TeeChart.Styles.Line
+        'Result chart
+        Dim series_points As ScottPlot.Plottable.ScatterPlot
+        Dim regression_line As ScottPlot.Plottable.ScatterPlot
 
-        Me.ResultChart = New Steema.TeeChart.Chart()
+        Me.ResultChart = New ScottPlot.Plot()
         Call Helpers.FormatChart(Me.ResultChart)
-        Me.ResultChart.Header.Text = $"Comparison ({x_title} / {y_title})"
-        Me.ResultChart.Legend.Visible = False
-
-        'Achsen
-        '------
-        Me.ResultChart.Axes.Bottom.Title.Caption = $"{x_title}  [{x_unit}]"
-        Me.ResultChart.Axes.Bottom.Labels.Style = Steema.TeeChart.AxisLabelStyle.Value
-        Me.ResultChart.Axes.Left.Title.Caption = $"{y_title}  [{y_unit}]"
-        Me.ResultChart.Axes.Left.Labels.Style = Steema.TeeChart.AxisLabelStyle.Value
-
-        'Reihen
-        '------
-        series_points = New Steema.TeeChart.Styles.Points(Me.ResultChart)
-        series_points.Title = $"Comparison {x_title} - {y_title}"
-        series_points.Pointer.Visible = True
-        series_points.Pointer.Style = Steema.TeeChart.Styles.PointerStyles.Circle
-        series_points.Pointer.HorizSize = 2
-        series_points.Pointer.VertSize = 2
-
-        regression_line = New Steema.TeeChart.Styles.Line(Me.ResultChart)
-        regression_line.Title = "Regression line"
-        regression_line.LinePen.Width = 2
-        regression_line.LinePen.Color = Color.Red
-
-        'Plot points
-        '-----------
-        series_points.Add(x_values, y_values)
-
-        'Plot regression line
-        '--------------------
+        Me.ResultChart.XAxis.DateTimeFormat(False)
+
+        Me.ResultChart.Title($"Comparison ({x_title} / {y_title})")
+        Me.ResultChart.Legend.IsVisible = False
+
+        'axes
+        Me.ResultChart.XLabel($"{x_title}  [{x_unit}]")
+        Me.ResultChart.YLabel($"{y_title}  [{y_unit}]")
+
+        'point series
+        series_points = Me.ResultChart.AddScatterPoints(x_values, y_values)
+        series_points.Label = $"Comparison {x_title} - {y_title}"
+        series_points.MarkerShape = ScottPlot.MarkerShape.filledCircle
+        series_points.MarkerSize = 4
+
+        'regression line
         Dim intercept, slope As Double
         Dim x_min, x_max As Double
         x_min = x_values.Min()
         x_max = x_values.Max()
         intercept = Me.ResultValues("Linear regression intercept")
         slope = Me.ResultValues("Linear regression slope")
-        regression_line.Add(x_min, slope * x_min + intercept)
-        regression_line.Add(x_max, slope * x_max + intercept)
-
-        'Annotation
-        '----------
-        Dim anno As New Steema.TeeChart.Tools.Annotation(Me.ResultChart)
-        anno.Position = Steema.TeeChart.Tools.AnnotationPositions.RightBottom
-        anno.Text = $"Correlation coefficient: {Me.ResultValues("Correlation coefficient").ToString(DefaultNumberFormat)}" & eol
-        anno.Text &= "Linear regression line: " & eol
-        anno.Text &= $"y = {slope.ToString(DefaultNumberFormat)} * x + {intercept.ToString(DefaultNumberFormat)}"
+        regression_line = Me.ResultChart.AddScatterLines({x_min, x_max}, {slope * x_min + intercept, slope * x_max + intercept})
+        regression_line.Label = "Regression line"
+        regression_line.LineWidth = 2
+        regression_line.LineColor = Color.Red
+
+        'annotation
+        Dim annot As New ScottPlot.Plottable.Annotation()
+        annot.Label =
+            $"Correlation coefficient: {Me.ResultValues("Correlation coefficient").ToString(DefaultNumberFormat)}" & eol &
+            "Linear regression line: " & eol &
+            $"y = {slope.ToString(DefaultNumberFormat)} * x + {intercept.ToString(DefaultNumberFormat)}"
+        annot.Alignment = ScottPlot.Alignment.LowerRight
+        annot.BackgroundColor = Color.White
+        Me.ResultChart.Add(annot)
 
     End Sub
 
diff --git a/source/Analysis/DoubleSumCurve.vb b/source/Analysis/DoubleSumCurve.vb
index a3556ac9..dd84594f 100644
--- a/source/Analysis/DoubleSumCurve.vb
+++ b/source/Analysis/DoubleSumCurve.vb
@@ -126,42 +126,30 @@ Friend Class DoubleSumCurve
         '-----
         Me.ResultText = $"The analysis is based on {Me.summe1.Length} coincident data points between {Me.ts_1.StartDate.ToString(Helpers.CurrentDateFormat)} and {Me.ts_1.EndDate.ToString(Helpers.CurrentDateFormat)}"
 
-        'Diagramm:
-        '---------
-        Dim doppelsumme, gerade As Steema.TeeChart.Styles.Line
+        'Result chart:
+        Dim doppelsumme, gerade As ScottPlot.Plottable.ScatterPlot
 
-        Me.ResultChart = New Steema.TeeChart.Chart()
+        Me.ResultChart = New ScottPlot.Plot()
         Call Helpers.FormatChart(Me.ResultChart)
-        Me.ResultChart.Header.Text = $"Double Sum Curve ({Me.ts_1.Title} / {Me.ts_2.Title})"
-        Me.ResultChart.Legend.Visible = False
-
-        'Achsen
-        '------
-        Me.ResultChart.Axes.Bottom.Title.Caption = $"Sum {Me.ts_1.Title}"
-        Me.ResultChart.Axes.Bottom.Labels.Style = Steema.TeeChart.AxisLabelStyle.Value
-        Me.ResultChart.Axes.Left.Title.Caption = $"Sum {Me.ts_2.Title}"
-        Me.ResultChart.Axes.Left.Labels.Style = Steema.TeeChart.AxisLabelStyle.Value
-
-        'Reihen
-        '------
-        doppelsumme = New Steema.TeeChart.Styles.Line(Me.ResultChart)
-        doppelsumme.Title = $"Double Sum Curve {Me.ts_1.Title} - {Me.ts_2.Title}"
-        doppelsumme.Pointer.Visible = True
-        doppelsumme.Pointer.Style = Steema.TeeChart.Styles.PointerStyles.Circle
-        doppelsumme.Pointer.HorizSize = 2
-        doppelsumme.Pointer.VertSize = 2
-
-        gerade = New Steema.TeeChart.Styles.Line(Me.ResultChart)
-        gerade.Title = "45° line"
-        gerade.Color = Color.DarkGray
-        gerade.LinePen.Style = Drawing2D.DashStyle.Dash
-
-        'Werte eintragen
-        doppelsumme.Add(summe1, summe2)
-
-        gerade.Add(0, 0)
-        Dim maxwert As Double = Math.Min(Me.ResultChart.Axes.Bottom.MaxXValue, Me.ResultChart.Axes.Left.MaxYValue)
-        gerade.Add(maxwert, maxwert)
+        Me.ResultChart.XAxis.DateTimeFormat(False)
+        Me.ResultChart.Title($"Double Sum Curve ({Me.ts_1.Title} / {Me.ts_2.Title})")
+        Me.ResultChart.Legend.IsVisible = False
+
+        'axes
+        Me.ResultChart.XLabel($"Sum {Me.ts_1.Title}")
+        Me.ResultChart.YLabel($"Sum {Me.ts_2.Title}")
+
+        'series
+        doppelsumme = Me.ResultChart.AddScatter(summe1, summe2)
+        doppelsumme.Label = $"Double Sum Curve {Me.ts_1.Title} - {Me.ts_2.Title}"
+        doppelsumme.MarkerShape = ScottPlot.MarkerShape.filledCircle
+        doppelsumme.MarkerSize = 4
+
+        Dim max As Double = Math.Max(summe1.Max, summe2.Max)
+        gerade = Me.ResultChart.AddScatterLines({0, max}, {0, max})
+        gerade.Label = "45° line"
+        gerade.LineColor = Color.DarkGray
+        gerade.LineStyle = ScottPlot.LineStyle.Dash
 
     End Sub
 
diff --git a/source/Analysis/GoodnessOfFit.vb b/source/Analysis/GoodnessOfFit.vb
index 1d53355e..9d05eb6a 100644
--- a/source/Analysis/GoodnessOfFit.vb
+++ b/source/Analysis/GoodnessOfFit.vb
@@ -355,12 +355,13 @@ Friend Class GoodnessOfFit
 
         'result chart (radar plot):
         '--------------------------
-        'TODO: m is currently plotted using its absolute value, but labelled with the actual value, while the axis title says "absolute", confusing?
-        'TODO: the axis titles and grid disappear when the last series is unchecked by the user, why?
+        'TODO: NaN and negative values mess up the chart!
 
-        Me.ResultChart = New Steema.TeeChart.Chart()
+        Me.ResultChart = New ScottPlot.Plot()
         Call Helpers.FormatChart(Me.ResultChart)
-        Me.ResultChart.Header.Text = $"Goodness of Fit: {Me.ts_obs.Title} vs. {String.Join(", ", Me.ts_sim_list)}"
+        Me.ResultChart.XAxis.DateTimeFormat(False)
+
+        Me.ResultChart.Title($"Goodness of Fit: {Me.ts_obs.Title} vs. {String.Join(", ", Me.ts_sim_list)}")
 
         'determine max absolute volume error for scaling
         Dim max_abs_volume_error As Double = 0
@@ -378,55 +379,48 @@ Friend Class GoodnessOfFit
             max_abs_volume_error = 0.1
         End If
 
+        Dim axistitles() As String = {
+            "Absolute volume error [%]",
+            "Nash-Sutcliffe efficiency",
+            "Logarithmic Nash-Sutcliffe efficiency",
+            "Kling-Gupta efficiency",
+            "Coefficient of correlation"
+        }
+
+        Dim maxvalues() As Double = {
+            max_abs_volume_error,
+            1,
+            1,
+            1,
+            1
+        }
+
+        Dim labels As New List(Of String)
         For Each series_title As String In Me.GoFResults.Keys
-            For Each kvp As KeyValuePair(Of String, GoF) In Me.GoFResults(series_title)
-                Dim period = kvp.Key
-                Dim gof As GoF = kvp.Value
-
-                Dim series As New Steema.TeeChart.Styles.Radar(Me.ResultChart.Chart)
-                series.Title = $"{series_title} ({period})"
-
-                'make sure NaN values are handled
-                series.TreatNaNAsNull = True
-                series.TreatNulls = Steema.TeeChart.Styles.TreatNullsStyle.DoNotPaint
-
-                'this is important because otherwise the series nodes are automatically ordered by their x values (angles), potentially messing up the labelling
-                series.XValues.Order = Steema.TeeChart.Styles.ValueListOrder.None
-
-                'in the chart, X (angle) represents the actual value, Y is the scaled (plotted) value, text is the axis label
-
-                'scale the absolute volume error to range (-1, 1) and reverse it's sign
-                Dim scaled_volume_error As Double = -1 * (gof.abs_volume_error / max_abs_volume_error * 2 + -1)
-                'plot other indicators with their actual values
-                series.Add(gof.volume_error, scaled_volume_error, "Volume error [%]")
-                series.Add(gof.nash_sutcliffe, gof.nash_sutcliffe, "Nash-Sutcliffe efficiency")
-                series.Add(gof.ln_nash_sutcliffe, gof.ln_nash_sutcliffe, "Logarithmic Nash-Sutcliffe efficiency")
-                series.Add(gof.kge, gof.kge, "Kling-Gupta efficiency")
-                series.Add(gof.coeff_correlation, gof.coeff_correlation, "Coefficient of correlation")
-
-                series.Circled = True
-                series.Pen.Width = 2
-                series.Pen.Color = series.Pointer.Color
-                'series.Color
-                series.Brush.Visible = False
-                series.Pointer.Visible = True
-                series.CircleLabels = True
-                series.ClockWiseLabels = False
-                series.Marks.Visible = True
-                series.Marks.Style = Steema.TeeChart.Styles.MarksStyles.XValue 'label the actual value
-                series.Marks.FontSeriesColor = True
+            For Each period As String In Me.GoFResults(series_title).Keys
+                labels.Add($"{series_title} ({period})")
             Next
         Next
 
-        'scale radar spokes between -1 and 1
-        Me.ResultChart.Axes.Left.Automatic = False
-        Me.ResultChart.Axes.Left.Minimum = -1
-        Me.ResultChart.Axes.Left.Maximum = 1
+        Dim values(labels.Count - 1, 4) As Double
+
+        Dim i As Integer = 0
+        For Each series_title As String In Me.GoFResults.Keys
+            For Each period As String In Me.GoFResults(series_title).Keys
+                values(i, 0) = Me.GoFResults(series_title)(period).abs_volume_error
+                values(i, 1) = Me.GoFResults(series_title)(period).nash_sutcliffe
+                values(i, 2) = Me.GoFResults(series_title)(period).ln_nash_sutcliffe
+                values(i, 3) = Me.GoFResults(series_title)(period).kge
+                values(i, 4) = Me.GoFResults(series_title)(period).coeff_correlation
+                i += 1
+            Next
+        Next
 
-        'grid is on chart's left axis
-        Me.ResultChart.Axes.Left.Increment = 0.2
-        'labels are on chart's right axis, hide them
-        Me.ResultChart.Axes.Right.Labels.Visible = False
+        Dim radar As ScottPlot.Plottable.RadarPlot
+        radar = Me.ResultChart.AddRadar(values, independentAxes:=True, maxValues:=maxvalues)
+        radar.AxisType = ScottPlot.RadarAxis.Polygon
+        radar.CategoryLabels = axistitles
+        radar.GroupLabels = labels.ToArray()
 
         'result table
         '------------
diff --git a/source/Analysis/Histogram.vb b/source/Analysis/Histogram.vb
index d4b8d2ac..7d60fce0 100644
--- a/source/Analysis/Histogram.vb
+++ b/source/Analysis/Histogram.vb
@@ -226,63 +226,66 @@ Friend Class Histogram
         '-------------
         'TODO: Ergebniswerte zurückgeben?
 
-        'Ergebnisdiagramm
-        '----------------
-
-        'Diagramm formatieren
-        Me.ResultChart = New Steema.TeeChart.Chart()
+        'Result chart
+        '------------
+        Me.ResultChart = New ScottPlot.Plot()
         Call Helpers.FormatChart(Me.ResultChart)
-        Me.ResultChart.Header.Text = "Histogram"
-
-        'Achsen
-        Me.ResultChart.Axes.Left.Title.Caption = "Probability [%]"
-        Me.ResultChart.Axes.Left.Automatic = False
-        Me.ResultChart.Axes.Left.Minimum = 0
-        Me.ResultChart.Axes.Left.AutomaticMaximum = True
-        Me.ResultChart.Axes.Left.MaximumOffset = 2
-
-        Me.ResultChart.Axes.Right.Visible = True
-        Me.ResultChart.Axes.Right.Title.Caption = "Probability of non-exceedance [%]"
-        Me.ResultChart.Axes.Right.Title.Angle = 90
-        Me.ResultChart.Axes.Right.Automatic = False
-        Me.ResultChart.Axes.Right.Minimum = 0
-        Me.ResultChart.Axes.Right.Maximum = 100
-        Me.ResultChart.Axes.Right.Grid.Visible = False
-
-        Me.ResultChart.Axes.Bottom.Labels.Style = Steema.TeeChart.AxisLabelStyle.Value
-        Me.ResultChart.Axes.Bottom.Title.Caption = $"Value [{Me.InputTimeSeries(0).Unit}]"
-
-        'Serien
-        For Each res As histogramResults In Me.results
+        Me.ResultChart.XAxis.DateTimeFormat(False)
 
-            Dim serieP As New Steema.TeeChart.Styles.Histogram(Me.ResultChart)
-            serieP.Title = $"{res.title} (P(x))"
-            serieP.Marks.Visible = False
+        Me.ResultChart.Title("Histogram")
+
+        'series
+        For Each res As histogramResults In Me.results
 
+            'bars
+            Dim Xs As New List(Of Double)
+            Dim Ys As New List(Of Double)
             For i As Integer = 0 To n_bins - 1
-                serieP.Add((Me.breaks(i) + Me.breaks(i + 1)) / 2, res.probability(i), res.probability(i).ToString("F2") & "%")
+                Xs.Add((Me.breaks(i) + Me.breaks(i + 1)) / 2)
+                Ys.Add(res.probability(i))
             Next
 
-            Dim seriePU As New Steema.TeeChart.Styles.Line(Me.ResultChart)
-            seriePU.VertAxis = Steema.TeeChart.Styles.VerticalAxis.Right
-            seriePU.Title = $"{res.title} (PU(x))"
-            seriePU.LinePen.Width = 2
-            seriePU.Pointer.Visible = True
-            seriePU.Pointer.Style = Steema.TeeChart.Styles.PointerStyles.Circle
-            seriePU.Pointer.HorizSize = 2
-            seriePU.Pointer.VertSize = 2
-
+            Dim serieP As ScottPlot.Plottable.BarPlot
+            serieP = Me.ResultChart.AddBar(values:=Ys.ToArray(), positions:=Xs.ToArray())
+            serieP.Label = $"{res.title} (P(x))"
+            serieP.BarWidth = Me.breaks(1) - Me.breaks(0) 'TODO: bars are not necessarily all the same width!
+            Dim originalColor As Color = serieP.FillColor
+            serieP.FillColor = Color.FromArgb(128, originalColor.R, originalColor.G, originalColor.B)
+            If Me.results.Length = 1 Then
+                'show values if there is only one series
+                serieP.ShowValuesAboveBars = True
+                serieP.ValueFormatter = Function(v As Double) v.ToString("F2") & "%"
+            End If
+
+            'line
+            Xs = New List(Of Double)
+            Ys = New List(Of Double)
             For i As Integer = 0 To Me.n_bins - 1
-                seriePU.Add(Me.breaks(i + 1), res.PU(i), res.PU(i).ToString("F2") & "%")
+                Xs.Add(Me.breaks(i + 1))
+                Ys.Add(res.PU(i))
             Next
 
+            Dim seriePU As ScottPlot.Plottable.ScatterPlot
+            seriePU = Me.ResultChart.AddScatter(Xs.ToArray(), Ys.ToArray())
+            seriePU.YAxisIndex = 1
+            seriePU.Label = $"{res.title} (PU(x))"
+            seriePU.LineWidth = 2
+            seriePU.MarkerShape = ScottPlot.MarkerShape.filledCircle
+            seriePU.MarkerSize = 4
+            seriePU.Color = originalColor
+
         Next
 
-        'Markstips
-        Dim markstip As New Steema.TeeChart.Tools.MarksTip()
-        markstip.Style = Steema.TeeChart.Styles.MarksStyles.Label
-        'markstip.MouseAction = Steema.TeeChart.Tools.MarksTipMouseAction.Move
-        Me.ResultChart.Tools.Add(markstip)
+        'axes
+        Me.ResultChart.XLabel($"Value [{Me.InputTimeSeries(0).Unit}]")
+
+        Me.ResultChart.YLabel("Probability [%]")
+        Me.ResultChart.SetAxisLimits(yMin:=0, yAxisIndex:=0)
+
+        Me.ResultChart.YAxis2.Label("Probability of non-exceedance [%]")
+        Me.ResultChart.YAxis2.LabelStyle(rotation:=90)
+        Me.ResultChart.YAxis2.Ticks(enable:=True)
+        Me.ResultChart.SetAxisLimits(yMin:=0, yMax:=105, yAxisIndex:=1)
 
     End Sub
 
diff --git a/source/Analysis/MonthlyStatistics.vb b/source/Analysis/MonthlyStatistics.vb
index f1878717..3f764a2b 100644
--- a/source/Analysis/MonthlyStatistics.vb
+++ b/source/Analysis/MonthlyStatistics.vb
@@ -27,8 +27,6 @@ Imports BlueM.Wave.AnnualStatistics
 Friend Class MonthlyStatistics
     Inherits Analysis
 
-#Region "Data structures"
-
     ''' <summary>
     ''' Class for storing the statistic values of a month
     ''' </summary>
@@ -43,11 +41,6 @@ Friend Class MonthlyStatistics
         Public median As Double
     End Class
 
-
-#End Region 'Data structures
-
-#Region "Members"
-
     ''' <summary>
     ''' Result of the analysis
     ''' </summary>
@@ -59,9 +52,7 @@ Friend Class MonthlyStatistics
     ''' <remarks></remarks>
     Private isPreviousMonth As Boolean
 
-#End Region 'Members
-
-#Region "Properties"
+    Private startMonth As Integer
 
     Public Overloads Shared Function Description() As String
         Return "Calculates the following statistical values for each month of the year: average, median, minimum, maximum, standard deviation " &
@@ -111,10 +102,6 @@ Friend Class MonthlyStatistics
         End Get
     End Property
 
-#End Region ' Properties
-
-#Region "Methoden"
-
     ''' <summary>
     ''' Constructor
     ''' </summary>
@@ -136,7 +123,7 @@ Friend Class MonthlyStatistics
         End If
 
         Me.isPreviousMonth = (dlg.ComboBox_MonthType.SelectedItem = "previous month")
-        Dim startMonth As Integer = CType(dlg.ComboBox_startMonth.SelectedItem, Month).number
+        Me.startMonth = CType(dlg.ComboBox_startMonth.SelectedItem, Month).number
 
         'Initialize result data structure
         Me.result = New Dictionary(Of Integer, MonthData)
@@ -213,7 +200,11 @@ Friend Class MonthlyStatistics
                     End If
                 Else
                     Log.AddLogEntry(Log.levels.warning, $"The series does not contain any data for the month of { .month}!")
-                    'TODO: ideally we would set all result values to Double.NaN here but this inexplicably causes the result chart to crash!
+                    .average = Double.NaN
+                    .stddev = Double.NaN
+                    .min = Double.NaN
+                    .max = Double.NaN
+                    .median = Double.NaN
                 End If
 
             End With
@@ -240,100 +231,94 @@ Friend Class MonthlyStatistics
         Me.ResultTable.Columns.Add("Standard deviation", GetType(Double))
 
         For Each monthData As MonthData In Me.result.Values
-            If monthData.values.Count > 0 Then
-                Me.ResultTable.Rows.Add(
-                    monthData.month.number,
-                    monthData.month.name,
-                    monthData.values.Count,
-                    monthData.average,
-                    monthData.median,
-                    monthData.min,
-                    monthData.max,
-                    monthData.stddev
-                )
-            Else
-                Me.ResultTable.Rows.Add(
-                    monthData.month.number,
-                    monthData.month.name,
-                    monthData.values.Count,
-                    Double.NaN,
-                    Double.NaN,
-                    Double.NaN,
-                    Double.NaN,
-                    Double.NaN
-                )
-            End If
+            Me.ResultTable.Rows.Add(
+                monthData.month.number,
+                monthData.month.name,
+                monthData.values.Count,
+                monthData.average,
+                monthData.median,
+                monthData.min,
+                monthData.max,
+                monthData.stddev
+            )
         Next
 
         'Result chart
-        '------------
-        Dim i As Integer
-        Dim mittelwert, median As Steema.TeeChart.Styles.Line
-        Dim stdabw As Steema.TeeChart.Styles.Error
-        Dim minmax As Steema.TeeChart.Styles.HighLow
-
-        'Diagram
-        Me.ResultChart = New Steema.TeeChart.Chart()
+        Me.ResultChart = New ScottPlot.Plot()
         Call Helpers.FormatChart(Me.ResultChart)
-        Me.ResultChart.Header.Text = $"Monthly statistics ({Me.InputTimeSeries(0).Title})"
-
-        'Axes
-        Me.ResultChart.Axes.Bottom.Labels.Style = Steema.TeeChart.AxisLabelStyle.Text
-        Me.ResultChart.Axes.Bottom.Labels.Angle = 90
-        Me.ResultChart.Axes.Bottom.MinorTickCount = 0
-        Me.ResultChart.Axes.Left.Title.Text = Me.InputTimeSeries(0).Unit
-
-        'Series
-
-        'MinMax
-        minmax = New Steema.TeeChart.Styles.HighLow(Me.ResultChart)
-        minmax.DefaultNullValue = Double.NaN
-        minmax.Title = "Min / Max"
-        minmax.Color = Color.DarkGray
-        minmax.Pen.Color = Color.DarkGray
-        minmax.HighBrush.Visible = True
-        minmax.HighBrush.Color = Color.LightGray
-        minmax.HighBrush.Transparency = 50
-        For i = 1 To 12
-            minmax.Add(Me.result(i).index, Me.result(i).max, Me.result(i).min, Me.result(i).month.name)
-        Next
-
-        'Standard deviation
-        stdabw = New Steema.TeeChart.Styles.Error(Me.ResultChart)
-        stdabw.DefaultNullValue = Double.NaN
-        stdabw.Title = "Standard deviation"
-        stdabw.Color = Color.Red
-        stdabw.ErrorWidth = 50
-        For i = 1 To 12
-            'Skip months with no or NaN data
-            If Me.result(i).values.Count > 0 And Not Double.IsNaN(Me.result(i).stddev) Then
-                stdabw.Add(Me.result(i).index, Me.result(i).average, Me.result(i).stddev, Me.result(i).month.name)
+        Me.ResultChart.XAxis.DateTimeFormat(False)
+        Me.ResultChart.Title($"Monthly statistics ({Me.InputTimeSeries(0).Title})")
+
+        'sort month data by index for plotting
+        Dim monthDatas As List(Of MonthData) = Me.result.Values.ToList()
+        monthDatas.Sort(Function(m1 As MonthData, m2 As MonthData)
+                            Return m1.index.CompareTo(m2.index)
+                        End Function)
+
+        'collect data
+        Dim Xs As Double() = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}
+        Dim xLabels As New List(Of String)
+        Dim mins As New List(Of Double)
+        Dim maxs As New List(Of Double)
+        Dim avgs As New List(Of Double)
+        Dim stddevbases As New List(Of Double)
+        Dim stddevs As New List(Of Double)
+        Dim medians As New List(Of Double)
+        For Each monthdata As MonthData In monthDatas
+            xLabels.Add(monthdata.month.name)
+            avgs.Add(monthdata.average)
+            medians.Add(monthdata.median)
+            If monthdata.values.Count > 0 Then
+                mins.Add(monthdata.min)
+                maxs.Add(monthdata.max)
+                stddevbases.Add(monthdata.stddev)
+                stddevs.Add(monthdata.stddev)
+            Else
+                'series that cannot handle NaNs are displayed as 0
+                mins.Add(0)
+                maxs.Add(0)
+                stddevbases.Add(0)
+                stddevs.Add(0)
             End If
         Next
 
-        'Average
-        mittelwert = New Steema.TeeChart.Styles.Line(Me.ResultChart)
-        mittelwert.TreatNaNAsNull = True
-        mittelwert.TreatNulls = Steema.TeeChart.Styles.TreatNullsStyle.DoNotPaint
-        mittelwert.Title = "Average"
-        mittelwert.Color = Color.Blue
-        mittelwert.LinePen.Width = 2
-        For i = 1 To 12
-            mittelwert.Add(Me.result(i).index, Me.result(i).average, Me.result(i).month.name)
-        Next
-
-        'Median
-        median = New Steema.TeeChart.Styles.Line(Me.ResultChart)
-        median.TreatNaNAsNull = True
-        median.TreatNulls = Steema.TeeChart.Styles.TreatNullsStyle.DoNotPaint
-        median.Title = "Median"
+        'axes
+        Me.ResultChart.XAxis.ManualTickPositions(Xs, xLabels.ToArray())
+        Me.ResultChart.XAxis.AxisTicks.TickLabelRotation = 90
+        Me.ResultChart.XAxis.AxisTicks.MinorGridVisible = False
+        Me.ResultChart.YLabel(Me.InputTimeSeries(0).Unit)
+
+        'series min-max
+        Dim minmax As ScottPlot.Plottable.Polygon
+        minmax = Me.ResultChart.AddFill(Xs, mins.ToArray(), maxs.ToArray())
+        minmax.Label = "Min / Max"
+        minmax.FillColor = Color.FromArgb(128, Color.LightGray.R, Color.LightGray.G, Color.LightGray.B)
+        minmax.LineColor = Color.DarkGray
+        minmax.LineWidth = 1
+
+        'series standard deviation
+        Dim stddev As ScottPlot.Plottable.ErrorBar
+        stddev = Me.ResultChart.AddErrorBars(Xs, stddevbases.ToArray(), xErrors:=Nothing, yErrors:=stddevs.ToArray())
+        stddev.Label = "Standard deviation"
+        stddev.Color = Color.Red
+        stddev.CapSize = 8
+
+        'series average
+        Dim avg As ScottPlot.Plottable.ScatterPlot
+        avg = Me.ResultChart.AddScatter(Xs, avgs.ToArray())
+        avg.OnNaN = ScottPlot.Plottable.ScatterPlot.NanBehavior.Gap
+        avg.Label = "Average"
+        avg.Color = Color.Blue
+        avg.LineWidth = 2
+
+        'series median
+        Dim median As ScottPlot.Plottable.ScatterPlot
+        median = Me.ResultChart.AddScatter(Xs, medians.ToArray())
+        median.OnNaN = ScottPlot.Plottable.ScatterPlot.NanBehavior.Gap
+        median.Label = "Median"
         median.Color = Color.Green
-        For i = 1 To 12
-            median.Add(Me.result(i).index, Me.result(i).median, Me.result(i).month.name)
-        Next
+        median.LineWidth = 1
 
     End Sub
 
-#End Region 'Methods
-
 End Class
\ No newline at end of file
diff --git a/source/Analysis/TestAnalysis.vb b/source/Analysis/TestAnalysis.vb
index e8fb7486..4ebb59f1 100644
--- a/source/Analysis/TestAnalysis.vb
+++ b/source/Analysis/TestAnalysis.vb
@@ -139,7 +139,7 @@ Friend Class TestAnalysis
         MyBase.ResultValues.Add($"Count values of time series '{title}'", length)
 
         'Result chart (will be shown in separate window)
-        MyBase.ResultChart = New Steema.TeeChart.Chart()
+        MyBase.ResultChart = New ScottPlot.Plot()
         'Fill and format chart
         '...
         '...
diff --git a/source/Classes/AxisWrapper.vb b/source/Classes/AxisWrapper.vb
index 588c40b0..d1fc80d2 100644
--- a/source/Classes/AxisWrapper.vb
+++ b/source/Classes/AxisWrapper.vb
@@ -15,81 +15,96 @@
 'You should have received a copy of the GNU Lesser General Public License
 'along with this program.  If not, see <https://www.gnu.org/licenses/>.
 '
-Imports System.Text.RegularExpressions
-
 ''' <summary>
-''' Wrapper around a Steema.TeeChart.Axis instance
-''' exposing selected properties
+''' Wrapper for a Y axis
 ''' </summary>
 Friend Class AxisWrapper
 
-    Private _name As String
-    Private _TAxis As Steema.TeeChart.Axis
+    Public Axis As ScottPlot.Renderable.Axis
+    Private _min As Double
+    Private _max As Double
+    Private _autoMin As Boolean
+    Private _autoMax As Boolean
 
-    ''' <summary>
-    ''' Constructor
-    ''' </summary>
-    ''' <param name="_name">One of "Left", "Right", "Custom 0", etc.</param>
-    ''' <param name="_axis">The axis instance to wrap around</param>
-    Public Sub New(_name As String, ByRef _axis As Steema.TeeChart.Axis)
-        Me._name = _name
-        Me._TAxis = _axis
+    Public Sub New(axis As ScottPlot.Renderable.Axis)
+        Me.Axis = axis
+        Me._autoMin = True
+        Me._autoMax = True
     End Sub
 
-    ''' <summary>
-    ''' Axis Name, e.g. "Left", "Right", "Custom 0", etc.
-    ''' </summary>
-    Public ReadOnly Property Name As String
+    Public ReadOnly Property AxisIndex As Integer
         Get
-            Return Me._name
+            Return Me.Axis.AxisIndex
         End Get
     End Property
 
-    ''' <summary>
-    ''' Axis Title as displayed in the chart
-    ''' </summary>
-    ''' <returns></returns>
-    Public Property Title As String
+    Public Property Unit As String
         Get
-            Return Me._TAxis.Title.Text
+            Return Me.Axis.AxisLabel.Label
         End Get
         Set(value As String)
-            Me._TAxis.Title.Text = value
+            Me.Axis.AxisLabel.Label = value
         End Set
     End Property
 
-    ''' <summary>
-    ''' Axis Unit, internally stored in the Tag property
-    ''' </summary>
-    ''' <returns></returns>
-    Public Property Unit As String
+    Public Property AutoMin As Boolean
         Get
-            Return Me._TAxis.Tag
+            Return Me._autoMin
         End Get
-        Set(value As String)
-            Me._TAxis.Tag = value
+        Set(value As Boolean)
+            Me._autoMin = value
+            Call Me.setLimits()
         End Set
     End Property
 
-    ''' <summary>
-    ''' Attempts to extract a unit enclosed in square or round brackets from a text
-    ''' </summary>
-    ''' <param name="text">Text from which to extract the unit</param>
-    ''' <returns>The extracted unit or if unsuccessful the original text</returns>
-    Public Shared Function parseUnit(text As String) As String
+    Public Property AutoMax As Boolean
+        Get
+            Return Me._autoMax
+        End Get
+        Set(value As Boolean)
+            Me._autoMax = value
+            Call Me.setLimits()
+        End Set
+    End Property
 
-        Dim m As Match
-        Dim unit As String
+    Public Property Max As Double
+        Get
+            Return Me.Axis.Dims.Max
+        End Get
+        Set(value As Double)
+            Me.Axis.Dims.SetAxis(min:=Nothing, max:=value)
+            Me._autoMax = False
+            'Call Me.setLimits()
+        End Set
+    End Property
+
+    Public Property Min As Double
+        Get
+            Return Me.Axis.Dims.Min
+        End Get
+        Set(value As Double)
+            Me.Axis.Dims.SetAxis(min:=value, max:=Nothing)
+            Me._autoMin = False
+            'Call Me.setLimits()
+        End Set
+    End Property
 
-        m = Regex.Match(text, ".*[\[\(](.+?)[\]\)].*")
-        If m.Success Then
-            unit = m.Groups(1).Value
+    Public Sub setLimits()
+        If Me._autoMin And Me._autoMax Then
+            Me.Axis.Dims.ResetLimits()
+            'Me._axis.Dims.SetAxis(min:=Nothing, max:=Nothing)
+        ElseIf Me._autoMin Then
+            Dim max As Double = Me.Max
+            Me.Axis.Dims.ResetLimits()
+            Me.Axis.Dims.SetAxis(min:=Nothing, max:=max)
+        ElseIf Me._autoMax Then
+            Dim min As Double = Me.Min
+            Me.Axis.Dims.ResetLimits()
+            Me.Axis.Dims.SetAxis(min:=min, max:=Nothing)
         Else
-            unit = text
+            Me.Axis.Dims.SetAxis(Me.Min, Me.Max)
         End If
-
-        Return unit
-
-    End Function
+    End Sub
 
 End Class
+
diff --git a/source/Classes/TimeSeriesCollection.vb b/source/Classes/TimeSeriesCollection.vb
index 4c6176f1..1929319d 100644
--- a/source/Classes/TimeSeriesCollection.vb
+++ b/source/Classes/TimeSeriesCollection.vb
@@ -200,18 +200,6 @@ Public Class TimeSeriesCollection
         Return Me.GetEnumerator()
     End Function
 
-    ''' <summary>
-    ''' Reorders the TimeSeries contained in the TimeSeriesCollection according to the specified list of Ids
-    ''' </summary>
-    ''' <param name="ids">List of Ids in the new order</param>
-    Public Sub Reorder(ids As List(Of Integer))
-        Dim newdict As New Specialized.OrderedDictionary()
-        For Each id As Integer In ids
-            newdict.Add(id, Me.Item(id))
-        Next
-        _timeseriesdict = newdict
-    End Sub
-
     ''' <summary>
     ''' Reorders a TimeSeries within the collection
     ''' </summary>
diff --git a/source/Classes/TimeSeriesDisplayOptions.vb b/source/Classes/TimeSeriesDisplayOptions.vb
index e400731a..ac00da83 100644
--- a/source/Classes/TimeSeriesDisplayOptions.vb
+++ b/source/Classes/TimeSeriesDisplayOptions.vb
@@ -1,4 +1,4 @@
-'BlueM.Wave
+'BlueM.Wave
 'Copyright (C) BlueM Dev Group
 '<https://www.bluemodel.org>
 '
@@ -43,11 +43,11 @@ Public Class TimeSeriesDisplayOptions
     ''' Line style
     ''' </summary>
     ''' <returns></returns>
-    Public Property LineStyle As Drawing2D.DashStyle
+    Public Property LineStyle As ScottPlot.LineStyle
         Get
             Return _linestyle
         End Get
-        Set(value As Drawing2D.DashStyle)
+        Set(value As ScottPlot.LineStyle)
             _linestyle = value
         End Set
     End Property
@@ -84,7 +84,7 @@ Public Class TimeSeriesDisplayOptions
     ''' <remarks>Default Color is empty in order to allow automatic color assignment by the chart</remarks>
     Public Sub New()
         Me.Color = Color.Empty
-        Me.LineStyle = Drawing2D.DashStyle.Solid
+        Me.LineStyle = ScottPlot.LineStyle.Solid
         Me.LineWidth = 2
         Me.ShowPoints = False
     End Sub
@@ -131,10 +131,10 @@ Public Class TimeSeriesDisplayOptions
     ''' <remarks>Recognized line styles: https://learn.microsoft.com/en-us/dotnet/api/system.drawing.drawing2d.dashstyle</remarks>
     ''' <param name="lineStyle">the line style as string</param>
     Public Sub SetLineStyle(lineStyle As String)
-        If Not [Enum].IsDefined(GetType(Drawing2D.DashStyle), lineStyle) Then
+        If Not [Enum].IsDefined(GetType(ScottPlot.LineStyle), lineStyle) Then
             Log.AddLogEntry(levels.warning, $"Line style '{lineStyle}' is not recognized!")
         Else
-            Me.LineStyle = [Enum].Parse(GetType(Drawing2D.DashStyle), lineStyle)
+            Me.LineStyle = [Enum].Parse(GetType(ScottPlot.LineStyle), lineStyle)
         End If
     End Sub
 
diff --git a/source/Controllers/PropertiesController.vb b/source/Controllers/PropertiesController.vb
index 90df5c46..582fcb05 100644
--- a/source/Controllers/PropertiesController.vb
+++ b/source/Controllers/PropertiesController.vb
@@ -31,15 +31,13 @@ Friend Class PropertiesController
 
         'view events
         AddHandler Me.View.SeriesPropertyChanged, AddressOf SeriesPropertiesViewChanged
-        AddHandler Me.View.SeriesDeleted, AddressOf SeriesDeletedHandler
-        AddHandler Me.View.SeriesReordered, AddressOf SeriesReorderedHandler
 
         'model events
         AddHandler _model.SeriesAdded, AddressOf UpdateView
         AddHandler _model.SeriesPropertiesChanged, AddressOf UpdateView
         AddHandler _model.SeriesRemoved, AddressOf UpdateView
         AddHandler _model.SeriesCleared, AddressOf UpdateView
-        AddHandler _model.SeriesAllReordered, AddressOf UpdateView
+        AddHandler _model.SeriesReordered, AddressOf UpdateView
     End Sub
 
     Public Overrides Sub ShowView()
@@ -65,24 +63,4 @@ Friend Class PropertiesController
         _model.SeriesPropertiesChangedHandler(id)
     End Sub
 
-    ''' <summary>
-    ''' Deletes series deleted in the view from the model
-    ''' </summary>
-    ''' <param name="ids">List of time series ids to delete</param>
-    Private Sub SeriesDeletedHandler(ids As List(Of Integer))
-        For Each id As Integer In ids
-            _model.RemoveTimeSeries(id)
-        Next
-    End Sub
-
-    ''' <summary>
-    ''' Handles a series being reordered in the view by reordering it in the model
-    ''' </summary>
-    ''' <param name="id">Id of the TimeSeries that was reordered</param>
-    ''' <param name="direction">Direction</param>
-    Private Sub SeriesReorderedHandler(id As Integer, direction As Direction)
-        _model.SeriesReorder(id, direction)
-    End Sub
-
-
 End Class
diff --git a/source/Controllers/ValuesController.vb b/source/Controllers/ValuesController.vb
index a4986cf7..652e6251 100644
--- a/source/Controllers/ValuesController.vb
+++ b/source/Controllers/ValuesController.vb
@@ -39,7 +39,6 @@ Friend Class ValuesController
         AddHandler _model.SeriesAdded, AddressOf UpdateView
         AddHandler _model.SeriesPropertiesChanged, AddressOf UpdateView
         AddHandler _model.SeriesRemoved, AddressOf UpdateView
-        AddHandler _model.SeriesAllReordered, AddressOf UpdateView
         AddHandler _model.SeriesReordered, AddressOf UpdateView
         AddHandler _model.SeriesCleared, AddressOf UpdateView
     End Sub
diff --git a/source/Controllers/WaveController.vb b/source/Controllers/WaveController.vb
index 6d005ea0..5fb472e9 100644
--- a/source/Controllers/WaveController.vb
+++ b/source/Controllers/WaveController.vb
@@ -20,8 +20,6 @@ Imports System.Text.RegularExpressions
 Friend Class WaveController
     Inherits Controller
 
-    Implements Steema.TeeChart.ITeeEventListener
-
     Private Overloads ReadOnly Property View As MainWindow
         Get
             Return _view
@@ -47,6 +45,29 @@ Friend Class WaveController
         End Get
     End Property
 
+    ''' <summary>
+    ''' Dictionary of series in the main chart, key corresponds to TimeSeries ID
+    ''' </summary>
+    Private ChartSeries As Dictionary(Of Integer, ScottPlot.Plottable.IPlottable)
+
+    ''' <summary>
+    ''' Dictionary of series in the overview chart, key corresponds to TimeSeries ID
+    ''' </summary>
+    Private OverviewSeries As Dictionary(Of Integer, ScottPlot.Plottable.IPlottable)
+
+    ''' <summary>
+    ''' Dictionary of markers in main chart, key corresponds to TimeSeries ID
+    ''' </summary>
+    Private ChartMarkers As Dictionary(Of Integer, ScottPlot.Plottable.IPlottable)
+
+    ''' <summary>
+    ''' List of Y axes
+    ''' </summary>
+    Private Axes As System.ComponentModel.BindingList(Of AxisWrapper)
+
+    'Edit Chart dialog
+    Private WithEvents EditChartDlg As EditChartDialog
+
     Private selectionMade As Boolean 'Flag zeigt an, ob bereits ein Auswahlbereich ausgewählt wurde
 
     ''' <summary>
@@ -70,8 +91,6 @@ Friend Class WaveController
     Private OverviewChartMouseDragStartX As Double
     Private OverviewChartMouseDragOffset As Double
 
-    Private WithEvents _axisDialog As AxisDialog
-
     'Events handled by the AppInstance
     Friend Event Properties_Clicked()
     Friend Event TimeseriesValues_Clicked()
@@ -82,12 +101,19 @@ Friend Class WaveController
 
         Me.View.SetController(Me)
 
+        'Initialize chart series containers
+        Me.ChartSeries = New Dictionary(Of Integer, ScottPlot.Plottable.IPlottable)
+        Me.OverviewSeries = New Dictionary(Of Integer, ScottPlot.Plottable.IPlottable)
+        Me.ChartMarkers = New Dictionary(Of Integer, ScottPlot.Plottable.IPlottable)
+        Me.Axes = New ComponentModel.BindingList(Of AxisWrapper)
+
+        'Initialize edit chart dialog
+        Me.EditChartDlg = New EditChartDialog(Me.Axes)
+
         'Initialize zoom history
         Me.ZoomHistory = New List(Of (xmin As Double, xmax As Double))
         Me.ZoomHistoryIndex = 0
 
-        _axisDialog = New AxisDialog()
-
         'Subscribe to view events
 
         AddHandler Me.View.Load, AddressOf View_Load
@@ -95,21 +121,21 @@ Friend Class WaveController
         'toolbar buttons
         AddHandler Me.View.ToolStripButton_New.Click, AddressOf New_Click
         AddHandler Me.View.ToolStripButton_Copy.Click, AddressOf Copy_Click
-        AddHandler Me.View.ToolStripButton_Print.Click, AddressOf Print_Click
         AddHandler Me.View.ToolStripMenuItem_ImportSeries.Click, AddressOf ImportSeries_Click
         AddHandler Me.View.ToolStripMenuItem_LoadTEN.Click, AddressOf LoadTEN_Click
         AddHandler Me.View.ToolStripMenuItem_ReloadFromFiles.Click, AddressOf RefreshFromFiles_Click
         AddHandler Me.View.ToolStripMenuItem_RecentlyUsedFiles.DropDownItemClicked, AddressOf openRecentlyUsedFile
         AddHandler Me.View.ToolStripMenuItem_PasteFromClipboard.Click, AddressOf PasteFromClipboard_Click
         AddHandler Me.View.ToolStripMenuItem_SaveProjectFile.Click, AddressOf SaveProjectFile_Click
-        AddHandler Me.View.ToolStripMenuItem_SaveChart.Click, AddressOf SaveChart_Click
+        AddHandler Me.View.ToolStripMenuItem_SaveImage.Click, AddressOf SaveImage_Click
         AddHandler Me.View.ToolStripMenuItem_ExportSeries.Click, AddressOf ExportZeitreihe_Click
         AddHandler Me.View.ToolStripMenuItem_EnterSeries.Click, AddressOf Eingeben_Click
         AddHandler Me.View.ToolStripButton_Cut.Click, AddressOf Zuschneiden_Click
         AddHandler Me.View.ToolStripButton_Merge.Click, AddressOf Merge_Click
         AddHandler Me.View.ToolStripButton_Analysis.Click, AddressOf Analysis_Click
-        AddHandler Me.View.ToolStripButton_AxisDialog.Click, AddressOf AxisDialog_Click
         AddHandler Me.View.ToolStripButton_EditChart.Click, AddressOf EditChart_Click
+        AddHandler Me.View.ToolStripMenuItem_ColorPaletteCategory10.Click, AddressOf ColorPalette_Click
+        AddHandler Me.View.ToolStripMenuItem_ColorPaletteCategory20.Click, AddressOf ColorPalette_Click
         AddHandler Me.View.ToolStripMenuItem_ColorPaletteMaterial.Click, AddressOf ColorPalette_Click
         AddHandler Me.View.ToolStripMenuItem_ColorPaletteDistinct.Click, AddressOf ColorPalette_Click
         AddHandler Me.View.ToolStripMenuItem_ColorPaletteWheel.Click, AddressOf ColorPalette_Click
@@ -128,8 +154,6 @@ Friend Class WaveController
         AddHandler Me.View.ToolStripButton_ZoomNext.Click, AddressOf ZoomNext_Click
         AddHandler Me.View.ToolStripButton_ZoomAll.Click, AddressOf ZoomAll_Click
         AddHandler Me.View.ToolStripDropDownButton_ZoomToSeries.DropDownOpening, AddressOf ZoomToSeries_DropDown
-        AddHandler Me.View.ToolStripMenuItem_ActivateAllSeries.Click, AddressOf ActivateAllSeries_Click
-        AddHandler Me.View.ToolStripMenuItem_DeactivateAllSeries.Click, AddressOf DeactivateAllSeries_Click
         AddHandler Me.View.ToolStripMenuItem_Help.Click, AddressOf Help_Click
         AddHandler Me.View.ToolStripMenuItem_CheckForUpdate.Click, AddressOf CheckForUpdate_Click
         AddHandler Me.View.ToolStripButton_UpdateNotification.Click, AddressOf CheckForUpdate_Click
@@ -140,23 +164,31 @@ Friend Class WaveController
         AddHandler Me.View.KeyDown, AddressOf KeyDown
 
         'mouse events
-        AddHandler Me.View.TChart1.MouseDown, AddressOf Chart_MouseDown
-        AddHandler Me.View.TChart1.MouseMove, AddressOf Chart_MouseMove
-        AddHandler Me.View.TChart1.MouseUp, AddressOf Chart_MouseUp
-        AddHandler Me.View.TChart1.DoubleClick, AddressOf EditChart_Click
+        AddHandler Me.View.MainPlot.MouseDown, AddressOf Chart_MouseDown
+        AddHandler Me.View.MainPlot.MouseMove, AddressOf Chart_MouseMove
+        AddHandler Me.View.MainPlot.MouseUp, AddressOf Chart_MouseUp
+        AddHandler Me.View.MainPlot.DoubleClick, AddressOf EditChart_Click
 
-        AddHandler Me.View.TChart2.MouseDown, AddressOf OverviewChart_MouseDown
-        AddHandler Me.View.TChart2.MouseMove, AddressOf OverviewChart_MouseMove
-        AddHandler Me.View.TChart2.MouseUp, AddressOf OverviewChart_MouseUp
-        AddHandler Me.View.TChart2.DoubleClick, AddressOf OverviewChart_DoubleClick
+        AddHandler Me.View.OverviewPlot.MouseDown, AddressOf OverviewChart_MouseDown
+        AddHandler Me.View.OverviewPlot.MouseMove, AddressOf OverviewChart_MouseMove
+        AddHandler Me.View.OverviewPlot.MouseUp, AddressOf OverviewChart_MouseUp
 
-        AddHandler Me.View.TChart1.MouseWheel, AddressOf Chart_MouseWheel
-        AddHandler Me.View.TChart2.MouseWheel, AddressOf OverviewChart_MouseWheel
+        AddHandler Me.View.MainPlot.MouseWheel, AddressOf Chart_MouseWheel
+        AddHandler Me.View.OverviewPlot.MouseWheel, AddressOf OverviewChart_MouseWheel
 
         'drag drop events
         AddHandler Me.View.DragEnter, AddressOf Wave_DragEnter
         AddHandler Me.View.DragDrop, AddressOf Wave_DragDrop
 
+        'TOC events
+        AddHandler Me.View.CheckedListBox_Series.SelectedIndexChanged, AddressOf TOC_SelectionChanged
+        AddHandler Me.View.ToolStripButton_Delete.Click, AddressOf ToolStripButton_Delete_Click
+        AddHandler Me.View.ToolStripButton_MoveUp.Click, AddressOf ToolStripButton_MoveUp_Click
+        AddHandler Me.View.ToolStripButton_MoveDown.Click, AddressOf ToolStripButton_MoveDown_Click
+        AddHandler Me.View.ToolStripMenuItem_ActivateAllSeries.Click, AddressOf ActivateAllSeries_Click
+        AddHandler Me.View.ToolStripMenuItem_DeactivateAllSeries.Click, AddressOf DeactivateAllSeries_Click
+        AddHandler Me.View.CheckedListBox_Series.ItemCheck, AddressOf SeriesActiveChanged
+
         'navigation events
         AddHandler Me.View.MaskedTextBox_NavStart.KeyDown, AddressOf navigationKeyDown
         AddHandler Me.View.MaskedTextBox_NavEnd.KeyDown, AddressOf navigationKeyDown
@@ -177,13 +209,6 @@ Friend Class WaveController
         AddHandler Me.View.ToolStripStatusLabel_Errors.Click, AddressOf ShowLog_Click
         AddHandler Me.View.ToolStripStatusLabel_Warnings.Click, AddressOf ShowLog_Click
 
-        'axis dialog events
-        AddHandler _axisDialog.AxisDeleted, AddressOf axisDeleted
-        AddHandler _axisDialog.AxisUnitChanged, AddressOf AxisUnitChanged
-
-        'add chart event listener
-        Me.View.TChart1.Chart.Listeners.Add(Me)
-
         'model events
         AddHandler _model.FileImported, AddressOf FileImported
         AddHandler _model.SeriesAdded, AddressOf SeriesAdded
@@ -195,6 +220,9 @@ Friend Class WaveController
         AddHandler _model.TENFileLoading, AddressOf Load_TEN
         AddHandler _model.IsBusyChanged, AddressOf ShowBusy
 
+        'edit chart events
+        AddHandler EditChartDlg.AxesEdited, AddressOf AxesEditedHandler
+
         'add any already existing time series
         For Each ts As TimeSeries In _model.TimeSeries.Values
             Call SeriesAdded(ts)
@@ -212,8 +240,16 @@ Friend Class WaveController
 
     End Sub
 
+    Private Sub AxesEditedHandler()
+        View.MainPlot.Refresh()
+    End Sub
+
+    ''' <summary>
+    ''' Handles the case where all series were cleared from the model
+    ''' </summary>
     Private Sub SeriesCleared()
-        'nothing to do
+        'remove TOC items
+        View.CheckedListBox_Series.Items.Clear()
     End Sub
 
     ''' <summary>
@@ -233,69 +269,6 @@ Friend Class WaveController
         End Try
     End Sub
 
-    ''' <summary>
-    ''' Handles TeeChart Events
-    ''' </summary>
-    ''' <param name="e"></param>
-    Private Sub TeeEvent(e As Steema.TeeChart.TeeEvent) Implements Steema.TeeChart.ITeeEventListener.TeeEvent
-        Try
-            If TypeOf e Is Steema.TeeChart.Styles.SeriesEvent Then
-                Dim seriesEvent As Steema.TeeChart.Styles.SeriesEvent = CType(e, Steema.TeeChart.Styles.SeriesEvent)
-                Select Case seriesEvent.Event
-                    Case Steema.TeeChart.Styles.SeriesEventStyle.ChangeActive
-                        'series visibility has been changed. check whether custom axes should be made invisible
-
-                        'collect units of all active series
-                        Dim activeUnits As New HashSet(Of String)
-                        For Each series As Steema.TeeChart.Styles.Series In View.TChart1.Series
-                            If series.Active Then
-                                activeUnits.Add(series.GetVertAxis.Tag)
-                            End If
-                        Next
-                        'set visibility of custom axes accordingly
-                        For Each axis As Steema.TeeChart.Axis In View.TChart1.Axes.Custom
-                            If activeUnits.Contains(axis.Tag) Then
-                                axis.Visible = True
-                            Else
-                                axis.Visible = False
-                            End If
-                        Next
-
-                    Case Steema.TeeChart.Styles.SeriesEventStyle.ChangeTitle
-                        'series title changed, update title in the model
-                        Dim id As Integer = seriesEvent.Series.Tag
-                        If _model.TimeSeries.ContainsId(id) Then
-                            If _model.TimeSeries(id).Title <> seriesEvent.Series.Title Then
-                                _model.TimeSeries(id).Title = seriesEvent.Series.Title
-                                _model.SeriesPropertiesChangedHandler(id)
-                            End If
-                        End If
-
-                    Case Steema.TeeChart.Styles.SeriesEventStyle.Remove
-                        'series removed, delete series from model
-                        Dim id As Integer = seriesEvent.Series.Tag
-                        If _model.TimeSeries.ContainsId(id) Then
-                            'temporarily disable event handling to prevent multiple deletions
-                            RemoveHandler _model.SeriesRemoved, AddressOf SeriesRemoved
-                            _model.RemoveTimeSeries(id)
-                            AddHandler _model.SeriesRemoved, AddressOf SeriesRemoved
-                        End If
-
-                    Case Steema.TeeChart.Styles.SeriesEventStyle.Swap
-                        'series reordered, reorder series in model
-                        Dim ids As New List(Of Integer)
-                        For Each series As Steema.TeeChart.Styles.Series In e.sender.Series
-                            ids.Add(series.Tag)
-                        Next
-                        _model.Reorder_Series(ids)
-
-                End Select
-            End If
-        Catch ex As Exception
-            Log.AddLogEntry(Log.levels.debug, ex.Message)
-        End Try
-    End Sub
-
 #Region "user events"
 
     'Neu
@@ -306,13 +279,18 @@ Friend Class WaveController
 
         'Warnen, wenn bereits Serien vorhanden
         '-------------------------------------
-        If (View.TChart1.Series.Count() > 0) Then
+        If (View.MainPlot.Plot.GetPlottables().Count() > 0) Then
             res = MsgBox($"All existing series will be deleted!{eol}Continue?", MsgBoxStyle.OkCancel)
             If (Not res = Windows.Forms.DialogResult.OK) Then Exit Sub
         End If
 
+        'Clear chart series
+        Me.ChartSeries.Clear()
+        Me.OverviewSeries.Clear()
+        Me.ChartMarkers.Clear()
+
         'Charts zurücksetzen
-        Call View.Init_Charts()
+        Call View.InitializeCharts()
 
         'Reset Zoom history
         Me.ZoomHistory.Clear()
@@ -333,9 +311,6 @@ Friend Class WaveController
         View.ToolStripStatusLabel_Errors.Image = My.Resources.cancel_inactive
         View.ToolStripStatusLabel_Warnings.Image = My.Resources.warning_inactive
 
-        'Update axis dialog
-        Me.UpdateAxisDialog()
-
         Me.selectionMade = False
 
         'Update window title
@@ -402,18 +377,19 @@ Friend Class WaveController
                 'collect display options from chart and store them in timeseries
                 Dim tsList As New List(Of TimeSeries)
                 For Each ts As TimeSeries In _model.TimeSeries.ToList()
-                    For Each series As Steema.TeeChart.Styles.Series In View.TChart1.Series
-                        If series.Tag = ts.Id Then
-                            If TypeOf series Is Steema.TeeChart.Styles.Line Then
-                                Dim line As Steema.TeeChart.Styles.Line = CType(series, Steema.TeeChart.Styles.Line)
-                                ts.DisplayOptions.Color = line.Color
-                                ts.DisplayOptions.LineStyle = line.LinePen.Style
-                                ts.DisplayOptions.LineWidth = line.LinePen.Width
-                                ts.DisplayOptions.ShowPoints = line.Pointer.Visible
-                            End If
-                            Exit For
-                        End If
-                    Next
+                    'TODO: TChart
+                    'For Each series As Steema.TeeChart.Styles.Series In View.MainPlot.Series
+                    '    If series.Tag = ts.Id Then
+                    '        If TypeOf series Is Steema.TeeChart.Styles.Line Then
+                    '            Dim line As Steema.TeeChart.Styles.Line = CType(series, Steema.TeeChart.Styles.Line)
+                    '            ts.DisplayOptions.Color = line.Color
+                    '            ts.DisplayOptions.LineStyle = line.LinePen.Style
+                    '            ts.DisplayOptions.LineWidth = line.LinePen.Width
+                    '            ts.DisplayOptions.ShowPoints = line.Pointer.Visible
+                    '        End If
+                    '        Exit For
+                    '    End If
+                    'Next
                     tsList.Add(ts)
                 Next
                 Call Fileformats.WVP.Write_File(tsList, dlg.FileName,
@@ -435,11 +411,20 @@ Friend Class WaveController
 
     End Sub
 
-    'Teechart Export
-    '***************
-    Private Sub SaveChart_Click(sender As System.Object, e As System.EventArgs)
-        Dim fmt As New Steema.TeeChart.Export.TemplateExport(View.TChart1.Chart)
-        Call View.TChart1.Export.ShowExportDialog(fmt)
+    ''' <summary>
+    ''' Save image button clicked
+    ''' </summary>
+    ''' <param name="sender"></param>
+    ''' <param name="e"></param>
+    Private Sub SaveImage_Click(sender As System.Object, e As System.EventArgs)
+        View.SaveFileDialog1.Title = "Save image"
+        View.SaveFileDialog1.Filter = "PNG images (*.png)|*.png"
+        View.SaveFileDialog1.DefaultExt = "png"
+        View.SaveFileDialog1.OverwritePrompt = True
+        Dim dlgResult As DialogResult = View.SaveFileDialog1.ShowDialog()
+        If dlgResult = DialogResult.OK Then
+            View.MainPlot.Plot.SaveFig(View.SaveFileDialog1.FileName)
+        End If
     End Sub
 
     'Zeitreihen Export
@@ -566,7 +551,9 @@ Friend Class WaveController
     ''' <param name="sender"></param>
     ''' <param name="e"></param>
     Private Sub EditChart_Click(sender As System.Object, e As System.EventArgs)
-        Call Steema.TeeChart.Editor.Show(View.TChart1)
+        Me.EditChartDlg.Visible = True
+        Me.EditChartDlg.Show()
+        Me.EditChartDlg.BringToFront()
     End Sub
 
     ''' <summary>
@@ -578,16 +565,6 @@ Friend Class WaveController
         Dim colorPaletteName As String = CType(sender, ToolStripMenuItem).Text
         SetChartColorPalette(Helpers.getColorPalette(colorPaletteName))
     End Sub
-    ''' <summary>
-    ''' Show AxisDialog button clicked
-    ''' </summary>
-    ''' <param name="sender"></param>
-    ''' <param name="e"></param>
-    Private Sub AxisDialog_Click(sender As Object, e As EventArgs)
-        Call UpdateAxisDialog()
-        _axisDialog.Show()
-        _axisDialog.BringToFront()
-    End Sub
 
     ''' <summary>
     ''' Properties button clicked
@@ -642,97 +619,85 @@ Friend Class WaveController
     ''' <remarks></remarks>
     Private Sub ShowNaNValues_Click(sender As System.Object, e As System.EventArgs)
 
-        Dim processSeries As Boolean
-        Dim nanStart, nanEnd, bandStart, bandEnd As DateTime
-        Dim band As Steema.TeeChart.Tools.ColorBand
-        Dim color As Drawing.Color
+        Dim nanStart, nanEnd, spanStart, spanEnd As DateTime
         Dim isNaNPeriod, nanFound, nanFoundInSeries As Boolean
-
-        'set default color
-        color = Color.Red
+        Dim nanCount As Integer
 
         If View.ToolStripButton_ShowNaNValues.Checked Then
             'Switch visualization of NaN values on
-            'Show color bands for NaN values in the currently active series
+            'Show horizontal spans for NaN values in the currently active series
             nanFound = False
-            For Each ts As TimeSeries In _model.TimeSeries.Values
-                processSeries = False
-                'check if time series is currently active
-                For Each series As Steema.TeeChart.Styles.Series In View.TChart1.Series
-                    If series.Title = ts.Title Then
-                        If series.Active Then
-                            'process this series
-                            processSeries = True
-                            color = series.Color
-                        End If
-                        Exit For
-                    End If
-                Next
-                If processSeries Then
-                    'log
-                    Log.AddLogEntry(Log.levels.info, $"Finding NaN values for series {ts.Title}...")
-                    'find beginning and end of nan values
-                    nanFoundInSeries = False
-                    isNaNPeriod = False
-                    For i As Integer = 0 To ts.Length - 1
-                        If Not isNaNPeriod Then
-                            'test for start of NaN values
-                            If Double.IsNaN(ts.Values(i)) Then
-                                isNaNPeriod = True
-                                nanFoundInSeries = True
-                                nanFound = True
-                                If i = 0 Then
-                                    bandStart = ts.Dates(i)
-                                Else
-                                    bandStart = ts.Dates(i - 1)
-                                End If
-                                nanStart = ts.Dates(i)
-
-                                If i < ts.Length - 1 Then
-                                    Continue For
-                                End If
+            For Each index As Integer In View.CheckedListBox_Series.CheckedIndices
+
+                Dim ts As TimeSeries = CType(View.CheckedListBox_Series.Items(index), TimeSeries)
+                Dim color As Color = CType(Me.ChartSeries(ts.Id), ScottPlot.Plottable.ScatterPlot).LineColor
+
+                'find beginning and end of nan values
+                nanFoundInSeries = False
+                isNaNPeriod = False
+                nanCount = 0
+                For i As Integer = 0 To ts.Length - 1
+
+                    If Not isNaNPeriod Then
+                        'test for start of NaN values
+                        If Double.IsNaN(ts.Values(i)) Then
+                            isNaNPeriod = True
+                            nanFoundInSeries = True
+                            nanFound = True
+                            If i = 0 Then
+                                spanStart = ts.Dates(i)
+                            Else
+                                spanStart = ts.Dates(i - 1)
+                            End If
+                            nanStart = ts.Dates(i)
+
+                            If i < ts.Length - 1 Then
+                                'cycle to the next node directly
+                                nanCount += 1
+                                Continue For
                             End If
                         End If
-                        If isNaNPeriod Then
-                            'test for end of NaN values
-                            If Not Double.IsNaN(ts.Values(i)) Then
-                                bandEnd = ts.Dates(i)
-                                nanEnd = ts.Dates(i - 1)
-                                isNaNPeriod = False
+                    End If
+
+                    If isNaNPeriod Then
 
-                            ElseIf i = ts.Length - 1 Then
+                        'test for end of NaN values
+                        If Not Double.IsNaN(ts.Values(i)) Then
+                            spanEnd = ts.Dates(i)
+                            nanEnd = ts.Dates(i - 1)
+                            isNaNPeriod = False
+                        Else
+                            nanCount += 1
+
+                            If i = ts.Length - 1 Then
                                 'force end if end of time series reached
-                                bandEnd = ts.Dates(i)
+                                spanEnd = ts.Dates(i)
                                 nanEnd = ts.Dates(i)
                                 isNaNPeriod = False
-
                             End If
 
-                            If Not isNaNPeriod Then
-                                'end of NaN period reached, add a color band
-                                band = New Steema.TeeChart.Tools.ColorBand()
-                                View.TChart1.Tools.Add(band)
-                                band.Axis = View.TChart1.Axes.Bottom
-                                band.Start = bandStart.ToOADate()
-                                band.End = bandEnd.ToOADate()
-                                band.Pen.Visible = False
-                                band.Pen.Color = color
-                                band.Brush.Color = ControlPaint.Light(color)
-                                band.Brush.Transparency = 50
-                                band.ResizeEnd = False
-                                band.ResizeStart = False
-                                band.EndLinePen.Visible = False
-                                band.StartLinePen.Visible = False
-                                band.Tag = "NaN"
-
-                                'write to log
-                                Log.AddLogEntry(Log.levels.info, $"Series contains NaN values from {nanStart.ToString(Helpers.CurrentDateFormat)} to {nanEnd.ToString(Helpers.CurrentDateFormat)}")
-                            End If
                         End If
-                    Next
-                    If Not nanFoundInSeries Then
-                        Log.AddLogEntry(Log.levels.info, "Series does not contain any NaN values")
+
+                        If Not isNaNPeriod Then
+                            'end of NaN period reached
+
+                            'add a horizontal span
+                            Dim hspan As ScottPlot.Plottable.HSpan = View.MainPlot.Plot.AddHorizontalSpan(spanStart.ToOADate(), spanEnd.ToOADate())
+                            hspan.BorderLineStyle = ScottPlot.LineStyle.None
+                            hspan.Color = Color.FromArgb(100, ControlPaint.Light(color))
+                            hspan.DragEnabled = False
+                            View.NaNSpans.Add(hspan)
+
+                            'write to log
+                            Log.AddLogEntry(Log.levels.info, $"Series {ts.Title} contains {nanCount} NaN values from {nanStart.ToString(Helpers.CurrentDateFormat)} to {nanEnd.ToString(Helpers.CurrentDateFormat)}")
+
+                            'reset nanCount
+                            nanCount = 0
+                        End If
                     End If
+                Next
+                If Not nanFoundInSeries Then
+                    Log.AddLogEntry(Log.levels.info, $"Series {ts.Title} does not contain any NaN values")
                 End If
             Next
             If Not nanFound Then
@@ -741,17 +706,15 @@ Friend Class WaveController
             End If
         Else
             'Switch visualization of NaN values off
-            'Remove all tools of type ColorBand with Tag "NaN" from TChart1
-            Dim nanbands As New List(Of Steema.TeeChart.Tools.ColorBand)
-            For Each tool As Steema.TeeChart.Tools.Tool In View.TChart1.Tools
-                If tool.GetType Is GetType(Steema.TeeChart.Tools.ColorBand) And tool.Tag = "NaN" Then
-                    nanbands.Add(tool)
-                End If
-            Next
-            For Each nanband As Steema.TeeChart.Tools.ColorBand In nanbands
-                View.TChart1.Tools.Remove(nanband)
+            'Remove all corresponding hspans in main chart
+            For Each hspan In View.NaNSpans
+                View.MainPlot.Plot.Remove(hspan)
             Next
+            View.NaNSpans.Clear()
         End If
+
+        View.MainPlot.Refresh()
+
     End Sub
 
     ''' <summary>
@@ -796,31 +759,21 @@ Friend Class WaveController
                 ts = ts.removeNaNValues()
                 _model.TimeSeries(id) = ts
                 'replace values of series in chart
-                For Each series As Steema.TeeChart.Styles.Series In View.TChart1.Series
-                    If series.Tag = id Then
-                        series.BeginUpdate()
-                        series.Clear()
-                        For Each kvp As KeyValuePair(Of DateTime, Double) In ts.Nodes
-                            series.Add(kvp.Key, kvp.Value)
-                        Next
-                        series.EndUpdate()
-                        Exit For
-                    End If
-                Next
+                Dim series As ScottPlot.Plottable.ScatterPlot = Me.ChartSeries(id)
+                series.Update(ts.Dates.Select(Function(t As DateTime) t.ToOADate()).ToArray(), ts.Values.ToArray())
+                'TODO: update series in overview chart
             Next
+            View.MainPlot.Refresh()
         End If
     End Sub
 
-    'Drucken
-    '*******
-    Private Sub Print_Click(sender As System.Object, e As System.EventArgs)
-        Call View.TChart1.Printer.Preview()
-    End Sub
-
-    'Kopieren (als PNG)
-    '******************
+    ''' <summary>
+    ''' Handles copy button clicked
+    ''' </summary>
+    ''' <param name="sender"></param>
+    ''' <param name="e"></param>
     Private Sub Copy_Click(sender As System.Object, e As System.EventArgs)
-        Call View.TChart1.Export.Image.PNG.CopyToClipboard()
+        Clipboard.SetImage(View.MainPlot.Plot.Render())
     End Sub
 
     'Analysieren
@@ -870,9 +823,8 @@ Friend Class WaveController
                 '--------------------
                 'Ergebnisdiagramm anzeigen
                 If (oAnalysis.hasResultChart) Then
-                    Dim resultChart As New AnalysisResultChart()
+                    Dim resultChart As New AnalysisResultChart(oAnalysis.getResultChart())
                     resultChart.Text &= " - " & oAnalysisDialog.selectedAnalysisFunction.ToString()
-                    resultChart.TChart1.Chart = oAnalysis.getResultChart()
                     Call resultChart.Show()
                 End If
 
@@ -1088,12 +1040,10 @@ Friend Class WaveController
             Call Me.ViewportChanged()
         Else
             'Reset the Y axes to automatic
-            View.TChart1.Axes.Left.Automatic = True
-            View.TChart1.Axes.Right.Automatic = True
-            For Each axis As Steema.TeeChart.Axis In View.TChart1.Axes.Custom
-                axis.Automatic = True
+            For Each axis As ScottPlot.Renderable.Axis In View.MainPlot.Plot.GetAxesMatching(axisIndex:=Nothing, isVertical:=True)
+                axis.Dims.ResetLimits()
             Next
-            View.TChart1.Refresh()
+            View.MainPlot.Refresh()
         End If
     End Sub
 
@@ -1148,10 +1098,10 @@ Friend Class WaveController
             Log.AddLogEntry(Log.levels.info, "Reloading all series from their original datasources...")
 
             'Alle Serien löschen
-            View.TChart1.Series.RemoveAllSeries()
-            View.TChart2.Series.RemoveAllSeries()
-            View.TChart1.Refresh()
-            View.TChart2.Refresh()
+            View.MainPlot.Plot.Clear()
+            View.OverviewPlot.Plot.Clear()
+            'View.MainPlot.Refresh()
+            'View.OverviewPlot.Refresh()
 
             'Collection zurücksetzen
             _model.TimeSeries.Clear()
@@ -1192,14 +1142,41 @@ Friend Class WaveController
 
     End Sub
 
+    ''' <summary>
+    ''' Handles the user clicking the delete button
+    ''' </summary>
+    ''' <param name="sender"></param>
+    ''' <param name="e"></param>
+    Private Sub ToolStripButton_Delete_Click(sender As Object, e As EventArgs)
+        Call DeleteSelectedSeries()
+    End Sub
+
+    ''' <summary>
+    ''' Handles the user clicking the move up button
+    ''' </summary>
+    ''' <param name="sender"></param>
+    ''' <param name="e"></param>
+    Private Sub ToolStripButton_MoveUp_Click(sender As Object, e As EventArgs)
+        Call ReorderSelectedSeries(Direction.Up)
+    End Sub
+
+    ''' <summary>
+    ''' Handles the user clicking the move down button
+    ''' </summary>
+    ''' <param name="sender"></param>
+    ''' <param name="e"></param>
+    Private Sub ToolStripButton_MoveDown_Click(sender As Object, e As EventArgs)
+        Call ReorderSelectedSeries(Direction.Down)
+    End Sub
+
     ''' <summary>
     ''' Activate all series button clicked
     ''' </summary>
     ''' <param name="sender"></param>
     ''' <param name="e"></param>
     Private Sub ActivateAllSeries_Click(sender As Object, e As EventArgs)
-        For Each series As Steema.TeeChart.Styles.Series In View.TChart1.Series
-            series.Active = True
+        For i As Integer = 0 To View.CheckedListBox_Series.Items.Count - 1
+            View.CheckedListBox_Series.SetItemChecked(i, True)
         Next
     End Sub
 
@@ -1209,11 +1186,101 @@ Friend Class WaveController
     ''' <param name="sender"></param>
     ''' <param name="e"></param>
     Private Sub DeactivateAllSeries_Click(sender As Object, e As EventArgs)
-        For Each series As Steema.TeeChart.Styles.Series In View.TChart1.Series
-            series.Active = False
+        For i As Integer = 0 To View.CheckedListBox_Series.Items.Count - 1
+            View.CheckedListBox_Series.SetItemChecked(i, False)
         Next
     End Sub
 
+    ''' <summary>
+    ''' Reorder selected series
+    ''' </summary>
+    ''' <param name="direction">Direction in which to move selected series</param>
+    Private Sub ReorderSelectedSeries(direction As Direction)
+
+        'TODO: CheckedListBox does not allow multiselection, so only one series will ever be selected
+
+        Dim indices As New List(Of Integer)
+        Dim ids As New List(Of Integer)
+        For Each index As Integer In View.CheckedListBox_Series.SelectedIndices
+            If (direction = Direction.Up And index = 0) Or
+               (direction = Direction.Down And index = View.CheckedListBox_Series.Items.Count - 1) Then
+                'if first row is selected, moving up does nothing
+                'if last row is selected, moving down does nothing
+                Exit Sub
+            End If
+            indices.Add(index)
+            ids.Add(CType(View.CheckedListBox_Series.Items(index), TimeSeries).Id)
+        Next
+        'reorder each series in the model
+        For Each id As Integer In ids
+            Model.SeriesReorder(id, direction)
+        Next
+        'reselect previously selected items in their new positions
+        View.CheckedListBox_Series.ClearSelected()
+        Dim offset As Integer
+        If direction = Direction.Up Then
+            offset = -1
+        Else
+            offset = 1
+        End If
+        For Each index As Integer In indices
+            View.CheckedListBox_Series.SetSelected(index + offset, True)
+        Next
+    End Sub
+
+    ''' <summary>
+    ''' Deletes the series currently selected in the TOC
+    ''' </summary>
+    Private Sub DeleteSelectedSeries()
+
+        'TODO: CheckedListBox does not allow multiselection, so only one series will ever be selected
+
+        'collect titles and ids of all selected items
+        Dim titles As New List(Of String)
+        Dim ids As New List(Of Integer)
+        For Each ts As TimeSeries In View.CheckedListBox_Series.SelectedItems
+            titles.Add(ts.Title)
+            ids.Add(ts.Id)
+        Next
+        If ids.Count > 0 Then
+            'ask for user confirmation
+            Dim result As MsgBoxResult = MsgBox($"Delete {ids.Count} series?{eol}{String.Join(eol, titles)}", MsgBoxStyle.OkCancel Or MsgBoxStyle.Exclamation)
+            If result = MsgBoxResult.Ok Then
+                For Each id As Integer In ids
+                    Model.RemoveTimeSeries(id)
+                Next
+            End If
+        End If
+
+    End Sub
+
+    ''' <summary>
+    ''' Handles the TOC selection changed
+    ''' Enables/disables buttons
+    ''' </summary>
+    ''' <param name="sender"></param>
+    ''' <param name="e"></param>
+    Private Sub TOC_SelectionChanged(sender As Object, e As EventArgs)
+        'Check if any items are selected
+        If View.CheckedListBox_Series.SelectedIndices.Count = 0 Then
+            View.ToolStripButton_Delete.Enabled = False
+            View.ToolStripButton_MoveUp.Enabled = False
+            View.ToolStripButton_MoveDown.Enabled = False
+        Else
+            View.ToolStripButton_Delete.Enabled = True
+            View.ToolStripButton_MoveUp.Enabled = True
+            View.ToolStripButton_MoveDown.Enabled = True
+            'check if first row is selected
+            If View.CheckedListBox_Series.GetSelected(0) Then
+                View.ToolStripButton_MoveUp.Enabled = False
+            End If
+            'check if last row is selected
+            If View.CheckedListBox_Series.GetSelected(View.CheckedListBox_Series.Items.Count - 1) Then
+                View.ToolStripButton_MoveDown.Enabled = False
+            End If
+        End If
+    End Sub
+
     ''' <summary>
     ''' Check for update menu item or update notification button clicked
     ''' </summary>
@@ -1269,7 +1336,7 @@ Friend Class WaveController
     ''' </summary>
     Private Sub About_Click(sender As System.Object, e As System.EventArgs)
         Dim about As New AboutBox()
-        Call about.ShowDialog(Me.View)
+        Call about.ShowDialog(View)
     End Sub
 
     ''' <summary>
@@ -1478,12 +1545,11 @@ Friend Class WaveController
         'collect start and end dates of all currently active series
         Dim startdates As New List(Of Double)
         Dim enddates As New List(Of Double)
-        For Each series As Steema.TeeChart.Styles.Series In View.TChart1.Series
-            If Not series.Active Then
-                Continue For
-            End If
-            startdates.Add(series.MinXValue)
-            enddates.Add(series.MaxXValue)
+
+        For Each index As Integer In View.CheckedListBox_Series.CheckedIndices
+            Dim ts As TimeSeries = View.CheckedListBox_Series.Items(index)
+            startdates.Add(ts.StartDate.ToOADate())
+            enddates.Add(ts.EndDate.ToOADate())
         Next
 
         If startdates.Count = 0 Or enddates.Count = 0 Then
@@ -1545,10 +1611,10 @@ Friend Class WaveController
 
         If e.Button = Windows.Forms.MouseButtons.Left Then
             'start zoom process
-            If View.TChart1.Series.Count > 0 Then
+            If View.MainPlot.Plot.GetPlottables().Length > 0 Then
 
                 Dim startValue As Double
-                startValue = View.TChart1.Series(0).XScreenToValue(e.X)
+                startValue = View.MainPlot.Plot.GetCoordinateX(e.X)
 
                 If startValue < View.ChartMinX.ToOADate() Or
                     startValue > View.ChartMaxX.ToOADate() Then
@@ -1556,16 +1622,17 @@ Friend Class WaveController
                     Exit Sub
                 End If
 
-                View.TChart1.Cursor = View.cursor_zoom
+                View.MainPlot.Cursor = View.cursor_zoom
                 Call Me.SaveZoomSnapshot()
 
                 Me.ChartMouseZoomDragging = True
                 Me.ChartMouseDragStartX = e.X
 
-                View.colorBandZoom.Chart = View.TChart1.Chart
-                View.colorBandZoom.Active = True
-                View.colorBandZoom.Start = startValue
-                View.colorBandZoom.End = startValue
+                View.ZoomRectangle.X1 = startValue
+                View.ZoomRectangle.X2 = startValue
+                View.ZoomRectangle.IsVisible = True
+
+                View.MainPlot.Refresh()
 
                 Log.AddLogEntry(Log.levels.debug, "Zoom start at " & DateTime.FromOADate(startValue))
             End If
@@ -1574,9 +1641,9 @@ Friend Class WaveController
             'start pan process
             Me.ChartMousePanning = True
             Me.ChartMouseDragStartX = e.X
-            Me.ChartMousePanDisplayRange = View.TChart1.Axes.Bottom.Maximum - View.TChart1.Axes.Bottom.Minimum
+            Me.ChartMousePanDisplayRange = View.MainPlot.Plot.XAxis.Dims.Span
             Call Me.SaveZoomSnapshot()
-            View.TChart1.Cursor = View.cursor_pan
+            View.MainPlot.Cursor = View.cursor_pan
         End If
 
     End Sub
@@ -1591,14 +1658,15 @@ Friend Class WaveController
 
         If Me.ChartMouseZoomDragging Then
             Dim endValue As Double
-            endValue = View.TChart1.Series(0).XScreenToValue(e.X)
-            View.colorBandZoom.End = endValue
+            endValue = View.MainPlot.Plot.GetCoordinateX(e.X)
+            View.ZoomRectangle.X2 = endValue
+            View.MainPlot.Refresh()
 
         ElseIf Me.ChartMousePanning Then
             Dim xMin, xMax As Double
-            Dim panDistance As Double = View.TChart1.Series(0).XScreenToValue(Me.ChartMouseDragStartX) - View.TChart1.Series(0).XScreenToValue(e.X)
-            xMin = View.TChart1.Axes.Bottom.Minimum + panDistance
-            xMax = View.TChart1.Axes.Bottom.Maximum + panDistance
+            Dim panDistance As Double = View.MainPlot.Plot.GetCoordinateX(Me.ChartMouseDragStartX) - View.MainPlot.Plot.GetCoordinateX(e.X)
+            xMin = View.MainPlot.Plot.XAxis.Dims.Min + panDistance
+            xMax = View.MainPlot.Plot.XAxis.Dims.Max + panDistance
             'prevent panning beyond displayable range (#68)
             If xMin < Constants.minOADate.ToOADate() Then
                 xMin = Constants.minOADate.ToOADate()
@@ -1611,6 +1679,7 @@ Friend Class WaveController
             'set the new viewport 
             View.ChartMinX = DateTime.FromOADate(xMin)
             View.ChartMaxX = DateTime.FromOADate(xMax)
+            View.MainPlot.Refresh()
             Me.selectionMade = True
             'update drag start point
             Me.ChartMouseDragStartX = e.X
@@ -1630,16 +1699,16 @@ Friend Class WaveController
                 'determine start and end dates of zoom
                 Dim mouseValue, startValue, endValue As Double
                 'prevent zooming beyond the displayable date range (#68)
-                mouseValue = View.TChart1.Series(0).XScreenToValue(e.X)
+                mouseValue = View.MainPlot.Plot.GetCoordinateX(e.X)
                 mouseValue = Math.Max(mouseValue, Constants.minOADate.ToOADate)
                 mouseValue = Math.Min(mouseValue, Constants.maxOADate.ToOADate)
                 'set start and end depending on zoom direction
                 If e.X > Me.ChartMouseDragStartX Then
-                    startValue = View.TChart1.Series(0).XScreenToValue(Me.ChartMouseDragStartX)
+                    startValue = View.MainPlot.Plot.GetCoordinateX(Me.ChartMouseDragStartX)
                     endValue = mouseValue
                 Else
                     startValue = mouseValue
-                    endValue = View.TChart1.Series(0).XScreenToValue(Me.ChartMouseDragStartX)
+                    endValue = View.MainPlot.Plot.GetCoordinateX(Me.ChartMouseDragStartX)
                 End If
                 Log.AddLogEntry(Log.levels.debug, "Zoom end at " & DateTime.FromOADate(endValue))
 
@@ -1652,14 +1721,17 @@ Friend Class WaveController
                 Me.selectionMade = True
                 Call Me.ViewportChanged()
             End If
-            'hide colorband
-            View.colorBandZoom.Active = False
+            'hide zoom rectangle
+            View.ZoomRectangle.IsVisible = False
+
+            View.MainPlot.Refresh()
+
         ElseIf Me.ChartMousePanning Then
             'complete the pan process
             Call Me.ViewportChanged()
             Me.ChartMousePanning = False
         End If
-        View.TChart1.Cursor = Cursors.Default
+        View.MainPlot.Cursor = Cursors.Default
     End Sub
 
     ''' <summary>
@@ -1690,7 +1762,7 @@ Friend Class WaveController
             End If
 
             'determine mouse position and its left-right ratio in relation to x axis
-            Dim centerOADate As Double = View.TChart1.Series(0).XScreenToValue(e.X)
+            Dim centerOADate As Double = View.MainPlot.Plot.GetCoordinateX(e.X)
             Dim centerDate As DateTime = DateTime.FromOADate(centerOADate)
             Dim leftRatio As Double = (centerDate - View.ChartMinX).Ticks / currentExtent.Ticks
             Dim rightRatio As Double = 1 - leftRatio
@@ -1703,6 +1775,7 @@ Friend Class WaveController
             View.ChartMaxX = centerDate + New TimeSpan(ticks:=newExtent * rightRatio)
 
             Me.selectionMade = True
+
             Call Me.ViewportChanged()
 
         Catch ex As ArgumentOutOfRangeException
@@ -1720,37 +1793,38 @@ Friend Class WaveController
     ''' <param name="e"></param>
     Private Sub OverviewChart_MouseDown(sender As Object, e As MouseEventArgs)
 
-        If View.TChart2.Series.Count > 0 Then
+        If View.OverviewPlot.Plot.GetPlottables().Count > 0 Then
 
             If e.Button = MouseButtons.Left Then
                 'start zoom process
 
-                View.TChart2.Cursor = View.cursor_zoom
+                View.OverviewPlot.Cursor = View.cursor_zoom
 
                 Me.OverviewChartMouseDragging = True
                 Me.OverviewChartMouseDragStartX = e.X
 
                 'set start and end value of colorband to mouse position
                 Dim xMouse As Double
-                xMouse = View.TChart2.Series(0).XScreenToValue(Me.OverviewChartMouseDragStartX)
+                xMouse = View.OverviewPlot.Plot.GetCoordinateX(Me.OverviewChartMouseDragStartX)
 
                 'prevent zoom starting beyond displayable date range (#68)
                 xMouse = Math.Max(xMouse, Constants.minOADate.ToOADate)
                 xMouse = Math.Min(xMouse, Constants.maxOADate.ToOADate)
 
-                View.colorBandOverview.Start = xMouse
-                View.colorBandOverview.End = xMouse
+                View.ViewExtentRectangle.X1 = xMouse
+                View.ViewExtentRectangle.X2 = xMouse
+                View.OverviewPlot.Refresh()
 
                 Log.AddLogEntry(Log.levels.debug, "Zoom start at " & DateTime.FromOADate(xMouse))
 
             ElseIf e.Button = MouseButtons.Right Then
                 'start panning process
 
-                View.TChart2.Cursor = View.cursor_pan
+                View.OverviewPlot.Cursor = View.cursor_pan
 
                 Me.OverviewChartMouseDragging = True
                 Me.OverviewChartMouseDragStartX = e.X
-                Me.OverviewChartMouseDragOffset = e.X - View.TChart2.Series(0).ValuePointToScreenPoint(View.colorBandOverview.Start, 0).X
+                Me.OverviewChartMouseDragOffset = e.X - View.OverviewPlot.Plot.GetPixelX(View.ViewExtentRectangle.X1)
 
             End If
         End If
@@ -1768,20 +1842,21 @@ Friend Class WaveController
 
             If e.Button = MouseButtons.Left Then
                 'move the end of the colorband to the mouse pointer
-                Dim xMouse As Double = View.TChart2.Series(0).XScreenToValue(e.X)
+                Dim xMouse As Double = View.OverviewPlot.Plot.GetCoordinateX(e.X)
 
                 'restrict to displayable date range (#68)
                 xMouse = Math.Max(xMouse, Constants.minOADate.ToOADate)
                 xMouse = Math.Min(xMouse, Constants.maxOADate.ToOADate)
 
-                View.colorBandOverview.End = xMouse
+                View.ViewExtentRectangle.X2 = xMouse
+                View.OverviewPlot.Refresh()
 
             ElseIf e.Button = MouseButtons.Right Then
                 'move the whole color band while maintaining its width
-                Dim width As Double = View.colorBandOverview.End - View.colorBandOverview.Start
+                Dim width As Double = View.ViewExtentRectangle.X2 - View.ViewExtentRectangle.X1
 
                 Dim startValue, endValue As Double
-                startValue = View.TChart2.Series(0).XScreenToValue(e.X - Me.OverviewChartMouseDragOffset)
+                startValue = View.OverviewPlot.Plot.GetCoordinateX(e.X - Me.OverviewChartMouseDragOffset)
                 endValue = startValue + width
 
                 'restrict to displayable date range (#68)
@@ -1794,8 +1869,9 @@ Friend Class WaveController
                     startValue = endValue - width
                 End If
 
-                View.colorBandOverview.Start = startValue
-                View.colorBandOverview.End = endValue
+                View.ViewExtentRectangle.X1 = startValue
+                View.ViewExtentRectangle.X2 = endValue
+                View.OverviewPlot.Refresh()
             End If
         End If
     End Sub
@@ -1808,7 +1884,7 @@ Friend Class WaveController
     ''' <param name="e"></param>
     Private Sub OverviewChart_MouseUp(sender As System.Object, e As System.Windows.Forms.MouseEventArgs)
 
-        View.TChart2.Cursor = Cursors.Default
+        View.OverviewPlot.Cursor = Cursors.Default
 
         If Me.OverviewChartMouseDragging Then
 
@@ -1822,11 +1898,11 @@ Friend Class WaveController
                     'set start and end depending on zoom direction
                     Dim startValue, endValue As Double
                     If e.X > Me.OverviewChartMouseDragStartX Then
-                        startValue = View.TChart2.Series(0).XScreenToValue(Me.OverviewChartMouseDragStartX)
-                        endValue = View.TChart2.Series(0).XScreenToValue(e.X)
+                        startValue = View.OverviewPlot.Plot.GetCoordinateX(Me.OverviewChartMouseDragStartX)
+                        endValue = View.OverviewPlot.Plot.GetCoordinateX(e.X)
                     Else
-                        startValue = View.TChart2.Series(0).XScreenToValue(e.X)
-                        endValue = View.TChart2.Series(0).XScreenToValue(Me.OverviewChartMouseDragStartX)
+                        startValue = View.OverviewPlot.Plot.GetCoordinateX(e.X)
+                        endValue = View.OverviewPlot.Plot.GetCoordinateX(Me.OverviewChartMouseDragStartX)
                     End If
                     'restrict to displayable date range (#68)
                     startValue = Math.Max(startValue, Constants.minOADate.ToOADate)
@@ -1835,15 +1911,16 @@ Friend Class WaveController
                     Log.AddLogEntry(Log.levels.debug, "Zoom end at " & DateTime.FromOADate(endValue))
 
                     'adjust colorband
-                    View.colorBandOverview.Start = startValue
-                    View.colorBandOverview.End = endValue
+                    View.ViewExtentRectangle.X1 = startValue
+                    View.ViewExtentRectangle.X2 = endValue
+                    View.OverviewPlot.Refresh()
 
                     'save the current zoom snapshot
                     Call Me.SaveZoomSnapshot()
 
                     'set the new viewport on the main chart
-                    View.ChartMinX = DateTime.FromOADate(View.colorBandOverview.Start)
-                    View.ChartMaxX = DateTime.FromOADate(View.colorBandOverview.End)
+                    View.ChartMinX = DateTime.FromOADate(View.ViewExtentRectangle.X1)
+                    View.ChartMaxX = DateTime.FromOADate(View.ViewExtentRectangle.X2)
 
                     Me.selectionMade = True
                     Call Me.ViewportChanged()
@@ -1856,8 +1933,8 @@ Friend Class WaveController
                 Call Me.SaveZoomSnapshot()
 
                 'set the new viewport on the main chart
-                View.ChartMinX = DateTime.FromOADate(View.colorBandOverview.Start)
-                View.ChartMaxX = DateTime.FromOADate(View.colorBandOverview.End)
+                View.ChartMinX = DateTime.FromOADate(View.ViewExtentRectangle.X1)
+                View.ChartMaxX = DateTime.FromOADate(View.ViewExtentRectangle.X2)
 
                 Me.selectionMade = True
                 Call Me.ViewportChanged()
@@ -1888,10 +1965,10 @@ Friend Class WaveController
             'zoom while centering on mouse
             Dim newStart As Double
             Dim newEnd As Double
-            Dim mouseOADate As Double = View.TChart2.Series(0).XScreenToValue(e.X)
-            Dim currentExtent As Double = View.colorBandOverview.End - View.colorBandOverview.Start
+            Dim mouseOADate As Double = View.OverviewPlot.Plot.GetCoordinateX(e.X)
+            Dim currentExtent As Double = View.ViewExtentRectangle.X2 - View.ViewExtentRectangle.X1
 
-            If mouseOADate >= View.colorBandOverview.Start And mouseOADate <= View.colorBandOverview.End Then
+            If mouseOADate >= View.ViewExtentRectangle.X1 And mouseOADate <= View.ViewExtentRectangle.X2 Then
                 'zoom by 25% if mouse is inside color band
                 Dim newExtent As Double
                 If numberOfTextLinesToMove > 0 Then
@@ -1907,27 +1984,28 @@ Friend Class WaveController
             Else
                 'pan by 25% of current extent if mouse is outside of color band
                 Dim delta As Double = currentExtent * 0.25
-                If mouseOADate > View.colorBandOverview.End Then
+                If mouseOADate > View.ViewExtentRectangle.X2 Then
                     'pan right
-                    newStart = View.colorBandOverview.Start + delta
-                    newEnd = View.colorBandOverview.End + delta
+                    newStart = View.ViewExtentRectangle.X1 + delta
+                    newEnd = View.ViewExtentRectangle.X2 + delta
                 Else
                     'pan left
-                    newStart = View.colorBandOverview.Start - delta
-                    newEnd = View.colorBandOverview.End - delta
+                    newStart = View.ViewExtentRectangle.X1 - delta
+                    newEnd = View.ViewExtentRectangle.X2 - delta
                 End If
             End If
 
             'set the new colorband
-            View.colorBandOverview.Start = newStart
-            View.colorBandOverview.End = newEnd
+            View.ViewExtentRectangle.X1 = newStart
+            View.ViewExtentRectangle.X2 = newEnd
+            View.OverviewPlot.Refresh()
 
             'save the current zoom snapshot
             Call Me.SaveZoomSnapshot()
 
             'set the new viewport on the main chart
-            View.ChartMinX = DateTime.FromOADate(View.colorBandOverview.Start)
-            View.ChartMaxX = DateTime.FromOADate(View.colorBandOverview.End)
+            View.ChartMinX = DateTime.FromOADate(View.ViewExtentRectangle.X1)
+            View.ChartMaxX = DateTime.FromOADate(View.ViewExtentRectangle.X2)
 
             Me.selectionMade = True
             Call Me.ViewportChanged()
@@ -1939,12 +2017,6 @@ Friend Class WaveController
 
     End Sub
 
-    'TChart2 DoubleClick
-    '*******************
-    Private Sub OverviewChart_DoubleClick(sender As System.Object, e As System.EventArgs)
-        Call Steema.TeeChart.Editor.Show(View.TChart2)
-    End Sub
-
     ''' <summary>
     ''' Add the current zoom extent to the zoom history
     ''' </summary>
@@ -1983,66 +2055,43 @@ Friend Class WaveController
         'Auto-adjust Y-axes to current viewport
         If View.AutoAdjustYAxes Then
 
-            Dim startdate, enddate As DateTime
-            Dim title As String
-            Dim seriesMin, seriesMax, Ymin, Ymax As Double
-            Dim axisType As Steema.TeeChart.Styles.VerticalAxis
-            Dim axis As Steema.TeeChart.Axis
-
             'get start and end date of current viewport
-            startdate = View.ChartMinX
-            enddate = View.ChartMaxX
-
-            'define axes to process
-            Dim axes As New List(Of (axisType As Steema.TeeChart.Styles.VerticalAxis, axis As Steema.TeeChart.Axis))
-            axes.Add((Steema.TeeChart.Styles.VerticalAxis.Left, View.TChart1.Axes.Left))
-            axes.Add((Steema.TeeChart.Styles.VerticalAxis.Right, View.TChart1.Axes.Right))
-            For Each axis In View.TChart1.Axes.Custom
-                axes.Add((Steema.TeeChart.Styles.VerticalAxis.Custom, axis))
+            Dim startdate As DateTime = View.ChartMinX
+            Dim enddate As DateTime = View.ChartMaxX
+
+            'get min and max values of visible series grouped by unit
+            Dim unitRanges As New Dictionary(Of String, (min As Double, max As Double))
+            For Each index As Integer In View.CheckedListBox_Series.CheckedIndices
+                Dim ts As TimeSeries = CType(View.CheckedListBox_Series.Items(index), TimeSeries)
+                Dim seriesMin As Double = ts.Minimum(startdate, enddate)
+                Dim seriesMax As Double = ts.Maximum(startdate, enddate)
+                If Not unitRanges.ContainsKey(ts.Unit) Then
+                    unitRanges.Add(ts.Unit, (seriesMin, seriesMax))
+                Else
+                    If seriesMin < unitRanges(ts.Unit).min Then
+                        unitRanges(ts.Unit) = (seriesMin, unitRanges(ts.Unit).max)
+                    End If
+                    If seriesMax > unitRanges(ts.Unit).max Then
+                        unitRanges(ts.Unit) = (unitRanges(ts.Unit).min, seriesMax)
+                    End If
+                End If
             Next
 
             'loop over Y-axes
-            For Each t As (axisType As Steema.TeeChart.Styles.VerticalAxis, axis As Steema.TeeChart.Axis) In axes
-                axisType = t.axisType
-                axis = t.axis
-
-                'loop over series
-                Ymin = Double.MaxValue
-                Ymax = Double.MinValue
-                For Each ts As TimeSeries In _model.TimeSeries.Values
-                    title = ts.Title
-
-                    'only process active series on the current axis
-                    If View.TChart1.Series.WithTitle(title).Active And View.TChart1.Series.WithTitle(title).VertAxis = axisType Then
-
-                        If axisType = Steema.TeeChart.Styles.VerticalAxis.Custom And ts.Unit <> axis.Tag Then
-                            'series is on a different custom axis, skip it
-                            Continue For
-                        End If
-
-                        'get series min and max for current viewport
-                        seriesMin = ts.Minimum(startdate, enddate)
-                        If seriesMin < Ymin Then
-                            Ymin = seriesMin
-                        End If
-                        seriesMax = ts.Maximum(startdate, enddate)
-                        If seriesMax > Ymax Then
-                            Ymax = seriesMax
-                        End If
-                    End If
-                Next
-
-                'set new Y axis bounds
-                If Ymin < Double.MaxValue Then
-                    axis.AutomaticMinimum = False
-                    axis.Minimum = Ymin
-                End If
-                If Ymax > Double.MinValue Then
-                    axis.AutomaticMaximum = False
-                    axis.Maximum = Ymax
+            For Each axis As ScottPlot.Renderable.Axis In View.MainPlot.Plot.GetAxesMatching(axisIndex:=Nothing, isVertical:=True)
+                Dim axisUnit As String = axis.AxisLabel.Label
+                If unitRanges.ContainsKey(axisUnit) Then
+                    'set new limits
+                    Dim range As (min As Double, max As Double) = unitRanges(axisUnit)
+                    Dim padding As Double = (range.max - range.min) * 0.05
+                    axis.Dims.ResetLimits()
+                    axis.Dims.SetAxis(range.min - padding, range.max + padding)
                 End If
             Next
         End If
+
+        View.MainPlot.Refresh()
+
     End Sub
 
     ''' <summary>
@@ -2144,8 +2193,8 @@ Friend Class WaveController
 
         If (_model.TimeSeries.Count = 0) Then
             'just refresh
-            View.TChart1.Refresh()
-            View.TChart2.Refresh()
+            View.MainPlot.Refresh()
+            View.OverviewPlot.Refresh()
 
         Else
             'Update X-Axis and colorBand
@@ -2171,8 +2220,7 @@ Friend Class WaveController
             End If
 
             'Ãœbersicht neu skalieren
-            View.TChart2.Axes.Bottom.Minimum = Xmin.ToOADate()
-            View.TChart2.Axes.Bottom.Maximum = Xmax.ToOADate()
+            View.OverviewPlot.Plot.XAxis.Dims.SetAxis(min:=Xmin.ToOADate(), max:=Xmax.ToOADate())
 
             If (Not Me.selectionMade) Then
                 'Wenn noch nicht gezoomed wurde, Gesamtzeitraum auswählen
@@ -2182,6 +2230,8 @@ Friend Class WaveController
             'Extent auf Colorband übertragen
             Call Me.UpdateOverviewZoomExtent()
 
+            View.MainPlot.Refresh()
+            View.OverviewPlot.Refresh()
         End If
 
     End Sub
@@ -2191,8 +2241,10 @@ Friend Class WaveController
     ''' </summary>
     ''' <remarks></remarks>
     Private Sub UpdateOverviewZoomExtent()
-        View.colorBandOverview.Start = View.ChartMinX.ToOADate()
-        View.colorBandOverview.End = View.ChartMaxX.ToOADate()
+        Dim limits As ScottPlot.AxisLimits = View.OverviewPlot.Plot.GetAxisLimits()
+        View.ViewExtentRectangle.X1 = View.ChartMinX.ToOADate()
+        View.ViewExtentRectangle.X2 = View.ChartMaxX.ToOADate()
+        View.OverviewPlot.Refresh()
     End Sub
 
     ''' <summary>
@@ -2239,41 +2291,23 @@ Friend Class WaveController
         'Serie zu Diagramm hinzufügen
 
         'Linien instanzieren
-        Dim Line1 As New Steema.TeeChart.Styles.Line(View.TChart1.Chart)
+        Dim Line1 As ScottPlot.Plottable.ScatterPlot
+        Line1 = View.MainPlot.Plot.AddScatter(ts.Dates.Select(Function(t As DateTime) t.ToOADate()).ToArray(), ts.Values.ToArray())
 
         'Do not paint NaN values
-        Line1.TreatNaNAsNull = True
-        Line1.TreatNulls = Steema.TeeChart.Styles.TreatNullsStyle.DoNotPaint
-
-        'X-Werte als Zeitdaten einstellen
-        Line1.XValues.DateTime = True
-
-        'Store id as Tag property
-        Line1.Tag = ts.Id
+        Line1.OnNaN = ScottPlot.Plottable.ScatterPlot.NanBehavior.Gap
 
         'Namen vergeben
-        Line1.Title = ts.Title
+        Line1.Label = ts.Title
 
         'set display options
         If Not ts.DisplayOptions.Color.IsEmpty Then
             Line1.Color = ts.DisplayOptions.Color
         End If
-        Line1.LinePen.Style = ts.DisplayOptions.LineStyle
-        Line1.LinePen.Width = ts.DisplayOptions.LineWidth
-        Line1.Pointer.Visible = ts.DisplayOptions.ShowPoints
-
-        'Stützstellen zur Serie hinzufügen
-        'Main chart
-        Line1.BeginUpdate()
-        Line1.Add(ts.Dates.ToArray(), ts.Values.ToArray())
-        Line1.EndUpdate()
-
-        'Add series to overview chart
-        Call Me.AddSeriesToOverview(ts)
-
-        'Determine total number of NaN-values and write to log
-        If ts.NaNCount > 0 Then
-            Log.AddLogEntry(Log.levels.warning, $"Series '{ts.Title}' contains {ts.NaNCount} NaN values!")
+        Line1.LineStyle = ts.DisplayOptions.LineStyle
+        Line1.LineWidth = ts.DisplayOptions.LineWidth
+        If Not ts.DisplayOptions.ShowPoints Then
+            Line1.MarkerShape = ScottPlot.MarkerShape.none
         End If
 
         'Y-Achsenzuordnung
@@ -2282,78 +2316,73 @@ Friend Class WaveController
         'Interpretation
         Select Case ts.Interpretation
             Case TimeSeries.InterpretationEnum.BlockRight
-                Line1.Stairs = True
+                Line1.StepDisplay = True
+                Line1.StepDisplayRight = True
             Case TimeSeries.InterpretationEnum.BlockLeft,
-                TimeSeries.InterpretationEnum.CumulativePerTimestep
-                Line1.Stairs = True
-                Line1.InvertedStairs = True
+                 TimeSeries.InterpretationEnum.CumulativePerTimestep
+                Line1.StepDisplay = True
+                Line1.StepDisplayRight = False
         End Select
 
+        'Store chart series
+        Me.ChartSeries.Add(ts.Id, Line1)
+
+        'Add series to overview chart
+        Call Me.AddSeriesToOverview(ts, Line1.Color)
+
         'Charts aktualisieren
         Call Me.UpdateChartExtents()
 
         Call Me.ViewportChanged()
 
+        'Determine total number of NaN-values and write to log
+        If ts.NaNCount > 0 Then
+            Log.AddLogEntry(Log.levels.warning, $"Series '{ts.Title}' contains {ts.NaNCount} NaN values!")
+        End If
+
+        'add series to TOC
+        View.CheckedListBox_Series.Items.Add(ts, isChecked:=True)
+
     End Sub
 
     ''' <summary>
-    ''' Adds a time series to the overview chart
+    ''' Adds a series to the overview chart
     ''' </summary>
     ''' <param name="ts">the TimeSeries to add</param>
-    Private Sub AddSeriesToOverview(ts As TimeSeries)
-
-        'Linien instanzieren
-        Dim Line2 As New Steema.TeeChart.Styles.FastLine(View.TChart2.Chart)
-
-        'Do not paint NaN values
-        Line2.TreatNaNAsNull = True
-        Line2.TreatNulls = Steema.TeeChart.Styles.TreatNullsStyle.DoNotPaint
+    ''' <param name="color">the color to use</param>
+    Private Sub AddSeriesToOverview(ts As TimeSeries, color As Color)
 
-        'X-Werte als Zeitdaten einstellen
-        Line2.XValues.DateTime = True
+        Dim Line2 As ScottPlot.Plottable.ScatterPlot
+        Line2 = View.OverviewPlot.Plot.AddScatterLines(ts.Dates.Select(Function(t As DateTime) t.ToOADate()).ToArray(), ts.Values.ToArray())
 
-        'Store id as Tag property
-        Line2.Tag = ts.Id
+        'Set color
+        Line2.Color = color
 
-        'Namen vergeben
-        Line2.Title = ts.Title
-
-        'set display options
-        If Not ts.DisplayOptions.Color.IsEmpty Then
-            Line2.Color = ts.DisplayOptions.Color
-        End If
-        Line2.LinePen.Style = ts.DisplayOptions.LineStyle
-        Line2.LinePen.Width = ts.DisplayOptions.LineWidth
-
-        'Stützstellen zur Serie hinzufügen
-        Line2.BeginUpdate()
-        If Double.IsNaN(ts.FirstValue) Then
-            'TeeChart throws an OverflowException when attempting to display a FastLine that begins with a NaN value as a step function!
-            'To avoid this we generally do not add NaN values at the beginning of the time series to the FastLine (#67)
-            Dim isNaN As Boolean = True
-            For Each node As KeyValuePair(Of DateTime, Double) In ts.Nodes
-                If isNaN Then
-                    isNaN = isNaN And Double.IsNaN(node.Value)
-                End If
-                If Not isNaN Then
-                    Line2.Add(node.Key, node.Value)
-                End If
-            Next
-        Else
-            Line2.Add(ts.Dates.ToArray(), ts.Values.ToArray())
-        End If
-        Line2.EndUpdate()
+        'Do not paint NaN values
+        Line2.OnNaN = ScottPlot.Plottable.ScatterPlot.NanBehavior.Gap
 
         'Interpretation
         Select Case ts.Interpretation
             Case TimeSeries.InterpretationEnum.BlockRight
-                Line2.Stairs = True
+                Line2.StepDisplay = True
+                Line2.StepDisplayRight = True
             Case TimeSeries.InterpretationEnum.BlockLeft,
-                TimeSeries.InterpretationEnum.CumulativePerTimestep
-                Line2.Stairs = True
-                Line2.InvertedStairs = True
+                 TimeSeries.InterpretationEnum.CumulativePerTimestep
+                Line2.StepDisplay = True
+                Line2.StepDisplayRight = False
         End Select
 
+        'reset y axis
+        View.OverviewPlot.Plot.YAxis.Dims.ResetLimits()
+
+        'Move extent rectangle to top
+        View.OverviewPlot.Plot.MoveLast(View.ViewExtentRectangle)
+
+        'store plottable
+        Me.OverviewSeries.Add(ts.Id, Line2)
+
+        View.OverviewPlot.Refresh()
+
     End Sub
 
     ''' <summary>
@@ -2383,80 +2412,156 @@ Friend Class WaveController
     ''' Assigns a series to the appropriate axis depending on its unit
     ''' If no axis exists for the given unit, a new axis is created
     ''' </summary>
+    ''' <param name="series">The series</param>
     ''' <param name="unit">The unit</param>
-    Private Sub assignSeriesToAxis(ByRef series As Steema.TeeChart.Styles.Series, unit As String)
-
-        If IsNothing(View.TChart1.Axes.Left.Tag) Then
-            'use left axis for the first time
-            View.TChart1.Axes.Left.Title.Text = unit
-            View.TChart1.Axes.Left.Tag = unit
-            View.TChart1.Axes.Left.Visible = True
-            View.TChart1.Axes.Left.Automatic = True
-            View.TChart1.Axes.Left.MaximumOffset = 5
-            series.VertAxis = Steema.TeeChart.Styles.VerticalAxis.Left
-
-        ElseIf View.TChart1.Axes.Left.Tag = unit Then
-            'reuse left axis
-            series.VertAxis = Steema.TeeChart.Styles.VerticalAxis.Left
-
-        ElseIf IsNothing(View.TChart1.Axes.Right.Tag) Then
-            'use right axis for the first time
-            View.TChart1.Axes.Right.Title.Text = unit
-            View.TChart1.Axes.Right.Tag = unit
-            View.TChart1.Axes.Right.Visible = True
-            View.TChart1.Axes.Right.Automatic = True
-            View.TChart1.Axes.Right.MaximumOffset = 5
-            series.VertAxis = Steema.TeeChart.Styles.VerticalAxis.Right
-
-        ElseIf View.TChart1.Axes.Right.Tag = unit Then
-            'reuse right axis
-            series.VertAxis = Steema.TeeChart.Styles.VerticalAxis.Right
-        Else
-            'check for reusable custom axes
+    Private Sub assignSeriesToAxis(ByRef series As ScottPlot.Plottable.IPlottable, unit As String)
+
+        Dim axisW As AxisWrapper
+
+        'check for existing axes
+        Dim axisExists As Boolean = False
+        For Each axisW In Me.Axes
+            If axisW.Unit = unit Then
+                axisExists = True
+                'assign series to axis
+                series.YAxisIndex = axisW.AxisIndex
+                Exit For
+            End If
+        Next
+
+        If Not axisExists Then
+            'check for existing, but unused axes
             Dim axisFound As Boolean = False
-            For Each axis As Steema.TeeChart.Axis In View.TChart1.Axes.Custom
-                If axis.Tag = unit Then
-                    series.VertAxis = Steema.TeeChart.Styles.VerticalAxis.Custom
-                    series.CustomVertAxis = axis
+            For Each axis As ScottPlot.Renderable.Axis In View.MainPlot.Plot.GetAxesMatching(axisIndex:=Nothing, isVertical:=True)
+                If axis.AxisLabel.Label = "" Then
+                    'this axis hasn't been used yet
+                    axis.AxisLabel.Label = unit
+                    axis.AxisLabel.IsVisible = True
+                    axis.Ticks(enable:=True)
+
+                    'assign series to axis
+                    series.YAxisIndex = axis.AxisIndex
+
+                    'store axis
+                    axisW = New AxisWrapper(axis)
+                    Me.Axes.Add(axisW)
+
                     axisFound = True
                     Exit For
                 End If
             Next
             If Not axisFound Then
                 'create a new custom axis
-                Dim axis As Steema.TeeChart.Axis
-                Dim number As Integer = View.TChart1.Axes.Custom.Count + 1
-                axis = New Steema.TeeChart.Axis(View.TChart1.Chart)
-                View.TChart1.Axes.Custom.Add(axis)
-                axis.Labels.Font.Name = "GenericSansSerif"
-                axis.Labels.Font.Color = Color.Black
-                axis.Labels.Font.Size = 10
-                axis.Title.Font.Name = "GenericSansSerif"
-                axis.Title.Font.Color = Color.Black
-                axis.Title.Font.Size = 10
-                axis.Title.Text = unit
-                axis.Title.Angle = 90
-                axis.Tag = unit
-                axis.Visible = True
-                axis.Automatic = True
-                axis.MaximumOffset = 5
-                axis.AxisPen.Visible = True
-                axis.Grid.Visible = False
+                Dim axis As ScottPlot.Renderable.Axis
+                Dim number As Integer = Axes.Count + 1
+
                 'Place every second axis on the right
                 If number Mod 2 = 0 Then
-                    axis.OtherSide = True
+                    axis = View.MainPlot.Plot.AddAxis(ScottPlot.Renderable.Edge.Right)
+                Else
+                    axis = View.MainPlot.Plot.AddAxis(ScottPlot.Renderable.Edge.Left)
                 End If
-                'Calculate position
-                axis.RelativePosition = Math.Ceiling((number) / 2) * 8
-                'assign series to new axis
-                series.VertAxis = Steema.TeeChart.Styles.VerticalAxis.Custom
-                series.CustomVertAxis = axis
-
-                'update axis dialog
-                Call Me.UpdateAxisDialog()
+
+                axis.AxisLabel.Label = unit
+                axis.IsVisible = True
+
+                'assign series to axis
+                series.YAxisIndex = axis.AxisIndex
+
+                'store axis
+                axisW = New AxisWrapper(axis)
+                Me.Axes.Add(axisW)
+            End If
+
+        End If
+
+        'remove any unused axes
+        Call Me.RemoveUnusedAxes()
+
+    End Sub
+
+    ''' <summary>
+    ''' Checks for any unused axes and removes them
+    ''' </summary>
+    Private Sub RemoveUnusedAxes()
+
+        'collect used units
+        Dim usedUnits As New HashSet(Of String)
+        For Each ts As TimeSeries In Model.TimeSeries.Values
+            usedUnits.Add(ts.Unit)
+        Next
+
+        'find unused axes
+        Dim axesToRemove As New List(Of ScottPlot.Renderable.Axis)
+        For Each axis As ScottPlot.Renderable.Axis In View.MainPlot.Plot.GetAxesMatching(axisIndex:=Nothing, isVertical:=True)
+            If axis.AxisLabel.Label <> "" And Not usedUnits.Contains(axis.AxisLabel.Label) Then
+                axesToRemove.Add(axis)
             End If
+        Next
+
+        'remove unused axes
+        If axesToRemove.Count > 0 Then
+            For Each axis As ScottPlot.Renderable.Axis In axesToRemove
+                If axis.AxisIndex <= 1 Then
+                    'left and right Y axis should never be removed, just reset
+                    axis.Label("")
+                    axis.Dims.ResetLimits()
+                    axis.Ticks(enable:=False)
+                Else
+                    View.MainPlot.Plot.RemoveAxis(axis)
+                End If
+            Next
+            View.MainPlot.Refresh()
         End If
 
+        'TODO: remove axis wrappers
+
+    End Sub
+
+    ''' <summary>
+    ''' Handles a series being activated/deactivated in the TOC
+    ''' </summary>
+    ''' <param name="sender"></param>
+    ''' <param name="e"></param>
+    Private Sub SeriesActiveChanged(sender As Object, e As ItemCheckEventArgs)
+
+        Dim id As Integer = View.CheckedListBox_Series.Items(e.Index).Id
+
+        If Me.ChartSeries.ContainsKey(id) Then
+            Me.ChartSeries(id).IsVisible = (e.NewValue = CheckState.Checked)
+        End If
+
+        'collect units of active series
+        Dim activeUnits As New HashSet(Of String)
+        Dim index As Integer = 0
+        Dim isActive As Boolean
+        For Each ts As TimeSeries In View.CheckedListBox_Series.Items
+            If ts.Id = id Then
+                'checkstate of the item being changed has not been updated in the CheckedListBox yet
+                isActive = (e.NewValue = CheckState.Checked)
+            Else
+                isActive = View.CheckedListBox_Series.GetItemChecked(index)
+            End If
+            If isActive Then
+                activeUnits.Add(ts.Unit)
+            End If
+            index += 1
+        Next
+
+        'rescale and set visibility of axes
+        For Each axisW As AxisWrapper In Me.Axes
+            axisW.setLimits()
+            Dim visibility As Boolean = activeUnits.Contains(axisW.Unit)
+            If axisW.AxisIndex <= 1 Then
+                'left and right axis should never be made completely invisible
+                axisW.Axis.AxisLabel.IsVisible = visibility
+                axisW.Axis.Ticks(enable:=visibility)
+            Else
+                axisW.Axis.IsVisible = visibility
+            End If
+        Next
+
+        View.MainPlot.Refresh()
     End Sub
 
     ''' <summary>
@@ -2466,72 +2571,39 @@ Friend Class WaveController
     Private Sub showMarkers(timestamps As List(Of DateTime))
 
         'Remove any existing marker series
-        For i As Integer = View.TChart1.Series.Count - 1 To 0 Step -1
-            Try
-                If CType(View.TChart1.Series(i).Tag, String) = "_markers" Then
-                    View.TChart1.Series.RemoveAt(i)
-                End If
-            Catch ex As Exception
-                Log.AddLogEntry(Log.levels.debug, ex.Message)
-            End Try
+        For Each marker As ScottPlot.Plottable.IPlottable In Me.ChartMarkers.Values
+            View.MainPlot.Plot.Remove(marker)
         Next
-        View.TChart1.Refresh()
+        Me.ChartMarkers.Clear()
+        View.MainPlot.Refresh()
 
         If timestamps.Count = 0 Then
             Exit Sub
         End If
 
-        'loop over series and create a marker series for each
-        For i As Integer = 0 To View.TChart1.Series.Count - 1
-            Try
-                Dim series As Steema.TeeChart.Styles.Series = View.TChart1.Series(i)
-                If Not series.Active Then
-                    'do not display markers for inactive series
-                    Continue For
-                End If
-                'collect all non-NaN values to display as markers
-                Dim markerValues As New Dictionary(Of DateTime, Double)
-                For Each t As DateTime In timestamps
-                    Dim index As Integer = series.XValues.IndexOf(t.ToOADate)
-                    If index <> -1 Then
-                        If Not series.IsNull(index) Then
-                            markerValues.Add(t, series.YValues(index))
-                        End If
-                    End If
-                Next
-                If markerValues.Count > 0 Then
-                    'create a new point series for markers
-                    Dim markers As New Steema.TeeChart.Styles.Points(View.TChart1.Chart)
-                    markers.Legend.Visible = False
-                    markers.Title = $"{series.Title} (selection)"
-                    markers.Tag = "_markers"
-                    markers.VertAxis = series.VertAxis
-                    If series.VertAxis = Steema.TeeChart.Styles.VerticalAxis.Custom Then
-                        markers.CustomVertAxis = series.CustomVertAxis
+        'loop over active series and create a marker series for each
+        For Each ts As TimeSeries In View.CheckedListBox_Series.CheckedItems
+            Dim Xs As New List(Of DateTime)
+            Dim Ys As New List(Of Double)
+            For Each t As DateTime In timestamps
+                If ts.Nodes.ContainsKey(t) Then
+                    If Not Double.IsNaN(ts.Nodes(t)) Then
+                        Xs.Add(t)
+                        Ys.Add(ts.Nodes(t))
                     End If
-                    markers.Pointer.Style = Steema.TeeChart.Styles.PointerStyles.Circle
-                    markers.Pointer.Brush.Visible = False
-                    markers.Color = series.Color
-                    markers.Pointer.Color = series.Color
-                    markers.Pointer.Pen.Color = series.Color
-                    markers.Pointer.Pen.Width = 2
-                    markers.Marks.Visible = True
-                    markers.Marks.Style = Steema.TeeChart.Styles.MarksStyles.Value
-                    'markers.Marks.OnTop = True 'causes crash when markers are panned out of view on the left
-                    markers.Marks.Callout.Visible = False
-                    markers.Marks.FontSeriesColor = True
-                    markers.Marks.Arrow.Visible = False
-                    markers.Marks.ArrowLength = 5
-                    markers.Marks.Pen.Color = series.Color
-                    'add data points
-                    For Each t As DateTime In markerValues.Keys
-                        markers.Add(t, markerValues(t))
-                    Next
                 End If
-            Catch ex As Exception
-                Log.AddLogEntry(Log.levels.debug, ex.Message)
-            End Try
+            Next
+            Dim markers As ScottPlot.Plottable.ScatterPlot
+            markers = View.MainPlot.Plot.AddScatterPoints(Xs.Select(Function(t As DateTime) t.ToOADate()).ToArray(), Ys.ToArray())
+            markers.DataPointLabels = Ys.Select(Function(y As Double) y.ToString()).ToArray()
+            markers.MarkerSize = 8
+            markers.YAxisIndex = Me.ChartSeries(ts.Id).YAxisIndex
+            Dim lineColor As Color = CType(Me.ChartSeries(ts.Id), ScottPlot.Plottable.ScatterPlot).LineColor
+            markers.MarkerColor = lineColor
+            markers.DataPointLabelFont.Color = ControlPaint.Dark(lineColor)
+            Me.ChartMarkers.Add(ts.Id, markers)
         Next
+        View.MainPlot.Refresh()
 
     End Sub
 
@@ -2571,64 +2643,104 @@ Friend Class WaveController
         Call Application.DoEvents()
     End Sub
 
+    ''' <summary>
+    ''' Handles the case where a TimeSeries' properties were changed in the model
+    ''' </summary>
+    ''' <param name="id">TimeSeries ID</param>
     Private Sub SeriesPropertiesChanged(id As Integer)
-        'find series in chart
-        For Each series As Steema.TeeChart.Styles.Series In View.TChart1.Series
-            If series.Tag = id Then
-                'set line display according to interpretation
-                If TypeOf series Is Steema.TeeChart.Styles.Line Then
-                    Dim seriesline As Steema.TeeChart.Styles.Line = series
-                    Select Case _model.TimeSeries(id).Interpretation
-                        Case TimeSeries.InterpretationEnum.Instantaneous,
-                             TimeSeries.InterpretationEnum.Undefined
-                            seriesline.Stairs = False
-                            seriesline.InvertedStairs = False
-                        Case TimeSeries.InterpretationEnum.BlockRight
-                            seriesline.Stairs = True
-                            seriesline.InvertedStairs = False
-                        Case TimeSeries.InterpretationEnum.BlockLeft,
-                             TimeSeries.InterpretationEnum.CumulativePerTimestep
-                            seriesline.Stairs = True
-                            seriesline.InvertedStairs = True
-                    End Select
-                End If
-
-                'update title in chart
-                series.Title = _model.TimeSeries(id).Title
 
-                'assign to axis according to unit
-                assignSeriesToAxis(series, _model.TimeSeries(id).Unit)
+        Dim ts As TimeSeries = Model.TimeSeries(id)
+
+        'update series in main chart
+        If Me.ChartSeries.ContainsKey(id) Then
+            Dim series As ScottPlot.Plottable.ScatterPlot = TryCast(Me.ChartSeries(id), ScottPlot.Plottable.ScatterPlot)
+            If Not IsNothing(series) Then
+                'label
+                series.Label = ts.Title
+                'y axis
+                assignSeriesToAxis(series, ts.Unit)
+                'interpretation
+                Select Case ts.Interpretation
+                    Case TimeSeries.InterpretationEnum.BlockRight
+                        series.StepDisplay = True
+                        series.StepDisplayRight = True
+                    Case TimeSeries.InterpretationEnum.BlockLeft,
+                         TimeSeries.InterpretationEnum.CumulativePerTimestep
+                        series.StepDisplay = True
+                        series.StepDisplayRight = False
+                    Case Else
+                        series.StepDisplay = False
+                End Select
+                View.MainPlot.Refresh()
+            End If
+        End If
 
-                'TODO: apply the same changes in the overview chart?
-                Exit For
+        'update series in overview chart
+        If Me.OverviewSeries.ContainsKey(id) Then
+            Dim series As ScottPlot.Plottable.ScatterPlot = TryCast(Me.OverviewSeries(id), ScottPlot.Plottable.ScatterPlot)
+            If Not IsNothing(series) Then
+                'interpretation
+                Select Case ts.Interpretation
+                    Case TimeSeries.InterpretationEnum.BlockRight
+                        series.StepDisplay = True
+                        series.StepDisplayRight = True
+                    Case TimeSeries.InterpretationEnum.BlockLeft,
+                         TimeSeries.InterpretationEnum.CumulativePerTimestep
+                        series.StepDisplay = True
+                        series.StepDisplayRight = False
+                    Case Else
+                        series.StepDisplay = False
+                End Select
+                View.OverviewPlot.Refresh()
             End If
-        Next
+        End If
+
+        'update the TOC
+        View.CheckedListBox_Series.Refresh()
 
     End Sub
 
+    ''' <summary>
+    ''' Handles the case where a TimeSeries was removed from the model
+    ''' </summary>
+    ''' <param name="id"></param>
     Private Sub SeriesRemoved(id As Integer)
 
         'Remove series from main chart
-        For i As Integer = View.TChart1.Series.Count - 1 To 0 Step -1
-            If CType(View.TChart1.Series.Item(i).Tag, String) = "_markers" Then
-                'TODO: marker series belonging to the removed series should be removed as well, skip for now
-                Continue For
-            End If
-            If View.TChart1.Series.Item(i).Tag = id Then
-                View.TChart1.Series.RemoveAt(i)
-                View.TChart1.Refresh()
-                Exit For
-            End If
-        Next
+        If Me.ChartSeries.ContainsKey(id) Then
+            View.MainPlot.Plot.Remove(Me.ChartSeries(id))
+            'reset Y axis limits
+            View.MainPlot.Plot.GetAxesMatching(axisIndex:=Me.ChartSeries(id).XAxisIndex, isVertical:=True).First().Dims.ResetLimits()
+            View.MainPlot.Refresh()
+        End If
+        Me.ChartSeries.Remove(id)
 
         'Remove series from overview chart
-        For i As Integer = View.TChart2.Series.Count - 1 To 0 Step -1
-            If (View.TChart2.Series.Item(i).Tag = id) Then
-                View.TChart2.Series.RemoveAt(i)
-                View.TChart2.Refresh()
+        If Me.OverviewSeries.ContainsKey(id) Then
+            View.OverviewPlot.Plot.Remove(Me.OverviewSeries(id))
+            'reset Y axis limits
+            View.OverviewPlot.Plot.YAxis.Dims.ResetLimits()
+            'update chart extents
+            Call Me.UpdateChartExtents()
+        End If
+        Me.OverviewSeries.Remove(id)
+
+        'Remove series from TOC
+        Dim indexFound As Boolean = False
+        Dim index As Integer = 0
+        For Each ts As TimeSeries In View.CheckedListBox_Series.Items
+            If ts.Id = id Then
+                indexFound = True
                 Exit For
             End If
+            index += 1
         Next
+        If indexFound Then
+            View.CheckedListBox_Series.Items.RemoveAt(index)
+        End If
+
+        'remove any unused axes
+        Call Me.RemoveUnusedAxes()
 
     End Sub
 
@@ -2638,79 +2750,50 @@ Friend Class WaveController
     ''' <param name="id">Id of the TimeSeries whose order was changed</param>
     ''' <param name="direction">Direction in which the series was moved</param>
     Private Sub SeriesReordered(id As Integer, direction As Direction)
-        'update series order in chart
-        'TODO: this causes a second, unnecessary event update through TeeEvent which I don't know how to prevent
-        Dim index As Integer = 0
-        For Each series As Steema.TeeChart.Styles.Series In View.TChart1.Series
-            If series.Tag = id Then
-                If direction = Direction.Up And index > 0 Then
-                    View.TChart1.Series.Exchange(index, index - 1)
-                ElseIf direction = Direction.Down And index < View.TChart1.Series.Count - 1 Then
-                    View.TChart1.Series.Exchange(index, index + 1)
-                End If
-                Exit For
-            End If
-            index += 1
-        Next
-    End Sub
 
-    ''' <summary>
-    ''' Handles axis deleted in the AxisDialog
-    ''' </summary>
-    ''' <param name="axisname"></param>
-    Private Sub axisDeleted(axisname As String)
-        Dim axisnumber As Integer
-        Dim m As Match = Regex.Match(axisname, "Custom (\d+)")
-        If m.Success Then
-            axisnumber = Integer.Parse(m.Groups(1).Value)
-            'Delete axis from chart
-            View.TChart1.Axes.Custom.RemoveAt(axisnumber)
-            View.TChart1.Refresh()
-            'update axis dialog
-            Call Me.UpdateAxisDialog()
+        Dim offset As Integer
+        If direction = Direction.Up Then
+            offset = -1
+        Else
+            offset = 1
         End If
-    End Sub
-
-    ''' <summary>
-    ''' Handles axis unit changed in the AxisDialog
-    ''' </summary>
-    ''' <remarks>Reassigns all series to their appropriate axis</remarks>
-    Private Sub AxisUnitChanged()
-
-        For Each series As Steema.TeeChart.Styles.Series In View.TChart1.Series
-            assignSeriesToAxis(series, _model.TimeSeries(series.Tag).Unit)
-        Next
 
-        'deactivate unused custom axes
-        Dim unitUsed As Boolean
-        For Each axis As Steema.TeeChart.Axis In View.TChart1.Axes.Custom
-            unitUsed = False
-            For Each ts As TimeSeries In _model.TimeSeries.Values
-                If ts.Unit = axis.Tag Then
-                    unitUsed = True
+        'update series order in chart
+        'find the index of the series in the chart by comparing titles
+        'TODO: find a better way to detemine a series' index in the chart
+        Dim index As Integer = 0
+        For Each plottable As ScottPlot.Plottable.IPlottable In View.MainPlot.Plot.GetPlottables()
+            Dim series As ScottPlot.Plottable.ScatterPlot = TryCast(plottable, ScottPlot.Plottable.ScatterPlot)
+            If Not IsNothing(series) Then
+                If series.Label = Me.Model.TimeSeries(id).Title Then
+                    View.MainPlot.Plot.Move(index, index + offset)
+                    View.MainPlot.Refresh()
                     Exit For
                 End If
-            Next
-            If Not unitUsed Then
-                axis.Visible = False
             End If
+            index += 1
         Next
 
-    End Sub
+        'TODO: reorder series in overview chart
 
-    ''' <summary>
-    ''' Update AxisDialog
-    ''' </summary>
-    Private Sub UpdateAxisDialog()
-        'Wrap Left, Right and Custom axes
-        Dim axisList As New List(Of AxisWrapper)
-        axisList.Add(New AxisWrapper("Left", View.TChart1.Axes.Left))
-        axisList.Add(New AxisWrapper("Right", View.TChart1.Axes.Right))
-        For i As Integer = 0 To View.TChart1.Axes.Custom.Count - 1
-            axisList.Add(New AxisWrapper("Custom " & i, View.TChart1.Axes.Custom(i)))
+        'update series order in TOC
+        'find the index of the series in the TOC by comparing titles
+        Dim indexFound As Boolean = False
+        index = 0
+        For Each ts As TimeSeries In View.CheckedListBox_Series.Items
+            If ts.Title = Me.Model.TimeSeries(id).Title Then
+                indexFound = True
+                Exit For
+            End If
+            index += 1
         Next
+        If indexFound Then
+            Dim isChecked As Boolean = View.CheckedListBox_Series.GetItemChecked(index)
+            View.CheckedListBox_Series.Items.RemoveAt(index)
+            View.CheckedListBox_Series.Items.Insert(index + offset, Me.Model.TimeSeries(id))
+            View.CheckedListBox_Series.SetItemChecked(index + offset, isChecked)
+        End If
 
-        _axisDialog.Update(axisList)
     End Sub
 
     ''' <summary>
@@ -2758,30 +2841,39 @@ Friend Class WaveController
     ''' <summary>
     ''' Sets a color palette in the charts and changes the colors of any existing series accordingly
     ''' </summary>
-    ''' <param name="colorPalette">The color palette to apply</param>
-    Private Sub SetChartColorPalette(colorPalette As Color())
+    ''' <param name="colors">The color palette to apply</param>
+    Private Sub SetChartColorPalette(colors As Color())
+
+        Dim palette As ScottPlot.IPalette = ScottPlot.Palette.FromColors(colors)
 
         'set colorpalette in charts
-        View.TChart1.Chart.ColorPalette = colorPalette
-        View.TChart2.Chart.ColorPalette = colorPalette
+        View.MainPlot.Plot.Palette = palette
+        View.OverviewPlot.Plot.Palette = palette
 
-        'change colors of existing series
+        'change colors of existing series in main chart
         Dim counter As Integer = 0
-        For Each series As Steema.TeeChart.Styles.Series In View.TChart1.Series
-            If counter >= colorPalette.Length Then
+        For Each series As ScottPlot.Plottable.ScatterPlot In Me.ChartSeries.Values
+            If counter >= colors.Length Then
                 'loop color palette
                 counter = 0
             End If
-            series.Color = colorPalette(counter)
-            'apply same color to series in overview chart
-            For Each series2 As Steema.TeeChart.Styles.Series In View.TChart2.Series
-                If series2.Tag = series.Tag Then
-                    series2.Color = colorPalette(counter)
-                    Exit For
-                End If
-            Next
+            series.Color = colors(counter)
+            counter += 1
+        Next
+        View.MainPlot.Refresh()
+
+        'change colors of existing series in overview chart
+        counter = 0
+        For Each series As ScottPlot.Plottable.ScatterPlot In Me.OverviewSeries.Values
+            If counter >= colors.Length Then
+                'loop color palette
+                counter = 0
+            End If
+            series.Color = colors(counter)
             counter += 1
         Next
+        View.OverviewPlot.Refresh()
+
     End Sub
 
     ''' <summary>
@@ -2818,156 +2910,157 @@ Friend Class WaveController
     ''' <param name="FileName">Path to TEN file</param>
     Private Sub Load_TEN(FileName As String)
 
-        Dim result As DialogResult
-        Dim i As Integer
-        Dim reihe As TimeSeries
-        Dim XMin, XMax As DateTime
-
-        Try
-
-            'Log
-            Call Log.AddLogEntry(Log.levels.info, $"Loading file '{FileName}' ...")
-
-            'Bereits vorhandene Reihen merken
-            Dim existingIds = New List(Of Integer)
-            For Each id As Integer In _model.TimeSeries.Ids
-                existingIds.Add(id)
-            Next
-
-            'Zoom der X-Achse merken
-            XMin = View.ChartMinX
-            XMax = View.ChartMaxX
-            If (XMin <> XMax) Then
-                Me.selectionMade = True
-            Else
-                Me.selectionMade = False
-            End If
-
-            'Load TEN file in main chart, this completely replaces the chart!
-            Call View.TChart1.Import.Template.Load(FileName)
-            'Clear overview chart
-            Call View.TChart2.Series.Clear()
-
-            'Abfrage für Reihenimport
-            If (View.TChart1.Series.Count() > 0) Then
-                result = MsgBox("Also import time series?", MsgBoxStyle.YesNo)
-
-                Select Case result
-
-                    Case Windows.Forms.DialogResult.Yes
-                        'Reihen aus TEN-Datei sollen importiert werden
-
-                        Dim nSeries As Integer = 0
-
-                        'Alle Reihen durchlaufen
-                        For Each series As Steema.TeeChart.Styles.Series In View.TChart1.Series
-
-                            'Nur Zeitreihen behandeln
-                            If (series.XValues.DateTime) Then
-
-                                'Zeitreihe aus dem importierten Diagramm nach intern übertragen
-                                Log.AddLogEntry(Log.levels.info, $"Importing series '{series.Title}' from TEN file...")
-                                reihe = New TimeSeries(series.Title)
-                                For i = 0 To series.Count - 1
-                                    reihe.AddNode(DateTime.FromOADate(series.XValues(i)), series.YValues(i))
-                                Next
-                                'Determine total number of NaN-values and write to log
-                                If reihe.NaNCount > 0 Then
-                                    Log.AddLogEntry(Log.levels.warning, $"Series '{reihe.Title}' contains {reihe.NaNCount} NaN values!")
-                                End If
-                                'Get the series' unit from the axis title
-                                Dim axistitle As String = ""
-                                Select Case series.VertAxis
-                                    Case Steema.TeeChart.Styles.VerticalAxis.Left
-                                        axistitle = View.TChart1.Axes.Left.Title.Text
-                                    Case Steema.TeeChart.Styles.VerticalAxis.Right
-                                        axistitle = View.TChart1.Axes.Right.Title.Text
-                                    Case Steema.TeeChart.Styles.VerticalAxis.Custom
-                                        axistitle = series.CustomVertAxis.Title.Text
-                                End Select
-                                reihe.Unit = AxisWrapper.parseUnit(axistitle)
-
-                                'Save datasource
-                                reihe.DataSource = New TimeSeriesDataSource(FileName, series.Title)
-
-                                'Add the series to the model while temporarily disabling event handling
-                                RemoveHandler _model.SeriesAdded, AddressOf SeriesAdded
-                                Call _model.Import_Series(reihe)
-                                AddHandler _model.SeriesAdded, AddressOf SeriesAdded
-
-                                'after import in the model, the title might have been changed,
-                                'then we need to edit the title in the chart as well
-                                If reihe.Title <> series.Title Then
-                                    series.Title = reihe.Title
-                                End If
-
-                                'Store the time series id in the Tag property
-                                series.Tag = reihe.Id
-
-                                'Add series to overview
-                                Call Me.AddSeriesToOverview(reihe)
-
-                                nSeries += 1
-
-                            End If
-                        Next
+        'TODO: TChart
+        'Dim result As DialogResult
+        'Dim i As Integer
+        'Dim reihe As TimeSeries
+        'Dim XMin, XMax As DateTime
+
+        'Try
+
+        '    'Log
+        '    Call Log.AddLogEntry(Log.levels.info, $"Loading file '{FileName}' ...")
+
+        '    'Bereits vorhandene Reihen merken
+        '    Dim existingIds = New List(Of Integer)
+        '    For Each id As Integer In _model.TimeSeries.Ids
+        '        existingIds.Add(id)
+        '    Next
+
+        '    'Zoom der X-Achse merken
+        '    XMin = View.ChartMinX
+        '    XMax = View.ChartMaxX
+        '    If (XMin <> XMax) Then
+        '        Me.selectionMade = True
+        '    Else
+        '        Me.selectionMade = False
+        '    End If
+
+        '    'Load TEN file in main chart, this completely replaces the chart!
+        '    Call View.MainPlot.Import.Template.Load(FileName)
+        '    'Clear overview chart
+        '    Call View.TChart2.Series.Clear()
+
+        '    'Abfrage für Reihenimport
+        '    If (View.MainPlot.Series.Count() > 0) Then
+        '        result = MsgBox("Also import time series?", MsgBoxStyle.YesNo)
+
+        '        Select Case result
+
+        '            Case Windows.Forms.DialogResult.Yes
+        '                'Reihen aus TEN-Datei sollen importiert werden
+
+        '                Dim nSeries As Integer = 0
+
+        '                'Alle Reihen durchlaufen
+        '                For Each series As Steema.TeeChart.Styles.Series In View.MainPlot.Series
+
+        '                    'Nur Zeitreihen behandeln
+        '                    If (series.XValues.DateTime) Then
+
+        '                        'Zeitreihe aus dem importierten Diagramm nach intern übertragen
+        '                        Log.AddLogEntry(Log.levels.info, $"Importing series '{series.Title}' from TEN file...")
+        '                        reihe = New TimeSeries(series.Title)
+        '                        For i = 0 To series.Count - 1
+        '                            reihe.AddNode(DateTime.FromOADate(series.XValues(i)), series.YValues(i))
+        '                        Next
+        '                        'Determine total number of NaN-values and write to log
+        '                        If reihe.NaNCount > 0 Then
+        '                            Log.AddLogEntry(Log.levels.warning, $"Series '{reihe.Title}' contains {reihe.NaNCount} NaN values!")
+        '                        End If
+        '                        'Get the series' unit from the axis title
+        '                        Dim axistitle As String = ""
+        '                        Select Case series.VertAxis
+        '                            Case Steema.TeeChart.Styles.VerticalAxis.Left
+        '                                axistitle = View.MainPlot.Axes.Left.Title.Text
+        '                            Case Steema.TeeChart.Styles.VerticalAxis.Right
+        '                                axistitle = View.MainPlot.Axes.Right.Title.Text
+        '                            Case Steema.TeeChart.Styles.VerticalAxis.Custom
+        '                                axistitle = series.CustomVertAxis.Title.Text
+        '                        End Select
+        '                        reihe.Unit = AxisWrapper.parseUnit(axistitle)
+
+        '                        'Save datasource
+        '                        reihe.DataSource = New TimeSeriesDataSource(FileName, series.Title)
+
+        '                        'Add the series to the model while temporarily disabling event handling
+        '                        RemoveHandler _model.SeriesAdded, AddressOf SeriesAdded
+        '                        Call _model.Import_Series(reihe)
+        '                        AddHandler _model.SeriesAdded, AddressOf SeriesAdded
+
+        '                        'after import in the model, the title might have been changed,
+        '                        'then we need to edit the title in the chart as well
+        '                        If reihe.Title <> series.Title Then
+        '                            series.Title = reihe.Title
+        '                        End If
+
+        '                        'Store the time series id in the Tag property
+        '                        series.Tag = reihe.Id
+
+        '                        'Add series to overview
+        '                        Call Me.AddSeriesToOverview(reihe)
+
+        '                        nSeries += 1
+
+        '                    End If
+        '                Next
+
+        '                Log.AddLogEntry(levels.info, $"Imported {nSeries} time series from TEN file.")
+
+        '                'Update window title
+        '                View.Text = "BlueM.Wave - " & FileName
+
+        '            Case Windows.Forms.DialogResult.No
+        '                'Reihen aus TEN-Datei sollen nicht importiert werden
+
+        '                'Alle Reihen aus den Diagrammen löschen (wurden bei TEN-Import automatisch mit eingeladen)
+        '                View.MainPlot.Series.RemoveAllSeries()
+        '                View.TChart2.Series.RemoveAllSeries()
+
+        '        End Select
+
+        '    End If
+
+        '    'extract units from axis titles and store as tags
+        '    View.MainPlot.Axes.Left.Tag = AxisWrapper.parseUnit(View.MainPlot.Axes.Left.TitleOrName)
+        '    View.MainPlot.Axes.Right.Tag = AxisWrapper.parseUnit(View.MainPlot.Axes.Right.TitleOrName)
+        '    For Each axis As Steema.TeeChart.Axis In View.MainPlot.Axes.Custom
+        '        axis.Tag = AxisWrapper.parseUnit(axis.TitleOrName)
+        '    Next
+
+        '    'Die vor dem Laden bereits vorhandenen Zeitreihen wieder zu den Diagrammen hinzufügen (durch TEN-Import verloren)
+        '    For Each id As Integer In existingIds
+        '        Call Me.SeriesAdded(_model.TimeSeries(id))
+        '    Next
+
+        '    'Vorherigen Zoom wiederherstellen
+        '    If (Me.selectionMade) Then
+        '        View.ChartMinX = XMin
+        '        View.ChartMaxX = XMax
+        '    End If
 
-                        Log.AddLogEntry(levels.info, $"Imported {nSeries} time series from TEN file.")
+        '    'ColorBands neu einrichten (durch TEN-Import verloren)
+        '    Call View.Init_ColorBands()
+
+        '    'Reset zoom and pan settings
+        '    View.MainPlot.Zoom.Direction = Steema.TeeChart.ZoomDirections.None
+        '    View.MainPlot.Panning.Allow = Steema.TeeChart.ScrollModes.None
+        '    View.MainPlot.Panning.MouseButton = MouseButtons.Right
 
-                        'Update window title
-                        View.Text = "BlueM.Wave - " & FileName
-
-                    Case Windows.Forms.DialogResult.No
-                        'Reihen aus TEN-Datei sollen nicht importiert werden
-
-                        'Alle Reihen aus den Diagrammen löschen (wurden bei TEN-Import automatisch mit eingeladen)
-                        View.TChart1.Series.RemoveAllSeries()
-                        View.TChart2.Series.RemoveAllSeries()
-
-                End Select
-
-            End If
-
-            'extract units from axis titles and store as tags
-            View.TChart1.Axes.Left.Tag = AxisWrapper.parseUnit(View.TChart1.Axes.Left.TitleOrName)
-            View.TChart1.Axes.Right.Tag = AxisWrapper.parseUnit(View.TChart1.Axes.Right.TitleOrName)
-            For Each axis As Steema.TeeChart.Axis In View.TChart1.Axes.Custom
-                axis.Tag = AxisWrapper.parseUnit(axis.TitleOrName)
-            Next
-
-            'Die vor dem Laden bereits vorhandenen Zeitreihen wieder zu den Diagrammen hinzufügen (durch TEN-Import verloren)
-            For Each id As Integer In existingIds
-                Call Me.SeriesAdded(_model.TimeSeries(id))
-            Next
-
-            'Vorherigen Zoom wiederherstellen
-            If (Me.selectionMade) Then
-                View.ChartMinX = XMin
-                View.ChartMaxX = XMax
-            End If
-
-            'ColorBands neu einrichten (durch TEN-Import verloren)
-            Call View.Init_ColorBands()
-
-            'Reset zoom and pan settings
-            View.TChart1.Zoom.Direction = Steema.TeeChart.ZoomDirections.None
-            View.TChart1.Panning.Allow = Steema.TeeChart.ScrollModes.None
-            View.TChart1.Panning.MouseButton = MouseButtons.Right
-
-            'Charts aktualisieren
-            Call Me.UpdateChartExtents()
-
-            Call Me.ViewportChanged()
-
-            'Log
-            Call Log.AddLogEntry(Log.levels.info, $"TEN file '{FileName}' loaded successfully!")
-
-            Call FileImported(FileName)
-
-        Catch ex As Exception
-            MsgBox("Error while loading:" & eol & ex.Message, MsgBoxStyle.Critical)
-            Call Log.AddLogEntry(Log.levels.error, "Error while loading:" & eol & ex.Message)
-        End Try
+        '    'Charts aktualisieren
+        '    Call Me.UpdateChartExtents()
+
+        '    Call Me.ViewportChanged()
+
+        '    'Log
+        '    Call Log.AddLogEntry(Log.levels.info, $"TEN file '{FileName}' loaded successfully!")
+
+        '    Call FileImported(FileName)
+
+        'Catch ex As Exception
+        '    MsgBox("Error while loading:" & eol & ex.Message, MsgBoxStyle.Critical)
+        '    Call Log.AddLogEntry(Log.levels.error, "Error while loading:" & eol & ex.Message)
+        'End Try
 
     End Sub
 
diff --git a/source/Dialogs/AxisDialog.Designer.vb b/source/Dialogs/AxisDialog.Designer.vb
deleted file mode 100644
index 9e5c8e9b..00000000
--- a/source/Dialogs/AxisDialog.Designer.vb
+++ /dev/null
@@ -1,111 +0,0 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
-Partial Class AxisDialog
-    Inherits System.Windows.Forms.Form
-
-    'Form overrides dispose to clean up the component list.
-    <System.Diagnostics.DebuggerNonUserCode()>
-    Protected Overrides Sub Dispose(disposing As Boolean)
-        Try
-            If disposing AndAlso components IsNot Nothing Then
-                components.Dispose()
-            End If
-        Finally
-            MyBase.Dispose(disposing)
-        End Try
-    End Sub
-
-    'Required by the Windows Form Designer
-    Private components As System.ComponentModel.IContainer
-
-    'NOTE: The following procedure is required by the Windows Form Designer
-    'It can be modified using the Windows Form Designer.  
-    'Do not modify it using the code editor.
-    <System.Diagnostics.DebuggerStepThrough()>
-    Private Sub InitializeComponent()
-        Me.components = New System.ComponentModel.Container()
-        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(AxisDialog))
-        Me.DataGridView1 = New System.Windows.Forms.DataGridView()
-        Me.NameColumn = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.TitleColumn = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.UnitColumn = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.AxisWrapperBindingSource = New System.Windows.Forms.BindingSource(Me.components)
-        Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.AxisWrapperBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.SuspendLayout()
-        '
-        'DataGridView1
-        '
-        Me.DataGridView1.AllowUserToAddRows = False
-        Me.DataGridView1.AllowUserToResizeRows = False
-        Me.DataGridView1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-            Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.DataGridView1.AutoGenerateColumns = False
-        Me.DataGridView1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells
-        Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.DataGridView1.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.NameColumn, Me.TitleColumn, Me.UnitColumn})
-        Me.DataGridView1.DataSource = Me.AxisWrapperBindingSource
-        Me.DataGridView1.Location = New System.Drawing.Point(15, 12)
-        Me.DataGridView1.Name = "DataGridView1"
-        Me.DataGridView1.Size = New System.Drawing.Size(405, 199)
-        Me.DataGridView1.TabIndex = 3
-        '
-        'NameColumn
-        '
-        Me.NameColumn.DataPropertyName = "Name"
-        Me.NameColumn.HeaderText = "Name"
-        Me.NameColumn.Name = "NameColumn"
-        Me.NameColumn.ReadOnly = True
-        Me.NameColumn.Width = 60
-        '
-        'TitleColumn
-        '
-        Me.TitleColumn.DataPropertyName = "Title"
-        Me.TitleColumn.HeaderText = "Title"
-        Me.TitleColumn.Name = "TitleColumn"
-        Me.TitleColumn.Width = 52
-        '
-        'UnitColumn
-        '
-        Me.UnitColumn.DataPropertyName = "Unit"
-        Me.UnitColumn.HeaderText = "Unit"
-        Me.UnitColumn.Name = "UnitColumn"
-        Me.UnitColumn.Width = 51
-        '
-        'AxisWrapperBindingSource
-        '
-        Me.AxisWrapperBindingSource.DataSource = GetType(BlueM.Wave.AxisWrapper)
-        '
-        'DataGridViewTextBoxColumn1
-        '
-        Me.DataGridViewTextBoxColumn1.DataPropertyName = "Tag"
-        Me.DataGridViewTextBoxColumn1.HeaderText = "Tag"
-        Me.DataGridViewTextBoxColumn1.Name = "DataGridViewTextBoxColumn1"
-        Me.DataGridViewTextBoxColumn1.Width = 51
-        '
-        'AxisDialog
-        '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
-        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(435, 223)
-        Me.Controls.Add(Me.DataGridView1)
-        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
-        Me.MaximizeBox = False
-        Me.MinimizeBox = False
-        Me.Name = "AxisDialog"
-        Me.ShowInTaskbar = False
-        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
-        Me.Text = "Manage Axes"
-        CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.AxisWrapperBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.ResumeLayout(False)
-
-    End Sub
-    Friend WithEvents DataGridView1 As DataGridView
-    Friend WithEvents AxisWrapperBindingSource As BindingSource
-    Friend WithEvents DataGridViewTextBoxColumn1 As DataGridViewTextBoxColumn
-    Friend WithEvents NameColumn As DataGridViewTextBoxColumn
-    Friend WithEvents TitleColumn As DataGridViewTextBoxColumn
-    Friend WithEvents UnitColumn As DataGridViewTextBoxColumn
-End Class
diff --git a/source/Dialogs/AxisDialog.vb b/source/Dialogs/AxisDialog.vb
deleted file mode 100644
index fbb7243e..00000000
--- a/source/Dialogs/AxisDialog.vb
+++ /dev/null
@@ -1,83 +0,0 @@
-'BlueM.Wave
-'Copyright (C) BlueM Dev Group
-'<https://www.bluemodel.org>
-'
-'This program is free software: you can redistribute it and/or modify
-'it under the terms of the GNU Lesser General Public License as published by
-'the Free Software Foundation, either version 3 of the License, or
-'(at your option) any later version.
-'
-'This program is distributed in the hope that it will be useful,
-'but WITHOUT ANY WARRANTY; without even the implied warranty of
-'MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-'GNU Lesser General Public License for more details.
-'
-'You should have received a copy of the GNU Lesser General Public License
-'along with this program.  If not, see <https://www.gnu.org/licenses/>.
-'
-Imports System.Windows.Forms
-Friend Class AxisDialog
-
-    ''' <summary>
-    ''' Is raised when an axis unit is changed by the user
-    ''' </summary>
-    Friend Event AxisUnitChanged()
-
-    ''' <summary>
-    ''' Is raised when an axis is deleted by the user
-    ''' </summary>
-    ''' <param name="axisname"></param>
-    Friend Event AxisDeleted(axisname As String)
-
-    Public Overloads Sub Update(ByRef axisList As List(Of AxisWrapper))
-        Me.AxisWrapperBindingSource.DataSource = axisList
-    End Sub
-
-    ''' <summary>
-    ''' Handles changed cell values
-    ''' </summary>
-    ''' <param name="sender"></param>
-    ''' <param name="e"></param>
-    Private Sub DataGridView1_CellValueChanged(sender As Object, e As DataGridViewCellEventArgs) Handles DataGridView1.CellValueChanged
-
-        If e.RowIndex = -1 Then
-            Exit Sub
-        End If
-
-        If Me.DataGridView1.Columns(e.ColumnIndex).Name = "UnitColumn" Then
-            RaiseEvent AxisUnitChanged()
-        End If
-
-    End Sub
-
-    ''' <summary>
-    ''' Handles user trying to delete a row
-    ''' </summary>
-    ''' <param name="sender"></param>
-    ''' <param name="e"></param>
-    Private Sub DataGridView1_UserDeletingRow(sender As Object, e As DataGridViewRowCancelEventArgs) Handles DataGridView1.UserDeletingRow
-
-        Dim axisname As String
-
-        'cancel row deletion because datagridview will be refreshed from outside
-        'otherwise, two rows end up being deleted
-        e.Cancel = True
-
-        axisname = CType(e.Row.DataBoundItem, AxisWrapper).Name
-        If axisname = "Left" Or axisname = "Right" Then
-            MsgBox("Left and Right axes cannot be deleted.", MsgBoxStyle.Information)
-            Return
-        Else
-            If MsgBox($"Delete axis {axisname}?", MsgBoxStyle.OkCancel) = MsgBoxResult.Ok Then
-                RaiseEvent AxisDeleted(axisname)
-            End If
-        End If
-    End Sub
-
-    Private Sub PropertiesDialog_FormClosing(sender As Object, e As FormClosingEventArgs) Handles MyBase.FormClosing
-        'prevent the form from closing and hide it instead
-        e.Cancel = True
-        Call Me.Hide()
-    End Sub
-
-End Class
diff --git a/source/Dialogs/EditChartDialog.Designer.vb b/source/Dialogs/EditChartDialog.Designer.vb
new file mode 100644
index 00000000..8600c96e
--- /dev/null
+++ b/source/Dialogs/EditChartDialog.Designer.vb
@@ -0,0 +1,177 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Partial Class EditChartDialog
+    Inherits System.Windows.Forms.Form
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()>
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()>
+    Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(EditChartDialog))
+        Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
+        Me.OK_Button = New System.Windows.Forms.Button()
+        Me.Cancel_Button = New System.Windows.Forms.Button()
+        Me.DataGridView1 = New System.Windows.Forms.DataGridView()
+        Me.AxisWrapperBindingSource = New System.Windows.Forms.BindingSource(Me.components)
+        Me.AxisIndexDataGridViewTextBoxColumn = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.UnitDataGridViewTextBoxColumn = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.AutoMinDataGridViewCheckBoxColumn = New System.Windows.Forms.DataGridViewCheckBoxColumn()
+        Me.MinDataGridViewTextBoxColumn = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.AutoMaxDataGridViewCheckBoxColumn = New System.Windows.Forms.DataGridViewCheckBoxColumn()
+        Me.MaxDataGridViewTextBoxColumn = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.TableLayoutPanel1.SuspendLayout()
+        CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.AxisWrapperBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.SuspendLayout()
+        '
+        'TableLayoutPanel1
+        '
+        Me.TableLayoutPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.TableLayoutPanel1.ColumnCount = 2
+        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
+        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
+        Me.TableLayoutPanel1.Controls.Add(Me.OK_Button, 0, 0)
+        Me.TableLayoutPanel1.Controls.Add(Me.Cancel_Button, 1, 0)
+        Me.TableLayoutPanel1.Location = New System.Drawing.Point(277, 274)
+        Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
+        Me.TableLayoutPanel1.RowCount = 1
+        Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
+        Me.TableLayoutPanel1.Size = New System.Drawing.Size(146, 29)
+        Me.TableLayoutPanel1.TabIndex = 0
+        '
+        'OK_Button
+        '
+        Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None
+        Me.OK_Button.Location = New System.Drawing.Point(3, 3)
+        Me.OK_Button.Name = "OK_Button"
+        Me.OK_Button.Size = New System.Drawing.Size(67, 23)
+        Me.OK_Button.TabIndex = 0
+        Me.OK_Button.Text = "OK"
+        '
+        'Cancel_Button
+        '
+        Me.Cancel_Button.Anchor = System.Windows.Forms.AnchorStyles.None
+        Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel
+        Me.Cancel_Button.Location = New System.Drawing.Point(76, 3)
+        Me.Cancel_Button.Name = "Cancel_Button"
+        Me.Cancel_Button.Size = New System.Drawing.Size(67, 23)
+        Me.Cancel_Button.TabIndex = 1
+        Me.Cancel_Button.Text = "Cancel"
+        '
+        'DataGridView1
+        '
+        Me.DataGridView1.AllowUserToAddRows = False
+        Me.DataGridView1.AllowUserToDeleteRows = False
+        Me.DataGridView1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.DataGridView1.AutoGenerateColumns = False
+        Me.DataGridView1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.ColumnHeader
+        Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.DataGridView1.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.AxisIndexDataGridViewTextBoxColumn, Me.UnitDataGridViewTextBoxColumn, Me.AutoMinDataGridViewCheckBoxColumn, Me.MinDataGridViewTextBoxColumn, Me.AutoMaxDataGridViewCheckBoxColumn, Me.MaxDataGridViewTextBoxColumn})
+        Me.DataGridView1.DataSource = Me.AxisWrapperBindingSource
+        Me.DataGridView1.Location = New System.Drawing.Point(13, 13)
+        Me.DataGridView1.Name = "DataGridView1"
+        Me.DataGridView1.Size = New System.Drawing.Size(410, 150)
+        Me.DataGridView1.TabIndex = 1
+        '
+        'AxisWrapperBindingSource
+        '
+        Me.AxisWrapperBindingSource.DataSource = GetType(BlueM.Wave.AxisWrapper)
+        '
+        'AxisIndexDataGridViewTextBoxColumn
+        '
+        Me.AxisIndexDataGridViewTextBoxColumn.DataPropertyName = "AxisIndex"
+        Me.AxisIndexDataGridViewTextBoxColumn.Frozen = True
+        Me.AxisIndexDataGridViewTextBoxColumn.HeaderText = "AxisIndex"
+        Me.AxisIndexDataGridViewTextBoxColumn.Name = "AxisIndexDataGridViewTextBoxColumn"
+        Me.AxisIndexDataGridViewTextBoxColumn.ReadOnly = True
+        Me.AxisIndexDataGridViewTextBoxColumn.Visible = False
+        Me.AxisIndexDataGridViewTextBoxColumn.Width = 77
+        '
+        'UnitDataGridViewTextBoxColumn
+        '
+        Me.UnitDataGridViewTextBoxColumn.DataPropertyName = "Unit"
+        Me.UnitDataGridViewTextBoxColumn.Frozen = True
+        Me.UnitDataGridViewTextBoxColumn.HeaderText = "Unit"
+        Me.UnitDataGridViewTextBoxColumn.Name = "UnitDataGridViewTextBoxColumn"
+        Me.UnitDataGridViewTextBoxColumn.Width = 51
+        '
+        'AutoMinDataGridViewCheckBoxColumn
+        '
+        Me.AutoMinDataGridViewCheckBoxColumn.DataPropertyName = "AutoMin"
+        Me.AutoMinDataGridViewCheckBoxColumn.HeaderText = "AutoMin"
+        Me.AutoMinDataGridViewCheckBoxColumn.Name = "AutoMinDataGridViewCheckBoxColumn"
+        Me.AutoMinDataGridViewCheckBoxColumn.Width = 52
+        '
+        'MinDataGridViewTextBoxColumn
+        '
+        Me.MinDataGridViewTextBoxColumn.DataPropertyName = "Min"
+        Me.MinDataGridViewTextBoxColumn.HeaderText = "Min"
+        Me.MinDataGridViewTextBoxColumn.Name = "MinDataGridViewTextBoxColumn"
+        Me.MinDataGridViewTextBoxColumn.Width = 49
+        '
+        'AutoMaxDataGridViewCheckBoxColumn
+        '
+        Me.AutoMaxDataGridViewCheckBoxColumn.DataPropertyName = "AutoMax"
+        Me.AutoMaxDataGridViewCheckBoxColumn.HeaderText = "AutoMax"
+        Me.AutoMaxDataGridViewCheckBoxColumn.Name = "AutoMaxDataGridViewCheckBoxColumn"
+        Me.AutoMaxDataGridViewCheckBoxColumn.Width = 55
+        '
+        'MaxDataGridViewTextBoxColumn
+        '
+        Me.MaxDataGridViewTextBoxColumn.DataPropertyName = "Max"
+        Me.MaxDataGridViewTextBoxColumn.HeaderText = "Max"
+        Me.MaxDataGridViewTextBoxColumn.Name = "MaxDataGridViewTextBoxColumn"
+        Me.MaxDataGridViewTextBoxColumn.Width = 52
+        '
+        'EditChartDialog
+        '
+        Me.AcceptButton = Me.OK_Button
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.CancelButton = Me.Cancel_Button
+        Me.ClientSize = New System.Drawing.Size(435, 315)
+        Me.Controls.Add(Me.DataGridView1)
+        Me.Controls.Add(Me.TableLayoutPanel1)
+        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.MaximizeBox = False
+        Me.MinimizeBox = False
+        Me.Name = "EditChartDialog"
+        Me.ShowInTaskbar = False
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
+        Me.Text = "Edit Chart"
+        Me.TopMost = True
+        Me.TableLayoutPanel1.ResumeLayout(False)
+        CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.AxisWrapperBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.ResumeLayout(False)
+
+    End Sub
+    Friend WithEvents TableLayoutPanel1 As System.Windows.Forms.TableLayoutPanel
+    Friend WithEvents OK_Button As System.Windows.Forms.Button
+    Friend WithEvents Cancel_Button As System.Windows.Forms.Button
+    Friend WithEvents DataGridView1 As DataGridView
+    Friend WithEvents AxisIndexDataGridViewTextBoxColumn As DataGridViewTextBoxColumn
+    Friend WithEvents UnitDataGridViewTextBoxColumn As DataGridViewTextBoxColumn
+    Friend WithEvents AutoMinDataGridViewCheckBoxColumn As DataGridViewCheckBoxColumn
+    Friend WithEvents MinDataGridViewTextBoxColumn As DataGridViewTextBoxColumn
+    Friend WithEvents AutoMaxDataGridViewCheckBoxColumn As DataGridViewCheckBoxColumn
+    Friend WithEvents MaxDataGridViewTextBoxColumn As DataGridViewTextBoxColumn
+    Friend WithEvents AxisWrapperBindingSource As BindingSource
+End Class
diff --git a/source/Dialogs/AxisDialog.resx b/source/Dialogs/EditChartDialog.resx
similarity index 94%
rename from source/Dialogs/AxisDialog.resx
rename to source/Dialogs/EditChartDialog.resx
index 59d99686..eee96e35 100644
--- a/source/Dialogs/AxisDialog.resx
+++ b/source/Dialogs/EditChartDialog.resx
@@ -112,15 +112,15 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="AxisWrapperBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 16</value>
+  <metadata name="AxisWrapperBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
   </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAABMLAAATCwAAAAAAAAAA
diff --git a/source/Dialogs/EditChartDialog.vb b/source/Dialogs/EditChartDialog.vb
new file mode 100644
index 00000000..6d728cee
--- /dev/null
+++ b/source/Dialogs/EditChartDialog.vb
@@ -0,0 +1,67 @@
+'BlueM.Wave
+'Copyright (C) BlueM Dev Group
+'<https://www.bluemodel.org>
+'
+'This program is free software: you can redistribute it and/or modify
+'it under the terms of the GNU Lesser General Public License as published by
+'the Free Software Foundation, either version 3 of the License, or
+'(at your option) any later version.
+'
+'This program is distributed in the hope that it will be useful,
+'but WITHOUT ANY WARRANTY; without even the implied warranty of
+'MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+'GNU Lesser General Public License for more details.
+'
+'You should have received a copy of the GNU Lesser General Public License
+'along with this program.  If not, see <https://www.gnu.org/licenses/>.
+'
+Imports System.Windows.Forms
+
+Friend Class EditChartDialog
+
+    ''' <summary>
+    ''' Is raised when axes properties were changed
+    ''' </summary>
+    Friend Event AxesEdited()
+
+    Public Sub New(ByRef axes As System.ComponentModel.BindingList(Of AxisWrapper))
+
+        ' This call is required by the designer.
+        InitializeComponent()
+
+        ' Add any initialization after the InitializeComponent() call.
+        Me.AxisWrapperBindingSource.DataSource = axes
+
+    End Sub
+
+    ''' <summary>
+    ''' Commit edits as soon as they occur, but only if they occur in the AutoMin or AutoMax columns
+    ''' </summary>
+    ''' <param name="sender"></param>
+    ''' <param name="e"></param>
+    Private Sub DataGridView1_CurrentCellDirtyStateChanged(sender As Object, e As EventArgs) Handles DataGridView1.CurrentCellDirtyStateChanged
+        If DataGridView1.IsCurrentCellDirty And
+            (DataGridView1.CurrentCell.OwningColumn.DataPropertyName = "AutoMin" Or DataGridView1.CurrentCell.OwningColumn.DataPropertyName = "AutoMax") Then
+            DataGridView1.CommitEdit(DataGridViewDataErrorContexts.Commit)
+        End If
+    End Sub
+
+    Private Sub DataGridView1_CellEndEdit(sender As Object, e As DataGridViewCellEventArgs) Handles DataGridView1.CellValueChanged
+        RaiseEvent AxesEdited()
+    End Sub
+
+    Private Sub OK_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles OK_Button.Click
+        Me.DialogResult = System.Windows.Forms.DialogResult.OK
+        Me.Close()
+    End Sub
+
+    Private Sub Cancel_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Cancel_Button.Click
+        Me.DialogResult = System.Windows.Forms.DialogResult.Cancel
+        Me.Close()
+    End Sub
+
+    Private Sub EditChartDialog_FormClosing(sender As Object, e As FormClosingEventArgs) Handles MyBase.FormClosing
+        Me.Hide()
+        e.Cancel = True
+    End Sub
+End Class
diff --git a/source/Helpers.vb b/source/Helpers.vb
index 5e3c5f31..f2b6663c 100644
--- a/source/Helpers.vb
+++ b/source/Helpers.vb
@@ -126,11 +126,15 @@ Public Module Helpers
     ''' <summary>
     ''' Returns a specified color palette
     ''' </summary>
-    ''' <param name="name">Available color palettes are "Material", "Distinct", "Color Wheel" and "Random". Defaults to "Material".</param>
+    ''' <param name="name">Available color palettes are "Category10", "Category20", "Material", "Distinct", "Color Wheel" and "Random". Defaults to "Category10".</param>
     ''' <returns>A color palette</returns>
-    Public Function getColorPalette(Optional name As String = "Material") As Color()
+    Public Function getColorPalette(Optional name As String = "Category10") As Color()
         Dim colorPalette As Color()
         Select Case name
+            Case "Category10"
+                colorPalette = New ScottPlot.Palettes.Category10().Colors
+            Case "Category20"
+                colorPalette = New ScottPlot.Palettes.Category20().Colors
             Case "Material"
                 'Material Design Palette
                 'https://hexcolor.co/material-design-colors
@@ -224,79 +228,34 @@ Public Module Helpers
     End Function
 
     ''' <summary>
-    ''' Führt Standardformatierung eines TCharts aus
+    ''' Default formatting for a chart
     ''' </summary>
-    ''' <param name="chart"></param>
-    Friend Sub FormatChart(ByRef chart As Steema.TeeChart.Chart)
+    ''' <param name="plot"></param>
+    Friend Sub FormatChart(ByRef plot As ScottPlot.Plot)
 
         'set default color palette
-        chart.ColorPalette = Helpers.getColorPalette()
+        plot.Palette = ScottPlot.Palette.FromColors(getColorPalette())
 
-        chart.Aspect.View3D = False
-        'chart.BackColor = Color.White
-        chart.Panel.Gradient.Visible = False
-        chart.Panel.Brush.Color = Color.White
-        chart.Walls.Back.Transparent = False
-        chart.Walls.Back.Gradient.Visible = False
-        chart.Walls.Back.Color = Color.White
+        'legend
+        Dim legend As ScottPlot.Renderable.Legend
+        legend = plot.Legend(enable:=True, location:=ScottPlot.Alignment.UpperRight)
+        legend.UpdateLegendItems(plot, includeHidden:=True)
 
-        'Header
-        chart.Header.Font.Name = "GenericSansSerif"
-        chart.Header.Font.Color = Color.Black
-        chart.Header.Font.Size = 12
-        chart.Header.Text = ""
+        'X axis
+        plot.XAxis.DateTimeFormat(True)
 
-        'Legende
-        chart.Legend.Font.Name = "GenericSansSerif"
-        chart.Legend.Font.Size = 10
-        chart.Legend.LegendStyle = Steema.TeeChart.LegendStyles.Series
-        chart.Legend.FontSeriesColor = True
-        chart.Legend.CheckBoxes = True
+        'reset left Y axis
+        plot.YAxis.Label("")
+        plot.YAxis.Dims.ResetLimits()
 
-        'Achsen
-        chart.Axes.DrawBehind = False
-
-        chart.Axes.Left.Title.Font.Name = "GenericSansSerif"
-        chart.Axes.Left.Title.Font.Color = Color.Black
-        chart.Axes.Left.Title.Font.Size = 10
-
-        chart.Axes.Left.Labels.Font.Name = "GenericSansSerif"
-        chart.Axes.Left.Labels.Font.Color = Color.Black
-        chart.Axes.Left.Labels.Font.Size = 10
-
-        chart.Axes.Left.AxisPen.Visible = True
-
-        chart.Axes.Left.Grid.Visible = True
-        chart.Axes.Left.Grid.Style = Drawing2D.DashStyle.Dash
-
-        chart.Axes.Right.Title.Font.Name = "GenericSansSerif"
-        chart.Axes.Right.Title.Font.Color = Color.Black
-        chart.Axes.Right.Title.Font.Size = 10
-
-        chart.Axes.Right.Labels.Font.Name = "GenericSansSerif"
-        chart.Axes.Right.Labels.Font.Color = Color.Black
-        chart.Axes.Right.Labels.Font.Size = 10
-
-        chart.Axes.Right.AxisPen.Visible = True
-
-        chart.Axes.Right.Grid.Visible = False
-        chart.Axes.Right.Grid.Style = Drawing2D.DashStyle.Dash
-
-        chart.Axes.Bottom.Title.Font.Name = "GenericSansSerif"
-        chart.Axes.Bottom.Title.Font.Color = Color.Black
-        chart.Axes.Bottom.Title.Font.Size = 10
-
-        chart.Axes.Bottom.Labels.Font.Name = "GenericSansSerif"
-        chart.Axes.Bottom.Labels.Font.Color = Color.Black
-        chart.Axes.Bottom.Labels.Font.Size = 10
-
-        chart.Axes.Bottom.Automatic = True
-
-        chart.Axes.Bottom.AxisPen.Visible = True
-
-        chart.Axes.Bottom.Grid.Visible = True
-        chart.Axes.Bottom.Grid.Style = Drawing2D.DashStyle.Dash
+        'hide right Y axis
+        plot.YAxis2.Label("")
+        plot.YAxis2.Dims.ResetLimits()
 
+        'remove any additional axes
+        For axisIndex As Integer = 2 To plot.GetAxesMatching(axisIndex:=Nothing, isVertical:=True).Count() - 1
+            plot.RemoveAxis(plot.GetAxesMatching(axisIndex:=axisIndex).First)
+        Next
     End Sub
 
     Public Enum Direction
diff --git a/source/My Project/DataSources/AxisWrapper.datasource b/source/My Project/DataSources/AxisWrapper.datasource
index 8a3a11dd..826fc7af 100644
--- a/source/My Project/DataSources/AxisWrapper.datasource	
+++ b/source/My Project/DataSources/AxisWrapper.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="AxisWrapper" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>BlueM.Wave.AxisWrapper, Wave, Version=1.9.2.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>BlueM.Wave.AxisWrapper, Wave, Version=2.6.1.23947, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/source/My Project/Resources.Designer.vb b/source/My Project/Resources.Designer.vb
index 58568336..f5f22808 100644
--- a/source/My Project/Resources.Designer.vb	
+++ b/source/My Project/Resources.Designer.vb	
@@ -500,6 +500,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property picture_save() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("picture_save", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized resource of type System.Drawing.Bitmap.
         '''</summary>
diff --git a/source/My Project/Resources.resx b/source/My Project/Resources.resx
index ebf11d13..9a7baee0 100644
--- a/source/My Project/Resources.resx	
+++ b/source/My Project/Resources.resx	
@@ -250,6 +250,9 @@
   <data name="pan" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\pan.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="picture_save" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\picture_save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="script" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\script.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
diff --git a/source/Resources/picture_save.png b/source/Resources/picture_save.png
new file mode 100644
index 00000000..777fb5d2
Binary files /dev/null and b/source/Resources/picture_save.png differ
diff --git a/source/Views/MainWindow.Designer.vb b/source/Views/MainWindow.Designer.vb
index d83b1d1a..468de26b 100644
--- a/source/Views/MainWindow.Designer.vb
+++ b/source/Views/MainWindow.Designer.vb
@@ -33,8 +33,6 @@ Partial Class MainWindow
         Dim ToolStripSeparator5 As System.Windows.Forms.ToolStripSeparator
         Dim ToolStripSeparator4 As System.Windows.Forms.ToolStripSeparator
         Dim ToolStripSeparator3 As System.Windows.Forms.ToolStripSeparator
-        Dim Margins2 As Steema.TeeChart.Margins = New Steema.TeeChart.Margins()
-        Dim Margins3 As Steema.TeeChart.Margins = New Steema.TeeChart.Margins()
         Me.ToolStripStatusLabel_Errors = New System.Windows.Forms.ToolStripStatusLabel()
         Me.ToolStripStatusLabel_Warnings = New System.Windows.Forms.ToolStripStatusLabel()
         Me.ToolStripStatusLabel_Log = New System.Windows.Forms.ToolStripStatusLabel()
@@ -48,10 +46,8 @@ Partial Class MainWindow
         Me.ToolStripMenuItem_RecentlyUsedFiles = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripDropDownButton_Save = New System.Windows.Forms.ToolStripDropDownButton()
         Me.ToolStripMenuItem_SaveProjectFile = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ToolStripMenuItem_SaveChart = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem_ExportSeries = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripButton_Copy = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripButton_Print = New System.Windows.Forms.ToolStripButton()
         Me.ToolStripButton_Cut = New System.Windows.Forms.ToolStripButton()
         Me.ToolStripButton_Merge = New System.Windows.Forms.ToolStripButton()
         Me.ToolStripSeparator8 = New System.Windows.Forms.ToolStripSeparator()
@@ -62,6 +58,8 @@ Partial Class MainWindow
         Me.ToolStripButton_Analysis = New System.Windows.Forms.ToolStripButton()
         Me.ToolStripButton_EditChart = New System.Windows.Forms.ToolStripButton()
         Me.ToolStripDropDownButton_ColorPalette = New System.Windows.Forms.ToolStripDropDownButton()
+        Me.ToolStripMenuItem_ColorPaletteCategory10 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripMenuItem_ColorPaletteCategory20 = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem_ColorPaletteMaterial = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem_ColorPaletteDistinct = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem_ColorPaletteWheel = New System.Windows.Forms.ToolStripMenuItem()
@@ -70,7 +68,6 @@ Partial Class MainWindow
         Me.ToolStripButton_Properties = New System.Windows.Forms.ToolStripButton()
         Me.ToolStripButton_TimeseriesValues = New System.Windows.Forms.ToolStripButton()
         Me.ToolStripSeparator10 = New System.Windows.Forms.ToolStripSeparator()
-        Me.ToolStripButton_AxisDialog = New System.Windows.Forms.ToolStripButton()
         Me.ToolStripButton_AutoAdjustYAxes = New System.Windows.Forms.ToolStripButton()
         Me.ToolStripButton_ToggleOverview = New System.Windows.Forms.ToolStripButton()
         Me.ToolStripButton_ToggleNavigation = New System.Windows.Forms.ToolStripButton()
@@ -87,12 +84,9 @@ Partial Class MainWindow
         Me.ToolStripButton_ZoomAll = New System.Windows.Forms.ToolStripButton()
         Me.ToolStripButton_UpdateNotification = New System.Windows.Forms.ToolStripButton()
         Me.ToolStripSeparator11 = New System.Windows.Forms.ToolStripSeparator()
-        Me.ToolStripDropDownButton_ActivateAllSeries = New System.Windows.Forms.ToolStripDropDownButton()
-        Me.ToolStripMenuItem_ActivateAllSeries = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ToolStripMenuItem_DeactivateAllSeries = New System.Windows.Forms.ToolStripMenuItem()
         Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog()
         Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
-        Me.TChart2 = New Steema.TeeChart.TChart()
+        Me.OverviewPlot = New ScottPlot.FormsPlot()
         Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
         Me.PanelNavigation = New System.Windows.Forms.Panel()
         Me.Button_NavEnd = New System.Windows.Forms.Button()
@@ -102,7 +96,7 @@ Partial Class MainWindow
         Me.Button_NavBack = New System.Windows.Forms.Button()
         Me.NumericUpDown_NavMultiplier = New System.Windows.Forms.NumericUpDown()
         Me.ComboBox_NavIncrement = New System.Windows.Forms.ComboBox()
-        Me.TChart1 = New Steema.TeeChart.TChart()
+        Me.MainPlot = New ScottPlot.FormsPlot()
         Me.Panel_DisplayRange = New System.Windows.Forms.Panel()
         Me.Label_Display = New System.Windows.Forms.Label()
         Me.NumericUpDown_DisplayRangeMultiplier = New System.Windows.Forms.NumericUpDown()
@@ -112,6 +106,18 @@ Partial Class MainWindow
         Me.SaveFileDialog1 = New System.Windows.Forms.SaveFileDialog()
         Me.ProgressBar1 = New System.Windows.Forms.ProgressBar()
         Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
+        Me.SplitContainer2 = New System.Windows.Forms.SplitContainer()
+        Me.ToolStrip2 = New System.Windows.Forms.ToolStrip()
+        Me.ToolStripButton_Delete = New System.Windows.Forms.ToolStripButton()
+        Me.ToolStripSeparator12 = New System.Windows.Forms.ToolStripSeparator()
+        Me.ToolStripButton_MoveUp = New System.Windows.Forms.ToolStripButton()
+        Me.ToolStripButton_MoveDown = New System.Windows.Forms.ToolStripButton()
+        Me.ToolStripSeparator13 = New System.Windows.Forms.ToolStripSeparator()
+        Me.ToolStripDropDownButton1 = New System.Windows.Forms.ToolStripDropDownButton()
+        Me.ToolStripMenuItem_ActivateAllSeries = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripMenuItem_DeactivateAllSeries = New System.Windows.Forms.ToolStripMenuItem()
+        Me.CheckedListBox_Series = New System.Windows.Forms.CheckedListBox()
+        Me.ToolStripMenuItem_SaveImage = New System.Windows.Forms.ToolStripMenuItem()
         ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
         toolStripSeparator = New System.Windows.Forms.ToolStripSeparator()
         ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
@@ -132,6 +138,11 @@ Partial Class MainWindow
         CType(Me.NumericUpDown_NavMultiplier, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel_DisplayRange.SuspendLayout()
         CType(Me.NumericUpDown_DisplayRangeMultiplier, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.SplitContainer2, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.SplitContainer2.Panel1.SuspendLayout()
+        Me.SplitContainer2.Panel2.SuspendLayout()
+        Me.SplitContainer2.SuspendLayout()
+        Me.ToolStrip2.SuspendLayout()
         Me.SuspendLayout()
         '
         'ToolStripSeparator1
@@ -199,7 +210,7 @@ Partial Class MainWindow
         '
         ToolStrip1.AutoSize = False
         ToolStrip1.BackColor = System.Drawing.SystemColors.Control
-        ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton_New, Me.ToolStripDropDownButton_Open, Me.ToolStripDropDownButton_Save, ToolStripSeparator4, Me.ToolStripButton_Copy, Me.ToolStripButton_Print, ToolStripSeparator2, Me.ToolStripButton_Cut, Me.ToolStripButton_Merge, Me.ToolStripSeparator8, Me.ToolStripButton_ShowNaNValues, Me.ToolStripButton_ConvertErrorValues, Me.ToolStripButton_RemoveNaNValues, Me.ToolStripSeparator7, Me.ToolStripButton_Analysis, ToolStripSeparator1, Me.ToolStripButton_EditChart, Me.ToolStripDropDownButton_ColorPalette, Me.ToolStripSeparator9, Me.ToolStripButton_Properties, Me.ToolStripButton_TimeseriesValues, Me.ToolStripSeparator10, Me.ToolStripButton_AxisDialog, Me.ToolStripButton_AutoAdjustYAxes, ToolStripSeparator3, Me.ToolStripButton_ToggleOverview, Me.ToolStripButton_ToggleNavigation, toolStripSeparator, Me.ToolStripButton_ZoomIn, Me.ToolStripButton_ZoomOut, Me.ToolStripButton_ZoomPrevious, Me.ToolStripDropDownButton_Help, Me.ToolStripButton_ZoomNext, Me.ToolStripDropDownButton_ZoomToSeries, Me.ToolStripButton_ZoomAll, Me.ToolStripButton_UpdateNotification, Me.ToolStripSeparator11, Me.ToolStripDropDownButton_ActivateAllSeries})
+        ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton_New, Me.ToolStripDropDownButton_Open, Me.ToolStripDropDownButton_Save, ToolStripSeparator4, Me.ToolStripButton_Copy, ToolStripSeparator2, Me.ToolStripButton_Cut, Me.ToolStripButton_Merge, Me.ToolStripSeparator8, Me.ToolStripButton_ShowNaNValues, Me.ToolStripButton_ConvertErrorValues, Me.ToolStripButton_RemoveNaNValues, Me.ToolStripSeparator7, Me.ToolStripButton_Analysis, ToolStripSeparator1, Me.ToolStripButton_EditChart, Me.ToolStripDropDownButton_ColorPalette, Me.ToolStripSeparator9, Me.ToolStripButton_Properties, Me.ToolStripButton_TimeseriesValues, Me.ToolStripSeparator10, Me.ToolStripButton_AutoAdjustYAxes, ToolStripSeparator3, Me.ToolStripButton_ToggleOverview, Me.ToolStripButton_ToggleNavigation, toolStripSeparator, Me.ToolStripButton_ZoomIn, Me.ToolStripButton_ZoomOut, Me.ToolStripButton_ZoomPrevious, Me.ToolStripDropDownButton_Help, Me.ToolStripButton_ZoomNext, Me.ToolStripDropDownButton_ZoomToSeries, Me.ToolStripButton_ZoomAll, Me.ToolStripButton_UpdateNotification, Me.ToolStripSeparator11})
         ToolStrip1.Location = New System.Drawing.Point(0, 0)
         ToolStrip1.Name = "ToolStrip1"
         ToolStrip1.Size = New System.Drawing.Size(944, 34)
@@ -279,7 +290,7 @@ Partial Class MainWindow
         'ToolStripDropDownButton_Save
         '
         Me.ToolStripDropDownButton_Save.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripDropDownButton_Save.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem_SaveProjectFile, Me.ToolStripMenuItem_SaveChart, Me.ToolStripMenuItem_ExportSeries})
+        Me.ToolStripDropDownButton_Save.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem_SaveProjectFile, Me.ToolStripMenuItem_SaveImage, Me.ToolStripMenuItem_ExportSeries})
         Me.ToolStripDropDownButton_Save.Image = CType(resources.GetObject("ToolStripDropDownButton_Save.Image"), System.Drawing.Image)
         Me.ToolStripDropDownButton_Save.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripDropDownButton_Save.Name = "ToolStripDropDownButton_Save"
@@ -290,21 +301,14 @@ Partial Class MainWindow
         '
         Me.ToolStripMenuItem_SaveProjectFile.Image = Global.BlueM.Wave.My.Resources.Resources.chart_curve_link
         Me.ToolStripMenuItem_SaveProjectFile.Name = "ToolStripMenuItem_SaveProjectFile"
-        Me.ToolStripMenuItem_SaveProjectFile.Size = New System.Drawing.Size(167, 22)
+        Me.ToolStripMenuItem_SaveProjectFile.Size = New System.Drawing.Size(180, 22)
         Me.ToolStripMenuItem_SaveProjectFile.Text = "Save project file"
         '
-        'ToolStripMenuItem_SaveChart
-        '
-        Me.ToolStripMenuItem_SaveChart.Image = Global.BlueM.Wave.My.Resources.Resources.chart_pie
-        Me.ToolStripMenuItem_SaveChart.Name = "ToolStripMenuItem_SaveChart"
-        Me.ToolStripMenuItem_SaveChart.Size = New System.Drawing.Size(167, 22)
-        Me.ToolStripMenuItem_SaveChart.Text = "Save chart"
-        '
         'ToolStripMenuItem_ExportSeries
         '
         Me.ToolStripMenuItem_ExportSeries.Image = Global.BlueM.Wave.My.Resources.Resources.page_white_go
         Me.ToolStripMenuItem_ExportSeries.Name = "ToolStripMenuItem_ExportSeries"
-        Me.ToolStripMenuItem_ExportSeries.Size = New System.Drawing.Size(167, 22)
+        Me.ToolStripMenuItem_ExportSeries.Size = New System.Drawing.Size(180, 22)
         Me.ToolStripMenuItem_ExportSeries.Text = "Export time series"
         '
         'ToolStripSeparator4
@@ -319,16 +323,7 @@ Partial Class MainWindow
         Me.ToolStripButton_Copy.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripButton_Copy.Name = "ToolStripButton_Copy"
         Me.ToolStripButton_Copy.Size = New System.Drawing.Size(23, 31)
-        Me.ToolStripButton_Copy.Text = "&Copy chart to clipboard (PNG)"
-        '
-        'ToolStripButton_Print
-        '
-        Me.ToolStripButton_Print.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripButton_Print.Image = CType(resources.GetObject("ToolStripButton_Print.Image"), System.Drawing.Image)
-        Me.ToolStripButton_Print.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripButton_Print.Name = "ToolStripButton_Print"
-        Me.ToolStripButton_Print.Size = New System.Drawing.Size(23, 31)
-        Me.ToolStripButton_Print.Text = "&Print"
+        Me.ToolStripButton_Copy.Text = "&Copy chart image to clipboard"
         '
         'ToolStripButton_Cut
         '
@@ -408,13 +403,25 @@ Partial Class MainWindow
         'ToolStripDropDownButton_ColorPalette
         '
         Me.ToolStripDropDownButton_ColorPalette.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripDropDownButton_ColorPalette.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem_ColorPaletteMaterial, Me.ToolStripMenuItem_ColorPaletteDistinct, Me.ToolStripMenuItem_ColorPaletteWheel, Me.ToolStripMenuItem_ColorPaletteRandom})
+        Me.ToolStripDropDownButton_ColorPalette.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem_ColorPaletteCategory10, Me.ToolStripMenuItem_ColorPaletteCategory20, Me.ToolStripMenuItem_ColorPaletteMaterial, Me.ToolStripMenuItem_ColorPaletteDistinct, Me.ToolStripMenuItem_ColorPaletteWheel, Me.ToolStripMenuItem_ColorPaletteRandom})
         Me.ToolStripDropDownButton_ColorPalette.Image = Global.BlueM.Wave.My.Resources.Resources.color_wheel
         Me.ToolStripDropDownButton_ColorPalette.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripDropDownButton_ColorPalette.Name = "ToolStripDropDownButton_ColorPalette"
         Me.ToolStripDropDownButton_ColorPalette.Size = New System.Drawing.Size(29, 31)
         Me.ToolStripDropDownButton_ColorPalette.Text = "Set color palette"
         '
+        'ToolStripMenuItem_ColorPaletteCategory10
+        '
+        Me.ToolStripMenuItem_ColorPaletteCategory10.Name = "ToolStripMenuItem_ColorPaletteCategory10"
+        Me.ToolStripMenuItem_ColorPaletteCategory10.Size = New System.Drawing.Size(180, 22)
+        Me.ToolStripMenuItem_ColorPaletteCategory10.Text = "Category10"
+        '
+        'ToolStripMenuItem_ColorPaletteCategory20
+        '
+        Me.ToolStripMenuItem_ColorPaletteCategory20.Name = "ToolStripMenuItem_ColorPaletteCategory20"
+        Me.ToolStripMenuItem_ColorPaletteCategory20.Size = New System.Drawing.Size(180, 22)
+        Me.ToolStripMenuItem_ColorPaletteCategory20.Text = "Category20"
+        '
         'ToolStripMenuItem_ColorPaletteMaterial
         '
         Me.ToolStripMenuItem_ColorPaletteMaterial.Name = "ToolStripMenuItem_ColorPaletteMaterial"
@@ -469,16 +476,6 @@ Partial Class MainWindow
         Me.ToolStripSeparator10.Name = "ToolStripSeparator10"
         Me.ToolStripSeparator10.Size = New System.Drawing.Size(6, 34)
         '
-        'ToolStripButton_AxisDialog
-        '
-        Me.ToolStripButton_AxisDialog.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripButton_AxisDialog.Image = Global.BlueM.Wave.My.Resources.Resources.shape_align_bottom
-        Me.ToolStripButton_AxisDialog.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripButton_AxisDialog.Name = "ToolStripButton_AxisDialog"
-        Me.ToolStripButton_AxisDialog.Size = New System.Drawing.Size(23, 31)
-        Me.ToolStripButton_AxisDialog.Text = "ToolStripButton_AxisDialog"
-        Me.ToolStripButton_AxisDialog.ToolTipText = "Manage Axes"
-        '
         'ToolStripButton_AutoAdjustYAxes
         '
         Me.ToolStripButton_AutoAdjustYAxes.CheckOnClick = True
@@ -629,2671 +626,355 @@ Partial Class MainWindow
         Me.ToolStripSeparator11.Name = "ToolStripSeparator11"
         Me.ToolStripSeparator11.Size = New System.Drawing.Size(6, 34)
         '
-        'ToolStripDropDownButton_ActivateAllSeries
-        '
-        Me.ToolStripDropDownButton_ActivateAllSeries.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripDropDownButton_ActivateAllSeries.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem_ActivateAllSeries, Me.ToolStripMenuItem_DeactivateAllSeries})
-        Me.ToolStripDropDownButton_ActivateAllSeries.Image = Global.BlueM.Wave.My.Resources.Resources.accept_split
-        Me.ToolStripDropDownButton_ActivateAllSeries.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripDropDownButton_ActivateAllSeries.Name = "ToolStripDropDownButton_ActivateAllSeries"
-        Me.ToolStripDropDownButton_ActivateAllSeries.Size = New System.Drawing.Size(29, 31)
-        '
-        'ToolStripMenuItem_ActivateAllSeries
-        '
-        Me.ToolStripMenuItem_ActivateAllSeries.Image = Global.BlueM.Wave.My.Resources.Resources.accept
-        Me.ToolStripMenuItem_ActivateAllSeries.Name = "ToolStripMenuItem_ActivateAllSeries"
-        Me.ToolStripMenuItem_ActivateAllSeries.Size = New System.Drawing.Size(176, 22)
-        Me.ToolStripMenuItem_ActivateAllSeries.Text = "Activate all series"
-        '
-        'ToolStripMenuItem_DeactivateAllSeries
-        '
-        Me.ToolStripMenuItem_DeactivateAllSeries.Image = Global.BlueM.Wave.My.Resources.Resources.accept_grayscale
-        Me.ToolStripMenuItem_DeactivateAllSeries.Name = "ToolStripMenuItem_DeactivateAllSeries"
-        Me.ToolStripMenuItem_DeactivateAllSeries.Size = New System.Drawing.Size(176, 22)
-        Me.ToolStripMenuItem_DeactivateAllSeries.Text = "Deactivate all series"
-        '
         'OpenFileDialog1
         '
         Me.OpenFileDialog1.Multiselect = True
         '
         'SplitContainer1
         '
-        Me.SplitContainer1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-            Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.SplitContainer1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
-        Me.SplitContainer1.Location = New System.Drawing.Point(0, 34)
+        Me.SplitContainer1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.SplitContainer1.Location = New System.Drawing.Point(0, 0)
         Me.SplitContainer1.Name = "SplitContainer1"
         Me.SplitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal
         '
         'SplitContainer1.Panel1
         '
-        Me.SplitContainer1.Panel1.Controls.Add(Me.TChart2)
+        Me.SplitContainer1.Panel1.Controls.Add(Me.OverviewPlot)
         Me.SplitContainer1.Panel1MinSize = 100
         '
         'SplitContainer1.Panel2
         '
         Me.SplitContainer1.Panel2.Controls.Add(Me.TableLayoutPanel1)
-        Me.SplitContainer1.Size = New System.Drawing.Size(944, 606)
-        Me.SplitContainer1.SplitterDistance = 140
+        Me.SplitContainer1.Size = New System.Drawing.Size(805, 605)
+        Me.SplitContainer1.SplitterDistance = 139
         Me.SplitContainer1.TabIndex = 1
         '
-        'TChart2
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Axes.Bottom.Labels.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart2.Axes.Bottom.Labels.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart2.Axes.Bottom.Labels.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart2.Axes.Bottom.Labels.Brush.Color = System.Drawing.Color.White
-        Me.TChart2.Axes.Bottom.Labels.Brush.Solid = True
-        Me.TChart2.Axes.Bottom.Labels.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart2.Axes.Bottom.Labels.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart2.Axes.Bottom.Labels.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart2.Axes.Bottom.Labels.Font.Brush.Solid = True
-        Me.TChart2.Axes.Bottom.Labels.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Axes.Bottom.Labels.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.Axes.Bottom.Labels.Font.Shadow.Brush.Solid = True
-        Me.TChart2.Axes.Bottom.Labels.Font.Shadow.Brush.Visible = True
-        Me.TChart2.Axes.Bottom.Labels.Font.Size = 9
-        Me.TChart2.Axes.Bottom.Labels.Font.SizeFloat = 9.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Axes.Bottom.Labels.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart2.Axes.Bottom.Labels.ImageBevel.Brush.Solid = True
-        Me.TChart2.Axes.Bottom.Labels.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Axes.Bottom.Labels.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.Axes.Bottom.Labels.Shadow.Brush.Solid = True
-        Me.TChart2.Axes.Bottom.Labels.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart2.Axes.Bottom.Title.Angle = 0
-        '
-        '
-        '
-        Me.TChart2.Axes.Bottom.Title.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart2.Axes.Bottom.Title.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart2.Axes.Bottom.Title.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart2.Axes.Bottom.Title.Brush.Color = System.Drawing.Color.Silver
-        Me.TChart2.Axes.Bottom.Title.Brush.Solid = True
-        Me.TChart2.Axes.Bottom.Title.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart2.Axes.Bottom.Title.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart2.Axes.Bottom.Title.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
-        Me.TChart2.Axes.Bottom.Title.Font.Brush.Solid = True
-        Me.TChart2.Axes.Bottom.Title.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Axes.Bottom.Title.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.Axes.Bottom.Title.Font.Shadow.Brush.Solid = True
-        Me.TChart2.Axes.Bottom.Title.Font.Shadow.Brush.Visible = True
-        Me.TChart2.Axes.Bottom.Title.Font.Size = 11
-        Me.TChart2.Axes.Bottom.Title.Font.SizeFloat = 11.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Axes.Bottom.Title.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart2.Axes.Bottom.Title.ImageBevel.Brush.Solid = True
-        Me.TChart2.Axes.Bottom.Title.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Axes.Bottom.Title.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.Axes.Bottom.Title.Shadow.Brush.Solid = True
-        Me.TChart2.Axes.Bottom.Title.Shadow.Brush.Visible = True
-        Me.TChart2.Axes.Bottom.UseMaxPixelPos = True
-        '
-        '
-        '
+        'OverviewPlot
         '
+        Me.OverviewPlot.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.OverviewPlot.Location = New System.Drawing.Point(0, 0)
+        Me.OverviewPlot.Name = "OverviewPlot"
+        Me.OverviewPlot.Size = New System.Drawing.Size(801, 135)
+        Me.OverviewPlot.TabIndex = 0
         '
+        'TableLayoutPanel1
         '
+        Me.TableLayoutPanel1.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.[Single]
+        Me.TableLayoutPanel1.ColumnCount = 1
+        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100.0!))
+        Me.TableLayoutPanel1.Controls.Add(Me.PanelNavigation, 0, 0)
+        Me.TableLayoutPanel1.Controls.Add(Me.MainPlot, 0, 1)
+        Me.TableLayoutPanel1.Controls.Add(Me.Panel_DisplayRange, 0, 2)
+        Me.TableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.TableLayoutPanel1.Location = New System.Drawing.Point(0, 0)
+        Me.TableLayoutPanel1.Margin = New System.Windows.Forms.Padding(0)
+        Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
+        Me.TableLayoutPanel1.RowCount = 4
+        Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 38.0!))
+        Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100.0!))
+        Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 36.0!))
+        Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20.0!))
+        Me.TableLayoutPanel1.Size = New System.Drawing.Size(801, 458)
+        Me.TableLayoutPanel1.TabIndex = 3
         '
+        'PanelNavigation
         '
+        Me.PanelNavigation.Controls.Add(Me.Button_NavEnd)
+        Me.PanelNavigation.Controls.Add(Me.Button_NavStart)
+        Me.PanelNavigation.Controls.Add(Me.Label_Navigate)
+        Me.PanelNavigation.Controls.Add(Me.Button_NavForward)
+        Me.PanelNavigation.Controls.Add(Me.Button_NavBack)
+        Me.PanelNavigation.Controls.Add(Me.NumericUpDown_NavMultiplier)
+        Me.PanelNavigation.Controls.Add(Me.ComboBox_NavIncrement)
+        Me.PanelNavigation.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.PanelNavigation.Location = New System.Drawing.Point(1, 1)
+        Me.PanelNavigation.Margin = New System.Windows.Forms.Padding(0)
+        Me.PanelNavigation.Name = "PanelNavigation"
+        Me.PanelNavigation.Size = New System.Drawing.Size(799, 38)
+        Me.PanelNavigation.TabIndex = 0
         '
-        Me.TChart2.Axes.Depth.Labels.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart2.Axes.Depth.Labels.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart2.Axes.Depth.Labels.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
+        'Button_NavEnd
         '
+        Me.Button_NavEnd.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Button_NavEnd.Image = Global.BlueM.Wave.My.Resources.Resources.control_end
+        Me.Button_NavEnd.Location = New System.Drawing.Point(767, 8)
+        Me.Button_NavEnd.Name = "Button_NavEnd"
+        Me.Button_NavEnd.Size = New System.Drawing.Size(23, 23)
+        Me.Button_NavEnd.TabIndex = 6
+        Me.ToolTip1.SetToolTip(Me.Button_NavEnd, "Navigate to end")
+        Me.Button_NavEnd.UseVisualStyleBackColor = True
         '
+        'Button_NavStart
         '
-        Me.TChart2.Axes.Depth.Labels.Brush.Color = System.Drawing.Color.White
-        Me.TChart2.Axes.Depth.Labels.Brush.Solid = True
-        Me.TChart2.Axes.Depth.Labels.Brush.Visible = True
+        Me.Button_NavStart.Image = Global.BlueM.Wave.My.Resources.Resources.control_start
+        Me.Button_NavStart.Location = New System.Drawing.Point(8, 8)
+        Me.Button_NavStart.Name = "Button_NavStart"
+        Me.Button_NavStart.Size = New System.Drawing.Size(23, 23)
+        Me.Button_NavStart.TabIndex = 0
+        Me.ToolTip1.SetToolTip(Me.Button_NavStart, "Navigate to start")
+        Me.Button_NavStart.UseVisualStyleBackColor = True
         '
+        'Label_Navigate
         '
+        Me.Label_Navigate.Anchor = System.Windows.Forms.AnchorStyles.Top
+        Me.Label_Navigate.AutoSize = True
+        Me.Label_Navigate.Location = New System.Drawing.Point(306, 13)
+        Me.Label_Navigate.Name = "Label_Navigate"
+        Me.Label_Navigate.Size = New System.Drawing.Size(53, 13)
+        Me.Label_Navigate.TabIndex = 2
+        Me.Label_Navigate.Text = "Navigate:"
         '
-        Me.TChart2.Axes.Depth.Labels.Font.Bold = False
+        'Button_NavForward
         '
+        Me.Button_NavForward.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Button_NavForward.Image = CType(resources.GetObject("Button_NavForward.Image"), System.Drawing.Image)
+        Me.Button_NavForward.Location = New System.Drawing.Point(692, 8)
+        Me.Button_NavForward.Name = "Button_NavForward"
+        Me.Button_NavForward.Size = New System.Drawing.Size(69, 23)
+        Me.Button_NavForward.TabIndex = 5
+        Me.ToolTip1.SetToolTip(Me.Button_NavForward, "Navigate forwards")
+        Me.Button_NavForward.UseVisualStyleBackColor = True
         '
+        'Button_NavBack
         '
-        Me.TChart2.Axes.Depth.Labels.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart2.Axes.Depth.Labels.Font.Brush.Solid = True
-        Me.TChart2.Axes.Depth.Labels.Font.Brush.Visible = True
+        Me.Button_NavBack.Image = CType(resources.GetObject("Button_NavBack.Image"), System.Drawing.Image)
+        Me.Button_NavBack.Location = New System.Drawing.Point(37, 8)
+        Me.Button_NavBack.Name = "Button_NavBack"
+        Me.Button_NavBack.Size = New System.Drawing.Size(69, 23)
+        Me.Button_NavBack.TabIndex = 1
+        Me.ToolTip1.SetToolTip(Me.Button_NavBack, "Navigate backwards")
+        Me.Button_NavBack.UseVisualStyleBackColor = True
         '
+        'NumericUpDown_NavMultiplier
         '
+        Me.NumericUpDown_NavMultiplier.Anchor = System.Windows.Forms.AnchorStyles.Top
+        Me.NumericUpDown_NavMultiplier.Location = New System.Drawing.Point(365, 9)
+        Me.NumericUpDown_NavMultiplier.Minimum = New Decimal(New Integer() {1, 0, 0, 0})
+        Me.NumericUpDown_NavMultiplier.Name = "NumericUpDown_NavMultiplier"
+        Me.NumericUpDown_NavMultiplier.Size = New System.Drawing.Size(40, 20)
+        Me.NumericUpDown_NavMultiplier.TabIndex = 3
+        Me.NumericUpDown_NavMultiplier.Value = New Decimal(New Integer() {1, 0, 0, 0})
         '
+        'ComboBox_NavIncrement
         '
+        Me.ComboBox_NavIncrement.Anchor = System.Windows.Forms.AnchorStyles.Top
+        Me.ComboBox_NavIncrement.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.ComboBox_NavIncrement.FormattingEnabled = True
+        Me.ComboBox_NavIncrement.Items.AddRange(New Object() {"Centuries", "Decades", "Years", "Months", "Weeks", "Days", "Hours", "Minutes", "Seconds"})
+        Me.ComboBox_NavIncrement.Location = New System.Drawing.Point(411, 9)
+        Me.ComboBox_NavIncrement.Name = "ComboBox_NavIncrement"
+        Me.ComboBox_NavIncrement.Size = New System.Drawing.Size(81, 21)
+        Me.ComboBox_NavIncrement.TabIndex = 4
         '
+        'MainPlot
         '
-        Me.TChart2.Axes.Depth.Labels.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.Axes.Depth.Labels.Font.Shadow.Brush.Solid = True
-        Me.TChart2.Axes.Depth.Labels.Font.Shadow.Brush.Visible = True
-        Me.TChart2.Axes.Depth.Labels.Font.Size = 9
-        Me.TChart2.Axes.Depth.Labels.Font.SizeFloat = 9.0!
+        Me.MainPlot.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.MainPlot.Location = New System.Drawing.Point(4, 43)
+        Me.MainPlot.Name = "MainPlot"
+        Me.MainPlot.Size = New System.Drawing.Size(793, 353)
+        Me.MainPlot.TabIndex = 3
         '
+        'Panel_DisplayRange
         '
+        Me.Panel_DisplayRange.Controls.Add(Me.Label_Display)
+        Me.Panel_DisplayRange.Controls.Add(Me.NumericUpDown_DisplayRangeMultiplier)
+        Me.Panel_DisplayRange.Controls.Add(Me.ComboBox_DisplayRangeUnit)
+        Me.Panel_DisplayRange.Controls.Add(Me.MaskedTextBox_NavEnd)
+        Me.Panel_DisplayRange.Controls.Add(Me.MaskedTextBox_NavStart)
+        Me.Panel_DisplayRange.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.Panel_DisplayRange.Location = New System.Drawing.Point(1, 400)
+        Me.Panel_DisplayRange.Margin = New System.Windows.Forms.Padding(0)
+        Me.Panel_DisplayRange.Name = "Panel_DisplayRange"
+        Me.Panel_DisplayRange.Size = New System.Drawing.Size(799, 36)
+        Me.Panel_DisplayRange.TabIndex = 2
         '
+        'Label_Display
         '
+        Me.Label_Display.Anchor = System.Windows.Forms.AnchorStyles.Top
+        Me.Label_Display.AutoSize = True
+        Me.Label_Display.Location = New System.Drawing.Point(311, 12)
+        Me.Label_Display.Name = "Label_Display"
+        Me.Label_Display.Size = New System.Drawing.Size(44, 13)
+        Me.Label_Display.TabIndex = 1
+        Me.Label_Display.Text = "Display:"
         '
+        'NumericUpDown_DisplayRangeMultiplier
         '
-        Me.TChart2.Axes.Depth.Labels.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart2.Axes.Depth.Labels.ImageBevel.Brush.Solid = True
-        Me.TChart2.Axes.Depth.Labels.ImageBevel.Brush.Visible = True
+        Me.NumericUpDown_DisplayRangeMultiplier.Anchor = System.Windows.Forms.AnchorStyles.Top
+        Me.NumericUpDown_DisplayRangeMultiplier.Location = New System.Drawing.Point(361, 8)
+        Me.NumericUpDown_DisplayRangeMultiplier.Minimum = New Decimal(New Integer() {1, 0, 0, 0})
+        Me.NumericUpDown_DisplayRangeMultiplier.Name = "NumericUpDown_DisplayRangeMultiplier"
+        Me.NumericUpDown_DisplayRangeMultiplier.Size = New System.Drawing.Size(40, 20)
+        Me.NumericUpDown_DisplayRangeMultiplier.TabIndex = 2
+        Me.NumericUpDown_DisplayRangeMultiplier.Value = New Decimal(New Integer() {1, 0, 0, 0})
         '
+        'ComboBox_DisplayRangeUnit
         '
+        Me.ComboBox_DisplayRangeUnit.Anchor = System.Windows.Forms.AnchorStyles.Top
+        Me.ComboBox_DisplayRangeUnit.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.ComboBox_DisplayRangeUnit.FormattingEnabled = True
+        Me.ComboBox_DisplayRangeUnit.Items.AddRange(New Object() {"", "Centuries", "Decades", "Years", "Months", "Weeks", "Days", "Hours", "Minutes", "Seconds"})
+        Me.ComboBox_DisplayRangeUnit.Location = New System.Drawing.Point(407, 8)
+        Me.ComboBox_DisplayRangeUnit.Name = "ComboBox_DisplayRangeUnit"
+        Me.ComboBox_DisplayRangeUnit.Size = New System.Drawing.Size(81, 21)
+        Me.ComboBox_DisplayRangeUnit.TabIndex = 3
         '
+        'MaskedTextBox_NavEnd
         '
+        Me.MaskedTextBox_NavEnd.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.MaskedTextBox_NavEnd.Culture = New System.Globalization.CultureInfo("")
+        Me.MaskedTextBox_NavEnd.Location = New System.Drawing.Point(690, 8)
+        Me.MaskedTextBox_NavEnd.Name = "MaskedTextBox_NavEnd"
+        Me.MaskedTextBox_NavEnd.Size = New System.Drawing.Size(100, 20)
+        Me.MaskedTextBox_NavEnd.TabIndex = 4
+        Me.MaskedTextBox_NavEnd.ValidatingType = GetType(Date)
         '
+        'MaskedTextBox_NavStart
         '
-        Me.TChart2.Axes.Depth.Labels.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.Axes.Depth.Labels.Shadow.Brush.Solid = True
-        Me.TChart2.Axes.Depth.Labels.Shadow.Brush.Visible = True
+        Me.MaskedTextBox_NavStart.Culture = New System.Globalization.CultureInfo("")
+        Me.MaskedTextBox_NavStart.Location = New System.Drawing.Point(8, 8)
+        Me.MaskedTextBox_NavStart.Name = "MaskedTextBox_NavStart"
+        Me.MaskedTextBox_NavStart.Size = New System.Drawing.Size(100, 20)
+        Me.MaskedTextBox_NavStart.TabIndex = 0
+        Me.MaskedTextBox_NavStart.ValidatingType = GetType(Date)
         '
+        'ProgressBar1
         '
+        Me.ProgressBar1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.ProgressBar1.Enabled = False
+        Me.ProgressBar1.Location = New System.Drawing.Point(832, 641)
+        Me.ProgressBar1.Name = "ProgressBar1"
+        Me.ProgressBar1.Size = New System.Drawing.Size(108, 16)
+        Me.ProgressBar1.Step = 1
+        Me.ProgressBar1.TabIndex = 2
         '
-        Me.TChart2.Axes.Depth.Title.Angle = 0
+        'SplitContainer2
         '
+        Me.SplitContainer2.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.SplitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel1
+        Me.SplitContainer2.Location = New System.Drawing.Point(0, 34)
+        Me.SplitContainer2.Name = "SplitContainer2"
         '
+        'SplitContainer2.Panel1
         '
-        Me.TChart2.Axes.Depth.Title.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart2.Axes.Depth.Title.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart2.Axes.Depth.Title.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
+        Me.SplitContainer2.Panel1.AutoScroll = True
+        Me.SplitContainer2.Panel1.Controls.Add(Me.ToolStrip2)
+        Me.SplitContainer2.Panel1.Controls.Add(Me.CheckedListBox_Series)
         '
+        'SplitContainer2.Panel2
         '
+        Me.SplitContainer2.Panel2.Controls.Add(Me.SplitContainer1)
+        Me.SplitContainer2.Size = New System.Drawing.Size(944, 605)
+        Me.SplitContainer2.SplitterDistance = 135
+        Me.SplitContainer2.TabIndex = 7
         '
-        Me.TChart2.Axes.Depth.Title.Brush.Color = System.Drawing.Color.Silver
-        Me.TChart2.Axes.Depth.Title.Brush.Solid = True
-        Me.TChart2.Axes.Depth.Title.Brush.Visible = True
+        'ToolStrip2
         '
+        Me.ToolStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton_Delete, Me.ToolStripSeparator12, Me.ToolStripButton_MoveUp, Me.ToolStripButton_MoveDown, Me.ToolStripSeparator13, Me.ToolStripDropDownButton1})
+        Me.ToolStrip2.Location = New System.Drawing.Point(0, 0)
+        Me.ToolStrip2.Name = "ToolStrip2"
+        Me.ToolStrip2.Size = New System.Drawing.Size(135, 25)
+        Me.ToolStrip2.TabIndex = 1
+        Me.ToolStrip2.Text = "ToolStrip2"
         '
+        'ToolStripButton_Delete
         '
-        Me.TChart2.Axes.Depth.Title.Font.Bold = False
+        Me.ToolStripButton_Delete.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.ToolStripButton_Delete.Enabled = False
+        Me.ToolStripButton_Delete.Image = Global.BlueM.Wave.My.Resources.Resources.chart_line_delete
+        Me.ToolStripButton_Delete.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.ToolStripButton_Delete.Name = "ToolStripButton_Delete"
+        Me.ToolStripButton_Delete.Size = New System.Drawing.Size(23, 22)
+        Me.ToolStripButton_Delete.Text = "ToolStripButton_Delete"
+        Me.ToolStripButton_Delete.ToolTipText = "Delete selected time series"
         '
+        'ToolStripSeparator12
         '
+        Me.ToolStripSeparator12.Name = "ToolStripSeparator12"
+        Me.ToolStripSeparator12.Size = New System.Drawing.Size(6, 25)
         '
-        Me.TChart2.Axes.Depth.Title.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
-        Me.TChart2.Axes.Depth.Title.Font.Brush.Solid = True
-        Me.TChart2.Axes.Depth.Title.Font.Brush.Visible = True
+        'ToolStripButton_MoveUp
         '
+        Me.ToolStripButton_MoveUp.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.ToolStripButton_MoveUp.Enabled = False
+        Me.ToolStripButton_MoveUp.Image = Global.BlueM.Wave.My.Resources.Resources.arrow_up
+        Me.ToolStripButton_MoveUp.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.ToolStripButton_MoveUp.Name = "ToolStripButton_MoveUp"
+        Me.ToolStripButton_MoveUp.Size = New System.Drawing.Size(23, 22)
+        Me.ToolStripButton_MoveUp.Text = "Move selected time series up"
+        Me.ToolStripButton_MoveUp.ToolTipText = "Move selected time series up"
         '
+        'ToolStripButton_MoveDown
         '
+        Me.ToolStripButton_MoveDown.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.ToolStripButton_MoveDown.Enabled = False
+        Me.ToolStripButton_MoveDown.Image = Global.BlueM.Wave.My.Resources.Resources.arrow_down
+        Me.ToolStripButton_MoveDown.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.ToolStripButton_MoveDown.Name = "ToolStripButton_MoveDown"
+        Me.ToolStripButton_MoveDown.Size = New System.Drawing.Size(23, 22)
+        Me.ToolStripButton_MoveDown.Text = "Move selected time series down"
         '
+        'ToolStripSeparator13
         '
+        Me.ToolStripSeparator13.Name = "ToolStripSeparator13"
+        Me.ToolStripSeparator13.Size = New System.Drawing.Size(6, 25)
         '
-        Me.TChart2.Axes.Depth.Title.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.Axes.Depth.Title.Font.Shadow.Brush.Solid = True
-        Me.TChart2.Axes.Depth.Title.Font.Shadow.Brush.Visible = True
-        Me.TChart2.Axes.Depth.Title.Font.Size = 11
-        Me.TChart2.Axes.Depth.Title.Font.SizeFloat = 11.0!
+        'ToolStripDropDownButton1
         '
+        Me.ToolStripDropDownButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.ToolStripDropDownButton1.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem_ActivateAllSeries, Me.ToolStripMenuItem_DeactivateAllSeries})
+        Me.ToolStripDropDownButton1.Image = Global.BlueM.Wave.My.Resources.Resources.accept_split
+        Me.ToolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.ToolStripDropDownButton1.Name = "ToolStripDropDownButton1"
+        Me.ToolStripDropDownButton1.Size = New System.Drawing.Size(29, 22)
         '
+        'ToolStripMenuItem_ActivateAllSeries
         '
+        Me.ToolStripMenuItem_ActivateAllSeries.Image = Global.BlueM.Wave.My.Resources.Resources.accept
+        Me.ToolStripMenuItem_ActivateAllSeries.Name = "ToolStripMenuItem_ActivateAllSeries"
+        Me.ToolStripMenuItem_ActivateAllSeries.Size = New System.Drawing.Size(176, 22)
+        Me.ToolStripMenuItem_ActivateAllSeries.Text = "Activate all series"
         '
+        'ToolStripMenuItem_DeactivateAllSeries
         '
+        Me.ToolStripMenuItem_DeactivateAllSeries.Image = Global.BlueM.Wave.My.Resources.Resources.accept_grayscale
+        Me.ToolStripMenuItem_DeactivateAllSeries.Name = "ToolStripMenuItem_DeactivateAllSeries"
+        Me.ToolStripMenuItem_DeactivateAllSeries.Size = New System.Drawing.Size(176, 22)
+        Me.ToolStripMenuItem_DeactivateAllSeries.Text = "Deactivate all series"
         '
-        Me.TChart2.Axes.Depth.Title.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart2.Axes.Depth.Title.ImageBevel.Brush.Solid = True
-        Me.TChart2.Axes.Depth.Title.ImageBevel.Brush.Visible = True
+        'CheckedListBox_Series
         '
+        Me.CheckedListBox_Series.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.CheckedListBox_Series.BackColor = System.Drawing.SystemColors.Control
+        Me.CheckedListBox_Series.FormattingEnabled = True
+        Me.CheckedListBox_Series.HorizontalScrollbar = True
+        Me.CheckedListBox_Series.Location = New System.Drawing.Point(5, 31)
+        Me.CheckedListBox_Series.Margin = New System.Windows.Forms.Padding(5)
+        Me.CheckedListBox_Series.Name = "CheckedListBox_Series"
+        Me.CheckedListBox_Series.Size = New System.Drawing.Size(125, 559)
+        Me.CheckedListBox_Series.TabIndex = 0
+        Me.CheckedListBox_Series.ThreeDCheckBoxes = True
+        '
+        'ToolStripMenuItem_SaveImage
+        '
+        Me.ToolStripMenuItem_SaveImage.Image = Global.BlueM.Wave.My.Resources.Resources.picture_save
+        Me.ToolStripMenuItem_SaveImage.Name = "ToolStripMenuItem_SaveImage"
+        Me.ToolStripMenuItem_SaveImage.Size = New System.Drawing.Size(180, 22)
+        Me.ToolStripMenuItem_SaveImage.Text = "Save image"
         '
-        '
-        '
-        '
-        '
-        Me.TChart2.Axes.Depth.Title.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.Axes.Depth.Title.Shadow.Brush.Solid = True
-        Me.TChart2.Axes.Depth.Title.Shadow.Brush.Visible = True
-        Me.TChart2.Axes.Depth.UseMaxPixelPos = True
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Axes.DepthTop.Labels.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart2.Axes.DepthTop.Labels.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart2.Axes.DepthTop.Labels.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart2.Axes.DepthTop.Labels.Brush.Color = System.Drawing.Color.White
-        Me.TChart2.Axes.DepthTop.Labels.Brush.Solid = True
-        Me.TChart2.Axes.DepthTop.Labels.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart2.Axes.DepthTop.Labels.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart2.Axes.DepthTop.Labels.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart2.Axes.DepthTop.Labels.Font.Brush.Solid = True
-        Me.TChart2.Axes.DepthTop.Labels.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Axes.DepthTop.Labels.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.Axes.DepthTop.Labels.Font.Shadow.Brush.Solid = True
-        Me.TChart2.Axes.DepthTop.Labels.Font.Shadow.Brush.Visible = True
-        Me.TChart2.Axes.DepthTop.Labels.Font.Size = 9
-        Me.TChart2.Axes.DepthTop.Labels.Font.SizeFloat = 9.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Axes.DepthTop.Labels.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart2.Axes.DepthTop.Labels.ImageBevel.Brush.Solid = True
-        Me.TChart2.Axes.DepthTop.Labels.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Axes.DepthTop.Labels.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.Axes.DepthTop.Labels.Shadow.Brush.Solid = True
-        Me.TChart2.Axes.DepthTop.Labels.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart2.Axes.DepthTop.Title.Angle = 0
-        '
-        '
-        '
-        Me.TChart2.Axes.DepthTop.Title.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart2.Axes.DepthTop.Title.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart2.Axes.DepthTop.Title.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart2.Axes.DepthTop.Title.Brush.Color = System.Drawing.Color.Silver
-        Me.TChart2.Axes.DepthTop.Title.Brush.Solid = True
-        Me.TChart2.Axes.DepthTop.Title.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart2.Axes.DepthTop.Title.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart2.Axes.DepthTop.Title.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
-        Me.TChart2.Axes.DepthTop.Title.Font.Brush.Solid = True
-        Me.TChart2.Axes.DepthTop.Title.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Axes.DepthTop.Title.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.Axes.DepthTop.Title.Font.Shadow.Brush.Solid = True
-        Me.TChart2.Axes.DepthTop.Title.Font.Shadow.Brush.Visible = True
-        Me.TChart2.Axes.DepthTop.Title.Font.Size = 11
-        Me.TChart2.Axes.DepthTop.Title.Font.SizeFloat = 11.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Axes.DepthTop.Title.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart2.Axes.DepthTop.Title.ImageBevel.Brush.Solid = True
-        Me.TChart2.Axes.DepthTop.Title.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Axes.DepthTop.Title.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.Axes.DepthTop.Title.Shadow.Brush.Solid = True
-        Me.TChart2.Axes.DepthTop.Title.Shadow.Brush.Visible = True
-        Me.TChart2.Axes.DepthTop.UseMaxPixelPos = True
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Axes.Left.Labels.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart2.Axes.Left.Labels.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart2.Axes.Left.Labels.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart2.Axes.Left.Labels.Brush.Color = System.Drawing.Color.White
-        Me.TChart2.Axes.Left.Labels.Brush.Solid = True
-        Me.TChart2.Axes.Left.Labels.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart2.Axes.Left.Labels.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart2.Axes.Left.Labels.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart2.Axes.Left.Labels.Font.Brush.Solid = True
-        Me.TChart2.Axes.Left.Labels.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Axes.Left.Labels.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.Axes.Left.Labels.Font.Shadow.Brush.Solid = True
-        Me.TChart2.Axes.Left.Labels.Font.Shadow.Brush.Visible = True
-        Me.TChart2.Axes.Left.Labels.Font.Size = 9
-        Me.TChart2.Axes.Left.Labels.Font.SizeFloat = 9.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Axes.Left.Labels.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart2.Axes.Left.Labels.ImageBevel.Brush.Solid = True
-        Me.TChart2.Axes.Left.Labels.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Axes.Left.Labels.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.Axes.Left.Labels.Shadow.Brush.Solid = True
-        Me.TChart2.Axes.Left.Labels.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart2.Axes.Left.Title.Angle = 90
-        '
-        '
-        '
-        Me.TChart2.Axes.Left.Title.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart2.Axes.Left.Title.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart2.Axes.Left.Title.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart2.Axes.Left.Title.Brush.Color = System.Drawing.Color.Silver
-        Me.TChart2.Axes.Left.Title.Brush.Solid = True
-        Me.TChart2.Axes.Left.Title.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart2.Axes.Left.Title.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart2.Axes.Left.Title.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
-        Me.TChart2.Axes.Left.Title.Font.Brush.Solid = True
-        Me.TChart2.Axes.Left.Title.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Axes.Left.Title.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.Axes.Left.Title.Font.Shadow.Brush.Solid = True
-        Me.TChart2.Axes.Left.Title.Font.Shadow.Brush.Visible = True
-        Me.TChart2.Axes.Left.Title.Font.Size = 11
-        Me.TChart2.Axes.Left.Title.Font.SizeFloat = 11.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Axes.Left.Title.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart2.Axes.Left.Title.ImageBevel.Brush.Solid = True
-        Me.TChart2.Axes.Left.Title.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Axes.Left.Title.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.Axes.Left.Title.Shadow.Brush.Solid = True
-        Me.TChart2.Axes.Left.Title.Shadow.Brush.Visible = True
-        Me.TChart2.Axes.Left.UseMaxPixelPos = True
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Axes.Right.Labels.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart2.Axes.Right.Labels.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart2.Axes.Right.Labels.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart2.Axes.Right.Labels.Brush.Color = System.Drawing.Color.White
-        Me.TChart2.Axes.Right.Labels.Brush.Solid = True
-        Me.TChart2.Axes.Right.Labels.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart2.Axes.Right.Labels.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart2.Axes.Right.Labels.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart2.Axes.Right.Labels.Font.Brush.Solid = True
-        Me.TChart2.Axes.Right.Labels.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Axes.Right.Labels.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.Axes.Right.Labels.Font.Shadow.Brush.Solid = True
-        Me.TChart2.Axes.Right.Labels.Font.Shadow.Brush.Visible = True
-        Me.TChart2.Axes.Right.Labels.Font.Size = 9
-        Me.TChart2.Axes.Right.Labels.Font.SizeFloat = 9.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Axes.Right.Labels.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart2.Axes.Right.Labels.ImageBevel.Brush.Solid = True
-        Me.TChart2.Axes.Right.Labels.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Axes.Right.Labels.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.Axes.Right.Labels.Shadow.Brush.Solid = True
-        Me.TChart2.Axes.Right.Labels.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart2.Axes.Right.Title.Angle = 270
-        '
-        '
-        '
-        Me.TChart2.Axes.Right.Title.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart2.Axes.Right.Title.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart2.Axes.Right.Title.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart2.Axes.Right.Title.Brush.Color = System.Drawing.Color.Silver
-        Me.TChart2.Axes.Right.Title.Brush.Solid = True
-        Me.TChart2.Axes.Right.Title.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart2.Axes.Right.Title.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart2.Axes.Right.Title.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
-        Me.TChart2.Axes.Right.Title.Font.Brush.Solid = True
-        Me.TChart2.Axes.Right.Title.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Axes.Right.Title.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.Axes.Right.Title.Font.Shadow.Brush.Solid = True
-        Me.TChart2.Axes.Right.Title.Font.Shadow.Brush.Visible = True
-        Me.TChart2.Axes.Right.Title.Font.Size = 11
-        Me.TChart2.Axes.Right.Title.Font.SizeFloat = 11.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Axes.Right.Title.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart2.Axes.Right.Title.ImageBevel.Brush.Solid = True
-        Me.TChart2.Axes.Right.Title.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Axes.Right.Title.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.Axes.Right.Title.Shadow.Brush.Solid = True
-        Me.TChart2.Axes.Right.Title.Shadow.Brush.Visible = True
-        Me.TChart2.Axes.Right.UseMaxPixelPos = True
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Axes.Top.Labels.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart2.Axes.Top.Labels.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart2.Axes.Top.Labels.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart2.Axes.Top.Labels.Brush.Color = System.Drawing.Color.White
-        Me.TChart2.Axes.Top.Labels.Brush.Solid = True
-        Me.TChart2.Axes.Top.Labels.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart2.Axes.Top.Labels.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart2.Axes.Top.Labels.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart2.Axes.Top.Labels.Font.Brush.Solid = True
-        Me.TChart2.Axes.Top.Labels.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Axes.Top.Labels.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.Axes.Top.Labels.Font.Shadow.Brush.Solid = True
-        Me.TChart2.Axes.Top.Labels.Font.Shadow.Brush.Visible = True
-        Me.TChart2.Axes.Top.Labels.Font.Size = 9
-        Me.TChart2.Axes.Top.Labels.Font.SizeFloat = 9.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Axes.Top.Labels.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart2.Axes.Top.Labels.ImageBevel.Brush.Solid = True
-        Me.TChart2.Axes.Top.Labels.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Axes.Top.Labels.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.Axes.Top.Labels.Shadow.Brush.Solid = True
-        Me.TChart2.Axes.Top.Labels.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart2.Axes.Top.Title.Angle = 0
-        '
-        '
-        '
-        Me.TChart2.Axes.Top.Title.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart2.Axes.Top.Title.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart2.Axes.Top.Title.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart2.Axes.Top.Title.Brush.Color = System.Drawing.Color.Silver
-        Me.TChart2.Axes.Top.Title.Brush.Solid = True
-        Me.TChart2.Axes.Top.Title.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart2.Axes.Top.Title.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart2.Axes.Top.Title.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
-        Me.TChart2.Axes.Top.Title.Font.Brush.Solid = True
-        Me.TChart2.Axes.Top.Title.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Axes.Top.Title.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.Axes.Top.Title.Font.Shadow.Brush.Solid = True
-        Me.TChart2.Axes.Top.Title.Font.Shadow.Brush.Visible = True
-        Me.TChart2.Axes.Top.Title.Font.Size = 11
-        Me.TChart2.Axes.Top.Title.Font.SizeFloat = 11.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Axes.Top.Title.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart2.Axes.Top.Title.ImageBevel.Brush.Solid = True
-        Me.TChart2.Axes.Top.Title.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Axes.Top.Title.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.Axes.Top.Title.Shadow.Brush.Solid = True
-        Me.TChart2.Axes.Top.Title.Shadow.Brush.Visible = True
-        Me.TChart2.Axes.Top.UseMaxPixelPos = True
-        Me.TChart2.Cursor = System.Windows.Forms.Cursors.Default
-        Me.TChart2.Dock = System.Windows.Forms.DockStyle.Fill
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Footer.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart2.Footer.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart2.Footer.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart2.Footer.Brush.Color = System.Drawing.Color.Silver
-        Me.TChart2.Footer.Brush.Solid = True
-        Me.TChart2.Footer.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart2.Footer.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart2.Footer.Font.Brush.Color = System.Drawing.Color.Red
-        Me.TChart2.Footer.Font.Brush.Solid = True
-        Me.TChart2.Footer.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Footer.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.Footer.Font.Shadow.Brush.Solid = True
-        Me.TChart2.Footer.Font.Shadow.Brush.Visible = True
-        Me.TChart2.Footer.Font.Size = 8
-        Me.TChart2.Footer.Font.SizeFloat = 8.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Footer.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart2.Footer.ImageBevel.Brush.Solid = True
-        Me.TChart2.Footer.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Footer.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.Footer.Shadow.Brush.Solid = True
-        Me.TChart2.Footer.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Header.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart2.Header.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart2.Header.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart2.Header.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.TChart2.Header.Brush.Solid = True
-        Me.TChart2.Header.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart2.Header.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart2.Header.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart2.Header.Font.Brush.Solid = True
-        Me.TChart2.Header.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Header.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.Header.Font.Shadow.Brush.Solid = True
-        Me.TChart2.Header.Font.Shadow.Brush.Visible = True
-        Me.TChart2.Header.Font.Size = 12
-        Me.TChart2.Header.Font.SizeFloat = 12.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Header.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart2.Header.ImageBevel.Brush.Solid = True
-        Me.TChart2.Header.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Header.Shadow.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(169, Byte), Integer), CType(CType(169, Byte), Integer), CType(CType(169, Byte), Integer))
-        Me.TChart2.Header.Shadow.Brush.Solid = True
-        Me.TChart2.Header.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Legend.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart2.Legend.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart2.Legend.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart2.Legend.Brush.Color = System.Drawing.Color.White
-        Me.TChart2.Legend.Brush.Solid = True
-        Me.TChart2.Legend.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart2.Legend.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart2.Legend.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
-        Me.TChart2.Legend.Font.Brush.Solid = True
-        Me.TChart2.Legend.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Legend.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.Legend.Font.Shadow.Brush.Solid = True
-        Me.TChart2.Legend.Font.Shadow.Brush.Visible = True
-        Me.TChart2.Legend.Font.Size = 9
-        Me.TChart2.Legend.Font.SizeFloat = 9.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Legend.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart2.Legend.ImageBevel.Brush.Solid = True
-        Me.TChart2.Legend.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Legend.Shadow.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer))
-        Me.TChart2.Legend.Shadow.Brush.Solid = True
-        Me.TChart2.Legend.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Legend.Symbol.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.Legend.Symbol.Shadow.Brush.Solid = True
-        Me.TChart2.Legend.Symbol.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Legend.Title.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart2.Legend.Title.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart2.Legend.Title.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart2.Legend.Title.Brush.Color = System.Drawing.Color.White
-        Me.TChart2.Legend.Title.Brush.Solid = True
-        Me.TChart2.Legend.Title.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart2.Legend.Title.Font.Bold = True
-        '
-        '
-        '
-        Me.TChart2.Legend.Title.Font.Brush.Color = System.Drawing.Color.Black
-        Me.TChart2.Legend.Title.Font.Brush.Solid = True
-        Me.TChart2.Legend.Title.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Legend.Title.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.Legend.Title.Font.Shadow.Brush.Solid = True
-        Me.TChart2.Legend.Title.Font.Shadow.Brush.Visible = True
-        Me.TChart2.Legend.Title.Font.Size = 8
-        Me.TChart2.Legend.Title.Font.SizeFloat = 8.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Legend.Title.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart2.Legend.Title.ImageBevel.Brush.Solid = True
-        Me.TChart2.Legend.Title.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Legend.Title.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.Legend.Title.Shadow.Brush.Solid = True
-        Me.TChart2.Legend.Title.Shadow.Brush.Visible = True
-        Me.TChart2.Location = New System.Drawing.Point(0, 0)
-        Me.TChart2.Name = "TChart2"
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Panel.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart2.Panel.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart2.Panel.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart2.Panel.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart2.Panel.Brush.Solid = True
-        Me.TChart2.Panel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Panel.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart2.Panel.ImageBevel.Brush.Solid = True
-        Me.TChart2.Panel.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Panel.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.Panel.Shadow.Brush.Solid = True
-        Me.TChart2.Panel.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart2.Printer.Landscape = True
-        Margins2.Bottom = 10
-        Margins2.Left = 10
-        Margins2.Right = 10
-        Margins2.Top = 10
-        Me.TChart2.Printer.Margins = Margins2
-        Me.TChart2.Size = New System.Drawing.Size(940, 136)
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.SubFooter.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart2.SubFooter.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart2.SubFooter.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart2.SubFooter.Brush.Color = System.Drawing.Color.Silver
-        Me.TChart2.SubFooter.Brush.Solid = True
-        Me.TChart2.SubFooter.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart2.SubFooter.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart2.SubFooter.Font.Brush.Color = System.Drawing.Color.Red
-        Me.TChart2.SubFooter.Font.Brush.Solid = True
-        Me.TChart2.SubFooter.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.SubFooter.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.SubFooter.Font.Shadow.Brush.Solid = True
-        Me.TChart2.SubFooter.Font.Shadow.Brush.Visible = True
-        Me.TChart2.SubFooter.Font.Size = 8
-        Me.TChart2.SubFooter.Font.SizeFloat = 8.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.SubFooter.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart2.SubFooter.ImageBevel.Brush.Solid = True
-        Me.TChart2.SubFooter.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.SubFooter.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.SubFooter.Shadow.Brush.Solid = True
-        Me.TChart2.SubFooter.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.SubHeader.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart2.SubHeader.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart2.SubHeader.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart2.SubHeader.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.TChart2.SubHeader.Brush.Solid = True
-        Me.TChart2.SubHeader.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart2.SubHeader.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart2.SubHeader.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart2.SubHeader.Font.Brush.Solid = True
-        Me.TChart2.SubHeader.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.SubHeader.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.SubHeader.Font.Shadow.Brush.Solid = True
-        Me.TChart2.SubHeader.Font.Shadow.Brush.Visible = True
-        Me.TChart2.SubHeader.Font.Size = 12
-        Me.TChart2.SubHeader.Font.SizeFloat = 12.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.SubHeader.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart2.SubHeader.ImageBevel.Brush.Solid = True
-        Me.TChart2.SubHeader.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.SubHeader.Shadow.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(169, Byte), Integer), CType(CType(169, Byte), Integer), CType(CType(169, Byte), Integer))
-        Me.TChart2.SubHeader.Shadow.Brush.Solid = True
-        Me.TChart2.SubHeader.Shadow.Brush.Visible = True
-        Me.TChart2.TabIndex = 0
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Walls.Back.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart2.Walls.Back.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart2.Walls.Back.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart2.Walls.Back.Brush.Color = System.Drawing.Color.Silver
-        Me.TChart2.Walls.Back.Brush.Solid = True
-        Me.TChart2.Walls.Back.Brush.Visible = False
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Walls.Back.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart2.Walls.Back.ImageBevel.Brush.Solid = True
-        Me.TChart2.Walls.Back.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Walls.Back.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.Walls.Back.Shadow.Brush.Solid = True
-        Me.TChart2.Walls.Back.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Walls.Bottom.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart2.Walls.Bottom.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart2.Walls.Bottom.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart2.Walls.Bottom.Brush.Color = System.Drawing.Color.White
-        Me.TChart2.Walls.Bottom.Brush.Solid = True
-        Me.TChart2.Walls.Bottom.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Walls.Bottom.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart2.Walls.Bottom.ImageBevel.Brush.Solid = True
-        Me.TChart2.Walls.Bottom.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Walls.Bottom.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.Walls.Bottom.Shadow.Brush.Solid = True
-        Me.TChart2.Walls.Bottom.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Walls.Left.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart2.Walls.Left.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart2.Walls.Left.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart2.Walls.Left.Brush.Color = System.Drawing.Color.LightYellow
-        Me.TChart2.Walls.Left.Brush.Solid = True
-        Me.TChart2.Walls.Left.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Walls.Left.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart2.Walls.Left.ImageBevel.Brush.Solid = True
-        Me.TChart2.Walls.Left.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Walls.Left.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.Walls.Left.Shadow.Brush.Solid = True
-        Me.TChart2.Walls.Left.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Walls.Right.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart2.Walls.Right.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart2.Walls.Right.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart2.Walls.Right.Brush.Color = System.Drawing.Color.LightYellow
-        Me.TChart2.Walls.Right.Brush.Solid = True
-        Me.TChart2.Walls.Right.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Walls.Right.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart2.Walls.Right.ImageBevel.Brush.Solid = True
-        Me.TChart2.Walls.Right.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Walls.Right.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart2.Walls.Right.Shadow.Brush.Solid = True
-        Me.TChart2.Walls.Right.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart2.Zoom.Brush.Color = System.Drawing.Color.LightBlue
-        Me.TChart2.Zoom.Brush.Solid = True
-        Me.TChart2.Zoom.Brush.Visible = True
-        '
-        'TableLayoutPanel1
-        '
-        Me.TableLayoutPanel1.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.[Single]
-        Me.TableLayoutPanel1.ColumnCount = 1
-        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100.0!))
-        Me.TableLayoutPanel1.Controls.Add(Me.PanelNavigation, 0, 0)
-        Me.TableLayoutPanel1.Controls.Add(Me.TChart1, 0, 1)
-        Me.TableLayoutPanel1.Controls.Add(Me.Panel_DisplayRange, 0, 2)
-        Me.TableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.TableLayoutPanel1.Location = New System.Drawing.Point(0, 0)
-        Me.TableLayoutPanel1.Margin = New System.Windows.Forms.Padding(0)
-        Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
-        Me.TableLayoutPanel1.RowCount = 3
-        Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 38.0!))
-        Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100.0!))
-        Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 36.0!))
-        Me.TableLayoutPanel1.Size = New System.Drawing.Size(940, 458)
-        Me.TableLayoutPanel1.TabIndex = 3
-        '
-        'PanelNavigation
-        '
-        Me.PanelNavigation.Controls.Add(Me.Button_NavEnd)
-        Me.PanelNavigation.Controls.Add(Me.Button_NavStart)
-        Me.PanelNavigation.Controls.Add(Me.Label_Navigate)
-        Me.PanelNavigation.Controls.Add(Me.Button_NavForward)
-        Me.PanelNavigation.Controls.Add(Me.Button_NavBack)
-        Me.PanelNavigation.Controls.Add(Me.NumericUpDown_NavMultiplier)
-        Me.PanelNavigation.Controls.Add(Me.ComboBox_NavIncrement)
-        Me.PanelNavigation.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.PanelNavigation.Location = New System.Drawing.Point(1, 1)
-        Me.PanelNavigation.Margin = New System.Windows.Forms.Padding(0)
-        Me.PanelNavigation.Name = "PanelNavigation"
-        Me.PanelNavigation.Size = New System.Drawing.Size(938, 38)
-        Me.PanelNavigation.TabIndex = 0
-        '
-        'Button_NavEnd
-        '
-        Me.Button_NavEnd.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.Button_NavEnd.Image = Global.BlueM.Wave.My.Resources.Resources.control_end
-        Me.Button_NavEnd.Location = New System.Drawing.Point(906, 8)
-        Me.Button_NavEnd.Name = "Button_NavEnd"
-        Me.Button_NavEnd.Size = New System.Drawing.Size(23, 23)
-        Me.Button_NavEnd.TabIndex = 6
-        Me.ToolTip1.SetToolTip(Me.Button_NavEnd, "Navigate to end")
-        Me.Button_NavEnd.UseVisualStyleBackColor = True
-        '
-        'Button_NavStart
-        '
-        Me.Button_NavStart.Image = Global.BlueM.Wave.My.Resources.Resources.control_start
-        Me.Button_NavStart.Location = New System.Drawing.Point(8, 8)
-        Me.Button_NavStart.Name = "Button_NavStart"
-        Me.Button_NavStart.Size = New System.Drawing.Size(23, 23)
-        Me.Button_NavStart.TabIndex = 0
-        Me.ToolTip1.SetToolTip(Me.Button_NavStart, "Navigate to start")
-        Me.Button_NavStart.UseVisualStyleBackColor = True
-        '
-        'Label_Navigate
-        '
-        Me.Label_Navigate.Anchor = System.Windows.Forms.AnchorStyles.Top
-        Me.Label_Navigate.AutoSize = True
-        Me.Label_Navigate.Location = New System.Drawing.Point(376, 13)
-        Me.Label_Navigate.Name = "Label_Navigate"
-        Me.Label_Navigate.Size = New System.Drawing.Size(53, 13)
-        Me.Label_Navigate.TabIndex = 2
-        Me.Label_Navigate.Text = "Navigate:"
-        '
-        'Button_NavForward
-        '
-        Me.Button_NavForward.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.Button_NavForward.Image = CType(resources.GetObject("Button_NavForward.Image"), System.Drawing.Image)
-        Me.Button_NavForward.Location = New System.Drawing.Point(831, 8)
-        Me.Button_NavForward.Name = "Button_NavForward"
-        Me.Button_NavForward.Size = New System.Drawing.Size(69, 23)
-        Me.Button_NavForward.TabIndex = 5
-        Me.ToolTip1.SetToolTip(Me.Button_NavForward, "Navigate forwards")
-        Me.Button_NavForward.UseVisualStyleBackColor = True
-        '
-        'Button_NavBack
-        '
-        Me.Button_NavBack.Image = CType(resources.GetObject("Button_NavBack.Image"), System.Drawing.Image)
-        Me.Button_NavBack.Location = New System.Drawing.Point(37, 8)
-        Me.Button_NavBack.Name = "Button_NavBack"
-        Me.Button_NavBack.Size = New System.Drawing.Size(69, 23)
-        Me.Button_NavBack.TabIndex = 1
-        Me.ToolTip1.SetToolTip(Me.Button_NavBack, "Navigate backwards")
-        Me.Button_NavBack.UseVisualStyleBackColor = True
-        '
-        'NumericUpDown_NavMultiplier
-        '
-        Me.NumericUpDown_NavMultiplier.Anchor = System.Windows.Forms.AnchorStyles.Top
-        Me.NumericUpDown_NavMultiplier.Location = New System.Drawing.Point(435, 9)
-        Me.NumericUpDown_NavMultiplier.Minimum = New Decimal(New Integer() {1, 0, 0, 0})
-        Me.NumericUpDown_NavMultiplier.Name = "NumericUpDown_NavMultiplier"
-        Me.NumericUpDown_NavMultiplier.Size = New System.Drawing.Size(40, 20)
-        Me.NumericUpDown_NavMultiplier.TabIndex = 3
-        Me.NumericUpDown_NavMultiplier.Value = New Decimal(New Integer() {1, 0, 0, 0})
-        '
-        'ComboBox_NavIncrement
-        '
-        Me.ComboBox_NavIncrement.Anchor = System.Windows.Forms.AnchorStyles.Top
-        Me.ComboBox_NavIncrement.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-        Me.ComboBox_NavIncrement.FormattingEnabled = True
-        Me.ComboBox_NavIncrement.Items.AddRange(New Object() {"Centuries", "Decades", "Years", "Months", "Weeks", "Days", "Hours", "Minutes", "Seconds"})
-        Me.ComboBox_NavIncrement.Location = New System.Drawing.Point(481, 9)
-        Me.ComboBox_NavIncrement.Name = "ComboBox_NavIncrement"
-        Me.ComboBox_NavIncrement.Size = New System.Drawing.Size(81, 21)
-        Me.ComboBox_NavIncrement.TabIndex = 4
-        '
-        'TChart1
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Bottom.Labels.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Axes.Bottom.Labels.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Axes.Bottom.Labels.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Axes.Bottom.Labels.Brush.Color = System.Drawing.Color.White
-        Me.TChart1.Axes.Bottom.Labels.Brush.Solid = True
-        Me.TChart1.Axes.Bottom.Labels.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Axes.Bottom.Labels.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart1.Axes.Bottom.Labels.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Axes.Bottom.Labels.Font.Brush.Solid = True
-        Me.TChart1.Axes.Bottom.Labels.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Bottom.Labels.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Bottom.Labels.Font.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Bottom.Labels.Font.Shadow.Brush.Visible = True
-        Me.TChart1.Axes.Bottom.Labels.Font.Size = 9
-        Me.TChart1.Axes.Bottom.Labels.Font.SizeFloat = 9.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Bottom.Labels.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Axes.Bottom.Labels.ImageBevel.Brush.Solid = True
-        Me.TChart1.Axes.Bottom.Labels.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Bottom.Labels.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Bottom.Labels.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Bottom.Labels.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Axes.Bottom.Title.Angle = 0
-        '
-        '
-        '
-        Me.TChart1.Axes.Bottom.Title.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Axes.Bottom.Title.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Axes.Bottom.Title.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Axes.Bottom.Title.Brush.Color = System.Drawing.Color.Silver
-        Me.TChart1.Axes.Bottom.Title.Brush.Solid = True
-        Me.TChart1.Axes.Bottom.Title.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Axes.Bottom.Title.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart1.Axes.Bottom.Title.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
-        Me.TChart1.Axes.Bottom.Title.Font.Brush.Solid = True
-        Me.TChart1.Axes.Bottom.Title.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Bottom.Title.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Bottom.Title.Font.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Bottom.Title.Font.Shadow.Brush.Visible = True
-        Me.TChart1.Axes.Bottom.Title.Font.Size = 11
-        Me.TChart1.Axes.Bottom.Title.Font.SizeFloat = 11.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Bottom.Title.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Axes.Bottom.Title.ImageBevel.Brush.Solid = True
-        Me.TChart1.Axes.Bottom.Title.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Bottom.Title.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Bottom.Title.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Bottom.Title.Shadow.Brush.Visible = True
-        Me.TChart1.Axes.Bottom.UseMaxPixelPos = True
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Depth.Labels.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Axes.Depth.Labels.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Axes.Depth.Labels.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Axes.Depth.Labels.Brush.Color = System.Drawing.Color.White
-        Me.TChart1.Axes.Depth.Labels.Brush.Solid = True
-        Me.TChart1.Axes.Depth.Labels.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Axes.Depth.Labels.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart1.Axes.Depth.Labels.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Axes.Depth.Labels.Font.Brush.Solid = True
-        Me.TChart1.Axes.Depth.Labels.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Depth.Labels.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Depth.Labels.Font.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Depth.Labels.Font.Shadow.Brush.Visible = True
-        Me.TChart1.Axes.Depth.Labels.Font.Size = 9
-        Me.TChart1.Axes.Depth.Labels.Font.SizeFloat = 9.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Depth.Labels.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Axes.Depth.Labels.ImageBevel.Brush.Solid = True
-        Me.TChart1.Axes.Depth.Labels.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Depth.Labels.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Depth.Labels.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Depth.Labels.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Axes.Depth.Title.Angle = 0
-        '
-        '
-        '
-        Me.TChart1.Axes.Depth.Title.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Axes.Depth.Title.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Axes.Depth.Title.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Axes.Depth.Title.Brush.Color = System.Drawing.Color.Silver
-        Me.TChart1.Axes.Depth.Title.Brush.Solid = True
-        Me.TChart1.Axes.Depth.Title.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Axes.Depth.Title.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart1.Axes.Depth.Title.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
-        Me.TChart1.Axes.Depth.Title.Font.Brush.Solid = True
-        Me.TChart1.Axes.Depth.Title.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Depth.Title.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Depth.Title.Font.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Depth.Title.Font.Shadow.Brush.Visible = True
-        Me.TChart1.Axes.Depth.Title.Font.Size = 11
-        Me.TChart1.Axes.Depth.Title.Font.SizeFloat = 11.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Depth.Title.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Axes.Depth.Title.ImageBevel.Brush.Solid = True
-        Me.TChart1.Axes.Depth.Title.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Depth.Title.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Depth.Title.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Depth.Title.Shadow.Brush.Visible = True
-        Me.TChart1.Axes.Depth.UseMaxPixelPos = True
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.DepthTop.Labels.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Axes.DepthTop.Labels.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Axes.DepthTop.Labels.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Axes.DepthTop.Labels.Brush.Color = System.Drawing.Color.White
-        Me.TChart1.Axes.DepthTop.Labels.Brush.Solid = True
-        Me.TChart1.Axes.DepthTop.Labels.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Axes.DepthTop.Labels.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart1.Axes.DepthTop.Labels.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Axes.DepthTop.Labels.Font.Brush.Solid = True
-        Me.TChart1.Axes.DepthTop.Labels.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.DepthTop.Labels.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.DepthTop.Labels.Font.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.DepthTop.Labels.Font.Shadow.Brush.Visible = True
-        Me.TChart1.Axes.DepthTop.Labels.Font.Size = 9
-        Me.TChart1.Axes.DepthTop.Labels.Font.SizeFloat = 9.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.DepthTop.Labels.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Axes.DepthTop.Labels.ImageBevel.Brush.Solid = True
-        Me.TChart1.Axes.DepthTop.Labels.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.DepthTop.Labels.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.DepthTop.Labels.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.DepthTop.Labels.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Axes.DepthTop.Title.Angle = 0
-        '
-        '
-        '
-        Me.TChart1.Axes.DepthTop.Title.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Axes.DepthTop.Title.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Axes.DepthTop.Title.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Axes.DepthTop.Title.Brush.Color = System.Drawing.Color.Silver
-        Me.TChart1.Axes.DepthTop.Title.Brush.Solid = True
-        Me.TChart1.Axes.DepthTop.Title.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Axes.DepthTop.Title.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart1.Axes.DepthTop.Title.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
-        Me.TChart1.Axes.DepthTop.Title.Font.Brush.Solid = True
-        Me.TChart1.Axes.DepthTop.Title.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.DepthTop.Title.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.DepthTop.Title.Font.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.DepthTop.Title.Font.Shadow.Brush.Visible = True
-        Me.TChart1.Axes.DepthTop.Title.Font.Size = 11
-        Me.TChart1.Axes.DepthTop.Title.Font.SizeFloat = 11.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.DepthTop.Title.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Axes.DepthTop.Title.ImageBevel.Brush.Solid = True
-        Me.TChart1.Axes.DepthTop.Title.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.DepthTop.Title.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.DepthTop.Title.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.DepthTop.Title.Shadow.Brush.Visible = True
-        Me.TChart1.Axes.DepthTop.UseMaxPixelPos = True
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Left.Labels.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Axes.Left.Labels.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Axes.Left.Labels.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Axes.Left.Labels.Brush.Color = System.Drawing.Color.White
-        Me.TChart1.Axes.Left.Labels.Brush.Solid = True
-        Me.TChart1.Axes.Left.Labels.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Axes.Left.Labels.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart1.Axes.Left.Labels.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Axes.Left.Labels.Font.Brush.Solid = True
-        Me.TChart1.Axes.Left.Labels.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Left.Labels.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Left.Labels.Font.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Left.Labels.Font.Shadow.Brush.Visible = True
-        Me.TChart1.Axes.Left.Labels.Font.Size = 9
-        Me.TChart1.Axes.Left.Labels.Font.SizeFloat = 9.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Left.Labels.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Axes.Left.Labels.ImageBevel.Brush.Solid = True
-        Me.TChart1.Axes.Left.Labels.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Left.Labels.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Left.Labels.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Left.Labels.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Axes.Left.Title.Angle = 90
-        '
-        '
-        '
-        Me.TChart1.Axes.Left.Title.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Axes.Left.Title.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Axes.Left.Title.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Axes.Left.Title.Brush.Color = System.Drawing.Color.Silver
-        Me.TChart1.Axes.Left.Title.Brush.Solid = True
-        Me.TChart1.Axes.Left.Title.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Axes.Left.Title.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart1.Axes.Left.Title.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
-        Me.TChart1.Axes.Left.Title.Font.Brush.Solid = True
-        Me.TChart1.Axes.Left.Title.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Left.Title.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Left.Title.Font.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Left.Title.Font.Shadow.Brush.Visible = True
-        Me.TChart1.Axes.Left.Title.Font.Size = 11
-        Me.TChart1.Axes.Left.Title.Font.SizeFloat = 11.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Left.Title.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Axes.Left.Title.ImageBevel.Brush.Solid = True
-        Me.TChart1.Axes.Left.Title.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Left.Title.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Left.Title.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Left.Title.Shadow.Brush.Visible = True
-        Me.TChart1.Axes.Left.UseMaxPixelPos = True
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Right.Labels.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Axes.Right.Labels.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Axes.Right.Labels.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Axes.Right.Labels.Brush.Color = System.Drawing.Color.White
-        Me.TChart1.Axes.Right.Labels.Brush.Solid = True
-        Me.TChart1.Axes.Right.Labels.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Axes.Right.Labels.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart1.Axes.Right.Labels.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Axes.Right.Labels.Font.Brush.Solid = True
-        Me.TChart1.Axes.Right.Labels.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Right.Labels.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Right.Labels.Font.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Right.Labels.Font.Shadow.Brush.Visible = True
-        Me.TChart1.Axes.Right.Labels.Font.Size = 9
-        Me.TChart1.Axes.Right.Labels.Font.SizeFloat = 9.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Right.Labels.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Axes.Right.Labels.ImageBevel.Brush.Solid = True
-        Me.TChart1.Axes.Right.Labels.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Right.Labels.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Right.Labels.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Right.Labels.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Axes.Right.Title.Angle = 270
-        '
-        '
-        '
-        Me.TChart1.Axes.Right.Title.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Axes.Right.Title.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Axes.Right.Title.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Axes.Right.Title.Brush.Color = System.Drawing.Color.Silver
-        Me.TChart1.Axes.Right.Title.Brush.Solid = True
-        Me.TChart1.Axes.Right.Title.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Axes.Right.Title.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart1.Axes.Right.Title.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
-        Me.TChart1.Axes.Right.Title.Font.Brush.Solid = True
-        Me.TChart1.Axes.Right.Title.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Right.Title.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Right.Title.Font.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Right.Title.Font.Shadow.Brush.Visible = True
-        Me.TChart1.Axes.Right.Title.Font.Size = 11
-        Me.TChart1.Axes.Right.Title.Font.SizeFloat = 11.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Right.Title.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Axes.Right.Title.ImageBevel.Brush.Solid = True
-        Me.TChart1.Axes.Right.Title.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Right.Title.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Right.Title.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Right.Title.Shadow.Brush.Visible = True
-        Me.TChart1.Axes.Right.UseMaxPixelPos = True
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Top.Labels.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Axes.Top.Labels.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Axes.Top.Labels.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Axes.Top.Labels.Brush.Color = System.Drawing.Color.White
-        Me.TChart1.Axes.Top.Labels.Brush.Solid = True
-        Me.TChart1.Axes.Top.Labels.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Axes.Top.Labels.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart1.Axes.Top.Labels.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Axes.Top.Labels.Font.Brush.Solid = True
-        Me.TChart1.Axes.Top.Labels.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Top.Labels.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Top.Labels.Font.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Top.Labels.Font.Shadow.Brush.Visible = True
-        Me.TChart1.Axes.Top.Labels.Font.Size = 9
-        Me.TChart1.Axes.Top.Labels.Font.SizeFloat = 9.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Top.Labels.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Axes.Top.Labels.ImageBevel.Brush.Solid = True
-        Me.TChart1.Axes.Top.Labels.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Top.Labels.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Top.Labels.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Top.Labels.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Axes.Top.Title.Angle = 0
-        '
-        '
-        '
-        Me.TChart1.Axes.Top.Title.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Axes.Top.Title.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Axes.Top.Title.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Axes.Top.Title.Brush.Color = System.Drawing.Color.Silver
-        Me.TChart1.Axes.Top.Title.Brush.Solid = True
-        Me.TChart1.Axes.Top.Title.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Axes.Top.Title.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart1.Axes.Top.Title.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
-        Me.TChart1.Axes.Top.Title.Font.Brush.Solid = True
-        Me.TChart1.Axes.Top.Title.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Top.Title.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Top.Title.Font.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Top.Title.Font.Shadow.Brush.Visible = True
-        Me.TChart1.Axes.Top.Title.Font.Size = 11
-        Me.TChart1.Axes.Top.Title.Font.SizeFloat = 11.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Top.Title.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Axes.Top.Title.ImageBevel.Brush.Solid = True
-        Me.TChart1.Axes.Top.Title.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Axes.Top.Title.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Axes.Top.Title.Shadow.Brush.Solid = True
-        Me.TChart1.Axes.Top.Title.Shadow.Brush.Visible = True
-        Me.TChart1.Axes.Top.UseMaxPixelPos = True
-        Me.TChart1.Dock = System.Windows.Forms.DockStyle.Fill
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Footer.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Footer.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Footer.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Footer.Brush.Color = System.Drawing.Color.Silver
-        Me.TChart1.Footer.Brush.Solid = True
-        Me.TChart1.Footer.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Footer.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart1.Footer.Font.Brush.Color = System.Drawing.Color.Red
-        Me.TChart1.Footer.Font.Brush.Solid = True
-        Me.TChart1.Footer.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Footer.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Footer.Font.Shadow.Brush.Solid = True
-        Me.TChart1.Footer.Font.Shadow.Brush.Visible = True
-        Me.TChart1.Footer.Font.Size = 8
-        Me.TChart1.Footer.Font.SizeFloat = 8.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Footer.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Footer.ImageBevel.Brush.Solid = True
-        Me.TChart1.Footer.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Footer.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Footer.Shadow.Brush.Solid = True
-        Me.TChart1.Footer.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Header.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Header.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Header.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Header.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.TChart1.Header.Brush.Solid = True
-        Me.TChart1.Header.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Header.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart1.Header.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Header.Font.Brush.Solid = True
-        Me.TChart1.Header.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Header.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Header.Font.Shadow.Brush.Solid = True
-        Me.TChart1.Header.Font.Shadow.Brush.Visible = True
-        Me.TChart1.Header.Font.Size = 12
-        Me.TChart1.Header.Font.SizeFloat = 12.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Header.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Header.ImageBevel.Brush.Solid = True
-        Me.TChart1.Header.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Header.Shadow.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(169, Byte), Integer), CType(CType(169, Byte), Integer), CType(CType(169, Byte), Integer))
-        Me.TChart1.Header.Shadow.Brush.Solid = True
-        Me.TChart1.Header.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Legend.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Legend.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Legend.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Legend.Brush.Color = System.Drawing.Color.White
-        Me.TChart1.Legend.Brush.Solid = True
-        Me.TChart1.Legend.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Legend.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart1.Legend.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
-        Me.TChart1.Legend.Font.Brush.Solid = True
-        Me.TChart1.Legend.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Legend.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Legend.Font.Shadow.Brush.Solid = True
-        Me.TChart1.Legend.Font.Shadow.Brush.Visible = True
-        Me.TChart1.Legend.Font.Size = 9
-        Me.TChart1.Legend.Font.SizeFloat = 9.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Legend.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Legend.ImageBevel.Brush.Solid = True
-        Me.TChart1.Legend.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Legend.Shadow.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer))
-        Me.TChart1.Legend.Shadow.Brush.Solid = True
-        Me.TChart1.Legend.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Legend.Symbol.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Legend.Symbol.Shadow.Brush.Solid = True
-        Me.TChart1.Legend.Symbol.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Legend.Title.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Legend.Title.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Legend.Title.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Legend.Title.Brush.Color = System.Drawing.Color.White
-        Me.TChart1.Legend.Title.Brush.Solid = True
-        Me.TChart1.Legend.Title.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Legend.Title.Font.Bold = True
-        '
-        '
-        '
-        Me.TChart1.Legend.Title.Font.Brush.Color = System.Drawing.Color.Black
-        Me.TChart1.Legend.Title.Font.Brush.Solid = True
-        Me.TChart1.Legend.Title.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Legend.Title.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Legend.Title.Font.Shadow.Brush.Solid = True
-        Me.TChart1.Legend.Title.Font.Shadow.Brush.Visible = True
-        Me.TChart1.Legend.Title.Font.Size = 8
-        Me.TChart1.Legend.Title.Font.SizeFloat = 8.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Legend.Title.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Legend.Title.ImageBevel.Brush.Solid = True
-        Me.TChart1.Legend.Title.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Legend.Title.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Legend.Title.Shadow.Brush.Solid = True
-        Me.TChart1.Legend.Title.Shadow.Brush.Visible = True
-        Me.TChart1.Location = New System.Drawing.Point(1, 40)
-        Me.TChart1.Margin = New System.Windows.Forms.Padding(0)
-        Me.TChart1.Name = "TChart1"
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Panel.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Panel.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Panel.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Panel.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Panel.Brush.Solid = True
-        Me.TChart1.Panel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Panel.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Panel.ImageBevel.Brush.Solid = True
-        Me.TChart1.Panel.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Panel.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Panel.Shadow.Brush.Solid = True
-        Me.TChart1.Panel.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.Printer.Landscape = True
-        Margins3.Bottom = 10
-        Margins3.Left = 10
-        Margins3.Right = 10
-        Margins3.Top = 10
-        Me.TChart1.Printer.Margins = Margins3
-        Me.TChart1.Size = New System.Drawing.Size(938, 380)
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.SubFooter.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.SubFooter.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.SubFooter.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.SubFooter.Brush.Color = System.Drawing.Color.Silver
-        Me.TChart1.SubFooter.Brush.Solid = True
-        Me.TChart1.SubFooter.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.SubFooter.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart1.SubFooter.Font.Brush.Color = System.Drawing.Color.Red
-        Me.TChart1.SubFooter.Font.Brush.Solid = True
-        Me.TChart1.SubFooter.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.SubFooter.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.SubFooter.Font.Shadow.Brush.Solid = True
-        Me.TChart1.SubFooter.Font.Shadow.Brush.Visible = True
-        Me.TChart1.SubFooter.Font.Size = 8
-        Me.TChart1.SubFooter.Font.SizeFloat = 8.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.SubFooter.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.SubFooter.ImageBevel.Brush.Solid = True
-        Me.TChart1.SubFooter.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.SubFooter.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.SubFooter.Shadow.Brush.Solid = True
-        Me.TChart1.SubFooter.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.SubHeader.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.SubHeader.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.SubHeader.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.SubHeader.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.TChart1.SubHeader.Brush.Solid = True
-        Me.TChart1.SubHeader.Brush.Visible = True
-        '
-        '
-        '
-        Me.TChart1.SubHeader.Font.Bold = False
-        '
-        '
-        '
-        Me.TChart1.SubHeader.Font.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.SubHeader.Font.Brush.Solid = True
-        Me.TChart1.SubHeader.Font.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.SubHeader.Font.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.SubHeader.Font.Shadow.Brush.Solid = True
-        Me.TChart1.SubHeader.Font.Shadow.Brush.Visible = True
-        Me.TChart1.SubHeader.Font.Size = 12
-        Me.TChart1.SubHeader.Font.SizeFloat = 12.0!
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.SubHeader.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.SubHeader.ImageBevel.Brush.Solid = True
-        Me.TChart1.SubHeader.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.SubHeader.Shadow.Brush.Color = System.Drawing.Color.FromArgb(CType(CType(169, Byte), Integer), CType(CType(169, Byte), Integer), CType(CType(169, Byte), Integer))
-        Me.TChart1.SubHeader.Shadow.Brush.Solid = True
-        Me.TChart1.SubHeader.Shadow.Brush.Visible = True
-        Me.TChart1.TabIndex = 1
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Walls.Back.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Walls.Back.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Walls.Back.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Walls.Back.Brush.Color = System.Drawing.Color.Silver
-        Me.TChart1.Walls.Back.Brush.Solid = True
-        Me.TChart1.Walls.Back.Brush.Visible = False
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Walls.Back.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Walls.Back.ImageBevel.Brush.Solid = True
-        Me.TChart1.Walls.Back.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Walls.Back.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Walls.Back.Shadow.Brush.Solid = True
-        Me.TChart1.Walls.Back.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Walls.Bottom.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Walls.Bottom.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Walls.Bottom.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Walls.Bottom.Brush.Color = System.Drawing.Color.White
-        Me.TChart1.Walls.Bottom.Brush.Solid = True
-        Me.TChart1.Walls.Bottom.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Walls.Bottom.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Walls.Bottom.ImageBevel.Brush.Solid = True
-        Me.TChart1.Walls.Bottom.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Walls.Bottom.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Walls.Bottom.Shadow.Brush.Solid = True
-        Me.TChart1.Walls.Bottom.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Walls.Left.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Walls.Left.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Walls.Left.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Walls.Left.Brush.Color = System.Drawing.Color.LightYellow
-        Me.TChart1.Walls.Left.Brush.Solid = True
-        Me.TChart1.Walls.Left.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Walls.Left.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Walls.Left.ImageBevel.Brush.Solid = True
-        Me.TChart1.Walls.Left.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Walls.Left.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Walls.Left.Shadow.Brush.Solid = True
-        Me.TChart1.Walls.Left.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Walls.Right.Bevel.ColorOne = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.TChart1.Walls.Right.Bevel.ColorTwo = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.TChart1.Walls.Right.Bevel.Outer = Steema.TeeChart.Drawing.BevelStyles.None
-        '
-        '
-        '
-        Me.TChart1.Walls.Right.Brush.Color = System.Drawing.Color.LightYellow
-        Me.TChart1.Walls.Right.Brush.Solid = True
-        Me.TChart1.Walls.Right.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Walls.Right.ImageBevel.Brush.Color = System.Drawing.Color.LightGray
-        Me.TChart1.Walls.Right.ImageBevel.Brush.Solid = True
-        Me.TChart1.Walls.Right.ImageBevel.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Walls.Right.Shadow.Brush.Color = System.Drawing.Color.DarkGray
-        Me.TChart1.Walls.Right.Shadow.Brush.Solid = True
-        Me.TChart1.Walls.Right.Shadow.Brush.Visible = True
-        '
-        '
-        '
-        '
-        '
-        '
-        Me.TChart1.Zoom.Brush.Color = System.Drawing.Color.LightBlue
-        Me.TChart1.Zoom.Brush.Solid = True
-        Me.TChart1.Zoom.Brush.Visible = True
-        '
-        'Panel_DisplayRange
-        '
-        Me.Panel_DisplayRange.Controls.Add(Me.Label_Display)
-        Me.Panel_DisplayRange.Controls.Add(Me.NumericUpDown_DisplayRangeMultiplier)
-        Me.Panel_DisplayRange.Controls.Add(Me.ComboBox_DisplayRangeUnit)
-        Me.Panel_DisplayRange.Controls.Add(Me.MaskedTextBox_NavEnd)
-        Me.Panel_DisplayRange.Controls.Add(Me.MaskedTextBox_NavStart)
-        Me.Panel_DisplayRange.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.Panel_DisplayRange.Location = New System.Drawing.Point(1, 421)
-        Me.Panel_DisplayRange.Margin = New System.Windows.Forms.Padding(0)
-        Me.Panel_DisplayRange.Name = "Panel_DisplayRange"
-        Me.Panel_DisplayRange.Size = New System.Drawing.Size(938, 36)
-        Me.Panel_DisplayRange.TabIndex = 2
-        '
-        'Label_Display
-        '
-        Me.Label_Display.Anchor = System.Windows.Forms.AnchorStyles.Top
-        Me.Label_Display.AutoSize = True
-        Me.Label_Display.Location = New System.Drawing.Point(381, 12)
-        Me.Label_Display.Name = "Label_Display"
-        Me.Label_Display.Size = New System.Drawing.Size(44, 13)
-        Me.Label_Display.TabIndex = 1
-        Me.Label_Display.Text = "Display:"
-        '
-        'NumericUpDown_DisplayRangeMultiplier
-        '
-        Me.NumericUpDown_DisplayRangeMultiplier.Anchor = System.Windows.Forms.AnchorStyles.Top
-        Me.NumericUpDown_DisplayRangeMultiplier.Location = New System.Drawing.Point(431, 8)
-        Me.NumericUpDown_DisplayRangeMultiplier.Minimum = New Decimal(New Integer() {1, 0, 0, 0})
-        Me.NumericUpDown_DisplayRangeMultiplier.Name = "NumericUpDown_DisplayRangeMultiplier"
-        Me.NumericUpDown_DisplayRangeMultiplier.Size = New System.Drawing.Size(40, 20)
-        Me.NumericUpDown_DisplayRangeMultiplier.TabIndex = 2
-        Me.NumericUpDown_DisplayRangeMultiplier.Value = New Decimal(New Integer() {1, 0, 0, 0})
-        '
-        'ComboBox_DisplayRangeUnit
-        '
-        Me.ComboBox_DisplayRangeUnit.Anchor = System.Windows.Forms.AnchorStyles.Top
-        Me.ComboBox_DisplayRangeUnit.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-        Me.ComboBox_DisplayRangeUnit.FormattingEnabled = True
-        Me.ComboBox_DisplayRangeUnit.Items.AddRange(New Object() {"", "Centuries", "Decades", "Years", "Months", "Weeks", "Days", "Hours", "Minutes", "Seconds"})
-        Me.ComboBox_DisplayRangeUnit.Location = New System.Drawing.Point(477, 8)
-        Me.ComboBox_DisplayRangeUnit.Name = "ComboBox_DisplayRangeUnit"
-        Me.ComboBox_DisplayRangeUnit.Size = New System.Drawing.Size(81, 21)
-        Me.ComboBox_DisplayRangeUnit.TabIndex = 3
-        '
-        'MaskedTextBox_NavEnd
-        '
-        Me.MaskedTextBox_NavEnd.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.MaskedTextBox_NavEnd.Culture = New System.Globalization.CultureInfo("")
-        Me.MaskedTextBox_NavEnd.Location = New System.Drawing.Point(829, 8)
-        Me.MaskedTextBox_NavEnd.Name = "MaskedTextBox_NavEnd"
-        Me.MaskedTextBox_NavEnd.Size = New System.Drawing.Size(100, 20)
-        Me.MaskedTextBox_NavEnd.TabIndex = 4
-        Me.MaskedTextBox_NavEnd.ValidatingType = GetType(Date)
-        '
-        'MaskedTextBox_NavStart
-        '
-        Me.MaskedTextBox_NavStart.Culture = New System.Globalization.CultureInfo("")
-        Me.MaskedTextBox_NavStart.Location = New System.Drawing.Point(8, 8)
-        Me.MaskedTextBox_NavStart.Name = "MaskedTextBox_NavStart"
-        Me.MaskedTextBox_NavStart.Size = New System.Drawing.Size(100, 20)
-        Me.MaskedTextBox_NavStart.TabIndex = 0
-        Me.MaskedTextBox_NavStart.ValidatingType = GetType(Date)
-        '
-        'ProgressBar1
-        '
-        Me.ProgressBar1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.ProgressBar1.Enabled = False
-        Me.ProgressBar1.Location = New System.Drawing.Point(832, 641)
-        Me.ProgressBar1.Name = "ProgressBar1"
-        Me.ProgressBar1.Size = New System.Drawing.Size(108, 16)
-        Me.ProgressBar1.Step = 1
-        Me.ProgressBar1.TabIndex = 2
-        '
-        'MainWindow
+        'MainWindow
         '
         Me.AllowDrop = True
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.BackColor = System.Drawing.SystemColors.Control
         Me.ClientSize = New System.Drawing.Size(944, 661)
+        Me.Controls.Add(Me.SplitContainer2)
         Me.Controls.Add(Me.ProgressBar1)
         Me.Controls.Add(ToolStrip1)
-        Me.Controls.Add(Me.SplitContainer1)
         Me.Controls.Add(StatusStrip1)
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
         Me.KeyPreview = True
@@ -3315,6 +996,13 @@ Partial Class MainWindow
         Me.Panel_DisplayRange.ResumeLayout(False)
         Me.Panel_DisplayRange.PerformLayout()
         CType(Me.NumericUpDown_DisplayRangeMultiplier, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.SplitContainer2.Panel1.ResumeLayout(False)
+        Me.SplitContainer2.Panel1.PerformLayout()
+        Me.SplitContainer2.Panel2.ResumeLayout(False)
+        CType(Me.SplitContainer2, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.SplitContainer2.ResumeLayout(False)
+        Me.ToolStrip2.ResumeLayout(False)
+        Me.ToolStrip2.PerformLayout()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -3326,11 +1014,9 @@ Partial Class MainWindow
 
     Friend WithEvents OpenFileDialog1 As System.Windows.Forms.OpenFileDialog
     Friend WithEvents SplitContainer1 As System.Windows.Forms.SplitContainer
-    Friend WithEvents TChart2 As Steema.TeeChart.TChart
     Friend WithEvents ToolStripButton_New As System.Windows.Forms.ToolStripButton
     Friend WithEvents ToolStripDropDownButton_Open As System.Windows.Forms.ToolStripDropDownButton
     Friend WithEvents ToolStripDropDownButton_Save As System.Windows.Forms.ToolStripDropDownButton
-    Friend WithEvents ToolStripButton_Print As System.Windows.Forms.ToolStripButton
     Friend WithEvents ToolStripButton_Copy As System.Windows.Forms.ToolStripButton
     Friend WithEvents ToolStripButton_EditChart As System.Windows.Forms.ToolStripButton
     Friend WithEvents ToolStripButton_ToggleOverview As System.Windows.Forms.ToolStripButton
@@ -3343,7 +1029,6 @@ Partial Class MainWindow
     Friend WithEvents ToolStripMenuItem_About As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents ToolStripMenuItem_ImportSeries As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents ToolStripMenuItem_LoadTEN As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents ToolStripMenuItem_SaveChart As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents ToolStripMenuItem_ExportSeries As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents ToolStripMenuItem_ReloadFromFiles As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents ToolStripMenuItem_EnterSeries As System.Windows.Forms.ToolStripMenuItem
@@ -3353,7 +1038,6 @@ Partial Class MainWindow
     Friend WithEvents ComboBox_DisplayRangeUnit As System.Windows.Forms.ComboBox
     Friend WithEvents MaskedTextBox_NavEnd As System.Windows.Forms.MaskedTextBox
     Friend WithEvents MaskedTextBox_NavStart As System.Windows.Forms.MaskedTextBox
-    Friend WithEvents TChart1 As Steema.TeeChart.TChart
     Friend WithEvents PanelNavigation As System.Windows.Forms.Panel
     Friend WithEvents NumericUpDown_NavMultiplier As System.Windows.Forms.NumericUpDown
     Friend WithEvents ComboBox_NavIncrement As System.Windows.Forms.ComboBox
@@ -3377,7 +1061,6 @@ Partial Class MainWindow
     Friend WithEvents ToolStripButton_AutoAdjustYAxes As System.Windows.Forms.ToolStripButton
     Friend WithEvents ToolStripButton_RemoveNaNValues As System.Windows.Forms.ToolStripButton
     Friend WithEvents ToolStripMenuItem_Changelog As ToolStripMenuItem
-    Friend WithEvents ToolStripButton_AxisDialog As ToolStripButton
     Friend WithEvents ToolStripMenuItem_PasteFromClipboard As ToolStripMenuItem
     Friend WithEvents ToolStripSeparator10 As ToolStripSeparator
     Friend WithEvents ToolStripStatusLabel_Errors As ToolStripStatusLabel
@@ -3394,11 +1077,24 @@ Partial Class MainWindow
     Friend WithEvents ToolStripMenuItem_ColorPaletteWheel As ToolStripMenuItem
     Friend WithEvents ToolStripMenuItem_ColorPaletteRandom As ToolStripMenuItem
     Friend WithEvents ToolStripSeparator11 As ToolStripSeparator
-    Friend WithEvents ToolStripDropDownButton_ActivateAllSeries As ToolStripDropDownButton
-    Friend WithEvents ToolStripMenuItem_ActivateAllSeries As ToolStripMenuItem
-    Friend WithEvents ToolStripMenuItem_DeactivateAllSeries As ToolStripMenuItem
     Friend WithEvents ProgressBar1 As ProgressBar
     Friend WithEvents Button_NavStart As Button
     Friend WithEvents Button_NavEnd As Button
     Friend WithEvents ToolTip1 As ToolTip
+    Friend WithEvents MainPlot As ScottPlot.FormsPlot
+    Friend WithEvents OverviewPlot As ScottPlot.FormsPlot
+    Friend WithEvents SplitContainer2 As SplitContainer
+    Friend WithEvents CheckedListBox_Series As CheckedListBox
+    Friend WithEvents ToolStrip2 As ToolStrip
+    Friend WithEvents ToolStripDropDownButton1 As ToolStripDropDownButton
+    Friend WithEvents ToolStripMenuItem_ActivateAllSeries As ToolStripMenuItem
+    Friend WithEvents ToolStripMenuItem_DeactivateAllSeries As ToolStripMenuItem
+    Friend WithEvents ToolStripButton_MoveUp As ToolStripButton
+    Friend WithEvents ToolStripButton_MoveDown As ToolStripButton
+    Friend WithEvents ToolStripButton_Delete As ToolStripButton
+    Friend WithEvents ToolStripSeparator12 As ToolStripSeparator
+    Friend WithEvents ToolStripSeparator13 As ToolStripSeparator
+    Friend WithEvents ToolStripMenuItem_ColorPaletteCategory10 As ToolStripMenuItem
+    Friend WithEvents ToolStripMenuItem_ColorPaletteCategory20 As ToolStripMenuItem
+    Friend WithEvents ToolStripMenuItem_SaveImage As ToolStripMenuItem
 End Class
diff --git a/source/Views/MainWindow.resx b/source/Views/MainWindow.resx
index 9ab2fe8f..b4fed811 100644
--- a/source/Views/MainWindow.resx
+++ b/source/Views/MainWindow.resx
@@ -138,12 +138,6 @@
   <metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>120, 3</value>
   </metadata>
-  <metadata name="ToolStripSeparator4.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-  <metadata name="ToolStripSeparator3.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="ToolStripButton_New.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -178,12 +172,6 @@
         g6eHO+A/lyD8ARfG3mk9fv1YAAAAAElFTkSuQmCC
 </value>
   </data>
-  <metadata name="ToolStripSeparator6.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-  <metadata name="ToolStripSeparator5.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
   <data name="ToolStripDropDownButton_Save.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -215,21 +203,6 @@
         zjLzOUEwEsMf+sLI2zmaOou/93pPGoM5zvk7UU7fnBKxSBPoT7SXBNW1F/9Io2lKCNTCeomUyrS8xnBA
         wfUqyf1eP5U1ptJD/o1LzeNCsHPydtqdr6k4aiwvOHvNSya3ibU/QIdrEkvfhJislc32MfYfuV1eUGPw
         FF7bIVJVZ0N/soPK421UHGstlFvYd/hWecF/Qqf7CR0A5wwgSQA2AAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="ToolStripButton_Print.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIpSURBVDhPtZL/T1JRGMb5p1itrVZbbRpqZbawnBENV1I0
-        jGlByTSyJTXJwq2oKZQb1KAv6JCYWSxvBrkkZUq4CeQEiRABFeLL072Xa0zRra31bO8v57zP5znnPYf1
-        X+TxhWF6O7VtGYcnwbSWijKPOLzYrPSvLPwLS3huGUMlT7o9wGD9grVUBj+icdid03S9tDmgNxNwTgVQ
-        J+rA8XNtWwM+uuZATMwxmQVRycuJFNyzIRitDlScugKzjSgFRGJJaIwEsrk8AsHIhnSL/Ssck37UNipQ
-        I5DjtuYV7uksRYhr2kebhx2eP6nrycFIEh5fBA/1Nvru8q5+PDaOovK0rABwfwugWzcErfkzHhjsePL6
-        E7q1VrTdNUDcrgGvSYlDZHN5XTNOnL8BVe8AJAoNDtZfLgDu9L1BPJmikzcrk81hlRwodZJwdBXziwnI
-        OrVoaOkiT8C8hKLHBPO7CbywOaE1jeC+bhAd6meQdvZC1KoG/5IS3MZ2HObLUHZSggvkWq3wOvbWiAqA
-        VpWeyStVfCUNf3AZ4zNhfHCFMEDMgye+hYr6FrDLzxQAUuVTpr0ocn74mchg5vsKRt1RcHp2Qv9+kZ78
-        UcE17KkWFgHNN/uQzgBkGKLJPBZiecyGchjzrmFwPIF++xJUbDbUQzEacIArLpopSRSP4CUN1Obf1Abz
-        uqob5KjiXwWH/GVl5HPt5zZh37GL2H1EiF1VZ7GDI6CNW5r/TSzWbwHYL0mKJ5czAAAAAElFTkSuQmCC
 </value>
   </data>
   <metadata name="ToolStripSeparator3.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -253,19 +226,19 @@
   <data name="ToolStripButton_ZoomNext.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAK8SURBVDhPjZFfTFJRHMfZerHWQ2v9e6jlfLrWQ5nN25xG
-        rUJk6S2DFBWUGVKYc05zuTBJgRpO0TIR3bokXhRpMnM2MpREkQq5uFq5tRZCW9RYq8CXHtivi1zHmq76
-        bOflnN/n9z3ndxhruI2lqGdIaCGHykL24dyo3ZgTdeKCkKuv0OLqvoDSZRvjNQrE3kFR0GMQkm59sWwB
-        5yNOXQHi6uPKXDoeOactDDo058R0+Z/EkuNyicrjC6eSy2Eu6Y/UeAORq4v+n3mv/T9SHJ2YalaDBafb
-        OOtv4jEKLbHkBV8YIf3hK9Rq9AbCDWRgpd7rj9RSjUq8vu/JMx0YOXWbY6G1BKSxLOTWF8kWP4ULKPl6
-        XI7UxWTWNROkSXCgbnR6SsmRWZV5IVpLYB/KiS7o+AiVVLWWuvaEk9UEFLeMA8LvBWszC5lWM6O0lsBO
-        sKKxgXn9YUl2LQGZtYOQUTUAR8QPgHfTAl1mN2ANZtjD1sCUaoMGTrwk5OrhyjyBFTZabYCeMRK6Rz2r
-        YqfJDfVdNlAPuIAlJSAJVQKtJZjXci3z3TwyNqg0Mb4q12gmoUpthUrVExDdGgdJ6wS06hyQJdQDY6f0
-        F63GcWjy0bn7WPB5B6ZKFfRD58graDe+oFLn4Q7uBCnVpKXXAezLBOw7VAejNVl8Wk1gV+eLHdQ/p3C1
-        sPfsXdjF0sC2422QWY6DXDsDrEsGQJgt8HGuHWytGIxVoLtpNcG0ioNOKjgWq5IVig3LpmBGNx+VwynR
-        Qzh4ogm+vDXA1yUC3j+Tgzk3O2rcqMk69jeGNiXfgJmOIvA5NRB8o4dl1z142S8C1Rnkw+PK9C105d95
-        JM0S2BTnYWmiCd5NNMNs10UwS9K+jfAObKVL/o1JnCEgStPhqZwNw+XoZ4KfvoM++n9MFce29xUdVuBl
-        zKT4DoPxGz/xlyzmeBdoAAAAAElFTkSuQmCC
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAK8SURBVDhPjZFfTFJRHMfZerHWQ2v9e6jlfLrWQ5nN25yG
+        rWKMpbcMUlRQZkhhzjnN5cIkBWo0RctEdOuSeK8iTWbORoaSKFIhF1crt9ZCaIsaaxX40gP7dZHrWNNV
+        n+28nPP7/L7n/A5rDQ9ZhnqHxFZqqDzsGM6LOUh2zIWLwu6+Iqu7+zzKlG2MjxRJfYOSkNckpjzGEsUC
+        LkRchkLE3cdXuA0Cak5fFHLqzkqZ8j+JJyfkUo3XH0mnliN8KhCt9QWjVxYDP/NfB36kOTsxzawOC03f
+        4a2/iZcUW+PJC/4IQgUil+nV5AtGGqngSoMvEK2jG5X6/N9TZzowauoWz8poSSiyPOwxFisWP0UKafla
+        Qo7Wx2XOVTNkyHCgb3RqSs1T2NT5YUZL4hhixxYMQoROql5LXXvCiRoCSlrHARH2gq2Fg0xr2TFGS+Ig
+        6GnTA/MFIrLcOgKy6wYhq3oAjkgfgOCGFbosHsAaLbCHq4MpzQYNXHhp2N3DV3iDK1y0xgQ9YxR0j3pX
+        xU6zBxq67KAdcANHTkAKqgZGSzKv51vnuwVUfFAZUnxVrtVNQrXWBlWaJyC5OQ6ytgloMzghR2wE1k75
+        L0ZN4NQVoHP3sdDzDkyTLuqHzpFX0E6+oFPn4TbuAjndpLXXCdxLBOw7VA+jtTlCRk3i0BZInfQ/p/H1
+        sPfMXdjF0cG243cguwIHpX4GOBdNgLBb4eNcO9jbMBirRHczapJpDQ+dVPGsNjUnHB+WXcWObT6qhJOS
+        h3Awrxm+vDXB1yUC3j9TgiUvN0Zu1GQd+5vCm1Kvw0xHMfhdOgi9McKy+x687JeA5jTy4XFV5ham8u88
+        kueI7KpzsDTRDO8mWmC26wJYZBnfRgQHtjIl/8YszRIRZZnwVMmF4Qr0MyHM3MEc/T/mymPb+4oPq/By
+        dkpih8X6DcsBlwPmslDeAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="ToolStripButton_ZoomAll.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -289,6 +262,12 @@
         25iC8wXPdvCp1kI+tSp/locg/gWbSFuRUqfdRgAAAABJRU5ErkJggg==
 </value>
   </data>
+  <metadata name="ToolStripSeparator6.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="ToolStripSeparator5.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
   <metadata name="OpenFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>6, 3</value>
   </metadata>
@@ -310,9 +289,6 @@
         1GNPK3gAAAAASUVORK5CYII=
 </value>
   </data>
-  <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>458, 4</value>
-  </metadata>
   <data name="Button_NavBack.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAAAlwSFlzAAAO
@@ -331,6 +307,12 @@
   <metadata name="SaveFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>222, 3</value>
   </metadata>
+  <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>458, 4</value>
+  </metadata>
+  <metadata name="ToolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>556, 4</value>
+  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>25</value>
   </metadata>
diff --git a/source/Views/MainWindow.vb b/source/Views/MainWindow.vb
index e6171579..70fa5c44 100644
--- a/source/Views/MainWindow.vb
+++ b/source/Views/MainWindow.vb
@@ -32,11 +32,16 @@ Friend Class MainWindow
     ''' <remarks></remarks>
     Friend isInitializing As Boolean
 
-    'ColorBand that is shown while zooming in main chart
-    Friend colorBandZoom As Steema.TeeChart.Tools.ColorBand
+    'Rectangle that is shown while zooming in main chart
+    Friend ZoomRectangle As ScottPlot.Plottable.HSpan
 
-    'ColorBand representing current view extent of main chart in OverviewChart
-    Friend colorBandOverview As Steema.TeeChart.Tools.ColorBand
+    'Rectangle representing current view extent of main chart in overview chart
+    Friend ViewExtentRectangle As ScottPlot.Plottable.HSpan
+
+    ''' <summary>
+    ''' List of HorizontalSpans representing NaN periods
+    ''' </summary>
+    Friend NaNSpans As List(Of ScottPlot.Plottable.HSpan)
 
     'Cursors
     Friend cursor_pan As Cursor
@@ -61,7 +66,7 @@ Friend Class MainWindow
     Friend Property ChartMinX As DateTime
         Get
             Try
-                Return DateTime.FromOADate(Me.TChart1.Axes.Bottom.Minimum)
+                Return DateTime.FromOADate(Me.MainPlot.Plot.XAxis.Dims.Min)
             Catch ex As ArgumentException
                 Return Constants.minOADate
             End Try
@@ -70,14 +75,14 @@ Friend Class MainWindow
             If value < Constants.minOADate Then
                 value = Constants.minOADate
             End If
-            Me.TChart1.Axes.Bottom.Minimum = value.ToOADate()
+            Me.MainPlot.Plot.XAxis.Dims.SetAxis(min:=value.ToOADate(), max:=Nothing)
         End Set
     End Property
 
     Friend Property ChartMaxX As DateTime
         Get
             Try
-                Return DateTime.FromOADate(Me.TChart1.Axes.Bottom.Maximum)
+                Return DateTime.FromOADate(Me.MainPlot.Plot.XAxis.Dims.Max)
             Catch ex As ArgumentException
                 Return Constants.maxOADate
             End Try
@@ -86,7 +91,7 @@ Friend Class MainWindow
             If value > Constants.maxOADate Then
                 value = Constants.maxOADate
             End If
-            Me.TChart1.Axes.Bottom.Maximum = value.ToOADate()
+            Me.MainPlot.Plot.XAxis.Dims.SetAxis(min:=Nothing, max:=value.ToOADate())
         End Set
     End Property
 
@@ -96,12 +101,12 @@ Friend Class MainWindow
 
         Me.isInitializing = True
 
-        ' Dieser Aufruf ist für den Windows Form-Designer erforderlich.
+        ' Dieser Aufruf ist für den Windows Form-Designer erforderlich.
         InitializeComponent()
 
         'Charts einrichten
         '-----------------
-        Call Me.Init_Charts()
+        Call Me.InitializeCharts()
 
         'Navigation initialisieren
         Me.ComboBox_NavIncrement.SelectedItem = "Days"
@@ -124,75 +129,61 @@ Friend Class MainWindow
 
     End Sub
 
-
-    'Charts neu einrichten
-    '*********************
-    Friend Sub Init_Charts()
-
-        'Charts zurücksetzen
-        Me.TChart1.Clear()
-        Call Helpers.FormatChart(Me.TChart1.Chart)
-
-        Me.TChart2.Clear()
-        Call Helpers.FormatChart(Me.TChart2.Chart)
-        Me.TChart2.Panel.Brush.Color = Color.FromArgb(239, 239, 239)
-        Me.TChart2.Walls.Back.Color = Color.FromArgb(239, 239, 239)
-        Me.TChart2.Header.Visible = False
-        Me.TChart2.Legend.Visible = False
-
-        'Disable TeeChart builtin zooming and panning functionality
-        Me.TChart1.Zoom.Direction = Steema.TeeChart.ZoomDirections.None
-        Me.TChart1.Zoom.History = False
-        Me.TChart1.Zoom.Animated = True
-        Me.TChart1.Panning.Allow = Steema.TeeChart.ScrollModes.None
-
-        Me.TChart2.Zoom.Direction = Steema.TeeChart.ZoomDirections.None
-        Me.TChart2.Panning.Allow = Steema.TeeChart.ScrollModes.None
-
-        'Achsen
-        Me.TChart1.Axes.Bottom.Automatic = False
-        Me.TChart1.Axes.Bottom.Labels.Angle = 90
-        Me.TChart1.Axes.Bottom.Labels.DateTimeFormat = Helpers.CurrentDateFormat
-        Me.TChart1.Axes.Right.Title.Angle = 90
-
-        Me.TChart2.Axes.Left.Labels.Font.Color = Color.FromArgb(100, 100, 100)
-        Me.TChart2.Axes.Left.Labels.Font.Size = 8
-        Me.TChart2.Axes.Bottom.Labels.Font.Color = Color.FromArgb(100, 100, 100)
-        Me.TChart2.Axes.Bottom.Labels.Font.Size = 8
-        Me.TChart2.Axes.Bottom.Automatic = False
-        Me.TChart2.Axes.Bottom.Labels.DateTimeFormat = Globalization.CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern 'date only without time
-
-        'ColorBand einrichten
-        Call Me.Init_ColorBands()
+    ''' <summary>
+    ''' Initializes/resets the charts
+    ''' </summary>
+    Friend Sub InitializeCharts()
+
+        'initialize main plot
+        Me.MainPlot.Plot.Clear()
+        Call Helpers.FormatChart(Me.MainPlot.Plot)
+        Me.MainPlot.Plot.Style(figureBackground:=Color.White)
+        Me.MainPlot.Configuration.Pan = False
+        Me.MainPlot.Configuration.Zoom = False
+        Me.MainPlot.Refresh()
+
+        'initialize overview plot
+        Me.OverviewPlot.Plot.Clear()
+        Call Helpers.FormatChart(Me.OverviewPlot.Plot)
+        Me.OverviewPlot.Plot.Legend.IsVisible = False
+        Me.OverviewPlot.Configuration.Pan = False
+        Me.OverviewPlot.Configuration.Zoom = False
+        Me.OverviewPlot.Refresh()
+
+        'initialize rectangles
+        Call Me.InitializeRectangles()
+
+        'initialize list of HorizontalSpans representing NaN periods
+        Me.NaNSpans = New List(Of ScottPlot.Plottable.HSpan)
 
     End Sub
 
     ''' <summary>
-    ''' Initialize color bands
+    ''' Initialize the chart rectangles
     ''' </summary>
-    Friend Sub Init_ColorBands()
-
-        colorBandOverview = New Steema.TeeChart.Tools.ColorBand()
-        Me.TChart2.Tools.Add(colorBandOverview)
-        colorBandOverview.Axis = Me.TChart2.Axes.Bottom
-        colorBandOverview.Brush.Color = Color.Coral
-        colorBandOverview.Brush.Transparency = 50
-        colorBandOverview.ResizeEnd = False
-        colorBandOverview.ResizeStart = False
-        colorBandOverview.EndLinePen.Visible = False
-        colorBandOverview.StartLinePen.Visible = False
-
-        colorBandZoom = New Steema.TeeChart.Tools.ColorBand()
-        Me.TChart1.Tools.Add(colorBandZoom)
-        colorBandZoom.Axis = Me.TChart1.Axes.Bottom
-        colorBandZoom.Color = Color.Black
-        colorBandZoom.Pen.Color = Color.Black
-        colorBandZoom.Pen.Style = Drawing2D.DashStyle.Dash
-        colorBandZoom.Brush.Visible = False
-        colorBandZoom.ResizeEnd = False
-        colorBandZoom.ResizeStart = False
-        colorBandZoom.EndLinePen.Visible = True
-        colorBandZoom.StartLinePen.Visible = True
+    Friend Sub InitializeRectangles()
+
+        Dim limits As ScottPlot.AxisLimits
+
+        'view extent rectangle
+        limits = Me.OverviewPlot.Plot.GetAxisLimits()
+        ViewExtentRectangle = Me.OverviewPlot.Plot.AddHorizontalSpan(limits.XMin, limits.XMax)
+        ViewExtentRectangle.Color = Color.FromArgb(100, Color.Coral)
+        ViewExtentRectangle.BorderColor = Color.Coral
+        ViewExtentRectangle.BorderLineStyle = ScottPlot.LineStyle.Solid
+        ViewExtentRectangle.BorderLineWidth = 1
+        Me.OverviewPlot.Refresh()
+
+        'zoom rectangle
+        limits = Me.MainPlot.Plot.GetAxisLimits()
+        ZoomRectangle = Me.MainPlot.Plot.AddHorizontalSpan(limits.XMin, limits.XMax)
+        ZoomRectangle.DragEnabled = False
+        ZoomRectangle.Color = Color.FromArgb(0, Color.Empty)
+        ZoomRectangle.BorderColor = Color.Black
+        ZoomRectangle.BorderLineStyle = ScottPlot.LineStyle.Dash
+        ZoomRectangle.BorderLineWidth = 1
+        ZoomRectangle.IsVisible = False
+
     End Sub
 
     Private Overloads Sub Close() Implements IView.Close
diff --git a/source/Views/PropertiesWindow.Designer.vb b/source/Views/PropertiesWindow.Designer.vb
index fb19fc23..9418b9da 100644
--- a/source/Views/PropertiesWindow.Designer.vb
+++ b/source/Views/PropertiesWindow.Designer.vb
@@ -23,17 +23,14 @@ Partial Class PropertiesWindow
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
-        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(PropertiesWindow))
         Me.DataGridView1 = New System.Windows.Forms.DataGridView()
         Me.Id = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.TitleDataGridViewTextBoxColumn = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.Interpretation = New System.Windows.Forms.DataGridViewComboBoxColumn()
-        Me.UnitDataGridViewTextBoxColumn = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.MetadataText = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.DataSource = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.Length = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.StartDate = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.EndDate = New System.Windows.Forms.DataGridViewTextBoxColumn()
@@ -44,21 +41,22 @@ Partial Class PropertiesWindow
         Me.Maximum = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.Sum = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.Volume = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.TimeSeriesBindingSource = New System.Windows.Forms.BindingSource(Me.components)
-        Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
-        Me.ToolStripButton_showStatistics = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripButton_MoveUp = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripButton_MoveDown = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripButton_Delete = New System.Windows.Forms.ToolStripButton()
         Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.ToolStripButton_showStatistics = New System.Windows.Forms.ToolStripButton()
+        Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
+        Me.TitleDataGridViewTextBoxColumn = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.UnitDataGridViewTextBoxColumn = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.DataSource = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.TimeSeriesBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.TimeSeriesBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.ToolStrip1.SuspendLayout()
+        CType(Me.TimeSeriesBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'DataGridView1
         '
         Me.DataGridView1.AllowUserToAddRows = False
+        Me.DataGridView1.AllowUserToDeleteRows = False
         Me.DataGridView1.AllowUserToResizeRows = False
         Me.DataGridView1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left) _
@@ -85,17 +83,6 @@ Partial Class PropertiesWindow
         Me.Id.Visible = False
         Me.Id.Width = 41
         '
-        'TitleDataGridViewTextBoxColumn
-        '
-        Me.TitleDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells
-        Me.TitleDataGridViewTextBoxColumn.DataPropertyName = "Title"
-        DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.TitleDataGridViewTextBoxColumn.DefaultCellStyle = DataGridViewCellStyle1
-        Me.TitleDataGridViewTextBoxColumn.Frozen = True
-        Me.TitleDataGridViewTextBoxColumn.HeaderText = "Title"
-        Me.TitleDataGridViewTextBoxColumn.Name = "TitleDataGridViewTextBoxColumn"
-        Me.TitleDataGridViewTextBoxColumn.Width = 52
-        '
         'Interpretation
         '
         Me.Interpretation.DataPropertyName = "Interpretation"
@@ -108,15 +95,6 @@ Partial Class PropertiesWindow
         Me.Interpretation.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic
         Me.Interpretation.Width = 94
         '
-        'UnitDataGridViewTextBoxColumn
-        '
-        Me.UnitDataGridViewTextBoxColumn.DataPropertyName = "Unit"
-        DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.UnitDataGridViewTextBoxColumn.DefaultCellStyle = DataGridViewCellStyle3
-        Me.UnitDataGridViewTextBoxColumn.HeaderText = "Unit"
-        Me.UnitDataGridViewTextBoxColumn.Name = "UnitDataGridViewTextBoxColumn"
-        Me.UnitDataGridViewTextBoxColumn.Width = 51
-        '
         'MetadataText
         '
         Me.MetadataText.DataPropertyName = "MetadataText"
@@ -124,13 +102,6 @@ Partial Class PropertiesWindow
         Me.MetadataText.Name = "MetadataText"
         Me.MetadataText.ReadOnly = True
         '
-        'DataSource
-        '
-        Me.DataSource.DataPropertyName = "DataSource"
-        Me.DataSource.HeaderText = "DataSource"
-        Me.DataSource.Name = "DataSource"
-        Me.DataSource.ReadOnly = True
-        '
         'Length
         '
         Me.Length.DataPropertyName = "Length"
@@ -211,18 +182,12 @@ Partial Class PropertiesWindow
         Me.Volume.ReadOnly = True
         Me.Volume.Visible = False
         '
-        'TimeSeriesBindingSource
-        '
-        Me.TimeSeriesBindingSource.DataSource = GetType(BlueM.Wave.TimeSeries)
-        '
-        'ToolStrip1
+        'DataGridViewTextBoxColumn1
         '
-        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton_showStatistics, Me.ToolStripButton_MoveUp, Me.ToolStripButton_MoveDown, Me.ToolStripButton_Delete})
-        Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
-        Me.ToolStrip1.Name = "ToolStrip1"
-        Me.ToolStrip1.Size = New System.Drawing.Size(464, 25)
-        Me.ToolStrip1.TabIndex = 2
-        Me.ToolStrip1.Text = "ToolStrip1"
+        Me.DataGridViewTextBoxColumn1.DataPropertyName = "DataSource"
+        Me.DataGridViewTextBoxColumn1.HeaderText = "DataSource"
+        Me.DataGridViewTextBoxColumn1.Name = "DataGridViewTextBoxColumn1"
+        Me.DataGridViewTextBoxColumn1.ReadOnly = True
         '
         'ToolStripButton_showStatistics
         '
@@ -235,44 +200,45 @@ Partial Class PropertiesWindow
         Me.ToolStripButton_showStatistics.Text = "Show statistics"
         Me.ToolStripButton_showStatistics.ToolTipText = "Show statistics"
         '
-        'ToolStripButton_MoveUp
-        '
-        Me.ToolStripButton_MoveUp.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripButton_MoveUp.Enabled = False
-        Me.ToolStripButton_MoveUp.Image = Global.BlueM.Wave.My.Resources.Resources.arrow_up
-        Me.ToolStripButton_MoveUp.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripButton_MoveUp.Name = "ToolStripButton_MoveUp"
-        Me.ToolStripButton_MoveUp.Size = New System.Drawing.Size(23, 22)
-        Me.ToolStripButton_MoveUp.Text = "Move selected time series up"
-        Me.ToolStripButton_MoveUp.ToolTipText = "Move selected time series up"
-        '
-        'ToolStripButton_MoveDown
-        '
-        Me.ToolStripButton_MoveDown.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripButton_MoveDown.Enabled = False
-        Me.ToolStripButton_MoveDown.Image = Global.BlueM.Wave.My.Resources.Resources.arrow_down
-        Me.ToolStripButton_MoveDown.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripButton_MoveDown.Name = "ToolStripButton_MoveDown"
-        Me.ToolStripButton_MoveDown.Size = New System.Drawing.Size(23, 22)
-        Me.ToolStripButton_MoveDown.Text = "Move selected time series down"
-        '
-        'ToolStripButton_Delete
-        '
-        Me.ToolStripButton_Delete.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripButton_Delete.Enabled = False
-        Me.ToolStripButton_Delete.Image = Global.BlueM.Wave.My.Resources.Resources.chart_line_delete
-        Me.ToolStripButton_Delete.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripButton_Delete.Name = "ToolStripButton_Delete"
-        Me.ToolStripButton_Delete.Size = New System.Drawing.Size(23, 22)
-        Me.ToolStripButton_Delete.Text = "ToolStripButton_Delete"
-        Me.ToolStripButton_Delete.ToolTipText = "Delete selected time series"
+        'ToolStrip1
         '
-        'DataGridViewTextBoxColumn1
+        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton_showStatistics})
+        Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
+        Me.ToolStrip1.Name = "ToolStrip1"
+        Me.ToolStrip1.Size = New System.Drawing.Size(464, 25)
+        Me.ToolStrip1.TabIndex = 2
+        Me.ToolStrip1.Text = "ToolStrip1"
         '
-        Me.DataGridViewTextBoxColumn1.DataPropertyName = "DataSource"
-        Me.DataGridViewTextBoxColumn1.HeaderText = "DataSource"
-        Me.DataGridViewTextBoxColumn1.Name = "DataGridViewTextBoxColumn1"
-        Me.DataGridViewTextBoxColumn1.ReadOnly = True
+        'TitleDataGridViewTextBoxColumn
+        '
+        Me.TitleDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells
+        Me.TitleDataGridViewTextBoxColumn.DataPropertyName = "Title"
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.TitleDataGridViewTextBoxColumn.DefaultCellStyle = DataGridViewCellStyle1
+        Me.TitleDataGridViewTextBoxColumn.Frozen = True
+        Me.TitleDataGridViewTextBoxColumn.HeaderText = "Title"
+        Me.TitleDataGridViewTextBoxColumn.Name = "TitleDataGridViewTextBoxColumn"
+        Me.TitleDataGridViewTextBoxColumn.Width = 52
+        '
+        'UnitDataGridViewTextBoxColumn
+        '
+        Me.UnitDataGridViewTextBoxColumn.DataPropertyName = "Unit"
+        DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.UnitDataGridViewTextBoxColumn.DefaultCellStyle = DataGridViewCellStyle3
+        Me.UnitDataGridViewTextBoxColumn.HeaderText = "Unit"
+        Me.UnitDataGridViewTextBoxColumn.Name = "UnitDataGridViewTextBoxColumn"
+        Me.UnitDataGridViewTextBoxColumn.Width = 51
+        '
+        'DataSource
+        '
+        Me.DataSource.DataPropertyName = "DataSource"
+        Me.DataSource.HeaderText = "DataSource"
+        Me.DataSource.Name = "DataSource"
+        Me.DataSource.ReadOnly = True
+        '
+        'TimeSeriesBindingSource
+        '
+        Me.TimeSeriesBindingSource.DataSource = GetType(BlueM.Wave.TimeSeries)
         '
         'PropertiesWindow
         '
@@ -288,19 +254,15 @@ Partial Class PropertiesWindow
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
         Me.Text = "Time Series Properties"
         CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.TimeSeriesBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ToolStrip1.ResumeLayout(False)
         Me.ToolStrip1.PerformLayout()
+        CType(Me.TimeSeriesBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
     End Sub
     Friend WithEvents DataGridView1 As System.Windows.Forms.DataGridView
     Friend WithEvents TimeSeriesBindingSource As System.Windows.Forms.BindingSource
-    Friend WithEvents ToolStrip1 As ToolStrip
-    Friend WithEvents ToolStripButton_showStatistics As ToolStripButton
-    Friend WithEvents ToolStripButton_Delete As ToolStripButton
-    Friend WithEvents ToolStripButton_MoveUp As ToolStripButton
     Friend WithEvents DataGridViewTextBoxColumn1 As DataGridViewTextBoxColumn
     Friend WithEvents Id As DataGridViewTextBoxColumn
     Friend WithEvents TitleDataGridViewTextBoxColumn As DataGridViewTextBoxColumn
@@ -318,5 +280,6 @@ Partial Class PropertiesWindow
     Friend WithEvents Maximum As DataGridViewTextBoxColumn
     Friend WithEvents Sum As DataGridViewTextBoxColumn
     Friend WithEvents Volume As DataGridViewTextBoxColumn
-    Friend WithEvents ToolStripButton_MoveDown As ToolStripButton
+    Friend WithEvents ToolStripButton_showStatistics As ToolStripButton
+    Friend WithEvents ToolStrip1 As ToolStrip
 End Class
diff --git a/source/Views/PropertiesWindow.vb b/source/Views/PropertiesWindow.vb
index 7ea169cc..44916d99 100644
--- a/source/Views/PropertiesWindow.vb
+++ b/source/Views/PropertiesWindow.vb
@@ -31,19 +31,6 @@ Friend Class PropertiesWindow
     ''' <param name="id">Id of the time series whose properties were changed</param>
     Friend Event SeriesPropertyChanged(id As Integer)
 
-    ''' <summary>
-    ''' Is raised when the user deletes rows/series
-    ''' </summary>
-    ''' <param name="ids">List of ids of the time series that were deleted</param>
-    Friend Event SeriesDeleted(ids As List(Of Integer))
-
-    ''' <summary>
-    ''' Is raised when the user reorders a row/series
-    ''' </summary>
-    ''' <param name="id">Id of TimeSeries that was reordered</param>
-    ''' <param name="direction">Direction</param>
-    Friend Event SeriesReordered(id As Integer, direction As Direction)
-
     Public Sub New()
         ' This call is required by the Windows Form Designer.
         InitializeComponent()
@@ -172,138 +159,12 @@ Friend Class PropertiesWindow
 
     End Sub
 
-    ''' <summary>
-    ''' Handles the user deleting rows/series using the keyboard
-    ''' </summary>
-    ''' <param name="sender"></param>
-    ''' <param name="e"></param>
-    Private Sub DataGridView1_UserDeletingRow(sender As Object, e As DataGridViewRowCancelEventArgs) Handles DataGridView1.UserDeletingRow
-        Call DeleteSeries()
-        'cancel row deletion because datagridview will be refreshed from outside
-        'otherwise, two rows end up being deleted
-        e.Cancel = True
-    End Sub
-
-    ''' <summary>
-    ''' Handles the user clicking the delete button
-    ''' </summary>
-    ''' <param name="sender"></param>
-    ''' <param name="e"></param>
-    Private Sub ToolStripButton_Delete_Click(sender As Object, e As EventArgs) Handles ToolStripButton_Delete.Click
-        Call DeleteSeries()
-    End Sub
-
-    ''' <summary>
-    ''' Handles the user clicking the move up button
-    ''' </summary>
-    ''' <param name="sender"></param>
-    ''' <param name="e"></param>
-    Private Sub ToolStripButton_MoveUp_Click(sender As Object, e As EventArgs) Handles ToolStripButton_MoveUp.Click
-        Call ReorderSelectedSeries(Direction.Up)
-    End Sub
-
-    ''' <summary>
-    ''' Handles the user clicking the move down button
-    ''' </summary>
-    ''' <param name="sender"></param>
-    ''' <param name="e"></param>
-    Private Sub ToolStripButton_MoveDown_Click(sender As Object, e As EventArgs) Handles ToolStripButton_MoveDown.Click
-        Call ReorderSelectedSeries(Direction.Down)
-    End Sub
-
-    ''' <summary>
-    ''' Reorder selected series
-    ''' </summary>
-    ''' <param name="direction">Direction in which to move selected series</param>
-    Private Sub ReorderSelectedSeries(direction As Direction)
-
-        Dim indices As New List(Of Integer)
-        Dim ids As New List(Of Integer)
-        For Each row As DataGridViewRow In Me.DataGridView1.Rows
-            If row.Selected Then
-                If (direction = Direction.Up And row.Index = 0) Or
-                   (direction = Direction.Down And row.Index = Me.DataGridView1.RowCount - 1) Then
-                    'if first row is selected, moving up does nothing
-                    'if last row is selected, moving down does nothing
-                    Exit Sub
-                End If
-                indices.Add(row.Index)
-                ids.Add(CType(row.DataBoundItem, TimeSeries).Id)
-            End If
-        Next
-        'raise event for each series
-        For Each id As Integer In ids
-            RaiseEvent SeriesReordered(id, direction)
-        Next
-        'reselect previously sslected rows in their new positions
-        Me.DataGridView1.ClearSelection()
-        Dim offset As Integer
-        If direction = Direction.Up Then
-            offset = -1
-        Else
-            offset = 1
-        End If
-        For Each index As Integer In indices
-            Me.DataGridView1.Rows(index + offset).Selected = True
-        Next
-    End Sub
-
     Private Sub PropertiesDialog_FormClosing(sender As Object, e As FormClosingEventArgs) Handles MyBase.FormClosing
         'prevent the form from closing and hide it instead
         e.Cancel = True
         Call Me.Hide()
     End Sub
 
-    ''' <summary>
-    ''' Handles the datagridview selection changed
-    ''' Enables/disables buttons
-    ''' </summary>
-    ''' <param name="sender"></param>
-    ''' <param name="e"></param>
-    Private Sub DataGridView1_SelectionChanged(sender As Object, e As EventArgs) Handles DataGridView1.SelectionChanged
-        'Check if any rows are selected
-        If Me.DataGridView1.SelectedRows.Count = 0 Then
-            Me.ToolStripButton_Delete.Enabled = False
-            Me.ToolStripButton_MoveUp.Enabled = False
-            Me.ToolStripButton_MoveDown.Enabled = False
-        Else
-            Me.ToolStripButton_Delete.Enabled = True
-            Me.ToolStripButton_MoveUp.Enabled = True
-            Me.ToolStripButton_MoveDown.Enabled = True
-            'check if first row is selected
-            If Me.DataGridView1.Rows(0).Selected Then
-                Me.ToolStripButton_MoveUp.Enabled = False
-            End If
-            'check if last row is selected
-            If Me.DataGridView1.Rows(Me.DataGridView1.Rows.Count - 1).Selected Then
-                Me.ToolStripButton_MoveDown.Enabled = False
-            End If
-        End If
-    End Sub
-
-    ''' <summary>
-    ''' Delete all selected rows / series
-    ''' </summary>
-    Private Sub DeleteSeries()
-        'collect titles and ids of all selected rows
-        Dim titles As New List(Of String)
-        Dim ids As New List(Of Integer)
-        For Each row As DataGridViewRow In Me.DataGridView1.SelectedRows
-            Dim ts As TimeSeries = CType(row.DataBoundItem, TimeSeries)
-            If Not IsNothing(ts) Then
-                titles.Add(ts.Title)
-                ids.Add(ts.Id)
-            End If
-        Next
-        If ids.Count > 0 Then
-            'ask for user confirmation
-            Dim result As MsgBoxResult = MsgBox($"Delete {ids.Count} series?{eol}{String.Join(eol, titles)}", MsgBoxStyle.OkCancel Or MsgBoxStyle.Exclamation)
-            If result = MsgBoxResult.Ok Then
-                RaiseEvent SeriesDeleted(ids)
-            End If
-        End If
-    End Sub
-
     Private Overloads Sub Close() Implements IView.Close
         Throw New NotImplementedException()
     End Sub
diff --git a/source/Wave.vb b/source/Wave.vb
index 5c2d67cc..f1478028 100644
--- a/source/Wave.vb
+++ b/source/Wave.vb
@@ -45,11 +45,6 @@ Public Class Wave
     ''' </summary>
     Friend Event SeriesCleared()
 
-    ''' <summary>
-    ''' Is raised when all the time series are reordered
-    ''' </summary>
-    Friend Event SeriesAllReordered()
-
     ''' <summary>
     ''' Is raised when a single time series is reordered
     ''' </summary>
@@ -459,15 +454,6 @@ Public Class Wave
 
     End Sub
 
-    ''' <summary>
-    ''' Reorders the internally stored time series according to the specified list of Ids
-    ''' </summary>
-    ''' <param name="ids">List of Ids in the new order</param>
-    Friend Sub Reorder_Series(ids As List(Of Integer))
-        Me.TimeSeries.Reorder(ids)
-        RaiseEvent SeriesAllReordered()
-    End Sub
-
     ''' <summary>
     ''' Initiates timeseries export
     ''' </summary>
diff --git a/source/Wave.vbproj b/source/Wave.vbproj
index 47021e13..28ca263f 100644
--- a/source/Wave.vbproj
+++ b/source/Wave.vbproj
@@ -1,605 +1,609 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{CE4132A2-2E2F-4F54-B66D-1BAA928D499E}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <StartupObject>Sub Main</StartupObject>
-    <RootNamespace>BlueM.Wave</RootNamespace>
-    <AssemblyName>Wave</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <MyType>Empty</MyType>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Deterministic>false</Deterministic>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionExplicit>On</OptionExplicit>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionCompare>Binary</OptionCompare>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionStrict>Off</OptionStrict>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionInfer>On</OptionInfer>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationIcon>Resources\Wave.ico</ApplicationIcon>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DocumentationFile>Wave.xml</DocumentationFile>
-    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DocumentationFile>Wave.xml</DocumentationFile>
-    <Optimize>true</Optimize>
-    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
-    <DebugType>None</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DocumentationFile>Wave.xml</DocumentationFile>
-    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DocumentationFile>Wave.xml</DocumentationFile>
-    <Optimize>true</Optimize>
-    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
-    <DebugType>None</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="MathParserNet, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>lib\MathParserNet\MathParserNet.dll</HintPath>
-    </Reference>
-    <Reference Include="modelEAU.SWMM.DllAdapter, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>lib\modelEAU\modelEAU.SWMM.DllAdapter.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Data.SQLite, Version=1.0.118.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>lib\SQLite\System.Data.SQLite.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml.Linq" />
-  </ItemGroup>
-  <ItemGroup>
-    <Import Include="Microsoft.VisualBasic" />
-    <Import Include="System" />
-    <Import Include="System.Collections" />
-    <Import Include="System.Collections.Generic" />
-    <Import Include="System.Data" />
-    <Import Include="System.Drawing" />
-    <Import Include="System.Diagnostics" />
-    <Import Include="System.Windows.Forms" />
-    <Import Include="System.Linq" />
-    <Import Include="System.Xml.Linq" />
-    <Import Include="System.Threading.Tasks" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Analysis\Analysis.vb" />
-    <Compile Include="Analysis\AnalysisResultChart.Designer.vb">
-      <DependentUpon>AnalysisResultChart.vb</DependentUpon>
-    </Compile>
-    <Compile Include="Analysis\AnalysisResultChart.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Analysis\AnalysisDialog.Designer.vb">
-      <DependentUpon>AnalysisDialog.vb</DependentUpon>
-    </Compile>
-    <Compile Include="Analysis\AnalysisDialog.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Analysis\AnalysisFactory.vb" />
-    <Compile Include="Analysis\AnalysisResultTable.Designer.vb">
-      <DependentUpon>AnalysisResultTable.vb</DependentUpon>
-    </Compile>
-    <Compile Include="Analysis\AnalysisResultTable.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Analysis\AnnualStatistics.vb" />
-    <Compile Include="Analysis\AnnualRecurrenceProbability_Dialog.Designer.vb">
-      <DependentUpon>AnnualRecurrenceProbability_Dialog.vb</DependentUpon>
-    </Compile>
-    <Compile Include="Analysis\AnnualRecurrenceProbability_Dialog.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Analysis\Autocorrelation.vb" />
-    <Compile Include="Analysis\Autocorrelation_Dialog.Designer.vb">
-      <DependentUpon>Autocorrelation_Dialog.vb</DependentUpon>
-    </Compile>
-    <Compile Include="Analysis\Autocorrelation_Dialog.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Analysis\Calculator.vb" />
-    <Compile Include="Analysis\ChangeTimestep.vb" />
-    <Compile Include="Analysis\AccumulateDialog.Designer.vb">
-      <DependentUpon>AccumulateDialog.vb</DependentUpon>
-    </Compile>
-    <Compile Include="Analysis\AccumulateDialog.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Analysis\ChangeTimestepDialog.Designer.vb">
-      <DependentUpon>ChangeTimestepDialog.vb</DependentUpon>
-    </Compile>
-    <Compile Include="Analysis\ChangeTimestepDialog.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Analysis\CalculatorVariable.vb" />
-    <Compile Include="Analysis\Comparison.vb" />
-    <Compile Include="Analysis\Comparison_Dialog.Designer.vb">
-      <DependentUpon>Comparison_Dialog.vb</DependentUpon>
-    </Compile>
-    <Compile Include="Analysis\Comparison_Dialog.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Analysis\Accumulate.vb" />
-    <Compile Include="Analysis\Decumulate.vb" />
-    <Compile Include="Analysis\DoubleSumCurve.vb" />
-    <Compile Include="Analysis\GoodnessOfFit.vb" />
-    <Compile Include="Analysis\AnnualStatistics_Dialog.Designer.vb">
-      <DependentUpon>AnnualStatistics_Dialog.vb</DependentUpon>
-    </Compile>
-    <Compile Include="Analysis\AnnualStatistics_Dialog.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Analysis\GoodnessOfFit_Dialog.Designer.vb">
-      <DependentUpon>GoodnessOfFit_Dialog.vb</DependentUpon>
-    </Compile>
-    <Compile Include="Analysis\GoodnessOfFit_Dialog.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Analysis\Histogram.vb" />
-    <Compile Include="Analysis\HistogramDialog.Designer.vb">
-      <DependentUpon>HistogramDialog.vb</DependentUpon>
-    </Compile>
-    <Compile Include="Analysis\HistogramDialog.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Analysis\LinearRegression.vb" />
-    <Compile Include="Analysis\LinearRegression_Dialog.Designer.vb">
-      <DependentUpon>LinearRegression_Dialog.vb</DependentUpon>
-    </Compile>
-    <Compile Include="Analysis\LinearRegression_Dialog.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Analysis\MonthlyStatistics.vb" />
-    <Compile Include="Analysis\MonthlyStatisticsDialog.Designer.vb">
-      <DependentUpon>MonthlyStatisticsDialog.vb</DependentUpon>
-    </Compile>
-    <Compile Include="Analysis\MonthlyStatisticsDialog.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Analysis\AnnualRecurrenceProbability.vb" />
-    <Compile Include="Analysis\TestAnalysis.vb" />
-    <Compile Include="Analysis\TimestepAnalysis.vb" />
-    <Compile Include="Analysis\TimestepAnalysisDialog.Designer.vb">
-      <DependentUpon>TimestepAnalysisDialog.vb</DependentUpon>
-    </Compile>
-    <Compile Include="Analysis\TimestepAnalysisDialog.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Dialogs\SaveProjectFileDialog.Designer.vb">
-      <DependentUpon>SaveProjectFileDialog.vb</DependentUpon>
-    </Compile>
-    <Compile Include="Dialogs\SaveProjectFileDialog.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Dialogs\SelectSeriesDialog.Designer.vb">
-      <DependentUpon>SelectSeriesDialog.vb</DependentUpon>
-    </Compile>
-    <Compile Include="Dialogs\SelectSeriesDialog.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Classes\TimeSeriesDisplayOptions.vb" />
-    <Compile Include="FileFormats\JAMS.vb" />
-    <Compile Include="Main.vb" />
-    <Compile Include="App.vb" />
-    <Compile Include="Classes\AxisWrapper.vb" />
-    <Compile Include="Classes\Character.vb" />
-    <Compile Include="Classes\Metadata.vb" />
-    <Compile Include="Classes\Month.vb" />
-    <Compile Include="Classes\TimeSeries.vb" />
-    <Compile Include="Classes\TimeSeriesCollection.vb" />
-    <Compile Include="Classes\TimeSeriesDataSource.vb" />
-    <Compile Include="Classes\TimeSeriesFile.vb" />
-    <Compile Include="Classes\TimeSeriesInfo.vb" />
-    <Compile Include="CLI.vb" />
-    <Compile Include="Constants.vb" />
-    <Compile Include="Controllers\Controller.vb" />
-    <Compile Include="Controllers\PropertiesController.vb" />
-    <Compile Include="Controllers\ValuesController.vb" />
-    <Compile Include="Controllers\WaveController.vb" />
-    <Compile Include="Dialogs\AboutBox.Designer.vb">
-      <DependentUpon>AboutBox.vb</DependentUpon>
-    </Compile>
-    <Compile Include="Dialogs\AboutBox.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Dialogs\AxisDialog.Designer.vb">
-      <DependentUpon>AxisDialog.vb</DependentUpon>
-    </Compile>
-    <Compile Include="Dialogs\AxisDialog.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Dialogs\ConvertErrorValuesDialog.Designer.vb">
-      <DependentUpon>ConvertErrorValuesDialog.vb</DependentUpon>
-    </Compile>
-    <Compile Include="Dialogs\ConvertErrorValuesDialog.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Dialogs\CutDialog.Designer.vb">
-      <DependentUpon>CutDialog.vb</DependentUpon>
-    </Compile>
-    <Compile Include="Dialogs\CutDialog.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Analysis\CalculatorDialog.Designer.vb">
-      <DependentUpon>CalculatorDialog.vb</DependentUpon>
-    </Compile>
-    <Compile Include="Analysis\CalculatorDialog.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Dialogs\ExportDiag.Designer.vb">
-      <DependentUpon>ExportDiag.vb</DependentUpon>
-    </Compile>
-    <Compile Include="Dialogs\ExportDiag.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Dialogs\ImportCSVDialog.Designer.vb">
-      <DependentUpon>ImportCSVDialog.vb</DependentUpon>
-    </Compile>
-    <Compile Include="Dialogs\ImportCSVDialog.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Dialogs\LogWindow.Designer.vb">
-      <DependentUpon>LogWindow.vb</DependentUpon>
-    </Compile>
-    <Compile Include="Dialogs\LogWindow.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Dialogs\MergeSeriesDialog.Designer.vb">
-      <DependentUpon>MergeSeriesDialog.vb</DependentUpon>
-    </Compile>
-    <Compile Include="Dialogs\MergeSeriesDialog.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Dialogs\MetadataDialog.Designer.vb">
-      <DependentUpon>MetadataDialog.vb</DependentUpon>
-    </Compile>
-    <Compile Include="Dialogs\MetadataDialog.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Dialogs\SeriesEditorDialog.Designer.vb">
-      <DependentUpon>SeriesEditorDialog.vb</DependentUpon>
-    </Compile>
-    <Compile Include="Dialogs\SeriesEditorDialog.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FileFormats\ASC.vb" />
-    <Compile Include="FileFormats\WBL.vb" />
-    <Compile Include="FileFormats\DFS0_ExportDialog.Designer.vb">
-      <DependentUpon>DFS0_ExportDialog.vb</DependentUpon>
-    </Compile>
-    <Compile Include="FileFormats\DFS0_ExportDialog.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FileFormats\SWMM_INTERFACE.vb" />
-    <Compile Include="FileFormats\SWMM_LID_REPORT.vb" />
-    <Compile Include="FileFormats\WVP.vb" />
-    <Compile Include="FileFormats\DFS0.vb" />
-    <Compile Include="FileFormats\BIN.vb" />
-    <Compile Include="FileFormats\CSV.vb" />
-    <Compile Include="FileFormats\HYDRO_AS-2D.vb" />
-    <Compile Include="FileFormats\HYDRO_AS-2D_Diag.Designer.vb">
-      <DependentUpon>HYDRO_AS-2D_Diag.vb</DependentUpon>
-    </Compile>
-    <Compile Include="FileFormats\HYDRO_AS-2D_Diag.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FileFormats\HystemExtran_REG.vb" />
-    <Compile Include="FileFormats\HystemExtran_WEL.vb" />
-    <Compile Include="FileFormats\PRMS.vb" />
-    <Compile Include="FileFormats\SMUSI_REG.vb" />
-    <Compile Include="FileFormats\SMB.vb" />
-    <Compile Include="FileFormats\SWMM_TIMESERIES.vb" />
-    <Compile Include="FileFormats\SWMM_OUT.vb" />
-    <Compile Include="FileFormats\SydroSQLite.vb" />
-    <Compile Include="FileFormats\UVF.vb" />
-    <Compile Include="FileFormats\WEL.vb" />
-    <Compile Include="FileFormats\GISMO_WEL.vb" />
-    <Compile Include="FileFormats\ZRE.vb" />
-    <Compile Include="FileFormats\ZRXP.vb" />
-    <Compile Include="Helpers.vb" />
-    <Compile Include="Log.vb" />
-    <Compile Include="My Project\AssemblyInfo.vb" />
-    <Compile Include="My Project\Application.Designer.vb">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Application.myapp</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="My Project\Resources.Designer.vb">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="My Project\Settings.Designer.vb">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <Compile Include="Views\IView.vb" />
-    <Compile Include="Views\MainWindow.Designer.vb">
-      <DependentUpon>MainWindow.vb</DependentUpon>
-    </Compile>
-    <Compile Include="Views\MainWindow.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Views\PropertiesWindow.Designer.vb">
-      <DependentUpon>PropertiesWindow.vb</DependentUpon>
-    </Compile>
-    <Compile Include="Views\PropertiesWindow.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Views\ValuesWindow.Designer.vb">
-      <DependentUpon>ValuesWindow.vb</DependentUpon>
-    </Compile>
-    <Compile Include="Views\ValuesWindow.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Wave.vb" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Analysis\AnalysisResultChart.resx">
-      <DependentUpon>AnalysisResultChart.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Analysis\AnalysisDialog.resx">
-      <DependentUpon>AnalysisDialog.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Analysis\AnalysisResultTable.resx">
-      <DependentUpon>AnalysisResultTable.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Analysis\AnnualRecurrenceProbability_Dialog.resx">
-      <DependentUpon>AnnualRecurrenceProbability_Dialog.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Analysis\Autocorrelation_Dialog.resx">
-      <DependentUpon>Autocorrelation_Dialog.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Analysis\AccumulateDialog.resx">
-      <DependentUpon>AccumulateDialog.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Analysis\ChangeTimestepDialog.resx">
-      <DependentUpon>ChangeTimestepDialog.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Analysis\Comparison_Dialog.resx">
-      <DependentUpon>Comparison_Dialog.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Analysis\AnnualStatistics_Dialog.resx">
-      <DependentUpon>AnnualStatistics_Dialog.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Analysis\GoodnessOfFit_Dialog.resx">
-      <DependentUpon>GoodnessOfFit_Dialog.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Analysis\HistogramDialog.resx">
-      <DependentUpon>HistogramDialog.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Analysis\LinearRegression_Dialog.resx">
-      <DependentUpon>LinearRegression_Dialog.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Analysis\MonthlyStatisticsDialog.resx">
-      <DependentUpon>MonthlyStatisticsDialog.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Analysis\TimestepAnalysisDialog.resx">
-      <DependentUpon>TimestepAnalysisDialog.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Dialogs\AboutBox.resx">
-      <DependentUpon>AboutBox.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Dialogs\AxisDialog.resx">
-      <DependentUpon>AxisDialog.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Dialogs\ConvertErrorValuesDialog.resx">
-      <DependentUpon>ConvertErrorValuesDialog.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Dialogs\CutDialog.resx">
-      <DependentUpon>CutDialog.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Analysis\CalculatorDialog.resx">
-      <DependentUpon>CalculatorDialog.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Dialogs\SaveProjectFileDialog.resx">
-      <DependentUpon>SaveProjectFileDialog.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Dialogs\ExportDiag.resx">
-      <DependentUpon>ExportDiag.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Dialogs\SelectSeriesDialog.resx">
-      <DependentUpon>SelectSeriesDialog.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Dialogs\ImportCSVDialog.resx">
-      <DependentUpon>ImportCSVDialog.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Dialogs\LogWindow.resx">
-      <DependentUpon>LogWindow.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Dialogs\MergeSeriesDialog.resx">
-      <DependentUpon>MergeSeriesDialog.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Dialogs\MetadataDialog.resx">
-      <DependentUpon>MetadataDialog.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Dialogs\SeriesEditorDialog.resx">
-      <DependentUpon>SeriesEditorDialog.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="FileFormats\DFS0_ExportDialog.resx">
-      <DependentUpon>DFS0_ExportDialog.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="FileFormats\HYDRO_AS-2D_Diag.resx">
-      <DependentUpon>HYDRO_AS-2D_Diag.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="My Project\Resources.resx">
-      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
-      <CustomToolNamespace>My.Resources</CustomToolNamespace>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="My Project\TeeChart.licenses" />
-    <EmbeddedResource Include="Views\MainWindow.resx">
-      <DependentUpon>MainWindow.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Views\PropertiesWindow.resx">
-      <DependentUpon>PropertiesWindow.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Views\ValuesWindow.resx">
-      <DependentUpon>ValuesWindow.vb</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="CHANGELOG.md">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="lib\Newtonsoft.Json\Newtonsoft.Json.LICENSE.md" />
-    <None Include="lib\SQLite\System.Data.SQLite.dll.config" />
-    <None Include="My Project\Application.myapp">
-      <Generator>MyApplicationCodeGenerator</Generator>
-      <LastGenOutput>Application.Designer.vb</LastGenOutput>
-    </None>
-    <None Include="My Project\DataSources\AxisWrapper.datasource" />
-    <None Include="My Project\DataSources\TimeSeries.datasource" />
-    <None Include="My Project\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <CustomToolNamespace>My</CustomToolNamespace>
-      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
-    </None>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="lib\DHI.DFS\DHI.DFS.license.txt" />
-    <Content Include="lib\MathNet\MathNet.Numerics.license.txt" />
-    <Content Include="lib\MathParserNet\MathParserNet.dll" />
-    <Content Include="lib\MathParserNet\MathParserNet.license.html" />
-    <Content Include="lib\modelEAU\modelEAU.SWMM.DllAdapter.dll" />
-    <Content Include="lib\SQLite\System.Data.SQLite.dll" />
-    <Content Include="lib\SQLite\x64\SQLite.Interop.dll" />
-    <Content Include="lib\SQLite\x86\SQLite.Interop.dll" />
-    <None Include="Resources\accept.png" />
-    <None Include="Resources\accept_grayscale.png" />
-    <None Include="Resources\accept_split.png" />
-    <Content Include="Resources\application_get.png" />
-    <Content Include="Resources\application_split.png" />
-    <Content Include="Resources\arrow_down.png" />
-    <Content Include="Resources\arrow_join_right.png" />
-    <Content Include="Resources\arrow_refresh.png" />
-    <Content Include="Resources\arrow_up.png" />
-    <Content Include="Resources\arrow_up_down.png" />
-    <Content Include="Resources\BlueM.png" />
-    <Content Include="Resources\BlueM_icon.png" />
-    <Content Include="Resources\calculator.png" />
-    <Content Include="Resources\cancel.png" />
-    <Content Include="Resources\cancel_inactive.png" />
-    <Content Include="Resources\chart_curve.png" />
-    <Content Include="Resources\chart_curve_edit.png" />
-    <Content Include="Resources\chart_curve_link.png" />
-    <Content Include="Resources\chart_line_add.png" />
-    <Content Include="Resources\chart_line_delete.png" />
-    <Content Include="Resources\chart_line_edit.png" />
-    <Content Include="Resources\chart_line_error.png" />
-    <Content Include="Resources\chart_magnify.png" />
-    <Content Include="Resources\chart_pie.png" />
-    <Content Include="Resources\color_wheel.png" />
-    <Content Include="Resources\comments.png" />
-    <Content Include="Resources\controller.png" />
-    <Content Include="Resources\control_end.png" />
-    <Content Include="Resources\control_fastforward.png" />
-    <Content Include="Resources\control_rewind.png" />
-    <Content Include="Resources\control_start.png" />
-    <Content Include="Resources\cursor.png" />
-    <EmbeddedResource Include="Resources\cursor_pan.cur" />
-    <EmbeddedResource Include="Resources\cursor_zoom.cur" />
-    <Content Include="Resources\cut.png" />
-    <Content Include="Resources\database_refresh.png" />
-    <Content Include="Resources\error.png" />
-    <Content Include="Resources\error_convert.png" />
-    <Content Include="Resources\error_delete.png" />
-    <Content Include="Resources\error_inactive.png" />
-    <Content Include="Resources\help.png" />
-    <Content Include="Resources\log.ico" />
-    <Content Include="Resources\navigate_back.png" />
-    <Content Include="Resources\navigate_forward.png" />
-    <Content Include="Resources\page_paste.png" />
-    <Content Include="Resources\page_save.png" />
-    <Content Include="Resources\page_white_go.png" />
-    <Content Include="Resources\pan.png" />
-    <Content Include="Resources\script.png" />
-    <Content Include="Resources\shape_align_bottom.png" />
-    <Content Include="Resources\table.png" />
-    <Content Include="Resources\table_edit.png" />
-    <Content Include="Resources\table_gear.png" />
-    <Content Include="Resources\table_save.png" />
-    <Content Include="Resources\tick.png" />
-    <Content Include="Resources\wave.ico" />
-    <Content Include="Resources\zoom.png" />
-    <Content Include="Resources\zoom_in.png" />
-    <Content Include="Resources\zoom_next.png" />
-    <Content Include="Resources\zoom_out.png" />
-    <Content Include="Resources\zoom_previous.png" />
-    <Content Include="Resources\zoom_world.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="DHI.DFS">
-      <Version>22.0.3</Version>
-    </PackageReference>
-    <PackageReference Include="DotNetZip">
-      <Version>1.16.0</Version>
-    </PackageReference>
-    <PackageReference Include="MathNet.Numerics">
-      <Version>5.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="Newtonsoft.Json">
-      <Version>13.0.3</Version>
-    </PackageReference>
-    <PackageReference Include="Steema.TeeChart.NET">
-      <Version>4.2023.4.18</Version>
-    </PackageReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-  <PropertyGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{CE4132A2-2E2F-4F54-B66D-1BAA928D499E}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <StartupObject>Sub Main</StartupObject>
+    <RootNamespace>BlueM.Wave</RootNamespace>
+    <AssemblyName>Wave</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <MyType>Empty</MyType>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <Deterministic>false</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionExplicit>On</OptionExplicit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionCompare>Binary</OptionCompare>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionStrict>Off</OptionStrict>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionInfer>On</OptionInfer>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>Resources\Wave.ico</ApplicationIcon>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DocumentationFile>Wave.xml</DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DocumentationFile>Wave.xml</DocumentationFile>
+    <Optimize>true</Optimize>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+    <DebugType>None</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DocumentationFile>Wave.xml</DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DocumentationFile>Wave.xml</DocumentationFile>
+    <Optimize>true</Optimize>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+    <DebugType>None</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="MathParserNet, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>lib\MathParserNet\MathParserNet.dll</HintPath>
+    </Reference>
+    <Reference Include="modelEAU.SWMM.DllAdapter, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>lib\modelEAU\modelEAU.SWMM.DllAdapter.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Data.SQLite, Version=1.0.118.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>lib\SQLite\System.Data.SQLite.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml.Linq" />
+  </ItemGroup>
+  <ItemGroup>
+    <Import Include="Microsoft.VisualBasic" />
+    <Import Include="System" />
+    <Import Include="System.Collections" />
+    <Import Include="System.Collections.Generic" />
+    <Import Include="System.Data" />
+    <Import Include="System.Drawing" />
+    <Import Include="System.Diagnostics" />
+    <Import Include="System.Windows.Forms" />
+    <Import Include="System.Linq" />
+    <Import Include="System.Xml.Linq" />
+    <Import Include="System.Threading.Tasks" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Analysis\Analysis.vb" />
+    <Compile Include="Analysis\AnalysisResultChart.Designer.vb">
+      <DependentUpon>AnalysisResultChart.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Analysis\AnalysisResultChart.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Analysis\AnalysisDialog.Designer.vb">
+      <DependentUpon>AnalysisDialog.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Analysis\AnalysisDialog.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Analysis\AnalysisFactory.vb" />
+    <Compile Include="Analysis\AnalysisResultTable.Designer.vb">
+      <DependentUpon>AnalysisResultTable.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Analysis\AnalysisResultTable.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Analysis\AnnualStatistics.vb" />
+    <Compile Include="Analysis\AnnualRecurrenceProbability_Dialog.Designer.vb">
+      <DependentUpon>AnnualRecurrenceProbability_Dialog.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Analysis\AnnualRecurrenceProbability_Dialog.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Analysis\Autocorrelation.vb" />
+    <Compile Include="Analysis\Autocorrelation_Dialog.Designer.vb">
+      <DependentUpon>Autocorrelation_Dialog.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Analysis\Autocorrelation_Dialog.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Analysis\Calculator.vb" />
+    <Compile Include="Analysis\ChangeTimestep.vb" />
+    <Compile Include="Analysis\AccumulateDialog.Designer.vb">
+      <DependentUpon>AccumulateDialog.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Analysis\AccumulateDialog.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Analysis\ChangeTimestepDialog.Designer.vb">
+      <DependentUpon>ChangeTimestepDialog.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Analysis\ChangeTimestepDialog.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Analysis\CalculatorVariable.vb" />
+    <Compile Include="Analysis\Comparison.vb" />
+    <Compile Include="Analysis\Comparison_Dialog.Designer.vb">
+      <DependentUpon>Comparison_Dialog.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Analysis\Comparison_Dialog.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Analysis\Accumulate.vb" />
+    <Compile Include="Analysis\Decumulate.vb" />
+    <Compile Include="Analysis\DoubleSumCurve.vb" />
+    <Compile Include="Analysis\GoodnessOfFit.vb" />
+    <Compile Include="Analysis\AnnualStatistics_Dialog.Designer.vb">
+      <DependentUpon>AnnualStatistics_Dialog.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Analysis\AnnualStatistics_Dialog.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Analysis\GoodnessOfFit_Dialog.Designer.vb">
+      <DependentUpon>GoodnessOfFit_Dialog.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Analysis\GoodnessOfFit_Dialog.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Analysis\Histogram.vb" />
+    <Compile Include="Analysis\HistogramDialog.Designer.vb">
+      <DependentUpon>HistogramDialog.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Analysis\HistogramDialog.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Analysis\LinearRegression.vb" />
+    <Compile Include="Analysis\LinearRegression_Dialog.Designer.vb">
+      <DependentUpon>LinearRegression_Dialog.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Analysis\LinearRegression_Dialog.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Analysis\MonthlyStatistics.vb" />
+    <Compile Include="Analysis\MonthlyStatisticsDialog.Designer.vb">
+      <DependentUpon>MonthlyStatisticsDialog.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Analysis\MonthlyStatisticsDialog.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Analysis\AnnualRecurrenceProbability.vb" />
+    <Compile Include="Analysis\TestAnalysis.vb" />
+    <Compile Include="Analysis\TimestepAnalysis.vb" />
+    <Compile Include="Analysis\TimestepAnalysisDialog.Designer.vb">
+      <DependentUpon>TimestepAnalysisDialog.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Analysis\TimestepAnalysisDialog.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Classes\AxisWrapper.vb" />
+    <Compile Include="Dialogs\EditChartDialog.Designer.vb">
+      <DependentUpon>EditChartDialog.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Dialogs\EditChartDialog.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Dialogs\SaveProjectFileDialog.Designer.vb">
+      <DependentUpon>SaveProjectFileDialog.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Dialogs\SaveProjectFileDialog.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Dialogs\SelectSeriesDialog.Designer.vb">
+      <DependentUpon>SelectSeriesDialog.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Dialogs\SelectSeriesDialog.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Classes\TimeSeriesDisplayOptions.vb" />
+    <Compile Include="FileFormats\JAMS.vb" />
+    <Compile Include="Main.vb" />
+    <Compile Include="App.vb" />
+    <Compile Include="Classes\Character.vb" />
+    <Compile Include="Classes\Metadata.vb" />
+    <Compile Include="Classes\Month.vb" />
+    <Compile Include="Classes\TimeSeries.vb" />
+    <Compile Include="Classes\TimeSeriesCollection.vb" />
+    <Compile Include="Classes\TimeSeriesDataSource.vb" />
+    <Compile Include="Classes\TimeSeriesFile.vb" />
+    <Compile Include="Classes\TimeSeriesInfo.vb" />
+    <Compile Include="CLI.vb" />
+    <Compile Include="Constants.vb" />
+    <Compile Include="Controllers\Controller.vb" />
+    <Compile Include="Controllers\PropertiesController.vb" />
+    <Compile Include="Controllers\ValuesController.vb" />
+    <Compile Include="Controllers\WaveController.vb" />
+    <Compile Include="Dialogs\AboutBox.Designer.vb">
+      <DependentUpon>AboutBox.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Dialogs\AboutBox.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Dialogs\ConvertErrorValuesDialog.Designer.vb">
+      <DependentUpon>ConvertErrorValuesDialog.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Dialogs\ConvertErrorValuesDialog.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Dialogs\CutDialog.Designer.vb">
+      <DependentUpon>CutDialog.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Dialogs\CutDialog.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Analysis\CalculatorDialog.Designer.vb">
+      <DependentUpon>CalculatorDialog.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Analysis\CalculatorDialog.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Dialogs\ExportDiag.Designer.vb">
+      <DependentUpon>ExportDiag.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Dialogs\ExportDiag.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Dialogs\ImportCSVDialog.Designer.vb">
+      <DependentUpon>ImportCSVDialog.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Dialogs\ImportCSVDialog.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Dialogs\LogWindow.Designer.vb">
+      <DependentUpon>LogWindow.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Dialogs\LogWindow.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Dialogs\MergeSeriesDialog.Designer.vb">
+      <DependentUpon>MergeSeriesDialog.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Dialogs\MergeSeriesDialog.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Dialogs\MetadataDialog.Designer.vb">
+      <DependentUpon>MetadataDialog.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Dialogs\MetadataDialog.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Dialogs\SeriesEditorDialog.Designer.vb">
+      <DependentUpon>SeriesEditorDialog.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Dialogs\SeriesEditorDialog.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FileFormats\ASC.vb" />
+    <Compile Include="FileFormats\WBL.vb" />
+    <Compile Include="FileFormats\DFS0_ExportDialog.Designer.vb">
+      <DependentUpon>DFS0_ExportDialog.vb</DependentUpon>
+    </Compile>
+    <Compile Include="FileFormats\DFS0_ExportDialog.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FileFormats\SWMM_INTERFACE.vb" />
+    <Compile Include="FileFormats\SWMM_LID_REPORT.vb" />
+    <Compile Include="FileFormats\WVP.vb" />
+    <Compile Include="FileFormats\DFS0.vb" />
+    <Compile Include="FileFormats\BIN.vb" />
+    <Compile Include="FileFormats\CSV.vb" />
+    <Compile Include="FileFormats\HYDRO_AS-2D.vb" />
+    <Compile Include="FileFormats\HYDRO_AS-2D_Diag.Designer.vb">
+      <DependentUpon>HYDRO_AS-2D_Diag.vb</DependentUpon>
+    </Compile>
+    <Compile Include="FileFormats\HYDRO_AS-2D_Diag.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FileFormats\HystemExtran_REG.vb" />
+    <Compile Include="FileFormats\HystemExtran_WEL.vb" />
+    <Compile Include="FileFormats\PRMS.vb" />
+    <Compile Include="FileFormats\SMUSI_REG.vb" />
+    <Compile Include="FileFormats\SMB.vb" />
+    <Compile Include="FileFormats\SWMM_TIMESERIES.vb" />
+    <Compile Include="FileFormats\SWMM_OUT.vb" />
+    <Compile Include="FileFormats\SydroSQLite.vb" />
+    <Compile Include="FileFormats\UVF.vb" />
+    <Compile Include="FileFormats\WEL.vb" />
+    <Compile Include="FileFormats\GISMO_WEL.vb" />
+    <Compile Include="FileFormats\ZRE.vb" />
+    <Compile Include="FileFormats\ZRXP.vb" />
+    <Compile Include="Helpers.vb" />
+    <Compile Include="Log.vb" />
+    <Compile Include="My Project\AssemblyInfo.vb" />
+    <Compile Include="My Project\Application.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Application.myapp</DependentUpon>
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <Compile Include="My Project\Resources.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="My Project\Settings.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <Compile Include="Views\IView.vb" />
+    <Compile Include="Views\MainWindow.Designer.vb">
+      <DependentUpon>MainWindow.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Views\MainWindow.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Views\PropertiesWindow.Designer.vb">
+      <DependentUpon>PropertiesWindow.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Views\PropertiesWindow.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Views\ValuesWindow.Designer.vb">
+      <DependentUpon>ValuesWindow.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Views\ValuesWindow.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Wave.vb" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Analysis\AnalysisResultChart.resx">
+      <DependentUpon>AnalysisResultChart.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Analysis\AnalysisDialog.resx">
+      <DependentUpon>AnalysisDialog.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Analysis\AnalysisResultTable.resx">
+      <DependentUpon>AnalysisResultTable.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Analysis\AnnualRecurrenceProbability_Dialog.resx">
+      <DependentUpon>AnnualRecurrenceProbability_Dialog.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Analysis\Autocorrelation_Dialog.resx">
+      <DependentUpon>Autocorrelation_Dialog.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Analysis\AccumulateDialog.resx">
+      <DependentUpon>AccumulateDialog.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Analysis\ChangeTimestepDialog.resx">
+      <DependentUpon>ChangeTimestepDialog.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Analysis\Comparison_Dialog.resx">
+      <DependentUpon>Comparison_Dialog.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Analysis\AnnualStatistics_Dialog.resx">
+      <DependentUpon>AnnualStatistics_Dialog.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Analysis\GoodnessOfFit_Dialog.resx">
+      <DependentUpon>GoodnessOfFit_Dialog.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Analysis\HistogramDialog.resx">
+      <DependentUpon>HistogramDialog.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Analysis\LinearRegression_Dialog.resx">
+      <DependentUpon>LinearRegression_Dialog.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Analysis\MonthlyStatisticsDialog.resx">
+      <DependentUpon>MonthlyStatisticsDialog.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Analysis\TimestepAnalysisDialog.resx">
+      <DependentUpon>TimestepAnalysisDialog.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Dialogs\AboutBox.resx">
+      <DependentUpon>AboutBox.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Dialogs\ConvertErrorValuesDialog.resx">
+      <DependentUpon>ConvertErrorValuesDialog.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Dialogs\CutDialog.resx">
+      <DependentUpon>CutDialog.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Analysis\CalculatorDialog.resx">
+      <DependentUpon>CalculatorDialog.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Dialogs\EditChartDialog.resx">
+      <DependentUpon>EditChartDialog.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Dialogs\SaveProjectFileDialog.resx">
+      <DependentUpon>SaveProjectFileDialog.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Dialogs\ExportDiag.resx">
+      <DependentUpon>ExportDiag.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Dialogs\SelectSeriesDialog.resx">
+      <DependentUpon>SelectSeriesDialog.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Dialogs\ImportCSVDialog.resx">
+      <DependentUpon>ImportCSVDialog.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Dialogs\LogWindow.resx">
+      <DependentUpon>LogWindow.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Dialogs\MergeSeriesDialog.resx">
+      <DependentUpon>MergeSeriesDialog.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Dialogs\MetadataDialog.resx">
+      <DependentUpon>MetadataDialog.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Dialogs\SeriesEditorDialog.resx">
+      <DependentUpon>SeriesEditorDialog.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FileFormats\DFS0_ExportDialog.resx">
+      <DependentUpon>DFS0_ExportDialog.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FileFormats\HYDRO_AS-2D_Diag.resx">
+      <DependentUpon>HYDRO_AS-2D_Diag.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="My Project\Resources.resx">
+      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="My Project\TeeChart.licenses" />
+    <EmbeddedResource Include="Views\MainWindow.resx">
+      <DependentUpon>MainWindow.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Views\PropertiesWindow.resx">
+      <DependentUpon>PropertiesWindow.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Views\ValuesWindow.resx">
+      <DependentUpon>ValuesWindow.vb</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="CHANGELOG.md">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="lib\Newtonsoft.Json\Newtonsoft.Json.LICENSE.md" />
+    <None Include="lib\SQLite\System.Data.SQLite.dll.config" />
+    <None Include="My Project\Application.myapp">
+      <Generator>MyApplicationCodeGenerator</Generator>
+      <LastGenOutput>Application.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="My Project\DataSources\AxisWrapper.datasource" />
+    <None Include="My Project\DataSources\TimeSeries.datasource" />
+    <None Include="My Project\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <CustomToolNamespace>My</CustomToolNamespace>
+      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="lib\DHI.DFS\DHI.DFS.license.txt" />
+    <Content Include="lib\MathNet\MathNet.Numerics.license.txt" />
+    <Content Include="lib\MathParserNet\MathParserNet.dll" />
+    <Content Include="lib\MathParserNet\MathParserNet.license.html" />
+    <Content Include="lib\modelEAU\modelEAU.SWMM.DllAdapter.dll" />
+    <Content Include="lib\SQLite\System.Data.SQLite.dll" />
+    <Content Include="lib\SQLite\x64\SQLite.Interop.dll" />
+    <Content Include="lib\SQLite\x86\SQLite.Interop.dll" />
+    <None Include="Resources\accept.png" />
+    <None Include="Resources\accept_grayscale.png" />
+    <None Include="Resources\accept_split.png" />
+    <Content Include="Resources\application_get.png" />
+    <Content Include="Resources\application_split.png" />
+    <Content Include="Resources\arrow_down.png" />
+    <Content Include="Resources\arrow_join_right.png" />
+    <Content Include="Resources\arrow_refresh.png" />
+    <Content Include="Resources\arrow_up.png" />
+    <Content Include="Resources\arrow_up_down.png" />
+    <Content Include="Resources\BlueM.png" />
+    <Content Include="Resources\BlueM_icon.png" />
+    <Content Include="Resources\calculator.png" />
+    <Content Include="Resources\cancel.png" />
+    <Content Include="Resources\cancel_inactive.png" />
+    <Content Include="Resources\chart_curve.png" />
+    <Content Include="Resources\chart_curve_edit.png" />
+    <Content Include="Resources\chart_curve_link.png" />
+    <Content Include="Resources\chart_line_add.png" />
+    <Content Include="Resources\chart_line_delete.png" />
+    <Content Include="Resources\chart_line_edit.png" />
+    <Content Include="Resources\chart_line_error.png" />
+    <Content Include="Resources\chart_magnify.png" />
+    <Content Include="Resources\chart_pie.png" />
+    <Content Include="Resources\color_wheel.png" />
+    <Content Include="Resources\comments.png" />
+    <Content Include="Resources\controller.png" />
+    <Content Include="Resources\control_end.png" />
+    <Content Include="Resources\control_fastforward.png" />
+    <Content Include="Resources\control_rewind.png" />
+    <Content Include="Resources\control_start.png" />
+    <Content Include="Resources\cursor.png" />
+    <EmbeddedResource Include="Resources\cursor_pan.cur" />
+    <EmbeddedResource Include="Resources\cursor_zoom.cur" />
+    <Content Include="Resources\cut.png" />
+    <Content Include="Resources\database_refresh.png" />
+    <Content Include="Resources\error.png" />
+    <Content Include="Resources\error_convert.png" />
+    <Content Include="Resources\error_delete.png" />
+    <Content Include="Resources\error_inactive.png" />
+    <Content Include="Resources\help.png" />
+    <Content Include="Resources\log.ico" />
+    <Content Include="Resources\navigate_back.png" />
+    <Content Include="Resources\navigate_forward.png" />
+    <Content Include="Resources\page_paste.png" />
+    <Content Include="Resources\page_save.png" />
+    <Content Include="Resources\page_white_go.png" />
+    <Content Include="Resources\pan.png" />
+    <Content Include="Resources\picture_save.png" />
+    <Content Include="Resources\script.png" />
+    <Content Include="Resources\shape_align_bottom.png" />
+    <Content Include="Resources\table.png" />
+    <Content Include="Resources\table_edit.png" />
+    <Content Include="Resources\table_gear.png" />
+    <Content Include="Resources\table_save.png" />
+    <Content Include="Resources\tick.png" />
+    <Content Include="Resources\wave.ico" />
+    <Content Include="Resources\zoom.png" />
+    <Content Include="Resources\zoom_in.png" />
+    <Content Include="Resources\zoom_next.png" />
+    <Content Include="Resources\zoom_out.png" />
+    <Content Include="Resources\zoom_previous.png" />
+    <Content Include="Resources\zoom_world.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="DHI.DFS">
+      <Version>22.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="DotNetZip">
+      <Version>1.16.0</Version>
+    </PackageReference>
+    <PackageReference Include="MathNet.Numerics">
+      <Version>5.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="Newtonsoft.Json">
+      <Version>13.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="Steema.TeeChart.NET">
+      <Version>4.2023.4.18</Version>
+    </PackageReference>
+    <PackageReference Include="ScottPlot.WinForms">
+      <Version>4.1.69</Version>
+    </PackageReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+  <PropertyGroup>
     <PostBuildEvent>copy $(ProjectDir)..\COPYING $(TargetDir)COPYING
 copy $(ProjectDir)..\COPYING.LESSER $(TargetDir)COPYING.LESSER
 copy $(ProjectDir)lib\MathNet\MathNet.Numerics.license.txt $(TargetDir)MathNet.Numerics.license.txt
 copy $(ProjectDir)lib\MathParserNet\MathParserNet.license.html $(TargetDir)MathParserNet.license.html
 copy $(ProjectDir)lib\Newtonsoft.Json\Newtonsoft.Json.LICENSE.md $(TargetDir)Newtonsoft.Json.LICENSE.md
 copy $(ProjectDir)lib\DHI.DFS\DHI.DFS.license.txt $(TargetDir)DHI.DFS.license.txt
-copy $(ProjectDir)lib\SQLite\$(PlatformName)\SQLite.Interop.dll $(TargetDir)SQLite.Interop.dll</PostBuildEvent>
-  </PropertyGroup>
+copy $(ProjectDir)lib\SQLite\$(PlatformName)\SQLite.Interop.dll $(TargetDir)SQLite.Interop.dll</PostBuildEvent>
+  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/TestWVP.vb b/tests/TestWVP.vb
index b12e96d9..3a273377 100644
--- a/tests/TestWVP.vb
+++ b/tests/TestWVP.vb
@@ -58,7 +58,7 @@ Imports Microsoft.VisualStudio.TestTools.UnitTesting
             Assert.AreEqual(TimeSeries.InterpretationEnum.BlockLeft, .Interpretation)
             Assert.AreEqual("Red", .DisplayOptions.Color.Name)
             Assert.AreEqual(4, .DisplayOptions.LineWidth)
-            Assert.AreEqual(Drawing.Drawing2D.DashStyle.Dash, .DisplayOptions.LineStyle)
+            Assert.AreEqual(ScottPlot.LineStyle.Dash, .DisplayOptions.LineStyle)
             Assert.AreEqual(True, .DisplayOptions.ShowPoints)
         End With
 
diff --git a/tests/Wave.Tests.vbproj b/tests/Wave.Tests.vbproj
index fca29596..dbd75b5b 100644
--- a/tests/Wave.Tests.vbproj
+++ b/tests/Wave.Tests.vbproj
@@ -138,6 +138,9 @@
     <PackageReference Include="MSTest.TestFramework">
       <Version>3.1.1</Version>
     </PackageReference>
+    <PackageReference Include="ScottPlot.WinForms">
+      <Version>4.1.69</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\source\Wave.vbproj">