diff --git a/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj b/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj
index 7d76b3d..72cfa9c 100644
--- a/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj
+++ b/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj
@@ -84,9 +84,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\DDMonorepo\Modules.Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Filesystem, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\DDMonorepo\Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Filesystem">
+      <HintPath>..\..\..\DDMonorepo\Modules.Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Language, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -102,7 +101,7 @@
       <HintPath>..\..\..\DDMonorepo\Modules.ZooFlow\bin\Debug\DigitalData.Modules.ZooFlow.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">
diff --git a/app/SetupWix/Product.wxs b/app/SetupWix/Product.wxs
index e3dd4f4..9eeb538 100644
--- a/app/SetupWix/Product.wxs
+++ b/app/SetupWix/Product.wxs
@@ -95,6 +95,9 @@
         <File Id="DDLanguage" Name="DigitalData.Modules.Language.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"/>
+        <File Id="DDCommon" Name="DigitalData.GUIs.Common.dll" KeyPath="no" Checksum="yes"/>
+        <File Id="DDClipboardWatcher" Name="DigitalData.Modules.ClipboardWatcher.dll" KeyPath="no" Checksum="yes"/>
+        <File Id="DDZooFlow" Name="DigitalData.Modules.ZooFlow.dll" KeyPath="no" Checksum="yes"/>
       </Component>
       
       <Component Id="NLog" Guid="{08903680-6b02-4ff0-b700-93209381fe1a}">
@@ -115,6 +118,7 @@
         <File Id="DevExpress.XtraGrid.v18.1" Name="DevExpress.XtraGrid.v18.1.dll" />
         <File Id="DevExpress.XtraLayout.v18.1" Name="DevExpress.XtraLayout.v18.1.dll" />
         <File Id="DevExpress.XtraPrinting.v18.1" Name="DevExpress.XtraPrinting.v18.1.dll" />
+        <File Id="DevExpress.XtraTreeList.v18.1" Name="DevExpress.XtraTreeList.v18.1.dll" />
       </Component>
 
       <Component Id="GDPictureLibs" Guid="9ea5ab43-58ff-4813-9a8b-f854784f0275">