diff --git a/ScheMe/ExtLib/Microsoft.ReportViewer.Common.dll b/ScheMe/ExtLib/Microsoft.ReportViewer.Common.dll
deleted file mode 100644
index fe74ce4..0000000
Binary files a/ScheMe/ExtLib/Microsoft.ReportViewer.Common.dll and /dev/null differ
diff --git a/ScheMe/ExtLib/Microsoft.ReportViewer.WebForms.dll b/ScheMe/ExtLib/Microsoft.ReportViewer.WebForms.dll
index 08d1a99..8dfaf55 100644
Binary files a/ScheMe/ExtLib/Microsoft.ReportViewer.WebForms.dll and b/ScheMe/ExtLib/Microsoft.ReportViewer.WebForms.dll differ
diff --git a/ScheMe/ExtLib/Microsoft.ReportViewer.WinForms.dll b/ScheMe/ExtLib/Microsoft.ReportViewer.WinForms.dll
index 684d8d2..f85bd01 100644
Binary files a/ScheMe/ExtLib/Microsoft.ReportViewer.WinForms.dll and b/ScheMe/ExtLib/Microsoft.ReportViewer.WinForms.dll differ
diff --git a/ScheMe/ScheMe.csproj b/ScheMe/ScheMe.csproj
index 43e35b4..53f3d71 100644
--- a/ScheMe/ScheMe.csproj
+++ b/ScheMe/ScheMe.csproj
@@ -54,14 +54,10 @@
       <HintPath>..\packages\Microsoft.AspNet.Web.Optimization.WebForms.1.1.3\lib\net45\Microsoft.AspNet.Web.Optimization.WebForms.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.ReportViewer.WebForms, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.ReportViewer.WebForms, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>ExtLib\Microsoft.ReportViewer.WebForms.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.ReportViewer.WinForms, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>ExtLib\Microsoft.ReportViewer.WinForms.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <Private>True</Private>
       <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
diff --git a/ScheMe/Web.config b/ScheMe/Web.config
index 941ab78..eef3d04 100644
--- a/ScheMe/Web.config
+++ b/ScheMe/Web.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0"?>
 <!--
   For more information on how to configure your ASP.NET application, please visit
   http://go.microsoft.com/fwlink/?LinkId=169433
@@ -61,12 +61,17 @@
   -->
   <system.web>
     <httpHandlers>
-      <add path="Reserved.ReportViewerWebControl.axd" verb="*" type="Microsoft.Reporting.WebForms.HttpHandler, Microsoft.ReportViewer.WebForms, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91" validate="false" />
+      <add path="Reserved.ReportViewerWebControl.axd" verb="*" type="Microsoft.Reporting.WebForms.HttpHandler, Microsoft.ReportViewer.WebForms, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91" validate="false" />
     </httpHandlers>
     <compilation debug="true" targetFramework="4.6.2">
       <buildProviders>
         <add extension=".rdlc" type="Microsoft.Reporting.RdlBuildProvider, Microsoft.ReportViewer.WebForms, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91" />
       </buildProviders>
+      <assemblies>
+        <add assembly="Microsoft.ReportViewer.WebForms, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845DCD8080CC91" />
+        <add assembly="Microsoft.ReportViewer.Common, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845DCD8080CC91" />
+        <add assembly="Microsoft.Build.Framework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
+      </assemblies>
     </compilation>
     <httpRuntime targetFramework="4.5" maxRequestLength="1048576" executionTimeout="3600" />
     <httpModules>
@@ -86,7 +91,7 @@
   </system.web>
   <system.webServer>
     <handlers>
-      <add name="ReportViewerWebControlHandler" preCondition="integratedMode" verb="*" path="Reserved.ReportViewerWebControl.axd" type="Microsoft.Reporting.WebForms.HttpHandler, Microsoft.ReportViewer.WebForms, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91" />
+      <add name="ReportViewerWebControlHandler" preCondition="integratedMode" verb="*" path="Reserved.ReportViewerWebControl.axd" type="Microsoft.Reporting.WebForms.HttpHandler, Microsoft.ReportViewer.WebForms, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91" />
     </handlers>
     <security>
       <requestFiltering>
diff --git a/ScheMe/WebUserControls/mod_reportVisita.ascx b/ScheMe/WebUserControls/mod_reportVisita.ascx
index cfea928..118ad0b 100644
--- a/ScheMe/WebUserControls/mod_reportVisita.ascx
+++ b/ScheMe/WebUserControls/mod_reportVisita.ascx
@@ -1,4 +1,4 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_reportVisita.ascx.cs" Inherits="ScheMe.WebUserControls.mod_reportVisita" %>
-<%@ Register Assembly="Microsoft.ReportViewer.WebForms, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91" Namespace="Microsoft.Reporting.WebForms" TagPrefix="rsweb" %>
-<rsweb:ReportViewer ID="RepVisita" runat="server" Font-Names="Verdana" Font-Size="8pt" Width="100%" WaitMessageFont-Names="Verdana" WaitMessageFont-Size="14pt" SizeToReportContent="false" Height="400px">
-</rsweb:ReportViewer>
+<%@ Register Assembly="Microsoft.ReportViewer.WebForms" Namespace="Microsoft.Reporting.WebForms" TagPrefix="rsweb" %>
+<rsweb:ReportViewer ID="RepVisita" runat="server" Font-Names="Verdana" Font-Size="8pt" Width="100%" WaitMessageFont-Names="Verdana" WaitMessageFont-Size="20pt" SizeToReportContent="false" Height="400px">
+</rsweb:ReportViewer>
\ No newline at end of file
diff --git a/ScheMe/bin/ADODB.dll b/ScheMe/bin/ADODB.dll
deleted file mode 100644
index b8896ba..0000000
Binary files a/ScheMe/bin/ADODB.dll and /dev/null differ
diff --git a/ScheMe/bin/AjaxMin.dll b/ScheMe/bin/AjaxMin.dll
new file mode 100644
index 0000000..cada03b
Binary files /dev/null and b/ScheMe/bin/AjaxMin.dll differ
diff --git a/ScheMe/bin/Microsoft.Build.Utilities.v3.5.dll b/ScheMe/bin/Microsoft.Build.Utilities.v3.5.dll
deleted file mode 100644
index dcc5f0b..0000000
Binary files a/ScheMe/bin/Microsoft.Build.Utilities.v3.5.dll and /dev/null differ
diff --git a/ScheMe/bin/Microsoft.Build.Utilities.v3.5.xml b/ScheMe/bin/Microsoft.Build.Utilities.v3.5.xml
deleted file mode 100644
index a7f2a73..0000000
--- a/ScheMe/bin/Microsoft.Build.Utilities.v3.5.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<doc>
-  <assembly>
-    <name>Microsoft.Build.Utilities.v3.5</name>
-  </assembly>
-  <members>
-    <member name="M:Microsoft.Build.Utilities.CommandLineBuilder.#ctor(System.Boolean)"></member>
-    <member name="M:Microsoft.Build.Utilities.CommandLineBuilder.AppendQuotedTextToBuffer(System.Text.StringBuilder,System.String)"></member>
-    <member name="T:Microsoft.Build.Utilities.ProcessorArchitecture">
-      <summary>
-                    Determines the correct tool in the Toolset that MSBuild should use, based on the current system's processor architecture.
-                </summary>
-    </member>
-    <member name="F:Microsoft.Build.Utilities.ProcessorArchitecture.AMD64">
-      <summary>
-                    Represents the AMD64 processor.
-                </summary>
-    </member>
-    <member name="P:Microsoft.Build.Utilities.ProcessorArchitecture.CurrentProcessArchitecture">
-      <summary>
-                    Gets the current processor architecture of the system.
-                </summary>
-      <returns>
-                    A string containing the processor architecture value.
-                </returns>
-    </member>
-    <member name="F:Microsoft.Build.Utilities.ProcessorArchitecture.IA64">
-      <summary>
-                    Represents the IA64 processor.
-                </summary>
-    </member>
-    <member name="F:Microsoft.Build.Utilities.ProcessorArchitecture.MSIL">
-      <summary>
-                    Represents MSIL.
-                </summary>
-    </member>
-    <member name="F:Microsoft.Build.Utilities.ProcessorArchitecture.X86">
-      <summary>
-                    Represents an x86 processor.
-                </summary>
-    </member>
-    <member name="P:Microsoft.Build.Utilities.Task.BuildEngine2"></member>
-    <member name="M:Microsoft.Build.Utilities.TaskLoggingHelper.LogErrorFromException(System.Exception,System.Boolean,System.Boolean,System.String)">
-      <summary>
-                    Logs an error using the message, and optionally the stack-trace from the given exception and any inner exceptions.
-                </summary>
-      <param name="exception">
-                    The exception to log.
-                </param>
-      <param name="showStackTrace">true to include the stack trace in the log; otherwise, false.
-                </param>
-      <param name="showDetail">true to log exception types and any inner exceptions; otherwise, false.
-                </param>
-      <param name="file">
-                    The name of the file related to the exception, or null if the project file should be logged.
-                </param>
-      <exception cref="T:System.ArgumentNullException">
-        <paramref name="e" /> is null.
-                </exception>
-      <filterpriority>2</filterpriority>
-    </member>
-    <member name="M:Microsoft.Build.Utilities.ToolLocationHelper.GetDotNetFrameworkSdkRootRegistryKey(Microsoft.Build.Utilities.TargetDotNetFrameworkVersion)"></member>
-    <member name="M:Microsoft.Build.Utilities.ToolLocationHelper.GetPathToDotNetFrameworkReferenceAssemblies(Microsoft.Build.Utilities.TargetDotNetFrameworkVersion)"></member>
-    <member name="P:Microsoft.Build.Utilities.ToolTask.HasLoggedErrors"></member>
-    <member name="P:Microsoft.Build.Utilities.ToolTask.StandardErrorImportance"></member>
-    <member name="P:Microsoft.Build.Utilities.ToolTask.StandardOutputImportance"></member>
-    <member name="P:Microsoft.Build.Utilities.ToolTask.ToolExe"></member>
-  </members>
-</doc>
\ No newline at end of file
diff --git a/ScheMe/bin/Microsoft.ReportViewer.Common.dll b/ScheMe/bin/Microsoft.ReportViewer.Common.dll
deleted file mode 100644
index fe74ce4..0000000
Binary files a/ScheMe/bin/Microsoft.ReportViewer.Common.dll and /dev/null differ
diff --git a/ScheMe/bin/Microsoft.ReportViewer.WebForms.dll b/ScheMe/bin/Microsoft.ReportViewer.WebForms.dll
index 08d1a99..8dfaf55 100644
Binary files a/ScheMe/bin/Microsoft.ReportViewer.WebForms.dll and b/ScheMe/bin/Microsoft.ReportViewer.WebForms.dll differ
diff --git a/ScheMe/bin/Microsoft.ReportViewer.WinForms.dll b/ScheMe/bin/Microsoft.ReportViewer.WinForms.dll
deleted file mode 100644
index 684d8d2..0000000
Binary files a/ScheMe/bin/Microsoft.ReportViewer.WinForms.dll and /dev/null differ
diff --git a/ScheMe/bin/ScheMe.dll b/ScheMe/bin/ScheMe.dll
index c277140..edfecd5 100644
Binary files a/ScheMe/bin/ScheMe.dll and b/ScheMe/bin/ScheMe.dll differ
diff --git a/ScheMe/bin/ScheMe.dll.config b/ScheMe/bin/ScheMe.dll.config
index 941ab78..eef3d04 100644
--- a/ScheMe/bin/ScheMe.dll.config
+++ b/ScheMe/bin/ScheMe.dll.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0"?>
 <!--
   For more information on how to configure your ASP.NET application, please visit
   http://go.microsoft.com/fwlink/?LinkId=169433
@@ -61,12 +61,17 @@
   -->
   <system.web>
     <httpHandlers>
-      <add path="Reserved.ReportViewerWebControl.axd" verb="*" type="Microsoft.Reporting.WebForms.HttpHandler, Microsoft.ReportViewer.WebForms, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91" validate="false" />
+      <add path="Reserved.ReportViewerWebControl.axd" verb="*" type="Microsoft.Reporting.WebForms.HttpHandler, Microsoft.ReportViewer.WebForms, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91" validate="false" />
     </httpHandlers>
     <compilation debug="true" targetFramework="4.6.2">
       <buildProviders>
         <add extension=".rdlc" type="Microsoft.Reporting.RdlBuildProvider, Microsoft.ReportViewer.WebForms, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91" />
       </buildProviders>
+      <assemblies>
+        <add assembly="Microsoft.ReportViewer.WebForms, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845DCD8080CC91" />
+        <add assembly="Microsoft.ReportViewer.Common, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845DCD8080CC91" />
+        <add assembly="Microsoft.Build.Framework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
+      </assemblies>
     </compilation>
     <httpRuntime targetFramework="4.5" maxRequestLength="1048576" executionTimeout="3600" />
     <httpModules>
@@ -86,7 +91,7 @@
   </system.web>
   <system.webServer>
     <handlers>
-      <add name="ReportViewerWebControlHandler" preCondition="integratedMode" verb="*" path="Reserved.ReportViewerWebControl.axd" type="Microsoft.Reporting.WebForms.HttpHandler, Microsoft.ReportViewer.WebForms, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91" />
+      <add name="ReportViewerWebControlHandler" preCondition="integratedMode" verb="*" path="Reserved.ReportViewerWebControl.axd" type="Microsoft.Reporting.WebForms.HttpHandler, Microsoft.ReportViewer.WebForms, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91" />
     </handlers>
     <security>
       <requestFiltering>
diff --git a/ScheMe/bin/ScheMe_Data.dll b/ScheMe/bin/ScheMe_Data.dll
index 3bba99f..2e696b2 100644
Binary files a/ScheMe/bin/ScheMe_Data.dll and b/ScheMe/bin/ScheMe_Data.dll differ
diff --git a/ScheMe/bin/SteamWare.dll b/ScheMe/bin/SteamWare.dll
index 57f2225..27af63d 100644
Binary files a/ScheMe/bin/SteamWare.dll and b/ScheMe/bin/SteamWare.dll differ
diff --git a/ScheMe/bin/it/Microsoft.Build.Utilities.v3.5.resources.dll b/ScheMe/bin/it/Microsoft.Build.Utilities.v3.5.resources.dll
deleted file mode 100644
index a7861a9..0000000
Binary files a/ScheMe/bin/it/Microsoft.Build.Utilities.v3.5.resources.dll and /dev/null differ
diff --git a/ScheMe_Data/bin/Debug/ScheMe_Data.dll b/ScheMe_Data/bin/Debug/ScheMe_Data.dll
index 76e3120..2e696b2 100644
Binary files a/ScheMe_Data/bin/Debug/ScheMe_Data.dll and b/ScheMe_Data/bin/Debug/ScheMe_Data.dll differ
diff --git a/ScheMe_Data/bin/Debug/SteamWare.dll b/ScheMe_Data/bin/Debug/SteamWare.dll
index 87f6236..27af63d 100644
Binary files a/ScheMe_Data/bin/Debug/SteamWare.dll and b/ScheMe_Data/bin/Debug/SteamWare.dll differ
diff --git a/VersGen/VersGen.cs b/VersGen/VersGen.cs
index 297da63..1f9dc67 100644
--- a/VersGen/VersGen.cs
+++ b/VersGen/VersGen.cs
@@ -5,7 +5,7 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("2.1.999.2579")]
-[assembly: AssemblyFileVersion("2.1.999.2579")]
+[assembly: AssemblyVersion("2.1.1700.2579")]
+[assembly: AssemblyFileVersion("2.1.1700.2579")]
 [assembly: AssemblyCopyright("Steamware © 2007-2017")]
 [assembly: AssemblyCompany("Steamware")]
diff --git a/VersGen/VersGen.tt b/VersGen/VersGen.tt
index 2c766c9..2b4998c 100644
--- a/VersGen/VersGen.tt
+++ b/VersGen/VersGen.tt
@@ -6,8 +6,8 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("2.1.999.<#= this.RevisionNumber #>")]
-[assembly: AssemblyFileVersion("2.1.999.<#= this.RevisionNumber #>")]
+[assembly: AssemblyVersion("2.1.1700.<#= this.RevisionNumber #>")]
+[assembly: AssemblyFileVersion("2.1.1700.<#= this.RevisionNumber #>")]
 [assembly: AssemblyCopyright("Steamware © 2007-<#= DateTime.Now.Year #>")]
 [assembly: AssemblyCompany("Steamware")]
 <#+
diff --git a/VersGen/bin/Debug/VersGen.dll b/VersGen/bin/Debug/VersGen.dll
index 83dfe8c..8470001 100644
Binary files a/VersGen/bin/Debug/VersGen.dll and b/VersGen/bin/Debug/VersGen.dll differ