diff --git a/Development/Powerpoint Deck Language/DeckLanguageAddIn/DeckLanguageAddIn.csproj b/Development/Powerpoint Deck Language/DeckLanguageAddIn/DeckLanguageAddIn.csproj
index 3e05998..cf82a2f 100644
--- a/Development/Powerpoint Deck Language/DeckLanguageAddIn/DeckLanguageAddIn.csproj	
+++ b/Development/Powerpoint Deck Language/DeckLanguageAddIn/DeckLanguageAddIn.csproj	
@@ -159,10 +159,10 @@
     <SignManifests>true</SignManifests>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestKeyFile>DeckLanguageAddIn_TemporaryKey.pfx</ManifestKeyFile>
+    <ManifestKeyFile>techmikael.pfx</ManifestKeyFile>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestCertificateThumbprint>A4C5361D85F14C5DF6CA3839CC4D7CA2EBEB435C</ManifestCertificateThumbprint>
+    <ManifestCertificateThumbprint>B104453B927D1CDA36C8C4BBBFEC5609F3458B31</ManifestCertificateThumbprint>
   </PropertyGroup>
   <!--
     This section specifies references for the project.
@@ -236,7 +236,6 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
-    <None Include="DeckLanguageAddIn_TemporaryKey.pfx" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -249,6 +248,7 @@
     <Compile Include="ThisAddIn.cs">
       <SubType>Code</SubType>
     </Compile>
+    <None Include="techmikael.pfx" />
     <None Include="ThisAddIn.Designer.xml">
       <DependentUpon>ThisAddIn.cs</DependentUpon>
     </None>
@@ -272,7 +272,7 @@
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{BAA0C2D2-18E2-41B9-852F-F413020CAA33}">
-        <ProjectProperties HostName="PowerPoint" HostPackage="{29A7B9D7-A7F1-4328-8EF0-6B2D1A56B2C1}" OfficeVersion="15.0" VstxVersion="4.0" ApplicationType="PowerPoint" Language="cs" TemplatesPath="VSTOTemplates" DebugInfoExeName="#Software\Microsoft\Office\15.0\PowerPoint\InstallRoot\Path#powerpnt.exe" AddItemTemplatesGuid="{51063C3A-E220-4D12-8922-BDA915ACD783}" />
+        <ProjectProperties HostName="PowerPoint" HostPackage="{29A7B9D7-A7F1-4328-8EF0-6B2D1A56B2C1}" OfficeVersion="15.0" VstxVersion="4.0" ApplicationType="PowerPoint" Language="cs" TemplatesPath="VSTOTemplates" DebugInfoExeName="#Software\Microsoft\Office\16.0\PowerPoint\InstallRoot\Path#powerpnt.exe" AddItemTemplatesGuid="{51063C3A-E220-4D12-8922-BDA915ACD783}" />
         <Host Name="PowerPoint" GeneratedCodeNamespace="DeckLanguageAddIn" PublishedHash="69C324AB27932AA2FBF2B7EA72250886FF164DE6" IconIndex="0">
           <HostItem Name="ThisAddIn" Code="ThisAddIn.cs" CanonicalName="AddIn" PublishedHash="EBE13B243306ABC8069E3949A0B586081BC2CD2B" CanActivate="false" IconIndex="1" Blueprint="ThisAddIn.Designer.xml" GeneratedCode="ThisAddIn.Designer.cs" />
         </Host>
diff --git a/Development/Powerpoint Deck Language/DeckLanguageAddIn/techmikael.pfx b/Development/Powerpoint Deck Language/DeckLanguageAddIn/techmikael.pfx
new file mode 100644
index 0000000..4e485d5
Binary files /dev/null and b/Development/Powerpoint Deck Language/DeckLanguageAddIn/techmikael.pfx differ
diff --git a/Development/Powerpoint Deck Language/DeckLanguageSetup/DeckLanguageSetup.vdproj b/Development/Powerpoint Deck Language/DeckLanguageSetup/DeckLanguageSetup.vdproj
index 2f8a651..67580b3 100644
--- a/Development/Powerpoint Deck Language/DeckLanguageSetup/DeckLanguageSetup.vdproj	
+++ b/Development/Powerpoint Deck Language/DeckLanguageSetup/DeckLanguageSetup.vdproj	
@@ -7,63 +7,45 @@
 "LanguageId" = "3:1033"
 "CodePage" = "3:1252"
 "UILanguageId" = "3:1033"
-"SccProjectName" = "8:SAK"
-"SccLocalPath" = "8:SAK"
-"SccAuxPath" = "8:SAK"
-"SccProvider" = "8:SAK"
+"SccProjectName" = "8:"
+"SccLocalPath" = "8:"
+"SccAuxPath" = "8:"
+"SccProvider" = "8:"
     "Hierarchy"
     {
         "Entry"
         {
-        "MsmKey" = "8:_15238D1D6DC1452AD2D67FB956023203"
-        "OwnerKey" = "8:_F992742F27564124B28945886C568552"
+        "MsmKey" = "8:_43C090EDFCED4F2199904503B76E917F"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_1D171F11B8F2FC0F53B5E1657899ED54"
+        "MsmKey" = "8:_4FDAA69D0C454BC388BCC0DB942157A7"
         "OwnerKey" = "8:_F992742F27564124B28945886C568552"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_1D171F11B8F2FC0F53B5E1657899ED54"
-        "OwnerKey" = "8:_658A7411E65E4632DCF0BF085CE6D320"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_2B890A25FDF74E5573D1B620A1339D2F"
-        "OwnerKey" = "8:_CDDAEAB70C626B1F512A1998E5F57C7D"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_2B890A25FDF74E5573D1B620A1339D2F"
+        "MsmKey" = "8:_7A4D0CAB365DC99685596F6B8E201667"
         "OwnerKey" = "8:_F992742F27564124B28945886C568552"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_43C090EDFCED4F2199904503B76E917F"
+        "MsmKey" = "8:_C6366F5E323D4D10827A6B66E9085674"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_658A7411E65E4632DCF0BF085CE6D320"
-        "OwnerKey" = "8:_F992742F27564124B28945886C568552"
+        "MsmKey" = "8:_EBBB96113B8EF28CE64A01EB3AA7942F"
+        "OwnerKey" = "8:_7A4D0CAB365DC99685596F6B8E201667"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C6366F5E323D4D10827A6B66E9085674"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_CDDAEAB70C626B1F512A1998E5F57C7D"
+        "MsmKey" = "8:_EBBB96113B8EF28CE64A01EB3AA7942F"
         "OwnerKey" = "8:_F992742F27564124B28945886C568552"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -76,37 +58,25 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_658A7411E65E4632DCF0BF085CE6D320"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_UNDEFINED"
         "OwnerKey" = "8:_F992742F27564124B28945886C568552"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_CDDAEAB70C626B1F512A1998E5F57C7D"
+        "OwnerKey" = "8:_7A4D0CAB365DC99685596F6B8E201667"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_2B890A25FDF74E5573D1B620A1339D2F"
+        "OwnerKey" = "8:_EBBB96113B8EF28CE64A01EB3AA7942F"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_1D171F11B8F2FC0F53B5E1657899ED54"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_15238D1D6DC1452AD2D67FB956023203"
+        "OwnerKey" = "8:_4FDAA69D0C454BC388BCC0DB942157A7"
         "MsmSig" = "8:_UNDEFINED"
         }
     }
@@ -127,6 +97,14 @@
         "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:"
+            }
         }
         "Release"
         {
@@ -198,21 +176,10 @@
         }
         "File"
         {
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_15238D1D6DC1452AD2D67FB956023203"
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_43C090EDFCED4F2199904503B76E917F"
             {
-            "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Microsoft.Office.Tools.Common.v4.0.Utilities, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
-                "ScatterAssemblies"
-                {
-                    "_15238D1D6DC1452AD2D67FB956023203"
-                    {
-                    "Name" = "8:Microsoft.Office.Tools.Common.v4.0.Utilities.dll"
-                    "Attributes" = "3:512"
-                    }
-                }
-            "SourcePath" = "8:Microsoft.Office.Tools.Common.v4.0.Utilities.dll"
-            "TargetName" = "8:"
+            "SourcePath" = "8:..\\DeckLanguageAddIn\\bin\\Release\\DeckLanguageAddIn.dll.manifest"
+            "TargetName" = "8:DeckLanguageAddIn.dll.manifest"
             "Tag" = "8:"
             "Folder" = "8:_C456642806A949199017810BCEFDFC82"
             "Condition" = "8:"
@@ -226,54 +193,23 @@
             "PackageAs" = "3:1"
             "Register" = "3:1"
             "Exclude" = "11:FALSE"
-            "IsDependency" = "11:TRUE"
-            "IsolateTo" = "8:"
-            }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1D171F11B8F2FC0F53B5E1657899ED54"
-            {
-            "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Microsoft.Office.Tools, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
-                "ScatterAssemblies"
-                {
-                    "_1D171F11B8F2FC0F53B5E1657899ED54"
-                    {
-                    "Name" = "8:Microsoft.Office.Tools.dll"
-                    "Attributes" = "3:512"
-                    }
-                }
-            "SourcePath" = "8:Microsoft.Office.Tools.dll"
-            "TargetName" = "8:"
-            "Tag" = "8:"
-            "Folder" = "8:_C456642806A949199017810BCEFDFC82"
-            "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"
+            "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2B890A25FDF74E5573D1B620A1339D2F"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4FDAA69D0C454BC388BCC0DB942157A7"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Microsoft.VisualStudio.Tools.Applications.Runtime, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:Microsoft.Office.Tools.Common.v4.0.Utilities, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_2B890A25FDF74E5573D1B620A1339D2F"
+                    "_4FDAA69D0C454BC388BCC0DB942157A7"
                     {
-                    "Name" = "8:Microsoft.VisualStudio.Tools.Applications.Runtime.dll"
+                    "Name" = "8:Microsoft.Office.Tools.Common.v4.0.Utilities.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:Microsoft.VisualStudio.Tools.Applications.Runtime.dll"
+            "SourcePath" = "8:Microsoft.Office.Tools.Common.v4.0.Utilities.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_C456642806A949199017810BCEFDFC82"
@@ -287,44 +223,24 @@
             "SharedLegacy" = "11:FALSE"
             "PackageAs" = "3:1"
             "Register" = "3:1"
-            "Exclude" = "11:TRUE"
-            "IsDependency" = "11:TRUE"
-            "IsolateTo" = "8:"
-            }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_43C090EDFCED4F2199904503B76E917F"
-            {
-            "SourcePath" = "8:..\\DeckLanguageAddIn\\bin\\Release\\DeckLanguageAddIn.dll.manifest"
-            "TargetName" = "8:DeckLanguageAddIn.dll.manifest"
-            "Tag" = "8:"
-            "Folder" = "8:_C456642806A949199017810BCEFDFC82"
-            "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"
+            "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_658A7411E65E4632DCF0BF085CE6D320"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7A4D0CAB365DC99685596F6B8E201667"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Microsoft.Office.Tools.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:Microsoft.Office.Tools.v4.0.Framework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_658A7411E65E4632DCF0BF085CE6D320"
+                    "_7A4D0CAB365DC99685596F6B8E201667"
                     {
-                    "Name" = "8:Microsoft.Office.Tools.Common.dll"
+                    "Name" = "8:Microsoft.Office.Tools.v4.0.Framework.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:Microsoft.Office.Tools.Common.dll"
+            "SourcePath" = "8:Microsoft.Office.Tools.v4.0.Framework.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_C456642806A949199017810BCEFDFC82"
@@ -362,20 +278,20 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_CDDAEAB70C626B1F512A1998E5F57C7D"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_EBBB96113B8EF28CE64A01EB3AA7942F"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Microsoft.Office.Tools.v4.0.Framework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:Microsoft.VisualStudio.Tools.Applications.Runtime, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_CDDAEAB70C626B1F512A1998E5F57C7D"
+                    "_EBBB96113B8EF28CE64A01EB3AA7942F"
                     {
-                    "Name" = "8:Microsoft.Office.Tools.v4.0.Framework.dll"
+                    "Name" = "8:Microsoft.VisualStudio.Tools.Applications.Runtime.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:Microsoft.Office.Tools.v4.0.Framework.dll"
+            "SourcePath" = "8:Microsoft.VisualStudio.Tools.Applications.Runtime.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_C456642806A949199017810BCEFDFC82"
@@ -443,13 +359,6 @@
             "Message" = "8:The Visual Studio 2010 Tools for Office Runtime is not installed. Please run Setup.exe"
             "InstallUrl" = "8:"
             }
-            "{836E08B8-0285-4809-BA42-01DB6754A45D}:_4C90F2ABB54246CF8951F89A81435E9F"
-            {
-            "Name" = "8:Verify Office 2010 Shared PIA availability"
-            "Condition" = "8:HASSHAREDPIA"
-            "Message" = "8:A required component for interacting with Excel is not available. Please run setup.exe."
-            "InstallUrl" = "8:"
-            }
         }
         "Locator"
         {
@@ -469,12 +378,6 @@
             "Value" = "8:Version"
             "Property" = "8:OFFICERUNTIME"
             }
-            "{B8A5E33E-1082-4FE2-AC2E-1197791E9409}:_D6EB2378CC2645FFA98C955ABC6BE91F"
-            {
-            "Name" = "8:Search for Office 2010 Shared PIA"
-            "ComponentId" = "8:{64E2917E-AA13-4CA4-BFFE-EA6EDA3AFCB4}"
-            "Property" = "8:HASSHAREDPIA"
-            }
         }
         "MsiBootstrapper"
         {
diff --git a/Development/Powerpoint Deck Language/Powerpoint Deck Language.sln b/Development/Powerpoint Deck Language/Powerpoint Deck Language.sln
index 2c8b3b3..247edf9 100644
--- a/Development/Powerpoint Deck Language/Powerpoint Deck Language.sln	
+++ b/Development/Powerpoint Deck Language/Powerpoint Deck Language.sln	
@@ -1,20 +1,13 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30110.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.26730.16
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeckLanguageAddIn", "DeckLanguageAddIn\DeckLanguageAddIn.csproj", "{85458C85-350B-4A4C-B9F0-B07ADFE89EFB}"
 EndProject
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "DeckLanguageSetup", "DeckLanguageSetup\DeckLanguageSetup.vdproj", "{7898E4D3-E0B8-44E8-BDBA-88C1BDE2513C}"
+EndProject
 Global
-	GlobalSection(TeamFoundationVersionControl) = preSolution
-		SccNumberOfProjects = 2
-		SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
-		SccTeamFoundationServer = https://tfs.codeplex.com/tfs/tfs03
-		SccLocalPath0 = .
-		SccProjectUniqueName1 = DeckLanguageAddIn\\DeckLanguageAddIn.csproj
-		SccProjectName1 = DeckLanguageAddIn
-		SccLocalPath1 = DeckLanguageAddIn
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
@@ -24,8 +17,15 @@ Global
 		{85458C85-350B-4A4C-B9F0-B07ADFE89EFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{85458C85-350B-4A4C-B9F0-B07ADFE89EFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{85458C85-350B-4A4C-B9F0-B07ADFE89EFB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7898E4D3-E0B8-44E8-BDBA-88C1BDE2513C}.Debug|Any CPU.ActiveCfg = Debug
+		{7898E4D3-E0B8-44E8-BDBA-88C1BDE2513C}.Debug|Any CPU.Build.0 = Debug
+		{7898E4D3-E0B8-44E8-BDBA-88C1BDE2513C}.Release|Any CPU.ActiveCfg = Release
+		{7898E4D3-E0B8-44E8-BDBA-88C1BDE2513C}.Release|Any CPU.Build.0 = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {4E8E83B5-F7F6-489E-B5F8-75C40A6627F9}
+	EndGlobalSection
 EndGlobal