diff --git a/app/DD_Clipboard_Searcher/ClassInit.vb b/app/DD_Clipboard_Searcher/ClassInit.vb
index 41cd158..74dfb67 100644
--- a/app/DD_Clipboard_Searcher/ClassInit.vb
+++ b/app/DD_Clipboard_Searcher/ClassInit.vb
@@ -9,6 +9,7 @@ Imports DigitalData.Modules.EDMI.API.EDMIServiceReference
 Imports System.Globalization
 Imports System.Threading
 Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback
+Imports DigitalData.Modules.Base
 
 Public Class ClassInit
     Public _lizenzManager As LicenseManagerLegacy
@@ -197,19 +198,19 @@ Public Class ClassInit
                 Logger.Info("Login time: " & Now.ToShortDateString, False)
 
                 USER_ID = DT_CHECKUSER_MODULE.Rows(0).Item("USER_ID")
-                USER_SURNAME = NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_SURNAME"), "")
-                USER_PRENAME = NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_PRENAME"), "")
-                USER_SHORTNAME = NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_SHORTNAME"), "")
-                USER_EMAIL = NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_EMAIL"), "")
+                USER_SURNAME = ObjectEx.NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_SURNAME"), "")
+                USER_PRENAME = ObjectEx.NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_PRENAME"), "")
+                USER_SHORTNAME = ObjectEx.NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_SHORTNAME"), "")
+                USER_EMAIL = ObjectEx.NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_EMAIL"), "")
 
 
-                USER_LANGUAGE = NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_LANGUAGE"), "de-DE")
+                USER_LANGUAGE = ObjectEx.NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_LANGUAGE"), "de-DE")
 
 
-                USER_DATE_FORMAT = NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_DATE_FORMAT"), "dd.MM.yyyy")
-                USER_IN_MODULE = NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("MODULE_ACCESS"), False)
-                USER_IS_ADMIN = NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("IS_ADMIN"), False)
-                ADDITIONAL_TITLE = NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("ADDITIONAL_TITLE"), "")
+                USER_DATE_FORMAT = ObjectEx.NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_DATE_FORMAT"), "dd.MM.yyyy")
+                USER_IN_MODULE = ObjectEx.NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("MODULE_ACCESS"), False)
+                USER_IS_ADMIN = ObjectEx.NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("IS_ADMIN"), False)
+                ADDITIONAL_TITLE = ObjectEx.NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("ADDITIONAL_TITLE"), "")
 
                 Logger.Debug("User Id: [{0}]", USER_ID)
                 Logger.Debug("User Email: [{0}]", USER_EMAIL)
diff --git a/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj b/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj
index 5cb0fa2..aab06f5 100644
--- a/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj
+++ b/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj
@@ -121,9 +121,6 @@
     <Reference Include="DigitalData.Modules.Filesystem">
       <HintPath>..\..\..\DDModules\Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Language">
-      <HintPath>..\..\..\DDModules\Language\bin\Debug\DigitalData.Modules.Language.dll</HintPath>
-    </Reference>
     <Reference Include="DigitalData.Modules.License">
       <HintPath>..\..\..\DDModules\License\bin\Debug\DigitalData.Modules.License.dll</HintPath>
     </Reference>
diff --git a/app/DD_Clipboard_Searcher/My Project/licenses.licx b/app/DD_Clipboard_Searcher/My Project/licenses.licx
index 773d16c..f36632e 100644
--- a/app/DD_Clipboard_Searcher/My Project/licenses.licx	
+++ b/app/DD_Clipboard_Searcher/My Project/licenses.licx	
@@ -1 +1,7 @@
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/app/DD_Clipboard_Searcher/frmAdministration.vb b/app/DD_Clipboard_Searcher/frmAdministration.vb
index 45e4581..b0b797b 100644
--- a/app/DD_Clipboard_Searcher/frmAdministration.vb
+++ b/app/DD_Clipboard_Searcher/frmAdministration.vb
@@ -1,4 +1,5 @@
 Imports System.Text.RegularExpressions
+Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Language
 Public Class frmAdministration
@@ -377,7 +378,7 @@ Public Class frmAdministration
     End Sub
 
     Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick
-        If Utils.NotNull(txtProfileName.EditValue, String.Empty) <> String.Empty Then
+        If ObjectEx.NotNull(txtProfileName.EditValue, String.Empty) <> String.Empty Then
             Save_Profile()
         Else
             MsgBox("Profil kann nicht ohne Profil-Name gespeichert werden!", MsgBoxStyle.Exclamation, Text)
diff --git a/app/DD_Clipboard_Searcher/frmMain.vb b/app/DD_Clipboard_Searcher/frmMain.vb
index d99a621..d6b3ec6 100644
--- a/app/DD_Clipboard_Searcher/frmMain.vb
+++ b/app/DD_Clipboard_Searcher/frmMain.vb
@@ -61,7 +61,7 @@ Public Class frmMain
         End If
         lblUser.Caption = USER_USERNAME
 
-        Language.LogApplicationLanguage(Logger)
+        LanguageEx.LogApplicationLanguage(Logger)
 
         If Database.DBInitialized = True Then
             If ERROR_INIT <> "" Then
diff --git a/app/DD_Clipboard_Searcher/frmSplash.vb b/app/DD_Clipboard_Searcher/frmSplash.vb
index 1ec8564..51e8c04 100644
--- a/app/DD_Clipboard_Searcher/frmSplash.vb
+++ b/app/DD_Clipboard_Searcher/frmSplash.vb
@@ -84,7 +84,7 @@ Public NotInheritable Class frmSplash
             Application.Exit()
         End If
 
-        Language.SetApplicationLanguage(Logger, USER_LANGUAGE, USER_DATE_FORMAT)
+        LanguageEx.SetApplicationLanguage(Logger, USER_LANGUAGE, USER_DATE_FORMAT)
 
         ' Wenn kein Fehler, Splashscreen schließen
         Close()