diff --git a/SparkleLib/windows/transform_tt.cmd b/SparkleLib/windows/transform_tt.cmd
index 5b60f53e..3ba9ef60 100644
--- a/SparkleLib/windows/transform_tt.cmd
+++ b/SparkleLib/windows/transform_tt.cmd
@@ -1,8 +1,8 @@
 @echo off
 cd %~dp0
 
-set TextTransform=..\..\tools\TextTemplating\bin\TextTransform.exe
-if not exist %TextTransform% call ..\..\tools\TextTemplating\build.cmd
+set TextTransform=..\..\SparkleShare\Windows\tools\TextTemplating\bin\TextTransform.exe
+if not exist %TextTransform% call ..\..\SparkleShare\Windows\tools\TextTemplating\build.cmd
 
 echo running texttransform..
 
diff --git a/SparkleShare/Windows/build.cmd b/SparkleShare/Windows/build.cmd
index 857498cd..6c837043 100644
--- a/SparkleShare/Windows/build.cmd
+++ b/SparkleShare/Windows/build.cmd
@@ -7,11 +7,11 @@ set msbuild="%WinDirNet%\v3.5\msbuild.exe"
 if not exist %msbuild% set msbuild="%WinDirNet%\v4.0.30319\msbuild.exe"
 set wixBinDir=%WIX%\bin
 
+cd lib
+copy * ..\..\..\bin
+cd ..
 
-
-%msbuild% /t:Rebuild /p:Configuration=Release /p:Platform="AnyCPU"   %~dp0..\..\tools\gettext-cs-utils\Gettext.CsUtils\Core\Gettext.Cs\Gettext.Cs.csproj 
-
-
+%msbuild% /t:Rebuild /p:Configuration=Release /p:Platform="AnyCPU"   %~dp0\tools\gettext-cs-utils\Gettext.CsUtils\Core\Gettext.Cs\Gettext.Cs.csproj
 %msbuild% /t:Rebuild /p:Configuration=Release /p:Platform="Any CPU" %~dp0\SparkleShare.sln
 
 if "%1"=="installer" (
diff --git a/SparkleShare/Windows/lib/CefSharp.dll b/SparkleShare/Windows/lib/CefSharp.dll
new file mode 100644
index 00000000..6f871b69
Binary files /dev/null and b/SparkleShare/Windows/lib/CefSharp.dll differ
diff --git a/SparkleShare/Windows/lib/avcodec-52.dll b/SparkleShare/Windows/lib/avcodec-52.dll
new file mode 100644
index 00000000..433efbee
Binary files /dev/null and b/SparkleShare/Windows/lib/avcodec-52.dll differ
diff --git a/SparkleShare/Windows/lib/avformat-52.dll b/SparkleShare/Windows/lib/avformat-52.dll
new file mode 100644
index 00000000..fa2e000e
Binary files /dev/null and b/SparkleShare/Windows/lib/avformat-52.dll differ
diff --git a/SparkleShare/Windows/lib/avutil-50.dll b/SparkleShare/Windows/lib/avutil-50.dll
new file mode 100644
index 00000000..f01f3f3d
Binary files /dev/null and b/SparkleShare/Windows/lib/avutil-50.dll differ
diff --git a/SparkleShare/Windows/lib/icudt42.dll b/SparkleShare/Windows/lib/icudt42.dll
new file mode 100644
index 00000000..d61ac0b0
Binary files /dev/null and b/SparkleShare/Windows/lib/icudt42.dll differ
diff --git a/SparkleShare/Windows/lib/libcef.dll b/SparkleShare/Windows/lib/libcef.dll
new file mode 100644
index 00000000..9ea64973
Binary files /dev/null and b/SparkleShare/Windows/lib/libcef.dll differ
diff --git a/SparkleShare/Windows/tools/gettext-cs-utils/Gettext.CsUtils/Core/Gettext.Cs/Gettext.Cs.csproj b/SparkleShare/Windows/tools/gettext-cs-utils/Gettext.CsUtils/Core/Gettext.Cs/Gettext.Cs.csproj
index b3822e2b..2127e2c4 100644
--- a/SparkleShare/Windows/tools/gettext-cs-utils/Gettext.CsUtils/Core/Gettext.Cs/Gettext.Cs.csproj
+++ b/SparkleShare/Windows/tools/gettext-cs-utils/Gettext.CsUtils/Core/Gettext.Cs/Gettext.Cs.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D8869765-AB47-4C03-B2C5-E5498A55CA79}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -17,7 +17,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>..\..\..\..\..\..\..\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -25,7 +25,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\..\..\..\..\..\..\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/data/plugins/build.cmd b/data/plugins/build.cmd
index 88e88349..2a1c69e8 100644
--- a/data/plugins/build.cmd
+++ b/data/plugins/build.cmd
@@ -1,8 +1,8 @@
 @echo off
 pushd %~dp0
 
-set xslt=..\..\tools\xslt\bin\release\xslt.exe
-if not exist %xslt% call ..\..\tools\xslt\build.cmd
+set xslt=..\..\SparkleShare\Windows\tools\xslt\bin\release\xslt.exe
+if not exist %xslt% call ..\..\SparkleShare\Windows\tools\xslt\build.cmd
 
 for %%a in (*.xml.in) do (
   %xslt% parse_plugins.xsl %%a %%~dpna