diff --git a/.github/workflows/ISSUE_TEMPLATE/bug_report.md b/.github/workflows/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000..cf33db73
--- /dev/null
+++ b/.github/workflows/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,31 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. Windows 11]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/workflows/ISSUE_TEMPLATE/feature_request.md b/.github/workflows/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 00000000..bbcbbe7d
--- /dev/null
+++ b/.github/workflows/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 00000000..d50e15b4
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,43 @@
+name: Build ACAT
+
+on:
+  push:
+    branches: [ "master" ]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+
+  build:
+
+    strategy:
+      matrix:
+        configuration: [Release, Debug]
+
+    runs-on: windows-latest  # For a list of available runner types, refer to
+                             # https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        lfs: true   # Enable Git LFS
+
+    # Add  MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
+    - name: Setup MSBuild.exe
+      uses: microsoft/setup-msbuild@v2
+          
+    # Build the full application
+    - name: Build the Solution
+      run: |
+        msbuild acat.sln /t:Build /p:Configuration=${{ matrix.configuration }}
+      working-directory: src/
+      
+    - name: Upload release build artifacts
+      uses: actions/upload-artifact@v4.6.2
+      with:
+        name: acat_${{ matrix.configuration }}
+        path: src/Applications/ACATApp/bin/${{ matrix.configuration }}
+
diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/debug-installer.yml
similarity index 56%
rename from .github/workflows/dotnet-desktop.yml
rename to .github/workflows/debug-installer.yml
index ae98cac9..2e02a37b 100644
--- a/.github/workflows/dotnet-desktop.yml
+++ b/.github/workflows/debug-installer.yml
@@ -1,12 +1,11 @@
-name: Build ACAT - DEBUG ONLY
+name: Build ACAT Installer - DEBUG ONLY
 
 on:
-  push:
-    branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
   workflow_dispatch:
 
+permissions:
+  contents: read
+
 jobs:
 
   build:
@@ -17,22 +16,12 @@ jobs:
 
     runs-on: windows-latest  # For a list of available runner types, refer to
                              # https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on
-
-    env:
-      Solution_Name: acat.sln                         # Replace with your solution name, i.e. MyWpfApp.sln.
-      Installer_Dir: src/Setup/
-
     steps:
     - name: Checkout
       uses: actions/checkout@v4
       with:
         fetch-depth: 0
-
-    # # Install the .NET Core workload
-    # - name: Install .NET Framework
-    #   uses: actions/setup-dotnet@v4
-    #   with:
-    #     dotnet-version: '4.8.x'
+        lfs: true   # Enable Git LFS
 
     # Add  MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
     - name: Setup MSBuild.exe
@@ -41,27 +30,29 @@ jobs:
     - name: Install NSIS
     # You may pin to the exact commit or the version.
     # uses: repolevedavaj/install-nsis@d414d91c2460758f0a2ef2b865ad7b9c8f541534
-      uses: repolevedavaj/install-nsis@v1.0.2
-      with:
-        # The version of NSIS to install
-        nsis-version: 3.10
+      # uses: repolevedavaj/install-nsis@v1.0.2
+      # with:
+      #   # The version of NSIS to install
+      #   nsis-version: "3.11"
+      run: |
+        Invoke-WebRequest https://cfhcable.dl.sourceforge.net/project/nsis/NSIS%203/3.11/nsis-3.11-setup.exe?viasf=1 -OutFile C:\WINDOWS\Temp\nsis-3.11-setup.exe
+        Invoke-Expression "& C:\WINDOWS\Temp\nsis-3.11-setup.exe \S"
+      shell: pwsh
           
     # Build the full application
     - name: Build the Solution
-      run: msbuild $env:Solution_Name /t:Build /p:Configuration=$env:Configuration
-      env:
-        shell: powershell
-        working-dir: ./src
-        Configuration: ${{ matrix.configuration }}
+      run: |
+        msbuild acat.sln /t:Build /p:Configuration=${{ matrix.configuration }}
+      working-directory: src/
 
     # Create the app package by building and packaging the Windows Application Packaging project
     - name: Create the app package
       run: |
-        python installGenerator.py ../Applications/AcatApp/$env:Configuration/
-        makensis.exe ./NSIS_InstallerScript.nsi
+        python installGenerator.py "D:\a\acat\acat\src\Applications\ACATApp\bin\Debug"
+        makensis.exe /V4 ./NSIS_InstallerScript.nsi
+      working-directory: src/Setup
       env:
         shell: powershell
-        working-dir: ./src/Setup/
         Configuration: ${{ matrix.configuration }}
       
     # Upload the MSIX package: https://github.com/marketplace/actions/upload-a-build-artifact
@@ -69,4 +60,4 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: ACATSetup
-        path: ${{ env.Installer_Dir }}\ACATSetup.exe
+        path: src/Setup/ACATSetup.exe
diff --git a/src/ACATResources/ACATResources.csproj b/src/ACATResources/ACATResources.csproj
index fe2031ae..05319205 100644
--- a/src/ACATResources/ACATResources.csproj
+++ b/src/ACATResources/ACATResources.csproj
@@ -35,7 +35,7 @@
     <DefineConstants>TRACE;ENABLE_DIGITAL_VERIFICATION</DefineConstants>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-        <ErrorReport>prompt</ErrorReport>
+    <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
@@ -66,95 +66,95 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="en\KeyboardABCUserControlBCI2.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\KeyboardEditUserControlBCI.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\KeyboardLockUserControlBCI.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\KeyboardModesUserControlBCI.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\KeyboardNumberNumericKeypadUserControl.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\KeyboardYesNoUserControlBCI2.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\MenuUserControlBCI.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\NumericUserControlBCI.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\PhrasesUserControlBCI.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\TalkApplicationBCIScannerNewUI.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\TTSYesNoUserControlBCI2.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\UserControlContainerForm.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\UserControlScreenLock.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\UserControlDefaultTryout.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\KeyboardAbcUserControl.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\ScanTimeAdjustForm.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\UserControlTalkInterfaceDesc.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\WordPredictionSetModeScanner.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\KeyboardNumbersUserControl.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\KeyboardEditUserControl.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\MainMenu.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\SentencePredictionUserControl.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\KeyboardQwertyUserControl.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\PanelConfigMap.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
       <SubType>Designer</SubType>
     </Content>
     <Content Include="en\TalkApplicationScannerQwerty.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\UserControlConfigMap.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\WordPredictionUserControl.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\WordPredictionUserControlBCI.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\YesNoResponseScanner.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\YesNoScanner.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
   </ItemGroup>
   <ItemGroup>
@@ -167,7 +167,7 @@
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>call "$(SolutionDir)deployRedist.bat" "$(TargetDir)\$(TargetFileName)" "$(SolutionDir)"</PostBuildEvent>
+    <PostBuildEvent>call $(SolutionDir)deployRedist.bat $(TargetDir)\$(TargetFileName) $(SolutionDir)</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/ACATResources/Properties/AssemblyInfo.cs b/src/ACATResources/Properties/AssemblyInfo.cs
index 3644f859..05286e79 100644
--- a/src/ACATResources/Properties/AssemblyInfo.cs
+++ b/src/ACATResources/Properties/AssemblyInfo.cs
@@ -22,16 +22,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("1afb947e-d5fa-4e8d-b218-9d7aef32460f")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.12")]
-[assembly: AssemblyFileVersion("3.12")]
diff --git a/src/Applications/ACATConfig/ACATConfig.csproj b/src/Applications/ACATConfig/ACATConfig.csproj
index 1e919adb..0c11416d 100644
--- a/src/Applications/ACATConfig/ACATConfig.csproj
+++ b/src/Applications/ACATConfig/ACATConfig.csproj
@@ -62,6 +62,10 @@
       <HintPath>..\..\Redistributable\ACATResources.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="AppCommon">
+      <HintPath>..\..\Redistributable\AppCommon.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Security" />
@@ -108,13 +112,6 @@
   <ItemGroup>
     <Content Include="Properties\ACATConfig.ico" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\AppCommon\AppCommon.csproj">
-      <Project>{9a6ff395-2444-439a-990d-1bab13bf56fd}</Project>
-      <Name>AppCommon</Name>
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Applications/ACATConfig/Program.cs b/src/Applications/ACATConfig/Program.cs
index 861b80eb..fb1ef9cc 100644
--- a/src/Applications/ACATConfig/Program.cs
+++ b/src/Applications/ACATConfig/Program.cs
@@ -104,8 +104,6 @@ private static void Main()
 
             Log.SetupListeners();
 
-            AppCommon.UpgradeFromPreviousVersion(freshInstallForUser);
-
             CommandDescriptors.Init();
 
             if (!AppCommon.SetCulture())
diff --git a/src/Applications/ACATConfig/Properties/AssemblyInfo.cs b/src/Applications/ACATConfig/Properties/AssemblyInfo.cs
index 32b7ede4..0e723482 100644
--- a/src/Applications/ACATConfig/Properties/AssemblyInfo.cs
+++ b/src/Applications/ACATConfig/Properties/AssemblyInfo.cs
@@ -22,17 +22,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("d353daaf-58a3-423c-b3d9-8c9638c043e7")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.12")]
-[assembly: AssemblyFileVersion("3.12")]
-
diff --git a/src/Applications/ACATTalk/Program.cs b/src/Applications/ACATTalk/Program.cs
index cd74c965..db3b55f1 100644
--- a/src/Applications/ACATTalk/Program.cs
+++ b/src/Applications/ACATTalk/Program.cs
@@ -106,7 +106,8 @@ public static void Main(String[] args)
 
             AuditLog.Audit(new AuditEvent("Application", "start"));
 
-            AppCommon.UpgradeFromPreviousVersion(freshInstallForUser);
+            AppCommon.addBCIActuatorSetting();
+            AppCommon.addPanelClassConfigMapForBCI();
 
             CommandDescriptors.Init();
 
diff --git a/src/Applications/ACATTalk/Properties/AssemblyInfo.cs b/src/Applications/ACATTalk/Properties/AssemblyInfo.cs
index d58dfec4..256013f2 100644
--- a/src/Applications/ACATTalk/Properties/AssemblyInfo.cs
+++ b/src/Applications/ACATTalk/Properties/AssemblyInfo.cs
@@ -22,17 +22,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("2b16cd9f-5e6e-4beb-b5d2-79e0edf6d231")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.12")]
-[assembly: AssemblyFileVersion("3.12")]
-
diff --git a/src/Applications/ACATWatch/Properties/AssemblyInfo.cs b/src/Applications/ACATWatch/Properties/AssemblyInfo.cs
index acf8c512..fd354ba4 100644
--- a/src/Applications/ACATWatch/Properties/AssemblyInfo.cs
+++ b/src/Applications/ACATWatch/Properties/AssemblyInfo.cs
@@ -21,16 +21,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("e47223ce-3a77-47d1-9729-edf05f97d4f1")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.12")]
-[assembly: AssemblyFileVersion("3.12")]
diff --git a/src/Applications/AppCommon/AppCommon.cs b/src/Applications/AppCommon/AppCommon.cs
index 31bb8399..4e3fadab 100644
--- a/src/Applications/AppCommon/AppCommon.cs
+++ b/src/Applications/AppCommon/AppCommon.cs
@@ -358,22 +358,6 @@ public static bool CheckFontsInstalled()
             return true;
         }
 
-        public static void UpgradeFromPreviousVersion(bool freshInstallForUser)
-        {
-            var prevVersion = VersionInfo.GetPreviousInstalledVersion();
-            var currentVersion = VersionInfo.GetCurrentVersion();
-
-            if (prevVersion.Item1 == 2 && currentVersion.Item1 == 3)
-            {
-                if (!freshInstallForUser)
-                {
-                    upgradeFromRel2ToRel3();
-                }
-            }
-
-            VersionInfo.SaveCurrentVersion();
-            VersionInfo.SaveCurrentVersionForUser();
-        }
 
         /// <summary>
         /// Sets the paths to the settings file for the app
@@ -384,20 +368,8 @@ private static void setPreferencesPaths()
             ACATPreferences.DefaultPreferencesFilePath = ProfileManager.GetFullPath("DefaultSettings.xml");
         }
 
-        private static void upgradeFromRel2ToRel3()
-        {
-            var prevVersion = VersionInfo.GetPreviousInstalledVersionForUser();
-            var currentVersion = VersionInfo.GetCurrentVersion();
-
-            if (prevVersion.Item1 == 2 && currentVersion.Item1 == 3)
-            {
-                addBCIActuatorSetting();
-
-                addPanelClassConfigMapForBCI();
-            }
-        }
 
-        private static void addBCIActuatorSetting()
+        public static void addBCIActuatorSetting()
         {
             var config = ActuatorManager.Instance.GetActuatorConfig();
 
@@ -420,7 +392,7 @@ private static void addBCIActuatorSetting()
                 Enabled = false,
                 Id = new Guid("77809D19-F450-4D36-A633-D818400B3D9A"),
                 ImageFileName = "BCISwitch.png",
-                Name = "BCI"
+                Name = "BCI EEG Actuator"
             };
 
             var switchSetting = new SwitchSetting
@@ -440,7 +412,7 @@ private static void addBCIActuatorSetting()
             config.Save();
         }
 
-        private static void addPanelClassConfigMapForBCI()
+        public static void addPanelClassConfigMapForBCI()
         {
             var panelClassConfigMap = new PanelClassConfigMap();
             panelClassConfigMap.Default = false;
diff --git a/src/Applications/AppCommon/AppCommon.csproj b/src/Applications/AppCommon/AppCommon.csproj
index b81243b6..0f1771e4 100644
--- a/src/Applications/AppCommon/AppCommon.csproj
+++ b/src/Applications/AppCommon/AppCommon.csproj
@@ -25,7 +25,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\ACATApp\bin\Debug\</OutputPath>
+    <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -34,21 +34,22 @@
     <DebugType>none</DebugType>
     <DefineConstants>TRACE;ENABLE_DIGITAL_VERIFICATION</DefineConstants>
     <Optimize>true</Optimize>
-    <OutputPath>..\ACATApp\bin\Release\</OutputPath>
-        <ErrorReport>prompt</ErrorReport>
+    <OutputPath>bin\Release\</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="ACATCore, Version=1.50.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\Redistributable\ACATCore.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="ACATExtension, Version=1.50.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\Redistributable\ACATExtension.dll</HintPath>
+      <Private>False</Private>
     </Reference>
-    <Reference Include="ACATResources, Version=1.50.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="ACATResources">
       <HintPath>..\..\Redistributable\ACATResources.dll</HintPath>
     </Reference>
     <Reference Include="System" />
@@ -66,7 +67,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>call "$(SolutionDir)deployRedist.bat" "$(TargetDir)\$(TargetFileName)" "$(SolutionDir)"</PostBuildEvent>
+    <PostBuildEvent>call $(SolutionDir)deployRedist.bat $(TargetDir)$(TargetFileName) $(SolutionDir)</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Applications/AppCommon/Properties/AssemblyInfo.cs b/src/Applications/AppCommon/Properties/AssemblyInfo.cs
index 84feb069..2b7cace4 100644
--- a/src/Applications/AppCommon/Properties/AssemblyInfo.cs
+++ b/src/Applications/AppCommon/Properties/AssemblyInfo.cs
@@ -22,16 +22,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("96b00334-d46e-4257-b5d8-c9e059e08183")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.10")]
-[assembly: AssemblyFileVersion("3.10")]
diff --git a/src/Applications/ConvAssistTerminate/ConvAssistTerminate.csproj b/src/Applications/ConvAssistTerminate/ConvAssistTerminate.csproj
index ac847641..76894f22 100644
--- a/src/Applications/ConvAssistTerminate/ConvAssistTerminate.csproj
+++ b/src/Applications/ConvAssistTerminate/ConvAssistTerminate.csproj
@@ -11,7 +11,7 @@
     <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Deterministic>true</Deterministic>
+    <Deterministic>false</Deterministic>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
diff --git a/src/Applications/ConvAssistTerminate/Properties/AssemblyInfo.cs b/src/Applications/ConvAssistTerminate/Properties/AssemblyInfo.cs
index a81626d4..41af9874 100644
--- a/src/Applications/ConvAssistTerminate/Properties/AssemblyInfo.cs
+++ b/src/Applications/ConvAssistTerminate/Properties/AssemblyInfo.cs
@@ -21,16 +21,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("edb861ec-18cb-4578-8dfc-36658124f70c")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/Applications/Install/Users/DefaultUser/ActuatorSettings.xml b/src/Applications/Install/Users/DefaultUser/ActuatorSettings.xml
index ec1f2771..327beb0f 100644
--- a/src/Applications/Install/Users/DefaultUser/ActuatorSettings.xml
+++ b/src/Applications/Install/Users/DefaultUser/ActuatorSettings.xml
@@ -118,7 +118,7 @@
 	<ActuatorSetting>
       <Enabled>false</Enabled>
       <Id>77809d19-f450-4d36-a633-d818400b3d9a</Id>
-      <Name>BCI</Name>
+      <Name>BCI EEG Actuator</Name>
       <Description>Brain Computer Interface (BCI) is technology that reads brain waves to help you interact with your computer. Click &lt;a href=$ASSETS_VIDEOS_DIR#ACATOverviewBCI.mp4&gt;here&lt;/a&gt; for a demonstration of BCI. You can find more details &lt;a href=$ACAT_USER_GUIDE#BCISwitch&gt;here&lt;/a&gt;</Description>
       <ImageFileName>BCISwitch.png</ImageFileName>
       <SwitchSettings>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
new file mode 100644
index 00000000..830ced45
--- /dev/null
+++ b/src/Directory.Build.props
@@ -0,0 +1,23 @@
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VersionPrefix>3.13.0</VersionPrefix>
+    <AssemblyVersion>$(VersionPrefix).*</AssemblyVersion>
+    <FileVersion>$(VersionPrefix)</FileVersion>
+    <InformationalVersion>$(VersionPrefix)</InformationalVersion>
+  </PropertyGroup>
+
+  <Target Name="InjectAssemblyVersion" BeforeTargets="BeforeCompile">
+    <WriteLinesToFile
+      File="$(IntermediateOutputPath)AutoAssemblyVersion.cs"
+      Lines='
+using System.Reflection%3B
+[assembly: AssemblyVersion("$(AssemblyVersion)")]
+[assembly: AssemblyFileVersion("$(FileVersion)")]
+[assembly: AssemblyInformationalVersion("$(InformationalVersion)")];
+'
+      Overwrite="true" />
+    <ItemGroup>
+      <Compile Include="$(IntermediateOutputPath)AutoAssemblyVersion.cs" />
+    </ItemGroup>
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/src/Extensions/BCI/Actuators/BCIActuator/BCIActuator.csproj b/src/Extensions/BCI/Actuators/BCIActuator/BCIActuator.csproj
index 290a1618..ed9b84c7 100644
--- a/src/Extensions/BCI/Actuators/BCIActuator/BCIActuator.csproj
+++ b/src/Extensions/BCI/Actuators/BCIActuator/BCIActuator.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>BCIActuator</AssemblyName>
     <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <Deterministic>true</Deterministic>
+    <Deterministic>false</Deterministic>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/src/Extensions/BCI/Actuators/BCIActuator/Properties/AssemblyInfo.cs b/src/Extensions/BCI/Actuators/BCIActuator/Properties/AssemblyInfo.cs
index 04ff3ab5..718f56d0 100644
--- a/src/Extensions/BCI/Actuators/BCIActuator/Properties/AssemblyInfo.cs
+++ b/src/Extensions/BCI/Actuators/BCIActuator/Properties/AssemblyInfo.cs
@@ -21,16 +21,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("acd93bc0-e644-40be-9749-d0665a90e43c")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/Extensions/BCI/Actuators/EEGDataAcquisition/EEGDataAcquisition.csproj b/src/Extensions/BCI/Actuators/EEGDataAcquisition/EEGDataAcquisition.csproj
index 3f198949..b921254a 100644
--- a/src/Extensions/BCI/Actuators/EEGDataAcquisition/EEGDataAcquisition.csproj
+++ b/src/Extensions/BCI/Actuators/EEGDataAcquisition/EEGDataAcquisition.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>EEGDataAcquisition</AssemblyName>
     <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <Deterministic>true</Deterministic>
+    <Deterministic>false</Deterministic>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/src/Extensions/BCI/Actuators/EEGDataAcquisition/Properties/AssemblyInfo.cs b/src/Extensions/BCI/Actuators/EEGDataAcquisition/Properties/AssemblyInfo.cs
index 0638637e..243244ba 100644
--- a/src/Extensions/BCI/Actuators/EEGDataAcquisition/Properties/AssemblyInfo.cs
+++ b/src/Extensions/BCI/Actuators/EEGDataAcquisition/Properties/AssemblyInfo.cs
@@ -21,16 +21,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("16522c79-a205-4b58-a34e-b64202080008")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/Extensions/BCI/Actuators/EEGProcessing/EEGProcessing.csproj b/src/Extensions/BCI/Actuators/EEGProcessing/EEGProcessing.csproj
index f0a12fc1..871aeb28 100644
--- a/src/Extensions/BCI/Actuators/EEGProcessing/EEGProcessing.csproj
+++ b/src/Extensions/BCI/Actuators/EEGProcessing/EEGProcessing.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>EEGProcessing</AssemblyName>
     <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <Deterministic>true</Deterministic>
+    <Deterministic>false</Deterministic>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/src/Extensions/BCI/Actuators/EEGProcessing/Properties/AssemblyInfo.cs b/src/Extensions/BCI/Actuators/EEGProcessing/Properties/AssemblyInfo.cs
index 8595d92f..b5c66e14 100644
--- a/src/Extensions/BCI/Actuators/EEGProcessing/Properties/AssemblyInfo.cs
+++ b/src/Extensions/BCI/Actuators/EEGProcessing/Properties/AssemblyInfo.cs
@@ -21,16 +21,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("6472f0d7-ed15-4044-86e0-453593ce73f6")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/Extensions/BCI/Actuators/EEGSettings/EEGSettings.csproj b/src/Extensions/BCI/Actuators/EEGSettings/EEGSettings.csproj
index 311a27b5..d6b0c2d1 100644
--- a/src/Extensions/BCI/Actuators/EEGSettings/EEGSettings.csproj
+++ b/src/Extensions/BCI/Actuators/EEGSettings/EEGSettings.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>EEGSettings</AssemblyName>
     <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <Deterministic>true</Deterministic>
+    <Deterministic>false</Deterministic>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/src/Extensions/BCI/Actuators/EEGSettings/Properties/AssemblyInfo.cs b/src/Extensions/BCI/Actuators/EEGSettings/Properties/AssemblyInfo.cs
index f9c08159..474e925f 100644
--- a/src/Extensions/BCI/Actuators/EEGSettings/Properties/AssemblyInfo.cs
+++ b/src/Extensions/BCI/Actuators/EEGSettings/Properties/AssemblyInfo.cs
@@ -21,16 +21,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("5748f997-aca2-43a6-ab9f-f879af604080")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/Extensions/BCI/Actuators/EEGUtilities/EEGUtils.csproj b/src/Extensions/BCI/Actuators/EEGUtilities/EEGUtils.csproj
index 374b9142..5f51ddb2 100644
--- a/src/Extensions/BCI/Actuators/EEGUtilities/EEGUtils.csproj
+++ b/src/Extensions/BCI/Actuators/EEGUtilities/EEGUtils.csproj
@@ -11,7 +11,7 @@
     <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Deterministic>true</Deterministic>
+    <Deterministic>false</Deterministic>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/src/Extensions/BCI/Actuators/EEGUtilities/Properties/AssemblyInfo.cs b/src/Extensions/BCI/Actuators/EEGUtilities/Properties/AssemblyInfo.cs
index 8f85cdff..b2325dec 100644
--- a/src/Extensions/BCI/Actuators/EEGUtilities/Properties/AssemblyInfo.cs
+++ b/src/Extensions/BCI/Actuators/EEGUtilities/Properties/AssemblyInfo.cs
@@ -21,16 +21,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("6a3faa6c-4085-4460-98f6-623f726e8f18")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/Extensions/BCI/Actuators/SensorUI/Properties/AssemblyInfo.cs b/src/Extensions/BCI/Actuators/SensorUI/Properties/AssemblyInfo.cs
index 04d6ceb1..e1b9e78c 100644
--- a/src/Extensions/BCI/Actuators/SensorUI/Properties/AssemblyInfo.cs
+++ b/src/Extensions/BCI/Actuators/SensorUI/Properties/AssemblyInfo.cs
@@ -20,16 +20,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("ec1e8088-33a6-4593-832a-bf4722806ab2")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
diff --git a/src/Extensions/BCI/Actuators/SensorUI/SensorUI.csproj b/src/Extensions/BCI/Actuators/SensorUI/SensorUI.csproj
index d67c6ad9..13a0a3f2 100644
--- a/src/Extensions/BCI/Actuators/SensorUI/SensorUI.csproj
+++ b/src/Extensions/BCI/Actuators/SensorUI/SensorUI.csproj
@@ -11,7 +11,7 @@
     <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Deterministic>true</Deterministic>
+    <Deterministic>false</Deterministic>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/src/Extensions/BCI/Common/AnimationSharp/AnimationSharp.csproj b/src/Extensions/BCI/Common/AnimationSharp/AnimationSharp.csproj
index ab2f08de..dc7700eb 100644
--- a/src/Extensions/BCI/Common/AnimationSharp/AnimationSharp.csproj
+++ b/src/Extensions/BCI/Common/AnimationSharp/AnimationSharp.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>AnimationSharp</AssemblyName>
     <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <Deterministic>true</Deterministic>
+    <Deterministic>false</Deterministic>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/Extensions/BCI/Common/AnimationSharp/Properties/AssemblyInfo.cs b/src/Extensions/BCI/Common/AnimationSharp/Properties/AssemblyInfo.cs
index 15b098fc..900802ad 100644
--- a/src/Extensions/BCI/Common/AnimationSharp/Properties/AssemblyInfo.cs
+++ b/src/Extensions/BCI/Common/AnimationSharp/Properties/AssemblyInfo.cs
@@ -21,16 +21,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("9b1d5877-a3c0-4afd-8565-3fb32ffcd753")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/Extensions/BCI/Common/BCIControl/BCIControl.csproj b/src/Extensions/BCI/Common/BCIControl/BCIControl.csproj
index 7a352951..5cde48a9 100644
--- a/src/Extensions/BCI/Common/BCIControl/BCIControl.csproj
+++ b/src/Extensions/BCI/Common/BCIControl/BCIControl.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>BCIControl</AssemblyName>
     <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <Deterministic>true</Deterministic>
+    <Deterministic>false</Deterministic>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/Extensions/BCI/Common/BCIControl/Properties/AssemblyInfo.cs b/src/Extensions/BCI/Common/BCIControl/Properties/AssemblyInfo.cs
index 274ca29f..171b8e47 100644
--- a/src/Extensions/BCI/Common/BCIControl/Properties/AssemblyInfo.cs
+++ b/src/Extensions/BCI/Common/BCIControl/Properties/AssemblyInfo.cs
@@ -21,16 +21,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("ef508e55-555d-4896-99bc-92eccd00746f")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/Extensions/BCI/Common/BCIInterfaceUtilities/BCIInterfaceUtilities.csproj b/src/Extensions/BCI/Common/BCIInterfaceUtilities/BCIInterfaceUtilities.csproj
index 4aac5684..3889f84e 100644
--- a/src/Extensions/BCI/Common/BCIInterfaceUtilities/BCIInterfaceUtilities.csproj
+++ b/src/Extensions/BCI/Common/BCIInterfaceUtilities/BCIInterfaceUtilities.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>BCIInterfaceUtilities</AssemblyName>
     <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <Deterministic>true</Deterministic>
+    <Deterministic>false</Deterministic>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/Extensions/BCI/Common/BCIInterfaceUtilities/Properties/AssemblyInfo.cs b/src/Extensions/BCI/Common/BCIInterfaceUtilities/Properties/AssemblyInfo.cs
index cb08c6f4..c9a94d8c 100644
--- a/src/Extensions/BCI/Common/BCIInterfaceUtilities/Properties/AssemblyInfo.cs
+++ b/src/Extensions/BCI/Common/BCIInterfaceUtilities/Properties/AssemblyInfo.cs
@@ -21,16 +21,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("ff74af7d-5c3b-4e1d-a3ec-100d00128f7c")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/Extensions/BCI/UI/en/Scanners/Properties/AssemblyInfo.cs b/src/Extensions/BCI/UI/en/Scanners/Properties/AssemblyInfo.cs
index d7abd3fc..adbef397 100644
--- a/src/Extensions/BCI/UI/en/Scanners/Properties/AssemblyInfo.cs
+++ b/src/Extensions/BCI/UI/en/Scanners/Properties/AssemblyInfo.cs
@@ -23,15 +23,3 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("bf18d874-1d53-424c-baa1-1bc83f2ed8cb")]
 
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.0.0")]
-[assembly: AssemblyFileVersion("0.9.0.0")]
diff --git a/src/Extensions/BCI/UI/en/UserControls/Properties/AssemblyInfo.cs b/src/Extensions/BCI/UI/en/UserControls/Properties/AssemblyInfo.cs
index c8ec6faf..34f60d77 100644
--- a/src/Extensions/BCI/UI/en/UserControls/Properties/AssemblyInfo.cs
+++ b/src/Extensions/BCI/UI/en/UserControls/Properties/AssemblyInfo.cs
@@ -21,16 +21,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("7a9b8133-b2ee-4465-852c-41ab42fd0601")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/Extensions/BCI/UI/en/UserControls/UserControls.csproj b/src/Extensions/BCI/UI/en/UserControls/UserControls.csproj
index 96347cb6..8f4ca04f 100644
--- a/src/Extensions/BCI/UI/en/UserControls/UserControls.csproj
+++ b/src/Extensions/BCI/UI/en/UserControls/UserControls.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>UserControls</AssemblyName>
     <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <Deterministic>true</Deterministic>
+    <Deterministic>false</Deterministic>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/src/Extensions/Default/Actuators/CameraActuator/CameraActuator.csproj b/src/Extensions/Default/Actuators/CameraActuator/CameraActuator.csproj
index 52511939..c71b3754 100644
--- a/src/Extensions/Default/Actuators/CameraActuator/CameraActuator.csproj
+++ b/src/Extensions/Default/Actuators/CameraActuator/CameraActuator.csproj
@@ -38,7 +38,7 @@
     <DefineConstants>TRACE;ENABLE_DIGITAL_VERIFICATION</DefineConstants>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-        <ErrorReport>prompt</ErrorReport>
+    <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -132,154 +132,152 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="External\acat_gestures.exe">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
+    <Content Include="External\acat_gestures.exe" />
     <Content Include="External\acat_gestures_dll.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\acat_gestures_dll_d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\libinfra.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\libinfra_d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\libivcp.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\libivcp_d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\libpipeline.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\libpipeline_d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\msvcp110.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\msvcr110.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_calib3d2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_calib3d2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_contrib2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_contrib2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_core2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_core2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_features2d2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_features2d2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_ffmpeg2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_flann2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_flann2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_gpu2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_gpu2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_highgui2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_highgui2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_imgproc2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_imgproc2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_legacy2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_legacy2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_ml2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_ml2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_nonfree2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_nonfree2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_objdetect2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_objdetect2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_ocl2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_ocl2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_photo2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_photo2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_stitching2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_stitching2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_superres2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_superres2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_video2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_video2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_videostab2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_videostab2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
   </ItemGroup>
   <ItemGroup>
     <None Include="External\shape_predictor_68_face_landmarks.dat">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/src/Extensions/Default/Actuators/CameraActuator/Properties/AssemblyInfo.cs b/src/Extensions/Default/Actuators/CameraActuator/Properties/AssemblyInfo.cs
index da42c219..f31fa1d8 100644
--- a/src/Extensions/Default/Actuators/CameraActuator/Properties/AssemblyInfo.cs
+++ b/src/Extensions/Default/Actuators/CameraActuator/Properties/AssemblyInfo.cs
@@ -21,16 +21,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("066cfc39-78f9-4794-bc44-2e55dff45256")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/Extensions/Default/Actuators/SampleActuator/Properties/AssemblyInfo.cs b/src/Extensions/Default/Actuators/SampleActuator/Properties/AssemblyInfo.cs
index 7528a392..dab65813 100644
--- a/src/Extensions/Default/Actuators/SampleActuator/Properties/AssemblyInfo.cs
+++ b/src/Extensions/Default/Actuators/SampleActuator/Properties/AssemblyInfo.cs
@@ -21,16 +21,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("066cfc39-78f9-4794-bc44-2e55dff45256")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/Extensions/Default/AppAgents/ACATAgent/Properties/AssemblyInfo.cs b/src/Extensions/Default/AppAgents/ACATAgent/Properties/AssemblyInfo.cs
index 4f4ee885..d1a5fefc 100644
--- a/src/Extensions/Default/AppAgents/ACATAgent/Properties/AssemblyInfo.cs
+++ b/src/Extensions/Default/AppAgents/ACATAgent/Properties/AssemblyInfo.cs
@@ -22,16 +22,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("fe8b6694-ab72-4abd-99c6-9267237c8df3")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/Extensions/Default/AppAgents/TalkApplicationScannerAgent/Properties/AssemblyInfo.cs b/src/Extensions/Default/AppAgents/TalkApplicationScannerAgent/Properties/AssemblyInfo.cs
index cee94c2a..91922891 100644
--- a/src/Extensions/Default/AppAgents/TalkApplicationScannerAgent/Properties/AssemblyInfo.cs
+++ b/src/Extensions/Default/AppAgents/TalkApplicationScannerAgent/Properties/AssemblyInfo.cs
@@ -22,16 +22,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("fe8b6694-ab72-4abd-99c6-9267237c8df3")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/Extensions/Default/SpellCheckers/SpellCheck/Properties/AssemblyInfo.cs b/src/Extensions/Default/SpellCheckers/SpellCheck/Properties/AssemblyInfo.cs
index afdd7ec9..14b7b7cb 100644
--- a/src/Extensions/Default/SpellCheckers/SpellCheck/Properties/AssemblyInfo.cs
+++ b/src/Extensions/Default/SpellCheckers/SpellCheck/Properties/AssemblyInfo.cs
@@ -22,16 +22,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("d2ea276b-11dd-4535-b8bb-a88925b08234")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/Extensions/Default/TTSEngines/SAPIEngine/Properties/AssemblyInfo.cs b/src/Extensions/Default/TTSEngines/SAPIEngine/Properties/AssemblyInfo.cs
index 12653af0..f130dae6 100644
--- a/src/Extensions/Default/TTSEngines/SAPIEngine/Properties/AssemblyInfo.cs
+++ b/src/Extensions/Default/TTSEngines/SAPIEngine/Properties/AssemblyInfo.cs
@@ -22,16 +22,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("08be95c0-ebb9-49ad-8abc-e73cf9d54286")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/Extensions/Default/TTSEngines/TTSClient/Properties/AssemblyInfo.cs b/src/Extensions/Default/TTSEngines/TTSClient/Properties/AssemblyInfo.cs
index 8e39a562..bcc4bb5a 100644
--- a/src/Extensions/Default/TTSEngines/TTSClient/Properties/AssemblyInfo.cs
+++ b/src/Extensions/Default/TTSEngines/TTSClient/Properties/AssemblyInfo.cs
@@ -21,16 +21,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("f0afb84f-8106-46e2-ab3b-984c4a4429ce")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/Extensions/Default/TTSEngines/TTSClient/TTSClient.csproj b/src/Extensions/Default/TTSEngines/TTSClient/TTSClient.csproj
index e3cd4eed..8c732a29 100644
--- a/src/Extensions/Default/TTSEngines/TTSClient/TTSClient.csproj
+++ b/src/Extensions/Default/TTSEngines/TTSClient/TTSClient.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>TTSClient</AssemblyName>
     <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <Deterministic>true</Deterministic>
+    <Deterministic>false</Deterministic>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/src/Extensions/Default/UI/Dialogs/Properties/AssemblyInfo.cs b/src/Extensions/Default/UI/Dialogs/Properties/AssemblyInfo.cs
index 11adbc20..60ed8e22 100644
--- a/src/Extensions/Default/UI/Dialogs/Properties/AssemblyInfo.cs
+++ b/src/Extensions/Default/UI/Dialogs/Properties/AssemblyInfo.cs
@@ -21,16 +21,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("bf18d874-1d53-424c-baa1-1bc83f2ed8cb")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.0.0")]
-[assembly: AssemblyFileVersion("0.9.0.0")]
diff --git a/src/Extensions/Default/UI/Menus/Properties/AssemblyInfo.cs b/src/Extensions/Default/UI/Menus/Properties/AssemblyInfo.cs
index 8de1f0b4..922632d6 100644
--- a/src/Extensions/Default/UI/Menus/Properties/AssemblyInfo.cs
+++ b/src/Extensions/Default/UI/Menus/Properties/AssemblyInfo.cs
@@ -22,16 +22,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("bf18d874-1d53-424c-baa1-1bc83f2ed8cb")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.0.0")]
-[assembly: AssemblyFileVersion("0.9.0.0")]
diff --git a/src/Extensions/Default/UI/Scanners/Properties/AssemblyInfo.cs b/src/Extensions/Default/UI/Scanners/Properties/AssemblyInfo.cs
index 193a52bb..d28d9aba 100644
--- a/src/Extensions/Default/UI/Scanners/Properties/AssemblyInfo.cs
+++ b/src/Extensions/Default/UI/Scanners/Properties/AssemblyInfo.cs
@@ -22,16 +22,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("bf18d874-1d53-424c-baa1-1bc83f2ed8cb")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.0.0")]
-[assembly: AssemblyFileVersion("0.9.0.0")]
diff --git a/src/Extensions/Default/UI/en/Scanners/Properties/AssemblyInfo.cs b/src/Extensions/Default/UI/en/Scanners/Properties/AssemblyInfo.cs
index 193a52bb..d28d9aba 100644
--- a/src/Extensions/Default/UI/en/Scanners/Properties/AssemblyInfo.cs
+++ b/src/Extensions/Default/UI/en/Scanners/Properties/AssemblyInfo.cs
@@ -22,16 +22,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("bf18d874-1d53-424c-baa1-1bc83f2ed8cb")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.0.0")]
-[assembly: AssemblyFileVersion("0.9.0.0")]
diff --git a/src/Extensions/Default/UI/en/UserControls/Properties/AssemblyInfo.cs b/src/Extensions/Default/UI/en/UserControls/Properties/AssemblyInfo.cs
index c8ec6faf..34f60d77 100644
--- a/src/Extensions/Default/UI/en/UserControls/Properties/AssemblyInfo.cs
+++ b/src/Extensions/Default/UI/en/UserControls/Properties/AssemblyInfo.cs
@@ -21,16 +21,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("7a9b8133-b2ee-4465-852c-41ab42fd0601")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/Extensions/Default/UI/en/UserControls/UserControls.csproj b/src/Extensions/Default/UI/en/UserControls/UserControls.csproj
index 91332f96..e2778e1a 100644
--- a/src/Extensions/Default/UI/en/UserControls/UserControls.csproj
+++ b/src/Extensions/Default/UI/en/UserControls/UserControls.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>UserControls</AssemblyName>
     <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <Deterministic>true</Deterministic>
+    <Deterministic>false</Deterministic>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/src/Extensions/Default/WordPredictors/ConvAssist/ConvAssist.csproj b/src/Extensions/Default/WordPredictors/ConvAssist/ConvAssist.csproj
index a02d10a6..a747cf8e 100644
--- a/src/Extensions/Default/WordPredictors/ConvAssist/ConvAssist.csproj
+++ b/src/Extensions/Default/WordPredictors/ConvAssist/ConvAssist.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>ConvAssist</AssemblyName>
     <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <Deterministic>true</Deterministic>
+    <Deterministic>false</Deterministic>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/src/Extensions/Default/WordPredictors/ConvAssist/Properties/AssemblyInfo.cs b/src/Extensions/Default/WordPredictors/ConvAssist/Properties/AssemblyInfo.cs
index 517e78d4..b4d0da03 100644
--- a/src/Extensions/Default/WordPredictors/ConvAssist/Properties/AssemblyInfo.cs
+++ b/src/Extensions/Default/WordPredictors/ConvAssist/Properties/AssemblyInfo.cs
@@ -21,16 +21,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("ae20a883-bab4-4740-a93e-7eb0c4d5a6a5")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/Extensions/PostBuildSolution/Properties/AssemblyInfo.cs b/src/Extensions/PostBuildSolution/Properties/AssemblyInfo.cs
index a9e35397..e9489b8f 100644
--- a/src/Extensions/PostBuildSolution/Properties/AssemblyInfo.cs
+++ b/src/Extensions/PostBuildSolution/Properties/AssemblyInfo.cs
@@ -21,16 +21,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("c8b28315-126a-44c4-84d2-244440b60989")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.12")]
-[assembly: AssemblyFileVersion("3.12")]
diff --git a/src/Libraries/ACATCore/Core.csproj b/src/Libraries/ACATCore/Core.csproj
index bbd4cefa..9d48c9ce 100644
--- a/src/Libraries/ACATCore/Core.csproj
+++ b/src/Libraries/ACATCore/Core.csproj
@@ -491,7 +491,6 @@
     <Compile Include="Utility\ScannerFocus.cs" />
     <Compile Include="Utility\SoundManager.cs" />
     <Compile Include="Utility\VerifyDigitalSignature.cs" />
-    <Compile Include="Utility\VersionInfo.cs" />
     <Compile Include="Utility\XmlUtils.cs" />
     <Compile Include="Utility\DescriptorAttribute.cs" />
     <Compile Include="Utility\DirectoryWalker.cs">
diff --git a/src/Libraries/ACATCore/Properties/AssemblyInfo.cs b/src/Libraries/ACATCore/Properties/AssemblyInfo.cs
index 9a90f61a..20b280aa 100644
--- a/src/Libraries/ACATCore/Properties/AssemblyInfo.cs
+++ b/src/Libraries/ACATCore/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
@@ -22,17 +21,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("e258518e-a3bb-4b20-aac8-d36078b7b584")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Bdduild and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.12")]
-[assembly: AssemblyFileVersion("3.12")]
-
diff --git a/src/Libraries/ACATCore/Utility/VersionInfo.cs b/src/Libraries/ACATCore/Utility/VersionInfo.cs
deleted file mode 100644
index a8122adb..00000000
--- a/src/Libraries/ACATCore/Utility/VersionInfo.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2013-2019; 2023 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
-//
-// VersionInfo.cs
-//
-// Records the current version of ACAT in the Public Documents folder.
-// This information can be used to upgrade to new versions
-//
-////////////////////////////////////////////////////////////////////////////
-
-using ACAT.Lib.Core.PreferencesManagement;
-using ACAT.Lib.Core.UserManagement;
-using System;
-using System.IO;
-using System.Reflection;
-using System.Xml.Serialization;
-
-namespace ACAT.Lib.Core.Utility
-{
-    [Serializable]
-    public class VersionInfo : PreferencesBase
-    {
-        [NonSerialized, XmlIgnore]
-        private const String VersionInfoFileName = "VersionInfo.xml";
-
-        [NonSerialized, XmlIgnore]
-        private const String VersionInfoFolderName = "ACAT";
-
-        [NonSerialized, XmlIgnore]
-        private bool forUser;
-
-        public VersionInfo()
-        {
-            MajorVersion = 2;
-            MinorVersion = 0;
-            forUser = false;
-        }
-
-        public int MajorVersion { get; set; }
-
-        public int MinorVersion { get; set; }
-
-        public static Tuple<int, int> GetCurrentVersion()
-        {
-            Assembly entryAssembly = Assembly.GetEntryAssembly();
-
-            return new Tuple<int, int>(entryAssembly.GetName().Version.Major, entryAssembly.GetName().Version.Minor);
-        }
-
-        public static Tuple<int, int> GetPreviousInstalledVersion()
-        {
-            var versionInfo = VersionInfo.load();
-
-            return new Tuple<int, int>(versionInfo.MajorVersion, versionInfo.MinorVersion);
-        }
-
-        public static Tuple<int, int> GetPreviousInstalledVersionForUser()
-        {
-            var versionInfo = VersionInfo.load(true);
-
-            return new Tuple<int, int>(versionInfo.MajorVersion, versionInfo.MinorVersion);
-        }
-
-        public static bool SaveCurrentVersion()
-        {
-            var tuple = GetCurrentVersion();
-
-            var versionInfo = new VersionInfo
-            {
-                MajorVersion = tuple.Item1,
-                MinorVersion = tuple.Item2
-            };
-
-            return versionInfo.Save();
-        }
-
-        public static bool SaveCurrentVersionForUser()
-        {
-            var tuple = GetCurrentVersion();
-
-            var versionInfo = new VersionInfo
-            {
-                MajorVersion = tuple.Item1,
-                MinorVersion = tuple.Item2,
-                forUser = true
-            };
-
-            return versionInfo.Save();
-        }
-
-        /// <summary>
-        /// Saves settings
-        /// </summary>
-        /// <returns>true on success</returns>
-        public override bool Save()
-        {
-            var fileName = (forUser) ? getVersionInfoFileNameForUser() : getVersionInfoFileName();
-            return Save<VersionInfo>(this, fileName);
-        }
-
-        private static string getVersionInfoFileName()
-        {
-            return Environment.GetFolderPath(Environment.SpecialFolder.CommonDocuments) +
-                                                "\\" + VersionInfoFolderName +
-                                                "\\" + VersionInfoFileName;
-        }
-
-        private static String getVersionInfoFileNameForUser()
-        {
-            return UserManager.GetUserDir(UserManager.CurrentUser) + "\\" + VersionInfoFileName;
-        }
-
-        private static VersionInfo load(bool forUser = false)
-        {
-            var fileName = getVersionInfoFileName();
-            var dir = new FileInfo(fileName).Directory.FullName;
-            if (!Directory.Exists(dir))
-            {
-                Directory.CreateDirectory(dir);
-            }
-
-            var versionInfo = PreferencesBase.Load<VersionInfo>(fileName);
-
-            versionInfo.forUser = forUser;
-
-            return versionInfo;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Libraries/ACATExtension/Properties/AssemblyInfo.cs b/src/Libraries/ACATExtension/Properties/AssemblyInfo.cs
index e65cd9e4..c5143535 100644
--- a/src/Libraries/ACATExtension/Properties/AssemblyInfo.cs
+++ b/src/Libraries/ACATExtension/Properties/AssemblyInfo.cs
@@ -22,16 +22,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("f4439eaa-25ba-4d95-bdba-5552dadb9e1d")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.12")]
-[assembly: AssemblyFileVersion("3.12")]
diff --git a/src/deploy.bat b/src/deploy.bat
index e7f9f59d..7fac750b 100644
--- a/src/deploy.bat
+++ b/src/deploy.bat
@@ -1,27 +1,48 @@
-rem @echo off
+@echo off
 
 set CONFIG=%2
+
+if "%CONFIG%"=="" (
+	echo "ERROR: No configuration specified. Please specify Debug or Release."
+	echo "Usage: deploy.bat <path to ACAT root> <Debug|Release>"
+	exit /b 1
+)
+if "%CONFIG%"=="Debug" (
+	echo Deploying Debug configuration
+) else if "%CONFIG%"=="Release" (
+	echo Deploying Release configuration
+) else (
+	echo "ERROR: Invalid configuration specified. Please specify Debug or Release."
+	echo "Usage: deploy.bat <path to ACAT root> <Debug|Release>"
+	exit /b 1
+)
 set INSTALLDIR=.\Applications\ACATApp\bin\%CONFIG%
 
+echo Deploying ACAT to %INSTALLDIR%
 cd %1
 
+echo Current Directory is %CD%
+
+
 rem ------------------------------------------------
 @echo Deploying Install files
 rem ------------------------------------------------
 
-set SOURCEDIR=Applications\Install\Users
-set TARGETDIR=%INSTALLDIR%\Install\Users
-xcopy /s /y /e /i %SOURCEDIR%\*.* %TARGETDIR% 
+set SOURCEDIR=Applications\Install\Users\
+set TARGETDIR=%INSTALLDIR%\Install\Users\
+call :safe_xcopy %SOURCEDIR%\*.* %TARGETDIR% 
+if errorlevel 1 exit /b 1
 
 set LANGUAGE=en
 
-set TARGETDIR=%INSTALLDIR%\%LANGUAGE%\WordPredictors\ConvAssist
-set SOURCEDIR=Applications\Install\%LANGUAGE%\WordPredictors\ConvAssist
+set TARGETDIR=%INSTALLDIR%\%LANGUAGE%\WordPredictors\ConvAssist\
+set SOURCEDIR=Applications\Install\%LANGUAGE%\WordPredictors\ConvAssist\
 if not exist %SOURCEDIR% (
 	echo ERROR: %SOURCEDIR% does not exist
-	goto DeployConvAssist
+	exit /b 1
 )
-xcopy /s /y /e /i %SOURCEDIR%\*.* %TARGETDIR% 
+call :safe_xcopy %SOURCEDIR%\*.* %TARGETDIR% 
+if errorlevel 1 exit /b 1
 
 rem ------------------------------------------------
 @echo Deploying ConvAssist
@@ -32,21 +53,24 @@ set SOURCEDIR=Applications\Install\ConvAssistApp
 set TARGETDIR=%INSTALLDIR%\ConvAssistApp
 if not exist %TARGETDIR% (
 	mkdir %TARGETDIR%
-) else (
-	del /s /q %TARGETDIR%\*
 )
 if not exist %SOURCEDIR%\ConvAssist\ (
 	powershell -Command "Expand-Archive -Force -Path %SOURCEDIR%\ConvAssist.zip -Destination %SOURCEDIR%\ConvAssist"
 )
-xcopy /s /y /e /i %SOURCEDIR%\ConvAssist\* %TARGETDIR%
+
+if not exist %TARGETDIR%\ConvAssist.exe (
+	call :safe_xcopy %SOURCEDIR%\ConvAssist\* %TARGETDIR%
+)
+if errorlevel 1 exit /b 1
 
 :DeployAssets
 rem ------------------------------------------------
 @echo Deploying Assets
 rem ------------------------------------------------
-set SOURCEDIR=Assets
+set SOURCEDIR=Assets\
 set TARGETDIR=%INSTALLDIR%\%SOURCEDIR%
-xcopy /s /y /e /i %SOURCEDIR%\*.* %TARGETDIR% 
+call :safe_xcopy %SOURCEDIR%\*.* %TARGETDIR% 
+if errorlevel 1 exit /b 1
 
 rem ------------------------------------------------
 @echo Deploying UI dlls
@@ -55,14 +79,19 @@ rem ------------------------------------------------
 set SOURCEDIR=Extensions\Default\UI\Scanners
 set TARGETDIR=%INSTALLDIR%\%SOURCEDIR%
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
-if exist .\%SOURCEDIR%\Config\*.xml copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
+if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
+if exist .\%SOURCEDIR%\Config\*.xml call :safe_copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 set SOURCEDIR=Extensions\Default\UI\Menus
 set TARGETDIR=%INSTALLDIR%\%SOURCEDIR%
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-copy .\%SOURCEDIR%\bin\%CONFIG%\Menus.dll %TARGETDIR%
-copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
+call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\Menus.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
+
+if exist .\%SOURCEDIR%\Config\ call :safe_copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 rem ------------------------------------------------
 @echo Deploying English Language UI DLL's
@@ -73,48 +102,50 @@ set BASEDIR=Extensions\Default\UI
 set SOURCEDIR=%BASEDIR%\%LANGUAGE%\Scanners
 set TARGETDIR=%INSTALLDIR%\%LANGUAGE%\%BASEDIR%\Scanners
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
-if exist .\%SOURCEDIR%\Config\*.xml copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
+if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
+
+if exist .\%SOURCEDIR%\Config\*.xml call :safe_copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 set SOURCEDIR=%BASEDIR%\%LANGUAGE%\UserControls
 set TARGETDIR=%INSTALLDIR%\%LANGUAGE%\%BASEDIR%\UserControls
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
-if exist .\%SOURCEDIR%\Config\*.xml copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
-
-rem goto Next
+if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
 
+if exist .\%SOURCEDIR%\Config\*.xml call :safe_copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
+if errorlevel 1 exit /b 1
 rem ------------------------------------------------
-@echo Actuators
+@echo Deploying Camera Actuator
 rem ------------------------------------------------
-
-set SOURCEDIR=Extensions\Default\Actuators\CameraActuator
+set SOURCEDIR=Extensions\Default\Actuators\CameraActuator\bin\%CONFIG%\
 set TARGETDIR=%INSTALLDIR%\Extensions\Default\Actuators\Camera
+echo TargetDir is %TARGETDIR%
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-copy .\%SOURCEDIR%\bin\%CONFIG%\CameraActuator.dll %TARGETDIR%
-copy .\%SOURCEDIR%\bin\%CONFIG%\*.exe %TARGETDIR%
-if exist .\%SOURCEDIR%\External goto CopyVisionExternal
-echo *** ERROR *** Could not find External dependencies for the Vision Actuator (.\%SOURCEDIR%\External).
-rem goto Next
-
-:CopyVisionExternal
-if not exist %TARGETDIR%\acat_gestures_dll.dll copy .\%SOURCEDIR%\External\*.* %TARGETDIR%
-if not exist %INSTALLDIR%\shape_predictor_68_face_landmarks.dat copy .\%SOURCEDIR%\External\shape_predictor_68_face_landmarks.dat %INSTALLDIR%
+call :safe_copy %SOURCEDIR%\CameraActuator.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
 
+set SOURCEDIR=Extensions\Default\Actuators\CameraActuator\External\
+call :safe_xcopy %SOURCEDIR% %TARGETDIR%
+if errorlevel 1 exit /b 1
+call :safe_copy .\%SOURCEDIR%shape_predictor_68_face_landmarks.dat %INSTALLDIR%
+if errorlevel 1 exit /b 1
 
 rem ------------------------------------------------
 @echo Deploying TTSEngine dlls
 rem ------------------------------------------------
-:Next
 set SOURCEDIR=Extensions\Default\TTSEngines\SAPIEngine
 set TARGETDIR=%INSTALLDIR%\%SOURCEDIR%
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-copy .\%SOURCEDIR%\bin\%CONFIG%\SAPIEngine.dll %TARGETDIR%
+call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\SAPIEngine.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 set SOURCEDIR=Extensions\Default\TTSEngines\TTSClient
 set TARGETDIR=%INSTALLDIR%\%SOURCEDIR%
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-copy .\%SOURCEDIR%\bin\%CONFIG%\TTSClient.dll %TARGETDIR%
+call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\TTSClient.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 rem ------------------------------------------------
 @echo Deploying SpellChecker dlls
@@ -123,7 +154,8 @@ rem ------------------------------------------------
 set SOURCEDIR=Extensions\Default\SpellCheckers\SpellCheck
 set TARGETDIR=%INSTALLDIR%\%SOURCEDIR%
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-copy .\%SOURCEDIR%\bin\%CONFIG%\SpellCheck.dll %TARGETDIR%
+call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\SpellCheck.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 rem ------------------------------------------------
 @echo Deploying AppAgents dlls
@@ -134,18 +166,24 @@ set EXTENSIONSBASE=Extensions\Default
 set SOURCEDIR=%EXTENSIONSBASE%\AppAgents\%AGENT%
 set TARGETDIR=%INSTALLDIR%\%EXTENSIONSBASE%\AppAgents\%AGENT%
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-copy .\%SOURCEDIR%\bin\%CONFIG%\%AGENT%.dll %TARGETDIR%
-if exist %SOURCEDIR%\*.xml copy %SOURCEDIR%\*.xml %TARGETDIR%
-if exist %SOURCEDIR%\Config\*.xml copy %SOURCEDIR%\Config\*.xml %TARGETDIR%
+call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\%AGENT%.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
+if exist %SOURCEDIR%\*.xml call :safe_copy %SOURCEDIR%\*.xml %TARGETDIR%
+if errorlevel 1 exit /b 1
+if exist %SOURCEDIR%\Config\*.xml call :safe_copy %SOURCEDIR%\Config\*.xml %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 set AGENT=TalkApplicationScannerAgent
 set EXTENSIONSBASE=Extensions\Default
 set SOURCEDIR=%EXTENSIONSBASE%\AppAgents\%AGENT%
 set TARGETDIR=%INSTALLDIR%\%EXTENSIONSBASE%\AppAgents\%AGENT%
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-copy .\%SOURCEDIR%\bin\%CONFIG%\%AGENT%.dll %TARGETDIR%
-if exist %SOURCEDIR%\*.xml copy %SOURCEDIR%\*.xml %TARGETDIR%
-if exist %SOURCEDIR%\Config\*.xml copy %SOURCEDIR%\Config\*.xml %TARGETDIR%
+call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\%AGENT%.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
+if exist %SOURCEDIR%\*.xml call :safe_copy %SOURCEDIR%\*.xml %TARGETDIR%
+if errorlevel 1 exit /b 1
+if exist %SOURCEDIR%\Config\*.xml call :safe_copy %SOURCEDIR%\Config\*.xml %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 rem ------------------------------------------------
 @echo Deploying ACAT WordPredictor dlls
@@ -154,7 +192,8 @@ rem ------------------------------------------------
 set SOURCEDIR=Extensions\Default\WordPredictors\ConvAssist
 set TARGETDIR=%INSTALLDIR%\%SOURCEDIR%
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
+call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 rem ------------------------------------------------
 @echo Deploying ACAT UserControls
@@ -164,8 +203,10 @@ rem ------------------------------------------------
 set SOURCEDIR=%BASEDIR%\%LANGUAGE%\UserControls
 set TARGETDIR=%INSTALLDIR%\%LANGUAGE%\%BASEDIR%\UserControls
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
-if exist .\%SOURCEDIR%\Config\*.xml copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
+if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
+if exist .\%SOURCEDIR%\Config\*.xml call :safe_copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 
 rem ------------------------------------------------
@@ -176,7 +217,8 @@ set LANGUAGE=en
 set SOURCEDIR=ACATResources\bin\%CONFIG%\%LANGUAGE%
 set TARGETDIR=%INSTALLDIR%\%LANGUAGE%
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-copy .\%SOURCEDIR%\*.* %TARGETDIR%
+call :safe_copy .\%SOURCEDIR%\*.* %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 
 rem ------------------------------------------------
@@ -184,14 +226,16 @@ rem ------------------------------------------------
 rem ------------------------------------------------
 set SHARED_LIB_DIR=%INSTALLDIR%\SharedLibs
 if not exist %SHARED_LIB_DIR% mkdir %SHARED_LIB_DIR%
-copy Redistributable\*.*  %SHARED_LIB_DIR%
+call :safe_copy Redistributable\*.*  %SHARED_LIB_DIR%
+if errorlevel 1 exit /b 1
 
 rem ------------------------------------------------
 @echo Deploying Docs
 rem ------------------------------------------------
 set TARGETDIR=%INSTALLDIR%\Docs
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-xcopy /s /y /e /i Docs\*.* %TARGETDIR% 
+call :safe_xcopy Docs\*.* %TARGETDIR% 
+if errorlevel 1 exit /b 1
 
 rem ------------------------------------------------
 @echo Deploying BCI Extensions
@@ -199,21 +243,50 @@ rem ------------------------------------------------
 
 set SOURCEDIR=Extensions\BCI\Actuators\BCIActuator
 set BCIEXTERNALSRCDIR=Extensions\BCI\Actuators\External
+echo Install Dir is %INSTALLDIR%
 set TARGETDIR=%INSTALLDIR%\Extensions\BCI\Actuators\BCIActuator
+echo Target Dir is %TARGETDIR%
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
-copy .\%BCIEXTERNALSRCDIR%\brainflow.5.5.0\*.dll %TARGETDIR%
+call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
+call :safe_copy .\%BCIEXTERNALSRCDIR%\brainflow.5.5.0\*.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 set LANGUAGE=en
 set BASEDIR=Extensions\BCI\UI
 set SOURCEDIR=%BASEDIR%\%LANGUAGE%\Scanners
 set TARGETDIR=%INSTALLDIR%\%LANGUAGE%\%BASEDIR%\Scanners
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
-if exist .\%SOURCEDIR%\Config\*.xml copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
+if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 set SOURCEDIR=%BASEDIR%\%LANGUAGE%\UserControls
 set TARGETDIR=%INSTALLDIR%\%LANGUAGE%\%BASEDIR%\UserControls
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
-if exist .\%SOURCEDIR%\Config\*.xml copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
+if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
+
+set SOURCEDIR=ACATResources\%LANGUAGE%\
+set TARGETDIR=%INSTALLDIR%\%LANGUAGE%
+call :safe_xcopy .\%SOURCEDIR%\*.* %TARGETDIR%
+if errorlevel 1 exit /b 1
+
+echo Completed deploying ACAT to %INSTALLDIR%
+exit /b 0
+
+:safe_copy
+copy %1 %2
+echo ERRORLEVEL is %errorlevel%
+if errorlevel 1 (
+    echo Failed to copy %1 to %2
+    exit /b 1
+)
+goto :eof
+
+:safe_xcopy
+xcopy /E /Y %1 %2
+echo ERRORLEVEL is %errorlevel%
+if errorlevel 1 (
+    echo Failed to xcopy from %1 to %2
+    exit /b 1
+)
+goto :eof