diff --git a/EDMarketConnector.wxs b/EDMarketConnector.wxs
index 4e6b0f2c..e94176a5 100644
--- a/EDMarketConnector.wxs
+++ b/EDMarketConnector.wxs
@@ -2304,265 +2304,6 @@
 			                        <Component Id="xmfbox.tcl" Guid="*">
 			                            <File Id="xmfbox.tcl" KeyPath="yes" Source="SourceDir\lib\tk\xmfbox.tcl" />
 			                        </Component>
-			                        <Directory Id="demos" Name="demos">
-			                            <Component Id="anilabel.tcl" Guid="*">
-			                                <File Id="anilabel.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\anilabel.tcl" />
-			                            </Component>
-			                            <Component Id="aniwave.tcl" Guid="*">
-			                                <File Id="aniwave.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\aniwave.tcl" />
-			                            </Component>
-			                            <Component Id="arrow.tcl" Guid="*">
-			                                <File Id="arrow.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\arrow.tcl" />
-			                            </Component>
-			                            <Component Id="bind.tcl" Guid="*">
-			                                <File Id="bind.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\bind.tcl" />
-			                            </Component>
-			                            <Component Id="bitmap.tcl" Guid="*">
-			                                <File Id="bitmap.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\bitmap.tcl" />
-			                            </Component>
-			                            <Component Id="browse" Guid="*">
-			                                <File Id="browse" KeyPath="yes" Source="SourceDir\lib\tk\demos\browse" />
-			                            </Component>
-			                            <Component Id="button.tcl_1" Guid="*">
-			                                <File Id="button.tcl_1" KeyPath="yes" Source="SourceDir\lib\tk\demos\button.tcl" />
-			                            </Component>
-			                            <Component Id="check.tcl" Guid="*">
-			                                <File Id="check.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\check.tcl" />
-			                            </Component>
-			                            <Component Id="clrpick.tcl_1" Guid="*">
-			                                <File Id="clrpick.tcl_1" KeyPath="yes" Source="SourceDir\lib\tk\demos\clrpick.tcl" />
-			                            </Component>
-			                            <Component Id="colors.tcl" Guid="*">
-			                                <File Id="colors.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\colors.tcl" />
-			                            </Component>
-			                            <Component Id="combo.tcl" Guid="*">
-			                                <File Id="combo.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\combo.tcl" />
-			                            </Component>
-			                            <Component Id="cscroll.tcl" Guid="*">
-			                                <File Id="cscroll.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\cscroll.tcl" />
-			                            </Component>
-			                            <Component Id="ctext.tcl" Guid="*">
-			                                <File Id="ctext.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\ctext.tcl" />
-			                            </Component>
-			                            <Component Id="dialog1.tcl" Guid="*">
-			                                <File Id="dialog1.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\dialog1.tcl" />
-			                            </Component>
-			                            <Component Id="dialog2.tcl" Guid="*">
-			                                <File Id="dialog2.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\dialog2.tcl" />
-			                            </Component>
-			                            <Component Id="en.msg" Guid="*">
-			                                <File Id="en.msg" KeyPath="yes" Source="SourceDir\lib\tk\demos\en.msg" />
-			                            </Component>
-			                            <Component Id="entry1.tcl" Guid="*">
-			                                <File Id="entry1.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\entry1.tcl" />
-			                            </Component>
-			                            <Component Id="entry2.tcl" Guid="*">
-			                                <File Id="entry2.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\entry2.tcl" />
-			                            </Component>
-			                            <Component Id="entry3.tcl" Guid="*">
-			                                <File Id="entry3.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\entry3.tcl" />
-			                            </Component>
-			                            <Component Id="filebox.tcl" Guid="*">
-			                                <File Id="filebox.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\filebox.tcl" />
-			                            </Component>
-			                            <Component Id="floor.tcl" Guid="*">
-			                                <File Id="floor.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\floor.tcl" />
-			                            </Component>
-			                            <Component Id="fontchoose.tcl" Guid="*">
-			                                <File Id="fontchoose.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\fontchoose.tcl" />
-			                            </Component>
-			                            <Component Id="form.tcl" Guid="*">
-			                                <File Id="form.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\form.tcl" />
-			                            </Component>
-			                            <Component Id="goldberg.tcl" Guid="*">
-			                                <File Id="goldberg.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\goldberg.tcl" />
-			                            </Component>
-			                            <Component Id="hello" Guid="*">
-			                                <File Id="hello" KeyPath="yes" Source="SourceDir\lib\tk\demos\hello" />
-			                            </Component>
-			                            <Component Id="hscale.tcl" Guid="*">
-			                                <File Id="hscale.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\hscale.tcl" />
-			                            </Component>
-			                            <Component Id="icon.tcl" Guid="*">
-			                                <File Id="icon.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\icon.tcl" />
-			                            </Component>
-			                            <Component Id="image1.tcl" Guid="*">
-			                                <File Id="image1.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\image1.tcl" />
-			                            </Component>
-			                            <Component Id="image2.tcl" Guid="*">
-			                                <File Id="image2.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\image2.tcl" />
-			                            </Component>
-			                            <Component Id="items.tcl" Guid="*">
-			                                <File Id="items.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\items.tcl" />
-			                            </Component>
-			                            <Component Id="ixset" Guid="*">
-			                                <File Id="ixset" KeyPath="yes" Source="SourceDir\lib\tk\demos\ixset" />
-			                            </Component>
-			                            <Component Id="knightstour.tcl" Guid="*">
-			                                <File Id="knightstour.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\knightstour.tcl" />
-			                            </Component>
-			                            <Component Id="label.tcl" Guid="*">
-			                                <File Id="label.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\label.tcl" />
-			                            </Component>
-			                            <Component Id="labelframe.tcl" Guid="*">
-			                                <File Id="labelframe.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\labelframe.tcl" />
-			                            </Component>
-			                            <Component Id="license.terms_1" Guid="*">
-			                                <File Id="license.terms_1" KeyPath="yes" Source="SourceDir\lib\tk\demos\license.terms" />
-			                            </Component>
-			                            <Component Id="mclist.tcl" Guid="*">
-			                                <File Id="mclist.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\mclist.tcl" />
-			                            </Component>
-			                            <Component Id="menu.tcl_1" Guid="*">
-			                                <File Id="menu.tcl_1" KeyPath="yes" Source="SourceDir\lib\tk\demos\menu.tcl" />
-			                            </Component>
-			                            <Component Id="menubu.tcl" Guid="*">
-			                                <File Id="menubu.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\menubu.tcl" />
-			                            </Component>
-			                            <Component Id="msgbox.tcl_1" Guid="*">
-			                                <File Id="msgbox.tcl_1" KeyPath="yes" Source="SourceDir\lib\tk\demos\msgbox.tcl" />
-			                            </Component>
-			                            <Component Id="nl.msg_1" Guid="*">
-			                                <File Id="nl.msg_1" KeyPath="yes" Source="SourceDir\lib\tk\demos\nl.msg" />
-			                            </Component>
-			                            <Component Id="paned1.tcl" Guid="*">
-			                                <File Id="paned1.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\paned1.tcl" />
-			                            </Component>
-			                            <Component Id="paned2.tcl" Guid="*">
-			                                <File Id="paned2.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\paned2.tcl" />
-			                            </Component>
-			                            <Component Id="pendulum.tcl" Guid="*">
-			                                <File Id="pendulum.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\pendulum.tcl" />
-			                            </Component>
-			                            <Component Id="plot.tcl" Guid="*">
-			                                <File Id="plot.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\plot.tcl" />
-			                            </Component>
-			                            <Component Id="puzzle.tcl" Guid="*">
-			                                <File Id="puzzle.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\puzzle.tcl" />
-			                            </Component>
-			                            <Component Id="radio.tcl" Guid="*">
-			                                <File Id="radio.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\radio.tcl" />
-			                            </Component>
-			                            <Component Id="README" Guid="*">
-			                                <File Id="README" KeyPath="yes" Source="SourceDir\lib\tk\demos\README" />
-			                            </Component>
-			                            <Component Id="rmt" Guid="*">
-			                                <File Id="rmt" KeyPath="yes" Source="SourceDir\lib\tk\demos\rmt" />
-			                            </Component>
-			                            <Component Id="rolodex" Guid="*">
-			                                <File Id="rolodex" KeyPath="yes" Source="SourceDir\lib\tk\demos\rolodex" />
-			                            </Component>
-			                            <Component Id="ruler.tcl" Guid="*">
-			                                <File Id="ruler.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\ruler.tcl" />
-			                            </Component>
-			                            <Component Id="sayings.tcl" Guid="*">
-			                                <File Id="sayings.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\sayings.tcl" />
-			                            </Component>
-			                            <Component Id="search.tcl" Guid="*">
-			                                <File Id="search.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\search.tcl" />
-			                            </Component>
-			                            <Component Id="spin.tcl" Guid="*">
-			                                <File Id="spin.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\spin.tcl" />
-			                            </Component>
-			                            <Component Id="square" Guid="*">
-			                                <File Id="square" KeyPath="yes" Source="SourceDir\lib\tk\demos\square" />
-			                            </Component>
-			                            <Component Id="states.tcl" Guid="*">
-			                                <File Id="states.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\states.tcl" />
-			                            </Component>
-			                            <Component Id="style.tcl" Guid="*">
-			                                <File Id="style.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\style.tcl" />
-			                            </Component>
-			                            <Component Id="tclIndex_2" Guid="*">
-			                                <File Id="tclIndex_2" KeyPath="yes" Source="SourceDir\lib\tk\demos\tclIndex" />
-			                            </Component>
-			                            <Component Id="tcolor" Guid="*">
-			                                <File Id="tcolor" KeyPath="yes" Source="SourceDir\lib\tk\demos\tcolor" />
-			                            </Component>
-			                            <Component Id="text.tcl_1" Guid="*">
-			                                <File Id="text.tcl_1" KeyPath="yes" Source="SourceDir\lib\tk\demos\text.tcl" />
-			                            </Component>
-			                            <Component Id="textpeer.tcl" Guid="*">
-			                                <File Id="textpeer.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\textpeer.tcl" />
-			                            </Component>
-			                            <Component Id="timer" Guid="*">
-			                                <File Id="timer" KeyPath="yes" Source="SourceDir\lib\tk\demos\timer" />
-			                            </Component>
-			                            <Component Id="toolbar.tcl" Guid="*">
-			                                <File Id="toolbar.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\toolbar.tcl" />
-			                            </Component>
-			                            <Component Id="tree.tcl" Guid="*">
-			                                <File Id="tree.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\tree.tcl" />
-			                            </Component>
-			                            <Component Id="ttkbut.tcl" Guid="*">
-			                                <File Id="ttkbut.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\ttkbut.tcl" />
-			                            </Component>
-			                            <Component Id="ttkmenu.tcl" Guid="*">
-			                                <File Id="ttkmenu.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\ttkmenu.tcl" />
-			                            </Component>
-			                            <Component Id="ttknote.tcl" Guid="*">
-			                                <File Id="ttknote.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\ttknote.tcl" />
-			                            </Component>
-			                            <Component Id="ttkpane.tcl" Guid="*">
-			                                <File Id="ttkpane.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\ttkpane.tcl" />
-			                            </Component>
-			                            <Component Id="ttkprogress.tcl" Guid="*">
-			                                <File Id="ttkprogress.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\ttkprogress.tcl" />
-			                            </Component>
-			                            <Component Id="ttkscale.tcl" Guid="*">
-			                                <File Id="ttkscale.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\ttkscale.tcl" />
-			                            </Component>
-			                            <Component Id="twind.tcl" Guid="*">
-			                                <File Id="twind.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\twind.tcl" />
-			                            </Component>
-			                            <Component Id="unicodeout.tcl" Guid="*">
-			                                <File Id="unicodeout.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\unicodeout.tcl" />
-			                            </Component>
-			                            <Component Id="vscale.tcl" Guid="*">
-			                                <File Id="vscale.tcl" KeyPath="yes" Source="SourceDir\lib\tk\demos\vscale.tcl" />
-			                            </Component>
-			                            <Component Id="widget" Guid="*">
-			                                <File Id="widget" KeyPath="yes" Source="SourceDir\lib\tk\demos\widget" />
-			                            </Component>
-			                            <Directory Id="images" Name="images">
-			                                <Component Id="earth.gif" Guid="*">
-			                                    <File Id="earth.gif" KeyPath="yes" Source="SourceDir\lib\tk\demos\images\earth.gif" />
-			                                </Component>
-			                                <Component Id="earthmenu.png" Guid="*">
-			                                    <File Id="earthmenu.png" KeyPath="yes" Source="SourceDir\lib\tk\demos\images\earthmenu.png" />
-			                                </Component>
-			                                <Component Id="earthris.gif" Guid="*">
-			                                    <File Id="earthris.gif" KeyPath="yes" Source="SourceDir\lib\tk\demos\images\earthris.gif" />
-			                                </Component>
-			                                <Component Id="flagdown.xbm" Guid="*">
-			                                    <File Id="flagdown.xbm" KeyPath="yes" Source="SourceDir\lib\tk\demos\images\flagdown.xbm" />
-			                                </Component>
-			                                <Component Id="flagup.xbm" Guid="*">
-			                                    <File Id="flagup.xbm" KeyPath="yes" Source="SourceDir\lib\tk\demos\images\flagup.xbm" />
-			                                </Component>
-			                                <Component Id="gray25.xbm" Guid="*">
-			                                    <File Id="gray25.xbm" KeyPath="yes" Source="SourceDir\lib\tk\demos\images\gray25.xbm" />
-			                                </Component>
-			                                <Component Id="letters.xbm" Guid="*">
-			                                    <File Id="letters.xbm" KeyPath="yes" Source="SourceDir\lib\tk\demos\images\letters.xbm" />
-			                                </Component>
-			                                <Component Id="noletter.xbm" Guid="*">
-			                                    <File Id="noletter.xbm" KeyPath="yes" Source="SourceDir\lib\tk\demos\images\noletter.xbm" />
-			                                </Component>
-			                                <Component Id="ouster.png" Guid="*">
-			                                    <File Id="ouster.png" KeyPath="yes" Source="SourceDir\lib\tk\demos\images\ouster.png" />
-			                                </Component>
-			                                <Component Id="pattern.xbm" Guid="*">
-			                                    <File Id="pattern.xbm" KeyPath="yes" Source="SourceDir\lib\tk\demos\images\pattern.xbm" />
-			                                </Component>
-			                                <Component Id="tcllogo.gif" Guid="*">
-			                                    <File Id="tcllogo.gif" KeyPath="yes" Source="SourceDir\lib\tk\demos\images\tcllogo.gif" />
-			                                </Component>
-			                                <Component Id="teapot.ppm" Guid="*">
-			                                    <File Id="teapot.ppm" KeyPath="yes" Source="SourceDir\lib\tk\demos\images\teapot.ppm" />
-			                                </Component>
-			                            </Directory>
-			                        </Directory>
 			                        <Directory Id="images_1" Name="images">
 			                            <Component Id="logo.eps" Guid="*">
 			                                <File Id="logo.eps" KeyPath="yes" Source="SourceDir\lib\tk\images\logo.eps" />
@@ -3470,91 +3211,6 @@
 			<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" />