diff --git a/Controls.DocumentViewer/DocumentViewer.vbproj b/Controls.DocumentViewer/DocumentViewer.vbproj
index ff6f0a70..1104f1b4 100644
--- a/Controls.DocumentViewer/DocumentViewer.vbproj
+++ b/Controls.DocumentViewer/DocumentViewer.vbproj
@@ -8,8 +8,8 @@
     <OutputType>Library</OutputType>
     <StartupObject>
     </StartupObject>
-    <RootNamespace>DocumentViewer</RootNamespace>
-    <AssemblyName>DocumentViewer</AssemblyName>
+    <RootNamespace>DigitalData.Controls.DocumentViewer</RootNamespace>
+    <AssemblyName>DigitalData.Controls.DocumentViewer</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
@@ -22,7 +22,7 @@
     <DefineDebug>true</DefineDebug>
     <DefineTrace>true</DefineTrace>
     <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>DocumentViewer.xml</DocumentationFile>
+    <DocumentationFile>DigitalData.Controls.DocumentViewer.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -32,7 +32,7 @@
     <DefineTrace>true</DefineTrace>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>DocumentViewer.xml</DocumentationFile>
+    <DocumentationFile>DigitalData.Controls.DocumentViewer.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
@@ -49,7 +49,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="GdPicture.NET.14">
-      <HintPath>D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET\GdPicture.NET.14.dll</HintPath>
+      <HintPath>D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
diff --git a/Controls.DocumentViewer/My Project/Resources.Designer.vb b/Controls.DocumentViewer/My Project/Resources.Designer.vb
index f2b580d9..1801c93d 100644
--- a/Controls.DocumentViewer/My Project/Resources.Designer.vb	
+++ b/Controls.DocumentViewer/My Project/Resources.Designer.vb	
@@ -39,7 +39,7 @@ Namespace My.Resources
         Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
             Get
                 If Object.ReferenceEquals(resourceMan, Nothing) Then
-                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DocumentViewer.Resources", GetType(Resources).Assembly)
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DigitalData.Controls.DocumentViewer.Resources", GetType(Resources).Assembly)
                     resourceMan = temp
                 End If
                 Return resourceMan
diff --git a/Controls.DocumentViewer/My Project/Settings.Designer.vb b/Controls.DocumentViewer/My Project/Settings.Designer.vb
index a54cb10a..8b56a3d4 100644
--- a/Controls.DocumentViewer/My Project/Settings.Designer.vb	
+++ b/Controls.DocumentViewer/My Project/Settings.Designer.vb	
@@ -64,9 +64,9 @@ Namespace My
     Friend Module MySettingsProperty
         
         <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
-        Friend ReadOnly Property Settings() As Global.DocumentViewer.My.MySettings
+        Friend ReadOnly Property Settings() As Global.DigitalData.Controls.DocumentViewer.My.MySettings
             Get
-                Return Global.DocumentViewer.My.MySettings.Default
+                Return Global.DigitalData.Controls.DocumentViewer.My.MySettings.Default
             End Get
         End Property
     End Module
diff --git a/GUIs.Common/Common.vbproj b/GUIs.Common/Common.vbproj
index 2f717c66..fc7c526d 100644
--- a/GUIs.Common/Common.vbproj
+++ b/GUIs.Common/Common.vbproj
@@ -54,8 +54,11 @@
     <Reference Include="DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.XtraPrinting.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.XtraTreeList.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DigitalData.Controls.DocumentViewer">
+      <HintPath>..\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
+    </Reference>
     <Reference Include="GdPicture.NET.14">
-      <HintPath>D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET\GdPicture.NET.14.dll</HintPath>
+      <HintPath>D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
@@ -154,10 +157,6 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Controls.DocumentViewer\DocumentViewer.vbproj">
-      <Project>{0958cddf-4a16-41f6-8837-8335f71d599c}</Project>
-      <Name>DocumentViewer</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Modules.Config\Config.vbproj">
       <Project>{44982f9b-6116-44e2-85d0-f39650b1ef99}</Project>
       <Name>Config</Name>
diff --git a/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb b/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb
index 92b64f24..6f2df705 100644
--- a/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb
+++ b/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb
@@ -1,9 +1,9 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class frmDocumentResultList
-    Inherits Base.BaseRibbonForm
+    Inherits DevExpress.XtraBars.Ribbon.RibbonForm
 
     'Form overrides dispose to clean up the component list.
-    <System.Diagnostics.DebuggerNonUserCode()> _
+    <System.Diagnostics.DebuggerNonUserCode()>
     Protected Overrides Sub Dispose(ByVal disposing As Boolean)
         If disposing AndAlso components IsNot Nothing Then
             components.Dispose()
@@ -17,7 +17,7 @@ Partial Class frmDocumentResultList
     'NOTE: The following procedure is required by the Windows Form Designer
     'It can be modified using the Windows Form Designer.  
     'Do not modify it using the code editor.
-    <System.Diagnostics.DebuggerStepThrough()> _
+    <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmDocumentResultList))
@@ -53,7 +53,7 @@ Partial Class frmDocumentResultList
         Me.GridView3 = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridView()
         Me.GridBand3 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand()
         Me.SplitContainerControl3 = New DevExpress.XtraEditors.SplitContainerControl()
-        Me.DocumentViewer1 = New DocumentViewer.DocumentViewer()
+        Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer()
         Me.XtraSaveFileDialog = New DevExpress.XtraEditors.XtraSaveFileDialog(Me.components)
         CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -420,7 +420,7 @@ Partial Class frmDocumentResultList
     Friend WithEvents BarButtonItemExportGrid1 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
     Friend WithEvents SplitContainerControl3 As DevExpress.XtraEditors.SplitContainerControl
-    Friend WithEvents DocumentViewer1 As DocumentViewer.DocumentViewer
+    Friend WithEvents DocumentViewer1 As DigitalData.Controls.DocumentViewer.DocumentViewer
     Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
diff --git a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb
index 260772de..3d91aa76 100644
--- a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb
+++ b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb
@@ -38,8 +38,6 @@ Public Class frmDocumentResultList
     Public Property ShouldReturnToPreviousForm As Boolean = False Implements IResultForm.ShouldReturnToPreviousForm
 
     Public Sub New(LogConfig As LogConfig, Environment As Environment, Params As DocumentResultParams)
-        MyBase.New(LogConfig)
-
         ' Dieser Aufruf ist für den Designer erforderlich.
         InitializeComponent()