From 3fca229f52f8075fa18ba1cf8f9b3d7fa0b99024 Mon Sep 17 00:00:00 2001
From: Wombat <chkprivat@gmail.com>
Date: Sun, 5 Jan 2025 17:48:45 +0100
Subject: [PATCH] DevExpress-Update frmCategoryEdit umbenannt in frmSettings
 Weitere (erfolglose) Tests, um die richtige Zeitzone bei
 Google-Kalender-Terminen zu hinterlegen

---
 FWCreateCalendar/Classes/clsSettings.vb       |  9 ++
 FWCreateCalendar/FWCreateCalendar.vbproj      | 72 +++++++-------
 FWCreateCalendar/FWCreateCalendar.vbproj.bak  | 98 ++++++++++++-------
 FWCreateCalendar/My Project/Resources.resx    |  8 +-
 .../My Project/Resources.resx.bak             |  8 +-
 .../My Project/Settings.Designer.vb           | 14 ++-
 FWCreateCalendar/My Project/Settings.settings |  3 +
 FWCreateCalendar/My Project/licenses.licx     | 11 ++-
 FWCreateCalendar/My Project/licenses.licx.bak | 10 +-
 FWCreateCalendar/Objects/clsEventEntry.vb     |  3 +-
 FWCreateCalendar/app.config                   |  3 +
 FWCreateCalendar/frmCategoryEdit.vb           | 25 -----
 FWCreateCalendar/frmMain.Designer.vb          |  4 +-
 FWCreateCalendar/frmMain.vb                   | 16 +--
 ...it.Designer.vb => frmSettings.Designer.vb} | 75 ++++++++++++--
 ...{frmCategoryEdit.resx => frmSettings.resx} |  0
 FWCreateCalendar/frmSettings.vb               | 49 ++++++++++
 17 files changed, 277 insertions(+), 131 deletions(-)
 delete mode 100644 FWCreateCalendar/frmCategoryEdit.vb
 rename FWCreateCalendar/{frmCategoryEdit.Designer.vb => frmSettings.Designer.vb} (56%)
 rename FWCreateCalendar/{frmCategoryEdit.resx => frmSettings.resx} (100%)
 create mode 100644 FWCreateCalendar/frmSettings.vb

diff --git a/FWCreateCalendar/Classes/clsSettings.vb b/FWCreateCalendar/Classes/clsSettings.vb
index 84430cd..ad6235d 100644
--- a/FWCreateCalendar/Classes/clsSettings.vb
+++ b/FWCreateCalendar/Classes/clsSettings.vb
@@ -2,6 +2,8 @@
 Public Class Settings
 
     Public Property Categories As List(Of Category)
+    Public Property DefaultTimezoneId As String
+
 
     Public Sub New()
         Load()
@@ -17,10 +19,17 @@ Public Class Settings
         Else
             Categories = New List(Of Category)
         End If
+
+        If My.Settings.DefaultTimezoneId Is Nothing Then
+            DefaultTimezoneId = TimeZoneInfo.Local.Id
+        Else
+            DefaultTimezoneId = My.Settings.DefaultTimezoneId
+        End If
     End Sub
 
     Public Sub Save()
         My.Settings.CategoryList = JsonConvert.SerializeObject(Categories)
+        My.Settings.DefaultTimezoneId = DefaultTimezoneId
         My.Settings.Save()
     End Sub
 
diff --git a/FWCreateCalendar/FWCreateCalendar.vbproj b/FWCreateCalendar/FWCreateCalendar.vbproj
index ecc3ede..c88dd17 100644
--- a/FWCreateCalendar/FWCreateCalendar.vbproj
+++ b/FWCreateCalendar/FWCreateCalendar.vbproj
@@ -71,37 +71,37 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DevExpress.Drawing.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.Data.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.DataAccess.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.DataAccess.v23.2.UI, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.DataVisualization.v23.2.Core, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.Dialogs.v23.2.Core, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.Office.v23.2.Core, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.Printing.v23.2.Core, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.Data.Desktop.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.RichEdit.v23.2.Core, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.Spreadsheet.v23.2.Core, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.Utils.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.Utils.v23.2.UI, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraBars.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.Charts.v23.2.Core, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraCharts.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraDialogs.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraEditors.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraGrid.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraLayout.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraNavBar.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraPrinting.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraRichEdit.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraScheduler.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraScheduler.v23.2.Core.Desktop, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraScheduler.v23.2.Core, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraScheduler.v23.2.Extensions, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Images.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraSpreadsheet.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraTreeList.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraTreeMap.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Drawing.v24.1, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Data.v24.1, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.DataAccess.v24.1, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.DataAccess.v24.1.UI, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.DataVisualization.v24.1.Core, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Dialogs.v24.1.Core, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Office.v24.1.Core, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Printing.v24.1.Core, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Data.Desktop.v24.1, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.RichEdit.v24.1.Core, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Spreadsheet.v24.1.Core, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Utils.v24.1, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Utils.v24.1.UI, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraBars.v24.1, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Charts.v24.1.Core, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraCharts.v24.1, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraDialogs.v24.1, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraEditors.v24.1, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraGrid.v24.1, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraLayout.v24.1, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraNavBar.v24.1, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraPrinting.v24.1, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraRichEdit.v24.1, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraScheduler.v24.1, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraScheduler.v24.1.Core.Desktop, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraScheduler.v24.1.Core, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraScheduler.v24.1.Extensions, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Images.v24.1, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraSpreadsheet.v24.1, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraTreeList.v24.1, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraTreeMap.v24.1, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
@@ -136,10 +136,10 @@
     <Compile Include="Classes\clsGridFunctions.vb" />
     <Compile Include="Classes\clsSettings.vb" />
     <Compile Include="Objects\clsTableHeader.vb" />
-    <Compile Include="frmCategoryEdit.Designer.vb">
-      <DependentUpon>frmCategoryEdit.vb</DependentUpon>
+    <Compile Include="frmSettings.Designer.vb">
+      <DependentUpon>frmSettings.vb</DependentUpon>
     </Compile>
-    <Compile Include="frmCategoryEdit.vb">
+    <Compile Include="frmSettings.vb">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="frmMain.Designer.vb">
@@ -166,8 +166,8 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="frmCategoryEdit.resx">
-      <DependentUpon>frmCategoryEdit.vb</DependentUpon>
+    <EmbeddedResource Include="frmSettings.resx">
+      <DependentUpon>frmSettings.vb</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="frmMain.resx">
       <DependentUpon>frmMain.vb</DependentUpon>
diff --git a/FWCreateCalendar/FWCreateCalendar.vbproj.bak b/FWCreateCalendar/FWCreateCalendar.vbproj.bak
index f4ceb36..ecc3ede 100644
--- a/FWCreateCalendar/FWCreateCalendar.vbproj.bak
+++ b/FWCreateCalendar/FWCreateCalendar.vbproj.bak
@@ -71,39 +71,37 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DevExpress.Drawing.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.Data.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.DataAccess.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.DataAccess.v22.1.UI, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.DataVisualization.v22.1.Core, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.Dialogs.v22.1.Core, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.Office.v22.1.Core, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.Printing.v22.1.Core, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.Data.Desktop.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.RichEdit.v22.1.Core, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.Spreadsheet.v22.1.Core, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.Utils.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.Utils.v22.1.UI, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraBars.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.Charts.v22.1.Core, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraCharts.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraDialogs.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraEditors.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraGrid.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraLayout.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraNavBar.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraPrinting.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraRichEdit.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraScheduler.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraScheduler.v22.1.Core.Desktop, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraScheduler.v22.1.Core, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraScheduler.v22.1.Extensions, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraSpreadsheet.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraTreeList.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraTreeMap.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </Reference>
+    <Reference Include="DevExpress.Drawing.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Data.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.DataAccess.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.DataAccess.v23.2.UI, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.DataVisualization.v23.2.Core, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Dialogs.v23.2.Core, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Office.v23.2.Core, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Printing.v23.2.Core, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Data.Desktop.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.RichEdit.v23.2.Core, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Spreadsheet.v23.2.Core, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Utils.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Utils.v23.2.UI, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraBars.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Charts.v23.2.Core, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraCharts.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraDialogs.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraEditors.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraGrid.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraLayout.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraNavBar.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraPrinting.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraRichEdit.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraScheduler.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraScheduler.v23.2.Core.Desktop, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraScheduler.v23.2.Core, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraScheduler.v23.2.Extensions, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Images.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraSpreadsheet.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraTreeList.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraTreeMap.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
@@ -184,7 +182,10 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
-    <None Include="Feuerwehr 2019.xlsx" />
+    <None Include="_Docs\2023_Dienstplan_FFWeitefeld.xlsx" />
+    <None Include="_Docs\2022_Dienstplan_FFWeitefeld_V1.0.xlsx" />
+    <None Include="_Docs\2024_Dienstplan_FFWeitefeld.xlsx" />
+    <None Include="_Docs\2019_Dienstplan.xlsx" />
     <None Include="My Project\Application.myapp">
       <Generator>MyApplicationCodeGenerator</Generator>
       <LastGenOutput>Application.Designer.vb</LastGenOutput>
@@ -220,6 +221,35 @@
   <ItemGroup>
     <None Include="Resources\exportfile.svg" />
   </ItemGroup>
+  <ItemGroup>
+    <COMReference Include="Microsoft.Office.Core">
+      <Guid>{2DF8D04C-5BFA-101B-BDE5-00AA0044DE52}</Guid>
+      <VersionMajor>2</VersionMajor>
+      <VersionMinor>8</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>primary</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </COMReference>
+    <COMReference Include="Microsoft.Office.Interop.Excel">
+      <Guid>{00020813-0000-0000-C000-000000000046}</Guid>
+      <VersionMajor>1</VersionMajor>
+      <VersionMinor>9</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>primary</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </COMReference>
+    <COMReference Include="VBIDE">
+      <Guid>{0002E157-0000-0000-C000-000000000046}</Guid>
+      <VersionMajor>5</VersionMajor>
+      <VersionMinor>3</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>primary</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </COMReference>
+  </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/FWCreateCalendar/My Project/Resources.resx b/FWCreateCalendar/My Project/Resources.resx
index dae4449..d845ea3 100644
--- a/FWCreateCalendar/My Project/Resources.resx	
+++ b/FWCreateCalendar/My Project/Resources.resx	
@@ -119,15 +119,15 @@
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="viewsettings" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\viewsettings.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\viewsettings.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v24.1, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="save" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v24.1, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="open" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\open.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\open.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v24.1, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="exportfile" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\exportfile.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\exportfile.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v24.1, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/FWCreateCalendar/My Project/Resources.resx.bak b/FWCreateCalendar/My Project/Resources.resx.bak
index 2cc51b3..dae4449 100644
--- a/FWCreateCalendar/My Project/Resources.resx.bak	
+++ b/FWCreateCalendar/My Project/Resources.resx.bak	
@@ -119,15 +119,15 @@
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="viewsettings" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\viewsettings.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\viewsettings.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="save" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="open" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\open.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\open.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="exportfile" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\exportfile.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\exportfile.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/FWCreateCalendar/My Project/Settings.Designer.vb b/FWCreateCalendar/My Project/Settings.Designer.vb
index 75addbb..eefab51 100644
--- a/FWCreateCalendar/My Project/Settings.Designer.vb	
+++ b/FWCreateCalendar/My Project/Settings.Designer.vb	
@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
     
     <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.12.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -77,6 +77,18 @@ Namespace My
                 Me("EndDateCalculationHoursToAdd") = value
             End Set
         End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("")>  _
+        Public Property DefaultTimezoneId() As String
+            Get
+                Return CType(Me("DefaultTimezoneId"),String)
+            End Get
+            Set
+                Me("DefaultTimezoneId") = value
+            End Set
+        End Property
     End Class
 End Namespace
 
diff --git a/FWCreateCalendar/My Project/Settings.settings b/FWCreateCalendar/My Project/Settings.settings
index b6ef0a2..b9128e9 100644
--- a/FWCreateCalendar/My Project/Settings.settings	
+++ b/FWCreateCalendar/My Project/Settings.settings	
@@ -8,5 +8,8 @@
     <Setting Name="EndDateCalculationHoursToAdd" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">2</Value>
     </Setting>
+    <Setting Name="DefaultTimezoneId" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/FWCreateCalendar/My Project/licenses.licx b/FWCreateCalendar/My Project/licenses.licx
index 9cb7ca0..d0009dc 100644
--- a/FWCreateCalendar/My Project/licenses.licx	
+++ b/FWCreateCalendar/My Project/licenses.licx	
@@ -1,5 +1,6 @@
-DevExpress.XtraScheduler.SchedulerControl, DevExpress.XtraScheduler.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraSpreadsheet.SpreadsheetControl, DevExpress.XtraSpreadsheet.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v24.1, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v24.1, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraScheduler.SchedulerControl, DevExpress.XtraScheduler.v24.1, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v24.1, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraSpreadsheet.SpreadsheetControl, DevExpress.XtraSpreadsheet.v24.1, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ImageComboBoxEdit, DevExpress.XtraEditors.v24.1, Version=24.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/FWCreateCalendar/My Project/licenses.licx.bak b/FWCreateCalendar/My Project/licenses.licx.bak
index c976329..9cb7ca0 100644
--- a/FWCreateCalendar/My Project/licenses.licx.bak	
+++ b/FWCreateCalendar/My Project/licenses.licx.bak	
@@ -1,5 +1,5 @@
-DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraSpreadsheet.SpreadsheetControl, DevExpress.XtraSpreadsheet.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraScheduler.SchedulerControl, DevExpress.XtraScheduler.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v22.1, Version=22.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraScheduler.SchedulerControl, DevExpress.XtraScheduler.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraSpreadsheet.SpreadsheetControl, DevExpress.XtraSpreadsheet.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/FWCreateCalendar/Objects/clsEventEntry.vb b/FWCreateCalendar/Objects/clsEventEntry.vb
index 376d3c1..535a647 100644
--- a/FWCreateCalendar/Objects/clsEventEntry.vb
+++ b/FWCreateCalendar/Objects/clsEventEntry.vb
@@ -8,7 +8,8 @@
     Public Property Status As String
     Public Property IsInvalid As Boolean
     Public Property Exclude As Boolean
-
     Public Property RowIndex As Integer
 
+    Public Property TimeZoneKey As String = General.Settings.DefaultTimezoneId
+
 End Class
diff --git a/FWCreateCalendar/app.config b/FWCreateCalendar/app.config
index 1b22f0d..df5fadd 100644
--- a/FWCreateCalendar/app.config
+++ b/FWCreateCalendar/app.config
@@ -33,6 +33,9 @@
             <setting name="EndDateCalculationHoursToAdd" serializeAs="String">
                 <value>2</value>
             </setting>
+            <setting name="DefaultTimezoneId" serializeAs="String">
+                <value />
+            </setting>
         </FWCreateCalendar.My.MySettings>
     </userSettings>
 </configuration>
diff --git a/FWCreateCalendar/frmCategoryEdit.vb b/FWCreateCalendar/frmCategoryEdit.vb
deleted file mode 100644
index a2b89f4..0000000
--- a/FWCreateCalendar/frmCategoryEdit.vb
+++ /dev/null
@@ -1,25 +0,0 @@
-Public Class frmCategoryEdit
-
-    Private Sub frmCategoryEdit_Load(sender As Object, e As EventArgs) Handles MyBase.Load
-        prepare()
-    End Sub
-
-    Private Sub prepare()
-        grd.DataSource = General.Settings.Categories
-        With grdv
-            .PopulateColumns()
-            .Columns(NameOf(Category.Key)).OptionsColumn.AllowEdit = False
-            .Columns(NameOf(Category.Key)).Caption = "Kürzel"
-            .Columns(NameOf(Category.Text)).Caption = "Bezeichnung"
-            .Columns(NameOf(Category.Color)).Caption = "Farbe"
-            .Columns(NameOf(Category.Exclude)).Caption = "Auf Kalender ausschließen"
-        End With
-    End Sub
-
-    Private Sub btnSave_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnSave.ItemClick
-        GridFunctions.EndGridEdit(grdv)
-        General.Settings.Save()
-        DialogResult = DialogResult.OK
-    End Sub
-
-End Class
\ No newline at end of file
diff --git a/FWCreateCalendar/frmMain.Designer.vb b/FWCreateCalendar/frmMain.Designer.vb
index 2979f2e..c2928bc 100644
--- a/FWCreateCalendar/frmMain.Designer.vb
+++ b/FWCreateCalendar/frmMain.Designer.vb
@@ -141,7 +141,7 @@ Partial Class frmMain
         '
         'btnCategories
         '
-        Me.btnCategories.Caption = "Kategorien bearbeiten..."
+        Me.btnCategories.Caption = "Einstellungen..."
         Me.btnCategories.Id = 2
         Me.btnCategories.ImageOptions.SvgImage = Global.FWCreateCalendar.My.Resources.Resources.viewsettings
         Me.btnCategories.Name = "btnCategories"
@@ -364,7 +364,7 @@ Partial Class frmMain
         Me.schedStorage.Appointments.Labels.CreateNewLabel(8, "Birthday", "&Birthday", System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(207, Byte), Integer), CType(CType(233, Byte), Integer)))
         Me.schedStorage.Appointments.Labels.CreateNewLabel(9, "Anniversary", "&Anniversary", System.Drawing.Color.FromArgb(CType(CType(141, Byte), Integer), CType(CType(233, Byte), Integer), CType(CType(223, Byte), Integer)))
         Me.schedStorage.Appointments.Labels.CreateNewLabel(10, "Phone Call", "Phone &Call", System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(247, Byte), Integer), CType(CType(165, Byte), Integer)))
-        Me.schedStorage.TimeZoneId = "UTC"
+        Me.schedStorage.TimeZoneId = "E. Europe Standard Time"
         '
         'SFD
         '
diff --git a/FWCreateCalendar/frmMain.vb b/FWCreateCalendar/frmMain.vb
index f935e3c..cd0fd61 100644
--- a/FWCreateCalendar/frmMain.vb
+++ b/FWCreateCalendar/frmMain.vb
@@ -78,6 +78,7 @@ Public Class frmMain
                 .Subject = NameOf(EventEntry.Subject)
                 .Location = NameOf(EventEntry.Location)
                 .Label = NameOf(EventEntry.Category)
+                .TimeZoneId = NameOf(EventEntry.TimeZoneKey)
             End With
             .Appointments.CustomFieldMappings.Add(New AppointmentCustomFieldMapping(NameOf(EventEntry.IsInvalid), NameOf(EventEntry.IsInvalid)))
             .Appointments.CustomFieldMappings.Add(New AppointmentCustomFieldMapping(NameOf(EventEntry.Exclude), NameOf(EventEntry.Exclude)))
@@ -96,23 +97,21 @@ Public Class frmMain
         sched.GoToToday()
     End Sub
 
-    Private Sub fill(datei As String)
+    Private Sub ImportDatasourceFromFile(datei As String)
         schedStorage.Appointments.DataSource = Nothing
-
         grd.BeginUpdate()
         grd.DataSource = Nothing
-        ds = Readout(datei)
+        ds = GetEventsFromFile(datei)
         grd.DataSource = ds
         grd.EndUpdate()
         grdv.BestFitColumns()
-
         schedStorage.Appointments.DataSource = ds
         sched.RefreshData()
     End Sub
 
 
 
-    Public Function Readout(datei As String) As List(Of EventEntry)
+    Public Function GetEventsFromFile(datei As String) As List(Of EventEntry)
         Dim xlApp = New Excel.Application
         'Im Fall von folgendem Fehler:
         'The COM object of the type "Microsoft.Office.Interop.Excel.ApplicationClass" cannot be converted to the interface type "Microsoft.Office.Interop.Excel._Application". 
@@ -233,13 +232,13 @@ Public Class frmMain
         If OFD.ShowDialog = DialogResult.OK Then
             SFD.FileName = $"{Path.GetFileNameWithoutExtension(OFD.FileName)}.ics"
             SFD.InitialDirectory = Path.GetDirectoryName(OFD.FileName)
-            fill(OFD.FileName)
+            ImportDatasourceFromFile(OFD.FileName)
             xlsSheet.LoadDocument(OFD.FileName)
         End If
     End Sub
 
     Private Sub btnCategories_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnCategories.ItemClick
-        Dim frm As New frmCategoryEdit
+        Dim frm As New frmSettings
         If frm.ShowDialog = DialogResult.OK Then
             RefreshEventExclusion(ds)
             CheckEventValidity(ds)
@@ -251,6 +250,7 @@ Public Class frmMain
     Private Sub btnExport_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnExport.ItemClick
         SFD.FileName = Path.GetFileNameWithoutExtension(OFD.FileName) & ".ics"
         If SFD.ShowDialog = DialogResult.OK Then
+            'schedStorage.TimeZoneId = General.Settings.DefaultTimezoneId
             Dim exporter As New iCalendarExporter(schedStorage)
             AddHandler exporter.AppointmentExporting, AddressOf Exporter_AppointmentExporting
             exporter.Export(SFD.FileName)
@@ -259,7 +259,7 @@ Public Class frmMain
 
     Private Sub Exporter_AppointmentExporting(sender As Object, e As AppointmentExportingEventArgs)
         'e.Appointment.TimeZoneId = sched.OptionsBehavior.ClientTimeZoneId
-        'e.Appointment.TimeZoneId = "Europe/Berlin"
+        'e.Appointment.TimeZoneId = General.Settings.DefaultTimezoneId
         If CType(e.Appointment.GetSourceObject(schedStorage), EventEntry).Exclude OrElse CType(e.Appointment.GetSourceObject(schedStorage), EventEntry).IsInvalid Then
             e.Cancel = True
         End If
diff --git a/FWCreateCalendar/frmCategoryEdit.Designer.vb b/FWCreateCalendar/frmSettings.Designer.vb
similarity index 56%
rename from FWCreateCalendar/frmCategoryEdit.Designer.vb
rename to FWCreateCalendar/frmSettings.Designer.vb
index 03bdf8d..710bf19 100644
--- a/FWCreateCalendar/frmCategoryEdit.Designer.vb
+++ b/FWCreateCalendar/frmSettings.Designer.vb
@@ -1,5 +1,5 @@
 <Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
-Partial Class frmCategoryEdit
+Partial Class frmSettings
     Inherits System.Windows.Forms.Form
 
     'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
@@ -28,23 +28,33 @@ Partial Class frmCategoryEdit
         Me.rpgGeneral = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.grd = New DevExpress.XtraGrid.GridControl()
         Me.grdv = New DevExpress.XtraGrid.Views.Grid.GridView()
+        Me.tcMain = New DevExpress.XtraTab.XtraTabControl()
+        Me.tpGeneral = New DevExpress.XtraTab.XtraTabPage()
+        Me.tpCategories = New DevExpress.XtraTab.XtraTabPage()
+        Me.cboDefaultTimezone = New DevExpress.XtraEditors.ImageComboBoxEdit()
+        Me.lblDefaultTimezone = New DevExpress.XtraEditors.LabelControl()
         CType(Me.rcMain, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.grd, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.grdv, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.tcMain, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.tcMain.SuspendLayout()
+        Me.tpGeneral.SuspendLayout()
+        Me.tpCategories.SuspendLayout()
+        CType(Me.cboDefaultTimezone.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'rcMain
         '
         Me.rcMain.DrawGroupCaptions = DevExpress.Utils.DefaultBoolean.[False]
         Me.rcMain.ExpandCollapseItem.Id = 0
-        Me.rcMain.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.rcMain.ExpandCollapseItem, Me.btnSave, Me.rcMain.SearchEditItem})
+        Me.rcMain.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.rcMain.ExpandCollapseItem, Me.btnSave})
         Me.rcMain.Location = New System.Drawing.Point(0, 0)
         Me.rcMain.MaxItemId = 3
         Me.rcMain.Name = "rcMain"
         Me.rcMain.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.rpMain})
         Me.rcMain.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
         Me.rcMain.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages
-        Me.rcMain.Size = New System.Drawing.Size(800, 79)
+        Me.rcMain.Size = New System.Drawing.Size(800, 109)
         Me.rcMain.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden
         '
         'btnSave
@@ -69,11 +79,11 @@ Partial Class frmCategoryEdit
         'grd
         '
         Me.grd.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.grd.Location = New System.Drawing.Point(0, 79)
+        Me.grd.Location = New System.Drawing.Point(0, 0)
         Me.grd.MainView = Me.grdv
         Me.grd.MenuManager = Me.rcMain
         Me.grd.Name = "grd"
-        Me.grd.Size = New System.Drawing.Size(800, 371)
+        Me.grd.Size = New System.Drawing.Size(798, 316)
         Me.grd.TabIndex = 1
         Me.grd.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.grdv})
         '
@@ -84,18 +94,66 @@ Partial Class frmCategoryEdit
         Me.grdv.OptionsView.ShowGroupPanel = False
         Me.grdv.OptionsView.ShowIndicator = False
         '
+        'tcMain
+        '
+        Me.tcMain.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.tcMain.Location = New System.Drawing.Point(0, 109)
+        Me.tcMain.Name = "tcMain"
+        Me.tcMain.SelectedTabPage = Me.tpCategories
+        Me.tcMain.Size = New System.Drawing.Size(800, 341)
+        Me.tcMain.TabIndex = 3
+        Me.tcMain.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.tpGeneral, Me.tpCategories})
+        '
+        'tpGeneral
+        '
+        Me.tpGeneral.Controls.Add(Me.lblDefaultTimezone)
+        Me.tpGeneral.Controls.Add(Me.cboDefaultTimezone)
+        Me.tpGeneral.Name = "tpGeneral"
+        Me.tpGeneral.Size = New System.Drawing.Size(798, 316)
+        Me.tpGeneral.Text = "Allgemein"
+        '
+        'tpCategories
+        '
+        Me.tpCategories.Controls.Add(Me.grd)
+        Me.tpCategories.Name = "tpCategories"
+        Me.tpCategories.Size = New System.Drawing.Size(798, 316)
+        Me.tpCategories.Text = "Kategorien"
+        '
+        'cboDefaultTimezone
+        '
+        Me.cboDefaultTimezone.Location = New System.Drawing.Point(212, 8)
+        Me.cboDefaultTimezone.MenuManager = Me.rcMain
+        Me.cboDefaultTimezone.Name = "cboDefaultTimezone"
+        Me.cboDefaultTimezone.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
+        Me.cboDefaultTimezone.Size = New System.Drawing.Size(212, 20)
+        Me.cboDefaultTimezone.TabIndex = 0
+        '
+        'lblDefaultTimezone
+        '
+        Me.lblDefaultTimezone.Location = New System.Drawing.Point(11, 11)
+        Me.lblDefaultTimezone.Name = "lblDefaultTimezone"
+        Me.lblDefaultTimezone.Size = New System.Drawing.Size(162, 13)
+        Me.lblDefaultTimezone.TabIndex = 1
+        Me.lblDefaultTimezone.Text = "Standard-Zeitzone für den Import"
+        '
         'frmCategoryEdit
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(800, 450)
-        Me.Controls.Add(Me.grd)
+        Me.Controls.Add(Me.tcMain)
         Me.Controls.Add(Me.rcMain)
         Me.Name = "frmCategoryEdit"
         Me.Text = "Kategorien bearbeiten"
         CType(Me.rcMain, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.grd, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.grdv, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.tcMain, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.tcMain.ResumeLayout(False)
+        Me.tpGeneral.ResumeLayout(False)
+        Me.tpGeneral.PerformLayout()
+        Me.tpCategories.ResumeLayout(False)
+        CType(Me.cboDefaultTimezone.Properties, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -107,4 +165,9 @@ Partial Class frmCategoryEdit
     Friend WithEvents rpgGeneral As DevExpress.XtraBars.Ribbon.RibbonPageGroup
     Friend WithEvents grd As DevExpress.XtraGrid.GridControl
     Friend WithEvents grdv As DevExpress.XtraGrid.Views.Grid.GridView
+    Friend WithEvents tcMain As DevExpress.XtraTab.XtraTabControl
+    Friend WithEvents tpCategories As DevExpress.XtraTab.XtraTabPage
+    Friend WithEvents tpGeneral As DevExpress.XtraTab.XtraTabPage
+    Friend WithEvents lblDefaultTimezone As DevExpress.XtraEditors.LabelControl
+    Friend WithEvents cboDefaultTimezone As DevExpress.XtraEditors.ImageComboBoxEdit
 End Class
diff --git a/FWCreateCalendar/frmCategoryEdit.resx b/FWCreateCalendar/frmSettings.resx
similarity index 100%
rename from FWCreateCalendar/frmCategoryEdit.resx
rename to FWCreateCalendar/frmSettings.resx
diff --git a/FWCreateCalendar/frmSettings.vb b/FWCreateCalendar/frmSettings.vb
new file mode 100644
index 0000000..3911427
--- /dev/null
+++ b/FWCreateCalendar/frmSettings.vb
@@ -0,0 +1,49 @@
+Public Class frmSettings
+
+    Private Sub frmCategoryEdit_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        prepare()
+        fill()
+
+        tcMain.SelectedTabPageIndex = 0
+    End Sub
+
+    Private Sub prepare()
+        grd.DataSource = General.Settings.Categories
+        With grdv
+            .PopulateColumns()
+            .Columns(NameOf(Category.Key)).OptionsColumn.AllowEdit = False
+            .Columns(NameOf(Category.Key)).Caption = "Kürzel"
+            .Columns(NameOf(Category.Text)).Caption = "Bezeichnung"
+            .Columns(NameOf(Category.Color)).Caption = "Farbe"
+            .Columns(NameOf(Category.Exclude)).Caption = "Auf Kalender ausschließen"
+        End With
+
+        cboDefaultTimezone.DataBindings.Add(New Binding("EditValue", General.Settings, NameOf(General.Settings.DefaultTimezoneId)))
+    End Sub
+
+    Private Sub fill()
+        For Each z As TimeZoneInfo In TimeZoneInfo.GetSystemTimeZones().OrderBy(Function(tz) tz.DisplayName)
+            cboDefaultTimezone.Properties.Items.Add(z.DisplayName, z.Id, -1)
+            '    Console.WriteLine(z.Id)
+        Next
+    End Sub
+
+    Private Sub btnSave_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnSave.ItemClick
+        GridFunctions.EndGridEdit(grdv)
+        EndControlEdit(ActiveControl)
+
+        General.Settings.Save()
+        DialogResult = DialogResult.OK
+    End Sub
+
+
+    Public Shared Sub EndControlEdit(ActiveCtrl As Control)
+        'Dieser Sub ist nötig, da DevExpress-Controls ihre Daten erst durch verlieren des Fokus oder durch DoValidate() zurück ins DataSet schreiben.
+        'Hat ein DevExpress-Control noch Fokus und es wird auf einen Button geklickt, der keinen Fokus bekommt (z.B. RibbonControl-Buttons), werden die Änderungen aus diesem Feld nicht ins Dataset zurückgeschrieben und somit auch nicht beim Speichern als Änderungen erkannt
+        While TypeOf ActiveCtrl Is IContainerControl
+            ActiveCtrl = CType(ActiveCtrl, IContainerControl).ActiveControl
+        End While
+        If TypeOf ActiveCtrl Is DevExpress.XtraEditors.TextBoxMaskBox Then ActiveCtrl = ActiveCtrl.Parent
+        If TypeOf ActiveCtrl Is DevExpress.XtraEditors.BaseEdit Then CType(ActiveCtrl, DevExpress.XtraEditors.BaseEdit).DoValidate()
+    End Sub
+End Class
\ No newline at end of file