[dasher: 44/217] update_wix.perl is a script that parses Data\alphabets\Makefile.am, Data\colours\Makefile.am and Dat



commit c1f72f137746c55e1461b656a92f1bc66a1f3638
Author: Ron Bessems <ron b promixis com>
Date:   Thu Oct 1 16:15:45 2015 -0400

    update_wix.perl is a script that parses Data\alphabets\Makefile.am, Data\colours\Makefile.am and 
Data\Colours\Makefile.am. It extras the file names that should be included in the installer and merges those 
files into the three wix installer source files ( Src/Installer/Dasher.wix, 
Src/InstallerTobii/InstallerTobii.wxs and Src/InstallerW2K/InstallerW2k.wxs ).
    
    Updated the wix installers from the Makefile.am sources via update_wix.perl.

 Src/Installer/Dasher.wxs              |  557 ++++++++++++++++-----------------
 Src/InstallerTobii/InstallerTobii.wxs |  551 ++++++++++++++++-----------------
 Src/InstallerW2K/InstallerW2K.wxs     |  551 ++++++++++++++++-----------------
 Src/update_wix.perl                   |  110 +++++++
 4 files changed, 899 insertions(+), 870 deletions(-)
---
diff --git a/Src/Installer/Dasher.wxs b/Src/Installer/Dasher.wxs
index c9649c4..2a1e4aa 100644
--- a/Src/Installer/Dasher.wxs
+++ b/Src/Installer/Dasher.wxs
@@ -1,268 +1,245 @@
-<?xml version='1.0' encoding='utf-8'?>
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-
-  <Product Name='Dasher 4.11' Id='bd8ecd28-2d32-11df-8d17-000423472618'
-   Language='1033' Codepage='1252' Version='4.11' Manufacturer='The Dasher Project'
-   UpgradeCode='c52ec8a8-2d32-11df-8d17-000423472618'>
-
-    <Package Keywords='Installer'
-     Description="Dasher 4.11 Installer"
-     Comments='This will install Dasher' Manufacturer='The Dasher Project'
-     InstallerVersion='100' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
-    <Media Id='1' Cabinet='Sample.cab' EmbedCab='yes' DiskPrompt="CD-ROM #1" />
-    <Property Id='DiskPrompt' Value="Dasher 4.11 Installation [1]" />
-
-    <Directory Id='TARGETDIR' Name='SourceDir'>
-      <Directory Id='ProgramFilesFolder' Name='PFiles'>
-        <Directory Id='Dasher' Name='Dasher'>
-          <Directory Id='INSTALLDIR' Name='Dasher 4.11'>
-            <Component Id='MainExecutable' Guid='5a93ba53-2e2d-4f88-8a1f-5bdd8f130394'>
-              <File Id='DasherEXE' Name='Dasher.exe' DiskId='1'
-               Source='..\Win32\Target\Release\Dasher.exe' Vital='yes'>
-               <Shortcut Id="startmenuDasher44" Directory="ProgramMenuDir" Name="Dasher 4.11" 
WorkingDirectory='INSTALLDIR'
-                 Icon="Dasher.exe" IconIndex="0" Advertise="yes"/>
-                <Shortcut Id="desktopDasher44" Directory="DesktopFolder" Name="Dasher 4.11" 
WorkingDirectory='INSTALLDIR'
-                 Icon="Dasher.exe" IconIndex="0" Advertise="yes"/>
-              </File>              
-              <File Id="ExpatDLL" Name="libexpat.dll" DiskId="1" Source="$(env.EXPAT)\bin\libexpat.dll" 
Vital="yes"/>              
-            </Component>
-            <Component Id="Help" Guid="cf486329-8d04-462b-afd4-e8e0bccc9c95">
-              <File Id="HelpFile" Name="Dasher.chm" DiskId="1" Source="..\..\Data\Help\Win32\dasher.chm"/>
-            </Component>
-            <Component Id="Tobii" Guid="a0f3fa44-106e-4fff-9ed6-010310f3ec0d">
-              <File Id="TobiiIconFile" Name="dasher-tobii.png" DiskId="1" 
Source="..\..\Data\Graphics\dasher-tobii.png"/>
-            </Component>
-            <Directory Id="SystemRC" Name="system.rc">
-              <Component Id="Alphabets" Guid="e734711a-0e68-4897-b7a6-7a60a20062b5">
-                <File Id="alphabet.AfaanOromo.xml" Name="alphabet.AfaanOromo.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.AfaanOromo.xml" />
-                <File Id="alphabet.Armenian.xml" Name="alphabet.Armenian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Armenian.xml" />
-                <File Id="alphabet.Assamese.xml" Name="alphabet.Assamese.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Assamese.xml" />
-                <!--<File Id="alphabet.Austen.xml" Name="alphabet.Austen.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Austen.xml" />-->
-                <File Id="alphabet.Azerbaijani.xml" Name="alphabet.Azerbaijani.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Azerbaijani.xml" />
-                <File Id="alphabet.Belarusian.xml" Name="alphabet.Belarusian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Belarusian.xml" />
-                <File Id="alphabet.Bulgarian.xml" Name="alphabet.Bulgarian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Bulgarian.xml" />
-                <File Id="alphabet.Esperanto.xml" Name="alphabet.Esperanto.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Esperanto.xml" />
-                <File Id="alphabet.Estonian.xml" Name="alphabet.Estonian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Estonian.xml" />
-                <File Id="alphabet.Filipino.xml" Name="alphabet.Filipino.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Filipino.xml" />
-                <File Id="alphabet.Greek.xml" Name="alphabet.Greek.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Greek.xml" />
-                <File Id="alphabet.Gujarati.xml" Name="alphabet.Gujarati.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Gujarati.xml" />
-                <File Id="alphabet.Hawaiian.xml" Name="alphabet.Hawaiian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Hawaiian.xml" />
-                <File Id="alphabet.Hebrew.xml" Name="alphabet.Hebrew.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Hebrew.xml" />
-                <File Id="alphabet.Hindi.xml" Name="alphabet.Hindi.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Hindi.xml" />
-                <File Id="alphabet.Icelandic.xml" Name="alphabet.Icelandic.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Icelandic.xml" />
-                <File Id="alphabet.Igbo.xml" Name="alphabet.Igbo.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Igbo.xml" />
-                <File Id="alphabet.Indonesian.xml" Name="alphabet.Indonesian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Indonesian.xml" />
-                <File Id="alphabet.IrishGaelic.xml" Name="alphabet.IrishGaelic.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.IrishGaelic.xml" />
-                <File Id="alphabet.Kannada.xml" Name="alphabet.Kannada.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Kannada.xml" />
-                <File Id="alphabet.Katakana.xml" Name="alphabet.Katakana.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Katakana.xml" />
-                <File Id="alphabet.Malay.xml" Name="alphabet.Malay.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Malay.xml" />
-                <File Id="alphabet.Malayalam.xml" Name="alphabet.Malayalam.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Malayalam.xml" />
-                <File Id="alphabet.Marathi.xml" Name="alphabet.Marathi.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Marathi.xml" />
-                <File Id="alphabet.Moldavian.xml" Name="alphabet.Moldavian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Moldavian.xml" />
-                <File Id="alphabet.Ndebele.xml" Name="alphabet.Ndebele.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Ndebele.xml" />
-                <File Id="alphabet.Oriya.xml" Name="alphabet.Oriya.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Oriya.xml" />
-                <File Id="alphabet.Punjabi.xml" Name="alphabet.Punjabi.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Punjabi.xml" />
-                <File Id="alphabet.Romanian.xml" Name="alphabet.Romanian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Romanian.xml" />
-                <File Id="alphabet.Sami.xml" Name="alphabet.Sami.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Sami.xml" />
-                <File Id="alphabet.ScotsGaelic.xml" Name="alphabet.ScotsGaelic.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.ScotsGaelic.xml" />
-                <File Id="alphabet.Sepedi.xml" Name="alphabet.Sepedi.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Sepedi.xml" />
-                <File Id="alphabet.Sesotho.xml" Name="alphabet.Sesotho.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Sesotho.xml" />
-                <File Id="alphabet.Sinhala.xml" Name="alphabet.Sinhala.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Sinhala.xml" />
-                <File Id="alphabet.Slovak.xml" Name="alphabet.Slovak.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Slovak.xml" />
-                <File Id="alphabet.Slovenian.xml" Name="alphabet.Slovenian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Slovenian.xml" />
-                <File Id="alphabet.Swati.xml" Name="alphabet.Swati.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Swati.xml" />
-                <File Id="alphabet.Tajik.xml" Name="alphabet.Tajik.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Tajik.xml" />
-                <File Id="alphabet.Tamil.xml" Name="alphabet.Tamil.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Tamil.xml" />
-                <File Id="alphabet.Telugu.xml" Name="alphabet.Telugu.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Telugu.xml" />
-                <File Id="alphabet.Thai.xml" Name="alphabet.Thai.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Thai.xml" />
-                <File Id="alphabet.Thai2.xml" Name="alphabet.Thai2.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Thai2.xml" />
-                <File Id="alphabet.Tsonga.xml" Name="alphabet.Tsonga.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Tsonga.xml" />
-                <File Id="alphabet.Tswana.xml" Name="alphabet.Tswana.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Tswana.xml" />
-                <File Id="alphabet.Turkish.xml" Name="alphabet.Turkish.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Turkish.xml" />
-                <File Id="alphabet.Urdu.xml" Name="alphabet.Urdu.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Urdu.xml" />
-                <File Id="alphabet.Vietnamese.xml" Name="alphabet.Vietnamese.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Vietnamese.xml" />
-                <File Id="alphabet.Xhosa.xml" Name="alphabet.Xhosa.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Xhosa.xml" />
-                <File Id="alphabet.Yoruba.xml" Name="alphabet.Yoruba.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Yoruba.xml" />
-                <File Id="alphabet.Zulu.xml" Name="alphabet.Zulu.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Zulu.xml" />
-                <File Id="alphabet.abc.xml" Name="alphabet.abc.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.abc.xml" />
-                <File Id="alphabet.adangbe.xml" Name="alphabet.adangbe.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.adangbe.xml" />
-                <File Id="alphabet.afrikaans.xml" Name="alphabet.afrikaans.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.afrikaans.xml" />
-                <File Id="alphabet.akan.xml" Name="alphabet.akan.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.akan.xml" />
-                <File Id="alphabet.albanian.xml" Name="alphabet.albanian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.albanian.xml" />
-                <File Id="alphabet.amharic.xml" Name="alphabet.amharic.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.amharic.xml" />
-                <File Id="alphabet.arabic.xml" Name="alphabet.arabic.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.arabic.xml" />
-                <File Id="alphabet.basque.xml" Name="alphabet.basque.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.basque.xml" />
-                <File Id="alphabet.bengali.xml" Name="alphabet.bengali.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.bengali.xml" />
-                <File Id="alphabet.bopomofo.xml" Name="alphabet.bopomofo.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.bopomofo.xml" />
-                <File Id="alphabet.bosnian.xml" Name="alphabet.bosnian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.bosnian.xml" />
-                <File Id="alphabet.breton.xml" Name="alphabet.breton.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.breton.xml" />
-                <File Id="alphabet.catalan.xml" Name="alphabet.catalan.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.catalan.xml" />
-                <File Id="alphabet.cherokee.xml" Name="alphabet.cherokee.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.cherokee.xml" />
-                <File Id="alphabet.chinese.xml" Name="alphabet.chinese.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.chinese.xml" />
-                <File Id="alphabet.chineseRuby.xml" Name="alphabet.chineseRuby.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.chineseRuby.xml" />
-                <File Id="alphabet.spyDict.xml" Name="alphabet.spyDict.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.spyDict.xml" />
-                <File Id="alphabet.corsican.xml" Name="alphabet.corsican.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.corsican.xml" />
-                <File Id="alphabet.croatian.xml" Name="alphabet.croatian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.croatian.xml" />
-                <File Id="alphabet.czech.xml" Name="alphabet.czech.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.czech.xml" />
-                <File Id="alphabet.danish.xml" Name="alphabet.danish.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.danish.xml" />
-                <File Id="alphabet.dutch.xml" Name="alphabet.dutch.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.dutch.xml" />
-                <File Id="alphabet.english.xml" Name="alphabet.english.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.english.xml" />
-                <File Id="alphabet.englishC.xml" Name="alphabet.englishC.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.englishC.xml" />
-                <File Id="alphabet.ethiopic.xml" Name="alphabet.ethiopic.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.ethiopic.xml" />
-                <File Id="alphabet.ewe.xml" Name="alphabet.ewe.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.ewe.xml" />
-                <File Id="alphabet.faroese.xml" Name="alphabet.faroese.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.faroese.xml" />
-                <File Id="alphabet.finnish.xml" Name="alphabet.finnish.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.finnish.xml" />
-                <File Id="alphabet.finnish2.xml" Name="alphabet.finnish2.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.finnish2.xml" />
-                <File Id="alphabet.french.xml" Name="alphabet.french.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.french.xml" />
-                <File Id="alphabet.ga.xml" Name="alphabet.ga.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.ga.xml" />
-                <File Id="alphabet.galician.xml" Name="alphabet.galician.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.galician.xml" />
-                <File Id="alphabet.georgian.xml" Name="alphabet.georgian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.georgian.xml" />
-                <File Id="alphabet.german.xml" Name="alphabet.german.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.german.xml" />
-                <File Id="alphabet.hausa.xml" Name="alphabet.hausa.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.hausa.xml" />
-                <File Id="alphabet.hiragana.xml" Name="alphabet.hiragana.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.hiragana.xml" />
-                <File Id="alphabet.hiragana2.xml" Name="alphabet.hiragana2.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.hiragana2.xml" />
-                <File Id="alphabet.hungarian.xml" Name="alphabet.hungarian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.hungarian.xml" />
-                <File Id="alphabet.ipa.xml" Name="alphabet.ipa.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.ipa.xml" />
-                <File Id="alphabet.italian.xml" Name="alphabet.italian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.italian.xml" />
-                <File Id="alphabet.japanese.canna.xml" Name="alphabet.japanese.canna.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.japanese.canna.xml" />
-                <File Id="alphabet.kazakh.xml" Name="alphabet.kazakh.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.kazakh.xml" />
-                <File Id="alphabet.kirghiz.xml" Name="alphabet.kirghiz.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.kirghiz.xml" />
-                <File Id="alphabet.kirundi.xml" Name="alphabet.kirundi.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.kirundi.xml" />
-                <File Id="alphabet.klingon.xml" Name="alphabet.klingon.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.klingon.xml" />
-                <File Id="alphabet.korean.xml" Name="alphabet.korean.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.korean.xml" />
-                <File Id="alphabet.koreanNested.xml" Name="alphabet.koreanNested.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.koreanNested.xml" />
-                <File Id="alphabet.kurdish.xml" Name="alphabet.kurdish.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.kurdish.xml" />
-                <File Id="alphabet.lao.xml" Name="alphabet.lao.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.lao.xml" />
-                <File Id="alphabet.latex.xml" Name="alphabet.latex.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.latex.xml" />
-                <File Id="alphabet.latin.xml" Name="alphabet.latin.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.latin.xml" />
-                <File Id="alphabet.latvian.xml" Name="alphabet.latvian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.latvian.xml" />
-                <File Id="alphabet.lithuanian.xml" Name="alphabet.lithuanian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.lithuanian.xml" />
-                <File Id="alphabet.luxembourgish.xml" Name="alphabet.luxembourgish.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.luxembourgish.xml" />
-                <File Id="alphabet.macedonian.xml" Name="alphabet.macedonian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.macedonian.xml" />
-                <File Id="alphabet.maltese.xml" Name="alphabet.maltese.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.maltese.xml" />
-                <File Id="alphabet.mongolian.xml" Name="alphabet.mongolian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.mongolian.xml" />
-                <File Id="alphabet.myanmar.xml" Name="alphabet.myanmar.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.myanmar.xml" />
-                <File Id="alphabet.nepali.xml" Name="alphabet.nepali.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.nepali.xml" />
-                <File Id="alphabet.norwegian.xml" Name="alphabet.norwegian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.norwegian.xml" />
-                <File Id="alphabet.occitan.xml" Name="alphabet.occitan.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.occitan.xml" />
-                <File Id="alphabet.ogham.xml" Name="alphabet.ogham.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.ogham.xml" />
-                <File Id="alphabet.pashto.xml" Name="alphabet.pashto.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.pashto.xml" />
-                <!--<File Id="alphabet.perl.xml" Name="alphabet.perl.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.perl.xml" />-->
-                <File Id="alphabet.persian.xml" Name="alphabet.persian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.persian.xml" />
-                <File Id="alphabet.pinyin.xml" Name="alphabet.pinyin.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.pinyin.xml" />
-                <File Id="alphabet.pinyin2.xml" Name="alphabet.pinyin2.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.pinyin2.xml" />
-                <File Id="alphabet.polish.xml" Name="alphabet.polish.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.polish.xml" />
-                <File Id="alphabet.portuguese.xml" Name="alphabet.portuguese.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.portuguese.xml" />
-                <File Id="alphabet.romansch.xml" Name="alphabet.romansch.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.romansch.xml" />
-                <File Id="alphabet.runic.xml" Name="alphabet.runic.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.runic.xml" />
-                <File Id="alphabet.russian.xml" Name="alphabet.russian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.russian.xml" />
-                <File Id="alphabet.sanskrit.xml" Name="alphabet.sanskrit.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.sanskrit.xml" />
-                <File Id="alphabet.serbian.xml" Name="alphabet.serbian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.serbian.xml" />
-                <File Id="alphabet.somali.xml" Name="alphabet.somali.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.somali.xml" />
-                <File Id="alphabet.spanish.xml" Name="alphabet.spanish.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.spanish.xml" />
-                <File Id="alphabet.swahili.xml" Name="alphabet.swahili.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.swahili.xml" />
-                <File Id="alphabet.swedish.xml" Name="alphabet.swedish.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.swedish.xml" />
-                <File Id="alphabet.thaana.xml" Name="alphabet.thaana.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.thaana.xml" />
-                <File Id="alphabet.tigrinya.xml" Name="alphabet.tigrinya.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.tigrinya.xml" />
-                <File Id="alphabet.turkmen.xml" Name="alphabet.turkmen.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.turkmen.xml" />
-                <File Id="alphabet.ukrainian.xml" Name="alphabet.ukrainian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.ukrainian.xml" />
-                <File Id="alphabet.uzbek.xml" Name="alphabet.uzbek.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.uzbek.xml" />
-                <File Id="alphabet.venda.xml" Name="alphabet.venda.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.venda.xml" />
-                <File Id="alphabet.welsh.xml" Name="alphabet.welsh.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.welsh.xml" />
-              </Component>
-              <Component Id="Training" Guid="bcc684a1-0a58-474c-bfd9-c25906bc7bf4">
-                <File Id="training_albanian_SQ.txt" Name="training_albanian_SQ.txt" DiskId="1" 
Source="..\..\Data\training\training_albanian_SQ.txt" />
-                <File Id="training_basque_ES.txt" Name="training_basque_ES.txt" DiskId="1" 
Source="..\..\Data\training\training_basque_ES.txt" />
-                <File Id="training_bengali_BD.txt" Name="training_bengali_BD.txt" DiskId="1" 
Source="..\..\Data\training\training_bengali_BD.txt" />
-                <!--<File Id="training_bengali_bn.txt" Name="training_bengali_bn.txt" DiskId="1" 
Source="..\..\Data\training\training_bengali_bn.txt" />-->
-                <File Id="training_canna_JP.txt" Name="training_canna_JP.txt" DiskId="1" 
Source="..\..\Data\training\training_canna_JP.txt" />
-                <!--<File Id="training_spyDict.txt" Name="training_spyDict.txt" DiskId="1" 
Source="..\..\Data\training\training_spyDict.txt" />-->
-                <File Id="training_czech_CS.txt" Name="training_czech_CS.txt" DiskId="1" 
Source="..\..\Data\training\training_czech_CS.txt" />
-                <File Id="training_danish_DK.txt" Name="training_danish_DK.txt" DiskId="1" 
Source="..\..\Data\training\training_danish_DK.txt" />
-                <File Id="training_dutch_NL.txt" Name="training_dutch_NL.txt" DiskId="1" 
Source="..\..\Data\training\training_dutch_NL.txt" />
-                <File Id="training_english_GB.txt" Name="training_english_GB.txt" DiskId="1" 
Source="..\..\Data\training\training_english_GB.txt" />
-                <File Id="training_finnish_FI.txt" Name="training_finnish_FI.txt" DiskId="1" 
Source="..\..\Data\training\training_finnish_FI.txt" />
-                <File Id="training_french_FR.txt" Name="training_french_FR.txt" DiskId="1" 
Source="..\..\Data\training\training_french_FR.txt" />
-                <File Id="training_frenchC_FR.txt" Name="training_frenchC_FR.txt" DiskId="1" 
Source="..\..\Data\training\training_frenchC_FR.txt" />
-                <File Id="training_german_DE.txt" Name="training_german_DE.txt" DiskId="1" 
Source="..\..\Data\training\training_german_DE.txt" />
-                <File Id="training_greek_GR.txt" Name="training_greek_GR.txt" DiskId="1" 
Source="..\..\Data\training\training_greek_GR.txt" />
-                <File Id="training_hebrew_IL.txt" Name="training_hebrew_IL.txt" DiskId="1" 
Source="..\..\Data\training\training_hebrew_IL.txt" />
-                <File Id="training_hiragana60_JP.txt" Name="training_hiragana60_JP.txt" DiskId="1" 
Source="..\..\Data\training\training_hiragana60_JP.txt" />
-                <File Id="training_hiragana83_JP.txt" Name="training_hiragana83_JP.txt" DiskId="1" 
Source="..\..\Data\training\training_hiragana83_JP.txt" />
-                <File Id="training_hungarian_HU.txt" Name="training_hungarian_HU.txt" DiskId="1" 
Source="..\..\Data\training\training_hungarian_HU.txt" />
-                <File Id="training_italian_IT.txt" Name="training_italian_IT.txt" DiskId="1" 
Source="..\..\Data\training\training_italian_IT.txt" />
-                <File Id="training_italianC_IT.txt" Name="training_italianC_IT.txt" DiskId="1" 
Source="..\..\Data\training\training_italianC_IT.txt" />
-                <File Id="training_mongolian_MN.txt" Name="training_mongolian_MN.txt" DiskId="1" 
Source="..\..\Data\training\training_mongolian_MN.txt" />
-                <File Id="training_persian_IR.txt" Name="training_persian_IR.txt" DiskId="1" 
Source="..\..\Data\training\training_persian_IR.txt" />
-                <File Id="training_polish_PL.txt" Name="training_polish_PL.txt" DiskId="1" 
Source="..\..\Data\training\training_polish_PL.txt" />
-                <File Id="training_portuguese_BR.txt" Name="training_portuguese_BR.txt" DiskId="1" 
Source="..\..\Data\training\training_portuguese_BR.txt" />
-                <File Id="training_portugueseC_BR.txt" Name="training_portugueseC_BR.txt" DiskId="1" 
Source="..\..\Data\training\training_portugueseC_BR.txt" />
-                <File Id="training_russian_RU.txt" Name="training_russian_RU.txt" DiskId="1" 
Source="..\..\Data\training\training_russian_RU.txt" />
-                <File Id="training_spanish_ES.txt" Name="training_spanish_ES.txt" DiskId="1" 
Source="..\..\Data\training\training_spanish_ES.txt" />
-                <File Id="training_spanishC_ES.txt" Name="training_spanishC_ES.txt" DiskId="1" 
Source="..\..\Data\training\training_spanishC_ES.txt" />
-                <File Id="training_swahili_KE.txt" Name="training_swahili_KE.txt" DiskId="1" 
Source="..\..\Data\training\training_swahili_KE.txt" />
-                <File Id="training_swedish_SE.txt" Name="training_swedish_SE.txt" DiskId="1" 
Source="..\..\Data\training\training_swedish_SE.txt" />
-                <File Id="training_turkish_TR.txt" Name="training_turkish_TR.txt" DiskId="1" 
Source="..\..\Data\training\training_turkish_TR.txt" />
-                <File Id="training_welsh_GB.txt" Name="training_welsh_GB.txt" DiskId="1" 
Source="..\..\Data\training\training_welsh_GB.txt" />
-              </Component>
-              <Component Id="Colours" Guid="bebff3fb-083c-46f8-ac31-2484f4b1e9a8">
-                <File Id="colour.blue.xml" Name="colour.blue.xml" DiskId="1" 
Source="..\..\Data\colours\colour.blue.xml" />
-                <File Id="colour.euroasian.xml" Name="colour.euroasian.xml" DiskId="1" 
Source="..\..\Data\colours\colour.euroasian.xml" />
-                <File Id="colour.euroasian2.xml" Name="colour.euroasian2.xml" DiskId="1" 
Source="..\..\Data\colours\colour.euroasian2.xml" />
-                <File Id="colour.euroasian3.xml" Name="colour.euroasian3.xml" DiskId="1" 
Source="..\..\Data\colours\colour.euroasian3.xml" />
-                <File Id="colour.jamie.xml" Name="colour.jamie.xml" DiskId="1" 
Source="..\..\Data\colours\colour.jamie.xml" />
-                <File Id="colour.rainbow.xml" Name="colour.rainbow.xml" DiskId="1" 
Source="..\..\Data\colours\colour.rainbow.xml" />
-                <File Id="colour.thai.xml" Name="colour.thai.xml" DiskId="1" 
Source="..\..\Data\colours\colour.thai.xml" />
-                <File Id="colour.vowels.xml" Name="colour.vowels.xml" DiskId="1" 
Source="..\..\Data\colours\colour.vowels.xml" />
-                <File Id="colour.vowels2.xml" Name="colour.vowels2.xml" DiskId="1" 
Source="..\..\Data\colours\colour.vowels2.xml" />
-                <File Id="colour.xml" Name="colour.xml" DiskId="1" Source="..\..\Data\colours\colour.xml" />
-              </Component>
-              <Component Id="ControlLabels" Guid="fc6ff2ec-3172-4259-b879-162c21981358">
-                <File Id="controllabels.xml" Name="controllabels.xml" DiskId="1" 
Source="..\..\Data\controllabels\controllabels.xml" />
-              </Component>
-            </Directory>
-          </Directory>
-        </Directory>
-      </Directory>
-
-     <Directory Id="ProgramMenuFolder" Name="Programs">
-       <Directory Id="ProgramMenuDir" Name="Dasher 4.11">
-         <Component  Id="Random" Guid="D28C2189-5E40-4f93-B42E-0CD76D8B5B37" KeyPath="no">
-           <Registry Id='DummyReg' Root='HKCU' Key='Software\Inference Group\Dasher3' Name='Dummy'
-              Action='write' Type='string' Value='Dummy Key' KeyPath='yes'/>
-           <RemoveFolder Id="RandomRemove" On="uninstall" />
-         </Component>
-       </Directory>
-     </Directory>
-
-     <Directory Id="DesktopFolder" Name="Desktop" />
-      <Component Id="RegistryTobii" Guid="63287558-8a18-4103-89d5-2c1116cffc52">
-        <Registry Id='TobiiExecutable' Root='HKLM' Key='Software\Tobii\MyTobii\MPA\Dasher45' 
Name='ExecutablePath'
-         Action='write' Type='string' Value='[INSTALLDIR]Dasher.exe' />
-        <Registry Id='TobiiIcon' Root='HKLM' Key='Software\Tobii\MyTobii\MPA\Dasher45' Name='IconPath'
-         Action='write' Type='string' Value='[INSTALLDIR]dasher-tobii.png' />
-        <Registry Id='TobiiTitle' Root='HKLM' Key='Software\Tobii\MyTobii\MPA\Dasher45' Name='Title'
-   Action='write' Type='string' Value='Dasher' />
-        <Registry Id='TobiiMouse' Root='HKLM' Key='Software\Tobii\MyTobii\MPA\Dasher45' Name='MouseControl'
-         Action='write' Type='string' Value='true' />
-      </Component>
-
-      <Component Id="RegistryTobiiDefaults" Guid="6EBE4DD9-850E-4a7b-BEBF-A33B0580F3EC">
-         <Registry Id="RegistryCircleStart" Root="HKCU" Key="Software\Inference Group\Dasher3" 
Name="CircleStart" Action="write" Type="integer" Value="1" />
-         <Registry Id="RegistryInputFilter" Root="HKCU" Key="Software\Inference Group\Dasher3" 
Name="InputFilter" Action="write" Type="string" Value="Eyetracker Mode" />
-    <Registry Id="RegistryStartOnLeft" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="StartOnLeft" 
Action="write" Type="integer" Value="0" />
-       </Component>
-
-       <!--<Component Id="RegistryNonTobii" Guid="a3bf552d-9622-4d4a-b17b-ebb47a18955b">
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>
+       <Product Name="Dasher 4.11" Id="bd8ecd28-2d32-11df-8d17-000423472618" Language="1033" Codepage="1252" 
Version="4.11" Manufacturer="The Dasher Project" UpgradeCode="c52ec8a8-2d32-11df-8d17-000423472618">
+               <Package Keywords="Installer" Description="Dasher 4.11 Installer" Comments="This will install 
Dasher" Manufacturer="The Dasher Project" InstallerVersion="100" Languages="1033" Compressed="yes" 
SummaryCodepage="1252"/>
+               <Media Id="1" Cabinet="Sample.cab" EmbedCab="yes" DiskPrompt="CD-ROM #1"/>
+               <Property Id="DiskPrompt" Value="Dasher 4.11 Installation [1]"/>
+               <Directory Id="TARGETDIR" Name="SourceDir">
+                       <Directory Id="ProgramFilesFolder" Name="PFiles">
+                               <Directory Id="Dasher" Name="Dasher">
+                                       <Directory Id="INSTALLDIR" Name="Dasher 4.11">
+                                               <Component Id="MainExecutable" 
Guid="5a93ba53-2e2d-4f88-8a1f-5bdd8f130394">
+                                                       <File Id="DasherEXE" Name="Dasher.exe" DiskId="1" 
Source="..\Win32\Target\Release\Dasher.exe" Vital="yes">
+                                                               <Shortcut Id="startmenuDasher44" 
Directory="ProgramMenuDir" Name="Dasher 4.11" WorkingDirectory="INSTALLDIR" Icon="Dasher.exe" IconIndex="0" 
Advertise="yes"/>
+                                                               <Shortcut Id="desktopDasher44" 
Directory="DesktopFolder" Name="Dasher 4.11" WorkingDirectory="INSTALLDIR" Icon="Dasher.exe" IconIndex="0" 
Advertise="yes"/>
+                                                       </File>
+                                                       <File Id="ExpatDLL" Name="libexpat.dll" DiskId="1" 
Source="$(env.EXPAT)\bin\libexpat.dll" Vital="yes"/>
+                                               </Component>
+                                               <Component Id="Help" 
Guid="cf486329-8d04-462b-afd4-e8e0bccc9c95">
+                                                       <File Id="HelpFile" Name="Dasher.chm" DiskId="1" 
Source="..\..\Data\Help\Win32\dasher.chm"/>
+                                               </Component>
+                                               <Component Id="Tobii" 
Guid="a0f3fa44-106e-4fff-9ed6-010310f3ec0d">
+                                                       <File Id="TobiiIconFile" Name="dasher-tobii.png" 
DiskId="1" Source="..\..\Data\Graphics\dasher-tobii.png"/>
+                                               </Component>
+                                               <Directory Id="SystemRC" Name="system.rc">
+                                                       <Component Id="Alphabets" 
Guid="e734711a-0e68-4897-b7a6-7a60a20062b5">
+                                                               <File Id="alphabet.AfaanOromo.xml" 
Name="alphabet.AfaanOromo.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.AfaanOromo.xml"/>
+                                                               <File Id="alphabet.Armenian.xml" 
Name="alphabet.Armenian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Armenian.xml"/>
+                                                               <File Id="alphabet.Assamese.xml" 
Name="alphabet.Assamese.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Assamese.xml"/>
+                                                               <File Id="alphabet.Austen.xml" 
Name="alphabet.Austen.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Austen.xml"/>
+                                                               <File Id="alphabet.Azerbaijani.xml" 
Name="alphabet.Azerbaijani.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Azerbaijani.xml"/>
+                                                               <File Id="alphabet.Belarusian.xml" 
Name="alphabet.Belarusian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Belarusian.xml"/>
+                                                               <File Id="alphabet.Bulgarian.xml" 
Name="alphabet.Bulgarian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Bulgarian.xml"/>
+                                                               <File Id="alphabet.Esperanto.xml" 
Name="alphabet.Esperanto.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Esperanto.xml"/>
+                                                               <File Id="alphabet.Estonian.xml" 
Name="alphabet.Estonian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Estonian.xml"/>
+                                                               <File Id="alphabet.Filipino.xml" 
Name="alphabet.Filipino.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Filipino.xml"/>
+                                                               <File Id="alphabet.Greek.xml" 
Name="alphabet.Greek.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Greek.xml"/>
+                                                               <File Id="alphabet.Gujarati.xml" 
Name="alphabet.Gujarati.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Gujarati.xml"/>
+                                                               <File Id="alphabet.Hawaiian.xml" 
Name="alphabet.Hawaiian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Hawaiian.xml"/>
+                                                               <File Id="alphabet.Hebrew.xml" 
Name="alphabet.Hebrew.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Hebrew.xml"/>
+                                                               <File Id="alphabet.Hindi.xml" 
Name="alphabet.Hindi.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Hindi.xml"/>
+                                                               <File Id="alphabet.Icelandic.xml" 
Name="alphabet.Icelandic.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Icelandic.xml"/>
+                                                               <File Id="alphabet.Igbo.xml" 
Name="alphabet.Igbo.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Igbo.xml"/>
+                                                               <File Id="alphabet.Indonesian.xml" 
Name="alphabet.Indonesian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Indonesian.xml"/>
+                                                               <File Id="alphabet.IrishGaelic.xml" 
Name="alphabet.IrishGaelic.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.IrishGaelic.xml"/>
+                                                               <File Id="alphabet.Kannada.xml" 
Name="alphabet.Kannada.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Kannada.xml"/>
+                                                               <File Id="alphabet.Katakana.xml" 
Name="alphabet.Katakana.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Katakana.xml"/>
+                                                               <File Id="alphabet.Malay.xml" 
Name="alphabet.Malay.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Malay.xml"/>
+                                                               <File Id="alphabet.Malayalam.xml" 
Name="alphabet.Malayalam.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Malayalam.xml"/>
+                                                               <File Id="alphabet.Marathi.xml" 
Name="alphabet.Marathi.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Marathi.xml"/>
+                                                               <File Id="alphabet.Moldavian.xml" 
Name="alphabet.Moldavian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Moldavian.xml"/>
+                                                               <File Id="alphabet.Ndebele.xml" 
Name="alphabet.Ndebele.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Ndebele.xml"/>
+                                                               <File Id="alphabet.Oriya.xml" 
Name="alphabet.Oriya.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Oriya.xml"/>
+                                                               <File Id="alphabet.Punjabi.xml" 
Name="alphabet.Punjabi.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Punjabi.xml"/>
+                                                               <File Id="alphabet.Romanian.xml" 
Name="alphabet.Romanian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Romanian.xml"/>
+                                                               <File Id="alphabet.Sami.xml" 
Name="alphabet.Sami.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Sami.xml"/>
+                                                               <File Id="alphabet.ScotsGaelic.xml" 
Name="alphabet.ScotsGaelic.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.ScotsGaelic.xml"/>
+                                                               <File Id="alphabet.Sepedi.xml" 
Name="alphabet.Sepedi.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Sepedi.xml"/>
+                                                               <File Id="alphabet.Sesotho.xml" 
Name="alphabet.Sesotho.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Sesotho.xml"/>
+                                                               <File Id="alphabet.Sinhala.xml" 
Name="alphabet.Sinhala.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Sinhala.xml"/>
+                                                               <File Id="alphabet.Slovak.xml" 
Name="alphabet.Slovak.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Slovak.xml"/>
+                                                               <File Id="alphabet.Slovenian.xml" 
Name="alphabet.Slovenian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Slovenian.xml"/>
+                                                               <File Id="alphabet.Swati.xml" 
Name="alphabet.Swati.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Swati.xml"/>
+                                                               <File Id="alphabet.Tajik.xml" 
Name="alphabet.Tajik.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Tajik.xml"/>
+                                                               <File Id="alphabet.Tamil.xml" 
Name="alphabet.Tamil.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Tamil.xml"/>
+                                                               <File Id="alphabet.Telugu.xml" 
Name="alphabet.Telugu.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Telugu.xml"/>
+                                                               <File Id="alphabet.Thai.xml" 
Name="alphabet.Thai.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Thai.xml"/>
+                                                               <File Id="alphabet.Thai2.xml" 
Name="alphabet.Thai2.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Thai2.xml"/>
+                                                               <File Id="alphabet.Tsonga.xml" 
Name="alphabet.Tsonga.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Tsonga.xml"/>
+                                                               <File Id="alphabet.Tswana.xml" 
Name="alphabet.Tswana.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Tswana.xml"/>
+                                                               <File Id="alphabet.Turkish.xml" 
Name="alphabet.Turkish.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Turkish.xml"/>
+                                                               <File Id="alphabet.Urdu.xml" 
Name="alphabet.Urdu.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Urdu.xml"/>
+                                                               <File Id="alphabet.Vietnamese.xml" 
Name="alphabet.Vietnamese.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Vietnamese.xml"/>
+                                                               <File Id="alphabet.Xhosa.xml" 
Name="alphabet.Xhosa.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Xhosa.xml"/>
+                                                               <File Id="alphabet.Yoruba.xml" 
Name="alphabet.Yoruba.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Yoruba.xml"/>
+                                                               <File Id="alphabet.Zulu.xml" 
Name="alphabet.Zulu.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Zulu.xml"/>
+                                                               <File Id="alphabet.abc.xml" 
Name="alphabet.abc.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.abc.xml"/>
+                                                               <File Id="alphabet.adangbe.xml" 
Name="alphabet.adangbe.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.adangbe.xml"/>
+                                                               <File Id="alphabet.afrikaans.xml" 
Name="alphabet.afrikaans.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.afrikaans.xml"/>
+                                                               <File Id="alphabet.akan.xml" 
Name="alphabet.akan.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.akan.xml"/>
+                                                               <File Id="alphabet.albanian.xml" 
Name="alphabet.albanian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.albanian.xml"/>
+                                                               <File Id="alphabet.amharic.xml" 
Name="alphabet.amharic.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.amharic.xml"/>
+                                                               <File Id="alphabet.arabic.xml" 
Name="alphabet.arabic.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.arabic.xml"/>
+                                                               <File Id="alphabet.basque.xml" 
Name="alphabet.basque.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.basque.xml"/>
+                                                               <File Id="alphabet.bengali.xml" 
Name="alphabet.bengali.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.bengali.xml"/>
+                                                               <File Id="alphabet.bopomofo.xml" 
Name="alphabet.bopomofo.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.bopomofo.xml"/>
+                                                               <File Id="alphabet.bopoTrad.xml" 
Name="alphabet.bopoTrad.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.bopoTrad.xml"/>
+                                                               <File Id="alphabet.bosnian.xml" 
Name="alphabet.bosnian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.bosnian.xml"/>
+                                                               <File Id="alphabet.breton.xml" 
Name="alphabet.breton.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.breton.xml"/>
+                                                               <File Id="alphabet.catalan.xml" 
Name="alphabet.catalan.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.catalan.xml"/>
+                                                               <File Id="alphabet.cangjie.xml" 
Name="alphabet.cangjie.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.cangjie.xml"/>
+                                                               <File Id="alphabet.cherokee.xml" 
Name="alphabet.cherokee.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.cherokee.xml"/>
+                                                               <File Id="alphabet.corsican.xml" 
Name="alphabet.corsican.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.corsican.xml"/>
+                                                               <File Id="alphabet.croatian.xml" 
Name="alphabet.croatian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.croatian.xml"/>
+                                                               <File Id="alphabet.czech.xml" 
Name="alphabet.czech.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.czech.xml"/>
+                                                               <File Id="alphabet.danish.xml" 
Name="alphabet.danish.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.danish.xml"/>
+                                                               <File Id="alphabet.dutch.xml" 
Name="alphabet.dutch.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.dutch.xml"/>
+                                                               <File Id="alphabet.english.xml" 
Name="alphabet.english.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.english.xml"/>
+                                                               <File Id="alphabet.englishC.xml" 
Name="alphabet.englishC.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.englishC.xml"/>
+                                                               <File Id="alphabet.ethiopic.xml" 
Name="alphabet.ethiopic.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.ethiopic.xml"/>
+                                                               <File Id="alphabet.ewe.xml" 
Name="alphabet.ewe.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.ewe.xml"/>
+                                                               <File Id="alphabet.faroese.xml" 
Name="alphabet.faroese.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.faroese.xml"/>
+                                                               <File Id="alphabet.finnish.xml" 
Name="alphabet.finnish.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.finnish.xml"/>
+                                                               <File Id="alphabet.finnish2.xml" 
Name="alphabet.finnish2.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.finnish2.xml"/>
+                                                               <File Id="alphabet.french.xml" 
Name="alphabet.french.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.french.xml"/>
+                                                               <File Id="alphabet.ga.xml" 
Name="alphabet.ga.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.ga.xml"/>
+                                                               <File Id="alphabet.galician.xml" 
Name="alphabet.galician.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.galician.xml"/>
+                                                               <File Id="alphabet.georgian.xml" 
Name="alphabet.georgian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.georgian.xml"/>
+                                                               <File Id="alphabet.german.xml" 
Name="alphabet.german.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.german.xml"/>
+                                                               <File Id="alphabet.hausa.xml" 
Name="alphabet.hausa.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.hausa.xml"/>
+                                                               <File Id="alphabet.hiragana.xml" 
Name="alphabet.hiragana.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.hiragana.xml"/>
+                                                               <File Id="alphabet.hiragana2.xml" 
Name="alphabet.hiragana2.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.hiragana2.xml"/>
+                                                               <File Id="alphabet.hungarian.xml" 
Name="alphabet.hungarian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.hungarian.xml"/>
+                                                               <File Id="alphabet.ipa.xml" 
Name="alphabet.ipa.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.ipa.xml"/>
+                                                               <File Id="alphabet.italian.xml" 
Name="alphabet.italian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.italian.xml"/>
+                                                               <File Id="alphabet.japanese.canna.xml" 
Name="alphabet.japanese.canna.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.japanese.canna.xml"/>
+                                                               <File Id="alphabet.kazakh.xml" 
Name="alphabet.kazakh.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.kazakh.xml"/>
+                                                               <File Id="alphabet.kirghiz.xml" 
Name="alphabet.kirghiz.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.kirghiz.xml"/>
+                                                               <File Id="alphabet.kirundi.xml" 
Name="alphabet.kirundi.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.kirundi.xml"/>
+                                                               <File Id="alphabet.klingon.xml" 
Name="alphabet.klingon.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.klingon.xml"/>
+                                                               <File Id="alphabet.korean.xml" 
Name="alphabet.korean.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.korean.xml"/>
+                                                               <File Id="alphabet.koreanNested.xml" 
Name="alphabet.koreanNested.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.koreanNested.xml"/>
+                                                               <File Id="alphabet.kurdish.xml" 
Name="alphabet.kurdish.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.kurdish.xml"/>
+                                                               <File Id="alphabet.lao.xml" 
Name="alphabet.lao.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.lao.xml"/>
+                                                               <File Id="alphabet.latex.xml" 
Name="alphabet.latex.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.latex.xml"/>
+                                                               <File Id="alphabet.latin.xml" 
Name="alphabet.latin.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.latin.xml"/>
+                                                               <File Id="alphabet.latvian.xml" 
Name="alphabet.latvian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.latvian.xml"/>
+                                                               <File Id="alphabet.lithuanian.xml" 
Name="alphabet.lithuanian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.lithuanian.xml"/>
+                                                               <File Id="alphabet.luxembourgish.xml" 
Name="alphabet.luxembourgish.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.luxembourgish.xml"/>
+                                                               <File Id="alphabet.macedonian.xml" 
Name="alphabet.macedonian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.macedonian.xml"/>
+                                                               <File Id="alphabet.maltese.xml" 
Name="alphabet.maltese.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.maltese.xml"/>
+                                                               <File Id="alphabet.mongolian.xml" 
Name="alphabet.mongolian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.mongolian.xml"/>
+                                                               <File Id="alphabet.myanmar.xml" 
Name="alphabet.myanmar.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.myanmar.xml"/>
+                                                               <File Id="alphabet.nepali.xml" 
Name="alphabet.nepali.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.nepali.xml"/>
+                                                               <File Id="alphabet.norwegian.xml" 
Name="alphabet.norwegian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.norwegian.xml"/>
+                                                               <File Id="alphabet.occitan.xml" 
Name="alphabet.occitan.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.occitan.xml"/>
+                                                               <File Id="alphabet.ogham.xml" 
Name="alphabet.ogham.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.ogham.xml"/>
+                                                               <File Id="alphabet.pashto.xml" 
Name="alphabet.pashto.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.pashto.xml"/>
+                                                               <File Id="alphabet.perl.xml" 
Name="alphabet.perl.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.perl.xml"/>
+                                                               <File Id="alphabet.persian.xml" 
Name="alphabet.persian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.persian.xml"/>
+                                                               <File Id="alphabet.pinyin2.xml" 
Name="alphabet.pinyin2.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.pinyin2.xml"/>
+                                                               <File Id="alphabet.polish.xml" 
Name="alphabet.polish.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.polish.xml"/>
+                                                               <File Id="alphabet.portuguese.xml" 
Name="alphabet.portuguese.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.portuguese.xml"/>
+                                                               <File Id="alphabet.romansch.xml" 
Name="alphabet.romansch.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.romansch.xml"/>
+                                                               <File Id="alphabet.runic.xml" 
Name="alphabet.runic.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.runic.xml"/>
+                                                               <File Id="alphabet.russian.xml" 
Name="alphabet.russian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.russian.xml"/>
+                                                               <File Id="alphabet.sanskrit.xml" 
Name="alphabet.sanskrit.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.sanskrit.xml"/>
+                                                               <File Id="alphabet.serbian.xml" 
Name="alphabet.serbian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.serbian.xml"/>
+                                                               <File Id="alphabet.somali.xml" 
Name="alphabet.somali.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.somali.xml"/>
+                                                               <File Id="alphabet.spanish.xml" 
Name="alphabet.spanish.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.spanish.xml"/>
+                                                               <File Id="alphabet.spyNew.xml" 
Name="alphabet.spyNew.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.spyNew.xml"/>
+                                                               <File Id="alphabet.spyTonesNew.xml" 
Name="alphabet.spyTonesNew.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.spyTonesNew.xml"/>
+                                                               <File Id="alphabet.spyTones2New.xml" 
Name="alphabet.spyTones2New.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.spyTones2New.xml"/>
+                                                               <File Id="alphabet.swahili.xml" 
Name="alphabet.swahili.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.swahili.xml"/>
+                                                               <File Id="alphabet.swedish.xml" 
Name="alphabet.swedish.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.swedish.xml"/>
+                                                               <File Id="alphabet.thaana.xml" 
Name="alphabet.thaana.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.thaana.xml"/>
+                                                               <File Id="alphabet.tigrinya.xml" 
Name="alphabet.tigrinya.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.tigrinya.xml"/>
+                                                               <File Id="alphabet.turkmen.xml" 
Name="alphabet.turkmen.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.turkmen.xml"/>
+                                                               <File Id="alphabet.ukrainian.xml" 
Name="alphabet.ukrainian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.ukrainian.xml"/>
+                                                               <File Id="alphabet.uzbek.xml" 
Name="alphabet.uzbek.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.uzbek.xml"/>
+                                                               <File Id="alphabet.venda.xml" 
Name="alphabet.venda.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.venda.xml"/>
+                                                               <File Id="alphabet.welsh.xml" 
Name="alphabet.welsh.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.welsh.xml"/>
+                                                       </Component>
+                                                       <Component Id="Training" 
Guid="bcc684a1-0a58-474c-bfd9-c25906bc7bf4">
+                                                               <File Id="training_albanian_SQ.txt" 
Name="training_albanian_SQ.txt" DiskId="1" Source="..\..\Data\training\training_albanian_SQ.txt"/>
+                                                               <File Id="training_basque_ES.txt" 
Name="training_basque_ES.txt" DiskId="1" Source="..\..\Data\training\training_basque_ES.txt"/>
+                                                               <File Id="training_bengali_BD.txt" 
Name="training_bengali_BD.txt" DiskId="1" Source="..\..\Data\training\training_bengali_BD.txt"/>
+                                                               <File Id="training_canna_JP.txt" 
Name="training_canna_JP.txt" DiskId="1" Source="..\..\Data\training\training_canna_JP.txt"/>
+                                                               <File Id="training_czechC_CS.txt" 
Name="training_czechC_CS.txt" DiskId="1" Source="..\..\Data\training\training_czechC_CS.txt"/>
+                                                               <File Id="training_czech_CS.txt" 
Name="training_czech_CS.txt" DiskId="1" Source="..\..\Data\training\training_czech_CS.txt"/>
+                                                               <File Id="training_danish_DK.txt" 
Name="training_danish_DK.txt" DiskId="1" Source="..\..\Data\training\training_danish_DK.txt"/>
+                                                               <File Id="training_dutch_NL.txt" 
Name="training_dutch_NL.txt" DiskId="1" Source="..\..\Data\training\training_dutch_NL.txt"/>
+                                                               <File Id="training_englishLC_GB.txt" 
Name="training_englishLC_GB.txt" DiskId="1" Source="..\..\Data\training\training_englishLC_GB.txt"/>
+                                                               <File Id="training_english_GB.txt" 
Name="training_english_GB.txt" DiskId="1" Source="..\..\Data\training\training_english_GB.txt"/>
+                                                               <File Id="training_finnish_FI.txt" 
Name="training_finnish_FI.txt" DiskId="1" Source="..\..\Data\training\training_finnish_FI.txt"/>
+                                                               <File Id="training_frenchC_FR.txt" 
Name="training_frenchC_FR.txt" DiskId="1" Source="..\..\Data\training\training_frenchC_FR.txt"/>
+                                                               <File Id="training_french_FR.txt" 
Name="training_french_FR.txt" DiskId="1" Source="..\..\Data\training\training_french_FR.txt"/>
+                                                               <File Id="training_german_DE.txt" 
Name="training_german_DE.txt" DiskId="1" Source="..\..\Data\training\training_german_DE.txt"/>
+                                                               <File Id="training_greek_GR.txt" 
Name="training_greek_GR.txt" DiskId="1" Source="..\..\Data\training\training_greek_GR.txt"/>
+                                                               <File Id="training_hebrew_IL.txt" 
Name="training_hebrew_IL.txt" DiskId="1" Source="..\..\Data\training\training_hebrew_IL.txt"/>
+                                                               <File Id="training_hiragana60_JP.txt" 
Name="training_hiragana60_JP.txt" DiskId="1" Source="..\..\Data\training\training_hiragana60_JP.txt"/>
+                                                               <File Id="training_hiragana83_JP.txt" 
Name="training_hiragana83_JP.txt" DiskId="1" Source="..\..\Data\training\training_hiragana83_JP.txt"/>
+                                                               <File Id="training_hungarian_HU.txt" 
Name="training_hungarian_HU.txt" DiskId="1" Source="..\..\Data\training\training_hungarian_HU.txt"/>
+                                                               <File Id="training_italianC_IT.txt" 
Name="training_italianC_IT.txt" DiskId="1" Source="..\..\Data\training\training_italianC_IT.txt"/>
+                                                               <File Id="training_italian_IT.txt" 
Name="training_italian_IT.txt" DiskId="1" Source="..\..\Data\training\training_italian_IT.txt"/>
+                                                               <File Id="training_mongolian_MN.txt" 
Name="training_mongolian_MN.txt" DiskId="1" Source="..\..\Data\training\training_mongolian_MN.txt"/>
+                                                               <File Id="training_persian_IR.txt" 
Name="training_persian_IR.txt" DiskId="1" Source="..\..\Data\training\training_persian_IR.txt"/>
+                                                               <File Id="training_polish_PL.txt" 
Name="training_polish_PL.txt" DiskId="1" Source="..\..\Data\training\training_polish_PL.txt"/>
+                                                               <File Id="training_portugueseC_BR.txt" 
Name="training_portugueseC_BR.txt" DiskId="1" Source="..\..\Data\training\training_portugueseC_BR.txt"/>
+                                                               <File Id="training_portuguese_BR.txt" 
Name="training_portuguese_BR.txt" DiskId="1" Source="..\..\Data\training\training_portuguese_BR.txt"/>
+                                                               <File Id="training_russian_RU.txt" 
Name="training_russian_RU.txt" DiskId="1" Source="..\..\Data\training\training_russian_RU.txt"/>
+                                                               <File Id="training_spanishC_ES.txt" 
Name="training_spanishC_ES.txt" DiskId="1" Source="..\..\Data\training\training_spanishC_ES.txt"/>
+                                                               <File Id="training_spanish_ES.txt" 
Name="training_spanish_ES.txt" DiskId="1" Source="..\..\Data\training\training_spanish_ES.txt"/>
+                                                               <File Id="training_spyNew.txt" 
Name="training_spyNew.txt" DiskId="1" Source="..\..\Data\training\training_spyNew.txt"/>
+                                                               <File Id="training_swahili_KE.txt" 
Name="training_swahili_KE.txt" DiskId="1" Source="..\..\Data\training\training_swahili_KE.txt"/>
+                                                               <File Id="training_swedish_SE.txt" 
Name="training_swedish_SE.txt" DiskId="1" Source="..\..\Data\training\training_swedish_SE.txt"/>
+                                                               <File Id="training_turkish_TR.txt" 
Name="training_turkish_TR.txt" DiskId="1" Source="..\..\Data\training\training_turkish_TR.txt"/>
+                                                               <File Id="training_welsh_GB.txt" 
Name="training_welsh_GB.txt" DiskId="1" Source="..\..\Data\training\training_welsh_GB.txt"/>
+                                                       </Component>
+                                                       <Component Id="Colours" 
Guid="bebff3fb-083c-46f8-ac31-2484f4b1e9a8">
+                                                               <File Id="colour.blue.xml" 
Name="colour.blue.xml" DiskId="1" Source="..\..\Data\colours\colour.blue.xml"/>
+                                                               <File Id="colour.euroasian.xml" 
Name="colour.euroasian.xml" DiskId="1" Source="..\..\Data\colours\colour.euroasian.xml"/>
+                                                               <File Id="colour.euroasian2.xml" 
Name="colour.euroasian2.xml" DiskId="1" Source="..\..\Data\colours\colour.euroasian2.xml"/>
+                                                               <File Id="colour.euroasian3.xml" 
Name="colour.euroasian3.xml" DiskId="1" Source="..\..\Data\colours\colour.euroasian3.xml"/>
+                                                               <File Id="colour.jamie.xml" 
Name="colour.jamie.xml" DiskId="1" Source="..\..\Data\colours\colour.jamie.xml"/>
+                                                               <File Id="colour.rainbow.xml" 
Name="colour.rainbow.xml" DiskId="1" Source="..\..\Data\colours\colour.rainbow.xml"/>
+                                                               <File Id="colour.thai.xml" 
Name="colour.thai.xml" DiskId="1" Source="..\..\Data\colours\colour.thai.xml"/>
+                                                               <File Id="colour.vowels.xml" 
Name="colour.vowels.xml" DiskId="1" Source="..\..\Data\colours\colour.vowels.xml"/>
+                                                               <File Id="colour.vowels2.xml" 
Name="colour.vowels2.xml" DiskId="1" Source="..\..\Data\colours\colour.vowels2.xml"/>
+                                                               <File Id="colour.xml" Name="colour.xml" 
DiskId="1" Source="..\..\Data\colours\colour.xml"/>
+                                                       </Component>
+                                               </Directory>
+                                       </Directory>
+                               </Directory>
+                       </Directory>
+                       <Directory Id="ProgramMenuFolder" Name="Programs">
+                               <Directory Id="ProgramMenuDir" Name="Dasher 4.11">
+                                       <Component Id="Random" Guid="D28C2189-5E40-4f93-B42E-0CD76D8B5B37" 
KeyPath="no">
+                                               <Registry Id="DummyReg" Root="HKCU" Key="Software\Inference 
Group\Dasher3" Name="Dummy" Action="write" Type="string" Value="Dummy Key" KeyPath="yes"/>
+                                               <RemoveFolder Id="RandomRemove" On="uninstall"/>
+                                       </Component>
+                               </Directory>
+                       </Directory>
+                       <Directory Id="DesktopFolder" Name="Desktop"/>
+                       <Component Id="RegistryTobii" Guid="63287558-8a18-4103-89d5-2c1116cffc52">
+                               <Registry Id="TobiiExecutable" Root="HKLM" 
Key="Software\Tobii\MyTobii\MPA\Dasher45" Name="ExecutablePath" Action="write" Type="string" 
Value="[INSTALLDIR]Dasher.exe"/>
+                               <Registry Id="TobiiIcon" Root="HKLM" 
Key="Software\Tobii\MyTobii\MPA\Dasher45" Name="IconPath" Action="write" Type="string" 
Value="[INSTALLDIR]dasher-tobii.png"/>
+                               <Registry Id="TobiiTitle" Root="HKLM" 
Key="Software\Tobii\MyTobii\MPA\Dasher45" Name="Title" Action="write" Type="string" Value="Dasher"/>
+                               <Registry Id="TobiiMouse" Root="HKLM" 
Key="Software\Tobii\MyTobii\MPA\Dasher45" Name="MouseControl" Action="write" Type="string" Value="true"/>
+                       </Component>
+                       <Component Id="RegistryTobiiDefaults" Guid="6EBE4DD9-850E-4a7b-BEBF-A33B0580F3EC">
+                               <Registry Id="RegistryCircleStart" Root="HKCU" Key="Software\Inference 
Group\Dasher3" Name="CircleStart" Action="write" Type="integer" Value="1"/>
+                               <Registry Id="RegistryInputFilter" Root="HKCU" Key="Software\Inference 
Group\Dasher3" Name="InputFilter" Action="write" Type="string" Value="Eyetracker Mode"/>
+                               <Registry Id="RegistryStartOnLeft" Root="HKCU" Key="Software\Inference 
Group\Dasher3" Name="StartOnLeft" Action="write" Type="integer" Value="0"/>
+                       </Component>
+                       <!--<Component Id="RegistryNonTobii" Guid="a3bf552d-9622-4d4a-b17b-ebb47a18955b">
          <Condition>NOT TOBII</Condition>
 
          <Registry Id="RegistryCircleStart" Root="HKCU" Key="Software\Inference Group\Dasher3" 
Name="CircleStart" Action="write" Type="integer" Value="0" />
          <Registry Id="RegistryInputFilter" Root="HKCU" Key="Software\Inference Group\Dasher3" 
Name="InputFilter" Action="write" Type="string" Value="Normal Control" />
     <Registry Id="RegistryStartOnLeft" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="StartOnLeft" 
Action="write" Type="integer" Value="1" />
     </Component>-->
-
-
-       <!--<Component Id="RegistryCore" Guid="5999aef1-3ba7-4af2-8d56-5f3f4e7a4410">
+                       <!--<Component Id="RegistryCore" Guid="5999aef1-3ba7-4af2-8d56-5f3f4e7a4410">
        <Registry Id="RegistryDrawMouseLine" Root="HKCU" Key="Software\Inference Group\Dasher3" 
Name="DrawMouseLine" Action="write" Type="integer" Value="1" />
        <Registry Id="RegistryDrawMouse" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="DrawMouse" 
Action="write" Type="integer" Value="0" />
        <Registry Id="RegistryShowSpeedSlider" Root="HKCU" Key="Software\Inference Group\Dasher3" 
Name="ShowSpeedSlider" Action="write" Type="integer" Value="1" />
@@ -383,42 +360,34 @@
        <Registry Id="RegistryEditFont" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="EditFont" 
Action="write" Type="string" Value="Sans 10" />
        <Registry Id="RegistryWindowState" Root="HKCU" Key="Software\Inference Group\Dasher3" 
Name="WindowState" Action="write" Type="string" Value="" />
     </Component>-->
-  </Directory>
-
-
-
-    <Feature Id='Complete' Title='Dasher 4.11' Description='The full Dasher installation.' Display='expand' 
Level='1' ConfigurableDirectory='INSTALLDIR'>
-      <Feature Id="Core" Title="Core" Description="Core programs and data files." Level="1">
-       
-        <ComponentRef Id='MainExecutable' />
-        <ComponentRef Id='Random' />
-        <ComponentRef Id="Alphabets" />
-        <ComponentRef Id="Training" />
-        <ComponentRef Id="Colours" />
-        <ComponentRef Id="ControlLabels" />
-        <!--<ComponentRef Id="RegistryCore" />-->
-      </Feature>
-      <Feature Id="Documentation" Title="Documentation" Description="The Dasher manual." Level="1">
-        <ComponentRef Id="Help" />
-      </Feature>
-      <Feature Id="Tobii" Title="MyTobii Support" Description="Support for the MyTobii gaze tracker." 
Level="1000">
-        <ComponentRef Id="Tobii" />
-        <ComponentRef Id="RegistryTobii" />
-        <ComponentRef Id="RegistryTobiiDefaults" />
-      </Feature>
-      <!--<Feature Id="NonTobii" Title="Non-Tobii Defaults" Description="Default values for non-Tobii 
installations (internal)" Level="1">
+               </Directory>
+               <Feature Id="Complete" Title="Dasher 4.11" Description="The full Dasher installation." 
Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR">
+                       <Feature Id="Core" Title="Core" Description="Core programs and data files." Level="1">
+                               <ComponentRef Id="MainExecutable"/>
+                               <ComponentRef Id="Random"/>
+                               <ComponentRef Id="Alphabets"/>
+                               <ComponentRef Id="Training"/>
+                               <ComponentRef Id="Colours"/>                            
+                               <!--<ComponentRef Id="RegistryCore" />-->
+                       </Feature>
+                       <Feature Id="Documentation" Title="Documentation" Description="The Dasher manual." 
Level="1">
+                               <ComponentRef Id="Help"/>
+                       </Feature>
+                       <Feature Id="Tobii" Title="MyTobii Support" Description="Support for the MyTobii gaze 
tracker." Level="1000">
+                               <ComponentRef Id="Tobii"/>
+                               <ComponentRef Id="RegistryTobii"/>
+                               <ComponentRef Id="RegistryTobiiDefaults"/>
+                       </Feature>
+                       <!--<Feature Id="NonTobii" Title="Non-Tobii Defaults" Description="Default values for 
non-Tobii installations (internal)" Level="1">
         <Condition Level="0">FooBar</Condition>
         <CoponentRef Id="RegistryNonTobii" />
       </Feature>-->
-    </Feature>
-
-    <WixVariable Id="WixUILicenseRtf" Value="License.rtf" />
-    <WixVariable Id="WixUIDialogBmp" Value="Background.bmp" />
-    <WixVariable Id="WixUIBannerBmp" Value="Top.bmp" />
-                   
-    <UIRef Id="WixUI_Mondo" />
-    <UIRef Id="WixUI_ErrorProgressText" />
-
-    <Icon Id="Dasher.exe" SourceFile="..\Win32\Target\Release\Dasher.exe" />
-  </Product>
+               </Feature>
+               <WixVariable Id="WixUILicenseRtf" Value="License.rtf"/>
+               <WixVariable Id="WixUIDialogBmp" Value="Background.bmp"/>
+               <WixVariable Id="WixUIBannerBmp" Value="Top.bmp"/>
+               <UIRef Id="WixUI_Mondo"/>
+               <UIRef Id="WixUI_ErrorProgressText"/>
+               <Icon Id="Dasher.exe" SourceFile="..\Win32\Target\Release\Dasher.exe"/>
+       </Product>
 </Wix>
diff --git a/Src/InstallerTobii/InstallerTobii.wxs b/Src/InstallerTobii/InstallerTobii.wxs
index 052f249..63029af 100644
--- a/Src/InstallerTobii/InstallerTobii.wxs
+++ b/Src/InstallerTobii/InstallerTobii.wxs
@@ -1,262 +1,245 @@
-<?xml version='1.0' encoding='utf-8'?>
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-
-  <Product Name='Dasher 4.6 (MyTobii)' Id='8903D8E8-8AF4-46dd-A685-C1E5379912B4'
-   Language='1033' Codepage='1252' Version='4.6.2' Manufacturer='Dasher'
-   UpgradeCode='761FEE49-85EE-4c63-8A70-9A3CA5D70D3E'>
-
-    <Package Keywords='Installer'
-     Description="Dasher 4.6 (MyTobii Version) Installer"
-     Comments='This will install Dasher (MyTobii Version)' Manufacturer='The Dasher Group.'
-     InstallerVersion='100' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
-    <Media Id='1' Cabinet='Sample.cab' EmbedCab='yes' DiskPrompt="CD-ROM #1" />
-    <Property Id='DiskPrompt' Value="Dasher 4.6 (MyTobii) Installation [1]" />
-
-    <Directory Id='TARGETDIR' Name='SourceDir'>
-      <Directory Id='ProgramFilesFolder' Name='PFiles'>
-        <Directory Id='Dasher' Name='Dasher'>
-          <Directory Id='INSTALLDIR' Name='Dasher 4.6'>
-            <Component Id='MainExecutable' Guid='5a93ba53-2e2d-4f88-8a1f-5bdd8f130394'>
-              <File Id='DasherEXE' Name='Dasher.exe' DiskId='1'
-               Source='..\Win32\Target\Release\Dasher.exe' Vital='yes'>
-                <Shortcut Id="startmenuDasher44" Directory="ProgramMenuDir" Name="Dasher 4.6" 
WorkingDirectory='INSTALLDIR'
-                  Icon="Dasher.exe" IconIndex="0" Advertise="yes"/>
-                <Shortcut Id="desktopDasher44" Directory="DesktopFolder" Name="Dasher 4.6" 
WorkingDirectory='INSTALLDIR'
-                 Icon="Dasher.exe" IconIndex="0" Advertise="yes"/>
-              </File>
-              <File Id="ExpatDLL" Name="libexpat.dll" DiskId="1" Source="$(env.EXPAT)\bin\libexpat.dll" 
Vital="yes"/>
-            </Component>
-            <Component Id="Help" Guid="cf486329-8d04-462b-afd4-e8e0bccc9c95">
-              <File Id="HelpFile" Name="Dasher.chm" DiskId="1" Source="..\..\Data\Help\Win32\dasher.chm"/>
-            </Component>
-            <Component Id="Tobii" Guid="a0f3fa44-106e-4fff-9ed6-010310f3ec0d">
-              <File Id="TobiiIconFile" Name="dasher-tobii.png" DiskId="1" 
Source="..\..\Data\Graphics\dasher-tobii.png"/>
-            </Component>
-            <Directory Id="SystemRC" Name="system.rc">
-              <Component Id="Alphabets" Guid="e734711a-0e68-4897-b7a6-7a60a20062b5">
-                <File Id="alphabet.AfaanOromo.xml" Name="alphabet.AfaanOromo.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.AfaanOromo.xml" />
-                <File Id="alphabet.Armenian.xml" Name="alphabet.Armenian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Armenian.xml" />
-                <File Id="alphabet.Assamese.xml" Name="alphabet.Assamese.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Assamese.xml" />
-                <!--<File Id="alphabet.Austen.xml" Name="alphabet.Austen.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Austen.xml" />-->
-                <File Id="alphabet.Azerbaijani.xml" Name="alphabet.Azerbaijani.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Azerbaijani.xml" />
-                <File Id="alphabet.Belarusian.xml" Name="alphabet.Belarusian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Belarusian.xml" />
-                <File Id="alphabet.Bulgarian.xml" Name="alphabet.Bulgarian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Bulgarian.xml" />
-                <File Id="alphabet.Esperanto.xml" Name="alphabet.Esperanto.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Esperanto.xml" />
-                <File Id="alphabet.Estonian.xml" Name="alphabet.Estonian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Estonian.xml" />
-                <File Id="alphabet.Filipino.xml" Name="alphabet.Filipino.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Filipino.xml" />
-                <File Id="alphabet.Greek.xml" Name="alphabet.Greek.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Greek.xml" />
-                <File Id="alphabet.Gujarati.xml" Name="alphabet.Gujarati.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Gujarati.xml" />
-                <File Id="alphabet.Hawaiian.xml" Name="alphabet.Hawaiian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Hawaiian.xml" />
-                <File Id="alphabet.Hebrew.xml" Name="alphabet.Hebrew.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Hebrew.xml" />
-                <File Id="alphabet.Hindi.xml" Name="alphabet.Hindi.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Hindi.xml" />
-                <File Id="alphabet.Icelandic.xml" Name="alphabet.Icelandic.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Icelandic.xml" />
-                <File Id="alphabet.Igbo.xml" Name="alphabet.Igbo.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Igbo.xml" />
-                <File Id="alphabet.Indonesian.xml" Name="alphabet.Indonesian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Indonesian.xml" />
-                <File Id="alphabet.IrishGaelic.xml" Name="alphabet.IrishGaelic.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.IrishGaelic.xml" />
-                <File Id="alphabet.Kannada.xml" Name="alphabet.Kannada.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Kannada.xml" />
-                <File Id="alphabet.Katakana.xml" Name="alphabet.Katakana.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Katakana.xml" />
-                <File Id="alphabet.Malay.xml" Name="alphabet.Malay.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Malay.xml" />
-                <File Id="alphabet.Malayalam.xml" Name="alphabet.Malayalam.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Malayalam.xml" />
-                <File Id="alphabet.Marathi.xml" Name="alphabet.Marathi.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Marathi.xml" />
-                <File Id="alphabet.Moldavian.xml" Name="alphabet.Moldavian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Moldavian.xml" />
-                <File Id="alphabet.Ndebele.xml" Name="alphabet.Ndebele.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Ndebele.xml" />
-                <File Id="alphabet.Oriya.xml" Name="alphabet.Oriya.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Oriya.xml" />
-                <File Id="alphabet.Punjabi.xml" Name="alphabet.Punjabi.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Punjabi.xml" />
-                <File Id="alphabet.Romanian.xml" Name="alphabet.Romanian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Romanian.xml" />
-                <File Id="alphabet.Sami.xml" Name="alphabet.Sami.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Sami.xml" />
-                <File Id="alphabet.ScotsGaelic.xml" Name="alphabet.ScotsGaelic.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.ScotsGaelic.xml" />
-                <File Id="alphabet.Sepedi.xml" Name="alphabet.Sepedi.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Sepedi.xml" />
-                <File Id="alphabet.Sesotho.xml" Name="alphabet.Sesotho.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Sesotho.xml" />
-                <File Id="alphabet.Sinhala.xml" Name="alphabet.Sinhala.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Sinhala.xml" />
-                <File Id="alphabet.Slovak.xml" Name="alphabet.Slovak.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Slovak.xml" />
-                <File Id="alphabet.Slovenian.xml" Name="alphabet.Slovenian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Slovenian.xml" />
-                <File Id="alphabet.Swati.xml" Name="alphabet.Swati.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Swati.xml" />
-                <File Id="alphabet.Tajik.xml" Name="alphabet.Tajik.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Tajik.xml" />
-                <File Id="alphabet.Tamil.xml" Name="alphabet.Tamil.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Tamil.xml" />
-                <File Id="alphabet.Telugu.xml" Name="alphabet.Telugu.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Telugu.xml" />
-                <File Id="alphabet.Thai.xml" Name="alphabet.Thai.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Thai.xml" />
-                <File Id="alphabet.Thai2.xml" Name="alphabet.Thai2.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Thai2.xml" />
-                <File Id="alphabet.Tsonga.xml" Name="alphabet.Tsonga.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Tsonga.xml" />
-                <File Id="alphabet.Tswana.xml" Name="alphabet.Tswana.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Tswana.xml" />
-                <File Id="alphabet.Turkish.xml" Name="alphabet.Turkish.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Turkish.xml" />
-                <File Id="alphabet.Urdu.xml" Name="alphabet.Urdu.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Urdu.xml" />
-                <File Id="alphabet.Vietnamese.xml" Name="alphabet.Vietnamese.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Vietnamese.xml" />
-                <File Id="alphabet.Xhosa.xml" Name="alphabet.Xhosa.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Xhosa.xml" />
-                <File Id="alphabet.Yoruba.xml" Name="alphabet.Yoruba.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Yoruba.xml" />
-                <File Id="alphabet.Zulu.xml" Name="alphabet.Zulu.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Zulu.xml" />
-                <File Id="alphabet.abc.xml" Name="alphabet.abc.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.abc.xml" />
-                <File Id="alphabet.adangbe.xml" Name="alphabet.adangbe.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.adangbe.xml" />
-                <File Id="alphabet.afrikaans.xml" Name="alphabet.afrikaans.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.afrikaans.xml" />
-                <File Id="alphabet.akan.xml" Name="alphabet.akan.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.akan.xml" />
-                <File Id="alphabet.albanian.xml" Name="alphabet.albanian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.albanian.xml" />
-                <File Id="alphabet.amharic.xml" Name="alphabet.amharic.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.amharic.xml" />
-                <File Id="alphabet.arabic.xml" Name="alphabet.arabic.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.arabic.xml" />
-                <File Id="alphabet.basque.xml" Name="alphabet.basque.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.basque.xml" />
-                <File Id="alphabet.bengali.xml" Name="alphabet.bengali.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.bengali.xml" />
-                <File Id="alphabet.bopomofo.xml" Name="alphabet.bopomofo.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.bopomofo.xml" />
-                <File Id="alphabet.bosnian.xml" Name="alphabet.bosnian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.bosnian.xml" />
-                <File Id="alphabet.breton.xml" Name="alphabet.breton.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.breton.xml" />
-                <File Id="alphabet.catalan.xml" Name="alphabet.catalan.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.catalan.xml" />
-                <File Id="alphabet.cherokee.xml" Name="alphabet.cherokee.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.cherokee.xml" />
-                <File Id="alphabet.chinese.xml" Name="alphabet.chinese.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.chinese.xml" />
-                <File Id="alphabet.chineseRuby.xml" Name="alphabet.chineseRuby.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.chineseRuby.xml" />
-                <File Id="alphabet.corsican.xml" Name="alphabet.corsican.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.corsican.xml" />
-                <File Id="alphabet.croatian.xml" Name="alphabet.croatian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.croatian.xml" />
-                <File Id="alphabet.czech.xml" Name="alphabet.czech.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.czech.xml" />
-                <File Id="alphabet.danish.xml" Name="alphabet.danish.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.danish.xml" />
-                <File Id="alphabet.dutch.xml" Name="alphabet.dutch.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.dutch.xml" />
-                <File Id="alphabet.english.xml" Name="alphabet.english.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.english.xml" />
-                <File Id="alphabet.englishC.xml" Name="alphabet.englishC.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.englishC.xml" />
-                <File Id="alphabet.ethiopic.xml" Name="alphabet.ethiopic.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.ethiopic.xml" />
-                <File Id="alphabet.ewe.xml" Name="alphabet.ewe.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.ewe.xml" />
-                <File Id="alphabet.faroese.xml" Name="alphabet.faroese.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.faroese.xml" />
-                <File Id="alphabet.finnish.xml" Name="alphabet.finnish.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.finnish.xml" />
-                <File Id="alphabet.finnish2.xml" Name="alphabet.finnish2.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.finnish2.xml" />
-                <File Id="alphabet.french.xml" Name="alphabet.french.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.french.xml" />
-                <File Id="alphabet.ga.xml" Name="alphabet.ga.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.ga.xml" />
-                <File Id="alphabet.galician.xml" Name="alphabet.galician.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.galician.xml" />
-                <File Id="alphabet.georgian.xml" Name="alphabet.georgian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.georgian.xml" />
-                <File Id="alphabet.german.xml" Name="alphabet.german.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.german.xml" />
-                <File Id="alphabet.hausa.xml" Name="alphabet.hausa.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.hausa.xml" />
-                <File Id="alphabet.hiragana.xml" Name="alphabet.hiragana.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.hiragana.xml" />
-                <File Id="alphabet.hiragana2.xml" Name="alphabet.hiragana2.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.hiragana2.xml" />
-                <File Id="alphabet.hungarian.xml" Name="alphabet.hungarian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.hungarian.xml" />
-                <File Id="alphabet.ipa.xml" Name="alphabet.ipa.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.ipa.xml" />
-                <File Id="alphabet.italian.xml" Name="alphabet.italian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.italian.xml" />
-                <File Id="alphabet.japanese.canna.xml" Name="alphabet.japanese.canna.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.japanese.canna.xml" />
-                <File Id="alphabet.kazakh.xml" Name="alphabet.kazakh.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.kazakh.xml" />
-                <File Id="alphabet.kirghiz.xml" Name="alphabet.kirghiz.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.kirghiz.xml" />
-                <File Id="alphabet.kirundi.xml" Name="alphabet.kirundi.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.kirundi.xml" />
-                <File Id="alphabet.klingon.xml" Name="alphabet.klingon.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.klingon.xml" />
-                <File Id="alphabet.korean.xml" Name="alphabet.korean.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.korean.xml" />
-                <File Id="alphabet.koreanNested.xml" Name="alphabet.koreanNested.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.koreanNested.xml" />
-                <File Id="alphabet.kurdish.xml" Name="alphabet.kurdish.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.kurdish.xml" />
-                <File Id="alphabet.lao.xml" Name="alphabet.lao.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.lao.xml" />
-                <File Id="alphabet.latex.xml" Name="alphabet.latex.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.latex.xml" />
-                <File Id="alphabet.latin.xml" Name="alphabet.latin.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.latin.xml" />
-                <File Id="alphabet.latvian.xml" Name="alphabet.latvian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.latvian.xml" />
-                <File Id="alphabet.lithuanian.xml" Name="alphabet.lithuanian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.lithuanian.xml" />
-                <File Id="alphabet.luxembourgish.xml" Name="alphabet.luxembourgish.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.luxembourgish.xml" />
-                <File Id="alphabet.macedonian.xml" Name="alphabet.macedonian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.macedonian.xml" />
-                <File Id="alphabet.maltese.xml" Name="alphabet.maltese.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.maltese.xml" />
-                <File Id="alphabet.mongolian.xml" Name="alphabet.mongolian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.mongolian.xml" />
-                <File Id="alphabet.myanmar.xml" Name="alphabet.myanmar.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.myanmar.xml" />
-                <File Id="alphabet.nepali.xml" Name="alphabet.nepali.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.nepali.xml" />
-                <File Id="alphabet.norwegian.xml" Name="alphabet.norwegian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.norwegian.xml" />
-                <File Id="alphabet.occitan.xml" Name="alphabet.occitan.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.occitan.xml" />
-                <File Id="alphabet.ogham.xml" Name="alphabet.ogham.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.ogham.xml" />
-                <File Id="alphabet.pashto.xml" Name="alphabet.pashto.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.pashto.xml" />
-                <!--<File Id="alphabet.perl.xml" Name="alphabet.perl.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.perl.xml" />-->
-                <File Id="alphabet.persian.xml" Name="alphabet.persian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.persian.xml" />
-                <File Id="alphabet.pinyin.xml" Name="alphabet.pinyin.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.pinyin.xml" />
-                <!--<File Id="alphabet.pinyin2.xml" Name="alphabet.pinyin2.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.pinyin2.xml" />-->
-                <File Id="alphabet.polish.xml" Name="alphabet.polish.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.polish.xml" />
-                <File Id="alphabet.portuguese.xml" Name="alphabet.portuguese.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.portuguese.xml" />
-                <File Id="alphabet.romansch.xml" Name="alphabet.romansch.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.romansch.xml" />
-                <File Id="alphabet.runic.xml" Name="alphabet.runic.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.runic.xml" />
-                <File Id="alphabet.russian.xml" Name="alphabet.russian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.russian.xml" />
-                <File Id="alphabet.sanskrit.xml" Name="alphabet.sanskrit.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.sanskrit.xml" />
-                <File Id="alphabet.serbian.xml" Name="alphabet.serbian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.serbian.xml" />
-                <File Id="alphabet.somali.xml" Name="alphabet.somali.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.somali.xml" />
-                <File Id="alphabet.spanish.xml" Name="alphabet.spanish.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.spanish.xml" />
-                <File Id="alphabet.swahili.xml" Name="alphabet.swahili.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.swahili.xml" />
-                <File Id="alphabet.swedish.xml" Name="alphabet.swedish.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.swedish.xml" />
-                <File Id="alphabet.thaana.xml" Name="alphabet.thaana.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.thaana.xml" />
-                <File Id="alphabet.tigrinya.xml" Name="alphabet.tigrinya.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.tigrinya.xml" />
-                <File Id="alphabet.turkmen.xml" Name="alphabet.turkmen.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.turkmen.xml" />
-                <File Id="alphabet.ukrainian.xml" Name="alphabet.ukrainian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.ukrainian.xml" />
-                <File Id="alphabet.uzbek.xml" Name="alphabet.uzbek.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.uzbek.xml" />
-                <File Id="alphabet.venda.xml" Name="alphabet.venda.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.venda.xml" />
-                <File Id="alphabet.welsh.xml" Name="alphabet.welsh.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.welsh.xml" />
-              </Component>
-              <Component Id="Training" Guid="bcc684a1-0a58-474c-bfd9-c25906bc7bf4">
-                <File Id="training_albanian_SQ.txt" Name="training_albanian_SQ.txt" DiskId="1" 
Source="..\..\Data\training\training_albanian_SQ.txt" />
-                <File Id="training_basque_ES.txt" Name="training_basque_ES.txt" DiskId="1" 
Source="..\..\Data\training\training_basque_ES.txt" />
-                <File Id="training_bengali_BD.txt" Name="training_bengali_BD.txt" DiskId="1" 
Source="..\..\Data\training\training_bengali_BD.txt" />
-                <!--<File Id="training_bengali_bn.txt" Name="training_bengali_bn.txt" DiskId="1" 
Source="..\..\Data\training\training_bengali_bn.txt" />-->
-                <File Id="training_canna_JP.txt" Name="training_canna_JP.txt" DiskId="1" 
Source="..\..\Data\training\training_canna_JP.txt" />
-                <File Id="training_czech_CS.txt" Name="training_czech_CS.txt" DiskId="1" 
Source="..\..\Data\training\training_czech_CS.txt" />
-                <File Id="training_danish_DK.txt" Name="training_danish_DK.txt" DiskId="1" 
Source="..\..\Data\training\training_danish_DK.txt" />
-                <File Id="training_dutch_NL.txt" Name="training_dutch_NL.txt" DiskId="1" 
Source="..\..\Data\training\training_dutch_NL.txt" />
-                <File Id="training_english_GB.txt" Name="training_english_GB.txt" DiskId="1" 
Source="..\..\Data\training\training_english_GB.txt" />
-                <File Id="training_finnish_FI.txt" Name="training_finnish_FI.txt" DiskId="1" 
Source="..\..\Data\training\training_finnish_FI.txt" />
-                <File Id="training_french_FR.txt" Name="training_french_FR.txt" DiskId="1" 
Source="..\..\Data\training\training_french_FR.txt" />
-                <File Id="training_german_DE.txt" Name="training_german_DE.txt" DiskId="1" 
Source="..\..\Data\training\training_german_DE.txt" />
-                <File Id="training_greek_GR.txt" Name="training_greek_GR.txt" DiskId="1" 
Source="..\..\Data\training\training_greek_GR.txt" />
-                <File Id="training_hebrew_IL.txt" Name="training_hebrew_IL.txt" DiskId="1" 
Source="..\..\Data\training\training_hebrew_IL.txt" />
-                <File Id="training_hiragana60_JP.txt" Name="training_hiragana60_JP.txt" DiskId="1" 
Source="..\..\Data\training\training_hiragana60_JP.txt" />
-                <File Id="training_hiragana83_JP.txt" Name="training_hiragana83_JP.txt" DiskId="1" 
Source="..\..\Data\training\training_hiragana83_JP.txt" />
-                <File Id="training_hungarian_HU.txt" Name="training_hungarian_HU.txt" DiskId="1" 
Source="..\..\Data\training\training_hungarian_HU.txt" />
-                <File Id="training_italian_IT.txt" Name="training_italian_IT.txt" DiskId="1" 
Source="..\..\Data\training\training_italian_IT.txt" />
-                <File Id="training_mongolian_MN.txt" Name="training_mongolian_MN.txt" DiskId="1" 
Source="..\..\Data\training\training_mongolian_MN.txt" />
-                <File Id="training_persian_IR.txt" Name="training_persian_IR.txt" DiskId="1" 
Source="..\..\Data\training\training_persian_IR.txt" />
-                <File Id="training_polish_PL.txt" Name="training_polish_PL.txt" DiskId="1" 
Source="..\..\Data\training\training_polish_PL.txt" />
-                <File Id="training_portuguese_BR.txt" Name="training_portuguese_BR.txt" DiskId="1" 
Source="..\..\Data\training\training_portuguese_BR.txt" />
-                <File Id="training_russian_RU.txt" Name="training_russian_RU.txt" DiskId="1" 
Source="..\..\Data\training\training_russian_RU.txt" />
-                <File Id="training_spanish_ES.txt" Name="training_spanish_ES.txt" DiskId="1" 
Source="..\..\Data\training\training_spanish_ES.txt" />
-                <File Id="training_swahili_KE.txt" Name="training_swahili_KE.txt" DiskId="1" 
Source="..\..\Data\training\training_swahili_KE.txt" />
-                <File Id="training_swedish_SE.txt" Name="training_swedish_SE.txt" DiskId="1" 
Source="..\..\Data\training\training_swedish_SE.txt" />
-                <File Id="training_turkish_TR.txt" Name="training_turkish_TR.txt" DiskId="1" 
Source="..\..\Data\training\training_turkish_TR.txt" />
-                <File Id="training_welsh_GB.txt" Name="training_welsh_GB.txt" DiskId="1" 
Source="..\..\Data\training\training_welsh_GB.txt" />
-              </Component>
-              <Component Id="Colours" Guid="bebff3fb-083c-46f8-ac31-2484f4b1e9a8">
-                <File Id="colour.blue.xml" Name="colour.blue.xml" DiskId="1" 
Source="..\..\Data\colours\colour.blue.xml" />
-                <File Id="colour.euroasian.xml" Name="colour.euroasian.xml" DiskId="1" 
Source="..\..\Data\colours\colour.euroasian.xml" />
-                <File Id="colour.euroasian2.xml" Name="colour.euroasian2.xml" DiskId="1" 
Source="..\..\Data\colours\colour.euroasian2.xml" />
-                <File Id="colour.euroasian3.xml" Name="colour.euroasian3.xml" DiskId="1" 
Source="..\..\Data\colours\colour.euroasian3.xml" />
-                <File Id="colour.jamie.xml" Name="colour.jamie.xml" DiskId="1" 
Source="..\..\Data\colours\colour.jamie.xml" />
-                <File Id="colour.rainbow.xml" Name="colour.rainbow.xml" DiskId="1" 
Source="..\..\Data\colours\colour.rainbow.xml" />
-                <File Id="colour.thai.xml" Name="colour.thai.xml" DiskId="1" 
Source="..\..\Data\colours\colour.thai.xml" />
-                <File Id="colour.vowels.xml" Name="colour.vowels.xml" DiskId="1" 
Source="..\..\Data\colours\colour.vowels.xml" />
-                <File Id="colour.vowels2.xml" Name="colour.vowels2.xml" DiskId="1" 
Source="..\..\Data\colours\colour.vowels2.xml" />
-                <File Id="colour.xml" Name="colour.xml" DiskId="1" Source="..\..\Data\colours\colour.xml" />
-              </Component>
-              <Component Id="ControlLabels" Guid="fc6ff2ec-3172-4259-b879-162c21981358">
-                <File Id="controllabels.xml" Name="controllabels.xml" DiskId="1" 
Source="..\..\Data\controllabels\controllabels.xml" />
-              </Component>
-            </Directory>
-          </Directory>
-        </Directory>
-      </Directory>
-
-      <Directory Id="ProgramMenuFolder" Name="Programs">
-        <Directory Id="ProgramMenuDir" Name="Dasher 4.6">
-          <Component  Id="Random" Guid="D28C2189-5E40-4f93-B42E-0CD76D8B5B37" KeyPath="no">
-            <Registry Id='DummyReg' Root='HKCU' Key='Software\Inference Group\Dasher3' Name='Dummy'
-               Action='write' Type='string' Value='Dummy Key' KeyPath='yes'/>
-            <RemoveFolder Id="RandomRemove" On="uninstall" />
-          </Component>
-        </Directory>
-      </Directory>
-
-      <Directory Id="DesktopFolder" Name="Desktop" />
-      <Component Id="RegistryTobii" Guid="63287558-8a18-4103-89d5-2c1116cffc52">
-        <Registry Id='TobiiExecutable' Root='HKLM' Key='Software\Tobii\MyTobii\MPA\Dasher45' 
Name='ExecutablePath'
-         Action='write' Type='string' Value='[INSTALLDIR]Dasher.exe' />
-        <Registry Id='TobiiIcon' Root='HKLM' Key='Software\Tobii\MyTobii\MPA\Dasher45' Name='IconPath'
-         Action='write' Type='string' Value='[INSTALLDIR]dasher-tobii.png' />
-        <Registry Id='TobiiTitle' Root='HKLM' Key='Software\Tobii\MyTobii\MPA\Dasher45' Name='Title'
-   Action='write' Type='string' Value='Dasher' />
-        <Registry Id='TobiiMouse' Root='HKLM' Key='Software\Tobii\MyTobii\MPA\Dasher45' Name='MouseControl'
-         Action='write' Type='string' Value='true' />
-      </Component>
-
-      <Component Id="RegistryTobiiDefaults" Guid="6EBE4DD9-850E-4a7b-BEBF-A33B0580F3EC">
-        <Registry Id="RegistryCircleStart" Root="HKCU" Key="Software\Inference Group\Dasher3" 
Name="CircleStart" Action="write" Type="integer" Value="1" />
-        <Registry Id="RegistryInputFilter" Root="HKCU" Key="Software\Inference Group\Dasher3" 
Name="InputFilter" Action="write" Type="string" Value="Eyetracker Mode" />
-        <Registry Id="RegistryStartOnLeft" Root="HKCU" Key="Software\Inference Group\Dasher3" 
Name="StartOnLeft" Action="write" Type="integer" Value="0" />
-      </Component>
-
-      <!--<Component Id="RegistryNonTobii" Guid="a3bf552d-9622-4d4a-b17b-ebb47a18955b">
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>
+       <Product Name="Dasher 4.6 (MyTobii)" Id="8903D8E8-8AF4-46dd-A685-C1E5379912B4" Language="1033" 
Codepage="1252" Version="4.6.2" Manufacturer="Dasher" UpgradeCode="761FEE49-85EE-4c63-8A70-9A3CA5D70D3E">
+               <Package Keywords="Installer" Description="Dasher 4.6 (MyTobii Version) Installer" 
Comments="This will install Dasher (MyTobii Version)" Manufacturer="The Dasher Group." InstallerVersion="100" 
Languages="1033" Compressed="yes" SummaryCodepage="1252"/>
+               <Media Id="1" Cabinet="Sample.cab" EmbedCab="yes" DiskPrompt="CD-ROM #1"/>
+               <Property Id="DiskPrompt" Value="Dasher 4.6 (MyTobii) Installation [1]"/>
+               <Directory Id="TARGETDIR" Name="SourceDir">
+                       <Directory Id="ProgramFilesFolder" Name="PFiles">
+                               <Directory Id="Dasher" Name="Dasher">
+                                       <Directory Id="INSTALLDIR" Name="Dasher 4.6">
+                                               <Component Id="MainExecutable" 
Guid="5a93ba53-2e2d-4f88-8a1f-5bdd8f130394">
+                                                       <File Id="DasherEXE" Name="Dasher.exe" DiskId="1" 
Source="..\Win32\Target\Release\Dasher.exe" Vital="yes">
+                                                               <Shortcut Id="startmenuDasher44" 
Directory="ProgramMenuDir" Name="Dasher 4.6" WorkingDirectory="INSTALLDIR" Icon="Dasher.exe" IconIndex="0" 
Advertise="yes"/>
+                                                               <Shortcut Id="desktopDasher44" 
Directory="DesktopFolder" Name="Dasher 4.6" WorkingDirectory="INSTALLDIR" Icon="Dasher.exe" IconIndex="0" 
Advertise="yes"/>
+                                                       </File>
+                                                       <File Id="ExpatDLL" Name="libexpat.dll" DiskId="1" 
Source="$(env.EXPAT)\bin\libexpat.dll" Vital="yes"/>
+                                               </Component>
+                                               <Component Id="Help" 
Guid="cf486329-8d04-462b-afd4-e8e0bccc9c95">
+                                                       <File Id="HelpFile" Name="Dasher.chm" DiskId="1" 
Source="..\..\Data\Help\Win32\dasher.chm"/>
+                                               </Component>
+                                               <Component Id="Tobii" 
Guid="a0f3fa44-106e-4fff-9ed6-010310f3ec0d">
+                                                       <File Id="TobiiIconFile" Name="dasher-tobii.png" 
DiskId="1" Source="..\..\Data\Graphics\dasher-tobii.png"/>
+                                               </Component>
+                                               <Directory Id="SystemRC" Name="system.rc">
+                                                       <Component Id="Alphabets" 
Guid="e734711a-0e68-4897-b7a6-7a60a20062b5">
+                                                               <File Id="alphabet.AfaanOromo.xml" 
Name="alphabet.AfaanOromo.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.AfaanOromo.xml"/>
+                                                               <File Id="alphabet.Armenian.xml" 
Name="alphabet.Armenian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Armenian.xml"/>
+                                                               <File Id="alphabet.Assamese.xml" 
Name="alphabet.Assamese.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Assamese.xml"/>
+                                                               <File Id="alphabet.Austen.xml" 
Name="alphabet.Austen.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Austen.xml"/>
+                                                               <File Id="alphabet.Azerbaijani.xml" 
Name="alphabet.Azerbaijani.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Azerbaijani.xml"/>
+                                                               <File Id="alphabet.Belarusian.xml" 
Name="alphabet.Belarusian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Belarusian.xml"/>
+                                                               <File Id="alphabet.Bulgarian.xml" 
Name="alphabet.Bulgarian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Bulgarian.xml"/>
+                                                               <File Id="alphabet.Esperanto.xml" 
Name="alphabet.Esperanto.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Esperanto.xml"/>
+                                                               <File Id="alphabet.Estonian.xml" 
Name="alphabet.Estonian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Estonian.xml"/>
+                                                               <File Id="alphabet.Filipino.xml" 
Name="alphabet.Filipino.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Filipino.xml"/>
+                                                               <File Id="alphabet.Greek.xml" 
Name="alphabet.Greek.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Greek.xml"/>
+                                                               <File Id="alphabet.Gujarati.xml" 
Name="alphabet.Gujarati.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Gujarati.xml"/>
+                                                               <File Id="alphabet.Hawaiian.xml" 
Name="alphabet.Hawaiian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Hawaiian.xml"/>
+                                                               <File Id="alphabet.Hebrew.xml" 
Name="alphabet.Hebrew.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Hebrew.xml"/>
+                                                               <File Id="alphabet.Hindi.xml" 
Name="alphabet.Hindi.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Hindi.xml"/>
+                                                               <File Id="alphabet.Icelandic.xml" 
Name="alphabet.Icelandic.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Icelandic.xml"/>
+                                                               <File Id="alphabet.Igbo.xml" 
Name="alphabet.Igbo.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Igbo.xml"/>
+                                                               <File Id="alphabet.Indonesian.xml" 
Name="alphabet.Indonesian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Indonesian.xml"/>
+                                                               <File Id="alphabet.IrishGaelic.xml" 
Name="alphabet.IrishGaelic.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.IrishGaelic.xml"/>
+                                                               <File Id="alphabet.Kannada.xml" 
Name="alphabet.Kannada.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Kannada.xml"/>
+                                                               <File Id="alphabet.Katakana.xml" 
Name="alphabet.Katakana.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Katakana.xml"/>
+                                                               <File Id="alphabet.Malay.xml" 
Name="alphabet.Malay.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Malay.xml"/>
+                                                               <File Id="alphabet.Malayalam.xml" 
Name="alphabet.Malayalam.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Malayalam.xml"/>
+                                                               <File Id="alphabet.Marathi.xml" 
Name="alphabet.Marathi.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Marathi.xml"/>
+                                                               <File Id="alphabet.Moldavian.xml" 
Name="alphabet.Moldavian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Moldavian.xml"/>
+                                                               <File Id="alphabet.Ndebele.xml" 
Name="alphabet.Ndebele.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Ndebele.xml"/>
+                                                               <File Id="alphabet.Oriya.xml" 
Name="alphabet.Oriya.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Oriya.xml"/>
+                                                               <File Id="alphabet.Punjabi.xml" 
Name="alphabet.Punjabi.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Punjabi.xml"/>
+                                                               <File Id="alphabet.Romanian.xml" 
Name="alphabet.Romanian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Romanian.xml"/>
+                                                               <File Id="alphabet.Sami.xml" 
Name="alphabet.Sami.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Sami.xml"/>
+                                                               <File Id="alphabet.ScotsGaelic.xml" 
Name="alphabet.ScotsGaelic.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.ScotsGaelic.xml"/>
+                                                               <File Id="alphabet.Sepedi.xml" 
Name="alphabet.Sepedi.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Sepedi.xml"/>
+                                                               <File Id="alphabet.Sesotho.xml" 
Name="alphabet.Sesotho.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Sesotho.xml"/>
+                                                               <File Id="alphabet.Sinhala.xml" 
Name="alphabet.Sinhala.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Sinhala.xml"/>
+                                                               <File Id="alphabet.Slovak.xml" 
Name="alphabet.Slovak.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Slovak.xml"/>
+                                                               <File Id="alphabet.Slovenian.xml" 
Name="alphabet.Slovenian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Slovenian.xml"/>
+                                                               <File Id="alphabet.Swati.xml" 
Name="alphabet.Swati.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Swati.xml"/>
+                                                               <File Id="alphabet.Tajik.xml" 
Name="alphabet.Tajik.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Tajik.xml"/>
+                                                               <File Id="alphabet.Tamil.xml" 
Name="alphabet.Tamil.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Tamil.xml"/>
+                                                               <File Id="alphabet.Telugu.xml" 
Name="alphabet.Telugu.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Telugu.xml"/>
+                                                               <File Id="alphabet.Thai.xml" 
Name="alphabet.Thai.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Thai.xml"/>
+                                                               <File Id="alphabet.Thai2.xml" 
Name="alphabet.Thai2.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Thai2.xml"/>
+                                                               <File Id="alphabet.Tsonga.xml" 
Name="alphabet.Tsonga.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Tsonga.xml"/>
+                                                               <File Id="alphabet.Tswana.xml" 
Name="alphabet.Tswana.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Tswana.xml"/>
+                                                               <File Id="alphabet.Turkish.xml" 
Name="alphabet.Turkish.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Turkish.xml"/>
+                                                               <File Id="alphabet.Urdu.xml" 
Name="alphabet.Urdu.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Urdu.xml"/>
+                                                               <File Id="alphabet.Vietnamese.xml" 
Name="alphabet.Vietnamese.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Vietnamese.xml"/>
+                                                               <File Id="alphabet.Xhosa.xml" 
Name="alphabet.Xhosa.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Xhosa.xml"/>
+                                                               <File Id="alphabet.Yoruba.xml" 
Name="alphabet.Yoruba.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Yoruba.xml"/>
+                                                               <File Id="alphabet.Zulu.xml" 
Name="alphabet.Zulu.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Zulu.xml"/>
+                                                               <File Id="alphabet.abc.xml" 
Name="alphabet.abc.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.abc.xml"/>
+                                                               <File Id="alphabet.adangbe.xml" 
Name="alphabet.adangbe.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.adangbe.xml"/>
+                                                               <File Id="alphabet.afrikaans.xml" 
Name="alphabet.afrikaans.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.afrikaans.xml"/>
+                                                               <File Id="alphabet.akan.xml" 
Name="alphabet.akan.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.akan.xml"/>
+                                                               <File Id="alphabet.albanian.xml" 
Name="alphabet.albanian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.albanian.xml"/>
+                                                               <File Id="alphabet.amharic.xml" 
Name="alphabet.amharic.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.amharic.xml"/>
+                                                               <File Id="alphabet.arabic.xml" 
Name="alphabet.arabic.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.arabic.xml"/>
+                                                               <File Id="alphabet.basque.xml" 
Name="alphabet.basque.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.basque.xml"/>
+                                                               <File Id="alphabet.bengali.xml" 
Name="alphabet.bengali.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.bengali.xml"/>
+                                                               <File Id="alphabet.bopomofo.xml" 
Name="alphabet.bopomofo.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.bopomofo.xml"/>
+                                                               <File Id="alphabet.bopoTrad.xml" 
Name="alphabet.bopoTrad.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.bopoTrad.xml"/>
+                                                               <File Id="alphabet.bosnian.xml" 
Name="alphabet.bosnian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.bosnian.xml"/>
+                                                               <File Id="alphabet.breton.xml" 
Name="alphabet.breton.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.breton.xml"/>
+                                                               <File Id="alphabet.catalan.xml" 
Name="alphabet.catalan.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.catalan.xml"/>
+                                                               <File Id="alphabet.cangjie.xml" 
Name="alphabet.cangjie.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.cangjie.xml"/>
+                                                               <File Id="alphabet.cherokee.xml" 
Name="alphabet.cherokee.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.cherokee.xml"/>
+                                                               <File Id="alphabet.corsican.xml" 
Name="alphabet.corsican.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.corsican.xml"/>
+                                                               <File Id="alphabet.croatian.xml" 
Name="alphabet.croatian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.croatian.xml"/>
+                                                               <File Id="alphabet.czech.xml" 
Name="alphabet.czech.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.czech.xml"/>
+                                                               <File Id="alphabet.danish.xml" 
Name="alphabet.danish.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.danish.xml"/>
+                                                               <File Id="alphabet.dutch.xml" 
Name="alphabet.dutch.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.dutch.xml"/>
+                                                               <File Id="alphabet.english.xml" 
Name="alphabet.english.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.english.xml"/>
+                                                               <File Id="alphabet.englishC.xml" 
Name="alphabet.englishC.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.englishC.xml"/>
+                                                               <File Id="alphabet.ethiopic.xml" 
Name="alphabet.ethiopic.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.ethiopic.xml"/>
+                                                               <File Id="alphabet.ewe.xml" 
Name="alphabet.ewe.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.ewe.xml"/>
+                                                               <File Id="alphabet.faroese.xml" 
Name="alphabet.faroese.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.faroese.xml"/>
+                                                               <File Id="alphabet.finnish.xml" 
Name="alphabet.finnish.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.finnish.xml"/>
+                                                               <File Id="alphabet.finnish2.xml" 
Name="alphabet.finnish2.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.finnish2.xml"/>
+                                                               <File Id="alphabet.french.xml" 
Name="alphabet.french.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.french.xml"/>
+                                                               <File Id="alphabet.ga.xml" 
Name="alphabet.ga.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.ga.xml"/>
+                                                               <File Id="alphabet.galician.xml" 
Name="alphabet.galician.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.galician.xml"/>
+                                                               <File Id="alphabet.georgian.xml" 
Name="alphabet.georgian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.georgian.xml"/>
+                                                               <File Id="alphabet.german.xml" 
Name="alphabet.german.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.german.xml"/>
+                                                               <File Id="alphabet.hausa.xml" 
Name="alphabet.hausa.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.hausa.xml"/>
+                                                               <File Id="alphabet.hiragana.xml" 
Name="alphabet.hiragana.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.hiragana.xml"/>
+                                                               <File Id="alphabet.hiragana2.xml" 
Name="alphabet.hiragana2.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.hiragana2.xml"/>
+                                                               <File Id="alphabet.hungarian.xml" 
Name="alphabet.hungarian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.hungarian.xml"/>
+                                                               <File Id="alphabet.ipa.xml" 
Name="alphabet.ipa.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.ipa.xml"/>
+                                                               <File Id="alphabet.italian.xml" 
Name="alphabet.italian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.italian.xml"/>
+                                                               <File Id="alphabet.japanese.canna.xml" 
Name="alphabet.japanese.canna.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.japanese.canna.xml"/>
+                                                               <File Id="alphabet.kazakh.xml" 
Name="alphabet.kazakh.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.kazakh.xml"/>
+                                                               <File Id="alphabet.kirghiz.xml" 
Name="alphabet.kirghiz.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.kirghiz.xml"/>
+                                                               <File Id="alphabet.kirundi.xml" 
Name="alphabet.kirundi.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.kirundi.xml"/>
+                                                               <File Id="alphabet.klingon.xml" 
Name="alphabet.klingon.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.klingon.xml"/>
+                                                               <File Id="alphabet.korean.xml" 
Name="alphabet.korean.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.korean.xml"/>
+                                                               <File Id="alphabet.koreanNested.xml" 
Name="alphabet.koreanNested.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.koreanNested.xml"/>
+                                                               <File Id="alphabet.kurdish.xml" 
Name="alphabet.kurdish.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.kurdish.xml"/>
+                                                               <File Id="alphabet.lao.xml" 
Name="alphabet.lao.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.lao.xml"/>
+                                                               <File Id="alphabet.latex.xml" 
Name="alphabet.latex.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.latex.xml"/>
+                                                               <File Id="alphabet.latin.xml" 
Name="alphabet.latin.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.latin.xml"/>
+                                                               <File Id="alphabet.latvian.xml" 
Name="alphabet.latvian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.latvian.xml"/>
+                                                               <File Id="alphabet.lithuanian.xml" 
Name="alphabet.lithuanian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.lithuanian.xml"/>
+                                                               <File Id="alphabet.luxembourgish.xml" 
Name="alphabet.luxembourgish.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.luxembourgish.xml"/>
+                                                               <File Id="alphabet.macedonian.xml" 
Name="alphabet.macedonian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.macedonian.xml"/>
+                                                               <File Id="alphabet.maltese.xml" 
Name="alphabet.maltese.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.maltese.xml"/>
+                                                               <File Id="alphabet.mongolian.xml" 
Name="alphabet.mongolian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.mongolian.xml"/>
+                                                               <File Id="alphabet.myanmar.xml" 
Name="alphabet.myanmar.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.myanmar.xml"/>
+                                                               <File Id="alphabet.nepali.xml" 
Name="alphabet.nepali.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.nepali.xml"/>
+                                                               <File Id="alphabet.norwegian.xml" 
Name="alphabet.norwegian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.norwegian.xml"/>
+                                                               <File Id="alphabet.occitan.xml" 
Name="alphabet.occitan.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.occitan.xml"/>
+                                                               <File Id="alphabet.ogham.xml" 
Name="alphabet.ogham.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.ogham.xml"/>
+                                                               <File Id="alphabet.pashto.xml" 
Name="alphabet.pashto.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.pashto.xml"/>
+                                                               <File Id="alphabet.perl.xml" 
Name="alphabet.perl.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.perl.xml"/>
+                                                               <File Id="alphabet.persian.xml" 
Name="alphabet.persian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.persian.xml"/>
+                                                               <File Id="alphabet.pinyin2.xml" 
Name="alphabet.pinyin2.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.pinyin2.xml"/>
+                                                               <File Id="alphabet.polish.xml" 
Name="alphabet.polish.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.polish.xml"/>
+                                                               <File Id="alphabet.portuguese.xml" 
Name="alphabet.portuguese.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.portuguese.xml"/>
+                                                               <File Id="alphabet.romansch.xml" 
Name="alphabet.romansch.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.romansch.xml"/>
+                                                               <File Id="alphabet.runic.xml" 
Name="alphabet.runic.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.runic.xml"/>
+                                                               <File Id="alphabet.russian.xml" 
Name="alphabet.russian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.russian.xml"/>
+                                                               <File Id="alphabet.sanskrit.xml" 
Name="alphabet.sanskrit.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.sanskrit.xml"/>
+                                                               <File Id="alphabet.serbian.xml" 
Name="alphabet.serbian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.serbian.xml"/>
+                                                               <File Id="alphabet.somali.xml" 
Name="alphabet.somali.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.somali.xml"/>
+                                                               <File Id="alphabet.spanish.xml" 
Name="alphabet.spanish.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.spanish.xml"/>
+                                                               <File Id="alphabet.spyNew.xml" 
Name="alphabet.spyNew.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.spyNew.xml"/>
+                                                               <File Id="alphabet.spyTonesNew.xml" 
Name="alphabet.spyTonesNew.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.spyTonesNew.xml"/>
+                                                               <File Id="alphabet.spyTones2New.xml" 
Name="alphabet.spyTones2New.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.spyTones2New.xml"/>
+                                                               <File Id="alphabet.swahili.xml" 
Name="alphabet.swahili.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.swahili.xml"/>
+                                                               <File Id="alphabet.swedish.xml" 
Name="alphabet.swedish.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.swedish.xml"/>
+                                                               <File Id="alphabet.thaana.xml" 
Name="alphabet.thaana.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.thaana.xml"/>
+                                                               <File Id="alphabet.tigrinya.xml" 
Name="alphabet.tigrinya.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.tigrinya.xml"/>
+                                                               <File Id="alphabet.turkmen.xml" 
Name="alphabet.turkmen.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.turkmen.xml"/>
+                                                               <File Id="alphabet.ukrainian.xml" 
Name="alphabet.ukrainian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.ukrainian.xml"/>
+                                                               <File Id="alphabet.uzbek.xml" 
Name="alphabet.uzbek.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.uzbek.xml"/>
+                                                               <File Id="alphabet.venda.xml" 
Name="alphabet.venda.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.venda.xml"/>
+                                                               <File Id="alphabet.welsh.xml" 
Name="alphabet.welsh.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.welsh.xml"/>
+                                                       </Component>
+                                                       <Component Id="Training" 
Guid="bcc684a1-0a58-474c-bfd9-c25906bc7bf4">
+                                                               <File Id="training_albanian_SQ.txt" 
Name="training_albanian_SQ.txt" DiskId="1" Source="..\..\Data\training\training_albanian_SQ.txt"/>
+                                                               <File Id="training_basque_ES.txt" 
Name="training_basque_ES.txt" DiskId="1" Source="..\..\Data\training\training_basque_ES.txt"/>
+                                                               <File Id="training_bengali_BD.txt" 
Name="training_bengali_BD.txt" DiskId="1" Source="..\..\Data\training\training_bengali_BD.txt"/>
+                                                               <File Id="training_canna_JP.txt" 
Name="training_canna_JP.txt" DiskId="1" Source="..\..\Data\training\training_canna_JP.txt"/>
+                                                               <File Id="training_czechC_CS.txt" 
Name="training_czechC_CS.txt" DiskId="1" Source="..\..\Data\training\training_czechC_CS.txt"/>
+                                                               <File Id="training_czech_CS.txt" 
Name="training_czech_CS.txt" DiskId="1" Source="..\..\Data\training\training_czech_CS.txt"/>
+                                                               <File Id="training_danish_DK.txt" 
Name="training_danish_DK.txt" DiskId="1" Source="..\..\Data\training\training_danish_DK.txt"/>
+                                                               <File Id="training_dutch_NL.txt" 
Name="training_dutch_NL.txt" DiskId="1" Source="..\..\Data\training\training_dutch_NL.txt"/>
+                                                               <File Id="training_englishLC_GB.txt" 
Name="training_englishLC_GB.txt" DiskId="1" Source="..\..\Data\training\training_englishLC_GB.txt"/>
+                                                               <File Id="training_english_GB.txt" 
Name="training_english_GB.txt" DiskId="1" Source="..\..\Data\training\training_english_GB.txt"/>
+                                                               <File Id="training_finnish_FI.txt" 
Name="training_finnish_FI.txt" DiskId="1" Source="..\..\Data\training\training_finnish_FI.txt"/>
+                                                               <File Id="training_frenchC_FR.txt" 
Name="training_frenchC_FR.txt" DiskId="1" Source="..\..\Data\training\training_frenchC_FR.txt"/>
+                                                               <File Id="training_french_FR.txt" 
Name="training_french_FR.txt" DiskId="1" Source="..\..\Data\training\training_french_FR.txt"/>
+                                                               <File Id="training_german_DE.txt" 
Name="training_german_DE.txt" DiskId="1" Source="..\..\Data\training\training_german_DE.txt"/>
+                                                               <File Id="training_greek_GR.txt" 
Name="training_greek_GR.txt" DiskId="1" Source="..\..\Data\training\training_greek_GR.txt"/>
+                                                               <File Id="training_hebrew_IL.txt" 
Name="training_hebrew_IL.txt" DiskId="1" Source="..\..\Data\training\training_hebrew_IL.txt"/>
+                                                               <File Id="training_hiragana60_JP.txt" 
Name="training_hiragana60_JP.txt" DiskId="1" Source="..\..\Data\training\training_hiragana60_JP.txt"/>
+                                                               <File Id="training_hiragana83_JP.txt" 
Name="training_hiragana83_JP.txt" DiskId="1" Source="..\..\Data\training\training_hiragana83_JP.txt"/>
+                                                               <File Id="training_hungarian_HU.txt" 
Name="training_hungarian_HU.txt" DiskId="1" Source="..\..\Data\training\training_hungarian_HU.txt"/>
+                                                               <File Id="training_italianC_IT.txt" 
Name="training_italianC_IT.txt" DiskId="1" Source="..\..\Data\training\training_italianC_IT.txt"/>
+                                                               <File Id="training_italian_IT.txt" 
Name="training_italian_IT.txt" DiskId="1" Source="..\..\Data\training\training_italian_IT.txt"/>
+                                                               <File Id="training_mongolian_MN.txt" 
Name="training_mongolian_MN.txt" DiskId="1" Source="..\..\Data\training\training_mongolian_MN.txt"/>
+                                                               <File Id="training_persian_IR.txt" 
Name="training_persian_IR.txt" DiskId="1" Source="..\..\Data\training\training_persian_IR.txt"/>
+                                                               <File Id="training_polish_PL.txt" 
Name="training_polish_PL.txt" DiskId="1" Source="..\..\Data\training\training_polish_PL.txt"/>
+                                                               <File Id="training_portugueseC_BR.txt" 
Name="training_portugueseC_BR.txt" DiskId="1" Source="..\..\Data\training\training_portugueseC_BR.txt"/>
+                                                               <File Id="training_portuguese_BR.txt" 
Name="training_portuguese_BR.txt" DiskId="1" Source="..\..\Data\training\training_portuguese_BR.txt"/>
+                                                               <File Id="training_russian_RU.txt" 
Name="training_russian_RU.txt" DiskId="1" Source="..\..\Data\training\training_russian_RU.txt"/>
+                                                               <File Id="training_spanishC_ES.txt" 
Name="training_spanishC_ES.txt" DiskId="1" Source="..\..\Data\training\training_spanishC_ES.txt"/>
+                                                               <File Id="training_spanish_ES.txt" 
Name="training_spanish_ES.txt" DiskId="1" Source="..\..\Data\training\training_spanish_ES.txt"/>
+                                                               <File Id="training_spyNew.txt" 
Name="training_spyNew.txt" DiskId="1" Source="..\..\Data\training\training_spyNew.txt"/>
+                                                               <File Id="training_swahili_KE.txt" 
Name="training_swahili_KE.txt" DiskId="1" Source="..\..\Data\training\training_swahili_KE.txt"/>
+                                                               <File Id="training_swedish_SE.txt" 
Name="training_swedish_SE.txt" DiskId="1" Source="..\..\Data\training\training_swedish_SE.txt"/>
+                                                               <File Id="training_turkish_TR.txt" 
Name="training_turkish_TR.txt" DiskId="1" Source="..\..\Data\training\training_turkish_TR.txt"/>
+                                                               <File Id="training_welsh_GB.txt" 
Name="training_welsh_GB.txt" DiskId="1" Source="..\..\Data\training\training_welsh_GB.txt"/>
+                                                       </Component>
+                                                       <Component Id="Colours" 
Guid="bebff3fb-083c-46f8-ac31-2484f4b1e9a8">
+                                                               <File Id="colour.blue.xml" 
Name="colour.blue.xml" DiskId="1" Source="..\..\Data\colours\colour.blue.xml"/>
+                                                               <File Id="colour.euroasian.xml" 
Name="colour.euroasian.xml" DiskId="1" Source="..\..\Data\colours\colour.euroasian.xml"/>
+                                                               <File Id="colour.euroasian2.xml" 
Name="colour.euroasian2.xml" DiskId="1" Source="..\..\Data\colours\colour.euroasian2.xml"/>
+                                                               <File Id="colour.euroasian3.xml" 
Name="colour.euroasian3.xml" DiskId="1" Source="..\..\Data\colours\colour.euroasian3.xml"/>
+                                                               <File Id="colour.jamie.xml" 
Name="colour.jamie.xml" DiskId="1" Source="..\..\Data\colours\colour.jamie.xml"/>
+                                                               <File Id="colour.rainbow.xml" 
Name="colour.rainbow.xml" DiskId="1" Source="..\..\Data\colours\colour.rainbow.xml"/>
+                                                               <File Id="colour.thai.xml" 
Name="colour.thai.xml" DiskId="1" Source="..\..\Data\colours\colour.thai.xml"/>
+                                                               <File Id="colour.vowels.xml" 
Name="colour.vowels.xml" DiskId="1" Source="..\..\Data\colours\colour.vowels.xml"/>
+                                                               <File Id="colour.vowels2.xml" 
Name="colour.vowels2.xml" DiskId="1" Source="..\..\Data\colours\colour.vowels2.xml"/>
+                                                               <File Id="colour.xml" Name="colour.xml" 
DiskId="1" Source="..\..\Data\colours\colour.xml"/>
+                                                       </Component>
+                                               </Directory>
+                                       </Directory>
+                               </Directory>
+                       </Directory>
+                       <Directory Id="ProgramMenuFolder" Name="Programs">
+                               <Directory Id="ProgramMenuDir" Name="Dasher 4.6">
+                                       <Component Id="Random" Guid="D28C2189-5E40-4f93-B42E-0CD76D8B5B37" 
KeyPath="no">
+                                               <Registry Id="DummyReg" Root="HKCU" Key="Software\Inference 
Group\Dasher3" Name="Dummy" Action="write" Type="string" Value="Dummy Key" KeyPath="yes"/>
+                                               <RemoveFolder Id="RandomRemove" On="uninstall"/>
+                                       </Component>
+                               </Directory>
+                       </Directory>
+                       <Directory Id="DesktopFolder" Name="Desktop"/>
+                       <Component Id="RegistryTobii" Guid="63287558-8a18-4103-89d5-2c1116cffc52">
+                               <Registry Id="TobiiExecutable" Root="HKLM" 
Key="Software\Tobii\MyTobii\MPA\Dasher45" Name="ExecutablePath" Action="write" Type="string" 
Value="[INSTALLDIR]Dasher.exe"/>
+                               <Registry Id="TobiiIcon" Root="HKLM" 
Key="Software\Tobii\MyTobii\MPA\Dasher45" Name="IconPath" Action="write" Type="string" 
Value="[INSTALLDIR]dasher-tobii.png"/>
+                               <Registry Id="TobiiTitle" Root="HKLM" 
Key="Software\Tobii\MyTobii\MPA\Dasher45" Name="Title" Action="write" Type="string" Value="Dasher"/>
+                               <Registry Id="TobiiMouse" Root="HKLM" 
Key="Software\Tobii\MyTobii\MPA\Dasher45" Name="MouseControl" Action="write" Type="string" Value="true"/>
+                       </Component>
+                       <Component Id="RegistryTobiiDefaults" Guid="6EBE4DD9-850E-4a7b-BEBF-A33B0580F3EC">
+                               <Registry Id="RegistryCircleStart" Root="HKCU" Key="Software\Inference 
Group\Dasher3" Name="CircleStart" Action="write" Type="integer" Value="1"/>
+                               <Registry Id="RegistryInputFilter" Root="HKCU" Key="Software\Inference 
Group\Dasher3" Name="InputFilter" Action="write" Type="string" Value="Eyetracker Mode"/>
+                               <Registry Id="RegistryStartOnLeft" Root="HKCU" Key="Software\Inference 
Group\Dasher3" Name="StartOnLeft" Action="write" Type="integer" Value="0"/>
+                       </Component>
+                       <!--<Component Id="RegistryNonTobii" Guid="a3bf552d-9622-4d4a-b17b-ebb47a18955b">
          <Condition>NOT TOBII</Condition>
 
          <Registry Id="RegistryCircleStart" Root="HKCU" Key="Software\Inference Group\Dasher3" 
Name="CircleStart" Action="write" Type="integer" Value="0" />
          <Registry Id="RegistryInputFilter" Root="HKCU" Key="Software\Inference Group\Dasher3" 
Name="InputFilter" Action="write" Type="string" Value="Normal Control" />
     <Registry Id="RegistryStartOnLeft" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="StartOnLeft" 
Action="write" Type="integer" Value="1" />
     </Component>-->
-
-
-      <!--<Component Id="RegistryCore" Guid="5999aef1-3ba7-4af2-8d56-5f3f4e7a4410">
+                       <!--<Component Id="RegistryCore" Guid="5999aef1-3ba7-4af2-8d56-5f3f4e7a4410">
        <Registry Id="RegistryDrawMouseLine" Root="HKCU" Key="Software\Inference Group\Dasher3" 
Name="DrawMouseLine" Action="write" Type="integer" Value="1" />
        <Registry Id="RegistryDrawMouse" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="DrawMouse" 
Action="write" Type="integer" Value="0" />
        <Registry Id="RegistryShowSpeedSlider" Root="HKCU" Key="Software\Inference Group\Dasher3" 
Name="ShowSpeedSlider" Action="write" Type="integer" Value="1" />
@@ -377,42 +360,34 @@
        <Registry Id="RegistryEditFont" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="EditFont" 
Action="write" Type="string" Value="Sans 10" />
        <Registry Id="RegistryWindowState" Root="HKCU" Key="Software\Inference Group\Dasher3" 
Name="WindowState" Action="write" Type="string" Value="" />
     </Component>-->
-    </Directory>
-
-
-
-    <Feature Id='Complete' Title='Dasher 4.6' Description='The full Dasher installation.' Display='expand' 
Level='1' ConfigurableDirectory='INSTALLDIR'>
-      <Feature Id="Core" Title="Core" Description="Core programs and data files." Level="1">
-
-        <ComponentRef Id='MainExecutable' />
-        <ComponentRef Id='Random' />
-        <ComponentRef Id="Alphabets" />
-        <ComponentRef Id="Training" />
-        <ComponentRef Id="Colours" />
-        <ComponentRef Id="ControlLabels" />
-        <!--<ComponentRef Id="RegistryCore" />-->
-      </Feature>
-      <Feature Id="Documentation" Title="Documentation" Description="The Dasher manual." Level="1">
-        <ComponentRef Id="Help" />
-      </Feature>
-      <Feature Id="Tobii" Title="MyTobii Support" Description="Support for the MyTobii gaze tracker." 
Level="1">
-        <ComponentRef Id="Tobii" />
-        <ComponentRef Id="RegistryTobii" />
-        <ComponentRef Id="RegistryTobiiDefaults" />
-      </Feature>
-      <!--<Feature Id="NonTobii" Title="Non-Tobii Defaults" Description="Default values for non-Tobii 
installations (internal)" Level="1">
+               </Directory>
+               <Feature Id="Complete" Title="Dasher 4.6" Description="The full Dasher installation." 
Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR">
+                       <Feature Id="Core" Title="Core" Description="Core programs and data files." Level="1">
+                               <ComponentRef Id="MainExecutable"/>
+                               <ComponentRef Id="Random"/>
+                               <ComponentRef Id="Alphabets"/>
+                               <ComponentRef Id="Training"/>
+                               <ComponentRef Id="Colours"/>
+                               <!--<ComponentRef Id="RegistryCore" />-->
+                       </Feature>
+                       <Feature Id="Documentation" Title="Documentation" Description="The Dasher manual." 
Level="1">
+                               <ComponentRef Id="Help"/>
+                       </Feature>
+                       <Feature Id="Tobii" Title="MyTobii Support" Description="Support for the MyTobii gaze 
tracker." Level="1">
+                               <ComponentRef Id="Tobii"/>
+                               <ComponentRef Id="RegistryTobii"/>
+                               <ComponentRef Id="RegistryTobiiDefaults"/>
+                       </Feature>
+                       <!--<Feature Id="NonTobii" Title="Non-Tobii Defaults" Description="Default values for 
non-Tobii installations (internal)" Level="1">
         <Condition Level="0">FooBar</Condition>
         <CoponentRef Id="RegistryNonTobii" />
       </Feature>-->
-    </Feature>
-
-    <WixVariable Id="WixUILicenseRtf" Value="License.rtf" />
-    <WixVariable Id="WixUIDialogBmp" Value="Background.bmp" />
-    <WixVariable Id="WixUIBannerBmp" Value="Top.bmp" />
-
-    <UIRef Id="WixUI_Mondo" />
-    <UIRef Id="WixUI_ErrorProgressText" />
-
-    <Icon Id="Dasher.exe" SourceFile="..\Win32\Target\Release\Dasher.exe" />
-  </Product>
+               </Feature>
+               <WixVariable Id="WixUILicenseRtf" Value="License.rtf"/>
+               <WixVariable Id="WixUIDialogBmp" Value="Background.bmp"/>
+               <WixVariable Id="WixUIBannerBmp" Value="Top.bmp"/>
+               <UIRef Id="WixUI_Mondo"/>
+               <UIRef Id="WixUI_ErrorProgressText"/>
+               <Icon Id="Dasher.exe" SourceFile="..\Win32\Target\Release\Dasher.exe"/>
+       </Product>
 </Wix>
diff --git a/Src/InstallerW2K/InstallerW2K.wxs b/Src/InstallerW2K/InstallerW2K.wxs
index 4f6901f..f50b73f 100644
--- a/Src/InstallerW2K/InstallerW2K.wxs
+++ b/Src/InstallerW2K/InstallerW2K.wxs
@@ -1,262 +1,245 @@
-<?xml version='1.0' encoding='utf-8'?>
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-
-  <Product Name='Dasher 4.6' Id='B454FAAB-A95C-4e2f-968D-655F94A35E3F'
-   Language='1033' Codepage='1252' Version='4.6.2' Manufacturer='Dasher'
-   UpgradeCode='EB7F9F64-6452-402a-8586-4BCBA860842F'>
-
-    <Package Keywords='Installer'
-     Description="Dasher 4.6 Installer"
-     Comments='This will install Dasher' Manufacturer='The Dasher Group.'
-     InstallerVersion='100' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
-    <Media Id='1' Cabinet='Sample.cab' EmbedCab='yes' DiskPrompt="CD-ROM #1" />
-    <Property Id='DiskPrompt' Value="Dasher 4.6 Installation [1]" />
-
-    <Directory Id='TARGETDIR' Name='SourceDir'>
-      <Directory Id='ProgramFilesFolder' Name='PFiles'>
-        <Directory Id='Dasher' Name='Dasher'>
-          <Directory Id='INSTALLDIR' Name='Dasher 4.6'>
-            <Component Id='MainExecutable' Guid='5a93ba53-2e2d-4f88-8a1f-5bdd8f130394'>
-              <File Id='DasherEXE' Name='Dasher.exe' DiskId='1'
-               Source='..\Win32\Target\Release\Dasher.exe' Vital='yes'>
-                <Shortcut Id="startmenuDasher44" Directory="ProgramMenuDir" Name="Dasher 4.6" 
WorkingDirectory='INSTALLDIR'
-                  Icon="Dasher.exe" IconIndex="0" Advertise="yes"/>
-                <Shortcut Id="desktopDasher44" Directory="DesktopFolder" Name="Dasher 4.6" 
WorkingDirectory='INSTALLDIR'
-                 Icon="Dasher.exe" IconIndex="0" Advertise="yes"/>
-              </File>
-              <File Id="ExpatDLL" Name="libexpat.dll" DiskId="1" Source="$(env.EXPAT)\bin\libexpat.dll" 
Vital="yes"/>
-            </Component>
-            <Component Id="Help" Guid="cf486329-8d04-462b-afd4-e8e0bccc9c95">
-              <File Id="HelpFile" Name="Dasher.chm" DiskId="1" Source="..\..\Data\Help\Win32\dasher.chm"/>
-            </Component>
-            <Component Id="Tobii" Guid="a0f3fa44-106e-4fff-9ed6-010310f3ec0d">
-              <File Id="TobiiIconFile" Name="dasher-tobii.png" DiskId="1" 
Source="..\..\Data\Graphics\dasher-tobii.png"/>
-            </Component>
-            <Directory Id="SystemRC" Name="system.rc">
-              <Component Id="Alphabets" Guid="e734711a-0e68-4897-b7a6-7a60a20062b5">
-                <File Id="alphabet.AfaanOromo.xml" Name="alphabet.AfaanOromo.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.AfaanOromo.xml" />
-                <File Id="alphabet.Armenian.xml" Name="alphabet.Armenian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Armenian.xml" />
-                <File Id="alphabet.Assamese.xml" Name="alphabet.Assamese.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Assamese.xml" />
-                <!--<File Id="alphabet.Austen.xml" Name="alphabet.Austen.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Austen.xml" />-->
-                <File Id="alphabet.Azerbaijani.xml" Name="alphabet.Azerbaijani.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Azerbaijani.xml" />
-                <File Id="alphabet.Belarusian.xml" Name="alphabet.Belarusian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Belarusian.xml" />
-                <File Id="alphabet.Bulgarian.xml" Name="alphabet.Bulgarian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Bulgarian.xml" />
-                <File Id="alphabet.Esperanto.xml" Name="alphabet.Esperanto.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Esperanto.xml" />
-                <File Id="alphabet.Estonian.xml" Name="alphabet.Estonian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Estonian.xml" />
-                <File Id="alphabet.Filipino.xml" Name="alphabet.Filipino.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Filipino.xml" />
-                <File Id="alphabet.Greek.xml" Name="alphabet.Greek.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Greek.xml" />
-                <File Id="alphabet.Gujarati.xml" Name="alphabet.Gujarati.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Gujarati.xml" />
-                <File Id="alphabet.Hawaiian.xml" Name="alphabet.Hawaiian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Hawaiian.xml" />
-                <File Id="alphabet.Hebrew.xml" Name="alphabet.Hebrew.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Hebrew.xml" />
-                <File Id="alphabet.Hindi.xml" Name="alphabet.Hindi.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Hindi.xml" />
-                <File Id="alphabet.Icelandic.xml" Name="alphabet.Icelandic.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Icelandic.xml" />
-                <File Id="alphabet.Igbo.xml" Name="alphabet.Igbo.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Igbo.xml" />
-                <File Id="alphabet.Indonesian.xml" Name="alphabet.Indonesian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Indonesian.xml" />
-                <File Id="alphabet.IrishGaelic.xml" Name="alphabet.IrishGaelic.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.IrishGaelic.xml" />
-                <File Id="alphabet.Kannada.xml" Name="alphabet.Kannada.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Kannada.xml" />
-                <File Id="alphabet.Katakana.xml" Name="alphabet.Katakana.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Katakana.xml" />
-                <File Id="alphabet.Malay.xml" Name="alphabet.Malay.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Malay.xml" />
-                <File Id="alphabet.Malayalam.xml" Name="alphabet.Malayalam.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Malayalam.xml" />
-                <File Id="alphabet.Marathi.xml" Name="alphabet.Marathi.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Marathi.xml" />
-                <File Id="alphabet.Moldavian.xml" Name="alphabet.Moldavian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Moldavian.xml" />
-                <File Id="alphabet.Ndebele.xml" Name="alphabet.Ndebele.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Ndebele.xml" />
-                <File Id="alphabet.Oriya.xml" Name="alphabet.Oriya.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Oriya.xml" />
-                <File Id="alphabet.Punjabi.xml" Name="alphabet.Punjabi.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Punjabi.xml" />
-                <File Id="alphabet.Romanian.xml" Name="alphabet.Romanian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Romanian.xml" />
-                <File Id="alphabet.Sami.xml" Name="alphabet.Sami.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Sami.xml" />
-                <File Id="alphabet.ScotsGaelic.xml" Name="alphabet.ScotsGaelic.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.ScotsGaelic.xml" />
-                <File Id="alphabet.Sepedi.xml" Name="alphabet.Sepedi.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Sepedi.xml" />
-                <File Id="alphabet.Sesotho.xml" Name="alphabet.Sesotho.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Sesotho.xml" />
-                <File Id="alphabet.Sinhala.xml" Name="alphabet.Sinhala.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Sinhala.xml" />
-                <File Id="alphabet.Slovak.xml" Name="alphabet.Slovak.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Slovak.xml" />
-                <File Id="alphabet.Slovenian.xml" Name="alphabet.Slovenian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Slovenian.xml" />
-                <File Id="alphabet.Swati.xml" Name="alphabet.Swati.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Swati.xml" />
-                <File Id="alphabet.Tajik.xml" Name="alphabet.Tajik.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Tajik.xml" />
-                <File Id="alphabet.Tamil.xml" Name="alphabet.Tamil.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Tamil.xml" />
-                <File Id="alphabet.Telugu.xml" Name="alphabet.Telugu.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Telugu.xml" />
-                <File Id="alphabet.Thai.xml" Name="alphabet.Thai.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Thai.xml" />
-                <File Id="alphabet.Thai2.xml" Name="alphabet.Thai2.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Thai2.xml" />
-                <File Id="alphabet.Tsonga.xml" Name="alphabet.Tsonga.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Tsonga.xml" />
-                <File Id="alphabet.Tswana.xml" Name="alphabet.Tswana.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Tswana.xml" />
-                <File Id="alphabet.Turkish.xml" Name="alphabet.Turkish.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Turkish.xml" />
-                <File Id="alphabet.Urdu.xml" Name="alphabet.Urdu.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Urdu.xml" />
-                <File Id="alphabet.Vietnamese.xml" Name="alphabet.Vietnamese.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Vietnamese.xml" />
-                <File Id="alphabet.Xhosa.xml" Name="alphabet.Xhosa.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Xhosa.xml" />
-                <File Id="alphabet.Yoruba.xml" Name="alphabet.Yoruba.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Yoruba.xml" />
-                <File Id="alphabet.Zulu.xml" Name="alphabet.Zulu.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.Zulu.xml" />
-                <File Id="alphabet.abc.xml" Name="alphabet.abc.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.abc.xml" />
-                <File Id="alphabet.adangbe.xml" Name="alphabet.adangbe.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.adangbe.xml" />
-                <File Id="alphabet.afrikaans.xml" Name="alphabet.afrikaans.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.afrikaans.xml" />
-                <File Id="alphabet.akan.xml" Name="alphabet.akan.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.akan.xml" />
-                <File Id="alphabet.albanian.xml" Name="alphabet.albanian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.albanian.xml" />
-                <File Id="alphabet.amharic.xml" Name="alphabet.amharic.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.amharic.xml" />
-                <File Id="alphabet.arabic.xml" Name="alphabet.arabic.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.arabic.xml" />
-                <File Id="alphabet.basque.xml" Name="alphabet.basque.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.basque.xml" />
-                <File Id="alphabet.bengali.xml" Name="alphabet.bengali.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.bengali.xml" />
-                <File Id="alphabet.bopomofo.xml" Name="alphabet.bopomofo.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.bopomofo.xml" />
-                <File Id="alphabet.bosnian.xml" Name="alphabet.bosnian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.bosnian.xml" />
-                <File Id="alphabet.breton.xml" Name="alphabet.breton.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.breton.xml" />
-                <File Id="alphabet.catalan.xml" Name="alphabet.catalan.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.catalan.xml" />
-                <File Id="alphabet.cherokee.xml" Name="alphabet.cherokee.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.cherokee.xml" />
-                <File Id="alphabet.chinese.xml" Name="alphabet.chinese.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.chinese.xml" />
-                <File Id="alphabet.chineseRuby.xml" Name="alphabet.chineseRuby.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.chineseRuby.xml" />
-                <File Id="alphabet.corsican.xml" Name="alphabet.corsican.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.corsican.xml" />
-                <File Id="alphabet.croatian.xml" Name="alphabet.croatian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.croatian.xml" />
-                <File Id="alphabet.czech.xml" Name="alphabet.czech.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.czech.xml" />
-                <File Id="alphabet.danish.xml" Name="alphabet.danish.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.danish.xml" />
-                <File Id="alphabet.dutch.xml" Name="alphabet.dutch.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.dutch.xml" />
-                <File Id="alphabet.english.xml" Name="alphabet.english.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.english.xml" />
-                <File Id="alphabet.englishC.xml" Name="alphabet.englishC.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.englishC.xml" />
-                <File Id="alphabet.ethiopic.xml" Name="alphabet.ethiopic.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.ethiopic.xml" />
-                <File Id="alphabet.ewe.xml" Name="alphabet.ewe.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.ewe.xml" />
-                <File Id="alphabet.faroese.xml" Name="alphabet.faroese.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.faroese.xml" />
-                <File Id="alphabet.finnish.xml" Name="alphabet.finnish.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.finnish.xml" />
-                <File Id="alphabet.finnish2.xml" Name="alphabet.finnish2.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.finnish2.xml" />
-                <File Id="alphabet.french.xml" Name="alphabet.french.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.french.xml" />
-                <File Id="alphabet.ga.xml" Name="alphabet.ga.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.ga.xml" />
-                <File Id="alphabet.galician.xml" Name="alphabet.galician.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.galician.xml" />
-                <File Id="alphabet.georgian.xml" Name="alphabet.georgian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.georgian.xml" />
-                <File Id="alphabet.german.xml" Name="alphabet.german.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.german.xml" />
-                <File Id="alphabet.hausa.xml" Name="alphabet.hausa.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.hausa.xml" />
-                <File Id="alphabet.hiragana.xml" Name="alphabet.hiragana.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.hiragana.xml" />
-                <File Id="alphabet.hiragana2.xml" Name="alphabet.hiragana2.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.hiragana2.xml" />
-                <File Id="alphabet.hungarian.xml" Name="alphabet.hungarian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.hungarian.xml" />
-                <File Id="alphabet.ipa.xml" Name="alphabet.ipa.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.ipa.xml" />
-                <File Id="alphabet.italian.xml" Name="alphabet.italian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.italian.xml" />
-                <File Id="alphabet.japanese.canna.xml" Name="alphabet.japanese.canna.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.japanese.canna.xml" />
-                <File Id="alphabet.kazakh.xml" Name="alphabet.kazakh.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.kazakh.xml" />
-                <File Id="alphabet.kirghiz.xml" Name="alphabet.kirghiz.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.kirghiz.xml" />
-                <File Id="alphabet.kirundi.xml" Name="alphabet.kirundi.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.kirundi.xml" />
-                <File Id="alphabet.klingon.xml" Name="alphabet.klingon.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.klingon.xml" />
-                <File Id="alphabet.korean.xml" Name="alphabet.korean.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.korean.xml" />
-                <File Id="alphabet.koreanNested.xml" Name="alphabet.koreanNested.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.koreanNested.xml" />
-                <File Id="alphabet.kurdish.xml" Name="alphabet.kurdish.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.kurdish.xml" />
-                <File Id="alphabet.lao.xml" Name="alphabet.lao.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.lao.xml" />
-                <File Id="alphabet.latex.xml" Name="alphabet.latex.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.latex.xml" />
-                <File Id="alphabet.latin.xml" Name="alphabet.latin.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.latin.xml" />
-                <File Id="alphabet.latvian.xml" Name="alphabet.latvian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.latvian.xml" />
-                <File Id="alphabet.lithuanian.xml" Name="alphabet.lithuanian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.lithuanian.xml" />
-                <File Id="alphabet.luxembourgish.xml" Name="alphabet.luxembourgish.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.luxembourgish.xml" />
-                <File Id="alphabet.macedonian.xml" Name="alphabet.macedonian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.macedonian.xml" />
-                <File Id="alphabet.maltese.xml" Name="alphabet.maltese.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.maltese.xml" />
-                <File Id="alphabet.mongolian.xml" Name="alphabet.mongolian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.mongolian.xml" />
-                <File Id="alphabet.myanmar.xml" Name="alphabet.myanmar.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.myanmar.xml" />
-                <File Id="alphabet.nepali.xml" Name="alphabet.nepali.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.nepali.xml" />
-                <File Id="alphabet.norwegian.xml" Name="alphabet.norwegian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.norwegian.xml" />
-                <File Id="alphabet.occitan.xml" Name="alphabet.occitan.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.occitan.xml" />
-                <File Id="alphabet.ogham.xml" Name="alphabet.ogham.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.ogham.xml" />
-                <File Id="alphabet.pashto.xml" Name="alphabet.pashto.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.pashto.xml" />
-                <!--<File Id="alphabet.perl.xml" Name="alphabet.perl.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.perl.xml" />-->
-                <File Id="alphabet.persian.xml" Name="alphabet.persian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.persian.xml" />
-                <File Id="alphabet.pinyin.xml" Name="alphabet.pinyin.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.pinyin.xml" />
-                <!--<File Id="alphabet.pinyin2.xml" Name="alphabet.pinyin2.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.pinyin2.xml" />-->
-                <File Id="alphabet.polish.xml" Name="alphabet.polish.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.polish.xml" />
-                <File Id="alphabet.portuguese.xml" Name="alphabet.portuguese.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.portuguese.xml" />
-                <File Id="alphabet.romansch.xml" Name="alphabet.romansch.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.romansch.xml" />
-                <File Id="alphabet.runic.xml" Name="alphabet.runic.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.runic.xml" />
-                <File Id="alphabet.russian.xml" Name="alphabet.russian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.russian.xml" />
-                <File Id="alphabet.sanskrit.xml" Name="alphabet.sanskrit.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.sanskrit.xml" />
-                <File Id="alphabet.serbian.xml" Name="alphabet.serbian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.serbian.xml" />
-                <File Id="alphabet.somali.xml" Name="alphabet.somali.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.somali.xml" />
-                <File Id="alphabet.spanish.xml" Name="alphabet.spanish.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.spanish.xml" />
-                <File Id="alphabet.swahili.xml" Name="alphabet.swahili.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.swahili.xml" />
-                <File Id="alphabet.swedish.xml" Name="alphabet.swedish.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.swedish.xml" />
-                <File Id="alphabet.thaana.xml" Name="alphabet.thaana.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.thaana.xml" />
-                <File Id="alphabet.tigrinya.xml" Name="alphabet.tigrinya.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.tigrinya.xml" />
-                <File Id="alphabet.turkmen.xml" Name="alphabet.turkmen.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.turkmen.xml" />
-                <File Id="alphabet.ukrainian.xml" Name="alphabet.ukrainian.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.ukrainian.xml" />
-                <File Id="alphabet.uzbek.xml" Name="alphabet.uzbek.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.uzbek.xml" />
-                <File Id="alphabet.venda.xml" Name="alphabet.venda.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.venda.xml" />
-                <File Id="alphabet.welsh.xml" Name="alphabet.welsh.xml" DiskId="1" 
Source="..\..\Data\alphabets\alphabet.welsh.xml" />
-              </Component>
-              <Component Id="Training" Guid="bcc684a1-0a58-474c-bfd9-c25906bc7bf4">
-                <File Id="training_albanian_SQ.txt" Name="training_albanian_SQ.txt" DiskId="1" 
Source="..\..\Data\training\training_albanian_SQ.txt" />
-                <File Id="training_basque_ES.txt" Name="training_basque_ES.txt" DiskId="1" 
Source="..\..\Data\training\training_basque_ES.txt" />
-                <File Id="training_bengali_BD.txt" Name="training_bengali_BD.txt" DiskId="1" 
Source="..\..\Data\training\training_bengali_BD.txt" />
-                <!--<File Id="training_bengali_bn.txt" Name="training_bengali_bn.txt" DiskId="1" 
Source="..\..\Data\training\training_bengali_bn.txt" />-->
-                <File Id="training_canna_JP.txt" Name="training_canna_JP.txt" DiskId="1" 
Source="..\..\Data\training\training_canna_JP.txt" />
-                <File Id="training_czech_CS.txt" Name="training_czech_CS.txt" DiskId="1" 
Source="..\..\Data\training\training_czech_CS.txt" />
-                <File Id="training_danish_DK.txt" Name="training_danish_DK.txt" DiskId="1" 
Source="..\..\Data\training\training_danish_DK.txt" />
-                <File Id="training_dutch_NL.txt" Name="training_dutch_NL.txt" DiskId="1" 
Source="..\..\Data\training\training_dutch_NL.txt" />
-                <File Id="training_english_GB.txt" Name="training_english_GB.txt" DiskId="1" 
Source="..\..\Data\training\training_english_GB.txt" />
-                <File Id="training_finnish_FI.txt" Name="training_finnish_FI.txt" DiskId="1" 
Source="..\..\Data\training\training_finnish_FI.txt" />
-                <File Id="training_french_FR.txt" Name="training_french_FR.txt" DiskId="1" 
Source="..\..\Data\training\training_french_FR.txt" />
-                <File Id="training_german_DE.txt" Name="training_german_DE.txt" DiskId="1" 
Source="..\..\Data\training\training_german_DE.txt" />
-                <File Id="training_greek_GR.txt" Name="training_greek_GR.txt" DiskId="1" 
Source="..\..\Data\training\training_greek_GR.txt" />
-                <File Id="training_hebrew_IL.txt" Name="training_hebrew_IL.txt" DiskId="1" 
Source="..\..\Data\training\training_hebrew_IL.txt" />
-                <File Id="training_hiragana60_JP.txt" Name="training_hiragana60_JP.txt" DiskId="1" 
Source="..\..\Data\training\training_hiragana60_JP.txt" />
-                <File Id="training_hiragana83_JP.txt" Name="training_hiragana83_JP.txt" DiskId="1" 
Source="..\..\Data\training\training_hiragana83_JP.txt" />
-                <File Id="training_hungarian_HU.txt" Name="training_hungarian_HU.txt" DiskId="1" 
Source="..\..\Data\training\training_hungarian_HU.txt" />
-                <File Id="training_italian_IT.txt" Name="training_italian_IT.txt" DiskId="1" 
Source="..\..\Data\training\training_italian_IT.txt" />
-                <File Id="training_mongolian_MN.txt" Name="training_mongolian_MN.txt" DiskId="1" 
Source="..\..\Data\training\training_mongolian_MN.txt" />
-                <File Id="training_persian_IR.txt" Name="training_persian_IR.txt" DiskId="1" 
Source="..\..\Data\training\training_persian_IR.txt" />
-                <File Id="training_polish_PL.txt" Name="training_polish_PL.txt" DiskId="1" 
Source="..\..\Data\training\training_polish_PL.txt" />
-                <File Id="training_portuguese_BR.txt" Name="training_portuguese_BR.txt" DiskId="1" 
Source="..\..\Data\training\training_portuguese_BR.txt" />
-                <File Id="training_russian_RU.txt" Name="training_russian_RU.txt" DiskId="1" 
Source="..\..\Data\training\training_russian_RU.txt" />
-                <File Id="training_spanish_ES.txt" Name="training_spanish_ES.txt" DiskId="1" 
Source="..\..\Data\training\training_spanish_ES.txt" />
-                <File Id="training_swahili_KE.txt" Name="training_swahili_KE.txt" DiskId="1" 
Source="..\..\Data\training\training_swahili_KE.txt" />
-                <File Id="training_swedish_SE.txt" Name="training_swedish_SE.txt" DiskId="1" 
Source="..\..\Data\training\training_swedish_SE.txt" />
-                <File Id="training_turkish_TR.txt" Name="training_turkish_TR.txt" DiskId="1" 
Source="..\..\Data\training\training_turkish_TR.txt" />
-                <File Id="training_welsh_GB.txt" Name="training_welsh_GB.txt" DiskId="1" 
Source="..\..\Data\training\training_welsh_GB.txt" />
-              </Component>
-              <Component Id="Colours" Guid="bebff3fb-083c-46f8-ac31-2484f4b1e9a8">
-                <File Id="colour.blue.xml" Name="colour.blue.xml" DiskId="1" 
Source="..\..\Data\colours\colour.blue.xml" />
-                <File Id="colour.euroasian.xml" Name="colour.euroasian.xml" DiskId="1" 
Source="..\..\Data\colours\colour.euroasian.xml" />
-                <File Id="colour.euroasian2.xml" Name="colour.euroasian2.xml" DiskId="1" 
Source="..\..\Data\colours\colour.euroasian2.xml" />
-                <File Id="colour.euroasian3.xml" Name="colour.euroasian3.xml" DiskId="1" 
Source="..\..\Data\colours\colour.euroasian3.xml" />
-                <File Id="colour.jamie.xml" Name="colour.jamie.xml" DiskId="1" 
Source="..\..\Data\colours\colour.jamie.xml" />
-                <File Id="colour.rainbow.xml" Name="colour.rainbow.xml" DiskId="1" 
Source="..\..\Data\colours\colour.rainbow.xml" />
-                <File Id="colour.thai.xml" Name="colour.thai.xml" DiskId="1" 
Source="..\..\Data\colours\colour.thai.xml" />
-                <File Id="colour.vowels.xml" Name="colour.vowels.xml" DiskId="1" 
Source="..\..\Data\colours\colour.vowels.xml" />
-                <File Id="colour.vowels2.xml" Name="colour.vowels2.xml" DiskId="1" 
Source="..\..\Data\colours\colour.vowels2.xml" />
-                <File Id="colour.xml" Name="colour.xml" DiskId="1" Source="..\..\Data\colours\colour.xml" />
-              </Component>
-              <Component Id="ControlLabels" Guid="fc6ff2ec-3172-4259-b879-162c21981358">
-                <File Id="controllabels.xml" Name="controllabels.xml" DiskId="1" 
Source="..\..\Data\controllabels\controllabels.xml" />
-              </Component>
-            </Directory>
-          </Directory>
-        </Directory>
-      </Directory>
-
-      <Directory Id="ProgramMenuFolder" Name="Programs">
-        <Directory Id="ProgramMenuDir" Name="Dasher 4.6">
-          <Component  Id="Random" Guid="D28C2189-5E40-4f93-B42E-0CD76D8B5B37" KeyPath="no">
-            <Registry Id='DummyReg' Root='HKCU' Key='Software\Inference Group\Dasher3' Name='Dummy'
-               Action='write' Type='string' Value='Dummy Key' KeyPath='yes'/>
-            <RemoveFolder Id="RandomRemove" On="uninstall" />
-          </Component>
-        </Directory>
-      </Directory>
-
-      <Directory Id="DesktopFolder" Name="Desktop" />
-      <Component Id="RegistryTobii" Guid="63287558-8a18-4103-89d5-2c1116cffc52">
-        <Registry Id='TobiiExecutable' Root='HKLM' Key='Software\Tobii\MyTobii\MPA\Dasher45' 
Name='ExecutablePath'
-         Action='write' Type='string' Value='[INSTALLDIR]Dasher.exe' />
-        <Registry Id='TobiiIcon' Root='HKLM' Key='Software\Tobii\MyTobii\MPA\Dasher45' Name='IconPath'
-         Action='write' Type='string' Value='[INSTALLDIR]dasher-tobii.png' />
-        <Registry Id='TobiiTitle' Root='HKLM' Key='Software\Tobii\MyTobii\MPA\Dasher45' Name='Title'
-   Action='write' Type='string' Value='Dasher' />
-        <Registry Id='TobiiMouse' Root='HKLM' Key='Software\Tobii\MyTobii\MPA\Dasher45' Name='MouseControl'
-         Action='write' Type='string' Value='true' />
-      </Component>
-
-      <Component Id="RegistryTobiiDefaults" Guid="6EBE4DD9-850E-4a7b-BEBF-A33B0580F3EC">
-        <Registry Id="RegistryCircleStart" Root="HKCU" Key="Software\Inference Group\Dasher3" 
Name="CircleStart" Action="write" Type="integer" Value="1" />
-        <Registry Id="RegistryInputFilter" Root="HKCU" Key="Software\Inference Group\Dasher3" 
Name="InputFilter" Action="write" Type="string" Value="Eyetracker Mode" />
-        <Registry Id="RegistryStartOnLeft" Root="HKCU" Key="Software\Inference Group\Dasher3" 
Name="StartOnLeft" Action="write" Type="integer" Value="0" />
-      </Component>
-
-      <!--<Component Id="RegistryNonTobii" Guid="a3bf552d-9622-4d4a-b17b-ebb47a18955b">
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>
+       <Product Name="Dasher 4.6" Id="B454FAAB-A95C-4e2f-968D-655F94A35E3F" Language="1033" Codepage="1252" 
Version="4.6.2" Manufacturer="Dasher" UpgradeCode="EB7F9F64-6452-402a-8586-4BCBA860842F">
+               <Package Keywords="Installer" Description="Dasher 4.6 Installer" Comments="This will install 
Dasher" Manufacturer="The Dasher Group." InstallerVersion="100" Languages="1033" Compressed="yes" 
SummaryCodepage="1252"/>
+               <Media Id="1" Cabinet="Sample.cab" EmbedCab="yes" DiskPrompt="CD-ROM #1"/>
+               <Property Id="DiskPrompt" Value="Dasher 4.6 Installation [1]"/>
+               <Directory Id="TARGETDIR" Name="SourceDir">
+                       <Directory Id="ProgramFilesFolder" Name="PFiles">
+                               <Directory Id="Dasher" Name="Dasher">
+                                       <Directory Id="INSTALLDIR" Name="Dasher 4.6">
+                                               <Component Id="MainExecutable" 
Guid="5a93ba53-2e2d-4f88-8a1f-5bdd8f130394">
+                                                       <File Id="DasherEXE" Name="Dasher.exe" DiskId="1" 
Source="..\Win32\Target\Release\Dasher.exe" Vital="yes">
+                                                               <Shortcut Id="startmenuDasher44" 
Directory="ProgramMenuDir" Name="Dasher 4.6" WorkingDirectory="INSTALLDIR" Icon="Dasher.exe" IconIndex="0" 
Advertise="yes"/>
+                                                               <Shortcut Id="desktopDasher44" 
Directory="DesktopFolder" Name="Dasher 4.6" WorkingDirectory="INSTALLDIR" Icon="Dasher.exe" IconIndex="0" 
Advertise="yes"/>
+                                                       </File>
+                                                       <File Id="ExpatDLL" Name="libexpat.dll" DiskId="1" 
Source="$(env.EXPAT)\bin\libexpat.dll" Vital="yes"/>
+                                               </Component>
+                                               <Component Id="Help" 
Guid="cf486329-8d04-462b-afd4-e8e0bccc9c95">
+                                                       <File Id="HelpFile" Name="Dasher.chm" DiskId="1" 
Source="..\..\Data\Help\Win32\dasher.chm"/>
+                                               </Component>
+                                               <Component Id="Tobii" 
Guid="a0f3fa44-106e-4fff-9ed6-010310f3ec0d">
+                                                       <File Id="TobiiIconFile" Name="dasher-tobii.png" 
DiskId="1" Source="..\..\Data\Graphics\dasher-tobii.png"/>
+                                               </Component>
+                                               <Directory Id="SystemRC" Name="system.rc">
+                                                       <Component Id="Alphabets" 
Guid="e734711a-0e68-4897-b7a6-7a60a20062b5">
+                                                               <File Id="alphabet.AfaanOromo.xml" 
Name="alphabet.AfaanOromo.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.AfaanOromo.xml"/>
+                                                               <File Id="alphabet.Armenian.xml" 
Name="alphabet.Armenian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Armenian.xml"/>
+                                                               <File Id="alphabet.Assamese.xml" 
Name="alphabet.Assamese.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Assamese.xml"/>
+                                                               <File Id="alphabet.Austen.xml" 
Name="alphabet.Austen.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Austen.xml"/>
+                                                               <File Id="alphabet.Azerbaijani.xml" 
Name="alphabet.Azerbaijani.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Azerbaijani.xml"/>
+                                                               <File Id="alphabet.Belarusian.xml" 
Name="alphabet.Belarusian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Belarusian.xml"/>
+                                                               <File Id="alphabet.Bulgarian.xml" 
Name="alphabet.Bulgarian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Bulgarian.xml"/>
+                                                               <File Id="alphabet.Esperanto.xml" 
Name="alphabet.Esperanto.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Esperanto.xml"/>
+                                                               <File Id="alphabet.Estonian.xml" 
Name="alphabet.Estonian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Estonian.xml"/>
+                                                               <File Id="alphabet.Filipino.xml" 
Name="alphabet.Filipino.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Filipino.xml"/>
+                                                               <File Id="alphabet.Greek.xml" 
Name="alphabet.Greek.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Greek.xml"/>
+                                                               <File Id="alphabet.Gujarati.xml" 
Name="alphabet.Gujarati.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Gujarati.xml"/>
+                                                               <File Id="alphabet.Hawaiian.xml" 
Name="alphabet.Hawaiian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Hawaiian.xml"/>
+                                                               <File Id="alphabet.Hebrew.xml" 
Name="alphabet.Hebrew.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Hebrew.xml"/>
+                                                               <File Id="alphabet.Hindi.xml" 
Name="alphabet.Hindi.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Hindi.xml"/>
+                                                               <File Id="alphabet.Icelandic.xml" 
Name="alphabet.Icelandic.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Icelandic.xml"/>
+                                                               <File Id="alphabet.Igbo.xml" 
Name="alphabet.Igbo.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Igbo.xml"/>
+                                                               <File Id="alphabet.Indonesian.xml" 
Name="alphabet.Indonesian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Indonesian.xml"/>
+                                                               <File Id="alphabet.IrishGaelic.xml" 
Name="alphabet.IrishGaelic.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.IrishGaelic.xml"/>
+                                                               <File Id="alphabet.Kannada.xml" 
Name="alphabet.Kannada.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Kannada.xml"/>
+                                                               <File Id="alphabet.Katakana.xml" 
Name="alphabet.Katakana.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Katakana.xml"/>
+                                                               <File Id="alphabet.Malay.xml" 
Name="alphabet.Malay.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Malay.xml"/>
+                                                               <File Id="alphabet.Malayalam.xml" 
Name="alphabet.Malayalam.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Malayalam.xml"/>
+                                                               <File Id="alphabet.Marathi.xml" 
Name="alphabet.Marathi.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Marathi.xml"/>
+                                                               <File Id="alphabet.Moldavian.xml" 
Name="alphabet.Moldavian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Moldavian.xml"/>
+                                                               <File Id="alphabet.Ndebele.xml" 
Name="alphabet.Ndebele.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Ndebele.xml"/>
+                                                               <File Id="alphabet.Oriya.xml" 
Name="alphabet.Oriya.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Oriya.xml"/>
+                                                               <File Id="alphabet.Punjabi.xml" 
Name="alphabet.Punjabi.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Punjabi.xml"/>
+                                                               <File Id="alphabet.Romanian.xml" 
Name="alphabet.Romanian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Romanian.xml"/>
+                                                               <File Id="alphabet.Sami.xml" 
Name="alphabet.Sami.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Sami.xml"/>
+                                                               <File Id="alphabet.ScotsGaelic.xml" 
Name="alphabet.ScotsGaelic.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.ScotsGaelic.xml"/>
+                                                               <File Id="alphabet.Sepedi.xml" 
Name="alphabet.Sepedi.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Sepedi.xml"/>
+                                                               <File Id="alphabet.Sesotho.xml" 
Name="alphabet.Sesotho.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Sesotho.xml"/>
+                                                               <File Id="alphabet.Sinhala.xml" 
Name="alphabet.Sinhala.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Sinhala.xml"/>
+                                                               <File Id="alphabet.Slovak.xml" 
Name="alphabet.Slovak.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Slovak.xml"/>
+                                                               <File Id="alphabet.Slovenian.xml" 
Name="alphabet.Slovenian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Slovenian.xml"/>
+                                                               <File Id="alphabet.Swati.xml" 
Name="alphabet.Swati.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Swati.xml"/>
+                                                               <File Id="alphabet.Tajik.xml" 
Name="alphabet.Tajik.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Tajik.xml"/>
+                                                               <File Id="alphabet.Tamil.xml" 
Name="alphabet.Tamil.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Tamil.xml"/>
+                                                               <File Id="alphabet.Telugu.xml" 
Name="alphabet.Telugu.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Telugu.xml"/>
+                                                               <File Id="alphabet.Thai.xml" 
Name="alphabet.Thai.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Thai.xml"/>
+                                                               <File Id="alphabet.Thai2.xml" 
Name="alphabet.Thai2.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Thai2.xml"/>
+                                                               <File Id="alphabet.Tsonga.xml" 
Name="alphabet.Tsonga.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Tsonga.xml"/>
+                                                               <File Id="alphabet.Tswana.xml" 
Name="alphabet.Tswana.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Tswana.xml"/>
+                                                               <File Id="alphabet.Turkish.xml" 
Name="alphabet.Turkish.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Turkish.xml"/>
+                                                               <File Id="alphabet.Urdu.xml" 
Name="alphabet.Urdu.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Urdu.xml"/>
+                                                               <File Id="alphabet.Vietnamese.xml" 
Name="alphabet.Vietnamese.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Vietnamese.xml"/>
+                                                               <File Id="alphabet.Xhosa.xml" 
Name="alphabet.Xhosa.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Xhosa.xml"/>
+                                                               <File Id="alphabet.Yoruba.xml" 
Name="alphabet.Yoruba.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Yoruba.xml"/>
+                                                               <File Id="alphabet.Zulu.xml" 
Name="alphabet.Zulu.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.Zulu.xml"/>
+                                                               <File Id="alphabet.abc.xml" 
Name="alphabet.abc.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.abc.xml"/>
+                                                               <File Id="alphabet.adangbe.xml" 
Name="alphabet.adangbe.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.adangbe.xml"/>
+                                                               <File Id="alphabet.afrikaans.xml" 
Name="alphabet.afrikaans.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.afrikaans.xml"/>
+                                                               <File Id="alphabet.akan.xml" 
Name="alphabet.akan.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.akan.xml"/>
+                                                               <File Id="alphabet.albanian.xml" 
Name="alphabet.albanian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.albanian.xml"/>
+                                                               <File Id="alphabet.amharic.xml" 
Name="alphabet.amharic.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.amharic.xml"/>
+                                                               <File Id="alphabet.arabic.xml" 
Name="alphabet.arabic.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.arabic.xml"/>
+                                                               <File Id="alphabet.basque.xml" 
Name="alphabet.basque.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.basque.xml"/>
+                                                               <File Id="alphabet.bengali.xml" 
Name="alphabet.bengali.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.bengali.xml"/>
+                                                               <File Id="alphabet.bopomofo.xml" 
Name="alphabet.bopomofo.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.bopomofo.xml"/>
+                                                               <File Id="alphabet.bopoTrad.xml" 
Name="alphabet.bopoTrad.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.bopoTrad.xml"/>
+                                                               <File Id="alphabet.bosnian.xml" 
Name="alphabet.bosnian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.bosnian.xml"/>
+                                                               <File Id="alphabet.breton.xml" 
Name="alphabet.breton.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.breton.xml"/>
+                                                               <File Id="alphabet.catalan.xml" 
Name="alphabet.catalan.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.catalan.xml"/>
+                                                               <File Id="alphabet.cangjie.xml" 
Name="alphabet.cangjie.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.cangjie.xml"/>
+                                                               <File Id="alphabet.cherokee.xml" 
Name="alphabet.cherokee.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.cherokee.xml"/>
+                                                               <File Id="alphabet.corsican.xml" 
Name="alphabet.corsican.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.corsican.xml"/>
+                                                               <File Id="alphabet.croatian.xml" 
Name="alphabet.croatian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.croatian.xml"/>
+                                                               <File Id="alphabet.czech.xml" 
Name="alphabet.czech.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.czech.xml"/>
+                                                               <File Id="alphabet.danish.xml" 
Name="alphabet.danish.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.danish.xml"/>
+                                                               <File Id="alphabet.dutch.xml" 
Name="alphabet.dutch.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.dutch.xml"/>
+                                                               <File Id="alphabet.english.xml" 
Name="alphabet.english.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.english.xml"/>
+                                                               <File Id="alphabet.englishC.xml" 
Name="alphabet.englishC.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.englishC.xml"/>
+                                                               <File Id="alphabet.ethiopic.xml" 
Name="alphabet.ethiopic.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.ethiopic.xml"/>
+                                                               <File Id="alphabet.ewe.xml" 
Name="alphabet.ewe.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.ewe.xml"/>
+                                                               <File Id="alphabet.faroese.xml" 
Name="alphabet.faroese.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.faroese.xml"/>
+                                                               <File Id="alphabet.finnish.xml" 
Name="alphabet.finnish.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.finnish.xml"/>
+                                                               <File Id="alphabet.finnish2.xml" 
Name="alphabet.finnish2.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.finnish2.xml"/>
+                                                               <File Id="alphabet.french.xml" 
Name="alphabet.french.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.french.xml"/>
+                                                               <File Id="alphabet.ga.xml" 
Name="alphabet.ga.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.ga.xml"/>
+                                                               <File Id="alphabet.galician.xml" 
Name="alphabet.galician.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.galician.xml"/>
+                                                               <File Id="alphabet.georgian.xml" 
Name="alphabet.georgian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.georgian.xml"/>
+                                                               <File Id="alphabet.german.xml" 
Name="alphabet.german.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.german.xml"/>
+                                                               <File Id="alphabet.hausa.xml" 
Name="alphabet.hausa.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.hausa.xml"/>
+                                                               <File Id="alphabet.hiragana.xml" 
Name="alphabet.hiragana.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.hiragana.xml"/>
+                                                               <File Id="alphabet.hiragana2.xml" 
Name="alphabet.hiragana2.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.hiragana2.xml"/>
+                                                               <File Id="alphabet.hungarian.xml" 
Name="alphabet.hungarian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.hungarian.xml"/>
+                                                               <File Id="alphabet.ipa.xml" 
Name="alphabet.ipa.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.ipa.xml"/>
+                                                               <File Id="alphabet.italian.xml" 
Name="alphabet.italian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.italian.xml"/>
+                                                               <File Id="alphabet.japanese.canna.xml" 
Name="alphabet.japanese.canna.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.japanese.canna.xml"/>
+                                                               <File Id="alphabet.kazakh.xml" 
Name="alphabet.kazakh.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.kazakh.xml"/>
+                                                               <File Id="alphabet.kirghiz.xml" 
Name="alphabet.kirghiz.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.kirghiz.xml"/>
+                                                               <File Id="alphabet.kirundi.xml" 
Name="alphabet.kirundi.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.kirundi.xml"/>
+                                                               <File Id="alphabet.klingon.xml" 
Name="alphabet.klingon.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.klingon.xml"/>
+                                                               <File Id="alphabet.korean.xml" 
Name="alphabet.korean.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.korean.xml"/>
+                                                               <File Id="alphabet.koreanNested.xml" 
Name="alphabet.koreanNested.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.koreanNested.xml"/>
+                                                               <File Id="alphabet.kurdish.xml" 
Name="alphabet.kurdish.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.kurdish.xml"/>
+                                                               <File Id="alphabet.lao.xml" 
Name="alphabet.lao.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.lao.xml"/>
+                                                               <File Id="alphabet.latex.xml" 
Name="alphabet.latex.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.latex.xml"/>
+                                                               <File Id="alphabet.latin.xml" 
Name="alphabet.latin.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.latin.xml"/>
+                                                               <File Id="alphabet.latvian.xml" 
Name="alphabet.latvian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.latvian.xml"/>
+                                                               <File Id="alphabet.lithuanian.xml" 
Name="alphabet.lithuanian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.lithuanian.xml"/>
+                                                               <File Id="alphabet.luxembourgish.xml" 
Name="alphabet.luxembourgish.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.luxembourgish.xml"/>
+                                                               <File Id="alphabet.macedonian.xml" 
Name="alphabet.macedonian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.macedonian.xml"/>
+                                                               <File Id="alphabet.maltese.xml" 
Name="alphabet.maltese.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.maltese.xml"/>
+                                                               <File Id="alphabet.mongolian.xml" 
Name="alphabet.mongolian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.mongolian.xml"/>
+                                                               <File Id="alphabet.myanmar.xml" 
Name="alphabet.myanmar.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.myanmar.xml"/>
+                                                               <File Id="alphabet.nepali.xml" 
Name="alphabet.nepali.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.nepali.xml"/>
+                                                               <File Id="alphabet.norwegian.xml" 
Name="alphabet.norwegian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.norwegian.xml"/>
+                                                               <File Id="alphabet.occitan.xml" 
Name="alphabet.occitan.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.occitan.xml"/>
+                                                               <File Id="alphabet.ogham.xml" 
Name="alphabet.ogham.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.ogham.xml"/>
+                                                               <File Id="alphabet.pashto.xml" 
Name="alphabet.pashto.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.pashto.xml"/>
+                                                               <File Id="alphabet.perl.xml" 
Name="alphabet.perl.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.perl.xml"/>
+                                                               <File Id="alphabet.persian.xml" 
Name="alphabet.persian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.persian.xml"/>
+                                                               <File Id="alphabet.pinyin2.xml" 
Name="alphabet.pinyin2.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.pinyin2.xml"/>
+                                                               <File Id="alphabet.polish.xml" 
Name="alphabet.polish.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.polish.xml"/>
+                                                               <File Id="alphabet.portuguese.xml" 
Name="alphabet.portuguese.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.portuguese.xml"/>
+                                                               <File Id="alphabet.romansch.xml" 
Name="alphabet.romansch.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.romansch.xml"/>
+                                                               <File Id="alphabet.runic.xml" 
Name="alphabet.runic.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.runic.xml"/>
+                                                               <File Id="alphabet.russian.xml" 
Name="alphabet.russian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.russian.xml"/>
+                                                               <File Id="alphabet.sanskrit.xml" 
Name="alphabet.sanskrit.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.sanskrit.xml"/>
+                                                               <File Id="alphabet.serbian.xml" 
Name="alphabet.serbian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.serbian.xml"/>
+                                                               <File Id="alphabet.somali.xml" 
Name="alphabet.somali.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.somali.xml"/>
+                                                               <File Id="alphabet.spanish.xml" 
Name="alphabet.spanish.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.spanish.xml"/>
+                                                               <File Id="alphabet.spyNew.xml" 
Name="alphabet.spyNew.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.spyNew.xml"/>
+                                                               <File Id="alphabet.spyTonesNew.xml" 
Name="alphabet.spyTonesNew.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.spyTonesNew.xml"/>
+                                                               <File Id="alphabet.spyTones2New.xml" 
Name="alphabet.spyTones2New.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.spyTones2New.xml"/>
+                                                               <File Id="alphabet.swahili.xml" 
Name="alphabet.swahili.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.swahili.xml"/>
+                                                               <File Id="alphabet.swedish.xml" 
Name="alphabet.swedish.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.swedish.xml"/>
+                                                               <File Id="alphabet.thaana.xml" 
Name="alphabet.thaana.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.thaana.xml"/>
+                                                               <File Id="alphabet.tigrinya.xml" 
Name="alphabet.tigrinya.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.tigrinya.xml"/>
+                                                               <File Id="alphabet.turkmen.xml" 
Name="alphabet.turkmen.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.turkmen.xml"/>
+                                                               <File Id="alphabet.ukrainian.xml" 
Name="alphabet.ukrainian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.ukrainian.xml"/>
+                                                               <File Id="alphabet.uzbek.xml" 
Name="alphabet.uzbek.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.uzbek.xml"/>
+                                                               <File Id="alphabet.venda.xml" 
Name="alphabet.venda.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.venda.xml"/>
+                                                               <File Id="alphabet.welsh.xml" 
Name="alphabet.welsh.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.welsh.xml"/>
+                                                       </Component>
+                                                       <Component Id="Training" 
Guid="bcc684a1-0a58-474c-bfd9-c25906bc7bf4">
+                                                               <File Id="training_albanian_SQ.txt" 
Name="training_albanian_SQ.txt" DiskId="1" Source="..\..\Data\training\training_albanian_SQ.txt"/>
+                                                               <File Id="training_basque_ES.txt" 
Name="training_basque_ES.txt" DiskId="1" Source="..\..\Data\training\training_basque_ES.txt"/>
+                                                               <File Id="training_bengali_BD.txt" 
Name="training_bengali_BD.txt" DiskId="1" Source="..\..\Data\training\training_bengali_BD.txt"/>
+                                                               <File Id="training_canna_JP.txt" 
Name="training_canna_JP.txt" DiskId="1" Source="..\..\Data\training\training_canna_JP.txt"/>
+                                                               <File Id="training_czechC_CS.txt" 
Name="training_czechC_CS.txt" DiskId="1" Source="..\..\Data\training\training_czechC_CS.txt"/>
+                                                               <File Id="training_czech_CS.txt" 
Name="training_czech_CS.txt" DiskId="1" Source="..\..\Data\training\training_czech_CS.txt"/>
+                                                               <File Id="training_danish_DK.txt" 
Name="training_danish_DK.txt" DiskId="1" Source="..\..\Data\training\training_danish_DK.txt"/>
+                                                               <File Id="training_dutch_NL.txt" 
Name="training_dutch_NL.txt" DiskId="1" Source="..\..\Data\training\training_dutch_NL.txt"/>
+                                                               <File Id="training_englishLC_GB.txt" 
Name="training_englishLC_GB.txt" DiskId="1" Source="..\..\Data\training\training_englishLC_GB.txt"/>
+                                                               <File Id="training_english_GB.txt" 
Name="training_english_GB.txt" DiskId="1" Source="..\..\Data\training\training_english_GB.txt"/>
+                                                               <File Id="training_finnish_FI.txt" 
Name="training_finnish_FI.txt" DiskId="1" Source="..\..\Data\training\training_finnish_FI.txt"/>
+                                                               <File Id="training_frenchC_FR.txt" 
Name="training_frenchC_FR.txt" DiskId="1" Source="..\..\Data\training\training_frenchC_FR.txt"/>
+                                                               <File Id="training_french_FR.txt" 
Name="training_french_FR.txt" DiskId="1" Source="..\..\Data\training\training_french_FR.txt"/>
+                                                               <File Id="training_german_DE.txt" 
Name="training_german_DE.txt" DiskId="1" Source="..\..\Data\training\training_german_DE.txt"/>
+                                                               <File Id="training_greek_GR.txt" 
Name="training_greek_GR.txt" DiskId="1" Source="..\..\Data\training\training_greek_GR.txt"/>
+                                                               <File Id="training_hebrew_IL.txt" 
Name="training_hebrew_IL.txt" DiskId="1" Source="..\..\Data\training\training_hebrew_IL.txt"/>
+                                                               <File Id="training_hiragana60_JP.txt" 
Name="training_hiragana60_JP.txt" DiskId="1" Source="..\..\Data\training\training_hiragana60_JP.txt"/>
+                                                               <File Id="training_hiragana83_JP.txt" 
Name="training_hiragana83_JP.txt" DiskId="1" Source="..\..\Data\training\training_hiragana83_JP.txt"/>
+                                                               <File Id="training_hungarian_HU.txt" 
Name="training_hungarian_HU.txt" DiskId="1" Source="..\..\Data\training\training_hungarian_HU.txt"/>
+                                                               <File Id="training_italianC_IT.txt" 
Name="training_italianC_IT.txt" DiskId="1" Source="..\..\Data\training\training_italianC_IT.txt"/>
+                                                               <File Id="training_italian_IT.txt" 
Name="training_italian_IT.txt" DiskId="1" Source="..\..\Data\training\training_italian_IT.txt"/>
+                                                               <File Id="training_mongolian_MN.txt" 
Name="training_mongolian_MN.txt" DiskId="1" Source="..\..\Data\training\training_mongolian_MN.txt"/>
+                                                               <File Id="training_persian_IR.txt" 
Name="training_persian_IR.txt" DiskId="1" Source="..\..\Data\training\training_persian_IR.txt"/>
+                                                               <File Id="training_polish_PL.txt" 
Name="training_polish_PL.txt" DiskId="1" Source="..\..\Data\training\training_polish_PL.txt"/>
+                                                               <File Id="training_portugueseC_BR.txt" 
Name="training_portugueseC_BR.txt" DiskId="1" Source="..\..\Data\training\training_portugueseC_BR.txt"/>
+                                                               <File Id="training_portuguese_BR.txt" 
Name="training_portuguese_BR.txt" DiskId="1" Source="..\..\Data\training\training_portuguese_BR.txt"/>
+                                                               <File Id="training_russian_RU.txt" 
Name="training_russian_RU.txt" DiskId="1" Source="..\..\Data\training\training_russian_RU.txt"/>
+                                                               <File Id="training_spanishC_ES.txt" 
Name="training_spanishC_ES.txt" DiskId="1" Source="..\..\Data\training\training_spanishC_ES.txt"/>
+                                                               <File Id="training_spanish_ES.txt" 
Name="training_spanish_ES.txt" DiskId="1" Source="..\..\Data\training\training_spanish_ES.txt"/>
+                                                               <File Id="training_spyNew.txt" 
Name="training_spyNew.txt" DiskId="1" Source="..\..\Data\training\training_spyNew.txt"/>
+                                                               <File Id="training_swahili_KE.txt" 
Name="training_swahili_KE.txt" DiskId="1" Source="..\..\Data\training\training_swahili_KE.txt"/>
+                                                               <File Id="training_swedish_SE.txt" 
Name="training_swedish_SE.txt" DiskId="1" Source="..\..\Data\training\training_swedish_SE.txt"/>
+                                                               <File Id="training_turkish_TR.txt" 
Name="training_turkish_TR.txt" DiskId="1" Source="..\..\Data\training\training_turkish_TR.txt"/>
+                                                               <File Id="training_welsh_GB.txt" 
Name="training_welsh_GB.txt" DiskId="1" Source="..\..\Data\training\training_welsh_GB.txt"/>
+                                                       </Component>
+                                                       <Component Id="Colours" 
Guid="bebff3fb-083c-46f8-ac31-2484f4b1e9a8">
+                                                               <File Id="colour.blue.xml" 
Name="colour.blue.xml" DiskId="1" Source="..\..\Data\colours\colour.blue.xml"/>
+                                                               <File Id="colour.euroasian.xml" 
Name="colour.euroasian.xml" DiskId="1" Source="..\..\Data\colours\colour.euroasian.xml"/>
+                                                               <File Id="colour.euroasian2.xml" 
Name="colour.euroasian2.xml" DiskId="1" Source="..\..\Data\colours\colour.euroasian2.xml"/>
+                                                               <File Id="colour.euroasian3.xml" 
Name="colour.euroasian3.xml" DiskId="1" Source="..\..\Data\colours\colour.euroasian3.xml"/>
+                                                               <File Id="colour.jamie.xml" 
Name="colour.jamie.xml" DiskId="1" Source="..\..\Data\colours\colour.jamie.xml"/>
+                                                               <File Id="colour.rainbow.xml" 
Name="colour.rainbow.xml" DiskId="1" Source="..\..\Data\colours\colour.rainbow.xml"/>
+                                                               <File Id="colour.thai.xml" 
Name="colour.thai.xml" DiskId="1" Source="..\..\Data\colours\colour.thai.xml"/>
+                                                               <File Id="colour.vowels.xml" 
Name="colour.vowels.xml" DiskId="1" Source="..\..\Data\colours\colour.vowels.xml"/>
+                                                               <File Id="colour.vowels2.xml" 
Name="colour.vowels2.xml" DiskId="1" Source="..\..\Data\colours\colour.vowels2.xml"/>
+                                                               <File Id="colour.xml" Name="colour.xml" 
DiskId="1" Source="..\..\Data\colours\colour.xml"/>
+                                                       </Component>
+                                               </Directory>
+                                       </Directory>
+                               </Directory>
+                       </Directory>
+                       <Directory Id="ProgramMenuFolder" Name="Programs">
+                               <Directory Id="ProgramMenuDir" Name="Dasher 4.6">
+                                       <Component Id="Random" Guid="D28C2189-5E40-4f93-B42E-0CD76D8B5B37" 
KeyPath="no">
+                                               <Registry Id="DummyReg" Root="HKCU" Key="Software\Inference 
Group\Dasher3" Name="Dummy" Action="write" Type="string" Value="Dummy Key" KeyPath="yes"/>
+                                               <RemoveFolder Id="RandomRemove" On="uninstall"/>
+                                       </Component>
+                               </Directory>
+                       </Directory>
+                       <Directory Id="DesktopFolder" Name="Desktop"/>
+                       <Component Id="RegistryTobii" Guid="63287558-8a18-4103-89d5-2c1116cffc52">
+                               <Registry Id="TobiiExecutable" Root="HKLM" 
Key="Software\Tobii\MyTobii\MPA\Dasher45" Name="ExecutablePath" Action="write" Type="string" 
Value="[INSTALLDIR]Dasher.exe"/>
+                               <Registry Id="TobiiIcon" Root="HKLM" 
Key="Software\Tobii\MyTobii\MPA\Dasher45" Name="IconPath" Action="write" Type="string" 
Value="[INSTALLDIR]dasher-tobii.png"/>
+                               <Registry Id="TobiiTitle" Root="HKLM" 
Key="Software\Tobii\MyTobii\MPA\Dasher45" Name="Title" Action="write" Type="string" Value="Dasher"/>
+                               <Registry Id="TobiiMouse" Root="HKLM" 
Key="Software\Tobii\MyTobii\MPA\Dasher45" Name="MouseControl" Action="write" Type="string" Value="true"/>
+                       </Component>
+                       <Component Id="RegistryTobiiDefaults" Guid="6EBE4DD9-850E-4a7b-BEBF-A33B0580F3EC">
+                               <Registry Id="RegistryCircleStart" Root="HKCU" Key="Software\Inference 
Group\Dasher3" Name="CircleStart" Action="write" Type="integer" Value="1"/>
+                               <Registry Id="RegistryInputFilter" Root="HKCU" Key="Software\Inference 
Group\Dasher3" Name="InputFilter" Action="write" Type="string" Value="Eyetracker Mode"/>
+                               <Registry Id="RegistryStartOnLeft" Root="HKCU" Key="Software\Inference 
Group\Dasher3" Name="StartOnLeft" Action="write" Type="integer" Value="0"/>
+                       </Component>
+                       <!--<Component Id="RegistryNonTobii" Guid="a3bf552d-9622-4d4a-b17b-ebb47a18955b">
          <Condition>NOT TOBII</Condition>
 
          <Registry Id="RegistryCircleStart" Root="HKCU" Key="Software\Inference Group\Dasher3" 
Name="CircleStart" Action="write" Type="integer" Value="0" />
          <Registry Id="RegistryInputFilter" Root="HKCU" Key="Software\Inference Group\Dasher3" 
Name="InputFilter" Action="write" Type="string" Value="Normal Control" />
     <Registry Id="RegistryStartOnLeft" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="StartOnLeft" 
Action="write" Type="integer" Value="1" />
     </Component>-->
-
-
-      <!--<Component Id="RegistryCore" Guid="5999aef1-3ba7-4af2-8d56-5f3f4e7a4410">
+                       <!--<Component Id="RegistryCore" Guid="5999aef1-3ba7-4af2-8d56-5f3f4e7a4410">
        <Registry Id="RegistryDrawMouseLine" Root="HKCU" Key="Software\Inference Group\Dasher3" 
Name="DrawMouseLine" Action="write" Type="integer" Value="1" />
        <Registry Id="RegistryDrawMouse" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="DrawMouse" 
Action="write" Type="integer" Value="0" />
        <Registry Id="RegistryShowSpeedSlider" Root="HKCU" Key="Software\Inference Group\Dasher3" 
Name="ShowSpeedSlider" Action="write" Type="integer" Value="1" />
@@ -377,42 +360,34 @@
        <Registry Id="RegistryEditFont" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="EditFont" 
Action="write" Type="string" Value="Sans 10" />
        <Registry Id="RegistryWindowState" Root="HKCU" Key="Software\Inference Group\Dasher3" 
Name="WindowState" Action="write" Type="string" Value="" />
     </Component>-->
-    </Directory>
-
-
-
-    <Feature Id='Complete' Title='Dasher 4.6' Description='The full Dasher installation.' Display='expand' 
Level='1' ConfigurableDirectory='INSTALLDIR'>
-      <Feature Id="Core" Title="Core" Description="Core programs and data files." Level="1">
-
-        <ComponentRef Id='MainExecutable' />
-        <ComponentRef Id='Random' />
-        <ComponentRef Id="Alphabets" />
-        <ComponentRef Id="Training" />
-        <ComponentRef Id="Colours" />
-        <ComponentRef Id="ControlLabels" />
-        <!--<ComponentRef Id="RegistryCore" />-->
-      </Feature>
-      <Feature Id="Documentation" Title="Documentation" Description="The Dasher manual." Level="1">
-        <ComponentRef Id="Help" />
-      </Feature>
-      <Feature Id="Tobii" Title="MyTobii Support" Description="Support for the MyTobii gaze tracker." 
Level="1000">
-        <ComponentRef Id="Tobii" />
-        <ComponentRef Id="RegistryTobii" />
-        <ComponentRef Id="RegistryTobiiDefaults" />
-      </Feature>
-      <!--<Feature Id="NonTobii" Title="Non-Tobii Defaults" Description="Default values for non-Tobii 
installations (internal)" Level="1">
+               </Directory>
+               <Feature Id="Complete" Title="Dasher 4.6" Description="The full Dasher installation." 
Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR">
+                       <Feature Id="Core" Title="Core" Description="Core programs and data files." Level="1">
+                               <ComponentRef Id="MainExecutable"/>
+                               <ComponentRef Id="Random"/>
+                               <ComponentRef Id="Alphabets"/>
+                               <ComponentRef Id="Training"/>
+                               <ComponentRef Id="Colours"/>
+                               <!--<ComponentRef Id="RegistryCore" />-->
+                       </Feature>
+                       <Feature Id="Documentation" Title="Documentation" Description="The Dasher manual." 
Level="1">
+                               <ComponentRef Id="Help"/>
+                       </Feature>
+                       <Feature Id="Tobii" Title="MyTobii Support" Description="Support for the MyTobii gaze 
tracker." Level="1000">
+                               <ComponentRef Id="Tobii"/>
+                               <ComponentRef Id="RegistryTobii"/>
+                               <ComponentRef Id="RegistryTobiiDefaults"/>
+                       </Feature>
+                       <!--<Feature Id="NonTobii" Title="Non-Tobii Defaults" Description="Default values for 
non-Tobii installations (internal)" Level="1">
         <Condition Level="0">FooBar</Condition>
         <CoponentRef Id="RegistryNonTobii" />
       </Feature>-->
-    </Feature>
-
-    <WixVariable Id="WixUILicenseRtf" Value="License.rtf" />
-    <WixVariable Id="WixUIDialogBmp" Value="Background.bmp" />
-    <WixVariable Id="WixUIBannerBmp" Value="Top.bmp" />
-
-    <UIRef Id="WixUI_Mondo" />
-    <UIRef Id="WixUI_ErrorProgressText" />
-
-    <Icon Id="Dasher.exe" SourceFile="..\Win32\Target\Release\Dasher.exe" />
-  </Product>
+               </Feature>
+               <WixVariable Id="WixUILicenseRtf" Value="License.rtf"/>
+               <WixVariable Id="WixUIDialogBmp" Value="Background.bmp"/>
+               <WixVariable Id="WixUIBannerBmp" Value="Top.bmp"/>
+               <UIRef Id="WixUI_Mondo"/>
+               <UIRef Id="WixUI_ErrorProgressText"/>
+               <Icon Id="Dasher.exe" SourceFile="..\Win32\Target\Release\Dasher.exe"/>
+       </Product>
 </Wix>
diff --git a/Src/update_wix.perl b/Src/update_wix.perl
new file mode 100644
index 0000000..ab31f1e
--- /dev/null
+++ b/Src/update_wix.perl
@@ -0,0 +1,110 @@
+#
+#  update_wix.perl updates the alphabet, training and color entries in the WIX installer
+#  files.
+#
+#  Ron Bessems <ron b promixis com>
+#
+
+use XML::LibXML;
+use XML::LibXML::PrettyPrint;
+
+sub parse_makefile {
+
+    my $filename = @_[0];
+    my $regexp = @_[1];
+    my @alphabets;
+
+    open(my $fh, '<:encoding(UTF-8)', $filename) or die "Could not open file '$filename' $!";
+
+    while (my $row = <$fh>) {    
+        my @matches = $row =~ @_[1];
+        if ( scalar @matches > 0 ) {           
+            push @alphabets, @matches[0];
+        }
+    }  
+
+    close $fh;
+
+    return @alphabets;
+
+}
+
+#Parses Makefile.am and extras the files it lists.
+sub parse_alphabet_makefile {
+    return parse_makefile( @_[0],  qr/(alphabet\.(:?\w|.)*\.xml)/);
+}
+
+#Parses Makefile.am and extras the files it lists.
+sub parse_training_makefile {
+    return parse_makefile( @_[0],  qr/(training_(:?\w|.)*\.txt)/);     
+}
+
+#Parses Makefile.am and extras the files it lists.
+sub parse_colours_makefile {
+    return parse_makefile( @_[0],  qr/(colour(:?\w|.)*\.xml)/);        
+}
+
+
+# Finds the node with specified xpath, removes it's subnodes and then adds the files as children.
+sub update_nodes {
+    my $xc = @_[0];
+    my $xpath = @_[1];
+    my $prefix = @_[2];
+    my $files = @_[3];
+
+    my @nodes = $xc->findnodes($xpath);
+    if ( scalar @nodes != 1 ) {
+        die "Could not find $xpath Node.";
+    }
+
+    my $node = @nodes[0];      
+
+    $node->removeChildNodes(); 
+    for my $file (@$files) {
+        my $source = "$prefix$file";
+        my $fileNode = $node->addNewChild( '', 'File' );
+
+        $fileNode->setAttribute('Id', $file );
+        $fileNode->setAttribute('Name', $file );
+        $fileNode->setAttribute('DiskId', '1' );
+        $fileNode->setAttribute('Source', $source);                            
+    }          
+       
+}
+
+# Takes the source XML and replaces the alphabets, training and colours.
+sub parse_xml {
+
+    my $filename = @_[0];
+    my $alphabets = @_[1];
+    my $training = @_[2];
+    my $colours = @_[3];
+
+    my $parser = XML::LibXML->new;     
+    my $dom = $parser->parse_file($filename) or die("Could not load $filename");
+
+    my $xc = XML::LibXML::XPathContext->new($dom);
+    $xc->registerNs('Wix', 'http://schemas.microsoft.com/wix/2006/wi');
+
+    update_nodes($xc, q {//Wix:Component[ Id="Alphabets"]}, "..\\..\\Data\\alphabets\\", $alphabets);
+    update_nodes($xc, q {//Wix:Component[ Id="Training"]}, "..\\..\\Data\\training\\", $training);
+    update_nodes($xc, q {//Wix:Component[ Id="Colours"]}, "..\\..\\Data\\colours\\", $colours);
+
+    open my $out_fh, '>', $filename;
+    print {$out_fh} XML::LibXML::PrettyPrint->pretty_print($dom);
+    close $out_fh;
+}
+
+my @alphabets = parse_alphabet_makefile("../Data/alphabets/Makefile.am");
+my @training = parse_training_makefile("../Data/training/Makefile.am");
+my @colours = parse_colours_makefile("../Data/colours/Makefile.am");
+
+print("Found " . scalar @alphabets . " alphabets\n");
+print("Found " . scalar @training . " training files\n");
+print("Found " . scalar @colours . " colours\n");
+
+my @files = ( "Installer/Dasher.wxs", "InstallerTobii/InstallerTobii.wxs", "InstallerW2K/InstallerW2K.wxs");
+
+for my $file (@files) {
+    parse_xml ( $file, \ alphabets, \ training, \ colours);
+}



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]