diff --git a/app/DD_Clipboard_Searcher/ClassDataASorDB.vb b/app/DD_Clipboard_Searcher/ClassDataASorDB.vb
index 89d36f8..51cd8b2 100644
--- a/app/DD_Clipboard_Searcher/ClassDataASorDB.vb
+++ b/app/DD_Clipboard_Searcher/ClassDataASorDB.vb
@@ -32,37 +32,37 @@ Public Class ClassDataASorDB
 
     Public Function CheckModuleData()
         Try
-            Dim oSql = String.Format("SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{0}','CW',{1},'')", USER_USERNAME, CLIENT_SELECTED)
-            Dim DT_CHECKUSER_MODULE As DataTable
-            DT_CHECKUSER_MODULE = Database.GetDatatable(oSql)
+            Dim oSql = String.Format("SELECT * FROM [dbo].[FNDD_LOGIN_USER_MODULE] ('{0}','CW',{1})", USER_USERNAME, CLIENT_SELECTED)
+            Dim DT_LOGIN_USER_MODULE As DataTable
+            DT_LOGIN_USER_MODULE = Database.GetDatatable(oSql)
 
-            If DT_CHECKUSER_MODULE.Rows.Count = 0 Then
+            If DT_LOGIN_USER_MODULE.Rows.Count = 0 Then
                 Logger.Info("DT_CHECKUSER_MODULE.Rows.Count = 0", True)
                 'ERROR_STATE = "NO USER"
                 MsgBox("Sorry - Something went wrong in getting Your rights." & vbNewLine & "Please contact the system administrator!", MsgBoxStyle.Exclamation)
                 Return False
             End If
-            If DT_CHECKUSER_MODULE.Rows.Count = 1 Then
+            If DT_LOGIN_USER_MODULE.Rows.Count = 1 Then
                 Logger.Info(">> Login Username: " & USER_USERNAME, False)
                 Logger.Info(">> Login time: " & Now.ToString, False)
-                USER_ID = DT_CHECKUSER_MODULE.Rows(0).Item("USER_ID")
-                USER_SURNAME = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_SURNAME")), "", DT_CHECKUSER_MODULE.Rows(0).Item("USER_SURNAME"))
-                USER_PRENAME = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_PRENAME")), "", DT_CHECKUSER_MODULE.Rows(0).Item("USER_PRENAME"))
-                USER_SHORTNAME = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_SHORTNAME")), "", DT_CHECKUSER_MODULE.Rows(0).Item("USER_SHORTNAME"))
-                USER_EMAIL = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_EMAIL")), "", DT_CHECKUSER_MODULE.Rows(0).Item("USER_EMAIL"))
-                USER_LANGUAGE = DT_CHECKUSER_MODULE.Rows(0).Item("USER_LANGUAGE")
-                USER_DATE_FORMAT = DT_CHECKUSER_MODULE.Rows(0).Item("USER_DATE_FORMAT")
+                USER_ID = DT_LOGIN_USER_MODULE.Rows(0).Item("USER_ID")
+                USER_SURNAME = IIf(IsDBNull(DT_LOGIN_USER_MODULE.Rows(0).Item("USER_SURNAME")), "", DT_LOGIN_USER_MODULE.Rows(0).Item("USER_SURNAME"))
+                USER_PRENAME = IIf(IsDBNull(DT_LOGIN_USER_MODULE.Rows(0).Item("USER_PRENAME")), "", DT_LOGIN_USER_MODULE.Rows(0).Item("USER_PRENAME"))
+                USER_SHORTNAME = IIf(IsDBNull(DT_LOGIN_USER_MODULE.Rows(0).Item("USER_SHORTNAME")), "", DT_LOGIN_USER_MODULE.Rows(0).Item("USER_SHORTNAME"))
+                USER_EMAIL = IIf(IsDBNull(DT_LOGIN_USER_MODULE.Rows(0).Item("USER_EMAIL")), "", DT_LOGIN_USER_MODULE.Rows(0).Item("USER_EMAIL"))
+                USER_LANGUAGE = DT_LOGIN_USER_MODULE.Rows(0).Item("USER_LANGUAGE")
+                USER_DATE_FORMAT = DT_LOGIN_USER_MODULE.Rows(0).Item("USER_DATE_FORMAT")
 
-                USER_IN_MODULE = DT_CHECKUSER_MODULE.Rows(0).Item("MODULE_ACCESS")
-                USER_IS_ADMIN = DT_CHECKUSER_MODULE.Rows(0).Item("IS_ADMIN")
-                ADDITIONAL_TITLE = DT_CHECKUSER_MODULE.Rows(0).Item("ADDITIONAL_TITLE")
+                USER_IN_MODULE = DT_LOGIN_USER_MODULE.Rows(0).Item("MODULE_ACCESS")
+                USER_IS_ADMIN = DT_LOGIN_USER_MODULE.Rows(0).Item("IS_ADMIN")
+                ADDITIONAL_TITLE = DT_LOGIN_USER_MODULE.Rows(0).Item("ADDITIONAL_TITLE")
                 If ADDITIONAL_TITLE = String.Empty Then
                     ADDITIONAL_TITLE = My.Application.Info.ProductName
                 End If
-                USERCOUNT_LOGGED_IN = DT_CHECKUSER_MODULE.Rows(0).Item("USERCOUNT_LOGGED_IN")
+                USERCOUNT_LOGGED_IN = DT_LOGIN_USER_MODULE.Rows(0).Item("USERCOUNT_LOGGED_IN")
                 USERCOUNT_LOGGED_IN += 1
                 Try
-                    WORKING_MODE = DT_CHECKUSER_MODULE.Rows(0).Item("WORKING_MODE")
+                    WORKING_MODE = DT_LOGIN_USER_MODULE.Rows(0).Item("WORKING_MODE")
                 Catch ex As Exception
                     WORKING_MODE = ""
                 End Try
diff --git a/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj b/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj
index 82f034b..4e5349e 100644
--- a/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj
+++ b/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj
@@ -63,7 +63,7 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>search.ico</ApplicationIcon>
+    <ApplicationIcon>DD_easyFLOW_ICON.ico</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationManifest>My Project\app.manifest</ApplicationManifest>
@@ -99,8 +99,7 @@
     <Reference Include="DigitalData.Controls.RegexEditor">
       <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\Controls\DigitalData.Controls.RegexEditor.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.GUIs.ClipboardWatcher, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="DigitalData.GUIs.ClipboardWatcher">
       <HintPath>..\..\..\DDMonorepo\GUIs.ClipboardWatcher\bin\Debug\DigitalData.GUIs.ClipboardWatcher.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.GUIs.Common">
@@ -454,6 +453,7 @@
     <None Include="Resources\Annotation_New.png" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="DD_easyFLOW_ICON.ico" />
     <Content Include="DD_Icons_ICO_CBWATCHER_48px.ico" />
     <Content Include="KeyOutput_8167.ico" />
     <Content Include="MailLicense.xml">
diff --git a/app/DD_Clipboard_Searcher/DD_easyFLOW_ICON.ico b/app/DD_Clipboard_Searcher/DD_easyFLOW_ICON.ico
new file mode 100644
index 0000000..914504b
Binary files /dev/null and b/app/DD_Clipboard_Searcher/DD_easyFLOW_ICON.ico differ
diff --git a/app/SetupVS19/Config.wxi b/app/SetupVS19/Config.wxi
index 85b08fc..0d0be0d 100644
--- a/app/SetupVS19/Config.wxi
+++ b/app/SetupVS19/Config.wxi
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include>
   <?define ProgramName="DD_Clipboard_Watcher"?>
-  <?define ProductName="Clipboard Watcher"?>
+  <?define ProductName="easyFLOW"?>
   <?define Manufacturer="Digital Data"?>
-  <?define Description="Clipboard Watcher"?>
-  <?define Comments="Clipboard Watcher"?>
+  <?define Description="easyFLOW"?>
+  <?define Comments="easyFLOW"?>
   <?define UpgradeCode="BB3A9D50-7CCE-42DA-84F2-D67129F57B59"?>
 
   <?define SourceDir="..\$(var.ProgramName)\bin\$(var.Configuration)\"?>
diff --git a/app/SetupVS19/Product.wxs b/app/SetupVS19/Product.wxs
index adf7c17..a9d0f16 100644
--- a/app/SetupVS19/Product.wxs
+++ b/app/SetupVS19/Product.wxs
@@ -95,7 +95,6 @@
 				<File Id="DDFilesystem" Name="DigitalData.Modules.Filesystem.dll" KeyPath="no" Checksum="yes"/>
 				<File Id="DDDatabase" Name="DigitalData.Modules.Database.dll" KeyPath="no" Checksum="yes"/>
 				<File Id="DDEncryption" Name="DigitalData.Modules.Encryption.dll" KeyPath="no" Checksum="yes"/>
-				<File Id="DDLanguage" Name="DigitalData.Modules.Language.dll" KeyPath="no" Checksum="yes"/>
 				<File Id="DDLicense" Name="DigitalData.Modules.License.dll" KeyPath="no" Checksum="yes"/>
 				<File Id="DDRegexEditor" Name="DigitalData.Controls.RegexEditor.dll" KeyPath="no" Checksum="yes"/>
 				<File Id="DDprotobuf" Name="protobuf-net.dll" KeyPath="no" Checksum="yes"/>