diff --git a/EDMarketConnector.wxs b/EDMarketConnector.wxs
index fdd1849f..f470c4df 100644
--- a/EDMarketConnector.wxs
+++ b/EDMarketConnector.wxs
@@ -3363,57 +3363,59 @@
 
 		<Feature Id='Complete' Level='1'>
 			<ComponentRef Id="RegistryEntries" />
-			<ComponentRef Id="MainExecutable" />
-			<ComponentRef Id="_ctypes.pyd" />
-			<ComponentRef Id="_hashlib.pyd" />
-			<ComponentRef Id="_socket.pyd" />
-			<ComponentRef Id="_sqlite3.pyd" />
-			<ComponentRef Id="_ssl.pyd" />
-			<ComponentRef Id="_tkinter.pyd" />
-			<ComponentRef Id="_bz2.pyd" />
-			<ComponentRef Id="cacert.pem" />
-			<ComponentRef Id="coriolis.py" />
+			<ComponentRef Id="MainExecutable" Guid="{D33BB66E-9664-4AB6-A044-3004B50A09B0}">
+			<ComponentRef Id="cacert.pem" Guid="{62DF41B7-0BE8-48F3-BB22-90E9201A6D8C}">
 			<ComponentRef Id="commodity.csv" />
-			<ComponentRef Id="cs.strings" />
-			<ComponentRef Id="de.strings" />
-			<ComponentRef Id="EDMarketConnector.ico" />
-			<ComponentRef Id="EDMarketConnector.VisualElementsManifest.xml" />
+			<ComponentRef Id="EDMarketConnector.ico" Guid="{6762E871-5FA1-4C2F-A3C9-6A9954CC018C}">
+			<ComponentRef Id="EDMarketConnector.VisualElementsManifest.xml" Guid="{9A0CB8A2-7167-492F-A185-0BDF7E9F5C01}">
 			<ComponentRef Id="EDMC.exe" />
 			<ComponentRef Id="EUROCAPS.TTF" />
-			<ComponentRef Id="eddb.py" />
-			<ComponentRef Id="eddn.py" />
-			<ComponentRef Id="edsm.py" />
-			<ComponentRef Id="edsy.py" />
-			<ComponentRef Id="es.strings" />
-			<ComponentRef Id="fi.strings" />
-			<ComponentRef Id="fr.strings" />
-			<ComponentRef Id="hu.strings" />
-			<ComponentRef Id="inara.py" />
-			<ComponentRef Id="it.strings" />
-			<ComponentRef Id="ja.strings" />
-			<ComponentRef Id="lv.strings" />
+			<ComponentRef Id="libcrypto_1_1.dll" />
+			<ComponentRef Id="libssl_1_1.dll" />
 			<ComponentRef Id="modules.p" />
-			<ComponentRef Id="nl.strings" />
-			<ComponentRef Id="pl.strings" />
-			<ComponentRef Id="pt_BR.strings" />
-			<ComponentRef Id="pt_PT.strings" />
-			<ComponentRef Id="pyexpat.pyd" />
+			<ComponentRef Id="pyexpat.pyd" Guid="{87A99AAA-792F-4092-9D00-5106D99D00AD}">
 			<ComponentRef Id="python37.dll" />
 			<ComponentRef Id="rare_commodity.csv" />
-			<ComponentRef Id="ru.strings" />
-			<ComponentRef Id="select.pyd" />
+			<ComponentRef Id="select.pyd" Guid="{9DBAB544-E815-40A5-866A-391B68919344}">
 			<ComponentRef Id="ships.p" />
-			<ComponentRef Id="sr_Latn.strings" />
-			<ComponentRef Id="snd_good.wav" />
 			<ComponentRef Id="snd_bad.wav" />
+			<ComponentRef Id="snd_good.wav" />
 			<ComponentRef Id="stations.p" />
 			<ComponentRef Id="systems.p" />
 			<ComponentRef Id="tcl86t.dll" />
 			<ComponentRef Id="tk86t.dll" />
-			<ComponentRef Id="uk.strings" />
-			<ComponentRef Id="unicodedata.pyd" />
+			<ComponentRef Id="unicodedata.pyd" Guid="{E8E3701A-8AA1-4D46-A56D-7AF08D6AFCD4}">
 			<ComponentRef Id="winsound.pyd" />
-			<ComponentRef Id="WinSparkle.dll" />
+			<ComponentRef Id="WinSparkle.dll" Guid="{3117D2CF-1D87-4B99-BE44-7BDDFE8C8E60}">
+			<ComponentRef Id="_bz2.pyd" />
+			<ComponentRef Id="_ctypes.pyd" Guid="{433C38E1-F736-4546-AA83-FCD8B0AAA39B}">
+			<ComponentRef Id="_decimal.pyd" />
+			<ComponentRef Id="_elementtree.pyd" />
+			<ComponentRef Id="_hashlib.pyd" Guid="{45803711-A2A6-4DA8-8219-F625DE6DB33E}">
+			<ComponentRef Id="_lzma.pyd" />
+			<ComponentRef Id="_multiprocessing.pyd" />
+			<ComponentRef Id="_queue.pyd" />
+			<ComponentRef Id="_socket.pyd" />
+			<ComponentRef Id="_sqlite3.pyd" />
+			<ComponentRef Id="_ssl.pyd" Guid="{2EA8F0B6-A104-4D31-99F0-3535ACDC26A9}">
+			<ComponentRef Id="_testcapi.pyd" />
+			<ComponentRef Id="_tkinter.pyd" Guid="{D2F0CDD2-E934-419F-BC99-445E8FD3AF24}">
+			<ComponentRef Id="cs.strings" />
+			<ComponentRef Id="de.strings" />
+			<ComponentRef Id="es.strings" />
+			<ComponentRef Id="fi.strings" />
+			<ComponentRef Id="fr.strings" />
+			<ComponentRef Id="hu.strings" />
+			<ComponentRef Id="it.strings" />
+			<ComponentRef Id="ja.strings" />
+			<ComponentRef Id="lv.strings" />
+			<ComponentRef Id="nl.strings" />
+			<ComponentRef Id="pl.strings" />
+			<ComponentRef Id="pt_BR.strings" />
+			<ComponentRef Id="pt_PT.strings" />
+			<ComponentRef Id="ru.strings" />
+			<ComponentRef Id="sr_Latn.strings" />
+			<ComponentRef Id="uk.strings" />
 			<ComponentRef Id="zh_Hans.strings" />
 			<ComponentRef Id="auto.tcl" />
 			<ComponentRef Id="clock.tcl" />
@@ -3422,41 +3424,972 @@
 			<ComponentRef Id="package.tcl" />
 			<ComponentRef Id="parray.tcl" />
 			<ComponentRef Id="safe.tcl" />
-			<ComponentRef Id="tclIndex_1" />
+			<ComponentRef Id="tclIndex" />
 			<ComponentRef Id="tm.tcl" />
 			<ComponentRef Id="word.tcl" />
+			<ComponentRef Id="ascii.enc" />
+			<ComponentRef Id="big5.enc" />
+			<ComponentRef Id="cp1250.enc" />
+			<ComponentRef Id="cp1251.enc" />
+			<ComponentRef Id="cp1252.enc" />
+			<ComponentRef Id="cp1253.enc" />
+			<ComponentRef Id="cp1254.enc" />
+			<ComponentRef Id="cp1255.enc" />
+			<ComponentRef Id="cp1256.enc" />
+			<ComponentRef Id="cp1257.enc" />
+			<ComponentRef Id="cp1258.enc" />
+			<ComponentRef Id="cp437.enc" />
+			<ComponentRef Id="cp737.enc" />
+			<ComponentRef Id="cp775.enc" />
+			<ComponentRef Id="cp850.enc" />
+			<ComponentRef Id="cp852.enc" />
+			<ComponentRef Id="cp855.enc" />
+			<ComponentRef Id="cp857.enc" />
+			<ComponentRef Id="cp860.enc" />
+			<ComponentRef Id="cp861.enc" />
+			<ComponentRef Id="cp862.enc" />
+			<ComponentRef Id="cp863.enc" />
+			<ComponentRef Id="cp864.enc" />
+			<ComponentRef Id="cp865.enc" />
+			<ComponentRef Id="cp866.enc" />
+			<ComponentRef Id="cp869.enc" />
+			<ComponentRef Id="cp874.enc" />
+			<ComponentRef Id="cp932.enc" />
+			<ComponentRef Id="cp936.enc" />
+			<ComponentRef Id="cp949.enc" />
+			<ComponentRef Id="cp950.enc" />
+			<ComponentRef Id="dingbats.enc" />
+			<ComponentRef Id="ebcdic.enc" />
+			<ComponentRef Id="euc_cn.enc" />
+			<ComponentRef Id="euc_jp.enc" />
+			<ComponentRef Id="euc_kr.enc" />
+			<ComponentRef Id="gb12345.enc" />
+			<ComponentRef Id="gb1988.enc" />
+			<ComponentRef Id="gb2312_raw.enc" />
+			<ComponentRef Id="gb2312.enc" />
+			<ComponentRef Id="iso2022_jp.enc" />
+			<ComponentRef Id="iso2022_kr.enc" />
+			<ComponentRef Id="iso2022.enc" />
+			<ComponentRef Id="iso8859_1.enc" />
+			<ComponentRef Id="iso8859_10.enc" />
+			<ComponentRef Id="iso8859_13.enc" />
+			<ComponentRef Id="iso8859_14.enc" />
+			<ComponentRef Id="iso8859_15.enc" />
+			<ComponentRef Id="iso8859_16.enc" />
+			<ComponentRef Id="iso8859_2.enc" />
+			<ComponentRef Id="iso8859_3.enc" />
+			<ComponentRef Id="iso8859_4.enc" />
+			<ComponentRef Id="iso8859_5.enc" />
+			<ComponentRef Id="iso8859_6.enc" />
+			<ComponentRef Id="iso8859_7.enc" />
+			<ComponentRef Id="iso8859_8.enc" />
+			<ComponentRef Id="iso8859_9.enc" />
+			<ComponentRef Id="jis0201.enc" />
+			<ComponentRef Id="jis0208.enc" />
+			<ComponentRef Id="jis0212.enc" />
+			<ComponentRef Id="koi8_r.enc" />
+			<ComponentRef Id="koi8_u.enc" />
+			<ComponentRef Id="ksc5601.enc" />
+			<ComponentRef Id="macCentEuro.enc" />
+			<ComponentRef Id="macCroatian.enc" />
+			<ComponentRef Id="macCyrillic.enc" />
+			<ComponentRef Id="macDingbats.enc" />
+			<ComponentRef Id="macGreek.enc" />
+			<ComponentRef Id="macIceland.enc" />
+			<ComponentRef Id="macJapan.enc" />
+			<ComponentRef Id="macRoman.enc" />
+			<ComponentRef Id="macRomania.enc" />
+			<ComponentRef Id="macThai.enc" />
+			<ComponentRef Id="macTurkish.enc" />
+			<ComponentRef Id="macUkraine.enc" />
+			<ComponentRef Id="shiftjis.enc" />
+			<ComponentRef Id="symbol.enc" />
+			<ComponentRef Id="tis_620.enc" />
+			<ComponentRef Id="http.tcl" />
+			<ComponentRef Id="pkgIndex.tcl" />
+			<ComponentRef Id="af.msg" />
+			<ComponentRef Id="af_za.msg" />
+			<ComponentRef Id="ar.msg" />
+			<ComponentRef Id="ar_in.msg" />
+			<ComponentRef Id="ar_jo.msg" />
+			<ComponentRef Id="ar_lb.msg" />
+			<ComponentRef Id="ar_sy.msg" />
+			<ComponentRef Id="be.msg" />
+			<ComponentRef Id="bg.msg" />
+			<ComponentRef Id="bn.msg" />
+			<ComponentRef Id="bn_in.msg" />
+			<ComponentRef Id="ca.msg" />
+			<ComponentRef Id="cs.msg" />
+			<ComponentRef Id="da.msg" />
+			<ComponentRef Id="de.msg" />
+			<ComponentRef Id="de_at.msg" />
+			<ComponentRef Id="de_be.msg" />
+			<ComponentRef Id="el.msg" />
+			<ComponentRef Id="en_au.msg" />
+			<ComponentRef Id="en_be.msg" />
+			<ComponentRef Id="en_bw.msg" />
+			<ComponentRef Id="en_ca.msg" />
+			<ComponentRef Id="en_gb.msg" />
+			<ComponentRef Id="en_hk.msg" />
+			<ComponentRef Id="en_ie.msg" />
+			<ComponentRef Id="en_in.msg" />
+			<ComponentRef Id="en_nz.msg" />
+			<ComponentRef Id="en_ph.msg" />
+			<ComponentRef Id="en_sg.msg" />
+			<ComponentRef Id="en_za.msg" />
+			<ComponentRef Id="en_zw.msg" />
+			<ComponentRef Id="eo.msg" />
+			<ComponentRef Id="es.msg" />
+			<ComponentRef Id="es_ar.msg" />
+			<ComponentRef Id="es_bo.msg" />
+			<ComponentRef Id="es_cl.msg" />
+			<ComponentRef Id="es_co.msg" />
+			<ComponentRef Id="es_cr.msg" />
+			<ComponentRef Id="es_do.msg" />
+			<ComponentRef Id="es_ec.msg" />
+			<ComponentRef Id="es_gt.msg" />
+			<ComponentRef Id="es_hn.msg" />
+			<ComponentRef Id="es_mx.msg" />
+			<ComponentRef Id="es_ni.msg" />
+			<ComponentRef Id="es_pa.msg" />
+			<ComponentRef Id="es_pe.msg" />
+			<ComponentRef Id="es_pr.msg" />
+			<ComponentRef Id="es_py.msg" />
+			<ComponentRef Id="es_sv.msg" />
+			<ComponentRef Id="es_uy.msg" />
+			<ComponentRef Id="es_ve.msg" />
+			<ComponentRef Id="et.msg" />
+			<ComponentRef Id="eu.msg" />
+			<ComponentRef Id="eu_es.msg" />
+			<ComponentRef Id="fa.msg" />
+			<ComponentRef Id="fa_in.msg" />
+			<ComponentRef Id="fa_ir.msg" />
+			<ComponentRef Id="fi.msg" />
+			<ComponentRef Id="fo.msg" />
+			<ComponentRef Id="fo_fo.msg" />
+			<ComponentRef Id="fr.msg" />
+			<ComponentRef Id="fr_be.msg" />
+			<ComponentRef Id="fr_ca.msg" />
+			<ComponentRef Id="fr_ch.msg" />
+			<ComponentRef Id="ga.msg" />
+			<ComponentRef Id="ga_ie.msg" />
+			<ComponentRef Id="gl.msg" />
+			<ComponentRef Id="gl_es.msg" />
+			<ComponentRef Id="gv.msg" />
+			<ComponentRef Id="gv_gb.msg" />
+			<ComponentRef Id="he.msg" />
+			<ComponentRef Id="hi.msg" />
+			<ComponentRef Id="hi_in.msg" />
+			<ComponentRef Id="hr.msg" />
+			<ComponentRef Id="hu.msg" />
+			<ComponentRef Id="id.msg" />
+			<ComponentRef Id="id_id.msg" />
+			<ComponentRef Id="is.msg" />
+			<ComponentRef Id="it.msg" />
+			<ComponentRef Id="it_ch.msg" />
+			<ComponentRef Id="ja.msg" />
+			<ComponentRef Id="kl.msg" />
+			<ComponentRef Id="kl_gl.msg" />
+			<ComponentRef Id="ko.msg" />
+			<ComponentRef Id="kok.msg" />
+			<ComponentRef Id="kok_in.msg" />
+			<ComponentRef Id="ko_kr.msg" />
+			<ComponentRef Id="kw.msg" />
+			<ComponentRef Id="kw_gb.msg" />
+			<ComponentRef Id="lt.msg" />
+			<ComponentRef Id="lv.msg" />
+			<ComponentRef Id="mk.msg" />
+			<ComponentRef Id="mr.msg" />
+			<ComponentRef Id="mr_in.msg" />
+			<ComponentRef Id="ms.msg" />
+			<ComponentRef Id="ms_my.msg" />
+			<ComponentRef Id="mt.msg" />
+			<ComponentRef Id="nb.msg" />
+			<ComponentRef Id="nl.msg" />
+			<ComponentRef Id="nl_be.msg" />
+			<ComponentRef Id="nn.msg" />
+			<ComponentRef Id="pl.msg" />
+			<ComponentRef Id="pt.msg" />
+			<ComponentRef Id="pt_br.msg" />
+			<ComponentRef Id="ro.msg" />
+			<ComponentRef Id="ru.msg" />
+			<ComponentRef Id="ru_ua.msg" />
+			<ComponentRef Id="sh.msg" />
+			<ComponentRef Id="sk.msg" />
+			<ComponentRef Id="sl.msg" />
+			<ComponentRef Id="sq.msg" />
+			<ComponentRef Id="sr.msg" />
+			<ComponentRef Id="sv.msg" />
+			<ComponentRef Id="sw.msg" />
+			<ComponentRef Id="ta.msg" />
+			<ComponentRef Id="ta_in.msg" />
+			<ComponentRef Id="te.msg" />
+			<ComponentRef Id="te_in.msg" />
+			<ComponentRef Id="th.msg" />
+			<ComponentRef Id="tr.msg" />
+			<ComponentRef Id="uk.msg" />
+			<ComponentRef Id="vi.msg" />
+			<ComponentRef Id="zh.msg" />
+			<ComponentRef Id="zh_cn.msg" />
+			<ComponentRef Id="zh_hk.msg" />
+			<ComponentRef Id="zh_sg.msg" />
+			<ComponentRef Id="zh_tw.msg" />
 			<ComponentRef Id="optparse.tcl" />
 			<ComponentRef Id="pkgIndex.tcl_1" />
+			<ComponentRef Id="CET" />
+			<ComponentRef Id="CST6CDT" />
+			<ComponentRef Id="Cuba" />
+			<ComponentRef Id="EET" />
+			<ComponentRef Id="Egypt" />
+			<ComponentRef Id="Eire" />
+			<ComponentRef Id="EST" />
+			<ComponentRef Id="EST5EDT" />
+			<ComponentRef Id="GB" />
+			<ComponentRef Id="GB_Eire" />
+			<ComponentRef Id="GMT" />
+			<ComponentRef Id="GMT_0" />
+			<ComponentRef Id="GMT_0_1" />
+			<ComponentRef Id="GMT0" />
+			<ComponentRef Id="Greenwich" />
+			<ComponentRef Id="Hongkong" />
+			<ComponentRef Id="HST" />
+			<ComponentRef Id="Iceland" />
+			<ComponentRef Id="Iran" />
+			<ComponentRef Id="Israel" />
+			<ComponentRef Id="Jamaica" />
+			<ComponentRef Id="Japan" />
+			<ComponentRef Id="Kwajalein" />
+			<ComponentRef Id="Libya" />
+			<ComponentRef Id="MET" />
+			<ComponentRef Id="MST" />
+			<ComponentRef Id="MST7MDT" />
+			<ComponentRef Id="Navajo" />
+			<ComponentRef Id="NZ" />
+			<ComponentRef Id="NZ_CHAT" />
+			<ComponentRef Id="Poland" />
+			<ComponentRef Id="Portugal" />
+			<ComponentRef Id="PRC" />
+			<ComponentRef Id="PST8PDT" />
+			<ComponentRef Id="ROC" />
+			<ComponentRef Id="ROK" />
+			<ComponentRef Id="Singapore" />
+			<ComponentRef Id="Turkey" />
+			<ComponentRef Id="UCT" />
+			<ComponentRef Id="Universal" />
+			<ComponentRef Id="UTC" />
+			<ComponentRef Id="W_SU" />
+			<ComponentRef Id="WET" />
+			<ComponentRef Id="Zulu" />
+			<ComponentRef Id="Abidjan" />
+			<ComponentRef Id="Accra" />
+			<ComponentRef Id="Addis_Ababa" />
+			<ComponentRef Id="Algiers" />
+			<ComponentRef Id="Asmara" />
+			<ComponentRef Id="Asmera" />
+			<ComponentRef Id="Bamako" />
+			<ComponentRef Id="Bangui" />
+			<ComponentRef Id="Banjul" />
+			<ComponentRef Id="Bissau" />
+			<ComponentRef Id="Blantyre" />
+			<ComponentRef Id="Brazzaville" />
+			<ComponentRef Id="Bujumbura" />
+			<ComponentRef Id="Cairo" />
+			<ComponentRef Id="Casablanca" />
+			<ComponentRef Id="Ceuta" />
+			<ComponentRef Id="Conakry" />
+			<ComponentRef Id="Dakar" />
+			<ComponentRef Id="Dar_es_Salaam" />
+			<ComponentRef Id="Djibouti" />
+			<ComponentRef Id="Douala" />
+			<ComponentRef Id="El_Aaiun" />
+			<ComponentRef Id="Freetown" />
+			<ComponentRef Id="Gaborone" />
+			<ComponentRef Id="Harare" />
+			<ComponentRef Id="Johannesburg" />
+			<ComponentRef Id="Juba" />
+			<ComponentRef Id="Kampala" />
+			<ComponentRef Id="Khartoum" />
+			<ComponentRef Id="Kigali" />
+			<ComponentRef Id="Kinshasa" />
+			<ComponentRef Id="Lagos" />
+			<ComponentRef Id="Libreville" />
+			<ComponentRef Id="Lome" />
+			<ComponentRef Id="Luanda" />
+			<ComponentRef Id="Lubumbashi" />
+			<ComponentRef Id="Lusaka" />
+			<ComponentRef Id="Malabo" />
+			<ComponentRef Id="Maputo" />
+			<ComponentRef Id="Maseru" />
+			<ComponentRef Id="Mbabane" />
+			<ComponentRef Id="Mogadishu" />
+			<ComponentRef Id="Monrovia" />
+			<ComponentRef Id="Nairobi" />
+			<ComponentRef Id="Ndjamena" />
+			<ComponentRef Id="Niamey" />
+			<ComponentRef Id="Nouakchott" />
+			<ComponentRef Id="Ouagadougou" />
+			<ComponentRef Id="Porto_Novo" />
+			<ComponentRef Id="Sao_Tome" />
+			<ComponentRef Id="Timbuktu" />
+			<ComponentRef Id="Tripoli" />
+			<ComponentRef Id="Tunis" />
+			<ComponentRef Id="Windhoek" />
+			<ComponentRef Id="Adak" />
+			<ComponentRef Id="Anchorage" />
+			<ComponentRef Id="Anguilla" />
+			<ComponentRef Id="Antigua" />
+			<ComponentRef Id="Araguaina" />
+			<ComponentRef Id="Aruba" />
+			<ComponentRef Id="Asuncion" />
+			<ComponentRef Id="Atikokan" />
+			<ComponentRef Id="Atka" />
+			<ComponentRef Id="Bahia" />
+			<ComponentRef Id="Bahia_Banderas" />
+			<ComponentRef Id="Barbados" />
+			<ComponentRef Id="Belem" />
+			<ComponentRef Id="Belize" />
+			<ComponentRef Id="Blanc_Sablon" />
+			<ComponentRef Id="Boa_Vista" />
+			<ComponentRef Id="Bogota" />
+			<ComponentRef Id="Boise" />
+			<ComponentRef Id="Buenos_Aires" />
+			<ComponentRef Id="Cambridge_Bay" />
+			<ComponentRef Id="Campo_Grande" />
+			<ComponentRef Id="Cancun" />
+			<ComponentRef Id="Caracas" />
+			<ComponentRef Id="Catamarca" />
+			<ComponentRef Id="Cayenne" />
+			<ComponentRef Id="Cayman" />
+			<ComponentRef Id="Chicago" />
+			<ComponentRef Id="Chihuahua" />
+			<ComponentRef Id="Coral_Harbour" />
+			<ComponentRef Id="Cordoba" />
+			<ComponentRef Id="Costa_Rica" />
+			<ComponentRef Id="Creston" />
+			<ComponentRef Id="Cuiaba" />
+			<ComponentRef Id="Curacao" />
+			<ComponentRef Id="Danmarkshavn" />
+			<ComponentRef Id="Dawson" />
+			<ComponentRef Id="Dawson_Creek" />
+			<ComponentRef Id="Denver" />
+			<ComponentRef Id="Detroit" />
+			<ComponentRef Id="Dominica" />
+			<ComponentRef Id="Edmonton" />
+			<ComponentRef Id="Eirunepe" />
+			<ComponentRef Id="El_Salvador" />
+			<ComponentRef Id="Ensenada" />
+			<ComponentRef Id="Fortaleza" />
+			<ComponentRef Id="Fort_Nelson" />
+			<ComponentRef Id="Fort_Wayne" />
+			<ComponentRef Id="Glace_Bay" />
+			<ComponentRef Id="Godthab" />
+			<ComponentRef Id="Goose_Bay" />
+			<ComponentRef Id="Grand_Turk" />
+			<ComponentRef Id="Grenada" />
+			<ComponentRef Id="Guadeloupe" />
+			<ComponentRef Id="Guatemala" />
+			<ComponentRef Id="Guayaquil" />
+			<ComponentRef Id="Guyana" />
+			<ComponentRef Id="Halifax" />
+			<ComponentRef Id="Havana" />
+			<ComponentRef Id="Hermosillo" />
+			<ComponentRef Id="Indianapolis" />
+			<ComponentRef Id="Inuvik" />
+			<ComponentRef Id="Iqaluit" />
+			<ComponentRef Id="Jamaica_1" />
+			<ComponentRef Id="Jujuy" />
+			<ComponentRef Id="Juneau" />
+			<ComponentRef Id="Knox_IN" />
+			<ComponentRef Id="Kralendijk" />
+			<ComponentRef Id="La_Paz" />
+			<ComponentRef Id="Lima" />
+			<ComponentRef Id="Los_Angeles" />
+			<ComponentRef Id="Louisville" />
+			<ComponentRef Id="Lower_Princes" />
+			<ComponentRef Id="Maceio" />
+			<ComponentRef Id="Managua" />
+			<ComponentRef Id="Manaus" />
+			<ComponentRef Id="Marigot" />
+			<ComponentRef Id="Martinique" />
+			<ComponentRef Id="Matamoros" />
+			<ComponentRef Id="Mazatlan" />
+			<ComponentRef Id="Mendoza" />
+			<ComponentRef Id="Menominee" />
+			<ComponentRef Id="Merida" />
+			<ComponentRef Id="Metlakatla" />
+			<ComponentRef Id="Mexico_City" />
+			<ComponentRef Id="Miquelon" />
+			<ComponentRef Id="Moncton" />
+			<ComponentRef Id="Monterrey" />
+			<ComponentRef Id="Montevideo" />
+			<ComponentRef Id="Montreal" />
+			<ComponentRef Id="Montserrat" />
+			<ComponentRef Id="Nassau" />
+			<ComponentRef Id="New_York" />
+			<ComponentRef Id="Nipigon" />
+			<ComponentRef Id="Nome" />
+			<ComponentRef Id="Noronha" />
+			<ComponentRef Id="Ojinaga" />
+			<ComponentRef Id="Panama" />
+			<ComponentRef Id="Pangnirtung" />
+			<ComponentRef Id="Paramaribo" />
+			<ComponentRef Id="Phoenix" />
+			<ComponentRef Id="Port_au_Prince" />
+			<ComponentRef Id="Porto_Acre" />
+			<ComponentRef Id="Porto_Velho" />
+			<ComponentRef Id="Port_of_Spain" />
+			<ComponentRef Id="Puerto_Rico" />
+			<ComponentRef Id="Punta_Arenas" />
+			<ComponentRef Id="Rainy_River" />
+			<ComponentRef Id="Rankin_Inlet" />
+			<ComponentRef Id="Recife" />
+			<ComponentRef Id="Regina" />
+			<ComponentRef Id="Resolute" />
+			<ComponentRef Id="Rio_Branco" />
+			<ComponentRef Id="Rosario" />
+			<ComponentRef Id="Santarem" />
+			<ComponentRef Id="Santa_Isabel" />
+			<ComponentRef Id="Santiago" />
+			<ComponentRef Id="Santo_Domingo" />
+			<ComponentRef Id="Sao_Paulo" />
+			<ComponentRef Id="Scoresbysund" />
+			<ComponentRef Id="Shiprock" />
+			<ComponentRef Id="Sitka" />
+			<ComponentRef Id="St_Barthelemy" />
+			<ComponentRef Id="St_Johns" />
+			<ComponentRef Id="St_Kitts" />
+			<ComponentRef Id="St_Lucia" />
+			<ComponentRef Id="St_Thomas" />
+			<ComponentRef Id="St_Vincent" />
+			<ComponentRef Id="Swift_Current" />
+			<ComponentRef Id="Tegucigalpa" />
+			<ComponentRef Id="Thule" />
+			<ComponentRef Id="Thunder_Bay" />
+			<ComponentRef Id="Tijuana" />
+			<ComponentRef Id="Toronto" />
+			<ComponentRef Id="Tortola" />
+			<ComponentRef Id="Vancouver" />
+			<ComponentRef Id="Virgin" />
+			<ComponentRef Id="Whitehorse" />
+			<ComponentRef Id="Winnipeg" />
+			<ComponentRef Id="Yakutat" />
+			<ComponentRef Id="Yellowknife" />
+			<ComponentRef Id="Buenos_Aires_1" />
+			<ComponentRef Id="Catamarca_1" />
+			<ComponentRef Id="ComodRivadavia" />
+			<ComponentRef Id="Cordoba_1" />
+			<ComponentRef Id="Jujuy_1" />
+			<ComponentRef Id="La_Rioja" />
+			<ComponentRef Id="Mendoza_1" />
+			<ComponentRef Id="Rio_Gallegos" />
+			<ComponentRef Id="Salta" />
+			<ComponentRef Id="San_Juan" />
+			<ComponentRef Id="San_Luis" />
+			<ComponentRef Id="Tucuman" />
+			<ComponentRef Id="Ushuaia" />
+			<ComponentRef Id="Indianapolis_1" />
+			<ComponentRef Id="Knox" />
+			<ComponentRef Id="Marengo" />
+			<ComponentRef Id="Petersburg" />
+			<ComponentRef Id="Tell_City" />
+			<ComponentRef Id="Vevay" />
+			<ComponentRef Id="Vincennes" />
+			<ComponentRef Id="Winamac" />
+			<ComponentRef Id="Louisville_1" />
+			<ComponentRef Id="Monticello" />
+			<ComponentRef Id="Beulah" />
+			<ComponentRef Id="Center" />
+			<ComponentRef Id="New_Salem" />
+			<ComponentRef Id="Casey" />
+			<ComponentRef Id="Davis" />
+			<ComponentRef Id="DumontDUrville" />
+			<ComponentRef Id="Macquarie" />
+			<ComponentRef Id="Mawson" />
+			<ComponentRef Id="McMurdo" />
+			<ComponentRef Id="Palmer" />
+			<ComponentRef Id="Rothera" />
+			<ComponentRef Id="South_Pole" />
+			<ComponentRef Id="Syowa" />
+			<ComponentRef Id="Troll" />
+			<ComponentRef Id="Vostok" />
+			<ComponentRef Id="Longyearbyen" />
+			<ComponentRef Id="Aden" />
+			<ComponentRef Id="Almaty" />
+			<ComponentRef Id="Amman" />
+			<ComponentRef Id="Anadyr" />
+			<ComponentRef Id="Aqtau" />
+			<ComponentRef Id="Aqtobe" />
+			<ComponentRef Id="Ashgabat" />
+			<ComponentRef Id="Ashkhabad" />
+			<ComponentRef Id="Atyrau" />
+			<ComponentRef Id="Baghdad" />
+			<ComponentRef Id="Bahrain" />
+			<ComponentRef Id="Baku" />
+			<ComponentRef Id="Bangkok" />
+			<ComponentRef Id="Barnaul" />
+			<ComponentRef Id="Beirut" />
+			<ComponentRef Id="Bishkek" />
+			<ComponentRef Id="Brunei" />
+			<ComponentRef Id="Calcutta" />
+			<ComponentRef Id="Chita" />
+			<ComponentRef Id="Choibalsan" />
+			<ComponentRef Id="Chongqing" />
+			<ComponentRef Id="Chungking" />
+			<ComponentRef Id="Colombo" />
+			<ComponentRef Id="Dacca" />
+			<ComponentRef Id="Damascus" />
+			<ComponentRef Id="Dhaka" />
+			<ComponentRef Id="Dili" />
+			<ComponentRef Id="Dubai" />
+			<ComponentRef Id="Dushanbe" />
+			<ComponentRef Id="Famagusta" />
+			<ComponentRef Id="Gaza" />
+			<ComponentRef Id="Harbin" />
+			<ComponentRef Id="Hebron" />
+			<ComponentRef Id="Hong_Kong" />
+			<ComponentRef Id="Hovd" />
+			<ComponentRef Id="Ho_Chi_Minh" />
+			<ComponentRef Id="Irkutsk" />
+			<ComponentRef Id="Istanbul" />
+			<ComponentRef Id="Jakarta" />
+			<ComponentRef Id="Jayapura" />
+			<ComponentRef Id="Jerusalem" />
+			<ComponentRef Id="Kabul" />
+			<ComponentRef Id="Kamchatka" />
+			<ComponentRef Id="Karachi" />
+			<ComponentRef Id="Kashgar" />
+			<ComponentRef Id="Kathmandu" />
+			<ComponentRef Id="Katmandu" />
+			<ComponentRef Id="Khandyga" />
+			<ComponentRef Id="Kolkata" />
+			<ComponentRef Id="Krasnoyarsk" />
+			<ComponentRef Id="Kuala_Lumpur" />
+			<ComponentRef Id="Kuching" />
+			<ComponentRef Id="Kuwait" />
+			<ComponentRef Id="Macao" />
+			<ComponentRef Id="Macau" />
+			<ComponentRef Id="Magadan" />
+			<ComponentRef Id="Makassar" />
+			<ComponentRef Id="Manila" />
+			<ComponentRef Id="Muscat" />
+			<ComponentRef Id="Nicosia" />
+			<ComponentRef Id="Novokuznetsk" />
+			<ComponentRef Id="Novosibirsk" />
+			<ComponentRef Id="Omsk" />
+			<ComponentRef Id="Oral" />
+			<ComponentRef Id="Phnom_Penh" />
+			<ComponentRef Id="Pontianak" />
+			<ComponentRef Id="Pyongyang" />
+			<ComponentRef Id="Qatar" />
+			<ComponentRef Id="Qyzylorda" />
+			<ComponentRef Id="Rangoon" />
+			<ComponentRef Id="Riyadh" />
+			<ComponentRef Id="Saigon" />
+			<ComponentRef Id="Sakhalin" />
+			<ComponentRef Id="Samarkand" />
+			<ComponentRef Id="Seoul" />
+			<ComponentRef Id="Shanghai" />
+			<ComponentRef Id="Singapore_1" />
+			<ComponentRef Id="Srednekolymsk" />
+			<ComponentRef Id="Taipei" />
+			<ComponentRef Id="Tashkent" />
+			<ComponentRef Id="Tbilisi" />
+			<ComponentRef Id="Tehran" />
+			<ComponentRef Id="Tel_Aviv" />
+			<ComponentRef Id="Thimbu" />
+			<ComponentRef Id="Thimphu" />
+			<ComponentRef Id="Tokyo" />
+			<ComponentRef Id="Tomsk" />
+			<ComponentRef Id="Ujung_Pandang" />
+			<ComponentRef Id="Ulaanbaatar" />
+			<ComponentRef Id="Ulan_Bator" />
+			<ComponentRef Id="Urumqi" />
+			<ComponentRef Id="Ust_Nera" />
+			<ComponentRef Id="Vientiane" />
+			<ComponentRef Id="Vladivostok" />
+			<ComponentRef Id="Yakutsk" />
+			<ComponentRef Id="Yangon" />
+			<ComponentRef Id="Yekaterinburg" />
+			<ComponentRef Id="Yerevan" />
+			<ComponentRef Id="Azores" />
+			<ComponentRef Id="Bermuda" />
+			<ComponentRef Id="Canary" />
+			<ComponentRef Id="Cape_Verde" />
+			<ComponentRef Id="Faeroe" />
+			<ComponentRef Id="Faroe" />
+			<ComponentRef Id="Jan_Mayen" />
+			<ComponentRef Id="Madeira" />
+			<ComponentRef Id="Reykjavik" />
+			<ComponentRef Id="South_Georgia" />
+			<ComponentRef Id="Stanley" />
+			<ComponentRef Id="St_Helena" />
+			<ComponentRef Id="ACT" />
+			<ComponentRef Id="Adelaide" />
+			<ComponentRef Id="Brisbane" />
+			<ComponentRef Id="Broken_Hill" />
+			<ComponentRef Id="Canberra" />
+			<ComponentRef Id="Currie" />
+			<ComponentRef Id="Darwin" />
+			<ComponentRef Id="Eucla" />
+			<ComponentRef Id="Hobart" />
+			<ComponentRef Id="LHI" />
+			<ComponentRef Id="Lindeman" />
+			<ComponentRef Id="Lord_Howe" />
+			<ComponentRef Id="Melbourne" />
+			<ComponentRef Id="North" />
+			<ComponentRef Id="NSW" />
+			<ComponentRef Id="Perth" />
+			<ComponentRef Id="Queensland" />
+			<ComponentRef Id="South" />
+			<ComponentRef Id="Sydney" />
+			<ComponentRef Id="Tasmania" />
+			<ComponentRef Id="Victoria" />
+			<ComponentRef Id="West" />
+			<ComponentRef Id="Yancowinna" />
+			<ComponentRef Id="Acre" />
+			<ComponentRef Id="DeNoronha" />
+			<ComponentRef Id="East" />
+			<ComponentRef Id="West_1" />
+			<ComponentRef Id="Atlantic" />
+			<ComponentRef Id="Central" />
+			<ComponentRef Id="East_Saskatchewan" />
+			<ComponentRef Id="Eastern" />
+			<ComponentRef Id="Mountain" />
+			<ComponentRef Id="Newfoundland" />
+			<ComponentRef Id="Pacific" />
+			<ComponentRef Id="Saskatchewan" />
+			<ComponentRef Id="Yukon" />
+			<ComponentRef Id="Continental" />
+			<ComponentRef Id="EasterIsland" />
+			<ComponentRef Id="GMT_1" />
+			<ComponentRef Id="GMT_0_2" />
+			<ComponentRef Id="GMT_1_1" />
+			<ComponentRef Id="GMT_10" />
+			<ComponentRef Id="GMT_11" />
+			<ComponentRef Id="GMT_12" />
+			<ComponentRef Id="GMT_2" />
+			<ComponentRef Id="GMT_3" />
+			<ComponentRef Id="GMT_4" />
+			<ComponentRef Id="GMT_5" />
+			<ComponentRef Id="GMT_6" />
+			<ComponentRef Id="GMT_7" />
+			<ComponentRef Id="GMT_8" />
+			<ComponentRef Id="GMT_9" />
+			<ComponentRef Id="GMT_0_3" />
+			<ComponentRef Id="GMT_1_2" />
+			<ComponentRef Id="GMT_10_1" />
+			<ComponentRef Id="GMT_11_1" />
+			<ComponentRef Id="GMT_12_1" />
+			<ComponentRef Id="GMT_13" />
+			<ComponentRef Id="GMT_14" />
+			<ComponentRef Id="GMT_2_1" />
+			<ComponentRef Id="GMT_3_1" />
+			<ComponentRef Id="GMT_4_1" />
+			<ComponentRef Id="GMT_5_1" />
+			<ComponentRef Id="GMT_6_1" />
+			<ComponentRef Id="GMT_7_1" />
+			<ComponentRef Id="GMT_8_1" />
+			<ComponentRef Id="GMT_9_1" />
+			<ComponentRef Id="GMT0_1" />
+			<ComponentRef Id="Greenwich_1" />
+			<ComponentRef Id="UCT_1" />
+			<ComponentRef Id="Universal_1" />
+			<ComponentRef Id="UTC_1" />
+			<ComponentRef Id="Zulu_1" />
+			<ComponentRef Id="Amsterdam" />
+			<ComponentRef Id="Andorra" />
+			<ComponentRef Id="Astrakhan" />
+			<ComponentRef Id="Athens" />
+			<ComponentRef Id="Belfast" />
+			<ComponentRef Id="Belgrade" />
+			<ComponentRef Id="Berlin" />
+			<ComponentRef Id="Bratislava" />
+			<ComponentRef Id="Brussels" />
+			<ComponentRef Id="Bucharest" />
+			<ComponentRef Id="Budapest" />
+			<ComponentRef Id="Busingen" />
+			<ComponentRef Id="Chisinau" />
+			<ComponentRef Id="Copenhagen" />
+			<ComponentRef Id="Dublin" />
+			<ComponentRef Id="Gibraltar" />
+			<ComponentRef Id="Guernsey" />
+			<ComponentRef Id="Helsinki" />
+			<ComponentRef Id="Isle_of_Man" />
+			<ComponentRef Id="Istanbul_1" />
+			<ComponentRef Id="Jersey" />
+			<ComponentRef Id="Kaliningrad" />
+			<ComponentRef Id="Kiev" />
+			<ComponentRef Id="Kirov" />
+			<ComponentRef Id="Lisbon" />
+			<ComponentRef Id="Ljubljana" />
+			<ComponentRef Id="London" />
+			<ComponentRef Id="Luxembourg" />
+			<ComponentRef Id="Madrid" />
+			<ComponentRef Id="Malta" />
+			<ComponentRef Id="Mariehamn" />
+			<ComponentRef Id="Minsk" />
+			<ComponentRef Id="Monaco" />
+			<ComponentRef Id="Moscow" />
+			<ComponentRef Id="Nicosia_1" />
+			<ComponentRef Id="Oslo" />
+			<ComponentRef Id="Paris" />
+			<ComponentRef Id="Podgorica" />
+			<ComponentRef Id="Prague" />
+			<ComponentRef Id="Riga" />
+			<ComponentRef Id="Rome" />
+			<ComponentRef Id="Samara" />
+			<ComponentRef Id="San_Marino" />
+			<ComponentRef Id="Sarajevo" />
+			<ComponentRef Id="Saratov" />
+			<ComponentRef Id="Simferopol" />
+			<ComponentRef Id="Skopje" />
+			<ComponentRef Id="Sofia" />
+			<ComponentRef Id="Stockholm" />
+			<ComponentRef Id="Tallinn" />
+			<ComponentRef Id="Tirane" />
+			<ComponentRef Id="Tiraspol" />
+			<ComponentRef Id="Ulyanovsk" />
+			<ComponentRef Id="Uzhgorod" />
+			<ComponentRef Id="Vaduz" />
+			<ComponentRef Id="Vatican" />
+			<ComponentRef Id="Vienna" />
+			<ComponentRef Id="Vilnius" />
+			<ComponentRef Id="Volgograd" />
+			<ComponentRef Id="Warsaw" />
+			<ComponentRef Id="Zagreb" />
+			<ComponentRef Id="Zaporozhye" />
+			<ComponentRef Id="Zurich" />
+			<ComponentRef Id="Antananarivo" />
+			<ComponentRef Id="Chagos" />
+			<ComponentRef Id="Christmas" />
+			<ComponentRef Id="Cocos" />
+			<ComponentRef Id="Comoro" />
+			<ComponentRef Id="Kerguelen" />
+			<ComponentRef Id="Mahe" />
+			<ComponentRef Id="Maldives" />
+			<ComponentRef Id="Mauritius" />
+			<ComponentRef Id="Mayotte" />
+			<ComponentRef Id="Reunion" />
+			<ComponentRef Id="BajaNorte" />
+			<ComponentRef Id="BajaSur" />
+			<ComponentRef Id="General" />
+			<ComponentRef Id="Apia" />
+			<ComponentRef Id="Auckland" />
+			<ComponentRef Id="Bougainville" />
+			<ComponentRef Id="Chatham" />
+			<ComponentRef Id="Chuuk" />
+			<ComponentRef Id="Easter" />
+			<ComponentRef Id="Efate" />
+			<ComponentRef Id="Enderbury" />
+			<ComponentRef Id="Fakaofo" />
+			<ComponentRef Id="Fiji" />
+			<ComponentRef Id="Funafuti" />
+			<ComponentRef Id="Galapagos" />
+			<ComponentRef Id="Gambier" />
+			<ComponentRef Id="Guadalcanal" />
+			<ComponentRef Id="Guam" />
+			<ComponentRef Id="Honolulu" />
+			<ComponentRef Id="Johnston" />
+			<ComponentRef Id="Kiritimati" />
+			<ComponentRef Id="Kosrae" />
+			<ComponentRef Id="Kwajalein_1" />
+			<ComponentRef Id="Majuro" />
+			<ComponentRef Id="Marquesas" />
+			<ComponentRef Id="Midway" />
+			<ComponentRef Id="Nauru" />
+			<ComponentRef Id="Niue" />
+			<ComponentRef Id="Norfolk" />
+			<ComponentRef Id="Noumea" />
+			<ComponentRef Id="Pago_Pago" />
+			<ComponentRef Id="Palau" />
+			<ComponentRef Id="Pitcairn" />
+			<ComponentRef Id="Pohnpei" />
+			<ComponentRef Id="Ponape" />
+			<ComponentRef Id="Port_Moresby" />
+			<ComponentRef Id="Rarotonga" />
+			<ComponentRef Id="Saipan" />
+			<ComponentRef Id="Samoa" />
+			<ComponentRef Id="Tahiti" />
+			<ComponentRef Id="Tarawa" />
+			<ComponentRef Id="Tongatapu" />
+			<ComponentRef Id="Truk" />
+			<ComponentRef Id="Wake" />
+			<ComponentRef Id="Wallis" />
+			<ComponentRef Id="Yap" />
+			<ComponentRef Id="AST4" />
+			<ComponentRef Id="AST4ADT" />
+			<ComponentRef Id="CST6" />
+			<ComponentRef Id="CST6CDT_1" />
+			<ComponentRef Id="EST5" />
+			<ComponentRef Id="EST5EDT_1" />
+			<ComponentRef Id="HST10" />
+			<ComponentRef Id="MST7" />
+			<ComponentRef Id="MST7MDT_1" />
+			<ComponentRef Id="PST8" />
+			<ComponentRef Id="PST8PDT_1" />
+			<ComponentRef Id="YST9" />
+			<ComponentRef Id="YST9YDT" />
+			<ComponentRef Id="Alaska" />
+			<ComponentRef Id="Aleutian" />
+			<ComponentRef Id="Arizona" />
+			<ComponentRef Id="Central_1" />
+			<ComponentRef Id="East_Indiana" />
+			<ComponentRef Id="Eastern_1" />
+			<ComponentRef Id="Hawaii" />
+			<ComponentRef Id="Indiana_Starke" />
+			<ComponentRef Id="Michigan" />
+			<ComponentRef Id="Mountain_1" />
+			<ComponentRef Id="Pacific_1" />
+			<ComponentRef Id="Pacific_New" />
+			<ComponentRef Id="Samoa_1" />
 			<ComponentRef Id="bgerror.tcl" />
-			<ComponentRef Id="button.tcl_1" />
+			<ComponentRef Id="button.tcl" />
 			<ComponentRef Id="choosedir.tcl" />
 			<ComponentRef Id="clrpick.tcl" />
 			<ComponentRef Id="comdlg.tcl" />
 			<ComponentRef Id="console.tcl" />
 			<ComponentRef Id="dialog.tcl" />
-			<ComponentRef Id="entry.tcl_1" />
+			<ComponentRef Id="entry.tcl" />
 			<ComponentRef Id="focus.tcl" />
+			<ComponentRef Id="fontchooser.tcl" />
+			<ComponentRef Id="iconlist.tcl" />
+			<ComponentRef Id="icons.tcl" />
 			<ComponentRef Id="license.terms" />
 			<ComponentRef Id="listbox.tcl" />
+			<ComponentRef Id="megawidget.tcl" />
 			<ComponentRef Id="menu.tcl" />
 			<ComponentRef Id="mkpsenc.tcl" />
 			<ComponentRef Id="msgbox.tcl" />
 			<ComponentRef Id="obsolete.tcl" />
 			<ComponentRef Id="optMenu.tcl" />
 			<ComponentRef Id="palette.tcl" />
-			<ComponentRef Id="panedwindow.tcl_1" />
+			<ComponentRef Id="panedwindow.tcl" />
 			<ComponentRef Id="pkgIndex.tcl_2" />
 			<ComponentRef Id="safetk.tcl" />
-			<ComponentRef Id="scale.tcl_1" />
+			<ComponentRef Id="scale.tcl" />
 			<ComponentRef Id="scrlbar.tcl" />
-			<ComponentRef Id="spinbox.tcl_1" />
-			<ComponentRef Id="tclIndex_2" />
+			<ComponentRef Id="spinbox.tcl" />
+			<ComponentRef Id="tclIndex_1" />
 			<ComponentRef Id="tearoff.tcl" />
 			<ComponentRef Id="text.tcl" />
 			<ComponentRef Id="tk.tcl" />
 			<ComponentRef Id="tkfbox.tcl" />
 			<ComponentRef Id="unsupported.tcl" />
 			<ComponentRef Id="xmfbox.tcl" />
+			<ComponentRef Id="anilabel.tcl" />
+			<ComponentRef Id="aniwave.tcl" />
+			<ComponentRef Id="arrow.tcl" />
+			<ComponentRef Id="bind.tcl" />
+			<ComponentRef Id="bitmap.tcl" />
+			<ComponentRef Id="browse" />
+			<ComponentRef Id="button.tcl_1" />
+			<ComponentRef Id="check.tcl" />
+			<ComponentRef Id="clrpick.tcl_1" />
+			<ComponentRef Id="colors.tcl" />
+			<ComponentRef Id="combo.tcl" />
+			<ComponentRef Id="cscroll.tcl" />
+			<ComponentRef Id="ctext.tcl" />
+			<ComponentRef Id="dialog1.tcl" />
+			<ComponentRef Id="dialog2.tcl" />
+			<ComponentRef Id="en.msg" />
+			<ComponentRef Id="entry1.tcl" />
+			<ComponentRef Id="entry2.tcl" />
+			<ComponentRef Id="entry3.tcl" />
+			<ComponentRef Id="filebox.tcl" />
+			<ComponentRef Id="floor.tcl" />
+			<ComponentRef Id="fontchoose.tcl" />
+			<ComponentRef Id="form.tcl" />
+			<ComponentRef Id="goldberg.tcl" />
+			<ComponentRef Id="hello" />
+			<ComponentRef Id="hscale.tcl" />
+			<ComponentRef Id="icon.tcl" />
+			<ComponentRef Id="image1.tcl" />
+			<ComponentRef Id="image2.tcl" />
+			<ComponentRef Id="items.tcl" />
+			<ComponentRef Id="ixset" />
+			<ComponentRef Id="knightstour.tcl" />
+			<ComponentRef Id="label.tcl" />
+			<ComponentRef Id="labelframe.tcl" />
+			<ComponentRef Id="license.terms_1" />
+			<ComponentRef Id="mclist.tcl" />
+			<ComponentRef Id="menu.tcl_1" />
+			<ComponentRef Id="menubu.tcl" />
+			<ComponentRef Id="msgbox.tcl_1" />
+			<ComponentRef Id="nl.msg_1" />
+			<ComponentRef Id="paned1.tcl" />
+			<ComponentRef Id="paned2.tcl" />
+			<ComponentRef Id="pendulum.tcl" />
+			<ComponentRef Id="plot.tcl" />
+			<ComponentRef Id="puzzle.tcl" />
+			<ComponentRef Id="radio.tcl" />
+			<ComponentRef Id="README" />
+			<ComponentRef Id="rmt" />
+			<ComponentRef Id="rolodex" />
+			<ComponentRef Id="ruler.tcl" />
+			<ComponentRef Id="sayings.tcl" />
+			<ComponentRef Id="search.tcl" />
+			<ComponentRef Id="spin.tcl" />
+			<ComponentRef Id="square" />
+			<ComponentRef Id="states.tcl" />
+			<ComponentRef Id="style.tcl" />
+			<ComponentRef Id="tclIndex_2" />
+			<ComponentRef Id="tcolor" />
+			<ComponentRef Id="text.tcl_1" />
+			<ComponentRef Id="textpeer.tcl" />
+			<ComponentRef Id="timer" />
+			<ComponentRef Id="toolbar.tcl" />
+			<ComponentRef Id="tree.tcl" />
+			<ComponentRef Id="ttkbut.tcl" />
+			<ComponentRef Id="ttkmenu.tcl" />
+			<ComponentRef Id="ttknote.tcl" />
+			<ComponentRef Id="ttkpane.tcl" />
+			<ComponentRef Id="ttkprogress.tcl" />
+			<ComponentRef Id="ttkscale.tcl" />
+			<ComponentRef Id="twind.tcl" />
+			<ComponentRef Id="unicodeout.tcl" />
+			<ComponentRef Id="vscale.tcl" />
+			<ComponentRef Id="widget" />
+			<ComponentRef Id="earth.gif" />
+			<ComponentRef Id="earthmenu.png" />
+			<ComponentRef Id="earthris.gif" />
+			<ComponentRef Id="flagdown.xbm" />
+			<ComponentRef Id="flagup.xbm" />
+			<ComponentRef Id="gray25.xbm" />
+			<ComponentRef Id="letters.xbm" />
+			<ComponentRef Id="noletter.xbm" />
+			<ComponentRef Id="ouster.png" />
+			<ComponentRef Id="pattern.xbm" />
+			<ComponentRef Id="tcllogo.gif" />
+			<ComponentRef Id="teapot.ppm" />
+			<ComponentRef Id="logo.eps" />
+			<ComponentRef Id="logo100.gif" />
+			<ComponentRef Id="logo64.gif" />
+			<ComponentRef Id="logoLarge.gif" />
+			<ComponentRef Id="logoMed.gif" />
+			<ComponentRef Id="pwrdLogo.eps" />
+			<ComponentRef Id="pwrdLogo100.gif" />
+			<ComponentRef Id="pwrdLogo150.gif" />
+			<ComponentRef Id="pwrdLogo175.gif" />
+			<ComponentRef Id="pwrdLogo200.gif" />
+			<ComponentRef Id="pwrdLogo75.gif" />
+			<ComponentRef Id="README_1" />
+			<ComponentRef Id="tai_ku.gif" />
+			<ComponentRef Id="cs.msg_1" />
+			<ComponentRef Id="da.msg_1" />
+			<ComponentRef Id="de.msg_1" />
+			<ComponentRef Id="el.msg_1" />
+			<ComponentRef Id="en.msg_1" />
+			<ComponentRef Id="en_gb.msg_1" />
+			<ComponentRef Id="eo.msg_1" />
+			<ComponentRef Id="es.msg_1" />
+			<ComponentRef Id="fr.msg_1" />
+			<ComponentRef Id="hu.msg_1" />
+			<ComponentRef Id="it.msg_1" />
+			<ComponentRef Id="nl.msg_2" />
+			<ComponentRef Id="pl.msg_1" />
+			<ComponentRef Id="pt.msg_1" />
+			<ComponentRef Id="ru.msg_1" />
+			<ComponentRef Id="sv.msg_1" />
 			<ComponentRef Id="altTheme.tcl" />
 			<ComponentRef Id="aquaTheme.tcl" />
 			<ComponentRef Id="button.tcl_2" />
@@ -3465,17 +4398,28 @@
 			<ComponentRef Id="combobox.tcl" />
 			<ComponentRef Id="cursors.tcl" />
 			<ComponentRef Id="defaults.tcl" />
+			<ComponentRef Id="entry.tcl_1" />
 			<ComponentRef Id="fonts.tcl" />
 			<ComponentRef Id="menubutton.tcl" />
 			<ComponentRef Id="notebook.tcl" />
+			<ComponentRef Id="panedwindow.tcl_1" />
 			<ComponentRef Id="progress.tcl" />
+			<ComponentRef Id="scale.tcl_1" />
 			<ComponentRef Id="scrollbar.tcl" />
 			<ComponentRef Id="sizegrip.tcl" />
+			<ComponentRef Id="spinbox.tcl_1" />
+			<ComponentRef Id="treeview.tcl" />
 			<ComponentRef Id="ttk.tcl" />
 			<ComponentRef Id="utils.tcl" />
 			<ComponentRef Id="vistaTheme.tcl" />
 			<ComponentRef Id="winTheme.tcl" />
 			<ComponentRef Id="xpTheme.tcl" />
+			<ComponentRef Id="coriolis.py" />
+			<ComponentRef Id="eddb.py" />
+			<ComponentRef Id="eddn.py" />
+			<ComponentRef Id="edsm.py" />
+			<ComponentRef Id="edsy.py" />
+			<ComponentRef Id="inara.py" />
 		</Feature>
 
 	</Product>