diff --git a/app/DD_PM_WINDREAM/ClassConfig.vb b/app/DD_PM_WINDREAM/ClassConfig.vb
index 4a80d20..beb5442 100644
--- a/app/DD_PM_WINDREAM/ClassConfig.vb
+++ b/app/DD_PM_WINDREAM/ClassConfig.vb
@@ -8,19 +8,12 @@ Public Class ClassConfig
     Public Property ConnectionStringTest As String = ""
     <ConnectionStringAppServer>
     Public Property ConnectionStringAppServer As String = ""
-    <AppServerConfig>
-    Public Property AppServerConfig As String = ""
+    <EDMIAppServer>
+    Public Property EDMIAppServer As String = ""
 
     Public Property TestMode As Boolean = False
 
     ' PDF Viewer Settings
-    Public Property UniversalViewerPath As String = ""
-    Public Property XChangeViewerPath As String = ""
-    Public Property SumatraViewerPath As String = ""
-
-    Public Property PDFViewerZoomLevel As Integer = 3
-    Public Property PDFViewer As String = "internal"
-    Public Property DefaultViewer As String = "docview"
 
     ' Windream Settings
     Public Property IndexDmsErstellt As String = "DMS erstellt"
diff --git a/app/DD_PM_WINDREAM/ClassInit.vb b/app/DD_PM_WINDREAM/ClassInit.vb
index 58fadb6..6de5b4d 100644
--- a/app/DD_PM_WINDREAM/ClassInit.vb
+++ b/app/DD_PM_WINDREAM/ClassInit.vb
@@ -23,7 +23,7 @@ Public Class ClassInit
 
         LOGGER.Info("## ProcessManager started - {0}", Now)
         Try
-            Dim directory As New IO.DirectoryInfo(Application.LocalUserAppDataPath & "\Log")
+            Dim directory As New IO.DirectoryInfo(LOGCONFIG.LogDirectory)
 
             For Each file As IO.FileInfo In directory.GetFiles
                 If (Now - file.CreationTime).Days > 29 Then
@@ -42,15 +42,15 @@ Public Class ClassInit
     <STAThread()>
     Public Sub InitUserConfig()
         Try
-            Dim AppdataPath = Application.UserAppDataPath
+            Dim UserAppDataPath = Application.UserAppDataPath
             Dim CommonAppDataPath = Application.CommonAppDataPath
             Dim StartupPath = Application.StartupPath
             If My.Settings.UseAppConfigConString = True Then
-                AppdataPath = StartupPath
+                ' UserAppDataPath = StartupPath
                 CommonAppDataPath = StartupPath
             End If
 
-            CONFIG = New ConfigManager(Of ClassConfig)(LOGCONFIG, AppdataPath, CommonAppDataPath, StartupPath)
+            CONFIG = New ConfigManager(Of ClassConfig)(LOGCONFIG, UserAppDataPath, CommonAppDataPath, StartupPath)
             LOGGER.Info("Config loaded")
 
             If CONFIG.Config.ConnectionStringTest <> String.Empty And CONFIG.Config.TestMode = True Then
@@ -69,11 +69,9 @@ Public Class ClassInit
                 CONNECTION_STRING_READ = CONNECTION_STRING
             End If
 
-            If CONFIG.Config.AppServerConfig <> String.Empty Then
-
-
+            If CONFIG.Config.EDMIAppServer <> String.Empty Then
                 Try
-                    Dim oSplit() = CONFIG.Config.AppServerConfig.ToString.Split(";")
+                    Dim oSplit() = CONFIG.Config.EDMIAppServer.ToString.Split(";")
                     Dim oAppServer = oSplit(0)
                     Dim oAppServerPort = 9000
                     If oSplit.Length = 2 Then
@@ -82,7 +80,7 @@ Public Class ClassInit
                     _Client = New Client(LOGCONFIG, oAppServer, oAppServerPort)
                     If Not IsNothing(_Client) Then
                         If _Client.Connect() Then
-                            APPSERVER_ACTIVE = True
+                            EDMIAppServerActive = True
                         End If
                     End If
 
diff --git a/app/DD_PM_WINDREAM/ModuleMySettings.vb b/app/DD_PM_WINDREAM/ModuleMySettings.vb
index 02178c3..80321f2 100644
--- a/app/DD_PM_WINDREAM/ModuleMySettings.vb
+++ b/app/DD_PM_WINDREAM/ModuleMySettings.vb
@@ -9,7 +9,7 @@
     Public CONNECTION_STRING_IDB_READ As String = ""
     Public CONNECTION_STRING_IDB_WRITE As String = ""
     Public IDB_ACTIVE As Boolean = False
-    Public APPSERVER_ACTIVE As Boolean = False
+    Public EDMIAppServerActive As Boolean = False
 
     Public IDB_USES_WMFILESTORE As Boolean = False
     Public BASIC_CONF_VISIBLE As Boolean = True
diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb
index 605a96f..857f829 100644
--- a/app/DD_PM_WINDREAM/frmMain.vb
+++ b/app/DD_PM_WINDREAM/frmMain.vb
@@ -313,7 +313,7 @@ Public Class frmMain
                     LOGGER.Debug($"Got the IDB_DOC_DATA_SQL..{IDB_DOC_DATA_SQL}")
                 End If
                 bsiGeneralInfo.Caption = "IDB active"
-            If APPSERVER_ACTIVE = True Then
+            If EDMIAppServerActive = True Then
                 BarStaticItemAppServer.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
             Else
                 BarStaticItemAppServer.Visibility = DevExpress.XtraBars.BarItemVisibility.Never