diff --git a/VECTO/File Browser/FileBrowserDialog.designer.vb b/VECTO/File Browser/FileBrowserDialog.designer.vb
index 796f7facac9494ee286ecbef2d722f2dec3c6caf..a9fcb89c3dbcd99c861c97a92dae1d804ef26d61 100644
--- a/VECTO/File Browser/FileBrowserDialog.designer.vb	
+++ b/VECTO/File Browser/FileBrowserDialog.designer.vb	
@@ -35,392 +35,392 @@ Partial Class FileBrowserDialog
 	'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
 	<DebuggerStepThrough()> _
 	Private Sub InitializeComponent()
-		Me.components = New Container()
-		Dim resources As ComponentResourceManager = New ComponentResourceManager(GetType(FileBrowserDialog))
-		Me.SplitContainer1 = New SplitContainer()
-		Me.Label1 = New Label()
-		Me.ButtonNewDir = New Button()
-		Me.ButtonDesktop = New Button()
-		Me.ButtonHisFolder = New Button()
-		Me.ButtonFolderBack = New Button()
-		Me.TextBoxSearchFolder = New TextBox()
-		Me.ListViewFolder = New ListView()
-		Me.ColumnHeader3 = CType(New ColumnHeader(), ColumnHeader)
-		Me.ImageList1 = New ImageList(Me.components)
-		Me.ComboBoxDrive = New ComboBox()
-		Me.Label5 = New Label()
-		Me.Label2 = New Label()
-		Me.ButtonAll = New Button()
-		Me.ComboBoxExt = New ComboBox()
-		Me.ButtonHisFile = New Button()
-		Me.TextBoxSearchFile = New TextBox()
-		Me.ListViewFiles = New ListView()
-		Me.ColumnHeader1 = CType(New ColumnHeader(), ColumnHeader)
-		Me.ContextMenuFile = New ContextMenuStrip(Me.components)
-		Me.RenameFileToolStripMenuItem = New ToolStripMenuItem()
-		Me.DeleteFileToolStripMenuItem = New ToolStripMenuItem()
-		Me.TextBoxPath = New TextBox()
-		Me.ContextMenuHisFolder = New ContextMenuStrip(Me.components)
-		Me.ContextMenuHisFile = New ContextMenuStrip(Me.components)
-		Me.ButtonOK = New Button()
-		Me.ButtonCancel = New Button()
-		Me.TextBoxCurrent = New TextBox()
-		Me.Label3 = New Label()
-		Me.Label4 = New Label()
-		Me.ToolTip1 = New ToolTip(Me.components)
-		CType(Me.SplitContainer1, ISupportInitialize).BeginInit()
-		Me.SplitContainer1.Panel1.SuspendLayout()
-		Me.SplitContainer1.Panel2.SuspendLayout()
-		Me.SplitContainer1.SuspendLayout()
-		Me.ContextMenuFile.SuspendLayout()
-		Me.SuspendLayout()
-		'
-		'SplitContainer1
-		'
-		Me.SplitContainer1.Anchor = CType((((AnchorStyles.Top Or AnchorStyles.Bottom) _
-			Or AnchorStyles.Left) _
-			Or AnchorStyles.Right), AnchorStyles)
-		Me.SplitContainer1.BorderStyle = BorderStyle.Fixed3D
-		Me.SplitContainer1.Location = New Point(0, 46)
-		Me.SplitContainer1.Name = "SplitContainer1"
-		'
-		'SplitContainer1.Panel1
-		'
-		Me.SplitContainer1.Panel1.Controls.Add(Me.Label1)
-		Me.SplitContainer1.Panel1.Controls.Add(Me.ButtonNewDir)
-		Me.SplitContainer1.Panel1.Controls.Add(Me.ButtonDesktop)
-		Me.SplitContainer1.Panel1.Controls.Add(Me.ButtonHisFolder)
-		Me.SplitContainer1.Panel1.Controls.Add(Me.ButtonFolderBack)
-		Me.SplitContainer1.Panel1.Controls.Add(Me.TextBoxSearchFolder)
-		Me.SplitContainer1.Panel1.Controls.Add(Me.ListViewFolder)
-		Me.SplitContainer1.Panel1.Controls.Add(Me.ComboBoxDrive)
-		'
-		'SplitContainer1.Panel2
-		'
-		Me.SplitContainer1.Panel2.Controls.Add(Me.Label5)
-		Me.SplitContainer1.Panel2.Controls.Add(Me.Label2)
-		Me.SplitContainer1.Panel2.Controls.Add(Me.ButtonAll)
-		Me.SplitContainer1.Panel2.Controls.Add(Me.ComboBoxExt)
-		Me.SplitContainer1.Panel2.Controls.Add(Me.ButtonHisFile)
-		Me.SplitContainer1.Panel2.Controls.Add(Me.TextBoxSearchFile)
-		Me.SplitContainer1.Panel2.Controls.Add(Me.ListViewFiles)
-		Me.SplitContainer1.Size = New Size(663, 308)
-		Me.SplitContainer1.SplitterDistance = 329
-		Me.SplitContainer1.TabIndex = 5
-		Me.SplitContainer1.TabStop = False
-		'
-		'Label1
-		'
-		Me.Label1.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles)
-		Me.Label1.AutoSize = True
-		Me.Label1.Location = New Point(3, 284)
-		Me.Label1.Name = "Label1"
-		Me.Label1.Size = New Size(32, 13)
-		Me.Label1.TabIndex = 28
-		Me.Label1.Text = "Filter:"
-		'
-		'ButtonNewDir
-		'
-		Me.ButtonNewDir.Image = My.Resources.Resources.new_dir
-		Me.ButtonNewDir.Location = New Point(119, 1)
-		Me.ButtonNewDir.Name = "ButtonNewDir"
-		Me.ButtonNewDir.Size = New Size(26, 25)
-		Me.ButtonNewDir.TabIndex = 21
-		Me.ButtonNewDir.TabStop = False
-		Me.ToolTip1.SetToolTip(Me.ButtonNewDir, "Create new Directory")
-		Me.ButtonNewDir.UseVisualStyleBackColor = True
-		'
-		'ButtonDesktop
-		'
-		Me.ButtonDesktop.Image = My.Resources.Resources.desktop
-		Me.ButtonDesktop.Location = New Point(90, 1)
-		Me.ButtonDesktop.Name = "ButtonDesktop"
-		Me.ButtonDesktop.Size = New Size(26, 25)
-		Me.ButtonDesktop.TabIndex = 22
-		Me.ButtonDesktop.TabStop = False
-		Me.ToolTip1.SetToolTip(Me.ButtonDesktop, "Go to Desktop")
-		Me.ButtonDesktop.UseVisualStyleBackColor = True
-		'
-		'ButtonHisFolder
-		'
-		Me.ButtonHisFolder.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles)
-		Me.ButtonHisFolder.Image = My.Resources.Resources.file_history
-		Me.ButtonHisFolder.Location = New Point(298, 1)
-		Me.ButtonHisFolder.Name = "ButtonHisFolder"
-		Me.ButtonHisFolder.Size = New Size(26, 25)
-		Me.ButtonHisFolder.TabIndex = 24
-		Me.ButtonHisFolder.TabStop = False
-		Me.ToolTip1.SetToolTip(Me.ButtonHisFolder, "History / Favorites")
-		Me.ButtonHisFolder.UseVisualStyleBackColor = True
-		'
-		'ButtonFolderBack
-		'
-		Me.ButtonFolderBack.Image = CType(resources.GetObject("ButtonFolderBack.Image"), Image)
-		Me.ButtonFolderBack.Location = New Point(61, 1)
-		Me.ButtonFolderBack.Name = "ButtonFolderBack"
-		Me.ButtonFolderBack.Size = New Size(26, 25)
-		Me.ButtonFolderBack.TabIndex = 20
-		Me.ButtonFolderBack.TabStop = False
-		Me.ToolTip1.SetToolTip(Me.ButtonFolderBack, "Move up one directory")
-		Me.ButtonFolderBack.UseVisualStyleBackColor = True
-		'
-		'TextBoxSearchFolder
-		'
-		Me.TextBoxSearchFolder.Anchor = CType(((AnchorStyles.Bottom Or AnchorStyles.Left) _
-			Or AnchorStyles.Right), AnchorStyles)
-		Me.TextBoxSearchFolder.Location = New Point(37, 281)
-		Me.TextBoxSearchFolder.Name = "TextBoxSearchFolder"
-		Me.TextBoxSearchFolder.Size = New Size(288, 20)
-		Me.TextBoxSearchFolder.TabIndex = 15
-		Me.ToolTip1.SetToolTip(Me.TextBoxSearchFolder, "Filter the directories")
-		'
-		'ListViewFolder
-		'
-		Me.ListViewFolder.Anchor = CType((((AnchorStyles.Top Or AnchorStyles.Bottom) _
-			Or AnchorStyles.Left) _
-			Or AnchorStyles.Right), AnchorStyles)
-		Me.ListViewFolder.Columns.AddRange(New ColumnHeader() {Me.ColumnHeader3})
-		Me.ListViewFolder.FullRowSelect = True
-		Me.ListViewFolder.GridLines = True
-		Me.ListViewFolder.HideSelection = False
-		Me.ListViewFolder.Location = New Point(-2, 27)
-		Me.ListViewFolder.MultiSelect = False
-		Me.ListViewFolder.Name = "ListViewFolder"
-		Me.ListViewFolder.Size = New Size(327, 253)
-		Me.ListViewFolder.SmallImageList = Me.ImageList1
-		Me.ListViewFolder.TabIndex = 10
-		Me.ListViewFolder.UseCompatibleStateImageBehavior = False
-		Me.ListViewFolder.View = View.Details
-		'
-		'ColumnHeader3
-		'
-		Me.ColumnHeader3.Text = "Sub-Directories:"
-		Me.ColumnHeader3.Width = 368
-		'
-		'ImageList1
-		'
-		Me.ImageList1.ColorDepth = ColorDepth.Depth32Bit
-		Me.ImageList1.ImageSize = New Size(16, 16)
-		Me.ImageList1.TransparentColor = Color.Transparent
-		'
-		'ComboBoxDrive
-		'
-		Me.ComboBoxDrive.DropDownStyle = ComboBoxStyle.DropDownList
-		Me.ComboBoxDrive.FormattingEnabled = True
-		Me.ComboBoxDrive.Location = New Point(3, 3)
-		Me.ComboBoxDrive.Name = "ComboBoxDrive"
-		Me.ComboBoxDrive.Size = New Size(54, 21)
-		Me.ComboBoxDrive.TabIndex = 5
-		'
-		'Label5
-		'
-		Me.Label5.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles)
-		Me.Label5.AutoSize = True
-		Me.Label5.Location = New Point(256, 284)
-		Me.Label5.Name = "Label5"
-		Me.Label5.Size = New Size(10, 13)
-		Me.Label5.TabIndex = 30
-		Me.Label5.Text = "."
-		'
-		'Label2
-		'
-		Me.Label2.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles)
-		Me.Label2.AutoSize = True
-		Me.Label2.Location = New Point(3, 284)
-		Me.Label2.Name = "Label2"
-		Me.Label2.Size = New Size(32, 13)
-		Me.Label2.TabIndex = 29
-		Me.Label2.Text = "Filter:"
-		'
-		'ButtonAll
-		'
-		Me.ButtonAll.Location = New Point(2, 2)
-		Me.ButtonAll.Name = "ButtonAll"
-		Me.ButtonAll.Size = New Size(71, 23)
-		Me.ButtonAll.TabIndex = 19
-		Me.ButtonAll.Text = "Select All"
-		Me.ToolTip1.SetToolTip(Me.ButtonAll, "Select all shown files")
-		Me.ButtonAll.UseVisualStyleBackColor = True
-		'
-		'ComboBoxExt
-		'
-		Me.ComboBoxExt.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles)
-		Me.ComboBoxExt.FormattingEnabled = True
-		Me.ComboBoxExt.Location = New Point(268, 281)
-		Me.ComboBoxExt.Name = "ComboBoxExt"
-		Me.ComboBoxExt.Size = New Size(57, 21)
-		Me.ComboBoxExt.TabIndex = 20
-		Me.ToolTip1.SetToolTip(Me.ComboBoxExt, "Filter the file type")
-		'
-		'ButtonHisFile
-		'
-		Me.ButtonHisFile.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles)
-		Me.ButtonHisFile.Image = My.Resources.Resources.file_history
-		Me.ButtonHisFile.Location = New Point(299, 1)
-		Me.ButtonHisFile.Name = "ButtonHisFile"
-		Me.ButtonHisFile.Size = New Size(26, 25)
-		Me.ButtonHisFile.TabIndex = 24
-		Me.ButtonHisFile.TabStop = False
-		Me.ToolTip1.SetToolTip(Me.ButtonHisFile, "History")
-		Me.ButtonHisFile.UseVisualStyleBackColor = True
-		'
-		'TextBoxSearchFile
-		'
-		Me.TextBoxSearchFile.Anchor = CType(((AnchorStyles.Bottom Or AnchorStyles.Left) _
-			Or AnchorStyles.Right), AnchorStyles)
-		Me.TextBoxSearchFile.Location = New Point(36, 281)
-		Me.TextBoxSearchFile.Name = "TextBoxSearchFile"
-		Me.TextBoxSearchFile.Size = New Size(218, 20)
-		Me.TextBoxSearchFile.TabIndex = 15
-		Me.ToolTip1.SetToolTip(Me.TextBoxSearchFile, "Filter the files")
-		'
-		'ListViewFiles
-		'
-		Me.ListViewFiles.Anchor = CType((((AnchorStyles.Top Or AnchorStyles.Bottom) _
-			Or AnchorStyles.Left) _
-			Or AnchorStyles.Right), AnchorStyles)
-		Me.ListViewFiles.Columns.AddRange(New ColumnHeader() {Me.ColumnHeader1})
-		Me.ListViewFiles.ContextMenuStrip = Me.ContextMenuFile
-		Me.ListViewFiles.FullRowSelect = True
-		Me.ListViewFiles.GridLines = True
-		Me.ListViewFiles.HideSelection = False
-		Me.ListViewFiles.Location = New Point(0, 27)
-		Me.ListViewFiles.Name = "ListViewFiles"
-		Me.ListViewFiles.Size = New Size(328, 253)
-		Me.ListViewFiles.SmallImageList = Me.ImageList1
-		Me.ListViewFiles.TabIndex = 10
-		Me.ListViewFiles.UseCompatibleStateImageBehavior = False
-		Me.ListViewFiles.View = View.Details
-		'
-		'ColumnHeader1
-		'
-		Me.ColumnHeader1.Text = "Files:"
-		Me.ColumnHeader1.Width = 367
-		'
-		'ContextMenuFile
-		'
-		Me.ContextMenuFile.Items.AddRange(New ToolStripItem() {Me.RenameFileToolStripMenuItem, Me.DeleteFileToolStripMenuItem})
-		Me.ContextMenuFile.Name = "ContextMenuFile"
-		Me.ContextMenuFile.Size = New Size(148, 48)
-		'
-		'RenameFileToolStripMenuItem
-		'
-		Me.RenameFileToolStripMenuItem.Name = "RenameFileToolStripMenuItem"
-		Me.RenameFileToolStripMenuItem.Size = New Size(147, 22)
-		Me.RenameFileToolStripMenuItem.Text = "Rename File..."
-		'
-		'DeleteFileToolStripMenuItem
-		'
-		Me.DeleteFileToolStripMenuItem.Name = "DeleteFileToolStripMenuItem"
-		Me.DeleteFileToolStripMenuItem.Size = New Size(147, 22)
-		Me.DeleteFileToolStripMenuItem.Text = "Delete File..."
-		'
-		'TextBoxPath
-		'
-		Me.TextBoxPath.Anchor = CType(((AnchorStyles.Bottom Or AnchorStyles.Left) _
-			Or AnchorStyles.Right), AnchorStyles)
-		Me.TextBoxPath.Location = New Point(47, 370)
-		Me.TextBoxPath.Name = "TextBoxPath"
-		Me.TextBoxPath.Size = New Size(609, 20)
-		Me.TextBoxPath.TabIndex = 15
-		'
-		'ContextMenuHisFolder
-		'
-		Me.ContextMenuHisFolder.Name = "ContextMenuFolderHis"
-		Me.ContextMenuHisFolder.Size = New Size(61, 4)
-		'
-		'ContextMenuHisFile
-		'
-		Me.ContextMenuHisFile.Name = "ContextMenuFileHis"
-		Me.ContextMenuHisFile.Size = New Size(61, 4)
-		'
-		'ButtonOK
-		'
-		Me.ButtonOK.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles)
-		Me.ButtonOK.DialogResult = DialogResult.OK
-		Me.ButtonOK.Location = New Point(503, 399)
-		Me.ButtonOK.Name = "ButtonOK"
-		Me.ButtonOK.Size = New Size(75, 23)
-		Me.ButtonOK.TabIndex = 20
-		Me.ButtonOK.TabStop = False
-		Me.ButtonOK.Text = "OK"
-		Me.ButtonOK.UseVisualStyleBackColor = True
-		'
-		'ButtonCancel
-		'
-		Me.ButtonCancel.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles)
-		Me.ButtonCancel.DialogResult = DialogResult.Cancel
-		Me.ButtonCancel.Location = New Point(581, 399)
-		Me.ButtonCancel.Name = "ButtonCancel"
-		Me.ButtonCancel.Size = New Size(75, 23)
-		Me.ButtonCancel.TabIndex = 25
-		Me.ButtonCancel.TabStop = False
-		Me.ButtonCancel.Text = "Cancel"
-		Me.ButtonCancel.UseVisualStyleBackColor = True
-		'
-		'TextBoxCurrent
-		'
-		Me.TextBoxCurrent.Anchor = CType(((AnchorStyles.Top Or AnchorStyles.Left) _
-			Or AnchorStyles.Right), AnchorStyles)
-		Me.TextBoxCurrent.Cursor = Cursors.Hand
-		Me.TextBoxCurrent.Location = New Point(5, 17)
-		Me.TextBoxCurrent.Name = "TextBoxCurrent"
-		Me.TextBoxCurrent.ReadOnly = True
-		Me.TextBoxCurrent.Size = New Size(651, 20)
-		Me.TextBoxCurrent.TabIndex = 0
-		Me.TextBoxCurrent.TabStop = False
-		Me.ToolTip1.SetToolTip(Me.TextBoxCurrent, "Click for changing the directory")
-		'
-		'Label3
-		'
-		Me.Label3.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles)
-		Me.Label3.AutoSize = True
-		Me.Label3.Location = New Point(5, 373)
-		Me.Label3.Name = "Label3"
-		Me.Label3.Size = New Size(38, 13)
-		Me.Label3.TabIndex = 29
-		Me.Label3.Text = "Name:"
-		'
-		'Label4
-		'
-		Me.Label4.AutoSize = True
-		Me.Label4.Location = New Point(4, 3)
-		Me.Label4.Name = "Label4"
-		Me.Label4.Size = New Size(89, 13)
-		Me.Label4.TabIndex = 30
-		Me.Label4.Text = "Current Directory:"
-		'
-		'FB_Dialog
-		'
-		Me.AutoScaleDimensions = New SizeF(6.0!, 13.0!)
-		Me.AutoScaleMode = AutoScaleMode.Font
-		Me.CancelButton = Me.ButtonCancel
-		Me.ClientSize = New Size(663, 428)
-		Me.Controls.Add(Me.Label4)
-		Me.Controls.Add(Me.Label3)
-		Me.Controls.Add(Me.TextBoxCurrent)
-		Me.Controls.Add(Me.ButtonCancel)
-		Me.Controls.Add(Me.ButtonOK)
-		Me.Controls.Add(Me.TextBoxPath)
-		Me.Controls.Add(Me.SplitContainer1)
-		Me.MinimizeBox = False
-		Me.MinimumSize = New Size(341, 272)
-		Me.Name = "FileBrowserDialog"
-		Me.ShowIcon = False
-		Me.ShowInTaskbar = False
-		Me.StartPosition = FormStartPosition.CenterParent
-		Me.Text = "File Browser"
-		Me.SplitContainer1.Panel1.ResumeLayout(False)
-		Me.SplitContainer1.Panel1.PerformLayout()
-		Me.SplitContainer1.Panel2.ResumeLayout(False)
-		Me.SplitContainer1.Panel2.PerformLayout()
-		CType(Me.SplitContainer1, ISupportInitialize).EndInit()
-		Me.SplitContainer1.ResumeLayout(False)
-		Me.ContextMenuFile.ResumeLayout(False)
-		Me.ResumeLayout(False)
-		Me.PerformLayout()
+        Me.components = New System.ComponentModel.Container()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(FileBrowserDialog))
+        Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.ButtonNewDir = New System.Windows.Forms.Button()
+        Me.ButtonDesktop = New System.Windows.Forms.Button()
+        Me.ButtonHisFolder = New System.Windows.Forms.Button()
+        Me.ButtonFolderBack = New System.Windows.Forms.Button()
+        Me.TextBoxSearchFolder = New System.Windows.Forms.TextBox()
+        Me.ListViewFolder = New System.Windows.Forms.ListView()
+        Me.ColumnHeader3 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+        Me.ImageList1 = New System.Windows.Forms.ImageList(Me.components)
+        Me.ComboBoxDrive = New System.Windows.Forms.ComboBox()
+        Me.Label5 = New System.Windows.Forms.Label()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.ButtonAll = New System.Windows.Forms.Button()
+        Me.ComboBoxExt = New System.Windows.Forms.ComboBox()
+        Me.ButtonHisFile = New System.Windows.Forms.Button()
+        Me.TextBoxSearchFile = New System.Windows.Forms.TextBox()
+        Me.ListViewFiles = New System.Windows.Forms.ListView()
+        Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+        Me.ContextMenuFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.RenameFileToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.DeleteFileToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.TextBoxPath = New System.Windows.Forms.TextBox()
+        Me.ContextMenuHisFolder = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.ContextMenuHisFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.ButtonOK = New System.Windows.Forms.Button()
+        Me.ButtonCancel = New System.Windows.Forms.Button()
+        Me.TextBoxCurrent = New System.Windows.Forms.TextBox()
+        Me.Label3 = New System.Windows.Forms.Label()
+        Me.Label4 = New System.Windows.Forms.Label()
+        Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
+        CType(Me.SplitContainer1,System.ComponentModel.ISupportInitialize).BeginInit
+        Me.SplitContainer1.Panel1.SuspendLayout
+        Me.SplitContainer1.Panel2.SuspendLayout
+        Me.SplitContainer1.SuspendLayout
+        Me.ContextMenuFile.SuspendLayout
+        Me.SuspendLayout
+        '
+        '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, 46)
+        Me.SplitContainer1.Name = "SplitContainer1"
+        '
+        'SplitContainer1.Panel1
+        '
+        Me.SplitContainer1.Panel1.Controls.Add(Me.Label1)
+        Me.SplitContainer1.Panel1.Controls.Add(Me.ButtonNewDir)
+        Me.SplitContainer1.Panel1.Controls.Add(Me.ButtonDesktop)
+        Me.SplitContainer1.Panel1.Controls.Add(Me.ButtonHisFolder)
+        Me.SplitContainer1.Panel1.Controls.Add(Me.ButtonFolderBack)
+        Me.SplitContainer1.Panel1.Controls.Add(Me.TextBoxSearchFolder)
+        Me.SplitContainer1.Panel1.Controls.Add(Me.ListViewFolder)
+        Me.SplitContainer1.Panel1.Controls.Add(Me.ComboBoxDrive)
+        '
+        'SplitContainer1.Panel2
+        '
+        Me.SplitContainer1.Panel2.Controls.Add(Me.Label5)
+        Me.SplitContainer1.Panel2.Controls.Add(Me.Label2)
+        Me.SplitContainer1.Panel2.Controls.Add(Me.ButtonAll)
+        Me.SplitContainer1.Panel2.Controls.Add(Me.ComboBoxExt)
+        Me.SplitContainer1.Panel2.Controls.Add(Me.ButtonHisFile)
+        Me.SplitContainer1.Panel2.Controls.Add(Me.TextBoxSearchFile)
+        Me.SplitContainer1.Panel2.Controls.Add(Me.ListViewFiles)
+        Me.SplitContainer1.Size = New System.Drawing.Size(663, 308)
+        Me.SplitContainer1.SplitterDistance = 329
+        Me.SplitContainer1.TabIndex = 5
+        Me.SplitContainer1.TabStop = false
+        '
+        'Label1
+        '
+        Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+        Me.Label1.AutoSize = true
+        Me.Label1.Location = New System.Drawing.Point(3, 284)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(32, 13)
+        Me.Label1.TabIndex = 28
+        Me.Label1.Text = "Filter:"
+        '
+        'ButtonNewDir
+        '
+        Me.ButtonNewDir.Image = Global.TUGraz.VECTO.My.Resources.Resources.new_dir
+        Me.ButtonNewDir.Location = New System.Drawing.Point(119, 1)
+        Me.ButtonNewDir.Name = "ButtonNewDir"
+        Me.ButtonNewDir.Size = New System.Drawing.Size(26, 25)
+        Me.ButtonNewDir.TabIndex = 21
+        Me.ButtonNewDir.TabStop = false
+        Me.ToolTip1.SetToolTip(Me.ButtonNewDir, "Create new Directory")
+        Me.ButtonNewDir.UseVisualStyleBackColor = true
+        '
+        'ButtonDesktop
+        '
+        Me.ButtonDesktop.Image = Global.TUGraz.VECTO.My.Resources.Resources.desktop
+        Me.ButtonDesktop.Location = New System.Drawing.Point(90, 1)
+        Me.ButtonDesktop.Name = "ButtonDesktop"
+        Me.ButtonDesktop.Size = New System.Drawing.Size(26, 25)
+        Me.ButtonDesktop.TabIndex = 22
+        Me.ButtonDesktop.TabStop = false
+        Me.ToolTip1.SetToolTip(Me.ButtonDesktop, "Go to Desktop")
+        Me.ButtonDesktop.UseVisualStyleBackColor = true
+        '
+        'ButtonHisFolder
+        '
+        Me.ButtonHisFolder.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.ButtonHisFolder.Image = Global.TUGraz.VECTO.My.Resources.Resources.file_history
+        Me.ButtonHisFolder.Location = New System.Drawing.Point(298, 1)
+        Me.ButtonHisFolder.Name = "ButtonHisFolder"
+        Me.ButtonHisFolder.Size = New System.Drawing.Size(26, 25)
+        Me.ButtonHisFolder.TabIndex = 24
+        Me.ButtonHisFolder.TabStop = false
+        Me.ToolTip1.SetToolTip(Me.ButtonHisFolder, "History / Favorites")
+        Me.ButtonHisFolder.UseVisualStyleBackColor = true
+        '
+        'ButtonFolderBack
+        '
+        Me.ButtonFolderBack.Image = CType(resources.GetObject("ButtonFolderBack.Image"),System.Drawing.Image)
+        Me.ButtonFolderBack.Location = New System.Drawing.Point(61, 1)
+        Me.ButtonFolderBack.Name = "ButtonFolderBack"
+        Me.ButtonFolderBack.Size = New System.Drawing.Size(26, 25)
+        Me.ButtonFolderBack.TabIndex = 20
+        Me.ButtonFolderBack.TabStop = false
+        Me.ToolTip1.SetToolTip(Me.ButtonFolderBack, "Move up one directory")
+        Me.ButtonFolderBack.UseVisualStyleBackColor = true
+        '
+        'TextBoxSearchFolder
+        '
+        Me.TextBoxSearchFolder.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left)  _
+            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.TextBoxSearchFolder.Location = New System.Drawing.Point(37, 281)
+        Me.TextBoxSearchFolder.Name = "TextBoxSearchFolder"
+        Me.TextBoxSearchFolder.Size = New System.Drawing.Size(288, 20)
+        Me.TextBoxSearchFolder.TabIndex = 15
+        Me.ToolTip1.SetToolTip(Me.TextBoxSearchFolder, "Filter the directories")
+        '
+        'ListViewFolder
+        '
+        Me.ListViewFolder.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.ListViewFolder.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader3})
+        Me.ListViewFolder.FullRowSelect = true
+        Me.ListViewFolder.GridLines = true
+        Me.ListViewFolder.HideSelection = false
+        Me.ListViewFolder.Location = New System.Drawing.Point(-2, 27)
+        Me.ListViewFolder.MultiSelect = false
+        Me.ListViewFolder.Name = "ListViewFolder"
+        Me.ListViewFolder.Size = New System.Drawing.Size(327, 253)
+        Me.ListViewFolder.SmallImageList = Me.ImageList1
+        Me.ListViewFolder.TabIndex = 10
+        Me.ListViewFolder.UseCompatibleStateImageBehavior = false
+        Me.ListViewFolder.View = System.Windows.Forms.View.Details
+        '
+        'ColumnHeader3
+        '
+        Me.ColumnHeader3.Text = "Sub-Directories:"
+        Me.ColumnHeader3.Width = 368
+        '
+        'ImageList1
+        '
+        Me.ImageList1.ColorDepth = System.Windows.Forms.ColorDepth.Depth32Bit
+        Me.ImageList1.ImageSize = New System.Drawing.Size(16, 16)
+        Me.ImageList1.TransparentColor = System.Drawing.Color.Transparent
+        '
+        'ComboBoxDrive
+        '
+        Me.ComboBoxDrive.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.ComboBoxDrive.FormattingEnabled = true
+        Me.ComboBoxDrive.Location = New System.Drawing.Point(3, 3)
+        Me.ComboBoxDrive.Name = "ComboBoxDrive"
+        Me.ComboBoxDrive.Size = New System.Drawing.Size(54, 21)
+        Me.ComboBoxDrive.TabIndex = 5
+        '
+        'Label5
+        '
+        Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.Label5.AutoSize = true
+        Me.Label5.Location = New System.Drawing.Point(256, 284)
+        Me.Label5.Name = "Label5"
+        Me.Label5.Size = New System.Drawing.Size(10, 13)
+        Me.Label5.TabIndex = 30
+        Me.Label5.Text = "."
+        '
+        'Label2
+        '
+        Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+        Me.Label2.AutoSize = true
+        Me.Label2.Location = New System.Drawing.Point(3, 284)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(32, 13)
+        Me.Label2.TabIndex = 29
+        Me.Label2.Text = "Filter:"
+        '
+        'ButtonAll
+        '
+        Me.ButtonAll.Location = New System.Drawing.Point(2, 2)
+        Me.ButtonAll.Name = "ButtonAll"
+        Me.ButtonAll.Size = New System.Drawing.Size(71, 23)
+        Me.ButtonAll.TabIndex = 19
+        Me.ButtonAll.Text = "Select All"
+        Me.ToolTip1.SetToolTip(Me.ButtonAll, "Select all shown files")
+        Me.ButtonAll.UseVisualStyleBackColor = true
+        '
+        'ComboBoxExt
+        '
+        Me.ComboBoxExt.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.ComboBoxExt.FormattingEnabled = true
+        Me.ComboBoxExt.Location = New System.Drawing.Point(268, 281)
+        Me.ComboBoxExt.Name = "ComboBoxExt"
+        Me.ComboBoxExt.Size = New System.Drawing.Size(57, 21)
+        Me.ComboBoxExt.TabIndex = 20
+        Me.ToolTip1.SetToolTip(Me.ComboBoxExt, "Filter the file type")
+        '
+        'ButtonHisFile
+        '
+        Me.ButtonHisFile.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.ButtonHisFile.Image = Global.TUGraz.VECTO.My.Resources.Resources.file_history
+        Me.ButtonHisFile.Location = New System.Drawing.Point(299, 1)
+        Me.ButtonHisFile.Name = "ButtonHisFile"
+        Me.ButtonHisFile.Size = New System.Drawing.Size(26, 25)
+        Me.ButtonHisFile.TabIndex = 24
+        Me.ButtonHisFile.TabStop = false
+        Me.ToolTip1.SetToolTip(Me.ButtonHisFile, "History")
+        Me.ButtonHisFile.UseVisualStyleBackColor = true
+        '
+        'TextBoxSearchFile
+        '
+        Me.TextBoxSearchFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left)  _
+            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.TextBoxSearchFile.Location = New System.Drawing.Point(36, 281)
+        Me.TextBoxSearchFile.Name = "TextBoxSearchFile"
+        Me.TextBoxSearchFile.Size = New System.Drawing.Size(218, 20)
+        Me.TextBoxSearchFile.TabIndex = 15
+        Me.ToolTip1.SetToolTip(Me.TextBoxSearchFile, "Filter the files")
+        '
+        'ListViewFiles
+        '
+        Me.ListViewFiles.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.ListViewFiles.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1})
+        Me.ListViewFiles.ContextMenuStrip = Me.ContextMenuFile
+        Me.ListViewFiles.FullRowSelect = true
+        Me.ListViewFiles.GridLines = true
+        Me.ListViewFiles.HideSelection = false
+        Me.ListViewFiles.Location = New System.Drawing.Point(0, 27)
+        Me.ListViewFiles.Name = "ListViewFiles"
+        Me.ListViewFiles.Size = New System.Drawing.Size(328, 253)
+        Me.ListViewFiles.SmallImageList = Me.ImageList1
+        Me.ListViewFiles.TabIndex = 10
+        Me.ListViewFiles.UseCompatibleStateImageBehavior = false
+        Me.ListViewFiles.View = System.Windows.Forms.View.Details
+        '
+        'ColumnHeader1
+        '
+        Me.ColumnHeader1.Text = "Files:"
+        Me.ColumnHeader1.Width = 367
+        '
+        'ContextMenuFile
+        '
+        Me.ContextMenuFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.RenameFileToolStripMenuItem, Me.DeleteFileToolStripMenuItem})
+        Me.ContextMenuFile.Name = "ContextMenuFile"
+        Me.ContextMenuFile.Size = New System.Drawing.Size(148, 48)
+        '
+        'RenameFileToolStripMenuItem
+        '
+        Me.RenameFileToolStripMenuItem.Name = "RenameFileToolStripMenuItem"
+        Me.RenameFileToolStripMenuItem.Size = New System.Drawing.Size(147, 22)
+        Me.RenameFileToolStripMenuItem.Text = "Rename File..."
+        '
+        'DeleteFileToolStripMenuItem
+        '
+        Me.DeleteFileToolStripMenuItem.Name = "DeleteFileToolStripMenuItem"
+        Me.DeleteFileToolStripMenuItem.Size = New System.Drawing.Size(147, 22)
+        Me.DeleteFileToolStripMenuItem.Text = "Delete File..."
+        '
+        'TextBoxPath
+        '
+        Me.TextBoxPath.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left)  _
+            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.TextBoxPath.Location = New System.Drawing.Point(47, 370)
+        Me.TextBoxPath.Name = "TextBoxPath"
+        Me.TextBoxPath.Size = New System.Drawing.Size(609, 20)
+        Me.TextBoxPath.TabIndex = 15
+        '
+        'ContextMenuHisFolder
+        '
+        Me.ContextMenuHisFolder.Name = "ContextMenuFolderHis"
+        Me.ContextMenuHisFolder.Size = New System.Drawing.Size(61, 4)
+        '
+        'ContextMenuHisFile
+        '
+        Me.ContextMenuHisFile.Name = "ContextMenuFileHis"
+        Me.ContextMenuHisFile.Size = New System.Drawing.Size(61, 4)
+        '
+        'ButtonOK
+        '
+        Me.ButtonOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.ButtonOK.DialogResult = System.Windows.Forms.DialogResult.OK
+        Me.ButtonOK.Location = New System.Drawing.Point(503, 399)
+        Me.ButtonOK.Name = "ButtonOK"
+        Me.ButtonOK.Size = New System.Drawing.Size(75, 23)
+        Me.ButtonOK.TabIndex = 20
+        Me.ButtonOK.TabStop = false
+        Me.ButtonOK.Text = "OK"
+        Me.ButtonOK.UseVisualStyleBackColor = true
+        '
+        'ButtonCancel
+        '
+        Me.ButtonCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.ButtonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
+        Me.ButtonCancel.Location = New System.Drawing.Point(581, 399)
+        Me.ButtonCancel.Name = "ButtonCancel"
+        Me.ButtonCancel.Size = New System.Drawing.Size(75, 23)
+        Me.ButtonCancel.TabIndex = 25
+        Me.ButtonCancel.TabStop = false
+        Me.ButtonCancel.Text = "Cancel"
+        Me.ButtonCancel.UseVisualStyleBackColor = true
+        '
+        'TextBoxCurrent
+        '
+        Me.TextBoxCurrent.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
+            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.TextBoxCurrent.Cursor = System.Windows.Forms.Cursors.Hand
+        Me.TextBoxCurrent.Location = New System.Drawing.Point(5, 17)
+        Me.TextBoxCurrent.Name = "TextBoxCurrent"
+        Me.TextBoxCurrent.ReadOnly = true
+        Me.TextBoxCurrent.Size = New System.Drawing.Size(651, 20)
+        Me.TextBoxCurrent.TabIndex = 0
+        Me.TextBoxCurrent.TabStop = false
+        Me.ToolTip1.SetToolTip(Me.TextBoxCurrent, "Click for changing the directory")
+        '
+        'Label3
+        '
+        Me.Label3.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+        Me.Label3.AutoSize = true
+        Me.Label3.Location = New System.Drawing.Point(5, 373)
+        Me.Label3.Name = "Label3"
+        Me.Label3.Size = New System.Drawing.Size(38, 13)
+        Me.Label3.TabIndex = 29
+        Me.Label3.Text = "Name:"
+        '
+        'Label4
+        '
+        Me.Label4.AutoSize = true
+        Me.Label4.Location = New System.Drawing.Point(4, 3)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(89, 13)
+        Me.Label4.TabIndex = 30
+        Me.Label4.Text = "Current Directory:"
+        '
+        'FileBrowserDialog
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.CancelButton = Me.ButtonCancel
+        Me.ClientSize = New System.Drawing.Size(663, 428)
+        Me.Controls.Add(Me.Label4)
+        Me.Controls.Add(Me.Label3)
+        Me.Controls.Add(Me.TextBoxCurrent)
+        Me.Controls.Add(Me.ButtonCancel)
+        Me.Controls.Add(Me.ButtonOK)
+        Me.Controls.Add(Me.TextBoxPath)
+        Me.Controls.Add(Me.SplitContainer1)
+        Me.MinimizeBox = false
+        Me.MinimumSize = New System.Drawing.Size(341, 272)
+        Me.Name = "FileBrowserDialog"
+        Me.ShowIcon = false
+        Me.ShowInTaskbar = false
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
+        Me.Text = "File Browser"
+        Me.SplitContainer1.Panel1.ResumeLayout(false)
+        Me.SplitContainer1.Panel1.PerformLayout
+        Me.SplitContainer1.Panel2.ResumeLayout(false)
+        Me.SplitContainer1.Panel2.PerformLayout
+        CType(Me.SplitContainer1,System.ComponentModel.ISupportInitialize).EndInit
+        Me.SplitContainer1.ResumeLayout(false)
+        Me.ContextMenuFile.ResumeLayout(false)
+        Me.ResumeLayout(false)
+        Me.PerformLayout
 
-	End Sub
+End Sub
 	Friend WithEvents SplitContainer1 As SplitContainer
 	Friend WithEvents ComboBoxDrive As ComboBox
 	Friend WithEvents ListViewFolder As ListView
diff --git a/VECTO/File Browser/FileBrowserDialog.resx b/VECTO/File Browser/FileBrowserDialog.resx
index 67a95d3c92ccde32e8069a816021a3528a48b15b..3bb6aef32120c20f345acef6d958efffa1985f9c 100644
--- a/VECTO/File Browser/FileBrowserDialog.resx	
+++ b/VECTO/File Browser/FileBrowserDialog.resx	
@@ -123,21 +123,24 @@
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="ButtonFolderBack.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAKqSURBVDhPbZF3T1NRHIb5EvAh/McYDWI0sixblkRjGoypBoKJOAkOUESCYCLBiEZRVKBlVaQU
-        ECm2SNmUUsosXDvonrTMSo15vT0thApv8uae3JznOb97bpA3jqlnJoes1GqVFsMieQzzWAGMI/ehH8qD
-        gX4ahvOxpq9DNPc4CPB/aAE2dDVwzJTDRq9d6moYlbXwbInw1yMmjeWdwGFpyMESr+CPu5PU7WyBg6qE
-        sjcLGsUnrNo6CJwiC8NlZRzpPslegWezHb/Xv4LqYUE192EfvFcSwQ4L9glkpfC4O7C9yaPhVmy5mrH4
-        7RKBvY3v9glyLRnIW2EiWXCavN+dxD5Zgu2NNrjXvmDL2YQNOxsLnUxQ8ioop6uQ0HuMgHesF8FaSCIw
-        AXdio2/fvcrFprMR6/Z6rJo/Yo5/AUuyClB0vYIcdRoy5YydqZ76UV8skiJsrjRg3VZLwzVw6t9itu0c
-        xr5fh4SuV5A2cBIx7aHo7E2DnMcMnMA8Xog162e4TO+xonsDu+YlpltTMcK/SmBvGbxQdAhSYbfbIWtO
-        CBSYRh/CZayGQ/caNnUlLNRzTHHPgiE4gpjuo+Sy+IIUzIsziGCyKS5QYBi+B4e2CjZVBcxUOYwLJeSU
-        /pY0DHLTsTzChGboPNQD6UQgbWAECvSDd2FVvoB5qQyG+WLoZgohbYxFX0MCxE2JBFT1J5Nm9igxwTkT
-        KNCKb8G0WArD3BNopwugmczHBH2KqJ6Bfk7MLuxtPGcGEnZUoGD5Zy70s0XQyh9AI82Davwm2SSsi9on
-        oIRJGK+PoPyoL2rRNfwSZWNReAUKIQuKPha9KRL8ylPoehUOCSeaCMfZkQSme9uP+qL8kR2s6MoMp/99
-        jqwl8R39jQOjteHrj7IORZfdCA3xbzsgQUH/AJeyUFejvjvmAAAAAElFTkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAqpJREFUOE9t
+        kXdPU1EchvkS8CH8xxgNYjSyLFuWRGMajKkGgok4CQ5QRIJgIsGIRlFUoGVVpBQQKbZI2ZRSyixcO+ie
+        tMxKjXm9PS2ECm/y5p7cnOc5v3tukDeOqWcmh6zUapUWwyJ5DPNYAYwj96EfyoOBfhqG87Gmr0M09zgI
+        8H9oATZ0NXDMlMNGr13qahiVtfBsifDXIyaN5Z3AYWnIwRKv4I+7k9TtbIGDqoSyNwsaxSes2joInCIL
+        w2VlHOk+yV6BZ7Mdv9e/guphQTX3YR+8VxLBDgv2CWSl8Lg7sL3Jo+FWbLmasfjtEoG9je/2CXItGchb
+        YSJZcJq8353EPlmC7Y02uNe+YMvZhA07GwudTFDyKiinq5DQe4yAd6wXwVpIIjABd2Kjb9+9ysWmsxHr
+        9nqsmj9ijn8BS7IKUHS9ghx1GjLljJ2pnvpRXyySImyuNGDdVkvDNXDq32K27RzGvl+HhK5XkDZwEjHt
+        oejsTYOcxwycwDxeiDXrZ7hM77GiewO75iWmW1Mxwr9KYG8ZvFB0CFJht9sha04IFJhGH8JlrIZD9xo2
+        dSUs1HNMcc+CITiCmO6j5LL4ghTMizOIYLIpLlBgGL4Hh7YKNlUFzFQ5jAsl5JT+ljQMctOxPMKEZug8
+        1APpRCBtYAQK9IN3YVW+gHmpDIb5YuhmCiFtjEVfQwLETYkEVPUnk2b2KDHBORMo0IpvwbRYCsPcE2in
+        C6CZzMcEfYqonoF+Tswu7G08ZwYSdlSgYPlnLvSzRdDKH0AjzYNq/CbZJKyL2ieghEkYr4+g/KgvatE1
+        /BJlY1F4BQohC4o+Fr0pEvzKU+h6FQ4JJ5oIx9mRBKZ724/6ovyRHazoygyn/32OrCXxHf2NA6O14euP
+        sg5Fl90IDfFvOyBBQf8Al7JQV6O+O+YAAAAASUVORK5CYII=
 </value>
   </data>
+  <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>583, 17</value>
+  </metadata>
   <metadata name="ImageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>473, 17</value>
   </metadata>
diff --git a/VECTO/File Browser/FileBrowserDialog.vb b/VECTO/File Browser/FileBrowserDialog.vb
index 175ad7f8f44913bd2709a46926f9bf1adb8b156e..d16a69c22d13207ff1581b9f53848a240ae6aa6c 100644
--- a/VECTO/File Browser/FileBrowserDialog.vb	
+++ b/VECTO/File Browser/FileBrowserDialog.vb	
@@ -11,6 +11,7 @@
 Option Infer On
 
 Imports System.IO
+Imports System.Linq
 Imports System.Text
 Imports Microsoft.VisualBasic.FileIO
 Imports System.Runtime.InteropServices
@@ -291,6 +292,9 @@ Public Class FileBrowserDialog
 
 	Private _title As String
 
+	Private _filesSortColumn As Integer
+	Private _directorySortColumn As Integer
+
 	'Close and save File / Folder History
 	Public Sub SaveAndClose()
 		'Folder History
@@ -788,18 +792,26 @@ Public Class FileBrowserDialog
 			Dim di As New DirectoryInfo(_myFolder)
 			Dim aryFi = di.GetDirectories(searchPat)
 			ImageList1.Images.Clear()
-			Dim shinfo = New SHFILEINFO()
-			shinfo.szDisplayName = New String(Chr(0), 260)
-			shinfo.szTypeName = New String(Chr(0), 80)
-			SHGetFileInfo(_myFolder, 0, shinfo, Marshal.SizeOf(shinfo), SHGFI_ICON Or SHGFI_SMALLICON)
-			Dim myIcon = Icon.FromHandle(shinfo.hIcon)
-			ImageList1.Images.Add(myIcon)
+			Dim x = ImageList1.Images.Count - 1
 			For Each fi In aryFi
-				ListViewFolder.Items.Add(fi.ToString, 0)
+				x += 1
+				Dim shinfo = New SHFILEINFO()
+				shinfo.szDisplayName = New String(Chr(0), 260)
+				shinfo.szTypeName = New String(Chr(0), 80)
+				SHGetFileInfo(Path.Combine(_myFolder, fi.ToString()), 0, shinfo, Marshal.SizeOf(shinfo), SHGFI_ICON Or SHGFI_SMALLICON)
+				Dim myIcon = Icon.FromHandle(shinfo.hIcon)
+				ImageList1.Images.Add(myIcon)
+				'For Each fi In aryFi
+				ListViewFolder.Items.Add(fi.ToString, x)
 			Next
 		Catch ex As Exception
 			ListViewFolder.Items.Add("<ERROR: " & ex.Message.ToString & ">")
 		End Try
+		_directorySortColumn = 0
+	    
+	    ListViewFolder.Sorting = SortOrder.Ascending
+	    ListViewFolder.ListViewItemSorter = new ListViewFilesItemComparer(_directorySortColumn, ListViewFolder.Sorting)
+
 	End Sub
 
 	'Load File-list
@@ -824,12 +836,12 @@ Public Class FileBrowserDialog
 		Try
 			'Add Folder
 			Dim di As New DirectoryInfo(_myFolder)
-			Dim aryFi As FileInfo()
+			'Dim aryFi As FileInfo()
 			Dim fi As FileInfo
-			Dim x = -1
+			Dim x = ImageList1.Images.Count - 1
 			For Each SearchExt In extStr
 				Dim searchPat = "*" & Trim(searchFile) & "*." & Trim(SearchExt)
-				aryFi = di.GetFiles(searchPat)
+				Dim aryFi = di.GetFiles(searchPat)
 				For Each fi In aryFi
 					x += 1
 					Dim shinfo = New SHFILEINFO()
@@ -839,7 +851,7 @@ Public Class FileBrowserDialog
 								SHGFI_ICON Or SHGFI_SMALLICON)
 					Dim myIcon = Icon.FromHandle(shinfo.hIcon)
 					ImageList1.Images.Add(myIcon)
-					ListViewFiles.Items.Add(fi.ToString, x + 1)
+					ListViewFiles.Items.Add(fi.ToString, x)
 				Next
 			Next
 		Catch ex As Exception
@@ -847,6 +859,9 @@ Public Class FileBrowserDialog
 		End Try
 
 		ListViewFiles.EndUpdate()
+		_filesSortColumn = 0
+	    ListViewFiles.Sorting = SortOrder.Ascending
+        ListViewFiles.ListViewItemSorter = new ListViewFilesItemComparer(_filesSortColumn, ListViewFiles.Sorting)
 	End Sub
 
 	'Rename File
@@ -947,6 +962,69 @@ lb10:
 			_noExt = False
 		End Set
 	End Property
+
+	Private Sub ListViewFiles_ColumnClick(sender As Object, e As ColumnClickEventArgs) Handles ListViewFiles.ColumnClick
+		If e.Column <> _filesSortColumn Then
+			_filesSortColumn = e.Column
+			ListViewFiles.Sorting = SortOrder.Ascending
+		Else
+			If ListViewFiles.Sorting = SortOrder.Ascending Then
+				ListViewFiles.Sorting = SortOrder.Descending
+			Else
+				ListViewFiles.Sorting = SortOrder.Ascending
+			End If
+		End If 
+
+		ListViewFiles.ListViewItemSorter = new ListViewFilesItemComparer(e.Column, ListViewFiles.Sorting)
+		ListViewFiles.Sort()
+	End Sub
+
+	Private Sub ListViewFolder_ColumnClick(sender As Object, e As ColumnClickEventArgs) Handles ListViewFolder.ColumnClick
+		if e.Column <> _directorySortColumn Then
+			_directorySortColumn = e.Column
+			ListViewFolder.Sorting = SortOrder.Ascending
+		Else 
+			if ListViewFolder.Sorting = SortOrder.Ascending Then
+				ListViewFolder.Sorting = SortOrder.Descending
+			Else 
+				ListViewFolder.Sorting=SortOrder.Ascending
+			End If
+		End If
+		ListViewFolder.ListViewItemSorter = new ListViewFilesItemComparer(e.Column, ListViewFolder.Sorting)
+		ListViewFolder.Sort()
+	End Sub
+
+	Private Class ListViewFilesItemComparer
+		Implements IComparer
+
+		Private _col As Integer
+		Private _order As SortOrder
+
+		Public Sub New()
+			_col = 0
+		End Sub
+
+		Public Sub New(column As Integer, sortOrder As SortOrder)
+			_col = column
+			_order = sortOrder
+		End Sub
+
+		Public Function Compare(x As Object, y As Object) As Integer _ 
+			Implements IComparer.Compare
+			Dim returnVal as Integer = -1
+			returnVal = [String].Compare(CType(x, ListViewItem).SubItems(_col).Text, _
+										 CType(y, ListViewItem).SubItems(_col).Text)
+			' Determine whether the sort order is descending.
+			If _order = SortOrder.Descending Then
+				' Invert the value returned by String.Compare.
+				returnVal *= -1
+			End If
+
+			Return returnVal
+		End Function
+	End Class
+
+
 End Class
 
 
diff --git a/VECTO/GUI/MainForm.Designer.vb b/VECTO/GUI/MainForm.Designer.vb
index dff52a9b7b9f22f805f6fdbe8e6fbcc427f3f76b..6308e8eb093aca2fc7b3963871eafa57a76a5eb0 100644
--- a/VECTO/GUI/MainForm.Designer.vb
+++ b/VECTO/GUI/MainForm.Designer.vb
@@ -53,8 +53,8 @@ Partial Class MainForm
         Me.BtGENup = New System.Windows.Forms.Button()
         Me.ChBoxAllGEN = New System.Windows.Forms.CheckBox()
         Me.LvGEN = New System.Windows.Forms.ListView()
-        Me.ColGENpath = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-        Me.ColGENstatus = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+        Me.ColGENpath = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+        Me.ColGENstatus = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
         Me.ButtonGENremove = New System.Windows.Forms.Button()
         Me.ButtonGENadd = New System.Windows.Forms.Button()
         Me.TabPgOptions = New System.Windows.Forms.TabPage()
@@ -71,12 +71,12 @@ Partial Class MainForm
         Me.TabPageDEV = New System.Windows.Forms.TabPage()
         Me.Label1 = New System.Windows.Forms.Label()
         Me.LvDEVoptions = New System.Windows.Forms.ListView()
-        Me.ColumnHeader4 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-        Me.ColumnHeader7 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-        Me.ColumnHeader5 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-        Me.ColumnHeader6 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-        Me.ColumnHeader8 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-        Me.ColumnHeader9 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+        Me.ColumnHeader4 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+        Me.ColumnHeader7 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+        Me.ColumnHeader5 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+        Me.ColumnHeader6 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+        Me.ColumnHeader8 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+        Me.ColumnHeader9 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
         Me.ConMenFilelist = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ShowInFolderMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.SaveListToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -85,9 +85,9 @@ Partial Class MainForm
         Me.ClearListToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker()
         Me.LvMsg = New System.Windows.Forms.ListView()
-        Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-        Me.ColumnHeader2 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-        Me.ColumnHeader3 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+        Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+        Me.ColumnHeader2 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+        Me.ColumnHeader3 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
         Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
         Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
         Me.ToolStripBtNew = New System.Windows.Forms.ToolStripButton()
@@ -116,24 +116,24 @@ Partial Class MainForm
         Me.OpenInGraphWindowToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
-        Me.StatusBAR.SuspendLayout()
-        Me.TabControl1.SuspendLayout()
-        Me.TabPageGEN.SuspendLayout()
-        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.TabPgOptions.SuspendLayout()
-        Me.PanelOptAllg.SuspendLayout()
-        Me.GroupBox3.SuspendLayout()
-        Me.GroupBox2.SuspendLayout()
-        Me.GroupBox1.SuspendLayout()
-        Me.TabPageDEV.SuspendLayout()
-        Me.ConMenFilelist.SuspendLayout()
-        CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.SplitContainer1.Panel1.SuspendLayout()
-        Me.SplitContainer1.Panel2.SuspendLayout()
-        Me.SplitContainer1.SuspendLayout()
-        Me.ToolStrip1.SuspendLayout()
-        Me.CmOpenFile.SuspendLayout()
-        Me.SuspendLayout()
+        Me.StatusBAR.SuspendLayout
+        Me.TabControl1.SuspendLayout
+        Me.TabPageGEN.SuspendLayout
+        CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).BeginInit
+        Me.TabPgOptions.SuspendLayout
+        Me.PanelOptAllg.SuspendLayout
+        Me.GroupBox3.SuspendLayout
+        Me.GroupBox2.SuspendLayout
+        Me.GroupBox1.SuspendLayout
+        Me.TabPageDEV.SuspendLayout
+        Me.ConMenFilelist.SuspendLayout
+        CType(Me.SplitContainer1,System.ComponentModel.ISupportInitialize).BeginInit
+        Me.SplitContainer1.Panel1.SuspendLayout
+        Me.SplitContainer1.Panel2.SuspendLayout
+        Me.SplitContainer1.SuspendLayout
+        Me.ToolStrip1.SuspendLayout
+        Me.CmOpenFile.SuspendLayout
+        Me.SuspendLayout
         '
         'StatusBAR
         '
@@ -148,29 +148,29 @@ Partial Class MainForm
         '
         Me.ToolStripLbStatus.Name = "ToolStripLbStatus"
         Me.ToolStripLbStatus.Size = New System.Drawing.Size(1030, 17)
-        Me.ToolStripLbStatus.Spring = True
+        Me.ToolStripLbStatus.Spring = true
         Me.ToolStripLbStatus.Text = "Status Text"
         Me.ToolStripLbStatus.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         '
         'ToolStripProgBarJob
         '
         Me.ToolStripProgBarJob.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
-        Me.ToolStripProgBarJob.AutoSize = False
+        Me.ToolStripProgBarJob.AutoSize = false
         Me.ToolStripProgBarJob.Name = "ToolStripProgBarJob"
         Me.ToolStripProgBarJob.Size = New System.Drawing.Size(100, 16)
         Me.ToolStripProgBarJob.Style = System.Windows.Forms.ProgressBarStyle.Continuous
         Me.ToolStripProgBarJob.ToolTipText = "overall progress"
-        Me.ToolStripProgBarJob.Visible = False
+        Me.ToolStripProgBarJob.Visible = false
         '
         'ToolStripProgBarOverall
         '
         Me.ToolStripProgBarOverall.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
-        Me.ToolStripProgBarOverall.AutoSize = False
+        Me.ToolStripProgBarOverall.AutoSize = false
         Me.ToolStripProgBarOverall.Name = "ToolStripProgBarOverall"
         Me.ToolStripProgBarOverall.Size = New System.Drawing.Size(100, 16)
         Me.ToolStripProgBarOverall.Style = System.Windows.Forms.ProgressBarStyle.Continuous
         Me.ToolStripProgBarOverall.ToolTipText = "job progress"
-        Me.ToolStripProgBarOverall.Visible = False
+        Me.ToolStripProgBarOverall.Visible = false
         '
         'TabControl1
         '
@@ -206,34 +206,34 @@ Partial Class MainForm
         Me.TabPageGEN.Size = New System.Drawing.Size(1034, 302)
         Me.TabPageGEN.TabIndex = 0
         Me.TabPageGEN.Text = "Job Files"
-        Me.TabPageGEN.UseVisualStyleBackColor = True
+        Me.TabPageGEN.UseVisualStyleBackColor = true
         '
         'btnImportXML
         '
-        Me.btnImportXML.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.btnImportXML.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
         Me.btnImportXML.Location = New System.Drawing.Point(460, 267)
         Me.btnImportXML.Name = "btnImportXML"
         Me.btnImportXML.Size = New System.Drawing.Size(115, 30)
         Me.btnImportXML.TabIndex = 23
         Me.btnImportXML.Text = "Import from XML"
-        Me.btnImportXML.UseVisualStyleBackColor = True
-        Me.btnImportXML.Visible = False
+        Me.btnImportXML.UseVisualStyleBackColor = true
+        Me.btnImportXML.Visible = false
         '
         'btnExportXML
         '
-        Me.btnExportXML.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.btnExportXML.Enabled = False
+        Me.btnExportXML.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+        Me.btnExportXML.Enabled = false
         Me.btnExportXML.Location = New System.Drawing.Point(344, 267)
         Me.btnExportXML.Name = "btnExportXML"
         Me.btnExportXML.Size = New System.Drawing.Size(115, 30)
         Me.btnExportXML.TabIndex = 22
         Me.btnExportXML.Text = "Export as XML"
-        Me.btnExportXML.UseVisualStyleBackColor = True
+        Me.btnExportXML.UseVisualStyleBackColor = true
         '
         'Label6
         '
-        Me.Label6.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.Label6.AutoSize = True
+        Me.Label6.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.Label6.AutoSize = true
         Me.Label6.Location = New System.Drawing.Point(814, 268)
         Me.Label6.Name = "Label6"
         Me.Label6.Size = New System.Drawing.Size(217, 13)
@@ -242,7 +242,7 @@ Partial Class MainForm
         '
         'btStartV3
         '
-        Me.btStartV3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btStartV3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
         Me.btStartV3.Image = Global.TUGraz.VECTO.My.Resources.Resources.Play_icon
         Me.btStartV3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.btStartV3.Location = New System.Drawing.Point(3, 56)
@@ -252,80 +252,80 @@ Partial Class MainForm
         Me.btStartV3.Text = "START"
         Me.btStartV3.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText
         Me.ToolTip1.SetToolTip(Me.btStartV3, "Start Simulation")
-        Me.btStartV3.UseVisualStyleBackColor = True
+        Me.btStartV3.UseVisualStyleBackColor = true
         '
         'LbDecl
         '
-        Me.LbDecl.AutoSize = True
-        Me.LbDecl.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.LbDecl.AutoSize = true
+        Me.LbDecl.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
         Me.LbDecl.Location = New System.Drawing.Point(5, 109)
         Me.LbDecl.Name = "LbDecl"
         Me.LbDecl.Size = New System.Drawing.Size(107, 13)
         Me.LbDecl.TabIndex = 19
         Me.LbDecl.Text = "Declaration Mode"
-        Me.LbDecl.Visible = False
+        Me.LbDecl.Visible = false
         '
         'PictureBox1
         '
-        Me.PictureBox1.Image = CType(resources.GetObject("PictureBox1.Image"), System.Drawing.Image)
+        Me.PictureBox1.Image = CType(resources.GetObject("PictureBox1.Image"),System.Drawing.Image)
         Me.PictureBox1.Location = New System.Drawing.Point(3, 3)
         Me.PictureBox1.Name = "PictureBox1"
         Me.PictureBox1.Size = New System.Drawing.Size(108, 47)
         Me.PictureBox1.TabIndex = 18
-        Me.PictureBox1.TabStop = False
+        Me.PictureBox1.TabStop = false
         '
         'BtGENdown
         '
-        Me.BtGENdown.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.BtGENdown.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
         Me.BtGENdown.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_arrow_down_icon
         Me.BtGENdown.Location = New System.Drawing.Point(307, 267)
         Me.BtGENdown.Name = "BtGENdown"
         Me.BtGENdown.Size = New System.Drawing.Size(30, 30)
         Me.BtGENdown.TabIndex = 6
         Me.ToolTip1.SetToolTip(Me.BtGENdown, "Move job down one row")
-        Me.BtGENdown.UseVisualStyleBackColor = True
+        Me.BtGENdown.UseVisualStyleBackColor = true
         '
         'BtGENup
         '
-        Me.BtGENup.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.BtGENup.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
         Me.BtGENup.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_arrow_up_icon
         Me.BtGENup.Location = New System.Drawing.Point(276, 267)
         Me.BtGENup.Name = "BtGENup"
         Me.BtGENup.Size = New System.Drawing.Size(30, 30)
         Me.BtGENup.TabIndex = 4
         Me.ToolTip1.SetToolTip(Me.BtGENup, "Move job up one row")
-        Me.BtGENup.UseVisualStyleBackColor = True
+        Me.BtGENup.UseVisualStyleBackColor = true
         '
         'ChBoxAllGEN
         '
-        Me.ChBoxAllGEN.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.ChBoxAllGEN.AutoSize = True
+        Me.ChBoxAllGEN.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+        Me.ChBoxAllGEN.AutoSize = true
         Me.ChBoxAllGEN.Location = New System.Drawing.Point(195, 274)
         Me.ChBoxAllGEN.Name = "ChBoxAllGEN"
         Me.ChBoxAllGEN.Size = New System.Drawing.Size(70, 17)
         Me.ChBoxAllGEN.TabIndex = 16
         Me.ChBoxAllGEN.Text = "Select All"
         Me.ToolTip1.SetToolTip(Me.ChBoxAllGEN, "Select All / None")
-        Me.ChBoxAllGEN.UseVisualStyleBackColor = True
+        Me.ChBoxAllGEN.UseVisualStyleBackColor = true
         '
         'LvGEN
         '
-        Me.LvGEN.AllowDrop = True
-        Me.LvGEN.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.LvGEN.CheckBoxes = True
+        Me.LvGEN.AllowDrop = true
+        Me.LvGEN.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.LvGEN.CheckBoxes = true
         Me.LvGEN.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColGENpath, Me.ColGENstatus})
-        Me.LvGEN.FullRowSelect = True
-        Me.LvGEN.GridLines = True
+        Me.LvGEN.FullRowSelect = true
+        Me.LvGEN.GridLines = true
         Me.LvGEN.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable
-        Me.LvGEN.HideSelection = False
-        Me.LvGEN.LabelEdit = True
+        Me.LvGEN.HideSelection = false
+        Me.LvGEN.LabelEdit = true
         Me.LvGEN.Location = New System.Drawing.Point(114, 3)
         Me.LvGEN.Name = "LvGEN"
         Me.LvGEN.Size = New System.Drawing.Size(917, 263)
         Me.LvGEN.TabIndex = 14
-        Me.LvGEN.UseCompatibleStateImageBehavior = False
+        Me.LvGEN.UseCompatibleStateImageBehavior = false
         Me.LvGEN.View = System.Windows.Forms.View.Details
         '
         'ColGENpath
@@ -340,27 +340,27 @@ Partial Class MainForm
         '
         'ButtonGENremove
         '
-        Me.ButtonGENremove.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.ButtonGENremove.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.ButtonGENremove.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+        Me.ButtonGENremove.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
         Me.ButtonGENremove.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
         Me.ButtonGENremove.Location = New System.Drawing.Point(147, 267)
         Me.ButtonGENremove.Name = "ButtonGENremove"
         Me.ButtonGENremove.Size = New System.Drawing.Size(33, 30)
         Me.ButtonGENremove.TabIndex = 2
         Me.ToolTip1.SetToolTip(Me.ButtonGENremove, "Remove selected entries")
-        Me.ButtonGENremove.UseVisualStyleBackColor = True
+        Me.ButtonGENremove.UseVisualStyleBackColor = true
         '
         'ButtonGENadd
         '
-        Me.ButtonGENadd.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.ButtonGENadd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.ButtonGENadd.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+        Me.ButtonGENadd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
         Me.ButtonGENadd.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
         Me.ButtonGENadd.Location = New System.Drawing.Point(113, 267)
         Me.ButtonGENadd.Name = "ButtonGENadd"
         Me.ButtonGENadd.Size = New System.Drawing.Size(33, 30)
         Me.ButtonGENadd.TabIndex = 1
         Me.ToolTip1.SetToolTip(Me.ButtonGENadd, "Add Job File")
-        Me.ButtonGENadd.UseVisualStyleBackColor = True
+        Me.ButtonGENadd.UseVisualStyleBackColor = true
         '
         'TabPgOptions
         '
@@ -371,7 +371,7 @@ Partial Class MainForm
         Me.TabPgOptions.Size = New System.Drawing.Size(1034, 302)
         Me.TabPgOptions.TabIndex = 2
         Me.TabPgOptions.Text = "Options"
-        Me.TabPgOptions.UseVisualStyleBackColor = True
+        Me.TabPgOptions.UseVisualStyleBackColor = true
         '
         'PanelOptAllg
         '
@@ -391,7 +391,7 @@ Partial Class MainForm
         Me.GroupBox3.Name = "GroupBox3"
         Me.GroupBox3.Size = New System.Drawing.Size(173, 110)
         Me.GroupBox3.TabIndex = 18
-        Me.GroupBox3.TabStop = False
+        Me.GroupBox3.TabStop = false
         Me.GroupBox3.Text = "Misc"
         '
         'cbActVmod
@@ -401,19 +401,19 @@ Partial Class MainForm
         Me.cbActVmod.Size = New System.Drawing.Size(161, 63)
         Me.cbActVmod.TabIndex = 18
         Me.cbActVmod.Text = "Output values in vmod at beginning and end of simulation interval (EXPERT!)"
-        Me.cbActVmod.UseVisualStyleBackColor = True
+        Me.cbActVmod.UseVisualStyleBackColor = true
         '
         'cbValidateRunData
         '
-        Me.cbValidateRunData.AutoSize = True
-        Me.cbValidateRunData.Checked = True
+        Me.cbValidateRunData.AutoSize = true
+        Me.cbValidateRunData.Checked = true
         Me.cbValidateRunData.CheckState = System.Windows.Forms.CheckState.Checked
         Me.cbValidateRunData.Location = New System.Drawing.Point(6, 19)
         Me.cbValidateRunData.Name = "cbValidateRunData"
         Me.cbValidateRunData.Size = New System.Drawing.Size(90, 17)
         Me.cbValidateRunData.TabIndex = 17
         Me.cbValidateRunData.Text = "Validate Data"
-        Me.cbValidateRunData.UseVisualStyleBackColor = True
+        Me.cbValidateRunData.UseVisualStyleBackColor = true
         '
         'GroupBox2
         '
@@ -423,30 +423,30 @@ Partial Class MainForm
         Me.GroupBox2.Name = "GroupBox2"
         Me.GroupBox2.Size = New System.Drawing.Size(173, 89)
         Me.GroupBox2.TabIndex = 16
-        Me.GroupBox2.TabStop = False
+        Me.GroupBox2.TabStop = false
         Me.GroupBox2.Text = "Output"
         '
         'ChBoxModOut
         '
-        Me.ChBoxModOut.AutoSize = True
-        Me.ChBoxModOut.Checked = True
+        Me.ChBoxModOut.AutoSize = true
+        Me.ChBoxModOut.Checked = true
         Me.ChBoxModOut.CheckState = System.Windows.Forms.CheckState.Checked
         Me.ChBoxModOut.Location = New System.Drawing.Point(6, 19)
         Me.ChBoxModOut.Name = "ChBoxModOut"
         Me.ChBoxModOut.Size = New System.Drawing.Size(115, 17)
         Me.ChBoxModOut.TabIndex = 0
         Me.ChBoxModOut.Text = "Write modal results"
-        Me.ChBoxModOut.UseVisualStyleBackColor = True
+        Me.ChBoxModOut.UseVisualStyleBackColor = true
         '
         'ChBoxMod1Hz
         '
-        Me.ChBoxMod1Hz.AutoSize = True
+        Me.ChBoxMod1Hz.AutoSize = true
         Me.ChBoxMod1Hz.Location = New System.Drawing.Point(6, 42)
         Me.ChBoxMod1Hz.Name = "ChBoxMod1Hz"
         Me.ChBoxMod1Hz.Size = New System.Drawing.Size(121, 17)
         Me.ChBoxMod1Hz.TabIndex = 16
         Me.ChBoxMod1Hz.Text = "Modal results in 1Hz"
-        Me.ChBoxMod1Hz.UseVisualStyleBackColor = True
+        Me.ChBoxMod1Hz.UseVisualStyleBackColor = true
         '
         'GroupBox1
         '
@@ -456,31 +456,31 @@ Partial Class MainForm
         Me.GroupBox1.Name = "GroupBox1"
         Me.GroupBox1.Size = New System.Drawing.Size(173, 72)
         Me.GroupBox1.TabIndex = 15
-        Me.GroupBox1.TabStop = False
+        Me.GroupBox1.TabStop = false
         Me.GroupBox1.Text = "Mode"
         '
         'RbDev
         '
-        Me.RbDev.AutoSize = True
-        Me.RbDev.Checked = True
+        Me.RbDev.AutoSize = true
+        Me.RbDev.Checked = true
         Me.RbDev.Location = New System.Drawing.Point(6, 42)
         Me.RbDev.Name = "RbDev"
         Me.RbDev.Size = New System.Drawing.Size(111, 17)
         Me.RbDev.TabIndex = 1
-        Me.RbDev.TabStop = True
+        Me.RbDev.TabStop = true
         Me.RbDev.Text = "Engineering Mode"
-        Me.RbDev.UseVisualStyleBackColor = True
+        Me.RbDev.UseVisualStyleBackColor = true
         '
         'RbDecl
         '
-        Me.RbDecl.AutoSize = True
+        Me.RbDecl.AutoSize = true
         Me.RbDecl.Location = New System.Drawing.Point(6, 19)
         Me.RbDecl.Name = "RbDecl"
         Me.RbDecl.Size = New System.Drawing.Size(109, 17)
         Me.RbDecl.TabIndex = 0
-        Me.RbDecl.TabStop = True
+        Me.RbDecl.TabStop = true
         Me.RbDecl.Text = "Declaration Mode"
-        Me.RbDecl.UseVisualStyleBackColor = True
+        Me.RbDecl.UseVisualStyleBackColor = true
         '
         'TabPageDEV
         '
@@ -492,12 +492,12 @@ Partial Class MainForm
         Me.TabPageDEV.Size = New System.Drawing.Size(1034, 302)
         Me.TabPageDEV.TabIndex = 3
         Me.TabPageDEV.Text = "Test"
-        Me.TabPageDEV.UseVisualStyleBackColor = True
+        Me.TabPageDEV.UseVisualStyleBackColor = true
         '
         'Label1
         '
-        Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.Label1.AutoSize = True
+        Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+        Me.Label1.AutoSize = true
         Me.Label1.Location = New System.Drawing.Point(1012, 283)
         Me.Label1.Name = "Label1"
         Me.Label1.Size = New System.Drawing.Size(106, 13)
@@ -506,18 +506,18 @@ Partial Class MainForm
         '
         'LvDEVoptions
         '
-        Me.LvDEVoptions.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.LvDEVoptions.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.LvDEVoptions.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader4, Me.ColumnHeader7, Me.ColumnHeader5, Me.ColumnHeader6, Me.ColumnHeader8, Me.ColumnHeader9})
-        Me.LvDEVoptions.FullRowSelect = True
-        Me.LvDEVoptions.GridLines = True
+        Me.LvDEVoptions.FullRowSelect = true
+        Me.LvDEVoptions.GridLines = true
         Me.LvDEVoptions.Location = New System.Drawing.Point(6, 6)
-        Me.LvDEVoptions.MultiSelect = False
+        Me.LvDEVoptions.MultiSelect = false
         Me.LvDEVoptions.Name = "LvDEVoptions"
         Me.LvDEVoptions.Size = New System.Drawing.Size(1022, 277)
         Me.LvDEVoptions.TabIndex = 0
-        Me.LvDEVoptions.UseCompatibleStateImageBehavior = False
+        Me.LvDEVoptions.UseCompatibleStateImageBehavior = false
         Me.LvDEVoptions.View = System.Windows.Forms.View.Details
         '
         'ColumnHeader4
@@ -554,7 +554,7 @@ Partial Class MainForm
         '
         Me.ConMenFilelist.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ShowInFolderMenuItem, Me.SaveListToolStripMenuItem, Me.LoadListToolStripMenuItem, Me.LoadDefaultListToolStripMenuItem, Me.ClearListToolStripMenuItem})
         Me.ConMenFilelist.Name = "ConMenFilelist"
-        Me.ConMenFilelist.ShowImageMargin = False
+        Me.ConMenFilelist.ShowImageMargin = false
         Me.ConMenFilelist.Size = New System.Drawing.Size(151, 114)
         '
         'ShowInFolderMenuItem
@@ -589,21 +589,21 @@ Partial Class MainForm
         '
         'LvMsg
         '
-        Me.LvMsg.AllowColumnReorder = True
+        Me.LvMsg.AllowColumnReorder = true
         Me.LvMsg.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.LvMsg.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader2, Me.ColumnHeader3})
         Me.LvMsg.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.LvMsg.Font = New System.Drawing.Font("Courier New", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.LvMsg.FullRowSelect = True
-        Me.LvMsg.GridLines = True
+        Me.LvMsg.Font = New System.Drawing.Font("Courier New", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+        Me.LvMsg.FullRowSelect = true
+        Me.LvMsg.GridLines = true
         Me.LvMsg.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable
-        Me.LvMsg.LabelWrap = False
+        Me.LvMsg.LabelWrap = false
         Me.LvMsg.Location = New System.Drawing.Point(0, 0)
         Me.LvMsg.Margin = New System.Windows.Forms.Padding(0)
         Me.LvMsg.Name = "LvMsg"
         Me.LvMsg.Size = New System.Drawing.Size(1045, 281)
         Me.LvMsg.TabIndex = 0
-        Me.LvMsg.UseCompatibleStateImageBehavior = False
+        Me.LvMsg.UseCompatibleStateImageBehavior = false
         Me.LvMsg.View = System.Windows.Forms.View.Details
         '
         'ColumnHeader1
@@ -623,9 +623,9 @@ Partial Class MainForm
         '
         '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.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.Location = New System.Drawing.Point(0, 27)
         Me.SplitContainer1.Margin = New System.Windows.Forms.Padding(0)
         Me.SplitContainer1.Name = "SplitContainer1"
@@ -692,59 +692,59 @@ Partial Class MainForm
         '
         Me.GENEditorToolStripMenuItem1.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
         Me.GENEditorToolStripMenuItem1.Name = "GENEditorToolStripMenuItem1"
-        Me.GENEditorToolStripMenuItem1.Size = New System.Drawing.Size(156, 22)
+        Me.GENEditorToolStripMenuItem1.Size = New System.Drawing.Size(151, 22)
         Me.GENEditorToolStripMenuItem1.Text = "Job Editor"
         '
         'EPTPJobEditorToolStripMenuItem
         '
         Me.EPTPJobEditorToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
         Me.EPTPJobEditorToolStripMenuItem.Name = "EPTPJobEditorToolStripMenuItem"
-        Me.EPTPJobEditorToolStripMenuItem.Size = New System.Drawing.Size(156, 22)
+        Me.EPTPJobEditorToolStripMenuItem.Size = New System.Drawing.Size(151, 22)
         Me.EPTPJobEditorToolStripMenuItem.Text = "VTP Job Editor"
         '
         'VEHEditorToolStripMenuItem
         '
         Me.VEHEditorToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VEH
         Me.VEHEditorToolStripMenuItem.Name = "VEHEditorToolStripMenuItem"
-        Me.VEHEditorToolStripMenuItem.Size = New System.Drawing.Size(156, 22)
+        Me.VEHEditorToolStripMenuItem.Size = New System.Drawing.Size(151, 22)
         Me.VEHEditorToolStripMenuItem.Text = "Vehicle Editor"
         '
         'EngineEditorToolStripMenuItem
         '
         Me.EngineEditorToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_ENG
         Me.EngineEditorToolStripMenuItem.Name = "EngineEditorToolStripMenuItem"
-        Me.EngineEditorToolStripMenuItem.Size = New System.Drawing.Size(156, 22)
+        Me.EngineEditorToolStripMenuItem.Size = New System.Drawing.Size(151, 22)
         Me.EngineEditorToolStripMenuItem.Text = "Engine Editor"
         '
         'GearboxEditorToolStripMenuItem
         '
         Me.GearboxEditorToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_GBX
         Me.GearboxEditorToolStripMenuItem.Name = "GearboxEditorToolStripMenuItem"
-        Me.GearboxEditorToolStripMenuItem.Size = New System.Drawing.Size(156, 22)
+        Me.GearboxEditorToolStripMenuItem.Size = New System.Drawing.Size(151, 22)
         Me.GearboxEditorToolStripMenuItem.Text = "Gearbox Editor"
         '
         'GraphToolStripMenuItem
         '
         Me.GraphToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_Graph
         Me.GraphToolStripMenuItem.Name = "GraphToolStripMenuItem"
-        Me.GraphToolStripMenuItem.Size = New System.Drawing.Size(156, 22)
+        Me.GraphToolStripMenuItem.Size = New System.Drawing.Size(151, 22)
         Me.GraphToolStripMenuItem.Text = "Graph"
         '
         'ToolStripSeparator6
         '
         Me.ToolStripSeparator6.Name = "ToolStripSeparator6"
-        Me.ToolStripSeparator6.Size = New System.Drawing.Size(153, 6)
+        Me.ToolStripSeparator6.Size = New System.Drawing.Size(148, 6)
         '
         'OpenLogToolStripMenuItem
         '
         Me.OpenLogToolStripMenuItem.Name = "OpenLogToolStripMenuItem"
-        Me.OpenLogToolStripMenuItem.Size = New System.Drawing.Size(156, 22)
+        Me.OpenLogToolStripMenuItem.Size = New System.Drawing.Size(151, 22)
         Me.OpenLogToolStripMenuItem.Text = "Open Log"
         '
         'SettingsToolStripMenuItem
         '
         Me.SettingsToolStripMenuItem.Name = "SettingsToolStripMenuItem"
-        Me.SettingsToolStripMenuItem.Size = New System.Drawing.Size(156, 22)
+        Me.SettingsToolStripMenuItem.Size = New System.Drawing.Size(151, 22)
         Me.SettingsToolStripMenuItem.Text = "Settings"
         '
         'ToolStripDrDnBtInfo
@@ -788,7 +788,7 @@ Partial Class MainForm
         'CmDEV
         '
         Me.CmDEV.Name = "CmDEV"
-        Me.CmDEV.ShowImageMargin = False
+        Me.CmDEV.ShowImageMargin = false
         Me.CmDEV.Size = New System.Drawing.Size(36, 4)
         '
         'TmProgSec
@@ -799,7 +799,7 @@ Partial Class MainForm
         '
         Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.OpenInGraphWindowToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
         Me.CmOpenFile.Name = "CmOpenFile"
-        Me.CmOpenFile.ShowImageMargin = False
+        Me.CmOpenFile.ShowImageMargin = false
         Me.CmOpenFile.Size = New System.Drawing.Size(174, 70)
         '
         'OpenWithToolStripMenuItem
@@ -823,45 +823,45 @@ Partial Class MainForm
         'MainForm
         '
         Me.AcceptButton = Me.btStartV3
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(1045, 670)
         Me.Controls.Add(Me.ToolStrip1)
         Me.Controls.Add(Me.SplitContainer1)
         Me.Controls.Add(Me.StatusBAR)
-        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon)
         Me.MinimumSize = New System.Drawing.Size(785, 485)
         Me.Name = "MainForm"
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
         Me.Text = "VECTO"
-        Me.StatusBAR.ResumeLayout(False)
-        Me.StatusBAR.PerformLayout()
-        Me.TabControl1.ResumeLayout(False)
-        Me.TabPageGEN.ResumeLayout(False)
-        Me.TabPageGEN.PerformLayout()
-        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.TabPgOptions.ResumeLayout(False)
-        Me.PanelOptAllg.ResumeLayout(False)
-        Me.GroupBox3.ResumeLayout(False)
-        Me.GroupBox3.PerformLayout()
-        Me.GroupBox2.ResumeLayout(False)
-        Me.GroupBox2.PerformLayout()
-        Me.GroupBox1.ResumeLayout(False)
-        Me.GroupBox1.PerformLayout()
-        Me.TabPageDEV.ResumeLayout(False)
-        Me.TabPageDEV.PerformLayout()
-        Me.ConMenFilelist.ResumeLayout(False)
-        Me.SplitContainer1.Panel1.ResumeLayout(False)
-        Me.SplitContainer1.Panel2.ResumeLayout(False)
-        CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.SplitContainer1.ResumeLayout(False)
-        Me.ToolStrip1.ResumeLayout(False)
-        Me.ToolStrip1.PerformLayout()
-        Me.CmOpenFile.ResumeLayout(False)
-        Me.ResumeLayout(False)
-        Me.PerformLayout()
+        Me.StatusBAR.ResumeLayout(false)
+        Me.StatusBAR.PerformLayout
+        Me.TabControl1.ResumeLayout(false)
+        Me.TabPageGEN.ResumeLayout(false)
+        Me.TabPageGEN.PerformLayout
+        CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).EndInit
+        Me.TabPgOptions.ResumeLayout(false)
+        Me.PanelOptAllg.ResumeLayout(false)
+        Me.GroupBox3.ResumeLayout(false)
+        Me.GroupBox3.PerformLayout
+        Me.GroupBox2.ResumeLayout(false)
+        Me.GroupBox2.PerformLayout
+        Me.GroupBox1.ResumeLayout(false)
+        Me.GroupBox1.PerformLayout
+        Me.TabPageDEV.ResumeLayout(false)
+        Me.TabPageDEV.PerformLayout
+        Me.ConMenFilelist.ResumeLayout(false)
+        Me.SplitContainer1.Panel1.ResumeLayout(false)
+        Me.SplitContainer1.Panel2.ResumeLayout(false)
+        CType(Me.SplitContainer1,System.ComponentModel.ISupportInitialize).EndInit
+        Me.SplitContainer1.ResumeLayout(false)
+        Me.ToolStrip1.ResumeLayout(false)
+        Me.ToolStrip1.PerformLayout
+        Me.CmOpenFile.ResumeLayout(false)
+        Me.ResumeLayout(false)
+        Me.PerformLayout
 
-    End Sub
+End Sub
     Friend WithEvents StatusBAR As StatusStrip
 	Friend WithEvents ToolStripLbStatus As ToolStripStatusLabel
 	Friend WithEvents TabControl1 As TabControl
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponentData/FullLoadCurveTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/FullLoadCurveTest.cs
index 4e11006f1fe3cd0c79f832bcfedd9a0315067f12..bb1d9cb4c9f8e7e07d429b88431fa6bf01c399e5 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponentData/FullLoadCurveTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponentData/FullLoadCurveTest.cs
@@ -56,13 +56,13 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
 
 		public static List<string> LogList = new List<string>();
 
-        [OneTimeSetUp]
-        public void RunBeforeAnyTests()
-        {
-            Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory);
-        }
+		[OneTimeSetUp]
+		public void RunBeforeAnyTests()
+		{
+			Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory);
+		}
 
-        [TestCase]
+		[TestCase]
 		public void TestFullLoadStaticTorque()
 		{
 			var fldCurve = FullLoadCurveReader.ReadFromFile(CoachEngineFLD);