diff --git a/src/Installers/NuGetPackage/reko-files.xml b/src/Installers/NuGetPackage/reko-files.xml
index ace143a57e..ec1ffc0d66 100644
--- a/src/Installers/NuGetPackage/reko-files.xml
+++ b/src/Installers/NuGetPackage/reko-files.xml
@@ -13,63 +13,63 @@
         <var id="var.WindowsDecompiler.TargetPath">$SolutionDir$/Drivers/WindowsDecompiler/$TargetFwkWindowsDir_x64$/WindowsDecompiler.exe</var>
         <var id="var.WindowsForms.TargetPath">$SolutionDir$/UserInterfaces/WindowsForms/$TargetFwkWindowsDir$/Reko.UserInterfaces.WindowsForms.dll</var>
 
-        <var id="var.Alpha.TargetPath"  >$SolutionDir$/Arch/Alpha/$TargetDir$/Reko.Arch.Alpha.dll</var>
-        <var id="var.Altera.TargetPath"  >$SolutionDir$/Arch/Altera/$TargetDir$/Reko.Arch.Altera.dll</var>
-        <var id="var.Angstrem.TargetPath"  >$SolutionDir$/Arch/Angstrem/$TargetDir$/Reko.Arch.Angstrem.dll</var>
-        <var id="var.Arc.TargetPath" >$SolutionDir$/Arch/Arc/$TargetDir$/Reko.Arch.Arc.dll</var>
-        <var id="var.Arm.TargetPath" >$SolutionDir$/Arch/Arm/$TargetDir$/Reko.Arch.Arm.dll</var>
-        <var id="var.Avr.TargetPath" >$SolutionDir$/Arch/Avr/$TargetDir$/Reko.Arch.Avr.dll</var>
-        <var id="var.Blackfin.TargetPath" >$SolutionDir$/Arch/Blackfin/$TargetDir$/Reko.Arch.Blackfin.dll</var>
-        <var id="var.C166.TargetPath" >$SolutionDir$/Arch/C166/$TargetDir$/Reko.Arch.C166.dll</var>
-        <var id="var.Cil.TargetPath" >$SolutionDir$/Arch/Cil/$TargetDir$/Reko.Arch.Cil.dll</var>
-        <var id="var.CompactRisc.TargetPath" >$SolutionDir$/Arch/CompactRisc/$TargetDir$/Reko.Arch.CompactRisc.dll</var>
-        <var id="var.Cray.TargetPath" >$SolutionDir$/Arch/Cray/$TargetDir$/Reko.Arch.Cray.dll</var>
-        <var id="var.CSky.TargetPath" >$SolutionDir$/Arch/CSky/$TargetDir$/Reko.Arch.CSky.dll</var>
-        <var id="var.Etrax.TargetPath" >$SolutionDir$/Arch/Etrax/$TargetDir$/Reko.Arch.Etrax.dll</var>
-        <var id="var.Fujitsu.TargetPath" >$SolutionDir$/Arch/Fujitsu/$TargetDir$/Reko.Arch.Fujitsu.dll</var>
-        <var id="var.H8.TargetPath" >$SolutionDir$/Arch/H8/$TargetDir$/Reko.Arch.H8.dll</var>
-        <var id="var.IA64.TargetPath" >$SolutionDir$/Arch/IA64/$TargetDir$/Reko.Arch.IA64.dll</var>
-        <var id="var.Infineon.TargetPath" >$SolutionDir$/Arch/Infineon/$TargetDir$/Reko.Arch.Infineon.dll</var>
-        <var id="var.LatticeMico.TargetPath" >$SolutionDir$/Arch/LatticeMico/$TargetDir$/Reko.Arch.LatticeMico.dll</var>
-        <var id="var.Loongson.TargetPath" >$SolutionDir$/Arch/Loongson/$TargetDir$/Reko.Arch.Loongson.dll</var>
-        <var id="var.M6800.TargetPath" >$SolutionDir$/Arch/M6800/$TargetDir$/Reko.Arch.M6800.dll</var>
-        <var id="var.M68k.Design.TargetPath" >$SolutionDir$/Arch/M68k.Design/$TargetFwkWindowsDir$/Reko.Arch.M68k.Design.dll</var>
-        <var id="var.M68k.TargetPath" >$SolutionDir$/Arch/M68k/$TargetDir$/Reko.Arch.M68k.dll</var>
+        <var id="var.Alpha.TargetPath">$SolutionDir$/Arch/Alpha/$TargetDir$/Reko.Arch.Alpha.dll</var>
+        <var id="var.Altera.TargetPath">$SolutionDir$/Arch/Altera/$TargetDir$/Reko.Arch.Altera.dll</var>
+        <var id="var.Angstrem.TargetPath">$SolutionDir$/Arch/Angstrem/$TargetDir$/Reko.Arch.Angstrem.dll</var>
+        <var id="var.Arc.TargetPath">$SolutionDir$/Arch/Arc/$TargetDir$/Reko.Arch.Arc.dll</var>
+        <var id="var.Arm.TargetPath">$SolutionDir$/Arch/Arm/$TargetDir$/Reko.Arch.Arm.dll</var>
+        <var id="var.Avr.TargetPath">$SolutionDir$/Arch/Avr/$TargetDir$/Reko.Arch.Avr.dll</var>
+        <var id="var.Blackfin.TargetPath">$SolutionDir$/Arch/Blackfin/$TargetDir$/Reko.Arch.Blackfin.dll</var>
+        <var id="var.C166.TargetPath">$SolutionDir$/Arch/C166/$TargetDir$/Reko.Arch.C166.dll</var>
+        <var id="var.Cil.TargetPath">$SolutionDir$/Arch/Cil/$TargetDir$/Reko.Arch.Cil.dll</var>
+        <var id="var.CompactRisc.TargetPath">$SolutionDir$/Arch/CompactRisc/$TargetDir$/Reko.Arch.CompactRisc.dll</var>
+        <var id="var.Cray.TargetPath">$SolutionDir$/Arch/Cray/$TargetDir$/Reko.Arch.Cray.dll</var>
+        <var id="var.CSky.TargetPath">$SolutionDir$/Arch/CSky/$TargetDir$/Reko.Arch.CSky.dll</var>
+        <var id="var.Etrax.TargetPath">$SolutionDir$/Arch/Etrax/$TargetDir$/Reko.Arch.Etrax.dll</var>
+        <var id="var.Fujitsu.TargetPath">$SolutionDir$/Arch/Fujitsu/$TargetDir$/Reko.Arch.Fujitsu.dll</var>
+        <var id="var.H8.TargetPath">$SolutionDir$/Arch/H8/$TargetDir$/Reko.Arch.H8.dll</var>
+        <var id="var.IA64.TargetPath">$SolutionDir$/Arch/IA64/$TargetDir$/Reko.Arch.IA64.dll</var>
+        <var id="var.Infineon.TargetPath">$SolutionDir$/Arch/Infineon/$TargetDir$/Reko.Arch.Infineon.dll</var>
+        <var id="var.LatticeMico.TargetPath">$SolutionDir$/Arch/LatticeMico/$TargetDir$/Reko.Arch.LatticeMico.dll</var>
+        <var id="var.Loongson.TargetPath">$SolutionDir$/Arch/Loongson/$TargetDir$/Reko.Arch.Loongson.dll</var>
+        <var id="var.M6800.TargetPath">$SolutionDir$/Arch/M6800/$TargetDir$/Reko.Arch.M6800.dll</var>
+        <var id="var.M68k.Design.TargetPath">$SolutionDir$/Arch/M68k.Design/$TargetFwkWindowsDir$/Reko.Arch.M68k.Design.dll</var>
+        <var id="var.M68k.TargetPath">$SolutionDir$/Arch/M68k/$TargetDir$/Reko.Arch.M68k.dll</var>
         <var id="var.MCore.TargetPath">$SolutionDir$/Arch/MCore/$TargetDir$/Reko.Arch.MCore.dll</var>
-        <var id="var.MicroBlaze.TargetPath" >$SolutionDir$/Arch/MicroBlaze/$TargetDir$/Reko.Arch.MicroBlaze.dll</var>
-        <var id="var.Microchip.Utils.TargetPath" >$SolutionDir$/Libraries/Microchip/Utils/$TargetDir$/Reko.Libraries.Microchip.Utils.dll</var>
-        <var id="var.MicrochipPIC.Design.TargetPath" >$SolutionDir$/Arch/MicrochipPIC.Design/$TargetFwkWindowsDir$/Reko.Arch.MicrochipPIC.Design.dll</var>
-        <var id="var.MicrochipPIC.TargetPath" >$SolutionDir$/Arch/Microchip/$TargetDir$/Reko.Arch.MicrochipPIC.dll</var>
-        <var id="var.MilStd1750.TargetPath" >$SolutionDir$/Arch/MilStd1750/$TargetDir$/Reko.Arch.MilStd1750.dll</var>
-        <var id="var.Mips.TargetPath" >$SolutionDir$/Arch/Mips/$TargetDir$/Reko.Arch.Mips.dll</var>
-        <var id="var.MN103.TargetPath" >$SolutionDir$/Arch/Mips/$TargetDir$/Reko.Arch.MN103.dll</var>
-        <var id="var.Mos6502.TargetPath" >$SolutionDir$/Arch/Mos6502/$TargetDir$/Reko.Arch.Mos6502.dll</var>
-        <var id="var.Msp430.TargetPath" >$SolutionDir$/Arch/MSP430/$TargetDir$/Reko.Arch.Msp430.dll</var>
-        <var id="var.OpenRISC.TargetPath" >$SolutionDir$/Arch/OpenRISC/$TargetDir$/Reko.Arch.OpenRISC.dll</var>
-        <var id="var.Padauk.TargetPath" >$SolutionDir$/Arch/Padauk/$TargetDir$/Reko.Arch.Padauk.dll</var>
-        <var id="var.PaRisc.TargetPath" >$SolutionDir$/Arch/PaRisc/$TargetDir$/Reko.Arch.PaRisc.dll</var>
-        <var id="var.Pdp.TargetPath" >$SolutionDir$/Arch/Pdp/$TargetDir$/Reko.Arch.Pdp.dll</var>
-        <var id="var.PowerPC.Design.TargetPath" >$SolutionDir$/Arch/PowerPC.Design/$TargetFwkWindowsDir$/Reko.Arch.PowerPC.Design.dll</var>
-        <var id="var.PowerPC.TargetPath" >$SolutionDir$/Arch/PowerPC/$TargetDir$/Reko.Arch.PowerPC.dll</var>
-        <var id="var.Qualcomm.TargetPath" >$SolutionDir$/Arch/Qualcomm/$TargetDir$/Reko.Arch.Qualcomm.dll</var>
-        <var id="var.RiscV.TargetPath" >$SolutionDir$/Arch/RiscV/$TargetDir$/Reko.Arch.RiscV.dll</var>
-        <var id="var.Rl78.TargetPath" >$SolutionDir$/Arch/Rl78/$TargetDir$/Reko.Arch.Rl78.dll</var>
-        <var id="var.Sanyo.TargetPath" >$SolutionDir$/Arch/Sparc/$TargetDir$/Reko.Arch.Sanyo.dll</var>
-        <var id="var.Sparc.TargetPath" >$SolutionDir$/Arch/Sparc/$TargetDir$/Reko.Arch.Sparc.dll</var>
-        <var id="var.SuperH.TargetPath" >$SolutionDir$/Arch/SuperH/$TargetDir$/Reko.Arch.SuperH.dll</var>
-        <var id="var.Telink.TargetPath" >$SolutionDir$/Arch/Telink/$TargetDir$/Reko.Arch.Telink.dll</var>
-        <var id="var.Tlcs.TargetPath" >$SolutionDir$/Arch/Tlcs/$TargetDir$/Reko.Arch.Tlcs.dll</var>
-        <var id="var.Tms7000.TargetPath" >$SolutionDir$/Arch/Tms7000/$TargetDir$/Reko.Arch.Tms7000.dll</var>
-        <var id="var.Vax.TargetPath" >$SolutionDir$/Arch/Vax/$TargetDir$/Reko.Arch.Vax.dll</var>
-        <var id="var.V850.TargetPath" >$SolutionDir$/Arch/V850/$TargetDir$/Reko.Arch.V850.dll</var>
-        <var id="var.WE32100.TargetPath" >$SolutionDir$/Arch/WE32100/$TargetDir$/Reko.Arch.WE32100.dll</var>
-        <var id="var.X86.Design.TargetPath" >$SolutionDir$/Arch/X86.Design/$TargetFwkWindowsDir$/Reko.Arch.X86.Design.dll</var>
-        <var id="var.X86.TargetPath" >$SolutionDir$/Arch/X86/$TargetDir$/Reko.Arch.X86.dll</var>
-        <var id="var.XCore.TargetPath" >$SolutionDir$/Arch/XCore/$TargetDir$/Reko.Arch.XCore.dll</var>
-        <var id="var.Xtensa.TargetPath" >$SolutionDir$/Arch/Xtensa/$TargetDir$/Reko.Arch.Xtensa.dll</var>
-        <var id="var.Z80.TargetPath" >$SolutionDir$/Arch/Zilog/$TargetDir$/Reko.Arch.Zilog.dll</var>
-        <var id="var.zSeries.TargetPath" >$SolutionDir$/Arch/zSeries/$TargetDir$/Reko.Arch.zSeries.dll</var>
-        <var id="var.i8051.TargetPath" >$SolutionDir$/Arch/i8051/$TargetDir$/Reko.Arch.i8051.dll</var>
+        <var id="var.MicroBlaze.TargetPath">$SolutionDir$/Arch/MicroBlaze/$TargetDir$/Reko.Arch.MicroBlaze.dll</var>
+        <var id="var.Microchip.Utils.TargetPath">$SolutionDir$/Libraries/Microchip/Utils/$TargetDir$/Reko.Libraries.Microchip.Utils.dll</var>
+        <var id="var.MicrochipPIC.Design.TargetPath">$SolutionDir$/Arch/MicrochipPIC.Design/$TargetFwkWindowsDir$/Reko.Arch.MicrochipPIC.Design.dll</var>
+        <var id="var.MicrochipPIC.TargetPath">$SolutionDir$/Arch/Microchip/$TargetDir$/Reko.Arch.MicrochipPIC.dll</var>
+        <var id="var.MilStd1750.TargetPath">$SolutionDir$/Arch/MilStd1750/$TargetDir$/Reko.Arch.MilStd1750.dll</var>
+        <var id="var.Mips.TargetPath">$SolutionDir$/Arch/Mips/$TargetDir$/Reko.Arch.Mips.dll</var>
+        <var id="var.MN103.TargetPath">$SolutionDir$/Arch/MN103/$TargetDir$/Reko.Arch.MN103.dll</var>
+        <var id="var.Mos6502.TargetPath">$SolutionDir$/Arch/Mos6502/$TargetDir$/Reko.Arch.Mos6502.dll</var>
+        <var id="var.Msp430.TargetPath">$SolutionDir$/Arch/MSP430/$TargetDir$/Reko.Arch.Msp430.dll</var>
+        <var id="var.OpenRISC.TargetPath">$SolutionDir$/Arch/OpenRISC/$TargetDir$/Reko.Arch.OpenRISC.dll</var>
+        <var id="var.Padauk.TargetPath">$SolutionDir$/Arch/Padauk/$TargetDir$/Reko.Arch.Padauk.dll</var>
+        <var id="var.PaRisc.TargetPath">$SolutionDir$/Arch/PaRisc/$TargetDir$/Reko.Arch.PaRisc.dll</var>
+        <var id="var.Pdp.TargetPath">$SolutionDir$/Arch/Pdp/$TargetDir$/Reko.Arch.Pdp.dll</var>
+        <var id="var.PowerPC.Design.TargetPath">$SolutionDir$/Arch/PowerPC.Design/$TargetFwkWindowsDir$/Reko.Arch.PowerPC.Design.dll</var>
+        <var id="var.PowerPC.TargetPath">$SolutionDir$/Arch/PowerPC/$TargetDir$/Reko.Arch.PowerPC.dll</var>
+        <var id="var.Qualcomm.TargetPath">$SolutionDir$/Arch/Qualcomm/$TargetDir$/Reko.Arch.Qualcomm.dll</var>
+        <var id="var.RiscV.TargetPath">$SolutionDir$/Arch/RiscV/$TargetDir$/Reko.Arch.RiscV.dll</var>
+        <var id="var.Rl78.TargetPath">$SolutionDir$/Arch/Rl78/$TargetDir$/Reko.Arch.Rl78.dll</var>
+        <var id="var.Sanyo.TargetPath">$SolutionDir$/Arch/Sparc/$TargetDir$/Reko.Arch.Sanyo.dll</var>
+        <var id="var.Sparc.TargetPath">$SolutionDir$/Arch/Sparc/$TargetDir$/Reko.Arch.Sparc.dll</var>
+        <var id="var.SuperH.TargetPath">$SolutionDir$/Arch/SuperH/$TargetDir$/Reko.Arch.SuperH.dll</var>
+        <var id="var.Telink.TargetPath">$SolutionDir$/Arch/Telink/$TargetDir$/Reko.Arch.Telink.dll</var>
+        <var id="var.Tlcs.TargetPath">$SolutionDir$/Arch/Tlcs/$TargetDir$/Reko.Arch.Tlcs.dll</var>
+        <var id="var.Tms7000.TargetPath">$SolutionDir$/Arch/Tms7000/$TargetDir$/Reko.Arch.Tms7000.dll</var>
+        <var id="var.Vax.TargetPath">$SolutionDir$/Arch/Vax/$TargetDir$/Reko.Arch.Vax.dll</var>
+        <var id="var.V850.TargetPath">$SolutionDir$/Arch/V850/$TargetDir$/Reko.Arch.V850.dll</var>
+        <var id="var.WE32100.TargetPath">$SolutionDir$/Arch/WE32100/$TargetDir$/Reko.Arch.WE32100.dll</var>
+        <var id="var.X86.Design.TargetPath">$SolutionDir$/Arch/X86.Design/$TargetFwkWindowsDir$/Reko.Arch.X86.Design.dll</var>
+        <var id="var.X86.TargetPath">$SolutionDir$/Arch/X86/$TargetDir$/Reko.Arch.X86.dll</var>
+        <var id="var.XCore.TargetPath">$SolutionDir$/Arch/XCore/$TargetDir$/Reko.Arch.XCore.dll</var>
+        <var id="var.Xtensa.TargetPath">$SolutionDir$/Arch/Xtensa/$TargetDir$/Reko.Arch.Xtensa.dll</var>
+        <var id="var.Z80.TargetPath">$SolutionDir$/Arch/Zilog/$TargetDir$/Reko.Arch.Zilog.dll</var>
+        <var id="var.zSeries.TargetPath">$SolutionDir$/Arch/zSeries/$TargetDir$/Reko.Arch.zSeries.dll</var>
+        <var id="var.i8051.TargetPath">$SolutionDir$/Arch/i8051/$TargetDir$/Reko.Arch.i8051.dll</var>
 
       <var id="var.AmigaOS.ProjectDir">$SolutionDir$/Environments/AmigaOS/</var>
       <var id="var.AmigaOS.TargetPath">$SolutionDir$/Environments/AmigaOS/$TargetDir$/Reko.Environments.AmigaOS.dll</var>
@@ -77,73 +77,73 @@
       <var id="var.AtariTOS.ProjectDir">$SolutionDir$/Environments/AtariTOS/</var>
       <var id="var.AtariTOS.TargetPath">$SolutionDir$/Environments/AtariTOS/$TargetDir$/Reko.Environments.AtariTOS.dll</var>
       <var id="var.BbcMicro.TargetPath">$SolutionDir$/Environments/BbcMicro/$TargetDir$/Reko.Environments.BbcMicro.dll</var>
-      <var id="var.C64.ProjectDir" >$SolutionDir$/Environments/C64/</var>
-      <var id="var.C64.TargetPath" >$SolutionDir$/Environments/C64/$TargetDir$/Reko.Environments.C64.dll</var>
-      <var id="var.Cpm.ProjectDir" >$SolutionDir$/Environments/Cpm/</var>
-      <var id="var.Cpm.TargetPath" >$SolutionDir$/Environments/Cpm/$TargetDir$/Reko.Environments.Cpm.dll</var>
-      <var id="var.Dreamcast.ProjectDir" >$SolutionDir$/Environments/Dreamcast/</var>
-      <var id="var.Dreamcast.TargetPath" >$SolutionDir$/Environments/Dreamcast/$TargetDir$/Reko.Environments.Dreamcast.dll</var>
-      <var id="var.Gameboy.TargetPath" >$SolutionDir$/Environments/Gameboy/$TargetDir$/Reko.Environments.Gameboy.dll</var>
-      <var id="var.Hpux.TargetPath" >$SolutionDir$/Environments/Hpux/$TargetDir$/Reko.Environments.Hpux.dll</var>
-      <var id="var.MacOS.ProjectDir" >$SolutionDir$/Environments/MacOS/</var>
-      <var id="var.MacOS.TargetPath" >$SolutionDir$/Environments/MacOS/$TargetDir$/Reko.Environments.MacOS.dll</var>
-      <var id="var.MorphOS.TargetPath" >$SolutionDir$/Environments/MorphOS/$TargetDir$/Reko.Environments.MorphOS.dll</var>
-      <var id="var.Msdos.Design.TargetPath" >$SolutionDir$/Environments/Msdos.Design/$TargetFwkWindowsDir$/Reko.Environments.Msdos.Design.dll</var>
-      <var id="var.Msdos.ProjectDir" >$SolutionDir$/Environments/Msdos/</var>
-      <var id="var.Msdos.TargetPath" >$SolutionDir$/Environments/Msdos/$TargetDir$/Reko.Environments.Msdos.dll</var>
-      <var id="var.NeoGeo.TargetPath" >$SolutionDir$/Environments/NeoGeo/$TargetDir$/Reko.Environments.NeoGeo.dll</var>
-      <var id="var.OpenVMS.TargetPath" >$SolutionDir$/Environments/OpenVMS/$TargetDir$/Reko.Environments.OpenVMS.dll</var>
-      <var id="var.OS2.ProjectDir" >$SolutionDir$/Environments/OS2/</var>
-      <var id="var.OS2.TargetPath" >$SolutionDir$/Environments/OS2/$TargetDir$/Reko.Environments.OS2.dll</var>
-      <var id="var.PalmOS.ProjectDir" >$SolutionDir$/Environments/PalmOS/</var>
-      <var id="var.PalmOS.TargetPath" >$SolutionDir$/Environments/PalmOS/$TargetDir$/Reko.Environments.PalmOS.dll</var>
-      <var id="var.Pdp10Env.TargetPath" >$SolutionDir$/Environments/Pdp10Env/$TargetDir$/Reko.Environments.Pdp10Env.dll</var>
-      <var id="var.Ps3.TargetPath" >$SolutionDir$/Environments/Ps3/$TargetDir$/Reko.Environments.Ps3.dll</var>
-      <var id="var.RT11.ProjectDir" >$SolutionDir$/Environments/RT11/</var>
-      <var id="var.RT11.TargetPath" >$SolutionDir$/Environments/RT11/$TargetDir$/Reko.Environments.RT11.dll</var>
-      <var id="var.RiscOS.TargetPath" >$SolutionDir$/Environments/RiscOS/$TargetDir$/Reko.Environments.RiscOS.dll</var>
-      <var id="var.SegaGenesis.ProjectDir" >$SolutionDir$/Environments/SegaGenesis/</var>
-      <var id="var.SegaGenesis.TargetPath" >$SolutionDir$/Environments/SegaGenesis/$TargetDir$/Reko.Environments.SegaGenesis.dll</var>
-      <var id="var.Snes.TargetPath" >$SolutionDir$/Environments/Snes/$TargetDir$/Reko.Environments.Snes.dll</var>
-      <var id="var.Switch.TargetPath" >$SolutionDir$/Environments/Switch/$TargetDir$/Reko.Environments.Switch.dll</var>
-      <var id="var.SysV.ProjectDir" >$SolutionDir$/Environments/SysV/</var>
-      <var id="var.SysV.TargetPath" >$SolutionDir$/Environments/SysV/$TargetDir$/Reko.Environments.SysV.dll</var>
-      <var id="var.Trs80.ProjectDir" >$SolutionDir$/Environments/Trs80/</var>
-      <var id="var.Trs80.TargetPath" >$SolutionDir$/Environments/Trs80/$TargetDir$/Reko.Environments.Trs80.dll</var>
-      <var id="var.Wii.TargetPath" >$SolutionDir$/Environments/Wii/$TargetDir$/Reko.Environments.Wii.dll</var>
-      <var id="var.Windows.ProjectDir" >$SolutionDir$/Environments/Windows/</var>
-      <var id="var.Windows.TargetPath" >$SolutionDir$/Environments/Windows/$TargetDir$/Reko.Environments.Windows.dll</var>
-      <var id="var.Xbox.ProjectDir" >$SolutionDir$/Environments/Xbox/</var>
-      <var id="var.Xbox.TargetPath" >$SolutionDir$/Environments/Xbox/$TargetDir$/Reko.Environments.Xbox.dll</var>
-      <var id="var.ZX81.TargetPath" >$SolutionDir$/Environments/ZX81/$TargetDir$/Reko.Environments.ZX81.dll</var>
+      <var id="var.C64.ProjectDir">$SolutionDir$/Environments/C64/</var>
+      <var id="var.C64.TargetPath">$SolutionDir$/Environments/C64/$TargetDir$/Reko.Environments.C64.dll</var>
+      <var id="var.Cpm.ProjectDir">$SolutionDir$/Environments/Cpm/</var>
+      <var id="var.Cpm.TargetPath">$SolutionDir$/Environments/Cpm/$TargetDir$/Reko.Environments.Cpm.dll</var>
+      <var id="var.Dreamcast.ProjectDir">$SolutionDir$/Environments/Dreamcast/</var>
+      <var id="var.Dreamcast.TargetPath">$SolutionDir$/Environments/Dreamcast/$TargetDir$/Reko.Environments.Dreamcast.dll</var>
+      <var id="var.Gameboy.TargetPath">$SolutionDir$/Environments/Gameboy/$TargetDir$/Reko.Environments.Gameboy.dll</var>
+      <var id="var.Hpux.TargetPath">$SolutionDir$/Environments/Hpux/$TargetDir$/Reko.Environments.Hpux.dll</var>
+      <var id="var.MacOS.ProjectDir">$SolutionDir$/Environments/MacOS/</var>
+      <var id="var.MacOS.TargetPath">$SolutionDir$/Environments/MacOS/$TargetDir$/Reko.Environments.MacOS.dll</var>
+      <var id="var.MorphOS.TargetPath">$SolutionDir$/Environments/MorphOS/$TargetDir$/Reko.Environments.MorphOS.dll</var>
+      <var id="var.Msdos.Design.TargetPath">$SolutionDir$/Environments/Msdos.Design/$TargetFwkWindowsDir$/Reko.Environments.Msdos.Design.dll</var>
+      <var id="var.Msdos.ProjectDir">$SolutionDir$/Environments/Msdos/</var>
+      <var id="var.Msdos.TargetPath">$SolutionDir$/Environments/Msdos/$TargetDir$/Reko.Environments.Msdos.dll</var>
+      <var id="var.NeoGeo.TargetPath">$SolutionDir$/Environments/NeoGeo/$TargetDir$/Reko.Environments.NeoGeo.dll</var>
+      <var id="var.OpenVMS.TargetPath">$SolutionDir$/Environments/OpenVMS/$TargetDir$/Reko.Environments.OpenVMS.dll</var>
+      <var id="var.OS2.ProjectDir">$SolutionDir$/Environments/OS2/</var>
+      <var id="var.OS2.TargetPath">$SolutionDir$/Environments/OS2/$TargetDir$/Reko.Environments.OS2.dll</var>
+      <var id="var.PalmOS.ProjectDir">$SolutionDir$/Environments/PalmOS/</var>
+      <var id="var.PalmOS.TargetPath">$SolutionDir$/Environments/PalmOS/$TargetDir$/Reko.Environments.PalmOS.dll</var>
+      <var id="var.Pdp10Env.TargetPath">$SolutionDir$/Environments/Pdp10Env/$TargetDir$/Reko.Environments.Pdp10Env.dll</var>
+      <var id="var.Ps3.TargetPath">$SolutionDir$/Environments/Ps3/$TargetDir$/Reko.Environments.Ps3.dll</var>
+      <var id="var.RT11.ProjectDir">$SolutionDir$/Environments/RT11/</var>
+      <var id="var.RT11.TargetPath">$SolutionDir$/Environments/RT11/$TargetDir$/Reko.Environments.RT11.dll</var>
+      <var id="var.RiscOS.TargetPath">$SolutionDir$/Environments/RiscOS/$TargetDir$/Reko.Environments.RiscOS.dll</var>
+      <var id="var.SegaGenesis.ProjectDir">$SolutionDir$/Environments/SegaGenesis/</var>
+      <var id="var.SegaGenesis.TargetPath">$SolutionDir$/Environments/SegaGenesis/$TargetDir$/Reko.Environments.SegaGenesis.dll</var>
+      <var id="var.Snes.TargetPath">$SolutionDir$/Environments/Snes/$TargetDir$/Reko.Environments.Snes.dll</var>
+      <var id="var.Switch.TargetPath">$SolutionDir$/Environments/Switch/$TargetDir$/Reko.Environments.Switch.dll</var>
+      <var id="var.SysV.ProjectDir">$SolutionDir$/Environments/SysV/</var>
+      <var id="var.SysV.TargetPath">$SolutionDir$/Environments/SysV/$TargetDir$/Reko.Environments.SysV.dll</var>
+      <var id="var.Trs80.ProjectDir">$SolutionDir$/Environments/Trs80/</var>
+      <var id="var.Trs80.TargetPath">$SolutionDir$/Environments/Trs80/$TargetDir$/Reko.Environments.Trs80.dll</var>
+      <var id="var.Wii.TargetPath">$SolutionDir$/Environments/Wii/$TargetDir$/Reko.Environments.Wii.dll</var>
+      <var id="var.Windows.ProjectDir">$SolutionDir$/Environments/Windows/</var>
+      <var id="var.Windows.TargetPath">$SolutionDir$/Environments/Windows/$TargetDir$/Reko.Environments.Windows.dll</var>
+      <var id="var.Xbox.ProjectDir">$SolutionDir$/Environments/Xbox/</var>
+      <var id="var.Xbox.TargetPath">$SolutionDir$/Environments/Xbox/$TargetDir$/Reko.Environments.Xbox.dll</var>
+      <var id="var.ZX81.TargetPath">$SolutionDir$/Environments/ZX81/$TargetDir$/Reko.Environments.ZX81.dll</var>
 
-      <var id="var.AOut.ProjectDir" >$SolutionDir$/ImageLoaders/AOut/</var>
-      <var id="var.AOut.TargetPath" >$SolutionDir$/ImageLoaders/AOut/$TargetDir$/Reko.ImageLoaders.AOut.dll</var>
-      <var id="var.Ar.TargetPath" >$SolutionDir$/ImageLoaders/Archives/$TargetDir$/Reko.ImageLoaders.Archives.dll</var>
-      <var id="var.BinHex.TargetPath" >$SolutionDir$/ImageLoaders/BinHex/$TargetDir$/Reko.ImageLoaders.BinHex.dll</var>
-      <var id="var.Coff.TargetPath" >$SolutionDir$/ImageLoaders/Coff/$TargetDir$/Reko.ImageLoaders.Coff.dll</var>
-      <var id="var.DiskImages.TargetPath" >$SolutionDir$/ImageLoaders/DiskImages/$TargetDir$/Reko.ImageLoaders.DiskImages.dll</var>
-      <var id="var.Dol.TargetPath" >$SolutionDir$/ImageLoaders/Dol/$TargetDir$/Reko.ImageLoaders.Dol.dll</var>
-      <var id="var.Elf.TargetPath" >$SolutionDir$/ImageLoaders/Elf/$TargetDir$/Reko.ImageLoaders.Elf.dll</var>
-      <var id="var.HpSom.TargetPath" >$SolutionDir$/ImageLoaders/HpSom/$TargetDir$/Reko.ImageLoaders.HpSom.dll</var>
-      <var id="var.Hunk.TargetPath" >$SolutionDir$/ImageLoaders/Hunk/$TargetDir$/Reko.ImageLoaders.Hunk.dll</var>
-      <var id="var.IntelHex.TargetPath" >$SolutionDir$/ImageLoaders/IntelHex/$TargetDir$/Reko.ImageLoaders.IntelHex.dll</var>
-      <var id="var.Ldm.TargetPath" >$SolutionDir$/ImageLoaders/Ldm/$TargetDir$/Reko.ImageLoaders.Ldm.dll</var>
-      <var id="var.LLVM.TargetPath" >$SolutionDir$/ImageLoaders/Llvm/$TargetDir$/Reko.ImageLoaders.LLVM.dll</var>
-      <var id="var.MachO.TargetPath" >$SolutionDir$/ImageLoaders/MachO/$TargetDir$/Reko.ImageLoaders.MachO.dll</var>
-      <var id="var.MzExe.TargetPath" >$SolutionDir$/ImageLoaders/MzExe/$TargetDir$/Reko.ImageLoaders.MzExe.dll</var>
-      <var id="var.Nro.TargetPath" >$SolutionDir$/ImageLoaders/Nro/$TargetDir$/Reko.ImageLoaders.Nro.dll</var>
-      <var id="var.OdbgScript.ProjectDir" >$SolutionDir$/ImageLoaders/OdbgScript/</var>
-      <var id="var.OdbgScript.TargetPath" >$SolutionDir$/ImageLoaders/OdbgScript/$TargetDir$/Reko.ImageLoaders.OdbgScript.dll</var>
-      <var id="var.Omf.TargetPath" >$SolutionDir$/ImageLoaders/Omf/$TargetDir$/Reko.ImageLoaders.Omf.dll</var>
-      <var id="var.Pef.TargetPath" >$SolutionDir$/ImageLoaders/Pef/$TargetDir$/Reko.ImageLoaders.Pef.dll</var>
-      <var id="var.Srec.TargetPath" >$SolutionDir$/ImageLoaders/Srec/$TargetDir$/Reko.ImageLoaders.Srec.dll</var>
-      <var id="var.TekHex.TargetPath" >$SolutionDir$/ImageLoaders/TekHex/$TargetDir$/Reko.ImageLoaders.TekHex.dll</var>
-      <var id="var.TypeLib.TargetPath" >$SolutionDir$/ImageLoaders/TypeLib/$TargetDir$/Reko.ImageLoaders.TypeLib.dll</var>
-      <var id="var.VmsExe.TargetPath" >$SolutionDir$/ImageLoaders/VmsExe/$TargetDir$/Reko.ImageLoaders.VmsExe.dll</var>
-      <var id="var.WebAssembly.TargetPath" >$SolutionDir$/ImageLoaders/WebAssembly/$TargetDir$/Reko.ImageLoaders.WebAssembly.dll</var>
-      <var id="var.Xex.TargetPath" >$SolutionDir$/ImageLoaders/XexLoader/$TargetDir$/Reko.ImageLoaders.Xex.dll</var>
-      <var id="var.Xbe.TargetPath" >$SolutionDir$/ImageLoaders/Xbe/$TargetDir$/Reko.ImageLoaders.Xbe.dll</var>
+      <var id="var.AOut.ProjectDir">$SolutionDir$/ImageLoaders/AOut/</var>
+      <var id="var.AOut.TargetPath">$SolutionDir$/ImageLoaders/AOut/$TargetDir$/Reko.ImageLoaders.AOut.dll</var>
+      <var id="var.Ar.TargetPath">$SolutionDir$/ImageLoaders/Archives/$TargetDir$/Reko.ImageLoaders.Archives.dll</var>
+      <var id="var.BinHex.TargetPath">$SolutionDir$/ImageLoaders/BinHex/$TargetDir$/Reko.ImageLoaders.BinHex.dll</var>
+      <var id="var.Coff.TargetPath">$SolutionDir$/ImageLoaders/Coff/$TargetDir$/Reko.ImageLoaders.Coff.dll</var>
+      <var id="var.DiskImages.TargetPath">$SolutionDir$/ImageLoaders/DiskImages/$TargetDir$/Reko.ImageLoaders.DiskImages.dll</var>
+      <var id="var.Dol.TargetPath">$SolutionDir$/ImageLoaders/Dol/$TargetDir$/Reko.ImageLoaders.Dol.dll</var>
+      <var id="var.Elf.TargetPath">$SolutionDir$/ImageLoaders/Elf/$TargetDir$/Reko.ImageLoaders.Elf.dll</var>
+      <var id="var.HpSom.TargetPath">$SolutionDir$/ImageLoaders/HpSom/$TargetDir$/Reko.ImageLoaders.HpSom.dll</var>
+      <var id="var.Hunk.TargetPath">$SolutionDir$/ImageLoaders/Hunk/$TargetDir$/Reko.ImageLoaders.Hunk.dll</var>
+      <var id="var.IntelHex.TargetPath">$SolutionDir$/ImageLoaders/IntelHex/$TargetDir$/Reko.ImageLoaders.IntelHex.dll</var>
+      <var id="var.Ldm.TargetPath">$SolutionDir$/ImageLoaders/Ldm/$TargetDir$/Reko.ImageLoaders.Ldm.dll</var>
+      <var id="var.LLVM.TargetPath">$SolutionDir$/ImageLoaders/Llvm/$TargetDir$/Reko.ImageLoaders.LLVM.dll</var>
+      <var id="var.MachO.TargetPath">$SolutionDir$/ImageLoaders/MachO/$TargetDir$/Reko.ImageLoaders.MachO.dll</var>
+      <var id="var.MzExe.TargetPath">$SolutionDir$/ImageLoaders/MzExe/$TargetDir$/Reko.ImageLoaders.MzExe.dll</var>
+      <var id="var.Nro.TargetPath">$SolutionDir$/ImageLoaders/Nro/$TargetDir$/Reko.ImageLoaders.Nro.dll</var>
+      <var id="var.OdbgScript.ProjectDir">$SolutionDir$/ImageLoaders/OdbgScript/</var>
+      <var id="var.OdbgScript.TargetPath">$SolutionDir$/ImageLoaders/OdbgScript/$TargetDir$/Reko.ImageLoaders.OdbgScript.dll</var>
+      <var id="var.Omf.TargetPath">$SolutionDir$/ImageLoaders/Omf/$TargetDir$/Reko.ImageLoaders.Omf.dll</var>
+      <var id="var.Pef.TargetPath">$SolutionDir$/ImageLoaders/Pef/$TargetDir$/Reko.ImageLoaders.Pef.dll</var>
+      <var id="var.Srec.TargetPath">$SolutionDir$/ImageLoaders/Srec/$TargetDir$/Reko.ImageLoaders.Srec.dll</var>
+      <var id="var.TekHex.TargetPath">$SolutionDir$/ImageLoaders/TekHex/$TargetDir$/Reko.ImageLoaders.TekHex.dll</var>
+      <var id="var.TypeLib.TargetPath">$SolutionDir$/ImageLoaders/TypeLib/$TargetDir$/Reko.ImageLoaders.TypeLib.dll</var>
+      <var id="var.VmsExe.TargetPath">$SolutionDir$/ImageLoaders/VmsExe/$TargetDir$/Reko.ImageLoaders.VmsExe.dll</var>
+      <var id="var.WebAssembly.TargetPath">$SolutionDir$/ImageLoaders/WebAssembly/$TargetDir$/Reko.ImageLoaders.WebAssembly.dll</var>
+      <var id="var.Xex.TargetPath">$SolutionDir$/ImageLoaders/XexLoader/$TargetDir$/Reko.ImageLoaders.Xex.dll</var>
+      <var id="var.Xbe.TargetPath">$SolutionDir$/ImageLoaders/Xbe/$TargetDir$/Reko.ImageLoaders.Xbe.dll</var>
 
       <var id="var.LGSymLoader.TargetPath">$SolutionDir$/Symbols/LGSymLoader/$TargetDir$/Reko.Symbols.LGSymLoader.dll</var>
       <var id="var.Libc.TargetPath">$SolutionDir$/Libraries/Libc/$TargetDir$/Reko.Libraries.Libc.dll</var>