diff --git a/.gitignore b/.gitignore
index a92660f9..854205e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -189,3 +189,4 @@ arcgis10_mapping_tools/opencover-results.xml
 arcgis10_mapping_tools/RenameLayer/RenameLayer/obj/Debug/DesignTimeResolveAssemblyReferences.cache
 arcgis10_mapping_tools/RenameLayer/RenameLayer/obj/Debug/DesignTimeResolveAssemblyReferences.cache
 arcgis10_mapping_tools/.vs/
+.vs/
\ No newline at end of file
diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
new file mode 100644
index 00000000..6330bcfc
--- /dev/null
+++ b/.vs/VSWorkspaceState.json
@@ -0,0 +1,8 @@
+{
+  "ExpandedNodes": [
+    "",
+    "\\arcgis10_mapping_tools\\MapActionToolbar_COMTools"
+  ],
+  "SelectedNode": "\\arcgis10_mapping_tools",
+  "PreviewInSolutionExplorer": false
+}
\ No newline at end of file
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
new file mode 100644
index 00000000..0ae0eba7
Binary files /dev/null and b/.vs/slnx.sqlite differ
diff --git a/DevEnv-EnableOutOfProcBuild.cmd b/DevEnv-EnableOutOfProcBuild.cmd
new file mode 100644
index 00000000..6cad53ed
--- /dev/null
+++ b/DevEnv-EnableOutOfProcBuild.cmd
@@ -0,0 +1,33 @@
+@SETLOCAL
+@REM 
+@ECHO OFF
+
+ECHO: & ECHO Start %~nx0 & ECHO:
+
+
+@REM The workaround for building .vdproj by DevEnv for the following error:
+@REM Visual Studio has encountered an unexpected error.------ Starting pre-build validation for project 'Setup1' ------ 
+@REM ERROR: An error occurred while validating.  HRESULT = '8000000A'
+@REM http://stackoverflow.com/questions/8648428/an-error-occurred-while-validating-hresult-8000000a
+@REM https://connect.microsoft.com/VisualStudio/feedback/details/595632/inconsistent-hanging-with-devenv-2010
+
+SET current_path="%CD%"
+REM Bug! The DisableOutOfProcBuild.exe doesn't work if the current directory of CMD doesn't set to the installation location of DisableOutOfProcBuild.exe.
+ECHO Seting the current path to the DisableOutOfProcBuild.exe installation folder.
+@REM
+CD "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\VSI\DisableOutOfProcBuild"
+ECHO:
+CALL DisableOutOfProcBuild.exe
+
+
+IF [%env_qUtil%] NEQ [] (
+  CALL %env_qUtil%\exit_if_error
+)
+
+
+ECHO: & ECHO Revert the previous current directory.
+CD %current_path%
+ECHO CD is set to %CD%
+
+
+@ECHO End %~nx0 & ECHO:
diff --git a/arcgis10_mapping_tools/.vs/MapAction-toolbox/v15/Server/sqlite3/db.lock b/arcgis10_mapping_tools/.vs/MapAction-toolbox/v15/Server/sqlite3/db.lock
new file mode 100644
index 00000000..e69de29b
diff --git a/arcgis10_mapping_tools/.vs/MapAction-toolbox/v15/Server/sqlite3/storage.ide b/arcgis10_mapping_tools/.vs/MapAction-toolbox/v15/Server/sqlite3/storage.ide
new file mode 100644
index 00000000..0ba71e87
Binary files /dev/null and b/arcgis10_mapping_tools/.vs/MapAction-toolbox/v15/Server/sqlite3/storage.ide differ
diff --git a/arcgis10_mapping_tools/.vs/MapAction-toolbox/v15/Server/sqlite3/storage.ide-shm b/arcgis10_mapping_tools/.vs/MapAction-toolbox/v15/Server/sqlite3/storage.ide-shm
new file mode 100644
index 00000000..214d3e5a
Binary files /dev/null and b/arcgis10_mapping_tools/.vs/MapAction-toolbox/v15/Server/sqlite3/storage.ide-shm differ
diff --git a/arcgis10_mapping_tools/.vs/MapAction-toolbox/v15/Server/sqlite3/storage.ide-wal b/arcgis10_mapping_tools/.vs/MapAction-toolbox/v15/Server/sqlite3/storage.ide-wal
new file mode 100644
index 00000000..8670cc16
Binary files /dev/null and b/arcgis10_mapping_tools/.vs/MapAction-toolbox/v15/Server/sqlite3/storage.ide-wal differ
diff --git a/arcgis10_mapping_tools/CommonTests/CommonTests.csproj b/arcgis10_mapping_tools/CommonTests/CommonTests.csproj
index eda25c75..ca84d7ed 100644
--- a/arcgis10_mapping_tools/CommonTests/CommonTests.csproj
+++ b/arcgis10_mapping_tools/CommonTests/CommonTests.csproj
@@ -89,9 +89,9 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\MapAction\MapAction\MapAction.csproj">
+    <ProjectReference Include="..\MapAction\MapAction\MapActionToolbar_Core.csproj">
       <Project>{8B7ABA1A-C659-4D80-A2EF-13D953577643}</Project>
-      <Name>MapAction</Name>
+      <Name>MapActionToolbar_Core</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/arcgis10_mapping_tools/CommonTests/DDPExportTests.cs b/arcgis10_mapping_tools/CommonTests/DDPExportTests.cs
index 5eb22c54..e1f5e3a3 100644
--- a/arcgis10_mapping_tools/CommonTests/DDPExportTests.cs
+++ b/arcgis10_mapping_tools/CommonTests/DDPExportTests.cs
@@ -7,10 +7,10 @@
 using ESRI.ArcGIS.Carto;
 using ESRI.ArcGIS.ArcMapUI;
 using NUnit.Framework;
-using MapAction;
+using MapActionToolbar_Core;
 
 
-namespace MapAction.tests
+namespace MapActionToolbar_Core.tests
 {
     /// <summary>
     /// The tests in this case are focused on code dealing exporting MapAction specific MXDs which have DataDrivenPages enabled.
diff --git a/arcgis10_mapping_tools/CommonTests/EventConfigTests.cs b/arcgis10_mapping_tools/CommonTests/EventConfigTests.cs
index e6a4a75b..ab86f8e4 100644
--- a/arcgis10_mapping_tools/CommonTests/EventConfigTests.cs
+++ b/arcgis10_mapping_tools/CommonTests/EventConfigTests.cs
@@ -4,16 +4,16 @@
 using System.Linq;
 using System.Text;
 using NUnit.Framework;
-using MapAction;
+using MapActionToolbar_Core;
 
-namespace MapAction.tests
+namespace MapActionToolbar_Core.tests
 {
     [TestFixture]
     public class EventConfigTests
     {
         // Class properties 
         protected string testRootDir;
-        protected MapAction.EventConfig config;
+        protected MapActionToolbar_Core.EventConfig config;
 
         private readonly string expectedOperationName= "Op_test";
         private readonly string expectedGlideNo= "XY-2006-123456-PAK";
@@ -41,7 +41,7 @@ public EventConfigTests()
         public void Setup()
         {
             string filePath = Path.Combine(this.testRootDir, @"testfiles\event_description.json");
-            config = MapAction.Utilities.getEventConfigValues(filePath);
+            config = MapActionToolbar_Core.Utilities.getEventConfigValues(filePath);
         }
 
         [TestCase]
diff --git a/arcgis10_mapping_tools/CommonTests/ExportTests.cs b/arcgis10_mapping_tools/CommonTests/ExportTests.cs
index d0340265..9b82ca43 100644
--- a/arcgis10_mapping_tools/CommonTests/ExportTests.cs
+++ b/arcgis10_mapping_tools/CommonTests/ExportTests.cs
@@ -8,10 +8,10 @@
 using ESRI.ArcGIS.Carto;
 using ESRI.ArcGIS.Framework;
 using NUnit.Framework;
-using MapAction;
+using MapActionToolbar_Core;
 
 
-namespace MapAction.tests
+namespace MapActionToolbar_Core.tests
 {
     //[Ignore("Ignore Exports whilst fixing PageLayoutElements")]
     [TestFixture]
@@ -88,12 +88,12 @@ public void exportSizedImageNewCreatesFileTest(MapActionExportTypes fileType, st
                 string outDir = this.exportPath;// just for clarity...
 
                 exportFileName = Path.Combine(outDir, "thumbnail.png");
-                width = MapAction.Properties.Settings.Default.thumbnail_width_px;
+                width = MapActionToolbar_Core.Properties.Settings.Default.thumbnail_width_px;
             }
             else
             {
                 // at present the sized export still uses dpi to build the filename, using screen resolution
-                int dpi = MapAction.MapImageExporter.SCREEN_RES_DPI;
+                int dpi = MapActionToolbar_Core.MapImageExporter.SCREEN_RES_DPI;
 
                 width = 1024;
                 if (dataFrameName == null)
diff --git a/arcgis10_mapping_tools/CommonTests/MATemplateTests.cs b/arcgis10_mapping_tools/CommonTests/MATemplateTests.cs
index 0c5922eb..8a6d3f56 100644
--- a/arcgis10_mapping_tools/CommonTests/MATemplateTests.cs
+++ b/arcgis10_mapping_tools/CommonTests/MATemplateTests.cs
@@ -6,10 +6,10 @@
 using System.Text;
 using ESRI.ArcGIS.ArcMapUI;
 using ESRI.ArcGIS.Carto;
-using MapAction;
+using MapActionToolbar_Core;
 using NUnit.Framework;
 
-namespace MapAction.tests
+namespace MapActionToolbar_Core.tests
 {
     /// <summary>
     /// The tests in this case are focused on the testing that code dealing with the MapAction specific MXDs work correctly
diff --git a/arcgis10_mapping_tools/CommonTests/TestUtilities.cs b/arcgis10_mapping_tools/CommonTests/TestUtilities.cs
index 7f6fe475..85eab3b5 100644
--- a/arcgis10_mapping_tools/CommonTests/TestUtilities.cs
+++ b/arcgis10_mapping_tools/CommonTests/TestUtilities.cs
@@ -10,7 +10,7 @@
 /**
  * Various static functions that are useful for setting up and tearing down tests for the MapActionToolbox Addins
  */
-namespace MapAction.tests
+namespace MapActionToolbar_Core.tests
 {
     class TestUtilities
     {
diff --git a/arcgis10_mapping_tools/InvokeESRIRegAsm/EsriRegisterer.Designer.cs b/arcgis10_mapping_tools/InvokeESRIRegAsm/EsriRegisterer.Designer.cs
new file mode 100644
index 00000000..8ca3ccfb
--- /dev/null
+++ b/arcgis10_mapping_tools/InvokeESRIRegAsm/EsriRegisterer.Designer.cs
@@ -0,0 +1,36 @@
+namespace InvokeESRIRegAsm
+{
+    partial class EsriRegisterer
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Component Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            components = new System.ComponentModel.Container();
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/arcgis10_mapping_tools/InvokeESRIRegAsm/EsriRegisterer.cs b/arcgis10_mapping_tools/InvokeESRIRegAsm/EsriRegisterer.cs
new file mode 100644
index 00000000..187c401c
--- /dev/null
+++ b/arcgis10_mapping_tools/InvokeESRIRegAsm/EsriRegisterer.cs
@@ -0,0 +1,96 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Configuration.Install;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Diagnostics;
+
+namespace InvokeESRIRegAsm
+{
+    [RunInstaller(true)]
+    public partial class EsriRegisterer : Installer
+    {
+        public EsriRegisterer()
+        {
+            InitializeComponent();
+        }
+
+        public override void Install(System.Collections.IDictionary stateSaver)
+        {
+            base.Install(stateSaver);
+
+            //Register the custom component.
+            //-----------------------------
+            //The default location of the ESRIRegAsm utility.
+            //Note how the whole string is embedded in quotes because of the spaces in the path.
+            string cmd1 = "\"" + Environment.GetFolderPath
+                (Environment.SpecialFolder.CommonProgramFilesX86) +
+                "\\ArcGIS\\bin\\ESRIRegAsm.exe" + "\"";
+            //Obtain the input argument (via the CustomActionData Property) in the setup project.
+            //An example CustomActionData property that is passed through might be something like:
+            // /arg1="[ProgramFilesFolder]\[ProductName]\bin\ArcMapClassLibrary_Implements.dll",
+            //which translates to the following on a default install:
+            //C:\Program Files\MyGISApp\bin\ArcMapClassLibrary_Implements.dll.
+            string part1 = this.Context.Parameters["arg1"];
+
+            //Add the appropriate command line switches when invoking the ESRIRegAsm utility.
+            //In this case: /p:Desktop = means the ArcGIS Desktop product, /s = means a silent install.
+            string part2 = " /p:Desktop /s";
+
+            //It is important to embed the part1 in quotes in case there are any spaces in the path.
+            string cmd2 = "\"" + part1 + "\"" + part2;
+
+            //Call the routing that will execute the ESRIRegAsm utility.
+            int exitCode = ExecuteCommand(cmd1, cmd2, 30000);
+        }
+
+        public override void Uninstall(System.Collections.IDictionary savedState)
+        {
+            base.Uninstall(savedState);
+
+            //Unregister the custom component.
+            //-----------------------------
+            //The default location of the ESRIRegAsm utility.
+            //Note how the whole string is embedded in quotes because of the spaces in the path.
+            string cmd1 = "\"" + Environment.GetFolderPath
+                (Environment.SpecialFolder.CommonProgramFilesX86) +
+                "\\ArcGIS\\bin\\ESRIRegAsm.exe" + "\"";
+            //Obtain the input argument (via the CustomActionData Property) in the setup project.
+            //An example CustomActionData property that is passed through might be something like:
+            // /arg1="[ProgramFilesFolder]\[ProductName]\bin\ArcMapClassLibrary_Implements.dll",
+            //which translate to the following on a default install:
+            //C:\Program Files\MyGISApp\bin\ArcMapClassLibrary_Implements.dll.
+            string part1 = this.Context.Parameters["arg1"];
+
+            //Add the appropriate command line switches when invoking the ESRIRegAsm utility.
+            //In this case: /p:Desktop = means the ArcGIS Desktop product, /u = means unregister the Custom Component, /s = means a silent install.
+            string part2 = " /p:Desktop /u /s";
+
+            //It is important to embed the part1 in quotes in case there are any spaces in the path.
+            string cmd2 = "\"" + part1 + "\"" + part2;
+
+            //Call the routing that will execute the ESRIRegAsm utility.
+            int exitCode = ExecuteCommand(cmd1, cmd2, 30000);
+        }
+
+        public static int ExecuteCommand(string Command1, string Command2, int
+            Timeout)
+        {
+            //Set up a ProcessStartInfo using your path to the executable (Command1) and the command line arguments (Command2).
+            ProcessStartInfo ProcessInfo = new ProcessStartInfo(Command1, Command2);
+            ProcessInfo.CreateNoWindow = true;
+            ProcessInfo.UseShellExecute = false;
+
+            //Invoke the process.
+            Process Process = Process.Start(ProcessInfo);
+            Process.WaitForExit(Timeout);
+
+            //Finish.
+            int ExitCode = Process.ExitCode;
+            Process.Close();
+            return ExitCode;
+        }
+    }
+}
\ No newline at end of file
diff --git a/arcgis10_mapping_tools/InvokeESRIRegAsm/InvokeESRIRegAsm.csproj b/arcgis10_mapping_tools/InvokeESRIRegAsm/InvokeESRIRegAsm.csproj
new file mode 100644
index 00000000..31958fc4
--- /dev/null
+++ b/arcgis10_mapping_tools/InvokeESRIRegAsm/InvokeESRIRegAsm.csproj
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{38C0FD0A-697D-4298-AAEE-9A2217CECF29}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>InvokeESRIRegAsm</RootNamespace>
+    <AssemblyName>InvokeESRIRegAsm</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration.Install" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Management" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="EsriRegisterer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="EsriRegisterer.Designer.cs">
+      <DependentUpon>EsriRegisterer.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/arcgis10_mapping_tools/InvokeESRIRegAsm/Properties/AssemblyInfo.cs b/arcgis10_mapping_tools/InvokeESRIRegAsm/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..6f66eda4
--- /dev/null
+++ b/arcgis10_mapping_tools/InvokeESRIRegAsm/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("InvokeESRIRegAsm")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("InvokeESRIRegAsm")]
+[assembly: AssemblyCopyright("Copyright ©  2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("38c0fd0a-697d-4298-aaee-9a2217cecf29")]
+
+// 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/arcgis10_mapping_tools/MapAction-toolbox.sln b/arcgis10_mapping_tools/MapAction-toolbox.sln
index 9c217e80..4d1ff4b2 100644
--- a/arcgis10_mapping_tools/MapAction-toolbox.sln
+++ b/arcgis10_mapping_tools/MapAction-toolbox.sln
@@ -1,7 +1,9 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapAction", "MapAction\MapAction\MapAction.csproj", "{8B7ABA1A-C659-4D80-A2EF-13D953577643}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.960
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapActionToolbar_Core", "MapAction\MapAction\MapActionToolbar_Core.csproj", "{8B7ABA1A-C659-4D80-A2EF-13D953577643}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{185C9A74-2001-4B24-843F-C7D00B7EB474}"
 	ProjectSection(SolutionItems) = preProject
@@ -10,7 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		TraceAndTestImpact.testsettings = TraceAndTestImpact.testsettings
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapActionToolbars", "MapActionToolbars\MapActionToolbars.csproj", "{5388B0F1-B5E9-45B2-810C-49F019300ACA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapActionToolbar_Forms", "MapActionToolbars\MapActionToolbar_Forms.csproj", "{5388B0F1-B5E9-45B2-810C-49F019300ACA}"
 	ProjectSection(ProjectDependencies) = postProject
 		{8B7ABA1A-C659-4D80-A2EF-13D953577643} = {8B7ABA1A-C659-4D80-A2EF-13D953577643}
 	EndProjectSection
@@ -22,10 +24,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{837E9B
 		.nuget\packages.config = .nuget\packages.config
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapActionToolbar_COMTools", "MapActionToolbar_COMTools\MapActionToolbar_COMTools.csproj", "{7B617336-DC71-4653-AD35-56DDF5E7062D}"
+EndProject
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "MapActionToolbarInstaller", "MapActionToolbarInstaller\MapActionToolbarInstaller.vdproj", "{7B30F4FA-381F-4CFE-9BB1-61E78FC56D77}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InvokeESRIRegAsm", "InvokeESRIRegAsm\InvokeESRIRegAsm.csproj", "{38C0FD0A-697D-4298-AAEE-9A2217CECF29}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapActionToolbar_Addin", "MapActionToolbar_Addin\MapActionToolbar_Addin.csproj", "{F5DB27DB-E505-4583-B766-1F8C8AF6DE27}"
+EndProject
 Global
-	GlobalSection(TestCaseManagementSettings) = postSolution
-		CategoryFile = MapAction-toolbox.vsmdi
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
@@ -43,8 +50,29 @@ Global
 		{EFAA6DBF-A7AF-467F-810F-75044A5EAC9F}.Debug|Any CPU.Build.0 = Release|Any CPU
 		{EFAA6DBF-A7AF-467F-810F-75044A5EAC9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EFAA6DBF-A7AF-467F-810F-75044A5EAC9F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7B617336-DC71-4653-AD35-56DDF5E7062D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7B617336-DC71-4653-AD35-56DDF5E7062D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7B617336-DC71-4653-AD35-56DDF5E7062D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7B617336-DC71-4653-AD35-56DDF5E7062D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7B30F4FA-381F-4CFE-9BB1-61E78FC56D77}.Debug|Any CPU.ActiveCfg = Debug
+		{7B30F4FA-381F-4CFE-9BB1-61E78FC56D77}.Release|Any CPU.ActiveCfg = Release
+		{7B30F4FA-381F-4CFE-9BB1-61E78FC56D77}.Release|Any CPU.Build.0 = Release
+		{38C0FD0A-697D-4298-AAEE-9A2217CECF29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{38C0FD0A-697D-4298-AAEE-9A2217CECF29}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{38C0FD0A-697D-4298-AAEE-9A2217CECF29}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{38C0FD0A-697D-4298-AAEE-9A2217CECF29}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F5DB27DB-E505-4583-B766-1F8C8AF6DE27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5DB27DB-E505-4583-B766-1F8C8AF6DE27}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F5DB27DB-E505-4583-B766-1F8C8AF6DE27}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F5DB27DB-E505-4583-B766-1F8C8AF6DE27}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {CF73C2F1-243E-4AF4-BE98-00BAD330B4A6}
+	EndGlobalSection
+	GlobalSection(TestCaseManagementSettings) = postSolution
+		CategoryFile = MapAction-toolbox.vsmdi
+	EndGlobalSection
 EndGlobal
diff --git a/arcgis10_mapping_tools/MapAction/MapAction/AutomationReport.cs b/arcgis10_mapping_tools/MapAction/MapAction/AutomationReport.cs
index 16a9b16f..a588db41 100644
--- a/arcgis10_mapping_tools/MapAction/MapAction/AutomationReport.cs
+++ b/arcgis10_mapping_tools/MapAction/MapAction/AutomationReport.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace MapAction
+namespace MapActionToolbar_Core
 {
     public class AutomationReport
     {
diff --git a/arcgis10_mapping_tools/MapAction/MapAction/AutomationResult.cs b/arcgis10_mapping_tools/MapAction/MapAction/AutomationResult.cs
index 5e5ba708..3b9b10d9 100644
--- a/arcgis10_mapping_tools/MapAction/MapAction/AutomationResult.cs
+++ b/arcgis10_mapping_tools/MapAction/MapAction/AutomationResult.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace MapAction
+namespace MapActionToolbar_Core
 {
     public class AutomationResult
     {
diff --git a/arcgis10_mapping_tools/MapAction/MapAction/Cookbook.cs b/arcgis10_mapping_tools/MapAction/MapAction/Cookbook.cs
index 0110afd3..c543d3d4 100644
--- a/arcgis10_mapping_tools/MapAction/MapAction/Cookbook.cs
+++ b/arcgis10_mapping_tools/MapAction/MapAction/Cookbook.cs
@@ -6,7 +6,7 @@
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 
-namespace MapAction
+namespace MapActionToolbar_Core
 {
     public class Cookbook
     {
diff --git a/arcgis10_mapping_tools/MapAction/MapAction/Countries.cs b/arcgis10_mapping_tools/MapAction/MapAction/Countries.cs
index 1e5056de..b7a81b40 100644
--- a/arcgis10_mapping_tools/MapAction/MapAction/Countries.cs
+++ b/arcgis10_mapping_tools/MapAction/MapAction/Countries.cs
@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 
-namespace MapAction
+namespace MapActionToolbar_Core
 {
     public enum CountryFields { Alpha2Code, Alpha3Code };
 
diff --git a/arcgis10_mapping_tools/MapAction/MapAction/CrashMoveFolderConfig.cs b/arcgis10_mapping_tools/MapAction/MapAction/CrashMoveFolderConfig.cs
index 8118e327..b8e07154 100644
--- a/arcgis10_mapping_tools/MapAction/MapAction/CrashMoveFolderConfig.cs
+++ b/arcgis10_mapping_tools/MapAction/MapAction/CrashMoveFolderConfig.cs
@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 
-namespace MapAction
+namespace MapActionToolbar_Core
 {
     public class CrashMoveFolderConfig
     {
diff --git a/arcgis10_mapping_tools/MapAction/MapAction/DataFrameProperties.cs b/arcgis10_mapping_tools/MapAction/MapAction/DataFrameProperties.cs
index 05037c23..acb2e88d 100644
--- a/arcgis10_mapping_tools/MapAction/MapAction/DataFrameProperties.cs
+++ b/arcgis10_mapping_tools/MapAction/MapAction/DataFrameProperties.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 
-namespace MapAction
+namespace MapActionToolbar_Core
 {
     public class DataFrameProperties
     {
diff --git a/arcgis10_mapping_tools/MapAction/MapAction/EventConfig.cs b/arcgis10_mapping_tools/MapAction/MapAction/EventConfig.cs
index 89833abb..7c71cb6c 100644
--- a/arcgis10_mapping_tools/MapAction/MapAction/EventConfig.cs
+++ b/arcgis10_mapping_tools/MapAction/MapAction/EventConfig.cs
@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 
-namespace MapAction
+namespace MapActionToolbar_Core
 {
     public class EventConfig
     {
diff --git a/arcgis10_mapping_tools/MapAction/MapAction/LanguageCode.cs b/arcgis10_mapping_tools/MapAction/MapAction/LanguageCode.cs
index a097f30b..e745cf87 100644
--- a/arcgis10_mapping_tools/MapAction/MapAction/LanguageCode.cs
+++ b/arcgis10_mapping_tools/MapAction/MapAction/LanguageCode.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-namespace MapAction
+namespace MapActionToolbar_Core
 {
     public class LanguageCode
     {
diff --git a/arcgis10_mapping_tools/MapAction/MapAction/LanguageCodeLookup.cs b/arcgis10_mapping_tools/MapAction/MapAction/LanguageCodeLookup.cs
index 0fb3f737..c187ef05 100644
--- a/arcgis10_mapping_tools/MapAction/MapAction/LanguageCodeLookup.cs
+++ b/arcgis10_mapping_tools/MapAction/MapAction/LanguageCodeLookup.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Xml.Serialization;
 
-namespace MapAction
+namespace MapActionToolbar_Core
 {
     public enum LanguageCodeFields { Alpha2, Alpha3b, Alpha3t, Alpha3h, Language };
 
diff --git a/arcgis10_mapping_tools/MapAction/MapAction/LanguageConfig.cs b/arcgis10_mapping_tools/MapAction/MapAction/LanguageConfig.cs
index 82041513..7b2fd7f5 100644
--- a/arcgis10_mapping_tools/MapAction/MapAction/LanguageConfig.cs
+++ b/arcgis10_mapping_tools/MapAction/MapAction/LanguageConfig.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 
-namespace MapAction
+namespace MapActionToolbar_Core
 {
     public class LanguageConfig
     {
diff --git a/arcgis10_mapping_tools/MapAction/MapAction/MapAction.csproj.user b/arcgis10_mapping_tools/MapAction/MapAction/MapAction.csproj.user
deleted file mode 100644
index d28f86c0..00000000
--- a/arcgis10_mapping_tools/MapAction/MapAction/MapAction.csproj.user
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <StartAction>Program</StartAction>
-    <StartProgram>C:\Program Files (x86)\ArcGIS\Desktop10.6\bin\ArcMap.exe</StartProgram>
-    <StartArguments>C:\MapAction\MA001_country-overview-with-admin-1-boundaries-p-codes.mxd</StartArguments>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/arcgis10_mapping_tools/MapAction/MapAction/MapAction.csproj b/arcgis10_mapping_tools/MapAction/MapAction/MapActionToolbar_Core.csproj
similarity index 98%
rename from arcgis10_mapping_tools/MapAction/MapAction/MapAction.csproj
rename to arcgis10_mapping_tools/MapAction/MapAction/MapActionToolbar_Core.csproj
index a9647102..95f264df 100644
--- a/arcgis10_mapping_tools/MapAction/MapAction/MapAction.csproj
+++ b/arcgis10_mapping_tools/MapAction/MapAction/MapActionToolbar_Core.csproj
@@ -1,170 +1,170 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{8B7ABA1A-C659-4D80-A2EF-13D953577643}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>MapAction</RootNamespace>
-    <AssemblyName>MapAction</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>
-    </DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="ESRI.ArcGIS.ArcMap, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="ESRI.ArcGIS.ArcMapUI, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="ESRI.ArcGIS.Carto, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="ESRI.ArcGIS.Desktop.AddIns, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL" />
-    <Reference Include="ESRI.ArcGIS.Display, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="ESRI.ArcGIS.DisplayUI, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="ESRI.ArcGIS.Framework, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="ESRI.ArcGIS.Geodatabase, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="ESRI.ArcGIS.Geometry, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="ESRI.ArcGIS.Geoprocessing, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="ESRI.ArcGIS.Geoprocessor, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL" />
-    <Reference Include="ESRI.ArcGIS.Output, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="ESRI.ArcGIS.System, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.configuration" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AutomationResult.cs" />
-    <Compile Include="Cookbook.cs" />
-    <Compile Include="Countries.cs" />
-    <Compile Include="CrashMoveFolderConfig.cs" />
-    <Compile Include="LanguageCode.cs" />
-    <Compile Include="LanguageCodeLookup.cs" />
-    <Compile Include="MapActionToolbarsConfig.cs" />
-    <Compile Include="EventConfig.cs" />
-    <Compile Include="DataFrameProperties.cs" />
-    <Compile Include="LanguageConfig.cs" />
-    <Compile Include="MapExport.cs" />
-    <Compile Include="MapImageExporter.cs" />
-    <Compile Include="PageLayoutProperties.cs" />
-    <Compile Include="MxdDocumentProperties.cs" />
-    <Compile Include="ProductLayer.cs" />
-    <Compile Include="Product.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>Settings.settings</DependentUpon>
-    </Compile>
-    <Compile Include="AutomationReport.cs" />
-    <Compile Include="Settings.cs" />
-    <Compile Include="Utilities.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="UtilityClasses.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\language_codes.xml" />
-    <EmbeddedResource Include="Resources\language_config.xml" />
-    <EmbeddedResource Include="Resources\MapActionToolbarsConfig.xml" />
-    <None Include="app.config">
-      <SubType>Designer</SubType>
-    </None>
-    <Content Include="mapbook_export_tool\generate_product.py">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="mapbook_export_tool\generate_qrcode.py">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="mapbook_export_tool\mapbook_export_tools.tbx">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="mapbook_export_tool\readme.md">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <None Include="packages.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>PublicSettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <EmbeddedResource Include="Resources\restcountries.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="mapbook_export_tool\check_dpp_mxd.py">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="mapbook_export_tool\export_mapbook.py">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{8B7ABA1A-C659-4D80-A2EF-13D953577643}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>MapAction</RootNamespace>
+    <AssemblyName>MapAction</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>
+    </DocumentationFile>
+    <Prefer32Bit>false</Prefer32Bit>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="ESRI.ArcGIS.ArcMap, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="ESRI.ArcGIS.ArcMapUI, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="ESRI.ArcGIS.Carto, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="ESRI.ArcGIS.Desktop.AddIns, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL" />
+    <Reference Include="ESRI.ArcGIS.Display, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="ESRI.ArcGIS.DisplayUI, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="ESRI.ArcGIS.Framework, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="ESRI.ArcGIS.Geodatabase, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="ESRI.ArcGIS.Geometry, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="ESRI.ArcGIS.Geoprocessing, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="ESRI.ArcGIS.Geoprocessor, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL" />
+    <Reference Include="ESRI.ArcGIS.Output, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="ESRI.ArcGIS.System, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.configuration" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AutomationResult.cs" />
+    <Compile Include="Cookbook.cs" />
+    <Compile Include="Countries.cs" />
+    <Compile Include="CrashMoveFolderConfig.cs" />
+    <Compile Include="LanguageCode.cs" />
+    <Compile Include="LanguageCodeLookup.cs" />
+    <Compile Include="MapActionToolbarsConfig.cs" />
+    <Compile Include="EventConfig.cs" />
+    <Compile Include="DataFrameProperties.cs" />
+    <Compile Include="LanguageConfig.cs" />
+    <Compile Include="MapExport.cs" />
+    <Compile Include="MapImageExporter.cs" />
+    <Compile Include="PageLayoutProperties.cs" />
+    <Compile Include="MxdDocumentProperties.cs" />
+    <Compile Include="ProductLayer.cs" />
+    <Compile Include="Product.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
+    <Compile Include="AutomationReport.cs" />
+    <Compile Include="Settings.cs" />
+    <Compile Include="Utilities.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="UtilityClasses.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\language_codes.xml" />
+    <EmbeddedResource Include="Resources\language_config.xml" />
+    <EmbeddedResource Include="Resources\MapActionToolbarsConfig.xml" />
+    <None Include="app.config">
+      <SubType>Designer</SubType>
+    </None>
+    <Content Include="mapbook_export_tool\generate_product.py">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="mapbook_export_tool\generate_qrcode.py">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="mapbook_export_tool\mapbook_export_tools.tbx">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="mapbook_export_tool\readme.md">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <None Include="packages.config" />
+    <None Include="Properties\Settings.settings">
+      <Generator>PublicSettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <EmbeddedResource Include="Resources\restcountries.json" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="mapbook_export_tool\check_dpp_mxd.py">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="mapbook_export_tool\export_mapbook.py">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
 </Project>
\ No newline at end of file
diff --git a/arcgis10_mapping_tools/MapAction/MapAction/MapActionToolbarsConfig.cs b/arcgis10_mapping_tools/MapAction/MapAction/MapActionToolbarsConfig.cs
index e47d5ea8..76923aee 100644
--- a/arcgis10_mapping_tools/MapAction/MapAction/MapActionToolbarsConfig.cs
+++ b/arcgis10_mapping_tools/MapAction/MapAction/MapActionToolbarsConfig.cs
@@ -6,7 +6,7 @@
 using System.Xml.Serialization;
 
 
-namespace MapAction
+namespace MapActionToolbar_Core
 {
     [Serializable]
     [XmlRoot("MapActionToolbarConfig")]
diff --git a/arcgis10_mapping_tools/MapAction/MapAction/MapExport.cs b/arcgis10_mapping_tools/MapAction/MapAction/MapExport.cs
index 107bd53c..25d69507 100644
--- a/arcgis10_mapping_tools/MapAction/MapAction/MapExport.cs
+++ b/arcgis10_mapping_tools/MapAction/MapAction/MapExport.cs
@@ -19,7 +19,7 @@
 using ESRI.ArcGIS.Geoprocessing;
 using ESRI.ArcGIS.Geodatabase;
 
-namespace MapAction
+namespace MapActionToolbar_Core
 {
     public static class MapExport
     {
diff --git a/arcgis10_mapping_tools/MapAction/MapAction/MapImageExporter.cs b/arcgis10_mapping_tools/MapAction/MapAction/MapImageExporter.cs
index 40fef838..77d901ce 100644
--- a/arcgis10_mapping_tools/MapAction/MapAction/MapImageExporter.cs
+++ b/arcgis10_mapping_tools/MapAction/MapAction/MapImageExporter.cs
@@ -19,7 +19,7 @@
 using ESRI.ArcGIS.Geodatabase;
 using ESRI.ArcGIS.Geoprocessor;
 
-namespace MapAction
+namespace MapActionToolbar_Core
 {
     /// <summary>
     /// This is a non-static type for exporting map images such as (but not limited to) within the Mapaction Export Tool.
diff --git a/arcgis10_mapping_tools/MapAction/MapAction/MxdDocumentProperties.cs b/arcgis10_mapping_tools/MapAction/MapAction/MxdDocumentProperties.cs
index 35f2eb81..d944d9c1 100644
--- a/arcgis10_mapping_tools/MapAction/MapAction/MxdDocumentProperties.cs
+++ b/arcgis10_mapping_tools/MapAction/MapAction/MxdDocumentProperties.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 
-namespace MapAction
+namespace MapActionToolbar_Core
 {
     class MxdDocumentProperties
     {
diff --git a/arcgis10_mapping_tools/MapAction/MapAction/PageLayoutProperties.cs b/arcgis10_mapping_tools/MapAction/MapAction/PageLayoutProperties.cs
index d6d72acd..6d7895d9 100644
--- a/arcgis10_mapping_tools/MapAction/MapAction/PageLayoutProperties.cs
+++ b/arcgis10_mapping_tools/MapAction/MapAction/PageLayoutProperties.cs
@@ -17,7 +17,7 @@
 using ESRI.ArcGIS.esriSystem;
 using ESRI.ArcGIS.Framework;
 
-namespace MapAction
+namespace MapActionToolbar_Core
 {
     /// <summary>
     /// This is a equiv of enum for strings.
diff --git a/arcgis10_mapping_tools/MapAction/MapAction/Product.cs b/arcgis10_mapping_tools/MapAction/MapAction/Product.cs
index 83e3b680..dea78c2a 100644
--- a/arcgis10_mapping_tools/MapAction/MapAction/Product.cs
+++ b/arcgis10_mapping_tools/MapAction/MapAction/Product.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace MapAction
+namespace MapActionToolbar_Core
 {
     public class Product
     {
diff --git a/arcgis10_mapping_tools/MapAction/MapAction/ProductLayer.cs b/arcgis10_mapping_tools/MapAction/MapAction/ProductLayer.cs
index 1403b224..1b2ef3e3 100644
--- a/arcgis10_mapping_tools/MapAction/MapAction/ProductLayer.cs
+++ b/arcgis10_mapping_tools/MapAction/MapAction/ProductLayer.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace MapAction
+namespace MapActionToolbar_Core
 {
     public class ProductLayer
     {
diff --git a/arcgis10_mapping_tools/MapAction/MapAction/Properties/AssemblyInfo.cs b/arcgis10_mapping_tools/MapAction/MapAction/Properties/AssemblyInfo.cs
index 88c9e7a9..1d94bd1c 100644
--- a/arcgis10_mapping_tools/MapAction/MapAction/Properties/AssemblyInfo.cs
+++ b/arcgis10_mapping_tools/MapAction/MapAction/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 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")]
+[assembly: AssemblyVersion("5.1.*")]
+//[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/arcgis10_mapping_tools/MapAction/MapAction/Properties/Resources.Designer.cs b/arcgis10_mapping_tools/MapAction/MapAction/Properties/Resources.Designer.cs
index 38c1c019..7b50c007 100644
--- a/arcgis10_mapping_tools/MapAction/MapAction/Properties/Resources.Designer.cs
+++ b/arcgis10_mapping_tools/MapAction/MapAction/Properties/Resources.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace MapAction.Properties {
+namespace MapActionToolbar_Core.Properties {
     using System;
     
     
diff --git a/arcgis10_mapping_tools/MapAction/MapAction/Properties/Settings.Designer.cs b/arcgis10_mapping_tools/MapAction/MapAction/Properties/Settings.Designer.cs
index cea712f7..04c6c929 100644
--- a/arcgis10_mapping_tools/MapAction/MapAction/Properties/Settings.Designer.cs
+++ b/arcgis10_mapping_tools/MapAction/MapAction/Properties/Settings.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace MapAction.Properties {
+namespace MapActionToolbar_Core.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
diff --git a/arcgis10_mapping_tools/MapAction/MapAction/Settings.cs b/arcgis10_mapping_tools/MapAction/MapAction/Settings.cs
index 7aa4c769..afef08cf 100644
--- a/arcgis10_mapping_tools/MapAction/MapAction/Settings.cs
+++ b/arcgis10_mapping_tools/MapAction/MapAction/Settings.cs
@@ -1,4 +1,4 @@
-namespace MapAction.Properties {
+namespace MapActionToolbar_Core.Properties {
     
     
     // This class allows you to handle specific events on the settings class:
diff --git a/arcgis10_mapping_tools/MapAction/MapAction/Utilities.cs b/arcgis10_mapping_tools/MapAction/MapAction/Utilities.cs
index cfb66367..2d8336dc 100644
--- a/arcgis10_mapping_tools/MapAction/MapAction/Utilities.cs
+++ b/arcgis10_mapping_tools/MapAction/MapAction/Utilities.cs
@@ -24,7 +24,7 @@
 using Newtonsoft.Json;
 using Formatting = Newtonsoft.Json.Formatting;
 
-namespace MapAction
+namespace MapActionToolbar_Core
 {
     public class Utilities
     {
@@ -122,7 +122,7 @@ public static string createXML(Dictionary<string, string> usDict, string rootEle
         #endregion
         #region Public method createEventConfig
         //Creates a json given a dictionary of tags and values.  Also pass in the root element, file path and filename.
-        public static string createEventConfig(MapAction.EventConfig eventConfig, string path, string fileName)
+        public static string createEventConfig(MapActionToolbar_Core.EventConfig eventConfig, string path, string fileName)
         {
             //set output path and filename
             string pathFileName;
@@ -475,7 +475,7 @@ public static string setCrashMovePathTest(string path)
 
             if (Directory.Exists(path))
             {
-                MapAction.Properties.Settings.Default.crash_move_folder_path = path;
+                MapActionToolbar_Core.Properties.Settings.Default.crash_move_folder_path = path;
                 Properties.Settings.Default.Save();
                 return Properties.Settings.Default.crash_move_folder_path;
             }
@@ -635,7 +635,7 @@ public static string GenerateQRCode(string url)
         #region Public method getLanguageCodeValues
         //Returns a List of the countries_config.xml elements and values
 
-        public static MapAction.LanguageCodeLookup getLanguageCodeValues(string path = null)
+        public static MapActionToolbar_Core.LanguageCodeLookup getLanguageCodeValues(string path = null)
         {
             const string LanguageCodesConfigFileName = "language_codes.xml";
 
@@ -753,10 +753,10 @@ public static MapActionToolbarConfig getToolboxConfig(string path = null)
         #region Public method getLanguageConfigValues
         //Returns the Language Configuration
 
-        public static List<MapAction.LanguageConfig> getLanguageConfigValues(string path = null)
+        public static List<MapActionToolbar_Core.LanguageConfig> getLanguageConfigValues(string path = null)
         {
             const string LanguageConfigFileName = "language_config.xml";
-            List<MapAction.LanguageConfig> languageDictionary = new List<MapAction.LanguageConfig>();
+            List<MapActionToolbar_Core.LanguageConfig> languageDictionary = new List<MapActionToolbar_Core.LanguageConfig>();
             string configPath;
             if (path == null)
             {
diff --git a/arcgis10_mapping_tools/MapAction/MapAction/UtilityClasses.cs b/arcgis10_mapping_tools/MapAction/MapAction/UtilityClasses.cs
index 281075d6..7729b582 100644
--- a/arcgis10_mapping_tools/MapAction/MapAction/UtilityClasses.cs
+++ b/arcgis10_mapping_tools/MapAction/MapAction/UtilityClasses.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Collections.ObjectModel;
 
-namespace MapAction
+namespace MapActionToolbar_Core
 {
     /// <summary>
     /// The different types that can be exported by the MapImageExporter
diff --git a/arcgis10_mapping_tools/MapActionToolbarInstaller/MapActionToolbarInstaller.vdproj b/arcgis10_mapping_tools/MapActionToolbarInstaller/MapActionToolbarInstaller.vdproj
new file mode 100644
index 00000000..c7aa1eba
--- /dev/null
+++ b/arcgis10_mapping_tools/MapActionToolbarInstaller/MapActionToolbarInstaller.vdproj
@@ -0,0 +1,4044 @@
+"DeployProject"
+{
+"VSVersion" = "3:800"
+"ProjectType" = "8:{978C614F-708E-4E1A-B201-565925725DBA}"
+"IsWebType" = "8:FALSE"
+"ProjectName" = "8:MapActionToolbarInstaller"
+"LanguageId" = "3:1033"
+"CodePage" = "3:1252"
+"UILanguageId" = "3:1033"
+"SccProjectName" = "8:"
+"SccLocalPath" = "8:"
+"SccAuxPath" = "8:"
+"SccProvider" = "8:"
+    "Hierarchy"
+    {
+        "Entry"
+        {
+        "MsmKey" = "8:_0325C2EAEA4662AFCDCD5A66EE49BF33"
+        "OwnerKey" = "8:_2E4AD81B95634102D9E2956818695BD0"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_0325C2EAEA4662AFCDCD5A66EE49BF33"
+        "OwnerKey" = "8:_5580E82132F342EDB889796FAB0DBC31"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_0325C2EAEA4662AFCDCD5A66EE49BF33"
+        "OwnerKey" = "8:_760E32D90A77177EC869F4FA57EC426B"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_0AAD1C457F70DD82EEEFE895BA4229E4"
+        "OwnerKey" = "8:_2A1A1E6466B6C307AC252693A05BE548"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_0C3AFD7D3A6ADB73DA43D7265E100C1C"
+        "OwnerKey" = "8:_F767F288C98E01D5BDF20D9C92047E7A"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_0CBA29147EBE5809756219E4CC0A8739"
+        "OwnerKey" = "8:_0325C2EAEA4662AFCDCD5A66EE49BF33"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_0D9BF066E5289CBD311D25824CDA11FB"
+        "OwnerKey" = "8:_B96829633675105AE7773BB595F6453B"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_0D9BF066E5289CBD311D25824CDA11FB"
+        "OwnerKey" = "8:_9469A27C01CB972ED17B3BDFF6FDF29C"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_0D9BF066E5289CBD311D25824CDA11FB"
+        "OwnerKey" = "8:_5580E82132F342EDB889796FAB0DBC31"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_0D9BF066E5289CBD311D25824CDA11FB"
+        "OwnerKey" = "8:_44E33405E1C124E1431C9578BB5F75F7"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_0D9BF066E5289CBD311D25824CDA11FB"
+        "OwnerKey" = "8:_56F7FE6028CB9F4B448491AB82DF33B4"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_0D9BF066E5289CBD311D25824CDA11FB"
+        "OwnerKey" = "8:_F767F288C98E01D5BDF20D9C92047E7A"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_0D9BF066E5289CBD311D25824CDA11FB"
+        "OwnerKey" = "8:_7D1E9A597A363401A81F5353C977E8CD"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_0D9BF066E5289CBD311D25824CDA11FB"
+        "OwnerKey" = "8:_F65D7169D1990D4824EF7C186CA6DDEA"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_0D9BF066E5289CBD311D25824CDA11FB"
+        "OwnerKey" = "8:_B1479DFC9B29BB1149C5B6827261E5FD"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_0D9BF066E5289CBD311D25824CDA11FB"
+        "OwnerKey" = "8:_F93E40D6D2218EF99E65785D9617898E"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_0D9BF066E5289CBD311D25824CDA11FB"
+        "OwnerKey" = "8:_71E38754F11B51C5F7EE428201511BD0"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_0D9BF066E5289CBD311D25824CDA11FB"
+        "OwnerKey" = "8:_760E32D90A77177EC869F4FA57EC426B"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_0D9BF066E5289CBD311D25824CDA11FB"
+        "OwnerKey" = "8:_2A1A1E6466B6C307AC252693A05BE548"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_0D9BF066E5289CBD311D25824CDA11FB"
+        "OwnerKey" = "8:_F63EDFC1AC05A488A01BEEA00747590C"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_0D9BF066E5289CBD311D25824CDA11FB"
+        "OwnerKey" = "8:_2FA2775FB767FBF8F47D33F9A6A9F5AA"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_0D9BF066E5289CBD311D25824CDA11FB"
+        "OwnerKey" = "8:_2B9479CB248C01C06589C2E0F70028EC"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_0D9BF066E5289CBD311D25824CDA11FB"
+        "OwnerKey" = "8:_3C20F84E998CB7AE85D6B620348A2051"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_0D9BF066E5289CBD311D25824CDA11FB"
+        "OwnerKey" = "8:_2E4AD81B95634102D9E2956818695BD0"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_0D9BF066E5289CBD311D25824CDA11FB"
+        "OwnerKey" = "8:_EEB92B2D0AE83C0C0859C4FE67F4CD83"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_0D9BF066E5289CBD311D25824CDA11FB"
+        "OwnerKey" = "8:_7172BA0BBBA89172675493D2AF871D53"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_0D9BF066E5289CBD311D25824CDA11FB"
+        "OwnerKey" = "8:_0325C2EAEA4662AFCDCD5A66EE49BF33"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_0D9BF066E5289CBD311D25824CDA11FB"
+        "OwnerKey" = "8:_2E3CBBD551B1153BE56AA077F4BFEC74"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_0D9BF066E5289CBD311D25824CDA11FB"
+        "OwnerKey" = "8:_C2EF36DBEB0C632A85DD2E0324DF4127"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_0D9BF066E5289CBD311D25824CDA11FB"
+        "OwnerKey" = "8:_B54777D4686F46444371771E5C6D7A41"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_0D9BF066E5289CBD311D25824CDA11FB"
+        "OwnerKey" = "8:_10292ABD5B3F80198C423DEA8A9BFBC6"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_0D9EAA2B82D12966F5FB2C607803288D"
+        "OwnerKey" = "8:_9469A27C01CB972ED17B3BDFF6FDF29C"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_0D9EAA2B82D12966F5FB2C607803288D"
+        "OwnerKey" = "8:_5580E82132F342EDB889796FAB0DBC31"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_10292ABD5B3F80198C423DEA8A9BFBC6"
+        "OwnerKey" = "8:_B54777D4686F46444371771E5C6D7A41"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_10292ABD5B3F80198C423DEA8A9BFBC6"
+        "OwnerKey" = "8:_9469A27C01CB972ED17B3BDFF6FDF29C"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_10292ABD5B3F80198C423DEA8A9BFBC6"
+        "OwnerKey" = "8:_5580E82132F342EDB889796FAB0DBC31"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_10292ABD5B3F80198C423DEA8A9BFBC6"
+        "OwnerKey" = "8:_44E33405E1C124E1431C9578BB5F75F7"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_10292ABD5B3F80198C423DEA8A9BFBC6"
+        "OwnerKey" = "8:_56F7FE6028CB9F4B448491AB82DF33B4"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_10292ABD5B3F80198C423DEA8A9BFBC6"
+        "OwnerKey" = "8:_F767F288C98E01D5BDF20D9C92047E7A"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_10292ABD5B3F80198C423DEA8A9BFBC6"
+        "OwnerKey" = "8:_7D1E9A597A363401A81F5353C977E8CD"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_10292ABD5B3F80198C423DEA8A9BFBC6"
+        "OwnerKey" = "8:_F65D7169D1990D4824EF7C186CA6DDEA"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_10292ABD5B3F80198C423DEA8A9BFBC6"
+        "OwnerKey" = "8:_B1479DFC9B29BB1149C5B6827261E5FD"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_10292ABD5B3F80198C423DEA8A9BFBC6"
+        "OwnerKey" = "8:_F93E40D6D2218EF99E65785D9617898E"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_10292ABD5B3F80198C423DEA8A9BFBC6"
+        "OwnerKey" = "8:_71E38754F11B51C5F7EE428201511BD0"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_10292ABD5B3F80198C423DEA8A9BFBC6"
+        "OwnerKey" = "8:_760E32D90A77177EC869F4FA57EC426B"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_10292ABD5B3F80198C423DEA8A9BFBC6"
+        "OwnerKey" = "8:_2A1A1E6466B6C307AC252693A05BE548"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_10292ABD5B3F80198C423DEA8A9BFBC6"
+        "OwnerKey" = "8:_F63EDFC1AC05A488A01BEEA00747590C"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_10292ABD5B3F80198C423DEA8A9BFBC6"
+        "OwnerKey" = "8:_2FA2775FB767FBF8F47D33F9A6A9F5AA"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_10292ABD5B3F80198C423DEA8A9BFBC6"
+        "OwnerKey" = "8:_2B9479CB248C01C06589C2E0F70028EC"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_10292ABD5B3F80198C423DEA8A9BFBC6"
+        "OwnerKey" = "8:_3C20F84E998CB7AE85D6B620348A2051"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_10292ABD5B3F80198C423DEA8A9BFBC6"
+        "OwnerKey" = "8:_2E4AD81B95634102D9E2956818695BD0"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_10292ABD5B3F80198C423DEA8A9BFBC6"
+        "OwnerKey" = "8:_7172BA0BBBA89172675493D2AF871D53"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_10292ABD5B3F80198C423DEA8A9BFBC6"
+        "OwnerKey" = "8:_0325C2EAEA4662AFCDCD5A66EE49BF33"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_10292ABD5B3F80198C423DEA8A9BFBC6"
+        "OwnerKey" = "8:_2E3CBBD551B1153BE56AA077F4BFEC74"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_10292ABD5B3F80198C423DEA8A9BFBC6"
+        "OwnerKey" = "8:_C2EF36DBEB0C632A85DD2E0324DF4127"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_1232B5776CD3425D823B7A1DD84D3FC2"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_15FC9C7A00D49AABBC29698ADFD07530"
+        "OwnerKey" = "8:_9469A27C01CB972ED17B3BDFF6FDF29C"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_15FC9C7A00D49AABBC29698ADFD07530"
+        "OwnerKey" = "8:_5580E82132F342EDB889796FAB0DBC31"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_15FC9C7A00D49AABBC29698ADFD07530"
+        "OwnerKey" = "8:_0D9EAA2B82D12966F5FB2C607803288D"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_18760DF6C5002C453A407BA86C2E2146"
+        "OwnerKey" = "8:_7172BA0BBBA89172675493D2AF871D53"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_19D359D31B3DB44CABCBE72F0037E67B"
+        "OwnerKey" = "8:_F65D7169D1990D4824EF7C186CA6DDEA"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_1CDF88EEB903F8081BDDBB5CCE6D0F06"
+        "OwnerKey" = "8:_2FA2775FB767FBF8F47D33F9A6A9F5AA"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_20655C4886AE82FA2DE1B199D47DAE43"
+        "OwnerKey" = "8:_FBDF04F54F76DFD670926A0735105D32"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2121D448E4550E5CE433E98193DC2411"
+        "OwnerKey" = "8:_B54777D4686F46444371771E5C6D7A41"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2121D448E4550E5CE433E98193DC2411"
+        "OwnerKey" = "8:_9469A27C01CB972ED17B3BDFF6FDF29C"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2121D448E4550E5CE433E98193DC2411"
+        "OwnerKey" = "8:_5580E82132F342EDB889796FAB0DBC31"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2121D448E4550E5CE433E98193DC2411"
+        "OwnerKey" = "8:_44E33405E1C124E1431C9578BB5F75F7"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2121D448E4550E5CE433E98193DC2411"
+        "OwnerKey" = "8:_56F7FE6028CB9F4B448491AB82DF33B4"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2121D448E4550E5CE433E98193DC2411"
+        "OwnerKey" = "8:_F767F288C98E01D5BDF20D9C92047E7A"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2121D448E4550E5CE433E98193DC2411"
+        "OwnerKey" = "8:_7D1E9A597A363401A81F5353C977E8CD"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2121D448E4550E5CE433E98193DC2411"
+        "OwnerKey" = "8:_F65D7169D1990D4824EF7C186CA6DDEA"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2121D448E4550E5CE433E98193DC2411"
+        "OwnerKey" = "8:_B1479DFC9B29BB1149C5B6827261E5FD"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2121D448E4550E5CE433E98193DC2411"
+        "OwnerKey" = "8:_BBF64723E871BC176CCFF39566A975D3"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2121D448E4550E5CE433E98193DC2411"
+        "OwnerKey" = "8:_F93E40D6D2218EF99E65785D9617898E"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2121D448E4550E5CE433E98193DC2411"
+        "OwnerKey" = "8:_71E38754F11B51C5F7EE428201511BD0"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2121D448E4550E5CE433E98193DC2411"
+        "OwnerKey" = "8:_2A1A1E6466B6C307AC252693A05BE548"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2121D448E4550E5CE433E98193DC2411"
+        "OwnerKey" = "8:_760E32D90A77177EC869F4FA57EC426B"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2121D448E4550E5CE433E98193DC2411"
+        "OwnerKey" = "8:_F63EDFC1AC05A488A01BEEA00747590C"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2121D448E4550E5CE433E98193DC2411"
+        "OwnerKey" = "8:_2FA2775FB767FBF8F47D33F9A6A9F5AA"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2121D448E4550E5CE433E98193DC2411"
+        "OwnerKey" = "8:_3C20F84E998CB7AE85D6B620348A2051"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2121D448E4550E5CE433E98193DC2411"
+        "OwnerKey" = "8:_2B9479CB248C01C06589C2E0F70028EC"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2121D448E4550E5CE433E98193DC2411"
+        "OwnerKey" = "8:_2E4AD81B95634102D9E2956818695BD0"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2121D448E4550E5CE433E98193DC2411"
+        "OwnerKey" = "8:_EEB92B2D0AE83C0C0859C4FE67F4CD83"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2121D448E4550E5CE433E98193DC2411"
+        "OwnerKey" = "8:_7172BA0BBBA89172675493D2AF871D53"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2121D448E4550E5CE433E98193DC2411"
+        "OwnerKey" = "8:_0325C2EAEA4662AFCDCD5A66EE49BF33"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2121D448E4550E5CE433E98193DC2411"
+        "OwnerKey" = "8:_2E3CBBD551B1153BE56AA077F4BFEC74"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2121D448E4550E5CE433E98193DC2411"
+        "OwnerKey" = "8:_C2EF36DBEB0C632A85DD2E0324DF4127"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2121D448E4550E5CE433E98193DC2411"
+        "OwnerKey" = "8:_10292ABD5B3F80198C423DEA8A9BFBC6"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2121D448E4550E5CE433E98193DC2411"
+        "OwnerKey" = "8:_FBDF04F54F76DFD670926A0735105D32"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2121D448E4550E5CE433E98193DC2411"
+        "OwnerKey" = "8:_0D9BF066E5289CBD311D25824CDA11FB"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2121D448E4550E5CE433E98193DC2411"
+        "OwnerKey" = "8:_94D6AC406515E84FC75F78076B2040A1"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2121D448E4550E5CE433E98193DC2411"
+        "OwnerKey" = "8:_B96829633675105AE7773BB595F6453B"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_24A912D72107856531304BA27657B725"
+        "OwnerKey" = "8:_44E33405E1C124E1431C9578BB5F75F7"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2A1A1E6466B6C307AC252693A05BE548"
+        "OwnerKey" = "8:_760E32D90A77177EC869F4FA57EC426B"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2A1A1E6466B6C307AC252693A05BE548"
+        "OwnerKey" = "8:_5580E82132F342EDB889796FAB0DBC31"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2B9479CB248C01C06589C2E0F70028EC"
+        "OwnerKey" = "8:_2FA2775FB767FBF8F47D33F9A6A9F5AA"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2B9479CB248C01C06589C2E0F70028EC"
+        "OwnerKey" = "8:_5580E82132F342EDB889796FAB0DBC31"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2B9479CB248C01C06589C2E0F70028EC"
+        "OwnerKey" = "8:_F63EDFC1AC05A488A01BEEA00747590C"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2E3CBBD551B1153BE56AA077F4BFEC74"
+        "OwnerKey" = "8:_0325C2EAEA4662AFCDCD5A66EE49BF33"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2E3CBBD551B1153BE56AA077F4BFEC74"
+        "OwnerKey" = "8:_5580E82132F342EDB889796FAB0DBC31"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2E3CBBD551B1153BE56AA077F4BFEC74"
+        "OwnerKey" = "8:_56F7FE6028CB9F4B448491AB82DF33B4"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2E3CBBD551B1153BE56AA077F4BFEC74"
+        "OwnerKey" = "8:_B1479DFC9B29BB1149C5B6827261E5FD"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2E3CBBD551B1153BE56AA077F4BFEC74"
+        "OwnerKey" = "8:_F65D7169D1990D4824EF7C186CA6DDEA"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2E3CBBD551B1153BE56AA077F4BFEC74"
+        "OwnerKey" = "8:_F93E40D6D2218EF99E65785D9617898E"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2E3CBBD551B1153BE56AA077F4BFEC74"
+        "OwnerKey" = "8:_760E32D90A77177EC869F4FA57EC426B"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2E3CBBD551B1153BE56AA077F4BFEC74"
+        "OwnerKey" = "8:_F63EDFC1AC05A488A01BEEA00747590C"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2E3CBBD551B1153BE56AA077F4BFEC74"
+        "OwnerKey" = "8:_2E4AD81B95634102D9E2956818695BD0"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2E4AD81B95634102D9E2956818695BD0"
+        "OwnerKey" = "8:_2B9479CB248C01C06589C2E0F70028EC"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2E4AD81B95634102D9E2956818695BD0"
+        "OwnerKey" = "8:_9469A27C01CB972ED17B3BDFF6FDF29C"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2E4AD81B95634102D9E2956818695BD0"
+        "OwnerKey" = "8:_5580E82132F342EDB889796FAB0DBC31"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2E4AD81B95634102D9E2956818695BD0"
+        "OwnerKey" = "8:_44E33405E1C124E1431C9578BB5F75F7"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2E4AD81B95634102D9E2956818695BD0"
+        "OwnerKey" = "8:_F93E40D6D2218EF99E65785D9617898E"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2E4AD81B95634102D9E2956818695BD0"
+        "OwnerKey" = "8:_F65D7169D1990D4824EF7C186CA6DDEA"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2E4AD81B95634102D9E2956818695BD0"
+        "OwnerKey" = "8:_7D1E9A597A363401A81F5353C977E8CD"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2E4AD81B95634102D9E2956818695BD0"
+        "OwnerKey" = "8:_56F7FE6028CB9F4B448491AB82DF33B4"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2E4AD81B95634102D9E2956818695BD0"
+        "OwnerKey" = "8:_760E32D90A77177EC869F4FA57EC426B"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2E4AD81B95634102D9E2956818695BD0"
+        "OwnerKey" = "8:_F63EDFC1AC05A488A01BEEA00747590C"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2E4AD81B95634102D9E2956818695BD0"
+        "OwnerKey" = "8:_71E38754F11B51C5F7EE428201511BD0"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2E4AD81B95634102D9E2956818695BD0"
+        "OwnerKey" = "8:_2FA2775FB767FBF8F47D33F9A6A9F5AA"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2F4050056EB4ACDCC5086FDAE2117D26"
+        "OwnerKey" = "8:_0D9BF066E5289CBD311D25824CDA11FB"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2FA2775FB767FBF8F47D33F9A6A9F5AA"
+        "OwnerKey" = "8:_5580E82132F342EDB889796FAB0DBC31"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2FA2775FB767FBF8F47D33F9A6A9F5AA"
+        "OwnerKey" = "8:_F63EDFC1AC05A488A01BEEA00747590C"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_2FA2775FB767FBF8F47D33F9A6A9F5AA"
+        "OwnerKey" = "8:_71E38754F11B51C5F7EE428201511BD0"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_3732172046D041E86357C7826CCAC036"
+        "OwnerKey" = "8:_C2EF36DBEB0C632A85DD2E0324DF4127"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_3C20F84E998CB7AE85D6B620348A2051"
+        "OwnerKey" = "8:_2B9479CB248C01C06589C2E0F70028EC"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_3C20F84E998CB7AE85D6B620348A2051"
+        "OwnerKey" = "8:_5580E82132F342EDB889796FAB0DBC31"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_3C20F84E998CB7AE85D6B620348A2051"
+        "OwnerKey" = "8:_760E32D90A77177EC869F4FA57EC426B"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_44E33405E1C124E1431C9578BB5F75F7"
+        "OwnerKey" = "8:_5580E82132F342EDB889796FAB0DBC31"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_5580E82132F342EDB889796FAB0DBC31"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_56F7FE6028CB9F4B448491AB82DF33B4"
+        "OwnerKey" = "8:_44E33405E1C124E1431C9578BB5F75F7"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_56F7FE6028CB9F4B448491AB82DF33B4"
+        "OwnerKey" = "8:_9469A27C01CB972ED17B3BDFF6FDF29C"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_56F7FE6028CB9F4B448491AB82DF33B4"
+        "OwnerKey" = "8:_5580E82132F342EDB889796FAB0DBC31"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_57D851B7504CEA0DCDC7312145749E92"
+        "OwnerKey" = "8:_3C20F84E998CB7AE85D6B620348A2051"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_5D49F85F449B85F2C5A3F5612ECB4289"
+        "OwnerKey" = "8:_2E3CBBD551B1153BE56AA077F4BFEC74"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_650333C24A201D893082AE0B23F8F318"
+        "OwnerKey" = "8:_56F7FE6028CB9F4B448491AB82DF33B4"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_69A1A519E93C73555F36D6256693E585"
+        "OwnerKey" = "8:_94D6AC406515E84FC75F78076B2040A1"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_6DB1A24DAD5B7D9D33651756B3016B78"
+        "OwnerKey" = "8:_F93E40D6D2218EF99E65785D9617898E"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_7172BA0BBBA89172675493D2AF871D53"
+        "OwnerKey" = "8:_2E4AD81B95634102D9E2956818695BD0"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_7172BA0BBBA89172675493D2AF871D53"
+        "OwnerKey" = "8:_5580E82132F342EDB889796FAB0DBC31"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_7172BA0BBBA89172675493D2AF871D53"
+        "OwnerKey" = "8:_7D1E9A597A363401A81F5353C977E8CD"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_71E38754F11B51C5F7EE428201511BD0"
+        "OwnerKey" = "8:_5580E82132F342EDB889796FAB0DBC31"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_73B1F7B98465A32065318D6F75423E17"
+        "OwnerKey" = "8:_94D6AC406515E84FC75F78076B2040A1"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_73B1F7B98465A32065318D6F75423E17"
+        "OwnerKey" = "8:_5580E82132F342EDB889796FAB0DBC31"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_73B1F7B98465A32065318D6F75423E17"
+        "OwnerKey" = "8:_56F7FE6028CB9F4B448491AB82DF33B4"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_73B1F7B98465A32065318D6F75423E17"
+        "OwnerKey" = "8:_F767F288C98E01D5BDF20D9C92047E7A"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_73B1F7B98465A32065318D6F75423E17"
+        "OwnerKey" = "8:_7D1E9A597A363401A81F5353C977E8CD"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_73B1F7B98465A32065318D6F75423E17"
+        "OwnerKey" = "8:_F65D7169D1990D4824EF7C186CA6DDEA"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_73B1F7B98465A32065318D6F75423E17"
+        "OwnerKey" = "8:_BBF64723E871BC176CCFF39566A975D3"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_73B1F7B98465A32065318D6F75423E17"
+        "OwnerKey" = "8:_F93E40D6D2218EF99E65785D9617898E"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_73B1F7B98465A32065318D6F75423E17"
+        "OwnerKey" = "8:_760E32D90A77177EC869F4FA57EC426B"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_73B1F7B98465A32065318D6F75423E17"
+        "OwnerKey" = "8:_F63EDFC1AC05A488A01BEEA00747590C"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_73B1F7B98465A32065318D6F75423E17"
+        "OwnerKey" = "8:_2FA2775FB767FBF8F47D33F9A6A9F5AA"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_73B1F7B98465A32065318D6F75423E17"
+        "OwnerKey" = "8:_2E4AD81B95634102D9E2956818695BD0"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_73B1F7B98465A32065318D6F75423E17"
+        "OwnerKey" = "8:_C2EF36DBEB0C632A85DD2E0324DF4127"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_73B1F7B98465A32065318D6F75423E17"
+        "OwnerKey" = "8:_B96829633675105AE7773BB595F6453B"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_760E32D90A77177EC869F4FA57EC426B"
+        "OwnerKey" = "8:_F63EDFC1AC05A488A01BEEA00747590C"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_760E32D90A77177EC869F4FA57EC426B"
+        "OwnerKey" = "8:_9469A27C01CB972ED17B3BDFF6FDF29C"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_760E32D90A77177EC869F4FA57EC426B"
+        "OwnerKey" = "8:_5580E82132F342EDB889796FAB0DBC31"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_760E32D90A77177EC869F4FA57EC426B"
+        "OwnerKey" = "8:_F65D7169D1990D4824EF7C186CA6DDEA"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_760E32D90A77177EC869F4FA57EC426B"
+        "OwnerKey" = "8:_F93E40D6D2218EF99E65785D9617898E"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_798743113BBE566D236D0E9A17BF1A2D"
+        "OwnerKey" = "8:_760E32D90A77177EC869F4FA57EC426B"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_7D1E9A597A363401A81F5353C977E8CD"
+        "OwnerKey" = "8:_56F7FE6028CB9F4B448491AB82DF33B4"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_7D1E9A597A363401A81F5353C977E8CD"
+        "OwnerKey" = "8:_5580E82132F342EDB889796FAB0DBC31"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_8156E10A8436791A31F57B31D2E0B8FF"
+        "OwnerKey" = "8:_F63EDFC1AC05A488A01BEEA00747590C"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_87F7E703767F9CD8F537794DC289DABE"
+        "OwnerKey" = "8:_10292ABD5B3F80198C423DEA8A9BFBC6"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_8EA16772ED4D45811A911F5F9E669710"
+        "OwnerKey" = "8:_2121D448E4550E5CE433E98193DC2411"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_91F6448CB9B8C53552EDF0BCC1DA88D6"
+        "OwnerKey" = "8:_B96829633675105AE7773BB595F6453B"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_9469A27C01CB972ED17B3BDFF6FDF29C"
+        "OwnerKey" = "8:_5580E82132F342EDB889796FAB0DBC31"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_94D6AC406515E84FC75F78076B2040A1"
+        "OwnerKey" = "8:_B96829633675105AE7773BB595F6453B"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_94D6AC406515E84FC75F78076B2040A1"
+        "OwnerKey" = "8:_5580E82132F342EDB889796FAB0DBC31"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_94D6AC406515E84FC75F78076B2040A1"
+        "OwnerKey" = "8:_56F7FE6028CB9F4B448491AB82DF33B4"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_94D6AC406515E84FC75F78076B2040A1"
+        "OwnerKey" = "8:_7D1E9A597A363401A81F5353C977E8CD"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_94D6AC406515E84FC75F78076B2040A1"
+        "OwnerKey" = "8:_F65D7169D1990D4824EF7C186CA6DDEA"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_94D6AC406515E84FC75F78076B2040A1"
+        "OwnerKey" = "8:_BBF64723E871BC176CCFF39566A975D3"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_94D6AC406515E84FC75F78076B2040A1"
+        "OwnerKey" = "8:_F93E40D6D2218EF99E65785D9617898E"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_94D6AC406515E84FC75F78076B2040A1"
+        "OwnerKey" = "8:_71E38754F11B51C5F7EE428201511BD0"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_94D6AC406515E84FC75F78076B2040A1"
+        "OwnerKey" = "8:_2E4AD81B95634102D9E2956818695BD0"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_9A43BAE26E2E5929845CA449931A0B49"
+        "OwnerKey" = "8:_EEB92B2D0AE83C0C0859C4FE67F4CD83"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_A5ED422A5B7CC62FAB57697E67EBAC62"
+        "OwnerKey" = "8:_B54777D4686F46444371771E5C6D7A41"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_A9E9D657ADD959EAF3A6E7B897D6F74B"
+        "OwnerKey" = "8:_2B9479CB248C01C06589C2E0F70028EC"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_B1479DFC9B29BB1149C5B6827261E5FD"
+        "OwnerKey" = "8:_F65D7169D1990D4824EF7C186CA6DDEA"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_B1479DFC9B29BB1149C5B6827261E5FD"
+        "OwnerKey" = "8:_5580E82132F342EDB889796FAB0DBC31"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_B54777D4686F46444371771E5C6D7A41"
+        "OwnerKey" = "8:_2E4AD81B95634102D9E2956818695BD0"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_B54777D4686F46444371771E5C6D7A41"
+        "OwnerKey" = "8:_5580E82132F342EDB889796FAB0DBC31"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_B54777D4686F46444371771E5C6D7A41"
+        "OwnerKey" = "8:_B1479DFC9B29BB1149C5B6827261E5FD"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_B54777D4686F46444371771E5C6D7A41"
+        "OwnerKey" = "8:_760E32D90A77177EC869F4FA57EC426B"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_B96829633675105AE7773BB595F6453B"
+        "OwnerKey" = "8:_10292ABD5B3F80198C423DEA8A9BFBC6"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_B96829633675105AE7773BB595F6453B"
+        "OwnerKey" = "8:_5580E82132F342EDB889796FAB0DBC31"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_B96829633675105AE7773BB595F6453B"
+        "OwnerKey" = "8:_44E33405E1C124E1431C9578BB5F75F7"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_B96829633675105AE7773BB595F6453B"
+        "OwnerKey" = "8:_F767F288C98E01D5BDF20D9C92047E7A"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_B96829633675105AE7773BB595F6453B"
+        "OwnerKey" = "8:_56F7FE6028CB9F4B448491AB82DF33B4"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_B96829633675105AE7773BB595F6453B"
+        "OwnerKey" = "8:_7D1E9A597A363401A81F5353C977E8CD"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_B96829633675105AE7773BB595F6453B"
+        "OwnerKey" = "8:_BBF64723E871BC176CCFF39566A975D3"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_B96829633675105AE7773BB595F6453B"
+        "OwnerKey" = "8:_F65D7169D1990D4824EF7C186CA6DDEA"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_B96829633675105AE7773BB595F6453B"
+        "OwnerKey" = "8:_F93E40D6D2218EF99E65785D9617898E"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_B96829633675105AE7773BB595F6453B"
+        "OwnerKey" = "8:_760E32D90A77177EC869F4FA57EC426B"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_B96829633675105AE7773BB595F6453B"
+        "OwnerKey" = "8:_F63EDFC1AC05A488A01BEEA00747590C"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_B96829633675105AE7773BB595F6453B"
+        "OwnerKey" = "8:_71E38754F11B51C5F7EE428201511BD0"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_B96829633675105AE7773BB595F6453B"
+        "OwnerKey" = "8:_2FA2775FB767FBF8F47D33F9A6A9F5AA"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_B96829633675105AE7773BB595F6453B"
+        "OwnerKey" = "8:_2B9479CB248C01C06589C2E0F70028EC"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_B96829633675105AE7773BB595F6453B"
+        "OwnerKey" = "8:_EEB92B2D0AE83C0C0859C4FE67F4CD83"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_B96829633675105AE7773BB595F6453B"
+        "OwnerKey" = "8:_7172BA0BBBA89172675493D2AF871D53"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_B96829633675105AE7773BB595F6453B"
+        "OwnerKey" = "8:_2E4AD81B95634102D9E2956818695BD0"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_B96829633675105AE7773BB595F6453B"
+        "OwnerKey" = "8:_C2EF36DBEB0C632A85DD2E0324DF4127"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_BBF64723E871BC176CCFF39566A975D3"
+        "OwnerKey" = "8:_F65D7169D1990D4824EF7C186CA6DDEA"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_BBF64723E871BC176CCFF39566A975D3"
+        "OwnerKey" = "8:_9469A27C01CB972ED17B3BDFF6FDF29C"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_BBF64723E871BC176CCFF39566A975D3"
+        "OwnerKey" = "8:_5580E82132F342EDB889796FAB0DBC31"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_BBF64723E871BC176CCFF39566A975D3"
+        "OwnerKey" = "8:_44E33405E1C124E1431C9578BB5F75F7"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_BBF64723E871BC176CCFF39566A975D3"
+        "OwnerKey" = "8:_F767F288C98E01D5BDF20D9C92047E7A"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_BBF64723E871BC176CCFF39566A975D3"
+        "OwnerKey" = "8:_56F7FE6028CB9F4B448491AB82DF33B4"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_BBF64723E871BC176CCFF39566A975D3"
+        "OwnerKey" = "8:_7D1E9A597A363401A81F5353C977E8CD"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_BE9DBD53546FAA6BC71C2F478B8A2A32"
+        "OwnerKey" = "8:_B1479DFC9B29BB1149C5B6827261E5FD"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_C2EF36DBEB0C632A85DD2E0324DF4127"
+        "OwnerKey" = "8:_2E4AD81B95634102D9E2956818695BD0"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_C2EF36DBEB0C632A85DD2E0324DF4127"
+        "OwnerKey" = "8:_5580E82132F342EDB889796FAB0DBC31"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_C2EF36DBEB0C632A85DD2E0324DF4127"
+        "OwnerKey" = "8:_F65D7169D1990D4824EF7C186CA6DDEA"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_C2EF36DBEB0C632A85DD2E0324DF4127"
+        "OwnerKey" = "8:_2A1A1E6466B6C307AC252693A05BE548"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_C2EF36DBEB0C632A85DD2E0324DF4127"
+        "OwnerKey" = "8:_760E32D90A77177EC869F4FA57EC426B"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_C2EF36DBEB0C632A85DD2E0324DF4127"
+        "OwnerKey" = "8:_2FA2775FB767FBF8F47D33F9A6A9F5AA"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_C2EF36DBEB0C632A85DD2E0324DF4127"
+        "OwnerKey" = "8:_7172BA0BBBA89172675493D2AF871D53"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_C37A04D9FBD7B5204BECE2FFAB930E80"
+        "OwnerKey" = "8:_BBF64723E871BC176CCFF39566A975D3"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_C39C0B28EAE36023E8934DF5747C2EEF"
+        "OwnerKey" = "8:_5580E82132F342EDB889796FAB0DBC31"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_C511E35B3B66B0070EC233AAC4B72EB0"
+        "OwnerKey" = "8:_2E4AD81B95634102D9E2956818695BD0"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_CFEE731A625FED564558C7E9C4667BA6"
+        "OwnerKey" = "8:_7D1E9A597A363401A81F5353C977E8CD"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_EEB92B2D0AE83C0C0859C4FE67F4CD83"
+        "OwnerKey" = "8:_2E4AD81B95634102D9E2956818695BD0"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_EEB92B2D0AE83C0C0859C4FE67F4CD83"
+        "OwnerKey" = "8:_5580E82132F342EDB889796FAB0DBC31"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_EEB92B2D0AE83C0C0859C4FE67F4CD83"
+        "OwnerKey" = "8:_44E33405E1C124E1431C9578BB5F75F7"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_EEB92B2D0AE83C0C0859C4FE67F4CD83"
+        "OwnerKey" = "8:_56F7FE6028CB9F4B448491AB82DF33B4"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_EEB92B2D0AE83C0C0859C4FE67F4CD83"
+        "OwnerKey" = "8:_F63EDFC1AC05A488A01BEEA00747590C"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_EEB92B2D0AE83C0C0859C4FE67F4CD83"
+        "OwnerKey" = "8:_2FA2775FB767FBF8F47D33F9A6A9F5AA"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_F63EDFC1AC05A488A01BEEA00747590C"
+        "OwnerKey" = "8:_71E38754F11B51C5F7EE428201511BD0"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_F63EDFC1AC05A488A01BEEA00747590C"
+        "OwnerKey" = "8:_5580E82132F342EDB889796FAB0DBC31"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_F65D7169D1990D4824EF7C186CA6DDEA"
+        "OwnerKey" = "8:_7D1E9A597A363401A81F5353C977E8CD"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_F65D7169D1990D4824EF7C186CA6DDEA"
+        "OwnerKey" = "8:_5580E82132F342EDB889796FAB0DBC31"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_F65D7169D1990D4824EF7C186CA6DDEA"
+        "OwnerKey" = "8:_44E33405E1C124E1431C9578BB5F75F7"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_F65D7169D1990D4824EF7C186CA6DDEA"
+        "OwnerKey" = "8:_56F7FE6028CB9F4B448491AB82DF33B4"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_F767F288C98E01D5BDF20D9C92047E7A"
+        "OwnerKey" = "8:_56F7FE6028CB9F4B448491AB82DF33B4"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_F767F288C98E01D5BDF20D9C92047E7A"
+        "OwnerKey" = "8:_5580E82132F342EDB889796FAB0DBC31"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_F93E40D6D2218EF99E65785D9617898E"
+        "OwnerKey" = "8:_F65D7169D1990D4824EF7C186CA6DDEA"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_F93E40D6D2218EF99E65785D9617898E"
+        "OwnerKey" = "8:_5580E82132F342EDB889796FAB0DBC31"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_F93E40D6D2218EF99E65785D9617898E"
+        "OwnerKey" = "8:_44E33405E1C124E1431C9578BB5F75F7"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_F93E40D6D2218EF99E65785D9617898E"
+        "OwnerKey" = "8:_56F7FE6028CB9F4B448491AB82DF33B4"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_FBDF04F54F76DFD670926A0735105D32"
+        "OwnerKey" = "8:_10292ABD5B3F80198C423DEA8A9BFBC6"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_FBDF04F54F76DFD670926A0735105D32"
+        "OwnerKey" = "8:_5580E82132F342EDB889796FAB0DBC31"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_FBDF04F54F76DFD670926A0735105D32"
+        "OwnerKey" = "8:_F65D7169D1990D4824EF7C186CA6DDEA"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_FBDF04F54F76DFD670926A0735105D32"
+        "OwnerKey" = "8:_B1479DFC9B29BB1149C5B6827261E5FD"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_FBDF04F54F76DFD670926A0735105D32"
+        "OwnerKey" = "8:_F93E40D6D2218EF99E65785D9617898E"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_FBDF04F54F76DFD670926A0735105D32"
+        "OwnerKey" = "8:_760E32D90A77177EC869F4FA57EC426B"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_FBDF04F54F76DFD670926A0735105D32"
+        "OwnerKey" = "8:_F63EDFC1AC05A488A01BEEA00747590C"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_FBDF04F54F76DFD670926A0735105D32"
+        "OwnerKey" = "8:_2E4AD81B95634102D9E2956818695BD0"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_FBDF04F54F76DFD670926A0735105D32"
+        "OwnerKey" = "8:_0325C2EAEA4662AFCDCD5A66EE49BF33"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_FBDF04F54F76DFD670926A0735105D32"
+        "OwnerKey" = "8:_2E3CBBD551B1153BE56AA077F4BFEC74"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_1232B5776CD3425D823B7A1DD84D3FC2"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_9469A27C01CB972ED17B3BDFF6FDF29C"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_0D9EAA2B82D12966F5FB2C607803288D"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_15FC9C7A00D49AABBC29698ADFD07530"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_44E33405E1C124E1431C9578BB5F75F7"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_56F7FE6028CB9F4B448491AB82DF33B4"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_F767F288C98E01D5BDF20D9C92047E7A"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_7D1E9A597A363401A81F5353C977E8CD"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_F65D7169D1990D4824EF7C186CA6DDEA"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_B1479DFC9B29BB1149C5B6827261E5FD"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_BBF64723E871BC176CCFF39566A975D3"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_F93E40D6D2218EF99E65785D9617898E"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_71E38754F11B51C5F7EE428201511BD0"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_F63EDFC1AC05A488A01BEEA00747590C"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_760E32D90A77177EC869F4FA57EC426B"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_2A1A1E6466B6C307AC252693A05BE548"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_2FA2775FB767FBF8F47D33F9A6A9F5AA"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_2B9479CB248C01C06589C2E0F70028EC"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_3C20F84E998CB7AE85D6B620348A2051"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_2E4AD81B95634102D9E2956818695BD0"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_EEB92B2D0AE83C0C0859C4FE67F4CD83"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_7172BA0BBBA89172675493D2AF871D53"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_0325C2EAEA4662AFCDCD5A66EE49BF33"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_2E3CBBD551B1153BE56AA077F4BFEC74"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_C2EF36DBEB0C632A85DD2E0324DF4127"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_B54777D4686F46444371771E5C6D7A41"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_10292ABD5B3F80198C423DEA8A9BFBC6"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_FBDF04F54F76DFD670926A0735105D32"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_B96829633675105AE7773BB595F6453B"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_0D9BF066E5289CBD311D25824CDA11FB"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_94D6AC406515E84FC75F78076B2040A1"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_73B1F7B98465A32065318D6F75423E17"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_2121D448E4550E5CE433E98193DC2411"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_5580E82132F342EDB889796FAB0DBC31"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+    }
+    "Configurations"
+    {
+        "Debug"
+        {
+        "DisplayName" = "8:Debug"
+        "IsDebugOnly" = "11:TRUE"
+        "IsReleaseOnly" = "11:FALSE"
+        "OutputFilename" = "8:Debug\\MapActionToolbarInstaller.msi"
+        "PackageFilesAs" = "3:2"
+        "PackageFileSize" = "3:-2147483648"
+        "CabType" = "3:1"
+        "Compression" = "3:2"
+        "SignOutput" = "11:FALSE"
+        "CertificateFile" = "8:"
+        "PrivateKeyFile" = "8:"
+        "TimeStampServer" = "8:"
+        "InstallerBootstrapper" = "3:2"
+            "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"
+            {
+            "Enabled" = "11:TRUE"
+            "PromptEnabled" = "11:TRUE"
+            "PrerequisitesLocation" = "2:1"
+            "Url" = "8:"
+            "ComponentsUrl" = "8:"
+                "Items"
+                {
+                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.6.1"
+                    {
+                    "Name" = "8:Microsoft .NET Framework 4.6.1 (x86 and x64)"
+                    "ProductCode" = "8:.NETFramework,Version=v4.6.1"
+                    }
+                }
+            }
+        }
+        "Release"
+        {
+        "DisplayName" = "8:Release"
+        "IsDebugOnly" = "11:FALSE"
+        "IsReleaseOnly" = "11:TRUE"
+        "OutputFilename" = "8:Release\\MapActionToolbarInstaller.msi"
+        "PackageFilesAs" = "3:2"
+        "PackageFileSize" = "3:-2147483648"
+        "CabType" = "3:1"
+        "Compression" = "3:2"
+        "SignOutput" = "11:FALSE"
+        "CertificateFile" = "8:"
+        "PrivateKeyFile" = "8:"
+        "TimeStampServer" = "8:"
+        "InstallerBootstrapper" = "3:2"
+            "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"
+            {
+            "Enabled" = "11:TRUE"
+            "PromptEnabled" = "11:TRUE"
+            "PrerequisitesLocation" = "2:1"
+            "Url" = "8:"
+            "ComponentsUrl" = "8:"
+                "Items"
+                {
+                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.6.1"
+                    {
+                    "Name" = "8:Microsoft .NET Framework 4.6.1 (x86 and x64)"
+                    "ProductCode" = "8:.NETFramework,Version=v4.6.1"
+                    }
+                }
+            }
+        }
+    }
+    "Deployable"
+    {
+        "CustomAction"
+        {
+            "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_3979452427E64F15B927242EBE2009EE"
+            {
+            "Name" = "8:Primary output from MapActionToolbar_COMTools (Active)"
+            "Condition" = "8:"
+            "Object" = "8:_5580E82132F342EDB889796FAB0DBC31"
+            "FileType" = "3:1"
+            "InstallAction" = "3:4"
+            "Arguments" = "8:"
+            "EntryPoint" = "8:"
+            "Sequence" = "3:1"
+            "Identifier" = "8:_DD1BCF34_86B1_4C33_8B36_5A79B93D3E2D"
+            "InstallerClass" = "11:TRUE"
+            "CustomActionData" = "8:"
+            }
+            "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_4B38A2DAC80B4BFA8B0C1C3885F4239E"
+            {
+            "Name" = "8:InvokeESRIRegAsm.dll"
+            "Condition" = "8:"
+            "Object" = "8:_1232B5776CD3425D823B7A1DD84D3FC2"
+            "FileType" = "3:1"
+            "InstallAction" = "3:4"
+            "Arguments" = "8:"
+            "EntryPoint" = "8:"
+            "Sequence" = "3:2"
+            "Identifier" = "8:_9A4996DC_E206_4469_8AAC_C8E63BD64ED6"
+            "InstallerClass" = "11:TRUE"
+            "CustomActionData" = "8:/arg1=\"[ProgramFilesFolder]\\[Manufacturer]\\[ProductName]\\MapActionToolbarExtension.dll\""
+            }
+            "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_7CF5B49204454AEE841CCA010B58C288"
+            {
+            "Name" = "8:InvokeESRIRegAsm.dll"
+            "Condition" = "8:"
+            "Object" = "8:_1232B5776CD3425D823B7A1DD84D3FC2"
+            "FileType" = "3:1"
+            "InstallAction" = "3:1"
+            "Arguments" = "8:"
+            "EntryPoint" = "8:"
+            "Sequence" = "3:2"
+            "Identifier" = "8:_EF425788_00D3_4162_937B_2C5E69E1AADC"
+            "InstallerClass" = "11:TRUE"
+            "CustomActionData" = "8:/arg1=\"[ProgramFilesFolder]\\[Manufacturer]\\[ProductName]\\MapActionToolbarExtension.dll\""
+            }
+            "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_8D460CE881774808A66EEB636444B26E"
+            {
+            "Name" = "8:Primary output from MapActionToolbar_COMTools (Active)"
+            "Condition" = "8:"
+            "Object" = "8:_5580E82132F342EDB889796FAB0DBC31"
+            "FileType" = "3:1"
+            "InstallAction" = "3:1"
+            "Arguments" = "8:"
+            "EntryPoint" = "8:"
+            "Sequence" = "3:1"
+            "Identifier" = "8:_8D6FD4B9_095E_4ED8_BD83_35C9FC96FE65"
+            "InstallerClass" = "11:TRUE"
+            "CustomActionData" = "8:"
+            }
+        }
+        "DefaultFeature"
+        {
+        "Name" = "8:DefaultFeature"
+        "Title" = "8:"
+        "Description" = "8:"
+        }
+        "ExternalPersistence"
+        {
+            "LaunchCondition"
+            {
+                "{A06ECF26-33A3-4562-8140-9B0E340D4F24}:_1D81C91895C64025A91FBC94F41FAE5D"
+                {
+                "Name" = "8:.NET Framework"
+                "Message" = "8:[VSDNETMSG]"
+                "FrameworkVersion" = "8:.NETFramework,Version=v4.5"
+                "AllowLaterVersions" = "11:FALSE"
+                "InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=671728"
+                }
+            }
+        }
+        "File"
+        {
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_0325C2EAEA4662AFCDCD5A66EE49BF33"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:ESRI.ArcGIS.GeoDatabaseDistributed, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_0325C2EAEA4662AFCDCD5A66EE49BF33"
+                    {
+                    "Name" = "8:ESRI.ArcGIS.GeoDatabaseDistributed.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:ESRI.ArcGIS.GeoDatabaseDistributed.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0AAD1C457F70DD82EEEFE895BA4229E4"
+            {
+            "SourcePath" = "8:esriGeoAnalyst.olb"
+            "TargetName" = "8:esriGeoAnalyst.olb"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0C3AFD7D3A6ADB73DA43D7265E100C1C"
+            {
+            "SourcePath" = "8:esriGeoDatabaseUI.olb"
+            "TargetName" = "8:esriGeoDatabaseUI.olb"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0CBA29147EBE5809756219E4CC0A8739"
+            {
+            "SourcePath" = "8:esriGeoDatabaseDistributed.olb"
+            "TargetName" = "8:esriGeoDatabaseDistributed.olb"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_0D9BF066E5289CBD311D25824CDA11FB"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:ESRI.ArcGIS.Geometry, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                }
+            "SourcePath" = "8:ESRI.ArcGIS.Geometry.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_0D9EAA2B82D12966F5FB2C607803288D"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:MapAction, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                }
+            "SourcePath" = "8:MapAction.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_10292ABD5B3F80198C423DEA8A9BFBC6"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:ESRI.ArcGIS.Geodatabase, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                }
+            "SourcePath" = "8:ESRI.ArcGIS.Geodatabase.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1232B5776CD3425D823B7A1DD84D3FC2"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:InvokeESRIRegAsm, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                }
+            "SourcePath" = "8:..\\InvokeESRIRegAsm\\bin\\Release\\InvokeESRIRegAsm.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_15FC9C7A00D49AABBC29698ADFD07530"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                }
+            "SourcePath" = "8:Newtonsoft.Json.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_18760DF6C5002C453A407BA86C2E2146"
+            {
+            "SourcePath" = "8:esriGeoDatabaseExtensions.olb"
+            "TargetName" = "8:esriGeoDatabaseExtensions.olb"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_19D359D31B3DB44CABCBE72F0037E67B"
+            {
+            "SourcePath" = "8:esriCatalogUI.olb"
+            "TargetName" = "8:esriCatalogUI.olb"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1CDF88EEB903F8081BDDBB5CCE6D0F06"
+            {
+            "SourcePath" = "8:esri3DAnalyst.olb"
+            "TargetName" = "8:esri3DAnalyst.olb"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_20655C4886AE82FA2DE1B199D47DAE43"
+            {
+            "SourcePath" = "8:esriServer.olb"
+            "TargetName" = "8:esriServer.olb"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2121D448E4550E5CE433E98193DC2411"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:ESRI.ArcGIS.System, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_2121D448E4550E5CE433E98193DC2411"
+                    {
+                    "Name" = "8:ESRI.ArcGIS.System.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:ESRI.ArcGIS.System.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_24A912D72107856531304BA27657B725"
+            {
+            "SourcePath" = "8:esriArcMap.olb"
+            "TargetName" = "8:esriArcMap.olb"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2A1A1E6466B6C307AC252693A05BE548"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:ESRI.ArcGIS.GeoAnalyst, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                }
+            "SourcePath" = "8:ESRI.ArcGIS.GeoAnalyst.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2B9479CB248C01C06589C2E0F70028EC"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:ESRI.ArcGIS.Animation, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_2B9479CB248C01C06589C2E0F70028EC"
+                    {
+                    "Name" = "8:ESRI.ArcGIS.Animation.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:ESRI.ArcGIS.Animation.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2E3CBBD551B1153BE56AA077F4BFEC74"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:ESRI.ArcGIS.GISClient, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_2E3CBBD551B1153BE56AA077F4BFEC74"
+                    {
+                    "Name" = "8:ESRI.ArcGIS.GISClient.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:ESRI.ArcGIS.GISClient.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2E4AD81B95634102D9E2956818695BD0"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:ESRI.ArcGIS.Carto, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_2E4AD81B95634102D9E2956818695BD0"
+                    {
+                    "Name" = "8:ESRI.ArcGIS.Carto.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:ESRI.ArcGIS.Carto.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2F4050056EB4ACDCC5086FDAE2117D26"
+            {
+            "SourcePath" = "8:esriGeometry.olb"
+            "TargetName" = "8:esriGeometry.olb"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2FA2775FB767FBF8F47D33F9A6A9F5AA"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:ESRI.ArcGIS.3DAnalyst, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_2FA2775FB767FBF8F47D33F9A6A9F5AA"
+                    {
+                    "Name" = "8:ESRI.ArcGIS.3DAnalyst.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:ESRI.ArcGIS.3DAnalyst.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3732172046D041E86357C7826CCAC036"
+            {
+            "SourcePath" = "8:esriDataSourcesRaster.olb"
+            "TargetName" = "8:esriDataSourcesRaster.olb"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_3C20F84E998CB7AE85D6B620348A2051"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:ESRI.ArcGIS.DataSourcesNetCDF, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                }
+            "SourcePath" = "8:ESRI.ArcGIS.DataSourcesNetCDF.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_44E33405E1C124E1431C9578BB5F75F7"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:ESRI.ArcGIS.ArcMap, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_44E33405E1C124E1431C9578BB5F75F7"
+                    {
+                    "Name" = "8:ESRI.ArcGIS.ArcMap.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:ESRI.ArcGIS.ArcMap.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_56F7FE6028CB9F4B448491AB82DF33B4"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:ESRI.ArcGIS.ArcMapUI, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_56F7FE6028CB9F4B448491AB82DF33B4"
+                    {
+                    "Name" = "8:ESRI.ArcGIS.ArcMapUI.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:ESRI.ArcGIS.ArcMapUI.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_57D851B7504CEA0DCDC7312145749E92"
+            {
+            "SourcePath" = "8:esriDataSourcesNetCDF.olb"
+            "TargetName" = "8:esriDataSourcesNetCDF.olb"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5D49F85F449B85F2C5A3F5612ECB4289"
+            {
+            "SourcePath" = "8:esriGISClient.olb"
+            "TargetName" = "8:esriGISClient.olb"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_650333C24A201D893082AE0B23F8F318"
+            {
+            "SourcePath" = "8:esriArcMapUI.olb"
+            "TargetName" = "8:esriArcMapUI.olb"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_69A1A519E93C73555F36D6256693E585"
+            {
+            "SourcePath" = "8:esriSystemUI.olb"
+            "TargetName" = "8:esriSystemUI.olb"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6DB1A24DAD5B7D9D33651756B3016B78"
+            {
+            "SourcePath" = "8:esriCatalog.olb"
+            "TargetName" = "8:esriCatalog.olb"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7172BA0BBBA89172675493D2AF871D53"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:ESRI.ArcGIS.GeoDatabaseExtensions, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_7172BA0BBBA89172675493D2AF871D53"
+                    {
+                    "Name" = "8:ESRI.ArcGIS.GeoDatabaseExtensions.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:ESRI.ArcGIS.GeoDatabaseExtensions.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_71E38754F11B51C5F7EE428201511BD0"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:ESRI.ArcGIS.ADF.Local, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_71E38754F11B51C5F7EE428201511BD0"
+                    {
+                    "Name" = "8:ESRI.ArcGIS.ADF.Local.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:ESRI.ArcGIS.ADF.Local.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_73B1F7B98465A32065318D6F75423E17"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
+                "ScatterAssemblies"
+                {
+                    "_73B1F7B98465A32065318D6F75423E17"
+                    {
+                    "Name" = "8:stdole.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:stdole.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_760E32D90A77177EC869F4FA57EC426B"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:ESRI.ArcGIS.Geoprocessing, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                }
+            "SourcePath" = "8:ESRI.ArcGIS.Geoprocessing.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_798743113BBE566D236D0E9A17BF1A2D"
+            {
+            "SourcePath" = "8:esriGeoprocessing.olb"
+            "TargetName" = "8:esriGeoprocessing.olb"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7D1E9A597A363401A81F5353C977E8CD"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:ESRI.ArcGIS.CartoUI, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_7D1E9A597A363401A81F5353C977E8CD"
+                    {
+                    "Name" = "8:ESRI.ArcGIS.CartoUI.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:ESRI.ArcGIS.CartoUI.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_8156E10A8436791A31F57B31D2E0B8FF"
+            {
+            "SourcePath" = "8:esriGlobeCore.olb"
+            "TargetName" = "8:esriGlobeCore.olb"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_87F7E703767F9CD8F537794DC289DABE"
+            {
+            "SourcePath" = "8:esriGeoDatabase.olb"
+            "TargetName" = "8:esriGeoDatabase.olb"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_8EA16772ED4D45811A911F5F9E669710"
+            {
+            "SourcePath" = "8:esriSystem.olb"
+            "TargetName" = "8:esriSystem.olb"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_91F6448CB9B8C53552EDF0BCC1DA88D6"
+            {
+            "SourcePath" = "8:esriDisplay.olb"
+            "TargetName" = "8:esriDisplay.olb"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_9469A27C01CB972ED17B3BDFF6FDF29C"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:MapActionToolbars, Version=4.1.7323.17685, Culture=neutral, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                }
+            "SourcePath" = "8:MapActionToolbars.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_94D6AC406515E84FC75F78076B2040A1"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:ESRI.ArcGIS.SystemUI, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_94D6AC406515E84FC75F78076B2040A1"
+                    {
+                    "Name" = "8:ESRI.ArcGIS.SystemUI.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:ESRI.ArcGIS.SystemUI.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9A43BAE26E2E5929845CA449931A0B49"
+            {
+            "SourcePath" = "8:esriOutput.olb"
+            "TargetName" = "8:esriOutput.olb"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A5ED422A5B7CC62FAB57697E67EBAC62"
+            {
+            "SourcePath" = "8:esriDataSourcesFile.olb"
+            "TargetName" = "8:esriDataSourcesFile.olb"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9E9D657ADD959EAF3A6E7B897D6F74B"
+            {
+            "SourcePath" = "8:esriAnimation.olb"
+            "TargetName" = "8:esriAnimation.olb"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B1479DFC9B29BB1149C5B6827261E5FD"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:ESRI.ArcGIS.Search, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_B1479DFC9B29BB1149C5B6827261E5FD"
+                    {
+                    "Name" = "8:ESRI.ArcGIS.Search.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:ESRI.ArcGIS.Search.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B54777D4686F46444371771E5C6D7A41"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:ESRI.ArcGIS.DataSourcesFile, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_B54777D4686F46444371771E5C6D7A41"
+                    {
+                    "Name" = "8:ESRI.ArcGIS.DataSourcesFile.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:ESRI.ArcGIS.DataSourcesFile.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B96829633675105AE7773BB595F6453B"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:ESRI.ArcGIS.Display, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_B96829633675105AE7773BB595F6453B"
+                    {
+                    "Name" = "8:ESRI.ArcGIS.Display.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:ESRI.ArcGIS.Display.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_BBF64723E871BC176CCFF39566A975D3"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:ESRI.ArcGIS.Framework, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_BBF64723E871BC176CCFF39566A975D3"
+                    {
+                    "Name" = "8:ESRI.ArcGIS.Framework.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:ESRI.ArcGIS.Framework.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BE9DBD53546FAA6BC71C2F478B8A2A32"
+            {
+            "SourcePath" = "8:esriSearch.olb"
+            "TargetName" = "8:esriSearch.olb"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C2EF36DBEB0C632A85DD2E0324DF4127"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:ESRI.ArcGIS.DataSourcesRaster, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_C2EF36DBEB0C632A85DD2E0324DF4127"
+                    {
+                    "Name" = "8:ESRI.ArcGIS.DataSourcesRaster.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:ESRI.ArcGIS.DataSourcesRaster.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C37A04D9FBD7B5204BECE2FFAB930E80"
+            {
+            "SourcePath" = "8:esriFramework.olb"
+            "TargetName" = "8:esriFramework.olb"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C39C0B28EAE36023E8934DF5747C2EEF"
+            {
+            "SourcePath" = "8:MapActionToolbar_COMTools.tlb"
+            "TargetName" = "8:MapActionToolbar_COMTools.tlb"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:2"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C511E35B3B66B0070EC233AAC4B72EB0"
+            {
+            "SourcePath" = "8:esriCarto.olb"
+            "TargetName" = "8:esriCarto.olb"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CFEE731A625FED564558C7E9C4667BA6"
+            {
+            "SourcePath" = "8:esriCartoUI.olb"
+            "TargetName" = "8:esriCartoUI.olb"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_EEB92B2D0AE83C0C0859C4FE67F4CD83"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:ESRI.ArcGIS.Output, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_EEB92B2D0AE83C0C0859C4FE67F4CD83"
+                    {
+                    "Name" = "8:ESRI.ArcGIS.Output.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:ESRI.ArcGIS.Output.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F63EDFC1AC05A488A01BEEA00747590C"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:ESRI.ArcGIS.GlobeCore, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_F63EDFC1AC05A488A01BEEA00747590C"
+                    {
+                    "Name" = "8:ESRI.ArcGIS.GlobeCore.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:ESRI.ArcGIS.GlobeCore.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F65D7169D1990D4824EF7C186CA6DDEA"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:ESRI.ArcGIS.CatalogUI, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_F65D7169D1990D4824EF7C186CA6DDEA"
+                    {
+                    "Name" = "8:ESRI.ArcGIS.CatalogUI.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:ESRI.ArcGIS.CatalogUI.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F767F288C98E01D5BDF20D9C92047E7A"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:ESRI.ArcGIS.GeoDatabaseUI, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_F767F288C98E01D5BDF20D9C92047E7A"
+                    {
+                    "Name" = "8:ESRI.ArcGIS.GeoDatabaseUI.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:ESRI.ArcGIS.GeoDatabaseUI.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F93E40D6D2218EF99E65785D9617898E"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:ESRI.ArcGIS.Catalog, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_F93E40D6D2218EF99E65785D9617898E"
+                    {
+                    "Name" = "8:ESRI.ArcGIS.Catalog.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:ESRI.ArcGIS.Catalog.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_FBDF04F54F76DFD670926A0735105D32"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:ESRI.ArcGIS.Server, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_FBDF04F54F76DFD670926A0735105D32"
+                    {
+                    "Name" = "8:ESRI.ArcGIS.Server.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:ESRI.ArcGIS.Server.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+        }
+        "FileType"
+        {
+        }
+        "Folder"
+        {
+            "{1525181F-901A-416C-8A58-119130FE478E}:_6A28C5A684C34F089C43DF02FD8AB4D2"
+            {
+            "Name" = "8:#1916"
+            "AlwaysCreate" = "11:FALSE"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Property" = "8:DesktopFolder"
+                "Folders"
+                {
+                }
+            }
+            "{1525181F-901A-416C-8A58-119130FE478E}:_F2C0CCF6F0DA42528B4ECA58662E187A"
+            {
+            "Name" = "8:#1919"
+            "AlwaysCreate" = "11:FALSE"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Property" = "8:ProgramMenuFolder"
+                "Folders"
+                {
+                }
+            }
+            "{3C67513D-01DD-4637-8A68-80971EB9504F}:_F46744268A8743988F6728EF2DB091CA"
+            {
+            "DefaultLocation" = "8:[ProgramFilesFolder][Manufacturer]\\[ProductName]"
+            "Name" = "8:#1925"
+            "AlwaysCreate" = "11:FALSE"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Property" = "8:TARGETDIR"
+                "Folders"
+                {
+                }
+            }
+        }
+        "LaunchCondition"
+        {
+            "{836E08B8-0285-4809-BA42-01DB6754A45D}:_6FBA8B122DF94BBB874E0980852E6901"
+            {
+            "Name" = "8:ArcGIS Registry Check"
+            "Condition" = "8:ARC106_32=\"10.6\" OR ARC106_64=\"10.6\" OR ARC106_32=\"10.6.1\" OR ARC106_64=\"10.6.1\""
+            "Message" = "8:ArcGIS Desktop 10.6 is required for this version of the MapAction Toolbar"
+            "InstallUrl" = "8:"
+            }
+        }
+        "Locator"
+        {
+            "{CF66B7F7-B7DA-4B08-A67A-233430638C9C}:_457C030EA64E46F1BC77D32A63E77DE5"
+            {
+            "Name" = "8:Search for ArcGIS 10.6 64 bit machine"
+            "Root" = "2:1"
+            "RegKey" = "8:SOFTWARE\\WOW6432Node\\ESRI\\Desktop10.6"
+            "Value" = "8:RealVersion"
+            "Property" = "8:ARC106_64"
+            }
+            "{CF66B7F7-B7DA-4B08-A67A-233430638C9C}:_A28B49EB5BF14C699919929AE354BBE0"
+            {
+            "Name" = "8:Search for ArcGIS 10.6 32 bit machine"
+            "Root" = "2:1"
+            "RegKey" = "8:SOFTWARE\\ESRI\\Desktop10.6"
+            "Value" = "8:RealVersion"
+            "Property" = "8:ARC106_32"
+            }
+        }
+        "MsiBootstrapper"
+        {
+        "LangId" = "3:1033"
+        "RequiresElevation" = "11:FALSE"
+        }
+        "Product"
+        {
+        "Name" = "8:Microsoft Visual Studio"
+        "ProductName" = "8:MapAction Toolbar (Installed Version)"
+        "ProductCode" = "8:{58455CF9-B6B3-4C41-A2ED-FE5D6E155FBD}"
+        "PackageCode" = "8:{3CB775A5-8980-47FE-8130-8081EA6839B1}"
+        "UpgradeCode" = "8:{1A25E7C3-E10F-44D6-B163-71B9626C50F8}"
+        "AspNetVersion" = "8:4.0.30319.0"
+        "RestartWWWService" = "11:FALSE"
+        "RemovePreviousVersions" = "11:TRUE"
+        "DetectNewerInstalledVersion" = "11:TRUE"
+        "InstallAllUsers" = "11:FALSE"
+        "ProductVersion" = "8:1.0.0"
+        "Manufacturer" = "8:MapAction_SDG"
+        "ARPHELPTELEPHONE" = "8:"
+        "ARPHELPLINK" = "8:"
+        "Title" = "8:MapActionToolbarInstaller"
+        "Subject" = "8:"
+        "ARPCONTACT" = "8:MapAction (Harry Gibson)"
+        "Keywords" = "8:"
+        "ARPCOMMENTS" = "8:"
+        "ARPURLINFOABOUT" = "8:"
+        "ARPPRODUCTICON" = "8:"
+        "ARPIconIndex" = "3:0"
+        "SearchPath" = "8:"
+        "UseSystemSearchPath" = "11:TRUE"
+        "TargetPlatform" = "3:0"
+        "PreBuildEvent" = "8:"
+        "PostBuildEvent" = "8:"
+        "RunPostBuildEvent" = "3:0"
+        }
+        "Registry"
+        {
+            "HKLM"
+            {
+                "Keys"
+                {
+                    "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_68CAF170B4F74DF2BD1C71AB809AC4A3"
+                    {
+                    "Name" = "8:Software"
+                    "Condition" = "8:"
+                    "AlwaysCreate" = "11:FALSE"
+                    "DeleteAtUninstall" = "11:FALSE"
+                    "Transitive" = "11:FALSE"
+                        "Keys"
+                        {
+                            "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_29F611E2A67A40D6A1A55778C68742BF"
+                            {
+                            "Name" = "8:[Manufacturer]"
+                            "Condition" = "8:"
+                            "AlwaysCreate" = "11:FALSE"
+                            "DeleteAtUninstall" = "11:FALSE"
+                            "Transitive" = "11:FALSE"
+                                "Keys"
+                                {
+                                }
+                                "Values"
+                                {
+                                }
+                            }
+                        }
+                        "Values"
+                        {
+                        }
+                    }
+                }
+            }
+            "HKCU"
+            {
+                "Keys"
+                {
+                    "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_5AA44FDAC523487193303EFC30C59B93"
+                    {
+                    "Name" = "8:Software"
+                    "Condition" = "8:"
+                    "AlwaysCreate" = "11:FALSE"
+                    "DeleteAtUninstall" = "11:FALSE"
+                    "Transitive" = "11:FALSE"
+                        "Keys"
+                        {
+                            "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_4ACAFF7315424B4BB9448648977B7972"
+                            {
+                            "Name" = "8:[Manufacturer]"
+                            "Condition" = "8:"
+                            "AlwaysCreate" = "11:FALSE"
+                            "DeleteAtUninstall" = "11:FALSE"
+                            "Transitive" = "11:FALSE"
+                                "Keys"
+                                {
+                                }
+                                "Values"
+                                {
+                                }
+                            }
+                        }
+                        "Values"
+                        {
+                        }
+                    }
+                }
+            }
+            "HKCR"
+            {
+                "Keys"
+                {
+                }
+            }
+            "HKU"
+            {
+                "Keys"
+                {
+                }
+            }
+            "HKPU"
+            {
+                "Keys"
+                {
+                }
+            }
+        }
+        "Sequences"
+        {
+        }
+        "Shortcut"
+        {
+        }
+        "UserInterface"
+        {
+            "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_1239CF1031A6494FB04E59630F63DBAE"
+            {
+            "UseDynamicProperties" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "SourcePath" = "8:<VsdDialogDir>\\VsdBasicDialogs.wim"
+            }
+            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_4EBC14525E2E4130B742776C45E3E209"
+            {
+            "Name" = "8:#1901"
+            "Sequence" = "3:1"
+            "Attributes" = "3:2"
+                "Dialogs"
+                {
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_10D06B46BE274BA4BA51FCE53593C0A3"
+                    {
+                    "Sequence" = "3:100"
+                    "DisplayName" = "8:Progress"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdProgressDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                            "ShowProgress"
+                            {
+                            "Name" = "8:ShowProgress"
+                            "DisplayName" = "8:#1009"
+                            "Description" = "8:#1109"
+                            "Type" = "3:5"
+                            "ContextData" = "8:1;True=1;False=0"
+                            "Attributes" = "3:0"
+                            "Setting" = "3:0"
+                            "Value" = "3:1"
+                            "DefaultValue" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                }
+            }
+            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_6FB3BD3E50B047239915F0520151EB5F"
+            {
+            "Name" = "8:#1901"
+            "Sequence" = "3:2"
+            "Attributes" = "3:2"
+                "Dialogs"
+                {
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_5F4B16EA2D1544579D2D917731DBBA4E"
+                    {
+                    "Sequence" = "3:100"
+                    "DisplayName" = "8:Progress"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdAdminProgressDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                            "ShowProgress"
+                            {
+                            "Name" = "8:ShowProgress"
+                            "DisplayName" = "8:#1009"
+                            "Description" = "8:#1109"
+                            "Type" = "3:5"
+                            "ContextData" = "8:1;True=1;False=0"
+                            "Attributes" = "3:0"
+                            "Setting" = "3:0"
+                            "Value" = "3:1"
+                            "DefaultValue" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                }
+            }
+            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_8C9788FAE7504F6CA2A1164D84EA9C47"
+            {
+            "Name" = "8:#1902"
+            "Sequence" = "3:2"
+            "Attributes" = "3:3"
+                "Dialogs"
+                {
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_0116CB3F1041454D80C8434745F301B5"
+                    {
+                    "Sequence" = "3:100"
+                    "DisplayName" = "8:Finished"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdAdminFinishedDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                }
+            }
+            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_BB87965D1E234567889E035FBA38AA03"
+            {
+            "Name" = "8:#1902"
+            "Sequence" = "3:1"
+            "Attributes" = "3:3"
+                "Dialogs"
+                {
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_60B66AD4570F4B93B88C452140C2EDC5"
+                    {
+                    "Sequence" = "3:100"
+                    "DisplayName" = "8:Finished"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdFinishedDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                            "UpdateText"
+                            {
+                            "Name" = "8:UpdateText"
+                            "DisplayName" = "8:#1058"
+                            "Description" = "8:#1158"
+                            "Type" = "3:15"
+                            "ContextData" = "8:"
+                            "Attributes" = "3:0"
+                            "Setting" = "3:1"
+                            "Value" = "8:#1258"
+                            "DefaultValue" = "8:#1258"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                }
+            }
+            "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_C364B23B550F401A9A4DD09318E9AA58"
+            {
+            "UseDynamicProperties" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "SourcePath" = "8:<VsdDialogDir>\\VsdUserInterface.wim"
+            }
+            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_D107E29FF9154FA3B3EE7CEEE3B7859A"
+            {
+            "Name" = "8:#1900"
+            "Sequence" = "3:2"
+            "Attributes" = "3:1"
+                "Dialogs"
+                {
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_56644713AEAC4495B061350AF7708280"
+                    {
+                    "Sequence" = "3:100"
+                    "DisplayName" = "8:Welcome"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdAdminWelcomeDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                            "CopyrightWarning"
+                            {
+                            "Name" = "8:CopyrightWarning"
+                            "DisplayName" = "8:#1002"
+                            "Description" = "8:#1102"
+                            "Type" = "3:3"
+                            "ContextData" = "8:"
+                            "Attributes" = "3:0"
+                            "Setting" = "3:1"
+                            "Value" = "8:#1202"
+                            "DefaultValue" = "8:#1202"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                            "Welcome"
+                            {
+                            "Name" = "8:Welcome"
+                            "DisplayName" = "8:#1003"
+                            "Description" = "8:#1103"
+                            "Type" = "3:3"
+                            "ContextData" = "8:"
+                            "Attributes" = "3:0"
+                            "Setting" = "3:1"
+                            "Value" = "8:#1203"
+                            "DefaultValue" = "8:#1203"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_8907EED28BA4489EA418C08DC11F4A03"
+                    {
+                    "Sequence" = "3:200"
+                    "DisplayName" = "8:Installation Folder"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdAdminFolderDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_A12E57DC3A834AC283BC68D6BB1ACB7E"
+                    {
+                    "Sequence" = "3:300"
+                    "DisplayName" = "8:Confirm Installation"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdAdminConfirmDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                }
+            }
+            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_FFE879A388B041E79BDD4FC214DA7D9C"
+            {
+            "Name" = "8:#1900"
+            "Sequence" = "3:1"
+            "Attributes" = "3:1"
+                "Dialogs"
+                {
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_05BED0F4201147608BDE3A07D8E09166"
+                    {
+                    "Sequence" = "3:200"
+                    "DisplayName" = "8:Installation Folder"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdFolderDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                            "InstallAllUsersVisible"
+                            {
+                            "Name" = "8:InstallAllUsersVisible"
+                            "DisplayName" = "8:#1059"
+                            "Description" = "8:#1159"
+                            "Type" = "3:5"
+                            "ContextData" = "8:1;True=1;False=0"
+                            "Attributes" = "3:0"
+                            "Setting" = "3:0"
+                            "Value" = "3:1"
+                            "DefaultValue" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_08E348ABECEB43A48EFE1D7A69C5432B"
+                    {
+                    "Sequence" = "3:300"
+                    "DisplayName" = "8:Confirm Installation"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdConfirmDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_B0769B63C1EF4041BDC6091FAFC5DE8F"
+                    {
+                    "Sequence" = "3:100"
+                    "DisplayName" = "8:Welcome"
+                    "UseDynamicProperties" = "11:TRUE"
+                    "IsDependency" = "11:FALSE"
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdWelcomeDlg.wid"
+                        "Properties"
+                        {
+                            "BannerBitmap"
+                            {
+                            "Name" = "8:BannerBitmap"
+                            "DisplayName" = "8:#1001"
+                            "Description" = "8:#1101"
+                            "Type" = "3:8"
+                            "ContextData" = "8:Bitmap"
+                            "Attributes" = "3:4"
+                            "Setting" = "3:1"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                            "CopyrightWarning"
+                            {
+                            "Name" = "8:CopyrightWarning"
+                            "DisplayName" = "8:#1002"
+                            "Description" = "8:#1102"
+                            "Type" = "3:3"
+                            "ContextData" = "8:"
+                            "Attributes" = "3:0"
+                            "Setting" = "3:1"
+                            "Value" = "8:#1202"
+                            "DefaultValue" = "8:#1202"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                            "Welcome"
+                            {
+                            "Name" = "8:Welcome"
+                            "DisplayName" = "8:#1003"
+                            "Description" = "8:#1103"
+                            "Type" = "3:3"
+                            "ContextData" = "8:"
+                            "Attributes" = "3:0"
+                            "Setting" = "3:1"
+                            "Value" = "8:#1203"
+                            "DefaultValue" = "8:#1203"
+                            "UsePlugInResources" = "11:TRUE"
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        "MergeModule"
+        {
+        }
+        "ProjectOutput"
+        {
+            "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_5580E82132F342EDB889796FAB0DBC31"
+            {
+            "SourcePath" = "8:..\\MapActionToolbar_COMTools\\obj\\Release\\MapActionToolbar_COMTools.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_F46744268A8743988F6728EF2DB091CA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            "ProjectOutputGroupRegister" = "3:2"
+            "OutputConfiguration" = "8:"
+            "OutputGroupCanonicalName" = "8:Built"
+            "OutputProjectGuid" = "8:{7B617336-DC71-4653-AD35-56DDF5E7062D}"
+            "ShowKeyOutput" = "11:TRUE"
+                "ExcludeFilters"
+                {
+                }
+            }
+        }
+    }
+}
diff --git a/arcgis10_mapping_tools/MapActionToolbars/AboutBox.cs b/arcgis10_mapping_tools/MapActionToolbar_Addin/AboutBox.cs
similarity index 95%
rename from arcgis10_mapping_tools/MapActionToolbars/AboutBox.cs
rename to arcgis10_mapping_tools/MapActionToolbar_Addin/AboutBox.cs
index 7fa7a3dd..02d30660 100644
--- a/arcgis10_mapping_tools/MapActionToolbars/AboutBox.cs
+++ b/arcgis10_mapping_tools/MapActionToolbar_Addin/AboutBox.cs
@@ -1,46 +1,46 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-using System.Windows.Forms;
-using System.Reflection;
-
-
-namespace MapActionToolbars
-{
-    public class ma_addin_about_box : ESRI.ArcGIS.Desktop.AddIns.Button
-    {
-        private string[] m_known_toolnames = {"MapAction_Alpha_ConfigTool_ConfigTool",
-                                                "Alpha_LayoutTool_LayoutTool",
-                                                "Alpha_ExportTool_ExportTool" };
-
-        private string m_thisaddin_desc;
-
-        public ma_addin_about_box()
-        {
-            AssemblyName an;
-            an = Assembly.GetExecutingAssembly().GetName();
-
-            String version_string = an.Version.ToString();
-            DateTime compile_date = new DateTime(2000, 1, 1);
-            compile_date = compile_date.AddDays(an.Version.Build);
-            compile_date = compile_date.AddSeconds(2 * an.Version.Revision);
-
-            m_thisaddin_desc = String.Format("Version {0}\n\n Compiled {1} {2}", version_string, compile_date.ToShortDateString(), compile_date.ToShortTimeString());
-        }
-
-        protected override void OnClick()
-        {
-            showDialog();
-        }
-
-        protected override void OnUpdate()
-        {
-        }
-
-        private void showDialog()
-        {
-            MessageBox.Show(m_thisaddin_desc, "About MapAction toolbox", MessageBoxButtons.OK, MessageBoxIcon.Information);
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+using System.Windows.Forms;
+using System.Reflection;
+
+
+namespace MapActionToolbar_Addin
+{
+    public class ma_addin_about_box : ESRI.ArcGIS.Desktop.AddIns.Button
+    {
+        private string[] m_known_toolnames = {"MapAction_Alpha_ConfigTool_ConfigTool",
+                                                "Alpha_LayoutTool_LayoutTool",
+                                                "Alpha_ExportTool_ExportTool" };
+
+        private string m_thisaddin_desc;
+
+        public ma_addin_about_box()
+        {
+            AssemblyName an;
+            an = Assembly.GetExecutingAssembly().GetName();
+
+            String version_string = an.Version.ToString();
+            DateTime compile_date = new DateTime(2000, 1, 1);
+            compile_date = compile_date.AddDays(an.Version.Build);
+            compile_date = compile_date.AddSeconds(2 * an.Version.Revision);
+
+            m_thisaddin_desc = String.Format("Version {0}\n\n Compiled {1} {2}", version_string, compile_date.ToShortDateString(), compile_date.ToShortTimeString());
+        }
+
+        protected override void OnClick()
+        {
+            showDialog();
+        }
+
+        protected override void OnUpdate()
+        {
+        }
+
+        private void showDialog()
+        {
+            MessageBox.Show(m_thisaddin_desc, "About MapAction toolbox", MessageBoxButtons.OK, MessageBoxIcon.Information);
+        }
+    }
+}
diff --git a/arcgis10_mapping_tools/MapActionToolbars/Config.Designer.cs b/arcgis10_mapping_tools/MapActionToolbar_Addin/Config.Designer.cs
similarity index 86%
rename from arcgis10_mapping_tools/MapActionToolbars/Config.Designer.cs
rename to arcgis10_mapping_tools/MapActionToolbar_Addin/Config.Designer.cs
index 0182ae28..2dd4f7b3 100644
Binary files a/arcgis10_mapping_tools/MapActionToolbars/Config.Designer.cs and b/arcgis10_mapping_tools/MapActionToolbar_Addin/Config.Designer.cs differ
diff --git a/arcgis10_mapping_tools/MapActionToolbar_Addin/Config.esriaddinx b/arcgis10_mapping_tools/MapActionToolbar_Addin/Config.esriaddinx
new file mode 100644
index 00000000..5c270d87
--- /dev/null
+++ b/arcgis10_mapping_tools/MapActionToolbar_Addin/Config.esriaddinx
@@ -0,0 +1,38 @@
+<ESRI.Configuration xmlns="http://schemas.esri.com/Desktop/AddIns" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Name>MapActionToolbar_Addin</Name>
+  <AddInID>{f5db27db-e505-4583-b766-1f8c8af6de27}</AddInID>
+  <Description>An addin toolbar to contain MapAction custom layout and export tools</Description>
+  <Version>1.0</Version>
+  <Image>Images\MapActionToolbar_Addin.png</Image>
+  <Author>Software Development Group</Author>
+  <Company>MapAction</Company>
+  <Date>18/01/2020</Date>
+  <Targets>
+    <Target name="Desktop" version="10.6" />
+  </Targets>
+  <AddIn language="CLR" library="MapActionToolbar_Addin.dll" namespace="MapActionToolbar_Addin">
+    <ArcMap>
+      <Toolbars>
+        <Toolbar id="MapActionToolbars_MapAction" caption="MapAction Toolbar" showInitially="true">
+          <Items>
+            <Button refID="MapActionToolbar_Addin_EventTool" />
+            <Button refID="MapActionToolbar_Addin_LayoutTool" />
+            <Button refID="MapActionToolbar_Addin_ExportTool" />
+            <Button refID="MapActionToolbar_Addin_RenameTool" />
+            <Button refID="MapActionToolbar_Addin_GenerationTool" />
+            <Button refID="MapActionToolbar_Addin_ma_addin_about_box" />
+          </Items>
+        </Toolbar>
+      </Toolbars>
+      <Commands>
+        <Button id="MapActionToolbar_Addin_ma_addin_about_box" class="ma_addin_about_box" message="Add-in command generated by Visual Studio project wizard." caption="About this Addin" tip="Add-in command tooltip." category="MapAction Mapping Tools" image="Images\ma_addin_about_box.png" />
+        <Button id="MapActionToolbar_Addin_EventTool" class="EventTool_Addin" message="Create or edit the event configuration file which is used by the MapAction layout and export tools" caption="Event tool" category="MapAction Mapping Tools" image="Images\ConfigTool.png" />
+        <Button id="MapActionToolbar_Addin_LayoutTool" class="LayoutTool_Addin" message="Improves the speed and accuracy of completing the MapAction map layout elements" caption="Layout Tool" tip="Update layout elements" category="MapAction Mapping Tools" image="Images\LayoutTool.png" />
+        <Button id="MapActionToolbar_Addin_ExportTool" class="ExportTool_Addin" message="Exports the map layout to an image (pdf, jpeg, emf) and creates the map metadata xml ready to be uploaded to the MapAction website" caption="Export Tool" tip="Export layout" category="MapAction Mapping Tools" image="Images\ExportTool.png" />
+        <Button id="MapActionToolbar_Addin_RenameTool" class="RenameTool_Addin" message="Renames files to standard naming convention" caption="Rename Tool" tip="Data Rename Tool" category="MapAction Mapping Tools" image="Images\rename_icon.png" />
+        <Button id="MapActionToolbar_Addin_GenerationTool" class="GenerationTool_Addin" message="Generates a map using a map 'recipe'" caption="Map Generation Tool" tip="Map Generation Tool" category="MapAction Mapping Tools" image="Images\generate_icon.png" />
+
+      </Commands>
+    </ArcMap>
+  </AddIn>
+</ESRI.Configuration>
\ No newline at end of file
diff --git a/arcgis10_mapping_tools/MapActionToolbars/EventTool.cs b/arcgis10_mapping_tools/MapActionToolbar_Addin/EventTool_Addin.cs
similarity index 66%
rename from arcgis10_mapping_tools/MapActionToolbars/EventTool.cs
rename to arcgis10_mapping_tools/MapActionToolbar_Addin/EventTool_Addin.cs
index ac26aaf5..c4a8ba71 100644
--- a/arcgis10_mapping_tools/MapActionToolbars/EventTool.cs
+++ b/arcgis10_mapping_tools/MapActionToolbar_Addin/EventTool_Addin.cs
@@ -3,12 +3,13 @@
 using System.Text;
 using System.IO;
 using System.Windows.Forms;
+using MapActionToolbar_Forms;
 
-namespace MapActionToolbars
+namespace MapActionToolbar_Addin
 {
-    public class EventTool : ESRI.ArcGIS.Desktop.AddIns.Button
+    public class EventTool_Addin : ESRI.ArcGIS.Desktop.AddIns.Button
     {
-        public EventTool()
+        public EventTool_Addin()
         {
         }
 
@@ -22,7 +23,7 @@ protected override void OnClick()
         }
         protected override void OnUpdate()
         {
-            Enabled = MapActionToolbars.ArcMap.Application != null;
+            Enabled = ArcMap.Application != null;
         }
     }
 
diff --git a/arcgis10_mapping_tools/MapActionToolbars/ExportTool.cs b/arcgis10_mapping_tools/MapActionToolbar_Addin/ExportTool_Addin.cs
similarity index 67%
rename from arcgis10_mapping_tools/MapActionToolbars/ExportTool.cs
rename to arcgis10_mapping_tools/MapActionToolbar_Addin/ExportTool_Addin.cs
index b1fd584c..6cda7b1e 100644
--- a/arcgis10_mapping_tools/MapActionToolbars/ExportTool.cs
+++ b/arcgis10_mapping_tools/MapActionToolbar_Addin/ExportTool_Addin.cs
@@ -1,60 +1,54 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-using System.Windows.Forms;
-using ESRI.ArcGIS.ArcMap;
-using ESRI.ArcGIS.ArcMapUI;
-using ESRI.ArcGIS.Carto;
-using ESRI.ArcGIS.Geometry;
-using ESRI.ArcGIS.Desktop;
-using ESRI.ArcGIS.Display;
-using ESRI.ArcGIS.DisplayUI;
-using ESRI.ArcGIS.Framework;
-
-namespace MapActionToolbars
-{
-    public class ExportTool : ESRI.ArcGIS.Desktop.AddIns.Button
-    {
-        public ExportTool()
-        {
-        }
-
-        protected override void OnClick()
-        {
-            //Check if 'Main map' frame exists.  If not show a message box telling the user so. Don't open GUI.
-            //if (!PageLayoutProperties.detectMainMapFrame())
-            string duplicates = "";
-            IMxDocument pMxDoc = ArcMap.Application.Document as IMxDocument;
-            if (!MapAction.PageLayoutProperties.detectMapFrame(pMxDoc, "Main map"))
-            {
-                MessageBox.Show("This tool only works with the MapAction mapping templates.  The 'Main map' map frame could not be detected. Please load a MapAction template and try again.", "Invalid map template",
-                    MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
-            }
-            else if (!MapAction.Utilities.detectEventConfig())
-            {
-                MessageBox.Show("The event configuration file is required for this tool.  It cannot be located.",
-                    "Configuration file required", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-            else if (MapAction.PageLayoutProperties.checkLayoutTextElementsForDuplicates(pMxDoc, "Main map", out duplicates))
-            {
-                MessageBox.Show("Duplicate named elements have been identified in the layout. Please remove duplicate element names \"" + duplicates + "\" before trying again.", "Invalid map template",
-                    MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
-            }
-            else if (MapAction.PageLayoutProperties.detectMapFrame(pMxDoc, "Main map"))
-            {   
-                var dlg = new frmExportMain();
-
-                if (dlg.Text.Length > 0)
-                {
-                    dlg.ShowDialog();
-                }
-            }    
-        }
-
-        protected override void OnUpdate()
-        {
-            Enabled = ArcMap.Application != null;
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+using System.Windows.Forms;
+using ESRI.ArcGIS.ArcMapUI;
+using MapActionToolbar_Forms;
+
+namespace MapActionToolbar_Addin
+{
+    public class ExportTool_Addin : ESRI.ArcGIS.Desktop.AddIns.Button
+    {
+        public ExportTool_Addin()
+        {
+        }
+
+        protected override void OnClick()
+        {
+            //Check if 'Main map' frame exists.  If not show a message box telling the user so. Don't open GUI.
+            //if (!PageLayoutProperties.detectMainMapFrame())
+            string duplicates = "";
+            IMxDocument pMxDoc = ArcMap.Application.Document as IMxDocument;
+            if (!MapActionToolbar_Core.PageLayoutProperties.detectMapFrame(pMxDoc, "Main map"))
+            {
+                MessageBox.Show("This tool only works with the MapAction mapping templates.  The 'Main map' map frame could not be detected. Please load a MapAction template and try again.", "Invalid map template",
+                    MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+            }
+            else if (!MapActionToolbar_Core.Utilities.detectEventConfig())
+            {
+                MessageBox.Show("The event configuration file is required for this tool.  It cannot be located.",
+                    "Configuration file required", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+            else if (MapActionToolbar_Core.PageLayoutProperties.checkLayoutTextElementsForDuplicates(pMxDoc, "Main map", out duplicates))
+            {
+                MessageBox.Show("Duplicate named elements have been identified in the layout. Please remove duplicate element names \"" + duplicates + "\" before trying again.", "Invalid map template",
+                    MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+            }
+            else if (MapActionToolbar_Core.PageLayoutProperties.detectMapFrame(pMxDoc, "Main map"))
+            {   
+                var dlg = new frmExportMain(ArcMap.Application);
+
+                if (dlg.Text.Length > 0)
+                {
+                    dlg.ShowDialog();
+                }
+            }    
+        }
+
+        protected override void OnUpdate()
+        {
+            Enabled = ArcMap.Application != null;
+        }
+    }
+}
diff --git a/arcgis10_mapping_tools/MapActionToolbars/GenerationTool.cs b/arcgis10_mapping_tools/MapActionToolbar_Addin/GenerationTool_Addin.cs
similarity index 70%
rename from arcgis10_mapping_tools/MapActionToolbars/GenerationTool.cs
rename to arcgis10_mapping_tools/MapActionToolbar_Addin/GenerationTool_Addin.cs
index f2309618..ec8b45fb 100644
--- a/arcgis10_mapping_tools/MapActionToolbars/GenerationTool.cs
+++ b/arcgis10_mapping_tools/MapActionToolbar_Addin/GenerationTool_Addin.cs
@@ -3,20 +3,16 @@
 using System.Text;
 using System.IO;
 using System.Windows.Forms;
-using ESRI.ArcGIS.ArcMap;
 using ESRI.ArcGIS.ArcMapUI;
-using ESRI.ArcGIS.Carto;
-using ESRI.ArcGIS.Geometry;
 using ESRI.ArcGIS.Desktop;
-using ESRI.ArcGIS.Display;
-using ESRI.ArcGIS.DisplayUI;
 using ESRI.ArcGIS.Framework;
+using MapActionToolbar_Forms;
 
-namespace MapActionToolbars
+namespace MapActionToolbar_Addin
 {
-    public class GenerationTool : ESRI.ArcGIS.Desktop.AddIns.Button
+    public class GenerationTool_Addin : ESRI.ArcGIS.Desktop.AddIns.Button
     {
-        public GenerationTool()
+        public GenerationTool_Addin()
         {
         }
 
@@ -25,24 +21,24 @@ protected override void OnClick()
             //Check if 'Main map' frame exists.  If not show a message box telling the user so. Don't open GUI.
             string duplicates = "";
             IMxDocument pMxDoc = ArcMap.Application.Document as IMxDocument;
-            if (!MapAction.PageLayoutProperties.detectMapFrame(pMxDoc, "Main map"))
+            if (!MapActionToolbar_Core.PageLayoutProperties.detectMapFrame(pMxDoc, "Main map"))
             {
                 MessageBox.Show("This tool only works with the MapAction mapping templates.  The 'Main map' map frame could not be detected. Please load a MapAction template and try again.", "Invalid map template",
                     MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
             }
-            else if (!MapAction.Utilities.detectEventConfig())
+            else if (!MapActionToolbar_Core.Utilities.detectEventConfig())
             {
                 MessageBox.Show("The event configuration file is required for this tool.  It cannot be located.",
                     "Configuration file required", MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
-            else if (MapAction.PageLayoutProperties.checkLayoutTextElementsForDuplicates(pMxDoc, "Main map", out duplicates))
+            else if (MapActionToolbar_Core.PageLayoutProperties.checkLayoutTextElementsForDuplicates(pMxDoc, "Main map", out duplicates))
             {
                 MessageBox.Show("Duplicate named elements have been identified in the layout. Please remove duplicate element names \"" + duplicates + "\" before trying again.", "Invalid map template",
                     MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
             }
-            else if (MapAction.PageLayoutProperties.detectMapFrame(pMxDoc, "Main map"))
+            else if (MapActionToolbar_Core.PageLayoutProperties.detectMapFrame(pMxDoc, "Main map"))
             {
-                var dlg = new frmGenerationTool();
+                var dlg = new frmGenerationTool(ArcMap.Application);
 
                 if (dlg.Text.Length > 0)
                 {
diff --git a/arcgis10_mapping_tools/MapActionToolbar_Addin/Images/ConfigTool.png b/arcgis10_mapping_tools/MapActionToolbar_Addin/Images/ConfigTool.png
new file mode 100644
index 00000000..86b5ac44
Binary files /dev/null and b/arcgis10_mapping_tools/MapActionToolbar_Addin/Images/ConfigTool.png differ
diff --git a/arcgis10_mapping_tools/MapActionToolbar_Addin/Images/ExportTool.png b/arcgis10_mapping_tools/MapActionToolbar_Addin/Images/ExportTool.png
new file mode 100644
index 00000000..b91d51c6
Binary files /dev/null and b/arcgis10_mapping_tools/MapActionToolbar_Addin/Images/ExportTool.png differ
diff --git a/arcgis10_mapping_tools/MapActionToolbar_Addin/Images/LayoutTool.png b/arcgis10_mapping_tools/MapActionToolbar_Addin/Images/LayoutTool.png
new file mode 100644
index 00000000..3e316a99
Binary files /dev/null and b/arcgis10_mapping_tools/MapActionToolbar_Addin/Images/LayoutTool.png differ
diff --git a/arcgis10_mapping_tools/MapActionToolbar_Addin/Images/MapActionToolbar_Addin.png b/arcgis10_mapping_tools/MapActionToolbar_Addin/Images/MapActionToolbar_Addin.png
new file mode 100644
index 00000000..a51d60df
Binary files /dev/null and b/arcgis10_mapping_tools/MapActionToolbar_Addin/Images/MapActionToolbar_Addin.png differ
diff --git a/arcgis10_mapping_tools/MapActionToolbar_Addin/Images/generate_icon.png b/arcgis10_mapping_tools/MapActionToolbar_Addin/Images/generate_icon.png
new file mode 100644
index 00000000..99f9b04a
Binary files /dev/null and b/arcgis10_mapping_tools/MapActionToolbar_Addin/Images/generate_icon.png differ
diff --git a/arcgis10_mapping_tools/MapActionToolbar_Addin/Images/ma_addin_about_box.png b/arcgis10_mapping_tools/MapActionToolbar_Addin/Images/ma_addin_about_box.png
new file mode 100644
index 00000000..54a10704
Binary files /dev/null and b/arcgis10_mapping_tools/MapActionToolbar_Addin/Images/ma_addin_about_box.png differ
diff --git a/arcgis10_mapping_tools/MapActionToolbar_Addin/Images/rename_icon.png b/arcgis10_mapping_tools/MapActionToolbar_Addin/Images/rename_icon.png
new file mode 100644
index 00000000..ae5dc290
Binary files /dev/null and b/arcgis10_mapping_tools/MapActionToolbar_Addin/Images/rename_icon.png differ
diff --git a/arcgis10_mapping_tools/MapActionToolbars/LayoutTool.cs b/arcgis10_mapping_tools/MapActionToolbar_Addin/LayoutTool_Addin.cs
similarity index 70%
rename from arcgis10_mapping_tools/MapActionToolbars/LayoutTool.cs
rename to arcgis10_mapping_tools/MapActionToolbar_Addin/LayoutTool_Addin.cs
index fe1a61ff..8b410b86 100644
--- a/arcgis10_mapping_tools/MapActionToolbars/LayoutTool.cs
+++ b/arcgis10_mapping_tools/MapActionToolbar_Addin/LayoutTool_Addin.cs
@@ -1,53 +1,54 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-using System.Windows.Forms;
-using ESRI.ArcGIS.ArcMapUI;
-
-namespace MapActionToolbars
-{
-    public class LayoutTool : ESRI.ArcGIS.Desktop.AddIns.Button
-    {
-        public LayoutTool()
-        {
-        }
-
-        protected override void OnClick()
-        {
-            //Check if 'Main map' frame exists.  If not show a message box telling the user so. Don't open GUI.
-            //Check to see if element name duplicates exist
-            //Check to see if the operational config file exists
-             //Check to see if the config file exists, if not abort and send the user a message
-            string path = MapAction.Utilities.getCrashMoveFolderPath();
-            string filePath = MapAction.Utilities.getEventConfigFilePath();
-            string duplicateString = "";
-            IMxDocument pMxDoc = ArcMap.Application.Document as IMxDocument;
-            if (!MapAction.PageLayoutProperties.detectMapFrame(pMxDoc, "Main map"))
-            {
-                MessageBox.Show("This tool only works with the MapAction mapping templates.  The 'Main map' map frame could not be detected. Please load a MapAction template and try again.", "Invalid map template",
-                    MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
-            }
-            else if (MapAction.PageLayoutProperties.checkLayoutTextElementsForDuplicates(pMxDoc, "Main map", out duplicateString))
-            {
-                MessageBox.Show("Duplicate named elements have been identified in the layout. Please remove duplicate element names \"" + duplicateString + "\" before trying again.", "Invalid map template",
-                    MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
-            }
-            else if (!File.Exists(@filePath))
-            {
-                MessageBox.Show("The operation configuration file is required for this tool.  It cannot be located.",
-                    "Configuration file required", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-            else if (MapAction.PageLayoutProperties.detectMapFrame(pMxDoc, "Main map"))
-            {
-                frmLayoutMain form = new frmLayoutMain();
-                form.ShowDialog();
-            }
-        }
-
-        protected override void OnUpdate()
-        {
-            Enabled = ArcMap.Application != null;
-        }        
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+using System.Windows.Forms;
+using ESRI.ArcGIS.ArcMapUI;
+using MapActionToolbar_Forms;
+
+namespace MapActionToolbar_Addin
+{
+    public class LayoutTool_Addin : ESRI.ArcGIS.Desktop.AddIns.Button
+    {
+        public LayoutTool_Addin()
+        {
+        }
+
+        protected override void OnClick()
+        {
+            //Check if 'Main map' frame exists.  If not show a message box telling the user so. Don't open GUI.
+            //Check to see if element name duplicates exist
+            //Check to see if the operational config file exists
+             //Check to see if the config file exists, if not abort and send the user a message
+            string path = MapActionToolbar_Core.Utilities.getCrashMoveFolderPath();
+            string filePath = MapActionToolbar_Core.Utilities.getEventConfigFilePath();
+            string duplicateString = "";
+            IMxDocument pMxDoc = ArcMap.Application.Document as IMxDocument;
+            if (!MapActionToolbar_Core.PageLayoutProperties.detectMapFrame(pMxDoc, "Main map"))
+            {
+                MessageBox.Show("This tool only works with the MapAction mapping templates.  The 'Main map' map frame could not be detected. Please load a MapAction template and try again.", "Invalid map template",
+                    MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+            }
+            else if (MapActionToolbar_Core.PageLayoutProperties.checkLayoutTextElementsForDuplicates(pMxDoc, "Main map", out duplicateString))
+            {
+                MessageBox.Show("Duplicate named elements have been identified in the layout. Please remove duplicate element names \"" + duplicateString + "\" before trying again.", "Invalid map template",
+                    MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+            }
+            else if (!File.Exists(@filePath))
+            {
+                MessageBox.Show("The operation configuration file is required for this tool.  It cannot be located.",
+                    "Configuration file required", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+            else if (MapActionToolbar_Core.PageLayoutProperties.detectMapFrame(pMxDoc, "Main map"))
+            {
+                frmLayoutMain form = new frmLayoutMain(ArcMap.Application);
+                form.ShowDialog();
+            }
+        }
+
+        protected override void OnUpdate()
+        {
+            Enabled = ArcMap.Application != null;
+        }        
+    }
+}
diff --git a/arcgis10_mapping_tools/MapActionToolbar_Addin/MapActionToolbar_Addin.csproj b/arcgis10_mapping_tools/MapActionToolbar_Addin/MapActionToolbar_Addin.csproj
new file mode 100644
index 00000000..c8b776d3
--- /dev/null
+++ b/arcgis10_mapping_tools/MapActionToolbar_Addin/MapActionToolbar_Addin.csproj
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.21022</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{F5DB27DB-E505-4583-B766-1F8C8AF6DE27}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>MapActionToolbar_Addin</RootNamespace>
+    <AssemblyName>MapActionToolbar_Addin</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="ESRI.ArcGIS.Carto, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="ESRI.ArcGIS.Desktop.AddIns">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="ESRI.ArcGIS.Editor, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="ESRI.ArcGIS.Framework">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="ESRI.ArcGIS.System">
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AboutBox.cs" />
+    <Compile Include="Config.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Config.esriaddinx</DependentUpon>
+    </Compile>
+    <Compile Include="EventTool_Addin.cs" />
+    <Compile Include="ExportTool_Addin.cs" />
+    <Compile Include="GenerationTool_Addin.cs" />
+    <Compile Include="LayoutTool_Addin.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="RenameTool_Addin.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <AddInContent Include="Config.esriaddinx">
+      <Generator>ArcGISAddInHostGenerator</Generator>
+      <LastGenOutput>Config.Designer.cs</LastGenOutput>
+    </AddInContent>
+  </ItemGroup>
+  <ItemGroup>
+    <AddInContent Include="Images\MapActionToolbar_Addin.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AddInContent Include="Images\ma_addin_about_box.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="ESRI.ArcGIS.ArcMapUI">
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <AddInContent Include="Images\ConfigTool.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\MapActionToolbars\MapActionToolbar_Forms.csproj">
+      <Project>{5388b0f1-b5e9-45b2-810c-49f019300aca}</Project>
+      <Name>MapActionToolbar_Forms</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\MapAction\MapAction\MapActionToolbar_Core.csproj">
+      <Project>{8b7aba1a-c659-4d80-a2ef-13d953577643}</Project>
+      <Name>MapActionToolbar_Core</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <AddInContent Include="Images\ExportTool.png" />
+    <AddInContent Include="Images\generate_icon.png" />
+    <AddInContent Include="Images\LayoutTool.png" />
+    <AddInContent Include="Images\rename_icon.png" />
+  </ItemGroup>
+  <PropertyGroup>
+    <ZipFileExtension>esriAddIn</ZipFileExtension>
+    <AddInTargetProduct>Desktop</AddInTargetProduct>
+    <AddInTargetVersion>10.6</AddInTargetVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\ESRI\ESRI.ArcGIS.AddIns.targets" Condition="Exists('$(MSBuildExtensionsPath)\ESRI\ESRI.ArcGIS.AddIns.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.
+  <Target Name="BeforeBuild">
+  </Target>
+  -->
+  <Target Name="AfterBuild">
+    <!-- Gives build warning when add-in targets file is not found. -->
+    <Warning Text="Unable to create .esriAddin; missing ESRI ArcGIS Add-in SDK component(s)." Condition="!Exists('$(MSBuildExtensionsPath)\ESRI\ESRI.ArcGIS.AddIns.targets')" />
+  </Target>
+  <ProjectExtensions>
+    <!-- Default ESRI add-in properties -->
+    <ESRIAddInProperties>
+      <Host>ArcMap</Host>
+    </ESRIAddInProperties>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file
diff --git a/arcgis10_mapping_tools/MapActionToolbar_Addin/Properties/AssemblyInfo.cs b/arcgis10_mapping_tools/MapActionToolbar_Addin/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..f5a9f013
--- /dev/null
+++ b/arcgis10_mapping_tools/MapActionToolbar_Addin/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("MapActionToolbar_Addin")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("MapActionToolbar_Addin")]
+[assembly: AssemblyCopyright("Copyright ©  2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("f5db27db-e505-4583-b766-1f8c8af6de27")]
+
+// 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("5.1.*")]
+//[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/arcgis10_mapping_tools/MapActionToolbars/RenameTool.cs b/arcgis10_mapping_tools/MapActionToolbar_Addin/RenameTool_Addin.cs
similarity index 57%
rename from arcgis10_mapping_tools/MapActionToolbars/RenameTool.cs
rename to arcgis10_mapping_tools/MapActionToolbar_Addin/RenameTool_Addin.cs
index e1fc9d0c..52748619 100644
--- a/arcgis10_mapping_tools/MapActionToolbars/RenameTool.cs
+++ b/arcgis10_mapping_tools/MapActionToolbar_Addin/RenameTool_Addin.cs
@@ -3,20 +3,13 @@
 using System.Text;
 using System.IO;
 using System.Windows.Forms;
-using ESRI.ArcGIS.ArcMap;
-using ESRI.ArcGIS.ArcMapUI;
-using ESRI.ArcGIS.Carto;
-using ESRI.ArcGIS.Geometry;
-using ESRI.ArcGIS.Desktop;
-using ESRI.ArcGIS.Display;
-using ESRI.ArcGIS.DisplayUI;
-using ESRI.ArcGIS.Framework;
+using MapActionToolbar_Forms;
 
-namespace MapActionToolbars
+namespace MapActionToolbar_Addin
 {
-    public class RenameTool : ESRI.ArcGIS.Desktop.AddIns.Button
+    public class RenameTool_Addin : ESRI.ArcGIS.Desktop.AddIns.Button
     {
-        public RenameTool()
+        public RenameTool_Addin()
         {
         }
 
diff --git a/arcgis10_mapping_tools/MapActionToolbar_COMTools/AboutBox_COM.cs b/arcgis10_mapping_tools/MapActionToolbar_COMTools/AboutBox_COM.cs
new file mode 100644
index 00000000..d64caff4
--- /dev/null
+++ b/arcgis10_mapping_tools/MapActionToolbar_COMTools/AboutBox_COM.cs
@@ -0,0 +1,146 @@
+using System;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using ESRI.ArcGIS.ADF.BaseClasses;
+using ESRI.ArcGIS.ADF.CATIDs;
+using ESRI.ArcGIS.Framework;
+using ESRI.ArcGIS.ArcMapUI;
+using System.Reflection;
+using System.Windows.Forms;
+
+namespace MapActionToolbar_COMTools
+{
+    /// <summary>
+    /// Summary description for AboutBox_Wrapper.
+    /// </summary>
+    [Guid("0e75c31f-334d-4e98-a351-ba2e9d89d0b9")]
+    [ClassInterface(ClassInterfaceType.None)]
+    [ProgId("MapActionToolbar_COMTools.AboutBox_COM")]
+    public sealed class AboutBox_COM : BaseCommand
+    {
+        #region COM Registration Function(s)
+        [ComRegisterFunction()]
+        [ComVisible(false)]
+        static void RegisterFunction(Type registerType)
+        {
+            // Required for ArcGIS Component Category Registrar support
+            ArcGISCategoryRegistration(registerType);
+
+            //
+            // TODO: Add any COM registration code here
+            //
+        }
+
+        [ComUnregisterFunction()]
+        [ComVisible(false)]
+        static void UnregisterFunction(Type registerType)
+        {
+            // Required for ArcGIS Component Category Registrar support
+            ArcGISCategoryUnregistration(registerType);
+
+            //
+            // TODO: Add any COM unregistration code here
+            //
+        }
+
+        #region ArcGIS Component Category Registrar generated code
+        /// <summary>
+        /// Required method for ArcGIS Component Category registration -
+        /// Do not modify the contents of this method with the code editor.
+        /// </summary>
+        private static void ArcGISCategoryRegistration(Type registerType)
+        {
+            string regKey = string.Format("HKEY_CLASSES_ROOT\\CLSID\\{{{0}}}", registerType.GUID);
+            MxCommands.Register(regKey);
+
+        }
+        /// <summary>
+        /// Required method for ArcGIS Component Category unregistration -
+        /// Do not modify the contents of this method with the code editor.
+        /// </summary>
+        private static void ArcGISCategoryUnregistration(Type registerType)
+        {
+            string regKey = string.Format("HKEY_CLASSES_ROOT\\CLSID\\{{{0}}}", registerType.GUID);
+            MxCommands.Unregister(regKey);
+
+        }
+
+        #endregion
+        #endregion
+
+        private IApplication m_application;
+        private string m_thisCompilation_desc;
+
+        public AboutBox_COM()
+        {
+            //
+            // TODO: Define values for the public properties
+            //
+            base.m_category = "MapAction Mapping Tools (AO)"; //localizable text
+            base.m_caption = "About MapAction Toolbar (installed version)";  //localizable text
+            base.m_message = "About MapAction Toolbar (installed version)";  //localizable text 
+            base.m_toolTip = "Shows the version number of the installed MapAction Tools";  //localizable text 
+            base.m_name = "MapactionMappingTools_About";   //unique id, non-localizable (e.g. "MyCategory_ArcMapCommand")
+
+            try
+            {
+                //
+                // TODO: change bitmap name if necessary
+                //
+                string bitmapResourceName = GetType().Name + ".png";
+                base.m_bitmap = new Bitmap(GetType(), bitmapResourceName);
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Trace.WriteLine(ex.Message, "Invalid Bitmap");
+            }
+        }
+
+        #region Overridden Class Methods
+
+        /// <summary>
+        /// Occurs when this command is created
+        /// </summary>
+        /// <param name="hook">Instance of the application</param>
+        public override void OnCreate(object hook)
+        {
+            if (hook == null)
+                return;
+
+            m_application = hook as IApplication;
+
+            //Disable if it is not ArcMap
+            if (hook is IMxApplication)
+                base.m_enabled = true;
+            else
+                base.m_enabled = false;
+
+            // TODO:  Add other initialization code
+            AssemblyName an;
+            an = Assembly.GetExecutingAssembly().GetName();
+
+            String version_string = an.Version.ToString();
+            DateTime compile_date = new DateTime(2000, 1, 1);
+            compile_date = compile_date.AddDays(an.Version.Build);
+            compile_date = compile_date.AddSeconds(2 * an.Version.Revision);
+
+            m_thisCompilation_desc = String.Format("Version {0}\n\n Compiled {1} {2}", version_string, compile_date.ToShortDateString(), compile_date.ToShortTimeString());
+        }
+
+        /// <summary>
+        /// Occurs when this command is clicked
+        /// </summary>
+        public override void OnClick()
+        {
+            // TODO: Add AboutBox_Wrapper.OnClick implementation
+            showDialog();
+        }
+
+        private void showDialog()
+        {
+            MessageBox.Show(m_thisCompilation_desc, "About MapAction toolbox", MessageBoxButtons.OK, MessageBoxIcon.Information);
+        }
+
+        #endregion
+    }
+}
diff --git a/arcgis10_mapping_tools/MapActionToolbar_COMTools/AboutBox_COM.png b/arcgis10_mapping_tools/MapActionToolbar_COMTools/AboutBox_COM.png
new file mode 100644
index 00000000..b978a2d6
Binary files /dev/null and b/arcgis10_mapping_tools/MapActionToolbar_COMTools/AboutBox_COM.png differ
diff --git a/arcgis10_mapping_tools/MapActionToolbar_COMTools/EventTool_COM.cs b/arcgis10_mapping_tools/MapActionToolbar_COMTools/EventTool_COM.cs
new file mode 100644
index 00000000..a0d0d042
--- /dev/null
+++ b/arcgis10_mapping_tools/MapActionToolbar_COMTools/EventTool_COM.cs
@@ -0,0 +1,127 @@
+using System;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using ESRI.ArcGIS.ADF.BaseClasses;
+using ESRI.ArcGIS.ADF.CATIDs;
+using ESRI.ArcGIS.Framework;
+using ESRI.ArcGIS.ArcMapUI;
+
+namespace MapActionToolbar_COMTools
+{
+    /// <summary>
+    /// /// A COM-visible ArcObjects BaseCommand (button) for ArcMap, calling the existing Event (op-config) Tool form on click.
+    /// </summary>
+    [Guid("6fb20e0f-b837-4034-b633-97aab31216e0")]
+    [ClassInterface(ClassInterfaceType.None)]
+    [ProgId("MapActionToolbar_COMTools.EventTool_COM")]
+    public sealed class EventTool_COM : BaseCommand
+    {
+        #region COM Registration Function(s)
+        [ComRegisterFunction()]
+        [ComVisible(false)]
+        static void RegisterFunction(Type registerType)
+        {
+            // Required for ArcGIS Component Category Registrar support
+            ArcGISCategoryRegistration(registerType);
+
+            //
+            // TODO: Add any COM registration code here
+            //
+        }
+
+        [ComUnregisterFunction()]
+        [ComVisible(false)]
+        static void UnregisterFunction(Type registerType)
+        {
+            // Required for ArcGIS Component Category Registrar support
+            ArcGISCategoryUnregistration(registerType);
+
+            //
+            // TODO: Add any COM unregistration code here
+            //
+        }
+
+        #region ArcGIS Component Category Registrar generated code
+        /// <summary>
+        /// Required method for ArcGIS Component Category registration -
+        /// Do not modify the contents of this method with the code editor.
+        /// </summary>
+        private static void ArcGISCategoryRegistration(Type registerType)
+        {
+            string regKey = string.Format("HKEY_CLASSES_ROOT\\CLSID\\{{{0}}}", registerType.GUID);
+            MxCommands.Register(regKey);
+
+        }
+        /// <summary>
+        /// Required method for ArcGIS Component Category unregistration -
+        /// Do not modify the contents of this method with the code editor.
+        /// </summary>
+        private static void ArcGISCategoryUnregistration(Type registerType)
+        {
+            string regKey = string.Format("HKEY_CLASSES_ROOT\\CLSID\\{{{0}}}", registerType.GUID);
+            MxCommands.Unregister(regKey);
+
+        }
+
+        #endregion
+        #endregion
+
+        private IApplication m_application;
+        public EventTool_COM()
+        {
+            // TODO: Remove (AO) from strings, currently here to distinguish this from addin-generated button
+            base.m_category = "MapAction Mapping Tools (AO)"; //localizable text
+            base.m_caption = "Event Tool (AO)";  //localizable text
+            base.m_message = "Create or edit the event configuration file which is used by the MapAction layour and export tools (AO)";  //localizable text 
+            base.m_toolTip = "Update Event Configuration (AO)";  //localizable text 
+            base.m_name = "MapactionMappingTools_EventTool";   //unique id, non-localizable (e.g. "MyCategory_ArcMapCommand")
+
+            try
+            {
+                // TODO: change bitmap name 
+                string bitmapResourceName = GetType().Name + ".png";
+                base.m_bitmap = new Bitmap(GetType(), bitmapResourceName);
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Trace.WriteLine(ex.Message, "Invalid Bitmap");
+            }
+        }
+
+        #region Overridden Class Methods
+
+        /// <summary>
+        /// Occurs when this command is created
+        /// </summary>
+        /// <param name="hook">Instance of the application</param>
+        public override void OnCreate(object hook)
+        {
+            if (hook == null)
+                return;
+
+            m_application = hook as IApplication;
+
+            //Disable if it is not ArcMap
+            if (hook is IMxApplication)
+                base.m_enabled = true;
+            else
+                base.m_enabled = false;
+
+            // TODO:  Add other initialization code
+        }
+
+        /// <summary>
+        /// Occurs when this command is clicked
+        /// </summary>
+        public override void OnClick()
+        {
+            MapActionToolbar_Forms.frmEvent form = new MapActionToolbar_Forms.frmEvent();
+            if (form.Text.Length > 0)
+            {
+                form.ShowDialog();
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/arcgis10_mapping_tools/MapActionToolbar_COMTools/EventTool_COM.png b/arcgis10_mapping_tools/MapActionToolbar_COMTools/EventTool_COM.png
new file mode 100644
index 00000000..86b5ac44
Binary files /dev/null and b/arcgis10_mapping_tools/MapActionToolbar_COMTools/EventTool_COM.png differ
diff --git a/arcgis10_mapping_tools/MapActionToolbar_COMTools/ExportTool_COM.cs b/arcgis10_mapping_tools/MapActionToolbar_COMTools/ExportTool_COM.cs
new file mode 100644
index 00000000..b18dd62b
--- /dev/null
+++ b/arcgis10_mapping_tools/MapActionToolbar_COMTools/ExportTool_COM.cs
@@ -0,0 +1,152 @@
+using System;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+using ESRI.ArcGIS.ADF.BaseClasses;
+using ESRI.ArcGIS.ADF.CATIDs;
+using ESRI.ArcGIS.Framework;
+using ESRI.ArcGIS.ArcMapUI;
+
+namespace MapActionToolbar_COMTools
+{
+    /// <summary>
+    /// A COM-visible ArcObjects BaseCommand (button) for ArcMap, calling the existing Export Tool form on click.
+    /// </summary>
+    [Guid("d498ed1a-3e7c-49eb-bd5d-aa529ce0fd5c")]
+    [ClassInterface(ClassInterfaceType.None)]
+    [ProgId("MapActionToolbar_COMTools.ExportTool_COM")]
+    public sealed class ExportTool_COM : BaseCommand
+    {
+        #region COM Registration Function(s)
+        [ComRegisterFunction()]
+        [ComVisible(false)]
+        static void RegisterFunction(Type registerType)
+        {
+            // Required for ArcGIS Component Category Registrar support
+            ArcGISCategoryRegistration(registerType);
+
+            //
+            // TODO: Add any COM registration code here
+            //
+        }
+
+        [ComUnregisterFunction()]
+        [ComVisible(false)]
+        static void UnregisterFunction(Type registerType)
+        {
+            // Required for ArcGIS Component Category Registrar support
+            ArcGISCategoryUnregistration(registerType);
+
+            //
+            // TODO: Add any COM unregistration code here
+            //
+        }
+
+        #region ArcGIS Component Category Registrar generated code
+        /// <summary>
+        /// Required method for ArcGIS Component Category registration -
+        /// Do not modify the contents of this method with the code editor.
+        /// </summary>
+        private static void ArcGISCategoryRegistration(Type registerType)
+        {
+            string regKey = string.Format("HKEY_CLASSES_ROOT\\CLSID\\{{{0}}}", registerType.GUID);
+            MxCommands.Register(regKey);
+
+        }
+        /// <summary>
+        /// Required method for ArcGIS Component Category unregistration -
+        /// Do not modify the contents of this method with the code editor.
+        /// </summary>
+        private static void ArcGISCategoryUnregistration(Type registerType)
+        {
+            string regKey = string.Format("HKEY_CLASSES_ROOT\\CLSID\\{{{0}}}", registerType.GUID);
+            MxCommands.Unregister(regKey);
+
+        }
+
+        #endregion
+        #endregion
+
+        private IApplication m_application;
+        public ExportTool_COM()
+        {
+            // TODO: remove (AO) from the strings, this is here to highlight difference between addin and installed version during testing
+            base.m_category = "MapAction Mapping Tools (AO)"; //localizable text
+            base.m_caption = "Export Tool (AO)";  //localizable text
+            base.m_message = "Exports the map layout to an image (pdf, jpeg, emf) and creates the map metadata xml ready to be uploaded to the MapAction website (AO)";  //localizable text 
+            base.m_toolTip = "Export Layout(AO)";  //localizable text 
+            base.m_name = "MapactionMappingTools_ExportTool";   //unique id, non-localizable (e.g. "MyCategory_ArcMapCommand")
+
+
+            try
+            {
+                //
+                // TODO: change bitmap name 
+                string bitmapResourceName = GetType().Name + ".png";
+                base.m_bitmap = new Bitmap(GetType(), bitmapResourceName);
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Trace.WriteLine(ex.Message, "Invalid Bitmap");
+            }
+        }
+
+        #region Overridden Class Methods
+
+        /// <summary>
+        /// Occurs when this command is created
+        /// </summary>
+        /// <param name="hook">Instance of the application</param>
+        public override void OnCreate(object hook)
+        {
+            if (hook == null)
+                return;
+
+            m_application = hook as IApplication;
+
+            //Disable if it is not ArcMap
+            if (hook is IMxApplication)
+                base.m_enabled = true;
+            else
+                base.m_enabled = false;
+
+            // TODO:  Add other initialization code
+        }
+
+        /// <summary>
+        /// Occurs when this command is clicked
+        /// </summary>
+        public override void OnClick()
+        {
+            //Check if 'Main map' frame exists.  If not show a message box telling the user so. Don't open GUI.
+            //if (!PageLayoutProperties.detectMainMapFrame())
+            string duplicates = "";
+            IMxDocument pMxDoc = m_application.Document as IMxDocument;
+            if (!MapActionToolbar_Core.PageLayoutProperties.detectMapFrame(pMxDoc, "Main map"))
+            {
+                MessageBox.Show("This tool only works with the MapAction mapping templates.  The 'Main map' map frame could not be detected. Please load a MapAction template and try again.", "Invalid map template",
+                    MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+            }
+            else if (!MapActionToolbar_Core.Utilities.detectEventConfig())
+            {
+                MessageBox.Show("The event configuration file is required for this tool.  It cannot be located.",
+                    "Configuration file required", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+            else if (MapActionToolbar_Core.PageLayoutProperties.checkLayoutTextElementsForDuplicates(pMxDoc, "Main map", out duplicates))
+            {
+                MessageBox.Show("Duplicate named elements have been identified in the layout. Please remove duplicate element names \"" + duplicates + "\" before trying again.", "Invalid map template",
+                    MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+            }
+            else if (MapActionToolbar_Core.PageLayoutProperties.detectMapFrame(pMxDoc, "Main map"))
+            {
+                var dlg = new MapActionToolbar_Forms.frmExportMain(m_application);
+
+                if (dlg.Text.Length > 0)
+                {
+                    dlg.ShowDialog();
+                }
+            }
+        }
+        #endregion
+    }
+}
diff --git a/arcgis10_mapping_tools/MapActionToolbar_COMTools/ExportTool_COM.png b/arcgis10_mapping_tools/MapActionToolbar_COMTools/ExportTool_COM.png
new file mode 100644
index 00000000..b91d51c6
Binary files /dev/null and b/arcgis10_mapping_tools/MapActionToolbar_COMTools/ExportTool_COM.png differ
diff --git a/arcgis10_mapping_tools/MapActionToolbar_COMTools/GenerationTool_COM.cs b/arcgis10_mapping_tools/MapActionToolbar_COMTools/GenerationTool_COM.cs
new file mode 100644
index 00000000..53fd851b
--- /dev/null
+++ b/arcgis10_mapping_tools/MapActionToolbar_COMTools/GenerationTool_COM.cs
@@ -0,0 +1,154 @@
+using System;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using ESRI.ArcGIS.ADF.BaseClasses;
+using ESRI.ArcGIS.ADF.CATIDs;
+using ESRI.ArcGIS.Framework;
+using ESRI.ArcGIS.ArcMapUI;
+using System.Windows.Forms;
+
+namespace MapActionToolbar_COMTools
+{
+    /// <summary>
+    /// Summary description for GenerationTool_Wrapper.
+    /// </summary>
+    [Guid("f78cc221-3db6-4f77-bfba-42b7eaeeaa27")]
+    [ClassInterface(ClassInterfaceType.None)]
+    [ProgId("MapActionToolbar_COMTools.GenerationTool_COM")]
+    public sealed class GenerationTool_COM : BaseCommand
+    {
+        #region COM Registration Function(s)
+        [ComRegisterFunction()]
+        [ComVisible(false)]
+        static void RegisterFunction(Type registerType)
+        {
+            // Required for ArcGIS Component Category Registrar support
+            ArcGISCategoryRegistration(registerType);
+
+            //
+            // TODO: Add any COM registration code here
+            //
+        }
+
+        [ComUnregisterFunction()]
+        [ComVisible(false)]
+        static void UnregisterFunction(Type registerType)
+        {
+            // Required for ArcGIS Component Category Registrar support
+            ArcGISCategoryUnregistration(registerType);
+
+            //
+            // TODO: Add any COM unregistration code here
+            //
+        }
+
+        #region ArcGIS Component Category Registrar generated code
+        /// <summary>
+        /// Required method for ArcGIS Component Category registration -
+        /// Do not modify the contents of this method with the code editor.
+        /// </summary>
+        private static void ArcGISCategoryRegistration(Type registerType)
+        {
+            string regKey = string.Format("HKEY_CLASSES_ROOT\\CLSID\\{{{0}}}", registerType.GUID);
+            MxCommands.Register(regKey);
+
+        }
+        /// <summary>
+        /// Required method for ArcGIS Component Category unregistration -
+        /// Do not modify the contents of this method with the code editor.
+        /// </summary>
+        private static void ArcGISCategoryUnregistration(Type registerType)
+        {
+            string regKey = string.Format("HKEY_CLASSES_ROOT\\CLSID\\{{{0}}}", registerType.GUID);
+            MxCommands.Unregister(regKey);
+
+        }
+
+        #endregion
+        #endregion
+
+        private IApplication m_application;
+        public GenerationTool_COM()
+        {
+            //
+            // TODO: Define values for the public properties
+            //
+            base.m_category = "MapAction Mapping Tools (AO)"; //localizable text
+            base.m_caption = "Map Generation Tool";  //localizable text
+            base.m_message = "Generates a map using a map 'recipe'";  //localizable text 
+            base.m_toolTip = "Map Generation Tool";  //localizable text 
+            base.m_name = "MapactionMappingTools_GenerationTool";   //unique id, non-localizable (e.g. "MyCategory_ArcMapCommand")
+
+            try
+            {
+                //
+                // TODO: change bitmap name if necessary
+                //
+                string bitmapResourceName = GetType().Name + ".png";
+                base.m_bitmap = new Bitmap(GetType(), bitmapResourceName);
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Trace.WriteLine(ex.Message, "Invalid Bitmap");
+            }
+        }
+
+        #region Overridden Class Methods
+
+        /// <summary>
+        /// Occurs when this command is created
+        /// </summary>
+        /// <param name="hook">Instance of the application</param>
+        public override void OnCreate(object hook)
+        {
+            if (hook == null)
+                return;
+
+            m_application = hook as IApplication;
+
+            //Disable if it is not ArcMap
+            if (hook is IMxApplication)
+                base.m_enabled = true;
+            else
+                base.m_enabled = false;
+
+            // TODO:  Add other initialization code
+        }
+
+        /// <summary>
+        /// Occurs when this command is clicked
+        /// </summary>
+        public override void OnClick()
+        {
+            //Check if 'Main map' frame exists.  If not show a message box telling the user so. Don't open GUI.
+            string duplicates = "";
+            IMxDocument pMxDoc = m_application.Document as IMxDocument;
+            if (!MapActionToolbar_Core.PageLayoutProperties.detectMapFrame(pMxDoc, "Main map"))
+            {
+                MessageBox.Show("This tool only works with the MapAction mapping templates.  The 'Main map' map frame could not be detected. Please load a MapAction template and try again.", "Invalid map template",
+                    MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+            }
+            else if (!MapActionToolbar_Core.Utilities.detectEventConfig())
+            {
+                MessageBox.Show("The event configuration file is required for this tool.  It cannot be located.",
+                    "Configuration file required", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+            else if (MapActionToolbar_Core.PageLayoutProperties.checkLayoutTextElementsForDuplicates(pMxDoc, "Main map", out duplicates))
+            {
+                MessageBox.Show("Duplicate named elements have been identified in the layout. Please remove duplicate element names \"" + duplicates + "\" before trying again.", "Invalid map template",
+                    MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+            }
+            else if (MapActionToolbar_Core.PageLayoutProperties.detectMapFrame(pMxDoc, "Main map"))
+            {
+                var dlg = new MapActionToolbar_Forms.frmGenerationTool(m_application);
+
+                if (dlg.Text.Length > 0)
+                {
+                    dlg.ShowDialog();
+                }
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/arcgis10_mapping_tools/MapActionToolbar_COMTools/GenerationTool_COM.png b/arcgis10_mapping_tools/MapActionToolbar_COMTools/GenerationTool_COM.png
new file mode 100644
index 00000000..99f9b04a
Binary files /dev/null and b/arcgis10_mapping_tools/MapActionToolbar_COMTools/GenerationTool_COM.png differ
diff --git a/arcgis10_mapping_tools/MapActionToolbar_COMTools/LayoutTool_COM.cs b/arcgis10_mapping_tools/MapActionToolbar_COMTools/LayoutTool_COM.cs
new file mode 100644
index 00000000..d0bf8404
--- /dev/null
+++ b/arcgis10_mapping_tools/MapActionToolbar_COMTools/LayoutTool_COM.cs
@@ -0,0 +1,153 @@
+using System;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.IO;
+using System.Windows.Forms;
+using ESRI.ArcGIS.ADF.BaseClasses;
+using ESRI.ArcGIS.ADF.CATIDs;
+using ESRI.ArcGIS.Framework;
+using ESRI.ArcGIS.ArcMapUI;
+
+
+namespace MapActionToolbar_COMTools
+{
+    /// <summary>
+    /// A COM-visible ArcObjects BaseCommand (button) for ArcMap, calling the existing Layout Tool form on click.
+/// </summary>
+    [Guid("c4d98af7-01c0-4264-8ca1-013605c81019")]
+    [ClassInterface(ClassInterfaceType.None)]
+    [ProgId("MapActionToolbar_COMTools.LayoutTool_COM")]
+    public sealed class LayoutTool_COM : BaseCommand
+    {
+        #region COM Registration Function(s)
+        [ComRegisterFunction()]
+        [ComVisible(false)]
+        static void RegisterFunction(Type registerType)
+        {
+            // Required for ArcGIS Component Category Registrar support
+            ArcGISCategoryRegistration(registerType);
+
+            //
+            // TODO: Add any COM registration code here
+            //
+        }
+
+        [ComUnregisterFunction()]
+        [ComVisible(false)]
+        static void UnregisterFunction(Type registerType)
+        {
+            // Required for ArcGIS Component Category Registrar support
+            ArcGISCategoryUnregistration(registerType);
+
+            //
+            // TODO: Add any COM unregistration code here
+            //
+        }
+
+        #region ArcGIS Component Category Registrar generated code
+        /// <summary>
+        /// Required method for ArcGIS Component Category registration -
+        /// Do not modify the contents of this method with the code editor.
+        /// </summary>
+        private static void ArcGISCategoryRegistration(Type registerType)
+        {
+            string regKey = string.Format("HKEY_CLASSES_ROOT\\CLSID\\{{{0}}}", registerType.GUID);
+            MxCommands.Register(regKey);
+
+        }
+        /// <summary>
+        /// Required method for ArcGIS Component Category unregistration -
+        /// Do not modify the contents of this method with the code editor.
+        /// </summary>
+        private static void ArcGISCategoryUnregistration(Type registerType)
+        {
+            string regKey = string.Format("HKEY_CLASSES_ROOT\\CLSID\\{{{0}}}", registerType.GUID);
+            MxCommands.Unregister(regKey);
+
+        }
+
+        #endregion
+        #endregion
+
+        private IApplication m_application;
+        public LayoutTool_COM()
+        {
+            // TODO: Remove "(AO)" from strings, currently here to distinguish from addin-generated button in testing
+            base.m_category = "MapAction Mapping Tools (AO)"; //localizable text
+            base.m_caption = "Layout Tool (AO)";  //localizable text
+            base.m_message = "Improves the speed and accuracy of completing the MapAction map layout elements (AO)";  //localizable text 
+            base.m_toolTip = "Update Layout Elements (AO)";  //localizable text 
+            base.m_name = "MapactionMappingTools_LayoutTool";   //unique id, non-localizable (e.g. "MyCategory_ArcMapCommand")
+
+            try
+            {
+                // TODO: change bitmap name
+                string bitmapResourceName = GetType().Name + ".png";
+                base.m_bitmap = new Bitmap(GetType(), bitmapResourceName);
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Trace.WriteLine(ex.Message, "Invalid Bitmap");
+            }
+        }
+
+        #region Overridden Class Methods
+
+        /// <summary>
+        /// Occurs when this command is created
+        /// </summary>
+        /// <param name="hook">Instance of the application</param>
+        public override void OnCreate(object hook)
+        {
+            if (hook == null)
+                return;
+
+            m_application = hook as IApplication;
+
+            //Disable if it is not ArcMap
+            if (hook is IMxApplication)
+                base.m_enabled = true;
+            else
+                base.m_enabled = false;
+
+            // TODO:  Add other initialization code
+        }
+
+        /// <summary>
+        /// Occurs when this command is clicked
+        /// </summary>
+        public override void OnClick()
+        {
+            //Check if 'Main map' frame exists.  If not show a message box telling the user so. Don't open GUI.
+            //Check to see if element name duplicates exist
+            //Check to see if the operational config file exists
+            //Check to see if the config file exists, if not abort and send the user a message
+            string path = MapActionToolbar_Core.Utilities.getCrashMoveFolderPath();
+            string filePath = MapActionToolbar_Core.Utilities.getEventConfigFilePath();
+            string duplicateString = "";
+            IMxDocument pMxDoc = m_application.Document as IMxDocument;
+            if (!MapActionToolbar_Core.PageLayoutProperties.detectMapFrame(pMxDoc, "Main map"))
+            {
+                MessageBox.Show("This tool only works with the MapAction mapping templates.  The 'Main map' map frame could not be detected. Please load a MapAction template and try again.", "Invalid map template",
+                    MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+            }
+            else if (MapActionToolbar_Core.PageLayoutProperties.checkLayoutTextElementsForDuplicates(pMxDoc, "Main map", out duplicateString))
+            {
+                MessageBox.Show("Duplicate named elements have been identified in the layout. Please remove duplicate element names \"" + duplicateString + "\" before trying again.", "Invalid map template",
+                    MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+            }
+            else if (!File.Exists(@filePath))
+            {
+                MessageBox.Show("The operation configuration file is required for this tool.  It cannot be located.",
+                    "Configuration file required", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+            else if (MapActionToolbar_Core.PageLayoutProperties.detectMapFrame(pMxDoc, "Main map"))
+            {
+                MapActionToolbar_Forms.frmLayoutMain form = new MapActionToolbar_Forms.frmLayoutMain(m_application);
+                form.ShowDialog();
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/arcgis10_mapping_tools/MapActionToolbar_COMTools/LayoutTool_COM.png b/arcgis10_mapping_tools/MapActionToolbar_COMTools/LayoutTool_COM.png
new file mode 100644
index 00000000..3e316a99
Binary files /dev/null and b/arcgis10_mapping_tools/MapActionToolbar_COMTools/LayoutTool_COM.png differ
diff --git a/arcgis10_mapping_tools/MapActionToolbar_COMTools/MapActionToolbarExtension_Toolbar.cs b/arcgis10_mapping_tools/MapActionToolbar_COMTools/MapActionToolbarExtension_Toolbar.cs
new file mode 100644
index 00000000..14959aaa
--- /dev/null
+++ b/arcgis10_mapping_tools/MapActionToolbar_COMTools/MapActionToolbarExtension_Toolbar.cs
@@ -0,0 +1,105 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Runtime.InteropServices;
+using ESRI.ArcGIS.ADF.CATIDs;
+using ESRI.ArcGIS.ADF.BaseClasses;
+
+namespace MapActionToolbar_COMTools
+{
+    /// <summary>
+    /// Summary description for MapActionToolbarExtension_Toolbar.
+    /// </summary>
+    [Guid("cce9ef42-818e-4a90-8d81-e36e0d970a2a")]
+    [ClassInterface(ClassInterfaceType.None)]
+    [ProgId("MapActionToolbar_COMTools.MapActionToolbar_COM")]
+    public sealed class MapActionToolbar_COM : BaseToolbar
+    {
+        #region COM Registration Function(s)
+        [ComRegisterFunction()]
+        [ComVisible(false)]
+        static void RegisterFunction(Type registerType)
+        {
+            // Required for ArcGIS Component Category Registrar support
+            ArcGISCategoryRegistration(registerType);
+
+            //
+            // TODO: Add any COM registration code here
+            //
+        }
+
+        [ComUnregisterFunction()]
+        [ComVisible(false)]
+        static void UnregisterFunction(Type registerType)
+        {
+            // Required for ArcGIS Component Category Registrar support
+            ArcGISCategoryUnregistration(registerType);
+
+            //
+            // TODO: Add any COM unregistration code here
+            //
+        }
+
+        #region ArcGIS Component Category Registrar generated code
+        /// <summary>
+        /// Required method for ArcGIS Component Category registration -
+        /// Do not modify the contents of this method with the code editor.
+        /// </summary>
+        private static void ArcGISCategoryRegistration(Type registerType)
+        {
+            string regKey = string.Format("HKEY_CLASSES_ROOT\\CLSID\\{{{0}}}", registerType.GUID);
+            MxCommandBars.Register(regKey);
+        }
+        /// <summary>
+        /// Required method for ArcGIS Component Category unregistration -
+        /// Do not modify the contents of this method with the code editor.
+        /// </summary>
+        private static void ArcGISCategoryUnregistration(Type registerType)
+        {
+            string regKey = string.Format("HKEY_CLASSES_ROOT\\CLSID\\{{{0}}}", registerType.GUID);
+            MxCommandBars.Unregister(regKey);
+        }
+
+        #endregion
+        #endregion
+
+        public MapActionToolbar_COM()
+        {
+            //
+            // TODO: Define your toolbar here by adding items
+            //
+            //AddItem("esriArcMapUI.ZoomInTool");
+            //BeginGroup(); //Separator
+            //AddItem("{FBF8C3FB-0480-11D2-8D21-080009EE4E51}", 1); //undo command
+            //AddItem(new Guid("FBF8C3FB-0480-11D2-8D21-080009EE4E51"), 2); //redo command
+            AddItem("MapActionToolbar_COMTools.EventTool_COM");
+            BeginGroup();
+            AddItem("MapActionToolbar_COMTools.LayoutTool_COM");
+            BeginGroup();
+            AddItem("MapActionToolbar_COMTools.ExportTool_COM");
+            BeginGroup();
+            AddItem("MapActionToolbar_COMTools.GenerationTool_COM");
+            BeginGroup();
+            AddItem("MapActionToolbar_COMTools.RenameTool_COM");
+            BeginGroup();
+            AddItem("MapActionToolbar_COMTools.AboutBox_COM");
+        }
+
+        public override string Caption
+        {
+            get
+            {
+                //TODO: Replace bar caption
+                return "MapAction Toolbar (COM)";
+            }
+        }
+        public override string Name
+        {
+            get
+            {
+                //TODO: Replace bar ID
+                return "MapActionToolbar_COM";
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/arcgis10_mapping_tools/MapActionToolbar_COMTools/MapActionToolbar_COMTools.csproj b/arcgis10_mapping_tools/MapActionToolbar_COMTools/MapActionToolbar_COMTools.csproj
new file mode 100644
index 00000000..4846679a
--- /dev/null
+++ b/arcgis10_mapping_tools/MapActionToolbar_COMTools/MapActionToolbar_COMTools.csproj
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{7B617336-DC71-4653-AD35-56DDF5E7062D}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>MapActionToolbar_COMTools</RootNamespace>
+    <AssemblyName>MapActionToolbar_COMTools</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <RegisterForComInterop>true</RegisterForComInterop>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <RegisterForComInterop>false</RegisterForComInterop>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="ESRI.ArcGIS.ADF.Local, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="ESRI.ArcGIS.ArcMap, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="ESRI.ArcGIS.ArcMapUI, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="ESRI.ArcGIS.Carto, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="ESRI.ArcGIS.Framework, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="ESRI.ArcGIS.System, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="ESRI.ArcGIS.SystemUI, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration.Install" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Management" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AboutBox_COM.cs" />
+    <Compile Include="EventTool_COM.cs" />
+    <Compile Include="ExportTool_COM.cs" />
+    <Compile Include="GenerationTool_COM.cs" />
+    <Compile Include="LayoutTool_COM.cs" />
+    <Compile Include="MapActionToolbarExtension_Toolbar.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="RenameTool_COM.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\MapActionToolbars\MapActionToolbar_Forms.csproj">
+      <Project>{5388b0f1-b5e9-45b2-810c-49f019300aca}</Project>
+      <Name>MapActionToolbar_Forms</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\MapAction\MapAction\MapActionToolbar_Core.csproj">
+      <Project>{8b7aba1a-c659-4d80-a2ef-13d953577643}</Project>
+      <Name>MapActionToolbar_Core</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="AboutBox_COM.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="EventTool_COM.png" />
+    <EmbeddedResource Include="ExportTool_COM.png" />
+    <EmbeddedResource Include="GenerationTool_COM.png" />
+    <EmbeddedResource Include="LayoutTool_COM.png" />
+    <EmbeddedResource Include="RenameTool_COM.png" />
+  </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.
+  -->
+  <Target Name="BeforeClean" Condition="'$(RegisterForComInterop)' == 'true'">
+    <Exec WorkingDirectory="$(CommonProgramFiles)\ArcGIS\bin" Command="esriRegasm.exe &quot;$(TargetPath)&quot; /p:Desktop /u /s" Condition="Exists('$(TargetPath)')" />
+  </Target>
+  <Target Name="AfterBuild" Condition="'$(RegisterForComInterop)' == 'true'">
+    <Exec WorkingDirectory="$(CommonProgramFiles)\ArcGIS\bin" Command="esriRegasm.exe &quot;$(TargetPath)&quot; /p:Desktop /s" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/arcgis10_mapping_tools/MapActionToolbar_COMTools/Properties/AssemblyInfo.cs b/arcgis10_mapping_tools/MapActionToolbar_COMTools/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..8b9e58cc
--- /dev/null
+++ b/arcgis10_mapping_tools/MapActionToolbar_COMTools/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("MapActionToolbar_COMTools")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("MapActionToolbar_COMTools")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(true)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("7b617336-dc71-4653-ad35-56ddf5e7062d")]
+
+// 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 Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("5.1.*")]
+//[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/arcgis10_mapping_tools/MapActionToolbar_COMTools/RenameTool_COM.cs b/arcgis10_mapping_tools/MapActionToolbar_COMTools/RenameTool_COM.cs
new file mode 100644
index 00000000..6f323fb1
--- /dev/null
+++ b/arcgis10_mapping_tools/MapActionToolbar_COMTools/RenameTool_COM.cs
@@ -0,0 +1,131 @@
+using System;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using ESRI.ArcGIS.ADF.BaseClasses;
+using ESRI.ArcGIS.ADF.CATIDs;
+using ESRI.ArcGIS.Framework;
+using ESRI.ArcGIS.ArcMapUI;
+
+namespace MapActionToolbar_COMTools
+{
+    /// <summary>
+    /// Summary description for RenameTool_Wrapper.
+    /// </summary>
+    [Guid("62782cf1-6134-4f34-8f0b-3f1b8a092ca0")]
+    [ClassInterface(ClassInterfaceType.None)]
+    [ProgId("MapActionToolbar_COMTools.RenameTool_COM")]
+    public sealed class RenameTool_COM : BaseCommand
+    {
+        #region COM Registration Function(s)
+        [ComRegisterFunction()]
+        [ComVisible(false)]
+        static void RegisterFunction(Type registerType)
+        {
+            // Required for ArcGIS Component Category Registrar support
+            ArcGISCategoryRegistration(registerType);
+
+            //
+            // TODO: Add any COM registration code here
+            //
+        }
+
+        [ComUnregisterFunction()]
+        [ComVisible(false)]
+        static void UnregisterFunction(Type registerType)
+        {
+            // Required for ArcGIS Component Category Registrar support
+            ArcGISCategoryUnregistration(registerType);
+
+            //
+            // TODO: Add any COM unregistration code here
+            //
+        }
+
+        #region ArcGIS Component Category Registrar generated code
+        /// <summary>
+        /// Required method for ArcGIS Component Category registration -
+        /// Do not modify the contents of this method with the code editor.
+        /// </summary>
+        private static void ArcGISCategoryRegistration(Type registerType)
+        {
+            string regKey = string.Format("HKEY_CLASSES_ROOT\\CLSID\\{{{0}}}", registerType.GUID);
+            MxCommands.Register(regKey);
+
+        }
+        /// <summary>
+        /// Required method for ArcGIS Component Category unregistration -
+        /// Do not modify the contents of this method with the code editor.
+        /// </summary>
+        private static void ArcGISCategoryUnregistration(Type registerType)
+        {
+            string regKey = string.Format("HKEY_CLASSES_ROOT\\CLSID\\{{{0}}}", registerType.GUID);
+            MxCommands.Unregister(regKey);
+
+        }
+
+        #endregion
+        #endregion
+
+        private IApplication m_application;
+        public RenameTool_COM()
+        {
+            //
+            // TODO: Define values for the public properties
+            //
+            base.m_category = "MapAction Mapping Tools (AO)"; //localizable text
+            base.m_caption = "Rename Tool";  //localizable text
+            base.m_message = "Renames shapefiles to standard naming convention";  //localizable text 
+            base.m_toolTip = "Data Rename Tool";  //localizable text 
+            base.m_name = "MapactionMappingTools_RenameTool";   //unique id, non-localizable (e.g. "MyCategory_ArcMapCommand")
+
+            try
+            {
+                //
+                // TODO: change bitmap name if necessary
+                //
+                string bitmapResourceName = GetType().Name + ".png";
+                base.m_bitmap = new Bitmap(GetType(), bitmapResourceName);
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Trace.WriteLine(ex.Message, "Invalid Bitmap");
+            }
+        }
+
+        #region Overridden Class Methods
+
+        /// <summary>
+        /// Occurs when this command is created
+        /// </summary>
+        /// <param name="hook">Instance of the application</param>
+        public override void OnCreate(object hook)
+        {
+            if (hook == null)
+                return;
+
+            m_application = hook as IApplication;
+
+            //Disable if it is not ArcMap
+            if (hook is IMxApplication)
+                base.m_enabled = true;
+            else
+                base.m_enabled = false;
+
+            // TODO:  Add other initialization code
+        }
+
+        /// <summary>
+        /// Occurs when this command is clicked
+        /// </summary>
+        public override void OnClick()
+        {
+            var dlg = new MapActionToolbar_Forms.frmRenameMain();
+            if (dlg.initialised)
+            {
+                dlg.ShowDialog();
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/arcgis10_mapping_tools/MapActionToolbar_COMTools/RenameTool_COM.png b/arcgis10_mapping_tools/MapActionToolbar_COMTools/RenameTool_COM.png
new file mode 100644
index 00000000..ae5dc290
Binary files /dev/null and b/arcgis10_mapping_tools/MapActionToolbar_COMTools/RenameTool_COM.png differ
diff --git a/arcgis10_mapping_tools/MapActionToolbars/Config.esriaddinx b/arcgis10_mapping_tools/MapActionToolbars/Config.esriaddinx
index c3482880..52695d60 100644
--- a/arcgis10_mapping_tools/MapActionToolbars/Config.esriaddinx
+++ b/arcgis10_mapping_tools/MapActionToolbars/Config.esriaddinx
@@ -1,37 +1,37 @@
-<ESRI.Configuration xmlns="http://schemas.esri.com/Desktop/AddIns" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <Name>MapActionToolbars</Name>
-  <AddInID>{d206869a-5273-4370-a062-c3ecad281c58}</AddInID>
-  <Description>A toolbar to contain MapAction custom tools</Description>
-  <Version>1.0</Version>
-  <Image>Images\MapActionToolbars.png</Image>
-  <Author>Software Development Group</Author>
-  <Company>MapAction</Company>
-  <Date>03/11/2019</Date>
-  <Targets>
-    <Target name="Desktop" version="10.6" />
-  </Targets>
-  <AddIn language="CLR" library="MapActionToolbars.dll" namespace="MapActionToolbars">
-    <ArcMap>
-      <Toolbars>
-        <Toolbar id="MapActionToolbars_MapAction" caption="MapAction Toolbar" showInitially="true">
-          <Items>
-            <Button refID="MapAction_EventTool" />
-            <Button refID="MapAction_LayoutTool" />
-            <Button refID="MapAction_ExportTool" />
-            <Button refID="MapAction_RenameTool" />
-            <!--<Button refID="MapAction_GenerationTool" /> -->
-            <Button refID="MapAction_About_Box" />
-          </Items>
-        </Toolbar>
-      </Toolbars>
-      <Commands>
-        <Button id="MapAction_About_Box" class="ma_addin_about_box" message="Add-in command generated by Visual Studio project wizard." caption="About MapAction Addins" tip="Shows the version number of the MapAction Addins" category="MapAction Mapping Tools" image="Images\ma_logo.png" onDemand="false" />
-        <Button id="MapAction_EventTool" class="EventTool" message="Create or edit the event configuration file which is used by the MapAction layout and export tools" caption="Event tool" category="MapAction Mapping Tools" image="Images\ConfigTool.png" />
-        <Button id="MapAction_LayoutTool" class="LayoutTool" message="Improves the speed and accuracy of completing the MapAction map layout elements" caption="Layout Tool" tip="Update layout elements" category="MapAction Mapping Tools" image="Images\LayoutTool.png" />
-        <Button id="MapAction_ExportTool" class="ExportTool" message="Exports the map layout to an image (pdf, jpeg, emf) and creates the map metadata xml ready to be uploaded to the MapAction website" caption="Export Tool" tip="Export layout" category="MapAction Mapping Tools" image="Images\ExportTool.png" />
-        <Button id="MapAction_RenameTool" class="RenameTool" message="Renames files to standard naming convention" caption="Rename Tool" tip="Data Rename Tool" category="MapAction Mapping Tools" image="Images\rename_icon.png" />
-        <Button id="MapAction_GenerationTool" class="GenerationTool" message="Generates a map using a map 'recipe'" caption="Map Generation Tool" tip="Map Generation Tool" category="MapAction Mapping Tools" image="Images\generate_icon.png" />
-      </Commands>
-    </ArcMap>
-  </AddIn>
+<ESRI.Configuration xmlns="http://schemas.esri.com/Desktop/AddIns" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Name>MapActionToolbars</Name>
+  <AddInID>{d206869a-5273-4370-a062-c3ecad281c58}</AddInID>
+  <Description>A toolbar to contain MapAction custom tools</Description>
+  <Version>1.0</Version>
+  <Image>Images\MapActionToolbars.png</Image>
+  <Author>Software Development Group</Author>
+  <Company>MapAction</Company>
+  <Date>03/11/2019</Date>
+  <Targets>
+    <Target name="Desktop" version="10.6" />
+  </Targets>
+  <AddIn language="CLR" library="MapActionToolbars.dll" namespace="MapActionToolbars">
+    <ArcMap>
+      <Toolbars>
+        <Toolbar id="MapActionToolbars_MapAction" caption="MapAction Toolbar" showInitially="true">
+          <Items>
+            <Button refID="MapAction_EventTool" />
+            <Button refID="MapAction_LayoutTool" />
+            <Button refID="MapAction_ExportTool" />
+            <Button refID="MapAction_RenameTool" />
+            <!--<Button refID="MapAction_GenerationTool" /> -->
+            <Button refID="MapAction_About_Box" />
+          </Items>
+        </Toolbar>
+      </Toolbars>
+      <Commands>
+        <Button id="MapAction_About_Box" class="ma_addin_about_box" message="Add-in command generated by Visual Studio project wizard." caption="About MapAction Addins" tip="Shows the version number of the MapAction Addins" category="MapAction Mapping Tools" image="Images\ma_logo.png" onDemand="false" />
+        <Button id="MapAction_EventTool" class="EventTool" message="Create or edit the event configuration file which is used by the MapAction layout and export tools" caption="Event tool" category="MapAction Mapping Tools" image="Images\ConfigTool.png" />
+        <Button id="MapAction_LayoutTool" class="LayoutTool" message="Improves the speed and accuracy of completing the MapAction map layout elements" caption="Layout Tool" tip="Update layout elements" category="MapAction Mapping Tools" image="Images\LayoutTool.png" />
+        <Button id="MapAction_ExportTool" class="ExportTool" message="Exports the map layout to an image (pdf, jpeg, emf) and creates the map metadata xml ready to be uploaded to the MapAction website" caption="Export Tool" tip="Export layout" category="MapAction Mapping Tools" image="Images\ExportTool.png" />
+        <Button id="MapAction_RenameTool" class="RenameTool" message="Renames files to standard naming convention" caption="Rename Tool" tip="Data Rename Tool" category="MapAction Mapping Tools" image="Images\rename_icon.png" />
+        <Button id="MapAction_GenerationTool" class="GenerationTool" message="Generates a map using a map 'recipe'" caption="Map Generation Tool" tip="Map Generation Tool" category="MapAction Mapping Tools" image="Images\generate_icon.png" />
+      </Commands>
+    </ArcMap>
+  </AddIn>
 </ESRI.Configuration>
\ No newline at end of file
diff --git a/arcgis10_mapping_tools/MapActionToolbars/ConstructLayerName.cs b/arcgis10_mapping_tools/MapActionToolbars/ConstructLayerName.cs
index 5e7b9840..d9ee3948 100644
--- a/arcgis10_mapping_tools/MapActionToolbars/ConstructLayerName.cs
+++ b/arcgis10_mapping_tools/MapActionToolbars/ConstructLayerName.cs
@@ -4,12 +4,12 @@
 using System.Text;
 using System.IO;
 using System.Diagnostics;
-using MapAction;
+using MapActionToolbar_Core;
 using System.Windows.Forms;
 using System.Globalization;
 using Microsoft.VisualBasic.FileIO;
 
-namespace MapActionToolbars
+namespace MapActionToolbar_Forms
 {
     public class ConstructLayerName
     {
@@ -36,7 +36,7 @@ public static string pathToLookupCSV()
             string _path;
 
             // check crash move folder first - if it doesn't exist then look on C drive - PJR 18/08/2016
-            _rawPath = MapAction.Utilities.getCrashMoveFolderPath();
+            _rawPath = MapActionToolbar_Core.Utilities.getCrashMoveFolderPath();
             _path = _rawPath + @"\GIS\2_Active_Data\200_data_name_lookup\";
                         
             if (Directory.Exists(_path))
diff --git a/arcgis10_mapping_tools/MapActionToolbars/Export.cs b/arcgis10_mapping_tools/MapActionToolbars/Export.cs
index 1e7b43aa..bec4a6ff 100644
--- a/arcgis10_mapping_tools/MapActionToolbars/Export.cs
+++ b/arcgis10_mapping_tools/MapActionToolbars/Export.cs
@@ -8,7 +8,7 @@
 using System.IO;
 
 
-namespace MapActionToolbars
+namespace MapActionToolbar_Forms
 {
     class Export
     {
diff --git a/arcgis10_mapping_tools/MapActionToolbars/FormValidationConfig.cs b/arcgis10_mapping_tools/MapActionToolbars/FormValidationConfig.cs
index af98ef91..3fb48cc6 100644
--- a/arcgis10_mapping_tools/MapActionToolbars/FormValidationConfig.cs
+++ b/arcgis10_mapping_tools/MapActionToolbars/FormValidationConfig.cs
@@ -7,7 +7,7 @@
 using System.Drawing;
 using System.Text.RegularExpressions;
 
-namespace MapActionToolbars
+namespace MapActionToolbar_Forms
 {
     public static class FormValidationConfig
     {
diff --git a/arcgis10_mapping_tools/MapActionToolbars/FormValidationExport.cs b/arcgis10_mapping_tools/MapActionToolbars/FormValidationExport.cs
index ca78b14d..87ef577a 100644
--- a/arcgis10_mapping_tools/MapActionToolbars/FormValidationExport.cs
+++ b/arcgis10_mapping_tools/MapActionToolbars/FormValidationExport.cs
@@ -14,13 +14,17 @@
 using ESRI.ArcGIS.DisplayUI;
 using ESRI.ArcGIS.Framework;
 
-namespace MapActionToolbars
+namespace MapActionToolbar_Forms
 {
     public static class FormValidationExport
     {
         private static string targetMapFrame = "Main map";
-        private static IMxDocument _pMxDoc = ArcMap.Application.Document as IMxDocument;
-        
+
+        //private static IMxDocument _pMxDoc = ArcMap.Application.Document as IMxDocument;
+        // No longer suitable as we do not have ArcMap.Application outside of addin framework,
+        // and because this class has been written as static for some reason we do not have a 
+        // constructor in which to initiate a member field passed in from the caller. To be fixed sometime.
+
         //Clear error providers (primarily on form close)
         public static void disposeErrorProvider(ErrorProvider epr)
         {
@@ -45,11 +49,15 @@ private static Boolean validateEmptyField(Control control, ErrorProvider epr)
 
         }
 
-        //Validate individual form elements
-        public static string validateMapTitle(Control control, ErrorProvider eprWarning, ErrorProvider eprError)
+        #region  Validate individual form elements
+        // For running outside of addin framework (as an installable extension) we have to provide the IMxDocument as we 
+        // don't have access to the ArcMap IApplication provided by a framework. This highlights how much of a mess this code 
+        // is with all the static methods meaning that for a quick fix now we are just providing the IMxDocument to every method,
+        // clearly the right answer will be to write a non-static validation class.
+        public static string validateMapTitle(IMxDocument mxDoc, Control control, ErrorProvider eprWarning, ErrorProvider eprError)
         {
             string layoutMapTitle = string.Empty;
-            Dictionary<string, string> dictMapValues = MapAction.PageLayoutProperties.getLayoutTextElements(_pMxDoc, targetMapFrame);
+            Dictionary<string, string> dictMapValues = MapActionToolbar_Core.PageLayoutProperties.getLayoutTextElements(mxDoc, targetMapFrame);
             if (dictMapValues.ContainsKey("title")) { layoutMapTitle = dictMapValues["title"]; }
             
             eprWarning.SetIconPadding(control, 5);
@@ -78,10 +86,10 @@ public static string validateMapTitle(Control control, ErrorProvider eprWarning,
 
         }
 
-        public static string validateMapSummary(Control control, ErrorProvider eprWarning, ErrorProvider eprError)
+        public static string validateMapSummary(IMxDocument mxDoc, Control control, ErrorProvider eprWarning, ErrorProvider eprError)
         {
             string layoutMapSummary = string.Empty;
-            Dictionary<string, string> dictMapValues = MapAction.PageLayoutProperties.getLayoutTextElements(_pMxDoc, targetMapFrame);
+            Dictionary<string, string> dictMapValues = MapActionToolbar_Core.PageLayoutProperties.getLayoutTextElements(mxDoc, targetMapFrame);
             if (dictMapValues.ContainsKey("summary")) { layoutMapSummary = dictMapValues["summary"]; }
 
             eprWarning.SetIconPadding(control, 5);
@@ -110,17 +118,17 @@ public static string validateMapSummary(Control control, ErrorProvider eprWarnin
 
         }
 
-        public static string validateMapDocument(Control control, ErrorProvider eprWarning, ErrorProvider eprError)
+        public static string validateMapDocument(IApplication mxApp, Control control, ErrorProvider eprWarning, ErrorProvider eprError)
         {
 
             eprWarning.SetIconPadding(control, 5);
             eprError.SetIconPadding(control, 5);
             string mapValue = string.Empty;
-            string automatedValue = MapAction.PageLayoutProperties.getMxdTitle(ArcMap.Application);
-
+            string automatedValue = MapActionToolbar_Core.PageLayoutProperties.getMxdTitle(mxApp);
+            IMxDocument mxDoc = mxApp.Document as IMxDocument;
             //Get and set the map value
             var dict = new Dictionary<string, string>();
-            dict = MapAction.PageLayoutProperties.getLayoutTextElements(_pMxDoc, targetMapFrame);
+            dict = MapActionToolbar_Core.PageLayoutProperties.getLayoutTextElements(mxDoc, targetMapFrame);
             //Update form text boxes with values from the map
             if (dict.ContainsKey("title")) {  mapValue = dict["title"]; }
 
@@ -146,13 +154,13 @@ public static string validateMapDocument(Control control, ErrorProvider eprWarni
             }
         }
 
-        public static string validateDatum(Control control, ErrorProvider eprWarning, ErrorProvider eprError)
+        public static string validateDatum(IMxDocument mxDoc, Control control, ErrorProvider eprWarning, ErrorProvider eprError)
         {
             eprWarning.SetIconPadding(control, 5);
             eprError.SetIconPadding(control, 5);
             // Set the spatial reference information on load
             var dictSpatialRef = new Dictionary<string, string>();
-            dictSpatialRef = MapAction.Utilities.getDataFrameSpatialReference(_pMxDoc, targetMapFrame);
+            dictSpatialRef = MapActionToolbar_Core.Utilities.getDataFrameSpatialReference(mxDoc, targetMapFrame);
             string automatedValue = string.Empty;
             if (dictSpatialRef.ContainsKey("datum")) { automatedValue = dictSpatialRef["datum"]; }
 
@@ -179,13 +187,13 @@ public static string validateDatum(Control control, ErrorProvider eprWarning, Er
 
         }
 
-        public static string validateProjection(Control control, ErrorProvider eprWarning, ErrorProvider eprError)
+        public static string validateProjection(IMxDocument mxDoc, Control control, ErrorProvider eprWarning, ErrorProvider eprError)
         {
             eprWarning.SetIconPadding(control, 5);
             eprError.SetIconPadding(control, 5);
             // Set the spatial reference information on load
             var dictSpatialRef = new Dictionary<string, string>();
-            dictSpatialRef = MapAction.Utilities.getDataFrameSpatialReference(_pMxDoc, targetMapFrame);
+            dictSpatialRef = MapActionToolbar_Core.Utilities.getDataFrameSpatialReference(mxDoc, targetMapFrame);
             string automatedValue = string.Empty;
             if (dictSpatialRef.ContainsKey("projection")) { automatedValue = dictSpatialRef["projection"]; }
 
@@ -212,11 +220,11 @@ public static string validateProjection(Control control, ErrorProvider eprWarnin
 
         }
 
-        public static string validateScale(Control control, ErrorProvider eprWarning, ErrorProvider eprError)
+        public static string validateScale(IMxDocument mxDoc, Control control, ErrorProvider eprWarning, ErrorProvider eprError)
         {
             eprWarning.SetIconPadding(control, 5);
             eprError.SetIconPadding(control, 5);
-            string automatedValue = MapAction.Utilities.getScale(_pMxDoc as IMapDocument, targetMapFrame);
+            string automatedValue = MapActionToolbar_Core.Utilities.getScale(mxDoc as IMapDocument, targetMapFrame);
  
             if (validateEmptyField(control, eprWarning))
             {
@@ -301,11 +309,11 @@ public static string validateTime(Control control, ErrorProvider eprWarning, Err
             
         }
 
-        public static string validatePaperSize(Control control, ErrorProvider eprWarning, ErrorProvider eprError)
+        public static string validatePaperSize(IMxDocument mxDoc, Control control, ErrorProvider eprWarning, ErrorProvider eprError)
         {
             eprWarning.SetIconPadding(control, 5);
             eprError.SetIconPadding(control, 5);
-            string automatedValue = MapAction.Utilities.getPageSize(_pMxDoc as IMapDocument, targetMapFrame);
+            string automatedValue = MapActionToolbar_Core.Utilities.getPageSize(mxDoc as IMapDocument, targetMapFrame);
 
             if (validateEmptyField(control, eprWarning))
             {
@@ -343,7 +351,7 @@ public static string validateImageryDate(Control control, ErrorProvider epr)
             }
         }
 
-        public static string validateDataSources(Control control, ErrorProvider eprWarning, ErrorProvider eprError)
+        public static string validateDataSources(IMxDocument mxDoc, Control control, ErrorProvider eprWarning, ErrorProvider eprError)
         {
             eprWarning.SetIconPadding(control, 5);
             eprError.SetIconPadding(control, 5);
@@ -351,7 +359,7 @@ public static string validateDataSources(Control control, ErrorProvider eprWarni
 
             //Get and set the map value
             var dict = new Dictionary<string, string>();
-            dict = MapAction.PageLayoutProperties.getLayoutTextElements(_pMxDoc, targetMapFrame);
+            dict = MapActionToolbar_Core.PageLayoutProperties.getLayoutTextElements(mxDoc, targetMapFrame);
             //Update form text boxes with values from the map
             if (!dict.ContainsKey("data_sources"))
             {
@@ -391,9 +399,9 @@ public static string validateOperationId(Control control, ErrorProvider eprWarni
             eprError.SetIconPadding(control, 5);
             string automatedValue = string.Empty;
             
-            string path = MapAction.Utilities.getCrashMoveFolderPath();
-            string filePath = MapAction.Utilities.getEventConfigFilePath();
-            MapAction.EventConfig config = MapAction.Utilities.getEventConfigValues(filePath);
+            string path = MapActionToolbar_Core.Utilities.getCrashMoveFolderPath();
+            string filePath = MapActionToolbar_Core.Utilities.getEventConfigFilePath();
+            MapActionToolbar_Core.EventConfig config = MapActionToolbar_Core.Utilities.getEventConfigValues(filePath);
             automatedValue = config.OperationId.ToLower();
 
             if (validateEmptyField(control, eprWarning))
@@ -419,7 +427,7 @@ public static string validateOperationId(Control control, ErrorProvider eprWarni
 
         }
 
-        public static string validateGlideNumber(Control control, ErrorProvider eprWarning, ErrorProvider eprError)
+        public static string validateGlideNumber(IMxDocument mxDoc, Control control, ErrorProvider eprWarning, ErrorProvider eprError)
         {
             eprWarning.SetIconPadding(control, 5);
             eprError.SetIconPadding(control, 5);
@@ -428,7 +436,7 @@ public static string validateGlideNumber(Control control, ErrorProvider eprWarni
 
             //Get and set the map value
             var dict = new Dictionary<string, string>();
-            dict = MapAction.PageLayoutProperties.getLayoutTextElements(_pMxDoc, targetMapFrame);
+            dict = MapActionToolbar_Core.PageLayoutProperties.getLayoutTextElements(mxDoc, targetMapFrame);
             //Update form text boxes with values from the map
             if (dict.ContainsKey("glide_no")) {  mapValue = dict["glide_no"]; }
 
@@ -560,6 +568,7 @@ public static string validateLanguage(Control control, ErrorProvider eprWarning,
             // Since using language_config.xml, this will always be valid.
             return "Valid";
         }
+        #endregion
 
         public static void validationCheck(string result, PictureBox pbox)
         {
diff --git a/arcgis10_mapping_tools/MapActionToolbars/FormValidationLayout.cs b/arcgis10_mapping_tools/MapActionToolbars/FormValidationLayout.cs
index d51c74f4..97eed408 100644
--- a/arcgis10_mapping_tools/MapActionToolbars/FormValidationLayout.cs
+++ b/arcgis10_mapping_tools/MapActionToolbars/FormValidationLayout.cs
@@ -5,8 +5,10 @@
 using System.Windows.Forms;
 using System.Drawing;
 using System.Text.RegularExpressions;
+using ESRI.ArcGIS.ArcMapUI;
+using ESRI.ArcGIS.Framework;
 
-namespace MapActionToolbars
+namespace MapActionToolbar_Forms
 {
     public static class FormValidationLayout
     {
@@ -54,12 +56,12 @@ public static void validateDataSources(Control control, ErrorProvider epr)
             validateEmptyField(control, epr);
         }
 
-        public static void validateMapDocument(Control control, ErrorProvider eprWarning, ErrorProvider eprError)
+        public static void validateMapDocument(IMxApplication mxApp, Control control, ErrorProvider eprWarning, ErrorProvider eprError)
         {
 
             eprWarning.SetIconPadding(control, 33);
             eprError.SetIconPadding(control, 33);
-            string automatedValue = MapAction.PageLayoutProperties.getMxdTitle(ArcMap.Application);
+            string automatedValue = MapActionToolbar_Core.PageLayoutProperties.getMxdTitle(mxApp as IApplication);
 
             if (validateEmptyField(control, eprWarning))
             {
diff --git a/arcgis10_mapping_tools/MapActionToolbars/LayoutToolAutomatedValues.cs b/arcgis10_mapping_tools/MapActionToolbars/LayoutToolAutomatedValues.cs
index 2e333e0f..df1e87a7 100644
--- a/arcgis10_mapping_tools/MapActionToolbars/LayoutToolAutomatedValues.cs
+++ b/arcgis10_mapping_tools/MapActionToolbars/LayoutToolAutomatedValues.cs
@@ -16,7 +16,7 @@
 using ESRI.ArcGIS.Framework;
 using System.Diagnostics;
 
-namespace MapActionToolbars
+namespace MapActionToolbar_Forms
 {
     class LayoutToolAutomatedValues
     {
@@ -28,11 +28,11 @@ Tab 1 automated values
         public static string getGlideNo()
         {
             string GlideNo = string.Empty;
-            string path = MapAction.Utilities.getEventConfigFilePath();
+            string path = MapActionToolbar_Core.Utilities.getEventConfigFilePath();
 
-            if (MapAction.Utilities.detectEventConfig())
+            if (MapActionToolbar_Core.Utilities.detectEventConfig())
             {
-                MapAction.EventConfig config = MapAction.Utilities.getEventConfigValues(path);
+                MapActionToolbar_Core.EventConfig config = MapActionToolbar_Core.Utilities.getEventConfigValues(path);
                 GlideNo = config.GlideNumber;
             }
             return GlideNo;
@@ -45,11 +45,11 @@ Tab 2 automated values
         public static string getConfigDisclaimer()
         {
             string DefaultDisclaimerText = string.Empty;
-            string path = MapAction.Utilities.getEventConfigFilePath();
+            string path = MapActionToolbar_Core.Utilities.getEventConfigFilePath();
 
-            if (MapAction.Utilities.detectEventConfig())
+            if (MapActionToolbar_Core.Utilities.detectEventConfig())
             {
-                MapAction.EventConfig config =  MapAction.Utilities.getEventConfigValues(path);
+                MapActionToolbar_Core.EventConfig config =  MapActionToolbar_Core.Utilities.getEventConfigValues(path);
                 DefaultDisclaimerText = config.DefaultDisclaimerText;
             }
             return DefaultDisclaimerText;
@@ -58,11 +58,11 @@ public static string getConfigDisclaimer()
         public static string getConfigDonorText()
         {
             string DefaultDonorsText = string.Empty;
-            string path = MapAction.Utilities.getEventConfigFilePath();
+            string path = MapActionToolbar_Core.Utilities.getEventConfigFilePath();
 
-            if (MapAction.Utilities.detectEventConfig())
+            if (MapActionToolbar_Core.Utilities.detectEventConfig())
             {
-                MapAction.EventConfig config = MapAction.Utilities.getEventConfigValues(path);
+                MapActionToolbar_Core.EventConfig config = MapActionToolbar_Core.Utilities.getEventConfigValues(path);
                 DefaultDonorsText = config.DefaultDonorCredits;
             }
             return DefaultDonorsText;
@@ -71,11 +71,11 @@ public static string getConfigDonorText()
         public static string getConfigTimezone()
         {
             string DefaultTimeZone = string.Empty;
-            string path = MapAction.Utilities.getEventConfigFilePath();
+            string path = MapActionToolbar_Core.Utilities.getEventConfigFilePath();
 
-            if (MapAction.Utilities.detectEventConfig())
+            if (MapActionToolbar_Core.Utilities.detectEventConfig())
             {
-                MapAction.EventConfig config = MapAction.Utilities.getEventConfigValues(path);
+                MapActionToolbar_Core.EventConfig config = MapActionToolbar_Core.Utilities.getEventConfigValues(path);
                 DefaultTimeZone = config.TimeZone;
             }
             return DefaultTimeZone;
@@ -87,11 +87,11 @@ public static string getProducedByText()
             string OrgUrl = string.Empty;
             string PrimaryEmail = string.Empty;
             
-            string path = MapAction.Utilities.getEventConfigFilePath();
+            string path = MapActionToolbar_Core.Utilities.getEventConfigFilePath();
 
-            if (MapAction.Utilities.detectEventConfig())
+            if (MapActionToolbar_Core.Utilities.detectEventConfig())
             {
-                MapAction.EventConfig config = MapAction.Utilities.getEventConfigValues(path);
+                MapActionToolbar_Core.EventConfig config = MapActionToolbar_Core.Utilities.getEventConfigValues(path);
 
                 OrgName = config.DefaultSourceOrganisation;
                 OrgUrl = config.DefaultSourceOrganisationUrl;
diff --git a/arcgis10_mapping_tools/MapActionToolbars/MADataRenameProperties.cs b/arcgis10_mapping_tools/MapActionToolbars/MADataRenameProperties.cs
index 1e9e30e5..024f5cc5 100644
--- a/arcgis10_mapping_tools/MapActionToolbars/MADataRenameProperties.cs
+++ b/arcgis10_mapping_tools/MapActionToolbars/MADataRenameProperties.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 
-namespace MapActionToolbars
+namespace MapActionToolbar_Forms
 {
     public class MADataRenameProperties
     {
diff --git a/arcgis10_mapping_tools/MapActionToolbars/MapActionToolbars.csproj b/arcgis10_mapping_tools/MapActionToolbars/MapActionToolbar_Forms.csproj
similarity index 89%
rename from arcgis10_mapping_tools/MapActionToolbars/MapActionToolbars.csproj
rename to arcgis10_mapping_tools/MapActionToolbars/MapActionToolbar_Forms.csproj
index 9c3af6ed..e7d8cc4c 100644
--- a/arcgis10_mapping_tools/MapActionToolbars/MapActionToolbars.csproj
+++ b/arcgis10_mapping_tools/MapActionToolbars/MapActionToolbar_Forms.csproj
@@ -1,364 +1,339 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{5388B0F1-B5E9-45B2-810C-49F019300ACA}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>MapActionToolbars</RootNamespace>
-    <AssemblyName>MapActionToolbars</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="ESRI.ArcGIS.ArcMap, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="ESRI.ArcGIS.ArcMapUI, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="ESRI.ArcGIS.Carto, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="ESRI.ArcGIS.Catalog, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="ESRI.ArcGIS.CatalogUI, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="ESRI.ArcGIS.DataSourcesFile, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="ESRI.ArcGIS.Desktop.AddIns">
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="ESRI.ArcGIS.Display, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="ESRI.ArcGIS.DisplayUI, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="ESRI.ArcGIS.Editor, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="ESRI.ArcGIS.Framework">
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="ESRI.ArcGIS.Geodatabase, Version=10.2.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="ESRI.ArcGIS.Geometry, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="ESRI.ArcGIS.Geoprocessing, Version=10.2.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="ESRI.ArcGIS.Geoprocessor, Version=10.2.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="ESRI.ArcGIS.Output, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="ESRI.ArcGIS.System, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.VisualBasic" />
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Drawing" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AboutBox.cs" />
-    <Compile Include="Config.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Config.esriaddinx</DependentUpon>
-    </Compile>
-    <Compile Include="EventTool.cs" />
-    <Compile Include="ConstructLayerName.cs" />
-    <Compile Include="Export.cs" />
-    <Compile Include="ExportTool.cs" />
-    <Compile Include="export_validation.cs" />
-    <Compile Include="FormValidationConfig.cs" />
-    <Compile Include="FormValidationExport.cs" />
-    <Compile Include="FormValidationLayout.cs" />
-    <Compile Include="frmAutomationResult.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmAutomationResult.Designer.cs">
-      <DependentUpon>frmAutomationResult.cs</DependentUpon>
-    </Compile>
-    <Compile Include="frmCheckElements.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmCheckElements.Designer.cs">
-      <DependentUpon>frmCheckElements.cs</DependentUpon>
-    </Compile>
-    <Compile Include="frmEvent.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmEvent.Designer.cs">
-      <DependentUpon>frmEvent.cs</DependentUpon>
-    </Compile>
-    <Compile Include="frmExportMain.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmExportMain.Designer.cs">
-      <DependentUpon>frmExportMain.cs</DependentUpon>
-    </Compile>
-    <Compile Include="frmGenerationTool.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmGenerationTool.Designer.cs">
-      <DependentUpon>frmGenerationTool.cs</DependentUpon>
-    </Compile>
-    <Compile Include="frmLayoutMain.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmLayoutMain.Designer.cs">
-      <DependentUpon>frmLayoutMain.cs</DependentUpon>
-    </Compile>
-    <Compile Include="frmPermissionsHelp.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmPermissionsHelp.Designer.cs">
-      <DependentUpon>frmPermissionsHelp.cs</DependentUpon>
-    </Compile>
-    <Compile Include="frmRenameMain.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmRenameMain.Designer.cs">
-      <DependentUpon>frmRenameMain.cs</DependentUpon>
-    </Compile>
-    <Compile Include="GenerationTool.cs" />
-    <Compile Include="LayoutTool.cs" />
-    <Compile Include="LayoutToolAutomatedValues.cs" />
-    <Compile Include="MADataRenameProperties.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>Settings.settings</DependentUpon>
-    </Compile>
-    <Compile Include="RenameTool.cs" />
-    <Compile Include="Resources\layer_name_lookupDataSet.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>layer_name_lookupDataSet.xsd</DependentUpon>
-    </Compile>
-    <Compile Include="Settings.cs" />
-    <Compile Include="ShowAutomationResults.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <AddInContent Include="Config.esriaddinx">
-      <Generator>ArcGISAddInHostGenerator</Generator>
-      <SubType>Designer</SubType>
-      <LastGenOutput>Config.Designer.cs</LastGenOutput>
-    </AddInContent>
-  </ItemGroup>
-  <ItemGroup>
-    <AddInContent Include="Images\MapActionToolbars.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AddInContent Include="Images\ma_addin_about_box.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AddInContent Include="Images\ma_globe_only.png" />
-    <AddInContent Include="Images\ma_logo.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="frmAutomationResult.resx">
-      <DependentUpon>frmAutomationResult.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="frmCheckElements.resx">
-      <DependentUpon>frmCheckElements.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="frmEvent.resx">
-      <DependentUpon>frmEvent.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="frmExportMain.resx">
-      <DependentUpon>frmExportMain.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="frmGenerationTool.resx">
-      <DependentUpon>frmGenerationTool.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="frmLayoutMain.resx">
-      <DependentUpon>frmLayoutMain.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="frmPermissionsHelp.resx">
-      <DependentUpon>frmPermissionsHelp.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="frmRenameMain.resx">
-      <DependentUpon>frmRenameMain.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\MapAction\MapAction\MapAction.csproj">
-      <Project>{8B7ABA1A-C659-4D80-A2EF-13D953577643}</Project>
-      <Name>MapAction</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="packages.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>PublicSettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <AddInContent Include="Images\ConfigTool.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AddInContent Include="Images\LayoutTool.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\clear-form-icon.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AddInContent Include="Images\ExportTool.png" />
-    <AddInContent Include="Images\rename_icon.png" />
-    <Content Include="Images\cross.png" />
-    <Content Include="Images\ma_globe.png" />
-    <Content Include="Images\ma_mapgenerator.png" />
-    <AddInContent Include="Images\generate_icon.png" />
-    <Content Include="Images\tick.png" />
-    <Content Include="Images\warning.png" />
-    <Content Include="Resources\clear-icon.png" />
-    <AddInContent Include="Resources\rename_icon.png" />
-    <None Include="Resources\gen_result_cross.png" />
-    <None Include="Resources\gen_result_tick.png" />
-    <None Include="Resources\gen_result_warning.png" />
-    <None Include="Resources\gen_result_cross_50.png" />
-    <None Include="Resources\gen_result_tick_50.png" />
-    <None Include="Resources\gen_result_warning_50.png" />
-    <Content Include="Sample\countries_config.xml" />
-    <Content Include="Sample\language_codes.xml" />
-    <Content Include="Sample\language_config.xml" />
-    <None Include="Resources\layer_name_lookupDataSet.xsc">
-      <DependentUpon>layer_name_lookupDataSet.xsd</DependentUpon>
-    </None>
-    <None Include="Resources\layer_name_lookupDataSet.xsd">
-      <Generator>MSDataSetGenerator</Generator>
-      <LastGenOutput>layer_name_lookupDataSet.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="Resources\layer_name_lookupDataSet.xss">
-      <DependentUpon>layer_name_lookupDataSet.xsd</DependentUpon>
-    </None>
-    <None Include="Resources\warning_17x17px.png" />
-    <None Include="Resources\right_button_20x20.png" />
-    <None Include="Resources\left_button_20x20.png" />
-    <None Include="Resources\empty17px.png" />
-    <None Include="Resources\tick_30px.png" />
-    <None Include="Resources\tick_17px.png" />
-    <None Include="Resources\refresh17x17px.png" />
-    <None Include="Resources\import20x20px.png" />
-    <None Include="Resources\gear-icon.png" />
-    <None Include="Resources\cross_30px.png" />
-    <None Include="Resources\cross_17px.png" />
-    <None Include="Resources\clear-icon1.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\DataSources\" />
-  </ItemGroup>
-  <PropertyGroup>
-    <ZipFileExtension>esriAddIn</ZipFileExtension>
-    <AddInTargetProduct>Desktop</AddInTargetProduct>
-    <AddInTargetVersion>10.1</AddInTargetVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <RunPostBuildEvent>Always</RunPostBuildEvent>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>false</SignAssembly>
-  </PropertyGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\ESRI\ESRI.ArcGIS.AddIns.targets" Condition="Exists('$(MSBuildExtensionsPath)\ESRI\ESRI.ArcGIS.AddIns.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.
-  <Target Name="BeforeBuild">
-  </Target>
-  -->
-  <Target Name="AfterBuild">
-    <!-- Gives build warning when add-in targets file is not found. -->
-    <Warning Text="Unable to create .esriAddin; missing ESRI ArcGIS Add-in SDK component(s)." Condition="!Exists('$(MSBuildExtensionsPath)\ESRI\ESRI.ArcGIS.AddIns.targets')" />
-  </Target>
-  <ProjectExtensions>
-    <!-- Default ESRI add-in properties -->
-    <ESRIAddInProperties>
-      <Host>ArcMap</Host>
-    </ESRIAddInProperties>
-  </ProjectExtensions>
-  <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.21022</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{5388B0F1-B5E9-45B2-810C-49F019300ACA}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>MapActionToolbars</RootNamespace>
+    <AssemblyName>MapActionToolbars</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Prefer32Bit>false</Prefer32Bit>
+    <RegisterForComInterop>false</RegisterForComInterop>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="ESRI.ArcGIS.ArcMap, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="ESRI.ArcGIS.ArcMapUI, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="ESRI.ArcGIS.Carto, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="ESRI.ArcGIS.Catalog, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="ESRI.ArcGIS.CatalogUI, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="ESRI.ArcGIS.DataSourcesFile, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="ESRI.ArcGIS.Desktop.AddIns">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="ESRI.ArcGIS.Display, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="ESRI.ArcGIS.DisplayUI, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="ESRI.ArcGIS.Editor, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="ESRI.ArcGIS.Framework">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="ESRI.ArcGIS.Geodatabase, Version=10.2.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="ESRI.ArcGIS.Geometry, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="ESRI.ArcGIS.Geoprocessing, Version=10.2.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="ESRI.ArcGIS.Geoprocessor, Version=10.2.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="ESRI.ArcGIS.Output, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="ESRI.ArcGIS.System, Version=10.6.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualBasic" />
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Drawing" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ConstructLayerName.cs" />
+    <Compile Include="Export.cs" />
+    <Compile Include="export_validation.cs" />
+    <Compile Include="FormValidationConfig.cs" />
+    <Compile Include="FormValidationExport.cs" />
+    <Compile Include="FormValidationLayout.cs" />
+    <Compile Include="frmAutomationResult.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmAutomationResult.Designer.cs">
+      <DependentUpon>frmAutomationResult.cs</DependentUpon>
+    </Compile>
+    <Compile Include="frmCheckElements.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmCheckElements.Designer.cs">
+      <DependentUpon>frmCheckElements.cs</DependentUpon>
+    </Compile>
+    <Compile Include="frmEvent.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmEvent.Designer.cs">
+      <DependentUpon>frmEvent.cs</DependentUpon>
+    </Compile>
+    <Compile Include="frmExportMain.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmExportMain.Designer.cs">
+      <DependentUpon>frmExportMain.cs</DependentUpon>
+    </Compile>
+    <Compile Include="frmGenerationTool.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmGenerationTool.Designer.cs">
+      <DependentUpon>frmGenerationTool.cs</DependentUpon>
+    </Compile>
+    <Compile Include="frmLayoutMain.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmLayoutMain.Designer.cs">
+      <DependentUpon>frmLayoutMain.cs</DependentUpon>
+    </Compile>
+    <Compile Include="frmPermissionsHelp.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmPermissionsHelp.Designer.cs">
+      <DependentUpon>frmPermissionsHelp.cs</DependentUpon>
+    </Compile>
+    <Compile Include="frmRenameMain.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmRenameMain.Designer.cs">
+      <DependentUpon>frmRenameMain.cs</DependentUpon>
+    </Compile>
+    <Compile Include="LayoutToolAutomatedValues.cs" />
+    <Compile Include="MADataRenameProperties.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
+    <Compile Include="Resources\layer_name_lookupDataSet.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>layer_name_lookupDataSet.xsd</DependentUpon>
+    </Compile>
+    <Compile Include="Settings.cs" />
+    <Compile Include="ShowAutomationResults.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <AddInContent Include="Images\MapActionToolbars.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AddInContent Include="Images\ma_addin_about_box.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AddInContent Include="Images\ma_globe_only.png" />
+    <AddInContent Include="Images\ma_logo.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="frmAutomationResult.resx">
+      <DependentUpon>frmAutomationResult.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmCheckElements.resx">
+      <DependentUpon>frmCheckElements.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmEvent.resx">
+      <DependentUpon>frmEvent.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmExportMain.resx">
+      <DependentUpon>frmExportMain.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmGenerationTool.resx">
+      <DependentUpon>frmGenerationTool.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmLayoutMain.resx">
+      <DependentUpon>frmLayoutMain.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmPermissionsHelp.resx">
+      <DependentUpon>frmPermissionsHelp.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmRenameMain.resx">
+      <DependentUpon>frmRenameMain.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\MapAction\MapAction\MapActionToolbar_Core.csproj">
+      <Project>{8B7ABA1A-C659-4D80-A2EF-13D953577643}</Project>
+      <Name>MapActionToolbar_Core</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="packages.config" />
+    <None Include="Properties\Settings.settings">
+      <Generator>PublicSettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <AddInContent Include="Images\ConfigTool.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AddInContent Include="Images\LayoutTool.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\clear-form-icon.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AddInContent Include="Images\ExportTool.png" />
+    <AddInContent Include="Images\rename_icon.png" />
+    <Content Include="Images\cross.png" />
+    <Content Include="Images\ma_globe.png" />
+    <Content Include="Images\ma_mapgenerator.png" />
+    <AddInContent Include="Images\generate_icon.png" />
+    <Content Include="Images\tick.png" />
+    <Content Include="Images\warning.png" />
+    <Content Include="Resources\clear-icon.png" />
+    <AddInContent Include="Resources\rename_icon.png" />
+    <None Include="Resources\gen_result_cross.png" />
+    <None Include="Resources\gen_result_tick.png" />
+    <None Include="Resources\gen_result_warning.png" />
+    <None Include="Resources\gen_result_cross_50.png" />
+    <None Include="Resources\gen_result_tick_50.png" />
+    <None Include="Resources\gen_result_warning_50.png" />
+    <Content Include="Sample\countries_config.xml" />
+    <Content Include="Sample\language_codes.xml" />
+    <Content Include="Sample\language_config.xml" />
+    <None Include="Resources\layer_name_lookupDataSet.xsc">
+      <DependentUpon>layer_name_lookupDataSet.xsd</DependentUpon>
+    </None>
+    <None Include="Resources\layer_name_lookupDataSet.xsd">
+      <Generator>MSDataSetGenerator</Generator>
+      <LastGenOutput>layer_name_lookupDataSet.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="Resources\layer_name_lookupDataSet.xss">
+      <DependentUpon>layer_name_lookupDataSet.xsd</DependentUpon>
+    </None>
+    <None Include="Resources\warning_17x17px.png" />
+    <None Include="Resources\right_button_20x20.png" />
+    <None Include="Resources\left_button_20x20.png" />
+    <None Include="Resources\empty17px.png" />
+    <None Include="Resources\tick_30px.png" />
+    <None Include="Resources\tick_17px.png" />
+    <None Include="Resources\refresh17x17px.png" />
+    <None Include="Resources\import20x20px.png" />
+    <None Include="Resources\gear-icon.png" />
+    <None Include="Resources\cross_30px.png" />
+    <None Include="Resources\cross_17px.png" />
+    <None Include="Resources\clear-icon1.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\DataSources\" />
+  </ItemGroup>
+  <PropertyGroup>
+    <ZipFileExtension>esriAddIn</ZipFileExtension>
+    <AddInTargetProduct>Desktop</AddInTargetProduct>
+    <AddInTargetVersion>10.1</AddInTargetVersion>
+  </PropertyGroup>
+  <PropertyGroup>
+    <RunPostBuildEvent>Always</RunPostBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>false</SignAssembly>
+  </PropertyGroup>
+  <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.
+  <Target Name="BeforeBuild">
+  </Target>
+  -->
+  <ProjectExtensions>
+  </ProjectExtensions>
+  <PropertyGroup>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/arcgis10_mapping_tools/MapActionToolbars/MapActionToolbars.csproj.user b/arcgis10_mapping_tools/MapActionToolbars/MapActionToolbars.csproj.user
deleted file mode 100644
index 3976e0f5..00000000
--- a/arcgis10_mapping_tools/MapActionToolbars/MapActionToolbars.csproj.user
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <StartAction>Program</StartAction>
-    <StartProgram>C:\Program Files\ArcGIS\Desktop10.2\bin\ArcMap.exe</StartProgram>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
-    <StartAction>Program</StartAction>
-    <StartProgram>C:\Program Files (x86)\ArcGIS\Desktop10.2\bin\ArcMap.exe</StartProgram>
-  </PropertyGroup>
-  <PropertyGroup>
-    <PublishUrlHistory />
-    <InstallUrlHistory />
-    <SupportUrlHistory />
-    <UpdateUrlHistory />
-    <BootstrapperUrlHistory />
-    <ErrorReportUrlHistory />
-    <FallbackCulture>en-US</FallbackCulture>
-    <VerifyUploadedFiles>false</VerifyUploadedFiles>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/arcgis10_mapping_tools/MapActionToolbars/Properties/AssemblyInfo.cs b/arcgis10_mapping_tools/MapActionToolbars/Properties/AssemblyInfo.cs
index c9e6940f..354c5f48 100644
--- a/arcgis10_mapping_tools/MapActionToolbars/Properties/AssemblyInfo.cs
+++ b/arcgis10_mapping_tools/MapActionToolbars/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 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("4.1.*")]
+[assembly: AssemblyVersion("5.1.*")]
 //[assembly: AssemblyFileVersion("3.1")]
diff --git a/arcgis10_mapping_tools/MapActionToolbars/Properties/Resources.Designer.cs b/arcgis10_mapping_tools/MapActionToolbars/Properties/Resources.Designer.cs
index 56dcdba0..bb4c1dea 100644
--- a/arcgis10_mapping_tools/MapActionToolbars/Properties/Resources.Designer.cs
+++ b/arcgis10_mapping_tools/MapActionToolbars/Properties/Resources.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace MapActionToolbars.Properties {
+namespace MapActionToolbar_Forms.Properties {
     using System;
     
     
diff --git a/arcgis10_mapping_tools/MapActionToolbars/Properties/Settings.Designer.cs b/arcgis10_mapping_tools/MapActionToolbars/Properties/Settings.Designer.cs
index 88283c4d..e9dd5fa9 100644
--- a/arcgis10_mapping_tools/MapActionToolbars/Properties/Settings.Designer.cs
+++ b/arcgis10_mapping_tools/MapActionToolbars/Properties/Settings.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace MapActionToolbars.Properties {
+namespace MapActionToolbar_Forms.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
diff --git a/arcgis10_mapping_tools/MapActionToolbars/Resources/layer_name_lookupDataSet.Designer.cs b/arcgis10_mapping_tools/MapActionToolbars/Resources/layer_name_lookupDataSet.Designer.cs
index d1d39dd8..0b19329e 100644
--- a/arcgis10_mapping_tools/MapActionToolbars/Resources/layer_name_lookupDataSet.Designer.cs
+++ b/arcgis10_mapping_tools/MapActionToolbars/Resources/layer_name_lookupDataSet.Designer.cs
@@ -10,7 +10,7 @@
 
 #pragma warning disable 1591
 
-namespace MapActionToolbars.Resources {
+namespace MapActionToolbar_Forms.Resources {
     
     
     /// <summary>
@@ -3059,7 +3059,7 @@ public TypeRow Row {
         }
     }
 }
-namespace MapActionToolbars.Resources.layer_name_lookupDataSetTableAdapters {
+namespace MapActionToolbar_Forms.Resources.layer_name_lookupDataSetTableAdapters {
     
     
     /// <summary>
@@ -3198,7 +3198,7 @@ private void InitAdapter() {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
         private void InitConnection() {
             this._connection = new global::System.Data.OleDb.OleDbConnection();
-            this._connection.ConnectionString = global::MapActionToolbars.Properties.Settings.Default.layer_name_lookupConnectionString;
+            this._connection.ConnectionString = global::MapActionToolbar_Forms.Properties.Settings.Default.layer_name_lookupConnectionString;
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -3434,7 +3434,7 @@ private void InitAdapter() {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
         private void InitConnection() {
             this._connection = new global::System.Data.OleDb.OleDbConnection();
-            this._connection.ConnectionString = global::MapActionToolbars.Properties.Settings.Default.layer_name_lookupConnectionString;
+            this._connection.ConnectionString = global::MapActionToolbar_Forms.Properties.Settings.Default.layer_name_lookupConnectionString;
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -3670,7 +3670,7 @@ private void InitAdapter() {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
         private void InitConnection() {
             this._connection = new global::System.Data.OleDb.OleDbConnection();
-            this._connection.ConnectionString = global::MapActionToolbars.Properties.Settings.Default.layer_name_lookupConnectionString;
+            this._connection.ConnectionString = global::MapActionToolbar_Forms.Properties.Settings.Default.layer_name_lookupConnectionString;
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -3906,7 +3906,7 @@ private void InitAdapter() {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
         private void InitConnection() {
             this._connection = new global::System.Data.OleDb.OleDbConnection();
-            this._connection.ConnectionString = global::MapActionToolbars.Properties.Settings.Default.layer_name_lookupConnectionString;
+            this._connection.ConnectionString = global::MapActionToolbar_Forms.Properties.Settings.Default.layer_name_lookupConnectionString;
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -4142,7 +4142,7 @@ private void InitAdapter() {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
         private void InitConnection() {
             this._connection = new global::System.Data.OleDb.OleDbConnection();
-            this._connection.ConnectionString = global::MapActionToolbars.Properties.Settings.Default.layer_name_lookupConnectionString;
+            this._connection.ConnectionString = global::MapActionToolbar_Forms.Properties.Settings.Default.layer_name_lookupConnectionString;
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -4378,7 +4378,7 @@ private void InitAdapter() {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
         private void InitConnection() {
             this._connection = new global::System.Data.OleDb.OleDbConnection();
-            this._connection.ConnectionString = global::MapActionToolbars.Properties.Settings.Default.layer_name_lookupConnectionString;
+            this._connection.ConnectionString = global::MapActionToolbar_Forms.Properties.Settings.Default.layer_name_lookupConnectionString;
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -4614,7 +4614,7 @@ private void InitAdapter() {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
         private void InitConnection() {
             this._connection = new global::System.Data.OleDb.OleDbConnection();
-            this._connection.ConnectionString = global::MapActionToolbars.Properties.Settings.Default.layer_name_lookupConnectionString;
+            this._connection.ConnectionString = global::MapActionToolbar_Forms.Properties.Settings.Default.layer_name_lookupConnectionString;
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
diff --git a/arcgis10_mapping_tools/MapActionToolbars/Settings.cs b/arcgis10_mapping_tools/MapActionToolbars/Settings.cs
index 47b6c7a5..973935f8 100644
--- a/arcgis10_mapping_tools/MapActionToolbars/Settings.cs
+++ b/arcgis10_mapping_tools/MapActionToolbars/Settings.cs
@@ -1,4 +1,4 @@
-namespace MapActionToolbars.Properties {
+namespace MapActionToolbar_Forms.Properties {
     
     
     // This class allows you to handle specific events on the settings class:
diff --git a/arcgis10_mapping_tools/MapActionToolbars/ShowAutomationResults.cs b/arcgis10_mapping_tools/MapActionToolbars/ShowAutomationResults.cs
index 0a2c0eaf..a4e9fa7a 100644
--- a/arcgis10_mapping_tools/MapActionToolbars/ShowAutomationResults.cs
+++ b/arcgis10_mapping_tools/MapActionToolbars/ShowAutomationResults.cs
@@ -3,10 +3,10 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using MapAction;
+using MapActionToolbar_Core;
 using Newtonsoft.Json;
 
-namespace MapActionToolbars
+namespace MapActionToolbar_Forms
 {
     public static class ShowAutomationResults
     {
diff --git a/arcgis10_mapping_tools/MapActionToolbars/export_validation.cs b/arcgis10_mapping_tools/MapActionToolbars/export_validation.cs
index 95082791..27e2623b 100644
--- a/arcgis10_mapping_tools/MapActionToolbars/export_validation.cs
+++ b/arcgis10_mapping_tools/MapActionToolbars/export_validation.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 
-namespace MapActionToolbars
+namespace MapActionToolbar_Forms
 {
     public static class export_validation
     {
diff --git a/arcgis10_mapping_tools/MapActionToolbars/frmAutomationResult.Designer.cs b/arcgis10_mapping_tools/MapActionToolbars/frmAutomationResult.Designer.cs
index 01e1078c..2b8ec6dd 100644
--- a/arcgis10_mapping_tools/MapActionToolbars/frmAutomationResult.Designer.cs
+++ b/arcgis10_mapping_tools/MapActionToolbars/frmAutomationResult.Designer.cs
@@ -1,4 +1,4 @@
-namespace MapActionToolbars
+namespace MapActionToolbar_Forms
 {
     partial class frmAutomationResult
     {
diff --git a/arcgis10_mapping_tools/MapActionToolbars/frmAutomationResult.cs b/arcgis10_mapping_tools/MapActionToolbars/frmAutomationResult.cs
index 2b2df253..b0378dd2 100644
--- a/arcgis10_mapping_tools/MapActionToolbars/frmAutomationResult.cs
+++ b/arcgis10_mapping_tools/MapActionToolbars/frmAutomationResult.cs
@@ -7,9 +7,9 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using MapAction;
+using MapActionToolbar_Core;
 
-namespace MapActionToolbars
+namespace MapActionToolbar_Forms
 {
     public partial class frmAutomationResult : Form
     {
@@ -23,15 +23,15 @@ public void SetContent(AutomationReport report)
             // Populate Summary box:
             if (report.result == "Success")
             {
-                this.pictureBox1.Image = global::MapActionToolbars.Properties.Resources.gen_result_tick_50;
+                this.pictureBox1.Image = global::MapActionToolbar_Forms.Properties.Resources.gen_result_tick_50;
             }
             else if (report.result == "Failure")
             {
-                this.pictureBox1.Image = global::MapActionToolbars.Properties.Resources.gen_result_cross_50;
+                this.pictureBox1.Image = global::MapActionToolbar_Forms.Properties.Resources.gen_result_cross_50;
             }
             else
             {
-                this.pictureBox1.Image = global::MapActionToolbars.Properties.Resources.gen_result_warning_50;
+                this.pictureBox1.Image = global::MapActionToolbar_Forms.Properties.Resources.gen_result_warning_50;
             }
             this.textBox1.Text = report.summary;
 
diff --git a/arcgis10_mapping_tools/MapActionToolbars/frmCheckElements.Designer.cs b/arcgis10_mapping_tools/MapActionToolbars/frmCheckElements.Designer.cs
index 267b3919..70ffdeea 100644
--- a/arcgis10_mapping_tools/MapActionToolbars/frmCheckElements.Designer.cs
+++ b/arcgis10_mapping_tools/MapActionToolbars/frmCheckElements.Designer.cs
@@ -1,4 +1,4 @@
-namespace MapActionToolbars
+namespace MapActionToolbar_Forms
 {
     partial class frmCheckElements
     {
@@ -135,7 +135,7 @@ private void InitializeComponent()
             // 
             // imgLanguageStatus
             // 
-            this.imgLanguageStatus.Image = global::MapActionToolbars.Properties.Resources.cross_17px;
+            this.imgLanguageStatus.Image = global::MapActionToolbar_Forms.Properties.Resources.cross_17px;
             this.imgLanguageStatus.Location = new System.Drawing.Point(117, 296);
             this.imgLanguageStatus.Name = "imgLanguageStatus";
             this.imgLanguageStatus.Size = new System.Drawing.Size(20, 20);
@@ -184,7 +184,7 @@ private void InitializeComponent()
             // 
             // imgTimezoneStatus
             // 
-            this.imgTimezoneStatus.Image = global::MapActionToolbars.Properties.Resources.cross_17px;
+            this.imgTimezoneStatus.Image = global::MapActionToolbar_Forms.Properties.Resources.cross_17px;
             this.imgTimezoneStatus.Location = new System.Drawing.Point(117, 273);
             this.imgTimezoneStatus.Name = "imgTimezoneStatus";
             this.imgTimezoneStatus.Size = new System.Drawing.Size(20, 20);
@@ -193,7 +193,7 @@ private void InitializeComponent()
             // 
             // imgProducedByStatus
             // 
-            this.imgProducedByStatus.Image = global::MapActionToolbars.Properties.Resources.cross_17px;
+            this.imgProducedByStatus.Image = global::MapActionToolbar_Forms.Properties.Resources.cross_17px;
             this.imgProducedByStatus.Location = new System.Drawing.Point(117, 250);
             this.imgProducedByStatus.Name = "imgProducedByStatus";
             this.imgProducedByStatus.Size = new System.Drawing.Size(20, 20);
@@ -202,7 +202,7 @@ private void InitializeComponent()
             // 
             // imgDonorCreditStatus
             // 
-            this.imgDonorCreditStatus.Image = global::MapActionToolbars.Properties.Resources.cross_17px;
+            this.imgDonorCreditStatus.Image = global::MapActionToolbar_Forms.Properties.Resources.cross_17px;
             this.imgDonorCreditStatus.Location = new System.Drawing.Point(117, 227);
             this.imgDonorCreditStatus.Name = "imgDonorCreditStatus";
             this.imgDonorCreditStatus.Size = new System.Drawing.Size(20, 20);
@@ -211,7 +211,7 @@ private void InitializeComponent()
             // 
             // imgDisclaimerStatus
             // 
-            this.imgDisclaimerStatus.Image = global::MapActionToolbars.Properties.Resources.cross_17px;
+            this.imgDisclaimerStatus.Image = global::MapActionToolbar_Forms.Properties.Resources.cross_17px;
             this.imgDisclaimerStatus.Location = new System.Drawing.Point(117, 204);
             this.imgDisclaimerStatus.Name = "imgDisclaimerStatus";
             this.imgDisclaimerStatus.Size = new System.Drawing.Size(20, 20);
@@ -230,7 +230,7 @@ private void InitializeComponent()
             // 
             // imgDataSources
             // 
-            this.imgDataSources.Image = global::MapActionToolbars.Properties.Resources.cross_17px;
+            this.imgDataSources.Image = global::MapActionToolbar_Forms.Properties.Resources.cross_17px;
             this.imgDataSources.Location = new System.Drawing.Point(116, 69);
             this.imgDataSources.Name = "imgDataSources";
             this.imgDataSources.Size = new System.Drawing.Size(20, 20);
@@ -309,7 +309,7 @@ private void InitializeComponent()
             // 
             // imgTitleStatus
             // 
-            this.imgTitleStatus.Image = global::MapActionToolbars.Properties.Resources.cross_17px;
+            this.imgTitleStatus.Image = global::MapActionToolbar_Forms.Properties.Resources.cross_17px;
             this.imgTitleStatus.Location = new System.Drawing.Point(116, 22);
             this.imgTitleStatus.Name = "imgTitleStatus";
             this.imgTitleStatus.Size = new System.Drawing.Size(20, 20);
@@ -318,7 +318,7 @@ private void InitializeComponent()
             // 
             // imgGlideNoStatus
             // 
-            this.imgGlideNoStatus.Image = global::MapActionToolbars.Properties.Resources.cross_17px;
+            this.imgGlideNoStatus.Image = global::MapActionToolbar_Forms.Properties.Resources.cross_17px;
             this.imgGlideNoStatus.Location = new System.Drawing.Point(116, 180);
             this.imgGlideNoStatus.Name = "imgGlideNoStatus";
             this.imgGlideNoStatus.Size = new System.Drawing.Size(20, 20);
@@ -327,7 +327,7 @@ private void InitializeComponent()
             // 
             // imgSummaryStatus
             // 
-            this.imgSummaryStatus.Image = global::MapActionToolbars.Properties.Resources.cross_17px;
+            this.imgSummaryStatus.Image = global::MapActionToolbar_Forms.Properties.Resources.cross_17px;
             this.imgSummaryStatus.Location = new System.Drawing.Point(116, 45);
             this.imgSummaryStatus.Name = "imgSummaryStatus";
             this.imgSummaryStatus.Size = new System.Drawing.Size(20, 20);
@@ -336,7 +336,7 @@ private void InitializeComponent()
             // 
             // imgScaleStatus
             // 
-            this.imgScaleStatus.Image = global::MapActionToolbars.Properties.Resources.cross_17px;
+            this.imgScaleStatus.Image = global::MapActionToolbar_Forms.Properties.Resources.cross_17px;
             this.imgScaleStatus.Location = new System.Drawing.Point(116, 157);
             this.imgScaleStatus.Name = "imgScaleStatus";
             this.imgScaleStatus.Size = new System.Drawing.Size(20, 20);
@@ -345,7 +345,7 @@ private void InitializeComponent()
             // 
             // imgMapNoStatus
             // 
-            this.imgMapNoStatus.Image = global::MapActionToolbars.Properties.Resources.cross_17px;
+            this.imgMapNoStatus.Image = global::MapActionToolbar_Forms.Properties.Resources.cross_17px;
             this.imgMapNoStatus.Location = new System.Drawing.Point(116, 88);
             this.imgMapNoStatus.Name = "imgMapNoStatus";
             this.imgMapNoStatus.Size = new System.Drawing.Size(20, 20);
@@ -354,7 +354,7 @@ private void InitializeComponent()
             // 
             // imgSpatialRefStatus
             // 
-            this.imgSpatialRefStatus.Image = global::MapActionToolbars.Properties.Resources.cross_17px;
+            this.imgSpatialRefStatus.Image = global::MapActionToolbar_Forms.Properties.Resources.cross_17px;
             this.imgSpatialRefStatus.Location = new System.Drawing.Point(116, 134);
             this.imgSpatialRefStatus.Name = "imgSpatialRefStatus";
             this.imgSpatialRefStatus.Size = new System.Drawing.Size(20, 20);
@@ -363,7 +363,7 @@ private void InitializeComponent()
             // 
             // imgMxdNameStatus
             // 
-            this.imgMxdNameStatus.Image = global::MapActionToolbars.Properties.Resources.cross_17px;
+            this.imgMxdNameStatus.Image = global::MapActionToolbar_Forms.Properties.Resources.cross_17px;
             this.imgMxdNameStatus.Location = new System.Drawing.Point(116, 111);
             this.imgMxdNameStatus.Name = "imgMxdNameStatus";
             this.imgMxdNameStatus.Size = new System.Drawing.Size(20, 20);
@@ -393,7 +393,7 @@ private void InitializeComponent()
             // 
             // imgQRCodeStatus
             // 
-            this.imgQRCodeStatus.Image = global::MapActionToolbars.Properties.Resources.cross_17px;
+            this.imgQRCodeStatus.Image = global::MapActionToolbar_Forms.Properties.Resources.cross_17px;
             this.imgQRCodeStatus.Location = new System.Drawing.Point(116, 22);
             this.imgQRCodeStatus.Name = "imgQRCodeStatus";
             this.imgQRCodeStatus.Size = new System.Drawing.Size(20, 20);
diff --git a/arcgis10_mapping_tools/MapActionToolbars/frmCheckElements.cs b/arcgis10_mapping_tools/MapActionToolbars/frmCheckElements.cs
index 06408ba0..9532a129 100644
--- a/arcgis10_mapping_tools/MapActionToolbars/frmCheckElements.cs
+++ b/arcgis10_mapping_tools/MapActionToolbars/frmCheckElements.cs
@@ -7,16 +7,20 @@
 using System.Text;
 using System.Windows.Forms;
 using ESRI.ArcGIS.ArcMapUI;
+using ESRI.ArcGIS.Framework;
 
-namespace MapActionToolbars
+namespace MapActionToolbar_Forms
 {
     public partial class frmCheckElements : Form
     {
 
-        private static IMxDocument _pMxDoc = ArcMap.Application.Document as IMxDocument;
+        // private static IMxDocument _pMxDoc = ArcMap.Application.Document as IMxDocument;
+        // this is not available when not auto-generated by the addin framework
+        private IApplication _mApplication;
 
-        public frmCheckElements()
+        public frmCheckElements(IApplication arcMapApp)
         {
+            _mApplication = arcMapApp;
             InitializeComponent();
         }
 
@@ -24,12 +28,14 @@ private void btnClose_Click(object sender, EventArgs e)
         {
             this.Close();
         }
-
+        
         private void frmCheckElements_Load(object sender, EventArgs e)
         {
             //Call the MapAction class library and the getLayoutElements function that returns a dictionare of the key value
             //pairs of each text element in the layout
-            Dictionary<string, string> dict = MapAction.PageLayoutProperties.getLayoutTextElements(_pMxDoc, "Main map");
+
+            IMxDocument _mxDoc = _mApplication.Document as IMxDocument;
+            Dictionary<string, string> dict = MapActionToolbar_Core.PageLayoutProperties.getLayoutTextElements(_mxDoc, "Main map");
             
             //Check for the presence of text element items in the layout, if present change image to tick
             if (dict.ContainsKey("title"))
@@ -97,7 +103,7 @@ private void frmCheckElements_Load(object sender, EventArgs e)
                 imgLanguageStatus.Image = Properties.Resources.tick_17px;
             }
 
-            List<string> pictureElements = MapAction.PageLayoutProperties.getLayoutPictureElements(_pMxDoc, "Main map");
+            List<string> pictureElements = MapActionToolbar_Core.PageLayoutProperties.getLayoutPictureElements(_mxDoc, "Main map");
             if (pictureElements.Contains("qr_code"))
             {
                 imgQRCodeStatus.Image = Properties.Resources.tick_17px;
diff --git a/arcgis10_mapping_tools/MapActionToolbars/frmEvent.Designer.cs b/arcgis10_mapping_tools/MapActionToolbars/frmEvent.Designer.cs
index 12acc634..5d95fa5c 100644
--- a/arcgis10_mapping_tools/MapActionToolbars/frmEvent.Designer.cs
+++ b/arcgis10_mapping_tools/MapActionToolbars/frmEvent.Designer.cs
@@ -1,4 +1,4 @@
-namespace MapActionToolbars
+namespace MapActionToolbar_Forms
 {
     partial class frmEvent
     {
diff --git a/arcgis10_mapping_tools/MapActionToolbars/frmEvent.cs b/arcgis10_mapping_tools/MapActionToolbars/frmEvent.cs
index 998d1b33..e53e84d3 100644
--- a/arcgis10_mapping_tools/MapActionToolbars/frmEvent.cs
+++ b/arcgis10_mapping_tools/MapActionToolbars/frmEvent.cs
@@ -9,9 +9,9 @@
 using System.Windows.Forms;
 using System.Diagnostics;
 using System.Configuration;
-using MapAction;
+using MapActionToolbar_Core;
 
-namespace MapActionToolbars
+namespace MapActionToolbar_Forms
 {
     public partial class frmEvent : Form
     {
@@ -33,13 +33,13 @@ public partial class frmEvent : Form
 
         private Boolean _configJsonEditState = false;
         private Boolean _configJsonNewFile = false;
-        private MapAction.LanguageCodeLookup languageCodeLookup = null;
-        private MapAction.Countries countries = null;
+        private MapActionToolbar_Core.LanguageCodeLookup languageCodeLookup = null;
+        private MapActionToolbar_Core.Countries countries = null;
         private MapActionToolbarConfig mapActionToolbarConfig = null;
 
         public frmEvent()
         {
-            this.mapActionToolbarConfig = MapAction.Utilities.getToolboxConfig();
+            this.mapActionToolbarConfig = MapActionToolbar_Core.Utilities.getToolboxConfig();
 
             if (this.mapActionToolbarConfig.Tools.Count == 0)
             {
@@ -47,15 +47,15 @@ public frmEvent()
             }
             else
             {
-                countries = MapAction.Utilities.getCountries();
+                countries = MapActionToolbar_Core.Utilities.getCountries();
 
-                string path = MapAction.Utilities.getCrashMoveFolderPath();
+                string path = MapActionToolbar_Core.Utilities.getCrashMoveFolderPath();
 
                 string languageFilePath = System.IO.Path.Combine(path, languageCodesXMLFileName);
-                this.languageCodeLookup = MapAction.Utilities.getLanguageCodeValues(languageFilePath);
+                this.languageCodeLookup = MapActionToolbar_Core.Utilities.getLanguageCodeValues(languageFilePath);
                 this._defaultSourceOrganisation = this.mapActionToolbarConfig.TextBoxItem(ToolName, OrganisationComponentName);
                 this._defaultDisclaimerText = this.mapActionToolbarConfig.TextBoxItem(ToolName, DisclaimerTextComponentName);
-                this._defaultMapRootUrl = MapAction.Utilities.getMDRUrlRoot();
+                this._defaultMapRootUrl = MapActionToolbar_Core.Utilities.getMDRUrlRoot();
                 this._defaultSourceOrganisationUrl = this.mapActionToolbarConfig.TextBoxItem(ToolName, OrganisationUrlComponentName);
 
                 InitializeComponent();
@@ -94,13 +94,13 @@ private void btnSave_Click(object sender, EventArgs e)
             {
                 if (_configJsonEditState != false)
                 {
-                    MapAction.Utilities.setCrashMovePathTest(tbxPathToCrashMove.Text);
+                    MapActionToolbar_Core.Utilities.setCrashMovePathTest(tbxPathToCrashMove.Text);
                     createConfigJson(_configJsonNewFile);
                 }
                 else if (_configJsonEditState != true)
                 {
                     //Save the path of the config file to the applicaton settings file
-                    MapAction.Utilities.setCrashMovePathTest(tbxPathToCrashMove.Text);
+                    MapActionToolbar_Core.Utilities.setCrashMovePathTest(tbxPathToCrashMove.Text);
                     MessageBox.Show("Config file path successfully updated.", "Config file path",
                         MessageBoxButtons.OK, MessageBoxIcon.Information);
                 }
@@ -111,16 +111,16 @@ private void btnSave_Click(object sender, EventArgs e)
         private void frmEvent_Load(object sender, EventArgs e)
         {
             //get the preset path from the configuration file
-            string path = MapAction.Utilities.getCrashMoveFolderPath();
-            string filepath = MapAction.Utilities.getEventConfigFilePath();
+            string path = MapActionToolbar_Core.Utilities.getCrashMoveFolderPath();
+            string filepath = MapActionToolbar_Core.Utilities.getEventConfigFilePath();
             //Check if the config file has been set and if it exists
-            if (@path != "" && !MapAction.Utilities.detectEventConfig())
+            if (@path != "" && !MapActionToolbar_Core.Utilities.detectEventConfig())
             {
                 //If not, set the dialog to empty
                 tbxPathToCrashMove.Text = "< File moved or deleted: " + path + " >";
                 populateDialogDefaultValues();
             }
-            else if (!MapAction.Utilities.detectEventConfig())
+            else if (!MapActionToolbar_Core.Utilities.detectEventConfig())
             {
                 //If the path is set and file exists, set the textbox to the path
                 tbxPathToCrashMove.Text = string.Empty;
@@ -241,7 +241,7 @@ private void clearAllChildControls(Control parent)
         //##alpha method
         public void populateDialogExistingConfigJson(string path = null)
         {
-            EventConfig newConfig = MapAction.Utilities.getEventConfigValues(path);
+            EventConfig newConfig = MapActionToolbar_Core.Utilities.getEventConfigValues(path);
 
             //Populate the text boxes with the values from the dictionary
             tbxOperationName.Text = newConfig.OperationName;
@@ -314,7 +314,7 @@ public Boolean createConfigJson(Boolean newJson)
                 //Call the MapAction create event config method on the utilities class
                 try
                 {
-                    savedPath = MapAction.Utilities.createEventConfig(config, path, "event_description");
+                    savedPath = MapActionToolbar_Core.Utilities.createEventConfig(config, path, "event_description");
                 }
                 catch (Exception error)
                 {
diff --git a/arcgis10_mapping_tools/MapActionToolbars/frmExportMain.Designer.cs b/arcgis10_mapping_tools/MapActionToolbars/frmExportMain.Designer.cs
index c96a121c..a589934f 100644
--- a/arcgis10_mapping_tools/MapActionToolbars/frmExportMain.Designer.cs
+++ b/arcgis10_mapping_tools/MapActionToolbars/frmExportMain.Designer.cs
@@ -1,4 +1,4 @@
-namespace MapActionToolbars
+namespace MapActionToolbar_Forms
 {
     partial class frmExportMain
     {
@@ -1145,7 +1145,7 @@ private void InitializeComponent()
             // 
             // btnExportLeft
             // 
-            this.btnExportLeft.Image = global::MapActionToolbars.Properties.Resources.left_button_20x20;
+            this.btnExportLeft.Image = global::MapActionToolbar_Forms.Properties.Resources.left_button_20x20;
             this.btnExportLeft.Location = new System.Drawing.Point(304, 430);
             this.btnExportLeft.Name = "btnExportLeft";
             this.btnExportLeft.Size = new System.Drawing.Size(30, 30);
@@ -1170,7 +1170,7 @@ private void InitializeComponent()
             // 
             // btnUserRight
             // 
-            this.btnUserRight.Image = global::MapActionToolbars.Properties.Resources.right_button_20x20;
+            this.btnUserRight.Image = global::MapActionToolbar_Forms.Properties.Resources.right_button_20x20;
             this.btnUserRight.Location = new System.Drawing.Point(341, 430);
             this.btnUserRight.Name = "btnUserRight";
             this.btnUserRight.Size = new System.Drawing.Size(30, 30);
@@ -1180,7 +1180,7 @@ private void InitializeComponent()
             // 
             // btnUserLeft
             // 
-            this.btnUserLeft.Image = global::MapActionToolbars.Properties.Resources.left_button_20x20;
+            this.btnUserLeft.Image = global::MapActionToolbar_Forms.Properties.Resources.left_button_20x20;
             this.btnUserLeft.Location = new System.Drawing.Point(304, 430);
             this.btnUserLeft.Name = "btnUserLeft";
             this.btnUserLeft.Size = new System.Drawing.Size(30, 30);
@@ -1447,7 +1447,7 @@ private void InitializeComponent()
             // 
             // button1
             // 
-            this.button1.Image = global::MapActionToolbars.Properties.Resources.right_button_20x20;
+            this.button1.Image = global::MapActionToolbar_Forms.Properties.Resources.right_button_20x20;
             this.button1.Location = new System.Drawing.Point(341, 430);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(30, 30);
@@ -1457,7 +1457,7 @@ private void InitializeComponent()
             // 
             // button2
             // 
-            this.button2.Image = global::MapActionToolbars.Properties.Resources.left_button_20x20;
+            this.button2.Image = global::MapActionToolbar_Forms.Properties.Resources.left_button_20x20;
             this.button2.Location = new System.Drawing.Point(304, 430);
             this.button2.Name = "button2";
             this.button2.Size = new System.Drawing.Size(30, 30);
@@ -1511,7 +1511,7 @@ private void InitializeComponent()
             // 
             // btnLayoutRight
             // 
-            this.btnLayoutRight.Image = global::MapActionToolbars.Properties.Resources.right_button_20x20;
+            this.btnLayoutRight.Image = global::MapActionToolbar_Forms.Properties.Resources.right_button_20x20;
             this.btnLayoutRight.Location = new System.Drawing.Point(341, 430);
             this.btnLayoutRight.Name = "btnLayoutRight";
             this.btnLayoutRight.Size = new System.Drawing.Size(30, 30);
diff --git a/arcgis10_mapping_tools/MapActionToolbars/frmExportMain.cs b/arcgis10_mapping_tools/MapActionToolbars/frmExportMain.cs
index 2614caee..efcee522 100644
--- a/arcgis10_mapping_tools/MapActionToolbars/frmExportMain.cs
+++ b/arcgis10_mapping_tools/MapActionToolbars/frmExportMain.cs
@@ -21,16 +21,17 @@
 using ESRI.ArcGIS.Display;
 using ESRI.ArcGIS.DisplayUI;
 using ESRI.ArcGIS.Framework;
-using MapAction;
+using MapActionToolbar_Core;
 
-namespace MapActionToolbars
+namespace MapActionToolbar_Forms
 {
     public partial class frmExportMain : Form
     {
         //Set the dataframe that you are searching for in the layouts.  This is used in many methods below.
         //Need a better solution for sorting this out
         private static string _targetMapFrame = "Main map";
-        private static IMxDocument _pMxDoc = ArcMap.Application.Document as IMxDocument;
+        //private static IMxDocument _pMxDoc = ArcMap.Application.Document as IMxDocument;
+        private static IApplication _mApplication;
         
         //create a variable to hold the status of each validation check
         private string _languageISO2;
@@ -65,21 +66,23 @@ public partial class frmExportMain : Form
 
         private string _labelLanguage;
         private string _mapRootURL = "";
-        private MapAction.LanguageCodeLookup languageCodeLookup = null;
+        private MapActionToolbar_Core.LanguageCodeLookup languageCodeLookup = null;
         private MapActionToolbarConfig mapActionToolbarConfig = null;
         private CrashMoveFolderConfig crashMoveFolder = null;
 
-        public frmExportMain()
+        // new constructor which takes a reference to the IApplication the form should be associated with
+        public frmExportMain(IApplication arcMapApp)
         {
-            string path = MapAction.Utilities.getCrashMoveFolderConfigFilePath();
+            _mApplication = arcMapApp;
+            string path = MapActionToolbar_Core.Utilities.getCrashMoveFolderConfigFilePath();
 
-            if (MapAction.Utilities.detectCrashMoveFolderConfig())
+            if (MapActionToolbar_Core.Utilities.detectCrashMoveFolderConfig())
             {
                 string languageFilePath = System.IO.Path.Combine(path, _languageCodesXmlFileName);
-                this.languageCodeLookup = MapAction.Utilities.getLanguageCodeValues(languageFilePath);
-                this.mapActionToolbarConfig = MapAction.Utilities.getToolboxConfig();
+                this.languageCodeLookup = MapActionToolbar_Core.Utilities.getLanguageCodeValues(languageFilePath);
+                this.mapActionToolbarConfig = MapActionToolbar_Core.Utilities.getToolboxConfig();
 
-                this.crashMoveFolder = MapAction.Utilities.getCrashMoveFolderConfigValues(path);
+                this.crashMoveFolder = MapActionToolbar_Core.Utilities.getCrashMoveFolderConfigValues(path);
                 
                 if (this.mapActionToolbarConfig.Tools.Count > 0)
                 {
@@ -128,9 +131,9 @@ private void btnExportZipPath_Click(object sender, EventArgs e)
             {
                 dlg.SelectedPath = @tbxExportZipPath.Text;
             }
-            else if (Directory.Exists(@MapAction.Utilities.getCrashMoveFolderPath()))
+            else if (Directory.Exists(MapActionToolbar_Core.Utilities.getCrashMoveFolderPath()))
             {
-                dlg.SelectedPath = @MapAction.Utilities.getCrashMoveFolderPath();
+                dlg.SelectedPath = MapActionToolbar_Core.Utilities.getCrashMoveFolderPath();
             }
             else
             {
@@ -155,19 +158,20 @@ private void btnClose_Click(object sender, EventArgs e)
         private void frmMain_Load(object sender, EventArgs e)
         {
             //Form validation methods
-            _titleValidationResult = FormValidationExport.validateMapTitle(tbxMapTitle, eprMaptitleWarning, eprMapTitleError);
-            _summaryValidationResult = FormValidationExport.validateMapSummary(tbxMapSummary, eprMapSummaryWarning, eprMapSummaryError);
-            _mapDocumentValidationResult = FormValidationExport.validateMapDocument(tbxMapDocument, eprMapDocumentWarning, eprMapDocumentError);
-            _datumValidationResult = FormValidationExport.validateDatum(tbxDatum, eprDatumWarning, eprDatumError);
-            _projectionValidationResult = FormValidationExport.validateProjection(tbxProjection, eprProjectionWarning, eprProjectionError);
-            _scaleValidationResult = FormValidationExport.validateScale(tbxScale, eprScaleWarning, eprScaleError);
+            IMxDocument mxDoc = _mApplication.Document as IMxDocument;
+            _titleValidationResult = FormValidationExport.validateMapTitle(mxDoc, tbxMapTitle, eprMaptitleWarning, eprMapTitleError);
+            _summaryValidationResult = FormValidationExport.validateMapSummary(mxDoc, tbxMapSummary, eprMapSummaryWarning, eprMapSummaryError);
+            _mapDocumentValidationResult = FormValidationExport.validateMapDocument(_mApplication, tbxMapDocument, eprMapDocumentWarning, eprMapDocumentError);
+            _datumValidationResult = FormValidationExport.validateDatum(mxDoc, tbxDatum, eprDatumWarning, eprDatumError);
+            _projectionValidationResult = FormValidationExport.validateProjection(mxDoc, tbxProjection, eprProjectionWarning, eprProjectionError);
+            _scaleValidationResult = FormValidationExport.validateScale(mxDoc, tbxScale, eprScaleWarning, eprScaleError);
             _dateValidationResult = FormValidationExport.validateDate(tbxDate, eprDateWarning, eprDateError);
             _timeValidationResult = FormValidationExport.validateTime(tbxTime, eprTimeWarning, eprTimeError);
-            _paperSizeValidationResult = FormValidationExport.validatePaperSize(tbxPaperSize, eprPaperWarning, eprPaperError);
+            _paperSizeValidationResult = FormValidationExport.validatePaperSize(mxDoc, tbxPaperSize, eprPaperWarning, eprPaperError);
             _imageryDateValidationResult = FormValidationExport.validateImageryDate(tbxImageDate, eprImageryDate);
-            _dataSourcesValidationResult = FormValidationExport.validateDataSources(tbxDataSources, eprDataSourcesWarning, eprDataSourcesError);
+            _dataSourcesValidationResult = FormValidationExport.validateDataSources(mxDoc, tbxDataSources, eprDataSourcesWarning, eprDataSourcesError);
             _operationIdValidationResult = FormValidationExport.validateOperationId(tbxOperationId, eprOperationIdWarning, eprOperationIdError);
-            _glideNumberValidationResult = FormValidationExport.validateGlideNumber(tbxGlideNo, eprGlideNumberWarning, eprGlideNumberError);
+            _glideNumberValidationResult = FormValidationExport.validateGlideNumber(mxDoc, tbxGlideNo, eprGlideNumberWarning, eprGlideNumberError);
             _locationValidationResult = FormValidationExport.validateLocation(tbxImageLocation, eprLocationWarning);
             _themeValidationResult = FormValidationExport.validateTheme(checkedListBoxThemes, eprThemeWarning);
             _countryValidationResult = FormValidationExport.validateCountry(tbxCountry, eprCountryWarning);
@@ -179,7 +183,8 @@ private void frmMain_Load(object sender, EventArgs e)
 
             var dict = new Dictionary<string, string>();
             // added extra parameter to say that in this case all of the ESRI markup should be stripped from the label values
-            dict = MapAction.PageLayoutProperties.getLayoutTextElements(_pMxDoc, _targetMapFrame, true);
+            IMxDocument doc = _mApplication.Document as IMxDocument;
+            dict = MapActionToolbar_Core.PageLayoutProperties.getLayoutTextElements(doc, _targetMapFrame, true);
 
             //Update form text boxes with values from the map
             if (dict.ContainsKey("title")) { tbxMapTitle.Text = dict["title"]; }
@@ -208,16 +213,16 @@ private void frmMain_Load(object sender, EventArgs e)
             tbxLanguage.Text = _labelLanguage;
 
             // Update form values from the config xml
-            string path = MapAction.Utilities.getCrashMoveFolderPath();
+            string path = MapActionToolbar_Core.Utilities.getCrashMoveFolderPath();
             string filePath = System.IO.Path.Combine(path, _eventConfigJsonFileName);
-            EventConfig config = MapAction.Utilities.getEventConfigValues(filePath);
+            EventConfig config = MapActionToolbar_Core.Utilities.getEventConfigValues(filePath);
             tbxGlideNo.Text = config.GlideNumber;
-            tbxCountry.Text = MapAction.Utilities.getCountries().nameFromAlpha3Code(config.AffectedCountryIso3);
+            tbxCountry.Text = MapActionToolbar_Core.Utilities.getCountries().nameFromAlpha3Code(config.AffectedCountryIso3);
 
             this._mapRootURL = config.DefaultPublishingBaseUrl;
             if (this._mapRootURL.Length == 0)
             {
-                this._mapRootURL = MapAction.Utilities.getMDRUrlRoot();
+                this._mapRootURL = MapActionToolbar_Core.Utilities.getMDRUrlRoot();
             }
 
             string operational_id = config.OperationId.ToLower();
@@ -234,7 +239,7 @@ private void frmMain_Load(object sender, EventArgs e)
 
             // Set the spatial reference information on load
             var dictSpatialRef = new Dictionary<string, string>();
-            dictSpatialRef  = MapAction.Utilities.getDataFrameSpatialReference(_pMxDoc, _targetMapFrame);
+            dictSpatialRef  = MapActionToolbar_Core.Utilities.getDataFrameSpatialReference(doc, _targetMapFrame);
             tbxDatum.Text = dictSpatialRef["datum"];
             tbxProjection.Text = dictSpatialRef["projection"];
 
@@ -248,12 +253,12 @@ private void frmMain_Load(object sender, EventArgs e)
             this.nudEmfResolution.Enabled = false;
             this.nudKmlResolution.Enabled = false;
 
-            tbxPaperSize.Text = MapAction.Utilities.getPageSize(_pMxDoc as IMapDocument, _targetMapFrame);
-            tbxScale.Text = MapAction.Utilities.getScale(_pMxDoc as IMapDocument, _targetMapFrame);
+            tbxPaperSize.Text = MapActionToolbar_Core.Utilities.getPageSize(doc as IMapDocument, _targetMapFrame);
+            tbxScale.Text = MapActionToolbar_Core.Utilities.getScale(doc as IMapDocument, _targetMapFrame);
 
             // Check if Data Driven Page and enable dropdown accordingly
             IMapDocument mapDoc;
-            mapDoc = (_pMxDoc as MxDocument) as IMapDocument;
+            mapDoc = (doc as MxDocument) as IMapDocument;
             tbxMapbookMode.Enabled = PageLayoutProperties.isDataDrivenPagesEnabled(mapDoc);
         }
 
@@ -412,9 +417,12 @@ private void btnCreateZip_Click(object sender, EventArgs e)
             // TODO:
             // APS Is there a good reasons for retreving the reference to the IMxDocument
             // via the ArcMap Application? Why not use the `frmExportMain._pMxDoc` member instead?
-            // Alternatively is the `frmExportMain._pMxDoc` member used or required?
-            IMxDocument pMxDoc = ArcMap.Application.Document as IMxDocument;
-            IActiveView pActiveView = pMxDoc.ActiveView;
+            // HSG: this has been changed now, in that the application is stored as a member 
+            // not the document (because when not running as an addin we don't have the 
+            // automatically set reference to the application so we make our own), and we 
+            // retrieve the document each time we need it. 
+            IMxDocument doc = _mApplication.Document as IMxDocument;
+            IActiveView pActiveView = doc.ActiveView;
             // Ssetup dictionaries for metadata XML
             Dictionary<string, string> dictFilePaths;
             // Create a dictionary to store the image file sizes to add to the output xml
@@ -423,12 +431,12 @@ private void btnCreateZip_Click(object sender, EventArgs e)
             // Create a dictionary to get and store the map frame extents to pass to the output xml
 
             IMapDocument mapDoc;
-            mapDoc = (pMxDoc as MxDocument) as IMapDocument;
+            mapDoc = doc as IMapDocument;
             bool isDDP = PageLayoutProperties.isDataDrivenPagesEnabled(mapDoc);
             Dictionary<string, string> dictFrameExtents = Utilities.getMapFrameWgs84BoundingBox(mapDoc, "Main map");
 
             // Update QR Code
-            updateQRCode(ArcMap.Application.Document.Title);
+            updateQRCode((doc as IDocument).Title);
 
             if (!isDDP) // Need a way to do this - the form elements are all disabled before export - see ^^
             {
@@ -440,21 +448,21 @@ private void btnCreateZip_Click(object sender, EventArgs e)
                 // values, and b) if we accidentally call it twice with same key we get an exception
                 foreach (var kvp in dictFilePaths)
                 {
-                    dictImageFileSizes[kvp.Key] = MapAction.Utilities.getFileSize(kvp.Value);
+                    dictImageFileSizes[kvp.Key] = MapActionToolbar_Core.Utilities.getFileSize(kvp.Value);
                 }
                 if (checkBoxKml.Checked)
                 {
                     System.Windows.Forms.Application.DoEvents();
 
                     // Export KML
-                    IMapDocument pMapDoc = (IMapDocument)pMxDoc;
+                    IMapDocument pMapDoc = (IMapDocument)doc;
                     string kmzPathFileName = exportPathFileName + ".kmz";
                     string kmzScale;
 
                     if (dictFrameExtents.ContainsKey("scale")) { kmzScale = dictFrameExtents["scale"]; } else { kmzScale = null; };
 
                     // TODO move this to the MapImageExporter class too, for now it is still in the static MapExport class
-                    MapAction.MapExport.exportMapFrameKmlAsRaster(pMapDoc, "Main map", @kmzPathFileName, kmzScale, nudKmlResolution.Value.ToString());
+                    MapActionToolbar_Core.MapExport.exportMapFrameKmlAsRaster(pMapDoc, "Main map", @kmzPathFileName, kmzScale, nudKmlResolution.Value.ToString());
                     // Add the xml path to the dictFilePaths, which is the input into the creatZip method
                     dictFilePaths["kmz"] = kmzPathFileName;
                 }
@@ -462,7 +470,7 @@ private void btnCreateZip_Click(object sender, EventArgs e)
             else
             {
                 //// Data driven pages
-                IMapDocument pMapDoc = (IMapDocument)pMxDoc;
+                IMapDocument pMapDoc = (IMapDocument)doc;
                 MapImageExporter mie = new MapImageExporter(pMapDoc, exportPathFileName, "Main map");
                 // if exact match do a multifile export, else default to single file.
                 bool isMultiplePage = (tbxMapbookMode.Text == "Multiple PDF Files");
@@ -484,14 +492,14 @@ private void btnCreateZip_Click(object sender, EventArgs e)
                 dictImageFileSizes["kmz"] = 0;
             }
             // Get the mxd filename
-            string mxdName = ArcMap.Application.Document.Title;
+            string mxdName = (doc as IDocument).Title;
             System.Windows.Forms.Application.DoEvents();
             // Create the output xml file & return the xml path           
             string xmlPath = string.Empty;
             try
             {
                 Dictionary<string, string> dict = getExportToolValues(dictImageFileSizes, dictFilePaths, dictFrameExtents, mxdName);
-                xmlPath = MapAction.Utilities.createXML(dict, "mapdata", path, System.IO.Path.GetFileNameWithoutExtension(tbxMapDocument.Text), 2);
+                xmlPath = MapActionToolbar_Core.Utilities.createXML(dict, "mapdata", path, System.IO.Path.GetFileNameWithoutExtension(tbxMapDocument.Text), 2);
             }
             catch (Exception xml_e)
             {
@@ -506,7 +514,7 @@ private void btnCreateZip_Click(object sender, EventArgs e)
             // Create zip
             // TODO Note that currently the createZip will zip the xml, jpeg, and pdf. Not the emf! 
             // So why are we making it??
-            MapAction.MapExport.createZip(dictFilePaths);
+            MapActionToolbar_Core.MapExport.createZip(dictFilePaths);
             
             try
             {
@@ -535,7 +543,7 @@ private void btnCreateZip_Click(object sender, EventArgs e)
             // If open explorer checkbox is ticked, open windows explorer to the directory 
             if (chkOpenExplorer.Checked)
             {
-                MapAction.MapExport.openExplorerDirectory(tbxExportZipPath.Text);
+                MapActionToolbar_Core.MapExport.openExplorerDirectory(tbxExportZipPath.Text);
             }
             sw.Stop();
             string timeTaken = Math.Round((sw.Elapsed.TotalMilliseconds / 1000),2).ToString();
@@ -546,7 +554,8 @@ private bool updateQRCode(string mxdName)
         {
             bool qrCodeUpdated = false;
             // Update QR Code
-            IPageLayout pLayout = _pMxDoc.PageLayout;
+            IMxDocument doc = _mApplication.Document as IMxDocument;
+            IPageLayout pLayout = doc.PageLayout;
             IGraphicsContainer pGraphics = pLayout as IGraphicsContainer;
             pGraphics.Reset();
 
@@ -679,7 +688,8 @@ private Dictionary<string, string> getExportToolValues(
         /// </remarks
         private Dictionary<string, string> exportAllImages()
         {
-            IMapDocument pMapDoc = ArcMap.Application.Document as IMapDocument;
+            IMxDocument doc = _mApplication.Document as IMxDocument;
+            IMapDocument pMapDoc = doc as IMapDocument;
             //IActiveView pActiveView = pMxDoc.ActiveView;
             var dict = new Dictionary<string, string>();
 
@@ -710,7 +720,7 @@ private Dictionary<string, string> exportAllImages()
                 // export the thumbnail, using the new functionality of specifying a pixel size rather than a dpi
                 XYDimensions thumbSize = new XYDimensions()
                     {
-                        Width = MapAction.Properties.Settings.Default.thumbnail_width_px,
+                        Width = MapActionToolbar_Core.Properties.Settings.Default.thumbnail_width_px,
                         Height = null // export will be constrained by width only
                     };
                 dict[MapActionExportTypes.png_thumbnail_zip.ToString()] =  
@@ -787,8 +797,9 @@ private string getExportPathFileName(string path, string documentName)
         public static string updateScale()
         
         {
-            string pageSize = MapAction.Utilities.getPageSize(_pMxDoc as IMapDocument, "Main map");
-            string scale = MapAction.Utilities.getScale(_pMxDoc as IMapDocument, "Main map");
+            IMapDocument doc = _mApplication.Document as IMapDocument;
+            string pageSize = MapActionToolbar_Core.Utilities.getPageSize(doc, "Main map");
+            string scale = MapActionToolbar_Core.Utilities.getScale(doc, "Main map");
             string scaleString = scale + " (At " + pageSize + ")";
             return scaleString;
         }
@@ -796,11 +807,11 @@ public static string updateScale()
         public static string getGlideNo()
         {
             string GlideNo = string.Empty;
-            string path = MapAction.Utilities.getEventConfigFilePath();
+            string path = MapActionToolbar_Core.Utilities.getEventConfigFilePath();
 
-            if (MapAction.Utilities.detectEventConfig())
+            if (MapActionToolbar_Core.Utilities.detectEventConfig())
             {
-                EventConfig config = MapAction.Utilities.getEventConfigValues(path);
+                EventConfig config = MapActionToolbar_Core.Utilities.getEventConfigValues(path);
                 GlideNo = config.GlideNumber;
             }
             return GlideNo;
@@ -810,13 +821,13 @@ public static string getGlideNo()
         public static string getExportDirectory()
         {
             string exportDirectory = string.Empty;
-            string path = MapAction.Utilities.getCrashMoveFolderConfigFilePath();
+            string path = MapActionToolbar_Core.Utilities.getCrashMoveFolderConfigFilePath();
 
-            if (MapAction.Utilities.detectCrashMoveFolderConfig())
+            if (MapActionToolbar_Core.Utilities.detectCrashMoveFolderConfig())
             {
-                CrashMoveFolderConfig config = MapAction.Utilities.getCrashMoveFolderConfigValues(path);
+                CrashMoveFolderConfig config = MapActionToolbar_Core.Utilities.getCrashMoveFolderConfigValues(path);
                 
-                exportDirectory = System.IO.Path.Combine(MapAction.Utilities.getCrashMoveFolderPath(), config.ExportDirectory);           
+                exportDirectory = System.IO.Path.Combine(MapActionToolbar_Core.Utilities.getCrashMoveFolderPath(), config.ExportDirectory);           
             }
             exportDirectory = exportDirectory.Replace('/', '\\');
             return exportDirectory;
@@ -825,7 +836,7 @@ public static string getExportDirectory()
 
         public static string getSpatialReference()
         {
-            Dictionary<string, string> dictSpatialRef = MapAction.Utilities.getDataFrameSpatialReference(ArcMap.Application.Document as IMxDocument, "Main map");
+            Dictionary<string, string> dictSpatialRef = MapActionToolbar_Core.Utilities.getDataFrameSpatialReference(_mApplication.Document as IMxDocument, "Main map");
             string stringSpatialRef;
 
             if (dictSpatialRef["type"] == "Geographic")
@@ -850,12 +861,14 @@ public string getStatus()
 
         private void tbxMapTitle_TextChanged(object sender, EventArgs e)
         {
-            _titleValidationResult = FormValidationExport.validateMapTitle(tbxMapTitle, eprMaptitleWarning, eprMapTitleError);
+            _titleValidationResult = FormValidationExport.validateMapTitle(_mApplication.Document as IMxDocument, 
+                tbxMapTitle, eprMaptitleWarning, eprMapTitleError);
         }
 
         private void tbxMapSummary_TextChanged(object sender, EventArgs e)
         {
-            _summaryValidationResult = FormValidationExport.validateMapSummary(tbxMapSummary, eprMapSummaryWarning, eprMapSummaryError);
+            _summaryValidationResult = FormValidationExport.validateMapSummary(_mApplication.Document as IMxDocument, 
+                tbxMapSummary, eprMapSummaryWarning, eprMapSummaryError);
         }
 
         private void tbxImageDate_TextChanged(object sender, EventArgs e)
@@ -865,12 +878,14 @@ private void tbxImageDate_TextChanged(object sender, EventArgs e)
 
         private void tbxDataSources_TextChanged(object sender, EventArgs e)
         {
-            _dataSourcesValidationResult = FormValidationExport.validateDataSources(tbxDataSources, eprDataSourcesWarning, eprDataSourcesError);
+            _dataSourcesValidationResult = FormValidationExport.validateDataSources(_mApplication.Document as IMxDocument, 
+                tbxDataSources, eprDataSourcesWarning, eprDataSourcesError);
         }
 
         private void tbxPaperSize_TextChanged(object sender, EventArgs e)
         {
-            _paperSizeValidationResult = FormValidationExport.validatePaperSize(tbxPaperSize, eprPaperWarning, eprPaperError);
+            _paperSizeValidationResult = FormValidationExport.validatePaperSize(_mApplication.Document as IMxDocument, 
+                tbxPaperSize, eprPaperWarning, eprPaperError);
         }
 
         private void tbxTime_TextChanged(object sender, EventArgs e)
@@ -885,22 +900,26 @@ private void tbxDate_TextChanged(object sender, EventArgs e)
 
         private void tbxScale_TextChanged(object sender, EventArgs e)
         {
-            _scaleValidationResult = FormValidationExport.validateScale(tbxScale, eprScaleWarning, eprScaleError);
+            _scaleValidationResult = FormValidationExport.validateScale(_mApplication.Document as IMxDocument, 
+                tbxScale, eprScaleWarning, eprScaleError);
         }
 
         private void tbxProjection_TextChanged(object sender, EventArgs e)
         {
-            _projectionValidationResult = FormValidationExport.validateProjection(tbxProjection, eprProjectionWarning, eprProjectionError);
+            _projectionValidationResult = FormValidationExport.validateProjection(_mApplication.Document as IMxDocument, 
+                tbxProjection, eprProjectionWarning, eprProjectionError);
         }
 
         private void tbxDatum_TextChanged(object sender, EventArgs e)
         {
-            _datumValidationResult = FormValidationExport.validateDatum(tbxDatum, eprDatumWarning, eprDatumError);
+            _datumValidationResult = FormValidationExport.validateDatum(_mApplication.Document as IMxDocument, 
+                tbxDatum, eprDatumWarning, eprDatumError);
         }
 
         private void tbxMapDocument_TextChanged(object sender, EventArgs e)
         {
-            _mapDocumentValidationResult = FormValidationExport.validateMapDocument(tbxMapDocument, eprMapDocumentWarning, eprMapDocumentError);
+            _mapDocumentValidationResult = FormValidationExport.validateMapDocument(_mApplication, 
+                tbxMapDocument, eprMapDocumentWarning, eprMapDocumentError);
         }
 
         private void tbxOperationId_TextChanged(object sender, EventArgs e)
@@ -910,7 +929,8 @@ private void tbxOperationId_TextChanged(object sender, EventArgs e)
 
         private void tbxGlideNo_TextChanged(object sender, EventArgs e)
         {
-            _glideNumberValidationResult = FormValidationExport.validateGlideNumber(tbxGlideNo, eprGlideNumberWarning, eprGlideNumberError);
+            _glideNumberValidationResult = FormValidationExport.validateGlideNumber(_mApplication.Document as IMxDocument, 
+                tbxGlideNo, eprGlideNumberWarning, eprGlideNumberError);
         }
 
         private void tbxImageLocation_TextChanged(object sender, EventArgs e)
diff --git a/arcgis10_mapping_tools/MapActionToolbars/frmGenerationTool.Designer.cs b/arcgis10_mapping_tools/MapActionToolbars/frmGenerationTool.Designer.cs
index 4ce3a7ca..a2cfcffa 100644
--- a/arcgis10_mapping_tools/MapActionToolbars/frmGenerationTool.Designer.cs
+++ b/arcgis10_mapping_tools/MapActionToolbars/frmGenerationTool.Designer.cs
@@ -1,4 +1,4 @@
-namespace MapActionToolbars
+namespace MapActionToolbar_Forms
 {
     partial class frmGenerationTool
     {
diff --git a/arcgis10_mapping_tools/MapActionToolbars/frmGenerationTool.cs b/arcgis10_mapping_tools/MapActionToolbars/frmGenerationTool.cs
index 10659ce9..bc566a5a 100644
--- a/arcgis10_mapping_tools/MapActionToolbars/frmGenerationTool.cs
+++ b/arcgis10_mapping_tools/MapActionToolbars/frmGenerationTool.cs
@@ -21,10 +21,10 @@
 using ESRI.ArcGIS.Framework;
 using ESRI.ArcGIS.esriSystem;
 using ESRI.ArcGIS.Output;
-using MapAction;
+using MapActionToolbar_Core;
 
 
-namespace MapActionToolbars
+namespace MapActionToolbar_Forms
 {
     public partial class frmGenerationTool : Form
     {
@@ -34,17 +34,19 @@ public partial class frmGenerationTool : Form
         private string layerPropertiesFullPath = "";
         private string layerDirectory = "";
         private Cookbook cookbook = null;
-        private static IMxDocument _pMxDoc = ArcMap.Application.Document as IMxDocument;
-        
-        public frmGenerationTool()
+        //private static IMxDocument _pMxDoc = ArcMap.Application.Document as IMxDocument;
+        private static IApplication _mApplication;
+
+        public frmGenerationTool(IApplication arcMapApp)
         {
+            _mApplication = arcMapApp;
             this.crashMoveFolder = Utilities.getCrashMoveFolderPath();
-            if (MapAction.Utilities.detectCrashMoveFolderConfig())
+            if (MapActionToolbar_Core.Utilities.detectCrashMoveFolderConfig())
             {
                 InitializeComponent();                
-                string path = MapAction.Utilities.getCrashMoveFolderConfigFilePath();
+                string path = MapActionToolbar_Core.Utilities.getCrashMoveFolderConfigFilePath();
 
-                CrashMoveFolderConfig config = MapAction.Utilities.getCrashMoveFolderConfigValues(path);
+                CrashMoveFolderConfig config = MapActionToolbar_Core.Utilities.getCrashMoveFolderConfigValues(path);
                 this.cookbookFullPath = System.IO.Path.Combine(this.crashMoveFolder, config.MapDefinitions);
                 this.layerPropertiesFullPath = System.IO.Path.Combine(this.crashMoveFolder, config.LayerProperties);
                 this.layerDirectory = System.IO.Path.Combine(this.crashMoveFolder, config.LayerRendering);
@@ -64,10 +66,10 @@ private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
 
         private void frmGenerationTool_Load(object sender, EventArgs e)
         {
-            string path = MapAction.Utilities.getCrashMoveFolderPath();
+            string path = MapActionToolbar_Core.Utilities.getCrashMoveFolderPath();
             string filePath = System.IO.Path.Combine(path, _eventConfigJsonFileName);
-            EventConfig config = MapAction.Utilities.getEventConfigValues(filePath);
-            tbxGeoExtent.Text = MapAction.Utilities.getCountries().nameFromAlpha3Code(config.AffectedCountryIso3);
+            EventConfig config = MapActionToolbar_Core.Utilities.getEventConfigValues(filePath);
+            tbxGeoExtent.Text = MapActionToolbar_Core.Utilities.getCountries().nameFromAlpha3Code(config.AffectedCountryIso3);
 
             cookbook = new Cookbook(this.cookbookFullPath);
 
diff --git a/arcgis10_mapping_tools/MapActionToolbars/frmLayoutMain.Designer.cs b/arcgis10_mapping_tools/MapActionToolbars/frmLayoutMain.Designer.cs
index 615c5dd4..0f719398 100644
--- a/arcgis10_mapping_tools/MapActionToolbars/frmLayoutMain.Designer.cs
+++ b/arcgis10_mapping_tools/MapActionToolbars/frmLayoutMain.Designer.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System;
 
-namespace MapActionToolbars
+namespace MapActionToolbar_Forms
 {
     partial class frmLayoutMain
     {
@@ -23,7 +23,7 @@ protected override void Dispose(bool disposing)
             }
             base.Dispose(disposing);
         }
-        private List<MapAction.LanguageConfig> languageDictionary;
+        private List<MapActionToolbar_Core.LanguageConfig> languageDictionary;
 
         #region Windows Form Designer generated code
 
@@ -174,7 +174,7 @@ private void InitializeComponent()
             // btnUpdateAll
             // 
             this.btnUpdateAll.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnUpdateAll.Image = global::MapActionToolbars.Properties.Resources.import20x20px;
+            this.btnUpdateAll.Image = global::MapActionToolbar_Forms.Properties.Resources.import20x20px;
             this.btnUpdateAll.Location = new System.Drawing.Point(120, 24);
             this.btnUpdateAll.Name = "btnUpdateAll";
             this.btnUpdateAll.Size = new System.Drawing.Size(34, 23);
@@ -184,7 +184,7 @@ private void InitializeComponent()
             // 
             // btnMapDocument
             // 
-            this.btnMapDocument.Image = global::MapActionToolbars.Properties.Resources.refresh17x17px;
+            this.btnMapDocument.Image = global::MapActionToolbar_Forms.Properties.Resources.refresh17x17px;
             this.btnMapDocument.Location = new System.Drawing.Point(304, 53);
             this.btnMapDocument.Name = "btnMapDocument";
             this.btnMapDocument.Size = new System.Drawing.Size(23, 23);
@@ -214,7 +214,7 @@ private void InitializeComponent()
             // 
             // btnSpatialReference
             // 
-            this.btnSpatialReference.Image = global::MapActionToolbars.Properties.Resources.refresh17x17px;
+            this.btnSpatialReference.Image = global::MapActionToolbar_Forms.Properties.Resources.refresh17x17px;
             this.btnSpatialReference.Location = new System.Drawing.Point(304, 82);
             this.btnSpatialReference.Name = "btnSpatialReference";
             this.btnSpatialReference.Size = new System.Drawing.Size(23, 23);
@@ -450,7 +450,7 @@ private void InitializeComponent()
             // tspBtnCheckElements
             // 
             this.tspBtnCheckElements.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.tspBtnCheckElements.Image = global::MapActionToolbars.Properties.Resources.gear_icon;
+            this.tspBtnCheckElements.Image = global::MapActionToolbar_Forms.Properties.Resources.gear_icon;
             this.tspBtnCheckElements.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.tspBtnCheckElements.Name = "tspBtnCheckElements";
             this.tspBtnCheckElements.Size = new System.Drawing.Size(23, 22);
@@ -465,7 +465,7 @@ private void InitializeComponent()
             // tspBtnClearForm
             // 
             this.tspBtnClearForm.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.tspBtnClearForm.Image = global::MapActionToolbars.Properties.Resources.clear_form_icon;
+            this.tspBtnClearForm.Image = global::MapActionToolbar_Forms.Properties.Resources.clear_form_icon;
             this.tspBtnClearForm.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.tspBtnClearForm.Name = "tspBtnClearForm";
             this.tspBtnClearForm.Size = new System.Drawing.Size(23, 22);
@@ -661,7 +661,7 @@ private void InitializeComponent()
             // btnUpdateAllTab2
             // 
             this.btnUpdateAllTab2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnUpdateAllTab2.Image = global::MapActionToolbars.Properties.Resources.import20x20px;
+            this.btnUpdateAllTab2.Image = global::MapActionToolbar_Forms.Properties.Resources.import20x20px;
             this.btnUpdateAllTab2.Location = new System.Drawing.Point(120, 19);
             this.btnUpdateAllTab2.Name = "btnUpdateAllTab2";
             this.btnUpdateAllTab2.Size = new System.Drawing.Size(34, 23);
@@ -671,7 +671,7 @@ private void InitializeComponent()
             // 
             // btnUpdateDisclaimer
             // 
-            this.btnUpdateDisclaimer.Image = global::MapActionToolbars.Properties.Resources.refresh17x17px;
+            this.btnUpdateDisclaimer.Image = global::MapActionToolbar_Forms.Properties.Resources.refresh17x17px;
             this.btnUpdateDisclaimer.Location = new System.Drawing.Point(304, 67);
             this.btnUpdateDisclaimer.Name = "btnUpdateDisclaimer";
             this.btnUpdateDisclaimer.Size = new System.Drawing.Size(23, 23);
@@ -691,7 +691,7 @@ private void InitializeComponent()
             // 
             // btnUpdateDonorCredits
             // 
-            this.btnUpdateDonorCredits.Image = global::MapActionToolbars.Properties.Resources.refresh17x17px;
+            this.btnUpdateDonorCredits.Image = global::MapActionToolbar_Forms.Properties.Resources.refresh17x17px;
             this.btnUpdateDonorCredits.Location = new System.Drawing.Point(304, 131);
             this.btnUpdateDonorCredits.Name = "btnUpdateDonorCredits";
             this.btnUpdateDonorCredits.Size = new System.Drawing.Size(23, 23);
diff --git a/arcgis10_mapping_tools/MapActionToolbars/frmLayoutMain.cs b/arcgis10_mapping_tools/MapActionToolbars/frmLayoutMain.cs
index 4f92ccce..22bb4766 100644
--- a/arcgis10_mapping_tools/MapActionToolbars/frmLayoutMain.cs
+++ b/arcgis10_mapping_tools/MapActionToolbars/frmLayoutMain.cs
@@ -16,13 +16,13 @@
 using ESRI.ArcGIS.DisplayUI;
 using ESRI.ArcGIS.Framework;
 using System.Diagnostics;
-using MapAction;
+using MapActionToolbar_Core;
 
-namespace MapActionToolbars
+namespace MapActionToolbar_Forms
 {
     public partial class frmLayoutMain : Form
     {
-        private static IMxDocument _pMxDoc = ArcMap.Application.Document as IMxDocument;
+        private static IApplication _mApplication;  // initialisation moved to  constructor for flexibility
         private List<string> languages;
         private string _languageIso2;
         private static string _operationId;
@@ -32,14 +32,23 @@ public partial class frmLayoutMain : Form
         private const string defaultMapNumber = "MA001";
         private const string defaultMapVersion = "1";
 
-        public frmLayoutMain()
-        {
-            string path = MapAction.Utilities.getCrashMoveFolderPath();
+        
+        /// <summary>
+        /// constructor taking a reference to the IApplication the form should be associated with
+        /// </summary>
+        /// <remarks>This is necessary because the IApplication object "ArcMap.Application" is provided by the addin framework and not 
+        /// available through the arcobjects BaseCommand / extension approach, so we need to be able to pass 
+        /// in the IApplication as a parameter when calling from there.</remarks>
+        /// <param name="arcMapApp"></param>
+        public frmLayoutMain(IApplication arcMapApp)
+        {
+            _mApplication = arcMapApp;//
+            string path = MapActionToolbar_Core.Utilities.getCrashMoveFolderPath();
             string filePath = System.IO.Path.Combine(path, languageConfigXmlFileName);
-            _mapRootURL = MapAction.Utilities.getMDRUrlRoot();
+            _mapRootURL = MapActionToolbar_Core.Utilities.getMDRUrlRoot();
 
             // Set up Language of labels
-            this.languageDictionary = MapAction.Utilities.getLanguageConfigValues(filePath);
+            this.languageDictionary = MapActionToolbar_Core.Utilities.getLanguageConfigValues(filePath);
             this.languages = new List<string>();
             for (int i = 0; i < languageDictionary.Count; i++)
             {
@@ -49,23 +58,23 @@ public frmLayoutMain()
             this.cboLabelLanguage.Items.AddRange(languages.ToArray());
         }
 
-
         //Gets the automated values for Tab 1 and populates each textbox
         private void btnUpdateAll_Click(object sender, EventArgs e)
         {
             //Call the MapAction class library and the getLayoutElements function that returns a dictionare of the key value
             //pairs of each text element in the layout
-            Dictionary<string, string> dict = MapAction.PageLayoutProperties.getLayoutTextElements(_pMxDoc, "Main map");
+            IMxDocument doc = _mApplication.Document as IMxDocument;
+            Dictionary<string, string> dict = MapActionToolbar_Core.PageLayoutProperties.getLayoutTextElements(doc, "Main map");
             
             tbxScale.Text = tbxScale.Text = updateScale();
             tbxSpatialReference.Text = getSpatialReference();
-            tbxMapDocument.Text = tbxMapDocument.Text = MapAction.PageLayoutProperties.getMxdTitle(ArcMap.Application);
+            tbxMapDocument.Text = tbxMapDocument.Text = MapActionToolbar_Core.PageLayoutProperties.getMxdTitle(_mApplication);
             tbxGlideNumber.Text = LayoutToolAutomatedValues.getGlideNo();
         }
 
         private void btnMapDocument_Click(object sender, EventArgs e)
         {
-            tbxMapDocument.Text = MapAction.PageLayoutProperties.getMxdTitle(ArcMap.Application);
+            tbxMapDocument.Text = MapActionToolbar_Core.PageLayoutProperties.getMxdTitle(_mApplication);
         }
 
         private void btnSpatialReference_Click(object sender, EventArgs e)
@@ -86,16 +95,16 @@ private void btnGlideNo_Click(object sender, EventArgs e)
         private void frmMain_Load(object sender, EventArgs e)
         {
             // Read the Operation Config file 
-            string path = MapAction.Utilities.getEventConfigFilePath();
-            if (MapAction.Utilities.detectEventConfig())
+            string path = MapActionToolbar_Core.Utilities.getEventConfigFilePath();
+            if (MapActionToolbar_Core.Utilities.detectEventConfig())
             {
-                EventConfig config = MapAction.Utilities.getEventConfigValues(path);
+                EventConfig config = MapActionToolbar_Core.Utilities.getEventConfigValues(path);
                 _languageIso2 = config.LanguageIso2;
                 _operationId = config.OperationId.ToLower();
                 _mapRootURL = config.DefaultPublishingBaseUrl;
                 if (_mapRootURL.Length == 0)
                 {
-                    _mapRootURL = MapAction.Utilities.getMDRUrlRoot();
+                    _mapRootURL = MapActionToolbar_Core.Utilities.getMDRUrlRoot();
                 }
             }
 
@@ -104,7 +113,7 @@ private void frmMain_Load(object sender, EventArgs e)
             FormValidationLayout.validateMapSummary(tbxSummary, eprMapSummary);
             FormValidationLayout.validateDataSources(tbxDataSources, eprDataSources);
             FormValidationLayout.validateMapNumber(tbxMapNumber, eprMapNumberWarning, eprMapNumberError);
-            FormValidationLayout.validateMapDocument(tbxMapDocument, eprMapDocumentWarning, eprMapDocumentError);
+            FormValidationLayout.validateMapDocument(_mApplication as IMxApplication, tbxMapDocument, eprMapDocumentWarning, eprMapDocumentError);
             FormValidationLayout.validateSpatialReference(tbxSpatialReference, eprSpatialReferenceWarning, eprSpatialReferenceError);
             FormValidationLayout.validateScaleText(tbxScale, eprScaleTextWarning, eprScaleTextError);
             FormValidationLayout.validateGlideNumber(tbxGlideNumber, eprGlideNumberWarning, eprSpatialReferenceError);
@@ -113,11 +122,11 @@ private void frmMain_Load(object sender, EventArgs e)
             FormValidationLayout.validateDonorCredit(tbxDonorCredit, eprDonorWarning, eprDonorError);
             FormValidationLayout.validateMapProducer(tbxMapProducer, eprProducedByWarning, eprProducedByError);
             FormValidationLayout.validateTimezone(tbxTimezone, eprTimezoneWarning, eprTimezoneError);
-            
+
             //Call the MapAction class library and the getLayoutElements function that returns a dictionare of the key value
             //pairs of each text element in the layout
-            //IMxDocument pMxDoc = ArcMap.Application.Document as IMxDocument;
-            Dictionary<string, string> dict = MapAction.PageLayoutProperties.getLayoutTextElements(_pMxDoc, "Main map");
+            IMxDocument doc = _mApplication.Document as IMxDocument;
+            Dictionary<string, string> dict = MapActionToolbar_Core.PageLayoutProperties.getLayoutTextElements(doc, "Main map");
             
             //Check if the various elements exist that automated update, if not disable the automation buttons.
             //If they are present then update the text boxes with the value from the dictionary 
@@ -268,13 +277,14 @@ private void setMapNumberAndVersion(string mapNumberAndVersion)
 
         private void tspBtnCheckElements_Click(object sender, EventArgs e)
         {
-            frmCheckElements dlg = new frmCheckElements();
+            frmCheckElements dlg = new frmCheckElements(_mApplication);
             dlg.ShowDialog();
         }
 
         public static string getSpatialReference()
         {
-            Dictionary<string, string> dictSpatialRef = MapAction.Utilities.getDataFrameSpatialReference(ArcMap.Application.Document as IMxDocument, "Main map");
+            IMxDocument doc = _mApplication.Document as IMxDocument;
+            Dictionary<string, string> dictSpatialRef = MapActionToolbar_Core.Utilities.getDataFrameSpatialReference(doc as IMxDocument, "Main map");
             string stringSpatialRef;
 
             if (dictSpatialRef["type"] == "Geographic")
@@ -295,12 +305,13 @@ public static string getSpatialReference()
 
         public static void setAllElements(Dictionary<string, string> dict)
         {
-            IPageLayout pLayout = _pMxDoc.PageLayout;
+            IMxDocument doc = _mApplication.Document as IMxDocument;
+            IPageLayout pLayout = doc.PageLayout;
             IGraphicsContainer pGraphics = pLayout as IGraphicsContainer;
             pGraphics.Reset();
 
             IMapDocument mapDoc;
-            mapDoc = (_pMxDoc as MxDocument) as IMapDocument;
+            mapDoc = (doc as MxDocument) as IMapDocument;
     
             // Update QR Code
             IElement element = new TextElementClass();
@@ -390,16 +401,18 @@ public static void setAllElements(Dictionary<string, string> dict)
                 System.Diagnostics.Debug.WriteLine(e);
             }
 
-            IActiveView activeView = _pMxDoc.ActivatedView as IActiveView;
+            IActiveView activeView = doc.ActivatedView as IActiveView;
             activeView.PartialRefresh(esriViewDrawPhase.esriViewGraphics, null, null);
         }
 
         public static string updateScale()
         {
             //string scale = MapAction.PageLayoutProperties.getScale(ArcMap.Application.Document as IMapDocument, "Main map");
-            string scale = MapAction.Utilities.getScale(ArcMap.Application.Document as IMapDocument, "Main map");
+            IMapDocument doc = _mApplication.Document as IMapDocument;
+
+            string scale = MapActionToolbar_Core.Utilities.getScale(doc, "Main map");
 
-            string pageSize = MapAction.Utilities.getPageSize(ArcMap.Application.Document as IMapDocument, "Main map");
+            string pageSize = MapActionToolbar_Core.Utilities.getPageSize(doc, "Main map");
             string scaleString = scale + " (At " + pageSize + ")";
             return scaleString;
         }
@@ -432,7 +445,7 @@ private void tbxSpatialReference_TextChanged(object sender, EventArgs e)
 
         private void tbxMapDocument_TextChanged(object sender, EventArgs e)
         {
-            FormValidationLayout.validateMapDocument(tbxMapDocument, eprMapDocumentWarning, eprMapDocumentError);
+            FormValidationLayout.validateMapDocument(_mApplication as IMxApplication, tbxMapDocument, eprMapDocumentWarning, eprMapDocumentError);
         }
 
         private void tbxScale_TextChanged(object sender, EventArgs e)
@@ -450,7 +463,8 @@ private void tbxGlideNumber_TextChanged(object sender, EventArgs e)
         //Gets the automated values for Tab 2 and populates each textbox
         private void btnUpdateAllTab2_Click(object sender, EventArgs e)
         {
-            Dictionary<string, string> dict = MapAction.PageLayoutProperties.getLayoutTextElements(_pMxDoc, "Main map");
+            IMxDocument doc = _mApplication.Document as IMxDocument;
+            Dictionary<string, string> dict = MapActionToolbar_Core.PageLayoutProperties.getLayoutTextElements(doc, "Main map");
             //If the elements are present in the map, update the values
             if (dict.ContainsKey("donor_credit") == true) { tbxDonorCredit.Text = LayoutToolAutomatedValues.getConfigDonorText(); } 
             if (dict.ContainsKey("timezone") == true) { tbxTimezone.Text = LayoutToolAutomatedValues.getConfigTimezone(); } 
@@ -504,7 +518,8 @@ private void cboLabelLanguage_SelectedIndexChanged(object sender, EventArgs e)
         
         public void setLabelLanguage()
         {
-            IPageLayout pLayout = _pMxDoc.PageLayout;
+            IMxDocument doc = _mApplication.Document as IMxDocument;
+            IPageLayout pLayout = doc.PageLayout;
             IGraphicsContainer pGraphics = pLayout as IGraphicsContainer;
             pGraphics.Reset();
 
@@ -545,7 +560,7 @@ public void setLabelLanguage()
                 System.Diagnostics.Debug.WriteLine(e);
             }
 
-            IActiveView activeView = _pMxDoc.ActivatedView as IActiveView;
+            IActiveView activeView = doc.ActivatedView as IActiveView;
             activeView.PartialRefresh(esriViewDrawPhase.esriViewGraphics, null, null);
         }
     }
diff --git a/arcgis10_mapping_tools/MapActionToolbars/frmPermissionsHelp.Designer.cs b/arcgis10_mapping_tools/MapActionToolbars/frmPermissionsHelp.Designer.cs
index e95cbfed..b9989d43 100644
--- a/arcgis10_mapping_tools/MapActionToolbars/frmPermissionsHelp.Designer.cs
+++ b/arcgis10_mapping_tools/MapActionToolbars/frmPermissionsHelp.Designer.cs
@@ -1,4 +1,4 @@
-namespace MapActionToolbars
+namespace MapActionToolbar_Forms
 {
     partial class frmPermissionsHelp
     {
diff --git a/arcgis10_mapping_tools/MapActionToolbars/frmPermissionsHelp.cs b/arcgis10_mapping_tools/MapActionToolbars/frmPermissionsHelp.cs
index c670560f..f4cdf3b5 100644
--- a/arcgis10_mapping_tools/MapActionToolbars/frmPermissionsHelp.cs
+++ b/arcgis10_mapping_tools/MapActionToolbars/frmPermissionsHelp.cs
@@ -7,7 +7,7 @@
 using System.Text;
 using System.Windows.Forms;
 
-namespace MapActionToolbars
+namespace MapActionToolbar_Forms
 {
     public partial class frmPermissionsHelp : Form
     {
diff --git a/arcgis10_mapping_tools/MapActionToolbars/frmRenameMain.Designer.cs b/arcgis10_mapping_tools/MapActionToolbars/frmRenameMain.Designer.cs
index 4d71bf93..415fb558 100644
--- a/arcgis10_mapping_tools/MapActionToolbars/frmRenameMain.Designer.cs
+++ b/arcgis10_mapping_tools/MapActionToolbars/frmRenameMain.Designer.cs
@@ -1,4 +1,4 @@
-namespace MapActionToolbars
+namespace MapActionToolbar_Forms
 {
     partial class frmRenameMain
     {
diff --git a/arcgis10_mapping_tools/MapActionToolbars/frmRenameMain.cs b/arcgis10_mapping_tools/MapActionToolbars/frmRenameMain.cs
index a305b721..7fce5a2b 100644
--- a/arcgis10_mapping_tools/MapActionToolbars/frmRenameMain.cs
+++ b/arcgis10_mapping_tools/MapActionToolbars/frmRenameMain.cs
@@ -17,7 +17,7 @@
 using System.Diagnostics;
 using Microsoft.VisualBasic.FileIO;
 
-namespace MapActionToolbars
+namespace MapActionToolbar_Forms
 {
     public partial class frmRenameMain : Form
     {
diff --git a/arcgis10_mapping_tools/arcaddins_for_testing/post_build_copy_addins.cmd b/arcgis10_mapping_tools/arcaddins_for_testing/post_build_copy_addins.cmd
index 9dc791d9..003eb2ce 100644
--- a/arcgis10_mapping_tools/arcaddins_for_testing/post_build_copy_addins.cmd
+++ b/arcgis10_mapping_tools/arcaddins_for_testing/post_build_copy_addins.cmd
@@ -4,5 +4,10 @@ del /q "%~dp0Alpha_LayoutTool.esriAddIn"
 del /q "%~dp0MapActionToolbars.esriAddIn"
 del /q "%~dp0RenameLayer.esriAddIn"
 
-xcopy /y "%~dp0..\RenameLayer\RenameLayer\bin\Release\RenameLayer.esriAddIn" "%~dp0"
-xcopy /y "%~dp0..\MapActionToolbars\bin\Release\MapActionToolbars.esriAddIn" "%~dp0"
\ No newline at end of file
+REM 3/3/20 HSG: not aware of a separate RenameLayer esriAddin, this is causing GOCD pipeline to fail
+REM xcopy /y "%~dp0..\RenameLayer\RenameLayer\bin\Release\RenameLayer.esriAddIn" "%~dp0"
+REM working name for the addin version of the tools, renames to distinguish from COM/installed version
+xcopy /y "%~dp0..\MapActionToolbar_Addin\bin\Release\MapActionToolbar_Addin.esriAddIn" "%~dp0"
+REM also copy the installer version to the same output folder (despite its inappropriate name)
+REM this fails as I believe GOCD cannot build installer (.vdproj) projects, it's here for a dreamed-of future
+xcopy /y "%~dp0..\MapActionToolbarInstaller\Release\MapActionToolbarInstaller.msi" "%~dp0"
\ No newline at end of file
diff --git a/make.cmd b/make.cmd
index 1fe99e20..e25f0ece 100644
--- a/make.cmd
+++ b/make.cmd
@@ -10,8 +10,9 @@ C:\nuget\nuget.exe install "%~dp0arcgis10_mapping_tools\CommonTests\packages.con
 ::C:\nuget\nuget.exe install nunit
 
 echo Building...
-"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe" %~dp0arcgis10_mapping_tools/MapAction-toolbox.sln /t:build /p:PlatformTarget=x86 /p:Configuration=Release /maxcpucount
-
+REM "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe" %~dp0arcgis10_mapping_tools/MapAction-toolbox.sln /t:build /p:PlatformTarget=x86 /p:Configuration=Release /maxcpucount
+call %~dp0DevEnv-EnableOutOfProcBuild.cmd
+"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\devenv" "%~dp0arcgis10_mapping_tools\MapAction-toolbox.sln" /build "Release|Any Cpu"
 :: echo Copying...
 :: call %~dp0arcgis10_mapping_tools\arcaddins_for_testing\post_build_copy_addins.cmd