diff --git a/LICENSE.md b/LICENSE.md
index e7c5f2f11..a02a82126 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -5,6 +5,7 @@ RenderDoc is licensed under the MIT License:
 > The MIT License (MIT)
 > 
 > Copyright (c) 2014 Crytek
+> Copyright (c) 2015 Baldur Karlsson
 > 
 > Permission is hereby granted, free of charge, to any person obtaining a copy
 > of this software and associated documentation files (the "Software"), to deal
diff --git a/installer/Installer32.wxs b/installer/Installer32.wxs
index 847432846..c9267000c 100644
--- a/installer/Installer32.wxs
+++ b/installer/Installer32.wxs
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='windows-1252'?>
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Product Name='RenderDoc' Id='*' UpgradeCode='D320753C-4B18-4905-A752-E68959943E7D'
-    Language='1033' Codepage='1252' Version='$(env.RENDERDOC_VERSION)' Manufacturer='Crytek'>
+    Language='1033' Codepage='1252' Version='$(env.RENDERDOC_VERSION)' Manufacturer='Baldur Karlsson'>
 
     <Package Id='*' Keywords='Installer' Description="Installer for RenderDoc"
-      Comments='RenderDoc Homepage is http://renderdoc.org/' Manufacturer='Crytek'
+      Comments='RenderDoc Homepage is http://renderdoc.org/' Manufacturer='Baldur Karlsson'
       InstallerVersion='100' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
 
     <UI> 
@@ -34,112 +34,109 @@
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFilesFolder' Name='PFiles'>
-        <Directory Id='Crytek' Name='Crytek'>
-          <Directory Id='INSTALLDIR' Name='RenderDoc'>
+        <Directory Id='INSTALLDIR' Name='RenderDoc'>
 
-            <Component Id='RenderDocUI' Guid='0DB375D5-7712-4853-AA75-536DF863C827'>
-              <File Id='renderdocuiEXE' Name='renderdocui.exe' DiskId='1' Source='dist/Release32/renderdocui.exe' KeyPath='yes'>
-                <Shortcut Id="startmenuRenderDoc" Directory="ProgramMenuDir" Name="RenderDoc" WorkingDirectory='INSTALLDIR' Icon="icon.ico" IconIndex="0" Advertise="yes" />
-              </File>
-              <File Id='renderdocuiPDB' Name='renderdocui.pdb' DiskId='1' Source='dist/Release32/renderdocui.pdb' />
-              <File Id='renderdocuiCFG' Name='renderdocui.exe.config' DiskId='1' Source='dist/Release32/renderdocui.exe.config' />
+          <Component Id='RenderDocUI' Guid='0DB375D5-7712-4853-AA75-536DF863C827'>
+            <File Id='renderdocuiEXE' Name='renderdocui.exe' DiskId='1' Source='dist/Release32/renderdocui.exe' KeyPath='yes'>
+              <Shortcut Id="startmenuRenderDoc" Directory="ProgramMenuDir" Name="RenderDoc" WorkingDirectory='INSTALLDIR' Icon="icon.ico" IconIndex="0" Advertise="yes" />
+            </File>
+            <File Id='renderdocuiPDB' Name='renderdocui.pdb' DiskId='1' Source='dist/Release32/renderdocui.pdb' />
+            <File Id='renderdocuiCFG' Name='renderdocui.exe.config' DiskId='1' Source='dist/Release32/renderdocui.exe.config' />
 
-              <RegistryValue Root="HKLM" Id="VerbRDC" Action="write" 
-                Key="Software\Classes\RenderDoc.RDCCapture.1\shell\open\command" 
-                Value='"[#renderdocuiEXE]" "%1"' 
-                Type="expandable" />
-              <RegistryValue Root="HKLM" Id="VerbDescRDC" Action="write" 
-                Key="Software\Classes\RenderDoc.RDCCapture.1" 
-                Value='RenderDoc Capture Log (.rdc)' 
-                Type="expandable" />
-              <RegistryValue Root="HKLM" Id="VerbIconRDC" Action="write" 
-                Key="Software\Classes\RenderDoc.RDCCapture.1\DefaultIcon" 
-                Value='[#renderdocuiEXE]' 
-                Type="expandable" />
-              <RegistryValue Root="HKLM" Id="RDCProgIDCLSID" Action="write" 
-                Key="Software\Classes\RenderDoc.RDCCapture.1\CLSID" 
-                Value='{5D6BF029-A6BA-417A-8523-120492B1DCE3}' 
-                Type="expandable" />
+            <RegistryValue Root="HKLM" Id="VerbRDC" Action="write" 
+              Key="Software\Classes\RenderDoc.RDCCapture.1\shell\open\command" 
+              Value='"[#renderdocuiEXE]" "%1"' 
+              Type="expandable" />
+            <RegistryValue Root="HKLM" Id="VerbDescRDC" Action="write" 
+              Key="Software\Classes\RenderDoc.RDCCapture.1" 
+              Value='RenderDoc Capture Log (.rdc)' 
+              Type="expandable" />
+            <RegistryValue Root="HKLM" Id="VerbIconRDC" Action="write" 
+              Key="Software\Classes\RenderDoc.RDCCapture.1\DefaultIcon" 
+              Value='[#renderdocuiEXE]' 
+              Type="expandable" />
+            <RegistryValue Root="HKLM" Id="RDCProgIDCLSID" Action="write" 
+              Key="Software\Classes\RenderDoc.RDCCapture.1\CLSID" 
+              Value='{5D6BF029-A6BA-417A-8523-120492B1DCE3}' 
+              Type="expandable" />
 
-              <RegistryValue Root="HKLM" Id="VerbCAP" Action="write" 
-                Key="Software\Classes\RenderDoc.RDCSettings.1\shell\open\command" 
-                Value='"[#renderdocuiEXE]" "%1"' 
-                Type="expandable" />
-              <RegistryValue Root="HKLM" Id="VerbDescCAP" Action="write" 
-                Key="Software\Classes\RenderDoc.RDCSettings.1" 
-                Value='RenderDoc Capture Settings (.cap)' 
-                Type="expandable" />
-              <RegistryValue Root="HKLM" Id="VerbIconCAP" Action="write" 
-                Key="Software\Classes\RenderDoc.RDCSettings.1\DefaultIcon" 
-                Value='[#renderdocuiEXE]' 
-                Type="expandable" />
-              
+            <RegistryValue Root="HKLM" Id="VerbCAP" Action="write" 
+              Key="Software\Classes\RenderDoc.RDCSettings.1\shell\open\command" 
+              Value='"[#renderdocuiEXE]" "%1"' 
+              Type="expandable" />
+            <RegistryValue Root="HKLM" Id="VerbDescCAP" Action="write" 
+              Key="Software\Classes\RenderDoc.RDCSettings.1" 
+              Value='RenderDoc Capture Settings (.cap)' 
+              Type="expandable" />
+            <RegistryValue Root="HKLM" Id="VerbIconCAP" Action="write" 
+              Key="Software\Classes\RenderDoc.RDCSettings.1\DefaultIcon" 
+              Value='[#renderdocuiEXE]' 
+              Type="expandable" />
+            
+          </Component>
+
+          <Component Id='RenderDocCPP' Guid='2E6F718F-8BCC-4D41-9688-E99CF2F6B303'>
+            <File Id='RenderDocCPP' Name='renderdoc.dll' DiskId='1' Source='dist/Release32/renderdoc.dll' KeyPath='yes' />
+            <File Id='D3DCompiler47' Name='d3dcompiler_47.dll' DiskId='1' Source='dist/Release32/d3dcompiler_47.dll' />
+            <File Id='RenderDocSHIM' Name='renderdocshim32.dll' DiskId='1' Source='dist/Release32/renderdocshim32.dll' />
+            
+            <RegistryValue Root="HKLM" Id="RDCCLSID" Action="write" 
+              Key="Software\Classes\CLSID\{5D6BF029-A6BA-417A-8523-120492B1DCE3}" 
+              Value='RenderDoc Thumbnail Handler' 
+              Type="expandable" />
+            <RegistryValue Root="HKLM" Id="RDCCLSIDServer" Action="write" 
+              Key="Software\Classes\CLSID\{5D6BF029-A6BA-417A-8523-120492B1DCE3}\InprocServer32" 
+              Value='[#RenderDocCPP]' 
+              Type="expandable" />
+
+          </Component>
+
+          <Component Id='LICENSE' Guid='107AD4E6-D64F-4284-A1F6-D8AAAA6CFC42'>
+            <File Id='LICENSE' Name='LICENSE.rtf' DiskId='1' Source='installer/LICENSE.rtf' KeyPath='yes' />
+          </Component>
+
+          <Component Id='RenderDocCMD' Guid='97338A5D-8FDB-4DF5-AEC7-14B36F234F29'>
+            <File Id='RenderDocCMD' Name='renderdoccmd.exe' DiskId='1' Source='dist/Release32/renderdoccmd.exe' KeyPath='yes' />
+          </Component>
+
+          <Component Id='Scintilla' Guid='63C1C176-5B7C-4D29-9382-8E0FA75C5B80'>
+            <File Id='ScintillaNET' Name='ScintillaNET.dll' DiskId='1' Source='dist/Release32/ScintillaNET.dll' KeyPath='yes' />
+            <File Id='SciLexer' Name='SciLexer.dll' DiskId='1' Source='dist/Release32/SciLexer.dll' />
+            <File Id='SciLexer64' Name='SciLexer64.dll' DiskId='1' Source='dist/Release32/SciLexer64.dll' />
+          </Component>
+
+          <Component Id='DockingUI' Guid='5FA0B96B-66C9-44B8-B20F-1680FAA47CD1'>
+            <File Id='WinFormsUIDLL' Name='WeifenLuo.WinFormsUI.Docking.dll' DiskId='1' Source='dist/Release32/WeifenLuo.WinFormsUI.Docking.dll' KeyPath='yes' />
+          </Component>
+
+          <Component Id='IronPython' Guid='63C5667D-38DA-464B-8E2F-B2857B8EAEC8'>
+            <File Id='IronPythonDLL' Name='IronPython.dll' DiskId='1' Source='dist/Release32/IronPython.dll' KeyPath='yes' />
+            <File Id='IronPythonModulesDLL' Name='IronPython.Modules.dll' DiskId='1' Source='dist/Release32/IronPython.Modules.dll' />
+            <File Id='MicrosoftScriptingDLL' Name='Microsoft.Scripting.dll' DiskId='1' Source='dist/Release32/Microsoft.Scripting.dll' />
+            <File Id='MicrosoftDynamicDLL' Name='Microsoft.Dynamic.dll' DiskId='1' Source='dist/Release32/Microsoft.Dynamic.dll' />
+            <File Id='PythonLibsDLL' Name='pythonlibs.dll' DiskId='1' Source='dist/Release32/pythonlibs.dll' />
+          </Component>
+
+          <Component Id='Documentation' Guid='CD32B446-6DC1-49E4-8FE9-509E1AFB126D'>
+            <File Id='Documentation' Name='renderdoc.chm' DiskId='1' Source='dist/Release32/renderdoc.chm' KeyPath='yes'>
+              <Shortcut Id="startmenuDocs" Directory="ProgramMenuDir" Name="RenderDoc Documentation" Icon='chm.ico' Advertise="yes" />
+            </File>
+          </Component>
+
+          <Directory Id='pdblocate' Name='pdblocate'>
+
+            <Component Id='pdblocateEXE' Guid='733FCA6A-EC84-4E96-BFD2-F2A9A62DEAEB'>
+              <File Id='pdblocateEXE' Name='pdblocate.exe' DiskId='1' Source='dist/Release32/pdblocate/pdblocate.exe' KeyPath='yes' />
             </Component>
 
-            <Component Id='RenderDocCPP' Guid='2E6F718F-8BCC-4D41-9688-E99CF2F6B303'>
-              <File Id='RenderDocCPP' Name='renderdoc.dll' DiskId='1' Source='dist/Release32/renderdoc.dll' KeyPath='yes' />
-              <File Id='D3DCompiler47' Name='d3dcompiler_47.dll' DiskId='1' Source='dist/Release32/d3dcompiler_47.dll' />
-              <File Id='RenderDocSHIM' Name='renderdocshim32.dll' DiskId='1' Source='dist/Release32/renderdocshim32.dll' />
-              
-              <RegistryValue Root="HKLM" Id="RDCCLSID" Action="write" 
-                Key="Software\Classes\CLSID\{5D6BF029-A6BA-417A-8523-120492B1DCE3}" 
-                Value='RenderDoc Thumbnail Handler' 
-                Type="expandable" />
-              <RegistryValue Root="HKLM" Id="RDCCLSIDServer" Action="write" 
-                Key="Software\Classes\CLSID\{5D6BF029-A6BA-417A-8523-120492B1DCE3}\InprocServer32" 
-                Value='[#RenderDocCPP]' 
-                Type="expandable" />
+            <Directory Id='pdblocateDeps32' Name='x86'>
 
-            </Component>
-
-            <Component Id='LICENSE' Guid='107AD4E6-D64F-4284-A1F6-D8AAAA6CFC42'>
-              <File Id='LICENSE' Name='LICENSE.rtf' DiskId='1' Source='installer/LICENSE.rtf' KeyPath='yes' />
-            </Component>
-
-            <Component Id='RenderDocCMD' Guid='97338A5D-8FDB-4DF5-AEC7-14B36F234F29'>
-              <File Id='RenderDocCMD' Name='renderdoccmd.exe' DiskId='1' Source='dist/Release32/renderdoccmd.exe' KeyPath='yes' />
-            </Component>
-
-            <Component Id='Scintilla' Guid='63C1C176-5B7C-4D29-9382-8E0FA75C5B80'>
-              <File Id='ScintillaNET' Name='ScintillaNET.dll' DiskId='1' Source='dist/Release32/ScintillaNET.dll' KeyPath='yes' />
-              <File Id='SciLexer' Name='SciLexer.dll' DiskId='1' Source='dist/Release32/SciLexer.dll' />
-              <File Id='SciLexer64' Name='SciLexer64.dll' DiskId='1' Source='dist/Release32/SciLexer64.dll' />
-            </Component>
-
-            <Component Id='DockingUI' Guid='5FA0B96B-66C9-44B8-B20F-1680FAA47CD1'>
-              <File Id='WinFormsUIDLL' Name='WeifenLuo.WinFormsUI.Docking.dll' DiskId='1' Source='dist/Release32/WeifenLuo.WinFormsUI.Docking.dll' KeyPath='yes' />
-            </Component>
-
-            <Component Id='IronPython' Guid='63C5667D-38DA-464B-8E2F-B2857B8EAEC8'>
-              <File Id='IronPythonDLL' Name='IronPython.dll' DiskId='1' Source='dist/Release32/IronPython.dll' KeyPath='yes' />
-              <File Id='IronPythonModulesDLL' Name='IronPython.Modules.dll' DiskId='1' Source='dist/Release32/IronPython.Modules.dll' />
-              <File Id='MicrosoftScriptingDLL' Name='Microsoft.Scripting.dll' DiskId='1' Source='dist/Release32/Microsoft.Scripting.dll' />
-              <File Id='MicrosoftDynamicDLL' Name='Microsoft.Dynamic.dll' DiskId='1' Source='dist/Release32/Microsoft.Dynamic.dll' />
-              <File Id='PythonLibsDLL' Name='pythonlibs.dll' DiskId='1' Source='dist/Release32/pythonlibs.dll' />
-            </Component>
-
-            <Component Id='Documentation' Guid='CD32B446-6DC1-49E4-8FE9-509E1AFB126D'>
-              <File Id='Documentation' Name='renderdoc.chm' DiskId='1' Source='dist/Release32/renderdoc.chm' KeyPath='yes'>
-                <Shortcut Id="startmenuDocs" Directory="ProgramMenuDir" Name="RenderDoc Documentation" Icon='chm.ico' Advertise="yes" />
-              </File>
-            </Component>
-
-            <Directory Id='pdblocate' Name='pdblocate'>
-
-              <Component Id='pdblocateEXE' Guid='733FCA6A-EC84-4E96-BFD2-F2A9A62DEAEB'>
-                <File Id='pdblocateEXE' Name='pdblocate.exe' DiskId='1' Source='dist/Release32/pdblocate/pdblocate.exe' KeyPath='yes' />
+              <Component Id='pdblocateDeps' Guid='CC83B1BB-8E47-4415-9308-5BEF2A7242A0'>
+                <File Id='dbghelpDLL' Name='dbghelp.dll' DiskId='1' Source='dist/Release32/pdblocate/x86/dbghelp.dll' KeyPath='yes' />
+                <File Id='symsrvDLL' Name='symsrv.dll' DiskId='1' Source='dist/Release32/pdblocate/x86/symsrv.dll' />
+                <File Id='symsrvYES' Name='symsrv.yes' DiskId='1' Source='dist/Release32/pdblocate/x86/symsrv.yes' />
               </Component>
 
-              <Directory Id='pdblocateDeps32' Name='x86'>
-
-                <Component Id='pdblocateDeps' Guid='CC83B1BB-8E47-4415-9308-5BEF2A7242A0'>
-                  <File Id='dbghelpDLL' Name='dbghelp.dll' DiskId='1' Source='dist/Release32/pdblocate/x86/dbghelp.dll' KeyPath='yes' />
-                  <File Id='symsrvDLL' Name='symsrv.dll' DiskId='1' Source='dist/Release32/pdblocate/x86/symsrv.dll' />
-                  <File Id='symsrvYES' Name='symsrv.yes' DiskId='1' Source='dist/Release32/pdblocate/x86/symsrv.yes' />
-                </Component>
-
-              </Directory>
-
             </Directory>
 
           </Directory>
diff --git a/installer/Installer64.wxs b/installer/Installer64.wxs
index 3bad9e7aa..a6788cb4d 100644
--- a/installer/Installer64.wxs
+++ b/installer/Installer64.wxs
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='windows-1252'?>
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Product Name='RenderDoc' Id='*' UpgradeCode='D320753C-4B18-4905-A752-E68959943E7D'
-    Language='1033' Codepage='1252' Version='$(env.RENDERDOC_VERSION)' Manufacturer='Crytek'>
+    Language='1033' Codepage='1252' Version='$(env.RENDERDOC_VERSION)' Manufacturer='Baldur Karlsson'>
 
     <Package Id='*' Keywords='Installer' Description="Installer for RenderDoc"
-      Comments='RenderDoc Homepage is http://renderdoc.org/' Platform="x64" Manufacturer='Crytek'
+      Comments='RenderDoc Homepage is http://renderdoc.org/' Platform="x64" Manufacturer='Baldur Karlsson'
       InstallerVersion='200' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
 
     <InstallExecuteSequence>
@@ -24,152 +24,150 @@
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFiles64Folder' Name='PFiles'>
-        <Directory Id='Crytek' Name='Crytek'>
-          <Directory Id='INSTALLDIR' Name='RenderDoc'>
+        <Directory Id='INSTALLDIR' Name='RenderDoc'>
 
-            <Component Id='RenderDocUI' Win64="yes" Guid='44398F0D-3FE3-470A-A137-BDFDFE82353D'>
-              <File Id='renderdocuiEXE' Name='renderdocui.exe' DiskId='1' Source='dist/Release64/renderdocui.exe' KeyPath='yes'>
-                <Shortcut Id="startmenuRenderDoc" Directory="ProgramMenuDir" Name="RenderDoc" WorkingDirectory='INSTALLDIR' Icon="icon.ico" IconIndex="0" Advertise="yes" />
-              </File>
-              <File Id='renderdocuiPDB' Name='renderdocui.pdb' DiskId='1' Source='dist/Release64/renderdocui.pdb' />
-              <File Id='renderdocuiCFG' Name='renderdocui.exe.config' DiskId='1' Source='dist/Release64/renderdocui.exe.config' />
+          <Component Id='RenderDocUI' Win64="yes" Guid='44398F0D-3FE3-470A-A137-BDFDFE82353D'>
+            <File Id='renderdocuiEXE' Name='renderdocui.exe' DiskId='1' Source='dist/Release64/renderdocui.exe' KeyPath='yes'>
+              <Shortcut Id="startmenuRenderDoc" Directory="ProgramMenuDir" Name="RenderDoc" WorkingDirectory='INSTALLDIR' Icon="icon.ico" IconIndex="0" Advertise="yes" />
+            </File>
+						<File Id='renderdocuiPDB' Name='renderdocui.pdb' DiskId='1' Source='dist/Release64/renderdocui.pdb' />
+						<File Id='renderdocuiCFG' Name='renderdocui.exe.config' DiskId='1' Source='dist/Release64/renderdocui.exe.config' />
 
-              <RegistryValue Root="HKLM" Id="VerbRDC" Action="write" 
-                Key="Software\Classes\RenderDoc.RDCCapture.1\shell\open\command" 
-                Value='"[#renderdocuiEXE]" "%1"' 
-                Type="expandable" />
-              <RegistryValue Root="HKLM" Id="VerbDescRDC" Action="write" 
-                Key="Software\Classes\RenderDoc.RDCCapture.1" 
-                Value='RenderDoc Capture Log (.rdc)' 
-                Type="expandable" />
-              <RegistryValue Root="HKLM" Id="VerbIconRDC" Action="write" 
-                Key="Software\Classes\RenderDoc.RDCCapture.1\DefaultIcon" 
-                Value='[#renderdocuiEXE]' 
-                Type="expandable" />
-              <RegistryValue Root="HKLM" Id="RDCProgIDCLSID" Action="write" 
-                Key="Software\Classes\RenderDoc.RDCCapture.1\CLSID" 
-                Value='{5D6BF029-A6BA-417A-8523-120492B1DCE3}' 
-                Type="expandable" />
+						<RegistryValue Root="HKLM" Id="VerbRDC" Action="write" 
+							Key="Software\Classes\RenderDoc.RDCCapture.1\shell\open\command" 
+							Value='"[#renderdocuiEXE]" "%1"' 
+							Type="expandable" />
+						<RegistryValue Root="HKLM" Id="VerbDescRDC" Action="write" 
+							Key="Software\Classes\RenderDoc.RDCCapture.1" 
+							Value='RenderDoc Capture Log (.rdc)' 
+							Type="expandable" />
+						<RegistryValue Root="HKLM" Id="VerbIconRDC" Action="write" 
+							Key="Software\Classes\RenderDoc.RDCCapture.1\DefaultIcon" 
+							Value='[#renderdocuiEXE]' 
+							Type="expandable" />
+						<RegistryValue Root="HKLM" Id="RDCProgIDCLSID" Action="write" 
+							Key="Software\Classes\RenderDoc.RDCCapture.1\CLSID" 
+							Value='{5D6BF029-A6BA-417A-8523-120492B1DCE3}' 
+							Type="expandable" />
 
-              <RegistryValue Root="HKLM" Id="VerbCAP" Action="write" 
-                Key="Software\Classes\RenderDoc.RDCSettings.1\shell\open\command" 
-                Value='"[#renderdocuiEXE]" "%1"' 
-                Type="expandable" />
-              <RegistryValue Root="HKLM" Id="VerbDescCAP" Action="write" 
-                Key="Software\Classes\RenderDoc.RDCSettings.1" 
-                Value='RenderDoc Capture Settings (.cap)' 
-                Type="expandable" />
-              <RegistryValue Root="HKLM" Id="VerbIconCAP" Action="write" 
-                Key="Software\Classes\RenderDoc.RDCSettings.1\DefaultIcon" 
-                Value='[#renderdocuiEXE]' 
-                Type="expandable" />
-              
-            </Component>
+						<RegistryValue Root="HKLM" Id="VerbCAP" Action="write" 
+							Key="Software\Classes\RenderDoc.RDCSettings.1\shell\open\command" 
+							Value='"[#renderdocuiEXE]" "%1"' 
+							Type="expandable" />
+						<RegistryValue Root="HKLM" Id="VerbDescCAP" Action="write" 
+							Key="Software\Classes\RenderDoc.RDCSettings.1" 
+							Value='RenderDoc Capture Settings (.cap)' 
+							Type="expandable" />
+						<RegistryValue Root="HKLM" Id="VerbIconCAP" Action="write" 
+							Key="Software\Classes\RenderDoc.RDCSettings.1\DefaultIcon" 
+							Value='[#renderdocuiEXE]' 
+							Type="expandable" />
+						
+					</Component>
 
-            <Component Id='RenderDocCPP' Win64="yes" Guid='9D5949F9-0447-47B6-829D-77465E1FDAD9'>
-              <File Id='RenderDocCPP' Name='renderdoc.dll' DiskId='1' Source='dist/Release64/renderdoc.dll' KeyPath='yes' />
-              <File Id='D3DCompiler47' Name='d3dcompiler_47.dll' DiskId='1' Source='dist/Release64/d3dcompiler_47.dll' />
-              <File Id='RenderDocSHIM' Name='renderdocshim64.dll' DiskId='1' Source='dist/Release64/renderdocshim64.dll' />
-              
-              <RegistryValue Root="HKLM" Id="RDCCLSID" Action="write" 
-                Key="Software\Classes\CLSID\{5D6BF029-A6BA-417A-8523-120492B1DCE3}" 
-                Value='RenderDoc Thumbnail Handler' 
-                Type="expandable" />
-              <RegistryValue Root="HKLM" Id="RDCCLSIDServer" Action="write" 
-                Key="Software\Classes\CLSID\{5D6BF029-A6BA-417A-8523-120492B1DCE3}\InprocServer32" 
-                Value='[#RenderDocCPP]' 
-                Type="expandable" />
+					<Component Id='RenderDocCPP' Win64="yes" Guid='9D5949F9-0447-47B6-829D-77465E1FDAD9'>
+						<File Id='RenderDocCPP' Name='renderdoc.dll' DiskId='1' Source='dist/Release64/renderdoc.dll' KeyPath='yes' />
+						<File Id='D3DCompiler47' Name='d3dcompiler_47.dll' DiskId='1' Source='dist/Release64/d3dcompiler_47.dll' />
+						<File Id='RenderDocSHIM' Name='renderdocshim64.dll' DiskId='1' Source='dist/Release64/renderdocshim64.dll' />
+						
+						<RegistryValue Root="HKLM" Id="RDCCLSID" Action="write" 
+							Key="Software\Classes\CLSID\{5D6BF029-A6BA-417A-8523-120492B1DCE3}" 
+							Value='RenderDoc Thumbnail Handler' 
+							Type="expandable" />
+						<RegistryValue Root="HKLM" Id="RDCCLSIDServer" Action="write" 
+							Key="Software\Classes\CLSID\{5D6BF029-A6BA-417A-8523-120492B1DCE3}\InprocServer32" 
+							Value='[#RenderDocCPP]' 
+							Type="expandable" />
 
-            </Component>
+					</Component>
 
-            <Component Id='LICENSE' Win64="yes" Guid='71534ACB-DF6B-4956-A14C-566925D77AB0'>
-              <File Id='LICENSE' Name='LICENSE.rtf' DiskId='1' Source='installer/LICENSE.rtf' KeyPath='yes' />
-            </Component>
+					<Component Id='LICENSE' Win64="yes" Guid='71534ACB-DF6B-4956-A14C-566925D77AB0'>
+						<File Id='LICENSE' Name='LICENSE.rtf' DiskId='1' Source='installer/LICENSE.rtf' KeyPath='yes' />
+					</Component>
 
-            <Component Id='RenderDocCMD' Win64="yes" Guid='3443061F-2B11-4661-8535-4319D97B375C'>
-              <File Id='RenderDocCMD' Name='renderdoccmd.exe' DiskId='1' Source='dist/Release64/renderdoccmd.exe' KeyPath='yes' />
-            </Component>
+					<Component Id='RenderDocCMD' Win64="yes" Guid='3443061F-2B11-4661-8535-4319D97B375C'>
+						<File Id='RenderDocCMD' Name='renderdoccmd.exe' DiskId='1' Source='dist/Release64/renderdoccmd.exe' KeyPath='yes' />
+					</Component>
 
-            <Component Id='Scintilla' Win64="yes" Guid='E1BC516F-F611-4C7B-8F3E-A459F026FC4E'>
-              <File Id='ScintillaNET' Name='ScintillaNET.dll' DiskId='1' Source='dist/Release64/ScintillaNET.dll' KeyPath='yes' />
-              <File Id='SciLexer' Name='SciLexer.dll' DiskId='1' Source='dist/Release64/SciLexer.dll' />
-              <File Id='SciLexer64' Name='SciLexer64.dll' DiskId='1' Source='dist/Release64/SciLexer64.dll' />
-            </Component>
+					<Component Id='Scintilla' Win64="yes" Guid='E1BC516F-F611-4C7B-8F3E-A459F026FC4E'>
+						<File Id='ScintillaNET' Name='ScintillaNET.dll' DiskId='1' Source='dist/Release64/ScintillaNET.dll' KeyPath='yes' />
+						<File Id='SciLexer' Name='SciLexer.dll' DiskId='1' Source='dist/Release64/SciLexer.dll' />
+						<File Id='SciLexer64' Name='SciLexer64.dll' DiskId='1' Source='dist/Release64/SciLexer64.dll' />
+					</Component>
 
-            <Component Id='DockingUI' Win64="yes" Guid='420997F0-93DA-4ACF-AA5D-9EDBE8D96A09'>
-              <File Id='WinFormsUIDLL' Name='WeifenLuo.WinFormsUI.Docking.dll' DiskId='1' Source='dist/Release64/WeifenLuo.WinFormsUI.Docking.dll' KeyPath='yes' />
-            </Component>
+					<Component Id='DockingUI' Win64="yes" Guid='420997F0-93DA-4ACF-AA5D-9EDBE8D96A09'>
+						<File Id='WinFormsUIDLL' Name='WeifenLuo.WinFormsUI.Docking.dll' DiskId='1' Source='dist/Release64/WeifenLuo.WinFormsUI.Docking.dll' KeyPath='yes' />
+					</Component>
 
-            <Component Id='IronPython' Win64="yes" Guid='CE2C9D5B-9040-47C7-8E42-B79B52AE93EB'>
-              <File Id='IronPythonDLL' Name='IronPython.dll' DiskId='1' Source='dist/Release64/IronPython.dll' KeyPath='yes' />
-              <File Id='IronPythonModulesDLL' Name='IronPython.Modules.dll' DiskId='1' Source='dist/Release64/IronPython.Modules.dll' />
-              <File Id='MicrosoftScriptingDLL' Name='Microsoft.Scripting.dll' DiskId='1' Source='dist/Release64/Microsoft.Scripting.dll' />
-              <File Id='MicrosoftDynamicDLL' Name='Microsoft.Dynamic.dll' DiskId='1' Source='dist/Release32/Microsoft.Dynamic.dll' />
-              <File Id='PythonLibsDLL' Name='pythonlibs.dll' DiskId='1' Source='dist/Release64/pythonlibs.dll' />
-            </Component>
+					<Component Id='IronPython' Win64="yes" Guid='CE2C9D5B-9040-47C7-8E42-B79B52AE93EB'>
+						<File Id='IronPythonDLL' Name='IronPython.dll' DiskId='1' Source='dist/Release64/IronPython.dll' KeyPath='yes' />
+						<File Id='IronPythonModulesDLL' Name='IronPython.Modules.dll' DiskId='1' Source='dist/Release64/IronPython.Modules.dll' />
+						<File Id='MicrosoftScriptingDLL' Name='Microsoft.Scripting.dll' DiskId='1' Source='dist/Release64/Microsoft.Scripting.dll' />
+						<File Id='MicrosoftDynamicDLL' Name='Microsoft.Dynamic.dll' DiskId='1' Source='dist/Release32/Microsoft.Dynamic.dll' />
+						<File Id='PythonLibsDLL' Name='pythonlibs.dll' DiskId='1' Source='dist/Release64/pythonlibs.dll' />
+					</Component>
 
-            <Component Id='Documentation' Win64="yes" Guid='C49ABF1D-1D73-469B-A44A-DD9470E85F19'>
-              <File Id='Documentation' Name='renderdoc.chm' DiskId='1' Source='dist/Release64/renderdoc.chm' KeyPath='yes'>
-                <Shortcut Id="startmenuDocs" Directory="ProgramMenuDir" Name="RenderDoc Documentation" Icon='chm.ico' Advertise="yes" />
-              </File>
-            </Component>
+					<Component Id='Documentation' Win64="yes" Guid='C49ABF1D-1D73-469B-A44A-DD9470E85F19'>
+						<File Id='Documentation' Name='renderdoc.chm' DiskId='1' Source='dist/Release64/renderdoc.chm' KeyPath='yes'>
+							<Shortcut Id="startmenuDocs" Directory="ProgramMenuDir" Name="RenderDoc Documentation" Icon='chm.ico' Advertise="yes" />
+						</File>
+					</Component>
 
-            <Directory Id='pdblocate' Name='pdblocate'>
-              <Component Id='pdblocateEXE' Win64="yes" Guid='ED392DDC-7B3A-424D-A9F2-2F8DAA0C4AC3'>
-                <File Id='pdblocateEXE' Name='pdblocate.exe' DiskId='1' Source='dist/Release64/pdblocate/pdblocate.exe' KeyPath='yes' />
-              </Component>
+					<Directory Id='pdblocate' Name='pdblocate'>
+						<Component Id='pdblocateEXE' Win64="yes" Guid='ED392DDC-7B3A-424D-A9F2-2F8DAA0C4AC3'>
+							<File Id='pdblocateEXE' Name='pdblocate.exe' DiskId='1' Source='dist/Release64/pdblocate/pdblocate.exe' KeyPath='yes' />
+						</Component>
 
-              <Directory Id='pdblocateDeps64' Name='x64'>
-                <Component Id='pdblocateDeps' Win64="yes" Guid='8AFD0EC4-04FE-4843-9DA3-9E23B806604A'>
-                  <File Id='dbghelpDLL' Name='dbghelp.dll' DiskId='1' Source='dist/Release64/pdblocate/x64/dbghelp.dll' KeyPath='yes' />
-                  <File Id='symsrvDLL' Name='symsrv.dll' DiskId='1' Source='dist/Release64/pdblocate/x64/symsrv.dll' />
-                  <File Id='symsrvYES' Name='symsrv.yes' DiskId='1' Source='dist/Release64/pdblocate/x64/symsrv.yes' />
+						<Directory Id='pdblocateDeps64' Name='x64'>
+							<Component Id='pdblocateDeps' Win64="yes" Guid='8AFD0EC4-04FE-4843-9DA3-9E23B806604A'>
+								<File Id='dbghelpDLL' Name='dbghelp.dll' DiskId='1' Source='dist/Release64/pdblocate/x64/dbghelp.dll' KeyPath='yes' />
+								<File Id='symsrvDLL' Name='symsrv.dll' DiskId='1' Source='dist/Release64/pdblocate/x64/symsrv.dll' />
+								<File Id='symsrvYES' Name='symsrv.yes' DiskId='1' Source='dist/Release64/pdblocate/x64/symsrv.yes' />
+							</Component>
+						</Directory>
+
+						<Directory Id='pdblocateDeps32bit' Name='x86'>
+							<Component Id='pdblocateDeps32' Win64="yes" Guid='15CE068A-56D9-4B9C-BA5E-DAC25E235E2E'>
+								<File Id='dbghelp32DLL' Name='dbghelp.dll' DiskId='1' Source='dist/Release64/pdblocate/x86/dbghelp.dll' KeyPath='yes' />
+								<File Id='symsrv32DLL' Name='symsrv.dll' DiskId='1' Source='dist/Release64/pdblocate/x86/symsrv.dll' />
+								<File Id='symsrv32YES' Name='symsrv.yes' DiskId='1' Source='dist/Release64/pdblocate/x86/symsrv.yes' />
+							</Component>
+						</Directory>
+					</Directory>
+
+					<Directory Id='renderdocX86' Name='x86'>
+						<Component Id='renderdocX86Bins' Win64="yes" Guid='EB58A048-899A-4239-B229-DA9781C431F8'>
+							<File Id='renderdocX86DLL' Name='renderdoc.dll' DiskId='1' Source='dist/Release64/x86/renderdoc.dll' KeyPath='yes' />
+							<File Id='renderdocshimX86DLL' Name='renderdocshim32.dll' DiskId='1' Source='dist/Release64/x86/renderdocshim32.dll' />
+							<File Id='renderdocX86CMD' Name='renderdoccmd.exe' DiskId='1' Source='dist/Release64/x86/renderdoccmd.exe' />
+								
+							<RegistryValue Root="HKLM" Id="RDCCLSID32" Action="write" 
+								Key="Software\Wow6432Node\Classes\CLSID\{5D6BF029-A6BA-417A-8523-120492B1DCE3}" 
+								Value='RenderDoc Thumbnail Handler' 
+								Type="expandable" />
+							<RegistryValue Root="HKLM" Id="RDCCLSIDServer32" Action="write" 
+								Key="Software\Wow6432Node\Classes\CLSID\{5D6BF029-A6BA-417A-8523-120492B1DCE3}\InprocServer32" 
+								Value='[#renderdocX86DLL]' 
+								Type="expandable" />
+
+						</Component>
+
+						<Directory Id='pdblocateX86' Name='pdblocate'>
+							<Component Id='pdblocateX86EXE' Win64="yes" Guid='1E7B3F86-D477-413F-9BAE-9C4BB96877C5'>
+								<File Id='pdblocateX86EXE' Name='pdblocate.exe' DiskId='1' Source='dist/Release64/x86/pdblocate/pdblocate.exe' KeyPath='yes' />
+							</Component>
+
+							<Directory Id='pdblocateX86Deps32' Name='x86'>
+								<Component Id='pdblocateX86Deps' Win64="yes" Guid='146A8E15-B6CC-4CA0-8CAA-BA8A76BC29B2'>
+									<File Id='dbghelpX86DLL' Name='dbghelp.dll' DiskId='1' Source='dist/Release64/x86/pdblocate/x86/dbghelp.dll' KeyPath='yes' />
+									<File Id='symsrvX86DLL' Name='symsrv.dll' DiskId='1' Source='dist/Release64/x86/pdblocate/x86/symsrv.dll' />
+									<File Id='symsrvX86YES' Name='symsrv.yes' DiskId='1' Source='dist/Release64/x86/pdblocate/x86/symsrv.yes' />
                 </Component>
               </Directory>
-
-              <Directory Id='pdblocateDeps32bit' Name='x86'>
-                <Component Id='pdblocateDeps32' Win64="yes" Guid='15CE068A-56D9-4B9C-BA5E-DAC25E235E2E'>
-                  <File Id='dbghelp32DLL' Name='dbghelp.dll' DiskId='1' Source='dist/Release64/pdblocate/x86/dbghelp.dll' KeyPath='yes' />
-                  <File Id='symsrv32DLL' Name='symsrv.dll' DiskId='1' Source='dist/Release64/pdblocate/x86/symsrv.dll' />
-                  <File Id='symsrv32YES' Name='symsrv.yes' DiskId='1' Source='dist/Release64/pdblocate/x86/symsrv.yes' />
-                </Component>
-              </Directory>
-            </Directory>
-
-            <Directory Id='renderdocX86' Name='x86'>
-              <Component Id='renderdocX86Bins' Win64="yes" Guid='EB58A048-899A-4239-B229-DA9781C431F8'>
-                <File Id='renderdocX86DLL' Name='renderdoc.dll' DiskId='1' Source='dist/Release64/x86/renderdoc.dll' KeyPath='yes' />
-                <File Id='renderdocshimX86DLL' Name='renderdocshim32.dll' DiskId='1' Source='dist/Release64/x86/renderdocshim32.dll' />
-                <File Id='renderdocX86CMD' Name='renderdoccmd.exe' DiskId='1' Source='dist/Release64/x86/renderdoccmd.exe' />
-                  
-                <RegistryValue Root="HKLM" Id="RDCCLSID32" Action="write" 
-                  Key="Software\Wow6432Node\Classes\CLSID\{5D6BF029-A6BA-417A-8523-120492B1DCE3}" 
-                  Value='RenderDoc Thumbnail Handler' 
-                  Type="expandable" />
-                <RegistryValue Root="HKLM" Id="RDCCLSIDServer32" Action="write" 
-                  Key="Software\Wow6432Node\Classes\CLSID\{5D6BF029-A6BA-417A-8523-120492B1DCE3}\InprocServer32" 
-                  Value='[#renderdocX86DLL]' 
-                  Type="expandable" />
-
-              </Component>
-
-              <Directory Id='pdblocateX86' Name='pdblocate'>
-                <Component Id='pdblocateX86EXE' Win64="yes" Guid='1E7B3F86-D477-413F-9BAE-9C4BB96877C5'>
-                  <File Id='pdblocateX86EXE' Name='pdblocate.exe' DiskId='1' Source='dist/Release64/x86/pdblocate/pdblocate.exe' KeyPath='yes' />
-                </Component>
-
-                <Directory Id='pdblocateX86Deps32' Name='x86'>
-                  <Component Id='pdblocateX86Deps' Win64="yes" Guid='146A8E15-B6CC-4CA0-8CAA-BA8A76BC29B2'>
-                    <File Id='dbghelpX86DLL' Name='dbghelp.dll' DiskId='1' Source='dist/Release64/x86/pdblocate/x86/dbghelp.dll' KeyPath='yes' />
-                    <File Id='symsrvX86DLL' Name='symsrv.dll' DiskId='1' Source='dist/Release64/x86/pdblocate/x86/symsrv.dll' />
-                    <File Id='symsrvX86YES' Name='symsrv.yes' DiskId='1' Source='dist/Release64/x86/pdblocate/x86/symsrv.yes' />
-                  </Component>
-                </Directory>
-              </Directory>
-
             </Directory>
 
           </Directory>
+
         </Directory>
       </Directory>
 
diff --git a/installer/LICENSE.rtf b/installer/LICENSE.rtf
index 040acc1fb..03d8c02ce 100644
Binary files a/installer/LICENSE.rtf and b/installer/LICENSE.rtf differ
diff --git a/renderdoc/data/renderdoc.rc b/renderdoc/data/renderdoc.rc
index c83039634..f631e4eb0 100644
--- a/renderdoc/data/renderdoc.rc
+++ b/renderdoc/data/renderdoc.rc
@@ -83,11 +83,11 @@ BEGIN
     BEGIN
         BLOCK "080904b0"
         BEGIN
-            VALUE "CompanyName", "Crytek"
+            VALUE "CompanyName", "Baldur Karlsson"
             VALUE "FileDescription", "Core DLL for RenderDoc - http://renderdoc.org/"
             VALUE "FileVersion", RENDERDOC_VERSION_STRING ".0.0"
             VALUE "InternalName", "renderdoc.dll"
-            VALUE "LegalCopyright", "Copyright © 2014 Crytek"
+            VALUE "LegalCopyright", "Copyright © 2015 Baldur Karlsson"
             VALUE "OriginalFilename", "renderdoc.dll"
             VALUE "ProductName", "RenderDoc"
             VALUE "ProductVersion", RENDERDOC_VERSION_STRING ".0.0"
diff --git a/renderdocui/Properties/AssemblyInfo.cs b/renderdocui/Properties/AssemblyInfo.cs
index 080f0259d..53fc96beb 100644
--- a/renderdocui/Properties/AssemblyInfo.cs
+++ b/renderdocui/Properties/AssemblyInfo.cs
@@ -34,9 +34,9 @@ using System.Resources;
 [assembly: AssemblyTitle("RenderDoc")]
 [assembly: AssemblyDescription("RenderDoc UI replay app + launcher - http://renderdoc.org/")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Crytek")]
+[assembly: AssemblyCompany("Baldur Karlsson")]
 [assembly: AssemblyProduct("RenderDoc UI")]
-[assembly: AssemblyCopyright("Copyright © 2014 Crytek")]
+[assembly: AssemblyCopyright("Copyright © 2015 Baldur Karlsson")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/renderdocui/Windows/Dialogs/AboutDialog.Designer.cs b/renderdocui/Windows/Dialogs/AboutDialog.Designer.cs
index aa9005aee..a14942f53 100644
--- a/renderdocui/Windows/Dialogs/AboutDialog.Designer.cs
+++ b/renderdocui/Windows/Dialogs/AboutDialog.Designer.cs
@@ -77,7 +77,7 @@
             this.label2.Size = new System.Drawing.Size(439, 122);
             this.label2.TabIndex = 2;
             this.label2.Text = "Baldur Karlsson\r\nbaldurk@baldurk.org\r\nhttps://github.com/baldurk/renderdoc\r\nCopy" +
-    "right Crytek 2014";
+    "right Baldur Karlsson 2015";
             this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // ok