From 4df9264e6d7f6236ac3ae533e3748bf6ee9b6ed6 Mon Sep 17 00:00:00 2001
From: Joshua Askharoun <jjask7@gmail.com>
Date: Mon, 5 Apr 2021 12:42:50 -0500
Subject: [PATCH] Add UIX source samples from Zune Software v2.1

---
 ZuneUIXTools/MainWindow.xaml.cs            |    2 +-
 test/2.1/ABOUTDIALOG.UIX                   |  122 +
 test/2.1/ACTIONPROGRESSBUTTON.UIX          |  160 ++
 test/2.1/ADDTOPLAYLIST.UIX                 |  150 ++
 test/2.1/ADDTOSYNC.UIX                     |  192 ++
 test/2.1/ALBUMSPANEL.UIX                   |  534 +++++
 test/2.1/ANIMATEDICONBUTTON.UIX            |   57 +
 test/2.1/ANIMATIONS.UIX                    |  684 ++++++
 test/2.1/ARTISTSPANEL.UIX                  |  221 ++
 test/2.1/BOTTOMTOOLBAR.UIX                 | 1289 +++++++++++
 test/2.1/BUTTON.UIX                        | 1183 ++++++++++
 test/2.1/CDSTATE.UIX                       |  282 +++
 test/2.1/CDVIEW.UIX                        | 1907 +++++++++++++++
 test/2.1/CHECKBOX.UIX                      |  179 ++
 test/2.1/COLLECTIONNAVIGATION.UIX          |   60 +
 test/2.1/CONTENTLIST.UIX                   | 1549 +++++++++++++
 test/2.1/CONTEXTMENU.UIX                   |  367 +++
 test/2.1/CONTROLS.UIX                      |   77 +
 test/2.1/CORECONTROLS.UIX                  |   74 +
 test/2.1/DEVICEFIRMWARE.UIX                |  361 +++
 test/2.1/DEVICEICONS.UIX                   |  215 ++
 test/2.1/DEVICELANDFILTERS.UIX             |  121 +
 test/2.1/DEVICEPARTNERSHIP.UIX             |   83 +
 test/2.1/DEVICESTATUS.UIX                  |  688 ++++++
 test/2.1/DEVICESTATUSSTANDARDDRILLDOWN.UIX |  334 +++
 test/2.1/DEVICESYNCSETUP.UIX               | 1873 +++++++++++++++
 test/2.1/DIALOG.UIX                        |  247 ++
 test/2.1/DRAGFEEDBACK.UIX                  |  117 +
 test/2.1/EDITBOX.UIX                       |  212 ++
 test/2.1/EMPTYCOLLECTIONPANEL.UIX          |   43 +
 test/2.1/ERRORDIALOG.UIX                   |  101 +
 test/2.1/EXPLICITWARNING.UIX               |   18 +
 test/2.1/FILTERLIST.UIX                    |  199 ++
 test/2.1/FOCUSRECT.UIX                     |   93 +
 test/2.1/FRAME.UIX                         |  382 +++
 test/2.1/FUE.UIX                           |  931 ++++++++
 test/2.1/GALLERYPANEL.UIX                  |  108 +
 test/2.1/GALLERYVIEW.UIX                   |  118 +
 test/2.1/GASGAUGE.UIX                      |  476 ++++
 test/2.1/IMAGESTYLE.UIX                    |  528 +++++
 test/2.1/INBOXBASEDETAILS.UIX              |  285 +++
 test/2.1/INBOXEMPTY.UIX                    |   90 +
 test/2.1/INBOXMAINPANEL.UIX                |  586 +++++
 test/2.1/INBOXPHOTODETAILS.UIX             |  265 +++
 test/2.1/INBOXPODCASTDETAILS.UIX           |  169 ++
 test/2.1/INBOXPROFILEDETAILS.UIX           |  126 +
 test/2.1/INBOXTEXTDETAILS.UIX              |  101 +
 test/2.1/INBOXTRACKDETAILS.UIX             |  379 +++
 test/2.1/JUMPINLIST.UIX                    |   92 +
 test/2.1/LABELWITHARROW.UIX                |   38 +
 test/2.1/LIBRARY.UIX                       |  402 ++++
 test/2.1/LIBRARYCONTEXTMENU.UIX            |  161 ++
 test/2.1/LIBRARYDIALOGS.UIX                | 1003 ++++++++
 test/2.1/LIBRARYPANELS.UIX                 |  992 ++++++++
 test/2.1/LINKBUTTONS.UIX                   |   68 +
 test/2.1/LISTVIEW.UIX                      |   85 +
 test/2.1/LISTVIEWPANEL.UIX                 |   84 +
 test/2.1/MANAGEMENT.UIX                    |  283 +++
 test/2.1/MANAGEMENTACCOUNT.UIX             |  134 ++
 test/2.1/MANAGEMENTBURN.UIX                |   49 +
 test/2.1/MANAGEMENTCOLLECTION.UIX          |  207 ++
 test/2.1/MANAGEMENTDEVICELIST.UIX          |  110 +
 test/2.1/MANAGEMENTDEVICES.UIX             |   94 +
 test/2.1/MANAGEMENTDISPLAY.UIX             |  127 +
 test/2.1/MANAGEMENTFILETYPES.UIX           |   74 +
 test/2.1/MANAGEMENTGENERAL.UIX             |  102 +
 test/2.1/MANAGEMENTPHOTO.UIX               |   63 +
 test/2.1/MANAGEMENTPODCAST.UIX             |   66 +
 test/2.1/MANAGEMENTPRIVACY.UIX             |   36 +
 test/2.1/MANAGEMENTRIP.UIX                 |   78 +
 test/2.1/MANAGEMENTSHARING.UIX             |  200 ++
 test/2.1/MUSICSYNCRULESPANEL.UIX           |   93 +
 test/2.1/NONCLIENTCONTROLS.UIX             |  338 +++
 test/2.1/NOTIFICATIONAREA.UIX              |  295 +++
 test/2.1/NOWPLAYINGLAND.UIX                | 1243 ++++++++++
 test/2.1/NOWPLAYINGNOTIFICATION.UIX        |  333 +++
 test/2.1/PAGESTACK.UIX                     |   86 +
 test/2.1/PAGINGCONTROL.UIX                 |  101 +
 test/2.1/PHOTOBUTTON.UIX                   |   53 +
 test/2.1/PHOTOLIBRARY.UIX                  |  766 ++++++
 test/2.1/PHOTOSLIDESHOW.UIX                |  286 +++
 test/2.1/PHOTOSYNCRULESPANEL.UIX           |   86 +
 test/2.1/PLAYLISTCONTENTSPANEL.UIX         |  294 +++
 test/2.1/PLAYLISTCONTENTSPANELCOLUMNS.UIX  |  279 +++
 test/2.1/PLAYLISTDIALOG.UIX                |  353 +++
 test/2.1/PLAYLISTICON.UIX                  |  317 +++
 test/2.1/PLAYLISTLAND.UIX                  |   31 +
 test/2.1/PLAYLISTPOPUP.UIX                 |  291 +++
 test/2.1/PLAYLISTSPANEL.UIX                |  356 +++
 test/2.1/PODCASTDETAILSPANEL.UIX           |  483 ++++
 test/2.1/PODCASTDIALOGS.UIX                |  536 +++++
 test/2.1/PODCASTEPISODESCOLUMNS.UIX        |  372 +++
 test/2.1/PODCASTEPISODESPANEL.UIX          |  593 +++++
 test/2.1/PODCASTSERIESPANEL.UIX            |  489 ++++
 test/2.1/PODCASTSYNCRULESPANEL.UIX         |   94 +
 test/2.1/POPUP.UIX                         |   43 +
 test/2.1/POPUPLAYER.UIX                    |  107 +
 test/2.1/PURCHASEFORBURN.UIX               |   90 +
 test/2.1/RADIOBUTTON.UIX                   |  300 +++
 test/2.1/SCROLLBAR.UIX                     |  476 ++++
 test/2.1/SEARCH.UIX                        | 1404 +++++++++++
 test/2.1/SIGNINDIALOG.UIX                  |  504 ++++
 test/2.1/SLIDER.UIX                        |  737 ++++++
 test/2.1/SOCIALNAVIGATION.UIX              |   19 +
 test/2.1/SPLITTER.UIX                      |  508 ++++
 test/2.1/SPREADSHEETVIEWBASE.UIX           | 2429 ++++++++++++++++++++
 test/2.1/STYLE.UIX                         |  354 +++
 test/2.1/STYLES.UIX                        | 1488 ++++++++++++
 test/2.1/SYNCANIMATION.UIX                 |  190 ++
 test/2.1/SYNCNOTIFICATION.UIX              |   46 +
 test/2.1/SYNCRULES.UIX                     |  238 ++
 test/2.1/TEXTAREA.UIX                      |   84 +
 test/2.1/THUMBNAILBUTTON.UIX               |  702 ++++++
 test/2.1/TOOLBARICON.UIX                   |   47 +
 test/2.1/TOOLTIP.UIX                       |   97 +
 test/2.1/TOPTOOLBAR.UIX                    |  798 +++++++
 test/2.1/TOPTOOLBARSIGNIN.UIX              |   86 +
 test/2.1/TRACKSPANEL.UIX                   |  437 ++++
 test/2.1/TRACKSPANELCOLUMNS.UIX            | 1153 ++++++++++
 test/2.1/TRANSPORTCONTROLS.UIX             |  592 +++++
 test/2.1/VIDEOLIBRARY.UIX                  |  260 +++
 121 files changed, 44242 insertions(+), 1 deletion(-)
 create mode 100644 test/2.1/ABOUTDIALOG.UIX
 create mode 100644 test/2.1/ACTIONPROGRESSBUTTON.UIX
 create mode 100644 test/2.1/ADDTOPLAYLIST.UIX
 create mode 100644 test/2.1/ADDTOSYNC.UIX
 create mode 100644 test/2.1/ALBUMSPANEL.UIX
 create mode 100644 test/2.1/ANIMATEDICONBUTTON.UIX
 create mode 100644 test/2.1/ANIMATIONS.UIX
 create mode 100644 test/2.1/ARTISTSPANEL.UIX
 create mode 100644 test/2.1/BOTTOMTOOLBAR.UIX
 create mode 100644 test/2.1/BUTTON.UIX
 create mode 100644 test/2.1/CDSTATE.UIX
 create mode 100644 test/2.1/CDVIEW.UIX
 create mode 100644 test/2.1/CHECKBOX.UIX
 create mode 100644 test/2.1/COLLECTIONNAVIGATION.UIX
 create mode 100644 test/2.1/CONTENTLIST.UIX
 create mode 100644 test/2.1/CONTEXTMENU.UIX
 create mode 100644 test/2.1/CONTROLS.UIX
 create mode 100644 test/2.1/CORECONTROLS.UIX
 create mode 100644 test/2.1/DEVICEFIRMWARE.UIX
 create mode 100644 test/2.1/DEVICEICONS.UIX
 create mode 100644 test/2.1/DEVICELANDFILTERS.UIX
 create mode 100644 test/2.1/DEVICEPARTNERSHIP.UIX
 create mode 100644 test/2.1/DEVICESTATUS.UIX
 create mode 100644 test/2.1/DEVICESTATUSSTANDARDDRILLDOWN.UIX
 create mode 100644 test/2.1/DEVICESYNCSETUP.UIX
 create mode 100644 test/2.1/DIALOG.UIX
 create mode 100644 test/2.1/DRAGFEEDBACK.UIX
 create mode 100644 test/2.1/EDITBOX.UIX
 create mode 100644 test/2.1/EMPTYCOLLECTIONPANEL.UIX
 create mode 100644 test/2.1/ERRORDIALOG.UIX
 create mode 100644 test/2.1/EXPLICITWARNING.UIX
 create mode 100644 test/2.1/FILTERLIST.UIX
 create mode 100644 test/2.1/FOCUSRECT.UIX
 create mode 100644 test/2.1/FRAME.UIX
 create mode 100644 test/2.1/FUE.UIX
 create mode 100644 test/2.1/GALLERYPANEL.UIX
 create mode 100644 test/2.1/GALLERYVIEW.UIX
 create mode 100644 test/2.1/GASGAUGE.UIX
 create mode 100644 test/2.1/IMAGESTYLE.UIX
 create mode 100644 test/2.1/INBOXBASEDETAILS.UIX
 create mode 100644 test/2.1/INBOXEMPTY.UIX
 create mode 100644 test/2.1/INBOXMAINPANEL.UIX
 create mode 100644 test/2.1/INBOXPHOTODETAILS.UIX
 create mode 100644 test/2.1/INBOXPODCASTDETAILS.UIX
 create mode 100644 test/2.1/INBOXPROFILEDETAILS.UIX
 create mode 100644 test/2.1/INBOXTEXTDETAILS.UIX
 create mode 100644 test/2.1/INBOXTRACKDETAILS.UIX
 create mode 100644 test/2.1/JUMPINLIST.UIX
 create mode 100644 test/2.1/LABELWITHARROW.UIX
 create mode 100644 test/2.1/LIBRARY.UIX
 create mode 100644 test/2.1/LIBRARYCONTEXTMENU.UIX
 create mode 100644 test/2.1/LIBRARYDIALOGS.UIX
 create mode 100644 test/2.1/LIBRARYPANELS.UIX
 create mode 100644 test/2.1/LINKBUTTONS.UIX
 create mode 100644 test/2.1/LISTVIEW.UIX
 create mode 100644 test/2.1/LISTVIEWPANEL.UIX
 create mode 100644 test/2.1/MANAGEMENT.UIX
 create mode 100644 test/2.1/MANAGEMENTACCOUNT.UIX
 create mode 100644 test/2.1/MANAGEMENTBURN.UIX
 create mode 100644 test/2.1/MANAGEMENTCOLLECTION.UIX
 create mode 100644 test/2.1/MANAGEMENTDEVICELIST.UIX
 create mode 100644 test/2.1/MANAGEMENTDEVICES.UIX
 create mode 100644 test/2.1/MANAGEMENTDISPLAY.UIX
 create mode 100644 test/2.1/MANAGEMENTFILETYPES.UIX
 create mode 100644 test/2.1/MANAGEMENTGENERAL.UIX
 create mode 100644 test/2.1/MANAGEMENTPHOTO.UIX
 create mode 100644 test/2.1/MANAGEMENTPODCAST.UIX
 create mode 100644 test/2.1/MANAGEMENTPRIVACY.UIX
 create mode 100644 test/2.1/MANAGEMENTRIP.UIX
 create mode 100644 test/2.1/MANAGEMENTSHARING.UIX
 create mode 100644 test/2.1/MUSICSYNCRULESPANEL.UIX
 create mode 100644 test/2.1/NONCLIENTCONTROLS.UIX
 create mode 100644 test/2.1/NOTIFICATIONAREA.UIX
 create mode 100644 test/2.1/NOWPLAYINGLAND.UIX
 create mode 100644 test/2.1/NOWPLAYINGNOTIFICATION.UIX
 create mode 100644 test/2.1/PAGESTACK.UIX
 create mode 100644 test/2.1/PAGINGCONTROL.UIX
 create mode 100644 test/2.1/PHOTOBUTTON.UIX
 create mode 100644 test/2.1/PHOTOLIBRARY.UIX
 create mode 100644 test/2.1/PHOTOSLIDESHOW.UIX
 create mode 100644 test/2.1/PHOTOSYNCRULESPANEL.UIX
 create mode 100644 test/2.1/PLAYLISTCONTENTSPANEL.UIX
 create mode 100644 test/2.1/PLAYLISTCONTENTSPANELCOLUMNS.UIX
 create mode 100644 test/2.1/PLAYLISTDIALOG.UIX
 create mode 100644 test/2.1/PLAYLISTICON.UIX
 create mode 100644 test/2.1/PLAYLISTLAND.UIX
 create mode 100644 test/2.1/PLAYLISTPOPUP.UIX
 create mode 100644 test/2.1/PLAYLISTSPANEL.UIX
 create mode 100644 test/2.1/PODCASTDETAILSPANEL.UIX
 create mode 100644 test/2.1/PODCASTDIALOGS.UIX
 create mode 100644 test/2.1/PODCASTEPISODESCOLUMNS.UIX
 create mode 100644 test/2.1/PODCASTEPISODESPANEL.UIX
 create mode 100644 test/2.1/PODCASTSERIESPANEL.UIX
 create mode 100644 test/2.1/PODCASTSYNCRULESPANEL.UIX
 create mode 100644 test/2.1/POPUP.UIX
 create mode 100644 test/2.1/POPUPLAYER.UIX
 create mode 100644 test/2.1/PURCHASEFORBURN.UIX
 create mode 100644 test/2.1/RADIOBUTTON.UIX
 create mode 100644 test/2.1/SCROLLBAR.UIX
 create mode 100644 test/2.1/SEARCH.UIX
 create mode 100644 test/2.1/SIGNINDIALOG.UIX
 create mode 100644 test/2.1/SLIDER.UIX
 create mode 100644 test/2.1/SOCIALNAVIGATION.UIX
 create mode 100644 test/2.1/SPLITTER.UIX
 create mode 100644 test/2.1/SPREADSHEETVIEWBASE.UIX
 create mode 100644 test/2.1/STYLE.UIX
 create mode 100644 test/2.1/STYLES.UIX
 create mode 100644 test/2.1/SYNCANIMATION.UIX
 create mode 100644 test/2.1/SYNCNOTIFICATION.UIX
 create mode 100644 test/2.1/SYNCRULES.UIX
 create mode 100644 test/2.1/TEXTAREA.UIX
 create mode 100644 test/2.1/THUMBNAILBUTTON.UIX
 create mode 100644 test/2.1/TOOLBARICON.UIX
 create mode 100644 test/2.1/TOOLTIP.UIX
 create mode 100644 test/2.1/TOPTOOLBAR.UIX
 create mode 100644 test/2.1/TOPTOOLBARSIGNIN.UIX
 create mode 100644 test/2.1/TRACKSPANEL.UIX
 create mode 100644 test/2.1/TRACKSPANELCOLUMNS.UIX
 create mode 100644 test/2.1/TRANSPORTCONTROLS.UIX
 create mode 100644 test/2.1/VIDEOLIBRARY.UIX

diff --git a/ZuneUIXTools/MainWindow.xaml.cs b/ZuneUIXTools/MainWindow.xaml.cs
index 1252100..1a05753 100644
--- a/ZuneUIXTools/MainWindow.xaml.cs
+++ b/ZuneUIXTools/MainWindow.xaml.cs
@@ -80,7 +80,7 @@ namespace ZuneUIXTools
                             {
                                 // Highlight the error in the code editor
                                 int offset = textEditor.Document.GetOffset(err.Line, err.Column);
-                                textEditor.SelectionStart = offset + 1;
+                                textEditor.SelectionStart = offset;
                                 textEditor.SelectionLength = 1;
                                 textEditor.ScrollTo(err.Line, err.Column);
                             };
diff --git a/test/2.1/ABOUTDIALOG.UIX b/test/2.1/ABOUTDIALOG.UIX
new file mode 100644
index 0000000..bd2cb81
--- /dev/null
+++ b/test/2.1/ABOUTDIALOG.UIX
@@ -0,0 +1,122 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX 
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris" 
+  xmlns:zune="assembly://ZuneShell/ZuneUI" 
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:dialog="res://ZuneShellResources!Dialog.uix"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:linkButtons="res://ZuneShellResources!LinkButtons.uix" 
+  xmlns:me="Me"
+  >
+
+  
+  
+  
+
+  
+  
+  
+  <Class Name="AboutDialog" Base="dialog:Dialog">
+    <Properties>
+      <String Name="ContentUI" String="res://ZuneShellResources!AboutDialog.uix#AboutDialogContentUI"/>
+      <iris:Command Name="Cancel" Description="{zune:Shell.LoadString(zune:StringId.IDS_DIALOG_OK)}"/> 
+      <zune:WebHelpCommand Name="TechSupportLink" 
+        Description="{zune:Shell.LoadString(zune:StringId.IDS_ABOUTDIALOG_TECHNICAL_SUPPORT_INFORMATION)}"
+        Url="http://www.zune.net/support/"
+        />
+      <String Name="AccessibleDescription" String="{zune:Shell.LoadString(zune:StringId.IDS_ABOUTDIALOG_TITLE)}"/>
+    </Properties>
+  </Class>
+  
+
+  
+  
+  
+  <UI Name="AboutDialogContentUI" Base="dialog:DialogContentUI">
+    <Properties>
+      <me:AboutDialog Name="Dialog" AboutDialog="$Required"/>      
+    </Properties>
+    <Scripts>
+      <Script>
+        if (iris:Application.RenderingType == iris:RenderingType.GDI)
+        {
+           GDIModeLabel.Visible = true;
+           GDIModeLabel.Content = zune:Shell.LoadString(zune:StringId.IDS_ABOUTDIALOG_GDI_MODE_NOTICE);
+        }           
+      </Script>
+    </Scripts>
+    <Content>
+      <Panel Navigation="ContainAll,WrapAll" MaximumSize="360,0" Margins="10">
+        <Layout>
+          <FlowLayout ItemAlignment="Near" Orientation="Vertical"/>
+        </Layout>
+        <Children>
+
+          <core:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_ABOUTDIALOG_TITLE)}" Style="{styles:SharedStyles.DialogHeaderStyle}" WordWrap="true"/>
+
+          <Panel Margins="10">
+            <Layout>
+              <FlowLayout Orientation="Horizontal"/>
+            </Layout>
+            <Children>
+
+              <Graphic Content="res://ZuneShellResources!ZuneColorLogo.png" StretchingPolicy="Uniform"  SizingPolicy="SizeToContent"/>
+
+              <Panel Margins="10">
+                <Layout>
+                  <DockLayout SizeToChildren="true" DefaultLayoutInput="Top"/>
+                </Layout>
+                <Children>
+                  
+                  <core:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_ABOUTDIALOG_COPYRIGHT_LINE1)}" Style="{styles:SharedStyles.DialogTextStyle}"/>
+
+                  <core:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_ABOUTDIALOG_COPYRIGHT_LINE2)}" Style="{styles:SharedStyles.DialogTextStyle}"/>
+
+                  <core:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_ABOUTDIALOG_COPYRIGHT_LINE3)}" Style="{styles:SharedStyles.DialogTextStyle}"/>
+
+                  <Panel Layout="HorizontalFlow">
+                    <Children>
+                      
+                      <core:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_ABOUTDIALOG_VERSION_HEADER)}" Style="{styles:SharedStyles.DialogTextStyle}"/>
+
+                      <core:Label Content="{zune:Management.Instance.BuildNumber}" Margins="5,0,0,0" Style="{styles:SharedStyles.DialogTextStyle}"/>
+                      
+                    </Children>
+                  </Panel>
+                  
+                  <Panel Layout="HorizontalFlow">
+                    <Children>
+
+                      <core:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_ABOUTDIALOG_PRODUCT_ID)}" Style="{styles:SharedStyles.DialogTextStyle}"/>
+
+                      <core:Label Content="{zune:SoftwareUpdates.PID}" Margins="5,0,0,0" Style="{styles:SharedStyles.DialogTextStyle}"/>
+                      
+                    </Children>
+                  </Panel>
+
+                  <core:Label Name="GDIModeLabel" Visible="false" Style="{styles:SharedStyles.DialogTextStyle}"/>
+
+                </Children>
+              </Panel>
+            </Children>
+          </Panel>
+          
+
+          <core:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_ABOUTDIALOG_WARNING)}" Style="{styles:SharedStyles.DialogTextStyle}" WordWrap="true"/>
+          
+          <Panel Layout ="VerticalFlow" Margins="0,10,0,0">           
+            <Children>
+              
+              <linkButtons:ExternalLink Model="{Dialog.TechSupportLink}" ToolTipEnabled="false" TileMinSize="160,16"/>
+              <core:BigActionButton Model="{Dialog.Cancel}" Margins="0,10,0,0" ToolTipEnabled="false" FocusOrder="0"/>
+
+            </Children>
+          </Panel>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+</UIX> 
diff --git a/test/2.1/ACTIONPROGRESSBUTTON.UIX b/test/2.1/ACTIONPROGRESSBUTTON.UIX
new file mode 100644
index 0000000..4312f3f
--- /dev/null
+++ b/test/2.1/ACTIONPROGRESSBUTTON.UIX
@@ -0,0 +1,160 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX 
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:style="res://ZuneShellResources!Style.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:button="res://ZuneShellResources!Button.uix"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:iris="assembly://UIX/Microsoft.Iris">
+
+
+  
+  
+  
+  <UI Name="ActionProgressButton" Base="button:LabelButtonBase">
+    <Properties>
+      <Single Name="Progress" Single="-1.0"/>
+
+      <Image Name="Image"         Image="{styles:Styles.Button}"/>
+      <Image Name="HoverImage"    Image="{styles:Styles.ButtonHover}"/>
+      <Image Name="FocusImage"    Image="{HoverImage}"/>
+      <Image Name="PressedImage"  Image="{styles:Styles.ButtonPressed}"/>
+      <Image Name="DisabledImage" Image="{styles:Styles.ButtonDisabled}"/>
+      <Image Name="ProgressImage" Image="{styles:Styles.ButtonProgress}"/>
+      <Image Name="ProgressBackgroundImage" Image="{styles:Styles.ButtonProgressBackground}"/>
+
+      <style:Style Name="BaseStyle" Style="{styles:SharedStyles.ActionButtonStyle}"/>
+      <style:Style Name="ShadowStyle" Style="{styles:SharedStyles.ActionButtonShadowStyle}"/>
+      <style:Style Name="ProgressStyle" Style="{styles:SharedStyles.ActionButtonProgressStyle}"/>
+      
+      <Inset Name="ButtonInset" Inset="10,1,9,1"/>
+      <Image Name="Icon" Image="{null}"/>
+
+      <iris:Command Name="Model" Command="$Required"/>
+      <button:CommandButtonProvider Name="Provider"/>
+
+      <Size Name="FixedHeight" Size="0,21"/>
+      <Size Name="ButtonFixedSize" Size="99,21" />
+    </Properties>
+
+    <Scripts>
+      <Script>Provider.Model = [Model];</Script>
+      <Script>IconGraphic.Content = [Icon];</Script>
+      <Script>
+        if (Model is zune:ProgressCommand)
+        {
+          Progress = [((zune:ProgressCommand)Model).Progress];
+        }
+      </Script>
+      <Script>
+        if ([Progress] &lt; 0.0 || [Progress] &gt; 1.0 || iris:Application.RenderingType == iris:RenderingType.GDI)
+        {
+          Label.Style = [Style];
+          ShadowLabel.Style = [ShadowStyle];
+          ShadowLabel.Visible = true;
+          
+          
+          if (![UI.FullyEnabled])
+          {
+            Background.Content = DisabledImage;
+          }
+          
+          else
+          {
+            
+            if ([Clicker.Clicking] &amp;&amp; [PressedImage] != null)
+            {
+              Background.Content = PressedImage;
+            }
+            else if ([UI.DeepMouseFocus] &amp;&amp; [HoverImage] != null)
+            {
+              Background.Content = HoverImage;
+            }
+            else if ([UI.DeepKeyFocus] &amp;&amp; [FocusImage] != null)
+            {
+              Background.Content = FocusImage;
+            }
+            else
+            {
+              Background.Content = [Image];
+            }
+          }
+        }
+        else
+        {
+          Background.Content = [ProgressBackgroundImage];
+          Label.Style = [ProgressStyle];
+          ShadowLabel.Visible = false;
+        }
+      </Script>
+      <Script>
+        if (iris:Application.RenderingType != iris:RenderingType.GDI)
+        {
+          float amountToHide = (1.0 - [Progress]) * (Single)(ButtonFixedSize.Width);
+          Clip.FarOffset = amountToHide * -1.0;
+        }
+        else
+        {
+          Clip.FarOffset = (Single)(ButtonFixedSize.Width) * -1.0;
+        }
+      </Script>
+      <Script>
+        ShadowLabel.Content = [Label.Content];
+      </Script>
+    </Scripts>
+    <Content>
+      <Panel MaximumSize="{ButtonFixedSize}">
+        <Children>
+
+          <Graphic Name="Background" 
+                   StretchingPolicy="Fill" SizingPolicy="SizeToChildren" 
+                   MinimumSize="{FixedHeight}" MaximumSize="{FixedHeight}" 
+                   Content="{Image}" ErrorImage="{null}" AcquiringImage="{null}"
+                   Layout="Anchor">
+            <Children>
+
+              <Panel Name="LabelPanel" Layout="Anchor" Padding="{ButtonInset}">
+                <LayoutInput>
+                  <AnchorLayoutInput Horizontal="Center" Vertical="Center"/>
+                </LayoutInput>
+                <Children>
+
+                  <core:Label Name="Label" Style="{Style}">
+                    <LayoutInput>
+                      <AnchorLayoutInput Vertical="Center"/>
+                    </LayoutInput>
+                  </core:Label>
+
+                  <core:Label Name="ShadowLabel" Style="{ShadowStyle}">
+                    <LayoutInput>
+                      <AnchorLayoutInput Left="Label,0,1" Top="Label,0,1"/>
+                    </LayoutInput>
+                  </core:Label>
+
+                  <Graphic Name="IconGraphic" Margins="0,1,0,0">
+                    <LayoutInput>
+                      <AnchorLayoutInput Left="Label,1,2" Vertical="Center"/>
+                    </LayoutInput>
+                  </Graphic>
+
+                </Children>
+              </Panel>
+
+              <Clip Name="Clip" Orientation="Horizontal" ShowFar="true" FadeSize="0.1">
+                <Children>
+
+                  <Graphic Content="{ProgressImage}" SizingPolicy="SizeToConstraint"/>
+
+                </Children>
+              </Clip>
+
+            </Children>
+          </Graphic>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+  
+</UIX>
diff --git a/test/2.1/ADDTOPLAYLIST.UIX b/test/2.1/ADDTOPLAYLIST.UIX
new file mode 100644
index 0000000..24cc22f
--- /dev/null
+++ b/test/2.1/ADDTOPLAYLIST.UIX
@@ -0,0 +1,150 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:col="assembly://mscorlib/System.Collections"
+  xmlns:svc="assembly://ZuneDBApi/Microsoft.Zune.Service"
+  xmlns:data="res://ZuneMarketplaceResources!MarketplaceData.schema.xml"
+  xmlns:buy="res://ZuneMarketplaceResources!PurchaseDialog.uix"
+  xmlns:signin="res://ZuneShellResources!SignInDialog.uix"
+  >
+
+  
+  
+  
+  
+  
+  
+  <Class Name="AddToPlaylist">
+    <Properties>
+      
+      <List Name="Items" List="{null}"/>
+
+      
+      <Int32 Name="PlaylistId" Int32="-1"/>
+
+      
+      <iris:Command Name="Start"/>
+    </Properties>
+
+    <Locals>
+      
+      <signin:SignInDialog Name="SignInDialog" SignInDialog ="{null}"/>
+      <buy:PurchaseDialog Name="PurchaseDialog" PurchaseDialog="{null}"/>
+
+      
+      <Command Name="PurchasePhase"/>
+      <Command Name="DownloadPhase"/>
+
+      <Boolean Name="ContentNotInLibrary" Boolean="false"/>
+    </Locals>
+
+    <Scripts>
+
+      
+      <Script>
+        [DeclareTrigger(Start.Invoked)]
+        
+        
+        if (!List.IsNullOrEmpty(Items) &amp;&amp; Items.GetItem(0) is data:Track)
+        {
+          foreach(data:Track track in Items)
+          {
+            if (!ContentNotInLibrary &amp;&amp; (!track.InCollection &amp;&amp; !track.IsDownloading))
+            { 
+              ContentNotInLibrary = true;
+            }
+          }
+        }
+
+        
+        
+        if (ContentNotInLibrary)
+        {
+          if (!zune:SignIn.Instance.SignedIn)
+          {
+            if (SignInDialog == null) SignInDialog = new signin:SignInDialog();
+            SignInDialog.OnSuccess = PurchasePhase;
+            SignInDialog.Helper.Show(SignInDialog);
+          }
+          else
+          {
+            
+            PurchasePhase.Invoke();
+          }
+        }
+        else
+        { 
+          
+          DownloadPhase.Invoke();
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(PurchasePhase.Invoked)]
+
+        
+        if (PurchaseDialog != null) Class.DisposeOwnedObject(PurchaseDialog);
+        PurchaseDialog = new buy:PurchaseDialog();
+        PurchaseDialog.Instance = PurchaseDialog;
+        
+        if (ContentNotInLibrary)
+        {
+          foreach(data:Track track in Items)
+          {
+            if (!track.InCollection &amp;&amp; !track.CanDownload &amp;&amp; track.CanPurchase)
+            {
+              PurchaseDialog.TrackIds.Add(track.Id);
+            }
+          }
+        }
+
+        if (PurchaseDialog.TrackIds.Count > 0)
+        {
+          PurchaseDialog.OnSuccess = DownloadPhase;
+          PurchaseDialog.Helper.Show(PurchaseDialog);
+        }
+        else
+        {
+          
+          DownloadPhase.Invoke();
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(DownloadPhase.Invoked)]
+        
+        
+        if (ContentNotInLibrary)
+        {
+          col:ArrayList trackGuids = new col:ArrayList(Items.Count);
+          foreach(data:Track track in Items)
+          {
+            if (track.CanDownload)
+            {
+              trackGuids.Add(track.Id);
+            }
+          }
+
+          if (trackGuids.Count > 0)
+          {
+            zune:Download.Instance.DownloadContent(null, trackGuids, null, svc:EContentRights.SubscriptionDownload);
+          }
+          
+          ContentNotInLibrary = false;
+        }
+
+        
+        zune:PlaylistManager.Instance.AddToPlaylist(PlaylistId, Items);
+        
+        
+        Items = null;
+      </Script>
+
+    </Scripts>
+  </Class>
+
+</UIX>
diff --git a/test/2.1/ADDTOSYNC.UIX b/test/2.1/ADDTOSYNC.UIX
new file mode 100644
index 0000000..1f8917e
--- /dev/null
+++ b/test/2.1/ADDTOSYNC.UIX
@@ -0,0 +1,192 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:zuneshell="assembly://ZuneShell/Microsoft.Zune.Shell"
+  xmlns:col="assembly://mscorlib/System.Collections"
+  xmlns:svc="assembly://ZuneDBApi/Microsoft.Zune.Service"
+  xmlns:data="res://ZuneMarketplaceResources!MarketplaceData.schema.xml"
+  xmlns:buy="res://ZuneMarketplaceResources!PurchaseDialog.uix"
+  xmlns:signin="res://ZuneShellResources!SignInDialog.uix"
+  >
+
+  
+  
+  
+  
+  
+  
+  <Class Name="AddToSync">
+    <Properties>
+      
+      <List Name="Items" List="{null}"/>
+
+      
+      <String Name="PlaylistName" String="{null}"/>
+
+      
+      <iris:Command Name="Start"/>
+    </Properties>
+
+    <Locals>
+      
+      <signin:SignInDialog Name="SignInDialog" SignInDialog ="{null}"/>
+      <buy:PurchaseDialog Name="PurchaseDialog" PurchaseDialog="{null}"/>
+
+      
+      <iris:Command Name="PurchasePhase"/>
+      <iris:Command Name="DownloadPhase"/>
+
+      <Boolean Name="fContentNotInLibrary" Boolean="false"/>
+    </Locals>
+
+    <Scripts>
+
+      
+      <Script>
+        [DeclareTrigger(Start.Invoked)]
+
+        
+        if ( !List.IsNullOrEmpty( Items ) )
+        {
+          if ( Items.GetItem(0) is data:Track )
+          {
+            
+            foreach(data:Track track in Items)
+            {
+              if (!fContentNotInLibrary &amp;&amp; (!track.InCollection &amp;&amp; !track.IsDownloading))
+              { 
+                fContentNotInLibrary = true;
+              }
+            }
+          }
+          else if ( Items.GetItem(0) is data:Album )
+          {
+            
+            fContentNotInLibrary = true;
+          }
+        }
+
+        
+        
+        if ( fContentNotInLibrary &amp;&amp; !zune:SignIn.Instance.SignedIn )
+        {
+          if (SignInDialog == null) SignInDialog = new signin:SignInDialog();
+          SignInDialog.OnSuccess = PurchasePhase;
+          SignInDialog.Helper.Show( SignInDialog );
+        }
+        else
+        { 
+          
+          PurchasePhase.Invoke();
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(PurchasePhase.Invoked)]
+
+        
+        if (PurchaseDialog != null) Class.DisposeOwnedObject(PurchaseDialog);
+        PurchaseDialog = new buy:PurchaseDialog();
+        PurchaseDialog.Instance = PurchaseDialog;
+
+        if ( fContentNotInLibrary )
+        {
+          if (Items.GetItem(0) is data:Track)
+          {
+            foreach(data:Track track in Items)
+            {
+              if (!track.InCollection &amp;&amp; !track.IsDownloading &amp;&amp; !track.CanDownload &amp;&amp; track.CanPurchase)
+              {
+                PurchaseDialog.TrackIds.Add( track.Id );
+              }
+            }
+          }
+
+          if (Items.GetItem(0) is data:Album &amp;&amp; !zuneshell:ZuneApplication.Service.CanDownloadSubscriptionContent())
+          {
+            
+            foreach(data:Album album in Items)
+            {
+              if (album.CanPurchase)
+              {
+                PurchaseDialog.AlbumIds.Add( album.Id );
+              }
+            }
+          }
+        }
+
+        if (PurchaseDialog.TrackIds.Count > 0 || PurchaseDialog.AlbumIds.Count > 0)
+        {
+          PurchaseDialog.OnSuccess = DownloadPhase;
+          PurchaseDialog.Helper.Show( PurchaseDialog );
+        }
+        else
+        {
+          
+          DownloadPhase.Invoke();
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(DownloadPhase.Invoked)]
+
+        if ( PlaylistName != null )
+        {
+          
+          zune:PlaylistResult result = zune:PlaylistManager.Instance.CreateAndAddToUniquePlaylist(PlaylistName, Items);
+          if (result.Error == zune:PlaylistError.Success)
+          {
+            zune:SyncControls.Instance.AddPlaylistSyncRule(result.PlaylistId);
+          }
+        }
+        else
+        {
+          
+          zune:SyncControls.Instance.AddSyncRule(Items);
+        }
+
+        
+        if ( fContentNotInLibrary )
+        {
+          col:ArrayList trackGuids = new col:ArrayList(Items.Count);
+          if (Items.GetItem(0) is data:Track)
+          {
+            foreach(data:Track track in Items)
+            {
+              if (track.CanDownload)
+              {
+                trackGuids.Add( track.Id );
+              }
+            }
+          }
+
+          col:ArrayList albumGuids = new col:ArrayList(Items.Count);
+          if (Items.GetItem(0) is data:Album &amp;&amp; zuneshell:ZuneApplication.Service.CanDownloadSubscriptionContent())
+          {
+            
+            foreach(data:Album album in Items)
+            {
+              albumGuids.Add( album.Id );
+            }
+          }
+
+          if (trackGuids.Count > 0 || albumGuids.Count > 0)
+          {
+            zune:Download.Instance.DownloadContent( albumGuids, trackGuids, null, svc:EContentRights.SubscriptionDownload );
+          }
+        }
+      </Script>
+    </Scripts>
+  </Class>
+
+</UIX>
+
+
+
+
+
+
diff --git a/test/2.1/ALBUMSPANEL.UIX b/test/2.1/ALBUMSPANEL.UIX
new file mode 100644
index 0000000..e16d734
--- /dev/null
+++ b/test/2.1/ALBUMSPANEL.UIX
@@ -0,0 +1,534 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:sys="assembly://mscorlib/System"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:data="res://ZuneShellResources!LibraryData.schema.xml"
+  xmlns:gp="res://ZuneShellResources!GalleryPanel.uix"
+  xmlns:panels="res://ZuneShellResources!LibraryPanels.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:thumbbutton="res://ZuneShellResources!ThumbnailButton.uix"
+  xmlns:list="res://ZuneShellResources!ContentList.uix"
+  xmlns:me="Me">
+
+
+  
+  
+  
+  <Class Name="AlbumsPanelData" Shared="true">
+    <Properties>
+      
+
+      <iris:ArrayListDataSet Name="SortOptions">
+        <Source>
+          <zune:SortCommand Description="{zune:Shell.LoadString(zune:StringId.IDS_DATE_ADDED_SORT)}" Sort="-DateAdded"/>
+          <zune:SortCommand Description="{zune:Shell.LoadString(zune:StringId.IDS_ASCENDING_SORT)}" Sort="+WM/AlbumTitle"  SupportsJumpInList="true"/>
+          <zune:SortCommand Description="{zune:Shell.LoadString(zune:StringId.IDS_DESCENDING_SORT)}" Sort="-WM/AlbumTitle" SupportsJumpInList="true"/>
+          <zune:SortCommand Description="{zune:Shell.LoadString(zune:StringId.IDS_RELEASE_YEAR_SORT)}" Sort="-WM/Year"/>
+        </Source>
+      </iris:ArrayListDataSet>
+      
+      
+      <panels:SortData Name="MultipleArtistsSorts" Options="{SortOptions}" 
+                       SaveKey="AlbumMultiArtistSort" DefaultIndex="0" /> 
+      
+      
+      <panels:SortData Name="SingleArtistSorts" Options="{SortOptions}" 
+                       SaveKey="AlbumSingleArtistSort" DefaultIndex="3" /> 
+    </Properties>
+  </Class>
+
+  
+  
+  
+  <UI Name="AlbumsPanel" Base="panels:LibraryGalleryPanel">
+    <Properties>
+      <zune:MusicLibraryPage Name="Page" MusicLibraryPage="$Required"/>
+      <zune:AlbumsPanel Name="Model" AlbumsPanel="$Required"/>
+
+      <Int32 Name="MinimumWidth" Int32="232"/>
+      <Single Name="MinimumPercent" Single="0.0"/>
+      <Inset Name="ColumnInset" Inset="20,0,0,0"/>
+      <Inset Name="HeaderMargins" Inset="7,0,12,22"/>
+      <Inset Name="HeaderPadding" Inset="{styles:Styles.CellPadding}"/>
+      
+      <panels:SortData Name="SortData" SortData="{me:AlbumsPanelData.MultipleArtistsSorts}"/>
+    </Properties>
+
+    <Locals>
+      <data:LibraryAlbumQuery Name="AlbumQuery" Enabled="false" 
+        AntialiasImageEdges="{iris:Application.RenderingType != iris:RenderingType.GDI}" 
+        ShowDeviceContents="{Page.ShowDeviceContents}"
+        ThumbnailFallbackImageUrl="res://ZuneShellResources!NoArt.png"
+        />
+
+      <zune:MenuItemCommand Name="ChooseArt"/>
+
+      <List Name="LibraryContextMenuOptions">
+        <Source>
+          <iris:Command Command="{Play}"/>
+          <iris:Command Command="{AddToNowPlaying}"/>
+          <iris:Command Command="{AddToPlaylist}"/>
+          <iris:Command Command="{AddToBurnList}"/>
+          <core:MenuDivider/>
+          <iris:Command Command="{Edit}"/>
+          <iris:Command Command="{ChooseArt}"/>
+          <iris:Command Command="{Delete}"/>
+          <core:MenuDivider MenuDivider="{SyncDivider}"/>
+          <iris:Command Command="{Sync}"/>
+          <iris:Command Command="{SyncAllUnexclude}"/>
+        </Source>
+      </List>
+
+      <List Name="DeviceContextMenuOptions">
+        <Source>
+          <iris:Command Command="{ReverseSync}"/>
+          <iris:Command Command="{DeleteFromDevice}"/>
+        </Source>
+      </List>
+
+      <zune:ShellCommand Name="BuyMoreCommand" Command="Marketplace\Music\Artist"/>
+
+      <Boolean Name="SortChanged"/>
+      
+      <zune:AlbumArtUpdateHandler Name="Updater" AlbumArtUpdateHandler="{null}"/>
+
+      <Timer Name="UpdateTimer" Interval="0" AutoRepeat="false" Enabled="false"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        if (Page.ShowDeviceContents)
+        {
+          AlbumQuery.DeviceId = [Page.DeviceId];
+        }
+      </Script>
+
+      <Script>
+        if (Page.ShowDeviceContents)
+        {
+          ContextMenu.Options = DeviceContextMenuOptions;
+          DeleteKey.Command = DeleteFromDevice;
+        }
+        else
+        {
+          ContextMenu.Options = LibraryContextMenuOptions;
+          Worker.ExecuteCommand = Play;
+        }
+      </Script>
+
+      
+
+      <Script>
+        [DeclareTrigger(Page.AllArtistsSelected)]
+        [DeclareTrigger(Page.SelectedArtistIds)]
+
+        if (Page.AllArtistsSelected || Page.SelectedArtistIds == null)
+        {
+          
+
+          AlbumQuery.ArtistIds = null;
+          AlbumQuery.ArtistId = -1;
+          AlbumQuery.MultiSelect = false;
+          SortData = me:AlbumsPanelData.MultipleArtistsSorts;
+        }
+        else
+        {
+          
+          
+          
+          
+          
+          
+          
+          
+          
+          
+
+          Int32 interval;
+
+          if (Page.SelectedArtistIds.Count == 1)
+          {
+            interval = 100;
+          }
+          else
+          {
+            interval = 250;
+          }
+
+          UpdateTimer.Stop();
+          UpdateTimer.Interval = interval;
+          UpdateTimer.Start();
+        }
+      </Script>
+
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(UpdateTimer.Tick)]
+        
+        List  artistIds   = null;
+        Int32 artistId    = -1;
+        bool  multiSelect = false;
+        
+        if (Page.SelectedArtistIds != null &amp;&amp; !Page.AllArtistsSelected)
+        {
+          if(Page.SelectedArtistIds.Count > 1)
+          {
+            artistIds   = Page.SelectedArtistIds;
+            multiSelect = true;
+          }
+          else
+          {
+            artistId = (int)Page.SelectedArtistIds.get_Item(0);
+          }
+        }
+        
+        
+        if (artistId != -1)
+        {
+          SortData = me:AlbumsPanelData.SingleArtistSorts;
+        }
+        else
+        {
+          SortData = me:AlbumsPanelData.MultipleArtistsSorts;
+        }
+
+        AlbumQuery.ArtistIds   = artistIds;
+        AlbumQuery.ArtistId    = artistId;
+        AlbumQuery.MultiSelect = multiSelect;
+      </Script>
+
+      
+      <Script>
+        zune:SortCommand sort = ((zune:SortCommand)[SortData.Sorts.Chosen]);
+        
+        SortChanged = AlbumQuery.Enabled;
+        AlbumQuery.Sort = sort.Sort;
+        SupportsJumpInList = sort.SupportsJumpInList;
+      </Script>
+
+      <Script>
+        
+        if (!String.IsNullOrEmpty([Page.SelectedArtistMediaId]))
+        {
+          BuyMoreButton.Visible = true;
+          BuyMoreCommand.Description = sys:String.Format(zune:Shell.LoadString(zune:StringId.IDS_BUY_MORE_ARTIST), Page.SelectedArtistName);
+          BuyMoreCommand.CommandArguments.set_Item("ArtistId", Page.SelectedArtistMediaId);
+        }
+        else
+        {
+          BuyMoreButton.Visible = false;
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Page.ArtistClicked.Invoked)]
+        [DeclareTrigger(Page.SelectedArtistIds)]
+
+        
+        SelectionManager.Clear();
+      </Script>
+      
+      
+      <Script>
+        AlbumQuery.Enabled = true;
+      </Script>
+
+      
+      <Script>
+        
+        Model.Content = [AlbumQuery.Result.Items];
+
+        
+        if (!SortChanged)
+        {
+          
+          
+          
+          
+          Page.AlbumsChanged.Invoke();
+        }
+        SortChanged = false;
+      </Script>
+
+      
+      <Script>
+        int count = [AlbumQuery.Result.Items.Count];
+        ToggleSelectAllCommand.Description = sys:String.Format(zune:Shell.LoadString(zune:StringId.IDS_ALBUMS_HEADER), count);
+        Page.AlbumsCount = count;
+      </Script>
+
+      <Script>
+        Page.AllAlbumsSelected = [SelectionManager.Count] == [AlbumQuery.Result.Items.Count];
+      </Script>
+      
+      <Script>
+        [DeclareTrigger(SelectionManager.SelectedItems)]
+        [DeclareTrigger(AlbumQuery.Result.Items.Count)]
+        
+        data:Album selectedAlbum = null;
+        
+        
+        if (AlbumQuery.Result.Items.Count == 1)
+          selectedAlbum = (data:Album)AlbumQuery.Result.Items.get_Item(0);
+        else if (SelectionManager.Count == 1)
+          selectedAlbum = (data:Album)SelectionManager.SelectedItem;
+          
+        if (selectedAlbum != null)
+          Page.AlbumArtistCount = selectedAlbum.DisplayArtistCount;
+        else
+          Page.AlbumArtistCount = 0;
+      </Script>
+
+      
+      <Script>
+        if ([ContextMenu.Helper.IsOpening])
+        {
+          
+          ChooseArt.Hidden = ([SelectionManager.Count] != 1);
+
+          
+          if (SelectionManager.SelectedItem is data:Album)
+          {
+            data:Album album = (data:Album)SelectionManager.SelectedItem;
+            if (album.HasAlbumArt)
+              ChooseArt.Description = zune:Shell.LoadString(zune:StringId.IDS_UPDATE_ALBUM_ART);
+            else
+              ChooseArt.Description = zune:Shell.LoadString(zune:StringId.IDS_ADD_ALBUM_ART);
+          }
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(ChooseArt.Invoked)]
+
+        if (SelectionManager.SelectedItem != null)
+        {
+          Updater = new zune:AlbumArtUpdateHandler(SelectionManager.SelectedItem);
+          Updater.Start();
+        }
+      </Script>
+      <Script>
+        if (Updater != null &amp;&amp;
+            [Updater.Done])
+        {
+          if (!sys:String.IsNullOrEmpty(Updater.Path))
+          {
+            data:Album album = (data:Album)Updater.Album;
+
+            album.ThumbnailPath = Updater.Path;
+          }
+
+          UI.DisposeOwnedObject(Updater);
+          Updater = null;
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      
+      <Panel Layout="Dock" Margins="0,0,-2,0">
+        <Children>
+
+          <core:ButtonWithIcon Name="BuyMoreButton" Model="{BuyMoreCommand}" Margins="10,0,0,0">
+            <Icon>
+             <core:Icon Name="Icon" Image="res://ZuneShellResources!Arrow.More.png" Margins="7,0,0,0"/>
+            </Icon>
+            <LayoutInput>
+              <DockLayoutInput Position="Bottom" Alignment="Near"/>
+            </LayoutInput>
+          </core:ButtonWithIcon>
+
+          <me:AlbumsGalleryPanelWorker Name="Worker" Model="{Model}" Page="{Page}"
+            ColumnInset="{ColumnInset}"
+            HeaderMargins="{HeaderMargins}"
+            HeaderPadding="{HeaderPadding}"
+            SelectionManager="{SelectionManager}"
+            NavigateIntoArgs="{NavigateIntoArgs}"
+            ContextMenu="{ContextMenu}"
+            EditContext="{EditContext}"
+            ToggleSelectAllCommand="{ToggleSelectAllCommand}"/>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="AlbumsGalleryPanelWorker" Base="gp:GalleryPanelWorker">
+    <Properties>
+      <zune:MusicLibraryPage Name="Page" MusicLibraryPage="$Required"/>
+      <Type Name="GalleryViewType" Type="{typeof(me:GalleryView)}"/>
+      <zune:AlbumsPanel Name="Model" AlbumsPanel="$Required"/>
+      <Size Name="LayoutSpacing" Size="20,6"/>
+      <Boolean Name="HighlightHeader" Boolean="true"/>
+    </Properties>
+
+    <Scripts>
+      <Script> Gallery.SelectedItemClicked = Page.AlbumClicked; </Script>
+
+      
+      <Script>
+        
+        [DeclareTrigger(((iris:VirtualList)Model.Content).Count)]
+
+        int count = 0;
+        if (Model.Content != null)
+          count = Model.Content.Count;
+
+        Size newTileSize;
+        bool largeTiles = (count &lt; 2);
+        if (largeTiles)
+          newTileSize = new Size(159,159);  
+        else
+          newTileSize = new Size(86,86);    
+
+        
+        if (Gallery.TileSize != newTileSize)
+        {
+          Gallery.TileSize = newTileSize;
+          Gallery.ForceRefresh();
+        }
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  <UI Name="GalleryView" Base="gp:GalleryView">
+    <Properties>
+      <Type Name="ThumbnailCaptionAreaType" Type="{typeof(me:AlbumGalleryCaptionArea)}"/>
+
+      <Type Name="LargeProviderType" Type="{typeof(me:LargeAlbumListItemProvider)}"/>
+      <Type Name="SmallProviderType" Type="{typeof(me:SmallAlbumListItemProvider)}"/>
+
+      <Type Name="NormalListItemType" Type="{typeof(me:AlbumThumbnailListItem)}"/>
+      <Type Name="SelectedListItemType" Type="{typeof(me:SelectedAlbumThumbnailListItem)}"/>
+
+      <Size Name="SizeThreshold" Size="86,86"/>
+      <StretchingPolicy Name="StretchingPolicy" StretchingPolicy="Uniform"/>
+      
+      <Size Name="LabelSize" Size="0,40"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+        if ([TileSize.Width] > SizeThreshold.Width ||
+            [TileSize.Height] > SizeThreshold.Height)
+        {
+          ListItemType = SelectedListItemType;
+          ProviderType = LargeProviderType;
+        }
+        else
+        {
+          ListItemType = NormalListItemType;
+          ProviderType = SmallProviderType;
+        }
+      </Script>
+      
+      <Script> Scroller.ShowNear = [ScrollData.CanScrollUp]; </Script>
+      <Script> Scroller.ShowFar = [ScrollData.CanScrollDown]; </Script>
+    </Scripts>
+  </UI>
+  
+  
+  
+  
+  <UI Name="AlbumThumbnailListItem" Base="list:ThumbnailListItemBase">
+  </UI>
+
+  
+  
+  
+  <UI Name="SelectedAlbumThumbnailListItem" Base="me:AlbumThumbnailListItem">
+    <Properties>
+      <Boolean Name="AlwaysDisplayAsSelected" Boolean="true"/>
+      <Int32 Name="BorderWidth" Int32="5"/>
+      <AnchorLayoutInput Name="LabelAnchor"
+          Left="TileBase,0" Right="TileBase,1" Horizontal="Near"
+          Top="TileBase,1,7" Bottom="TileBase,1,999" Vertical="Near"/>
+    </Properties>
+    <Scripts>
+      <Script>
+        Root.Padding = new Inset(0,10,0,0);
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  <UI Name="AlbumGalleryCaptionArea" Base="thumbbutton:ThumbnailCaptionArea">
+    <Properties>
+      <Type Name="PrimaryLabelType" Type="{typeof(thumbbutton:EditableLabelHost)}"/>
+    </Properties>
+  </UI>
+  
+  
+  
+  
+  
+  <Class Name="AlbumListItemProvider" Base="panels:ListItemProvider">
+    <Properties>
+      <data:Album Name="Model" Album="$Required"/>
+    </Properties>
+  
+    <Scripts>
+      <Script>
+        
+        
+        
+        List selectedArtists = ((zune:MusicLibraryPage)ListModel.LibraryPage).SelectedArtistIds;
+                 
+        if (!List.IsNullOrEmpty(selectedArtists) &amp;&amp; 
+             selectedArtists.Count == 1)
+        {
+          
+          int year = [Model.ReleaseDate].Year;
+        
+          
+          if (year == 1)
+            SecondaryLabel = zune:Shell.LoadString(zune:StringId.IDS_TYPE_UNKNOWN);
+          else
+            SecondaryLabel = year.ToString();
+        }
+        else
+        {
+          
+          
+          SecondaryLabel = [Model.ArtistName];
+        }
+      </Script>
+    </Scripts>
+  </Class>
+  
+  
+  
+  
+  
+  <Class Name="SmallAlbumListItemProvider" Base="me:AlbumListItemProvider">
+    <Scripts>
+      <Script>
+        Image = [Model.AlbumArtSmall];
+      </Script>
+    </Scripts>
+  </Class>
+
+  
+  
+  
+  <Class Name="LargeAlbumListItemProvider" Base="me:AlbumListItemProvider">
+    <Scripts>
+      <Script>
+        Image = [Model.AlbumArtLarge];
+      </Script>
+    </Scripts>
+  </Class>
+
+</UIX>
diff --git a/test/2.1/ANIMATEDICONBUTTON.UIX b/test/2.1/ANIMATEDICONBUTTON.UIX
new file mode 100644
index 0000000..18a28c2
--- /dev/null
+++ b/test/2.1/ANIMATEDICONBUTTON.UIX
@@ -0,0 +1,57 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:button="res://ZuneShellResources!Button.uix">
+
+  <UI Name="AnimatedIconButton" Base="button:IconButton">
+    <Properties>
+      <Boolean Name="Active" Boolean="False"/>
+      
+      <Animation Name="IconActiveAnimation" Animation="{null}"/>
+      <Animation Name="IconIdleAnimation"  Animation="{null}"/>
+    </Properties>
+
+    <Locals>
+      <iris:Choice Name="IconAnimationChoice">
+        <Options>
+          <String String="Active"/>
+          <String String="None"/>
+        </Options>
+      </iris:Choice>
+
+      <SwitchAnimation Name="ContentChangeAnimation" Type="ContentChangeShow" Expression="{IconAnimationChoice}">
+        <Options>
+          <Animation Name="Active" Animation="{IconActiveAnimation}"/>
+        </Options>
+      </SwitchAnimation>
+      <SwitchAnimation Name="IdleAnimation" Type="Idle" Expression="{IconAnimationChoice}">
+        <Options>
+          <Animation Name="Active" Animation="{IconIdleAnimation}"/>                  
+        </Options>
+      </SwitchAnimation>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        IconAnimationChoice.Chosen = "None";  
+
+        Background.AttachAnimation(ContentChangeAnimation);
+        Background.AttachAnimation(IdleAnimation);
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Background.Content)]
+        IconAnimationChoice.Chosen = "None";
+      </Script>
+
+      <Script>
+        if ([Active])
+          IconAnimationChoice.Chosen = "Active";
+        else
+          IconAnimationChoice.Chosen = "None";
+      </Script>
+    </Scripts>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/ANIMATIONS.UIX b/test/2.1/ANIMATIONS.UIX
new file mode 100644
index 0000000..d8f7412
--- /dev/null
+++ b/test/2.1/ANIMATIONS.UIX
@@ -0,0 +1,684 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:me="Me">
+
+  
+  <Class Name="AnimationState" Shared="true">
+    <Properties>
+      
+      <iris:BooleanChoice Name="InPageTransition" Value="false">
+        <Options>
+          <String String="Show"/>
+          <String String="PageShow"/>
+        </Options>
+      </iris:BooleanChoice>
+    </Properties>
+
+    <Locals>
+      <zune:Shell Name="Shell" Shell="{(zune:Shell)zune:Shell.DefaultInstance}"/>
+      <Timer Name="TransitionTimer" Interval="1500" AutoRepeat="false" Enabled="false"/>
+    </Locals>
+
+    <Scripts>
+      
+      <Script>
+        [DeclareTrigger(Shell.CurrentPage)]
+        InPageTransition.Value = true;
+        TransitionTimer.Start();
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(TransitionTimer.Tick)]
+        InPageTransition.Value = false;
+      </Script>
+    </Scripts>
+  </Class>
+
+  
+  <Class Name="Animations" Shared="True">
+    <Properties>
+      
+      <Interpolation Name="PopInterpolation" Type="Log" Weight="500.0" />
+      <Interpolation Name="SlideInterpolation" Type="Log" Weight="20000.0" />
+      <Interpolation Name="EaseInSlideInterpolation" Type="EaseIn" Weight="10" EasePercent="0.1"/>
+      <Interpolation Name="BezierPopInterpolation" Type="Bezier" BezierHandle1="1.0" BezierHandle2="1.5"/>
+      
+      <Single Name="PopLength" Single="0.5"/>
+      <Single Name="SlideLength" Single="2.75"/>
+      <Single Name="GalleryIndexFadeDelay" Single="0.05"/>
+      <Single Name="BasicAnimationLength" Single="{SlideLength}"/>
+      <Single Name="ShortAnimationLength" Single="0.5"/>
+
+      <Vector3 Name="BasicMoveSize" Vector3="-20,0,0"/>
+      <Vector3 Name="BasicGalleryItemMoveSize" Vector3="-5,0,0"/>
+      
+      
+      <Single Name="PageTransitionMaxLength" Single="1.5"/>
+
+      
+      
+      
+      
+      
+      <Animation Name="MoveNow" Type="Move">
+        <Keyframes>
+          <PositionKeyframe Time="0.00" RelativeTo="Current"/>
+          <PositionKeyframe Time="0.05" RelativeTo="Final"/>
+        </Keyframes>
+      </Animation>
+
+      
+      
+      
+      
+      <Animation Name="HideNow" Type="Hide">
+        <Keyframes>
+          <AlphaKeyframe Time="0.00" RelativeTo="Current"/>
+          <AlphaKeyframe Time="0.01" Value="0.0"/>
+        </Keyframes>
+      </Animation>
+      <Animation Name="ContentChangeHideNow" Type="ContentChangeHide">
+        <Keyframes>
+          <AlphaKeyframe Time="0.00" RelativeTo="Current"/>
+          <AlphaKeyframe Time="0.01" Value="0.0"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="BasicMove" Type="Move">
+        <Keyframes>
+          <PositionKeyframe Time="0" Value="0,0,0" RelativeTo="Current" Interpolation="{SlideInterpolation}"/>
+          <PositionKeyframe Time="{BasicAnimationLength}" Value="0,0,0" RelativeTo="Final"/>
+        </Keyframes>
+      </Animation>
+      
+      <Animation Name="BasicShowSlide" Type="Show">
+        <Keyframes>
+          <PositionKeyframe Time="0" Value="-10,0,0" Interpolation="{EaseInSlideInterpolation}"/>
+          <PositionKeyframe Time="{ShortAnimationLength}" Value="0,0,0" RelativeTo="Final"/>
+        </Keyframes>
+      </Animation>
+      
+      <Animation Name="BasicResize" Type="Size">
+        <Keyframes>
+          <SizeKeyframe Time="0" Value="0,0,0" RelativeTo="Current" Interpolation="{PopInterpolation}"/>
+          <SizeKeyframe Time="{BasicAnimationLength}" Value="0,0,0" RelativeTo="Final"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="BasicFadeIn" Type="Show">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="0.0" Interpolation="{PopInterpolation}"/>
+          <AlphaKeyframe Time="{PopLength}" Value="1.0"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="BasicFadeOut" Type="Hide">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="1.0" Interpolation="{PopInterpolation}"/>
+          <AlphaKeyframe Time="{PopLength}" Value="0.0"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="BasicPulse" Type="Idle" Loop="2">
+        <Keyframes>
+          <AlphaKeyframe Time="0" Value="1" Interpolation="SCurve"/>
+          <AlphaKeyframe Time="1" Value="0" Interpolation="SCurve"/>
+          <AlphaKeyframe Time="2" Value="1"/>
+        </Keyframes>
+      </Animation>
+      
+      <Animation Name="BasicContentChangeShow" Type="ContentChangeShow">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="0.2"/>
+          <AlphaKeyframe Time="0.2" Value="1.0"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="QuickContentChangeHide" Type="ContentChangeHide">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="1.0"/>
+          <AlphaKeyframe Time="0.1" Value="0.2"/>
+        </Keyframes>
+      </Animation>
+      
+      <Animation Name="QuickContentChangeShow" Type="ContentChangeShow">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="0.2"/>
+          <AlphaKeyframe Time="0.1" Value="1.0"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="BasicContentChangeHide" Type="ContentChangeHide">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="1.0"/>
+          <AlphaKeyframe Time="0.2" Value="0.2"/>
+        </Keyframes>
+      </Animation>
+      
+      
+      <Animation Name="ErrorOverlayPulse" Animation="{BasicPulse}"/>
+
+      
+      <Animation Name="MenuFadeIn" Type="Show">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="0.0" Interpolation="{PopInterpolation}"/>
+          <AlphaKeyframe Time="{PopLength}" Value="1.0"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="MenuFadeOut" Type="Hide">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="1.0" Interpolation="{PopInterpolation}"/>
+          <AlphaKeyframe Time="{PopLength}" Value="0.0"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="GalleryFadeIn" Type="Show">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="0.0" Interpolation="{PopInterpolation}"/>
+          <AlphaKeyframe Time="{PopLength}" Value="1.0"/>
+          <PositionKeyframe Time="0.0" Value="{BasicGalleryItemMoveSize}" RelativeTo="Current" Interpolation="{SlideInterpolation}"/>
+          <PositionKeyframe Time="{SlideLength}" Value="0,0,0" RelativeTo="Final"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="GalleryContentChangeFadeIn" Type="ContentChangeShow">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="0.0" Interpolation="{PopInterpolation}"/>
+          <AlphaKeyframe Time="{PopLength}" Value="1.0"/>
+          <PositionKeyframe Time="0.0" Value="{BasicGalleryItemMoveSize}" RelativeTo="Current" Interpolation="{SlideInterpolation}"/>
+          <PositionKeyframe Time="{SlideLength}" Value="0,0,0" RelativeTo="Final"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="GalleryContentChangeShow" Type="ContentChangeShow">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="0.0" Interpolation="{PopInterpolation}"/>
+          <AlphaKeyframe Time="{PopLength}" Value="1.0"/>
+          <PositionKeyframe Time="0.0" Value="{BasicGalleryItemMoveSize}" RelativeTo="Current" Interpolation="{SlideInterpolation}"/>
+          <PositionKeyframe Time="{SlideLength}" Value="0,0,0" RelativeTo="Final"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="GalleryMove" Type="Move">
+        <Keyframes>
+          <PositionKeyframe Time="0.0" Value="0,0,0" RelativeTo="Current" Interpolation="{SlideInterpolation}"/>
+          <PositionKeyframe Time="{SlideLength}" Value="0,0,0" RelativeTo="Final"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="ListFadeIn" Type="Show">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="0.0" Interpolation="{PopInterpolation}"/>
+          <AlphaKeyframe Time="{PopLength}" Value="1.0"/>
+          <PositionKeyframe Time="0.0" Value="{BasicMoveSize}" RelativeTo="Current" Interpolation="{SlideInterpolation}"/>
+          <PositionKeyframe Time="{SlideLength}" Value="0,0,0" RelativeTo="Final"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="ListContentChange" Type="ContentChangeShow">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="0.0" RelativeTo="Current" Interpolation="{PopInterpolation}"/>
+          <AlphaKeyframe Time="{PopLength}" Value="1.0"/>
+          <PositionKeyframe Time="0.0" Value="{BasicMoveSize}" Interpolation="{SlideInterpolation}"/>
+          <PositionKeyframe Time="{SlideLength}" Value="0,0,0" RelativeTo="Final"/>
+        </Keyframes>
+      </Animation>
+      
+      <Animation Name="MarketplacePopNSlide" Type="Show">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="0.0" Interpolation="EaseIn"/>
+          <AlphaKeyframe Time="{PopLength}" Value="1.0"/>
+          <PositionKeyframe Time="0.0" Value="{BasicMoveSize}" RelativeTo="Current" Interpolation="{SlideInterpolation}"/>
+          <PositionKeyframe Time="{SlideLength}" Value="0,0,0" RelativeTo="Final"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="MarketplacePop" Type="Show">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="0.0" Interpolation="EaseIn"/>
+          <AlphaKeyframe Time="{PopLength}" Value="1.0"/>
+        </Keyframes>
+      </Animation>
+      
+      
+      <Animation Name="MarketplacePopMove" Type="Move">
+        <Keyframes>
+          <PositionKeyframe Time="0.00" RelativeTo="Final"/>
+          <PositionKeyframe Time="0.01" RelativeTo="Final"/>
+          <AlphaKeyframe Time="0.0" Value="0.0" Interpolation="EaseIn"/>
+          <AlphaKeyframe Time="{PopLength}" Value="1.0"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="MarketplacePopNZoom" Type="Show" CenterPointPercent="0.5, 0.5, 0">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="0.0" Interpolation="EaseIn"/>
+          <AlphaKeyframe Time="{PopLength}" Value="1.0"/>
+          <ScaleKeyframe Time="0.0" Value="0.9,0.9,1" Interpolation="EaseIn"/>
+          <ScaleKeyframe Time="{PopLength}" Value="1,1,1"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="ButtonScale" Type="Scale" CenterPointPercent="0.5, 0.5, 0">
+        <Keyframes>
+          <ScaleKeyframe Time="0.0" RelativeTo="Current" Interpolation="Sine" />
+          <ScaleKeyframe Time="0.1" RelativeTo="Final"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="ButtonAlpha" Type="Alpha">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="1.0" RelativeTo="Current" Interpolation="Log, 20000.0"/>
+          <AlphaKeyframe Time="0.5" Value="1.0" RelativeTo="Final"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="FeaturedItemChangeShow" Type="ContentChangeShow">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="0.0" RelativeTo="Current" Interpolation="Log, 200.0"/>
+          <AlphaKeyframe Time="3" Value="1.0" RelativeTo="Final"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="ToolbarAlpha" Type="Alpha">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0"   Value="1.0" RelativeTo="Current" Interpolation="Sine"/>
+          <AlphaKeyframe Time="0.333" Value="1.0" RelativeTo="Final"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="DialogShow" Type="Show" CenterPointPercent="0.5,0.5,0.5">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="0.0" Interpolation="{PopInterpolation}"/>
+          <AlphaKeyframe Time="0.30" Value="1.0"/>
+          <ScaleKeyframe Time="0.0" Value="0.9,0.9,1.0" RelativeTo="Final" Interpolation="{BezierPopInterpolation}"/>
+          <ScaleKeyframe Time="0.30" Value="1,1,1" RelativeTo="Final"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="DialogHide" Type="Hide">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="1.0" Interpolation="Log"/>
+          <AlphaKeyframe Time="0.15" Value="0.0"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="SearchResultsExpand" Animation="{BasicFadeIn}" />
+
+      <Animation Name="ScrollBarFadeIn" Animation="{BasicFadeIn}" />
+
+      <Animation Name="ScrollBarFadeOut" Animation="{BasicFadeOut}" />
+
+      <Animation Name="PivotShowAnim" Type="Show">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="0.0" Interpolation="{EaseInSlideInterpolation}"/>
+          <AlphaKeyframe Time="1.5" Value="1.0"/>
+          <PositionKeyframe Time="0.0" Value="-10,0,0" RelativeTo="Final" Interpolation="{EaseInSlideInterpolation}"/>
+          <PositionKeyframe Time="1.0" Value="0,0,0" RelativeTo="Final"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="PivotHideAnim" Type="Hide">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="1.0" Interpolation="{PopInterpolation}"/>
+          <AlphaKeyframe Time="{PopLength}" Value="0.0"/>
+          <PositionKeyframe Time="0.0" Value="0,0,0" RelativeTo="Current" Interpolation="Exp, 1.0"/>
+          <PositionKeyframe Time="1.0" Value="-400,0,0" RelativeTo="Absolute"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="SlideShowImageChangeHide" CenterPointPercent="0.5,0.5,0.5" Type="ContentChangeHide">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="1.0" Interpolation="SCurve"/>
+          <AlphaKeyframe Time="0.75" Value="0.0"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="SlideShowImageChangeShow" CenterPointPercent="0.5,0.5,0.5"  Type="ContentChangeShow">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="0.0" Interpolation="SCurve"/>
+          <AlphaKeyframe Time="0.75" Value="1.0"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="SlideShowImageShow" CenterPointPercent="0.5,0.5,0.5"  Type="Show">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="0.0" Interpolation="SCurve"/>
+          <AlphaKeyframe Time="0.75" Value="1.0"/>
+        </Keyframes>
+      </Animation>
+
+      
+      
+      <Animation Name="MainBackgroundPageTransitionHide" Type="Hide">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="1.0" Interpolation="Linear"/>
+          <AlphaKeyframe Time="{PageTransitionMaxLength}" Value="1.0"/>
+        </Keyframes>
+      </Animation>
+
+      <TransformByAttributeAnimation Attribute="Index" Delay="{GalleryIndexFadeDelay}" Name="GalleryIndexFade" Source="{GalleryFadeIn}" />
+
+      <Animation Name="SettingsViewContentChange" Type="ContentChangeShow">
+        <Keyframes>
+          <PositionKeyframe Time="0" Value="{BasicMoveSize}" RelativeTo="Current" Interpolation="{SlideInterpolation}"/>
+          <PositionKeyframe Time="{SlideLength}" Value="0,0,0"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="SettingsViewShow" Type="Show">
+        <Keyframes>
+          <PositionKeyframe Time="0" Value="{BasicMoveSize}" RelativeTo="Current" Interpolation="{SlideInterpolation}"/>
+          <PositionKeyframe Time="{SlideLength}" Value="0,0,0"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="TitleContentChange" Type="ContentChangeShow">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="0.0" RelativeTo="Current" Interpolation="{PopInterpolation}" />
+          <AlphaKeyframe Time="5.0" Value="1.0" />
+          <PositionKeyframe Time="0.0" Value="-10,0,0" RelativeTo="Final" Interpolation="{SlideInterpolation}"/>
+          <PositionKeyframe Time="{SlideLength}" Value="0,0,0" RelativeTo="Final"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="TitleShow" Type="Show">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="0.0" RelativeTo="Current" Interpolation="{PopInterpolation}" />
+          <AlphaKeyframe Time="5.0" Value="1.0" />
+          <PositionKeyframe Time="0.0" Value="-10,0,0" RelativeTo="Final" Interpolation="{SlideInterpolation}"/>
+          <PositionKeyframe Time="{SlideLength}" Value="0,0,0" RelativeTo="Final"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="NowPlayingNotificationTrackTimeShow" Type="Show">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0"   Value="0.0"/>
+          <AlphaKeyframe Time="0.333" Value="0.0"/>
+          <AlphaKeyframe Time="0.666" Value="1.0"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="NowPlayingNotificationTrackTimeHide" Type="Hide">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="1.0" RelativeTo="Current"/>
+          <AlphaKeyframe Time="0.5" Value="0.0"/>
+        </Keyframes>
+      </Animation>
+  
+      <Animation Name="IconContentChange" CenterPointPercent="0.5,0.5,0.5">
+        <Keyframes>
+          <ScaleKeyframe Time="0.0" Value="0.7,0.7,1.0" RelativeTo="Final" Interpolation="{BezierPopInterpolation}"/>
+          <ScaleKeyframe Time="0.4" Value="1.0,1.0,1.0" RelativeTo="Final"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="IconPulse" CenterPointPercent="0.5,0.5,0.5" Loop="10">
+        <Keyframes>
+          <ScaleKeyframe Time="0.0" Value="1.0,1.0,1.0" RelativeTo="Final"/>
+          <ScaleKeyframe Time="0.3" Value="1.0,1.0,1.0" RelativeTo="Final" Interpolation="Sine"/>
+          <ScaleKeyframe Time="1.0" Value="1.2,1.2,1.0" RelativeTo="Final" Interpolation="Sine"/>
+          <ScaleKeyframe Time="2.0" Value="1.0,1.0,1.0" RelativeTo="Final" Interpolation="Sine"/>          
+        </Keyframes>
+      </Animation>
+      
+      <TransformAnimation Name="TextIconToggleShow" Delay="0.1">
+        <Source>
+          <Animation Type="Alpha" CenterPointPercent="0.5,0.5,0.5">
+            <Keyframes>
+              <AlphaKeyframe Time="0.0" RelativeTo="Current"/>
+              <AlphaKeyframe Time="0.2" RelativeTo="Final"/>
+              <ScaleKeyframe Time="0.0" Value="0.0,0.0,0.0" RelativeTo="Current"/>
+              <ScaleKeyframe Time="0.2" Value="1.0,1.0,1.0" RelativeTo="Absolute"/>                          
+            </Keyframes>
+          </Animation>
+        </Source>
+      </TransformAnimation>
+
+      
+      
+      
+      
+      <Animation Name="TextIconToggleHide" Type="Alpha" CenterPointPercent="0.5,0.5,0.5">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" RelativeTo="Current"/>
+          <AlphaKeyframe Time="0.2" RelativeTo="Final"/>
+          <ScaleKeyframe Time="0.0" Value="1.0,1.0,1.0" RelativeTo="Current"/>
+          <ScaleKeyframe Time="0.2" Value="0.0,0.0,0.0" RelativeTo="Absolute"/>                          
+        </Keyframes>
+      </Animation>
+
+      
+
+
+      <Animation Name="SpotlightFade" Type="Show" CenterPointPercent="0.5,0.5,1.0">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0"   Value="0.0" Interpolation="EaseIn,1.0,0.9"/>
+          <AlphaKeyframe Time="0.2"   Value="0.4" Interpolation="EaseOut,1.0,0.9"/>
+          <AlphaKeyframe Time="0.75"  Value="0.0"/>
+         </Keyframes>
+      </Animation>
+
+
+      
+
+      
+      <Single Name="NowPlayingGrid_MinDelay" Single="0.2"/>
+      <Single Name="NowPlayingGrid_DelayRange" Single="1.2"/>
+      <Single Name="NowPlayingGrid_MaxDelay" Single="{NowPlayingGrid_MinDelay + NowPlayingGrid_DelayRange}"/>
+      <Int32 Name="NowPlayingGrid_DelaySlices" Int32="{(int)(NowPlayingGrid_DelayRange * 10.0)}"/>
+      <Single Name="NowPlayingGrid_Length" Single="0.4"/>
+
+      
+      <Animation Name="NowPlayingGridShow" Type="Show" CenterPointPercent="0.5,0.5,1.0">
+        <Keyframes>
+          <ScaleKeyframe Time="0.0" Value="0.8,0.8,0.8" Interpolation="EaseIn,1.0"/>
+          <ScaleKeyframe Time="{NowPlayingGrid_Length}" Value="1.0,1.0,1.0"/>
+          <AlphaKeyframe Time="0.0" Value="0.0" Interpolation="EaseIn,0.5"/>
+          <AlphaKeyframe Time="{NowPlayingGrid_Length}" Value="1.0"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="NowPlayingGridSwapAlbumOut" Type="Hide">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="1.0" Interpolation="EaseOut,1.0"/>
+          <AlphaKeyframe Time="0.4" Value="0.0"/>
+        </Keyframes>
+      </Animation>
+      
+      <TransformAnimation Name="NowPlayingTitleContentShow" Delay="0.5">
+        <Source>
+          <Animation Type="ContentChangeShow">
+            <Keyframes>
+              <AlphaKeyframe Time="0.0" Value="0.0" Interpolation="EaseIn"/>
+              <AlphaKeyframe Time="1.0" Value="1.0"/>
+              <PositionKeyframe Time="0.0" Value="-20,0,0" Interpolation="EaseIn"/>
+              <PositionKeyframe Time="1.0" Value="0,0,0" RelativeTo="Final"/>
+            </Keyframes>
+          </Animation>
+        </Source>
+      </TransformAnimation>
+
+      <Animation Name="NowPlayingTitleContentHide" Type="ContentChangeHide">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" RelativeTo="Current" Interpolation="EaseOut"/>
+          <AlphaKeyframe Time="0.5" Value="0.0"/>
+          <PositionKeyframe Time="0.0" RelativeTo="Current" Interpolation="EaseOut"/>
+          <PositionKeyframe Time="0.5" Value="50,0,0" RelativeTo="Current"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="NowPlayingMoreInfoShow" Type="Show">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="0.0" Interpolation="EaseIn"/>
+          <AlphaKeyframe Time="1.0" Value="1.0"/>
+          <ScaleKeyframe Time="0.0" Value="0.9,0.7,1.0" Interpolation="EaseIn,1.0"/>
+          <ScaleKeyframe Time="0.4" Value="1.0,1.0,1.0"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="NowPlayingMoreInfoHide" Type="Hide">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" RelativeTo="Current" Interpolation="EaseOut"/>
+          <AlphaKeyframe Time="0.2" Value="0.0"/>
+        </Keyframes>
+      </Animation>
+      
+      <TransformAnimation Name="NowPlayingAlbumArtShow" Delay="1.3">
+        <Source>
+          <Animation Type="Show" CenterPointPercent="0.4,0.5,0.5">
+            <Keyframes>
+              <ScaleKeyframe Time="0.0" Value="0.9,0.9,1.0" Interpolation="EaseIn,1.0"/>
+              <ScaleKeyframe Time="0.4" Value="1.0,1.0,1.0"/>
+              <AlphaKeyframe Time="0.0" Value="0.0" Interpolation="EaseIn,0.5"/>
+              <AlphaKeyframe Time="0.4" Value="1.0"/>
+            </Keyframes>
+          </Animation>
+        </Source>
+      </TransformAnimation>
+
+      <Animation Name="NowPlayingAlbumArtContentShow" Type="ContentChangeShow" CenterPointPercent="0.2,0.5,0.5">
+        <Keyframes>
+          <ScaleKeyframe Time="0.0" Value="0.8,0.8,1.0" Interpolation="EaseIn,1.0"/>
+          <ScaleKeyframe Time="0.4" Value="1.0,1.0,1.0"/>
+          <AlphaKeyframe Time="0.0" Value="0.0" Interpolation="EaseIn,0.5"/>
+          <AlphaKeyframe Time="0.4" Value="1.0"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="NowPlayingTrackListShow" Type="Show" CenterPointPercent="0.5,0.5,0.5">
+        <Keyframes>
+          <ScaleKeyframe Time="0.0" Value="0.9,0.9,1.0" Interpolation="EaseIn,1.0"/>
+          <ScaleKeyframe Time="0.4" Value="1.0,1.0,1.0"/>
+          <AlphaKeyframe Time="0.0" Value="0.0" Interpolation="EaseIn,0.5"/>
+          <AlphaKeyframe Time="0.4" Value="1.0"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="NowPlayingPageFadeIn" Type="Show">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="0.0" Interpolation="Log"/>
+          <AlphaKeyframe Time="0.3" Value="1.0"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="NowPlayingPageFadeOut" Type="Hide">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" RelativeTo="Current" Interpolation="Log"/>
+          <AlphaKeyframe Time="0.3" Value="0.0"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="NowPlayingFadeIn" Type="Show">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="0.0" Interpolation="EaseIn"/>
+          <AlphaKeyframe Time="1.0" Value="1.0"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="NowPlayingFadeOut" Type="Hide">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" RelativeTo="Current" Interpolation="Log"/>
+          <AlphaKeyframe Time="1.0" Value="0.0"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="ComponentShow" Type="Show">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="0" Interpolation="EaseIn,1.5,0.8"/>
+          <AlphaKeyframe Time="0.3" Value="1.0"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="NowPlayingNotificationHide" Type="ContentChangeHide">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" RelativeTo="Current" Interpolation="EaseOut"/>
+          <AlphaKeyframe Time="0.5" Value="0.0"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="NowPlayingNotificationShow" Type="ContentChangeShow">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="0.0" Interpolation="EaseOut"/>
+          <AlphaKeyframe Time="0.5" RelativeTo="Current"  />
+        </Keyframes>
+      </Animation>
+      
+      
+      
+      <Animation Name="DeviceLandUIElementSlide" Type="Show">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="0.0"/>
+          <AlphaKeyframe Time="0.5" Value="1.0"/>
+          <PositionKeyframe Time="0.0" Value="{BasicMoveSize}" Interpolation="{SlideInterpolation}"/>
+          <PositionKeyframe Time="{SlideLength}" Value="0,0,0"/>
+        </Keyframes>
+      </Animation>
+      
+      
+      <Animation Name="DeviceFirmwareUpgrade" CenterPointPercent="0.5,0.5,0.5" Loop="4">
+        <Keyframes>
+          <ScaleKeyframe Time="0.0" Value="1,1,1" Interpolation="{BezierPopInterpolation}"/>
+          <ScaleKeyframe Time="0.2" Value="1.2,1.2,1.2"/>
+          <ScaleKeyframe Time="0.4" Value="1,1,1"/>
+          <ScaleKeyframe Time="1.0" Value="1,1,1"/>
+        </Keyframes>
+      </Animation>
+    </Properties>
+  </Class>
+  
+  
+  
+  
+  <Class Name="FlipAnimationHelper" Shared="true">
+    <Properties>
+      <Boolean Name="PlayFlipAnimation" Boolean="false"/>
+
+      
+      <Single Name="FlipLength" Single="0.3"/>
+      <Single Name="SlideLength" Single="0.5"/>
+      
+      <iris:BooleanChoice Name="ShowAnim">
+        <Options>
+          <String String="Flip"/>
+          <String String="Slide"/>
+        </Options>
+      </iris:BooleanChoice>
+      
+      <TransformAnimation Name="BasicSlideXForm" Delay="{FlipLength}" Source="{me:Animations.DeviceLandUIElementSlide}"/>
+
+      <SwitchAnimation Name="DeviceLandUIElementSwitch" Type="Show" Expression="{ShowAnim}">
+        <Options>
+          <TransformAnimation Name="Flip" TransformAnimation="{BasicSlideXForm}"/>
+          <Animation Name="Slide" Animation="{me:Animations.DeviceLandUIElementSlide}"/>
+        </Options>
+      </SwitchAnimation>
+    </Properties>
+
+    <Locals>
+      
+      
+      <Timer Name="AnimTimer" Enabled="false" AutoRepeat="false"/>    
+    </Locals>
+    
+    <Scripts>
+      <Script>
+        ShowAnim.Value = ![PlayFlipAnimation];
+        AnimTimer.Enabled = PlayFlipAnimation;
+        AnimTimer.Interval = (Int32)FlipLength * 1000;   
+      </Script>
+      <Script>
+        [DeclareTrigger(AnimTimer.Tick)]
+        PlayFlipAnimation = false;
+        AnimTimer.Enabled = false;
+      </Script>
+    </Scripts>
+  </Class>
+
+  <Class Name="CDAnimationHelper" Base="me:FlipAnimationHelper"/>
+</UIX>
diff --git a/test/2.1/ARTISTSPANEL.UIX b/test/2.1/ARTISTSPANEL.UIX
new file mode 100644
index 0000000..5955df3
--- /dev/null
+++ b/test/2.1/ARTISTSPANEL.UIX
@@ -0,0 +1,221 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:sys="assembly://mscorlib/System"
+  xmlns:data="res://ZuneShellResources!LibraryData.schema.xml"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:panels="res://ZuneShellResources!LibraryPanels.uix"
+  xmlns:spreadsheet="res://ZuneShellResources!SpreadSheetViewBase.uix"
+  xmlns:lv="res://ZuneShellResources!ListViewPanel.uix"
+  xmlns:lib="res://ZuneShellResources!Library.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:me="Me">
+
+  <Class Name="ArtistPanelData" Shared="true">
+    <Properties>
+      
+      <spreadsheet:ColumnData Name="ColumnData">
+        <Columns>
+          <spreadsheet:ColumnInfo HeaderType="{typeof(me:ArtistHeader)}"
+                                  CellType="{typeof(me:ArtistCell)}"
+                                  CellEditType="{typeof(me:ArtistEditCell)}"
+                                  Resizable="false"
+                                  CellPadding="26,0,5,0">
+            <LayoutInput>
+              <DockLayoutInput Position="Top"/>
+            </LayoutInput>
+          </spreadsheet:ColumnInfo>
+        </Columns>
+      </spreadsheet:ColumnData>
+      
+      
+
+      <iris:ArrayListDataSet Name="SortOptions">
+        <Source>
+          <zune:SortCommand Description="{zune:Shell.LoadString(zune:StringId.IDS_ASCENDING_SORT)}" Sort="+WM/AlbumArtist"  SupportsJumpInList="true"/>
+          <zune:SortCommand Description="{zune:Shell.LoadString(zune:StringId.IDS_DESCENDING_SORT)}" Sort="-WM/AlbumArtist" SupportsJumpInList="true"/>
+        </Source>
+      </iris:ArrayListDataSet>
+      
+      <panels:SortData Name="Sorts" Options="{SortOptions}" SaveKey="ArtistSort"/>
+    </Properties>
+  </Class>
+
+  
+  
+  
+  <UI Name="ArtistsPanel" Base="panels:LibraryPanelBase">
+    <Properties>
+      <zune:MusicLibraryPage Name="Page" MusicLibraryPage="$Required"/>
+      <zune:ArtistsPanel Name="Model" ArtistsPanel="$Required"/>
+      <panels:SortData Name="SortData" SortData="{me:ArtistPanelData.Sorts}"/>
+      
+      <spreadsheet:ColumnData Name="ColumnData" ColumnData="{me:ArtistPanelData.ColumnData}"/>
+      <Inset Name="ColumnMargin" Inset="18,0,0,0"/>
+    </Properties>
+
+    <Locals>
+      <data:LibraryArtistQuery Name="ArtistQuery" Enabled="false"
+        ShowDeviceContents="{Page.ShowDeviceContents}"/>
+
+      <List Name="LibraryContextMenuOptions">
+        <Source>
+          <iris:Command Command="{Play}"/>
+          <iris:Command Command="{AddToNowPlaying}"/>
+          <iris:Command Command="{AddToPlaylist}"/>
+          <iris:Command Command="{AddToBurnList}"/>
+          <core:MenuDivider/>
+          <iris:Command Command="{Edit}"/>
+          <iris:Command Command="{Delete}"/>
+          <core:MenuDivider MenuDivider="{SyncDivider}"/>
+          <iris:Command Command="{Sync}"/>
+          <iris:Command Command="{SyncAllUnexclude}"/>
+        </Source>
+      </List>
+
+      <List Name="DeviceContextMenuOptions">
+        <Source>
+          <iris:Command Command="{ReverseSync}"/>
+          <iris:Command Command="{DeleteFromDevice}"/>
+        </Source>
+      </List>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        if (Page.ShowDeviceContents)
+        {
+          ArtistQuery.DeviceId = [Page.DeviceId];
+        }
+      </Script>
+      
+      <Script>
+        if (Page.ShowDeviceContents)
+        {
+          ContextMenu.Options = DeviceContextMenuOptions;
+          DeleteKey.Command = DeleteFromDevice;
+          MinimumWidth = 65;
+          Worker.Margins = ColumnMargin;
+        }
+        else
+        {
+          ContextMenu.Options = LibraryContextMenuOptions;
+          Worker.ExecuteCommand = Play;
+        }
+      </Script>
+
+      
+      <Script>
+        zune:SortCommand sort = (zune:SortCommand)[SortData.Sorts.Chosen];
+
+        ArtistQuery.Sort = sort.Sort;
+        SupportsJumpInList = sort.SupportsJumpInList;
+      </Script>
+
+      <Script>
+        Worker.SupportsJumpInList = [SupportsJumpInList];
+      </Script>
+
+      
+      <Script>
+        ArtistQuery.Enabled = true;
+      </Script>
+
+      
+      <Script>
+        
+        Model.Content = [ArtistQuery.Result.Items];
+      </Script>
+      
+      <Script>
+        Page.IsEmpty = [ArtistQuery.Result.IsEmpty];
+      </Script>
+
+      <Script>Worker.Content = [Model.Content];</Script>
+
+      
+      <Script>
+        ToggleSelectAllCommand.Description = sys:String.Format(zune:Shell.LoadString(zune:StringId.IDS_ARTISTS_HEADER), [ArtistQuery.Result.Items.Count]);
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(SelectionManager.SelectedItems)]
+
+        if (SelectionManager.Count == 1)
+        {
+          data:Artist artist = (data:Artist)SelectionManager.SelectedItem;
+          Page.SetSelectedArtist(artist.Title, artist.MediaId);
+        }
+        else if (SelectionManager.SourceList != null)
+        {
+          
+          
+          
+          Page.SetSelectedArtist("", "");
+        }
+      </Script>
+      
+      <Script>
+        Page.AllArtistsSelected = [SelectionManager.Count] == [ArtistQuery.Result.Items.Count];
+      </Script>
+    </Scripts>
+
+    <Content>
+      
+      <spreadsheet:SpreadSheet Name="Worker"
+        ListModel="{ListModel}"
+        Content="{Model.Content}"
+        ColumnData="{ColumnData}"
+        NavigateIntoArgs="{NavigateIntoArgs}"
+        SelectionManager="{SelectionManager}"
+        ContextMenu="{ContextMenu}"
+        EditContext="{EditContext}"
+        AllowHorizontalScrolling="false"
+        HeaderSpacing="22"
+        SelectedItemClicked="{Page.ArtistClicked}"
+        Margins="-24,0,-2,0"
+        ScrollbarMargins="0,0,11,0"
+        LayoutSpacing="{styles:Styles.LibraryListLayoutSpacing}"
+        RowSize="{styles:Styles.LibraryListItemSize}"
+        RowPadding="{styles:Styles.LibraryListItemMargins}"
+        />
+    </Content>
+  </UI>
+
+
+  
+  <UI Name="ArtistHeader" Base="spreadsheet:Cell">
+    <Properties>
+      <lib:LibraryListModel Name="ListModel" LibraryListModel="$Required"/>
+    </Properties>
+    <Content>
+      <lv:ColumnPanelHeader ToggleSelectAll="{ListModel.ToggleSelectAllCommand}" Sorts="{ListModel.Sorts}"
+                            SizeToChildren="false"/>
+    </Content>
+  </UI>
+
+  
+  <UI Name="ArtistCell" Base="spreadsheet:LabelCell">
+    <Scripts>
+      <Script>Content = [((data:Artist)Model).Title];</Script>
+    </Scripts>
+  </UI>
+
+
+  
+  <UI Name="ArtistEditCell" Base="spreadsheet:LabelEditCell">
+    <Scripts>
+      <Script>
+        EditableText.Value = ((data:Artist)Model).Title;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(CommitValue.Invoked)]
+        ((data:Artist)Model).Title = EditableText.Value;
+      </Script>
+    </Scripts>
+  </UI>
+</UIX>
diff --git a/test/2.1/BOTTOMTOOLBAR.UIX b/test/2.1/BOTTOMTOOLBAR.UIX
new file mode 100644
index 0000000..9951563
--- /dev/null
+++ b/test/2.1/BOTTOMTOOLBAR.UIX
@@ -0,0 +1,1289 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX xmlns="http://schemas.microsoft.com/2007/uix"
+     xmlns:iris="assembly://UIX/Microsoft.Iris"
+     xmlns:core="res://ZuneShellResources!Controls.uix"
+     xmlns:tc="res://ZuneShellResources!TransportControls.uix"
+     xmlns:zune="assembly://ZuneShell/ZuneUI"
+     xmlns:sys="assembly://mscorlib/System" 
+     xmlns:notifications="res://ZuneShellResources!NotificationArea.uix"
+     xmlns:playlisticon="res://ZuneShellResources!PlaylistIcon.uix"
+     xmlns:addtosync="res://ZuneShellResources!AddToSync.uix"
+     xmlns:data="res://ZuneShellResources!LibraryData.schema.xml"
+     xmlns:mpdata="res://ZuneMarketplaceResources!MarketplaceData.schema.xml"
+     xmlns:cd="res://ZuneShellResources!CDState.uix"
+     xmlns:icons="res://ZuneShellResources!DeviceIcons.uix"
+     xmlns:dbapi="assembly://ZuneDBApi/"
+     xmlns:animations="res://ZuneShellResources!Animations.uix"
+     xmlns:styles="res://ZuneShellResources!Styles.uix" 
+     xmlns:zuneutil="assembly://ZuneShell/Microsoft.Zune.Util"
+     xmlns:zuneutilapi="assembly://ZuneDBApi/Microsoft.Zune.Util"
+     xmlns:syncAnim="res://ZuneShellResources!SyncAnimation.uix"
+     xmlns:devstatus="res://ZuneShellResources!DeviceStatus.uix"
+     xmlns:me="Me">
+
+  
+  <UI Name="BottomToolbar">
+    <Properties>
+      <zune:Shell Name="Shell" Shell="$Required"/>
+      <Boolean Name="InvisibleMode"/>
+    </Properties>
+
+    <Locals>
+      <zune:ZunePage Name="Page" ZunePage="{null}" />
+      <icons:DeviceIcons Name="DeviceIcons" DeviceIcons="{icons:DeviceIconWrapper.DeviceIcons}"/>
+      
+      
+
+
+
+
+      <FormLayoutInput Name="TransportAlignment" Left="Parent,0" Right="Parent,1" Top="Parent,0" Bottom="Parent,1,-5" Vertical="Center" Horizontal="Center"/>
+      <FormLayoutInput Name="LandAlignment" Left="IconContainer,1,12" Right="LandCustomBar,0,-24" Top="Parent,0" Bottom="Parent,1,-5" Vertical="Center" Horizontal="Center"/>
+      <FormLayoutInput Name="WideAlignment" Left="IconContainer,1,12" Right="Parent,1" Top="Parent,0" Bottom="Parent,1,-5" Vertical="Center" Horizontal="Center"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        Page = [Shell.CurrentPage];
+
+        zune:CategoryPage categoryPage = null;
+        if (Page is zune:CategoryPage)
+        {
+          categoryPage = (zune:CategoryPage) Page;
+        }
+        ManagementButtons.Visible = (categoryPage != null);
+        ManagementButtons.Page = categoryPage;
+
+        if (Page is zune:LibraryPage)
+        {
+          DeviceIcon.MediaType = ((zune:LibraryPage) Page).MediaType;
+        }
+        else
+        {
+          DeviceIcon.MediaType = zune:MediaType.Undefined;
+        }
+      </Script>
+      <Script>
+        NotificationArea.Visible = [Page.NotificationAreaVisible];
+      </Script>
+
+      <Script>
+        if ([Page.BottomBarUI] != null)
+        {
+          
+
+          LandCustomBar.RequestSource(Page.BottomBarUI, "Shell", Shell, "Page", Page);
+          NotificationArea.LayoutInput = LandAlignment;
+
+          TransportControls.Visible = false;
+        }
+        else
+        {
+          LandCustomBar.RequestSource(null);
+
+          if ([Page.TransportControlStyle] == zune:TransportControlStyle.Music ||
+               Page.TransportControlStyle == zune:TransportControlStyle.Video ||
+               Page.TransportControlStyle == zune:TransportControlStyle.Photo)
+          {
+             TransportControls.Visible = true;
+             TransportControls.Style = Page.TransportControlStyle;
+             NotificationArea.LayoutInput = TransportAlignment;
+          }
+          else
+          {
+             
+
+             NotificationArea.LayoutInput = WideAlignment;
+             TransportControls.Visible = false;
+          }
+        }
+      </Script>
+
+      <Script>
+        zune:ComputerIconState computerIcon = [Shell.CurrentPage.ShowComputerIcon];
+
+        if (computerIcon == zune:ComputerIconState.Hide)
+        {
+          ComputerIcon.Visible = false;
+          
+          ToolbarLabel.Style = styles:SharedStyles.ToolbarDarkStyle;
+        }
+        else 
+        {
+          ComputerIcon.Visible = true;
+          ComputerIcon.DropTarget = (computerIcon == zune:ComputerIconState.ShowAsDropTarget);
+
+          
+          if (DeviceIcons.Current.DarkColor)
+          {
+            ToolbarLabel.Style = styles:SharedStyles.ToolbarLightStyle;
+          }
+          else
+          {
+            ToolbarLabel.Style = styles:SharedStyles.ToolbarDarkStyle;
+          }
+        }
+      </Script>
+
+      <Script>
+        DeviceIcon.Alpha = (float)[Shell.CurrentPage.ShowDeviceIcon];
+        
+        DeviceIcon.InputEnabled = Shell.CurrentPage.ShowDeviceIcon;
+      </Script>
+
+      <Script>
+        PlaylistIcon.Visible = [Shell.CurrentPage.ShowPlaylistIcon];
+      </Script>
+
+      <Script>
+        CDIcon.Visible = [Shell.CurrentPage.ShowCDIcon];
+      </Script>
+
+      <Script>
+        styles:WindowState.BottomToolbarInputActivity = [UI.DeepMouseFocus];
+      </Script>
+
+      <Script>
+        bool hidden = [InvisibleMode];
+
+        float alpha = 1.0;
+        if (hidden)
+        {
+          alpha = 0.0;
+        }
+
+        Body.Alpha = alpha;
+      </Script>
+      
+      <Script>
+        String barText = null;        
+        if (!String.IsNullOrEmpty([PlaylistIcon.ToolbarText]))
+        {
+          barText = PlaylistIcon.ToolbarText;
+        }        
+        else if (!String.IsNullOrEmpty([DeviceIcon.ToolbarText]))
+        {
+          barText = DeviceIcon.ToolbarText;
+        }        
+        else if (!String.IsNullOrEmpty([CDIcon.ToolbarText]))
+        {
+          barText = CDIcon.ToolbarText;
+        }
+        else if (!String.IsNullOrEmpty([ComputerIcon.ToolbarText]))
+        {
+          barText = ComputerIcon.ToolbarText;
+        }       
+
+        
+        if (barText == null)
+        {
+          CDIcon.ShowText = true;
+          DeviceIcon.ShowText = true;
+          barText = "";
+        }
+        else
+        {
+          CDIcon.ShowText = false;
+          DeviceIcon.ShowText = false;
+        }
+        
+        ToolbarLabel.Content = barText;        
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Name="Body" Layout="Center" MaximumSize="0,90" Padding="0,0,0,0">
+        <Animations>
+          <Animation Animation="{animations:Animations.ToolbarAlpha}"/>
+        </Animations>
+
+        <Children>
+
+          <Panel Name="NormalBottomBar" Layout="Form">
+            <Children>
+              <Panel Name="IconContainer" Margins="46,15,0,10">
+                <Layout>
+                  <DockLayout DefaultLayoutInput="Left,Near"/>
+                </Layout>
+                <Children>
+
+                  <me:ComputerIcon Name="ComputerIcon" Shell="{Shell}" Margins="10,0,0,0"/>
+
+                  <me:DeviceIcon Name="DeviceIcon" Shell="{Shell}" />
+                  
+                  <me:CDIcon Name="CDIcon" Shell="{Shell}" />
+
+                  <playlisticon:PlaylistIcon Name="PlaylistIcon"/>
+
+                </Children>
+              </Panel>
+
+              <notifications:NotificationArea Name="NotificationArea">
+                <LayoutInput>
+                  <FormLayoutInput Vertical="Near"/>
+                </LayoutInput>
+              </notifications:NotificationArea>
+
+              <Host Name="LandCustomBar">
+                <LayoutInput>
+                  <FormLayoutInput Top="Parent,0" Horizontal="Center" Vertical="Center"/>
+                </LayoutInput>
+              </Host>
+
+              <me:ManagementButtons Name="ManagementButtons" Margins="0,0,50,0">
+                <LayoutInput>
+                  <FormLayoutInput Vertical="Center" Horizontal="Far" />
+                </LayoutInput>
+              </me:ManagementButtons>
+
+              <tc:TransportControls Name="TransportControls" Visible="false">
+                <LayoutInput>
+                  <FormLayoutInput Top="Parent,0,-3" Right="Parent,1" Vertical="Center"/>
+                </LayoutInput>
+              </tc:TransportControls>
+
+              <core:Label Name="ToolbarLabel"
+                  ShowToolTipWhenClipped="false"
+                  Style="{styles:SharedStyles.ToolbarDarkStyle}" 
+                  MaximumSize="400,0"
+                  >
+                <LayoutInput>
+                  <FormLayoutInput Left="IconContainer,0,50" Top="IconContainer,1,-30" ContributesToWidth="false" ContributesToHeight="false"/>
+                </LayoutInput>
+                <NamedStyles>
+                  <TextStyle Name="b" TextStyle="{styles:SharedStyles.IconNotificationBold}"/>
+                </NamedStyles>
+              </core:Label>
+
+            </Children>
+          </Panel>
+
+          <me:NowPlayingAnimation Shell="{Shell}"/>
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+
+
+  <UI Name="ManagementButtons">
+    <Properties>
+      <zune:CategoryPage Name="Page" CategoryPage="{null}"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+        [DeclareTrigger(Page.NextButton)]
+        [DeclareTrigger(Page.CancelButton)]
+
+        if ([Page] != null)
+        {
+          BackButton.Visible  = [Page.IsWizard];
+          
+          NextButton.Visible  = Page.IsWizard &amp;&amp; ![Page.DoneButton.Available]; 
+          ApplyButton.Visible = !Page.IsWizard &amp;&amp; [Page.ApplyButton.Available];
+          DoneButton.Visible  = [Page.DoneButton.Available];
+          
+          BackButton.Model   = Page.BackButton;
+          NextButton.Model   = Page.NextButton;
+          ApplyButton.Model  = Page.ApplyButton;
+          DoneButton.Model   = Page.DoneButton;
+          CancelButton.Model = Page.CancelButton;
+        }
+        else
+        {
+          
+          BackButton.Model   = null;
+          NextButton.Model   = null;
+          ApplyButton.Model  = null;
+          DoneButton.Model   = null;
+          CancelButton.Model = null;
+        }
+      </Script>
+    </Scripts>
+    
+    <Content>
+      <Panel Name="ButtonNavigation" Padding="0,0,10,0">
+        <Layout>
+          <FlowLayout Orientation="Horizontal" Spacing="5,0" StripAlignment="Far" ItemAlignment="Center"/>
+        </Layout>
+        <Children>
+          <core:BigActionButton Name="BackButton"   Model="{null}"/>
+          <core:BigActionButton Name="NextButton"   Model="{null}"/>
+          <core:BigActionButton Name="ApplyButton"  Model="{null}"/>
+          <core:BigActionButton Name="DoneButton"   Model="{null}"/>
+          <core:BigActionButton Name="CancelButton" Model="{null}"/>
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+
+
+
+
+  <UI Name="ComputerIcon" Base="core:ToolbarIconBase">
+    <Properties>
+      <zune:Shell Name="Shell" Shell="$Required"/>
+      <bool Name="DropTarget" bool="true" />
+    </Properties>
+    
+    <Locals>
+      <Image Name="ReverseSync" Source="res://ZuneShellResources!Icon.ReverseSync.png"/>  
+      <Image Name="ReverseSyncDrag" Source="res://ZuneShellResources!Icon.ReverseSync.Drag.png"/>  
+    </Locals>
+    
+    <Scripts>
+      <Script>
+        [DeclareTrigger(Target.DragEnter)]
+        Object value = Target.GetValue();
+        
+        if (zune:SyncControls.Instance.CurrentDeviceExists)
+        {
+          List items = null;
+          if (value is List)
+          {
+             items = (List)value;
+          } 
+          else if (value is mpdata:PlaylistData)
+          {
+             items = ((mpdata:PlaylistData)value).Tracks;
+          } 
+          else if (value is SelectionManager)
+          { 
+             items = ((SelectionManager)value).SelectedItems;
+          }
+
+          Target.AllowedDropActions = DropAction.None;
+
+          if (items != null &amp;&amp; items.Count > 0)
+          {
+            Target.AllowedDropActions = DropAction.Copy;
+
+            foreach(Object item in items)
+            {
+              if (!(item is data:Media))
+              {
+                Target.AllowedDropActions = DropAction.None;
+              }
+            }
+          }
+        }
+      </Script>
+
+      <Script>
+        if (![Target.Dragging])
+          Target.AllowedDropActions = DropAction.None;
+      </Script>
+      
+      <Script>
+        Target.Enabled = [DropTarget];
+        zune:StringId id = zune:StringId.IDS_COMPUTER_ICON_TOOLTIP;
+        if (DropTarget)
+        {
+          id = zune:StringId.IDS_COMPUTER_ICON_DROP_TARGET_TOOLTIP;
+        }
+        ToolbarActiveText = zune:Shell.LoadString(id);
+        ToolbarInactiveText = ToolbarActiveText;
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(Target.Dropped)]
+        object value = Target.GetValue();
+
+        List items = null;
+        if (value is List)
+        {
+           items = (List)value;
+        } 
+        else if (value is mpdata:PlaylistData)
+        {
+           items = ((mpdata:PlaylistData)value).Tracks;
+        } 
+        else if (value is SelectionManager)
+        { 
+           items = ((SelectionManager)value).SelectedItems;
+        }
+
+        if (items != null &amp;&amp; items.Count > 0)
+        {
+          zune:SyncControls.Instance.ReverseSync(items);
+        }
+
+        zuneutil:SQMLog.Log(zuneutilapi:SQMDataId.ComputerLogoDrops, 1);
+      </Script>
+      
+      <Script>
+        if ([Target.Dragging] &amp;&amp; [Target.AllowedDropActions] != DropAction.None)
+          Button.Image = ReverseSyncDrag;
+        else
+          Button.Image = ReverseSync;
+      </Script>
+    </Scripts>
+    <Content>
+
+      <core:IconButton Name="Button" 
+                 Model="{Shell.MainFrame.Collection}" 
+                 ToolTipEnabled="false"
+                 HoverImage="res://ZuneShellResources!Icon.ReverseSync.Hover.png"
+                 PressedImage="res://ZuneShellResources!Icon.ReverseSync.Pressed.png"
+                 DisabledImage="{null}"
+                 Navigation="TabGroup"/>
+
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="PercentageIcon" Base="core:ToolbarIconBase">
+    <Properties>
+      <bool Name="ShowText" bool="true" />
+      <zune:ProgressNotification Name="Notification" ProgressNotification="{null}" />
+      <Image Name="DisabledImage" Image="{null}"/>
+      <Image Name="Image" Image="{null}"/>
+      <Image Name="HoverImage" Image="{null}"/>
+      
+      <zune:Shell Name="Shell" Shell="$Required"/>
+    </Properties>
+    <Locals>
+      
+      <iris:Command Name="Model"/>
+    </Locals>
+    <Scripts>
+      <Script>
+         
+         Percentage.Visible = [ShowText];
+      </Script>
+      <Script>
+         
+         if (Notification != null)
+         {
+           Percentage.Content = notifications:Strings.Percentage.Format([Notification.Percentage]);
+         }
+         else
+         {
+           Percentage.Content = null;
+         }
+      </Script>
+      <Script>
+        if ([Percentage.Content] != null)
+        {
+          Button.AccessibleDescription = Percentage.Content;
+        }
+        else
+        {
+          Button.AccessibleDescription = [ToolbarInactiveText];
+        }
+      </Script>
+      
+    </Scripts>
+
+    
+    
+    <Content>
+      <Panel>
+        <Layout>
+          <FlowLayout Orientation="Vertical" ItemAlignment="Center"/>
+        </Layout>
+        <Children>
+          <core:IconButton Name="Button"            
+            DisabledImage="{DisabledImage}"
+            Image="{Image}"
+            HoverImage="{HoverImage}"
+            Model="{Model}"
+            Navigation="TabGroup"/>
+
+          <core:Label Name="Percentage"/>
+        </Children>
+      </Panel>
+    </Content>
+    
+  </UI>
+  
+  <UI Name="DeviceIcon" Base="me:PercentageIcon">
+    <Properties>
+      <zune:MediaType Name="MediaType" MediaType="{zune:MediaType.Undefined}" />
+    </Properties>
+    <Locals>
+      <core:ContextMenu Name="ContextMenu">
+        <Options>
+          <iris:Command Command="{zune:SyncControls.Instance.StartSyncCommand}"/>
+          <iris:Command Command="{zune:SyncControls.Instance.StopSyncCommand}"/>
+        </Options>
+      </core:ContextMenu>
+
+      <icons:DeviceIcons Name="DeviceIcons" DeviceIcons="{icons:DeviceIconWrapper.DeviceIcons}"/>
+
+      <addtosync:AddToSync Name="AddToSync" AddToSync="{null}"/>
+      <Boolean Name="PlayFirmwareUpgradeAnimation" Boolean="true"/>
+    </Locals>
+
+    <Input>
+      <ClickHandler Name="RightClick" ClickType="RightMouse" HandlerStage="Bubbled"/>
+    </Input>
+
+    <Scripts>
+      <Script>
+        Notification = [zune:SyncControls.Instance.Notification];
+      </Script>
+     <Script>
+        ToolbarInactiveText = zune:Shell.LoadString(zune:StringId.IDS_BOTTOM_TOOLBAR_NO_DEVICE);
+      </Script>
+
+      <Script>
+        if ((MediaType == zune:MediaType.Undefined) || zune:SyncControls.Instance.GetSyncAll([MediaType]))
+        {
+            ToolbarActiveText = zune:Shell.LoadString(zune:StringId.IDS_BOTTOM_TOOLBAR_DEVICE_AUTO);
+        }
+        else
+        {
+            ToolbarActiveText = sys:String.Format(zune:Shell.LoadString(zune:StringId.IDS_BOTTOM_TOOLBAR_DEVICE_MANUAL), [zune:SyncControls.Instance.CurrentDeviceName]);
+        }
+      </Script>
+
+      <Script>
+        if ([zune:SyncControls.Instance.CurrentDeviceSyncing])
+        {
+          Button.Image = [DeviceIcons.Current.Syncing.Default];
+          Button.HoverImage = [DeviceIcons.Current.Syncing.Default];
+          Button.PressedImage = [DeviceIcons.Current.Syncing.Default];
+          IsActive = true;
+        }
+        else if ([zune:Management.Instance.AlertedDeviceCategory] != null) 
+        {
+          Button.Image = [DeviceIcons.Current.Connected.Default];
+          Button.HoverImage = [DeviceIcons.Current.Connected.Hover];
+          Button.PressedImage = [DeviceIcons.Current.Connected.Click];
+          
+          
+          if(PlayFirmwareUpgradeAnimation)
+          {
+            IconPanel.PlayAnimation(animations:Animations.DeviceFirmwareUpgrade);
+            PlayFirmwareUpgradeAnimation = false;
+          }
+          IsActive = true;
+        }
+        else if ([zune:SyncControls.Instance.CurrentDeviceConnected])
+        {
+          Button.Image = [DeviceIcons.Current.Connected.Default];
+          Button.HoverImage = [DeviceIcons.Current.Connected.Hover];
+          Button.PressedImage = [DeviceIcons.Current.Connected.Click];
+          IsActive = true;
+        }
+        else
+        {
+          Button.Image = [DeviceIcons.Current.Disconnected.Default];
+          Button.HoverImage = [DeviceIcons.Current.Disconnected.Hover];
+          Button.PressedImage = [DeviceIcons.Current.Disconnected.Click];
+          IsActive = false;
+        }
+      </Script>
+      
+      <Script>
+        SyncAnimation.Alpha = (float)([Shell.AmbientAnimations] &amp;&amp; [zune:SyncControls.Instance.CurrentDeviceSyncing]);
+      </Script>
+      
+      
+      <Script>
+        <![CDATA[
+        [DeclareTrigger(Target.DragEnter)]
+        Object value = Target.GetValue();
+         
+        if (zune:SyncControls.Instance.CurrentDeviceExists)
+        {         
+          List items = null;
+          if (value is List)
+          {
+             items = (List)value;
+          } 
+          else if (value is mpdata:PlaylistData)
+          {
+             items = ((mpdata:PlaylistData)value).Tracks;
+          } 
+          else if (value is SelectionManager)
+          { 
+             items = ((SelectionManager)value).SelectedItems;
+          }
+
+          Target.AllowedDropActions = DropAction.None;
+
+          if (items != null && items.Count > 0)
+          {
+            Target.AllowedDropActions = DropAction.Copy;
+            
+            foreach(Object item in items)
+            {
+              if (item is data:PodcastEpisode &&
+                         ((data:PodcastEpisode)item).DownloadState != zune:EpisodeDownloadCommand.ConvertDownloadStatusToInt(dbapi:EEpisodeDownloadState.eDownloadStateDownloaded))
+              {
+                
+                Target.AllowedDropActions = DropAction.None;
+              }
+              else if (item is mpdata:Track)
+              {
+                if (!zune:SyncControls.Instance.CurrentDeviceIsGuest &&
+                    zune:SyncControls.Instance.GetSyncAll(zune:MediaType.Track) )
+                {
+                  Target.AllowedDropActions = DropAction.None;
+                }
+                else if (!((mpdata:Track)item).InCollection &&
+                         !((mpdata:Track)item).IsDownloading &&
+                         !((mpdata:Track)item).CanDownload &&
+                         !((mpdata:Track)item).CanPurchase)
+                {
+                  
+                  Target.AllowedDropActions = DropAction.None;
+                }
+              }
+              else if (item is mpdata:Album)
+              {
+                if (!zune:SyncControls.Instance.CurrentDeviceIsGuest &&
+                    zune:SyncControls.Instance.GetSyncAll(zune:MediaType.Track) )
+                {
+                  Target.AllowedDropActions = DropAction.None;
+                }
+              }
+              else if (!(item is data:Media))
+              {
+                Target.AllowedDropActions = DropAction.None;
+              }
+            }
+          }
+        }
+        ]]>
+      </Script>
+
+      <Script>
+        <![CDATA[
+          
+          if ([Target.Dragging] && [Target.AllowedDropActions] != DropAction.None)
+          {
+              
+              if ([zune:SyncControls.Instance.CurrentDeviceConnected] && ![zune:SyncControls.Instance.CurrentDeviceSyncing])
+              {            
+                Button.Image = [DeviceIcons.Current.Connected.Drag];
+              }
+              
+              else if (![zune:SyncControls.Instance.CurrentDeviceSyncing])
+              {
+                Button.Image = [DeviceIcons.Current.Disconnected.Drag];
+              }
+          }
+          else
+          {
+              Target.AllowedDropActions = DropAction.None; 
+              
+              
+              if ([zune:SyncControls.Instance.CurrentDeviceConnected] && ![zune:SyncControls.Instance.CurrentDeviceSyncing])
+              {            
+                Button.Image = [DeviceIcons.Current.Connected.Default];
+                Button.PlayAnimation(animations:Animations.IconContentChange);
+              }
+              
+              else if (![zune:SyncControls.Instance.CurrentDeviceSyncing])
+              {
+                Button.Image = [DeviceIcons.Current.Disconnected.Default];
+              }
+          }
+        ]]>
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Target.Dropped)]
+
+        object value = Target.GetValue();
+  
+        List items = null;
+        String playlistName = null;
+        if (value is List)
+        {
+           items = (List)value;
+        } 
+        else if (value is mpdata:PlaylistData)
+        {
+           items = ((mpdata:PlaylistData)value).Tracks;
+           playlistName = ((mpdata:PlaylistData)value).Title;
+        }
+        else if (value is SelectionManager)
+        { 
+           items = ((SelectionManager)value).SelectedItems;
+        }
+
+        if (items != null &amp;&amp; items.Count > 0)
+        {
+          
+          
+          
+          
+          
+          Object item = items.GetItem(0);
+          
+          
+          if (
+               item is data:Media &amp;&amp; 
+            
+               !zune:SyncControls.Instance.CurrentDeviceIsGuest &amp;&amp; 
+               
+               (
+                 
+                 (item is data:PlaylistContentItem &amp;&amp; zune:SyncControls.Instance.GetSyncAll(((data:PlaylistContentItem)item).MediaType))
+                 
+                 ||
+
+                 
+                 zune:SyncControls.Instance.GetSyncAll(zune:Shell.MapStringToMediaType(((data:Media)item).Type))
+               )
+             )
+          {
+            zune:SyncControls.Instance.Unexclude(items);
+          }
+          else
+          {
+            if (AddToSync == null) AddToSync = new addtosync:AddToSync();
+            AddToSync.Items = items;
+            AddToSync.PlaylistName = playlistName;
+            AddToSync.Start.Invoke();
+          }
+        }
+
+        zuneutil:SQMLog.Log(zuneutilapi:SQMDataId.DeviceLogoDrops, 1);    
+      </Script>
+
+      
+      
+      <Script>
+        [DeclareTrigger(RightClick.Invoked)]
+
+        if (zune:SyncControls.Instance.CurrentDeviceConnected)
+        {
+          ContextMenu.LayoutInput = new PopupLayoutInput();
+          ContextMenu.LayoutInput.Placement = PlacementMode.MouseOrigin;
+          ContextMenu.Helper.Show(ContextMenu);
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(Model.Invoked)]
+        zune:Shell.MainFrame.Device.Invoke();
+  
+        devstatus:AnimationHelper.PlayFlipAnimation = true;
+        zuneutil:SQMLog.Log(zuneutilapi:SQMDataId.DeviceLogoClicks, 1);
+      </Script>
+    </Scripts>
+  
+    <Content>
+      <Panel Layout="Anchor">
+        <Children>
+
+          <Panel Name="IconPanel" Layout="Anchor">
+            <LayoutInput>
+              <AnchorLayoutInput Top="Parent,0" Left="Parent,0"/>
+            </LayoutInput>
+
+            <Children>
+              <syncAnim:SyncAnimation Name="SyncAnimation">
+                <LayoutInput>
+                  <AnchorLayoutInput Left="Button,0.27" Top="Button,0.22" Right="Button,0.75" Bottom="Button,0.6,-4" />
+                </LayoutInput>
+              </syncAnim:SyncAnimation>
+
+              <core:IconButton Name="Button"
+                Image="{DeviceIcons.Current.Disconnected.Default}"
+                DisabledImage="{null}"
+                HoverImage="{DeviceIcons.Current.Disconnected.Hover}"
+                Model="{Model}"
+                Navigation="TabGroup">
+
+                <LayoutInput>
+                  <AnchorLayoutInput Left="Parent,0" Top="Parent,0"/>
+                </LayoutInput>
+              </core:IconButton>
+
+            </Children>
+          </Panel>
+          
+          <core:Label Name="Percentage">
+            <LayoutInput>
+              <AnchorLayoutInput Left="IconPanel,0.3" Top="IconPanel,1"/>
+            </LayoutInput>
+          </core:Label>
+
+        </Children>
+      </Panel>
+          
+    </Content>
+  </UI>
+
+  <UI Name="CDIcon" Base="me:PercentageIcon">
+    <Locals>
+      <cd:CDState Name="CDState" />
+
+      <Image Name="BurnIcon" Source="res://ZuneShellResources!Icon.Burn.png"/>
+      <Image Name="BurnIconHover" Source="res://ZuneShellResources!Icon.Burn.Hover.png"/>
+      <Image Name="BurnIconPressed" Source="res://ZuneShellResources!Icon.Burn.Pressed.png"/>
+      <Image Name="BurnIconDrag" Source="res://ZuneShellResources!Icon.Burn.Drag.png"/>
+      <Image Name="BurnIconAction" Source="res://ZuneShellResources!Icon.Burn.png"/>
+      
+      <Image Name="BurnIconEmpty" Source="res://ZuneShellResources!Icon.Burn.Empty.png"/>
+      <Image Name="BurnIconEmptyHover" Source="res://ZuneShellResources!Icon.Burn.Empty.Hover.png"/>
+      <Image Name="BurnIconEmptyPressed" Source="res://ZuneShellResources!Icon.Burn.Empty.Pressed.png"/>
+      <Image Name="BurnIconEmptyDrag" Source="res://ZuneShellResources!Icon.Burn.Empty.Drag.png"/>
+
+      <Single Name="AnimLength" Single="6.0"/>
+      <Single Name="PauseLength" Single="1.5"/>
+      <Rotation Name="Spin" Rotation="-1440deg;0,0,1"/>
+
+      <zune:DiscExperience Name="Disc" DiscExperience="{zune:Shell.MainFrame.Disc}" />
+    </Locals>
+
+    <Scripts>
+      
+      <Script>
+        Notification = [zune:CDAccess.Instance.Notification];
+        if (Notification == null)
+        {
+          Notification = [zune:CDAccess.Instance.BurnNotification];
+        }
+      </Script>
+      
+      <Script>
+        String str = zune:Shell.LoadString(zune:StringId.IDS_CD_LAND_MESSAGE);
+        ToolbarActiveText = str;
+        ToolbarInactiveText = str;
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(Model.Invoked)]
+        if (Disc.Available)
+        {
+          animations:CDAnimationHelper.PlayFlipAnimation = true;
+          Disc.Invoke();
+          zuneutil:SQMLog.Log(zuneutilapi:SQMDataId.DiscLogoClicks, 1);  
+        }
+      </Script>
+
+      <Script>
+        bool dragging = [Target.Dragging] &amp;&amp; [Target.AllowedDropActions] != DropAction.None;
+
+        if ([zune:CDAccess.Instance.IsBurning] || [zune:CDAccess.Instance.IsRipping])
+        {
+          IsActive = false;
+          Button.Image = BurnIconAction;
+          Button.HoverImage = BurnIconAction;
+          Button.PressedImage = BurnIconAction;
+        }
+        else if ([Disc.Available])
+        {
+          IsActive = true;
+          if (dragging)
+            Button.Image = BurnIconDrag;
+          else
+            Button.Image = BurnIcon;
+
+          Button.HoverImage = BurnIconHover;
+          Button.PressedImage = BurnIconPressed;
+          Button.PlayAnimation(animations:Animations.IconContentChange);
+        }
+        else
+        {
+          IsActive = false;
+          if (dragging)
+            Button.Image = BurnIconEmptyDrag;
+          else
+            Button.Image = BurnIconEmpty;
+
+          Button.HoverImage = BurnIconEmptyHover;
+          Button.PressedImage = BurnIconEmptyPressed;
+        }
+      </Script>
+
+      <Script>
+        RipBurnAnimation.Visible = ([Shell.AmbientAnimations] &amp;&amp;([zune:CDAccess.Instance.IsBurning] || [zune:CDAccess.Instance.IsRipping]));      
+      </Script>
+    
+      
+      <Script>
+        [DeclareTrigger(Target.DragEnter)]
+  
+        
+        
+        
+        if (zune:CDAccess.Instance.IsBurning)
+        {
+          Target.AllowedDropActions = DropAction.None;
+          return;
+        }
+        
+        object value = Target.GetValue();
+
+        List items = null;
+        if (value is List)
+        {
+           items = (List)value;
+        } 
+        else if (value is mpdata:PlaylistData)
+        {
+           items = ((mpdata:PlaylistData)value).Tracks;
+        } 
+        else if (value is SelectionManager)
+        { 
+           items = ((SelectionManager)value).SelectedItems;
+        }
+
+        if (items != null &amp;&amp; items.Count > 0)
+        {
+          foreach(object item in items)
+          {
+            
+            
+            
+            if ((item is data:Media &amp;&amp; !(item is data:MediaFolder) 
+                &amp;&amp; !(item is data:PodcastSeries) 
+                &amp;&amp; !(item is data:PodcastEpisode &amp;&amp; String.IsNullOrEmpty(((data:PodcastEpisode)item).SourceUrl)))
+                || item is mpdata:Track)
+            {
+              Target.AllowedDropActions = DropAction.Copy;
+              
+            }
+          }
+        }
+      </Script>
+
+      <Script>
+        if (![Target.Dragging])
+          Target.AllowedDropActions = DropAction.None;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Target.Dropped)]
+        object value = Target.GetValue();
+        
+        List items = null;
+        if (value is List)
+        {
+           items = (List)value;
+        } 
+        else if (value is mpdata:PlaylistData)
+        {
+           items = ((mpdata:PlaylistData)value).Tracks;
+        } 
+        else if (value is SelectionManager)
+        { 
+           items = ((SelectionManager)value).SelectedItems;
+        }
+
+        if (items != null &amp;&amp; items.Count > 0)
+        {
+          zune:CDAccess.Instance.AddToBurnList(items);
+        }
+
+        zuneutil:SQMLog.Log(zuneutilapi:SQMDataId.DiscLogoDrops, 1);
+      </Script>
+    </Scripts>
+    
+     <Content>
+      <Panel Layout="Anchor">
+        <Children>
+          
+          
+          
+          <Panel Name="RipBurnAnimation" Layout="Dock">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Button,0,6" Top="Button,0,6" Right="Button,1,-6" Bottom="Button,1,-6"/>
+            </LayoutInput>
+
+            <Animations>
+              <Animation Type="Idle" CenterPointPercent="0.5,0.5,1.0" Loop="-1">
+                <Keyframes>
+                  <RotateKeyframe Time="0.0" RelativeTo="Final"/>
+                  <RotateKeyframe Time="{AnimLength}" Value="{Spin}"/>
+                  <ScaleKeyframe  Time="0.0" RelativeTo="Final" Interpolation="EaseOut,2.5,0.99"/>
+                  <ScaleKeyframe  Time="{AnimLength}" Value="0.75,0.75,1.0"/>
+                  <AlphaKeyframe  Time ="0.0" RelativeTo="Final"/>
+                  <AlphaKeyframe  Time="{AnimLength - 0.5}" Value="1.0"/>
+                  <AlphaKeyframe  Time="{AnimLength}" Value="0.0"/>
+                  
+                  <RotateKeyframe Time="{AnimLength + PauseLength}" RelativeTo="Current"/>
+                  <ScaleKeyframe  Time="{AnimLength + PauseLength}" RelativeTo="Current"/>
+                  <AlphaKeyframe  Time="{AnimLength + PauseLength}" Value="0"/>
+                </Keyframes>
+              </Animation>
+            </Animations> 
+
+            <Children>
+              <Graphic Name="Indicator" Content="{styles:Styles.CDRipBurnGlow}" SizingPolicy="SizeToContent">
+                <LayoutInput>
+                  <DockLayoutInput Alignment="Center" Position="Top"/>
+                </LayoutInput>
+
+                <Animations>
+                  <Animation Type="Idle" Loop="-1">
+                    <Keyframes>
+                      <AlphaKeyframe Time="0.0" Value="0"/>
+                      <AlphaKeyframe Time="0.4" Value="1.0"/>
+                      
+                      <AlphaKeyframe Time="{AnimLength + PauseLength}" Value="1.0"/>
+                      
+                      <RotateKeyframe Time="0.0" Value="-30deg;0,0,1"/>
+                      <RotateKeyframe Time="{AnimLength}" Value="-10deg;0,0,1"/>
+                      <RotateKeyframe Time="{AnimLength + PauseLength}" RelativeTo="Final"/>
+                    </Keyframes>
+                  </Animation>
+                </Animations>
+              </Graphic>
+            </Children>
+          </Panel>
+
+          <core:IconButton 
+                      Name="Button"
+                      DisabledImage="{DisabledImage}"
+                      HoverImage="{HoverImage}"
+                      Image="{Image}"
+                      Model="{Model}"
+                      Navigation="TabGroup">
+
+            <LayoutInput>
+              <AnchorLayoutInput Left="Parent,0" Top="Parent,0"/>
+            </LayoutInput>
+          </core:IconButton>
+          
+          <core:Label Name="Percentage">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Button,0.3" Top="Button,1"/>
+            </LayoutInput>
+          </core:Label>
+        </Children>
+      </Panel>
+    </Content>   
+  </UI>
+
+  
+  <UI Name="NowPlayingAnimation">
+    <Properties>
+      <zune:Shell Name="Shell" Shell="$Required"/>
+    </Properties>
+    
+    <Locals>
+      <zune:TransportControls Name="TransportControls" TransportControls="{zune:TransportControls.Instance}"/>
+      <Image Name="NowplayingAnimationOrange1"         Source="res://ZuneShellResources!NowplayingAnimationOrange1.png"/>
+      <Image Name="NowplayingAnimationOrange2"         Source="res://ZuneShellResources!NowplayingAnimationOrange2.png"/>
+      <Image Name="NowplayingAnimationPink1"           Source="res://ZuneShellResources!NowplayingAnimationPink1.png"/>
+      <Image Name="NowplayingAnimationPink2"           Source="res://ZuneShellResources!NowplayingAnimationPink2.png"/>
+      <Image Name="NowplayingAnimationPink3"           Source="res://ZuneShellResources!NowplayingAnimationPink3.png"/>
+      <Image Name="NowplayingAnimationOrangeAndPink"   Source="res://ZuneShellResources!NowplayingAnimationOrangeAndPink.png"/>
+      
+      <sys:Random Name="Random"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        LayersPanel.Visible = (iris:Application.RenderingType != iris:RenderingType.GDI) &amp;&amp;
+                               [Shell.AmbientAnimations] &amp;&amp;
+                               [TransportControls.Playing] &amp;&amp;
+                              ![TransportControls.PlayingVideo] &amp;&amp;
+                              ![TransportControls.Muted.Value];
+      </Script>
+    </Scripts>
+    <Content>
+      <Panel Name="LayersPanel" Layout="Dock" Margins="50,0,50,2">
+        <LayoutInput>
+          <DockLayoutInput Position="Bottom"/>
+        </LayoutInput>
+        <Children>
+          <Panel>
+            <Animations>
+              <Animation Animation="{animations:Animations.MoveNow}"/>
+              <Animation Type="Show" CenterPointPercent="0.5,1.0,1.0">
+                <Keyframes>
+                  <ScaleKeyframe Time="0.0" Value="2,0.0,1.0" Interpolation="Bezier,1.1,1.5"/>
+                  <ScaleKeyframe Time="2.0" Value="1.0,1.0,1.0"/>
+                </Keyframes>
+              </Animation>
+              
+               <Animation Type="Hide" CenterPointPercent="0.5,1.0,1.0">
+                <Keyframes>
+                  <ScaleKeyframe Time="0.0" RelativeTo="Current" Interpolation="EaseOut,1.5,0.7"/>
+                  <ScaleKeyframe Time="1.0" Value="0.2,0.0,1.0"/>
+                  <PositionKeyframe Time="0.0" RelativeTo="Current" Interpolation="EaseOut,1.5,0.8"/>
+                  <PositionKeyframe Time="1.0" Value="0,10,0"/>                                  
+                </Keyframes>
+              </Animation>
+            </Animations>
+                
+            <LayoutInput>
+              <DockLayoutInput Position="Bottom"/>
+            </LayoutInput>
+
+            <Children>               
+              <me:NowplayingAnimLayer Image="{NowplayingAnimationOrange1}" Random="{Random}">
+                <LayoutInput>
+                  <AnchorLayoutInput Bottom="Parent,1"/>
+                </LayoutInput>
+              </me:NowplayingAnimLayer>
+              
+               <me:NowplayingAnimLayer Image="{NowplayingAnimationPink1}" Random="{Random}" XMin="0.25">
+                <LayoutInput>
+                  <AnchorLayoutInput Bottom="Parent,1"/>
+                </LayoutInput>
+              </me:NowplayingAnimLayer>
+
+               <me:NowplayingAnimLayer Image="{NowplayingAnimationOrange2}" Random="{Random}" XMin="0.8" YMax="2">
+                <LayoutInput>
+                  <AnchorLayoutInput Bottom="Parent,1"/>
+                </LayoutInput>
+              </me:NowplayingAnimLayer>
+
+               <me:NowplayingAnimLayer Image="{NowplayingAnimationPink2}" Random="{Random}" XMin="0.4">
+                <LayoutInput>
+                  <AnchorLayoutInput Bottom="Parent,1"/>
+                </LayoutInput>
+              </me:NowplayingAnimLayer>
+              
+              <me:NowplayingAnimLayer Image="{NowplayingAnimationPink3}" Random="{Random}" XMin="0.3">
+                <LayoutInput>
+                  <AnchorLayoutInput Bottom="Parent,1"/>
+                </LayoutInput>
+              </me:NowplayingAnimLayer> 
+
+              <me:NowplayingAnimLayer Image="{NowplayingAnimationOrangeAndPink}" Random="{Random}" XMin="0.75" AlphaMin="0.4">
+                <LayoutInput>
+                  <AnchorLayoutInput Bottom="Parent,1"/>
+                </LayoutInput>
+              </me:NowplayingAnimLayer>
+
+            </Children>
+          </Panel>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  <UI Name="NowplayingAnimLayer">
+    <Properties>
+      <Image Name="Image" Image="$Required"/>
+      <sys:Random Name="Random" Random="$Required"/>
+      <Single Name="AlphaMin" Single="0.1"/>
+      <Single Name="AlphaMax" Single="0.85"/>
+      <Boolean Name="Scaling" Boolean="true"/>
+      
+      <Single Name="XMax" Single="1"/>
+      <Single Name="XMin" Single="0.4"/>
+      <Single Name="YMax" Single="0.9"/>
+    </Properties>
+
+    <Locals>
+      
+      <Single Name="YMin" Single="0.4"/>
+      <Single Name="FrameLengthMin" Single="1.5"/>
+      <Single Name="FrameLengthMax" Single="5.0"/>
+            
+      <Interpolation Name="LayerFade" Type="EaseIn" Weight="1.5" EasePercent="0.8"/>
+  
+      <Interpolation Name="LayerScale" Type="Bezier" BezierHandle1="1.5" BezierHandle2="1.1"/>
+
+      <AlphaKeyframe Name="FirstAlphaKeyframe" Time="0.0" Value="{AlphaMin}" Interpolation="{LayerFade}"/>
+      
+      <AlphaKeyframe Name="LastAlphaKeyframe" Value="{FirstAlphaKeyframe.Value}"/>
+  
+      <Vector3 Name="StartScale" X="{XMin}" Y="{YMax}" Z="1.0"/>
+      <ScaleKeyframe Name="FirstScaleKeyframe" Time="0.0" Value="{StartScale}" Interpolation="{LayerScale}"/>
+      
+      <ScaleKeyframe Name="LastScaleKeyframe" Value="{FirstScaleKeyframe.Value}"/>
+      
+      <Animation Name="IdleAnimation" Type="Idle" Loop="-1" CenterPointPercent="0.5,1.0,1.0">
+        <Keyframes>
+          <AlphaKeyframe AlphaKeyframe="{FirstAlphaKeyframe}"/>
+          <AlphaKeyframe Interpolation="{LayerFade}"/>
+          <AlphaKeyframe Interpolation="{LayerFade}"/>
+          <AlphaKeyframe Interpolation="{LayerFade}"/>
+          <AlphaKeyframe Interpolation="{LayerFade}"/>
+          <AlphaKeyframe Interpolation="{LayerFade}"/>
+          <AlphaKeyframe Interpolation="{LayerFade}"/>
+          <AlphaKeyframe Interpolation="{LayerFade}"/>
+          <AlphaKeyframe AlphaKeyframe="{LastAlphaKeyframe}"/>
+          
+          <ScaleKeyframe ScaleKeyframe="{FirstScaleKeyframe}"/>
+          <ScaleKeyframe Interpolation="{LayerScale}"/>
+          <ScaleKeyframe Interpolation="{LayerScale}"/>
+          <ScaleKeyframe Interpolation="{LayerScale}"/>
+          <ScaleKeyframe Interpolation="{LayerScale}"/>
+          <ScaleKeyframe Interpolation="{LayerScale}"/>
+          <ScaleKeyframe Interpolation="{LayerScale}"/>
+          <ScaleKeyframe Interpolation="{LayerScale}"/>
+          <ScaleKeyframe ScaleKeyframe="{LastScaleKeyframe}"/>
+        </Keyframes>
+      </Animation>
+    </Locals>
+
+    <Scripts>
+      
+      <Script>        
+        Int32 randTimeRange = (Int32)((FrameLengthMax - FrameLengthMin) * 100.0);
+        Int32 randAlphaValueRange = (Int32)((AlphaMax - AlphaMin) * 100.0);
+        Int32 yRandRange = (Int32)((YMax - YMin) * 100.0);
+        Int32 xRandRange = (Int32)((XMax - XMin) * 100.0);
+        
+        float alphaTime = FrameLengthMin;
+        float scaleTime = FrameLengthMin;
+        float yScaleVal;
+        float xScaleVal;
+        
+        foreach (Keyframe keyframe in IdleAnimation.Keyframes)
+        {
+          if (keyframe is AlphaKeyframe)
+          {
+            if (keyframe != FirstAlphaKeyframe)
+            {
+              AlphaKeyframe alphaKeyframe = (AlphaKeyframe)keyframe;
+              
+              alphaTime = alphaTime + ((Single)Random.Next(randTimeRange) / 100.0) + FrameLengthMin;
+              alphaKeyframe.Time = alphaTime;
+            
+              if (keyframe != LastAlphaKeyframe)
+              {
+                alphaKeyframe.Value = ((Single)Random.Next(randAlphaValueRange) / 100.0) + AlphaMin;
+              }
+            }
+          }
+          else 
+          {
+            if (keyframe != FirstScaleKeyframe)
+            {
+              if (Scaling)
+              {
+                ScaleKeyframe scaleKeyframe = (ScaleKeyframe)keyframe;
+                
+                scaleTime = scaleTime + ((Single)Random.Next(randTimeRange) / 100.0) + FrameLengthMin;
+                scaleKeyframe.Time = scaleTime;
+                
+                if (keyframe != LastScaleKeyframe)
+                {
+                  yScaleVal = ((Single)Random.Next(yRandRange) / 100.0) + YMin;
+                  xScaleVal = ((Single)Random.Next(xRandRange) / 100.0) + XMin;
+                  scaleKeyframe.Value = new Vector3(xScaleVal, yScaleVal, 1.0);
+                }
+              }
+            }
+          }
+        }
+      </Script>
+    </Scripts>
+    
+    <Content>
+      <Graphic Content="{Image}" SizingPolicy="SizeToConstraint" MaximumSize="0,40" Alpha="0.6">
+        <LayoutInput>
+          <AnchorLayoutInput Bottom="Parent,1"/>
+        </LayoutInput>
+
+        <Animations>
+          <Animation Animation="{IdleAnimation}"/>
+        </Animations>
+      </Graphic>
+    </Content>
+  </UI> 
+</UIX>
diff --git a/test/2.1/BUTTON.UIX b/test/2.1/BUTTON.UIX
new file mode 100644
index 0000000..7723d78
--- /dev/null
+++ b/test/2.1/BUTTON.UIX
@@ -0,0 +1,1183 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:sys="assembly://mscorlib/System"
+  xmlns:col="assembly://mscorlib/System.Collections"
+  xmlns:style="res://ZuneShellResources!Style.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:tooltip="res://ZuneShellResources!ToolTip.uix"
+  xmlns:animations="res://ZuneShellResources!Animations.uix"
+  xmlns:me="Me">
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+
+  
+  
+  
+  <UI Name="Default">
+    <Content>
+      <Panel Layout="Anchor">
+        <Children>
+          <Panel Layout="VerticalFlow">
+            <Children>
+
+              <me:Button>
+                <Model>
+                  <iris:Command Description="Hello"/>
+                </Model>
+              </me:Button>
+
+              <me:IconButton>
+                <Model>
+                  <iris:Command Description="Hello"/>
+                </Model>
+              </me:IconButton>
+
+              <me:ButtonWithIcon>
+                <Model>
+                  <iris:Command Description="Hello"/>
+                </Model>
+              </me:ButtonWithIcon>
+
+              <me:MenuButton>
+                <Model>
+                  <iris:Command Description="Hello"/>
+                </Model>
+              </me:MenuButton>
+
+              <me:InputButton>
+                <Model>
+                  <iris:Command Description="Hello"/>
+                </Model>
+              </me:InputButton>
+
+            </Children>
+          </Panel>
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <Class Name="ButtonProvider">
+    <Properties>
+      <String Name="PrimaryLabel"/>
+      <String Name="ToolTip"/>
+      <Boolean Name="Available" Boolean="true"/>
+      <Boolean Name="Selected"/>
+
+      <iris:ICommand Name="ClickCommand" ICommand="{null}"/>
+      <Object Name="DragValue" Object="{null}"/>
+    </Properties>
+  </Class>
+
+  
+  
+  
+  <Class Name="ExtendedButtonProvider" Base="me:ButtonProvider">
+    <Properties>
+      <String Name="SecondaryLabel"/>
+    </Properties>
+  </Class>
+
+  
+  
+  
+  <Class Name="ModelButtonProvider" Base="me:ExtendedButtonProvider">
+    <Properties>
+      
+      <Object Name="Model" Object="{null}"/>
+      <Index Name="Index" Index="{null}"/>
+      <SelectionManager Name="SelectionManager" SelectionManager="{null}"/>
+      <Object Name="ListModel" Object="{null}"/>
+      <Command Name="EditPrimaryLabel" Command="{null}"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(SelectionManager.SelectedIndices)]
+        if (SelectionManager != null &amp;&amp; Index != null)
+        {
+          Selected = SelectionManager.IsSelected([Index.Value]);
+        }
+      </Script>
+    </Scripts>
+  </Class>
+
+  
+  
+  
+  <Class Name="CommandButtonProvider" Base="me:ModelButtonProvider">
+    <Properties>
+      <iris:Command Name="Model" Command="{null}"/>
+    </Properties>
+
+    <Scripts>
+      <Script>if (Model != null) PrimaryLabel = [Model.Description];</Script>
+      <Script>if (Model != null) ToolTip = [Model.Description];</Script>
+      <Script>if (Model != null) Available = [Model.Available];</Script>
+      <Script>if (Model != null) Selected = [Model.Selected];</Script>
+      <Script>if (Model != null) ClickCommand = [Model];</Script>
+    </Scripts>
+  </Class>
+
+  
+  
+  
+  
+  
+  
+  <UI Name="ButtonBase">
+    <Properties>
+      
+      <Boolean Name="KeyInteractiveNStuff" Boolean="true"/>
+
+      <me:ButtonProvider Name="Provider" ButtonProvider="{null}"/>
+
+      <Boolean Name="ToolTipEnabled" Boolean="false"/>
+
+      <String Name="AccessibleDescription" String="{null}"/>
+
+      <Boolean Name="KeyFocusOnMouseDown" Boolean="true"/>
+
+      <Boolean Name="AllowDoubleClicks" Boolean="true"/>
+      
+      <InputHandlerTransition Name="HandlerTransition" InputHandlerTransition="Up"/>
+    </Properties>
+
+    <Locals>
+      <Accessible Name="Accessible"/>
+
+      
+      <tooltip:ToolTip Name="ToolTip" ToolTip="{null}"/>
+    </Locals>
+
+    <Input>
+      <ClickHandler Name="Focuser" ClickType="LeftMouse,RightMouse" HandlerTransition="Down"
+                    HandlerStage="Routed,Direct" Repeat="false" Handle="false"/>
+
+      
+      
+      
+      
+      <ClickHandler Name="Clicker" ClickType="LeftMouse, Key" HandlerStage="Direct, Bubbled" 
+                    HandlerTransition="{HandlerTransition}" Handle="false"/>
+    </Input>
+
+    <Scripts>
+      <Script> UI.AllowDoubleClicks = AllowDoubleClicks; </Script>
+
+      <Script>
+        if (![KeyInteractiveNStuff])
+        {
+          Clicker.ClickType = ClickType.LeftMouse;
+        }
+      </Script>
+
+      <Script>
+        if (Provider != null)
+        {
+          Clicker.Command = [Provider.ClickCommand];
+          Clicker.Handle = (Clicker.Command != null);
+        }
+      </Script>
+
+      <Script>
+        if (Provider != null)
+        {
+          UI.Enabled = [Provider.Available];
+        }
+      </Script>
+
+      
+      <Script>
+        if ([Accessible.Enabled])
+        {
+          if (AccessibleDescription != null)
+          {
+            Accessible.Name = [AccessibleDescription];
+          }
+          else if (Provider != null)
+          {
+            Accessible.Name = [Provider.PrimaryLabel];
+          }
+          else
+          {
+            Accessible.Name = null;
+          }
+
+          if (Provider != null)
+          {
+            Accessible.DefaultAction = "Press";
+            Accessible.DefaultActionCommand = [Provider.ClickCommand];
+          }
+
+          Accessible.IsPressed = [Clicker.Clicking];
+          Accessible.Role = AccessibleRole.PushButton;
+        }
+      </Script>
+
+      
+      
+      <Script>
+        [DeclareTrigger(UI.DeepMouseFocus)]
+
+        
+        
+        
+        
+        
+        
+        if (ToolTip != null)
+        {
+          UI.DisposeOwnedObject(ToolTip);
+          ToolTip = null;
+        }
+
+        if (UI.DeepMouseFocus)
+        {
+          if (ToolTipEnabled &amp;&amp; Provider != null)
+          {
+            string tooltipText = Provider.ToolTip;
+
+            
+            
+            
+
+            if (!String.IsNullOrEmpty(tooltipText))
+            {
+              ToolTip = new tooltip:ToolTip();
+              ToolTip.Model = tooltipText;
+              ToolTip.Helper.ShowToolTip(ToolTip);
+            }
+          }
+        }
+      </Script>
+
+      <Script>
+        UI.KeyFocusOnMouseDown = [KeyFocusOnMouseDown];
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Focuser.Invoked)]
+        
+        
+        if (!UI.DeepKeyFocus &amp;&amp; UI.KeyFocusOnMouseDown)
+          UI.NavigateInto();
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  
+  
+  <UI Name="IconButton" Base="me:ButtonBase">
+    <Properties>
+      <iris:Command Name="Model" Command="$Required"/>
+      <me:CommandButtonProvider Name="Provider"/>
+
+      <Size Name="TileMinSize" Size="0,0"/>
+      <Size Name="TileMaxSize" Size="0,0"/>
+      <Inset Name="TilePadding" Inset="0,0,0,0"/>
+      <StretchingPolicy Name="StretchingPolicy" StretchingPolicy="None"/>
+
+      <Image Name="DisabledImage" Image="{null}"/>
+      <Image Name="Image" Image="{null}"/>
+      <Image Name="HoverImage" Image="{null}"/>
+      <Image Name="FocusImage" Image="{null}"/>
+      <Image Name="PressedImage" Image="{null}"/>
+
+      <StripAlignment Name="VerticalAlignment" StripAlignment="Near"/>
+      <StripAlignment Name="HorizontalAlignment" StripAlignment="Near"/>
+
+      
+      <Boolean Name="ToolTipEnabled" Boolean="True"/>
+    </Properties>
+
+    <Scripts>
+      <Script>Provider.Model = [Model];</Script>
+
+      <Script>
+        <![CDATA[
+        
+        if (![UI.FullyEnabled] && [DisabledImage] != null)
+        {
+          Background.Content = DisabledImage;
+        }
+        
+        else
+        {
+          
+          if ([Clicker.Clicking] && [PressedImage] != null)
+          {
+            Background.Content = PressedImage;
+          }
+          else if ([UI.DeepMouseFocus] && [HoverImage] != null)
+          {
+            Background.Content = HoverImage;
+          }
+          else if ([UI.DeepKeyFocus] && [FocusImage] != null)
+          {
+            Background.Content = FocusImage;
+          }
+          else
+          {
+            Background.Content = [Image];
+          }
+        }
+        ]]>
+      </Script>
+
+    </Scripts>
+
+    <Content>
+      <Panel Padding="{TilePadding}">
+        <Children>
+
+          <Graphic Name="Background"
+            MinimumSize="{TileMinSize}"
+            MaximumSize="{TileMaxSize}"
+            VerticalAlignment="{VerticalAlignment}"
+            HorizontalAlignment="{HorizontalAlignment}"
+            StretchingPolicy="{StretchingPolicy}"/>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  <UI Name="PressAndHoldIconButton" Base="me:ButtonBase">
+    <Properties>
+      <iris:Command Name="ClickCommand" Command="$Required"/>
+      <iris:BooleanChoice Name="Holding" BooleanChoice="$Required"/>
+      <me:CommandButtonProvider Name="Provider"/>
+
+      <Size Name="TileMinSize" Size="0,0"/>
+      <Size Name="TileMaxSize" Size="0,0"/>
+      <Inset Name="TilePadding" Inset="0,0,0,0"/>
+      <StretchingPolicy Name="StretchingPolicy" StretchingPolicy="None"/>
+
+      <Image Name="DisabledImage" Image="{null}"/>
+      <Image Name="Image" Image="{null}"/>
+      <Image Name="HoverImage" Image="{null}"/>
+      <Image Name="FocusImage" Image="{null}"/>
+      <Image Name="PressedImage" Image="{null}"/>
+      <Image Name="HoldingImage" Image="{null}"/>
+
+      <Int32 Name="TimerInterval" Int32="1000"/>
+
+      <StripAlignment Name="VerticalAlignment" StripAlignment="Near"/>
+      <StripAlignment Name="HorizontalAlignment" StripAlignment="Near"/>
+
+      <Boolean Name="AllowDoubleClicks" Boolean="true"/>
+    </Properties>
+
+    <Locals>
+      <iris:Command Name="WorkerCommand"/>
+      <Timer Name="Timer" Interval="{TimerInterval}" Enabled="false" AutoRepeat="false"/>
+      <Boolean Name="TimerFired"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        
+
+        Provider.Model = WorkerCommand;
+        ToolTipEnabled = true;
+
+        UI.AllowDoubleClicks = AllowDoubleClicks;
+      </Script>
+
+      <Script>
+        
+        
+
+        WorkerCommand.Available = [ClickCommand.Available];
+        WorkerCommand.Description = [ClickCommand.Description];
+      </Script>
+
+      <Script>
+        [InitialEvaluate(false)]
+
+        if ( [Clicker.Clicking] )
+        {
+           if (Holding.Value)
+           {
+              
+              
+              
+              
+              
+              
+              
+              
+              
+              
+
+              TimerFired = true;
+           }
+           else
+           {
+              
+              
+              
+              
+
+              Timer.Enabled = true;
+              TimerFired    = false;
+           }
+        }
+        else
+        {
+           
+           
+
+           Timer.Enabled = false;
+           Holding.Value = false;
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(WorkerCommand.Invoked)]
+
+        
+        
+
+        if (TimerFired == false)
+        {
+           ClickCommand.Invoke();
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Timer.Tick)]
+
+        
+        
+        
+        
+        
+
+        TimerFired = true;
+
+        if (Clicker.Clicking)
+        {
+           Holding.Value = true;
+        }
+      </Script>
+
+      <Script>
+        <![CDATA[
+        if (![UI.FullyEnabled] && [DisabledImage] != null)
+        {
+          Background.Content = DisabledImage;
+        }
+        else
+        {
+          if ([Holding.Value] && [HoldingImage] != null)
+          {
+            Background.Content = HoldingImage;
+          }
+          else if ([Clicker.Clicking] && [PressedImage] != null)
+          {
+            Background.Content = PressedImage;
+          }
+          else if ([UI.DeepMouseFocus] && [HoverImage] != null)
+          {
+            Background.Content = HoverImage;
+          }
+          else if ([UI.DeepKeyFocus] && [FocusImage] != null)
+          {
+            Background.Content = FocusImage;
+          }
+          else
+          {
+            Background.Content = [Image];
+          }
+        }
+        ]]>
+      </Script>
+
+    </Scripts>
+
+    <Content>
+      <Panel Padding="{TilePadding}">
+        <Children>
+          <Graphic Name="Background"
+            MinimumSize="{TileMinSize}"
+            MaximumSize="{TileMaxSize}"
+            VerticalAlignment="{VerticalAlignment}"
+            HorizontalAlignment="{HorizontalAlignment}"
+            StretchingPolicy="{StretchingPolicy}"/>
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  
+  <UI Name="LabelButtonBase" Base="me:ButtonBase">
+    <Properties>
+      
+      <style:Style Name="OverrideStyle" Style="{null}"/>
+      <style:Style Name="BaseStyle" Style="{styles:SharedStyles.ButtonStyle}"/>
+      <col:IDictionary Name="NamedStyles" IDictionary="{null}"/>
+      <Boolean Name="ShowToolTipWhenClipped" Boolean="true"/>
+      <Boolean Name="AlwaysShowToolTip" Boolean="false"/>
+      <PlacementMode Name="ToolTipPlacement" PlacementMode="Origin"/>
+    </Properties>
+
+    <Locals>
+      <style:StatefulCompositeStyle Name="Style" Base="{BaseStyle}"/>
+    </Locals>
+
+    <Scripts>
+      
+      <Script>Style.Override = [OverrideStyle];</Script>
+
+      
+      <Script>Style.State.Focused = [UI.DeepKeyFocus];</Script>
+      <Script>Style.State.Hovered = [UI.DeepMouseFocus];</Script>
+
+      <Script>
+        if (Provider != null)
+        {
+          Label.Content = [Provider.PrimaryLabel];
+          Label.ToolTipContent = [Provider.ToolTip];
+        }
+      </Script>
+
+      <Script>
+        if (Provider != null)
+        {
+          Style.State.Selected = [Provider.Selected];
+        }
+      </Script>
+      <Script>Style.State.Disabled = ![UI.FullyEnabled];</Script>
+
+    </Scripts>
+
+    <Content>
+      
+      <me:Label Name="Label" 
+                Style="{Style}" NamedStyles="{NamedStyles}" 
+                ShowToolTipWhenClipped="{ShowToolTipWhenClipped}" 
+                AlwaysShowToolTip="{AlwaysShowToolTip}"
+                ToolTipPlacement="{ToolTipPlacement}"/>
+    </Content>
+  </UI>
+
+  
+  
+  
+  
+  
+  <UI Name="LabelButtonWithBackground" Base="me:LabelButtonBase">
+    <Properties>
+      <Color Name="BackgroundColor" Color="Transparent"/>
+      <Color Name="BackgroundFocusColor" Color="Transparent"/>
+      <Inset Name="LabelMargins" Inset="0,0,0,0"/>
+
+      
+      <Size Name="TileMinSize" Size="0,0"/>
+      <Size Name="TileMaxSize" Size="0,0"/>
+    </Properties>
+
+    <Scripts>
+      
+      <Script>
+        if ([Style.State.Hovered])
+        {
+          Background.Content = BackgroundFocusColor;
+        }
+        else
+        {
+          Background.Content = BackgroundColor;
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      
+      <ColorFill Name="Background"
+          MinimumSize="{TileMinSize}" MaximumSize="{TileMaxSize}">
+        <Children>
+
+          
+          <me:Label Name="Label" Style="{Style}" NamedStyles="{NamedStyles}" 
+                    ShowToolTipWhenClipped="{ShowToolTipWhenClipped}" 
+                    AlwaysShowToolTip="{AlwaysShowToolTip}"
+                    ToolTipPlacement="{ToolTipPlacement}"
+                    Margins="{LabelMargins}"/>
+
+        </Children>
+      </ColorFill>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="Button" Base="me:LabelButtonWithBackground">
+    <Properties>
+      <iris:Command Name="Model" Command="{null}"/>
+      <me:CommandButtonProvider Name="Provider"/>
+
+    </Properties>
+
+    <Scripts>
+      <Script>Provider.Model = [Model];</Script>
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  <UI Name="Label">
+    <Properties>
+      <style:Style Name="Style" Style="{styles:SharedStyles.LabelStyle}"/>
+      <String Name="Content"/>
+      <String Name="ToolTipContent"/>
+      <Boolean Name="WordWrap" Boolean="false"/>
+      <Int32 Name="MaximumLines" Int32="0"/>
+      <HorizontalAlignment Name="Alignment" HorizontalAlignment="Near"/>
+      <col:IDictionary Name="NamedStyles" IDictionary="{null}"/>
+      <Boolean Name="ShowToolTipWhenClipped" Boolean="true"/>
+      <Boolean Name="AlwaysShowToolTip" Boolean="false"/>
+      <PlacementMode Name="ToolTipPlacement" PlacementMode="Origin"/>
+
+      
+      <Boolean Name="Clipped"/>
+
+      <String Name="AccessibleDescription" String="{null}"/>
+      <AccessibleRole Name="AccessibleRole" AccessibleRole="StaticText"/>
+    </Properties>
+
+    <Locals>
+      <Accessible Name="Accessible"/>
+
+      
+      <tooltip:ToolTip Name="ToolTip" ToolTip="{null}"/>
+    </Locals>
+
+    <Scripts>
+      <Script>Label.Content = [Content];</Script>
+      <Script>Label.WordWrap = [WordWrap];</Script>
+      <Script>Label.MaximumLines = [MaximumLines];</Script>
+      <Script>Label.Color = [Style.Color];</Script>
+      <Script>Label.Font = [Style.Font];</Script>
+      <Script>Label.Style = [Style.TextStyle];</Script>
+      <Script>Label.Margins = [Style.TextMargins];</Script>
+      <Script>Label.HorizontalAlignment = [Alignment];</Script>
+      <Script>Label.NamedStyles = [NamedStyles];</Script>
+      <Script>Clipped = [Label.Clipped];</Script>
+
+      <Script>
+        if ([Accessible.Enabled])
+        {
+          if (AccessibleDescription != null)
+          {
+            Accessible.Name = AccessibleDescription;
+          }
+          else
+          {
+            Accessible.Name = [Label.Content];
+          }
+
+          Accessible.Role = AccessibleRole;
+        }
+      </Script>
+
+      
+      
+      <Script><![CDATA[
+        [DeclareTrigger(UI.DeepMouseFocus)]
+
+        
+        
+        
+        
+        
+        
+        if (ToolTip != null)
+        {
+          UI.DisposeOwnedObject(ToolTip);
+          ToolTip = null;
+        }
+
+        if (UI.DeepMouseFocus && (AlwaysShowToolTip || (ShowToolTipWhenClipped && Clipped)))
+        {
+          
+          
+          
+          
+          
+
+          string display = null;
+          if (!String.IsNullOrEmpty(ToolTipContent))
+          {
+            display = ToolTipContent;
+          }
+          else
+          {
+            display = Content;
+          }
+
+          if (!String.IsNullOrEmpty(display))
+          {
+            ToolTip = new tooltip:ToolTip();
+            PopupLayoutInput input = new PopupLayoutInput();
+            input.Placement = ToolTipPlacement;
+            input.PlacementTarget = Label;
+            input.Offset = tooltip:ToolTipConstants.InversePadding;
+            ToolTip.LayoutInput = input;
+            ToolTip.Model = display;
+            ToolTip.Font = Label.Font;
+            ToolTip.Helper.ShowToolTip(ToolTip);
+          }
+        }
+   ]]></Script>
+    </Scripts>
+
+    <Content>
+      <Text Name="Label" NamedStyles="{NamedStyles}" MouseInteractive="{ShowToolTipWhenClipped}"/>
+    </Content>
+  </UI>
+
+  
+  
+  
+  
+  <UI Name="AnimatedLabel" Base="me:Label">
+    <Properties>
+      <Animation Name="ContentChangeAnim" Animation="{animations:Animations.TitleContentChange}" />
+      <Animation Name="ShowAnim" Animation="{animations:Animations.TitleShow}" />
+    </Properties>
+    <Content>
+      <Text Name="Label">
+        <Animations>
+          <Animation Animation="{ContentChangeAnim}" />
+          <Animation Animation="{ShowAnim}" />
+        </Animations>
+      </Text>
+    </Content>
+  </UI>
+
+
+  
+  
+  
+  
+  <UI Name="ButtonWithIcon" Base="me:Button">
+    <Properties>
+      <me:Icon Name="Icon"/>
+    </Properties>
+
+    <Scripts>
+      
+      <Script>
+        Label.RequestSource(typeof(me:LabelAndIconContent), "Icon", Icon);
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  
+  <UI Name="ActionButtonWithIcon" Base="me:BigActionButton">
+    <Properties>
+      <me:Icon Name="Icon"/>
+    </Properties>
+  </UI>
+
+  
+  
+  
+  <Class Name="Icon">
+    <Properties>
+      <Image Name="Image" Image="res://ZuneShellResources!Arrow.More.png"/>
+      <Inset Name="Margins" Inset="4,0,0,0"/>
+      <Boolean Name="Visible" Boolean="true"/>
+    </Properties>
+  </Class>
+
+  
+  
+  
+  <UI Name="LabelAndIconContent" Base="me:Label">
+    <Properties>
+      <me:Icon Name="Icon" Icon="{null}"/>
+    </Properties>
+
+    <Scripts>
+      
+      <Script>IconGraphic.Content = [Icon.Image];</Script>
+      <Script>IconGraphic.Margins = [Icon.Margins];</Script>
+      <Script>IconGraphic.Visible = [Icon.Visible];</Script>
+    </Scripts>
+
+    <Content>
+      <Panel>
+        <Layout>
+          <FlowLayout Orientation="Horizontal" ItemAlignment="Center"/>
+        </Layout>
+        <Children>
+
+          
+          <Text Name="Label" MouseInteractive="{ShowToolTipWhenClipped}"/>
+
+          
+          <Graphic Name="IconGraphic"/>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  
+  <UI Name="ToggleIconButton">
+    <Properties>
+      <iris:BooleanChoice Name="Model" BooleanChoice="$Required"/>
+      <Image Name="OnImage" Image="{null}"/>
+      <Image Name="OffImage" Image="{null}"/>
+      <Image Name="OnHoverImage" Image="{null}"/>
+      <Image Name="OffHoverImage" Image="{null}"/>
+      <Image Name="OnFocusImage" Image="{null}"/>
+      <Image Name="OffFocusImage" Image="{null}"/>
+      <Image Name="OnPressedImage" Image="{null}"/>
+      <Image Name="OffPressedImage" Image="{null}"/>
+      <Image Name="OnDisabledImage" Image="{null}"/>
+      <Image Name="OffDisabledImage" Image="{null}"/>
+      <sys:Boolean Name="KeyInteractiveNStuff" Boolean="true"/>
+      <String Name="Description" String="{null}"/>
+      <Boolean Name="KeyFocusOnMouseDown" Boolean="true"/>
+    </Properties>
+
+    <Locals>
+      <iris:Command Name="Toggle"/>
+    </Locals>
+
+    <Scripts>
+      
+      <Script>Toggle.Description = [Model.Description];</Script>
+
+      
+      <Script>
+        [DeclareTrigger(Toggle.Invoked)]
+        Model.Value = !Model.Value;
+      </Script>
+
+      
+      <Script>
+        if ([Model.Value])
+        {
+          Button.Image = [OnImage];
+          Button.FocusImage = [OnFocusImage];
+          Button.HoverImage = [OnHoverImage];
+          Button.PressedImage = [OnPressedImage];
+          Button.DisabledImage = [OnDisabledImage];
+        }
+        else
+        {
+          Button.Image = [OffImage];
+          Button.FocusImage = [OffFocusImage];
+          Button.HoverImage = [OffHoverImage];
+          Button.PressedImage = [OffPressedImage];
+          Button.DisabledImage = [OnDisabledImage];
+        }
+      </Script>
+
+      <Script>
+        Button.KeyFocusOnMouseDown = [KeyFocusOnMouseDown];
+      </Script>
+    </Scripts>
+
+    <Content>
+      <me:IconButton Name="Button" Model="{Toggle}"
+          KeyFocusOnMouseDown="{KeyFocusOnMouseDown}"
+          Image="{OffImage}" FocusImage="{OffFocusImage}"
+          HoverImage="{OffHoverImage}" PressedImage="{OffPressedImage}"
+          KeyInteractiveNStuff="{KeyInteractiveNStuff}"/>
+    </Content>
+  </UI>
+  
+  
+  
+  
+  <UI Name="ToggleActionButton" Base="me:ActionButtonBase">
+    <Properties>
+      <iris:BooleanChoice Name="Model" BooleanChoice="$Required"/>
+      <me:ToggleTextButtonProvider Name="Provider"/>
+    </Properties>
+
+    <Locals>
+      <iris:Command Name="Toggle"/>
+    </Locals>
+
+    <Scripts>
+      <Script>Toggle.Description = [Model.Description];</Script>
+      
+      <Script>
+        [DeclareTrigger(Toggle.Invoked)]
+        Model.Value = !Model.Value;
+      </Script>
+
+      <Script>Provider.Label = (sys:String)[Model.Chosen];</Script>
+      
+      <Script>Provider.Model = [Toggle];</Script>
+    </Scripts>
+  </UI>
+  
+  
+  
+  
+  <Class Name="ToggleTextButtonProvider" Base="me:ModelButtonProvider">
+    <Properties>
+      <iris:Command Name="Model"/>
+      <String Name="Label" String="{null}"/>
+    </Properties>
+
+    <Scripts>
+      <Script>if (Model != null) PrimaryLabel = [Label];</Script>
+      <Script>if (Model != null) ToolTip = [Model.Description];</Script>
+      <Script>if (Model != null) Available = [Model.Available];</Script>
+      <Script>if (Model != null) Selected = [Model.Selected];</Script>
+      <Script>if (Model != null) ClickCommand = [Model];</Script>
+    </Scripts>
+    
+  </Class>
+
+  
+
+  
+  
+  
+  <UI Name="MenuButton" Base="me:Button">
+    <Properties>
+      <style:StyleSet Name="OverrideStyle">
+        <Focused>
+          <style:Style Color="White"/>
+        </Focused>
+        <Default>
+          <style:Style Color="{styles:Styles.TextActive}"/>
+        </Default>
+      </style:StyleSet>
+
+      <Inset Name="TextMargins" Inset="3,0,3,2"/>
+      <Size Name="TileMinSize" Size="175,0"/>
+      <Color Name="BackgroundFocusColor" Color="{styles:Styles.TextSelected}"/>
+    </Properties>
+  </UI>
+
+  
+  
+  
+  <UI Name="InputButton" Base="me:Button">
+    <Properties>
+      <style:Style Name="OverrideStyle" Color="{styles:Styles.TextFocusedForeground}"/>
+
+      <Color Name="BackgroundColor" Color="{styles:Styles.TextActive}"/>
+      <Color Name="BackgroundFocusColor" Color="{styles:Styles.TextSelected}"/>
+    </Properties>
+  </UI>
+  
+  
+  
+  
+  <UI Name="ActionButtonBase" Base="me:LabelButtonBase">
+    <Properties>
+      <Size Name="TileMinSize" Size="75,0"/>
+      <Size Name="TileMaxSize" Size="0,0"/>
+
+      <Image Name="Image"         Image="{styles:Styles.Button}"/>
+      <Image Name="HoverImage"    Image="{styles:Styles.ButtonHover}"/>
+      <Image Name="FocusImage"    Image="{HoverImage}"/>
+      <Image Name="PressedImage"  Image="{styles:Styles.ButtonPressed}"/>
+      <Image Name="DisabledImage" Image="{styles:Styles.ButtonDisabled}"/>
+
+      <style:Style Name="BaseStyle" Style="{styles:SharedStyles.ActionButtonStyle}"/>
+      <style:Style Name="ShadowStyle" Style="{styles:SharedStyles.ActionButtonShadowStyle}"/>
+
+      <Inset Name="ButtonInset" Inset="10,4,9,0"/>
+
+      <Size Name="FixedHeight" Size="0,21"/>
+
+      <Boolean Name="ShowShadowLabel" Boolean="true"/>
+
+      <me:Icon Name="Icon" Icon="{null}"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+        <![CDATA[
+        
+        if (![UI.FullyEnabled] && [DisabledImage] != null)
+        {
+          Background.Content = DisabledImage;
+        }
+        
+        else
+        {
+          
+          if ([Clicker.Clicking] && [PressedImage] != null)
+          {
+            Background.Content = PressedImage;
+          }
+          else if ([UI.DeepMouseFocus] && [HoverImage] != null)
+          {
+            Background.Content = HoverImage;
+          }
+          else if ([UI.DeepKeyFocus] && [FocusImage] != null)
+          {
+            Background.Content = FocusImage;
+          }
+          else
+          {
+            Background.Content = [Image];
+          }
+        }
+        ]]>
+      </Script>
+      <Script>
+        ShadowLabel.Visible = [ShowShadowLabel];
+      </Script>
+      <Script>
+        ShadowLabel.Content = [Label.Content];
+      </Script>
+
+      
+      <Script>if (Icon != null) IconGraphic.Content = [Icon.Image];</Script>
+      <Script>if (Icon != null) IconGraphic.Margins = [Icon.Margins];</Script>
+      <Script>if (Icon != null) IconGraphic.Visible = [Icon.Visible];</Script>
+
+      
+      <Script>
+        int width = 1;
+        if (TileMinSize.Width > 0)
+          width = TileMinSize.Width; 
+
+        int height = 1;
+        if (TileMinSize.Height > 0)
+          height = TileMinSize.Height; 
+
+        WasteOfSpace.MaximumSize = new Size(width, height);
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Graphic Name="Background" StretchingPolicy="Fill" SizingPolicy="SizeToChildren" MinimumSize="{FixedHeight}" MaximumSize="{FixedHeight}" Layout="Anchor">
+        <Children>
+
+          
+          <Panel Name="LabelPanel" MaximumSize="{TileMaxSize}" Padding="{ButtonInset}">
+            <LayoutInput>
+              <AnchorLayoutInput Top="Parent,0"/>
+            </LayoutInput>
+            <Layout>
+              <FlowLayout Orientation="Horizontal" ItemAlignment="Center"/>
+            </Layout>
+            <Children>
+
+              
+              <Panel>
+                <Children>
+                  <me:Label Name="Label" Style="{Style}"/>
+                  <me:Label Name="ShadowLabel" Style="{ShadowStyle}" Margins="1,1,0,0"/>
+                </Children>
+              </Panel>
+
+              
+              <Graphic Name="IconGraphic"/>
+              
+            </Children>
+          </Panel>
+
+          
+          <Panel Name="WasteOfSpace" Layout="Fill">
+            <LayoutInput>
+              <AnchorLayoutInput Top="Parent,0"/>
+            </LayoutInput>
+          </Panel>
+
+        </Children>
+      </Graphic>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="ActionButton" Base="me:ActionButtonBase">
+    <Properties>
+      <iris:Command Name="Model" Command="{null}"/>
+      <me:CommandButtonProvider Name="Provider"/>
+    </Properties>
+
+    <Scripts>
+      <Script>Provider.Model = [Model];</Script>
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  <UI Name="BigActionButton" Base="me:ActionButton">
+    <Properties>
+      <Image Name="Image"         Image="{styles:Styles.BigButton}"/>
+      <Image Name="HoverImage"    Image="{styles:Styles.BigButtonHover}"/>
+      <Image Name="FocusImage"    Image="{HoverImage}"/>
+      <Image Name="PressedImage"  Image="{styles:Styles.BigButtonPressed}"/>
+      <Image Name="DisabledImage" Image="{styles:Styles.BigButtonDisabled}"/>
+
+      <style:Style Name="BaseStyle" Style="{styles:SharedStyles.BigActionButtonStyle}"/>
+      <style:Style Name="ShadowStyle" Style="{styles:SharedStyles.BigActionButtonShadowStyle}"/>
+
+      <Inset Name="ButtonInset" Inset="12,4,11,0"/>
+
+      <Size Name="FixedHeight" Size="0,25"/>
+    </Properties>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/CDSTATE.UIX b/test/2.1/CDSTATE.UIX
new file mode 100644
index 0000000..c5c549f
--- /dev/null
+++ b/test/2.1/CDSTATE.UIX
@@ -0,0 +1,282 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX xmlns="http://schemas.microsoft.com/2007/uix"
+     xmlns:iris="assembly://UIX/Microsoft.Iris"
+     xmlns:zune="assembly://ZuneShell/ZuneUI"
+     xmlns:sys="assembly://mscorlib/System"
+     xmlns:col="assembly://mscorlib/System.Collections"
+     xmlns:data="res://ZuneShellResources!LibraryData.schema.xml"
+     xmlns:me="Me">
+
+  
+  
+  
+  
+  <Class Name="CD">
+    <Properties>
+      <data:Album                  Name="DataAlbum"  Album="{null}" />
+      <zune:CDAlbumCommand         Name="CodeAlbum"  CDAlbumCommand="{null}" />
+      <List                        Name="Tracks"     List="{null}" />
+      <iris:Command                Name="Play" />
+      <iris:Command               Name="StartRip"    Description="{zune:Shell.LoadString(zune:StringId.IDS_START_RIP_BUTTON)}"/>
+      <iris:Command               Name="StopRip"     Description="{zune:Shell.LoadString(zune:StringId.IDS_STOP_RIP_BUTTON)}"/>
+      <bool Name="Unknown" />
+    </Properties>
+
+    <Locals>
+      <data:LibraryAlbumByTOCQuery Name="AlbumQuery" Enabled="false"/>
+      <data:LibraryTrackQuery      Name="TrackQuery" Enabled="false" DiscMediaView="true" Sort="+WM/TrackNumber" />
+    </Locals>
+
+    <Scripts>
+
+      <Script>
+        [InitialEvaluate(false)]
+        
+        
+        AlbumQuery.Enabled = false;
+        AlbumQuery.TOC = [CodeAlbum].TOC;
+        AlbumQuery.Enabled = true;
+      </Script>
+      <Script>
+        [DeclareTrigger(AlbumQuery.Result.Items.Count)]
+        if ((AlbumQuery.Result != null) &amp;&amp; !List.IsNullOrEmpty(AlbumQuery.Result.Items) &amp;&amp; (DataAlbum == null))
+        {
+          data:Album dataAlbum = (data:Album) AlbumQuery.Result.Items.get_Item(0);
+          CodeAlbum.LibraryID = dataAlbum.LibraryId;          
+          DataAlbum = dataAlbum;
+        }
+      </Script>
+
+      <Script>
+        if (DataAlbum != null)
+        {
+          
+          
+          TrackQuery.Enabled = false;
+          TrackQuery.AlbumId = [DataAlbum.LibraryId];
+          TrackQuery.Enabled = true;
+
+          Tracks = TrackQuery.Result.Items;
+        }
+      </Script>
+      <Script>
+        if ((Tracks != null) &amp;&amp; ([Tracks.Count] > 0))
+        {
+          
+          CodeAlbum.TrackCount = Tracks.Count;
+
+          
+          
+          int i = 0;
+          bool hasTracksToRip = false;
+          foreach(data:Track dataTrack in Tracks)
+          {
+            zune:CDAlbumTrack track = CodeAlbum.GetTrack(i);
+            i = i + 1;
+            if (dataTrack.InLibrary)
+            {
+              track.RipState = zune:RipState.InLibrary;
+            }
+            else
+            {
+              track.RipTrack = true;
+              hasTracksToRip = true;
+            }
+          }
+
+          
+          if (hasTracksToRip &amp;&amp; CodeAlbum.InsertedDuringSession &amp;&amp; zune:Management.Instance.AutoCopyCD.Value)
+          {
+            StartRip.Invoke();
+          }
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(CodeAlbum.AutoPlayAction)]
+        [DeclareTrigger(Tracks.Count)]
+
+        if (Tracks != null &amp;&amp; Tracks.Count > 0)
+        {
+          if (CodeAlbum.AutoPlayAction == zune:CDAction.Rip)
+          {
+            StartRip.Invoke();
+          }
+          else if (CodeAlbum.AutoPlayAction == zune:CDAction.Play)
+          {
+            Play.Invoke();
+          }
+
+          CodeAlbum.ClearAutoPlayAction();
+        }
+      </Script>
+
+      <Script>
+        StartRip.Available = (CodeAlbum != null) &amp;&amp; ([CodeAlbum.RipCount] > 0);
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Play.Invoked)]
+        if (Tracks != null &amp;&amp; Tracks.Count > 0)
+        {
+          zune:TransportControls.Instance.PlayItems(Tracks, 0);
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(StartRip.Invoked)]
+
+        if (CodeAlbum.RipCount > 0)
+        {
+          CodeAlbum.StartRip();
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(StopRip.Invoked)]
+        CodeAlbum.StopRip();
+      </Script>
+
+      <Script>
+        
+        if (DataAlbum != null)
+        {
+          if ((DataAlbum.Title != null) &amp;&amp; DataAlbum.Title.StartsWith(me:Strings.UnknownAlbumPrefix))
+          {
+            CodeAlbum.Description = me:Strings.UnknownAlbum;
+            Unknown = true;
+          }
+          else
+          {
+            CodeAlbum.Description = [DataAlbum.Title];
+          }
+        }
+      </Script>
+    </Scripts>
+  </Class>
+
+
+  
+
+
+
+  <Class Name="BurnList">
+    <Properties>
+      <String Name="Title"/>
+
+      <Int32 Name="PlaylistId" Int32="-1"/>
+      <Boolean Name="CanPlay"/>
+      <sys:TimeSpan Name="TotalTime"/> 
+      <Int64 Name="TotalSize" Int64="{(Int64)0}"/> 
+    </Properties>
+
+    <Scripts>
+      
+      <Script>
+        [DeclareTrigger(PlaylistId)]
+        Title = zune:Shell.LoadString(zune:StringId.IDS_PLAYLIST_BURN_LIST);
+      </Script>
+    </Scripts>
+  </Class>
+
+
+  
+  
+  
+  
+  <Class Name="CDState" Shared="True">
+    <Properties>
+      <zune:CDAccess Name="CDAccess" CDAccess="{zune:CDAccess.Instance}"/>
+      <me:BurnList Name="TheBurnList" BurnList="{null}"/>
+      <bool Name="HasMedia"/>
+
+      <col:Hashtable Name="AlbumToCD"/> 
+    </Properties>
+
+    <Locals>
+      <me:CD Name="PendingPlay" CD="{null}"/>
+      <me:CD Name="PendingRip"  CD="{null}"/>
+    </Locals>
+
+    <Scripts>
+      
+      <Script>
+        int burnListId = [CDAccess.BurnListId];
+        if (burnListId >= 0)
+        {
+          if (TheBurnList == null)
+          {
+            TheBurnList = new me:BurnList();
+          }
+          
+          TheBurnList.PlaylistId = -1;
+          TheBurnList.PlaylistId = burnListId;
+        }
+        else if (TheBurnList != null)
+        {
+          Class.DisposeOwnedObject(TheBurnList);
+          TheBurnList = null;
+        }
+      </Script>
+
+      
+
+
+
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(zune:CDAccess.Instance.MediaChanged)]
+
+        List nodes = (List) zune:Shell.MainFrame.Disc.NodesList;
+
+        bool hasMedia = false;
+        
+        if (nodes != null)
+        {
+          
+          
+
+          foreach(zune:CDAlbumCommand album in nodes)
+          {         
+            if ((album != zune:Shell.MainFrame.Disc.NoCD) &amp;&amp; (album != zune:Shell.MainFrame.Disc.BurnList))
+            {
+              if (!AlbumToCD.Contains(album))
+              {
+                me:CD cd = new me:CD();
+                cd.CodeAlbum = album;
+                
+                AlbumToCD.set_Item(album, cd);
+              }
+              hasMedia = true;
+            }
+          }
+        }
+
+        List discardedCDs = zune:CDAccess.Instance.DiscardedCDs;
+        
+        if (discardedCDs != null)
+        {
+          foreach(zune:CDAlbumCommand album in discardedCDs)
+          {
+            me:CD cd = (me:CD)AlbumToCD.get_Item(album);
+            if (cd != null)
+            {
+              Class.DisposeOwnedObject(cd);
+            }
+            AlbumToCD.Remove(album);
+          }
+          zune:CDAccess.Instance.DiscardedCDs = null;
+        }
+        HasMedia = hasMedia;
+      </Script>
+    </Scripts>
+  </Class>
+
+  <Class Name="Strings" Shared="true">
+      <Properties>
+        <string Name="UnknownAlbum" string="{zune:Shell.LoadString(zune:StringId.IDS_MEDIASTORE_UNKNOWN_ALBUM)}"/>
+        <string Name="UnknownAlbumPrefix" string="{zune:Shell.LoadString(zune:StringId.IDS_MEDIASTORE_UNKNOWN_ALBUM_PREFIX)}"/>
+     </Properties>
+  </Class>  
+
+</UIX>
diff --git a/test/2.1/CDVIEW.UIX b/test/2.1/CDVIEW.UIX
new file mode 100644
index 0000000..a124586
--- /dev/null
+++ b/test/2.1/CDVIEW.UIX
@@ -0,0 +1,1907 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:sys="assembly://mscorlib/System"
+  xmlns:data="res://ZuneShellResources!LibraryData.schema.xml"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:page="res://ZuneShellResources!PageStack.uix"
+  xmlns:spreadsheet="res://ZuneShellResources!SpreadSheetViewBase.uix"
+  xmlns:playlist="res://ZuneShellResources!PlaylistContentsPanel.uix"
+  xmlns:plc="res://ZuneShellResources!PlaylistContentsPanelColumns.uix"
+  xmlns:tpc="res://ZuneShellResources!TracksPanelColumns.uix"
+  xmlns:cd="res://ZuneShellResources!CDState.uix"
+  xmlns:animations="res://ZuneShellResources!Animations.uix"
+  xmlns:notification="res://ZuneShellResources!NotificationArea.uix"
+  xmlns:purchase="res://ZuneShellResources!PurchaseForBurn.uix"
+  xmlns:list="res://ZuneShellResources!ContentList.uix"
+  xmlns:dialogs="res://ZuneShellResources!LibraryDialogs.uix"
+  xmlns:me="Me">
+  
+  <Class Name="CDViewListModel" Base="spreadsheet:SpreadSheetListModel">
+    <Properties>
+      <cd:CD Name="CD"/>
+    </Properties>
+  </Class>
+
+  <UI Name="CDView" Base="page:PageBase">
+    <Properties>
+      <zune:Shell Name="Shell" Shell="$Required"/>
+      <zune:CDLand Name="Page" CDLand="$Required"/>
+    </Properties>
+
+    <Locals>
+      <cd:CD Name="CD" CD="{null}" />
+      <cd:BurnList Name="BurnList" BurnList="{null}"/>
+      <data:Album Name="CDAlbum" Album="{null}"/>
+      <cd:CDState Name="CDState"/>
+      <me:CDViewListModel Name="ListModel"/>
+      
+      <Inset Name="RipInset" Inset="24,16,0,0"/>
+      <Inset Name="BurnInset" Inset="4,16,0,0"/>
+      
+      
+      <zune:CDAlbumCommand Name="CurrentCodeAlbum" CDAlbumCommand="{null}"/>
+    </Locals>
+
+    <Scripts>
+      
+      <Script>
+        bool hasBurnList = false;
+        Inset inset;
+        
+        if (Page.Album == Shell.MainFrame.Disc.NoCD)
+        {
+          
+          Artist.Content = " ";
+          string noCD = me:Strings.NoCD;
+          AlbumTitle.Content = noCD;
+          CDView.AlbumArtContent = styles:Styles.NoAlbumArtRip;
+          CDView.AlbumInfoVisible = false;
+        }
+        else if (Page.Album == Shell.MainFrame.Disc.BurnList)
+        {
+          BurnList = CDState.TheBurnList;
+          
+          CDView.BurnList = BurnList;
+          BurnListPanel.BurnList = BurnList;
+          hasBurnList = (BurnList != null);
+
+          ActionButton.Model = BurnListPanel.ActionCommand;        
+          inset = BurnInset;
+        }
+        else
+        {
+          CD = (cd:CD) CDState.AlbumToCD.get_Item(Page.Album);
+          CDView.CD = CD;
+          ListModel.CD = CD;          
+          inset = RipInset;
+        }
+
+        BurnListPanel.Visible = hasBurnList;
+        ActionButton.Visible = hasBurnList;
+        ActionButtonPanel.Margins = inset;
+      </Script>
+
+      
+      <Script>ClearBurnList.Model = BurnListPanel.ClearBurnListCommand;</Script>
+
+      
+      <Script>ClearBurnList.Visible = [ClearBurnList.Model.Available];</Script>
+        
+      <Script>
+        if ([BurnList] != null)
+        {
+          if (zune:CDAccess.Instance.IsAudioBurn)
+          {
+            Artist.Content = me:Strings.BurnTitleAudio;
+          }
+          else
+          {
+            Artist.Content = me:Strings.BurnTitleData;
+          }
+        }
+      </Script>
+      
+      <Script>
+        if (CD != null)
+        {
+          CDAlbum = [CD.DataAlbum];
+        }
+      </Script>
+      
+      <Script>
+        if (BurnList != null)
+        {
+          StatusMessage.Content = [BurnListPanel.StatusMessage];
+        }
+      </Script>
+
+      <Script>
+        if (CD != null)
+        {
+          CDTrackList.Content = [CD.Tracks];
+        }
+        CDTrackList.Visible = (CDTrackList.Content != null);
+        
+      </Script>
+
+      <Script>
+        if ([CDAlbum] != null)
+        {
+          Artist.Content = [CDAlbum.ArtistName];
+          sys:String title = [CD.CodeAlbum.Description];
+          AlbumTitle.Content = title;
+
+         if (CDAlbum.AlbumArtSuperLarge != null)
+          {
+            CDView.AlbumArtContent = [CDAlbum.AlbumArtSuperLarge];
+          }
+          else
+          {
+            CDView.AlbumArtContent = styles:Styles.NoAlbumArtRip;
+          }
+
+          int year = [CDAlbum.ReleaseDate].Year;
+          
+          if (year > 1)
+          {
+            
+            
+            
+            String fmt = zune:Shell.LoadString(zune:StringId.IDS_CD_LAND_ALBUM_INFO);
+            CDView.AlbumInfoContent = fmt.Format(year);
+            CDView.AlbumInfoVisible = true;
+          }
+          else
+          {
+            CDView.AlbumInfoContent = null;
+            CDView.AlbumInfoVisible = false;
+          }
+
+          if ([CD.CodeAlbum.IsRipping])
+          {
+            ActionButton.Model = CD.StopRip;
+          }
+          else
+          {
+            ActionButton.Model = CD.StartRip;
+          }
+
+          
+          if (BurnList == null)
+          {
+            ActionButton.Visible = true;
+          }      
+        }
+      </Script>
+
+       
+      <Script>
+        if ([CD] != null)
+        {
+          CurrentCodeAlbum = CD.CodeAlbum;
+        }
+        else
+        {
+          CurrentCodeAlbum = null;
+        }
+      </Script>
+     
+      <Script>
+        bool isCurrentCDErasing = false;
+        bool isCurrentCDRipping = false;
+        bool isCurrentBurnListBurning = false;
+        
+        if (CurrentCodeAlbum != null)
+        {
+          zune:BurnableCD burnCD = CurrentCodeAlbum.BurnCD;
+          if (burnCD != null)
+          {
+            isCurrentCDErasing = [zune:CDAccess.Instance.IsErasing] &amp;&amp; burnCD.IsErasing;
+          }
+          
+          isCurrentCDRipping = [CurrentCodeAlbum.IsRipping];
+        }
+        
+        isCurrentBurnListBurning = ([BurnList] != null) &amp;&amp; [zune:CDAccess.Instance.IsBurning];
+
+        if (isCurrentBurnListBurning || isCurrentCDErasing)
+        {
+          
+          ProgressNotification.Model = [zune:CDAccess.Instance.BurnNotification];
+        }
+        else if (isCurrentCDRipping)
+        {
+          
+          ProgressNotification.Model = [zune:CDAccess.Instance.Notification];
+        }
+        else
+        {
+          
+          ProgressNotification.Model = null;
+        }
+      </Script>
+
+    </Scripts>
+    <Content>
+
+      <Panel Layout="Dock">
+        <Animations>
+          <Animation Animation="{animations:Animations.HideNow}"/>
+        </Animations>
+        
+        <Children>
+          
+          <Panel Name="ArtistPanel" Margins="0,-4,0,12">
+            <Layout>
+              <FlowLayout Orientation="Vertical"/>
+            </Layout>
+            
+            <LayoutInput>
+              <DockLayoutInput Alignment="Near" Position="Top"/>
+            </LayoutInput>
+            <Children>
+             
+              
+              <core:AnimatedLabel Name="Artist" Style="{styles:SharedStyles.CDLandArtistName}" Margins="0,0,0,-14"/>
+              
+              <core:AnimatedLabel Name="AlbumTitle" Style="{styles:SharedStyles.CDLandAlbumName}"/>
+              
+            </Children>
+          </Panel>
+
+            
+          <Panel Name="LeftColumn" Layout="Anchor" Margins="3,0,12,0">            
+            <LayoutInput>
+              <DockLayoutInput Alignment="Near" Position="Left"/>
+            </LayoutInput>
+            
+            <Children>
+              
+              
+              
+              
+              <me:CurrentCD Name="CDView" Shell="{Shell}" Margins="0,0,0,40">
+                <LayoutInput>
+                  <AnchorLayoutInput Top="Parent,0" Left="Parent,0"/>
+                </LayoutInput>
+              </me:CurrentCD>
+
+              <notification:StandaloneProgressArea Name="ProgressNotification" Model="{null}" Margins="0,-6,0,0">
+                <LayoutInput>
+                  <AnchorLayoutInput Top="CDView,1,-40" Left="Parent,0"/>
+                </LayoutInput>
+              </notification:StandaloneProgressArea>
+
+            </Children>
+          </Panel>
+          
+          
+          <Panel Layout="Dock" Name="RightColumn" Margins="0,0,0,10">
+            <LayoutInput>
+              <DockLayoutInput Alignment="Near" Position="Right"/>
+            </LayoutInput>
+
+            <Children>
+              <Panel Name="Tracks">
+                <Animations>
+                  <Animation Animation="{animations:Animations.ListFadeIn}"/>
+                </Animations>
+
+                <Children>
+
+                  <me:TrackList Name="CDTrackList" ListModel="{ListModel}"/>
+
+                  <me:BurnListPanel Name="BurnListPanel" Page="{Page}" Model="{Page.BurnListPanel}"/>
+
+                </Children>
+              </Panel>
+
+              
+              <core:AnimatedLabel Name="StatusMessage" Style="{styles:SharedStyles.CDLandStatusError}" Margins="8,12,0,0">
+                <LayoutInput>
+                  <DockLayoutInput Alignment="Near" Position="Bottom"/>
+                </LayoutInput>
+              </core:AnimatedLabel>
+              
+              <Panel Name="ActionButtonPanel" Layout="HorizontalFlow">
+                <LayoutInput>
+                  <DockLayoutInput Alignment="Near" Position="Bottom"/>
+                </LayoutInput>
+                
+                <Animations>
+                  <Animation  Animation="{animations:Animations.ComponentShow}"/>
+                </Animations>
+
+                <Children>
+
+                  <core:BigActionButton Name="ActionButton"/>
+
+                  <core:BigActionButton Name="ClearBurnList"/>
+
+                </Children>
+              </Panel>
+            </Children>
+          </Panel>
+
+        </Children>
+      </Panel>
+
+    </Content>
+  </UI>
+
+  <UI Name="CurrentCD">
+    <Properties>
+      <zune:Shell Name="Shell" Shell="$Required"/>
+      <String Name="AlbumInfoContent" String="{null}"/>
+      <Image Name="AlbumArtContent" Image="{null}"/>
+      <bool Name="AlbumInfoVisible" bool="false"/>
+
+      <cd:CD Name="CD" CD="{null}"/>
+      <cd:BurnList Name="BurnList" BurnList="{null}"/>
+    </Properties>
+
+    <Locals>
+      <zune:MenuItemCommand Name="Play" Description="{zune:Shell.LoadString(zune:StringId.IDS_PLAY_MENUITEM)}"/>
+      <zune:MenuItemCommand Name="Erase" Description="{zune:Shell.LoadString(zune:StringId.IDS_ERASE_CD_MENUITEM)}"/>
+      <zune:MenuItemCommand Name="Eject" Description="{zune:Shell.LoadString(zune:StringId.IDS_EJECT_CD_MENUITEM)}"/>
+      <zune:MenuItemCommand Name="Edit" Description="{zune:Shell.LoadString(zune:StringId.IDS_CD_EDIT_ALBUM_INFO_MENU_ITEM)}"/>
+      <zune:MenuItemCommand Name="ChooseArt"/>
+
+      <core:ContextMenu Name="ContextMenu">
+        <Options>
+          <iris:Command Command="{Play}"/>
+          <iris:Command Command="{Edit}"/>
+          <iris:Command Command="{ChooseArt}"/>
+          <iris:Command Command="{Erase}"/>
+          <iris:Command Command="{Eject}"/>
+        </Options>
+      </core:ContextMenu>
+
+      <zune:CDAccess Name="CDAccess" CDAccess="{zune:CDAccess.Instance}"/>
+
+      <zune:CDAlbumCommand Name="CurrentCodeAlbum" CDAlbumCommand="{null}"/>
+
+      <Single Name="AnimLength" Single="{animations:CDAnimationHelper.FlipLength}"/>
+      <Single Name="ShineLength" Single="0.4"/>
+      <Animation Name="ShineAnimation" Type="Show" CenterPointPercent="0.5,0.5,1.0">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0"                 Value="0"/>
+          <AlphaKeyframe Time="{ShineLength * 0.5}" Value="0.6"/>
+          <AlphaKeyframe Time="{ShineLength}"       Value="0"/>
+          <ScaleKeyframe Time="0.0"                 Value="0.4,0.4,1"/>
+          <ScaleKeyframe Time="{ShineLength * 0.5}" Value="1.5,1.5,1"/>
+          <ScaleKeyframe Time="{ShineLength}"       Value="0.4,0.4,1"/>
+          <PositionKeyframe Time="0.0"              Value="-200,-150,0"/>
+          <PositionKeyframe Time="{ShineLength}"    Value="150,25,0"/>
+        </Keyframes>
+      </Animation>
+
+      <dialogs:EditAlbumInfoDialog Name="EditAlbumInfoDialog" EditAlbumInfoDialog="{null}"/>
+      
+      <zune:AlbumArtUpdateHandler Name="Updater" AlbumArtUpdateHandler="{null}"/>
+
+      
+      <Int64 Name="UsedSpace"/>
+      <Int64 Name="AvailableSpace"/>
+
+      
+
+      <Int64 Name="OverTimeAllowed" Int64="{0L}"/>
+      <Int64 Name="OverSpaceAllowed" Int64="{0L}"/>
+    </Locals>
+
+    <Input>
+      <ClickHandler Name="RightClick" ClickType="RightMouse"/>
+    </Input>
+
+    
+    <Scripts>
+      <Script>
+        UsedSpace = 0L;
+        
+        if ([BurnList] != null)
+        {
+          AlbumInfo.Visible = false;
+
+          if (CDAccess.IsAudioBurn)
+          {
+            sys:TimeSpan totalTime = [BurnList.TotalTime];
+            AlbumTimeUsed.Visible = true;
+            if(totalTime.Ticks > 0L)
+            {
+              UsedSpace = totalTime.Ticks;
+              AlbumTimeUsed.Content = me:Strings.TimeUsed.Format(CDAccess.TimeSpanToStringForBurnTime(totalTime));
+            } 
+            else 
+            {
+              AlbumTimeUsed.Content = " ";
+            }
+            AlbumSizeUsed.Visible = false;
+          }
+          else
+          {
+            AlbumSizeUsed.Visible = true;
+            if(BurnList.TotalSize > (Int64)0)
+            {
+              AlbumSizeUsed.SizeData = [BurnList.TotalSize];
+              UsedSpace = BurnList.TotalSize;
+            }
+            else
+            {
+              AlbumSizeUsed.Content = " ";              
+            }
+            
+            AlbumTimeUsed.Visible = false;    
+          }
+
+          AlbumArt.Content = styles:Styles.NoAlbumArtBurn;
+        }
+        else
+        {
+          AlbumInfo.Visible = [AlbumInfoVisible];
+          AlbumInfo.Content = [AlbumInfoContent];
+          AlbumTimeUsed.Visible = false;
+          AlbumTimeAvailable.Visible = false;    
+          AlbumSizeUsed.Visible = false;
+          AlbumSizeAvailable.Visible = false;                
+          AlbumArt.Content = [AlbumArtContent];
+        }
+      </Script>
+
+      
+      <Script>
+        if ([CD] != null)
+        {
+          CurrentCodeAlbum = CD.CodeAlbum;
+        }
+        else
+        {
+          CurrentCodeAlbum = null;
+        }
+      </Script>
+
+      
+      <Script>
+        AvailableSpace = 0L;
+        
+        if ([BurnList] != null)
+        {
+          zune:BurnableCD burnCD = [CDAccess.BurnCDForNextSession];
+
+          bool isAudioBurn = CDAccess.IsAudioBurn;
+          AlbumTimeAvailable.Visible = isAudioBurn;
+          AlbumSizeAvailable.Visible = !isAudioBurn;
+
+          if (isAudioBurn)
+          {
+            sys:TimeSpan timeAvailable;
+            if (burnCD != null)
+            {
+              timeAvailable = burnCD.TimeAvailable;
+            }
+            else
+            {
+              timeAvailable = CDAccess.DefaultBurnTimeAvailable;
+            }
+            AvailableSpace = timeAvailable.Ticks;
+            
+            AlbumTimeAvailable.Content = me:Strings.TimeAvailable.Format(CDAccess.TimeSpanToStringForBurnTime(timeAvailable));
+            if(timeAvailable.Ticks &lt;= 0L)
+            {
+              AlbumTimeAvailable.Content = " ";
+            }
+          }
+          else
+          {
+            if (burnCD != null)
+            {
+               AlbumSizeAvailable.SizeData = burnCD.SpaceAvailable;
+               AvailableSpace = AlbumSizeAvailable.SizeData;
+            }
+            else
+            {
+              if(CDAccess.DefaultBurnSpaceAvailable > (Int64)0)
+              {
+                AlbumSizeAvailable.SizeData = CDAccess.DefaultBurnSpaceAvailable;
+              } 
+              else 
+              {
+                AlbumSizeAvailable.Content = " ";
+              }
+            }
+          }
+        }
+        else
+        {
+          AlbumTimeAvailable.Visible = false;
+          AlbumSizeAvailable.Visible = false;                    
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(AvailableSpace)]
+        [DeclareTrigger(UsedSpace)]
+        
+        bool over = false;
+        if (AvailableSpace > 0L)
+        {
+          if (CDAccess.IsAudioBurn)
+          {
+            if (UsedSpace > AvailableSpace + OverTimeAllowed) over = true;
+          }
+          else
+          {
+            if (UsedSpace > AvailableSpace + OverSpaceAllowed) over = true;
+          }
+        }
+        
+        if (over)
+        {
+          AlbumTimeUsed.Style = styles:SharedStyles.CDLandAlbumExceededCapacity;
+          AlbumSizeUsed.Style = styles:SharedStyles.CDLandAlbumExceededCapacity;
+        }
+        else
+        {
+          AlbumTimeUsed.Style = styles:SharedStyles.CDLandAlbumGenre;
+          AlbumSizeUsed.Style = styles:SharedStyles.CDLandAlbumGenre;
+        }
+      </Script>
+
+
+      
+      <Script>
+        [DeclareTrigger(RightClick.Invoked)]
+
+        ContextMenu.LayoutInput = new PopupLayoutInput();
+        ContextMenu.LayoutInput.Placement = PlacementMode.MouseOrigin;
+        ContextMenu.Helper.Show(ContextMenu);
+      </Script>
+
+      
+      <Script>
+        if ([ContextMenu.Helper.IsOpening])
+        {
+          if (CD == null)
+          {
+            
+            ContextMenu.Helper.Hide();
+          }
+          else
+          {
+            Play.Available = !List.IsNullOrEmpty(CD.Tracks);
+            
+            if (CurrentCodeAlbum != null)
+            {
+              Eject.Available = CurrentCodeAlbum.IsMediaLoaded &amp;&amp; !CurrentCodeAlbum.IsRipping &amp;&amp; !CurrentCodeAlbum.BurnCD.IsErasing;
+              Eject.Hidden = false;
+              Erase.Available = !CDAccess.IsErasing &amp;&amp; !CDAccess.IsBurning;
+              Erase.Hidden = !CurrentCodeAlbum.CanErase;
+            }
+            else
+            {
+              Eject.Hidden = true;
+              Erase.Hidden = true;
+            }
+
+            if (CD.DataAlbum != null)
+            {
+              ChooseArt.Hidden = false;
+              if (CD.DataAlbum.HasAlbumArt)
+              {
+                ChooseArt.Description = zune:Shell.LoadString(zune:StringId.IDS_UPDATE_ALBUM_ART);
+              }
+              else
+              {
+                ChooseArt.Description = zune:Shell.LoadString(zune:StringId.IDS_ADD_ALBUM_ART);
+              }
+            }
+            else
+            {
+              ChooseArt.Hidden = true;
+            }
+          }  
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(Play.Invoked)]
+        if (CD != null)
+        {
+          CD.Play.Invoke();
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(Eject.Invoked)]
+
+        if (CurrentCodeAlbum != null)
+        {
+          CurrentCodeAlbum.CDDevice.Eject();
+        }
+        else
+        {
+          
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(Erase.Invoked)]
+
+        if (CurrentCodeAlbum != null)
+        {
+          CurrentCodeAlbum.BurnCD.Erase();
+        }
+        else
+        {
+          
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Edit.Invoked)]
+        
+        if (EditAlbumInfoDialog == null) EditAlbumInfoDialog = new dialogs:EditAlbumInfoDialog();
+        
+        EditAlbumInfoDialog.Album = CD.DataAlbum;
+        EditAlbumInfoDialog.Tracks = CD.Tracks;
+        EditAlbumInfoDialog.Helper.Show(EditAlbumInfoDialog);
+      </Script>
+      
+      
+      <Script>
+        [DeclareTrigger(ChooseArt.Invoked)]
+
+        if (CD.DataAlbum != null)
+        {
+          Updater = new zune:AlbumArtUpdateHandler(CD.DataAlbum);
+          Updater.Start();
+        }
+      </Script>
+      <Script>
+        if (Updater != null &amp;&amp; [Updater.Done])
+        {
+          if (!sys:String.IsNullOrEmpty(Updater.Path))
+          {
+            data:Album album = (data:Album)Updater.Album;
+
+            album.ThumbnailPath = Updater.Path;
+          }
+
+          UI.DisposeOwnedObject(Updater);
+          Updater = null;
+        }
+      </Script>      
+
+      <Script>animations:CDAnimationHelper.FlipLength = AnimLength;</Script>
+    </Scripts>
+    <Content>
+
+      <Panel Layout="VerticalFlow">
+        <Children>
+          <Panel Name="CDDataView" Layout="VerticalFlow" Margins="0,0,0,22" MinimumSize="272,0">
+            <LayoutInput>
+              <AnchorLayoutInput Top="Parent,0" Left="Parent,0"/>
+            </LayoutInput>
+
+            <Animations>
+              <Animation Animation="{animations:Animations.TitleContentChange}" />
+              <Animation Animation="{animations:Animations.TitleShow}" />
+            </Animations>
+            <Children>
+
+              <core:Label   Name="AlbumInfo" Style="{styles:SharedStyles.CDLandAlbumGenre}"/>
+              <core:Label   Name="AlbumTimeAvailable" Style="{styles:SharedStyles.CDLandAlbumGenre}"/>
+              <core:Label   Name="AlbumTimeUsed" Style="{styles:SharedStyles.CDLandAlbumGenre}"/>
+              <tpc:SizeCell Name="AlbumSizeAvailable" FormatString="{me:Strings.SizeAvailable}" Style="{styles:SharedStyles.CDLandAlbumGenre}" />
+              <tpc:SizeCell Name="AlbumSizeUsed" FormatString="{me:Strings.SizeUsed}" Style="{styles:SharedStyles.CDLandAlbumGenre}"/>
+
+            </Children>
+          </Panel>
+
+          
+          <Panel Name="ArtPanel" Margins="12,0,0,0" Layout="Anchor">
+            <LayoutInput>
+              <AnchorLayoutInput Top="CDDataView,1" Left="CDDataView,0"/>
+            </LayoutInput>
+            
+            
+
+            <Animations>
+              <Animation Animation="{animations:Animations.MoveNow}"/>
+              <SwitchAnimation Type="Show" Expression="{animations:CDAnimationHelper.ShowAnim}">
+                <Options>
+                  <Animation Name="Flip" CenterPointPercent="0.5,0.5,1.0">
+                    <Keyframes>
+                      <PositionKeyframe Time="0.0"          Value="0,200,0" Interpolation="Sine"/>
+                      <PositionKeyframe Time="{AnimLength}" Value="0,0,0"/>
+                    </Keyframes>
+                  </Animation>
+                </Options>
+              </SwitchAnimation>
+            </Animations>
+            
+            <Children>
+              <Graphic Name="AlbumShine" Content="{styles:Styles.CDShine}" Padding="16,16,16,16">
+                <LayoutInput>
+                  <AnchorLayoutInput Left="Drop,0" Top="Drop,0" Right="Drop,1" Bottom="Drop,1" ContributesToHeight="false"/>
+                </LayoutInput>
+
+                <Animations>
+                  <Animation Animation="{animations:Animations.MoveNow}"/>
+                  <SwitchAnimation Type="Show" Expression="{animations:CDAnimationHelper.ShowAnim}">
+                    <Options>
+                      <TransformAnimation Name="Flip" Delay="{AnimLength + 0.1}" Source="{ShineAnimation}"/>
+                      <TransformAnimation Name="Slide" Delay="0.1" Source="{ShineAnimation}"/>
+                    </Options>
+                  </SwitchAnimation>
+                </Animations>
+              </Graphic>
+
+              
+              <Graphic Name="Drop" Content="{styles:Styles.CDArtShadow}" SizingPolicy="SizeToChildren" StretchingPolicy="Fill" Margins="-16,-16,0,0" Padding="16,16,16,16">
+                <LayoutInput>
+                  <AnchorLayoutInput Left="Parent,0" Top="Parent,0"/>
+                </LayoutInput>
+
+                <Animations>
+                  <Animation Animation="{animations:Animations.MoveNow}"/>
+                  <SwitchAnimation Type="Show" Expression="{animations:CDAnimationHelper.ShowAnim}">
+                    <Options>
+                      <Animation Name="Flip" CenterPointPercent="0.3,0.5,1.0">
+                        <Keyframes>
+                          <PositionKeyframe Time="0.0"          Value="-20,0,0"     Interpolation="Cosine"/>
+                          <PositionKeyframe Time="{AnimLength}" Value="0,0,0"/>
+                          <ScaleKeyframe Time="0.00"            Value="0.1,0.1,1.0" Interpolation="EaseOut,1.3,0.7"/>
+                          <ScaleKeyframe Time="{AnimLength}"    Value="0.95,0.95,1" Interpolation="EaseIn,1.3,0.3"/>
+                          <ScaleKeyframe Time="{AnimLength + animations:CDAnimationHelper.SlideLength}"  Value="1,1,1"/>
+                        </Keyframes>
+                      </Animation>
+                      <Animation Name="Slide" CenterPointOffset="0.7,0.5,1.0" >
+                        <Keyframes>
+                          <AlphaKeyframe Time="0.0"     Value="0.0"/>
+                          <AlphaKeyframe Time="0.1"     Value="1.0"/>
+                          <ScaleKeyframe Time="0.0"     Value="0.95,0.95,1" Interpolation="EaseIn,1.3,0.3"/>
+                          <ScaleKeyframe Time="0.5" RelativeTo="Final"/>
+                        </Keyframes>
+                      </Animation>
+                    </Options>
+                  </SwitchAnimation>
+                        
+                </Animations>
+                <Children>
+                  
+                  <Graphic Name="AlbumArt" SizingPolicy="SizeToConstraint" MaximumSize="240,240" StretchingPolicy="Uniform">
+                    <Animations>
+                      <Animation Type="ContentChangeHide">
+                        <Keyframes>
+                          <AlphaKeyframe Time="0.0" Value="1" Interpolation="Log"/>
+                          <AlphaKeyframe Time="{animations:Animations.PopLength}" Value="0"/>
+                        </Keyframes>
+                      </Animation>
+                    </Animations>
+                  </Graphic>
+                </Children>
+              </Graphic>
+            </Children>
+          </Panel>
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  <UI Name="TrackList" Base="spreadsheet:SpreadSheet">
+    <Properties>
+      <spreadsheet:ColumnData Name="ColumnData" ColumnData="{me:Columns.DefaultViewColumnData}"/>
+      <Type Name="ListItemType" Type="{typeof(me:TrackListItem)}"/>
+      <me:CDViewListModel Name="ListModel" CDViewListModel="$Required"/>
+      <Boolean Name="HighlightHeaders" Boolean="false"/>
+      <Size Name="RowSize" Size="0,27"/>
+      <Inset Name="RowPadding" Inset="0,0,0,0"/>
+
+      <list:CommandContainer Name="EditContext"/>
+      <core:NavigateIntoIndexRequest Name="NavigateIntoArgs"/>
+      
+      <zune:MenuItemCommand Name="Play" Description="{zune:Shell.LoadString(zune:StringId.IDS_PLAY_MENUITEM)}"/>
+      <iris:Command Name="Edit" Description="{zune:Shell.LoadString(zune:StringId.IDS_LIBRARY_EDIT_MENU_ITEM)}"/>
+      
+      <core:ContextMenu Name="ContextMenu">
+        <Options>
+          <iris:Command Command="{Play}"/>
+          <iris:Command Command="{Edit}"/>
+        </Options>
+      </core:ContextMenu>      
+    </Properties>
+    
+    <Locals>
+      <Command Name="Execute" />
+      <cd:CD Name="CD" />
+    </Locals>
+
+    <Input>
+      <KeyHandler Name="EditKey" Key="F2" DisallowedModifiers="Alt,Ctrl,Shift" HandlerStage="Bubbled" Handle="true"/>      
+    </Input>
+    
+    <Scripts>
+      
+      <Script> ExecuteCommand = Execute; </Script>
+
+      <Script>
+        CD = [ListModel.CD];
+
+        
+        me:FocusState.Track = 0;
+      </Script>
+
+      <Script>
+        
+        if (CD != null &amp;&amp; CD.CodeAlbum != null)
+        {
+          if (CD.Tracks == null)
+          {
+            
+            zune:TransportControls.Instance.PagePlaySelection.Available = false;
+          }
+          else
+          {
+            
+            zune:TransportControls.Instance.PagePlaySelection.Available = ([CD.Tracks.Count] > 0);
+          }
+        }
+      </Script>
+
+      
+      
+      
+      <Script>
+        [DeclareTrigger(zune:TransportControls.Instance.PagePlaySelection.Invoked)]
+        [DeclareTrigger(Execute.Invoked)]
+        [DeclareTrigger(Play.Invoked)]
+
+        if (CD != null)
+        {
+          List tracks = CD.Tracks;
+
+          if (tracks != null)
+          {
+            zune:TransportControls.Instance.PlayItems(tracks, me:FocusState.Track);
+          }
+        }
+      </Script>
+      
+      
+      <Script>
+        [DeclareTrigger(EditKey.Invoked)]
+
+        if (EditKey.EventContext is list:ListItemContext)
+        {
+          list:ListItemContext context = (list:ListItemContext)EditKey.EventContext;
+
+          if (context.Edit != null)
+          {
+            context.Edit.Invoke();
+          }
+        }
+      </Script>
+      
+      
+      <Script>
+        [DeclareTrigger(Edit.Invoked)]
+
+        if (EditContext.Model != null)
+        {
+          EditContext.Model.Invoke();
+        }
+      </Script>      
+    </Scripts>
+  </UI>
+
+  
+  <UI Name="TrackListItem" Base="spreadsheet:SpreadSheetListItem">
+    <Properties>
+      <me:CDViewListModel Name="ListModel" CDViewListModel="$Required"/>
+      <data:Track Name="Model" Track="$Required"/>
+    </Properties>
+
+    <Locals>
+      <zune:CDAlbumTrack Name="TrackInfo" CDAlbumTrack="{null}" />
+    </Locals>
+
+    <Input>
+      <KeyHandler Name="SpaceKey" Key="Space" HandlerStage="Direct"/>
+    </Input>
+    
+    <Scripts>
+      
+      <Script>
+        zune:CDAlbumCommand currentCD = ListModel.CD.CodeAlbum;
+        TrackInfo = currentCD.GetTrack(Index.Value);
+      </Script>      
+      
+      <Script>
+        if ([UI.DeepKeyFocus])
+        {
+          me:FocusState.Track = Index.Value;
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(SpaceKey.Invoked)]
+        
+        TrackInfo.RipTrack = !TrackInfo.RipTrack;
+      </Script>
+
+    </Scripts>
+  </UI>
+
+  
+  <Class Name="FocusState" Shared="True">
+    <Properties>
+      <int Name="Track" int="0" />
+    </Properties>
+  </Class>
+
+  
+  <Class Name="Columns" Shared="True">
+    <Properties>
+
+      
+      <spreadsheet:ColumnData Name="DefaultViewColumnData" HideColumns="true">
+        <Columns>
+
+          <spreadsheet:ColumnInfo CellType="{typeof(tpc:LibraryMediaStatusCell)}" Resizable="false" CellPadding="4,4,4,0">
+            <ColumnSize>
+              <SharedSize Size="25,0"/>
+            </ColumnSize>
+            <LayoutInput>
+              <StackLayoutInput Priority="High"/>
+            </LayoutInput>
+          </spreadsheet:ColumnInfo>
+
+          <spreadsheet:ColumnInfo CellType="{typeof(me:CheckCell)}"
+                                  HeaderType="{typeof(me:SongsHeader)}"
+                                  CellPadding="0,5,0,0" 
+                                  Resizable="false">
+            <ColumnSize>
+              <SharedSize Size="18,0"/>
+            </ColumnSize>
+            <LayoutInput>
+              <StackLayoutInput Priority="High"/>
+            </LayoutInput>
+          </spreadsheet:ColumnInfo>
+
+          <spreadsheet:ColumnInfo CellType="{typeof(me:NumberCell)}"
+                                  CellPadding="10,0,0,0" 
+                                  Resizable="false">
+            <ColumnSize>
+              <SharedSize Size="40,0"/>
+            </ColumnSize>
+            <LayoutInput>
+              <StackLayoutInput Priority="High"/>
+            </LayoutInput>
+          </spreadsheet:ColumnInfo>
+
+          <spreadsheet:ColumnInfo CellType="{typeof(me:TitleCell)}"
+                                  CellEditType="{typeof(tpc:SongEditCell)}"
+                                  CellPadding="0,5,0,0" 
+                                  Resizable="false">
+            <ColumnSize>
+              <SharedSize Size="9999,0"/>
+            </ColumnSize>
+            <LayoutInput>
+              <StackLayoutInput Priority="Medium" MinimumSize="100,0"/>
+            </LayoutInput>
+          </spreadsheet:ColumnInfo>
+          
+          <spreadsheet:ColumnInfo Header="{zune:Shell.LoadString(zune:StringId.IDS_LENGTH_COLUMN_HEADER)}"
+                                  CellType="{typeof(me:LengthCell)}"
+                                  Resizable="false">
+            <ColumnSize>
+              <SharedSize Size="75,0"/>
+            </ColumnSize>
+            <LayoutInput>
+              <StackLayoutInput Priority="High"/>
+            </LayoutInput>
+          </spreadsheet:ColumnInfo>
+
+          <spreadsheet:ColumnInfo Header="{zune:Shell.LoadString(zune:StringId.IDS_STATUS_COLUMN_HEADER)}"
+                                  CellType="{typeof(me:StatusCell)}"
+                                  CellPadding="5,0,10,0"
+                                  Resizable="false">
+            <ColumnSize>
+              <SharedSize Size="100,0"/>
+            </ColumnSize>
+            <LayoutInput>
+              <StackLayoutInput Priority="High"/>
+            </LayoutInput>
+          </spreadsheet:ColumnInfo>
+
+        </Columns>
+      </spreadsheet:ColumnData>
+
+    </Properties>
+  </Class>
+
+  
+  <Class Name="TrackColumn" Shared="True">
+    <Properties>
+      <SharedSize Name="TrackNumberSharedSize" />
+    </Properties>
+  </Class>
+
+  <UI Name="SongsHeader" Base="spreadsheet:LabelCell">
+    <Locals>
+      <cd:CDState Name="CDState" />
+    </Locals>
+    <Scripts>
+      <Script>
+        UI.FocusInterestTarget = private_Label;
+        UI.AllowDoubleClicks = false;
+      </Script>
+      
+      <Script>
+        int count = 0;
+
+        if (((me:CDViewListModel) ListModel).CD != null)
+        {
+          count = [((me:CDViewListModel) ListModel).CD.CodeAlbum.TrackCount];
+        }
+
+        Content = sys:String.Format(me:Strings.SongsHeader, count);
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Clicker.Invoked)]
+        cd:CD currentCD = ((me:CDViewListModel) ListModel).CD;
+
+        if (currentCD != null)
+        {
+          currentCD.CodeAlbum.ToggleRipAll();
+        }
+      </Script>
+    </Scripts>
+    <Input>
+      
+      <ClickHandler Name="Clicker" />
+    </Input>
+    <Content>
+
+      
+      <Panel Name="ToolTipOrigin" Layout="Form">
+        <Children>
+
+          <Panel Layout="HorizontalFlow"> 
+            <LayoutInput>
+              <AnchorLayoutInput Left="Parent,0" Right="Parent,1,999" Top="Parent,0" Bottom="Parent,1,999" ContributesToWidth="false"/>
+            </LayoutInput>
+            <Children>
+
+              <Text Name="private_Label" MouseInteractive="true"/>
+
+            </Children>
+          </Panel>
+          
+        </Children>
+      </Panel>
+
+    </Content>
+  </UI>
+
+  
+  <UI Name="CheckCell" Base="spreadsheet:Cell">
+    <Properties>
+      <me:CDViewListModel Name="ListModel" CDViewListModel="$Required"/>
+      <data:Track Name="Model" Track="$Required"/>
+    </Properties>
+
+    <Locals>
+      <iris:BooleanChoice Name="RipIt" Value="false"/>
+      <zune:CDAlbumTrack Name="TrackInfo" CDAlbumTrack="{null}" />
+    </Locals>
+
+    <Scripts>
+      
+      <Script>
+        zune:CDAlbumCommand currentCD = ListModel.CD.CodeAlbum;
+        TrackInfo = currentCD.GetTrack(RowIndex.Value);
+        CheckBox.AccessibleDescription = [Model.Title];
+        RipIt.Value = TrackInfo.RipTrack;
+      </Script>
+
+      <Script>TrackInfo.RipTrack = [RipIt.Value];</Script>
+
+      <Script>RipIt.Value = [TrackInfo.RipTrack];</Script>
+
+      <Script>
+         bool ripping = ([TrackInfo.RipState] == zune:RipState.InProgress);
+         CheckBox.Available = !ripping;        
+      </Script>
+    </Scripts>
+
+    <Content>
+      <core:CheckBox Name="CheckBox" Model="{RipIt}" BoxSize="18,18" KeyInteractive="false"/>
+    </Content>
+  </UI>
+
+  <UI Name="NumberCell" Base="tpc:TrackNumberCell">
+    <Scripts>
+      <Script>Style = styles:SharedStyles.CDLandTrackNumberStyle;</Script>
+    </Scripts>
+  </UI>
+
+  
+  <UI Name="TitleCell" Base="tpc:SongCell">
+    <Properties>
+      <me:CDViewListModel Name="ListModel" CDViewListModel="$Required"/>
+      <data:Track Name="Model" Track="$Required"/>
+    </Properties>
+
+    <Locals>
+      <zune:CDAlbumTrack Name="TrackInfo" CDAlbumTrack="{null}" />
+    </Locals>
+
+    <Scripts>
+      
+      <Script>
+        zune:CDAlbumCommand currentCD = ListModel.CD.CodeAlbum;
+        TrackInfo = currentCD.GetTrack(RowIndex.Value);
+      </Script>
+
+      <Script>
+         bool ripping = ([TrackInfo.RipState] == zune:RipState.InProgress);
+         if (ripping)
+         {
+           private_Label.Color = styles:Styles.TextSelected;
+         }
+         else
+         {
+           private_Label.Color = Style.Color;
+         }
+      </Script>
+    </Scripts>
+  </UI>
+  
+  
+  <UI Name="LengthCell" Base="spreadsheet:LengthCell">
+    <Scripts>
+      <Script>
+        Length = ((data:Track)Model).Duration;
+        ToolTipOrigin.Margins = new Inset(0,4,0,0);
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  
+  <UI Name="StatusCell" Base="spreadsheet:LabelCell">
+    <Properties>
+      <me:CDViewListModel Name="ListModel" CDViewListModel="$Required"/>
+    </Properties>
+    <Locals>
+      <zune:CDAlbumTrack Name="TrackInfo" CDAlbumTrack="{null}" />
+    </Locals>
+
+    <Input>
+      <ClickHandler Name="Clicker" Enabled="false" ClickType="Mouse"/>
+    </Input>
+
+    <Scripts>
+      
+      <Script>
+        zune:CDAlbumCommand currentCD = ListModel.CD.CodeAlbum;
+        TrackInfo = currentCD.GetTrack(RowIndex.Value);
+      </Script>
+
+      <Script>
+        ToolTipOrigin.Margins = new Inset(0,6,0,0);
+        Style = styles:SharedStyles.CDLandStatus;
+        ToolTipStyle = styles:SharedStyles.ToolTipStyle;
+      </Script>
+
+      <Script>
+        private_Label.Visible = true;
+        Clicker.Enabled = false;
+        ToolTipPlacement = PlacementMode.Origin;
+        
+        zune:RipState state = [TrackInfo.RipState];
+        if (state == zune:RipState.NotInLibrary)
+        {
+            Content = "";
+            Style = styles:SharedStyles.CDLandStatus;
+            CDIcon.Visible = false;
+        }
+        else if (state == zune:RipState.InLibrary)
+        {
+            Content = me:Strings.RipDone;
+            Style = styles:SharedStyles.CDLandStatus;
+            CDIcon.Visible = false;
+        }
+        else if (state == zune:RipState.Pending)
+        {
+            Content = me:Strings.RipPending;
+            Style = styles:SharedStyles.CDLandStatus;
+            CDIcon.Visible = false;
+        }
+        else if (state == zune:RipState.Error)
+        {
+            Content = me:Strings.RipErrorToolTip;
+            Style = styles:SharedStyles.CDLandStatusError;
+            CDIcon.Visible = true;
+            CDIcon.Content = styles:Styles.AttentionImage;
+
+            private_Label.Visible = false;
+            Clicker.Enabled = true;
+            ToolTipPlacement = PlacementMode.MouseBottom;
+        }
+        else if (state == zune:RipState.Incomplete)
+        {
+            Content = me:Strings.RipIncomplete;
+            Style = styles:SharedStyles.CDLandStatus;
+            CDIcon.Visible = false;
+        }
+        else if (state == zune:RipState.InProgress)
+        {
+            Content = sys:String.Format(me:Strings.RipProgress, [TrackInfo.PercentComplete]);
+            Style = styles:SharedStyles.CDLandStatusRipping;
+            CDIcon.Visible = true;
+            CDIcon.Content = styles:Styles.CDImage;
+        }         
+      </Script>
+      
+      
+      <Script>
+        [DeclareTrigger(Clicker.Invoked)]
+
+        zune:Shell.ShowErrorDialog(TrackInfo.RipErrorCode, me:Strings.RipErrorDialogTitle);
+      </Script>
+    </Scripts>
+     <Content>
+      <Panel Name="ToolTipOrigin" Layout="HorizontalFlow" MouseInteractive="true">
+        <Children>
+          <Graphic Name="CDIcon" MaximumSize="16,16" MinimumSize="16,16" Margins="0,0,2,0" Visible="false">
+            <Animations>
+              <Animation Animation="{animations:Animations.BasicFadeIn}"/>
+              <Animation Animation="{animations:Animations.BasicFadeOut}"/>
+              <Animation Type="Idle" Loop="-1" CenterPointPercent="0.5,0.5,0.5">
+                <Keyframes>
+                  <ScaleKeyframe Time="0.0" Value="1,1,1" Interpolation="Sine"/>
+                  <ScaleKeyframe Time="1.0" Value="1.1,1.1,1" Interpolation="Sine"/>
+                  <ScaleKeyframe Time="2.0" Value="1,1,1"/>
+                </Keyframes>
+              </Animation>
+            </Animations>
+          </Graphic>
+          <Text Name="private_Label"/>
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+
+
+
+
+  <UI Name="BurnListPanel" Base="playlist:PlaylistContentsPanel">
+    <Properties>
+      <zune:CDAccess Name="CDAccess" CDAccess="{zune:CDAccess.Instance}"/>
+
+      <cd:BurnList Name="BurnList" BurnList="{null}"/>
+
+      <zune:PlaylistContentsPanel Name="Model" PlaylistContentsPanel="$Required" />
+
+      <spreadsheet:ColumnData Name="ColumnData">
+        <ColumnData>
+          
+
+
+
+          <Script>
+            if (CDAccess.IsAudioBurn)
+            {
+              return me:BurnListColumns.AudioColumnData;
+            }
+
+            return me:BurnListColumns.DataColumnData;
+          </Script>
+        </ColumnData>
+      </spreadsheet:ColumnData>
+
+      <me:BurnListPanelListModel Name="ListModel" Model="{Model}"/>
+
+      <zune:StringId Name="EmptyPlaylistMessageId" StringId="{zune:StringId.IDS_BURNLIST_EMPTY}"/>
+      
+      
+      <iris:Command Name="ActionCommand"/>
+      <iris:Command Name="ClearBurnListCommand" Description="{zune:Shell.LoadString(zune:StringId.IDS_CLEAR_BURN_LIST)}" Available="false"/>
+      <String Name="StatusMessage"/>
+    </Properties>
+
+    <Locals>
+      <List Name="Tracks" List="{null}"/>
+
+      <sys:TimeSpan Name="TotalTime"/>
+      <Int64 Name="TotalSize"/>
+      
+      <List Name="BurnListAudioContextMenuOptions">
+        <Source>
+          <iris:Command Command="{PlayAll}"/>
+          <iris:Command Command="{Play}"/>
+          <iris:Command Command="{RemoveFromPlaylist}"/>
+          <iris:Command Command="{Properties}"/>
+          <iris:Command Command="{FindInCollection}"/>
+        </Source>
+      </List>
+
+      <List Name="BurnListDataContextMenuOptions">
+        <Source>
+          <iris:Command Command="{RemoveFromPlaylist}"/>
+          <iris:Command Command="{Properties}"/>
+          <iris:Command Command="{FindInCollection}"/>
+        </Source>
+      </List>
+      
+      <Int32 Name="MediaTypeAudio" Int32="{sys:Convert.ToInt32(zune:MediaType.Track)}"/>
+      <Int32 Name="MediaTypePodcastEpisode" Int32="{sys:Convert.ToInt32(zune:MediaType.PodcastEpisode)}"/>
+
+      <Command Name="StartBurn"/>
+      <Command Name="CancelBurn"/>
+      <purchase:PurchaseForBurn Name="PurchaseForBurn" PurchaseForBurn="{null}"/>
+    </Locals>
+
+    <Scripts>
+      
+      <Script>
+        if ([CanPlay])
+        {
+          ContextMenu.Options = BurnListAudioContextMenuOptions;
+          Worker.ExecuteCommand = Execute;
+        }
+        else
+        {
+          ContextMenu.Options = BurnListDataContextMenuOptions;
+          Worker.ExecuteCommand = null;
+        }
+      </Script>
+      <Script>ListModel.BurnList = [BurnList];</Script>
+
+      
+      <Script>
+        RemoveFromPlaylist.Description = zune:Shell.LoadString(zune:StringId.IDS_REMOVE_FROM_BURNLIST);
+        AddToBurnList.Hidden = true;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(BurnList.PlaylistId)]
+
+        List playlistIds;
+
+        if (BurnList != null)
+        {
+          playlistIds = new List();
+          playlistIds.Add(BurnList.PlaylistId);
+          
+          
+          
+          
+          
+          
+          
+          
+          TrackQuery.Enabled = false;
+          TrackQuery.PlaylistId = BurnList.PlaylistId;
+          TrackQuery.Enabled = true;
+        }
+
+        Model.SelectedPlaylistIds = playlistIds;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(TrackQuery.Result.Items)]
+
+        if (TrackQuery.PlaylistId >= 0)
+        {
+          Tracks = TrackQuery.Result.Items;
+        }
+        else
+        {
+          Tracks = null;
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(Tracks.Count)]
+
+        TotalTime = new sys:TimeSpan();
+        TotalSize = 0L;
+        
+        bool isEmpty = List.IsNullOrEmpty(Tracks);
+        if (!isEmpty)
+        {
+          if (CDAccess.IsAudioBurn)
+          {
+            bool hasOnlyAudioMedia = true;
+            
+            foreach (data:PlaylistContentItem content in Tracks)
+            {
+              TotalTime = TotalTime.Add(content.Duration);
+              
+              if (!(content.MediaType == MediaTypeAudio || 
+                   (content.MediaType == MediaTypePodcastEpisode &amp;&amp; !zune:PlaylistManager.IsVideo(content.MediaId, zune:MediaType.PodcastEpisode))))
+              {
+                hasOnlyAudioMedia = false;
+              }
+            }
+            
+            CanPlay = hasOnlyAudioMedia;
+          }
+          else
+          {
+            foreach (data:PlaylistContentItem content in Tracks)
+            {
+              TotalSize = TotalSize + content.FileSize;
+            }
+            
+            CanPlay = false;
+          }
+        }
+        else
+        {
+          CanPlay = false;
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(TotalTime)]
+        [DeclareTrigger(TotalSize)]
+        [DeclareTrigger(CanPlay)]
+        if (BurnList != null)
+        {
+          BurnList.TotalTime = TotalTime;
+          BurnList.TotalSize = TotalSize;
+          BurnList.CanPlay = CanPlay;
+        }
+      </Script>
+
+      
+      <Script>
+        if ([CDAccess.IsBurning])
+        {
+          ActionCommand.Description = zune:Shell.LoadString(zune:StringId.IDS_STOP_BURN_BUTTON);
+        }
+        else
+        {
+          ActionCommand.Description = zune:Shell.LoadString(zune:StringId.IDS_START_BURN_BUTTON);
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(ActionCommand.Invoked)]
+
+        if (CDAccess.IsBurning)
+        {
+          CancelBurn.Invoke();
+        }
+        else
+        {
+          
+          
+          
+          
+          CDAccess.PrepareForBurn(null, TrackQuery.PlaylistId, Tracks);
+          
+          if (CDAccess.IsAudioBurn)
+          {
+            
+            if (PurchaseForBurn == null) PurchaseForBurn = new purchase:PurchaseForBurn();
+            PurchaseForBurn.OnSuccess = StartBurn;
+            PurchaseForBurn.OnCancel = CancelBurn;
+            PurchaseForBurn.Items = Tracks;
+            PurchaseForBurn.Start.Invoke();
+          }
+          else
+          {
+            
+            StartBurn.Invoke();
+          }
+        }
+      </Script>
+
+      
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(Tracks.Count)]
+        [DeclareTrigger(CanEdit)]
+        
+        ClearBurnListCommand.Available = !List.IsNullOrEmpty(Tracks) &amp;&amp; CanEdit;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(ClearBurnListCommand.Invoked)]
+        
+        CDAccess.ClearBurnList();
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(StartBurn.Invoked)]
+        CDAccess.StartBurn();
+      </Script>
+
+      <Script>
+        [DeclareTrigger(CancelBurn.Invoked)]
+        CDAccess.CancelBurn();
+        
+        
+        
+        ActionCommand.Available = false;        
+      </Script>
+
+      
+      <Script>CanEdit = ![CDAccess.IsBurning];</Script>
+
+      
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(Tracks.Count)]
+        [DeclareTrigger(CDAccess.BurnCDForNextSession)]
+        [DeclareTrigger(CDAccess.IsBurning)]
+        [DeclareTrigger(CDAccess.IsErasing)]
+        [DeclareTrigger(CDAccess.HasBurner)]
+        [DeclareTrigger(CanPlay)]
+
+        if (CDAccess.IsBurning)
+        {
+          ActionCommand.Available = !CDAccess.IsBurnCanceling;
+          StatusMessage = null;
+        }
+        else
+        {
+          StatusMessage = null;
+
+          if (!CDAccess.IsBurning)
+          {
+            if (!CanPlay &amp;&amp; CDAccess.IsAudioBurn &amp;&amp; !List.IsNullOrEmpty(Tracks))
+            {
+              StatusMessage = me:Strings.BurnErrorCantBurnDataToAudio;
+            }
+            else if (!CDAccess.HasBurner)
+            {
+              StatusMessage = me:Strings.BurnErrorAttachBurner;
+            }
+            else 
+            {
+              zune:BurnableCD burnCD = CDAccess.BurnCDForNextSession;
+              
+              if (burnCD == null)
+              {
+                StatusMessage = me:Strings.BurnErrorInsertDisc;
+              }
+              else if (CDAccess.IsAudioBurn &amp;&amp; !burnCD.CanBurnAudio)
+              {
+                StatusMessage = me:Strings.BurnErrorCantBurnAudioToDVD;
+              }
+            }
+          }
+          
+          ActionCommand.Available = (StatusMessage == null) &amp;&amp; !List.IsNullOrEmpty(Tracks) &amp;&amp; !CDAccess.IsErasing;          
+        }
+      </Script>
+
+      <Script>
+        
+        
+        EmptyPlaylistPanel.Margins = new Inset(-10,0,0,-40);
+      </Script>    
+    </Scripts>
+  </UI>
+
+  <Class Name="BurnListPanelListModel" Base="plc:PlaylistContentsPanelListModel">
+    <Properties>
+      <cd:BurnList Name="BurnList"/>
+    </Properties>
+  </Class>
+
+  
+  <Class Name="BurnListColumns" Shared="True">
+    <Properties>
+      <spreadsheet:ColumnInfo Name="TitleColumn"
+            Header="{zune:Shell.LoadString(zune:StringId.IDS_SONG_COLUMN_HEADER)}"
+            CellType="{typeof(tpc:SongCell)}"
+            Resizable="false">
+        <ColumnSize>
+          <SharedSize Size="9999,0"/>
+        </ColumnSize>
+        <LayoutInput>
+          <StackLayoutInput Priority="Medium" MinimumSize="200,0"/>
+        </LayoutInput>
+      </spreadsheet:ColumnInfo>
+
+      <spreadsheet:ColumnInfo Name="TimeColumn"
+            Header="{zune:Shell.LoadString(zune:StringId.IDS_LENGTH_COLUMN_HEADER)}"
+            CellType="{typeof(me:BurnListLengthCell)}"
+            Resizable="false">
+        <ColumnSize>
+          <SharedSize Size="75,0"/>
+        </ColumnSize>
+        <LayoutInput>
+          <StackLayoutInput Priority="High"/>
+        </LayoutInput>
+      </spreadsheet:ColumnInfo>
+
+      <spreadsheet:ColumnInfo Name="SizeColumn"
+            Header="{zune:Shell.LoadString(zune:StringId.IDS_SIZE_COLUMN_HEADER)}"
+            CellType="{typeof(me:SizeCell)}"
+            Resizable="false">
+        <ColumnSize>
+          <SharedSize Size="75,0"/>
+        </ColumnSize>
+        <LayoutInput>
+          <StackLayoutInput Priority="High"/>
+        </LayoutInput>
+      </spreadsheet:ColumnInfo>
+
+      <spreadsheet:ColumnInfo Name="StatusColumn"
+            Header="{zune:Shell.LoadString(zune:StringId.IDS_STATUS_COLUMN_HEADER)}"
+            CellType="{typeof(me:BurnStatusCell)}"
+            Resizable="false">
+        <ColumnSize>
+          <SharedSize Size="80,0"/>
+        </ColumnSize>
+        <LayoutInput>
+          <StackLayoutInput Priority="High"/>
+        </LayoutInput>
+      </spreadsheet:ColumnInfo>
+
+      
+      <spreadsheet:ColumnData Name="AudioColumnData" HideColumns="true" 
+                              SortedColumn="{plc:SortInfo.Ordinal}">
+        <Columns>
+          <spreadsheet:ColumnInfo ColumnInfo="{TitleColumn}"/>
+          <spreadsheet:ColumnInfo ColumnInfo="{TimeColumn}"/>
+          <spreadsheet:ColumnInfo ColumnInfo="{StatusColumn}"/>
+        </Columns>
+      </spreadsheet:ColumnData>
+
+      
+      <spreadsheet:ColumnData Name="DataColumnData" HideColumns="true"
+                              SortedColumn="{plc:SortInfo.Ordinal}">
+        <Columns>
+          <spreadsheet:ColumnInfo ColumnInfo="{TitleColumn}"/>
+          <spreadsheet:ColumnInfo ColumnInfo="{SizeColumn}"/>
+          <spreadsheet:ColumnInfo ColumnInfo="{StatusColumn}"/>
+        </Columns>
+      </spreadsheet:ColumnData>
+    </Properties>
+  </Class>
+
+
+  
+
+
+
+  <UI Name="BurnListLengthCell" Base="spreadsheet:LabelCell">
+    <Properties>
+      <data:PlaylistContentItem Name="Model" PlaylistContentItem="$Required"/>
+    </Properties>
+    <Scripts>
+      <Script>
+        if (Model.Duration.Ticks != 0L)
+        {
+          Content = zune:Shell.TimeSpanToString(Model.Duration);
+        }
+        else
+        {
+          Content = null;
+        }
+     </Script>
+    </Scripts>
+  </UI>
+
+  
+
+
+
+  <UI Name="SizeCell" Base="tpc:SizeCell">
+    <Properties>
+      <data:PlaylistContentItem Name="Model" PlaylistContentItem="$Required"/>
+      <Int64 Name="SizeData" Int64="{Model.FileSize}"/>
+    </Properties>
+  </UI>
+
+  
+
+
+
+  <UI Name="BurnStatusCell" Base="spreadsheet:LabelCell">
+    <Properties>
+      <data:PlaylistContentItem Name="Model" PlaylistContentItem="$Required"/>
+      <me:BurnListPanelListModel Name="ListModel" BurnListPanelListModel="$Required"/>
+    </Properties>
+
+    <Locals>
+      <zune:BurnSessionItem Name="BurnItem" BurnSessionItem="{null}" />
+      <String Name="CanBurnFileError" String="{null}"/>
+      <Timer Name="CheckCanBurnTimer" Interval="2000" AutoRepeat="false" Enabled="true"/> 
+      <Boolean Name="CheckCanBurn"/>
+    </Locals>
+
+    <Input>
+      <ClickHandler Name="Clicker" ClickType="Mouse" Enabled="false"/>
+    </Input>
+
+    <Scripts>
+      
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(zune:CDAccess.Instance.IsBurning)]
+        [DeclareTrigger(zune:CDAccess.Instance.MediaChanged)]
+
+        BurnItem = zune:CDAccess.Instance.GetBurnItemByPlaylistContentId(Model.LibraryId);
+      </Script>
+
+      
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(CheckCanBurnTimer.Tick)]
+        
+        CanBurnFileError = null;
+        if (zune:CDAccess.Instance.IsAudioBurn &amp;&amp; BurnItem == null)
+        {
+          string filePath = Model.FilePath;
+          
+          if (String.IsNullOrEmpty(filePath))
+          {
+            if (!zune:GuidHelper.IsEmpty(Model.ServiceId))
+            {
+              CanBurnFileError = me:Strings.NoBurnRightsNeedToBuy;
+            }
+          }
+          else if (CheckCanBurn &amp;&amp; !zune:CDAccess.Instance.CanBurnFile(filePath))
+          {
+            CanBurnFileError = me:Strings.NoBurnRightsNeedToBuy;
+          }
+        }
+        
+        
+        
+        
+        
+        
+        CheckCanBurn = true;
+      </Script>
+
+      
+      <Script>
+        bool hasError = false;
+        if (BurnItem == null)
+        {
+          
+          
+          
+          
+          if ([CanBurnFileError] != null)
+          {
+            Content = null;
+            StatusIcon.Content = styles:Styles.AttentionImage;
+            hasError = true;
+          }
+          else
+          {
+            Content = null;
+            StatusIcon.Content = null;
+          }
+        }
+        else if ([BurnItem.ErrorCode] != 0)
+        {
+          Content = null; 
+          StatusIcon.Content = styles:Styles.AttentionImage;
+          hasError = true;
+        }
+        else if ([BurnItem.Downloading])
+        {
+          Content = sys:String.Format(me:Strings.RipProgress, [BurnItem.DownloadProgress]);
+          StatusIcon.Content = styles:Styles.DownloadIconSmall;
+        }
+        else if ([BurnItem.BurnCanceled])
+        {
+          Content = null;
+          StatusIcon.Content = null;
+        }
+        else if ([BurnItem.BurnComplete])
+        {
+          Content = me:Strings.BurnComplete;
+          StatusIcon.Content = null;
+        }
+        else if ([BurnItem.BurnProgress] &lt; 0)
+        {
+          Content = me:Strings.BurnPending;
+          StatusIcon.Content = null;
+        }
+        else
+        {
+          Content = me:Strings.BurnProgress.Format(BurnItem.BurnProgress);
+          StatusIcon.Content = styles:Styles.CDImageSmall;
+        }
+
+        StatusIcon.Visible = (StatusIcon.Content != null);
+        Clicker.Enabled = hasError;
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(Clicker.Invoked)]
+        if (BurnItem != null &amp;&amp; BurnItem.ErrorCode != 0)
+        {
+          zune:Shell.ShowErrorDialog(BurnItem.ErrorCode, me:Strings.BurnErrorDialogTitle);
+        }
+        else if (CanBurnFileError != null)
+        {
+          zune:MessageBox.Show(me:Strings.NoBurnRightsDialogTitle, CanBurnFileError, null);
+        }
+      </Script>
+    </Scripts>
+     <Content>
+      <Panel Name="ToolTipOrigin" Layout="HorizontalFlow">
+        <Children>
+          <Graphic Name="StatusIcon" MaximumSize="16,16"
+                   StretchingPolicy="Uniform" SizingPolicy="SizeToConstraint" Margins="0,0,2,0" Visible="true">
+          </Graphic>
+          <Text Name="private_Label"/>
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+
+  <Class Name="Strings" Shared="true">
+      <Properties>
+        <string Name="RipDone" string="{zune:Shell.LoadString(zune:StringId.IDS_RIP_TRACK_DONE)}" />
+        <string Name="RipPending" string="{zune:Shell.LoadString(zune:StringId.IDS_RIP_TRACK_PENDING)}" />
+        <string Name="RipIncomplete" string="{zune:Shell.LoadString(zune:StringId.IDS_RIP_TRACK_INCOMPLETE)}" />
+        <string Name="RipProgress" string="{zune:Shell.LoadString(zune:StringId.IDS_RIP_TRACK_PROGRESS)}" />
+        <string Name="RipErrorDialogTitle" string="{zune:Shell.LoadString(zune:StringId.IDS_RIP_ERROR_DIALOG_TITLE)}"/>
+        <string Name="RipErrorToolTip" string="{zune:Shell.LoadString(zune:StringId.IDS_RIP_ERROR_TOOLTIP)}"/>
+
+        <string Name="NoCD" string="{zune:Shell.LoadString(zune:StringId.IDS_NO_CD)}" />
+        <string Name="BlankCD" string="{zune:Shell.LoadString(zune:StringId.IDS_BLANK_CD)}" />
+        <string Name="DataOnly" string="{zune:Shell.LoadString(zune:StringId.IDS_DATA_ONLY_DISC)}" />
+
+        <string Name="SongsHeader" string="{zune:Shell.LoadString(zune:StringId.IDS_ALL_SONGS_COLUMN_HEADER)}" />
+
+        <string Name="TimeAvailable" string="{zune:Shell.LoadString(zune:StringId.IDS_BURN_LENGTH_AVAILABLE)}"/>
+        <string Name="TimeUsed" string="{zune:Shell.LoadString(zune:StringId.IDS_BURN_LENGTH_USED)}"/>
+        <string Name="SizeAvailable" string="{zune:Shell.LoadString(zune:StringId.IDS_BURN_SIZE_AVAILABLE)}"/>
+        <string Name="SizeUsed" string="{zune:Shell.LoadString(zune:StringId.IDS_BURN_SIZE_USED)}"/>
+
+        <string Name="BurnError" string="{zune:Shell.LoadString(zune:StringId.IDS_BURN_TRACK_ERROR)}"/>
+        <string Name="BurnPending" string="{zune:Shell.LoadString(zune:StringId.IDS_BURN_TRACK_PENDING)}"/>
+        <string Name="BurnProgress" string="{zune:Shell.LoadString(zune:StringId.IDS_BURN_TRACK_PROGRESS)}"/>
+        <string Name="BurnComplete" string="{zune:Shell.LoadString(zune:StringId.IDS_BURN_TRACK_COMPLETE)}"/>
+        <string Name="BurnErrorDialogTitle" string="{zune:Shell.LoadString(zune:StringId.IDS_BURN_ERROR_DIALOG_TITLE)}"/>
+
+        <string Name="BurnErrorInsertDisc" string="{zune:Shell.LoadString(zune:StringId.IDS_BURNERROR_INSERT_WRITEABLE_DISC)}"/>
+        <string Name="BurnErrorAttachBurner" string="{zune:Shell.LoadString(zune:StringId.IDS_BURNERROR_ATTACH_BURNER)}"/>
+        <string Name="BurnErrorCantBurnAudioToDVD" string="{zune:Shell.LoadString(zune:StringId.IDS_BURNERROR_CANT_BURN_AUDIO_TO_DVD)}"/>
+        <string Name="BurnErrorCantBurnDataToAudio" string="{zune:Shell.LoadString(zune:StringId.IDS_BURNERROR_CANT_BURN_DATA_TO_AUDIO)}"/>
+        
+        <string Name="BurnTitleAudio" string="{zune:Shell.LoadString(zune:StringId.IDS_BURN_LIST_AUDIO)}"/>
+        <string Name="BurnTitleData" string="{zune:Shell.LoadString(zune:StringId.IDS_BURN_LIST_DATA)}"/>
+        
+        <string Name="NoBurnRightsDialogTitle" string="{zune:Shell.LoadString(zune:StringId.IDS_NO_BURN_RIGHTS_DIALOG_TITLE)}"/>        
+        <string Name="NoBurnRightsNeedToBuy" string="{zune:Shell.LoadString(zune:StringId.IDS_NO_BURN_RIGHTS_NEED_TO_BUY)}"/>
+     </Properties>
+  </Class>  
+</UIX>
+
diff --git a/test/2.1/CHECKBOX.UIX b/test/2.1/CHECKBOX.UIX
new file mode 100644
index 0000000..7569aac
--- /dev/null
+++ b/test/2.1/CHECKBOX.UIX
@@ -0,0 +1,179 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX 
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:me="Me">
+
+  <UI Name="Default">
+    <Content>
+      <me:CheckBox>
+        <Model>
+          <iris:BooleanChoice Description="Hello"/>
+        </Model>
+      </me:CheckBox>
+    </Content>
+  </UI>
+
+  <UI Name="CheckBox">
+    <Properties>
+      
+      <iris:BooleanChoice Name="Model" BooleanChoice="$Required"/>
+      <Boolean Name="Available" Boolean="true"/>
+      <Boolean Name="WordWrap" Boolean="true"/>
+      <Size Name="BoxSize" Size="18,18"/>
+      <Boolean Name="KeyInteractive" Boolean="true"/>
+
+      
+      <Image Name="BoxFocusImage" Source="res://ZuneShellResources!CheckBoxFocus.png"/>
+      <Image Name="BoxNonFocusImage" Source="res://ZuneShellResources!CheckBoxNonFocus.png"/>
+      <Image Name="BoxCheckedImage" Source="res://ZuneShellResources!CheckBoxChecked.png"/>
+      <Image Name="BoxDisabledImage" Image="res://ZuneShellResources!CheckBoxDisabled.png"/>
+      
+      
+      <Color Name="LabelColor" Color="{styles:Styles.TextActive}"/>
+      <Color Name="LabelFocusedColor" Color="{styles:Styles.TextActive}"/>
+      <Color Name="LabelHoverColor" Color="{styles:Styles.TextActive}"/>
+      <Color Name="LabelPressedColor" Color="{styles:Styles.TextActive}"/>
+      <Color Name="LabelDisabledColor" Color="{styles:Styles.TextInactive}"/>
+
+      
+      <Font Name="LabelFont" Font="{styles:Styles.StandardSubHeaderText}"/>
+
+      <String Name="AccessibleDescription" String="{null}"/>
+    </Properties>
+
+    <Input>
+      
+      <ClickHandler Name="Clicker" ClickType="LeftMouse, SpaceKey" />
+    </Input>
+
+    <Locals>
+      <Accessible Name="Accessible"/>
+    </Locals>
+
+    <Scripts>
+      
+      <Script>
+        if (!KeyInteractive) Clicker.ClickType = ClickType.LeftMouse;
+      </Script>
+
+      <Script>UI.AllowDoubleClicks = false;</Script>
+
+      
+      <Script>
+        if (Model != null)
+        {
+          Check.Visible = [Model.Value];
+        }
+      </Script>
+
+      
+      <Script>
+        if (Model != null)
+        {
+          Label.Content = [Model.Description];
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(Clicker.Invoked)]
+        if (Model != null)
+        {
+          Model.Value = !Model.Value;
+        }
+      </Script>
+
+      <Script>
+        UI.Enabled = [Available];
+      </Script>
+
+      
+      <Script>
+
+        if (![UI.FullyEnabled])
+        {
+          Box.Content = BoxDisabledImage;
+          Label.Color = LabelDisabledColor;
+          Check.Alpha = 0.5;
+        }
+        else
+        {
+            Check.Alpha = 1.0;
+            
+            if ([Clicker.Clicking])
+            {
+              Label.Color = LabelPressedColor;
+              Box.Content = BoxFocusImage;
+            }
+            
+            else if ([UI.MouseFocus])
+            {
+              Label.Color = LabelHoverColor;
+              Box.Content = BoxFocusImage;
+            }
+            else if ([UI.KeyFocus])
+            {
+              Label.Color = LabelFocusedColor;
+              Box.Content = BoxFocusImage;
+            }
+            else
+            {
+              Label.Color = LabelColor;
+              Box.Content = BoxNonFocusImage;
+            }
+        }
+      </Script>
+
+      <Script>
+        if ([Accessible.Enabled])
+        {
+          if (AccessibleDescription != null)
+          {
+            Accessible.Name = [AccessibleDescription];
+          }
+          else
+          {
+            Accessible.Name = [Label.Content];
+          }
+          
+          if (Model != null)
+          {
+            Accessible.IsChecked = [Model.Value];
+          }
+          Accessible.Role = AccessibleRole.CheckButton;
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel MouseInteractive="true">
+        <Layout>
+          <FlowLayout Orientation="Horizontal" ItemAlignment="Center"/>
+        </Layout>
+        <Children>
+
+          
+          <Graphic Name="Box" Content="{BoxNonFocusImage}" MaximumSize="{BoxSize}" Layout="Form">
+            <Children>
+
+              
+              <Graphic Name="Check" Content="{BoxCheckedImage}">
+                <LayoutInput>
+                  <FormLayoutInput Left="Parent,0" Top="Parent,0"/>
+                </LayoutInput>
+              </Graphic>
+
+            </Children>
+          </Graphic>
+
+          
+          <Text Name="Label" Color="{LabelColor}" Font="{LabelFont}" WordWrap="{WordWrap}" Margins="5,0,0,0"/>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/COLLECTIONNAVIGATION.UIX b/test/2.1/COLLECTIONNAVIGATION.UIX
new file mode 100644
index 0000000..012e7b1
--- /dev/null
+++ b/test/2.1/COLLECTIONNAVIGATION.UIX
@@ -0,0 +1,60 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI">
+
+  <Class Name="Navigation" Shared="true">
+    <Properties>
+      <zune:DictionaryCommandHandler Name="Root">
+        <Handlers>
+
+          
+          <zune:MusicNavigationCommandHandler Name="Music"/>
+
+          
+          <zune:VideoNavigationCommandHandler Name="Videos"/>
+
+          
+          <zune:PodcastNavigationCommandHandler Name="Podcasts"/>
+
+          
+          <zune:PlaylistNavigationCommandHandler Name="Playlists"/>
+
+          
+          <zune:PhotoNavigationCommandHandler Name="Photos"/>
+          
+        </Handlers>
+      </zune:DictionaryCommandHandler>
+    </Properties>
+  </Class>
+
+  <Class Name="DeviceNavigation" Shared="true">
+    <Properties>
+      <zune:DictionaryCommandHandler Name="Root">
+        <Handlers>
+
+          
+          <zune:StatusNavigationCommandHandler Name="Status" />
+
+          
+          <zune:MusicNavigationCommandHandler Name="Music" ShowDeviceContents="true" />
+
+          
+          <zune:VideoNavigationCommandHandler Name="Videos" ShowDeviceContents="true" />
+
+          
+          <zune:PodcastNavigationCommandHandler Name="Podcasts" ShowDeviceContents="true" />
+
+          
+          <zune:PlaylistNavigationCommandHandler Name="Playlists" ShowDeviceContents="true" />
+
+          
+          <zune:PhotoNavigationCommandHandler Name="Photos" ShowDeviceContents="true" />
+          
+        </Handlers>
+      </zune:DictionaryCommandHandler>
+    </Properties>
+  </Class>
+
+
+</UIX>
diff --git a/test/2.1/CONTENTLIST.UIX b/test/2.1/CONTENTLIST.UIX
new file mode 100644
index 0000000..4af2c2e
--- /dev/null
+++ b/test/2.1/CONTENTLIST.UIX
@@ -0,0 +1,1549 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:sys="assembly://mscorlib/System"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:core="res://ZuneShellResources!CoreControls.uix"
+  xmlns:btn="res://ZuneShellResources!Button.uix"
+  xmlns:bar="res://ZuneShellResources!ScrollBar.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:anim="res://ZuneShellResources!Animations.uix"
+  xmlns:drag="res://ZuneShellResources!DragFeedback.uix"
+  xmlns:me="Me">
+
+  
+  
+  
+  <UI Name="Default">
+    <Locals>
+      <iris:ArrayListDataSet Name="Content">
+        <Source>
+          <String String="One"/>
+          <String String="Two"/>
+          <String String="Three"/>
+          <String String="Four"/>
+          <String String="Five"/>
+          <String String="Six"/>
+          <String String="Seven"/>
+          <String String="Eight"/>
+          <String String="Nine"/>
+          <String String="Ten"/>
+        </Source>
+      </iris:ArrayListDataSet>
+    </Locals>
+
+    <Content>
+      <Panel>
+        <Layout>
+          <GridLayout ReferenceSize="150,150" Spacing="50,0"/>
+        </Layout>
+        <Children>
+
+          <me:ScrollingContentListBase ScrollOrientation="Vertical" Content="{Content}"/>
+
+          <me:ScrollingContentListBase ScrollOrientation="Horizontal" ListLayout="HorizontalFlow" Content="{Content}"/>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <Class Name="CommandContainer">
+    <Properties>
+      <Command Name="Model" Command="{null}"/>
+    </Properties>
+  </Class>
+
+  
+  
+  
+  <Class Name="ListItemContext">
+    <Properties>
+      <Index Name="Index" Index="$Required"/>
+
+      
+      <Boolean Name="SelectOnMouseDown" Boolean="true"/>
+
+      
+
+
+      <Boolean Name="MainContext" Boolean="true"/>
+      <Command Name="Edit" Command="{null}"/>
+    </Properties>
+  </Class>
+
+
+  
+  
+  
+  <Class Name="NavigateIntoIndexRequest">
+    <Properties>
+      <Int32 Name="Index" Int32="-1"/>
+
+      
+      <Boolean Name="Select" Boolean="true"/>
+
+      
+      <Boolean Name="Focus"/>
+    </Properties>
+  </Class>
+
+
+  
+  
+  
+  
+  <UI Name="ContentListBase">
+    <Properties>
+      
+      <List Name="Content" List="{null}"/>
+
+      <String Name="AccessibleDescription" String="{null}"/>
+
+      
+      <Layout Name="ListLayout">
+        <Layout>
+          <FlowLayout Orientation="Vertical"/>
+        </Layout>
+      </Layout>
+
+      
+      <me:NavigateIntoIndexRequest Name="NavigateIntoArgs" NavigateIntoIndexRequest="{null}"/>
+
+      
+      <Boolean Name="SupportsJumpInList" Boolean="false"/>
+
+      
+      <SelectionManager Name="SelectionManager" SelectionManager="{null}"/>
+      <Boolean Name="RequireSelection"/>
+
+      
+      <core:ContextMenu Name="ContextMenu" ContextMenu="{null}"/>
+
+      
+      <Command Name="ExecuteCommand" Command="{null}"/>
+
+      
+      <ScrollingData Name="protected_VerticalScrollData" ScrollingData="{null}"/>
+      <ScrollingData Name="protected_HorizontalScrollData" ScrollingData="{null}"/>
+
+      <Inset Name="Padding" Inset="0,0,0,0"/>
+
+      <me:CommandContainer Name="EditContext" CommandContainer="{null}"/>
+
+      <Command Name="SelectedItemClicked" Command="{null}"/>
+
+      <Boolean Name="DeepMouseFocus"/>
+      <iris:BooleanChoice Name="EditingList"/>
+    </Properties>
+
+    <Locals>
+      <PopupLayoutInput Name="PopupRelativeToList" Placement="Origin"/>
+
+      
+      <AnchorLayoutInput Name="DragRectInput" Left="Background,0" Right="Background,0" Top="Background,0" Bottom="Background,0"
+                         ContributesToWidth="false" ContributesToHeight="false"/>
+
+      <EditableTextData Name="JumpInListString"/>
+      <Timer Name="JILTimeout" Interval="2000" />
+
+      
+      <Timer Name="JILDisableBackTimer" Interval="2000" AutoRepeat="false" Enabled="false"/>
+
+      <Command Name="JumpInListInvoked"/>
+      <iris:IntRangedValue Name="JumpInListIndex" IntRangedValue="{null}"/>
+
+      <Accessible Name="Accessible"/>
+
+      <Timer Name="ScrollTimer" Interval="100"/>
+
+      <Int32 Name="LastFocusedIndex" Int32="-1"/>
+
+    </Locals>
+
+    <Input>
+      
+      <FocusHandler Name="SingleSelect" HandlerStage="Bubbled"/>
+
+      
+
+      <DragHandler Name="Dragger" CancelOnEscape="true" BeginDragPolicy="Move" HandlerStage="Direct,Bubbled"/>
+      <ClickHandler Name="UnhandledClick" ClickType="LeftMouse" Repeat="false"/>
+
+      
+
+      
+      <ClickHandler Name="SingleSelectDown" ClickType="LeftMouse"
+          DisallowedModifiers="Shift,Ctrl, Alt" HandlerStage="Routed"
+          HandlerTransition="Down" Handle="false" Repeat="false"/>
+      
+      <ClickHandler Name="RangeSelectSetDown" ClickType="LeftMouse"
+          RequiredModifiers="Shift" DisallowedModifiers="Ctrl,Alt"
+          HandlerTransition="Down" Handle="false" HandlerStage="Routed" Repeat="false"/>
+      <ClickHandler Name="RangeSelectAddDown" ClickType="LeftMouse"
+          RequiredModifiers="Shift,Ctrl" DisallowedModifiers="Alt"
+          HandlerTransition="Down" Handle="false" HandlerStage="Routed" Repeat="false"/>
+
+      <ClickHandler Name="SingleSelectUp" ClickType="LeftMouse"
+          DisallowedModifiers="Ctrl,Shift,Alt"
+          HandlerStage="Bubbled"/>
+      <ClickHandler Name="ToggleSelectUp" ClickType="LeftMouse"
+          RequiredModifiers="Ctrl" DisallowedModifiers="Shift,Alt"
+          HandlerStage="Bubbled"/>
+      <ClickHandler Name="RangeSelectSetUp" ClickType="LeftMouse"
+          RequiredModifiers="Shift" DisallowedModifiers="Ctrl,Alt"
+          HandlerStage="Bubbled"/>
+      <ClickHandler Name="RangeSelectAddUp" ClickType="LeftMouse"
+          RequiredModifiers="Shift,Ctrl" DisallowedModifiers="Alt"
+          HandlerStage="Bubbled"/>
+
+      
+      <ClickHandler Name="AddToSelectionKey" ClickType="SpaceKey"
+          DisallowedModifiers="Ctrl,Shift" HandlerStage="Bubbled"/>
+      <ClickHandler Name="SelectRangeKey" ClickType="SpaceKey"
+          RequiredModifiers="Shift" HandlerStage="Bubbled"/>
+      <ClickHandler Name="ToggleSelectKey" ClickType="SpaceKey"
+          RequiredModifiers="Ctrl" DisallowedModifiers="Shift" HandlerStage="Bubbled"/>
+      <FocusHandler Name="Focus" Reason="Directional"
+          DisallowedModifiers="Shift, Ctrl" HandlerStage="Bubbled"/>
+      <FocusHandler Name="ShiftFocus" Reason="Directional"
+          RequiredModifiers="Shift" HandlerStage="Bubbled"/>
+
+      <FocusHandler Name="TrackLastFocusedIndex" Reason="Any" HandlerStage="Bubbled"/>
+
+      <FocusHandler Name="JILFocus" Reason="Any" HandlerStage="Bubbled,Direct"/>
+
+      
+      <KeyHandler Name="SelectAll" Key="A" RequiredModifiers="Ctrl" HandlerStage="Bubbled,Direct"/>
+
+
+      <ClickHandler Name="RightClickDown" ClickType="RightMouse" HandlerStage="Bubbled"
+          HandlerTransition="Down" Handle="false" Repeat="false"/>
+      <ClickHandler Name="RightClick" ClickType="RightMouse" HandlerStage="Bubbled"/>
+
+      <KeyHandler Name="RightClickKeyboard1" Key="F10" RequiredModifiers="Shift" DisallowedModifiers="Alt" HandlerStage="Bubbled"/>
+      <KeyHandler Name="RightClickKeyboard2" Key="Apps" DisallowedModifiers="Alt" HandlerStage="Bubbled"/>
+
+      <ClickHandler Name="DoubleClick" ClickType="LeftMouse" ClickCount="Double" HandlerStage="Bubbled"/>
+
+      <KeyHandler Name="Enter" Key="Enter" HandlerStage="Bubbled, Direct"/>
+
+
+      
+      
+      
+
+      <KeyHandler    Name="JILBackInterceptor"  HandlerStage="Routed" Key="Backspace" Repeat="false" Enabled="false" />
+
+      
+      
+      
+
+      <TypingHandler Name="JumpInListTyping" HandlerStage="Bubbled"
+        SubmitOnEnter="false" TreatEscapeAsBackspace="false" EditableTextData="{JumpInListString}"/>
+
+      
+      
+      
+      <KeyHandler    Name="JILEscape" Key="Escape" HandlerTransition="Up" HandlerStage="Routed"/>
+      <KeyHandler    Name="JILEnter"  Key="Enter"  HandlerTransition="Up" HandlerStage="Routed"/>
+
+      
+      <KeyHandler    Name="JILEnterInterceptor"    Key="Enter" HandlerTransition="Down" HandlerStage="Routed"/>
+      <ClickHandler  Name="JILClickInterceptor"    ClickType="SpaceKey"                 HandlerStage="Routed" Repeat="false"/>
+
+    </Input>
+
+    <Scripts>
+      <Script>Dragger.RelativeTo = Background;</Script>
+      <Script>Repeater.Source = [Content];</Script>
+      <Script>UI.CreateInterestOnFocus = false;</Script>
+      <Script>DeepMouseFocus = [UI.DeepMouseFocus];</Script>
+
+      
+      <Script>
+        
+        
+        
+        
+        
+        
+        if ([SelectionManager] != null &amp;&amp; SelectionManager.SourceList != Content)
+            SelectionManager.SourceList = [Content];
+
+        if (RequireSelection &amp;&amp; !List.IsNullOrEmpty(Content))
+          SelectionManager.Select(0, true);
+      </Script>
+
+      
+      <Script>
+        <![CDATA[
+        if (NavigateIntoArgs != null)
+        {
+          int index = [NavigateIntoArgs.Index];
+
+          if (index >= 0 && [Repeater.Source] != null)
+          {
+            int listCount = Repeater.Source.Count;
+            
+            if (index < listCount)
+            {
+              
+              if (UI.DeepKeyFocus || NavigateIntoArgs.Focus)
+              {
+                Repeater.NavigateIntoIndex(index);
+                
+              }
+              else
+              {
+                Repeater.ScrollIndexIntoView(index);
+                Repeater.DefaultFocusIndex = index;
+                
+              }
+
+              
+              
+              
+              if (NavigateIntoArgs.Select && SelectionManager != null)
+              {
+                SelectionManager.SelectedIndex = index;
+                
+              }
+            }
+
+            
+            NavigateIntoArgs.Index = -1;
+            NavigateIntoArgs.Select = false;
+          }
+        }
+        ]]>
+      </Script>
+
+      
+      <Script>
+        if (ExecuteCommand == null || ![ExecuteCommand.Available])
+        {
+          DoubleClick.Command = null;
+          Enter.Command = null;
+        }
+        else
+        {
+          DoubleClick.Command = [ExecuteCommand];
+          Enter.Command = ExecuteCommand;
+        }
+      </Script>
+
+
+      
+      <Script><![CDATA[
+        bool singleSelectEnabled = ([SelectionManager] != null && [SelectionManager.SingleSelect]);
+        bool multiSelectEnabled = (SelectionManager != null && !SelectionManager.SingleSelect);
+
+        SingleSelect.Enabled = singleSelectEnabled;
+
+        Dragger.Enabled            = multiSelectEnabled;
+        UnhandledClick.Enabled     = multiSelectEnabled;
+
+        SingleSelectDown.Enabled   = multiSelectEnabled;
+        RangeSelectSetDown.Enabled = multiSelectEnabled;
+        RangeSelectAddDown.Enabled = multiSelectEnabled;
+
+        SingleSelectUp.Enabled     = multiSelectEnabled;
+        ToggleSelectUp.Enabled     = multiSelectEnabled;
+        RangeSelectSetUp.Enabled   = multiSelectEnabled;
+        RangeSelectAddUp.Enabled   = multiSelectEnabled;
+
+        RightClickDown.Enabled     = multiSelectEnabled;
+
+
+        
+
+      ]]></Script>
+
+      
+      <Script><![CDATA[
+        bool jilActive = [zune:JumpInListManager.Instance.IsActive];
+        bool multiSelectEnabled = (SelectionManager != null && !SelectionManager.SingleSelect);
+        bool keyboardSelectionEnabled = ([SelectionManager] != null) && (!jilActive) && multiSelectEnabled;
+
+        AddToSelectionKey.Enabled = keyboardSelectionEnabled;
+        SelectRangeKey.Enabled    = keyboardSelectionEnabled;
+        ToggleSelectKey.Enabled   = keyboardSelectionEnabled;
+
+        Focus.Enabled             = keyboardSelectionEnabled;
+        ShiftFocus.Enabled        = keyboardSelectionEnabled;
+        SelectAll.Enabled         = keyboardSelectionEnabled;
+
+        Enter.Enabled = !jilActive;
+
+        JILFocus.Enabled            = jilActive;
+        JILEscape.Enabled           = jilActive;
+        JILEnter.Enabled            = jilActive;
+        JILClickInterceptor.Enabled = jilActive;
+        JILEnterInterceptor.Enabled = jilActive;
+
+        
+        
+        if (jilActive)
+        {
+          JumpInListTyping.HandlerStage = InputHandlerStage.Routed;
+
+          
+          
+          
+          
+          
+          
+          
+
+          JILBackInterceptor.Handle = false;
+          JILBackInterceptor.Enabled = true;
+
+        }
+        else
+        {
+          JumpInListTyping.HandlerStage = InputHandlerStage.Bubbled;
+          JILTimeout.Enabled = false;
+
+          
+          
+          
+          
+          
+          
+
+          JILBackInterceptor.Handle = true;
+          JILBackInterceptor.Enabled = JILDisableBackTimer.Enabled;
+        }
+
+      ]]></Script>
+
+      <Script>
+        [DeclareTrigger(JILBackInterceptor.Invoked)]
+
+        
+        
+        
+        
+        
+        
+        
+
+        if (zune:JumpInListManager.Instance.IsActive)
+        {
+          JILDisableBackTimer.Start();
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(JILDisableBackTimer.Tick)]
+
+        
+        
+        
+
+        JILBackInterceptor.Enabled = false;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(SingleSelect.GainedFocus)]
+        if (SingleSelect.GainedEventContext is me:ListItemContext)
+        {
+          me:ListItemContext context = (me:ListItemContext)SingleSelect.GainedEventContext;
+          SelectionManager.Select(context.Index.Value, true);
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(SingleSelectDown.Invoked)]
+        if (SingleSelectDown.EventContext is me:ListItemContext)
+        {
+          me:ListItemContext context = (me:ListItemContext)SingleSelectDown.EventContext;
+
+          
+          
+          
+          if (context.SelectOnMouseDown &amp;&amp; !SelectionManager.IsSelected(context.Index.Value))
+            SelectionManager.SelectedIndex = context.Index.Value;
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(RangeSelectSetDown.Invoked)]
+        if (RangeSelectSetDown.EventContext is me:ListItemContext)
+        {
+          me:ListItemContext context = (me:ListItemContext)RangeSelectSetDown.EventContext;
+
+          if (context.SelectOnMouseDown)
+          {
+            
+            
+            
+            SelectionManager.Clear();
+            SelectionManager.SelectRangeFromAnchor(context.Index.Value);
+          }
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(RangeSelectAddDown.Invoked)]
+        if (RangeSelectAddDown.EventContext is me:ListItemContext)
+        {
+          me:ListItemContext context = (me:ListItemContext)RangeSelectAddDown.EventContext;
+
+          if (context.SelectOnMouseDown)
+            SelectionManager.SelectRangeFromAnchor(context.Index.Value);
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(SingleSelectUp.Invoked)]
+        if (SingleSelectUp.EventContext is me:ListItemContext)
+        {
+          me:ListItemContext context = (me:ListItemContext)SingleSelectUp.EventContext;
+
+          
+          
+          if (SelectionManager.Count != 1 || SelectionManager.SelectedIndex != context.Index.Value)
+            SelectionManager.SelectedIndex = context.Index.Value;
+          else if (SelectedItemClicked != null)
+            SelectedItemClicked.Invoke();
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(ToggleSelectUp.Invoked)]
+        if (ToggleSelectUp.EventContext is me:ListItemContext)
+        {
+          me:ListItemContext context = (me:ListItemContext)ToggleSelectUp.EventContext;
+
+          SelectionManager.ToggleSelect(context.Index.Value);
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(RangeSelectSetUp.Invoked)]
+        if (RangeSelectSetUp.EventContext is me:ListItemContext)
+        {
+          me:ListItemContext context = (me:ListItemContext)RangeSelectSetUp.EventContext;
+
+          if (!context.SelectOnMouseDown)
+          {
+            
+            
+            
+            SelectionManager.Clear();
+            SelectionManager.SelectRangeFromAnchor(context.Index.Value);
+          }
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(RangeSelectAddUp.Invoked)]
+        if (RangeSelectAddUp.EventContext is me:ListItemContext)
+        {
+          me:ListItemContext context = (me:ListItemContext)RangeSelectAddUp.EventContext;
+
+          if (!context.SelectOnMouseDown)
+            SelectionManager.SelectRangeFromAnchor(context.Index.Value);
+        }
+      </Script>
+
+
+      
+      <Script>
+        [DeclareTrigger(UnhandledClick.Invoked)]
+        SelectionManager.Clear();
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(SelectAll.Invoked)]
+        if (Content != null)
+          SelectionManager.SelectRange(0, Content.Count - 1);
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(RightClickDown.Invoked)]
+
+        if (RightClickDown.EventContext is me:ListItemContext)
+        {
+          me:ListItemContext context = (me:ListItemContext)RightClickDown.EventContext;
+
+          
+          
+          
+          if (!SelectionManager.IsSelected(context.Index.Value))
+            SelectionManager.SelectedIndex = context.Index.Value;
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(RightClick.Invoked)]
+
+        if (ContextMenu != null)
+        {
+
+           if (EditContext != null &amp;&amp; RightClick.EventContext is  me:ListItemContext)
+           {
+             me:ListItemContext context = (me:ListItemContext)RightClick.EventContext;
+             EditContext.Model = context.Edit;
+           }
+
+          
+          
+          
+          ContextMenu.LayoutInput = new PopupLayoutInput();
+          ContextMenu.LayoutInput.Placement = PlacementMode.MouseOrigin;
+
+          ContextMenu.Helper.Show(ContextMenu);
+        }
+      </Script>
+
+      
+      
+      <Script>PopupRelativeToList.PlacementTarget = Repeater;</Script>
+
+      
+      <Script>
+        [DeclareTrigger(RightClickKeyboard1.Invoked)]
+
+        if (ContextMenu != null)
+        {
+           if (EditContext != null &amp;&amp; RightClickKeyboard1.EventContext is  me:ListItemContext)
+           {
+             me:ListItemContext context = (me:ListItemContext)RightClickKeyboard1.EventContext;
+             EditContext.Model = context.Edit;
+           }
+
+          
+          
+          
+          ContextMenu.LayoutInput = PopupRelativeToList;
+
+          ContextMenu.Helper.Show(ContextMenu);
+        }
+      </Script>
+
+
+      
+      <Script>
+        [DeclareTrigger(RightClickKeyboard2.Invoked)]
+
+        if (ContextMenu != null)
+        {
+           if (EditContext != null &amp;&amp; RightClickKeyboard2.EventContext is  me:ListItemContext)
+           {
+             me:ListItemContext context = (me:ListItemContext)RightClickKeyboard2.EventContext;
+             EditContext.Model = context.Edit;
+           }
+
+          
+          
+          
+          ContextMenu.LayoutInput = PopupRelativeToList;
+
+          ContextMenu.Helper.Show(ContextMenu);
+        }
+      </Script>
+
+
+      
+      <Script>
+        [DeclareTrigger(SelectRangeKey.Invoked)]
+        if (SelectRangeKey.EventContext is me:ListItemContext)
+        {
+          me:ListItemContext context = (me:ListItemContext)SelectRangeKey.EventContext;
+          SelectionManager.SelectRangeFromAnchor(context.Index.Value);
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(AddToSelectionKey.Invoked)]
+        if (AddToSelectionKey.EventContext is me:ListItemContext)
+        {
+          me:ListItemContext context = (me:ListItemContext)AddToSelectionKey.EventContext;
+          SelectionManager.Select(context.Index.Value, true);
+        }
+      </Script>
+
+       
+      <Script>
+        [DeclareTrigger(ToggleSelectKey.Invoked)]
+        if (ToggleSelectKey.EventContext is me:ListItemContext)
+        {
+          me:ListItemContext context = (me:ListItemContext)ToggleSelectKey.EventContext;
+          SelectionManager.ToggleSelect(context.Index.Value);
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Focus.GainedFocus)]
+
+        if (Focus.GainedEventContext is me:ListItemContext)
+        {
+          me:ListItemContext context = (me:ListItemContext)Focus.GainedEventContext;
+          SelectionManager.SelectedIndex = context.Index.Value;
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(ShiftFocus.GainedFocus)]
+        if (ShiftFocus.GainedEventContext is me:ListItemContext)
+        {
+          me:ListItemContext context = (me:ListItemContext)ShiftFocus.GainedEventContext;
+          SelectionManager.Clear();
+          SelectionManager.SelectRangeFromAnchor(context.Index.Value);
+        }
+      </Script>
+
+      <Script>SelectionRect.Visible = [Dragger.Dragging];</Script>
+
+      <Script>
+        [DeclareTrigger(Dragger.Cancelled)]
+        SelectionManager.Clear();
+      </Script>
+
+      <Script><![CDATA[
+        
+        
+        if ([Dragger.Dragging] && Dragger.ActiveModifiers == InputHandlerModifiers.None)
+          SelectionManager.Clear();
+
+        Repeater.DiscardOffscreenVisuals = !Dragger.Dragging;
+   ]]></Script>
+
+      <Script>
+        [DeclareTrigger(Dragger.EndPosition)]
+
+        DragRectInput.Left.Percent   = sys:Math.Max(0.0, sys:Math.Min(Dragger.BeginPosition.X, Dragger.EndPosition.X));
+        DragRectInput.Right.Percent  = sys:Math.Min(1.0, sys:Math.Max(Dragger.BeginPosition.X, Dragger.EndPosition.X));
+        DragRectInput.Top.Percent    = sys:Math.Max(0.0, sys:Math.Min(Dragger.BeginPosition.Y, Dragger.EndPosition.Y));
+        DragRectInput.Bottom.Percent = sys:Math.Min(1.0, sys:Math.Max(Dragger.BeginPosition.Y, Dragger.EndPosition.Y));
+
+        SelectionRect.LayoutInput = new AnchorLayoutInput();
+        SelectionRect.LayoutInput = DragRectInput;
+
+        List added = Dragger.GetAddedEventContexts();
+
+        foreach(object o in added)
+        {
+          if (o is me:ListItemContext)
+          {
+            me:ListItemContext context = (me:ListItemContext)o;
+
+            if (context.MainContext)
+            {
+              if (SelectionManager.SourceList == null ||
+                  (context.Index.Value >= 0 &amp;&amp;
+                   context.Index.Value &lt; SelectionManager.SourceList.Count))
+              {
+                
+                if (Dragger.ActiveModifiers == InputHandlerModifiers.Ctrl)
+                  SelectionManager.ToggleSelect(context.Index.Value);
+                else
+                  SelectionManager.Select(context.Index.Value, true);
+              }
+              else
+              {
+                
+              }
+            }
+          }
+        }
+
+        List removed = Dragger.GetRemovedEventContexts();
+
+        foreach(object o in removed)
+        {
+          if (o is me:ListItemContext)
+          {
+            me:ListItemContext context = (me:ListItemContext)o;
+
+            if (context.MainContext)
+            {
+              if (SelectionManager.SourceList == null ||
+                  (context.Index.Value >= 0 &amp;&amp;
+                   context.Index.Value &lt; SelectionManager.SourceList.Count))
+              {
+                
+                if (Dragger.ActiveModifiers == InputHandlerModifiers.Ctrl)
+                  SelectionManager.ToggleSelect(context.Index.Value);
+                else
+                  SelectionManager.Select(context.Index.Value, false);
+              }
+              else
+              {
+                
+              }
+            }
+          }
+        }
+      </Script>
+
+      
+
+      <Script> <![CDATA[
+        [DeclareTrigger(Dragger.AbsoluteDragSize)]
+        [DeclareTrigger(ScrollTimer.Tick)]
+
+        bool scrollTimerEnabled = false;
+
+        if (Dragger.Dragging)
+        {
+
+          if (protected_VerticalScrollData != null)
+          {
+            float currentPosition = protected_VerticalScrollData.CurrentPage - 1.0;
+            float maxPosition     = protected_VerticalScrollData.TotalPages  - 1.0;
+
+            float pageStep = protected_VerticalScrollData.PageStep;
+
+            float viewTop    = (pageStep * currentPosition      ) / (pageStep * maxPosition + 1.0);
+            float viewBottom = (pageStep * currentPosition + 1.0) / (pageStep * maxPosition + 1.0);
+
+            if (Dragger.EndPosition.Y < viewTop)
+            {
+              protected_VerticalScrollData.ScrollUp();
+              scrollTimerEnabled = true;
+            }
+            else if (Dragger.EndPosition.Y > viewBottom)
+            {
+              protected_VerticalScrollData.ScrollDown();
+              scrollTimerEnabled = true;
+            }
+          }
+          if (protected_HorizontalScrollData != null)
+          {
+            float currentPosition = protected_HorizontalScrollData.CurrentPage - 1.0;
+            float maxPosition     = protected_HorizontalScrollData.TotalPages  - 1.0;
+
+            float pageStep = protected_HorizontalScrollData.PageStep;
+
+            float viewLeft  = (pageStep * currentPosition      ) / (pageStep * maxPosition + 1.0);
+            float viewRight = (pageStep * currentPosition + 1.0) / (pageStep * maxPosition + 1.0);
+
+            if (Dragger.EndPosition.X < viewLeft)
+            {
+              protected_HorizontalScrollData.ScrollUp();
+              scrollTimerEnabled = true;
+            }
+            else if (Dragger.EndPosition.X > viewRight)
+            {
+              protected_HorizontalScrollData.ScrollDown();
+              scrollTimerEnabled = true;
+            }
+          }
+        }
+
+        ScrollTimer.Enabled = scrollTimerEnabled;
+      ]]></Script>
+
+      
+      <Script>
+        [DeclareTrigger(Dragger.Dragging)]
+        [DeclareTrigger(Content)]
+        zune:LibraryPage.BlockUpdatesFromDBList(
+            Content,
+            zune:BlockListUpdatesReason.DragSelect,
+            Dragger.Dragging);
+      </Script>
+
+
+      
+      <Script>
+        [DeclareTrigger(EditingList.Value)]
+        [DeclareTrigger(Content)]
+        zune:LibraryPage.BlockUpdatesFromDBList(
+            Content,
+            zune:BlockListUpdatesReason.Edit,
+            EditingList.Value);
+      </Script>
+
+      <Script>
+        [DeclareTrigger(JILFocus.GainedFocus)]
+        [DeclareTrigger(UI.DeepKeyFocus)]
+        int index = -1;
+
+        if (JILFocus.GainedEventContext is me:ListItemContext)
+        {
+          index = ((me:ListItemContext)JILFocus.GainedEventContext).Index.Value;
+        }
+
+        
+        
+        if (!UI.DeepKeyFocus || JumpInListIndex == null || index != JumpInListIndex.Value)
+        {
+          zune:JumpInListManager.Instance.Clear();
+        }
+      </Script>
+      
+      <Script>
+        
+        [DeclareTrigger(TrackLastFocusedIndex.GainedFocus)]
+        if (TrackLastFocusedIndex.GainedEventContext is me:ListItemContext)
+        {
+          LastFocusedIndex = ((me:ListItemContext)TrackLastFocusedIndex.GainedEventContext).Index.Value;
+        }
+      </Script>
+
+      <Script>
+        
+        
+        if (![zune:JumpInListManager.Instance.IsActive])
+        {
+          JumpInListString.Value = null;
+        }
+      </Script>
+
+
+      <Script>
+        
+        JumpInListTyping.Enabled = [SupportsJumpInList];
+
+        
+        
+        
+        if (!SupportsJumpInList &amp;&amp; JumpInListIndex != null)
+        {
+          zune:JumpInListManager.Instance.Clear();
+        }
+
+      </Script>
+
+
+      <Script>
+          [DeclareTrigger(JumpInListString.Value)]
+
+          
+          
+          
+
+          if (zune:JumpInListManager.Instance.IsActive || !String.IsNullOrEmpty(JumpInListString.Value) )
+          {
+            zune:JumpInListManager.Instance.SearchForString(Content, JumpInListString.Value);
+            JILTimeout.Start();
+            JumpInListInvoked.Invoke();
+          }
+      </Script>
+
+      <Script>
+          
+          if ([UI.DeepKeyFocus] &amp;&amp; [SupportsJumpInList])
+          {
+            JumpInListIndex = zune:JumpInListManager.Instance.ResultIndex;
+          }
+          else
+          {
+            JumpInListIndex = null;
+          }
+      </Script>
+
+      <Script>
+
+          
+          if (JumpInListIndex != null)
+          {
+            int index = [JumpInListIndex.Value];
+            if (index >= 0)
+            {
+              NavigateIntoArgs.Index = index;
+              NavigateIntoArgs.Select = true;
+            }
+          }
+      </Script>
+
+
+      <Script>
+        [DeclareTrigger(JILEscape.Invoked)]
+        [DeclareTrigger(JILEnter.Invoked)]
+        [DeclareTrigger(JILTimeout.Tick)]
+
+        zune:JumpInListManager.Instance.Clear();
+      </Script>
+
+      <Script><![CDATA[
+        [DeclareTrigger(Repeater.FocusedItemDiscarded)]
+
+        
+        
+        
+        
+        
+
+        int index = -1;
+        if (LastFocusedIndex >= 0 && Content != null && Content.Count > 0)
+        {
+           if (LastFocusedIndex < Content.Count)
+           {
+             index = LastFocusedIndex;
+           }
+           else
+           {
+             index = Content.Count - 1;
+           }
+        }
+
+
+        
+        
+        
+        
+        
+        if (index >= 0)
+        {
+          Repeater.NavigateIntoIndex(index);
+        }
+        else
+        {
+          Repeater.NavigateInto();
+        }
+
+      ]]></Script>
+
+      <Script>
+        if ([Accessible.Enabled])
+        {
+          Accessible.Name = [AccessibleDescription];
+          Accessible.Role = AccessibleRole.List;
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      
+      <Panel Layout="Anchor">
+        <Children>
+
+          
+          <Graphic Name="SelectionRect" Content="{styles:Styles.DragSelectRect}"/>
+
+          <Repeater Name="Repeater" ContentName="Item" Layout="{ListLayout}" DiscardOffscreenVisuals="true" Padding="{Padding}"/>
+
+          
+          <Panel Name="Background"/>
+
+        </Children>
+      </Panel>
+    </Content>
+
+    
+    
+    
+    <Content Name="Item">
+      <core:Label/>
+    </Content>
+  </UI>
+
+  
+  
+  
+  
+  
+  
+  
+  <UI Name="ScrollingContentListBase" Base="me:ContentListBase">
+    <Properties>
+      
+      <Orientation Name="ScrollOrientation" Orientation="Vertical"/>
+      <Boolean Name="AllowScrolling" Boolean="true"/>
+      <Boolean Name="AllowScrollingInput" Boolean="true"/>
+
+      <Inset Name="HorizontalScrollMargins" Inset="0,0,0,20"/>
+      <Inset Name="VerticalScrollMargins" Inset="0,0,20,0"/>
+
+      
+      <Single Name="FadeSize" Single="-0.1"/>
+      <Single Name="FadeAmount" Single="1.0"/>
+      <Inset Name="ScrollerPadding" Inset="0,0,0,0"/>
+
+      <Type Name="ScrollControlType" Type="{typeof(core:ScrollBar)}"/>
+      <AnchorLayoutInput Name="ScrollControlVertical"
+        Right="Parent,1" Horizontal="Far"
+        Top="Scroller,0" Bottom="Scroller,1" Vertical="Center"
+        ContributesToWidth="false" ContributesToHeight="false"/>
+      <AnchorLayoutInput Name="ScrollControlHorizontal"
+        Bottom="Parent,1" Vertical="Far"
+        Left="Scroller,0" Right="Scroller,1" Horizontal="Center"
+        ContributesToWidth="false" ContributesToHeight="false"/>
+
+      
+      <Animation Name="ListShow" Animation="{anim:Animations.ListFadeIn}"/>
+      <Animation Name="ScrollMove" Animation="{null}"/>
+
+      <Boolean Name="OnlyShowClipsWhenScrollable" Boolean="false"/>
+    </Properties>
+
+    <Locals>
+      <ScrollingData Name="ScrollData"/>
+    </Locals>
+
+    <Input>
+      
+      <ScrollingHandler Name="ScrollHandler" ScrollingData="{ScrollData}" Enabled="{AllowScrollingInput}"/>
+    </Input>
+
+    <Scripts>
+      <Script> Background.FillView = [Dragger.Enabled]; </Script>
+      
+      
+      <Script><![CDATA[
+        Inset margins;
+        if (AllowScrolling)
+        {
+          ScrollControl.Visible = true;
+          if ([ScrollOrientation] == Orientation.Vertical)
+          {
+            ScrollControl.LayoutInput = ScrollControlVertical;
+            margins = VerticalScrollMargins;
+            ScrollControl.Horizontal = false;
+            protected_VerticalScrollData = ScrollData;
+            protected_HorizontalScrollData = null;
+          }
+          else
+          {
+            ScrollControl.LayoutInput = ScrollControlHorizontal;
+            margins = HorizontalScrollMargins;
+            ScrollControl.Horizontal = true;
+            protected_VerticalScrollData = null;
+            protected_HorizontalScrollData = ScrollData;
+          }
+
+          Scroller.FadeSize = FadeSize;
+        }
+        else
+        {
+          ScrollControl.Visible = false;
+          Scroller.FadeSize = 0.0;
+        }
+
+        Scroller.Margins = margins;]]>
+      </Script>
+
+      <Script>ScrollData.Enabled = [AllowScrolling];</Script>
+
+      <Script>
+        [DeclareTrigger(NavigateIntoArgs.Index)]
+        [DeclareTrigger(JumpInListInvoked.Invoked)]
+
+        
+        
+        ScrollData.ScrollFocusIntoView();
+      </Script>
+
+      <Script> ScrollControl.RegionHover = [UI.DeepMouseFocus]; </Script>
+
+      
+      <Script>PopupRelativeToList.PlacementTarget = Scroller;</Script>
+
+      <Script>
+        if (OnlyShowClipsWhenScrollable)
+        {
+          Scroller.ShowNear = [ScrollData.CanScrollUp];
+          Scroller.ShowFar = [ScrollData.CanScrollDown];
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Layout="Anchor" Navigation="TabGroup">
+        <Children>
+
+          
+          <bar:ScrollControl Name="ScrollControl" ScrollControl="{ScrollControlType}" ScrollData="{ScrollData}"/>
+
+          
+          <Scroller Name="Scroller" Orientation="{ScrollOrientation}"
+              ScrollingData="{ScrollData}" Prefetch="0.5" FadeSize="{FadeSize}" FadeAmount="{FadeAmount}" Padding="{ScrollerPadding}">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Parent,0" Top="Parent,0"/>
+            </LayoutInput>
+            <Animations>
+              <Animation Animation="{ListShow}"/>
+              <Animation Animation="{anim:Animations.MoveNow}"/>
+            </Animations>
+            <Children>
+
+              <Panel Layout="Anchor">
+                <Animations>
+                  <Animation Animation="{ScrollMove}"/>
+                </Animations>
+                <Children>
+
+                  
+                  <Graphic Name="SelectionRect" Content="{styles:Styles.DragSelectRect}"/>
+
+                  <Panel Name="Background">
+                    <LayoutInput>
+                      <AnchorLayoutInput Left="Parent,0" Top="Parent,0" />
+                    </LayoutInput>
+                    <Children>
+
+                      
+                      <Repeater Name="Repeater" ContentName="Item" Layout="{ListLayout}" DiscardOffscreenVisuals="true" Padding="{Padding}"/>
+
+                    </Children>
+                  </Panel>
+
+                </Children>
+              </Panel>
+
+            </Children>
+
+          </Scroller>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  
+  <UI Name="ReorderableListBase" Base="me:ContentListBase">
+    <Properties>
+      <Boolean Name="CanReorder" Boolean="false"/>
+    </Properties>
+
+    <Locals>
+      <iris:BooleanChoice Name="IsDragging"/>
+      <iris:IntRangedValue Name="DraggingIndex" Value="-1"/>
+
+      <iris:IntRangedValue Name="InsertIndex" Value="-1"/>
+
+      <Command Name="ClearIndex"/>
+    </Locals>
+
+    <Input>
+      <DropTargetHandler Name="Target" HandlerStage="Bubbled, Direct" AllowedDropActions="Move"/>
+
+      
+      <EventContext Value="{-2}"/>
+    </Input>
+
+    <Scripts>
+      <Script> Target.Enabled = [IsDragging.Value]; </Script>
+
+      <Script>
+        
+        
+        
+        if (![Target.Dragging])
+          ClearIndex.Invoke();
+      </Script>
+
+      <Script>
+        [DeclareTrigger(ClearIndex.Invoked)]
+        InsertIndex.Value = -1;
+        DraggingIndex.Value = -1;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Target.EventContext)]
+        
+        object context = Target.EventContext;
+
+        
+
+        if (context is int)
+        {
+          InsertIndex.Value = (int)context;
+
+          if (InsertIndex.Value == -2)
+          {
+            
+            
+            InsertIndex.Value = Content.Count;
+          }
+        }
+      </Script>
+      
+      <Script>
+        [DeclareTrigger(Target.Dropped)]
+
+        
+        
+        
+        
+        
+        if (InsertIndex.Value >= 0)
+        {
+          if (InsertIndex.Value > DraggingIndex.Value)
+            LastFocusedIndex = InsertIndex.Value - 1;
+          else
+            LastFocusedIndex = InsertIndex.Value;
+        }
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  
+  <UI Name="DropZone">
+    <Properties>
+      
+      <iris:BooleanChoice Name="IsVisible" BooleanChoice="$Required"/>
+
+      
+      <Object Name="Context" Object="{null}"/>
+    </Properties>
+
+    <Input>
+      <EventContext Name="EventContext" Value="{Context}"/>
+    </Input>
+
+    <Scripts>
+      <Script> EventContext.Value = [Context]; </Script>
+
+      
+      <Script> Zone.Visible = [IsVisible.Value]; </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Name="Zone" MouseInteractive="true"/>
+    </Content>
+  </UI>
+
+  
+  
+  
+  
+  <UI Name="ItemDropZone" Base="me:DropZone">
+    <Properties>
+      
+      <Index Name="Index" Index="$Required"/>
+      
+      <Int32 Name="IndexModifier" Int32="0"/>
+
+      <Boolean Name="ValidTarget" Boolean="true"/>
+    </Properties>
+
+    <Scripts>
+      
+      <Script>
+        if (ValidTarget)
+          Context = [Index.Value] + [IndexModifier];
+        else
+          Context = -1; 
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  
+  <UI Name="Indicator">
+    <Properties>
+      <Object Name="Index" Object="{0}"/>
+      <iris:IntRangedValue Name="InsertAtIndex" IntRangedValue="$Required"/>
+      <iris:BooleanChoice Name="Visible" BooleanChoice="{null}"/>
+      <Boolean Name="ForceHidden" Boolean="false"/>
+      <Color Name="Color" Color="Transparent"/>
+      <Color Name="InsertColor" Color="{styles:Styles.ZuneMagenta}"/>
+      <Boolean Name="HideFirstIndicator" Boolean="false"/>
+    </Properties>
+
+    <Locals>
+      
+      <Int32 Name="IndexInt"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        if (Index is Index)
+          IndexInt = [((Index)Index).Value];
+        else
+          IndexInt = [(Int32)Index];
+      </Script>
+
+      <Script>
+        Indicator.Visible = !ForceHidden &amp;&amp;
+                            (Visible == null || [Visible.Value]) &amp;&amp;
+                            (!HideFirstIndicator || [IndexInt] != 0);
+      </Script>
+      <Script>
+        if ([InsertAtIndex.Value] == [IndexInt])
+          Indicator.Content = InsertColor;
+        else
+          Indicator.Content = Color;
+      </Script>
+    </Scripts>
+
+    <Content>
+      <ColorFill Name="Indicator"/>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="ListItemBase" Base="core:ButtonBase">
+    <Properties>
+      <Index Name="Index" Index="$Required"/>
+    </Properties>
+
+    <Input>
+      
+      <EventContext Name="Context" >
+        <Value>
+          <me:ListItemContext Index="{Index}"/>
+        </Value>
+      </EventContext>
+    </Input>
+  </UI>
+
+  
+  
+  
+  <UI Name="LabelListItemBase" Base="core:LabelButtonWithBackground">
+    <Properties>
+      <Index Name="Index" Index="$Required"/>
+      <drag:DragFeedback Name="DragFeedback" DragFeedback="{null}"/>
+      <btn:ModelButtonProvider Name="Provider" ModelButtonProvider="{null}"/>
+    </Properties>
+
+    <Input>
+      
+      <EventContext Name="Context">
+        <Value>
+          <me:ListItemContext Index="{Index}"/>
+        </Value>
+      </EventContext>
+      
+      
+      <DragSourceHandler Name="DragSource" AllowedDropActions="Copy" HandlerStage="Direct,Bubbled"
+                         CancelCursor="Arrow" CopyCursor="Arrow"/>
+    </Input>
+    
+    <Scripts>
+      <Script>
+        if (Provider != null)
+          DragSource.Value = [Provider.DragValue];
+      </Script>
+      
+      
+      <Script>DragSource.Enabled = [DragSource.Value] != null;</Script>
+      
+      <Script>
+        
+        
+        if ([DragSource.Dragging])
+        {
+          if (DragFeedback == null)
+            DragFeedback = new drag:DragFeedback();
+
+          if (Provider != null &amp;&amp; Provider.SelectionManager != null)
+          {
+            if (!Provider.SelectionManager.IsSelected(Index.Value))
+              Provider.SelectionManager.Select(Index.Value, true);
+
+            DragFeedback.Count = Provider.SelectionManager.Count;
+          }
+
+          DragFeedback.Helper.Show(DragFeedback);
+        }
+        else if (DragFeedback != null)
+        {
+          DragFeedback.Helper.Hide();
+          UI.DisposeOwnedObject(DragFeedback);
+          DragFeedback = null;
+        }
+
+        drag:DragInfo.IsDraggingInternally = DragSource.Dragging;
+      </Script>
+
+      <Script>
+        if (DragFeedback != null)
+          DragFeedback.DropAction = [DragSource.CurrentDropAction];
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  <UI Name="ThumbnailListItemBase" Base="core:ThumbnailButtonBase">
+    <Properties>
+      <Index Name="Index" Index="$Required"/>
+      <drag:DragFeedback Name="DragFeedback" DragFeedback="{null}"/>
+    </Properties>
+
+    <Input>
+      
+      <EventContext Name="Context">
+        <Value>
+          <me:ListItemContext Index="{Index}" Edit="{Provider.EditPrimaryLabel}"/>
+        </Value>
+      </EventContext>
+
+      
+      <DragSourceHandler Name="DragSource" AllowedDropActions="Copy" HandlerStage="Direct,Bubbled"
+                         CancelCursor="Arrow" CopyCursor="Arrow"/>
+    </Input>
+
+    <Scripts>
+      <Script>
+        if (Provider != null)
+          DragSource.Value = [Provider.DragValue];
+      </Script>
+
+      
+      <Script>DragSource.Enabled = [DragSource.Value] != null;</Script>
+
+      <Script>
+        
+        
+        if ([DragSource.Dragging])
+        {
+          if (DragFeedback == null)
+            DragFeedback = new drag:DragFeedback();
+
+          if (Provider != null &amp;&amp; Provider.SelectionManager != null)
+          {
+            if (!Provider.SelectionManager.IsSelected(Index.Value))
+              Provider.SelectionManager.Select(Index.Value, true);
+
+            DragFeedback.Count = Provider.SelectionManager.Count;
+          }
+
+          if (Provider != null)
+            DragFeedback.Thumbnail = Provider.Image;
+            
+          DragFeedback.Helper.Show(DragFeedback);
+        }
+        else if (DragFeedback != null)
+        {
+          DragFeedback.Helper.Hide();
+          UI.DisposeOwnedObject(DragFeedback);
+          DragFeedback = null;
+        }
+
+        drag:DragInfo.IsDraggingInternally = DragSource.Dragging;
+      </Script>
+
+      <Script>
+        if (DragFeedback != null)
+          DragFeedback.DropAction = [DragSource.CurrentDropAction];
+      </Script>
+    </Scripts>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/CONTEXTMENU.UIX b/test/2.1/CONTEXTMENU.UIX
new file mode 100644
index 0000000..a2c3c32
--- /dev/null
+++ b/test/2.1/CONTEXTMENU.UIX
@@ -0,0 +1,367 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX 
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris" 
+  xmlns:zune="assembly://ZuneShell/ZuneUI" 
+  xmlns:style="res://ZuneShellResources!Style.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:anim="res://ZuneShellResources!Animations.uix"
+  xmlns:popup="res://ZuneShellResources!Popup.uix"
+  xmlns:button="res://ZuneShellResources!Button.uix"
+  xmlns:me="Me"
+  >
+
+  
+  
+  
+  
+
+  
+  
+  
+  <Class Name="ContextMenu" Base="popup:Popup">
+    <Properties>
+      <PopupLayoutInput Name="LayoutInput" Placement="MouseOrigin" />
+      <String Name="PopupUI" String="res://ZuneShellResources!ContextMenu.uix#ContextMenuUI"/>
+      <String Name="Title"/>
+      <List Name="Options"/>
+      <Object Name="SelectedItem" Object="{null}"/>
+      <Boolean Name="HideIfAllDisabled" Boolean="true"/>
+    </Properties>
+
+    <Scripts>
+      
+      
+      <Script> 
+        Helper.IsModal = true; 
+        Helper.DismissOnWindowDeactivate = true;
+      </Script>
+
+      
+      <Script>
+        if ([Helper.IsVisible] &amp;&amp; HideIfAllDisabled)
+        {
+          bool anyEnabled = false;
+          if (Options != null)
+          {
+            foreach (object item in Options)
+            {
+              if (item is Command)
+              {
+                Command command = (Command)item;
+                if (command.Available)
+                {
+                  if (!(command is zune:MenuItemCommand) || !((zune:MenuItemCommand)command).Hidden)
+                  {
+                    anyEnabled = true;
+                    
+                  }
+                }
+              }
+            }
+          }
+          
+          
+          if (!anyEnabled)
+          {
+            Helper.Hide();
+          }
+        }
+      </Script>
+    </Scripts>
+  </Class>
+
+  
+  
+  
+  <Class Name="MenuDivider" Shared="True">
+    <Properties>
+      <Boolean Name="Visible" Boolean="true"/>
+    </Properties>
+  </Class>
+
+  
+  
+  
+  <Class Name="MenuIcon">
+    <Properties>
+      <Image Name="Icon" Image="$Required"/>
+    </Properties>
+  </Class>
+    
+  
+  
+  
+  <UI Name="ContextMenuUI" Base="popup:PopupUI">
+    <Properties>
+      
+      
+      
+      <me:ContextMenu Name="Popup" ContextMenu="{null}" />
+
+      <Size Name="MinimumItemSize" Size="150,0"/>
+
+      <Boolean Name="StealFocusOnOpen" Boolean="true"/>
+    </Properties>
+
+    <Locals>
+      <SharedSize Name="SharedSize" MinimumSize="150,0" MaximumSize="250,0"/>
+    </Locals>
+
+    <Input>
+      
+      <ClickHandler Name="Clicker" ClickType="LeftMouse,RightMouse"/>
+      
+      <KeyHandler Name="Escape" Key="Escape" HandlerStage="Bubbled"/>
+    </Input>
+
+    <Scripts>      
+      
+      <Script>
+        if (StealFocusOnOpen)
+        {
+          
+          Root.NavigateInto();
+        }
+      </Script>
+      
+      
+      
+      <Script>
+        [DeclareTrigger(UI.DeepKeyFocus)]
+        if (!UI.DeepKeyFocus)
+        {
+          
+          Popup.Helper.Hide();
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(Escape.Invoked)]
+        
+        Popup.Helper.Hide();
+      </Script>
+
+      <Script>
+        string title = [Popup.Title];
+        Header.Content = title;
+        
+        bool showHeader = !String.IsNullOrEmpty(title);
+        HeaderDivider.Visible = showHeader;
+        Header.Visible = showHeader;
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Graphic Name="Root" Content="{styles:Styles.ContextMenuDropShadow}" Margins="-8,-8,-12,-12" Padding="8,8,12,12" SizingPolicy="SizeToChildren">
+        <Animations>
+          <Animation Animation="{anim:Animations.MenuFadeIn}"/>
+          <Animation Animation="{anim:Animations.MenuFadeOut}"/>
+        </Animations>
+        <Children>
+          
+          <Panel MouseInteractive="true" Padding="0,6,0,10" MinimumSize="150,0" MaximumSize="250,0">
+            <Layout>
+              <DockLayout SizeToChildren="true" DefaultLayoutInput="Top,Near"/>
+            </Layout>
+            <Children>
+              
+              <me:DefaultFocus/>
+
+              <button:Label Name="Header" SharedSize="{SharedSize}" SharedSizePolicy="SharesWidth,ContributesToWidth" Style="{styles:SharedStyles.MenuItemHeaderStyle}" Padding="10,0,10,0"/>
+
+              <me:DividerUI Name="HeaderDivider" SharedSize="{SharedSize}" SharedSizePolicy="SharesWidth,ContributesToWidth" Padding="6,6,6,6"/>
+
+              <Repeater Name="Repeater" Source="{Popup.Options}" Navigation="ContainAll,WrapVertical,WrapTabOrder">
+                <Layout>
+                  <DockLayout SizeToChildren="true" DefaultLayoutInput="Top,Near"/>
+                </Layout>
+                <ContentSelectors>
+                  <TypeSelector Type="{typeof(iris:Command)}" ContentName="CommandItem"/>
+                  <TypeSelector Type="{typeof(me:MenuDivider)}" ContentName="DividerItem"/>
+                  <TypeSelector Type="{typeof(me:MenuIcon)}" ContentName="IconItem"/>
+                </ContentSelectors>
+              </Repeater>
+            
+            </Children>
+          </Panel>
+
+        </Children>
+      </Graphic>
+    </Content>
+
+    <Content Name="CommandItem">
+      <me:ContextMenuItem SharedSize="{SharedSize}" SharedSizePolicy="SharesWidth,ContributesToWidth" Model="{(iris:Command)RepeatedItem}" ContextMenu="{Popup}" MinimumSize="{MinimumItemSize}">
+        <Visible>
+          <Script>
+            if (RepeatedItem is zune:MenuItemCommand)
+              return !((zune:MenuItemCommand)RepeatedItem).Hidden;
+            return true;
+          </Script>
+        </Visible>
+      </me:ContextMenuItem>
+    </Content>
+
+    <Content Name="DividerItem">
+      <me:DividerUI 
+        SharedSize="{SharedSize}" 
+        SharedSizePolicy="SharesWidth,ContributesToWidth" 
+        Padding="6,6,6,6"
+        Visible="{((me:MenuDivider)RepeatedItem).Visible}"
+        />
+    </Content>
+    
+    <Content Name="IconItem">
+      <me:IconUI SharedSize="{SharedSize}" Icon="{((me:MenuIcon)RepeatedItem).Icon}" SharedSizePolicy="SharesWidth,ContributesToWidth"/>
+    </Content>
+  </UI>
+
+  <UI Name="DividerUI">
+    <Content>
+      <ColorFill MinimumSize="50,1" Content="{styles:Styles.ColumnDivider}">
+      </ColorFill>
+    </Content>
+  </UI>
+  
+  <UI Name="IconUI">
+    <Properties>
+      <Image Name="Icon" Image="$Required"/>
+    </Properties>
+    <Content>
+      <Graphic Content="{Icon}" StretchingPolicy="None"/>
+    </Content>
+  </UI>
+
+  
+  
+  
+  
+  <UI Name="DefaultFocus">
+    <Scripts>
+      <Script>
+        UI.KeyInteractive = true;
+        UI.CreateInterestOnFocus = false;
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel MinimumSize="1,1"/> 
+    </Content>
+  </UI>
+
+  
+  
+  
+  
+  <UI Name="ContextMenuItem" Base="me:ContextMenuItemBase">
+    <Properties>
+      <iris:Command Name="Model" Command="$Required"/>
+      <button:CommandButtonProvider Name="Provider"/>
+    </Properties>
+
+    <Scripts>
+      <Script>Provider.Model = [Model];</Script>
+    </Scripts>    
+  </UI>
+  
+  
+  
+  
+  
+  <UI Name="ContextMenuItemBase" Base="button:LabelButtonWithBackground">
+    <Properties>
+      <Object Name="Model" Object="$Required"/>
+      <me:ContextMenu Name="ContextMenu" ContextMenu="$Required"/>
+      
+      <Color Name="BackgroundSelectedColor" Color="{styles:Styles.LightGray}"/>
+      <style:Style Name="BaseStyle" Style="{styles:SharedStyles.MenuItemStyle}"/>
+      <Inset Name="LabelMargins" Inset="10,1,10,1"/>
+      
+      <Boolean Name="ShowToolTipWhenClipped" Boolean="true"/>
+    </Properties>
+
+    <Scripts>
+      
+      <Script> Clicker.ClickType = (ClickType)"LeftMouse,RightMouse,Key"; </Script>
+      
+      
+      <Script> 
+        UI.KeyFocusOnMouseEnter = true; 
+        UI.CreateInterestOnFocus = false;
+      </Script>
+
+      
+      
+
+
+
+
+
+
+
+
+
+      
+      
+      
+      <Script>
+        if ([UI.DeepMouseFocus])
+        {
+          ContextMenu.SelectedItem = Model;
+        }
+        else
+        {
+          ContextMenu.SelectedItem = null;
+        }
+      </Script>
+
+      <Script>
+        if ([UI.DeepKeyFocus])
+        {
+          ContextMenu.SelectedItem = Model;
+        }
+      </Script>
+
+      
+      <Script>
+        Style.State.Disabled = ![Provider.Available];
+      </Script>
+      
+      
+      <Script>
+        bool selected = ([ContextMenu.SelectedItem] == Model);
+        Provider.Selected = selected;
+        
+        
+        
+        
+        if (selected)
+        {
+          Background.Content = BackgroundSelectedColor;
+        }
+        else
+        {
+          Background.Content = BackgroundColor;
+        }
+
+        
+        
+        
+        
+        Clicker.Enabled = selected;
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(Clicker.Invoked)]
+
+        
+
+        
+        ContextMenu.Helper.Hide();
+      </Script>
+    </Scripts>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/CONTROLS.UIX b/test/2.1/CONTROLS.UIX
new file mode 100644
index 0000000..9cdb7c3
--- /dev/null
+++ b/test/2.1/CONTROLS.UIX
@@ -0,0 +1,77 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX 
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:core="res://ZuneShellResources!CoreControls.uix" 
+  xmlns:filter="res://ZuneShellResources!FilterList.uix" 
+  xmlns:listcore="res://ZuneShellResources!ContentList.uix"
+  xmlns:list="res://ZuneShellResources!ListView.uix"
+  xmlns:gallery="res://ZuneShellResources!GalleryView.uix">
+
+  <UI Name="Label" Base="core:Label"/>
+  <UI Name="AnimatedLabel" Base="core:AnimatedLabel"/>
+
+  <UI Name="Button" Base="core:Button"/>
+  <UI Name="MenuButton" Base="core:MenuButton"/>
+  <UI Name="InputButton" Base="core:InputButton"/>
+  <UI Name="IconButton" Base="core:IconButton"/>
+  <UI Name="PressAndHoldIconButton" Base="core:PressAndHoldIconButton"/>
+  <UI Name="AnimatedIconButton" Base="core:AnimatedIconButton"/>
+  <UI Name="ToggleIconButton" Base="core:ToggleIconButton"/>
+  <UI Name="ButtonWithIcon" Base="core:ButtonWithIcon"/>
+  <UI Name="ActionButtonWithIcon" Base="core:ActionButtonWithIcon"/>
+  <UI Name="ThumbnailButton" Base="core:ThumbnailButton"/>
+  <UI Name="ThumbnailButtonOverlay" Base="core:ThumbnailButtonOverlay"/>
+  <UI Name="ThumbnailCaptionArea" Base="core:ThumbnailCaptionArea"/>
+  <UI Name="ThumbnailIconCaptionArea" Base="core:ThumbnailIconCaptionArea"/>
+  <UI Name="ActionButton" Base="core:ActionButton"/>
+  <UI Name="ToggleActionButton" Base="core:ToggleActionButton"/>
+  <UI Name="BigActionButton" Base="core:BigActionButton"/>
+  <Class Name="ModelButtonProvider" Base="core:ModelButtonProvider"/>
+  <Class Name="Icon" Base="core:Icon"/>
+  
+  <UI Name="Editbox" Base="core:Editbox"/>
+  <UI Name="CheckBox" Base="core:CheckBox"/>
+
+  <UI Name="RadioGroup" Base="core:RadioGroup"/>
+  <UI Name="MCRadioGroup" Base="core:MCRadioGroup"/>
+  <UI Name="RadioButton" Base="core:RadioButton"/> 
+
+  <UI Name="ScrollBar" Base="core:ScrollBar"/>
+  
+  <UI Name="ContentListBase" Base="listcore:ContentListBase"/>
+  <UI Name="ScrollingContentListBase" Base="listcore:ScrollingContentListBase"/>
+  <UI Name="ListItemBase" Base="listcore:ListItemBase"/>
+  <UI Name="LabelListItemBase" Base="listcore:LabelListItemBase"/>
+  <UI Name="ThumbnailListItemBase" Base="listcore:ThumbnailListItemBase"/>
+  <Class Name="ListItemContext" Base="listcore:ListItemContext"/>
+  <Class Name="NavigateIntoIndexRequest" Base="listcore:NavigateIntoIndexRequest"/>
+  <UI Name="ReorderableListBase" Base="listcore:ReorderableListBase"/>
+  <UI Name="DropZone" Base="listcore:DropZone"/>
+  <UI Name="ItemDropZone" Base="listcore:ItemDropZone"/>
+  <UI Name="Indicator" Base="listcore:Indicator"/>
+  
+  <UI Name="FilterList" Base="filter:FilterList"/>
+  
+  <UI Name="ListView" Base="list:ListView"/>
+
+  <UI Name="GalleryView" Base="gallery:GalleryView"/>
+
+  <UI Name="ScrollBar" Base="core:ScrollBar"/>
+  <UI Name="Slider" Base="core:Slider"/>
+  <UI Name="ChoiceSlider" Base="core:ChoiceSlider"/>
+  <UI Name="LabeledChoiceSlider" Base="core:LabeledChoiceSlider"/>
+  <UI Name="PagingControl" Base="core:PagingControl"/>
+  <UI Name="PrevNextArrows" Base="core:PrevNextArrows"/>
+  
+  <UI Name="SplitPanel" Base="core:SplitPanel"/>
+  <UI Name="Splitter" Base="core:Splitter"/>
+  <Class Name="SplitterPositions" Base="core:SplitterPositions"/>
+
+  <Class Name="ContextMenu" Base="core:ContextMenu"/>
+  <Class Name="MenuDivider" Base="core:MenuDivider"/>
+
+  <UI Name="TextArea" Base="core:TextArea" />
+  
+  <UI Name="ToolbarIconBase" Base="core:ToolbarIconBase"/>  
+  
+</UIX>
diff --git a/test/2.1/CORECONTROLS.UIX b/test/2.1/CORECONTROLS.UIX
new file mode 100644
index 0000000..b0f5a6c
--- /dev/null
+++ b/test/2.1/CORECONTROLS.UIX
@@ -0,0 +1,74 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX 
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:button="res://ZuneShellResources!Button.uix"
+  xmlns:thumbnail="res://ZuneShellResources!ThumbnailButton.uix"
+  xmlns:edit="res://ZuneShellResources!EditBox.uix"
+  xmlns:check="res://ZuneShellResources!Checkbox.uix"
+  xmlns:radio="res://ZuneShellResources!RadioButton.uix"
+  xmlns:scroll="res://ZuneShellResources!ScrollBar.uix"
+  xmlns:pager="res://ZuneShellResources!PagingControl.uix"
+  xmlns:slider="res://ZuneShellResources!Slider.uix"
+  xmlns:splitter="res://ZuneShellResources!Splitter.uix"
+  xmlns:contextmenu="res://ZuneShellResources!ContextMenu.uix"  
+  xmlns:textarea="res://ZuneShellResources!TextArea.uix"
+  xmlns:toolbaricon="res://ZuneShellResources!ToolbarIcon.uix"
+  xmlns:animatedIconButton="res://ZuneShellResources!AnimatedIconButton.uix"
+  >
+
+  <UI Name="ButtonBase" Base="button:ButtonBase"/>
+  <UI Name="LabelButtonBase" Base="button:LabelButtonBase"/>
+  <UI Name="LabelButtonWithBackground" Base="button:LabelButtonWithBackground"/>
+  <UI Name="Button" Base="button:Button"/>
+  <UI Name="MenuButton" Base="button:MenuButton"/>
+  <UI Name="InputButton" Base="button:InputButton"/>
+  <UI Name="IconButton" Base="button:IconButton"/>
+  <UI Name="PressAndHoldIconButton" Base="button:PressAndHoldIconButton"/>
+  <UI Name="AnimatedIconButton" Base="animatedIconButton:AnimatedIconButton"/>
+  <UI Name="ToggleIconButton" Base="button:ToggleIconButton"/>
+  <UI Name="Label" Base="button:Label"/>
+  <UI Name="AnimatedLabel" Base="button:AnimatedLabel"/>
+  <UI Name="ButtonWithIcon" Base="button:ButtonWithIcon"/>
+  <UI Name="ActionButtonWithIcon" Base="button:ActionButtonWithIcon"/>
+  <UI Name="ActionButton" Base="button:ActionButton"/>
+  <UI Name="ToggleActionButton" Base="button:ToggleActionButton"/>
+  <UI Name="BigActionButton" Base="button:BigActionButton"/>
+  <Class Name="ModelButtonProvider" Base="button:ModelButtonProvider"/>
+  <Class Name="Icon" Base="button:Icon"/>
+
+  <UI Name="ThumbnailButton" Base="thumbnail:ThumbnailButton"/>
+  <UI Name="ThumbnailButtonBase" Base="thumbnail:ThumbnailButtonBase"/>
+  <UI Name="ThumbnailButtonOverlay" Base="thumbnail:ThumbnailButtonOverlay"/>
+  <UI Name="ThumbnailCaptionArea" Base="thumbnail:ThumbnailCaptionArea"/>
+  <UI Name="ThumbnailIconCaptionArea" Base="thumbnail:ThumbnailIconCaptionArea"/>
+
+  <UI Name="Editbox" Base="edit:Editbox"/>
+
+  <UI Name="CheckBox" Base="check:CheckBox"/>
+
+  <UI Name="RadioGroup" Base="radio:RadioGroup"/>
+  <UI Name="MCRadioGroup" Base="radio:MCRadioGroup"/>
+  <UI Name="RadioButton" Base="radio:RadioButton"/> 
+
+  <UI Name="ScrollControl" Base="scroll:ScrollControl"/>
+  <UI Name="ScrollBar" Base="scroll:ScrollBar"/>
+
+  <UI Name="Slider" Base="slider:Slider"/>
+  <UI Name="ChoiceSlider" Base="slider:ChoiceSlider"/>
+  <UI Name="LabeledChoiceSlider" Base="slider:LabeledChoiceSlider"/>
+  
+  <UI Name="SplitPanel" Base="splitter:SplitPanel"/>
+  <UI Name="Splitter" Base="splitter:Splitter"/>
+  <Class Name="SplitterPositions" Base="splitter:Positions"/>
+
+  <UI Name="PagingControl" Base="pager:PagingControl"/>
+  <UI Name="PrevNextArrows" Base="pager:PrevNextArrows"/>
+
+  <Class Name="ContextMenu" Base="contextmenu:ContextMenu"/>
+  <Class Name="MenuDivider" Base="contextmenu:MenuDivider"/>
+
+  <UI Name="TextArea" Base="textarea:TextArea" />
+  
+  <UI Name="ToolbarIconBase" Base="toolbaricon:ToolbarIconBase"/>
+  
+</UIX>
diff --git a/test/2.1/DEVICEFIRMWARE.UIX b/test/2.1/DEVICEFIRMWARE.UIX
new file mode 100644
index 0000000..394bb26
--- /dev/null
+++ b/test/2.1/DEVICEFIRMWARE.UIX
@@ -0,0 +1,361 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:me="Me"
+  >
+
+  <UI Name="Default">
+    <Properties>
+      <zune:CategoryPage Name="Page" CategoryPage="$Required" />      
+    </Properties>
+    <Locals>
+      <iris:Command Name="InstallNow" Description="{me:Strings.Install}"/>
+      <iris:Command Name="CancelUpdate" Description="{me:Strings.Cancel}"/>
+      <iris:RangedValue Name="ProgressModel" MinValue="0.0" MaxValue="100.0"/>
+      
+      <Timer AutoRepeat="false" Interval="300000" Name="Timer" Enabled="false"/>
+      <zune:FirmwareUpdate Name="Model" FirmwareUpdate="{zune:FirmwareUpdate.Instance}"/>
+      <bool Name="IsAvailable" bool="{Model.IsAvailable}"/>
+      <bool Name="Updating" bool="false"/>
+      <styles:LabelStyle Name="TextAreaStyle" Color="{styles:Styles.SettingsTextActive}" Font="{styles:Styles.StandardSubHeaderText}"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        
+        
+        
+        if (Model.NavigatedToWizardModeInvoked)
+        {
+          InstallNow.Invoke();
+        }
+      </Script>
+      <Script>
+        
+        
+        
+        bool showDeviceOptions = true;
+        if (!Page.IsWizard)
+        {
+          bool currentDeviceConnected = [zune:SyncControls.Instance.CurrentDeviceConnected];
+          bool connectedViaUSB = [zune:SyncSetupManager.Instance.ConnectedViaUSB];
+          if (!currentDeviceConnected || !connectedViaUSB)
+          {
+            showDeviceOptions = false;
+            if (!connectedViaUSB)
+            {
+              DeviceNotUpdatableText.Content = me:Strings.USBOnly;
+            }
+            else
+            {
+              DeviceNotUpdatableText.Content = me:Strings.ExistingOnly;
+            }
+          }
+        }
+        DeviceUpdatable.Visible = showDeviceOptions;
+        DeviceNotUpdatable.Visible = !showDeviceOptions;
+      </Script>
+      <Script>
+        if (IsAvailable)
+        {
+          UpdateHeader.Visible = true;
+        }
+        else
+        {
+          SuccessHeader.Visible = true;
+        }
+      </Script>
+      <Script>
+        
+        [DeclareTrigger(InstallNow.Invoked)]
+        
+        
+        if (!Page.IsWizard)
+        {
+          Model.NavigateToWizardMode();
+        }
+        else
+        {
+          bool success = Model.InvokeFirmwareUpdate();
+
+          if (!success)
+          {
+            Model.NavigatedToWizardModeInvoked = false;
+            zune:Shell.DefaultInstance.NavigateBack();
+            if (Model.Error.IsError)
+            {
+              zune:Shell.ShowErrorDialog(Model.Error.Int, me:Strings.Failure);
+            }
+          }
+          else
+          {
+            Timer.Start();
+            Page.CancelButton = CancelUpdate;
+            Page.CancelButton.Available = false;
+            
+            Page.AllowAdvance = false;
+                        
+            Updating = true;
+          }
+        }
+      </Script>
+      <Script>
+        
+        [DeclareTrigger(CancelUpdate.Invoked)]        
+        Updating = false;
+        Page.CancelButton = null;
+        Model.CancelFirmwareUpdate();
+        Page.CancelButton.Invoke();
+      </Script>
+      <Script>
+        CurrentFirmwareVersion.Content = me:Strings.CurrentVersion.Format(Model.FirmwareVersionOnDevice);
+      </Script>
+      <Script>
+        bool isRequired = Model.IsRequired;
+        
+        String newVersion = Model.NewFirmwareVersion;
+        String requiredText;
+        if( isRequired )
+        {
+          requiredText = me:Strings.NewVersionRequired;
+        }
+        else
+        {
+          requiredText = me:Strings.NewVersionOptional;
+        }
+        
+        NewFirmwareVersion.Content = requiredText.Format(newVersion);
+        
+        UpdateRequired.Visible = isRequired;
+        Page.AllowAdvance = !isRequired;
+        Page.AllowSkip = !isRequired &amp;&amp; [IsAvailable];
+      </Script>
+      <Script>
+        
+        [DeclareTrigger(Timer.Tick)]
+        Page.CancelButton.Available = true;
+      </Script>
+      <Script> 
+        ProgressDisplay.Content = [Model.FirmwareUpdateProgressStatus]; 
+      </Script>
+      <Script>
+        
+        bool inProgress = [Model.UpdateInProgress];
+        bool available = [IsAvailable];
+        bool success = false;
+
+        
+        if (Updating &amp;&amp; !inProgress)
+        {
+          
+          Updating = false;
+          Page.CancelButton = null;
+
+          success = Model.Error.IsSuccess;
+          if (success)
+          {
+            Page.AllowAdvance = true;
+            Page.AllowSkip = false;
+            
+            
+            
+            if (Model.NavigatedToWizardModeInvoked)
+            {
+              Model.NavigatedToWizardModeInvoked = false;
+              zune:Shell.DefaultInstance.NavigateBack();
+            }
+          }
+          else
+          {
+            zune:Shell.ShowErrorDialog(Model.Error.Int, me:Strings.Failure);
+          }
+        }
+
+        if (success || !available)
+        {
+          SuccessHeader.Visible = true;
+          Success.Visible = true;
+          UpdateHeader.Visible = false;
+
+          FirmwareVersion.Content = me:Strings.UpdatingVersion.Format(Model.FirmwareVersionOnDevice);
+          Size.Content = me:Strings.Size.Format(Model.DeviceCapacity);            
+        }
+        PreInstall.Visible = available &amp;&amp; !inProgress &amp;&amp; !success;
+        DuringInstall.Visible = inProgress;
+      </Script>
+      <Script>
+        float progressPercentage = (float)[Model.FirmwareUpdateProgressPercentage];
+        ProgressModel.Value = progressPercentage;
+        ProgressPercentage.Content = me:Strings.Percentage.Format(progressPercentage);
+      </Script>
+      <Script>
+        ProgressPanel.Visible = [Model.ProgressPercentageInMotion];
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel>
+        <Children>
+
+          <Panel Name="DeviceUpdatable" Visible="false">
+            <Layout>
+              <FlowLayout Orientation="Vertical" Spacing="4,0" StripAlignment="Near"/>
+            </Layout>
+            <Children>
+
+              <Text Name="SuccessHeader" 
+                    Content="{me:Strings.Success}" 
+                    Color="{styles:Styles.SettingsTextActive}" 
+                    Font="{styles:Styles.SettingsTextSubHeader}" 
+                    Visible="false" 
+                    WordWrap="false"/>
+
+              <Panel Name="UpdateHeader" Visible="false">
+                <Layout>
+                  <FlowLayout Orientation="Vertical" Spacing="4,0" StripAlignment="Near"/>
+                </Layout>
+                <Children>
+                  
+                  <Text Name="PreText" 
+                        Content="{me:Strings.VersionPreText}" 
+                        Color="{styles:Styles.SettingsTextActive}" 
+                        Font="{styles:Styles.ZegoeBold12}" 
+                        WordWrap="false"/>
+                  
+                  <Text Name="CurrentFirmwareVersion" 
+                        Color="{styles:Styles.SettingsTextActive}" 
+                        Font="{styles:Styles.ZegoeSemiBold10}" 
+                        WordWrap="false"/>
+                  
+                  <Text Name="NewFirmwareVersion" 
+                        Color="{styles:Styles.SettingsTextActive}" 
+                        Font="{styles:Styles.ZegoeSemiBold10}" 
+                        WordWrap="false" 
+                        Padding="0,0,0,15"/>
+
+                  <core:TextArea Name="FirmwareDescription" 
+                        Text="{Model.FirmwareDescription}" 
+                        MaximumSize="375,200" 
+                        Style="{TextAreaStyle}" 
+                        Padding="0,0,0,15"/>
+                  
+                </Children>
+              </Panel>
+
+              <Panel Name="PreInstall" Visible="false">
+                <Layout>
+                  <FlowLayout Orientation="Vertical" Spacing="4,0" StripAlignment="Near"/>
+                </Layout>
+                <Children>
+
+                  <Text Name="UpdateRequired" 
+                        Content="{me:Strings.Required}" 
+                        Visible="false" 
+                        Color="{styles:Styles.WarningColor}" 
+                        Font="{styles:Styles.SettingsText}" 
+                        WordWrap="true" 
+                        Padding="0,0,0,15"/>
+
+                  <core:ActionButton Name="InstallButton" Model="{InstallNow}"/>
+                  
+                </Children>
+              </Panel>
+
+              <Panel Name="DuringInstall" Visible="false">
+                <Layout>
+                  <FlowLayout Orientation="Vertical" Spacing="4,0" StripAlignment="Near"/>
+                </Layout>
+                <Children>
+                  
+                  <Panel Name="ProgressPanel">
+                    <Layout>
+                      <FlowLayout Orientation="Horizontal" Spacing="4,0" StripAlignment="Near" ItemAlignment="Center"/>
+                    </Layout>
+                    <Children>
+
+                      <Panel MaximumSize="300,0">
+                        <Children>
+                         <core:Slider Name="ProgressBar"
+                              Model="{ProgressModel}"
+                              FilledBackgroundImage="{styles:Styles.SliderFill}"
+                              MinimumSize="16,16"
+                              ReadOnly="true"/>     
+                        </Children>
+                      </Panel>
+
+                      <Text Name="ProgressPercentage" Color="{styles:Styles.SettingsTextActive}" Font="{styles:Styles.SettingsTextHeader}"/>
+
+                    </Children>
+                  </Panel>
+                  
+                  <Text Content="{me:Strings.Preparing}" 
+                        Name="ProgressDisplay" 
+                        Color="{styles:Styles.SettingsTextActive}" 
+                        Font="{styles:Styles.SettingsText}" 
+                        WordWrap="true" 
+                        Padding="0,0,0,15"/>
+                  
+                </Children>
+              </Panel>         
+
+              <Panel Name="Success" Visible="false">
+                <Layout>
+                  <FlowLayout Orientation="Vertical" Spacing="4,0" StripAlignment="Near"/>
+                </Layout>
+                <Children>
+
+                  <Text Name="Size" 
+                        Color="{styles:Styles.SettingsTextActive}" 
+                        Font="{styles:Styles.SettingsText}" 
+                        WordWrap="true"/>
+                        
+                  <Text Name="FirmwareVersion"  
+                        Color="{styles:Styles.SettingsTextActive}" 
+                        Font="{styles:Styles.SettingsText}" 
+                        WordWrap="true"/>
+
+                </Children>
+              </Panel>
+
+            </Children>
+          </Panel>
+          
+          <Panel Name="DeviceNotUpdatable" Visible="false">
+            <Children>
+            
+              <Text Name="DeviceNotUpdatableText" 
+                    Content="{me:Strings.ExistingOnly}" Color="{styles:Styles.SettingsTextActive}" 
+                    Font="{styles:Styles.SettingsText}" WordWrap="true"/>
+             
+            </Children>
+          </Panel>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  <Class Name="Strings" Shared="true">
+    <Properties>
+      <string Name="Install"            string="{zune:Shell.LoadString(zune:StringId.IDS_INSTALL_BUTTON)}" />
+      <string Name="Cancel"             string="{zune:Shell.LoadString(zune:StringId.IDS_CANCEL_BUTTON)}" />
+      <string Name="VersionPreText"     string="{zune:Shell.LoadString(zune:StringId.IDS_FIRMWARE_VERSION_PRE_TEXT)}" />
+      <string Name="CurrentVersion"     string="{zune:Shell.LoadString(zune:StringId.IDS_FIRMWARE_CURRENT_VERSION)}" />
+      <string Name="NewVersionRequired" string="{zune:Shell.LoadString(zune:StringId.IDS_FIRMWARE_NEW_VERSION_REQUIRED)}" />
+      <string Name="NewVersionOptional" string="{zune:Shell.LoadString(zune:StringId.IDS_FIRMWARE_NEW_VERSION_OPTIONAL)}" />
+      <string Name="UpdatingVersion"    string="{zune:Shell.LoadString(zune:StringId.IDS_FIRMWARE_UPDATING_VERSION)}" />
+      <string Name="Failure"            string="{zune:Shell.LoadString(zune:StringId.IDS_FIRMWARE_UPDATE_FAILURE)}" />
+      <string Name="Percentage"         string="{zune:Shell.LoadString(zune:StringId.IDS_FIRMWARE_UPDATE_PROGRESS)}" />
+      <string Name="Required"           string="{zune:Shell.LoadString(zune:StringId.IDS_FIRMWARE_UPDATE_WARNING)}" />
+      <string Name="Preparing"          string="{zune:Shell.LoadString(zune:StringId.IDS_FIRMWARE_UPDATE_PREPARING)}" />
+      <string Name="Success"            string="{zune:Shell.LoadString(zune:StringId.IDS_FIRMWARE_UPDATE_SUCCESS)}" />
+      <string Name="Size"               string="{zune:Shell.LoadString(zune:StringId.IDS_FIRMWARE_UPDATE_SIZE)}" />
+      <string Name="ExistingOnly"       string="{zune:Shell.LoadString(zune:StringId.IDS_OPTION_FOR_EXISTING_ONLY)}" />
+      <string Name="USBOnly"            string="{zune:Shell.LoadString(zune:StringId.IDS_OPTION_FOR_USB_ONLY)}" />
+    </Properties>
+  </Class>
+</UIX>
diff --git a/test/2.1/DEVICEICONS.UIX b/test/2.1/DEVICEICONS.UIX
new file mode 100644
index 0000000..abab024
--- /dev/null
+++ b/test/2.1/DEVICEICONS.UIX
@@ -0,0 +1,215 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:me="Me">
+
+  <Class Name="DeviceIconWrapper" Shared="true">
+    <Properties>
+      <me:DeviceIcons Name="DeviceIcons"/>
+    </Properties>
+  </Class>
+
+  <Class Name="DeviceIcons">
+    <Properties>
+      
+      <me:DeviceIconSet Name="Current" DeviceIconSet="{null}"/>
+    </Properties>
+    <Locals>
+      
+      <me:AutoDeviceIconSet Name="BlackKeel"
+                            Family="Keel"
+                            Color="Black"/>
+      <me:AutoDeviceIconSet Name="WhiteKeel"
+                            Family="Keel"
+                            Color="White"
+                            DarkColor="false"/>
+      <me:AutoDeviceIconSet Name="BrownKeel"
+                            Family="Keel"
+                            Color="Brown"/>
+
+      <me:AutoDeviceIconSet Name="BlackDraco"
+                            Family="Draco"
+                            Color="Black"/>
+
+      <me:AutoDeviceIconSet Name="BlackScorpius"
+                            Family="Scorpius"
+                            Color="Black"/>
+      <me:AutoDeviceIconSet Name="PinkScorpius"
+                            Family="Scorpius"
+                            Color="Pink"
+                            DarkColor="false"/>
+      <me:AutoDeviceIconSet Name="RedScorpius"
+                            Family="Scorpius"
+                            Color="Red"/>
+      <me:AutoDeviceIconSet Name="CamoScorpius"
+                            Family="Scorpius"
+                            Color="Camo"/>
+      <me:AutoDeviceIconSet Name="CitronScorpius"
+                            Family="Scorpius"
+                            Color="Citron"
+                            DarkColor="false"/>
+
+      
+      <me:DeviceIconSet Name="Default"/>
+
+      
+
+      <List Name="Icons">
+        
+
+
+
+        <Source>
+
+          
+          <List>
+            
+
+
+
+            <Source>
+
+              
+              <me:DeviceIconSet DeviceIconSet="{null}"/>
+              
+              <me:DeviceIconSet DeviceIconSet="{WhiteKeel}"/>
+              
+              <me:DeviceIconSet DeviceIconSet="{BlackKeel}"/>
+              
+              <me:DeviceIconSet DeviceIconSet="{BrownKeel}"/>
+
+            </Source>
+          </List>
+
+          
+          <List List="{null}"/>
+
+          
+          <List>
+            <Source>
+
+              
+              <me:DeviceIconSet DeviceIconSet="{null}"/>
+              
+              <me:DeviceIconSet DeviceIconSet="{null}"/>
+              
+              <me:DeviceIconSet DeviceIconSet="{BlackScorpius}"/>
+              
+              <me:DeviceIconSet DeviceIconSet="{null}"/>
+              
+              <me:DeviceIconSet DeviceIconSet="{PinkScorpius}"/>
+              
+              <me:DeviceIconSet DeviceIconSet="{CamoScorpius}"/>
+              
+              <me:DeviceIconSet DeviceIconSet="{RedScorpius}"/>
+              
+              <me:DeviceIconSet DeviceIconSet="{CitronScorpius}"/>
+
+            </Source>
+          </List>
+
+          
+          <List>
+            <Source>
+
+              
+              <me:DeviceIconSet DeviceIconSet="{null}"/>
+              
+              <me:DeviceIconSet DeviceIconSet="{null}"/>
+              
+              <me:DeviceIconSet DeviceIconSet="{BlackDraco}"/>
+
+            </Source>
+          </List>
+
+        </Source>
+      </List>
+    </Locals>
+    <Scripts>
+      <Script>
+        <![CDATA[
+        
+        
+        Int32 familyID = [zune:SyncControls.Instance.CurrentDeviceFamilyID];
+        Int32 colorID = [zune:SyncControls.Instance.CurrentDeviceColorID];
+        Current = Default;
+        
+        if (familyID >= 0 &&
+            familyID < Icons.Count)
+        {
+          List colorList = (List)Icons.GetItem(familyID);
+          
+          if (colorList != null &&
+              colorID >= 0 &&
+              colorID < colorList.Count)
+          {
+            me:DeviceIconSet temp = (me:DeviceIconSet)colorList.GetItem(colorID);
+            
+            if (temp != null)
+            {
+              Current = temp;
+            }
+          }
+        }
+        ]]>
+      </Script>
+    </Scripts>
+  </Class>
+
+  <Class Name="DeviceIconSet">
+    <Properties>
+      <me:ImageStyle Name="Disconnected"
+                     Default="res://ZuneShellResources!Draco.Black.Disconnected.Default.png"
+                     Hover="res://ZuneShellResources!Draco.Black.Disconnected.Hover.png"
+                     Click="res://ZuneShellResources!Draco.Black.Disconnected.Click.png"
+                     Drag="res://ZuneShellResources!Draco.Black.Disconnected.Drag.png"/>
+                     
+      <me:ImageStyle Name="Connected"
+                     Default="res://ZuneShellResources!Draco.Black.Connected.Default.png"
+                     Hover="res://ZuneShellResources!Draco.Black.Connected.Hover.png"
+                     Click="res://ZuneShellResources!Draco.Black.Connected.Click.png"
+                     Drag="res://ZuneShellResources!Draco.Black.Connected.Drag.png"/>
+
+      <me:ImageStyle Name="Syncing"
+                     Default="res://ZuneShellResources!Draco.Black.Syncing.Default.png"/>
+
+      <Image Name="LargeImage" Image="res://ZuneShellResources!Draco.Black.Large.png"/>
+      <Image Name="Background" Image="res://ZuneShellResources!Draco.Black.Background.png"/>
+      <String Name="Color" String="Black"/>
+      <Boolean Name="DarkColor" Boolean="true"/>
+    </Properties>
+  </Class>
+
+  <Class Name="AutoDeviceIconSet" Base="me:DeviceIconSet">
+    <Properties>
+      <String Name="Family" String="Keel"/>      
+    </Properties>
+    <Scripts>
+      <Script>
+        String base = "res://ZuneShellResources!{0}.{1}.".Format([Family], [Color]);
+        Disconnected.Default = (Image) (base + "Disconnected.Default.png");
+        Disconnected.Hover = (Image) (base + "Disconnected.Hover.png");
+        Disconnected.Click = (Image) (base + "Disconnected.Click.png");
+        Disconnected.Drag = (Image) (base + "Disconnected.Drag.png");
+        Connected.Default = (Image) (base + "Connected.Default.png");
+        Connected.Hover = (Image) (base + "Connected.Hover.png");
+        Connected.Click = (Image) (base + "Connected.Click.png");
+        Connected.Drag = (Image) (base + "Connected.Drag.png");
+        Syncing.Default = (Image) (base + "Syncing.Default.png");
+        LargeImage = (Image) (base + "Large.png");
+        Background = (Image) (base + "Background.png");
+      </Script>
+    </Scripts>
+  </Class>
+
+  <Class Name="ImageStyle">
+    <Properties>
+      <Image Name="Default" Image="$Required"/>
+      <Image Name="Hover" Image="{null}"/>
+      <Image Name="Click" Image="{null}"/>
+      <Image Name="Drag" Image="{null}"/>
+    </Properties>
+  </Class>
+  
+</UIX>
\ No newline at end of file
diff --git a/test/2.1/DEVICELANDFILTERS.UIX b/test/2.1/DEVICELANDFILTERS.UIX
new file mode 100644
index 0000000..f3abce4
--- /dev/null
+++ b/test/2.1/DEVICELANDFILTERS.UIX
@@ -0,0 +1,121 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:data="res://ZuneShellResources!LibraryData.schema.xml"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:me="Me">
+
+  <UI Name="DevicelandFilterList">
+    <Properties>
+      <data:LibrarySyncItemQuery Name="Query" LibrarySyncItemQuery="$Required"/>
+    </Properties>
+    <Scripts>
+      <Script>
+        Repeater.Source = [Query.Result.Items];
+      </Script>
+    </Scripts>
+    <Content>
+      <Repeater Name="Repeater" Layout="VerticalFlow" Source="{Query.Result.Items}" ContentName="Item"/>
+    </Content>
+    <Content Name="Item">
+      <Text Content="BASE DevicelandFilterList ITEM CONTENT NOT OVERRIDDEN"
+            Color="Pink" Font="{styles:Styles.StandardHeaderText}"/>
+    </Content>
+  </UI>
+
+  <UI Name="MusicFilterList" Base="me:DevicelandFilterList">
+    <Content Name="Item">
+      <me:MusicFilterListItem Model="{(data:SyncItem)RepeatedItem}"/>
+    </Content>
+  </UI>
+
+  <UI Name="VideoFilterList" Base="me:DevicelandFilterList">
+    <Content Name="Item">
+      <me:VideoFilterListItem Model="{(data:SyncItem)RepeatedItem}"/>
+    </Content>
+  </UI>
+
+  <UI Name="PhotoFilterList" Base="me:DevicelandFilterList">
+    <Content Name="Item">
+      <me:PhotoFilterListItem Model="{(data:SyncItem)RepeatedItem}"/>
+    </Content>
+  </UI>
+
+  <UI Name="PodcastFilterList" Base="me:DevicelandFilterList">
+    <Content Name="Item">
+      <me:PodcastFilterListItem Model="{(data:SyncItem)RepeatedItem}"/>
+    </Content>
+  </UI>
+
+  <UI Name="DevicelandFilterListItem">
+    <Properties>
+      <data:SyncItem Name="Model" SyncItem="$Required"/>
+    </Properties>
+    <Content>
+      <Text Name="Item" Content="DevicelandFilterListItem Content Not Overridden!"
+            Color="{styles:Styles.TextActive}" Font="{styles:Styles.PrimaryText}"/>
+    </Content>
+  </UI>
+
+  <UI Name="MusicFilterListItem" Base="me:DevicelandFilterListItem">
+    <Scripts>
+      <Script>
+        if (Model.MediaType != zune:SyncControls.ConvertSyncTypeToInt(zune:MediaType.Track))
+        {
+          Item.Visible = false;
+        }
+        else
+        {
+          Item.Content = "{0} / {1}, {2}".Format(Model.Title, Model.ArtistName, Model.AlbumName);
+        }
+      </Script>
+    </Scripts>
+  </UI>
+
+  <UI Name="VideoFilterListItem" Base="me:DevicelandFilterListItem">
+    <Scripts>
+      <Script>
+        if (Model.MediaType != zune:SyncControls.ConvertSyncTypeToInt(zune:MediaType.Video))
+        {
+          Item.Visible = false;
+        }
+        else
+        {
+          Item.Content = "{0} / {1}, {2}".Format(Model.Title, Model.Series, Model.DateAdded);
+        }
+      </Script>
+    </Scripts>
+  </UI>
+
+  <UI Name="PhotoFilterListItem" Base="me:DevicelandFilterListItem">
+    <Scripts>
+      <Script>
+        if (Model.MediaType != zune:SyncControls.ConvertSyncTypeToInt(zune:MediaType.Photo))
+        {
+          Item.Visible = false;
+        }
+        else
+        {
+          Item.Content = "{0} / {1}".Format(Model.Title, Model.DateTaken);
+        }
+      </Script>
+    </Scripts>
+  </UI>
+
+  <UI Name="PodcastFilterListItem" Base="me:DevicelandFilterListItem">
+    <Scripts>
+      <Script>
+        if (Model.MediaType != zune:SyncControls.ConvertSyncTypeToInt(zune:MediaType.PodcastEpisode))
+        {
+          Item.Visible = false;
+        }
+        else
+        {
+          Item.Content = "{0} / {1}".Format(Model.Series, Model.Title);
+        }
+      </Script>
+    </Scripts>
+  </UI>
+  
+</UIX>
diff --git a/test/2.1/DEVICEPARTNERSHIP.UIX b/test/2.1/DEVICEPARTNERSHIP.UIX
new file mode 100644
index 0000000..2ec9905
--- /dev/null
+++ b/test/2.1/DEVICEPARTNERSHIP.UIX
@@ -0,0 +1,83 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix">
+
+   <UI Name="Default">
+    <Properties>
+      <zune:CategoryPage Name="Page" CategoryPage="$Required" />
+    </Properties>
+    <Locals>     
+      <iris:Command Name="Back" Description="{zune:Shell.LoadString(zune:StringId.IDS_BACK_BUTTON)}"/>
+      <iris:Command Name="CompleteSetup" Description="{zune:Shell.LoadString(zune:StringId.IDS_DONE_BUTTON)}"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        [DeclareTrigger(CompleteSetup.Invoked)]      
+        zune:Management.Instance.CommitListSave();
+        zune:SyncSetupManager.Instance.Complete();
+        Page.DoneButton.Invoke();
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Back.Invoked)]      
+        Page.NextButton = null;
+        Page.BackButton = null;
+
+        Page.BackButton.Invoke();
+      </Script>
+
+      <Script>
+        if ([zune:SyncSetupManager.Instance.DevicePartnership] == zune:SyncPartnership.SyncWithOtherMachine)
+        {
+          AlwaysConnectAsGuest.Available = true;
+          
+          
+          Page.NextButton = CompleteSetup;
+          
+          
+          if (Page.BackButton.Available)
+          {
+            Page.BackButton = Back;
+          }
+        }
+        else
+        {
+          AlwaysConnectAsGuest.Available = false;
+          Page.NextButton = null;
+          Page.BackButton = null;
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel>
+        <Children>
+
+          <Panel>
+            <Layout>
+              <FlowLayout Orientation="Vertical" Spacing="4,0" StripAlignment="Near"/>
+            </Layout>
+            <Children>
+
+              <Text Content="{zune:Shell.LoadString(zune:StringId.IDS_EXISTING_PARTNERSHIP)}" Color="{styles:Styles.SettingsTextActive}" Font="{styles:Styles.SettingsTextSubHeader}" WordWrap="true"/>
+              
+              <Text Content="{zune:Shell.LoadString(zune:StringId.IDS_EXISTING_PARTNERSHIP_DESCRIPTION)}" Color="{styles:Styles.SettingsTextActive}" Font="{styles:Styles.SettingsText}" WordWrap="true" Padding="0,0,0,10"/>
+              
+              <core:RadioGroup Name="PartnershipGroup" Model="{zune:SyncSetupManager.Instance.PartnershipChoice}" Padding="0,0,0,5"/>
+              
+              <core:CheckBox Name="AlwaysConnectAsGuest" Model="{zune:SyncSetupManager.Instance.AlwaysConnectAsGuest}" Margins="15,0,0,15"/>
+              
+            </Children>
+          </Panel>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/DEVICESTATUS.UIX b/test/2.1/DEVICESTATUS.UIX
new file mode 100644
index 0000000..3db7dd3
--- /dev/null
+++ b/test/2.1/DEVICESTATUS.UIX
@@ -0,0 +1,688 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:page="res://ZuneShellResources!PageStack.uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:data="res://ZuneShellResources!LibraryData.schema.xml"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:dbapi="assembly://ZuneDBApi/"
+  xmlns:icons="res://ZuneShellResources!DeviceIcons.uix"
+  xmlns:sys="assembly://mscorlib/System"
+  xmlns:animations="res://ZuneShellResources!Animations.uix"
+  xmlns:notification="res://ZuneShellResources!NotificationArea.uix"
+  xmlns:gasgauge="res://ZuneShellResources!GasGauge.uix"
+  xmlns:panels="res://ZuneShellResources!LibraryPanels.uix"
+  xmlns:mctl="res://ZuneMarketplaceResources!Controls.uix"
+  xmlns:me="Me">
+
+  <UI Name="DeviceStatus" Base="page:PageBase">
+    <Locals>
+      <me:SyncStatusPage Name="InnerPage" ParentPage="{Page}"/>
+      <ScrollingData Name="ScrollData"/>
+    </Locals>
+
+     <Input>
+      <ScrollingHandler Name="ScrollHandler" ScrollingData="{ScrollData}"/>
+    </Input>
+
+    <Scripts>
+      <Script>
+        InnerPage.ParentPage = [Page];
+      </Script>
+      <Script>
+        if ([zune:SyncControls.Instance.CurrentDeviceConnected])
+        {
+          Body.RequestSource([InnerPage.ChildPage], "Page", InnerPage);
+          Body.MaximumSize = new Size(0,0);
+        }
+        else
+        {
+          Body.RequestSource(typeof(me:PleaseConnect));
+          Body.MaximumSize = new Size(0, 350);
+        }
+      </Script>
+      <Script> Content.ShowNear = [ScrollData.CanScrollUp]; </Script>
+      <Script> Content.ShowFar = [ScrollData.CanScrollDown]; </Script>
+    </Scripts>
+    <Content>
+      <Panel Layout="Anchor">
+        <Children>
+          <core:ScrollBar Name="ScrollBar" ScrollData="{ScrollData}">
+            <LayoutInput>
+              <AnchorLayoutInput Right="Parent,1"/>
+            </LayoutInput>
+          </core:ScrollBar>
+
+          <Panel>
+            <LayoutInput>
+              <AnchorLayoutInput Left="Parent,0" Top="Parent,0"/>
+            </LayoutInput>
+            <Layout>
+              <DockLayout SizeToChildren="true"/>
+            </Layout>
+            <Children>
+              <me:HeroDevice Margins="0,39,47,0" MaximumSize="335,0">
+                <LayoutInput>
+                  <DockLayoutInput Position="Left" Alignment="Near"/>
+                </LayoutInput>
+              </me:HeroDevice>
+
+              <Scroller Name="Content" FadeSize="5" Orientation="Vertical" ScrollingData="{ScrollData}" Margins="0,47,20,20">
+                <LayoutInput>
+                  <DockLayoutInput Position="Top" Alignment="Near"/>
+                </LayoutInput>
+                <Children>
+                  <Host Name="Body"/>
+                </Children>
+              </Scroller>
+            </Children>
+          </Panel>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  <UI Name="DeviceStatusInnerPageBase">
+    <Properties>
+      <me:SyncStatusPage Name="Page" SyncStatusPage="$Required"/>
+      <Boolean Name="HandleBack" Boolean="true"/>
+    </Properties>
+    <Scripts>
+      <Script>
+        Page.ParentPage.ShouldHandleBack = [HandleBack];
+      </Script>
+      <Script>
+        [DeclareTrigger(Page.ParentPage.BackHandled)]
+        Page.ChildPage = "res://ZuneShellResources!DeviceStatus.uix#MainSyncStatus";
+      </Script>
+    </Scripts>
+  </UI>
+
+  <UI Name="MainSyncStatus" Base="me:DeviceStatusInnerPageBase">
+    <Properties>
+      <Boolean Name="HandleBack" Boolean="false"/>
+    </Properties>
+    <Content>
+      <Panel>
+        <Layout>
+          <DockLayout SizeToChildren="true"/>
+        </Layout>
+        <Children>
+
+          <me:SyncBucket Name="SyncedBucket"
+                         Title="{zune:Shell.LoadString(zune:StringId.IDS_ITEMS_SYNCED_TITLE)}"
+                         Status="{zune:Shell.LoadString(zune:StringId.IDS_ITEMS_SYNCED_STATUS)}"
+                         BucketShowDelay="0.2"
+                         Page="{Page}" Complete="true">
+            <LayoutInput>
+              <DockLayoutInput Position="Top"/>
+            </LayoutInput>
+          </me:SyncBucket>
+
+          <me:SyncBucket Name="RemainingBucket"
+                         Title="{zune:Shell.LoadString(zune:StringId.IDS_ITEMS_REMAINING_TITLE)}"
+                         Status="{zune:Shell.LoadString(zune:StringId.IDS_ITEMS_REMAINING_STATUS)}"
+                         BucketShowDelay="0.3"
+                         Page="{Page}" Remaining="true">
+            <LayoutInput>
+              <DockLayoutInput Position="Top"/>
+            </LayoutInput>
+          </me:SyncBucket>
+
+          <me:SyncBucket Name="RemovedBucket"
+                         Title="{zune:Shell.LoadString(zune:StringId.IDS_ITEMS_REMOVED_TITLE)}"
+                         Status="{zune:Shell.LoadString(zune:StringId.IDS_ITEMS_REMOVED_STATUS)}"
+                         BucketShowDelay="0.4"
+                         Page="{Page}" Complete="true" Operation="{zune:SyncControls.ConvertSyncOperationToInt(dbapi:ESyncOperation.eSyncOperationDeleteFromDevice)}">
+            <LayoutInput>
+              <DockLayoutInput Position="Top"/>
+            </LayoutInput>
+          </me:SyncBucket>
+
+          <me:SyncBucket Name="FailedBucket"
+                         Title="{zune:Shell.LoadString(zune:StringId.IDS_ITEMS_FAILED_TITLE)}"
+                         Status="{zune:Shell.LoadString(zune:StringId.IDS_ITEMS_FAILED_STATUS)}"
+                         BucketShowDelay="0.5"
+                         Page="{Page}" Failed="true"
+                         Destination="res://ZuneShellResources!DeviceStatusStandardDrilldown.uix#ErrorDrilldownPage">
+            <LayoutInput>
+              <DockLayoutInput Position="Top"/>
+            </LayoutInput>
+          </me:SyncBucket>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  <UI Name="SyncBucket">
+    <Properties>
+      <String Name="Title" String="{null}"/>
+      <String Name="Status" String="{null}"/>
+
+      <Boolean Name="Remaining" Boolean="false"/>
+      <Boolean Name="Complete" Boolean="false"/>
+      <Boolean Name="Failed" Boolean="false"/>
+      <Int32 Name="Operation" Int32="{zune:SyncControls.ConvertSyncOperationToInt(dbapi:ESyncOperation.eSyncOperationSendToDevice)}"/>
+
+      <me:SyncStatusPage Name="Page" SyncStatusPage="$Required"/>
+
+      <Inset Name="Margins" Inset="20,20,20,0"/>
+
+      <String Name="Destination" String="res://ZuneShellResources!DeviceStatusStandardDrilldown.uix#StandardDrilldownPage"/>
+
+      
+      <Single Name="BucketShowDelay" Single="0.0"/>
+      <TransformAnimation Name="SlideXForm" Delay="{BucketShowDelay + me:AnimationHelper.FlipLength}" Source="{animations:Animations.DeviceLandUIElementSlide}"/>
+    </Properties>
+    <Locals>
+      <iris:Command Name="NavigateCommand"/>
+
+      <data:LibrarySyncItemQuery Name="SyncItemQuery"
+                                 DeviceId="{zune:SyncControls.Instance.CurrentDeviceID}"
+                                 InitTime="{zune:SyncControls.Instance.StartupTime}"
+                                 Remaining="{Remaining}"
+                                 Complete="{Complete}"
+                                 Failed="{Failed}"
+                                 Operation="{Operation}"
+                                 MediaType="{zune:SyncControls.ConvertSyncTypeToInt(zune:MediaType.Undefined)}"/>
+    </Locals>
+    <Scripts>
+      <Script>
+        TitleText.Content = [Title];
+      </Script>
+      <Script>
+        Int32 count = [SyncItemQuery.Result.Items.Count];
+
+        MainContainer.Visible = (count > 0);
+        NavigateCommand.Description = [Status].Format(count);
+      </Script>
+      <Script>
+        [DeclareTrigger(NavigateCommand.Invoked)]
+        Page.Title = Title;
+        Page.Remaining = Remaining;
+        Page.Complete = Complete;
+        Page.Failed = Failed;
+        Page.Operation = Operation;
+        Page.ChildPage = Destination;
+      </Script>
+    </Scripts>
+    <Content>
+      <Panel Name="MainContainer" Layout="Anchor">
+
+        <Animations>
+          <Animation Animation="{animations:Animations.MoveNow}"/>
+          <SwitchAnimation SwitchAnimation="{me:AnimationHelper.DeviceLandUIElementSwitch}"/>
+        </Animations>
+
+        <Children>
+          <core:Label Name="TitleText" Style="{styles:SharedStyles.SyncTitle}" ShowToolTipWhenClipped="false">
+            <LayoutInput>
+              <AnchorLayoutInput Top="Parent,0" Left="Parent,0"/>
+            </LayoutInput>
+          </core:Label>
+
+          <mctl:MoreLink Name="StatusText" OverrideStyle="{styles:SharedStyles.SyncLink}"
+                         Model="{NavigateCommand}" IconMargin="6,4,0,0"
+                         Margins="0,2,0,33" KeyInteractiveNStuff="false">
+            <LayoutInput>
+              <AnchorLayoutInput Top="TitleText,1,-10" Left="Parent,0"/>
+            </LayoutInput>
+          </mctl:MoreLink>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  <Class Name="SyncStatusPage">
+    <Properties>
+      <String Name="ChildPage" String="res://ZuneShellResources!DeviceStatus.uix#MainSyncStatus"/>
+
+      <zune:ZunePage Name="ParentPage" ZunePage="$Required"/>
+
+      <Boolean Name="Remaining"/>
+      <Boolean Name="Complete"/>
+      <Boolean Name="Failed"/>
+      <Int32 Name="Operation"/>
+      <String Name="Title"/>
+    </Properties>
+  </Class>
+
+  <Class Name="QueryGroup">
+    <Properties>
+      
+      <Boolean Name="Remaining" Boolean="$Required"/>
+      <Boolean Name="Complete" Boolean="$Required"/>
+      <Boolean Name="Failed" Boolean="$Required"/>
+      <Int32 Name="Operation" Int32="$Required"/>
+
+      
+      <data:LibrarySyncItemQuery Name="MusicQuery"
+                                 DeviceId="{zune:SyncControls.Instance.CurrentDeviceID}"
+                                 InitTime="{zune:SyncControls.Instance.StartupTime}"
+                                 Remaining="{Remaining}"
+                                 Complete="{Complete}"
+                                 Failed="{Failed}"
+                                 Operation="{Operation}"
+                                 MediaType="{zune:SyncControls.ConvertSyncTypeToInt(zune:MediaType.Track)}"/>
+      <data:LibrarySyncItemQuery Name="VideoQuery"
+                                 DeviceId="{zune:SyncControls.Instance.CurrentDeviceID}"
+                                 InitTime="{zune:SyncControls.Instance.StartupTime}"
+                                 Remaining="{Remaining}"
+                                 Complete="{Complete}"
+                                 Failed="{Failed}"
+                                 Operation="{Operation}"
+                                 MediaType="{zune:SyncControls.ConvertSyncTypeToInt(zune:MediaType.Video)}"/>
+      <data:LibrarySyncItemQuery Name="PhotoQuery"
+                                 DeviceId="{zune:SyncControls.Instance.CurrentDeviceID}"
+                                 InitTime="{zune:SyncControls.Instance.StartupTime}"
+                                 Remaining="{Remaining}"
+                                 Complete="{Complete}"
+                                 Failed="{Failed}"
+                                 Operation="{Operation}"
+                                 MediaType="{zune:SyncControls.ConvertSyncTypeToInt(zune:MediaType.Photo)}"/>
+      <data:LibrarySyncItemQuery Name="PodcastQuery"
+                                 DeviceId="{zune:SyncControls.Instance.CurrentDeviceID}"
+                                 InitTime="{zune:SyncControls.Instance.StartupTime}"
+                                 Remaining="{Remaining}"
+                                 Complete="{Complete}"
+                                 Failed="{Failed}"
+                                 Operation="{Operation}"
+                                 MediaType="{zune:SyncControls.ConvertSyncTypeToInt(zune:MediaType.PodcastEpisode)}"/>
+      <Int32 Name="Count" Int32="0"/>
+    </Properties>
+    <Scripts>
+      <Script>
+        MusicQuery.Complete = [Complete];
+        VideoQuery.Complete = Complete;
+        PhotoQuery.Complete = Complete;
+        PodcastQuery.Complete = Complete;
+      </Script>
+      <Script>
+        MusicQuery.Remaining = [Remaining];
+        VideoQuery.Remaining = Remaining;
+        PhotoQuery.Remaining = Remaining;
+        PodcastQuery.Remaining = Remaining;
+      </Script>
+      <Script>
+        MusicQuery.Failed = [Failed];
+        VideoQuery.Failed = Failed;
+        PhotoQuery.Failed = Failed;
+        PodcastQuery.Failed = Failed;
+      </Script>
+      <Script>
+        MusicQuery.Operation = [Operation];
+        VideoQuery.Operation = Operation;
+        PhotoQuery.Operation = Operation;
+        PodcastQuery.Operation = Operation;
+      </Script>
+      <Script>
+        [DeclareTrigger(zune:SyncControls.Instance.CurrentDeviceID)]
+
+        MusicQuery.DeviceId = zune:SyncControls.Instance.CurrentDeviceID;
+        VideoQuery.DeviceId = zune:SyncControls.Instance.CurrentDeviceID;
+        PhotoQuery.DeviceId = zune:SyncControls.Instance.CurrentDeviceID;
+        PodcastQuery.DeviceId = zune:SyncControls.Instance.CurrentDeviceID;
+      </Script>
+
+      <Script>
+        Count = [MusicQuery.Result.Items.Count] +
+        [VideoQuery.Result.Items.Count] +
+        [PhotoQuery.Result.Items.Count] +
+        [PodcastQuery.Result.Items.Count];
+      </Script>
+    </Scripts>
+  </Class>
+
+  <UI Name="HeroDevice">
+    <Locals>
+      <icons:DeviceIcons Name="DeviceIcons" DeviceIcons="{icons:DeviceIconWrapper.DeviceIcons}"/>
+      <zune:DeviceChoice Name="Devices"/>
+
+      <iris:Command Name="PreviousDeviceCommand" Description="{zune:Shell.LoadString(zune:StringId.IDS_CHANGE_TO_PREVIOUS_DEVICE)}"/>
+      <iris:Command Name="NextDeviceCommand" Description="{zune:Shell.LoadString(zune:StringId.IDS_CHANGE_TO_NEXT_DEVICE)}"/>
+
+      <Single Name="ShineLength" Single="0.3"/>
+      
+      <Single Name="Overlap"     Single="0.05"/>
+
+      
+      
+      <Animation Name="DeviceSlide" CenterPointPercent="0.5,0.5,1.0">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0"     Value="0.0"/>
+          <AlphaKeyframe Time="0.1"     Value="1.0"/>
+          <ScaleKeyframe Time="0.0"     Value="0.95,0.95,1.0"/>
+          <ScaleKeyframe Time="{me:AnimationHelper.SlideLength}" RelativeTo="Final"/>
+          <PositionKeyframe Time="0.0"  Value="-10,0,0" Interpolation="EaseIn,1.5,0.8"/>
+          <PositionKeyframe Time="{me:AnimationHelper.SlideLength}" RelativeTo="Final"/>
+        </Keyframes>
+      </Animation>
+
+       <Animation Name="ShineSlide" CenterPointPercent="0.5,0.5,1.0">
+        <Keyframes>
+          <AlphaKeyframe    Time="0.0"            Value="0.7"/>
+          <AlphaKeyframe    Time="{ShineLength * 0.5}" Value="0.6"/>
+          <AlphaKeyframe    Time="{ShineLength}"  Value="0.0"/>
+          <PositionKeyframe Time="0.0"            Value="-200,-150,0"/>
+          <PositionKeyframe Time="{ShineLength}"  Value="50,25,0"/>
+          <ScaleKeyframe    Time="0.0"            Value="0.8,0.8,1.0"/>
+          <ScaleKeyframe    Time="{ShineLength}"  Value="1,1,1" RelativeTo="Final"/>
+        </Keyframes>
+      </Animation>
+    </Locals>
+
+    <Scripts>
+      <Script>
+          ProgressNotification.Model = [zune:SyncControls.Instance.Notification];
+      </Script>
+      <Script>
+        <![CDATA[
+        if ([zune:SyncControls.Instance.CurrentDeviceConnected])
+        {
+          DeviceName.Content = sys:String.Format(zune:Shell.LoadString(zune:StringId.IDS_DEVICE_NAME_STRING),
+          [zune:SyncControls.Instance.CurrentDeviceName],
+          [zune:SyncControls.Instance.CurrentDeviceCapacity]);
+        }
+        else
+        {
+          DeviceName.Content = sys:String.Format("<b>{0}</b>", zune:SyncControls.Instance.CurrentDeviceName);
+        }
+        ]]>
+      </Script>
+      <Script>
+        
+        if ([zune:SyncControls.Instance.CurrentDeviceConnected])
+        {
+          
+        }
+        else
+        {
+          
+        }
+      </Script>
+      <Script>
+        Image.Content = [DeviceIcons.Current.LargeImage];
+      </Script>
+
+      <Script>
+        <![CDATA[
+        StartButton.Visible = ![zune:SyncControls.Instance.CurrentDeviceSyncing] && [zune:SyncControls.Instance.CurrentDeviceConnected];
+        StopButton.Visible = zune:SyncControls.Instance.CurrentDeviceSyncing && zune:SyncControls.Instance.CurrentDeviceConnected;
+        ]]>
+      </Script>
+
+      <Script>
+        Boolean deviceChooserVisible = [((iris:ArrayListDataSet)Devices.Options).Count] > 1;
+
+        PreviousDeviceButton.Visible = deviceChooserVisible;
+        NextDeviceButton.Visible = deviceChooserVisible;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(PreviousDeviceCommand.Invoked)]
+        Devices.PreviousValue(true);
+      </Script>
+      <Script>
+        [DeclareTrigger(NextDeviceCommand.Invoked)]
+        Devices.NextValue(true);
+      </Script>
+
+      <Script>
+        SmallDeviceImage.Visible = me:AnimationHelper.PlayFlipAnimation;
+      </Script>
+
+    </Scripts>
+    <Content>
+      <Panel Layout="Anchor">
+        <Children>
+
+          <Panel Name="DeviceImagePanel" Layout="Anchor" Margins="0,0,0,120">
+            <LayoutInput>
+              <AnchorLayoutInput Top="Parent,0" Left="Parent,0" Horizontal="Fill"/>
+            </LayoutInput>
+            <Children>
+
+              <Graphic Name="Image" Content="{DeviceIcons.Current.LargeImage}"
+                       StretchingPolicy="Uniform"
+                       HorizontalAlignment="Center"
+                       MaximumSize="350,300"
+                       Layout="Form"
+                       Margins="0,0,25,0">
+                <LayoutInput>
+                  <AnchorLayoutInput Top="Parent,0" Horizontal="Fill"/>
+                </LayoutInput>
+
+                <Animations>
+                  <Animation Animation="{animations:Animations.MoveNow}"/>
+                  <SwitchAnimation Type="Show" Expression="{me:AnimationHelper.ShowAnim}">
+                    <Options>
+                      <TransformAnimation Name="Flip" Delay="{me:AnimationHelper.FlipLength - Overlap}" Source="{DeviceSlide}"/>
+                      <Animation Name="Slide" Animation="{DeviceSlide}"/>
+                    </Options>
+                  </SwitchAnimation>
+                  
+                  <Animation Animation="{animations:Animations.QuickContentChangeShow}"/>
+                  <Animation Animation="{animations:Animations.QuickContentChangeHide}"/>
+                </Animations>
+
+                 <Children>
+                  
+                  <Graphic Name="Shine" Content="{styles:Styles.CDShine}" SizingPolicy="SizeToConstraint" Scale="0.5,0.5,0">
+                    <LayoutInput>
+                      <FormLayoutInput ContributesToHeight="false" Left="Parent,0" Top="Parent,0"/>
+                    </LayoutInput>
+
+                    <Animations>
+                      <Animation Animation="{animations:Animations.MoveNow}"/>
+                      <SwitchAnimation Type="Show" Expression="{me:AnimationHelper.ShowAnim}">
+                        <Options>
+                          <TransformAnimation Name="Flip" Delay="{me:AnimationHelper.FlipLength}" Source="{ShineSlide}"/>
+                          <Animation Name="Slide" Animation="{ShineSlide}"/>
+                        </Options>
+                      </SwitchAnimation>
+                    </Animations>
+                  </Graphic>
+                </Children>
+              </Graphic>
+
+              
+              
+              
+              
+              <Panel>
+                <LayoutInput>
+                  <AnchorLayoutInput Left="Parent,0" Top="Parent,0"/>
+                </LayoutInput>
+                <Animations>
+                  <Animation Animation="{animations:Animations.MoveNow}"/>
+                  <SwitchAnimation Type="Show" Expression="{me:AnimationHelper.ShowAnim}">
+                    <Options>
+                      <Animation Name="Flip">
+                        <Keyframes>
+                          <PositionKeyframe Time="0.0" Value="-80,0,0" Interpolation="EaseOut,1.1,0.7"/>
+                          <PositionKeyframe Time="{me:AnimationHelper.FlipLength}" Value="38,0,0"/>
+                          
+                          <AlphaKeyframe    Time="0.0"                                       Value="0.0"/>
+                          <AlphaKeyframe    Time="0.1"                                       Value="1.0"/>
+                          <AlphaKeyframe    Time="{me:AnimationHelper.FlipLength}"           Value="1.0"/>
+                          <AlphaKeyframe    Time="{me:AnimationHelper.FlipLength + Overlap}" Value="0.0"/>
+                        </Keyframes>
+                      </Animation>
+                    </Options>
+                  </SwitchAnimation>
+                </Animations>
+
+                <Children>
+                  
+                  <Graphic Name="SmallDeviceImage" Content="{DeviceIcons.Current.LargeImage}" StretchingPolicy="Uniform" MaximumSize="0,300" >
+                    <Animations>
+                      <Animation Animation="{animations:Animations.MoveNow}"/>
+                      <SwitchAnimation Type="Show" Expression="{me:AnimationHelper.ShowAnim}">
+                        <Options>
+                          <Animation Name="Flip" CenterPointPercent="0.5,0.5,1.0">
+                            <Keyframes>
+                              <PositionKeyframe Time="0.0"                                   Value="0,200,0" Interpolation="EaseIn,2.0,0.7"/>
+                              <PositionKeyframe Time="{me:AnimationHelper.FlipLength}"       Value="0,0,0"/>
+                              <ScaleKeyframe    Time="0.00"                                  Value="0.1,0.1,1" Interpolation="EaseIn,2.0,0.99"/>
+                              <ScaleKeyframe    Time="{me:AnimationHelper.FlipLength * 0.8}" Value="0.75,0.75,1" Interpolation="EaseIn,2.0,0.99"/>
+                              <ScaleKeyframe    Time="{me:AnimationHelper.FlipLength}"       Value="0.95,0.95,1"/>
+                            </Keyframes>
+                          </Animation>
+                        </Options>
+                      </SwitchAnimation>
+                    </Animations>
+                  </Graphic>
+                </Children>
+              </Panel>
+
+              <Panel Layout="Dock">
+                <LayoutInput>
+                  <AnchorLayoutInput Left="Image,0,55" Right="Image,1,-50" Top="Image,0.75" Bottom="Image,1"/>
+                </LayoutInput>
+
+                <Animations>
+                  <Animation Animation="{animations:Animations.MoveNow}"/>
+                  <SwitchAnimation Type="Show" Expression="{me:AnimationHelper.ShowAnim}">
+                    <Options>
+                      <TransformAnimation Name="Flip" Delay="{me:AnimationHelper.FlipLength}" Source="{animations:Animations.BasicFadeIn}"/>
+                      <Animation Name="Slide" Animation="{animations:Animations.BasicFadeIn}"/>
+                    </Options>
+                  </SwitchAnimation>
+                </Animations>
+
+                <Children>
+                  <core:IconButton Name="PreviousDeviceButton"
+                                   Model="{PreviousDeviceCommand}"
+                                   Image="res://ZuneShellResources!PreviousDevice.png"
+                                   HoverImage="res://ZuneShellResources!PreviousDevice.Hover.png"
+                                   PressedImage="res://ZuneShellResources!PreviousDevice.Pressed.png">
+                    <LayoutInput>
+                      <DockLayoutInput Position="Left"/>
+                    </LayoutInput>
+                  </core:IconButton>
+
+                  <core:IconButton Name="NextDeviceButton"
+                                   Model="{NextDeviceCommand}"
+                                   Image="res://ZuneShellResources!NextDevice.png"
+                                   HoverImage="res://ZuneShellResources!NextDevice.Hover.png"
+                                   PressedImage="res://ZuneShellResources!NextDevice.Pressed.png">
+                    <LayoutInput>
+                      <DockLayoutInput Position="Right" />
+                    </LayoutInput>
+                  </core:IconButton>
+                </Children>
+              </Panel>
+            </Children>
+          </Panel>
+
+          
+          <Panel>
+            <LayoutInput>
+              <AnchorLayoutInput Top="DeviceImagePanel,1,-120" Left="Parent,0" Horizontal="Fill"/>
+            </LayoutInput>
+
+            <Layout>
+              <DockLayout DefaultLayoutInput="Top,Center" SizeToChildren="true"/>
+            </Layout>
+
+            <Animations>
+              <Animation Animation="{animations:Animations.MoveNow}"/>
+              <SwitchAnimation SwitchAnimation="{me:AnimationHelper.DeviceLandUIElementSwitch}"/>
+            </Animations>
+
+            <Children>
+              <core:Label Name="DeviceName" Margins="0,2,0,0" ShowToolTipWhenClipped="false">
+                <NamedStyles>
+                  <TextStyle Name="b" TextStyle="{styles:SharedStyles.DeviceNameStyle}"/>
+                  <TextStyle Name="l" TextStyle="{styles:SharedStyles.DeviceSizeStyle}"/>
+                </NamedStyles>
+              </core:Label>
+
+              <notification:StandaloneProgressArea Name="ProgressNotification" Model="{null}" MinimumSize="295,0" />
+
+              <core:BigActionButton Name="StartButton" Model="{zune:SyncControls.Instance.StartSyncCommand}"/>
+              <core:BigActionButton Name="StopButton" Model="{zune:SyncControls.Instance.StopSyncCommand}"/>
+            </Children>
+          </Panel>
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  <UI Name="DeviceBackground" Base="page:PageBase">
+    <Locals>
+      <icons:DeviceIcons Name="DeviceIcons" DeviceIcons="{icons:DeviceIconWrapper.DeviceIcons}"/>
+    </Locals>
+    <Scripts>
+      <Script>
+        BackgroundOverlayGraphic.Content = [DeviceIcons.Current.Background];
+      </Script>
+    </Scripts>
+    <Content>
+      <Panel Margins="1,1,1,7" Layout="Dock">
+        <Children>
+          
+          <Graphic Name="BackgroundOverlayGraphic" SizingPolicy="SizeToContent">
+            <LayoutInput>
+              <DockLayoutInput Position="Bottom" Alignment="Fill"/>
+            </LayoutInput>
+            <Animations>
+              <Animation Animation="{animations:Animations.BasicContentChangeShow}"/>
+              <Animation Animation="{animations:Animations.BasicContentChangeHide}"/>
+            </Animations>
+          </Graphic>
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  <UI Name="GasGauge" Base="page:PageBase">
+    <Scripts>
+      <Script>
+        GasGauge.Visible = [zune:SyncControls.Instance.CurrentDeviceConnected];
+      </Script>
+    </Scripts>
+    <Content>
+
+      <gasgauge:GasGauge Name="GasGauge"/>
+
+    </Content>
+  </UI>
+
+  
+  <UI Name="PleaseConnect">
+    <Content>
+      <Panel Layout="Center">
+        <Children>
+
+          <core:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_PLEASE_CONNECT_TO_SEE_STATUS)}"
+                      Style="{styles:SharedStyles.PleaseConnectStyle}" WordWrap="true">
+            <Animations>
+              <Animation Animation="{animations:Animations.DeviceLandUIElementSlide}"/>
+            </Animations>
+          </core:Label>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  <UI Name="PleaseConnectPanel" Base="panels:LibraryPanelBase">
+    <Properties>
+      <Single Name="MinimumPercent" Single="0.50"/>
+    </Properties>
+    <Content>
+
+      <me:PleaseConnect/>
+
+    </Content>
+  </UI>
+
+  <Class Name="AnimationHelper" Base="animations:FlipAnimationHelper"/>
+
+</UIX>
diff --git a/test/2.1/DEVICESTATUSSTANDARDDRILLDOWN.UIX b/test/2.1/DEVICESTATUSSTANDARDDRILLDOWN.UIX
new file mode 100644
index 0000000..8d9358b
--- /dev/null
+++ b/test/2.1/DEVICESTATUSSTANDARDDRILLDOWN.UIX
@@ -0,0 +1,334 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:data="res://ZuneShellResources!LibraryData.schema.xml"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:status="res://ZuneShellResources!DeviceStatus.uix"
+  xmlns:spreadsheet="res://ZuneShellResources!SpreadSheetViewBase.uix"
+  xmlns:me="Me">
+
+  <UI Name="StandardDrilldownPage" Base="status:DeviceStatusInnerPageBase">
+    <Properties>
+      <Type Name="MusicType" Type="{typeof(me:MusicItem)}"/>
+      <Type Name="VideoType" Type="{typeof(me:VideoItem)}"/>
+      <Type Name="PhotoType" Type="{typeof(me:PhotoItem)}"/>
+      <Type Name="PodcastType" Type="{typeof(me:PodcastItem)}"/>
+    </Properties>
+    <Locals>
+      <status:QueryGroup Name="Group"
+                         Remaining="{Page.Remaining}"
+                         Complete="{Page.Complete}"
+                         Failed="{Page.Failed}"
+                         Operation="{Page.Operation}"/>
+    </Locals>
+    <Scripts>
+      <Script>Title.Content = Page.Title;</Script>
+    </Scripts>
+    <Content>
+      <Panel Layout="Anchor">
+        <Children>
+
+          <core:Label Name="Title" Style="{styles:SharedStyles.SyncTitle}" Margins="0,-60,0,25">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Parent,0" Top="Parent,0"/>
+            </LayoutInput>
+          </core:Label>
+
+          <Panel Name="List" Layout="Anchor">
+
+            <LayoutInput>
+              <AnchorLayoutInput Left="Parent,0" Top="Title,1"/>
+            </LayoutInput>
+
+            <Animations>
+              
+              <Animation Type="Move">
+                <Keyframes>
+                  <PositionKeyframe Time="0.00" RelativeTo="Current" Interpolation="Sine"/>
+                  <PositionKeyframe Time="0.025" RelativeTo="Final"/>
+                </Keyframes>
+              </Animation>
+            </Animations>
+
+            <Children>
+
+              <me:SchemaList Name="List1"
+                             Query="{Group.MusicQuery}"
+                             HeaderBaseText="{zune:Shell.LoadString(zune:StringId.IDS_DEVICE_STATUS_HEADER_MUSIC)}"
+                             ItemType="{MusicType}"
+                             ShowErrors="{Page.Failed}">
+                <LayoutInput>
+                  <AnchorLayoutInput Top="Parent,0" Left="Parent,0" Horizontal="Fill"/>
+                </LayoutInput>
+              </me:SchemaList>
+
+              <me:SchemaList Name="List2"
+                             Query="{Group.VideoQuery}"
+                             HeaderBaseText="{zune:Shell.LoadString(zune:StringId.IDS_DEVICE_STATUS_HEADER_VIDEO)}"
+                             ItemType="{VideoType}"
+                             ShowErrors="{Page.Failed}">
+                <LayoutInput>
+                  <AnchorLayoutInput Top="List1,1" Left="Parent,0" Horizontal="Fill"/>
+                </LayoutInput>
+              </me:SchemaList>
+
+              <me:SchemaList Name="List3"
+                             Query="{Group.PhotoQuery}"
+                             HeaderBaseText="{zune:Shell.LoadString(zune:StringId.IDS_DEVICE_STATUS_HEADER_PHOTO)}"
+                             ItemType="{PhotoType}"
+                             ShowErrors="{Page.Failed}">
+                <LayoutInput>
+                  <AnchorLayoutInput Top="List2,1" Left="Parent,0" Horizontal="Fill"/>
+                </LayoutInput>
+              </me:SchemaList>
+
+              <me:SchemaList Query="{Group.PodcastQuery}"
+                             HeaderBaseText="{zune:Shell.LoadString(zune:StringId.IDS_DEVICE_STATUS_HEADER_PODCAST)}"
+                             ItemType="{PodcastType}"
+                             ShowErrors="{Page.Failed}">
+                <LayoutInput>
+                  <AnchorLayoutInput Top="List3,1" Left="Parent,0" Horizontal="Fill"/>
+                </LayoutInput>
+              </me:SchemaList>
+
+
+            </Children>
+          </Panel>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  <UI Name="ErrorDrilldownPage" Base="me:StandardDrilldownPage">
+    <Properties>
+      <Type Name="MusicType" Type="{typeof(me:MusicError)}"/>
+      <Type Name="VideoType" Type="{typeof(me:VideoError)}"/>
+      <Type Name="PhotoType" Type="{typeof(me:PhotoError)}"/>
+      <Type Name="PodcastType" Type="{typeof(me:PodcastError)}"/>
+    </Properties>
+  </UI>
+
+  <UI Name="SchemaList">
+    <Properties>
+      <data:LibrarySyncItemQuery Name="Query" LibrarySyncItemQuery="$Required"/>
+      <String Name="HeaderBaseText" String="$Required"/>
+      <Type Name="ItemType" Type="$Required"/>
+      <Boolean Name="ShowErrors" Boolean="$Required"/>
+    </Properties>
+    <Scripts>
+      <Script>
+        List.Source = [Query.Result.Items];
+      </Script>
+      <Script>
+        Int32 count = [Query.Result.Items.Count];
+        bool display = (count > 0);
+
+        Container.Visible = display;
+        Header.Content = HeaderBaseText.Format(count);
+      </Script>
+    </Scripts>
+    <Content>
+
+      <Panel Name="Container" Layout="Anchor" Margins="0,0,0,17">
+        <Children>
+
+          <core:Label Name="Header" Style="{styles:SharedStyles.SyncHeader}" Margins="0,3,0,14">
+            <LayoutInput>
+              <AnchorLayoutInput Top="Parent,0" Left="Parent,0"/>
+            </LayoutInput>
+          </core:Label>
+
+          <Repeater Name="List" Source="{Query.Result.Items}" DiscardOffscreenVisuals="true">
+            <LayoutInput>
+              <AnchorLayoutInput Top="Header,1" Left="Parent,0"/>
+            </LayoutInput>
+            <Layout>
+              <GridLayout Columns="1" Orientation="Vertical"/>
+            </Layout>
+            <Content>
+              <me:SchemaListItem SchemaListItem="{ItemType}" Model="{(data:SyncItem)RepeatedItem}" IncludeError="{ShowErrors}" Margins="0,1,0,2"/>
+            </Content>
+          </Repeater>
+
+        </Children>
+      </Panel>
+
+    </Content>
+  </UI>
+
+  <UI Name="SchemaListItem">
+    <Properties>
+      <data:SyncItem Name="Model"/>
+      <Boolean Name="IncludeError"/>
+      <String Name="Content"/>
+    </Properties>
+  </UI>
+
+  <UI Name="LabelSchemaListItem" Base="me:SchemaListItem">
+    <Content>
+
+      <core:Label Name="Text" Style="{styles:SharedStyles.SyncItem}"/>
+
+    </Content>
+  </UI>
+
+  <UI Name="MusicItem" Base="me:LabelSchemaListItem">
+    <Locals>
+      <String Name="BaseText" String="{zune:Shell.LoadString(zune:StringId.IDS_MUSIC_SYNCITEM_DETAILS)}"/>
+    </Locals>
+    <Scripts>
+      <Script>
+        Text.Content = BaseText.Format([Model.Title], [Model.ArtistName], [Model.AlbumName]);
+      </Script>
+    </Scripts>
+  </UI>
+
+  <UI Name="VideoItem" Base="me:LabelSchemaListItem">
+    <Locals>
+      <String Name="BaseText" String="{zune:Shell.LoadString(zune:StringId.IDS_VIDEO_SYNCITEM_DETAILS)}"/>
+    </Locals>
+    <Scripts>
+      <Script>
+        Text.Content = BaseText.Format([Model.Title], [Model.Series], [Model.DateAdded]);
+      </Script>
+    </Scripts>
+  </UI>
+
+  <UI Name="PhotoItem" Base="me:LabelSchemaListItem">
+    <Locals>
+      <String Name="BaseText" String="{zune:Shell.LoadString(zune:StringId.IDS_PHOTO_SYNCITEM_DETAILS)}"/>
+    </Locals>
+    <Scripts>
+      <Script>
+        Text.Content = BaseText.Format([Model.Title], [Model.DateTaken]);
+      </Script>
+    </Scripts>
+  </UI>
+
+  <UI Name="PodcastItem" Base="me:LabelSchemaListItem">
+    <Locals>
+      <String Name="BaseText" String="{zune:Shell.LoadString(zune:StringId.IDS_PODCAST_SYNCITEM_DETAILS)}"/>
+    </Locals>
+    <Scripts>
+      <Script>
+        Text.Content = BaseText.Format([Model.Series], [Model.Title]);
+      </Script>
+    </Scripts>
+  </UI>
+
+  <UI Name="LinkSchemaListItem" Base="me:SchemaListItem">
+    <Properties>
+      <zune:StringId Name="ErrorTitleId" StringId="{zune:StringId.IDS_CANNOT_SYNC}"/>
+      <String Name="ErrorTooltip" String="{zune:Shell.LoadString(zune:StringId.IDS_CANNOT_SYNC_TOOLTIP)}"/>
+      
+      <String Name="Content"/>
+      <String Name="ToolTip"/>
+    </Properties>
+    
+    <Locals>
+      <String Name="ErrorTitle" String="{zune:Shell.LoadString(ErrorTitleId)}"/>      
+      <iris:Command Name="ShowErrorDialog"/>
+      <String Name="Error"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        zune:MappedError result = new zune:MappedError([Model.Error]);
+        Error = result.Text;
+        ErrorCell.ErrorCode = Model.Error;
+      </Script>
+      
+      <Script>
+        Link.Provider.PrimaryLabel = [Content];
+      </Script>
+      
+      <Script>
+        Link.Provider.ToolTip = [ToolTip];
+      </Script>
+      
+      <Script>
+        [DeclareTrigger(ShowErrorDialog.Invoked)]
+        zune:Shell.ShowErrorDialog(Model.Error, ErrorTitle);
+      </Script>
+    </Scripts>
+    <Content>
+      <Panel Layout="HorizontalFlow"> 
+        <Children>
+          
+          <spreadsheet:MediaStatusCell Name="ErrorCell"
+                    ErrorTitle="{ErrorTitleId}" 
+                    ErrorTooltip="{zune:StringId.IDS_CANNOT_SYNC_TOOLTIP}"
+                    Model="{ShowErrorDialog}"
+                    Style="{null}" Margins="0,1,0,0"/>
+          
+          <core:Button Name="Link" Model="{ShowErrorDialog}"
+                    KeyInteractiveNStuff="false"
+                    OverrideStyle="{styles:SharedStyles.SyncItem}"
+                    AlwaysShowToolTip="true"
+                    ToolTipPlacement="MouseBottom">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Parent,0" Top="Parent,0"/>
+            </LayoutInput>
+          </core:Button>
+          
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  <UI Name="MusicError" Base="me:LinkSchemaListItem">
+    <Locals>
+      <String Name="BaseText" String="{zune:Shell.LoadString(zune:StringId.IDS_MUSIC_SYNCITEM_DETAILS)}"/>
+      <String Name="ToolTipBaseText" String="{zune:Shell.LoadString(zune:StringId.IDS_MUSIC_ERROR_SYNCITEM_DETAILS)}"/>
+    </Locals>
+    <Scripts>
+      <Script>
+        Content = BaseText.Format([Model.Title], [Model.ArtistName], [Model.AlbumName]);
+        ToolTip = ToolTipBaseText.Format(Model.Title, Model.ArtistName, Model.AlbumName, [Error]);
+      </Script>
+    </Scripts>
+  </UI>
+
+  <UI Name="VideoError" Base="me:LinkSchemaListItem">
+    <Locals>
+      <String Name="BaseText" String="{zune:Shell.LoadString(zune:StringId.IDS_VIDEO_SYNCITEM_DETAILS)}"/>
+      <String Name="ToolTipBaseText" String="{zune:Shell.LoadString(zune:StringId.IDS_VIDEO_ERROR_SYNCITEM_DETAILS)}"/>
+    </Locals>
+    <Scripts>
+      <Script>
+        Content = BaseText.Format([Model.Title], [Model.Series], [Model.DateAdded]);
+        ToolTip = ToolTipBaseText.Format(Model.Title, Model.Series, Model.DateAdded, [Error]);
+      </Script>
+    </Scripts>
+  </UI>
+
+  <UI Name="PhotoError" Base="me:LinkSchemaListItem">
+    <Locals>
+      <String Name="BaseText" String="{zune:Shell.LoadString(zune:StringId.IDS_PHOTO_SYNCITEM_DETAILS)}"/>
+      <String Name="ToolTipBaseText" String="{zune:Shell.LoadString(zune:StringId.IDS_PHOTO_ERROR_SYNCITEM_DETAILS)}"/>
+    </Locals>
+    <Scripts>
+      <Script>
+        Content = BaseText.Format([Model.Title], [Model.DateTaken]);
+        ToolTip = ToolTipBaseText.Format(Model.Title, Model.DateTaken, [Error]);
+      </Script>
+    </Scripts>
+  </UI>
+
+  <UI Name="PodcastError" Base="me:LinkSchemaListItem">
+    <Locals>
+      <String Name="BaseText" String="{zune:Shell.LoadString(zune:StringId.IDS_PODCAST_SYNCITEM_DETAILS)}"/>
+      <String Name="ToolTipBaseText" String="{zune:Shell.LoadString(zune:StringId.IDS_PODCAST_ERROR_SYNCITEM_DETAILS)}"/>
+    </Locals>
+    <Scripts>
+      <Script>
+        Content = BaseText.Format([Model.Series], [Model.Title]);
+        ToolTip = ToolTipBaseText.Format(Model.Series, Model.Title, [Error]);
+      </Script>
+    </Scripts>
+  </UI>
+</UIX>
\ No newline at end of file
diff --git a/test/2.1/DEVICESYNCSETUP.UIX b/test/2.1/DEVICESYNCSETUP.UIX
new file mode 100644
index 0000000..ced6b30
--- /dev/null
+++ b/test/2.1/DEVICESYNCSETUP.UIX
@@ -0,0 +1,1873 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:sys="assembly://mscorlib/System"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:style="res://ZuneShellResources!Style.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:signindialog="res://ZuneShellResources!SignInDialog.uix"
+  xmlns:dialog="res://ZuneShellResources!Dialog.uix"
+  xmlns:mgmt="res://ZuneShellResources!Management.uix"
+  xmlns:spreadsheet="res://ZuneShellResources!SpreadSheetViewBase.uix"
+  xmlns:me="Me">
+
+  <UI Name="Default"/>
+
+  <UI Name="NameDevice">
+    <Properties>
+      <zune:CategoryPage Name="Page" CategoryPage="$Required" />
+    </Properties>
+    <Locals>
+      <iris:Command Name="AnotherButton" Description="{zune:Shell.LoadString(zune:StringId.IDS_CHANGE_TAG_BUTTON)}"/>
+      <iris:Command Name="RemoveAssociationModel" Description="{zune:Shell.LoadString(zune:StringId.IDS_ASSOCIATE_REMOVE)}"/>
+      <Boolean Name="ShowPartneredItems" Boolean="{(zune:SyncSetupManager.Instance.DevicePartnership == zune:SyncPartnership.SyncWithThisMachine)}"/>
+      <EditableTextData Name="FriendlyNameEditBox" MaxLength="32"/>
+      <zune:SyncSetupManager Name="Model" SyncSetupManager="{zune:SyncSetupManager.Instance}"/>
+      
+      <signindialog:SignInDialog Name="SignInDlg" SignInDialog="{null}"/>      
+    </Locals>
+
+    <Scripts>
+      <Script>
+        [DeclareTrigger(AnotherButton.Invoked)]
+        
+        
+        zune:SignIn.Instance.SignOut();
+        zune:SignIn.Instance.CancelSignIn();
+        if (SignInDlg == null) SignInDlg = new signindialog:SignInDialog();
+        SignInDlg.Helper.Show(SignInDlg);
+      </Script>
+
+      <Script>
+        
+        
+        if ((zune:SignIn.Instance.ZuneTag == null) &amp;&amp; (zune:SignIn.Instance.SigningIn == false))
+        {
+          Model.AssociationChoice.ChosenIndex = 1;
+        }
+      </Script>
+
+      <Script>
+        if (([zune:SignIn.Instance.ZuneTag] == null) &amp;&amp; ([zune:SignIn.Instance.SigningIn == false]))
+        {
+          AnotherButton.Description = zune:Shell.LoadString(zune:StringId.IDS_LOGON_BUTTON);
+          Model.AssociateOption.Description = zune:Shell.LoadString(zune:StringId.IDS_ASSOCIATE_ZUNE_OFFER_ANOTHER);
+        }
+        else
+        {
+          AnotherButton.Description = zune:Shell.LoadString(zune:StringId.IDS_CHANGE_TAG_BUTTON);
+          Model.AssociateOption.Description = 
+                  sys:String.Format(zune:Shell.LoadString(zune:StringId.IDS_ASSOCIATE_ZUNE_OFFER_LOGGEDIN_YES), zune:SignIn.Instance.ZuneTag);
+          
+          Model.AllowAdvanceOnAssociate = true;
+        }
+        Model.AssociateZuneTagWithSelection();
+      </Script>
+      <Script>
+        Page.AllowAdvance = [Model.AllowAdvanceOnAssociate];
+      </Script>
+      <Script>
+        Model.FriendlyNameOnDevice = [FriendlyNameEditBox.Value];
+      </Script>
+      <Script>
+        if( [Model.ErrorMessage] != null )
+        {
+          ErrorText.Content = Model.ErrorMessage;
+          ErrorText.Visible = true;
+          Page.AllowAdvance = false;
+        }
+        else
+        {
+          ErrorText.Visible = false;
+          Page.AllowAdvance = Model.AllowAdvanceOnAssociate;
+        }
+      </Script>
+      <Script>
+        bool currentDeviceConnected = true;
+        if (!Page.IsWizard)
+        {
+          currentDeviceConnected = [zune:SyncControls.Instance.CurrentDeviceConnected];
+        }
+        
+        if (currentDeviceConnected)
+        {
+          OptionsAvailable.Visible = [ShowPartneredItems];
+          OptionsNotAvailable.Visible = !ShowPartneredItems;
+          FriendlyNameEditBox.Value = zune:SyncSetupManager.Instance.FriendlyNameOnDevice;
+        }
+        else
+        {
+          OptionsAvailable.Visible = false;
+          OptionsNotAvailable.Visible = false;
+          FriendlyNameEditBox.Value = "";
+        }
+        NoDeviceExists.Visible = !currentDeviceConnected;
+      </Script>
+      <Script>
+        bool deviceIsAssociated = [Model.DeviceIsAssociated] &amp;&amp; !Page.IsWizard;
+        AssociationOptions.Visible = !deviceIsAssociated;
+        RemoveAssociationButton.Visible = deviceIsAssociated;
+      </Script>
+      <Script>
+        [DeclareTrigger(RemoveAssociationModel.Invoked)]
+        Model.RemoveDeviceAssociation();
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel>
+        <Children>
+
+          <Panel Name="OptionsAvailable" Visible="false">
+            <Layout>
+              <FlowLayout Orientation="Vertical" Spacing="4,0" StripAlignment="Near"/>
+            </Layout>
+            <Children>
+
+              <Text Content="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_ON_NOTE)}" Color="{styles:Styles.SettingsTextActive}" Font="{styles:Styles.SettingsText}" WordWrap="true"/>
+              <Text Content="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_OFF_NOTE)}" Color="{styles:Styles.SettingsTextActive}" Font="{styles:Styles.SettingsText}" WordWrap="true" Padding="0,0,0,5"/>
+
+              <Panel Name="NameBox" Padding="0,0,0,15" Layout="Anchor">
+                <LayoutInput>
+                  <AnchorLayoutInput Left="Parent,0" Right="Parent,1"/>
+                </LayoutInput>
+                <Children>
+
+                  <core:Editbox Name="NameText" Model="{FriendlyNameEditBox}" FocusOrder="0" TileMaxSize="120,0" TileMinSize="120,0" />
+
+                  <ColorFill Content="{styles:Styles.EditTextBorder}" MinimumSize="120,22">
+                    <LayoutInput>
+                      <AnchorLayoutInput Left="NameText,0" Top="NameText,0"/>
+                    </LayoutInput>
+                    <Children>
+                      <ColorFill Content="White" MinimumSize="120,22" Margins="1,1,1,1"/>
+                    </Children>
+                  </ColorFill>
+
+                </Children>
+              </Panel>
+
+              <Text Content="{zune:Shell.LoadString(zune:StringId.IDS_ASSOCIATE_YOUR_ZUNE)}" Color="{styles:Styles.SettingsTextActive}" Font="{styles:Styles.SettingsTextSubHeader}" WordWrap="true" Padding="0,0,0,5"/>
+              
+              <Text Content="{zune:Shell.LoadString(zune:StringId.IDS_ASSOCIATE_YOUR_ZUNE_DESCRIPTION1)}" Color="{styles:Styles.SettingsTextActive}" Font="{styles:Styles.SettingsText}" WordWrap="true" Padding="0,0,0,5"/>
+              <Text Content="{zune:Shell.LoadString(zune:StringId.IDS_ASSOCIATE_YOUR_ZUNE_DESCRIPTION2)}" Color="{styles:Styles.SettingsTextActive}" Font="{styles:Styles.SettingsText}" WordWrap="true" Padding="0,0,0,5"/>
+                            
+              <Text Name="Offer" Color="{styles:Styles.SettingsTextActive}" Font="{styles:Styles.SettingsText}" WordWrap="true" Padding="0,0,0,15"/>
+
+              <Panel Name="AssociationOptions">
+                <Layout>
+                  <FlowLayout Orientation="Horizontal" Spacing="4,0" StripAlignment="Near"/>
+                </Layout>
+                <Children>
+            
+                  <core:RadioGroup Model="{Model.AssociationChoice}" Padding="0,0,0,5"/>
+                  <core:ActionButton Model="{AnotherButton}"/>
+                  
+                </Children>
+              </Panel>
+
+              <core:ActionButton Name="RemoveAssociationButton" Model="{RemoveAssociationModel}"/>
+
+              
+              <Text Color="Red" Name="ErrorText" Visible="false" Font="{styles:Styles.SettingsText}" WordWrap="true" Padding="0,15,0,0"/>
+
+            </Children>
+          </Panel>
+
+          <Panel Name="OptionsNotAvailable" Visible="false">
+            <Children>
+              
+              <Text Content="{zune:Shell.LoadString(zune:StringId.IDS_OPTION_FOR_PARTNERS_ONLY)}" Color="{styles:Styles.SettingsTextActive}" Font="{styles:Styles.SettingsText}" WordWrap="true"/>
+              
+            </Children>
+          </Panel>
+
+          <me:NoDeviceExists Name="NoDeviceExists" Visible="false"/>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  <UI Name="SyncOptions">
+    <Properties>
+      <zune:CategoryPage Name="Page" CategoryPage="$Required" />
+    </Properties>
+    <Locals>
+      <iris:Command Name="FormatButtonModel" Description="{zune:Shell.LoadString(zune:StringId.IDS_FORMAT_DEVICE_BUTTON)}"/>
+      <iris:Command Name="ForgetButtonModel" Description="{zune:Shell.LoadString(zune:StringId.IDS_DELETE_DEVICE_BUTTON)}"/>
+      <iris:Command Name="ChangePartnershipButtonModel" Description="{zune:Shell.LoadString(zune:StringId.IDS_CHANGE_PARTNERSHIP_DEVICE_BUTTON)}"/>
+      
+      <me:FormatDialog Name="FormatDialog"/>
+
+      <iris:BooleanChoice Name="AutolaunchCheckboxModel"
+                          Description="{zune:Shell.LoadString(zune:StringId.IDS_LAUNCH_ON_ZUNE_CONNECT)}"
+                          Value="{zune:SyncSetupManager.Instance.Autolaunch}"/>
+
+      <iris:Command Name="Back" Description="{zune:Shell.LoadString(zune:StringId.IDS_BACK_BUTTON)}"/>
+      <iris:Command Name="CompleteSetup" Description="{zune:Shell.LoadString(zune:StringId.IDS_DONE_BUTTON)}"/>
+
+      <Boolean Name="InitiallySyncAllMusic"/>
+      <Boolean Name="InitiallySyncAllVideo"/>
+      <Boolean Name="InitiallySyncAllPhoto"/>
+      <Boolean Name="InitiallySyncAllPodcast"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        InitiallySyncAllMusic = zune:SyncControls.Instance.GetSyncAll(zune:MediaType.Track);
+        InitiallySyncAllVideo = zune:SyncControls.Instance.GetSyncAll(zune:MediaType.Video);
+        InitiallySyncAllPhoto = zune:SyncControls.Instance.GetSyncAll(zune:MediaType.Photo);
+        InitiallySyncAllPodcast = zune:SyncControls.Instance.GetSyncAll(zune:MediaType.PodcastEpisode);
+      </Script>
+      
+      <Script>
+        
+        
+        if(Page.IsWizard)
+        {
+          Page.DoneButton = CompleteSetup;
+          Page.BackButton = Back;
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(CompleteSetup.Invoked)]
+        zune:Management.Instance.CommitListSave();
+        zune:SyncSetupManager.Instance.Complete();
+        Page.DoneButton = null;
+        Page.DoneButton.Invoke();
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Back.Invoked)]
+        Page.DoneButton = null;
+        Page.BackButton = null;
+
+        Page.BackButton.Invoke();
+      </Script>
+
+      <Script>
+        [DeclareTrigger(FormatButtonModel.Invoked)]
+        zune:SyncSetupManager.Instance.FormatCurrentDevice();
+      </Script>
+
+      <Script>
+        [DeclareTrigger(zune:SyncSetupManager.Instance.FormatBegun.Invoked)]
+
+        FormatDialog.Helper.Show(FormatDialog);
+      </Script>
+
+      <Script>
+        [DeclareTrigger(ForgetButtonModel.Invoked)]
+        zune:SyncControls.Instance.DeleteCurrentDevice();
+      </Script>
+      
+      <Script>
+        [DeclareTrigger(ChangePartnershipButtonModel.Invoked)]
+        zune:SyncSetupManager.Instance.NavigateToWizardMode(zune:Shell.SettingsFrame.Wizard.PartneredDeviceChangeSetup);
+      </Script>
+
+      <Script>
+        zune:SyncSetupManager.Instance.Autolaunch = [AutolaunchCheckboxModel.Value];
+      </Script>
+
+      <Script>
+        zune:SyncPartnership partnership = [zune:SyncSetupManager.Instance.DevicePartnership];
+
+        bool isPartnered = partnership == zune:SyncPartnership.SyncWithThisMachine;
+
+        
+        bool hasRelationship = isPartnered || partnership == zune:SyncPartnership.SyncWithOtherMachine;
+
+        bool currentDeviceConnected = true;
+        if (!Page.IsWizard)
+        {
+          currentDeviceConnected = [zune:SyncControls.Instance.CurrentDeviceConnected];
+        }
+
+        
+        SyncChoices.Visible = isPartnered &amp;&amp; currentDeviceConnected;
+        
+        ForgetButton.Visible = hasRelationship &amp;&amp; [zune:SyncControls.Instance.CurrentDeviceExists];
+        
+        FormatButton.Visible = currentDeviceConnected;
+        
+        bool showChangePartnership = currentDeviceConnected &amp;&amp; !isPartnered;
+        ChangePartnershipButton.Visible = showChangePartnership;
+        OptionsNotAvailable.Visible = showChangePartnership;
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel>
+        <Children>
+
+          <Panel>
+            <Layout>
+              <FlowLayout Orientation="Vertical" Spacing="4,0" StripAlignment="Near"/>
+            </Layout>
+            <Children>
+
+              <Panel Name="SyncChoices" Visible="false">
+                <Layout>
+                  <FlowLayout Orientation="Vertical" Spacing="4,0" StripAlignment="Near"/>
+                </Layout>
+                <Children>
+
+                  <core:RadioGroup Model="{zune:SyncSetupManager.Instance.MusicSyncChoice}" Padding="0,0,0,15"/>
+                  <core:RadioGroup Model="{zune:SyncSetupManager.Instance.VideoSyncChoice}" Padding="0,0,0,15"/>
+                  <core:RadioGroup Model="{zune:SyncSetupManager.Instance.PhotoSyncChoice}" Padding="0,0,0,15"/>
+                  <core:RadioGroup Model="{zune:SyncSetupManager.Instance.PodcastSyncChoice}" Padding="0,0,0,15"/>
+
+                  <core:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_SYNC_OPTIONS_INFO)}"
+                              Style="{styles:SharedStyles.SettingsBodyStyle}" WordWrap="true"/>
+
+                  <core:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_SYNC_GROUP_EXPLANATION)}"
+                              Style="{styles:SharedStyles.SettingsBodyStyle}" WordWrap="true"
+                              Margins="0,8,0,0">
+                    <NamedStyles>
+                      <TextStyle Name="i" TextStyle="{styles:SharedStyles.SettingsBoldItalicBodyStyle}"/>
+                    </NamedStyles>
+                  </core:Label>
+                  
+                </Children>
+              </Panel>
+
+              <Panel Name="OptionsNotAvailable" Visible="false">
+                <Children>
+                  <Text Content="{zune:Shell.LoadString(zune:StringId.IDS_NO_SYNC_OPTIONS_INFO)}" Color="{styles:Styles.SettingsTextActive}" Font="{styles:Styles.SettingsText}" WordWrap="true"/>
+                  
+                </Children>
+              </Panel>
+
+              <Panel Name="DeviceManagementButtons" Visible="{!zune:Shell.SettingsFrame.Wizard.IsCurrent}" Padding="0,15,0,15">
+                <Layout>
+                  <FlowLayout Orientation="Horizontal" Spacing="4,0" StripAlignment="Near"/>
+                </Layout>
+                <Children>
+
+                  <core:ActionButton Name="FormatButton" Model="{FormatButtonModel}" Visible="false"/>
+                  <core:ActionButton Name="ForgetButton" Model="{ForgetButtonModel}" Visible="false"/>
+                  <core:ActionButton Name="ChangePartnershipButton" Model="{ChangePartnershipButtonModel}" Visible="false"/>
+                  
+                </Children>
+              </Panel>
+
+              <mgmt:CheckBox Name="AutolaunchCheckbox" Model="{AutolaunchCheckboxModel}" Visible="{zune:SyncControls.Instance.CurrentSetupDevice == null}" Margins="15,0,0,0"/>
+              
+            </Children>
+          </Panel>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  
+  
+  <UI Name="WirelessSyncAvailable">
+    <Properties>
+      <zune:CategoryPage Name="Page" CategoryPage="$Required" />
+    </Properties>
+    
+    <Scripts>
+      <Script>
+        
+        bool currentDeviceConnected = [zune:SyncControls.Instance.CurrentDeviceConnected];
+        bool isPartnered = [zune:SyncSetupManager.Instance.DevicePartnership] == zune:SyncPartnership.SyncWithThisMachine;
+        bool connectedViaUSB = zune:SyncSetupManager.Instance.ConnectedViaUSB;
+
+        if (currentDeviceConnected &amp;&amp; isPartnered &amp;&amp; connectedViaUSB)
+        {
+          zune:Management.NavigateToCategory(zune:SettingCategories.WirelessSetupCurrentConfig);
+        }
+        NoDeviceExists.Visible = !currentDeviceConnected;
+        PartnersOnly.Visible = currentDeviceConnected &amp;&amp; !isPartnered;
+        NoUSBConnection.Visible = currentDeviceConnected &amp;&amp; isPartnered &amp;&amp; !connectedViaUSB;
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel>
+        <Layout>
+          <FlowLayout Orientation="Vertical" Spacing="10,0"/>
+        </Layout>
+        <Children>
+
+          <Panel Name="NoUSBConnection" Visible="false">
+            <Children>
+
+              <Text Content="{zune:Shell.LoadString(zune:StringId.IDS_NOT_CONNECTED_VIA_USB)}" Color="{styles:Styles.SettingsTextActive}" Font="{styles:Styles.SettingsText}" WordWrap="true"/>
+
+            </Children>
+          </Panel>
+
+          <me:PartnersOnly Name="PartnersOnly"  Visible="false"/>
+          
+          <me:NoDeviceExists Name="NoDeviceExists" Visible="false"/>
+          
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  
+  
+  
+  <UI Name="WirelessSyncDeviceBusy">
+    <Properties>
+      <zune:CategoryPage Name="Page" CategoryPage="$Required" />
+    </Properties>    
+    <Content>
+      <core:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_DEVICE_BUSY)}"
+                  Style="{styles:SharedStyles.PodcastText}"
+                  WordWrap="true"/>
+    </Content>
+  </UI>
+
+  
+  
+  
+  
+  
+  
+  
+  <UI Name="WirelessSyncCurrentConfig">
+    <Properties>
+      <zune:CategoryPage Name="Page" CategoryPage="$Required" />
+    </Properties>    
+    <Locals>
+      <iris:Command Name="ChangeNetworkButton" Description="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_CHANGE_NETWORK_BUTTON)}"/>
+      <iris:Command Name="TurnOffButton" Description="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_TURN_OFF_BUTTON)}"/>
+      <iris:Command Name="ConfigureNowButton" Description="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_SYNC_START_CONFIG)}"/>
+      <zune:WebHelpCommand Name="HelpLinkWireless"
+                           Description="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_SYNC_FAILED_MORE_INFO_LINK)}"
+                           Url="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_SYNC_FAILED_MORE_INFO_LINK)}"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        zune:SyncSetupManager.Instance.RequestDeviceWirelessProfile();
+      </Script>
+      <Script>
+          [DeclareTrigger(zune:SyncSetupManager.Instance.WirelessDeviceProfile)]
+          if(zune:SyncSetupManager.Instance.WirelessDeviceShowError)
+          {
+          zune:SyncSetupManager.Instance.WirelessDeviceShowErrorDialog();
+          zune:Management.NavigateToCategory(zune:SettingCategories.WirelessSetupNotConfigured);
+          }
+          else if(string.IsNullOrEmpty(zune:SyncSetupManager.Instance.WirelessDeviceProfile.SSID))
+          {
+          Loading.Visible = false;
+          Configured.Visible = false;
+          NotConfigured.Visible = true;
+          }
+          else
+          {
+          NetworkName.Content = zune:SyncSetupManager.Instance.WirelessDeviceProfile.SSID;
+          NetworkType.Content = zune:SyncSetupManager.Instance.GetWirelessDeviceNetworkType();
+          Loading.Visible = false;
+          NotConfigured.Visible = false;
+          Configured.Visible = true;
+          }
+      </Script>
+            
+      <Script>
+        [DeclareTrigger(ChangeNetworkButton.Invoked)]
+        [DeclareTrigger(ConfigureNowButton.Invoked)]
+        zune:SyncSetupManager.Instance.NavigateToWizardMode(zune:Shell.SettingsFrame.Wizard.WirelessSetup);
+      </Script>
+      <Script>
+        [DeclareTrigger(TurnOffButton.Invoked)]
+        zune:SyncSetupManager.Instance.ClearWirelessOnDevice();
+        Configured.Visible = false;
+        NotConfigured.Visible = false;
+        Result.Visible = true;
+      </Script>
+      <Script>
+        bool currentDeviceConnected = [zune:SyncControls.Instance.CurrentDeviceConnected];
+        DeviceExists.Visible = currentDeviceConnected;
+        NoDeviceExists.Visible = !currentDeviceConnected;
+      </Script>
+    </Scripts>
+    <Content>
+      <Panel>
+        <Layout>
+          <FlowLayout Orientation="Vertical" Spacing="5,0"/>
+        </Layout>
+        <Children>
+
+          <Panel Name="DeviceExists" Visible="false">
+            <Children>
+                
+              <Panel Name="Loading" Visible="true">
+                <Children>
+
+                  <core:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_RETRIEVING_PROFILE)}"
+                              Style="{styles:SharedStyles.PodcastText}"/>
+
+                </Children>
+              </Panel>
+
+              <Panel Name="NotConfigured" Visible="false">
+                <Layout>
+                  <FlowLayout Orientation="Vertical" Spacing="15,0"/>
+                </Layout>
+                <Children>
+
+                  <core:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_SYNC_DESCRIPTION)}"
+                              Style="{styles:SharedStyles.SettingsBodyStyle}"
+                              WordWrap="true"/>
+
+                  <core:ActionButton Model="{ConfigureNowButton}"/>
+
+                  <Panel Layout="HorizontalFlow">
+                    <Children>
+
+                      <core:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_SYNC_MORE_INFO)}"
+                                  Style="{styles:SharedStyles.SettingsBodyStyle}"
+                                  WordWrap="true"/>
+                      <mgmt:Link Model="{HelpLinkWireless}"/>
+                      
+                    </Children>
+                  </Panel>
+
+                </Children>
+              </Panel>
+              
+              <Panel Name="Configured" Visible="false">
+                <Layout>
+                  <FlowLayout Orientation="Vertical" Spacing="15,0"/>
+                </Layout>
+                <Children>
+
+                  <core:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_ALREADY_CONFIGURED)}"
+                              Style="{styles:SharedStyles.PodcastText}"
+                              WordWrap="true"/>
+
+                  <Panel MinimumSize="300,0" MaximumSize="300,0">
+                    <Layout>
+                      <GridLayout Orientation="Horizontal" AllowWrap="true" Columns="2" Spacing="3,3"/>
+                    </Layout>
+                    <Children>
+
+                      <core:Label Content="Network name:"
+                                  Style="{styles:SharedStyles.SettingsBodyStyle}"/>
+
+                      <core:Label Name="NetworkName"
+                                  Content="{null}"
+                                  Style="{styles:SharedStyles.SettingsBodyStyle}"/>
+
+                      <core:Label Content="Network type:"
+                                  Style="{styles:SharedStyles.SettingsBodyStyle}"/>
+
+                      <core:Label Name="NetworkType"
+                                  Content="{null}"
+                                  Style="{styles:SharedStyles.SettingsBodyStyle}"/>
+                      
+                    </Children>
+                  </Panel>
+
+                  <Panel>
+                    <Layout>
+                      <FlowLayout Orientation="Horizontal" Spacing="5,0"/>
+                    </Layout>
+                    <Children>
+
+                      <core:ActionButton Model="{ChangeNetworkButton}"/>
+                      <core:ActionButton Model="{TurnOffButton}"/>
+
+                    </Children>
+                  </Panel>
+
+                </Children>
+              </Panel>
+
+              <core:Label Name="Result" 
+                          Content="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_SYNC_DISABLED)}"
+                          Style="{styles:SharedStyles.SettingsBodyStyle}"
+                          WordWrap="true" 
+                          Visible="false"/>
+              </Children>
+          </Panel>
+          
+          <me:NoDeviceExists Name="NoDeviceExists" Visible="false"/>
+          
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  
+  
+  
+  <UI Name="WirelessSyncDetectingConnected">
+    <Properties>
+      <zune:CategoryPage Name="Page" CategoryPage="$Required" />
+    </Properties>
+    <Scripts>
+      <Script>
+        
+        zune:SyncSetupManager.Instance.RequestConnectedWirelessNetwork();
+      </Script>
+      <Script>
+          [DeclareTrigger(zune:SyncSetupManager.Instance.ConnectedWirelessNetwork)]
+          if(zune:SyncSetupManager.Instance.WirelessDeviceShowError)
+          {
+          zune:SyncSetupManager.Instance.WirelessDeviceShowErrorDialog();
+          zune:Management.NavigateToCategory(zune:SettingCategories.WirelessSetupNotConfigured);
+          }
+          else if( !String.IsNullOrEmpty(zune:SyncSetupManager.Instance.ConnectedWirelessNetwork) )
+          {
+          zune:Management.NavigateToCategory(zune:SettingCategories.WirelessSetupUseConnected);
+          }
+          else
+          {
+          zune:Management.NavigateToCategory(zune:SettingCategories.WirelessSetupManual);
+          }
+      </Script>
+      <Script>
+        Page.DoneButton.Available = false;
+      </Script>
+    </Scripts>
+    <Content>
+      <Panel>
+        <Layout>
+          <FlowLayout Orientation="Vertical" Spacing="10,0"/>
+        </Layout>
+        <Children>
+
+          <core:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_DETECTING_CONNECTED)}"
+                      Style="{styles:SharedStyles.PodcastText}"
+                      WordWrap="true"/>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  
+  
+  
+  
+  
+  <UI Name="WirelessSyncUseConnectedNetwork">
+    <Properties>
+      <zune:CategoryPage Name="Page" CategoryPage="$Required" />
+    </Properties>
+    <Locals>
+      <iris:Command Name="DoneButton" Description="{zune:Shell.LoadString(zune:StringId.IDS_DONE_BUTTON)}"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        [DeclareTrigger(DoneButton.Invoked)]
+        if( UseConnectedNetwork.Model.ChosenIndex == 0 )
+        {
+          
+          bool success = zune:SyncSetupManager.Instance.SetConnectedNetwork();
+
+          if( success )
+          {
+            zune:Management.NavigateToCategory(zune:SettingCategories.WirelessSetupSaving);
+          }
+          else
+          {
+            zune:Management.NavigateToCategory(zune:SettingCategories.WirelessSetupNotConfigured);
+          }
+        }
+        else
+        {
+          
+          zune:Management.NavigateToCategory(zune:SettingCategories.WirelessSetupManual);
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel>
+        <Layout>
+          <FlowLayout Orientation="Vertical" Spacing="10,0" StripAlignment="Near"/>
+        </Layout>
+        <Children>
+
+          <core:Label Content="{sys:String.Format(zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_USE_CONNECTED), zune:SyncSetupManager.Instance.ConnectedWirelessNetwork)}"
+                      Style="{styles:SharedStyles.PodcastText}"/>
+          <core:RadioGroup Name="UseConnectedNetwork"
+                           Padding="10,0,0,5"
+                           Orientation="Vertical">
+            <Model>
+              <iris:Choice>
+                <Options>
+                  <String String="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_USE_CONNECTED_YES)}"/>
+                  <String String="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_USE_CONNECTED_NO)}"/>
+                </Options>
+              </iris:Choice>
+            </Model>
+          </core:RadioGroup>
+          <core:ActionButton Model="{DoneButton}"/>
+          
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  
+  
+  <Class Name="WirelessSyncNetworkKeyDialog" Base="dialog:Dialog">
+    <Properties>
+      <String Name="ContentUI" String="res://ZuneShellResources!DeviceSyncSetup.uix#WirelessSyncNetworkKeyDialogUI"/>
+      <zune:WlanCommand Name="ProfileCommand" WlanCommand="$Required"/>
+      <iris:Command Name="CommitWirelessSettings" Command="$Required"/>
+    </Properties>
+  </Class>
+
+  
+  
+  
+  
+  
+  <UI Name="WirelessSyncNetworkKeyDialogUI" Base="dialog:DialogContentUI">
+    <Properties>
+      <me:WirelessSyncNetworkKeyDialog Name="Dialog" WirelessSyncNetworkKeyDialog="$Required"/>
+    </Properties>
+
+    <Locals>
+      <EditableTextData Name="KeyEditBox"/>
+      <iris:Command Name="SubmitButton" Description="{zune:Shell.LoadString(zune:StringId.IDS_DIALOG_OK)}"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        [DeclareTrigger(SubmitButton.Invoked)]
+        [DeclareTrigger(KeyEditBox.Submitted)]
+        Dialog.ProfileCommand.Profile.Key = KeyEditBox.Value;
+        Dialog.CommitWirelessSettings.Invoke();
+        Dialog.Helper.Hide();
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Layout="Anchor">        
+        <Children>
+
+          <Panel Name="Content" MaximumSize="350,0">
+            <Layout>
+              <FlowLayout Orientation="Vertical" Spacing="10,0"/>
+            </Layout>
+            
+            <LayoutInput>
+              <AnchorLayoutInput Left="Parent,0,10" Top="Parent,0,10"/>
+            </LayoutInput>
+              
+            <Children>
+
+              <core:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_NETWORK_PROTECTED)}"
+                          Style="{styles:SharedStyles.PodcastText}"
+                          Padding="0,0,0,5"
+                          WordWrap="true"/>
+              <core:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_ENTER_NETWORK_KEY)}"
+                          Style="{styles:SharedStyles.PodcastText}"/>
+              <me:PasswordTextBox KeyEditBox="{KeyEditBox}" />
+
+            </Children>
+          </Panel>
+
+          <core:BigActionButton Name="Submit"
+                             Model="{SubmitButton}"
+                             ToolTipEnabled="false">
+
+            <LayoutInput>
+              <AnchorLayoutInput Right="Content,1,10"  Top="Content,1"/>
+            </LayoutInput>
+          </core:BigActionButton>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  
+  
+  <UI Name="WirelessSyncComplete">
+    <Properties>
+      <zune:CategoryPage Name="Page" CategoryPage="$Required" />
+    </Properties>
+
+    <Scripts>
+      <Script>
+        Page.DoneButton.Available = true;
+        Page.CancelButton.Available = false;
+      </Script>
+    </Scripts>
+    <Content>
+      <Panel>
+        <Layout>
+          <FlowLayout Orientation="Vertical" Spacing="5,0"/>
+        </Layout>
+        <Children>
+
+          <core:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_SYNC_SETUP_COMPLETE)}"
+                      Style="{styles:SharedStyles.PodcastText}"
+                      Padding="0,0,0,10"
+                      WordWrap="true"/>
+          <core:Label Content="{sys:String.Format(zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_SYNC_DEVICE), zune:SyncSetupManager.Instance.DeviceName)}"
+                      Style="{styles:SharedStyles.PodcastText}" />
+          <core:Label Content="{sys:String.Format(zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_SYNC_NETWORK), zune:SyncSetupManager.Instance.WirelessDeviceProfile.SSID)}"
+                      Style="{styles:SharedStyles.PodcastText}" />
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  
+  
+  
+  <UI Name="WirelessSyncAuto">
+    <Properties>
+      <SelectionManager Name="WirelessNetworkSM" SelectionManager="$Required"/>
+    </Properties>
+    <Locals>
+      <iris:Command Name="ScanButton" Description="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_SETTINGS_SCAN)}"/>
+      <iris:Command Name="SetWirelessSettings" Description="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_SETTINGS_SELECT_NETWORK)}"/>
+      <iris:Command Name="CommitWirelessSettings"/>
+      <me:WirelessSyncNetworkKeyDialog Name="WirelessSyncNetworkKeyDialog"
+                                       CommitWirelessSettings="{CommitWirelessSettings}"
+                                       ProfileCommand="{null}"/>
+
+      <spreadsheet:ColumnData Name="ListColumns">
+        <Columns>
+
+          <spreadsheet:ColumnInfo CellType="{typeof(me:SSIDCell)}" CellPadding="9,0,5,0">
+            <ColumnSize>
+              <SharedSize Size="300,0" MinimumSize="310,0" MaximumSize="310,0"/>
+            </ColumnSize>
+          </spreadsheet:ColumnInfo>
+
+        </Columns>
+      </spreadsheet:ColumnData>      
+    </Locals>
+
+    <Scripts>
+      
+      <Script>
+        [DeclareTrigger(zune:SyncSetupManager.Instance.WirelessNetworksList)]
+        if(zune:SyncSetupManager.Instance.WirelessDeviceShowError)
+        {
+          zune:SyncSetupManager.Instance.WirelessDeviceShowErrorDialog();
+          zune:Management.NavigateToCategory(zune:SettingCategories.WirelessSetup);
+        }
+        else
+        {
+          WirelessList.Content = zune:SyncSetupManager.Instance.WirelessNetworksList;
+          if( WirelessList.Content.Count > 0 )
+          {
+            DetectingNetworksLabel.Visible = false;
+            WirelessList.Visible = true;
+          }
+          else
+          {
+            DetectingNetworksLabel.Content = zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_NO_NETWORKS);
+            DetectingNetworksLabel.Visible = true;
+            WirelessList.Visible = false;
+          }
+          ScanButton.Available = true;
+          }
+      </Script>
+      
+      <Script>
+        [DeclareTrigger(WirelessNetworkSM.SelectedIndex)]
+        if( WirelessNetworkSM.SelectedItem != null )
+        {
+          SetWirelessSettings.Available = true;
+        }
+        else
+        {
+          SetWirelessSettings.Available = false;
+        }
+      </Script>
+      
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(ScanButton.Invoked)]
+
+        ScanButton.Available = false;
+        SetWirelessSettings.Available = false;
+
+        zune:WirelessStateResults result = zune:SyncSetupManager.Instance.RequestWirelessNetworksList();
+        
+        if( result == zune:WirelessStateResults.Success )
+        {
+          DetectingNetworksLabel.Content = zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_DETECTING_NETWORKS);
+        }
+        else
+        {
+          DetectingNetworksLabel.Content = zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_NO_NETWORKS);
+          ScanButton.Available = true;
+        }
+        DetectingNetworksLabel.Visible = true;
+        WirelessList.Visible = false;
+      </Script>
+      
+      <Script>
+        [DeclareTrigger(SetWirelessSettings.Invoked)]
+        if (WirelessNetworkSM.Count != 0)
+        {
+          
+          
+          
+          zune:WlanCommand wirelessCommand = (zune:WlanCommand)WirelessNetworkSM.SelectedItem;
+          if( wirelessCommand.NeedsKey )
+          {
+            WirelessSyncNetworkKeyDialog.ProfileCommand = wirelessCommand;
+            WirelessSyncNetworkKeyDialog.Helper.Show(WirelessSyncNetworkKeyDialog);
+          }
+          else
+          {
+            CommitWirelessSettings.Invoke();
+          }
+        }
+      </Script>
+      
+      <Script>
+        [DeclareTrigger(CommitWirelessSettings.Invoked)]
+        zune:WlanCommand wirelessCommand = (zune:WlanCommand)WirelessNetworkSM.SelectedItem;
+
+        if (wirelessCommand != null)
+        {
+          bool success = zune:SyncSetupManager.Instance.SetWirelessSettings(wirelessCommand);
+
+          if( success )
+          {
+            zune:Management.NavigateToCategory(zune:SettingCategories.WirelessSetupSaving);
+          }
+          else
+          {
+            zune:Management.NavigateToCategory(zune:SettingCategories.WirelessSetupNotConfigured);
+          }
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel>
+        <Children>
+          
+          <Panel>
+            <Layout>
+              <FlowLayout Orientation="Vertical" Spacing="5,0" StripAlignment="Near"/>
+            </Layout>
+            <Children>
+
+                <core:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_SETTINGS_AUTO_CONFIG_DESCRIPTION)}"
+                            Style="{styles:SharedStyles.PodcastText}"
+                            WordWrap="true"/>
+                <ColorFill Content="{styles:Styles.EditTextBackground}">
+                  <Children>
+
+                    <Panel Layout="Anchor">
+                      <Children>
+
+                        <Panel Name="WirelessNetworks" MaximumSize="325,115" Layout="Center" Padding="0,4,0,4">
+                          <Children>
+
+                            <spreadsheet:SpreadSheet Name="WirelessList"
+                                                     SelectionManager="{WirelessNetworkSM}"
+                                                     Content="{null}"
+                                                     ExecuteCommand="{SetWirelessSettings}"
+                                                     ColumnData="{ListColumns}"
+                                                     AllowHorizontalScrolling="false"
+                                                     AllowVerticalScrolling="true"
+                                                     ShowHeaders="false"
+                                                     AnimateItems="false"
+                                                     CanDrag="false" 
+                                                     RowPadding="{styles:Styles.ListBoxItemPadding}">
+                              <OverrideStyle>
+                                  <style:Style Font="{styles:Styles.ZegoeSemiBold10}" Color="{styles:Styles.SettingsTextActive}"/>
+                              </OverrideStyle>
+                            </spreadsheet:SpreadSheet>
+                            <core:Label Name="DetectingNetworksLabel"
+                                        Content="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_DETECTING_NETWORKS)}"
+                                        Style="{styles:SharedStyles.PodcastText}"/>
+
+                          </Children>
+                        </Panel>
+
+
+                        <ColorFill Content="{styles:Styles.EditTextBorder}">
+                          <LayoutInput>
+                            <AnchorLayoutInput Left="WirelessNetworks,0" Top="WirelessNetworks,0" Right="WirelessNetworks,1" Bottom="WirelessNetworks,1"/>
+                          </LayoutInput>
+                          <Children>
+                            <ColorFill Content="{styles:Styles.EditTextBackground}" Margins="1,1,1,1"/>
+                          </Children>
+                        </ColorFill>
+
+                      </Children>
+                    </Panel>
+
+                  </Children>
+                </ColorFill>
+                <Panel MinimumSize="325,0" MaximumSize="325,0">
+                  <Layout>
+                    <DockLayout SizeToChildren="true"/>
+                  </Layout>
+                  <Children>
+
+                    <core:ActionButton Model="{ScanButton}">
+                      <LayoutInput>
+                        <DockLayoutInput Position="Left" Alignment="Near"/>
+                      </LayoutInput>
+                    </core:ActionButton>
+                    <core:ActionButton Model="{SetWirelessSettings}">
+                      <LayoutInput>
+                        <DockLayoutInput Position="Right" Alignment="Near"/>
+                      </LayoutInput>
+                    </core:ActionButton>
+
+                  </Children>
+                </Panel>
+
+              </Children>
+            </Panel>
+            
+          </Children>
+        </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  
+  
+  <UI Name="SSIDCell" Base="spreadsheet:LabelCell">
+    <Properties>
+      <Command Name="Model" Command="$Required"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+        zune:WlanCommand wlanCommand = (zune:WlanCommand)(Model);
+        Content = wlanCommand.Profile.SSID;
+      </Script>
+    </Scripts>
+  </UI>
+  
+  
+  
+  
+  
+  
+  
+  <UI Name="WirelessSyncManual">
+    <Properties>
+      <zune:CategoryPage Name="Page" CategoryPage="$Required" />
+    </Properties>
+    <Locals>
+      <zune:WebHelpCommand Name="HelpLinkWireless"
+                           Description="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_SYNC_FAILED_MORE_INFO_LINK)}"
+                           Url="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_SYNC_FAILED_MORE_INFO_LINK)}"/>
+      <iris:Command Name="SaveButton"  Available="false" Description="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_SAVE_SETTINGS)}"/>
+      <iris:Command Name="ShowAdvancedSettings" Description="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_SYNC_SHOW_ADVANCED_SETTINGS)}"/>
+      <iris:Command Name="CommitWirelessSettings"/>
+      <iris:Command Name="UpdateAdvancedSettings"/>
+      <EditableTextData Name="SSIDEditBox"/>
+      <EditableTextData Name="KeyEditBox"/>
+      <SelectionManager Name="WirelessNetworkSM" SingleSelect="true" />
+      <Object Name="wirelessCommandObj" Object="{null}"/>
+      <me:WirelessSyncNetworkKeyDialog Name="WirelessSyncNetworkKeyDialog"
+                                       CommitWirelessSettings="{CommitWirelessSettings}"
+                                       ProfileCommand="{null}"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        wirelessCommandObj = new zune:WlanCommand(zune:SyncSetupManager.Instance.WirelessDeviceProfile);
+        UpdateAdvancedSettings.Invoke();
+      </Script>
+      
+      <Script>
+        [DeclareTrigger(SaveButton.Invoked)]
+        zune:WlanCommand wirelessCommand = zune:SyncSetupManager.Instance.CreateWlanCommand(SSIDEditBox.Value, WirelessNetworkTypes.Model.Chosen, KeyEditBox.Value);
+
+        if(wirelessCommand != null )
+        {
+          wirelessCommandObj = wirelessCommand;
+          if(wirelessCommand.NeedsKey )
+          {
+            WirelessSyncNetworkKeyDialog.ProfileCommand = wirelessCommand;
+            WirelessSyncNetworkKeyDialog.Helper.Show(WirelessSyncNetworkKeyDialog);
+          }
+          else
+          {
+            CommitWirelessSettings.Invoke();
+          }
+        }
+        else
+        {
+          zune:Management.NavigateToCategory(zune:SettingCategories.WirelessSetupNotConfigured);
+        }
+      </Script>
+      <Script>
+          [DeclareTrigger(CommitWirelessSettings.Invoked)]
+          zune:WlanCommand wirelessCommand = (zune:WlanCommand)wirelessCommandObj;
+
+          bool success = zune:SyncSetupManager.Instance.SetWirelessSettings(wirelessCommand);
+
+          if( success )
+          {
+            zune:Management.NavigateToCategory(zune:SettingCategories.WirelessSetupSaving);
+          }
+          else
+          {
+            zune:Management.NavigateToCategory(zune:SettingCategories.WirelessSetupNotConfigured);
+          }
+      </Script>
+      <Script>
+        [DeclareTrigger(WirelessNetworkSM.SelectedItem)]
+        if(WirelessNetworkSM.SelectedItem != null)
+        {
+          wirelessCommandObj = WirelessNetworkSM.SelectedItem;
+          UpdateAdvancedSettings.Invoke();
+        }
+      </Script>
+      
+      <Script>
+        [DeclareTrigger(UpdateAdvancedSettings.Invoked)]
+        zune:WlanCommand command = (zune:WlanCommand)wirelessCommandObj;
+
+        if( command != null )
+        {
+          KeyEdit.ShowClearTextModel.Value = false;
+          SSIDEditBox.Value = command.Profile.SSID;
+          WirelessNetworkTypes.Model.ChosenIndex = (int)zune:SyncSetupManager.Instance.GetNetworkTypeIndex(command.Profile.Auth, command.Profile.Cipher);
+        }
+      </Script>
+      <Script>
+        [DeclareTrigger(WirelessNetworkTypes.Model.ChosenIndex)]
+        if( WirelessNetworkTypes.Model.ChosenIndex > 0 )
+        {
+          PasskeyLabel.Visible = true;
+          KeyEdit.Visible = true;
+        }
+        else
+        {
+          PasskeyLabel.Visible = false;
+          KeyEdit.Visible = false;
+        }
+      </Script>
+      <Script>
+        [DeclareTrigger(ShowAdvancedSettings.Invoked)]
+        if( ManuallyEnterSettings.Visible )
+        {
+          ManuallyEnterSettings.Visible = false;
+          ShowAdvancedSettings.Description = zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_SYNC_SHOW_ADVANCED_SETTINGS);
+        }
+        else
+        {
+          ManuallyEnterSettings.Visible = true;
+          ShowAdvancedSettings.Description = zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_SYNC_HIDE_ADVANCED_SETTINGS);
+        }
+      </Script>
+      <Script>
+        [DeclareTrigger(SSIDEditBox.Value)]
+        if(((sys:String)SSIDEditBox.Value).Length > 0)
+        {
+          SaveButton.Available = true;
+        }
+        else
+        {
+          SaveButton.Available = false;
+        }
+      </Script>
+      <Script>
+        bool currentDeviceConnected = [zune:SyncControls.Instance.CurrentDeviceConnected];
+        DeviceExists.Visible = currentDeviceConnected;
+        NoDeviceExists.Visible = !currentDeviceConnected;
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel>
+        <Children>
+          <Panel Name="DeviceExists" Visible="false">
+            <Layout>
+              <FlowLayout Orientation="Vertical" Spacing="5,0" StripAlignment="Near"/>
+            </Layout> 
+            <Children>
+              
+              <me:WirelessSyncAuto WirelessNetworkSM="{WirelessNetworkSM}" Padding="0,0,0,5"/>
+
+              <core:ActionButton Model="{ShowAdvancedSettings}"/>
+
+              <Panel Name="ManuallyEnterSettings" Visible="false">
+                <Layout>
+                  <FlowLayout Orientation="Vertical" Spacing="3,0"/>
+                </Layout>
+                <Children>
+
+                  <Panel>
+                    <Layout>
+                      <FlowLayout Orientation="Horizontal"/>
+                    </Layout>
+                    <Children>
+
+                      <core:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_HELP)}"
+                                  Style="{styles:SharedStyles.PodcastText}"/>
+                      <mgmt:Link Model="{HelpLinkWireless}"/>
+
+                    </Children>
+                  </Panel>
+
+                  <core:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_NAME_HEADER)}">
+                    <Style>
+                      <styles:LabelStyle Color="{styles:Styles.SettingsTextActive}" Font="{styles:Styles.SettingsTextSubHeader}"/>
+                    </Style>
+                  </core:Label>
+
+                  <Panel Layout="Anchor">
+                    <Children>
+
+                      <core:Editbox Name="SSIDEdit"
+                                    Model="{SSIDEditBox}"
+                                    TileMinSize="325,18"
+                                    TileMaxSize="325,18"
+                                    TilePadding="4,0,4,0"/>
+                      <ColorFill Content="{styles:Styles.EditTextBorder}">
+                        <LayoutInput>
+                          <AnchorLayoutInput Left="SSIDEdit,0" Top="SSIDEdit,0" Right="SSIDEdit,1" Bottom="SSIDEdit,1"/>
+                        </LayoutInput>
+                        <Children>
+                          <ColorFill Content="{styles:Styles.EditTextBackground}" Margins="1,1,1,1"/>
+                        </Children>
+                      </ColorFill>
+
+                    </Children>
+                  </Panel>
+
+                  <core:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_NETWORK_TYPE)}">
+                    <Style>
+                      <styles:LabelStyle Color="{styles:Styles.SettingsTextActive}" Font="{styles:Styles.SettingsTextSubHeader}"/>
+                    </Style>
+                  </core:Label>
+
+                  <Panel MinimumSize="360,0" MaximumSize="360,0">
+                    <Children>
+
+                      <core:MCRadioGroup Name="WirelessNetworkTypes"
+                                         Model="{zune:SyncSetupManager.Instance.WirelessNetworkTypes}"
+                                         Padding="10,0,0,0"
+                                         Orientation="Horizontal" 
+                                         ColumnSize="175,0"
+                                         ColumnCount="2"
+                                         GridSpacing="3,3"/>
+                      
+                    </Children>
+                  </Panel>
+
+                  
+                  <core:Label Name="PasskeyLabel" 
+                              Content="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_KEY_HEADER)}"
+                              Visible="false">
+                    <Style>
+                      <styles:LabelStyle Color="{styles:Styles.SettingsTextActive}" Font="{styles:Styles.SettingsTextSubHeader}"/>
+                    </Style>
+                  </core:Label>
+
+                  <me:PasswordTextBox Name="KeyEdit" KeyEditBox="{KeyEditBox}" Visible="false"/>
+                  <core:ActionButton Model="{SaveButton}" Padding="0,5,0,0"/>
+
+                </Children>
+              </Panel>
+
+              <core:Label Content="{sys:String.Format(zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_SYNC_GET_CONNECTED_FAILED), zune:SyncSetupManager.Instance.WirelessGetConnectedProfileResult)}" 
+                          Visible="{zune:SyncSetupManager.Instance.WirelessGetConnectedProfileFailed}" 
+                          WordWrap="true">
+                <Style>
+                  <styles:LabelStyle Color="{styles:Styles.SettingsTextActive}" Font="{styles:Styles.SettingsTextMini}"/>
+                </Style>
+              </core:Label>
+          
+            </Children>
+          </Panel>
+          
+          <me:NoDeviceExists Name="NoDeviceExists" Visible="false"/>
+          
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  
+  
+  
+  <UI Name="WirelessSyncNotConfigured">
+    <Properties>
+      <zune:CategoryPage Name="Page" CategoryPage="$Required" />
+    </Properties>
+    <Locals>
+      <zune:WebHelpCommand Name="HelpLink"
+                           Description="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_SYNC_FAILED_MORE_INFO_LINK)}"
+                           Url="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_SYNC_FAILED_MORE_INFO_LINK)}"/>
+      <iris:Command Name="TryAgainButton" Description="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_TRY_AGAIN_BUTTON)}"/>
+      <iris:Command Name="ShowDetailsButton" Description="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_ERROR_DETAILS_BUTTON)}"/>
+      <Boolean Name="HaveError" Boolean="{!String.IsNullOrEmpty(zune:SyncSetupManager.Instance.WirelessDeviceErrorDescription)}"/>
+      <Boolean Name="ShowError" Boolean="{zune:SyncSetupManager.Instance.WirelessDeviceShowError}"/>
+      <Boolean Name="ShowErrorNow" Boolean="{zune:SyncSetupManager.Instance.WirelessDeviceShowErrorNow}"/>
+      <Boolean Name="Canceled" Boolean="{zune:SyncSetupManager.Instance.WirelessDeviceCanceled}"/>
+    </Locals>
+    <Scripts>
+      <Script>
+        [DeclareTrigger(TryAgainButton.Invoked)]
+        
+        
+        
+        Page.DoneButton.Available = false;
+        zune:Management.NavigateToCategory(zune:SettingCategories.WirelessSetupDetectingConnected);
+      </Script>
+      <Script>
+        
+        
+        
+        if(ShowErrorNow)
+        {
+          
+          
+          Page.CancelButton = null;
+          zune:SyncSetupManager.Instance.WirelessDeviceShowErrorDialog();
+        }
+      </Script>
+      <Script>
+        [DeclareTrigger(ShowDetailsButton.Invoked)]
+        zune:SyncSetupManager.Instance.WirelessDeviceShowErrorDialog();
+      </Script>
+      <Script>
+        
+        
+        
+        Page.DoneButton.Available = true;
+      </Script>
+      <Script>
+        bool currentDeviceConnected = [zune:SyncControls.Instance.CurrentDeviceConnected];
+        DeviceExists.Visible = currentDeviceConnected;
+        NoDeviceExists.Visible = !currentDeviceConnected;
+      </Script>
+
+    </Scripts>
+
+    <Content>
+      <Panel>
+        <Children>
+
+          <Panel Name="DeviceExists">
+            <Layout>
+              <FlowLayout Orientation="Vertical" Spacing="15,0"/>
+            </Layout>
+            <Children>
+              
+                
+              <core:Label Name="NotConfigured"
+                          Content="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_SYNC_NOT_CONFIGURED)}"
+                          Style="{styles:SharedStyles.PodcastText}"
+                          Visible="{!HaveError}"
+                          WordWrap="true"/>
+              <core:Label Name="ErrorDescription"
+                          Content="{zune:SyncSetupManager.Instance.WirelessDeviceErrorDescription}"
+                          Style="{styles:SharedStyles.PodcastText}"
+                          Visible="{HaveError}"
+                          WordWrap="true"/>
+
+              <Panel Visible="{!Canceled}">
+                <Layout>
+                  <FlowLayout Orientation="Vertical" Spacing="2,0"/>
+                </Layout>
+                <Children>
+
+                  <core:Label Name="CommonReasons"
+                              Content="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_COMMON_REASONS)}"
+                              Style="{styles:SharedStyles.PodcastText}"
+                              WordWrap="true"/>
+
+                  <Panel Padding="10,0,0,0">
+                    <Layout>
+                      <FlowLayout Orientation="Horizontal"/>
+                    </Layout>
+                    <Children>
+
+                      <core:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_SUGG_LIST_DASH)}"
+                                  Style="{styles:SharedStyles.PodcastText}"/>
+                      <core:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_SUGG_BAD_KEY)}"
+                                  Style="{styles:SharedStyles.PodcastText}"
+                                  WordWrap="true"/>
+
+                    </Children>
+                  </Panel>
+
+                  <Panel Padding="10,0,0,0">
+                    <Layout>
+                      <FlowLayout Orientation="Horizontal"/>
+                    </Layout>
+                    <Children>
+
+                      <core:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_SUGG_LIST_DASH)}"
+                                  Style="{styles:SharedStyles.PodcastText}"/>
+                      <core:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_SUGG_OUT_OF_RANGE)}"
+                                  Style="{styles:SharedStyles.PodcastText}"
+                                  WordWrap="true"/>
+
+                    </Children>
+                  </Panel>
+
+                  <Panel Padding="10,0,0,0">
+                    <Layout>
+                      <FlowLayout Orientation="Horizontal"/>
+                    </Layout>
+                    <Children>
+
+                      <core:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_SUGG_LIST_DASH)}"
+                                  Style="{styles:SharedStyles.PodcastText}"/>
+                      <core:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_SUGG_MAC_FILTERING)}"
+                                  Style="{styles:SharedStyles.PodcastText}"
+                                  WordWrap="true"/>
+
+                    </Children>
+                  </Panel>
+
+                </Children>
+              </Panel>
+
+              <core:Label Name="MoreInfo"
+                          Content="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_SYNC_FAILED_MORE_INFO)}"
+                          Style="{styles:SharedStyles.PodcastText}"
+                          Visible="{HaveError}"
+                          WordWrap="true"/>
+              <mgmt:Link Name="WirelessHelpLink"
+                         Model="{HelpLink}"
+                         Padding="5,0,0,0"
+                         Visible="{HaveError}"/>
+
+              <Panel>
+                <Layout>
+                  <FlowLayout Orientation="Horizontal"/>
+                </Layout>
+                <Children>
+
+                  <core:ActionButton Name="TryAgain" Model="{TryAgainButton}" Visible="{HaveError}"/>
+                  <core:ActionButton Name="ShowDetails" Model="{ShowDetailsButton}" Visible="{ShowError}"/>
+
+                </Children>
+              </Panel>
+            </Children>
+          </Panel>
+          
+          <me:NoDeviceExists Name="NoDeviceExists" Visible="false"/>
+          
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  
+  
+  
+  <UI Name="WirelessSyncSaving">
+    <Properties>
+      <zune:CategoryPage Name="Page" CategoryPage="$Required" />
+    </Properties>
+    <Locals>
+      <iris:Command Name="LocalCancelButton" Description="{zune:Shell.LoadString(zune:StringId.IDS_DIALOG_CANCEL)}"/>
+    </Locals>
+    
+    
+    
+    <Scripts>
+      <Script>
+        zune:SyncSetupManager.Instance.SetWirelessSettings();
+        Description.Content = sys:String.Format(zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_SETTINGS_ATTEMPTING), zune:SyncSetupManager.Instance.SavingProfileName);
+        
+        
+        
+        
+        Page.CancelButton = LocalCancelButton;
+      </Script>
+      <Script>
+        [DeclareTrigger(LocalCancelButton.Invoked)]
+        zune:SyncSetupManager.Instance.CancelSetWirelessSettings();
+        Canceling.Visible = true;
+        
+        
+        
+      </Script>
+    </Scripts>
+    <Content>
+      <Panel>
+        <Layout>
+          <FlowLayout Orientation="Vertical" Spacing="10,0"/>
+        </Layout>
+        <Children>
+
+          <core:Label Name="Description" 
+                      Content="{null}"
+                      Style="{styles:SharedStyles.PodcastText}"
+                      WordWrap="true"/>
+          <core:Label Name="Canceling"
+                      Content="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_CANCELING)}"
+                      Style="{styles:SharedStyles.PodcastText}"
+                      Visible="false"/>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  
+  
+  
+  <UI Name="PasswordTextBox">
+    <Properties>
+      <EditableTextData Name="KeyEditBox" EditableTextData="$Required"/>
+      <iris:BooleanChoice Name="ShowClearTextModel"
+                          Description="{zune:Shell.LoadString(zune:StringId.IDS_WIRELESS_SHOW_CLEAR_TEXT)}"
+                          Value="false"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+        [DeclareTrigger(ShowClearTextModel.Value)]
+        KeyEdit.PasswordMasked = !ShowClearTextModel.Value;
+      </Script>
+    </Scripts>
+    <Content>
+      <Panel>
+        <Layout>
+          <FlowLayout Orientation="Vertical" Spacing="5,0"/>
+        </Layout>
+        <Children>
+
+          <Panel Layout="Anchor">
+            <Children>
+
+              <core:Editbox Name="KeyEdit"
+                            Model="{KeyEditBox}"
+                            TileMinSize="325,18"
+                            TileMaxSize="325,18"
+                            TilePadding="4,0,4,0"
+                            PasswordMasked="{!ShowClearTextModel.Value}"/>
+              <ColorFill Content="{styles:Styles.EditTextBorder}">
+                <LayoutInput>
+                  <AnchorLayoutInput Left="KeyEdit,0" Top="KeyEdit,0" Right="KeyEdit,1" Bottom="KeyEdit,1"/>
+                </LayoutInput>
+                <Children>
+                  <ColorFill Content="{styles:Styles.EditTextBackground}" Margins="1,1,1,1"/>
+                </Children>
+              </ColorFill>
+
+            </Children>
+          </Panel>
+          <mgmt:CheckBox Name="ShowClearText"
+                         Model="{ShowClearTextModel}"
+                         Available="true"/>
+
+        </Children>
+      </Panel>
+
+    </Content>
+  </UI>
+
+  <Class Name="FormatDialog" Base="dialog:Dialog">
+    <Properties>
+      <zune:FormatCompletionListener Name="Listener"/>
+
+      <String Name="ContentUI" String="res://ZuneShellResources!DeviceSyncSetup.uix#FormatDialogContent"/>
+
+      <zune:DialogHelper Name="Helper"/>
+    </Properties>
+    <Scripts>
+      <Script>
+        if ([Helper.IsVisible] &amp;&amp;
+            !Listener.IsFormatting)
+        {
+          Helper.Hide();
+        }
+      </Script>
+      <Script>
+        [DeclareTrigger(Listener.Completed.Invoked)]
+        if (Helper.IsVisible)
+        {
+          Helper.Hide();
+        }
+      </Script>
+    </Scripts>
+  </Class>
+
+  <UI Name="FormatDialogContent" Base="dialog:DialogContentUI">
+    <Properties>
+      <me:FormatDialog Name="Dialog" FormatDialog="$Required"/>
+    </Properties>
+    <Content>
+
+      <Panel>
+        <Layout>
+          <FlowLayout Orientation="Vertical" Spacing="4,0" StripAlignment="Near"/>
+        </Layout>
+        <Children>
+
+          <core:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_FORMAT_IN_PROGRESS_HEADER)}" Style="{styles:SharedStyles.DialogHeaderStyle}"/>
+
+          <core:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_FORMAT_IN_PROGRESS)}" Style="{styles:SharedStyles.DialogTextStyle}" Margins="0,10,0,0"/>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  <UI Name="ConversionSettings">
+    <Properties>
+      <zune:CategoryPage Name="Page" CategoryPage="$Required" />
+    </Properties>
+    <Locals>
+      <iris:Command Name="ChangeButtonModel" Description="{zune:Shell.LoadString(zune:StringId.IDS_CACHE_LOCATION_BUTTON)}"/>
+      <iris:Command Name="ClearButtonModel" Description="{zune:Shell.LoadString(zune:StringId.IDS_CACHE_CLEAR_BUTTON)}"/>
+
+      <iris:BooleanChoice Name="TranscodeCheckboxModel"
+                          Description="{zune:Shell.LoadString(zune:StringId.IDS_CACHE_TRANSCODE_IN_BACKGROUND)}"
+                          Value="{zune:SyncSetupManager.Instance.TranscodeInBG}"/>
+
+      <EditableTextData Name="DiskSpaceEditBox" MaxLength="6"/>
+
+      <Boolean Name="ShowAnyItems" Boolean="{zune:SyncControls.Instance.CurrentDeviceExists}"/>
+    </Locals>
+    <Scripts>
+      <Script>
+        DiskSpaceEditBox.Value = [zune:SyncSetupManager.Instance.TranscodeSizeLimit];
+      </Script>
+      <Script>
+        CacheDirectoryText.Content = [zune:SyncSetupManager.Instance.TranscodeCacheLocation];
+      </Script>
+      <Script>
+        [DeclareTrigger(ChangeButtonModel.Invoked)]
+        zune:SyncSetupManager.Instance.ChangeTranscodeFolder();
+      </Script>
+      <Script>
+        [DeclareTrigger(ClearButtonModel.Invoked)]
+        zune:SyncSetupManager.Instance.ClearTranscodeFolder();
+      </Script>
+      <Script>
+        zune:SyncSetupManager.Instance.TranscodeSizeLimit = [DiskSpaceEditBox.Value];
+      </Script>
+      <Script>
+        zune:SyncSetupManager.Instance.TranscodeInBG = [TranscodeCheckboxModel.Value];
+      </Script>
+    </Scripts>
+    <Content>
+      <Panel>
+        <Children>
+
+          <Panel Visible="{ShowAnyItems}">
+            <Layout>
+              <FlowLayout Orientation="Vertical" Spacing="4,0" StripAlignment="Near"/>
+            </Layout>
+            <Children>
+
+              <mgmt:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_CACHE_LOCATION_HEADER)}"/>
+              <core:Label Name="CacheDirectoryText">
+                <Style>
+                  <styles:LabelStyle Font="{styles:Styles.SettingsText}" Color="{styles:Styles.SettingsTextActive}"/>
+                </Style>
+              </core:Label>
+
+              <Panel Padding="0,0,0,15">
+                <Layout>
+                  <FlowLayout Orientation="Horizontal" Spacing="4,0" StripAlignment="Near"/>
+                </Layout>
+                <Children>
+
+                  <core:ActionButton Name="ChangeButton" Model="{ChangeButtonModel}" TileMinSize="90,0"/>
+
+                  <core:ActionButton Name="ClearButton" Model="{ClearButtonModel}" TileMinSize="90,0"/>
+
+                </Children>
+              </Panel>
+
+
+              <mgmt:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_CACHE_SIZE_HEADER)}"/>
+
+              <Panel Padding="0,0,0,15">
+                <Layout>
+                  <FlowLayout Orientation="Horizontal" Spacing="4,0" StripAlignment="Near" ItemAlignment="Center"/>
+                </Layout>
+                <Children>
+
+                  <Text Name="CacheSizePrefix" Color="{styles:Styles.SettingsTextActive}" Font="{styles:Styles.SettingsText}" WordWrap="false"
+                        Content="{zune:Shell.LoadString(zune:StringId.IDS_CACHE_SIZE_PREFIX)}"/>
+
+                  <Panel Layout="Anchor">
+                    <Children>
+
+                      <core:Editbox Name="SpaceText" Model="{DiskSpaceEditBox}" TileMaxSize="120,0" TileMinSize="120,0" />
+
+                      <ColorFill Content="{styles:Styles.EditTextBorder}" MinimumSize="120,22">
+                        <LayoutInput>
+                          <AnchorLayoutInput Left="SpaceText,0" Top="SpaceText,0"/>
+                        </LayoutInput>
+                        <Children>
+                          <ColorFill Content="White" MinimumSize="120,22" Margins="1,1,1,1"/>
+                        </Children>
+                      </ColorFill>
+
+                    </Children>
+                  </Panel>
+                  
+                  <Text Name="CacheSizePostfix" Color="{styles:Styles.SettingsTextActive}" Font="{styles:Styles.SettingsText}" WordWrap="false"
+                        Content="{zune:Shell.LoadString(zune:StringId.IDS_CACHE_SIZE_POSTFIX)}"/>
+
+                </Children>
+              </Panel>
+
+              <mgmt:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_CACHE_USE_HEADER)}"/>
+
+              <mgmt:CheckBox Name="TranscodeCheckbox" Model="{TranscodeCheckboxModel}" Margins="15,0,0,0"/>
+
+            </Children>
+          </Panel>
+
+          <me:NoDeviceExists Visible="{!ShowAnyItems}"/>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  <UI Name="SpaceReservation">
+    <Properties>
+      <zune:CategoryPage Name="Page" CategoryPage="$Required" />
+    </Properties>
+    <Locals>
+      <iris:RangedValue Name="SliderModel" MinValue="0.0" MaxValue="100.0" Value="{zune:SyncSetupManager.Instance.ReservedSpaceOnDevice}"/>
+      <String Name="ReadoutBase" String="{zune:Shell.LoadString(zune:StringId.IDS_SPACE_RESERVATION_READOUT)}"/>
+    </Locals>
+    <Scripts>
+      <Script>
+        [DeclareTrigger(SliderModel.Value)]
+        zune:SyncSetupManager.Instance.ReservedSpaceOnDevice = SliderModel.Value;
+      </Script>
+      <Script>
+        if ([Slider.Dragging])
+        {
+          Readout.Content = ReadoutBase.Format((Int32)[Slider.UpdateValue]);
+        }
+        else
+        {
+          Readout.Content = ReadoutBase.Format((Int32)[SliderModel.Value]);
+        }
+      </Script>
+      <Script>
+        
+        bool currentDeviceConnected = [zune:SyncControls.Instance.CurrentDeviceConnected];
+        bool isPartnered = [zune:SyncSetupManager.Instance.DevicePartnership] == zune:SyncPartnership.SyncWithThisMachine;
+
+        SpaceReservationOptions.Visible = currentDeviceConnected &amp;&amp; isPartnered;
+        PartnersOnly.Visible = currentDeviceConnected &amp;&amp; !isPartnered;
+        NoDeviceExists.Visible = !currentDeviceConnected;
+      </Script>
+    </Scripts>
+    <Content>
+      <Panel>
+        <Children>
+
+          <Panel Name="SpaceReservationOptions" Visible="false">
+            <Layout>
+              <FlowLayout Orientation="Vertical" Spacing="4,0" StripAlignment="Near"/>
+            </Layout>
+            <Children>
+
+              <mgmt:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_SPACE_RESERVATION_HEADER)}" Padding="0,0,0,5"/>
+              
+              <Text Content="{zune:Shell.LoadString(zune:StringId.IDS_SPACE_RESERVATION_DESCRIPTION)}" Color="{styles:Styles.SettingsTextActive}" Font="{styles:Styles.SettingsText}" WordWrap="true" Padding="0,0,0,5"/>
+
+              <Panel>
+                <Layout>
+                  <FlowLayout Orientation="Horizontal" Spacing="8,0" StripAlignment="Near"/>
+                </Layout>
+                <Children>
+
+                  <core:Slider
+                      Name="Slider"
+                      Model="{SliderModel}"
+                      FilledBackgroundImage="{styles:Styles.SliderFill}"
+                      KeyDelta="5.0"
+                      KeyDeltaShift="1.0"
+                      KeyDeltaCtrl="10.0"
+                      KeyDeltaPage="20.0"
+                      MaximumSize="300,0"
+                      DiscreteValues="true"
+                      AutoUpdateDuringDrag="false">
+                  </core:Slider>
+
+                  <mgmt:Label Name="Readout" Content=""/>
+
+                </Children>
+              </Panel>
+
+            </Children>
+          </Panel>
+
+          <me:PartnersOnly Name="PartnersOnly"  Visible="false"/>
+          
+          <me:NoDeviceExists Name="NoDeviceExists" Visible="false"/>
+          
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  <UI Name="NoDeviceExists">
+    <Content>
+      <Text Content="{zune:Shell.LoadString(zune:StringId.IDS_OPTION_FOR_EXISTING_ONLY)}" 
+            Color="{styles:Styles.SettingsTextActive}" Font="{styles:Styles.SettingsText}" WordWrap="true"/>
+    </Content>
+  </UI>
+  
+  <UI Name="PartnersOnly">
+    <Content>
+      <Text Content="{zune:Shell.LoadString(zune:StringId.IDS_OPTION_FOR_PARTNERS_ONLY)}" 
+            Color="{styles:Styles.SettingsTextActive}" Font="{styles:Styles.SettingsText}" WordWrap="true"/>
+    </Content>
+  </UI>
+  
+</UIX>
diff --git a/test/2.1/DIALOG.UIX b/test/2.1/DIALOG.UIX
new file mode 100644
index 0000000..b94463a
--- /dev/null
+++ b/test/2.1/DIALOG.UIX
@@ -0,0 +1,247 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:anim="res://ZuneShellResources!Animations.uix"
+  xmlns:popup="res://ZuneShellResources!Popup.uix"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:nc="res://ZuneShellResources!NonClientControls.uix"
+  xmlns:me="Me"
+  >
+
+  
+  
+  
+
+  
+  
+  
+  <Class Name="Dialog" Base="popup:Popup">
+    <Properties>
+      <zune:DialogHelper Name="Helper"/>
+      <PopupLayoutInput Name="LayoutInput" Placement="Origin"/>
+      <String Name="PopupUI" String="res://ZuneShellResources!Dialog.uix#DialogUI"/>
+      <String Name="ContentUI" String="res://ZuneShellResources!Dialog.uix#DialogContentUI"/>
+      <String Name="AccessibleDescription" String="{null}"/>
+
+      
+      
+      <iris:Command Name="Cancel" Command="{Helper.Cancel}"/>
+    </Properties>
+
+    <Scripts>
+      
+      <Script>
+        [DeclareTrigger(Cancel.Invoked)]
+        
+        
+        
+        if (Cancel != Helper.Cancel)
+        {
+          Helper.Cancel.Invoke();
+        }
+        
+        Helper.Hide();
+      </Script>
+    </Scripts>
+  </Class>
+
+  
+  
+  
+  <UI Name="DialogUI" Base="popup:PopupUI">
+    <Properties>
+      
+      <me:Dialog Name="Popup" Dialog="$Required"/>
+    </Properties>
+
+    <Input>
+      <KeyHandler Name="Escape" Key="Escape" HandlerStage="Bubbled"/>
+      
+      <ClickHandler Name="ClickEater" ClickType="Mouse" HandlerStage="Bubbled, Direct"/>
+    </Input>
+
+    <Scripts>
+      
+      <Script>
+        Host.RequestSource(Popup.ContentUI, "Dialog", Popup);
+
+        Host.NavigateInto();
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(Escape.Invoked)]
+
+        
+        Popup.Cancel.Invoke();
+      </Script>
+    </Scripts>
+
+    <Content>
+      <ColorFill Layout="Dock" Content="{styles:Styles.DialogBackgroundFadeColor}">
+        <Animations>
+          <Animation Animation="{anim:Animations.MenuFadeIn}"/>
+          <Animation Animation="{anim:Animations.MenuFadeOut}"/>
+        </Animations>
+        <Children>
+
+          <Graphic Content="{styles:Styles.DialogDropShadow}" Padding="15,14,15,14" SizingPolicy="SizeToChildren" MouseInteractive="true">
+            <LayoutInput>
+              <DockLayoutInput Alignment="Center"/>
+            </LayoutInput>
+            <Animations>
+              <Animation Animation="{anim:Animations.DialogShow}"/>
+              <Animation Animation="{anim:Animations.DialogHide}"/>
+            </Animations>
+            <Children>
+
+              <Graphic Name="Background" Content="{styles:Styles.DialogBackground}" SizingPolicy="SizeToChildren" MinimumSize="100,60" Layout="Anchor">
+                <Children>
+
+                  <Host Name="Host" Padding="20,20,20,30"/>
+
+                  <Graphic Content="{styles:Styles.EnergyBar}" MaximumSize="0,6">
+                    <LayoutInput>
+                      <AnchorLayoutInput Bottom="Host,1" Left="Host,0" Right="Host,1"/>
+                    </LayoutInput>
+                  </Graphic>
+
+                </Children>
+              </Graphic>
+
+            </Children>
+          </Graphic>
+
+          
+          <nc:WindowCaption Layout="Fill"/>
+
+        </Children>
+      </ColorFill>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="DialogContentUI">
+    <Properties>
+      <me:Dialog Name="Dialog" Dialog="$Required"/>
+    </Properties>
+
+    <Locals>
+      <Accessible Name="Accessible"/>
+    </Locals>
+
+    <Scripts>
+      <Script>UI.KeyInteractive = true;</Script>
+
+      <Script>
+        if ([Accessible.Enabled])
+        {
+          Accessible.Name = [Dialog.AccessibleDescription];
+          Accessible.Role = AccessibleRole.Dialog;
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Text Content="Placeholder content -- use a base class"/>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="MessageBoxContentUI" Base="me:DialogContentUI">
+    <Properties>
+      <zune:MessageBox Name="Model" MessageBox="{(zune:MessageBox)Dialog.Helper}"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+        YesButton.Visible = (Model.Yes != null);
+        NoButton.Visible  = (Model.No != null);
+        OkButton.Visible  = (Model.Ok != null);
+        Dialog.Cancel.Description = Model.Cancel.Description;
+        Dialog.AccessibleDescription = Model.Title;
+        CheckBox.Visible = (Model.DoNotAskMeAgain != null);
+        if (Model.IsOKDefault)
+        {
+          OkButton.FocusOrder = 0;
+        }
+      </Script>    
+    </Scripts>
+      
+    <Content>
+      <Panel Navigation="ContainAll,WrapAll" Margins="10,5,9,0" Layout="Anchor">
+        <Children>
+
+          
+          <core:Label
+            Name="Title" 
+            Content="{Model.Title}"
+            Style="{styles:SharedStyles.DialogHeaderStyle}"
+            WordWrap="true" 
+            Margins="0,0,0,10"
+            MinimumSize="350,0">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Parent,0" Top="Parent,0"/>
+            </LayoutInput>
+          </core:Label>  
+          
+          
+          <core:Label 
+            Name="Message" 
+            Content="{Model.Message}" 
+            Style="{styles:SharedStyles.DialogTextStyle}"
+            WordWrap="true">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Title,0" Right="Title,1" Top="Title,1"/>
+            </LayoutInput>
+            <NamedStyles>
+              <TextStyle Name="b" TextStyle="{styles:SharedStyles.DialogBoldTextStyle}"/>
+            </NamedStyles>
+          </core:Label>
+
+          
+          <Panel Name="CheckBoxPanel">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Title,0" Right="Title,1" Top="Message,1"/>
+            </LayoutInput>
+            <Children>
+              <core:CheckBox Name="CheckBox"
+                Model="{Model.DoNotAskMeAgain}"
+                LabelFont="{styles:Styles.DialogText}"
+                Margins="0,10,0,0">
+              </core:CheckBox>
+            </Children>
+          </Panel>
+
+          
+          <Panel Margins="0,20,0,0">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Title,0" Right="Title,1" Top="CheckBoxPanel,1"/>
+            </LayoutInput>
+            <Layout>
+              <DockLayout SizeToChildren="true" DefaultLayoutInput="Right,Near"/>
+            </Layout>
+            <Children>
+              
+              <core:BigActionButton                  Model="{Dialog.Cancel}" Margins="3,0,0,0" FocusOrder="1"/>
+              <core:BigActionButton Name="OkButton"  Model="{Model.Ok}"      Margins="3,0,0,0"/>
+              <core:BigActionButton Name="NoButton"  Model="{Model.No}"      Margins="3,0,0,0"/>
+              <core:BigActionButton Name="YesButton" Model="{Model.Yes}"     Margins="3,0,0,0"/>
+              
+            </Children>
+          </Panel>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+  
+</UIX> 
+
diff --git a/test/2.1/DRAGFEEDBACK.UIX b/test/2.1/DRAGFEEDBACK.UIX
new file mode 100644
index 0000000..3c5fcdf
--- /dev/null
+++ b/test/2.1/DRAGFEEDBACK.UIX
@@ -0,0 +1,117 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX 
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI" 
+  xmlns:popup="res://ZuneShellResources!Popup.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:core="res://ZuneShellResources!CoreControls.uix"
+  xmlns:me="Me"
+  >
+  
+  
+  
+  
+  
+
+  
+  
+  
+  <Class Name="DragInfo" Shared="true">
+    <Properties>
+      <Boolean Name="IsDraggingInternally"/>
+    </Properties>
+  </Class>
+  
+  
+  
+  
+  <Class Name="DragFeedback" Base="popup:Popup">
+    <Properties>
+      <zune:PopupHelper Name="Helper" ZOrder="0"/>
+      <PopupLayoutInput Name="LayoutInput" Placement="FollowMouseOrigin" StayInBounds="false"
+                        Offset="2,-30"/>
+      <String Name="PopupUI" String="res://ZuneShellResources!DragFeedback.uix#DragFeedbackUI"/>
+      
+            
+      <DropAction Name="DropAction"/>
+
+      
+      <Int32 Name="Count" Int32="1"/>
+      
+      <Image Name="Thumbnail" Image="{null}"/>
+    </Properties>
+  </Class>
+
+  
+  
+  
+  <UI Name="DragFeedbackUI" Base="popup:PopupUI">
+    <Properties>
+      <me:DragFeedback Name="Popup" DragFeedback="{null}" />
+    </Properties>
+    
+    <Scripts>
+      <Script>
+        CountLabel.Content = Popup.Count.ToString();
+        if (Popup.Thumbnail == null)
+          Thumbnail.Content = styles:Styles.DragFallback;
+      </Script>
+      
+      <Script> 
+        bool copying = [Popup.DropAction] == DropAction.Copy;
+
+        Operation.Visible = copying;
+        CountPanel.Visible = !copying;
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Layout="Anchor">
+        <Children>
+          
+          <Panel Name="Indicator">
+            <Children>
+              
+              <Graphic Name="CountPanel" Content="{styles:Styles.DragFeedbackLabel}"
+                   SizingPolicy="SizeToChildren"
+                   MinimumSize="26,26">
+                <Children>
+                  
+                  <core:Label Name="CountLabel"
+                              Style="{styles:SharedStyles.DragFeedbackStyle}" 
+                              Margins="5,3,5,5" Alignment="Center"/>
+                  
+                </Children>
+              </Graphic>
+              
+              <Graphic Name="Operation" 
+                       Content="{styles:Styles.DragCopy}"
+                       SizingPolicy="SizeToContent" StretchingPolicy="None"/>
+              
+            </Children>
+          </Panel>
+          
+          <Graphic Name="ThumbnailPanel"
+                   Content="{styles:Styles.DragFeedbackGlow}"
+                   SizingPolicy="SizeToChildren"
+                   Padding="7,7,7,7" Alpha="0.6">
+            <LayoutInput>
+              <AnchorLayoutInput Right="Indicator,0,20" Top="Indicator,1,-20"
+                   ContributesToWidth="false"
+                   ContributesToHeight="false"/>
+            </LayoutInput>
+            
+            <Children>
+                
+              <Graphic Name="Thumbnail"
+                       Content="{Popup.Thumbnail}" MaximumSize="30,30"
+                       StretchingPolicy="Uniform"/>
+          
+            </Children>
+          </Graphic>
+        </Children>
+      </Panel>
+
+    </Content>
+  </UI>
+</UIX>
diff --git a/test/2.1/EDITBOX.UIX b/test/2.1/EDITBOX.UIX
new file mode 100644
index 0000000..6c4db89
--- /dev/null
+++ b/test/2.1/EDITBOX.UIX
@@ -0,0 +1,212 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:style="res://ZuneShellResources!Style.uix"
+  xmlns:sys="assembly://mscorlib/System"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:button="res://ZuneShellResources!Button.uix"
+  xmlns:me="Me">
+
+  <UI Name="Default">
+    <Content>
+      <me:Editbox>
+        <Model>
+          <EditableTextData Value="Hello"/>
+        </Model>
+      </me:Editbox>
+    </Content>
+  </UI>
+
+  <UI Name="Editbox" Base="button:Label">
+    <Properties>
+      
+      <EditableTextData Name="Model" EditableTextData="{null}"/>
+
+      
+      <style:Style Name="Style" Style="{styles:SharedStyles.EditBoxStyle}"/>
+      <Color Name="TextFocusedColor" Color="{styles:Styles.EditTextFocusedForeground}"/>
+      <Color Name="TextHighlightColor" Color="{styles:Styles.EditTextFocusedBackground}"/>
+      <Color Name="CaretColor" Color="{styles:Styles.CaretColor}"/>
+      <Color Name="BackgroundColor" Color="Transparent"/>
+      <Color Name="BackgroundColorFocus" Color="{BackgroundColor}"/>
+
+      
+      <Size Name="TileMinSize" Size="176,0"/>
+      <Size Name="TileMaxSize" Size="176,0"/>
+      <Inset Name="TilePadding" Inset="10,2,10,2"/>
+
+      
+      <Boolean Name="PasswordMasked" Boolean="false"/>
+
+      <Int32 Name="DefaultHeight" Int32="22"/>
+
+      <AccessibleRole Name="AccessibleRole" AccessibleRole="Text"/>
+    </Properties>
+
+    <Locals>
+      <AnchorLayoutInput Name="CaretPosition" Left="Label,0" Top="Label,0"/>
+      <AnchorLayoutInput Name="DummyPosition"/>
+
+      <TransformAnimation Name="CaretBlink" Source="{me:CaretBlinkAnimation.CaretBlink}"/>
+    </Locals>
+
+    <Input>
+      
+      <TextEditingHandler Name="TypingHandler" Overtype="true" />
+    </Input>
+
+    <Scripts>
+
+      <Script>
+        if ((Model != null) &amp;&amp; !Label.WordWrap)
+        {
+          
+          sys:String value = [Model.Value];
+
+          if (!String.IsNullOrEmpty(value))
+          {
+            if (value.Contains("\r\n"))
+            {
+              Model.Value = value.Replace("\r\n", " ");
+            }
+          }
+        }
+      </Script>
+
+      
+      <Script>
+        ShowToolTipWhenClipped = false;
+
+        
+        
+        
+        if (Model == null)
+        {
+          Model = new EditableTextData();
+          Model.Value = Content;
+        }
+
+        TypingHandler.TextDisplay = Label;
+
+        
+        
+        
+        
+        
+
+        if (DefaultHeight != 0)
+        {
+          if (TileMinSize.Height == 0)
+          {
+              TileMinSize = new Size(TileMinSize.Width, DefaultHeight);
+          }
+          if (TileMaxSize.Height == 0)
+          {
+              TileMaxSize = new Size(TileMaxSize.Width, DefaultHeight);
+          }
+        }
+        Tile.MinimumSize = TileMinSize;
+
+        Tile.MaximumSize = TileMaxSize;
+
+      </Script>
+
+      
+      <Script> TypingHandler.EditableTextData = [Model]; </Script>
+
+
+      <Script> Content = [Model.Value]; </Script>
+      <Script> Label.UsePasswordMask = [PasswordMasked]; </Script>
+
+      
+      <Script>
+        [DeclareTrigger(TypingHandler.CaretInfo.Position)]
+
+        CaretPosition.Left.Offset = TypingHandler.CaretInfo.Position.X;
+        CaretPosition.Top.Offset = TypingHandler.CaretInfo.Position.Y;
+        Caret.LayoutInput = DummyPosition;
+        Caret.LayoutInput = CaretPosition;
+      </Script>
+
+      <Script> Caret.Visible = [TypingHandler.CaretInfo.Visible]; </Script>
+
+      <Script>
+          Caret.MaximumSize = [TypingHandler.CaretInfo.SuggestedSize];
+          Caret.MinimumSize = [TypingHandler.CaretInfo.SuggestedSize];
+
+          
+          
+          Label.MinimumSize = Caret.MinimumSize;
+
+      </Script>
+
+      <Script>
+        
+        Label.Margins=new Inset(0,0,TypingHandler.CaretInfo.IdealWidth, 0);
+      </Script>
+
+      
+      <Script>
+        CaretBlink.TimeScale = TypingHandler.CaretInfo.BlinkTime;
+      </Script>
+
+      <Script>
+        if ([Accessible.Enabled])
+        {
+          Accessible.IsProtected = PasswordMasked;
+        }
+      </Script>
+
+      <Script>
+        if ([UI.DeepKeyFocus])
+        {
+          Tile.Content = BackgroundColorFocus;
+        }
+        else
+        {
+          Tile.Content = BackgroundColor;
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      <ColorFill Name="Tile" Layout="Anchor" Navigation="ContainHorizontal"
+          MouseInteractive="true" Padding="{TilePadding}">
+        <Children>
+          
+          <ColorFill Name="Caret" Content="{CaretColor}"
+              Layout="Fill" LayoutInput="{CaretPosition}">
+            <Animations>
+                <TransformAnimation TransformAnimation="{CaretBlink}"/>
+            </Animations>
+          </ColorFill>
+
+          
+          <Text Name="Label" FadeSize="1"
+              HighlightColor="{TextHighlightColor}" TextHighlightColor="{TextFocusedColor}"/>
+        </Children>
+      </ColorFill>
+    </Content>
+  </UI>
+
+
+  
+
+
+
+  <Class Name="CaretBlinkAnimation" Shared="true">
+
+      <Properties>
+          <Animation Name="CaretBlink" Type="Show" Loop="-1">
+              <Keyframes>
+                  <AlphaKeyframe Time="0.0" Value="1.0"/>
+                  <AlphaKeyframe Time="0.9" Value="1.0"/>
+                  <AlphaKeyframe Time="1.0" Value="0.0"/>
+                  <AlphaKeyframe Time="1.9" Value="0.0"/>
+                  <AlphaKeyframe Time="2.0" Value="1.0"/>
+              </Keyframes>
+          </Animation>
+      </Properties>
+  </Class>
+
+</UIX>
diff --git a/test/2.1/EMPTYCOLLECTIONPANEL.UIX b/test/2.1/EMPTYCOLLECTIONPANEL.UIX
new file mode 100644
index 0000000..a8f738d
--- /dev/null
+++ b/test/2.1/EMPTYCOLLECTIONPANEL.UIX
@@ -0,0 +1,43 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:lib="res://ZuneShellResources!Library.uix"
+  xmlns:dialogs="res://ZuneShellResources!PodcastDialogs.uix">
+
+  
+  
+  
+  <UI Name="EmptyCollectionPanel" Base="lib:EmptyPage">
+    <Properties>
+      <String Name="Title" String="{zune:Shell.LoadString(zune:StringId.IDS_PODCAST_ABOUT_TITLE)}"/>
+      <iris:Command Name="Link1Command" Description="{zune:Shell.LoadString(zune:StringId.IDS_PODCAST_MARKETPLACE_HUB_BUTTON)}"/>
+      <iris:Command Name="Link2Command" Description="{zune:Shell.LoadString(zune:StringId.IDS_PODCAST_ADD_URL_BUTTON)}"/>
+    </Properties>
+
+    <Locals>
+      <dialogs:SubscribeDialog Name="SubscribeDialog" SubscribeDialog="{null}"/>
+    </Locals>
+
+    <Scripts>
+      
+      <Script>
+        [DeclareTrigger(Link1Command.Invoked)]
+
+        zune:Shell.DefaultInstance.Execute("Marketplace\Podcasts\Home", null);
+      </Script>
+      
+      
+      <Script>
+        [DeclareTrigger(Link2Command.Invoked)]
+
+        if (SubscribeDialog == null)
+        {
+          SubscribeDialog = new dialogs:SubscribeDialog();
+        }
+        SubscribeDialog.Helper.Show(SubscribeDialog);
+      </Script>
+    </Scripts>
+  </UI>
+</UIX>
\ No newline at end of file
diff --git a/test/2.1/ERRORDIALOG.UIX b/test/2.1/ERRORDIALOG.UIX
new file mode 100644
index 0000000..28d6d1c
--- /dev/null
+++ b/test/2.1/ERRORDIALOG.UIX
@@ -0,0 +1,101 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX 
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI" 
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:dialog="res://ZuneShellResources!Dialog.uix"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:linkButtons="res://ZuneShellResources!LinkButtons.uix" 
+  >
+
+  
+    
+
+  
+  
+  
+  <UI Name="ErrorDialogContentUI" Base="dialog:DialogContentUI">
+    <Locals>
+      <zune:ErrorDialogInfo Name="Model" ErrorDialogInfo="{(zune:ErrorDialogInfo)Dialog.Helper}"/>
+      <zune:WebHelpCommand Name="WebHelp" 
+          Description="{zune:Shell.LoadString(zune:StringId.IDS_DIALOG_WEBHELP)}"
+          Url="{Model.WebHelpUrl}"/>
+    </Locals>
+
+    <Scripts>
+      
+      <Script>
+        Dialog.Cancel.Description = zune:Shell.LoadString(zune:StringId.IDS_DIALOG_OK);
+        Dialog.AccessibleDescription = "{0}. {1}".Format(Model.Title, Model.Description);
+      </Script>
+
+      
+      <Script>
+        if (Model.OriginalHR != 0 &amp;&amp; Model.HR != Model.OriginalHR)
+        {
+          OriginalErrorCode.Visible = true;
+          OriginalErrorCode.Content = "({0:X8})".Format(Model.OriginalHR);
+        }
+      </Script>
+    </Scripts>
+    
+    <Content>
+      <Panel Navigation="ContainAll,WrapAll" MaximumSize="300,0" Margins="10">
+        <Layout>
+          <FlowLayout ItemAlignment="Near" Orientation="Vertical"/>
+        </Layout>
+        <Children>
+
+          <core:Label 
+            Content="{Model.Title}" 
+            Style="{styles:SharedStyles.DialogHeaderStyle}"
+            WordWrap="true"
+            />
+          
+          <core:Label
+            Content="{zune:Shell.LoadString(zune:StringId.IDS_DIALOG_ERROR_SUMMARY)}" Margins="0,10,0,0"
+            Style="{styles:SharedStyles.DialogSubHeaderStyle}"
+            WordWrap="true"
+            />
+          
+          <core:Label
+            Content="{Model.Description}" 
+            Style="{styles:SharedStyles.DialogTextStyle}"
+            WordWrap="true"
+            />
+          
+          <core:Label
+            Content="{zune:Shell.LoadString(zune:StringId.IDS_DIALOG_ERROR_CODE)}" Margins="0,10,0,0" 
+            Style="{styles:SharedStyles.DialogSubHeaderStyle}"
+            WordWrap="true"
+            />
+          
+          <core:Label
+            Content='{"{0:X8}".Format(Model.HR)}' 
+            Style="{styles:SharedStyles.DialogTextStyle}"
+            />
+
+          <core:Label Name="OriginalErrorCode" 
+            Style="{styles:SharedStyles.DialogTextStyle}"
+            Visible="false"
+            />
+          
+          <linkButtons:ExternalLink Model="{WebHelp}" Margins="0,10,10,0" ToolTipEnabled="false"/>
+
+          <Panel>
+            <Layout>
+              <DockLayout SizeToChildren="true" DefaultLayoutInput="Right,Near"/>
+            </Layout>
+            <Children>
+
+              <core:BigActionButton Model="{Dialog.Cancel}" Margins="0,10,10,0" ToolTipEnabled="false" FocusOrder="0"/>         
+              
+            </Children>
+          </Panel>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+</UIX> 
diff --git a/test/2.1/EXPLICITWARNING.UIX b/test/2.1/EXPLICITWARNING.UIX
new file mode 100644
index 0000000..2223cad
--- /dev/null
+++ b/test/2.1/EXPLICITWARNING.UIX
@@ -0,0 +1,18 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX 
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix">
+
+  
+  <UI Name="PodcastExplicitWarning">
+    <Content>
+      <Graphic Content="{styles:Styles.WarningBackground}" SizingPolicy="SizeToChildren" MinimumSize="13,0" Padding="3,-1,3,1">
+        <Children>
+          <core:Label Name="ExplicitLabel" Content="{zune:Shell.LoadString(zune:StringId.IDS_EXPLICIT_TEXT)}" Style="{styles:SharedStyles.PodcastWarningStyle}"/>
+        </Children>
+      </Graphic>
+    </Content>
+  </UI>
+</UIX>
diff --git a/test/2.1/FILTERLIST.UIX b/test/2.1/FILTERLIST.UIX
new file mode 100644
index 0000000..1639135
--- /dev/null
+++ b/test/2.1/FILTERLIST.UIX
@@ -0,0 +1,199 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX 
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris" 
+  xmlns:anim="res://ZuneShellResources!Animations.uix"
+  xmlns:style="res://ZuneShellResources!Style.uix"
+  xmlns:core="res://ZuneShellResources!CoreControls.uix" 
+  xmlns:me="Me">
+
+  
+  
+  
+  <UI Name="Default">
+    <Content>
+      <Panel Layout="VerticalFlow">
+        <Children>
+
+          <me:FilterList>
+            <Filters>
+              <iris:Choice Description="Numbers">
+                <Options>
+                  <String String="One"/>
+                  <String String="Two"/>
+                  <String String="Three"/>
+                </Options>
+              </iris:Choice>
+            </Filters>
+          </me:FilterList>
+
+          <me:FilterList>
+            <Filters>
+              <iris:Choice Description="Letters">
+                <Options>
+                  <iris:Command Description="A"/>
+                  <iris:Command Description="B"/>
+                  <iris:Command Description="C"/>
+                </Options>
+              </iris:Choice>
+            </Filters>
+          </me:FilterList>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+  
+  
+  
+  
+  <Class Name="FilterLabelProvider" Base="core:ModelButtonProvider">
+    <Scripts>
+      <Script>
+        
+        
+        if ([Model] != null)
+        {
+          if (Model is iris:ModelItem)
+          {
+            PrimaryLabel = [((iris:ModelItem)Model).Description];
+          }
+          else
+          {
+            PrimaryLabel = Model.ToString();
+          }
+        }
+      </Script>
+    </Scripts>
+  </Class>
+
+  
+  
+  
+  
+  <UI Name="FilterList">
+    <Properties>
+      <iris:Choice Name="Filters" Choice="{null}"/>
+      <Type Name="FilterLabelProvider" Type="{typeof(me:FilterLabelProvider)}"/>
+
+      <ItemAlignment Name="ItemAlignment" ItemAlignment="Near"/>
+
+      <style:Style Name="Style" Style="{null}"/>
+      <style:Style Name="SelectedStyle" Style="{Style}"/>
+      
+      <Int32 Name="Spacing" Int32="12"/>
+      <Orientation Name="Orientation" Orientation="Horizontal"/>
+
+      
+      <Boolean Name="Animate" Boolean="true"/>
+    </Properties>
+
+    <Locals>
+      <Accessible Name="Accessible"/>
+
+      <iris:BooleanChoice Name="ShouldAnimate" Value="{Animate}"/>
+      <SwitchAnimation Name="PivotSlide" Expression="{ShouldAnimate}">
+        <Options>
+          <TransformByAttributeAnimation Name="True" Attribute="Index" Delay="0.125">
+            <Source>
+              <Animation Animation="{anim:Animations.PivotShowAnim}"/>
+            </Source>
+          </TransformByAttributeAnimation>
+        </Options>
+      </SwitchAnimation>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        if (Filters != null)
+        {
+          Repeater.Source = [Filters.Options];
+        }
+      </Script>
+
+      <Script>
+        if ([Accessible.Enabled])
+        {
+          Accessible.Role = AccessibleRole.List;
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Repeater Name="Repeater">
+        <Layout>
+          <FlowLayout Orientation="{Orientation}" ItemAlignment="{ItemAlignment}">
+            <Spacing>
+              <MajorMinor Major="{Spacing}" Minor="0"/>
+            </Spacing>
+          </FlowLayout>
+        </Layout>
+        <Content>
+
+          <me:FilterButton Option="{RepeatedItem}" Choice="{Filters}" Style="{Style}" SelectedStyle="{SelectedStyle}">
+            <Provider>
+              <core:ModelButtonProvider ModelButtonProvider="{FilterLabelProvider}" Model="{RepeatedItem}"/>
+            </Provider>
+            <Animations>
+              <SwitchAnimation SwitchAnimation="{PivotSlide}" />
+            </Animations>
+          </me:FilterButton>
+
+        </Content>
+      </Repeater>
+    </Content>
+  </UI>
+
+  
+  
+  
+  
+  <UI Name="FilterButton">
+    <Properties>
+      <Object Name="Option" Object="$Required"/>
+      <iris:Choice Name="Choice" Choice="$Required"/>
+      <core:ModelButtonProvider Name="Provider" ModelButtonProvider="$Required"/>
+
+      <style:Style Name="Style" Style="{null}"/>
+      <style:Style Name="SelectedStyle" Style="{Style}"/>
+    </Properties>
+
+    <Locals>
+      <iris:Command Name="SelectOption"/>
+    </Locals>
+
+    <Scripts>
+      
+      <Script>
+        [DeclareTrigger(SelectOption.Invoked)]
+        Choice.Chosen = Option;
+      </Script>
+
+      
+      <Script>
+        bool iAmTheChosenOne = ([Choice.Chosen] == Option);
+        SelectOption.Selected = iAmTheChosenOne;
+        if (iAmTheChosenOne)
+        {
+          Button.OverrideStyle = [SelectedStyle];
+        }
+        else
+        {
+          Button.OverrideStyle = [Style];
+        }
+      </Script>
+
+      <Script>
+        if (Provider != null)
+        {
+          SelectOption.Description = [Provider.PrimaryLabel];
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      <core:Button Name="Button" Model="{SelectOption}" OverrideStyle="{Style}" Navigation="TabGroup"/>
+    </Content>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/FOCUSRECT.UIX b/test/2.1/FOCUSRECT.UIX
new file mode 100644
index 0000000..9380edd
--- /dev/null
+++ b/test/2.1/FOCUSRECT.UIX
@@ -0,0 +1,93 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:me="Me">
+
+  
+  <UI Name="FocusRect">
+    <Content>
+      <Panel Layout="Anchor">
+        <Children>
+          
+          <me:FocusRectStrip Name="Left" Vertical="true">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Parent,0" Right="Parent,0,1" Top="Parent,0" Bottom="Parent,1"/>
+            </LayoutInput>
+          </me:FocusRectStrip>
+          
+          <me:FocusRectStrip Name="Top">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Parent,0" Right="Parent,1" Top="Parent,0"/>
+            </LayoutInput>
+          </me:FocusRectStrip>
+          
+          <me:FocusRectStrip Name="Right" Vertical="true">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Parent,1,-1" Right="Parent,1" Top="Parent,0" Bottom="Parent,1"/>
+            </LayoutInput>
+          </me:FocusRectStrip>
+                    
+          <me:FocusRectStrip Name="Bottom">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Parent,0" Right="Parent,1" Top="Parent,1,-1" Bottom="Parent,1"/>
+            </LayoutInput>
+          </me:FocusRectStrip>
+          
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+  
+  
+  <UI Name="FocusRectStrip">
+    <Properties>
+      <Boolean Name="Vertical" Boolean="false"/>
+    </Properties>
+    
+    <Locals>
+      <Image Name="FocusRectImage" Image="{null}"/>
+      
+      <DockLayout Name="HorizontalLayout" DefaultLayoutInput="Left,Near"/>
+      <DockLayout Name="VerticalLayout" DefaultLayoutInput="Top,Near"/>
+    </Locals>
+    
+    <Scripts>
+      <Script>
+        if (Vertical)
+        {
+          Repeater.Layout = VerticalLayout;
+          FocusRectImage = me:FocusRectGlobals.FocusRectVertical;
+        }
+        else
+        {
+          Repeater.Layout = HorizontalLayout;
+          FocusRectImage = me:FocusRectGlobals.FocusRectHorizontal;
+        }
+      </Script>
+    </Scripts>
+    
+    <Content>
+      <Repeater Name="Repeater" Source="{me:FocusRectGlobals.RepeatList}">
+        <Content>
+      
+          <Graphic Content="{FocusRectImage}" StretchingPolicy="None" />
+        
+        </Content>
+      </Repeater>
+    </Content>
+  </UI>
+  
+  
+  <Class Name="FocusRectGlobals" Shared="true">
+    <Properties>
+      <Image Name="FocusRectHorizontal" Source="res://ZuneShellResources!FocusRect.Horizontal.png"/>
+      <Image Name="FocusRectVertical" Source="res://ZuneShellResources!FocusRect.Vertical.png"/>
+
+      
+
+
+      <iris:VirtualList Name="RepeatList" Count="100"/>
+    </Properties>
+  </Class>
+</UIX>
diff --git a/test/2.1/FRAME.UIX b/test/2.1/FRAME.UIX
new file mode 100644
index 0000000..5ba917e
--- /dev/null
+++ b/test/2.1/FRAME.UIX
@@ -0,0 +1,382 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:sys="assembly://mscorlib/System"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:page="res://ZuneShellResources!PageStack.uix"
+  xmlns:toptoolbar="res://ZuneShellResources!TopToolbar.uix"
+  xmlns:popuplayer="res://ZuneShellResources!PopupLayer.uix"
+  xmlns:jil="res://ZuneShellResources!JumpInList.uix"
+  xmlns:bottomtoolbar="res://ZuneShellResources!BottomToolbar.uix"
+  xmlns:mnav="res://ZuneMarketplaceResources!Navigation.uix"
+  xmlns:cnav="res://ZuneShellResources!CollectionNavigation.uix"
+  xmlns:snav="res://ZuneShellResources!SocialNavigation.uix"
+  xmlns:animations="res://ZuneShellResources!Animations.uix"
+  xmlns:nonclient="res://ZuneShellResources!NonClientControls.uix"
+  xmlns:focus="res://ZuneShellResources!FocusRect.uix">
+
+  
+  <UI Name="Frame" Base="page:PageStack">
+    <Properties>
+      <zune:Shell Name="Shell" Shell="{(zune:Shell)zune:Shell.DefaultInstance}"/>
+    </Properties>
+
+    <Locals>
+      <zune:DictionaryCommandHandler Name="ShellCommandHandlers">
+        <Handlers>
+
+          <zune:CurrentPageCommandHandler Name="Page"/>
+
+          <zune:DictionaryCommandHandler Name="Marketplace"
+            DictionaryCommandHandler="{mnav:Navigation.Root}"/>
+
+          <zune:DictionaryCommandHandler Name="Collection"
+            DictionaryCommandHandler="{cnav:Navigation.Root}"/>
+
+          <zune:DictionaryCommandHandler Name="Device"
+            DictionaryCommandHandler="{cnav:DeviceNavigation.Root}"/>
+
+          <zune:DictionaryCommandHandler Name="Social"
+            DictionaryCommandHandler="{snav:Navigation.Root}"/>
+
+          <zune:WebUrlCommandHandler Name="Web"/>
+
+          <zune:HelpCommandHandler Name="Help"/>
+
+        </Handlers>
+      </zune:DictionaryCommandHandler>
+      <jil:JumpInList Name="JumpInList"/>
+
+      
+      
+      <AnchorLayoutInput Name="EnergyBarLayoutMax" Bottom="Parent,1" Left="Parent,0" Right="Parent,1,-1"/>
+      <AnchorLayoutInput Name="EnergyBarLayoutNorm" Bottom="Parent,1" Left="Parent,0,1" Right="Grabber,0"/>
+
+      <Int32 Name="MouseActivityTimeout" Int32="5000"/>
+
+      <sys:Boolean Name="AutoHideToolbars"/>
+      <Timer Name="KeyIdleTimer" Interval="{MouseActivityTimeout}" AutoRepeat="false" Enabled="false"/>
+      <styles:WindowState Name="WindowState"/>
+    </Locals>
+
+    <Input>
+      
+      <ClickHandler Name="MouseDown" ClickType="Mouse" HandlerTransition="Down" HandlerStage="Routed" Handle="false"/>
+
+      
+      <KeyHandler Name="CancelSettings" Key="Escape" DisallowedModifiers="Alt,Shift,Windows,Ctrl" HandlerStage="Bubbled" />
+
+      <ShortcutHandler Name="ShortcutPlay" Shortcut="Play" HandlerStage="Bubbled" Command="{zune:TransportControls.Instance.Play}"/>
+      <ShortcutHandler Name="ShortcutPause" Shortcut="Pause" HandlerStage="Bubbled" Command="{zune:TransportControls.Instance.Pause}"/>
+      <ShortcutHandler Name="ShortcutPlayPause" Shortcut="PlayPause" HandlerStage="Bubbled"/>
+      <ShortcutHandler Name="ShortcutStop" Shortcut="Stop" HandlerStage="Bubbled" Command="{zune:TransportControls.Instance.Stop}"/>
+      <ShortcutHandler Name="ShortcutSkipBack" Shortcut="SkipBack" HandlerStage="Bubbled" Command="{zune:TransportControls.Instance.Back}"/>
+      <ShortcutHandler Name="ShortcutSkipForward" Shortcut="SkipForward" HandlerStage="Bubbled" Command="{zune:TransportControls.Instance.Forward}"/>
+
+      <KeyHandler Name="KeyHandlerForward"       Key="F"  RequiredModifiers="Ctrl" DisallowedModifiers="Alt,Shift,Windows" HandlerStage="Bubbled" Command="{zune:TransportControls.Instance.Forward}"/>
+      <KeyHandler Name="KeyHandlerBack"          Key="B"  RequiredModifiers="Ctrl" DisallowedModifiers="Alt,Shift,Windows" HandlerStage="Bubbled" Command="{zune:TransportControls.Instance.Back}"/>
+      <KeyHandler Name="KeyHandlerStop"          Key="S"  RequiredModifiers="Ctrl" DisallowedModifiers="Alt,Shift,Windows" HandlerStage="Bubbled" Command="{zune:TransportControls.Instance.Stop}"/>
+      <KeyHandler Name="KeyHandlerPlayPause"     Key="P"  RequiredModifiers="Ctrl" DisallowedModifiers="Alt,Shift,Windows" HandlerStage="Bubbled"/>
+      <KeyHandler Name="KeyHandlerToggleShuffle" Key="H"  RequiredModifiers="Ctrl" DisallowedModifiers="Alt,Shift,Windows" HandlerStage="Bubbled"/>
+      <KeyHandler Name="KeyHandlerToggleRepeat"  Key="T"  RequiredModifiers="Ctrl" DisallowedModifiers="Alt,Shift,Windows" HandlerStage="Bubbled"/>
+      <KeyHandler Name="KeyHandlerHelp"          Key="F1" DisallowedModifiers="Alt,Shift,Ctrl,Windows" HandlerStage="Bubbled"/>
+      <KeyHandler Name="KeyHandlerToggleMute"    Key="F7" DisallowedModifiers="Alt,Shift,Ctrl,Windows" HandlerStage="Bubbled"/>
+      <KeyHandler Name="KeyHandlerVolumeDown"    Key="F8" DisallowedModifiers="Alt,Shift,Ctrl,Windows" HandlerStage="Bubbled"/>
+      <KeyHandler Name="KeyHandlerVolumeUp"      Key="F9" DisallowedModifiers="Alt,Shift,Ctrl,Windows" HandlerStage="Bubbled"/>
+      <KeyHandler Name="KeyHandlerFastForward"   Key="F"  RequiredModifiers="Ctrl,Shift" DisallowedModifiers="Alt,Windows" HandlerStage="Bubbled" Command="{zune:TransportControls.Instance.FastforwardHotkey}"/>
+      <KeyHandler Name="KeyHandlerRewind"        Key="B"  RequiredModifiers="Ctrl,Shift" DisallowedModifiers="Alt,Windows" HandlerStage="Bubbled" Command="{zune:TransportControls.Instance.RewindHotkey}"/>
+      <KeyHandler Name="KeyHandlerSearchFocus"   Key="E"  RequiredModifiers="Ctrl" DisallowedModifiers="Alt,Shift,Windows" HandlerStage="Bubbled" Command="{zune:Search.Instance.SearchFocusHotkey}"/>
+
+      <FocusHandler Name="FocusChangedUsingKeyboard" Reason="Key" HandlerStage="Bubbled"/>
+      <KeyHandler Name="ShowFocusRectF10" Key="F10" Handle="false" HandlerStage="Routed"/>
+      <KeyHandler Name="ShowFocusRectApps" Key="Apps" Handle="false" HandlerStage="Routed"/>
+
+      <KeyHandler Name="SpaceKeyHandler" Key="Space" RequiredModifiers="Alt" DisallowedModifiers="Ctrl,Shift,Windows" HandlerStage="Routed,Direct" Repeat="false" />
+
+      <KeyHandler Name="AnyKeys" Key="Any" HandlerStage="Routed" Handle="false"/>
+    </Input>
+
+
+    <Scripts>
+      
+      <Script>zune:Shell.DefaultInstance.CommandHandler = ShellCommandHandlers;</Script>
+
+      
+      <Script>
+        MouseDown.Command = PopupLayer.MouseDownCommand;
+      </Script>
+
+      
+      <Script>
+        zune:ZunePage page = [Shell.CurrentPage];
+        if (page is zune:CategoryPage)
+        {
+          CancelSettings.Command = ((zune:CategoryPage) page).CancelButton;
+        }
+        else
+        {
+          CancelSettings.Command = null;
+        }
+      </Script>
+
+      
+      <Script>
+        bool modalPopup = [PopupLayer.IsModal];
+        bool backArrow = [Shell.CurrentPage.ShowBackArrow];
+        bool computerIcon = ([Shell.CurrentPage.ShowComputerIcon] != zune:ComputerIconState.Hide);
+        bool nowPlayingX = [Shell.CurrentPage.ShowNowPlayingX];
+
+        
+        CanGoBack = !modalPopup &amp;&amp; (computerIcon || backArrow || nowPlayingX);
+      </Script>
+
+      
+      
+      <Script>
+        ResizeBorders.Visible = (!iris:Application.Window.ShowWindowFrame) &amp;&amp;
+                                ([iris:Application.Window.WindowState] != iris:WindowState.Maximized);
+      </Script>
+
+      <Script>
+        if ([iris:Application.Window.WindowState] == iris:WindowState.Maximized)
+        {
+          EnergyBar.LayoutInput = EnergyBarLayoutMax;
+          Grabber.Visible = false;
+        }
+        else
+        {
+          Grabber.Visible = true;
+          EnergyBar.LayoutInput = EnergyBarLayoutNorm;
+        }
+      </Script>
+
+      
+      <Script>
+        AutoHideToolbars = [Shell.CurrentPage.AutoHideToolbars] &amp;&amp; [WindowState.CanHideMouse];
+
+        iris:Application.Window.HideMouseOnIdle = AutoHideToolbars;
+      </Script>
+
+      
+      <Script>
+        iris:Application.Window.MouseIdleTimeout = MouseActivityTimeout;
+      </Script>
+      
+      
+      <Script>
+        [DeclareTrigger(Shell.CurrentPage)]
+        WindowState.PageInputActivity = false;
+      </Script>
+
+      
+      <Script>
+        bool hideNow = [AutoHideToolbars] &amp;&amp; 
+                      ![iris:Application.Window.MouseActive] &amp;&amp; 
+                      ![WindowState.KeysActive];
+        
+        
+
+        TopToolbar.InvisibleMode    = hideNow;
+        BottomToolbar.InvisibleMode = hideNow;
+
+        
+        
+
+        FocusRect.Alpha = (float)!hideNow;
+        AnyKeys.StopRoute = hideNow;
+        
+        styles:WindowState.InputActive = !hideNow;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(AnyKeys.Pressing)]
+        WindowState.KeysActive = true;
+        KeyIdleTimer.Stop();
+        KeyIdleTimer.Start();
+      </Script>
+
+      <Script>
+        [DeclareTrigger(KeyIdleTimer.Tick)]
+        WindowState.KeysActive = false;
+      </Script>
+
+      
+
+      
+      <Script>
+        [DeclareTrigger(ShortcutPlayPause.Invoked)]
+        [DeclareTrigger(KeyHandlerPlayPause.Invoked)]
+        if (zune:TransportControls.Instance.Playing)
+        {
+          zune:TransportControls.Instance.Pause.Invoke();
+        }
+        else
+        {
+          zune:TransportControls.Instance.Play.Invoke();
+        }
+      </Script>
+
+      
+      <Script>
+        bool shouldBeVisible = [zune:JumpInListManager.Instance.IsActive];
+
+        if (shouldBeVisible &amp;&amp; !JumpInList.Helper.IsVisible)
+        {
+            JumpInList.Helper.Show(JumpInList);
+        }
+        else if (!shouldBeVisible &amp;&amp; JumpInList.Helper.IsVisible)
+        {
+            JumpInList.Helper.Hide();
+        }
+      </Script>
+
+      
+      <Script>
+        if (![JumpInList.Helper.IsVisible])
+        {
+          zune:JumpInListManager.Instance.Clear();
+        }
+      </Script>
+
+      <Script>
+        SpaceKeyHandler.Command = TopToolbar.MenuCommand;
+      </Script>
+      
+      <Script>
+        [DeclareTrigger(KeyHandlerToggleShuffle.Invoked)]
+        zune:TransportControls.Instance.Shuffling.NextValue(true);
+      </Script>
+
+      <Script>
+        [DeclareTrigger(KeyHandlerToggleRepeat.Invoked)]
+        zune:TransportControls.Instance.Repeating.NextValue(true);
+      </Script>
+
+      <Script>
+        [DeclareTrigger(KeyHandlerToggleMute.Invoked)]
+        zune:TransportControls.Instance.Muted.NextValue(true);
+      </Script>
+
+      <Script>
+        [DeclareTrigger(KeyHandlerVolumeDown.Invoked)]
+        zune:TransportControls.Instance.Volume.Value = zune:TransportControls.Instance.Volume.Value - 10.0;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(KeyHandlerVolumeUp.Invoked)]
+        zune:TransportControls.Instance.Volume.Value = zune:TransportControls.Instance.Volume.Value + 10.0;
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(KeyHandlerHelp.Invoked)]
+        
+        string helpPath = "Help\" + zune:Shell.LoadString(zune:StringId.IDS_ZUNECLIENT_LOCALE) + "\LandingPage.htm";
+        zune:Shell.DefaultInstance.Execute(helpPath, null);
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(FocusChangedUsingKeyboard.GainedFocus)]
+        [DeclareTrigger(ShowFocusRectF10.Invoked)]
+        [DeclareTrigger(ShowFocusRectApps.Invoked)]
+        FocusRect.Visible = true;
+      </Script>
+
+      
+      <Script>
+        if (![iris:Application.Window.Active] || ![zune:PopupManager.Instance.AnyDialogs])
+        {
+          FocusRect.Visible = false;
+        }
+      </Script>
+
+      <Script>
+        MainBackground.Visible = [Shell.CurrentPage.ShowAppBackground];
+      </Script>
+
+      <Script>
+        MainBackground.Content = new Image([Shell.BackgroundImage], styles:Styles.BackgroundMargins);
+      </Script>
+
+    </Scripts>
+
+    <Content>
+      <Panel Layout="Anchor">
+        <Children>
+          
+          <focus:FocusRect Name="FocusRect" Visible="false">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Focus,0,-1" Right="Focus,1,1" Top="Focus,0,-1" Bottom="Focus,1,1" ContributesToHeight="false" ContributesToWidth="false"/>
+            </LayoutInput>
+          </focus:FocusRect>
+
+          <nonclient:WindowResizeBorderLayer Name="ResizeBorders" Layout="Fill"/>
+
+          <popuplayer:PopupLayer Name="PopupLayer" Layout="Fill"/>
+
+
+          <Graphic Name="Grabber" Content="{styles:Styles.Grabber}" MaximumSize="9,6" Layout="Fill">
+            <LayoutInput>
+              <AnchorLayoutInput Name="GrabberLayout" Bottom="Parent,1" Right="Parent,1,-1"/>
+            </LayoutInput>
+          </Graphic>
+
+          <Graphic Name="EnergyBar" Content="{styles:Styles.EnergyBar}" MaximumSize="0,6" Layout="Fill" Visible="true" Margins="1,0,0,0"/>
+
+
+          <Panel Layout="Anchor" Navigation="RememberFocus,ContainAll,WrapTabOrder" FocusOrder="0">
+            <Children>
+              <Panel Layout="Dock">
+                <Children>
+
+                  
+                  <toptoolbar:TopToolbar Name="TopToolbar" Shell="{Shell}" FocusOrder="1">
+                    <LayoutInput>
+                      <DockLayoutInput Position="Top"/>
+                    </LayoutInput>
+                  </toptoolbar:TopToolbar>
+
+                  
+                  <bottomtoolbar:BottomToolbar Name="BottomToolbar" Shell="{Shell}" FocusOrder="4">
+                    <LayoutInput>
+                      <DockLayoutInput Position="Bottom"/>
+                    </LayoutInput>
+                  </bottomtoolbar:BottomToolbar>
+
+                  
+                  
+                  <page:PageBase Name="ForegroundUI" Shell="{Shell}" Page="{Shell.CurrentPage}" FocusOrder="2" Margins="{styles:Styles.FrameMargins}">
+                    <LayoutInput>
+                      <DockLayoutInput Position="Client"/>
+                    </LayoutInput>
+                  </page:PageBase>
+
+                </Children>
+              </Panel>
+
+              
+              <page:PageBase Name="BackgroundUI" Shell="{Shell}" Page="{Shell.CurrentPage}" FocusOrder="3" Layout="Fill"/>
+
+            </Children>
+          </Panel>
+
+          <Graphic 
+            Name="MainBackground" 
+            Layout="Fill"
+            ErrorImage="{styles:Styles.DefaultBackgroundImage}"
+            >
+            
+            
+            <Animations>
+              <Animation Animation="{animations:Animations.MainBackgroundPageTransitionHide}"/>
+            </Animations>
+          </Graphic>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/FUE.UIX b/test/2.1/FUE.UIX
new file mode 100644
index 0000000..f86ad19
--- /dev/null
+++ b/test/2.1/FUE.UIX
@@ -0,0 +1,931 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:page="res://ZuneShellResources!PageStack.uix"
+  xmlns:animations="res://ZuneShellResources!Animations.uix"
+  xmlns:style="res://ZuneShellResources!Style.uix"
+  xmlns:button="res://ZuneShellResources!Button.uix" 
+  xmlns:zuneutil="assembly://ZuneShell/Microsoft.Zune.Util"
+  xmlns:zuneutilapi="assembly://ZuneDBApi/Microsoft.Zune.Util"  
+  xmlns:me="Me"
+  >
+
+  
+  
+  
+  <UI Name="IntroAnimation" Base="page:PageBase">
+    <Locals>
+      <Timer AutoRepeat="false" Interval="4200" Name="Timer" Enabled="true"/>
+      
+      <Single Name="Gem_Delay"  Single="0.5"/>
+      <Single Name="Z_Delay"    Single="{Gem_Delay + 0.45}"/>
+      <Single Name="U_Delay"    Single="{Z_Delay + 0.05}"/>
+      <Single Name="N_Delay"    Single="{U_Delay + 0.1}"/>
+      <Single Name="E_Delay"    Single="{N_Delay + 0.2}"/>      
+
+      <Image Name="Img_Zune_Z"    Source="res://ZuneShellResources!FUE.Zune.Z.png"/>
+      <Image Name="Img_Zune_U"    Source="res://ZuneShellResources!FUE.Zune.U.png"/>
+      <Image Name="Img_Zune_N"    Source="res://ZuneShellResources!FUE.Zune.N.png"/>
+      <Image Name="Img_Zune_E"    Source="res://ZuneShellResources!FUE.Zune.E.png"/>
+      <Image Name="Img_Zune_Gem0" Source="res://ZuneShellResources!FUE.Gem.0.png"/>
+      <Image Name="Img_Zune_Gem1" Source="res://ZuneShellResources!FUE.Gem.1.png"/>
+      <Image Name="Img_Zune_Gem2" Source="res://ZuneShellResources!FUE.Gem.2.png"/>
+      <Image Name="Img_Zune_Gem3" Source="res://ZuneShellResources!FUE.Gem.3.png"/>
+              
+      
+      <Animation Name="ElementFadeOn" Type="Show" CenterPointPercent="0.5,0.5,1.0">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="0" Interpolation="EaseIn,1.0,0.9"/>
+          <AlphaKeyframe Time="0.9" Value="0.6" Interpolation="EaseOut,1.0,0.5"/>           
+          <AlphaKeyframe Time="1.8" Value="0"/>
+        </Keyframes>
+      </Animation>
+      
+      <Animation Name="GemFadeIn" Type="Show" CenterPointPercent="0.5,0.5,1.0">
+        <Keyframes>
+          <AlphaKeyframe Time="0.00"  Value="0" Interpolation="EaseIn,1.0,0.9"/>
+          <AlphaKeyframe Time="0.5"   Value="0.7" Interpolation="EaseIn,1.0,0.9"/>
+          <AlphaKeyframe Time="1.0"   Value="0"/>
+        </Keyframes>
+      </Animation>
+   
+      <Animation Name="SpotlightShowFade" Type="Show" CenterPointPercent="0.5,0.5,1.0">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0"   Value="0.0" Interpolation="Bezier,1.0,1.5"/>
+          <AlphaKeyframe Time="0.1"   Value="1.0" Interpolation="EaseOut,1.0,0.9"/>
+          <AlphaKeyframe Time="0.3"  Value="0.0"/>
+         </Keyframes>
+      </Animation>
+      <Animation Name="SpotlightShowScale" Type="Show" CenterPointPercent="0.5,0.5,1.0">
+        <Keyframes>
+          <ScaleKeyframe Time="0.0"   Value="0.7,0.7,1.0" Interpolation="EaseOut,1.0,0.9"/>
+          <ScaleKeyframe Time="0.3"   Value="1.1,1.1,1.0"/>
+        </Keyframes>
+      </Animation>
+
+      <MergeAnimation Name="SpotlightFadeNScale" Type="Show">
+        <Sources>
+          <Animation Animation="{SpotlightShowFade}"/>
+          <Animation Animation="{SpotlightShowScale}"/>
+        </Sources>
+      </MergeAnimation>
+       
+      <TransformAnimation Name="GemXForm0" Delay="{Gem_Delay}" Source="{GemFadeIn}"/>
+      <TransformAnimation Name="GemXForm1" Delay="{Gem_Delay + 0.2}" Source="{GemFadeIn}"/>
+      <TransformAnimation Name="GemXForm2" Delay="{Gem_Delay + 0.3}" Source="{GemFadeIn}"/>
+      <TransformAnimation Name="GemXForm3" Delay="{Gem_Delay + 0.4}" Source="{GemFadeIn}"/>
+      <TransformAnimation Name="GemXForm4" Delay="{Gem_Delay + 0.5}" Source="{GemFadeIn}"/>
+      
+      <TransformAnimation Name="SpotlightXForm2" Delay="{Gem_Delay + 0.1}" Source="{SpotlightFadeNScale}"/>
+      <TransformAnimation Name="SpotlightXForm3" Delay="{Gem_Delay + 0.2}" Source="{SpotlightFadeNScale}"/>
+      <TransformAnimation Name="SpotlightXForm4" Delay="{Gem_Delay + 0.3}" Source="{SpotlightFadeNScale}"/>
+      <TransformAnimation Name="SpotlightXForm5" Delay="{Gem_Delay + 0.4}" Source="{SpotlightFadeNScale}"/>
+      <TransformAnimation Name="SpotlightXForm6" Delay="{Gem_Delay + 0.5}" Source="{SpotlightFadeNScale}"/>
+      <TransformAnimation Name="SpotlightXForm7" Delay="{Gem_Delay + 0.6}" Source="{SpotlightFadeNScale}"/>      
+    </Locals>
+ 
+    <Scripts>      
+      <Script>
+        [DeclareTrigger(Timer.Tick)]
+        zune:Shell.DefaultInstance.NavigateToPage(new zune:SetupLandPage("res://ZuneShellResources!Fue.uix#Welcome"));
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Margins="0,0,-5,0" Layout="Center">
+        <Children>
+          
+          <Panel Layout="Anchor">
+            <Animations>
+              <Animation Type="Show" CenterPointPercent="0.5,0.5,1.0">
+                <Keyframes>
+                  <ScaleKeyframe Time="0.0" Value="1.3,1.3,1.0" Interpolation="EaseIn,1.0,0.125"/>
+                  <ScaleKeyframe Time="2.0"/>
+                </Keyframes>
+              </Animation>
+            </Animations>
+            <Children>            
+
+              
+              
+              <Graphic Name="Gem0" Content="{Img_Zune_Gem0}" >
+                <LayoutInput>
+                  <AnchorLayoutInput Left="Parent,0" Top="Parent,0"/>
+                </LayoutInput>
+                <Animations>
+                  <TransformAnimation TransformAnimation="{GemXForm0}"/>
+                </Animations>
+              </Graphic>
+
+              <Graphic Content="{Img_Zune_Gem1}" >
+                <LayoutInput>
+                  <AnchorLayoutInput Left="Gem0,0" Top="Gem0,0"/>
+                </LayoutInput>
+                <Animations>
+                  <TransformAnimation TransformAnimation="{GemXForm1}"/>
+                </Animations>
+              </Graphic>
+
+              <Graphic Content="{Img_Zune_Gem2}" >
+                <LayoutInput>
+                  <AnchorLayoutInput Left="Gem0,0" Top="Gem0,0"/>
+                </LayoutInput>
+                <Animations>
+                  <TransformAnimation TransformAnimation="{GemXForm2}"/>
+                </Animations>
+              </Graphic>
+
+              <Graphic Content="{Img_Zune_Gem3}" >
+                <LayoutInput>
+                  <AnchorLayoutInput Left="Gem0,0" Top="Gem0,0"/>
+                </LayoutInput>
+                <Animations>
+                  <TransformAnimation TransformAnimation="{GemXForm3}"/>
+                </Animations>
+              </Graphic>
+
+              <Graphic Content="{styles:Styles.FUEZuneGemFull}" >
+                <LayoutInput>
+                  <AnchorLayoutInput Left="Gem0,0" Top="Gem0,0"/>
+                </LayoutInput>
+                <Animations>
+                  <TransformAnimation TransformAnimation="{GemXForm4}"/>
+                </Animations>
+              </Graphic>
+
+              
+              <Graphic Name="Z" Content="{Img_Zune_Z}" Margins="16,0,0,0">
+                <LayoutInput>
+                  <AnchorLayoutInput Left="Gem0,1" Top="Gem0,0,36"/>
+                </LayoutInput>
+                <Animations>
+                  <TransformAnimation Delay="{Z_Delay}" Source="{ElementFadeOn}"/>
+                </Animations>
+              </Graphic>
+
+              <Graphic Name="U" Content="{Img_Zune_U}" Margins="8,0,0,0">
+                <LayoutInput>
+                  <AnchorLayoutInput Left="Z,1" Top="Z,0"/>
+                </LayoutInput>
+                <Animations>
+                  <TransformAnimation Delay="{U_Delay}" Source="{ElementFadeOn}"/>
+                </Animations>
+              </Graphic>
+
+              <Graphic Name="N" Content="{Img_Zune_N}" Margins="8,0,0,0">
+                <LayoutInput>
+                  <AnchorLayoutInput Left="U,1" Top="Z,0"/>
+                </LayoutInput>
+                <Animations>
+                  <TransformAnimation Delay="{N_Delay}" Source="{ElementFadeOn}"/>
+                </Animations>
+              </Graphic>
+
+              <Graphic Name="E" Content="{Img_Zune_E}" Margins="8,0,0,0">
+                <LayoutInput>
+                  <AnchorLayoutInput Left="N,1" Top="Z,0"/>
+                </LayoutInput>
+                <Animations>
+                  <TransformAnimation Delay="{E_Delay}" Source="{ElementFadeOn}"/>                    
+                </Animations>
+              </Graphic>
+
+              
+              <Graphic Content="{styles:Styles.FUESpotlight}" HorizontalAlignment="Center" VerticalAlignment="Center">
+                <LayoutInput>
+                  <AnchorLayoutInput Left="Gem0,0.4" Top="Gem0,0,-8"/>
+                </LayoutInput>
+                <Animations>
+                  <TransformAnimation Delay="{Gem_Delay}" Source="{SpotlightFadeNScale}"/>                   
+                </Animations>
+              </Graphic>
+
+              <Graphic Content="{styles:Styles.FUESpotlight}" HorizontalAlignment="Center" VerticalAlignment="Center">
+                <LayoutInput>
+                  <AnchorLayoutInput Left="Gem0,0,-8" Top="Gem0,0.19"/>
+                </LayoutInput>
+                <Animations>
+                  <TransformAnimation TransformAnimation="{SpotlightXForm2}"/> 
+                </Animations>
+              </Graphic>
+
+              <Graphic Content="{styles:Styles.FUESpotlight}" HorizontalAlignment="Center" VerticalAlignment="Center">
+                <LayoutInput>                  
+                  <AnchorLayoutInput Left="Gem0,0.4" Top="Gem0,0.4"/>
+                </LayoutInput>
+                <Animations>
+                  <TransformAnimation TransformAnimation="{SpotlightXForm3}"/> 
+                </Animations>
+              </Graphic>
+
+              <Graphic Content="{styles:Styles.FUESpotlight}" HorizontalAlignment="Center" VerticalAlignment="Center">
+                <LayoutInput>
+                  <AnchorLayoutInput Left="Gem0,0,-8" Top="Gem0,0.65"/>
+                </LayoutInput>
+                <Animations>
+                  <TransformAnimation TransformAnimation="{SpotlightXForm4}"/> 
+                </Animations>
+              </Graphic>
+
+              <Graphic Content="{styles:Styles.FUESpotlight}" HorizontalAlignment="Center" VerticalAlignment="Center">
+                <LayoutInput>
+                  <AnchorLayoutInput Left="Gem0,0.4" Top="Gem0,1,-16"/>
+                </LayoutInput>
+                <Animations>
+                  <TransformAnimation TransformAnimation="{SpotlightXForm5}"/> 
+                </Animations>
+              </Graphic>
+
+              <Graphic Content="{styles:Styles.FUESpotlight}" HorizontalAlignment="Center" VerticalAlignment="Center">
+                <LayoutInput>
+                  <AnchorLayoutInput Left="Gem0,0.85" Top="Gem0,0.65"/>
+                </LayoutInput>
+                <Animations>
+                  <TransformAnimation TransformAnimation="{SpotlightXForm6}"/> 
+                </Animations>
+              </Graphic>
+
+              <Graphic Content="{styles:Styles.FUESpotlight}" HorizontalAlignment="Center" VerticalAlignment="Center">
+                <LayoutInput>
+                  <AnchorLayoutInput Left="Gem0,0.85" Top="Gem0,0.19"/>
+                </LayoutInput>
+                <Animations>
+                  <TransformAnimation TransformAnimation="{SpotlightXForm7}"/> 
+                </Animations>
+              </Graphic>
+
+              
+              <Graphic Content="{styles:Styles.FUESpotlight}" HorizontalAlignment="Center" VerticalAlignment="Center">
+                <LayoutInput>
+                  <AnchorLayoutInput Left="Z,0.25" Top="Z,0,-4"/>
+                </LayoutInput>
+                <Animations>
+                  <TransformAnimation Delay="{Z_Delay}" Source="{SpotlightFadeNScale}"/> 
+                </Animations>
+              </Graphic>
+
+              <Graphic Content="{styles:Styles.FUESpotlight}"  HorizontalAlignment="Center" VerticalAlignment="Center">
+                <LayoutInput>
+                  <AnchorLayoutInput Left="U,0" Top="U,0"/>
+                </LayoutInput>
+                <Animations>
+                  <TransformAnimation Delay="{U_Delay}" Source="{SpotlightFadeNScale}"/> 
+                </Animations>
+              </Graphic>
+
+              <Graphic Content="{styles:Styles.FUESpotlight}" HorizontalAlignment="Center" VerticalAlignment="Center">
+                <LayoutInput>
+                  <AnchorLayoutInput Left="N,0.75" Top="N,0.6"/>
+                </LayoutInput>
+                <Animations>
+                  <TransformAnimation Delay="{N_Delay}" Source="{SpotlightFadeNScale}"/> 
+                </Animations>
+              </Graphic>
+
+              <Graphic Content="{styles:Styles.FUESpotlight}" HorizontalAlignment="Center" VerticalAlignment="Center">
+                <LayoutInput>
+                  <AnchorLayoutInput Left="E,0.7" Top="E,0.35"/>
+                </LayoutInput>
+                <Animations>
+                  <TransformAnimation Delay="{E_Delay}" Source="{SpotlightFadeNScale}"/> 
+                </Animations>
+              </Graphic>
+
+            </Children>
+          </Panel>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="GDIWarning" Base="page:PageBase">
+    <Properties>
+      <zune:WebHelpCommand Name="VideoSupportLink"
+        Description="{zune:Shell.LoadString(zune:StringId.IDS_VIDEO_SUPPORT_URL)}"
+        Url="{zune:Shell.LoadString(zune:StringId.IDS_VIDEO_SUPPORT_URL)}"/>
+    </Properties>
+
+    <Locals>
+      <iris:Command Name="ContinueButton" Description="{zune:Shell.LoadString(zune:StringId.IDS_CONTINUE_BUTTON)}"/>
+      
+      
+      <styles:LabelStyle Name="StyleDetail" Color="White" Font="{styles:Styles.SettingsText}"/>      
+      <ScrollingData Name="ScrollData"/>
+    </Locals>
+
+    <Input>
+      <ScrollingHandler Name="ScrollHandler" ScrollingData="{ScrollData}"/>
+    </Input>
+
+    <Scripts>
+      <Script>
+        [DeclareTrigger(ContinueButton.Invoked)]
+        zune:Shell.DefaultInstance.NavigateToPage(new zune:SetupLandPage("res://ZuneShellResources!Fue.uix#Welcome"));
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Layout="Anchor" Margins="0,0,0,30">
+        <Children>
+
+          <Panel Name="Body" Layout="VerticalFlow">
+            <LayoutInput>
+              <AnchorLayoutInput Top="Parent,0" Left="Parent,0" Bottom="Parent,1"/>
+            </LayoutInput>
+            <Children>
+
+              <me:GreetingPanel Name="Greeting"/>
+              <core:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_GDI_WARNING)}" Style="{StyleDetail}" Padding="2,15,0,5" WordWrap="true"/>
+              <core:Button Model="{VideoSupportLink}" OverrideStyle="{styles:SharedStyles.HyperlinkStyle}" Padding="2,12,0,0"/>
+              <core:BigActionButton Model="{ContinueButton}" Padding="-2,20,0,0"/>
+
+            </Children>
+          </Panel>
+
+          <me:LinksPanel Margins="4,0,0,0">
+            <LayoutInput>
+              <AnchorLayoutInput Bottom="Parent,1,50" Left="Body,0"/>
+            </LayoutInput>
+          </me:LinksPanel>
+
+        </Children>        
+      </Panel>
+    </Content>
+  </UI>
+  
+  
+  
+  
+  <UI Name="Welcome" Base="page:PageBase">
+    <Locals>
+      <iris:Command Name="ZuneMarketplaceButton" Description="{zune:Shell.LoadString(zune:StringId.IDS_GO_TO_APP_HEADER)}"/>
+      <iris:Command Name="ConfigureButton" Description="{zune:Shell.LoadString(zune:StringId.IDS_CONFIGURE_HEADER)}"/>
+
+      
+      <Timer AutoRepeat="false" Name="Timer" Enabled="false"/>
+
+      <Animation Name="ElementShow" Type="Show">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="0"/>
+          <AlphaKeyframe Time="0.5" Value="1"/>
+          <PositionKeyframe Time="0.0" Value="-10,0,0" Interpolation="{animations:Animations.SlideInterpolation}"/>
+          <PositionKeyframe Time="{animations:Animations.SlideLength}" Value="0,0,0"/>
+        </Keyframes>
+      </Animation>
+
+      <Animation Name="ElementHide" Type="Hide" CenterPointPercent="0.5,0.5,1.0">
+        <Keyframes>
+          <AlphaKeyframe Time="0.0" Value="1" Interpolation="EaseIn,1.0,0.75"/>
+          <AlphaKeyframe Time="0.3" Value="0"/>                     
+          <PositionKeyframe Time="0.0" Value="0,0,0" Interpolation="EaseOut,1.0,0.9"/>
+          <PositionKeyframe Time="0.3" Value="10,0,0"/>
+        </Keyframes>
+      </Animation>
+      <ScrollingData Name="ScrollData"/>
+    </Locals>
+
+    <Input>
+      <ScrollingHandler Name="ScrollHandler" ScrollingData="{ScrollData}"/>
+    </Input>
+
+    <Scripts>
+      <Script>
+        [DeclareTrigger(ZuneMarketplaceButton.Invoked)]
+        zune:Shell.DefaultInstance.NavigateToPage(new zune:SetupLandPage("res://ZuneShellResources!Fue.uix#OutroAnimation"));
+        zuneutil:SQMLog.Log(zuneutilapi:SQMDataId.UserConfiguredSettingsFUE, 0);        
+        
+        
+        zune:Fue.Instance.MigrateLegacyConfiguration(true);
+      </Script>
+      <Script>
+        [DeclareTrigger(ConfigureButton.Invoked)]
+        zune:Fue.Instance.ProxyDefaultPaths();
+        zune:Shell.SettingsFrame.Wizard.FUE.Invoke();
+      </Script>
+      <Script>
+        [DeclareTrigger(Timer.Tick)]
+        Timer.Enabled = false;
+        zune:Fue.Instance.RenderPrompt();
+      </Script>
+      <Script>
+        Timer.Interval = [zune:Fue.Instance.RenderPromptInterval];
+        Timer.Enabled = true;
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Layout="Anchor" Margins="0,0,0,30">
+        <Children>
+
+          <me:GreetingPanel Name="Greeting" Margins="0,30,0,0">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Parent,0" Top="Parent,0"/>
+            </LayoutInput>
+            <Animations>
+              <Animation Type="Show" CenterPointPercent="0.5,0.5,1.0">
+                <Keyframes>
+                  <AlphaKeyframe Time="0.0" Value="0" Interpolation="EaseIn,1.0,0.75"/>
+                  <AlphaKeyframe Time="0.7" Value="1"/>
+                  <ScaleKeyframe Time="0.0" Value="3,3,1.0" Interpolation="EaseIn,2.0,0.125"/>
+                  <ScaleKeyframe Time="0.7" Value="1.0,1.0,1.0"/>
+                  <PositionKeyframe Time="0.0" Value="0,-20,0" Interpolation="EaseOut,1.0,0.75"/>
+                  <PositionKeyframe Time="0.7" Value="0,0,0"/>
+                </Keyframes>
+              </Animation>
+              <Animation Animation="{ElementHide}"/>
+            </Animations>
+          </me:GreetingPanel>
+
+          <core:ScrollBar Name="ScrollBar" 
+             ScrollData="{ScrollData}" 
+             ThumbColor="{styles:Styles.FUEThumbColor}"
+             BarColor="{styles:Styles.FUEBarColor}"
+             PageColor="{styles:Styles.FUEPageColor}"
+             ScrollPathColor="{styles:Styles.FUEScrollPathColor}">
+            <LayoutInput>
+              <AnchorLayoutInput Left="ScrollingLinks,1,50" Top="ScrollingLinks,0,10"/>
+            </LayoutInput>
+          </core:ScrollBar>
+
+          <Scroller Name="ScrollingLinks" FadeSize="5" Orientation="Vertical" ScrollingData="{ScrollData}">
+            <LayoutInput>
+              <AnchorLayoutInput Top="Greeting,1" Left="Greeting,0"/>
+            </LayoutInput>
+            <Animations>
+              
+              <Animation Type="Move">
+                <Keyframes>
+                  <PositionKeyframe Time="0.00" RelativeTo="Current" Interpolation="Sine"/>
+                  <PositionKeyframe Time="0.025" RelativeTo="Final"/>
+                </Keyframes>
+              </Animation>
+            </Animations>
+            <Children>
+
+              
+              <me:PanelLink Model="{ZuneMarketplaceButton}" LabelString="{zune:Shell.LoadString(zune:StringId.IDS_GO_TO_APP_LABEL)}" DescriptionString="{zune:Shell.LoadString(zune:StringId.IDS_GO_TO_APP_DETAILS)}">
+                <Animations>
+                  <Animation Animation="{animations:Animations.MoveNow}"/>
+                  <TransformAnimation Delay="0.9" Source="{ElementShow}"/>
+                  <Animation Animation="{ElementHide}"/>
+                </Animations>
+              </me:PanelLink>
+
+              
+              <me:PanelLink Model="{ConfigureButton}" LabelString="{zune:Shell.LoadString(zune:StringId.IDS_CONFIGURE_LABEL)}" DescriptionString="{zune:Shell.LoadString(zune:StringId.IDS_CONFIGURE_DETAILS)}" Margins="0,15,0,4">
+                <Animations>
+                  <Animation Animation="{animations:Animations.MoveNow}"/>
+                  <TransformAnimation Delay="1.1" Source="{ElementShow}"/>
+                  <Animation Animation="{ElementHide}"/>
+                </Animations>
+              </me:PanelLink>
+
+            </Children>
+          </Scroller>
+
+          <me:LinksPanel>
+            <LayoutInput>
+              <AnchorLayoutInput Bottom="Parent,1,50" Left="Parent,0"/>
+            </LayoutInput>
+            <Animations>
+              <TransformAnimation Delay="1.0" Source="{animations:Animations.BasicFadeIn}"/>                
+            </Animations>
+          </me:LinksPanel>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="FUEBackground" Base="page:PageBase">   
+    <Content>
+      <Panel>
+        <Animations>
+          <Animation Type="Show">
+            <Keyframes>
+              <AlphaKeyframe Time="0.0" Value="0"/>
+              <AlphaKeyframe Time="0.2" Value="1"/>
+            </Keyframes>
+          </Animation>
+          
+           
+          
+          
+          <Animation Type="Hide">
+            <Keyframes>
+              <AlphaKeyframe Time="0.0" Value="1.0"/>
+              <AlphaKeyframe Time="0.5" Value="0.0"/>
+            </Keyframes>
+          </Animation>
+        </Animations>
+        <Children>
+
+          <Graphic Content="{styles:Styles.FUEBackground}" StretchingPolicy="UniformToFill" SizingPolicy="SizeToConstraint" Layout="Form">
+            <Children>
+
+              
+              <Graphic Content="{styles:Styles.FUESpotlightLarge}" Scale="15,15,1.0" HorizontalAlignment="Center" VerticalAlignment="Center">
+                <LayoutInput>
+                  <FormLayoutInput Left="Parent,-1" Bottom="Parent,0.1"/>
+                </LayoutInput>
+                <Animations>
+                  <Animation Animation="{animations:Animations.MoveNow}"/>
+                  <TransformAnimation>
+                    <Source>
+                      <Animation Type="Show">
+                        <Keyframes>
+                          <AlphaKeyframe Time="0.0"     Value="0.0"       Interpolation="EaseIn,1.0,0.8"/>
+                          <AlphaKeyframe Time="1.0"     Value="0.2"       Interpolation="EaseOut,1.0,0.25"/>
+                          <AlphaKeyframe Time="5.0"     Value="0.0"/>
+                          <PositionKeyframe Time="0.0"  Value="0,-10,0"   Interpolation="EaseIn,1.0,0.25"/>
+                          <PositionKeyframe Time="5.1"  Value="200,10,0"  Interpolation="EaseOut,1.0,0.25"/>
+                        </Keyframes>
+                      </Animation>
+                    </Source>
+                  </TransformAnimation>
+                  <Animation Animation="{animations:Animations.MoveNow}"/>
+                </Animations>
+              </Graphic>
+
+               
+              <Graphic Content="{styles:Styles.FUESpotlightLarge}" Scale="10,10,1.0" HorizontalAlignment="Center" VerticalAlignment="Center">
+                <LayoutInput>
+                  <FormLayoutInput Right="Parent,0.5" Bottom="Parent,0.3"/>
+                </LayoutInput>
+                <Animations>
+                  <Animation Animation="{animations:Animations.MoveNow}"/>
+                  <TransformAnimation Delay="1" >
+                    <Source>
+                      <Animation Type="Show">
+                        <Keyframes>
+                          <AlphaKeyframe Time="0.0"    Value="0.0"       Interpolation="EaseIn,1.0,0.8"/>
+                          <AlphaKeyframe Time="1.0"    Value="0.2"       Interpolation="EaseOut,1.0,0.25"/>
+                          <AlphaKeyframe Time="2.0"    Value="0.0"/>
+                        </Keyframes>
+                      </Animation>
+                    </Source>
+                  </TransformAnimation>
+                  <Animation Animation="{animations:Animations.MoveNow}"/>
+                </Animations>
+              </Graphic>                    
+
+              
+              <Graphic Content="{styles:Styles.FUEPatternBR}" StretchingPolicy="Uniform">
+                <LayoutInput>
+                  <FormLayoutInput Right="Parent,1" Bottom="Parent,1"/>
+                </LayoutInput>
+                <Animations>
+                  <Animation Type="Show" Loop="-1">
+                    <Keyframes>
+                      <AlphaKeyframe Time="0.0" Value="0.0" Interpolation="EaseIn,1.0,0.1"/>
+                      <AlphaKeyframe Time="1.5" Value="0.2" Interpolation="EaseOut,1.0,0.2"/>
+                      <AlphaKeyframe Time="4.0" Value="0.01"/>
+                      <AlphaKeyframe Time="5.5" Value="0.0"/>
+                    </Keyframes>
+                  </Animation>
+                </Animations>                
+              </Graphic>
+
+              
+              <Graphic Content="{styles:Styles.FUEPatternTR}"  StretchingPolicy="Uniform">
+                <LayoutInput>
+                  <FormLayoutInput Right="Parent,1" Top="Parent,0"/>
+                </LayoutInput>
+                <Animations>
+                  <TransformAnimation Delay="4.0">
+                    <Source>
+                      <Animation Type="Show" Loop="-1">
+                        <Keyframes>
+                          <AlphaKeyframe Time="0.0" Value="0.0" Interpolation="EaseIn,1.0,0.5"/>
+                          <AlphaKeyframe Time="3.5" Value="0.2" Interpolation="EaseOut,1.0,0.5"/>
+                          <AlphaKeyframe Time="6.5" Value="0.0"/>
+                        </Keyframes>
+                      </Animation>
+                    </Source>
+                  </TransformAnimation>
+                </Animations>
+              </Graphic>
+
+              
+              <Graphic Content="{styles:Styles.FUEPatternBL}"  StretchingPolicy="Uniform">
+                <LayoutInput>
+                  <FormLayoutInput Left="Parent,0" Bottom="Parent,1"/>
+                </LayoutInput>
+                <Animations>
+                  <TransformAnimation Delay="5.5">
+                    <Source>
+                      <Animation Type="Show" Loop="-1">
+                        <Keyframes>
+                          <AlphaKeyframe Time="0.0" Value="0.0" Interpolation="EaseIn,1.0,0.5"/>
+                          <AlphaKeyframe Time="1.5" Value="0.2" Interpolation="EaseOut,1.0,0.5"/>
+                          <AlphaKeyframe Time="3.5" Value="0.0"/>
+                        </Keyframes>
+                      </Animation>
+                    </Source>
+                  </TransformAnimation>
+                </Animations>
+              </Graphic>
+
+            </Children>
+          </Graphic>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  
+  <UI Name="OutroAnimation" Base="page:PageBase">
+    <Locals>
+      <Timer Name="OutroTimer" Interval="1200" Enabled="true"/>         
+    </Locals>
+
+    <Scripts>
+      <Script>
+        [DeclareTrigger(OutroTimer.Tick)]
+        zune:Fue.Instance.CompleteFUE();
+      </Script>
+    </Scripts>
+
+    <Content>
+      
+
+      <Panel Margins="-40,-27,0,0" Layout="Form">
+        <Animations>
+          <Animation Type="Show">
+            <Keyframes>
+              <AlphaKeyframe Time="0.0" Value="0"/>
+              <AlphaKeyframe Time="0.5" Value="1"/>
+            </Keyframes>
+          </Animation>
+        </Animations>
+        <Children>
+
+          <Graphic Name="Gem" Content="{styles:Styles.ZuneLogo}" StretchingPolicy="None" SizingPolicy="SizeToContent">
+            <LayoutInput>
+              <FormLayoutInput Left="Parent,0" Top="Parent,0"/>
+            </LayoutInput>
+            <Animations>
+              <TransformAnimation Delay="1">
+                <Source>
+                  <Animation Type="Show">
+                    <Keyframes>
+                      <AlphaKeyframe Time="0.0" Value="0"/>
+                      <AlphaKeyframe Time="0.3" Value="1"/>
+                    </Keyframes>
+                  </Animation>
+                </Source>
+              </TransformAnimation>
+            </Animations>
+          </Graphic>
+
+          
+          <Graphic Content="{styles:Styles.FUESpotlight}" Scale="2,2,1.0" HorizontalAlignment="Center" VerticalAlignment="Center">
+            <LayoutInput>
+              <FormLayoutInput Left="Parent,0.3" Top="Parent,0.5"/>
+            </LayoutInput>
+            <Animations>
+              <Animation Animation="{animations:Animations.MoveNow}"/>
+              <TransformAnimation Delay="0.1">
+                <Source>
+                  <Animation Type="Show">
+                    <Keyframes>
+                      <AlphaKeyframe Time="0.0" Value="0.0"  Interpolation="EaseIn,1.0,0.8"/>
+                      <AlphaKeyframe Time="0.2" Value="0.6"  Interpolation="EaseOut,1.0,0.25"/>
+                      <AlphaKeyframe Time="0.4" Value="0.0"/>
+                    </Keyframes>
+                  </Animation>
+                </Source>
+              </TransformAnimation>
+              <Animation Animation="{animations:Animations.MoveNow}"/>
+            </Animations>
+          </Graphic>
+
+          
+          <Graphic Content="{styles:Styles.FUESpotlight}" Scale="1,1,1" HorizontalAlignment="Center" VerticalAlignment="Center">
+            <LayoutInput>
+              <FormLayoutInput Left="Parent,0.15" Top="Parent,0.25"/>
+            </LayoutInput>
+            <Animations>
+              <Animation Animation="{animations:Animations.MoveNow}"/>
+              <TransformAnimation Delay="0.2">
+                <Source>
+                  <Animation Type="Show">
+                    <Keyframes>
+                      <AlphaKeyframe Time="0.0" Value="0.0"  Interpolation="EaseIn,1.0,0.8"/>
+                      <AlphaKeyframe Time="0.2" Value="0.7"  Interpolation="EaseOut,1.0,0.25"/>
+                      <AlphaKeyframe Time="0.4" Value="0.0"/>
+                    </Keyframes>
+                  </Animation>
+                </Source>
+              </TransformAnimation>
+              <Animation Animation="{animations:Animations.MoveNow}"/>
+            </Animations>
+          </Graphic>
+
+          
+          <Graphic Content="{styles:Styles.FUESpotlight}" Scale="0.5,0.5,1.0" HorizontalAlignment="Center" VerticalAlignment="Center">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Gem,0" Top="Gem,0"/>
+            </LayoutInput>
+            <Animations>
+              <TransformAnimation Delay="0.3">
+                <Source>
+                  <Animation Animation="{animations:Animations.SpotlightFade}"/>
+                </Source>
+              </TransformAnimation>
+            </Animations>
+          </Graphic>
+
+          <Graphic Content="{styles:Styles.FUESpotlight}" Scale="0.5,0.5,1.0" HorizontalAlignment="Center" VerticalAlignment="Center">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Gem,0.25" Top="Gem,0"/>
+            </LayoutInput>
+            <Animations>
+              <TransformAnimation Delay="0.4">
+                <Source>
+                  <Animation Animation="{animations:Animations.SpotlightFade}"/>
+                </Source>
+              </TransformAnimation>
+            </Animations>
+           </Graphic>
+
+          <Graphic Content="{styles:Styles.FUESpotlight}" Scale="0.5,0.5,1.0" HorizontalAlignment="Center" VerticalAlignment="Center">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Gem,0.5" Top="Gem,0"/>
+            </LayoutInput>
+            <Animations>
+              <TransformAnimation Delay="0.45">
+                <Source>
+                  <Animation Animation="{animations:Animations.SpotlightFade}"/>
+                </Source>
+              </TransformAnimation>
+            </Animations>
+          </Graphic>
+
+          <Graphic Content="{styles:Styles.FUESpotlight}" Scale="0.5,0.5,1.0" HorizontalAlignment="Center" VerticalAlignment="Center">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Gem,0.5" Top="Gem,0.5"/>
+            </LayoutInput>
+            <Animations>
+              <TransformAnimation Delay="0.5">
+                <Source>
+                  <Animation Animation="{animations:Animations.SpotlightFade}"/>
+                </Source>
+              </TransformAnimation>
+            </Animations>
+          </Graphic>
+
+          <Graphic Content="{styles:Styles.FUESpotlight}" HorizontalAlignment="Center" VerticalAlignment="Center">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Gem,0.25" Top="Gem,0.25"/>
+            </LayoutInput>
+            <Animations>
+              <TransformAnimation Delay="0.55" Magnitude="2">
+                <Source>
+                  <Animation Type="Show" CenterPointPercent="0.5,0.5,1.0">
+                    <Keyframes>
+                      <AlphaKeyframe Time="0.0"   Value="0.0" Interpolation="Bezier,1.0,1.5"/>
+                      <AlphaKeyframe Time="0.2"   Value="1.0" Interpolation="EaseOut,1.0,0.9"/>
+                      <AlphaKeyframe Time="0.75"  Value="0.0"/>
+                      <ScaleKeyframe Time="0.0" Value="0.7,0.7,0.7"/>
+                      <ScaleKeyframe Time="0.5" Value="1.5,1.5,1.0"/>                          
+                     </Keyframes>
+                  </Animation>    
+                </Source>
+              </TransformAnimation>
+            </Animations>
+          </Graphic>
+
+          
+          <Graphic Content="{styles:Styles.FUESpotlightLarge}" Scale="10,10,1.0" HorizontalAlignment="Center" VerticalAlignment="Center">
+            <LayoutInput>
+              <FormLayoutInput Left="Parent,-0.5" Top="Parent,-0.5"/>
+            </LayoutInput>
+            <Animations>                  
+              <TransformAnimation>
+                <Source>
+                  <Animation Type="Show">
+                    <Keyframes>
+                      <AlphaKeyframe Time="0.0" Value="0.0"  Interpolation="EaseIn,1.0,0.8"/>
+                      <AlphaKeyframe Time="0.8" Value="0.4"  Interpolation="EaseOut,1.0,0.25"/>
+                      <AlphaKeyframe Time="1.5" Value="0.0"/>
+                    </Keyframes>
+                  </Animation>
+                </Source>
+              </TransformAnimation>
+              <Animation Animation="{animations:Animations.MoveNow}"/>
+            </Animations>
+          </Graphic>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  <UI Name="LinksPanel">
+    <Locals>
+      <zune:WebHelpCommand Name="CustomerExperienceLink" 
+        Description="{zune:Shell.LoadString(zune:StringId.IDS_CUSTOMER_EXPERIENCE_BUTTON)}"
+        Url="{zune:Shell.LoadString(zune:StringId.IDS_CUSTOMER_EXPERIENCE_URL)}"
+        />
+      <zune:WebHelpCommand Name="ReadOnlineLink" 
+        Description="{zune:Shell.LoadString(zune:StringId.IDS_PRIVACY_STATEMENT_BUTTON)}"
+        Url="{zune:Shell.LoadString(zune:StringId.IDS_PRIVACY_STATEMENT_URL)}"
+        />
+    </Locals>
+
+    <Content>
+      <Panel Layout="HorizontalFlow" Padding="0,0,10,0">
+        <Children>
+
+          <core:Button Model="{CustomerExperienceLink}" OverrideStyle="{styles:SharedStyles.FUEHyperlinkStyle}"/>
+          <Text Content="|" Font="{styles:Styles.HyperlinkFont}" Color="{styles:Styles.HyperlinkColor}" Margins="10,0,10,0"/>
+          <core:Button Model="{ReadOnlineLink}" OverrideStyle="{styles:SharedStyles.FUEHyperlinkStyle}"/>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  <UI Name="GreetingPanel">
+    <Properties>
+      
+      <styles:LabelStyle Name="StyleGreet" Color="{styles:Styles.FUEWelcomeTextColor}" Font="{styles:Styles.SettingsTextHeader}"/>
+    </Properties>
+
+    <Content>
+      <core:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_FIRSTRUN_GREETING)}" Style="{StyleGreet}"/>           
+    </Content>
+  </UI>
+
+  <UI Name="PanelLink" Base="button:Button">
+    <Properties>
+      <String Name="LabelString"/>
+      <String Name="DescriptionString"/>
+    </Properties>
+
+    <Locals>
+      <style:Style Name="LabelStyle" Style="{styles:SharedStyles.FUELabelStyle}"/>
+      <style:StatefulCompositeStyle Name="SecondaryStyle" Base="{LabelStyle}"/>
+      <style:StatefulCompositeStyle Name="DescriptionStyle" Base="{styles:SharedStyles.FUEDescriptionStyle}"/>
+    </Locals>
+
+    <Scripts>
+      <Script>OverrideStyle = styles:SharedStyles.FUEHeaderStyle;</Script>
+
+       
+      <Script>SecondaryStyle.State = [Style.State];</Script>
+      <Script>DescriptionStyle.State = [Style.State];</Script>
+
+      
+      
+      
+      
+      <Script>UI.KeyFocusOnMouseDown = false;</Script>
+    </Scripts>
+
+    <Content>
+      <ColorFill Name="Background" MouseInteractive="true" Layout="VerticalFlow" Margins="4,26,0,0">
+        <Children>
+
+          <Panel>
+            <Layout>
+              <FlowLayout Orientation="Horizontal" ItemAlignment="Center"/>
+            </Layout>
+            <Children>
+
+              
+              <core:Label Name="Label" Style="{Style}"/>
+
+              
+              <Graphic Name="IconGraphic" Content="res://ZuneShellResources!Arrow.More.png" Margins="4,0,0,0" Visible="true"/>
+
+            </Children>
+          </Panel>
+
+          <core:Label Name="SecondaryLabel" Content="{LabelString}" Style="{SecondaryStyle}" WordWrap="true" Margins="0,2,0,9"/>
+
+          <core:Label Name="DescriptionLabel" Content="{DescriptionString}" Style="{DescriptionStyle}" WordWrap="true"/>
+        </Children>
+      </ColorFill>
+    </Content>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/GALLERYPANEL.UIX b/test/2.1/GALLERYPANEL.UIX
new file mode 100644
index 0000000..b698d8f
--- /dev/null
+++ b/test/2.1/GALLERYPANEL.UIX
@@ -0,0 +1,108 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:list="res://ZuneShellResources!ContentList.uix"
+  xmlns:lv="res://ZuneShellResources!ListViewPanel.uix"
+  xmlns:me="Me">
+
+  
+  
+  
+  <UI Name="GalleryPanelWorker">
+    <Properties>
+      <zune:ListPanel Name="Model" ListPanel="$Required"/>
+      <iris:Choice Name="Sorts" Choice="{null}"/>
+
+      <Type Name="GalleryViewType" Type="{typeof(me:GalleryView)}"/>
+      <Inset Name="ColumnInset" Inset="0,0,0,0"/>
+      <Inset Name="ScrollMargins" Inset="0,0,38,0"/>
+      <Size Name="LayoutSpacing" Size="10,0"/>
+      <Inset Name="HeaderMargins" Inset="0,0,0,22"/>
+      <Inset Name="HeaderPadding" Inset="0,0,0,0"/>
+      <Boolean Name="HighlightHeader" Boolean="true"/>
+
+      <core:ContextMenu Name="ContextMenu" ContextMenu="{null}"/>
+      <list:CommandContainer Name="EditContext" CommandContainer="{null}"/>
+
+      <iris:Command Name="ToggleSelectAllCommand" Command="{null}"/>
+      <Command Name="ExecuteCommand" Command="{null}"/>
+      <iris:Command Name="SelectedItemClicked" Command="{null}"/>
+
+      <SelectionManager Name="SelectionManager" SelectionManager="{null}"/>
+
+      <core:NavigateIntoIndexRequest Name="NavigateIntoArgs" NavigateIntoIndexRequest="{null}"/>
+
+      <Boolean Name="SupportsJumpInList" Boolean="false"/>
+    </Properties>
+
+    <Locals>
+      <Accessible Name="Accessible"/>
+    </Locals>
+
+    <Scripts>
+      <Script>Gallery.Content = [Model.Content];</Script>
+      <Script>Gallery.ContextMenu = [ContextMenu];</Script>
+      <Script>Gallery.ExecuteCommand = [ExecuteCommand];</Script>
+      <Script>Gallery.SupportsJumpInList = [SupportsJumpInList];</Script>
+      <Script>Gallery.SelectedItemClicked = [SelectedItemClicked];</Script>
+      <Script>Header.Sorts = [Sorts];</Script>
+
+      <Script>
+        if ([Accessible.Enabled])
+        {
+          Accessible.Name = [Model.MediaType].ToString();
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      
+      
+      <Panel Navigation="ContainDirectional,RememberFocus" >
+        <Layout>
+          <DockLayout DefaultLayoutInput="Top,Near"/>
+        </Layout>
+        <Children>
+
+          <lv:ColumnPanelHeader Name="Header" ToggleSelectAll="{ToggleSelectAllCommand}" Sorts="{Sorts}" 
+                                Margins="{HeaderMargins}" HeaderPadding="{HeaderPadding}" 
+                                HighlightHeader="{HighlightHeader}" SizeToChildren="{!HighlightHeader}"/>
+
+          
+          <me:GalleryView Name="Gallery" GalleryView="{GalleryViewType}"
+              ListModel="{Model}"
+              ScrollOrientation="Vertical"
+              NavigateIntoArgs="{NavigateIntoArgs}"
+              SelectionManager="{SelectionManager}"
+              VerticalScrollMargins="{ScrollMargins}"
+              LayoutSpacing="{LayoutSpacing}"
+              ContextMenu="{ContextMenu}"
+              EditContext="{EditContext}"
+              Padding="{ColumnInset}"/>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="GalleryView" Base="core:GalleryView">
+    <Properties>
+      
+      <Single Name="FadeSize" Single="-4.0"/>
+      <Size Name="GridCellSize" Size="0,0"/>
+      <Size Name="LayoutSpacing" Size="10,0"/>
+      <Layout Name="ListLayout">
+        <Layout>
+          <GridLayout Orientation="Horizontal" AllowWrap="true" Spacing="{LayoutSpacing}" ReferenceSize="{GridCellSize}"/>
+        </Layout>
+      </Layout>
+    </Properties>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/GALLERYVIEW.UIX b/test/2.1/GALLERYVIEW.UIX
new file mode 100644
index 0000000..81224ad
--- /dev/null
+++ b/test/2.1/GALLERYVIEW.UIX
@@ -0,0 +1,118 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX 
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI" 
+  xmlns:list="res://ZuneShellResources!ContentList.uix" 
+  xmlns:thumbbutton="res://ZuneShellResources!ThumbnailButton.uix"
+  xmlns:animations="res://ZuneShellResources!Animations.uix"
+  xmlns:me="Me">
+
+  
+  
+  
+  <UI Name="Default">
+    <Content>
+      <me:GalleryView>
+        <Content>
+          <iris:ArrayListDataSet>
+            <Source>
+              <zune:ThumbnailCommand Description="The Information" ImagePath="res://ZuneShellTests!Beck01.jpg"/>
+              <zune:ThumbnailCommand Description="Sea Change" ImagePath="res://ZuneShellTests!Beck02.jpg"/>
+              <zune:ThumbnailCommand Description="Guero" ImagePath="res://ZuneShellTests!Beck03.jpg"/>
+              <zune:ThumbnailCommand Description="Midnight Vultures" ImagePath="res://ZuneShellTests!Beck04.jpg"/>
+              <zune:ThumbnailCommand Description="Mutations" ImagePath="res://ZuneShellTests!Beck05.jpg"/>
+              <zune:ThumbnailCommand Description="Odelay" ImagePath="res://ZuneShellTests!Beck06.jpg"/>
+            </Source>
+          </iris:ArrayListDataSet>
+        </Content>
+      </me:GalleryView>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="GalleryView" Base="list:ScrollingContentListBase">
+    <Properties>
+      <Size Name="TileSize" Size="70,70"/>
+      <Size Name="LabelSize" Size="0,20"/>
+      <Size Name="LayoutSpacing" Size="15,5"/>
+      <Layout Name="ListLayout">
+        <Layout>
+          <GridLayout Orientation="Horizontal" Spacing="{LayoutSpacing}"/>
+        </Layout>
+      </Layout>
+      <Orientation Name="ScrollOrientation" Orientation="Horizontal"/>
+
+      <Type Name="ListItemType" Type="{typeof(list:ThumbnailListItemBase)}"/>
+      <Type Name="ProviderType" Type="{typeof(thumbbutton:CommandThumbnailButtonProvider)}"/>
+
+      <Type Name="ThumbnailCaptionAreaType" Type="{typeof(thumbbutton:ThumbnailCaptionArea)}"/>
+
+      <StretchingPolicy Name="StretchingPolicy" StretchingPolicy="Uniform"/>
+
+      
+
+      <Object Name="ListModel" Object="{null}"/>
+
+      
+      <Animation Name="ItemMove" Animation="{animations:Animations.MoveNow}"/>
+      <Animation Name="ItemHide" Animation="{null}"/>
+    </Properties>
+
+    <Locals>
+      
+      
+      <Timer Name="ContentChangedTimer" AutoRepeat="false" Interval="1500" Enabled="true"/>
+      <iris:BooleanChoice Name="ContentRecentlyChanged" Value="true"/>
+      <Single Name="AnimDelay" Single="{animations:Animations.GalleryIndexFadeDelay}"/>
+
+      
+      <SwitchAnimation Name="ItemShow" Expression="{ContentRecentlyChanged}">
+        <Options>
+          <TransformByAttributeAnimation Name="True" Attribute="Index" Delay="{AnimDelay}" Source="{animations:Animations.GalleryFadeIn}"/>
+        </Options>
+      </SwitchAnimation>
+    </Locals>
+
+    <Scripts>
+      
+      <Script>        
+        [DeclareTrigger(Content)]
+        ContentChangedTimer.Start();
+        ContentRecentlyChanged.Value = true;
+      </Script>
+
+      
+      <Script>        
+        [DeclareTrigger(ContentChangedTimer.Tick)]
+        ContentRecentlyChanged.Value = false;
+      </Script>
+    </Scripts>
+
+    <Content Name="Item">
+      <list:ThumbnailListItemBase ThumbnailListItemBase="{ListItemType}"
+        Index="{RepeatedItemIndex}" 
+        TileSize="{TileSize}"
+        LabelSize="{LabelSize}"
+        StretchingPolicy="{StretchingPolicy}" 
+        EditingList="{EditingList}"
+        ThumbnailCaptionAreaType="{ThumbnailCaptionAreaType}">
+        <Provider>
+          <thumbbutton:ThumbnailButtonProvider ThumbnailButtonProvider="{ProviderType}" 
+              Model="{RepeatedItem}" 
+              Index="{RepeatedItemIndex}"
+              SelectionManager="{SelectionManager}"
+              ListModel="{ListModel}"/>
+        </Provider>
+        <Animations>
+          <SwitchAnimation SwitchAnimation="{ItemShow}"/>
+          <AnimationProvider AnimationProvider="{ItemMove}"/>
+          <AnimationProvider AnimationProvider="{ItemHide}"/>
+        </Animations>
+      </list:ThumbnailListItemBase>
+    </Content>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/GASGAUGE.UIX b/test/2.1/GASGAUGE.UIX
new file mode 100644
index 0000000..b7eddbe
--- /dev/null
+++ b/test/2.1/GASGAUGE.UIX
@@ -0,0 +1,476 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:core="res://ZuneShellResources!CoreControls.uix"
+  xmlns:animations="res://ZuneShellResources!Animations.uix"
+  xmlns:me="Me"
+  >
+
+  <UI Name="MiniGasGauge">
+    <Properties>
+      <Int64 Name="OldSize" Int64="$Required"/>
+      <Int64 Name="NewSize" Int64="$Required"/>
+      <Int64 Name="TotalSize" Int64="$Required"/>
+    </Properties>
+    <Locals>
+      
+      <Int32 Name="SizeOfMargins" Int32="2"/>
+      
+      <Size Name="Max" Size="220,8"/>
+      <Size Name="Old" Height="{Max.Height}" Width="{zune:SyncControls.GetGasGaugeSegmentWidth(Max.Width, OldSize, TotalSize, SizeOfMargins)}"/>
+    </Locals>
+    <Scripts>
+      <Script>
+        <![CDATA[
+		Int32 size = zune:SyncControls.GetGasGaugeSegmentWidth(Max.Width, [NewSize] - OldSize, TotalSize, SizeOfMargins);
+
+		if (size + SizeOfMargins > Max.Width - Old.Width)
+		{
+			size = Max.Width - Old.Width - SizeOfMargins;
+		}
+		
+        Size newSize = new Size(size, Max.Height);
+        NewUsedSpace.MinimumSize = newSize;
+        NewUsedSpace.MaximumSize = newSize;
+        ]]>
+      </Script>
+    </Scripts>
+    <Content>
+
+      <Panel Layout="Anchor" MaximumSize="{Max}">
+        <Children>
+
+          <Panel Name="Bar" Layout="Dock">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Border,0" Bottom="Border,1"/>
+            </LayoutInput>
+            <Children>
+              <ColorFill Content="{styles:Styles.GasGaugeMiniBorder}">
+                <LayoutInput>
+                  <DockLayoutInput Position="Left"/>
+                </LayoutInput>
+                <Layout>
+                  <DockLayout DefaultLayoutInput="Left,Center" SizeToChildren="true"/>
+                </Layout>
+                <Animations>
+                  <Animation Type="Size" Loop="0">
+                    <Keyframes>
+                      <SizeKeyframe Time="0" RelativeTo="Current" Value="0,0,0" Interpolation="SCurve"/>
+                      <SizeKeyframe Time="0.2" RelativeTo="Final" Value="0,0,0"/>
+                    </Keyframes>
+                  </Animation>
+                </Animations>
+                <Children>
+
+                  <ColorFill Name="OldUsedSpace" Content="{styles:Styles.GasGaugeUnimportantUsedSpace}"
+                             MaximumSize="{Old}" MinimumSize="{Old}" Margins="0,0,1,0"/>
+
+                  <ColorFill Name="NewUsedSpace" Content="{styles:Styles.GasGaugeNewlyUsedSpace}" Margins="0,0,1,0">
+                    <Animations>
+                      <Animation Type="Size" Loop="0">
+                        <Keyframes>
+                          <SizeKeyframe Time="0" RelativeTo="Current" Value="0,0,0" Interpolation="SCurve"/>
+                          <SizeKeyframe Time="0.2" RelativeTo="Final" Value="0,0,0"/>
+                        </Keyframes>
+                      </Animation>
+                    </Animations>
+                  </ColorFill>
+                  
+                </Children>
+              </ColorFill>
+
+              <ColorFill Name="FreeBar" Content="{styles:Styles.GasGaugeFreeSpace}">
+                <LayoutInput>
+                  <DockLayoutInput Position="Client"/>
+                </LayoutInput>
+              </ColorFill>
+
+            </Children>
+          </Panel>
+
+          <me:Border Name="Border" MaximumSize="{new Size(0, Max.Height)}" BorderColor="{styles:Styles.GasGaugeMiniBorder}">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Bar,0" Top="Bar,0" Right="Bar,1" Bottom="Bar,1" Vertical="Center"/>
+            </LayoutInput>
+          </me:Border>
+
+        </Children>
+      </Panel>
+     
+    </Content>
+  </UI>
+
+  <UI Name="GasGauge">
+    <Locals>
+      <me:GasGaugePortionSet Name="Portions"/>
+
+      <me:GasGaugePortion Name="CurrentPortion"/>
+
+      <String Name="SizeInKB" String="{zune:Shell.LoadString(zune:StringId.IDS_GAS_GAUGE_SIZE_IN_KB)}"/>
+      <String Name="SizeInMB" String="{zune:Shell.LoadString(zune:StringId.IDS_GAS_GAUGE_SIZE_IN_MB)}"/>
+      <String Name="SizeInGB" String="{zune:Shell.LoadString(zune:StringId.IDS_GAS_GAUGE_SIZE_IN_GB)}"/>
+      <String Name="FreeSpaceTitle" String="{zune:Shell.LoadString(zune:StringId.IDS_FREE_GAS_GAUGE_FORMAT)}"/>
+    </Locals>
+    <Scripts>
+      <Script>
+        
+        
+        
+        Boolean isGuest = [zune:SyncControls.Instance.CurrentDeviceIsGuest];
+
+        MusicBar.Visible = !isGuest;
+        VideoBar.Visible = !isGuest;
+        PhotoBar.Visible = !isGuest;
+        PodcastBar.Visible = !isGuest;
+        OtherBar.Visible = !isGuest;
+        TotalBar.Visible = isGuest;
+      </Script>
+      
+      <Script>
+        MusicBar.PercentSize = [Portions.Music.PercentSize];
+      </Script>
+      <Script>
+        MusicBar.PercentStart = [Portions.Music.StartPercentSize];
+      </Script>
+      <Script>
+        VideoBar.PercentSize = [Portions.Video.PercentSize];
+      </Script>
+      <Script>
+        VideoBar.PercentStart = [Portions.Video.StartPercentSize];
+      </Script>
+      <Script>
+        PhotoBar.PercentSize = [Portions.Photo.PercentSize];
+      </Script>
+      <Script>
+        PhotoBar.PercentStart = [Portions.Photo.StartPercentSize];
+      </Script>
+      <Script>
+        PodcastBar.PercentSize = [Portions.Podcast.PercentSize];
+      </Script>
+      <Script>
+        PodcastBar.PercentStart = [Portions.Podcast.StartPercentSize];
+      </Script>
+      <Script>
+        OtherBar.PercentSize = [Portions.Other.PercentSize];
+      </Script>
+      <Script>
+        OtherBar.PercentStart = [Portions.Other.StartPercentSize];
+      </Script>
+      <Script>
+        TotalBar.PercentSize = [Portions.Total.PercentSize];
+      </Script>
+      <Script>
+        TotalBar.PercentStart = [Portions.Total.StartPercentSize];
+      </Script>
+
+      <Script>
+        Int64 usedSpace = [CurrentPortion.RawSize];
+
+        if (usedSpace &lt; 0L)
+        {
+          usedSpace = 0L;
+        }
+        
+        if (usedSpace &lt; 1000000L &amp;&amp; usedSpace != 0L) 
+        {
+          CurrentSpaceReadout.Content = [CurrentPortion.Title].Format( SizeInKB.Format( (float)usedSpace / 1000.0 ) );
+        }
+        else if (CurrentPortion.RawSize &lt; 1000000000L) 
+        {
+          CurrentSpaceReadout.Content = CurrentPortion.Title.Format( SizeInMB.Format( (float)usedSpace / 1000000.0 ) );
+        }
+        else
+        {
+          CurrentSpaceReadout.Content = CurrentPortion.Title.Format( SizeInGB.Format( (float)usedSpace / 1000000000.0 ) );
+        }
+      </Script>
+
+      <Script>
+        Int64 freeSpace = [zune:SyncControls.Instance.FreeSpace];
+        
+        if (freeSpace &lt; 0L)
+        {
+          freeSpace = 0L;
+        }
+
+        if (freeSpace &lt; 1000000L &amp;&amp; freeSpace != 0L) 
+        {
+          FreeSpaceReadout.Content = [FreeSpaceTitle].Format( SizeInKB.Format( (float)freeSpace / 1000.0 ) );
+        }
+        else if (freeSpace &lt; 1000000000L) 
+        {
+          FreeSpaceReadout.Content = FreeSpaceTitle.Format( SizeInMB.Format( (float)freeSpace / 1000000.0 ) );
+        }
+        else
+        {
+          FreeSpaceReadout.Content = FreeSpaceTitle.Format( SizeInGB.Format( (float)freeSpace / 1000000000.0 ) );
+        }
+      </Script>
+      
+      <Script>
+        
+        if ([MusicBar.Focused])
+        {
+          CurrentPortion = Portions.Music;
+        }
+        else if ([VideoBar.Focused])
+        {
+          CurrentPortion = Portions.Video;
+        }
+        else if ([PhotoBar.Focused])
+        {
+          CurrentPortion = Portions.Photo;
+        }
+        else if ([PodcastBar.Focused])
+        {
+          CurrentPortion = Portions.Podcast;
+        }
+        else if ([OtherBar.Focused])
+        {
+          CurrentPortion = Portions.Other;
+        }
+        else
+        {
+          
+          zune:Node currentNode = ((zune:Shell) zune:Shell.DefaultInstance).CurrentNode;
+          
+          if (currentNode == zune:Shell.MainFrame.Device.Music)
+          {
+            CurrentPortion = Portions.Music;
+          }
+          else if (currentNode == zune:Shell.MainFrame.Device.Videos)
+          {
+            CurrentPortion = Portions.Video;
+          }
+          else if (currentNode == zune:Shell.MainFrame.Device.Photos)
+          {
+            CurrentPortion = Portions.Photo;
+          }
+          else if (currentNode == zune:Shell.MainFrame.Device.Podcasts)
+          {
+            CurrentPortion = Portions.Podcast;
+          }
+          
+          else
+          {
+            CurrentPortion = Portions.Total;
+          }
+        }
+      </Script>
+    </Scripts>
+    <Content>
+
+      <Panel Layout="Anchor" MaximumSize="297,0">
+        <Children>
+
+          <core:Label Name="CurrentSpaceReadout" Style="{styles:SharedStyles.GasGaugeCurrentSpace}" Padding="0,0,0,4">
+            <LayoutInput>
+              <AnchorLayoutInput Bottom="Bar,0" Left="Bar,0" Right="Bar,0,9999" ContributesToWidth="false"/>
+            </LayoutInput>
+            <Animations>
+              <Animation Animation="{animations:Animations.BasicMove}"/>
+            </Animations>
+          </core:Label>
+
+          <Panel Name="Bar" Layout="Dock" MinimumSize="0,8" MaximumSize="0,8">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Parent,0" Vertical="Center"/>
+            </LayoutInput>
+            <Children>
+              <ColorFill Content="{styles:Styles.GasGaugeBorder}">
+                <LayoutInput>
+                  <DockLayoutInput Position="Left"/>
+                </LayoutInput>
+                <Layout>
+                  <DockLayout DefaultLayoutInput="Left,Center" SizeToChildren="true"/>
+                </Layout>
+                <Children>
+                  <me:GasGaugeSegment Name="MusicBar" MaxWidth="295"  Node="{zune:Shell.MainFrame.Device.Music}"/>
+                  <me:GasGaugeSegment Name="VideoBar" MaxWidth="295" Node="{zune:Shell.MainFrame.Device.Videos}"/>
+                  <me:GasGaugeSegment Name="PhotoBar" MaxWidth="295" Node="{zune:Shell.MainFrame.Device.Photos}"/>
+                  <me:GasGaugeSegment Name="PodcastBar" MaxWidth="295" Node="{zune:Shell.MainFrame.Device.Podcasts}"/>
+                  <me:GasGaugeSegment Name="OtherBar" MaxWidth="295" Node="{null}"/>
+                  <me:GasGaugeSegment Name="TotalBar" MaxWidth="295" Node="{null}" AcceptFocus="false"/>
+                </Children>
+              </ColorFill>  
+              
+              <ColorFill Name="FreeBar" Content="{styles:Styles.GasGaugeFreeSpace}">
+                <LayoutInput>
+                  <DockLayoutInput Position="Client"/>
+                </LayoutInput>
+              </ColorFill>
+              
+            </Children>
+          </Panel>
+
+          <me:Border Name="Border" MaximumSize="0,8">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Bar,0" Top="Bar,0" Right="Bar,1" Bottom="Bar,1" Vertical="Center"/>
+            </LayoutInput>
+          </me:Border>          
+
+          <core:Label Name="FreeSpaceReadout" Style="{styles:SharedStyles.GasGaugeFreeSpaceText}" Padding="0,1,0,0">
+            <LayoutInput>
+              <AnchorLayoutInput Right="Bar,1" Top="Bar,1"/>
+            </LayoutInput>
+          </core:Label>
+          
+        </Children>
+      </Panel>
+
+    </Content>
+  </UI>
+
+  <UI Name="Border">
+    <Properties>
+      <Color Name="BorderColor" Color="{styles:Styles.GasGaugeBorder}"/>
+    </Properties>
+    <Content>
+      <Panel Name="Bar" Layout="Dock">
+        <Children>
+          <ColorFill Name="TopBorder" Content="{BorderColor}" MaximumSize="0,1">
+            <LayoutInput>
+              <DockLayoutInput Position="Top"/>
+            </LayoutInput>
+          </ColorFill>
+
+          <ColorFill Name="BottomBorder" Content="{BorderColor}" MaximumSize="0,1">
+            <LayoutInput>
+              <DockLayoutInput Position="Bottom"/>
+            </LayoutInput>
+          </ColorFill>
+
+          <ColorFill Name="LeftBorder" Content="{BorderColor}" MaximumSize="1,0">
+            <LayoutInput>
+              <DockLayoutInput Position="Left"/>
+            </LayoutInput>
+          </ColorFill>
+          
+          <ColorFill Name="RightBorder" Content="{BorderColor}" MaximumSize="1,0">
+            <LayoutInput>
+              <DockLayoutInput Position="Right"/>
+            </LayoutInput>
+          </ColorFill>
+        </Children>
+      </Panel>      
+    </Content>
+  </UI>
+  
+  <Class Name="GasGaugePortionSet">
+    <Properties>
+      <me:GasGaugePortion Name="Music" Title="{zune:Shell.LoadString(zune:StringId.IDS_MUSIC_GAS_GAUGE_FORMAT)}"/>
+      <me:GasGaugePortion Name="Video" Title="{zune:Shell.LoadString(zune:StringId.IDS_VIDEO_GAS_GAUGE_FORMAT)}"/>
+      <me:GasGaugePortion Name="Photo" Title="{zune:Shell.LoadString(zune:StringId.IDS_PHOTO_GAS_GAUGE_FORMAT)}"/>
+      <me:GasGaugePortion Name="Podcast" Title="{zune:Shell.LoadString(zune:StringId.IDS_PODCAST_GAS_GAUGE_FORMAT)}"/>
+      <me:GasGaugePortion Name="Other" Title="{zune:Shell.LoadString(zune:StringId.IDS_OTHER_GAS_GAUGE_FORMAT)}"/>
+      <me:GasGaugePortion Name="Total" Title="{zune:Shell.LoadString(zune:StringId.IDS_TOTAL_GAS_GAUGE_FORMAT)}"/>
+    </Properties>
+    <Locals>
+      <zune:SyncControls Name="Controls" SyncControls="{zune:SyncControls.Instance}"/>
+    </Locals>
+    <Scripts>
+      <Script>
+        Music.RawSize = [Controls.MusicSpace];
+      </Script>
+      <Script>
+        Video.RawSize = [Controls.VideoSpace];
+      </Script>
+      <Script>
+        Photo.RawSize = [Controls.PhotoSpace];
+      </Script>
+      <Script>
+        Podcast.RawSize = [Controls.PodcastSpace];
+      </Script>
+      <Script>
+        Other.RawSize = [Controls.OtherSpace];
+      </Script>
+
+      <Script>
+        Total.RawSize = [Controls.TotalSpace] - [Controls.FreeSpace];
+      </Script>
+
+      <Script>
+        Video.StartPercentSize = [Music.PercentSize];
+        Photo.StartPercentSize = Video.StartPercentSize + [Video.PercentSize];
+        Podcast.StartPercentSize = Photo.StartPercentSize + [Photo.PercentSize];
+        Other.StartPercentSize = Podcast.StartPercentSize + [Podcast.PercentSize];
+      </Script>
+    </Scripts>
+  </Class>
+  
+  <Class Name="GasGaugePortion">
+    <Properties>
+      <String Name="Title"/>
+      <Int64 Name="RawSize" Int64="0"/>
+      <Single Name="PercentSize"/>
+      <Single Name="StartPercentSize"/>
+    </Properties>
+    <Scripts>
+      <Script>
+        PercentSize = (Single)[RawSize] / (Single)[zune:SyncControls.Instance.TotalSpace];
+      </Script>
+    </Scripts>
+  </Class>
+
+  <UI Name="GasGaugeSegment">
+    <Properties>
+      <zune:Node Name="Node" Node="$Required"/>
+      <Single Name="PercentSize" Single="0.0"/>
+      <Single Name="PercentStart" Single="0.0"/>
+      <Int32 Name="MaxWidth" Int32="0"/>
+      <Boolean Name="AcceptFocus" Boolean="true"/>
+
+      <Boolean Name="Focused" Boolean="false"/>
+    </Properties>
+    <Locals>
+      <Int32 Name="Height" Int32="8"/>
+      <Int32 Name="SizeOfMargins" Int32="5"/>
+    </Locals>
+    <Input>
+      <ClickHandler Command="{Node}" Name="Clicky" HandlerStage="Direct"/>
+    </Input>
+    <Scripts>
+      <Script>
+        Int32 width = (Int32)((Single)[MaxWidth] * [PercentSize]) - 1;
+        Int32 startWidth = (Int32)((Single)MaxWidth * [PercentStart]);
+        
+        if (width + SizeOfMargins > MaxWidth - startWidth)
+        {
+          width = MaxWidth - startWidth - SizeOfMargins;
+        }
+        
+        if (width >= 0)
+        {
+          Size size = new Size(width, Height);
+          Visual.MinimumSize = size;
+          Visual.Visible = true;
+        }
+        else
+        {
+          Visual.Visible = false;
+        }
+      </Script>
+      <Script>
+        Clicky.Enabled = [AcceptFocus];
+      </Script>
+      <Script>
+        if ([UI.MouseFocus] &amp;&amp; [AcceptFocus])
+        {
+          Visual.Content = styles:Styles.GasGaugeImportantUsedSpace;
+          Focused = true;
+        }
+        else
+        {
+          Visual.Content = styles:Styles.GasGaugeUnimportantUsedSpace;
+          Focused = false;
+        }
+      </Script>
+    </Scripts>
+    <Content>
+      <ColorFill Name="Visual" Margins="0,0,1,0"/>
+    </Content>
+  </UI>
+  
+</UIX>
diff --git a/test/2.1/IMAGESTYLE.UIX b/test/2.1/IMAGESTYLE.UIX
new file mode 100644
index 0000000..9151734
--- /dev/null
+++ b/test/2.1/IMAGESTYLE.UIX
@@ -0,0 +1,528 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX 
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:me="Me">
+
+  
+  
+  
+  
+  <Class Name="ImageStyle">
+    <Properties>
+      <Image Name="Image" Image="{null}"/>
+      <Image Name="HoverImage" Image="{null}"/>
+      <Image Name="FocusImage" Image="{null}"/>
+      <Image Name="PressedImage" Image="{null}"/>
+      <Image Name="DisabledImage" Image="{null}"/>
+      
+      <Image Name="HoldingImage" Image="{null}"/>
+    </Properties>
+  </Class>
+  
+  
+  
+  
+  
+  
+  <Class Name="SwitchImageStyle" Base="me:ImageStyle">
+    <Properties>
+      <me:ImageStyle Name="True" ImageStyle="$Required"/>
+      <me:ImageStyle Name="False" ImageStyle="$Required"/>
+      <iris:BooleanChoice Name="Expression" BooleanChoice="$Required"/>
+    </Properties>
+
+    <Locals>
+      <me:ImageStyle Name="SelectedStyle" ImageStyle="{False}"/>
+    </Locals>
+
+    <Scripts>
+      
+      <Script>
+        if ([Expression.Value])
+          SelectedStyle = True;
+        else
+          SelectedStyle = False;
+      </Script>
+
+      
+      <Script>Image         = [SelectedStyle.Image];</Script>
+      <Script>HoverImage    = [SelectedStyle.HoverImage];</Script>
+      <Script>FocusImage    = [SelectedStyle.FocusImage];</Script>
+      <Script>PressedImage  = [SelectedStyle.PressedImage];</Script>
+      <Script>DisabledImage = [SelectedStyle.DisabledImage];</Script>
+      <Script>HoldingImage  = [SelectedStyle.HoldingImage];</Script>
+    </Scripts>
+  </Class>
+
+  
+  
+  
+  
+  <UI Name="IconButton" Base="core:IconButton">
+    <Properties>
+      <me:ImageStyle Name="Style"/>
+    </Properties>
+
+    <Scripts>
+      <Script>Image         = [Style.Image];</Script>
+      <Script>HoverImage    = [Style.HoverImage];</Script>
+      <Script>FocusImage    = [Style.FocusImage];</Script>
+      <Script>PressedImage  = [Style.PressedImage];</Script>
+      <Script>DisabledImage = [Style.DisabledImage];</Script>  
+    </Scripts>
+  </UI>
+  
+  
+  
+  
+  
+  <UI Name="ActionButton" Base="core:ActionButton">
+    <Properties>
+      <me:ImageStyle Name="ImageStyle"/>
+    </Properties>
+
+    <Scripts>
+      <Script>Image         = [ImageStyle.Image];</Script>
+      <Script>HoverImage    = [ImageStyle.HoverImage];</Script>
+      <Script>FocusImage    = [ImageStyle.FocusImage];</Script>
+      <Script>PressedImage  = [ImageStyle.PressedImage];</Script>
+      <Script>DisabledImage = [ImageStyle.DisabledImage];</Script>  
+    </Scripts>
+  </UI>
+  
+  
+  
+  
+  
+  <UI Name="ToggleActionButton" Base="core:ToggleActionButton">
+    <Properties>
+      <me:ImageStyle Name="ImageStyle"/>
+    </Properties>
+
+    <Scripts>
+      <Script>Image         = [ImageStyle.Image];</Script>
+      <Script>HoverImage    = [ImageStyle.HoverImage];</Script>
+      <Script>FocusImage    = [ImageStyle.FocusImage];</Script>
+      <Script>PressedImage  = [ImageStyle.PressedImage];</Script>
+      <Script>DisabledImage = [ImageStyle.DisabledImage];</Script>  
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  
+  <UI Name="PressAndHoldIconButton" Base="core:PressAndHoldIconButton">
+    <Properties>
+      <me:ImageStyle Name="Style"/>
+    </Properties>
+
+    <Scripts>
+      <Script>Image         = [Style.Image];</Script>
+      <Script>HoverImage    = [Style.HoverImage];</Script>
+      <Script>FocusImage    = [Style.FocusImage];</Script>
+      <Script>PressedImage  = [Style.PressedImage];</Script>
+      <Script>DisabledImage = [Style.DisabledImage];</Script>  
+      <Script>HoldingImage  = [Style.HoldingImage];</Script>  
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  
+  <UI Name="ToggleIconButton" Base="core:ToggleIconButton">
+    <Properties>
+      <me:ImageStyle Name="OnStyle"/>
+      <me:ImageStyle Name="OffStyle"/>
+    </Properties>
+
+    <Scripts>
+      <Script>OnImage           = [OnStyle.Image];</Script>
+      <Script>OnHoverImage      = [OnStyle.HoverImage];</Script>
+      <Script>OnFocusImage      = [OnStyle.FocusImage];</Script>
+      <Script>OnPressedImage    = [OnStyle.PressedImage];</Script>
+      <Script>OnDisabledImage   = [OnStyle.DisabledImage];</Script>
+      <Script>OffImage          = [OffStyle.Image];</Script>
+      <Script>OffHoverImage     = [OffStyle.HoverImage];</Script>
+      <Script>OffFocusImage     = [OffStyle.FocusImage];</Script>
+      <Script>OffPressedImage   = [OffStyle.PressedImage];</Script>
+      <Script>OffDisabledImage  = [OffStyle.DisabledImage];</Script>
+    </Scripts>
+  </UI>
+  
+  
+  
+  
+  
+  <Class Name="Images" Shared="true">
+    <Properties>
+
+      
+      
+      <iris:BooleanChoice Name="InNowPlaying"/>
+      <iris:Command Name="NowPlayingIconCommand" Description="{zune:Shell.LoadString(zune:StringId.IDS_NOW_PLAYING_ICON_TOOLTIP)}"/>
+
+      
+
+      <me:ImageStyle Name="ZuneLogo" 
+          Image         ="res://ZuneShellResources!ZuneLogo.png"
+          HoverImage    ="res://ZuneShellResources!ZuneLogo.Hover.png"
+          PressedImage  ="res://ZuneShellResources!ZuneLogo.Pressed.png"/>
+
+      <me:ImageStyle Name="WindowHelp" 
+          Image         ="res://ZuneShellResources!Window.Help.png"
+          HoverImage    ="res://ZuneShellResources!Window.Help.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Window.Help.Pressed.png"/>
+      <me:ImageStyle Name="NowPlayingWindowHelp" 
+          Image         ="res://ZuneShellResources!Window.Slideshow.Help.png"
+          HoverImage    ="res://ZuneShellResources!Window.Slideshow.Help.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Window.Slideshow.Help.Pressed.png"/>
+      <me:SwitchImageStyle Name="ContextualWindowHelp" 
+          Expression="{InNowPlaying}"
+          False="{WindowHelp}" 
+          True="{NowPlayingWindowHelp}"/>
+
+      <me:ImageStyle Name="WindowBack" 
+          Image         ="res://ZuneShellResources!Window.Back.png"
+          HoverImage    ="res://ZuneShellResources!Window.Back.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Window.Back.Pressed.png"
+          DisabledImage ="res://ZuneShellResources!Window.Back.Disabled.png"/>
+
+      <me:ImageStyle Name="WindowRestore" 
+          Image         ="res://ZuneShellResources!Window.Restore.png"
+          HoverImage    ="res://ZuneShellResources!Window.Restore.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Window.Restore.Pressed.png"/>
+      <me:ImageStyle Name="NowPlayingWindowRestore" 
+          Image         ="res://ZuneShellResources!Window.Slideshow.Restore.png"
+          HoverImage    ="res://ZuneShellResources!Window.Slideshow.Restore.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Window.Slideshow.Restore.Pressed.png"/>
+      <me:SwitchImageStyle Name="ContextualWindowRestore" 
+          Expression="{InNowPlaying}"
+          False="{WindowRestore}" 
+          True="{NowPlayingWindowRestore}"/>
+
+      <me:ImageStyle Name="WindowMaximize" 
+          Image         ="res://ZuneShellResources!Window.Maximize.png"
+          HoverImage    ="res://ZuneShellResources!Window.Maximize.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Window.Maximize.Pressed.png"/>
+      <me:ImageStyle Name="NowPlayingWindowMaximize" 
+          Image         ="res://ZuneShellResources!Window.Slideshow.Maximize.png"
+          HoverImage    ="res://ZuneShellResources!Window.Slideshow.Maximize.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Window.Slideshow.Maximize.Pressed.png"/>
+      <me:SwitchImageStyle Name="ContextualWindowMaximize" 
+          Expression="{InNowPlaying}"
+          False="{WindowMaximize}" 
+          True="{NowPlayingWindowMaximize}"/>
+
+      <me:ImageStyle Name="WindowMinimize" 
+          Image         ="res://ZuneShellResources!Window.Minimize.png"
+          HoverImage    ="res://ZuneShellResources!Window.Minimize.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Window.Minimize.Pressed.png"/>
+      <me:ImageStyle Name="NowPlayingWindowMinimize" 
+          Image         ="res://ZuneShellResources!Window.Slideshow.Minimize.png"
+          HoverImage    ="res://ZuneShellResources!Window.Slideshow.Minimize.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Window.Slideshow.Minimize.Pressed.png"/>
+      <me:SwitchImageStyle Name="ContextualWindowMinimize" 
+          Expression="{InNowPlaying}"
+          False="{WindowMinimize}" 
+          True="{NowPlayingWindowMinimize}"/>
+
+      <me:ImageStyle Name="WindowClose" 
+          Image         ="res://ZuneShellResources!Window.Close.png"
+          HoverImage    ="res://ZuneShellResources!Window.Close.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Window.Close.Pressed.png"/>
+      <me:ImageStyle Name="NowPlayingWindowClose" 
+          Image         ="res://ZuneShellResources!Window.Slideshow.Close.png"
+          HoverImage    ="res://ZuneShellResources!Window.Slideshow.Close.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Window.Slideshow.Close.Pressed.png"/>
+      <me:SwitchImageStyle Name="ContextualWindowClose" 
+          Expression="{InNowPlaying}"
+          False="{WindowClose}" 
+          True="{NowPlayingWindowClose}"/>
+
+
+      
+      
+      <me:ImageStyle Name="ModeSwitchOn" 
+          Image         ="res://ZuneShellResources!Transport.Switch.ToPhoto.png"
+          HoverImage    ="res://ZuneShellResources!Transport.Switch.ToPhoto.Hover.png"/>
+
+      <me:ImageStyle Name="ModeSwitchOff" 
+          Image         ="res://ZuneShellResources!Transport.Switch.ToMusic.png"
+          HoverImage    ="res://ZuneShellResources!Transport.Switch.ToMusic.Hover.png"/>
+
+      <me:ImageStyle Name="EnterNowPlaying" 
+          Image         ="res://ZuneShellResources!Icon.NowPlaying.Enter.png"
+          HoverImage    ="res://ZuneShellResources!Icon.NowPlaying.Enter.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Icon.NowPlaying.Enter.Pressed.png"/>
+      
+      <me:ImageStyle Name="TransportButtonActionButton" 
+          Image="{styles:Styles.TransportButton}"
+          HoverImage="{styles:Styles.TransportButtonHover}"
+          FocusImage="{styles:Styles.TransportButton}"
+          PressedImage="{styles:Styles.TransportButtonPressed}"
+          DisabledImage="{styles:Styles.TransportButtonDisabled}"/>
+      <me:ImageStyle Name="NowPlayingTransportActionButton" 
+          Image="{styles:Styles.NowPlayingButton}"
+          HoverImage="{styles:Styles.NowPlayingButtonHover}"
+          FocusImage="{styles:Styles.NowPlayingButton}"
+          PressedImage="{styles:Styles.NowPlayingButtonPressed}"
+          DisabledImage="{styles:Styles.NowPlayingButtonDisabled}"/>
+      <me:SwitchImageStyle Name="ContextualTransportActionButton" 
+          Expression="{InNowPlaying}"
+          False="{TransportButtonActionButton}" 
+          True="{NowPlayingTransportActionButton}"/>
+
+      
+
+      <me:ImageStyle Name="TransportPlay" 
+          Image         ="res://ZuneShellResources!Transport.Play.png"
+          HoverImage    ="res://ZuneShellResources!Transport.Play.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Transport.Play.Pressed.png"
+          DisabledImage ="res://ZuneShellResources!Transport.Play.Disabled.png"/>
+      <me:ImageStyle Name="NowPlayingTransportPlay" 
+          Image         ="res://ZuneShellResources!Transport.Slideshow.Play.png"
+          HoverImage    ="res://ZuneShellResources!Transport.Slideshow.Play.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Transport.Slideshow.Play.Pressed.png"
+          DisabledImage ="res://ZuneShellResources!Transport.Slideshow.Play.Disabled.png"/>
+      <me:SwitchImageStyle Name="ContextualTransportPlay" 
+          Expression="{InNowPlaying}"
+          False="{TransportPlay}" 
+          True="{NowPlayingTransportPlay}"/>
+
+       <me:ImageStyle Name="TransportPause" 
+          Image         ="res://ZuneShellResources!Transport.Pause.png"
+          HoverImage    ="res://ZuneShellResources!Transport.Pause.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Transport.Pause.Pressed.png"
+          DisabledImage ="res://ZuneShellResources!Transport.Pause.Disabled.png"/>
+      <me:ImageStyle Name="NowPlayingTransportPause" 
+          Image         ="res://ZuneShellResources!Transport.Slideshow.Pause.png"
+          HoverImage    ="res://ZuneShellResources!Transport.Slideshow.Pause.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Transport.Slideshow.Pause.Pressed.png"
+          DisabledImage ="res://ZuneShellResources!Transport.Slideshow.Pause.Disabled.png"/>
+      <me:SwitchImageStyle Name="ContextualTransportPause" 
+          Expression="{InNowPlaying}"
+          False="{TransportPause}" 
+          True="{NowPlayingTransportPause}"/>
+
+      <me:ImageStyle Name="TransportStop" 
+          Image         ="res://ZuneShellResources!Transport.Stop.png"
+          HoverImage    ="res://ZuneShellResources!Transport.Stop.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Transport.Stop.Pressed.png"
+          DisabledImage ="res://ZuneShellResources!Transport.Stop.Disabled.png"/>
+      <me:ImageStyle Name="NowPlayingTransportStop" 
+          Image         ="res://ZuneShellResources!Transport.Slideshow.Stop.png"
+          HoverImage    ="res://ZuneShellResources!Transport.Slideshow.Stop.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Transport.Slideshow.Stop.Pressed.png"
+          DisabledImage ="res://ZuneShellResources!Transport.Slideshow.Stop.Disabled.png"/>
+      <me:SwitchImageStyle Name="ContextualTransportStop" 
+          Expression="{InNowPlaying}"
+          False="{TransportStop}" 
+          True="{NowPlayingTransportStop}"/>
+
+      <me:ImageStyle Name="TransportBack" 
+          Image         ="res://ZuneShellResources!Transport.Back.png"
+          HoverImage    ="res://ZuneShellResources!Transport.Back.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Transport.Back.Pressed.png"
+          HoldingImage  ="res://ZuneShellResources!Transport.Back.Pressed.png"
+          DisabledImage ="res://ZuneShellResources!Transport.Back.Disabled.png"/>
+      <me:ImageStyle Name="NowPlayingTransportBack" 
+          Image         ="res://ZuneShellResources!Transport.Slideshow.Back.png"
+          HoverImage    ="res://ZuneShellResources!Transport.Slideshow.Back.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Transport.Slideshow.Back.Pressed.png"
+          HoldingImage  ="res://ZuneShellResources!Transport.Slideshow.Back.Pressed.png"
+          DisabledImage ="res://ZuneShellResources!Transport.Slideshow.Back.Disabled.png"/>
+      <me:SwitchImageStyle Name="ContextualTransportBack" 
+          Expression="{InNowPlaying}"
+          False="{TransportBack}" 
+          True="{NowPlayingTransportBack}"/>
+
+      <me:ImageStyle Name="TransportForward" 
+          Image         ="res://ZuneShellResources!Transport.Forward.png"
+          HoverImage    ="res://ZuneShellResources!Transport.Forward.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Transport.Forward.Pressed.png"
+          HoldingImage  ="res://ZuneShellResources!Transport.Forward.Pressed.png"
+          DisabledImage ="res://ZuneShellResources!Transport.Forward.Disabled.png"/>
+      <me:ImageStyle Name="NowPlayingTransportForward" 
+          Image         ="res://ZuneShellResources!Transport.Slideshow.Forward.png"
+          HoverImage    ="res://ZuneShellResources!Transport.Slideshow.Forward.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Transport.Slideshow.Forward.Pressed.png"
+          HoldingImage  ="res://ZuneShellResources!Transport.Slideshow.Forward.Pressed.png"
+          DisabledImage ="res://ZuneShellResources!Transport.Slideshow.Forward.Disabled.png"/>
+      <me:SwitchImageStyle Name="ContextualTransportForward" 
+          Expression="{InNowPlaying}"
+          False="{TransportForward}" 
+          True="{NowPlayingTransportForward}"/>
+
+      <me:ImageStyle Name="TransportMuteOn" 
+          Image         ="res://ZuneShellResources!Transport.Mute.On.png"
+          HoverImage    ="res://ZuneShellResources!Transport.Mute.On.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Transport.Mute.On.Pressed.png"/>
+      <me:ImageStyle Name="NowPlayingTransportMuteOn" 
+          Image         ="res://ZuneShellResources!Transport.Slideshow.Mute.On.png"
+          HoverImage    ="res://ZuneShellResources!Transport.Slideshow.Mute.On.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Transport.Slideshow.Mute.On.Pressed.png"/>
+      <me:SwitchImageStyle Name="ContextualTransportMuteOn" 
+          Expression="{InNowPlaying}"
+          False="{TransportMuteOn}" 
+          True="{NowPlayingTransportMuteOn}"/>
+
+      <me:ImageStyle Name="TransportMuteOff" 
+          Image         ="res://ZuneShellResources!Transport.Mute.Off.png"
+          HoverImage    ="res://ZuneShellResources!Transport.Mute.Off.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Transport.Mute.Off.Pressed.png"/>
+      <me:ImageStyle Name="NowPlayingTransportMuteOff" 
+          Image         ="res://ZuneShellResources!Transport.Slideshow.Mute.Off.png"
+          HoverImage    ="res://ZuneShellResources!Transport.Slideshow.Mute.Off.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Transport.Slideshow.Mute.Off.Pressed.png"/>
+      <me:SwitchImageStyle Name="ContextualTransportMuteOff" 
+          Expression="{InNowPlaying}"
+          False="{TransportMuteOff}" 
+          True="{NowPlayingTransportMuteOff}"/>
+
+      <me:ImageStyle Name="TransportRepeatingOn" 
+          Image         ="res://ZuneShellResources!Transport.Repeat.On.png"
+          HoverImage    ="res://ZuneShellResources!Transport.Repeat.On.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Transport.Repeat.On.Pressed.png"/>
+
+      <me:ImageStyle Name="NowPlayingTransportRepeatingOn" 
+          Image         ="res://ZuneShellResources!Transport.Slideshow.Repeat.On.png"
+          HoverImage    ="res://ZuneShellResources!Transport.Slideshow.Repeat.On.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Transport.Slideshow.Repeat.On.Pressed.png"/>
+      <me:SwitchImageStyle Name="ContextualTransportRepeatingOn" 
+          Expression="{InNowPlaying}"
+          False="{TransportRepeatingOn}" 
+          True="{NowPlayingTransportRepeatingOn}"/>
+
+      <me:ImageStyle Name="TransportRepeatingOff" 
+          Image         ="res://ZuneShellResources!Transport.Repeat.Off.png"
+          HoverImage    ="res://ZuneShellResources!Transport.Repeat.Off.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Transport.Repeat.Off.Pressed.png"/>
+      <me:ImageStyle Name="NowPlayingTransportRepeatingOff" 
+          Image         ="res://ZuneShellResources!Transport.Slideshow.Repeat.Off.png"
+          HoverImage    ="res://ZuneShellResources!Transport.Slideshow.Repeat.Off.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Transport.Slideshow.Repeat.Off.Pressed.png"/>
+      <me:SwitchImageStyle Name="ContextualTransportRepeatingOff" 
+          Expression="{InNowPlaying}"
+          False="{TransportRepeatingOff}" 
+          True="{NowPlayingTransportRepeatingOff}"/>
+
+      <me:ImageStyle Name="TransportShuffleOn" 
+          Image         ="res://ZuneShellResources!Transport.Shuffle.On.png"
+          HoverImage    ="res://ZuneShellResources!Transport.Shuffle.On.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Transport.Shuffle.On.Pressed.png"/>
+      <me:ImageStyle Name="NowPlayingTransportShuffleOn" 
+          Image         ="res://ZuneShellResources!Transport.Slideshow.Shuffle.On.png"
+          HoverImage    ="res://ZuneShellResources!Transport.Slideshow.Shuffle.On.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Transport.Slideshow.Shuffle.On.Pressed.png"/>
+      <me:SwitchImageStyle Name="ContextualTransportShuffleOn" 
+          Expression="{InNowPlaying}"
+          False="{TransportShuffleOn}" 
+          True="{NowPlayingTransportShuffleOn}"/>
+
+      <me:ImageStyle Name="TransportShuffleOff" 
+          Image         ="res://ZuneShellResources!Transport.Shuffle.Off.png"
+          HoverImage    ="res://ZuneShellResources!Transport.Shuffle.Off.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Transport.Shuffle.Off.Pressed.png"/>
+      <me:ImageStyle Name="NowPlayingTransportShuffleOff" 
+          Image         ="res://ZuneShellResources!Transport.Slideshow.Shuffle.Off.png"
+          HoverImage    ="res://ZuneShellResources!Transport.Slideshow.Shuffle.Off.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Transport.Slideshow.Shuffle.Off.Pressed.png"/>
+      <me:SwitchImageStyle Name="ContextualTransportShuffleOff" 
+          Expression="{InNowPlaying}"
+          False="{TransportShuffleOff}" 
+          True="{NowPlayingTransportShuffleOff}"/>
+
+
+      
+
+      <me:ImageStyle Name="PhotosBack" 
+          Image         ="res://ZuneShellResources!Pictures.Back.png"
+          HoverImage    ="res://ZuneShellResources!Pictures.Back.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Pictures.Back.Pressed.png"
+          DisabledImage ="res://ZuneShellResources!Pictures.Back.Disabled.png"/>
+      <me:ImageStyle Name="SlideshowBack" 
+          Image         ="res://ZuneShellResources!Slideshow.Back.png"
+          HoverImage    ="res://ZuneShellResources!Slideshow.Back.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Slideshow.Back.Pressed.png"
+          DisabledImage ="res://ZuneShellResources!Slideshow.Back.Disabled.png"/>
+      <me:SwitchImageStyle Name="ContextualSlideshowBack" 
+          Expression="{InNowPlaying}"
+          False="{PhotosBack}" 
+          True="{SlideshowBack}"/>
+
+      <me:ImageStyle Name="PhotosPlay"
+          Image         ="res://ZuneShellResources!Pictures.Play.png"
+          HoverImage    ="res://ZuneShellResources!Pictures.Play.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Pictures.Play.Pressed.png"
+          DisabledImage ="res://ZuneShellResources!Pictures.Play.Disabled.png"/>
+      <me:ImageStyle Name="SlideshowPlay"
+          Image         ="res://ZuneShellResources!Slideshow.Play.png"
+          HoverImage    ="res://ZuneShellResources!Slideshow.Play.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Slideshow.Play.Pressed.png"
+          DisabledImage ="res://ZuneShellResources!Slideshow.Play.Disabled.png"/>
+      <me:SwitchImageStyle Name="ContextualSlideshowPlay" 
+          Expression="{InNowPlaying}"
+          False="{PhotosPlay}" 
+          True="{SlideshowPlay}"/>
+
+      <me:ImageStyle Name="PhotosPause"
+          Image         ="res://ZuneShellResources!Pictures.Pause.png"
+          HoverImage    ="res://ZuneShellResources!Pictures.Pause.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Pictures.Pause.Pressed.png"
+          DisabledImage ="res://ZuneShellResources!Pictures.Pause.Disabled.png"/>
+      <me:ImageStyle Name="SlideshowPause"
+          Image         ="res://ZuneShellResources!Slideshow.Pause.png"
+          HoverImage    ="res://ZuneShellResources!Slideshow.Pause.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Slideshow.Pause.Pressed.png"
+          DisabledImage ="res://ZuneShellResources!Slideshow.Pause.Disabled.png"/>
+      <me:SwitchImageStyle Name="ContextualSlideshowPause" 
+          Expression="{InNowPlaying}"
+          False="{PhotosPause}" 
+          True="{SlideshowPause}"/>
+
+      <me:ImageStyle Name="PhotosNext" 
+          Image         ="res://ZuneShellResources!Pictures.Next.png"
+          HoverImage    ="res://ZuneShellResources!Pictures.Next.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Pictures.Next.Pressed.png"
+          DisabledImage ="res://ZuneShellResources!Pictures.Next.Disabled.png"/>
+      <me:ImageStyle Name="SlideshowNext" 
+          Image         ="res://ZuneShellResources!Slideshow.Next.png"
+          HoverImage    ="res://ZuneShellResources!Slideshow.Next.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Slideshow.Next.Pressed.png"
+          DisabledImage ="res://ZuneShellResources!Slideshow.Next.Disabled.png"/>
+      <me:SwitchImageStyle Name="ContextualSlideshowNext" 
+          Expression="{InNowPlaying}"
+          False="{PhotosNext}" 
+          True="{SlideshowNext}"/>
+
+      <me:ImageStyle Name="ErrorIcon"
+          Image         ="res://ZuneShellResources!Attention.png"
+          />
+
+      <me:ImageStyle Name="NowPlayingIcon"
+          Image         ="res://ZuneShellResources!Icon.NowPlaying.png"
+          HoverImage    ="res://ZuneShellResources!Icon.NowPlaying.Hover.png"
+          PressedImage  ="res://ZuneShellResources!Icon.NowPlaying.Pressed.png"/>
+
+      <me:ImageStyle Name="EmptyStyle"/>
+      
+    </Properties>
+
+    <Scripts>
+      <Script>NowPlayingIconCommand.Available = ![InNowPlaying.Value];</Script>
+
+      <Script>
+        [DeclareTrigger(NowPlayingIconCommand.Invoked)]
+        
+        zune:NowPlayingLand.NavigateToLand();
+      </Script>
+    </Scripts>
+  </Class>
+
+</UIX>
diff --git a/test/2.1/INBOXBASEDETAILS.UIX b/test/2.1/INBOXBASEDETAILS.UIX
new file mode 100644
index 0000000..02eaadf
--- /dev/null
+++ b/test/2.1/INBOXBASEDETAILS.UIX
@@ -0,0 +1,285 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:sys="assembly://mscorlib/System"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:zuneshell="assembly://ZuneShell/Microsoft.Zune.Shell"
+  xmlns:zuneutil="assembly://ZuneShell/Microsoft.Zune.Util"
+  xmlns:zuneutilapi="assembly://ZuneDBApi/Microsoft.Zune.Util"
+  xmlns:msg="assembly://ZuneDBApi/Microsoft.Zune.Messaging"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:msgdata="res://ZuneShellResources!MessagingData.schema.xml"
+  xmlns:me="Me">
+
+  
+  
+  
+  <UI Name="MessageDetailsProvider">
+    <Properties>
+      <zune:SelectionDetailsPanel Name="Model" SelectionDetailsPanel="$Required" />
+      <zune:InboxPage Name="Page" InboxPage="$Required"/>
+      <msgdata:UriResourceMessageDetailsQuery Name="MessageDetailsQuery" URI="{Model.SelectedItem.DetailsLink}"/>
+      <Boolean Name="MessageDetailsCompleted"/>
+      <Timer Name="MessageReadTimer" Enabled="false" AutoRepeat="false" Interval="2000"/>
+    </Properties>
+    <Scripts>
+      <Script>
+        if ([MessageDetailsCompleted] &amp;&amp; Model.SelectedItem.Unread)
+        {
+          MessageReadTimer.Start();
+        }
+      </Script>
+      <Script>
+        [DeclareTrigger(MessageReadTimer.Tick)]
+        MessageReadTimer.Stop();
+        if (me:MarkMessageReadWorker.Details == null)
+        {
+          me:MarkMessageReadWorker.Details = Model;
+        }
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  <Class Name="RemoveSelectedItemWorker" Shared="true">
+    <Properties>
+      <zune:SelectionDetailsPanel Name="Details" SelectionDetailsPanel="{null}" />
+    </Properties>
+
+    <Scripts>
+      <Script>
+        [DeclareTrigger(Details)]
+        if (Details == null)
+        {
+          return;
+        }
+        zune:InboxEntryItem message = (zune:InboxEntryItem)Details.SelectedItem;
+        if (message == null)
+        {
+          return;
+        }
+        if (msg:MessagingService.Instance.MessageDelete(message.DetailsLink))
+        {
+          
+          Details.SelectedItem = null;
+
+          
+          if (message.Unread)
+          {
+            Details.MainPanel.UpdateShellUnreadCount(-1, true);
+          }
+
+          
+          zune:InboxPanel panel;
+          if (message.Wishlist)
+          {
+            panel = Details.MainPanel.BuyPanel;
+          }
+          else
+          {
+            panel = Details.MainPanel.MessagePanel;
+          }
+          iris:ArrayListDataSet list = (iris:ArrayListDataSet)panel.Content;
+          if (list != null)
+          {
+            int index = list.IndexOf(message);
+            if (index >= 0)
+            {
+              
+              list.RemoveAt(index);
+
+              
+              if (index >= list.Count)
+              {
+                  index = list.Count - 1;
+              }
+
+              if (index &lt; 0)
+              {
+                
+                if (message.Wishlist)
+                {
+                  panel = Details.MainPanel.MessagePanel;
+                }
+                else
+                {
+                  panel = Details.MainPanel.BuyPanel;
+                }
+
+                
+                if (!List.IsNullOrEmpty(panel.Content))
+                {
+                  if (message.Wishlist)
+                  {
+                    
+                    index = 0;
+                  }
+                  else
+                  {
+                    
+                    index = panel.Content.Count - 1;
+                  }
+                }
+              }
+
+              if (index >= 0)
+              {
+                Details.MainPanel.MessageIdToSelect = ((zune:InboxEntryItem)panel.Content.get_Item(index)).Id;
+              }
+            }
+            else
+            {
+              
+            }
+          }
+        }
+        else
+        {
+          
+        }
+        
+        Details = null;
+      </Script>
+    </Scripts>
+  </Class>
+
+  
+  
+  
+  <Class Name="MarkMessageReadWorker" Shared="true">
+    <Properties>
+      <zune:SelectionDetailsPanel Name="Details" SelectionDetailsPanel="{null}"/>
+    </Properties>
+    <Scripts>
+      <Script>
+        if ([Details] != null &amp;&amp; Details.SelectedItem != null &amp;&amp; Details.SelectedItem.Unread)
+        {
+          if (msg:MessagingService.Instance.MessageSetRead(Details.SelectedItem.DetailsLink))
+          {
+            Details.SelectedItem.Unread = false;
+            Details.MainPanel.UpdateShellUnreadCount(-1, true);
+          }
+        }
+        
+        Details = null;
+      </Script>
+    </Scripts>
+  </Class>
+
+  
+  
+  
+  <UI Name="MessageDetailsHeader">
+    <Properties>
+      <zune:SelectionDetailsPanel Name="Model" SelectionDetailsPanel="$Required" />
+      <msgdata:UriResourceMessageDetailsQuery Name="MessageDetailsQuery" UriResourceMessageDetailsQuery="$Required" />
+      <String Name="TextContent" />
+      <Boolean Name="UseMessageTextContent" Boolean="true" />
+    </Properties>
+
+    <Scripts>
+      
+      <Script>
+        if (Model.SelectedItem != null)
+        {
+          
+          Details.Content = sys:String.Format(zune:Shell.LoadString(zune:StringId.IDS_INBOX_DETAILS_HEADER), Model.SelectedItem.From, Model.SelectedItem.Received.ToString("G"));
+        }
+      </Script>
+      
+      <Script>
+        if([MessageDetailsQuery.Status] == iris:DataProviderQueryStatus.Complete)
+        {
+          if (UseMessageTextContent)
+          {
+            TextContent = MessageDetailsQuery.Result.TextContent;
+          }
+        }
+      </Script>
+      
+      <Script>
+        if (!String.IsNullOrEmpty([TextContent]))
+        {
+          TextMessage.Content = TextContent;
+          TextMessage.Visible = true;
+        }
+      </Script>
+
+    </Scripts>
+
+    <Content>
+      <Panel Layout="VerticalFlow" Padding="15,0,0,0">
+        <Children>
+          <core:Label Name="Details" Style="{styles:SharedStyles.InboxDetailStyle}" />
+          <core:Label Name="TextMessage" WordWrap="true" Margins="0,10,13,13" Style="{styles:SharedStyles.InboxMessageStyle}"/>
+        </Children>
+      </Panel>
+    </Content>
+
+  </UI>
+
+  
+  
+  
+  <UI Name="MessageDetailsFooter">
+    <Properties>
+      <zune:SelectionDetailsPanel Name="Model" SelectionDetailsPanel="$Required" />
+      <msgdata:UriResourceMessageDetailsQuery Name="MessageDetailsQuery" UriResourceMessageDetailsQuery="$Required" />
+    </Properties>
+
+    <Locals>
+      <iris:Command Name="DeleteCommand" Description="{zune:Shell.LoadString(zune:StringId.IDS_DELETEMESSAGE)}" />
+      <iris:Command Name="ReplyCommand" Description="{zune:Shell.LoadString(zune:StringId.IDS_REPLYMESSAGE)}" Available="false" />
+    </Locals>
+
+    <Scripts>
+      
+      <Script>
+        if([MessageDetailsQuery.Status] == iris:DataProviderQueryStatus.Complete)
+        {
+          ReplyCommand.Available = !String.IsNullOrEmpty(MessageDetailsQuery.Result.ReplyLink);
+        }
+      </Script>
+      
+
+
+      <Script>
+        [DeclareTrigger(DeleteCommand.Invoked)]
+        
+        if (me:RemoveSelectedItemWorker.Details == null)
+        {
+          me:RemoveSelectedItemWorker.Details = Model;
+        }
+      </Script>
+      
+      <Script>
+        [DeclareTrigger(ReplyCommand.Invoked)]
+        zuneshell:ZuneApplication.Service.LaunchBrowserForExternalUrl(MessageDetailsQuery.Result.ReplyLink, true);
+        zuneutil:SQMLog.Log(zuneutilapi:SQMDataId.InboxMessageReply, 1);
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Layout="Anchor">
+        <Children>
+          <core:BigActionButton Name="ReplyButton" Model="{ReplyCommand}">
+            <LayoutInput>
+              <AnchorLayoutInput Right="Parent,1" Top="Parent,0"/>
+            </LayoutInput>
+          </core:BigActionButton>
+
+          <core:BigActionButton Name="DeleteButton" Model="{DeleteCommand}">
+            <LayoutInput>
+              <AnchorLayoutInput Right="ReplyButton,0" Top="Parent,0"/>
+            </LayoutInput>
+          </core:BigActionButton>
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/INBOXEMPTY.UIX b/test/2.1/INBOXEMPTY.UIX
new file mode 100644
index 0000000..17bffe0
--- /dev/null
+++ b/test/2.1/INBOXEMPTY.UIX
@@ -0,0 +1,90 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:style="res://ZuneShellResources!Style.uix"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:button="res://ZuneShellResources!Button.uix"
+  xmlns:signin="res://ZuneShellResources!SignInDialog.uix"
+  xmlns:me="Me">
+
+  
+  
+  
+  <UI Name="SignedOutOrEmptyInbox">
+
+    <Locals>
+      <iris:Command Name="SignInCommand" Description="{zune:Shell.LoadString(zune:StringId.IDS_INBOX_SIGNIN_HEADER)}"/>
+      <zune:SignIn Name="SignIn" SignIn="{zune:SignIn.Instance}"/>
+      <signin:SignInDialog Name="SignInDlg" SignInDialog="{null}"/>
+    </Locals>
+
+    <Scripts>
+      
+      <Script>
+        [DeclareTrigger(SignInCommand.Invoked)]
+        if (!(SignIn.SignedIn || SignIn.SigningIn))
+        {
+          if (SignInDlg != null) UI.DisposeOwnedObject(SignInDlg);
+          SignInDlg = new signin:SignInDialog();
+          SignInDlg.Helper.Show(SignInDlg);
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Layout="Anchor">
+        <Children>
+          <me:PanelLink Model="{SignInCommand}" LabelString="{zune:Shell.LoadString(zune:StringId.IDS_INBOX_SIGNIN_MESSAGE)}" />
+        </Children>
+      </Panel>
+    </Content>
+
+  </UI>
+
+  <UI Name="PanelLink" Base="button:Button">
+    <Properties>
+      <String Name="LabelString"/>
+    </Properties>
+
+    <Locals>
+      <style:Style Name="LabelStyle" Style="{styles:SharedStyles.InboxSignInDescriptionStyle}"/>
+      <style:StatefulCompositeStyle Name="SecondaryStyle" Base="{LabelStyle}"/>
+    </Locals>
+
+    <Scripts>
+      <Script>OverrideStyle = styles:SharedStyles.InboxSignInHeaderStyle;</Script>
+      <Script>SecondaryStyle.State.Focused = [Style.State.Focused];</Script>
+      <Script>SecondaryStyle.State.Hovered = [Style.State.Hovered];</Script>
+      <Script>UI.KeyFocusOnMouseDown = false;</Script>
+    </Scripts>
+
+    <Content>
+      <ColorFill Name="Background" MouseInteractive="true" Layout="VerticalFlow" Margins="4,26,0,0">
+        <Children>
+
+          <Panel>
+            <Layout>
+              <FlowLayout Orientation="Horizontal" ItemAlignment="Center"/>
+            </Layout>
+            <Children>
+
+              
+              <core:Label Name="Label" Style="{Style}"/>
+
+              
+              <Graphic Name="IconGraphic" Content="res://ZuneShellResources!Arrow.More.png" Margins="4,0,0,0" Visible="true"/>
+
+            </Children>
+          </Panel>
+
+          <core:Label Name="SecondaryLabel" Content="{LabelString}" Style="{SecondaryStyle}" WordWrap="true"/>
+
+        </Children>
+      </ColorFill>
+    </Content>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/INBOXMAINPANEL.UIX b/test/2.1/INBOXMAINPANEL.UIX
new file mode 100644
index 0000000..c3dab02
--- /dev/null
+++ b/test/2.1/INBOXMAINPANEL.UIX
@@ -0,0 +1,586 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:zuneshell="assembly://ZuneShell/Microsoft.Zune.Shell"
+  xmlns:zcfg="assembly://ZuneDBApi/Microsoft.Zune.Configuration"
+  xmlns:svc="assembly://ZuneDBApi/Microsoft.Zune.Service"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:spreadsheet="res://ZuneShellResources!SpreadSheetViewBase.uix"
+  xmlns:mctl="res://ZuneMarketplaceResources!Controls.uix"
+  xmlns:msgdata="res://ZuneShellResources!MessagingData.schema.xml"
+  xmlns:signin="res://ZuneShellResources!SignInDialog.uix"
+  xmlns:buy="res://ZuneMarketplaceResources!PurchaseDialog.uix"
+  xmlns:me="Me">
+
+  
+  
+  
+  <UI Name="InboxPanelUI">
+    <Properties>
+      <zune:InboxMainPanel Name="Model" InboxMainPanel="$Required"/>
+      <zune:InboxPage Name="Page" InboxPage="$Required"/>
+    </Properties>
+
+    <Locals>
+      <zune:Shell Name="Shell" Shell="{(zune:Shell)zune:ZuneShell.DefaultInstance}"/>
+      <msgdata:MessagingInboxDataQuery Name="InboxDataQuery" />
+      <zune:ShellMessagingNotifier Name="MessagingNotifier"/>
+      <ScrollingData Name="ScrollData"/>
+      <zune:SignIn Name="SignIn" SignIn="{zune:SignIn.Instance}" />
+      <SelectionManager Name="BuySelectionManager" SingleSelect="true" />
+      <SelectionManager Name="MessageSelectionManager" SingleSelect="true" />
+      <SelectionManager Name="ActiveSelectionManager" SelectionManager="{null}" />
+      <Boolean Name="InitializeSelection" Boolean="true" />
+      <signin:SignInDialog Name="SignInDlg" SignInDialog="{null}"/>
+      <Timer Name="CheckMessageCountTimer" Enabled="false" Interval="{zcfg:ClientConfiguration.Messaging.ServiceThrottlingInterval}" AutoRepeat="false"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        if ([Page.NavigationArguments] != null)
+        {
+          string messageIdToSelect = (string)Page.NavigationArguments.get_Item("MessageId");
+          Model.MessageIdToSelect = messageIdToSelect;
+          
+          Page.NavigationArguments = null;
+
+          
+          if (!(SignIn.SignedIn || SignIn.SigningIn))
+          {
+            if (SignInDlg != null) UI.DisposeOwnedObject(SignInDlg);
+            SignInDlg = new signin:SignInDialog();
+            SignInDlg.Helper.Show(SignInDlg);
+          }
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(MessagingNotifier.NewDeviceMessageCount)]
+        
+        CheckMessageCountTimer.Start();
+      </Script>
+
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(SignIn.SignedIn)]
+        [DeclareTrigger(CheckMessageCountTimer.Tick)]
+
+        CheckMessageCountTimer.Stop();
+        bool signedIn = SignIn.SignedIn;
+        MessagePanel.Visible = signedIn;
+        ListFooter.Visible = signedIn;
+
+        if (signedIn)
+        {
+          
+          if (Page.Details.SelectedItem != null)
+          {
+            Model.MessageIdToSelect = Page.Details.SelectedItem.Id;
+          }
+          
+          InboxDataQuery.ZuneTag = null;
+          MessagePanel.NavigateInto();
+          InboxDataQuery.ZuneTag = SignIn.ZuneTag;
+        }
+        else
+        {
+          Display.RequestSource("res://ZuneShellResources!InboxEmpty.uix#SignedOutOrEmptyInbox");
+          InboxDataQuery.ZuneTag = null;
+          Model.Result = null;
+        }
+      </Script>
+
+      <Script>
+        [InitialEvaluate(false)]
+        
+        if (![SignIn.SignedIn])
+        {
+          Shell.NavigateBack();
+        }
+      </Script>
+
+      <Script>
+        if ([InboxDataQuery.Status] == iris:DataProviderQueryStatus.Complete)
+        {
+          Model.Result = InboxDataQuery.Result;
+        }
+      </Script>
+
+      <Script>
+        bool visible = false;
+        if ([Model.BuyPanel.Content] != null)
+        {
+          if ([SignIn.SignedIn])
+          {
+            visible = Model.BuyPanel.Content.Count > 0;
+          }
+        }
+        BuyPanel.Visible = visible;
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(Model.MessagePanel.Content)]
+        [DeclareTrigger(Model.BuyPanel.Content)]
+        [DeclareTrigger(Model.MessageIdToSelect)]
+
+        
+        if (!SignIn.SignedIn ||
+            ((Model.MessagePanel.Content == null) &amp;&amp; (Model.BuyPanel.Content == null)))
+        {
+          return;
+        }
+
+        BuyPanel.Visible = Model.BuyPanel.Content.Count > 0;
+
+        bool selectMessageById = !String.IsNullOrEmpty(Model.MessageIdToSelect);
+        if (InitializeSelection || selectMessageById)
+        {
+          InitializeSelection = false;
+
+          SelectionManager sm = null;
+          
+          MessageSelectionManager.SourceList = Model.MessagePanel.Content;
+          BuySelectionManager.SourceList = Model.BuyPanel.Content;
+          int index = 0;
+          zune:MessageLocationDetails location = null;
+          if (selectMessageById)
+          {
+            location = Model.FindMessage(Model.MessageIdToSelect);
+          }
+          if (location != null)
+          {
+            index = location.Index;
+            if (location.Panel == Model.MessagePanel)
+            {
+              sm = MessageSelectionManager;
+            }
+            else
+            {
+              sm = BuySelectionManager;
+            }
+          }
+          else
+          {
+            if (!List.IsNullOrEmpty(Model.MessagePanel.Content))
+            {
+              sm = MessageSelectionManager;
+            }
+            else if (!List.IsNullOrEmpty(Model.BuyPanel.Content))
+            {
+              sm = BuySelectionManager;
+            }
+          }
+          if (sm != null)
+          {
+            sm.Select(index, true);
+          }
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(MessageSelectionManager.SelectedItems)]
+        
+        if (ActiveSelectionManager == null)
+        {
+          ActiveSelectionManager = MessageSelectionManager;
+          BuySelectionManager.Clear();
+        }
+      </Script>
+      <Script>
+        [DeclareTrigger(BuySelectionManager.SelectedItems)]
+        
+        if (ActiveSelectionManager == null)
+        {
+          ActiveSelectionManager = BuySelectionManager;
+          MessageSelectionManager.Clear();
+        }
+      </Script>
+      <Script>
+        [DeclareTrigger(ActiveSelectionManager.SelectedItems)]
+        
+        if (ActiveSelectionManager == null)
+        {
+          return;
+        }
+        int count = ActiveSelectionManager.Count;
+        if (count == 1)
+        {
+          
+          Page.Details.SelectedItem = (zune:InboxEntryItem)ActiveSelectionManager.SelectedItem;
+        }
+        else
+        {
+          if (count > 1)
+          {
+            Page.Details.UI = "res://ZuneShellResources!InboxTextDetails.uix#MultiSelection";
+          }
+          else
+          {
+            Page.Details.UI = "res://ZuneShellResources!InboxTextDetails.uix#NoSelection";
+          }
+          Page.Details.SelectedItem = null;
+        }
+        ActiveSelectionManager = null;
+      </Script>
+      <Script>
+        int msgCount = 0;
+        zune:InboxEntryItem singleMessage = null;
+        if (Model.BuyPanel.Content != null)
+        {
+          msgCount = msgCount + [Model.BuyPanel.Content.Count];
+          if (Model.BuyPanel.Content.Count == 1)
+          {
+            singleMessage = (zune:InboxEntryItem)Model.BuyPanel.Content.get_Item(0);
+          }
+        }
+        if (Model.MessagePanel.Content != null)
+        {
+          msgCount = msgCount + [Model.MessagePanel.Content.Count];
+          if (Model.MessagePanel.Content.Count == 1)
+          {
+            singleMessage = (zune:InboxEntryItem)Model.MessagePanel.Content.get_Item(0);
+          }
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel>
+        <Layout>
+          <DockLayout SizeToChildren="true" DefaultLayoutInput="Top,Near"/>
+        </Layout>
+        <Children>
+
+          <Host Name="Display">
+            <LayoutInput>
+              <AnchorLayoutInput Top="Parent,0" Bottom="Parent,1" Left="Parent,0"/>
+            </LayoutInput>
+          </Host>
+          
+          <me:MessageListFooter Name="ListFooter" Margins="-50,10,0,0">
+            <LayoutInput>
+              <DockLayoutInput Position="Bottom"/>
+            </LayoutInput>
+          </me:MessageListFooter>
+          
+          
+          <core:ScrollBar Name="ScrollBar" ScrollData="{ScrollData}" Margins="0,0,-2,0">
+            <LayoutInput>
+              <DockLayoutInput Position="Right" Alignment="Near"/>
+            </LayoutInput>
+          </core:ScrollBar>
+
+          
+          <Scroller Orientation="Vertical" FadeSize="-1" ScrollingData="{ScrollData}" >
+            <Children>
+
+              <Panel Margins="-50,0,0,0">
+                <Layout>
+                  <DockLayout SizeToChildren="true"  DefaultLayoutInput="Top,Near"/>
+                </Layout>
+                <Children>
+
+                  <me:BuyPanel Name="BuyPanel"
+                    Visible="false"
+                    HeaderText="{zune:Shell.LoadString(zune:StringId.IDS_BUY_LATER_HEADER)}"
+                    Model="{Model.BuyPanel}"
+                    MainPanel="{Model}"
+                    SelectionManager="{BuySelectionManager}" />
+
+                  <me:InboxCategory Name="MessagePanel"
+                    Visible="false"
+                    HeaderText="{zune:Shell.LoadString(zune:StringId.IDS_INBOX_HEADER)}"
+                    Model="{Model.MessagePanel}"
+                    SelectionManager="{MessageSelectionManager}"/>
+
+                </Children>
+              </Panel>
+
+            </Children>
+          </Scroller>
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+
+  
+  
+  
+  <UI Name="MessageListFooter">
+    <Locals>
+      <iris:Command Name="ComposeCommand" Description="{zune:Shell.LoadString(zune:StringId.IDS_COMPOSEMESSAGE)}" />
+      <iris:Command Name="ProfileCommand" Description="{zune:Shell.LoadString(zune:StringId.IDS_GOTOPROFILE)}" />
+    </Locals>
+
+    <Scripts>
+      <Script>
+        [DeclareTrigger(ComposeCommand.Invoked)]
+        String endpoint = svc:Service.GetEndPointUri(svc:EServiceEndpointId.SEID_Lynx);
+        zuneshell:ZuneApplication.Service.LaunchBrowserForExternalUrl(endpoint + "/my/sendmessage.aspx", true);
+      </Script>
+
+      <Script>
+        [DeclareTrigger(ProfileCommand.Invoked)]
+        String endpoint = svc:Service.GetEndPointUri(svc:EServiceEndpointId.SEID_Lynx);
+        zuneshell:ZuneApplication.Service.LaunchBrowserForExternalUrl(endpoint + "/profile/home.aspx", true);
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Margins="50,0,0,0" Layout="Anchor">
+        <Children>
+          <core:BigActionButton Name="ComposeButton" Model="{ComposeCommand}">
+            <LayoutInput>
+              <AnchorLayoutInput Right="Parent,1" Top="Parent,0"/>
+            </LayoutInput>
+          </core:BigActionButton>
+
+          <core:BigActionButton Name="ProfileButton" Model="{ProfileCommand}">
+            <LayoutInput>
+              <AnchorLayoutInput Right="ComposeButton,0" Top="Parent,0"/>
+            </LayoutInput>
+          </core:BigActionButton>
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="InboxCategory">
+    <Properties>
+      <String Name="HeaderText" String="$Required"/>
+      <zune:InboxPanel Name="Model" InboxPanel="$Required"/>
+      <SelectionManager Name="SelectionManager" SelectionManager="$Required"/>
+      <iris:Command Name="Command" Command="{null}"/>
+    </Properties>
+
+    <Scripts>
+      <Script>BuyButton.Visible = (Command != null);</Script>
+      <Script>Worker.Content = [Model.Content];</Script>
+    </Scripts>
+
+    <Content>
+      <Panel>
+        <Layout>
+          <DockLayout SizeToChildren="true"  DefaultLayoutInput="Top,Near"/>
+        </Layout>
+        <Children>
+
+          <core:Label Content="{HeaderText}" Style="{styles:SharedStyles.InboxHeader}" WordWrap="false" Margins="50,0,0,11"/>
+
+          <Panel Layout="Anchor">
+            <Children>
+              <spreadsheet:SpreadSheet Name="Worker"
+                Content="{Model.Content}"
+                ListItemType="{typeof(me:InboxListItem)}"
+                ColumnData="{me:Columns.DefaultViewColumnData}"
+                SelectionManager="{SelectionManager}"
+                SizeToChildren="true"
+                AllowHorizontalScrolling="true"
+                AllowVerticalScrolling="false"
+                ExecuteCommand="{null}"
+                HeaderSpacing="11"
+                HighlightHeaders="false"
+                ScrollbarMargins="0,0,0,8"
+                ShowColumnDividers="true"/>
+
+              <mctl:MarketplaceActionButton Name="BuyButton" Model="{Command}" Margins="0,0,5,5">
+                <LayoutInput>
+                  <AnchorLayoutInput Right="Worker,1" Top="Worker,1"/>
+                </LayoutInput>
+              </mctl:MarketplaceActionButton>
+            </Children>
+          </Panel>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="BuyPanel" Base="me:InboxCategory">
+    <Properties>
+      <zune:InboxMainPanel Name="MainPanel" InboxMainPanel="$Required"/>
+      <iris:Command Name="Command" Description="{zune:Shell.LoadString(zune:StringId.IDS_BUYALL)}" Available="false" />
+    </Properties>
+
+    <Locals>
+      <buy:PurchaseDialog Name="PurchaseDlg" PurchaseDialog="{null}"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        if ([MainPanel.BuyPanel.Content] != null)
+        {
+          bool available = false;
+          foreach (zune:InboxEntryItem item in (List)MainPanel.BuyPanel.Content)
+          {
+            if (!available &amp;&amp;
+                (item.Type == "song" || item.Type == "album") &amp;&amp;
+                !zune:GuidHelper.IsEmpty(item.MediaId))
+            {
+              available = true;
+            }
+          }
+          Command.Available = available;
+        }
+      </Script>
+      <Script>
+        [DeclareTrigger(Command.Invoked)]
+        if (PurchaseDlg != null) UI.DisposeOwnedObject(PurchaseDlg);
+        PurchaseDlg = new buy:PurchaseDialog();
+        PurchaseDlg.Instance = PurchaseDlg;
+
+        foreach (zune:InboxEntryItem item in (List)MainPanel.BuyPanel.Content)
+        {
+          if (item.Type == "song" &amp;&amp; !zune:GuidHelper.IsEmpty(item.MediaId))
+          {
+            PurchaseDlg.TrackIds.Add(item.MediaId);
+          }
+          else if (item.Type == "album" &amp;&amp; !zune:GuidHelper.IsEmpty(item.MediaId))
+          {
+            PurchaseDlg.AlbumIds.Add(item.MediaId);
+          }
+          else
+          {
+            
+          }
+        }
+
+        PurchaseDlg.Helper.Show(PurchaseDlg);
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  <Class Name="Columns" Shared="True">
+    <Properties>
+
+      <spreadsheet:ColumnData Name="DefaultViewColumnData" SaveKeyPrefix="Inbox">
+        <Columns>
+
+          <spreadsheet:ColumnInfo
+                         Header="{zune:Shell.LoadString(zune:StringId.IDS_FROM_COLUMN_HEADER)}"
+                         CellType="{typeof(me:FromCell)}"
+                         CellPadding="50,0,0,0"
+                         SortBy="{null}">
+            <ColumnSize>
+              <SharedSize Size="138,0" MinimumSize="88,0" MaximumSize="315,0"/>
+            </ColumnSize>
+          </spreadsheet:ColumnInfo>
+
+          <spreadsheet:ColumnInfo
+                         Header="{zune:Shell.LoadString(zune:StringId.IDS_TYPE_COLUMN_HEADER)}"
+                         CellType="{typeof(me:TypeCell)}"
+                         SortBy="{null}">
+            <ColumnSize>
+              <SharedSize Size="60,0" MinimumSize="40,0" MaximumSize="200,0"/>
+            </ColumnSize>
+          </spreadsheet:ColumnInfo>
+
+          <spreadsheet:ColumnInfo
+                         Header="{zune:Shell.LoadString(zune:StringId.IDS_SUBJECT_COLUMN_HEADER)}"
+                         CellType="{typeof(me:SubjectCell)}"
+                         SortBy="{null}">
+            <ColumnSize>
+              <SharedSize Size="162,0" MinimumSize="30,0" MaximumSize="315,0"/>
+            </ColumnSize>
+          </spreadsheet:ColumnInfo>
+
+          <spreadsheet:ColumnInfo
+                         Header="{zune:Shell.LoadString(zune:StringId.IDS_RECEIVED_COLUMN_HEADER)}"
+                         CellType="{typeof(me:ReceivedCell)}"
+                         SortBy="{null}">
+            <ColumnSize>
+              <SharedSize Size="125,0" MinimumSize="25,0" MaximumSize="200,0"/>
+            </ColumnSize>
+          </spreadsheet:ColumnInfo>
+
+        </Columns>
+      </spreadsheet:ColumnData>
+
+    </Properties>
+  </Class>
+
+  
+  
+  
+  <UI Name="FromCell" Base="spreadsheet:LabelCell">
+    <Scripts>
+      <Script>
+        Content = ((zune:InboxEntryItem)Model).From;
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  <UI Name="TypeCell" Base="spreadsheet:LabelCell">
+    <Scripts>
+      <Script>
+        Content = ((zune:InboxEntryItem)Model).UiType;
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  <UI Name="SubjectCell" Base="spreadsheet:LabelCell">
+    <Scripts>
+      <Script>
+        Content = ((zune:InboxEntryItem)Model).Subject;
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  <UI Name="ReceivedCell" Base="spreadsheet:LongDateTimeCell">
+    <Scripts>
+      <Script>
+        Date = ((zune:InboxEntryItem)Model).Received;
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  <UI Name="InboxListItem" Base="spreadsheet:SpreadSheetListItem">
+    <Properties>
+      <Boolean Name="CanDrag" Boolean="false"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(((zune:InboxEntryItem)Model).Unread)]
+
+        if (((zune:InboxEntryItem)Model).Unread)
+        {
+          OverrideStyle = styles:SharedStyles.InboxUnreadListItemStyle;
+        }
+        else
+        {
+          OverrideStyle = styles:SharedStyles.InboxReadListItemStyle;
+        }
+      </Script>
+    </Scripts>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/INBOXPHOTODETAILS.UIX b/test/2.1/INBOXPHOTODETAILS.UIX
new file mode 100644
index 0000000..7a80421
--- /dev/null
+++ b/test/2.1/INBOXPHOTODETAILS.UIX
@@ -0,0 +1,265 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:col="assembly://mscorlib/System.Collections"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:msg="assembly://ZuneDBApi/Microsoft.Zune.Messaging"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:msgdata="res://ZuneShellResources!MessagingData.schema.xml"
+  xmlns:thumbbutton="res://ZuneShellResources!ThumbnailButton.uix"
+  xmlns:inboxdetails="res://ZuneShellResources!InboxBaseDetails.uix"
+  xmlns:me="Me">
+
+  
+  
+  
+  <UI Name="PicturesView" Base="core:GalleryView">
+    <Properties>
+      <iris:ArrayListDataSet Name="PhotoQueries" ArrayListDataSet="$Required"/>
+    </Properties>
+
+    <Content Name="Item">
+      <core:ThumbnailListItemBase Index="{RepeatedItemIndex}" TileSize="{TileSize}">
+        <Provider>
+          <me:PhotoThumbnailButtonProvider
+            Item="{RepeatedItem}"
+            Index="{RepeatedItemIndex}"
+            ImageProvider="{(msgdata:InboxImageProviderQuery)PhotoQueries.get_Item(RepeatedItemIndex.Value)}"/>
+        </Provider>
+      </core:ThumbnailListItemBase>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <Class Name="PhotoThumbnailButtonProvider" Base="thumbbutton:ThumbnailButtonProvider">
+    <Properties>
+      <Object Name="Item" Object="$Required"/>
+      <Index Name="Index" Index="$Required"/>
+      <Image Name="Image" Image="{styles:Styles.NoArtWide}"/>
+      <msgdata:InboxImageProviderQuery Name="ImageProvider" InboxImageProviderQuery="$Required" />
+    </Properties>
+
+    <Scripts>
+      <Script>PrimaryLabel = ImageProvider.Title;</Script>
+      <Script>
+        
+        
+        if (ImageProvider != null &amp;&amp; ImageProvider.Result != null)
+        {
+          if ([ImageProvider.Result.ImagePath] != null &amp;&amp; ImageProvider.Result.Photo != null)
+          {
+            Image = ImageProvider.Result.Photo;
+          }
+        }
+      </Script>
+
+    </Scripts>
+  </Class>
+
+  
+  
+  
+  <UI Name="PhotoDetailsUI" Base="inboxdetails:MessageDetailsProvider">
+    <Locals>
+      <msgdata:UriResourcePhotosQuery Name="PhotosQuery" />
+      <iris:Command Name="PicturesCommand" Available="false"/>
+      <iris:ArrayListDataSet Name="PhotoQueries" />
+      <Int32 Name="Counter" Int32="-1" />
+      <msgdata:InboxImageProviderQuery Name="CurrentQuery" InboxImageProviderQuery="{null}" />
+      <Boolean Name="EvaluateCollectionState" />
+      <Boolean Name="AllInLibrary" />
+      <Boolean Name="ResultReady" />
+    </Locals>
+
+    <Scripts>
+      <Script>
+        if ([MessageDetailsQuery.Status] == iris:DataProviderQueryStatus.Complete)
+        {
+          PhotosQuery.URI = MessageDetailsQuery.Result.AltLink;
+        }
+      </Script>
+      <Script>
+        if ([PhotosQuery.Status] == iris:DataProviderQueryStatus.Complete)
+        {
+          CollectionTitle.Content = PhotosQuery.Result.CollectionName;
+
+          PhotoQueries.Clear();
+          foreach(msgdata:Photo photo in (List)PhotosQuery.Result.Photos)
+          {
+            msgdata:InboxImageProviderQuery queryPhotoImage = new msgdata:InboxImageProviderQuery();
+            PhotoQueries.Add(queryPhotoImage);
+            
+            queryPhotoImage.Title = photo.Title;
+            queryPhotoImage.CollectionName = PhotosQuery.Result.CollectionName;
+            
+            if (!queryPhotoImage.Result.InLibrary)
+            {
+              
+              queryPhotoImage.URL = MessageDetailsQuery.Result.AltLink + photo.Suffix;
+            }
+          }
+          Pictures.Content = PhotosQuery.Result.Photos;
+          
+          EvaluateCollectionState = true;
+        }
+      </Script>
+      <Script>
+        if ([EvaluateCollectionState])
+        {
+          EvaluateCollectionState = false;
+          if (!List.IsNullOrEmpty(PhotoQueries))
+          {
+            bool allInLibrary = true;
+            foreach(msgdata:InboxImageProviderQuery queryPhotoImage in (List)PhotoQueries)
+            {
+              allInLibrary = allInLibrary &amp;&amp; queryPhotoImage.Result.InLibrary;
+            }
+            AllInLibrary = allInLibrary;
+            PicturesCommand.Available = true;
+            PicturesButton.Visible = true;
+          }
+          MessageDetailsCompleted = true;
+        }
+      </Script>
+      <Script>
+        if ([AllInLibrary])
+        {
+          PicturesCommand.Description = zune:Shell.LoadString(zune:StringId.IDS_INCOLLECTION);
+        }
+        else
+        {
+          PicturesCommand.Description = zune:Shell.LoadString(zune:StringId.IDS_DOWNLOADPICTURES);
+        }
+      </Script>
+      <Script>
+        [DeclareTrigger(PicturesCommand.Invoked)]
+        if (AllInLibrary)
+        {
+          
+          col:Hashtable args = new col:Hashtable();
+          args.Add("FolderId", msg:MessagingService.Instance.GetInboxDownloadFolderId(PhotosQuery.Result.CollectionName));
+          zune:Shell.DefaultInstance.Execute("Collection\Photos", args);
+        }
+        else
+        {
+          
+          
+          PicturesCommand.Available = false;
+          
+          Counter = 0;
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Counter)]
+        if (Counter != -1)
+        {
+          if (Counter == PhotoQueries.Count)
+          {
+            
+            Counter = -1;
+            EvaluateCollectionState = true;
+          }
+          else
+          {
+            
+            msgdata:InboxImageProviderQuery photoQuery = (msgdata:InboxImageProviderQuery)PhotoQueries.get_Item(Counter);
+            CurrentQuery = photoQuery;
+            
+            if (photoQuery.Status == iris:DataProviderQueryStatus.Idle)
+            {
+              
+              msgdata:Photo photo = (msgdata:Photo)PhotosQuery.Result.Photos.get_Item(Counter);
+              photoQuery.Title = photo.Title;
+              photoQuery.CollectionName = PhotosQuery.Result.CollectionName;
+              if (!photoQuery.Result.InLibrary)
+              {
+                
+                photoQuery.URL = MessageDetailsQuery.Result.AltLink + photo.Suffix;
+              }
+            }
+            else
+            {
+              ResultReady = true;
+            }
+          }
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(CurrentQuery.Result.ImagePath)]
+        ResultReady = true;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(ResultReady)]
+        if (ResultReady)
+        {
+          if (CurrentQuery != null)
+          {
+            if (!CurrentQuery.Result.InLibrary)
+            {
+              if (!msg:MessagingService.Instance.AddInboxPhoto(CurrentQuery.Title, PhotosQuery.Result.CollectionName, CurrentQuery.Result.ImagePath))
+              {
+                
+              }
+              else
+              {
+                
+                CurrentQuery.Title = CurrentQuery.Title;
+              }
+            }
+            CurrentQuery = null;
+          }
+          
+          if (Counter >= 0)
+          {
+            Counter = Counter + 1;
+          }
+          ResultReady = false;
+        }
+      </Script>
+
+    </Scripts>
+
+    <Content>
+      <Panel Margins="10,5,0,0">
+        <Layout><DockLayout DefaultLayoutInput="Top,Near"/></Layout>
+        <Children>
+
+          
+          <inboxdetails:MessageDetailsHeader Name="Header" Model="{Model}" MessageDetailsQuery="{MessageDetailsQuery}"/>
+
+          
+          <core:Label Name="CollectionTitle" Margins="10,5,0,0" Style="{styles:SharedStyles.InboxAlbumTitle}"/>
+
+          
+          <core:ActionButton Name="PicturesButton" Visible="false" Model="{PicturesCommand}" Margins="10,0,0,0" />
+
+          
+          <me:PicturesView Name="Pictures" Content="{null}" TileSize="160,120" Margins="10,10,10,0" ScrollOrientation="Vertical" PhotoQueries="{PhotoQueries}" >
+            <ListLayout>
+              <GridLayout Orientation="Horizontal" AllowWrap="true" Spacing="5,5"/>
+            </ListLayout>
+            <LayoutInput>
+              <DockLayoutInput Position="Client"/>
+            </LayoutInput>
+          </me:PicturesView>
+
+          
+          <inboxdetails:MessageDetailsFooter Name="Footer" Model="{Model}" MessageDetailsQuery="{MessageDetailsQuery}" Margins="10,19,0,0">
+            <LayoutInput>
+              <DockLayoutInput Position="Bottom"/>
+            </LayoutInput>
+          </inboxdetails:MessageDetailsFooter>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/INBOXPODCASTDETAILS.UIX b/test/2.1/INBOXPODCASTDETAILS.UIX
new file mode 100644
index 0000000..14a7a8b
--- /dev/null
+++ b/test/2.1/INBOXPODCASTDETAILS.UIX
@@ -0,0 +1,169 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:zunedbapi="assembly://ZuneDBApi"
+  xmlns:subscription="assembly://ZuneDBApi/Microsoft.Zune.Subscription"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:button="res://ZuneShellResources!Button.uix"
+  xmlns:pcastdlg="res://ZuneShellResources!PodcastDialogs.uix"
+  xmlns:libdata="res://ZuneShellResources!LibraryData.schema.xml"
+  xmlns:pcastdata="res://ZuneMarketplaceResources!PodcastData.schema.xml"
+  xmlns:pcastview="res://ZuneMarketplaceResources!PodcastView.uix"
+  xmlns:inboxdetails="res://ZuneShellResources!InboxBaseDetails.uix">
+
+  
+  
+  
+  <UI Name="PodcastDetailsUI" Base="inboxdetails:MessageDetailsProvider">
+    <Locals>
+      <iris:Command Name="MarketplaceCommand" Description="{zune:Shell.LoadString(zune:StringId.IDS_MARKETPLACE_SITE_BUTTON)}" Available="false" />
+      <iris:Command Name="ToggleSubscriptionCommand" />
+      <String Name="PodcastUrl" />
+      <String Name="WebSiteUrl" />
+      <zune:SubscriptionState Name="SubscriptionState" />
+      <pcastdata:PodcastSeries Name="Podcast" />
+      <libdata:DynamicRssViewPodcastEpisodeQuery Name="DynamicRssEpisodesQuery" Sort="-ReleaseDate" />
+      <pcastdlg:UnsubscribeDialog Name="UnsubscribeDialog" />
+      <pcastdlg:SettingsDialog Name="SettingsDialog" Page="{null}"/>
+      <button:Icon Name="Icon" Image="res://ZuneShellResources!Icon.ExternalLink.png" Margins="7,1,0,0"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        if ([MessageDetailsQuery.Status] == iris:DataProviderQueryStatus.Complete)
+        {
+          PodcastUrl = MessageDetailsQuery.Result.PodcastUrl;
+        }
+      </Script>
+      
+      <Script>
+        if (!String.IsNullOrEmpty( [PodcastUrl] ))
+        {
+          SubscriptionState = zune:Management.Instance.GetSubscriptionState(PodcastUrl);
+          DynamicRssEpisodesQuery.FeedUrl = PodcastUrl;
+        }
+      </Script>
+      <Script>
+        [DeclareTrigger(SubscriptionState.IsSubscribed)]
+        if (SubscriptionState.IsSubscribed)
+        {
+          ToggleSubscriptionCommand.Description = zune:Shell.LoadString(zune:StringId.IDS_UNSUBSCRIBE_BUTTON);
+        }
+        else
+        {
+          ToggleSubscriptionCommand.Description = zune:Shell.LoadString(zune:StringId.IDS_SUBSCRIBE_BUTTON);
+        }
+        ToggleSubscriptionCommand.Available = true;
+      </Script>
+      <Script>
+        [DeclareTrigger(DynamicRssEpisodesQuery.Status)]
+        if (DynamicRssEpisodesQuery.Status == iris:DataProviderQueryStatus.Complete)
+        {
+          SeriesTitle.Content = DynamicRssEpisodesQuery.Result.PodcastSeriesInfo.Title;
+          AuthorName.Content = DynamicRssEpisodesQuery.Result.PodcastSeriesInfo.Author;
+          if (!String.IsNullOrEmpty(DynamicRssEpisodesQuery.Result.PodcastSeriesInfo.ArtUrl))
+          {
+            SeriesImage.Content = new iris:Image(DynamicRssEpisodesQuery.Result.PodcastSeriesInfo.ArtUrl, 0, 0, false, true);
+          }
+          if (!List.IsNullOrEmpty(DynamicRssEpisodesQuery.Result.Items))
+          {
+            EpisodesListView.Episodes = DynamicRssEpisodesQuery.Result.Items;
+          }
+          WebSiteUrl = DynamicRssEpisodesQuery.Result.PodcastSeriesInfo.HomeUrl;
+
+          EpisodesPanel.Visible = true;
+
+          MessageDetailsCompleted = true;
+        }
+      </Script>
+      
+      
+      <Script>
+        [DeclareTrigger(ToggleSubscriptionCommand.Invoked)]
+        if (SubscriptionState.IsSubscribed)
+        {
+            UnsubscribeDialog.SeriesId = SubscriptionState.SeriesId;
+            UnsubscribeDialog.Helper.Show(UnsubscribeDialog);
+        }
+        else if (SubscriptionState.SeriesFound)
+        {
+          
+          subscription:SubscriptionManager.Instance.Subscribe(SubscriptionState.SeriesId);
+          SubscriptionState.IsSubscribed = true;
+        }
+        else
+        {
+          
+          SubscriptionState = zune:Management.Instance.SubscribeToPodcastFeed(PodcastUrl, DynamicRssEpisodesQuery.Result.PodcastSeriesInfo.Title, zunedbapi:ESubscriptionSource.eSubscriptionSourceInbox);
+        }
+      </Script>
+      
+      <Script>
+        [DeclareTrigger(UnsubscribeDialog.Unsubscribe.Invoked)]
+        ToggleSubscriptionCommand.Available = false;
+        SubscriptionState.IsSubscribed = false;
+      </Script>
+
+    </Scripts>
+
+    <Content>
+      <Panel Layout="Dock" Margins="10,5,0,0">
+        <Children>
+
+          
+          <inboxdetails:MessageDetailsHeader Name="Header" Model="{Model}" MessageDetailsQuery="{MessageDetailsQuery}">
+            <LayoutInput>
+              <DockLayoutInput Position="Top"/>
+            </LayoutInput>
+          </inboxdetails:MessageDetailsHeader>
+
+          <Panel Layout="HorizontalFlow" Margins="13,0,0,0">
+            <LayoutInput>
+              <DockLayoutInput Position="Top"/>
+            </LayoutInput>
+            <Children>
+
+              
+              <Graphic Name="SeriesImage" MaximumSize="75,75" MinimumSize="75,75" Content="{styles:Styles.NoAlbumArt}"/>
+
+              
+              <Panel Layout="VerticalFlow" Margins="10,0,0,0">
+                <Children>
+
+                  <core:Label Name="SeriesTitle" Style="{styles:SharedStyles.InboxAlbumTitle}" />
+
+                  <core:Label Name="AuthorName" Style="{styles:SharedStyles.InboxAlbumArtist}"/>
+                  <core:ActionButton Name="SeriesStateButton" Model="{ToggleSubscriptionCommand}" Margins="-2,0,0,0" />
+                </Children>
+              </Panel>
+
+            </Children>
+          </Panel>
+
+          <Panel Name="EpisodesPanel" Visible="false" Margins="0,0,0,0">
+            <LayoutInput>
+              <DockLayoutInput Position="Client"/>
+            </LayoutInput>
+
+            <Children>
+              
+              <pcastview:PodcastEpisodesView Name="EpisodesListView" Page="{Page}" Shell="{(zune:Shell)zune:ZuneShell.DefaultInstance}"/>
+            </Children>
+          </Panel>
+
+          
+          <inboxdetails:MessageDetailsFooter Name="Footer" Model="{Model}" MessageDetailsQuery="{MessageDetailsQuery}" Margins="10,10,0,0">
+            <LayoutInput>
+              <DockLayoutInput Position="Bottom"/>
+            </LayoutInput>
+          </inboxdetails:MessageDetailsFooter>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/INBOXPROFILEDETAILS.UIX b/test/2.1/INBOXPROFILEDETAILS.UIX
new file mode 100644
index 0000000..cd03a11
--- /dev/null
+++ b/test/2.1/INBOXPROFILEDETAILS.UIX
@@ -0,0 +1,126 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:sys="assembly://mscorlib/System"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:zuneshell="assembly://ZuneShell/Microsoft.Zune.Shell"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:mctl="res://ZuneMarketplaceResources!Controls.uix"
+  xmlns:inboxdetails="res://ZuneShellResources!InboxBaseDetails.uix"
+  xmlns:me="Me">
+
+  
+  
+  
+  <UI Name="HeaderMessageAndLink" Base="inboxdetails:MessageDetailsProvider">
+    <Properties>
+      <iris:Command Name="LinkCommand" />
+      <String Name="TextContent" />
+      <String Name="ZuneTag" />
+    </Properties>
+
+    <Scripts>
+      <Script>
+        Header.TextContent = [TextContent];
+      </Script>
+      <Script>
+        ZuneTagLabel.Content = [ZuneTag];
+      </Script>
+      <Script>
+        if ([MessageDetailsQuery.Status] == iris:DataProviderQueryStatus.Complete)
+        {
+          if (!String.IsNullOrEmpty(MessageDetailsQuery.Result.AltLink))
+          {
+            LinkButton.Visible = true;
+          }
+          if (!String.IsNullOrEmpty(MessageDetailsQuery.Result.UserTile))
+          {
+            UserTile.Content = new iris:Image(MessageDetailsQuery.Result.UserTile, 0, 0, false, true);
+          }
+          MessageDetailsCompleted = true;
+        }
+      </Script>
+      <Script>
+        [DeclareTrigger(LinkCommand.Invoked)]
+        zuneshell:ZuneApplication.Service.LaunchBrowserForExternalUrl(MessageDetailsQuery.Result.AltLink, true);
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Layout="Dock" Margins="10,5,0,0">
+        <Children>
+
+          
+          <inboxdetails:MessageDetailsHeader Name="Header" Model="{Model}" MessageDetailsQuery="{MessageDetailsQuery}" UseMessageTextContent="false">
+            <LayoutInput>
+              <DockLayoutInput Position="Top"/>
+            </LayoutInput>
+          </inboxdetails:MessageDetailsHeader>
+
+          <Panel Layout="HorizontalFlow" Margins="13,0,0,0">
+            <LayoutInput>
+              <DockLayoutInput Position="Top"/>
+            </LayoutInput>
+
+            <Children>
+              
+              <Graphic Name="UserTile" MaximumSize="64,64" MinimumSize="64,64"/>
+              
+              <core:Label Name="ZuneTagLabel" Style="{styles:SharedStyles.InboxAlbumTitle}" Margins="10,5,0,0"/>
+            </Children>
+          </Panel>
+
+          <mctl:ExternalLink Name="LinkButton" Model="{LinkCommand}" Visible="false" Margins="15,10,0,0" KeyInteractiveNStuff="false" OverrideStyle="{styles:SharedStyles.ZuneNetLinkStyle}" IconMargin="7,1,0,0">
+            <LayoutInput>
+              <DockLayoutInput Position="Top" Alignment="Near"/>
+            </LayoutInput>
+          </mctl:ExternalLink>
+
+          
+          <inboxdetails:MessageDetailsFooter Name="Footer" Model="{Model}" MessageDetailsQuery="{MessageDetailsQuery}" Margins="10,19,0,0">
+            <LayoutInput>
+              <DockLayoutInput Position="Bottom"/>
+            </LayoutInput>
+          </inboxdetails:MessageDetailsFooter>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="CardDetailsUI" Base="me:HeaderMessageAndLink">
+    <Scripts>
+      <Script>
+        TextContent = sys:String.Format(zune:Shell.LoadString(zune:StringId.IDS_INBOX_USERCARD_MESSAGE), Model.SelectedItem.From);
+        LinkCommand.Description = zune:Shell.LoadString(zune:StringId.IDS_INBOX_USERCARD_LINK);
+      </Script>
+      
+      <Script>
+        if ([MessageDetailsQuery.Status] == iris:DataProviderQueryStatus.Complete)
+        {
+          ZuneTag = MessageDetailsQuery.Result.ZuneTag;
+        }
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  <UI Name="FriendRequestUI" Base="me:HeaderMessageAndLink">
+    <Scripts>
+      <Script>
+        TextContent = sys:String.Format(zune:Shell.LoadString(zune:StringId.IDS_INBOX_FRIENDREQUEST_MESSAGE), Model.SelectedItem.From);
+        LinkCommand.Description = zune:Shell.LoadString(zune:StringId.IDS_INBOX_FRIENDREQUEST_LINK);
+        
+        ZuneTag = Model.SelectedItem.From;
+      </Script>
+    </Scripts>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/INBOXTEXTDETAILS.UIX b/test/2.1/INBOXTEXTDETAILS.UIX
new file mode 100644
index 0000000..0817906
--- /dev/null
+++ b/test/2.1/INBOXTEXTDETAILS.UIX
@@ -0,0 +1,101 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:inboxdetails="res://ZuneShellResources!InboxBaseDetails.uix"
+  xmlns:me="Me">
+
+  
+  
+  
+  <UI Name="UnknownDetails" Base="inboxdetails:MessageDetailsProvider">
+    <Scripts>
+      <Script>
+        MessageDetailsCompleted = true;
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Layout="Dock">
+        <Children>
+          
+          <inboxdetails:MessageDetailsHeader Name="Header" Model="{Model}" TextContent="{zune:Shell.LoadString(zune:StringId.IDS_INBOX_UNKNOWN_MESSAGE)}" MessageDetailsQuery="{MessageDetailsQuery}" Margins="5,0,0,0">
+            <LayoutInput>
+              <DockLayoutInput Position="Top"/>
+            </LayoutInput>
+          </inboxdetails:MessageDetailsHeader>
+
+          
+          <inboxdetails:MessageDetailsFooter Name="Footer" Model="{Model}" MessageDetailsQuery="{MessageDetailsQuery}" Margins="10,0,0,0">
+            <LayoutInput>
+              <DockLayoutInput Position="Bottom"/>
+            </LayoutInput>
+          </inboxdetails:MessageDetailsFooter>
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="NoSelection">
+    <Properties>
+      
+      <zune:SelectionDetailsPanel Name="Model" SelectionDetailsPanel="$Required"/>
+      <zune:InboxPage Name="Page" InboxPage="$Required"/>
+    </Properties>
+
+    <Content>
+      <Panel Layout="VerticalFlow" Margins="15,0,0,0">
+        <Children>
+          <core:Label Name="Details" Content="{zune:Shell.LoadString(zune:StringId.IDS_DETAILS_NOANDMULTISELECT_HEADER)}" Style="{styles:SharedStyles.InboxDetailStyle}" />
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="MultiSelection" Base="me:NoSelection">
+  </UI>
+
+  
+  
+  
+  <UI Name="TextDetailsUI" Base="inboxdetails:MessageDetailsProvider">
+    <Scripts>
+      <Script>
+        if ([MessageDetailsQuery.Status] == iris:DataProviderQueryStatus.Complete)
+        {
+          MessageDetailsCompleted = true;
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Layout="Dock">
+        <Children>
+          
+          <inboxdetails:MessageDetailsHeader Name="Header" Model="{Model}" MessageDetailsQuery="{MessageDetailsQuery}" Margins="10,5,0,0">
+            <LayoutInput>
+              <DockLayoutInput Position="Top"/>
+            </LayoutInput>
+          </inboxdetails:MessageDetailsHeader>
+
+          
+          <inboxdetails:MessageDetailsFooter Name="Footer" Model="{Model}" MessageDetailsQuery="{MessageDetailsQuery}" Margins="10,19,0,0">
+            <LayoutInput>
+              <DockLayoutInput Position="Bottom"/>
+            </LayoutInput>
+          </inboxdetails:MessageDetailsFooter>
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/INBOXTRACKDETAILS.UIX b/test/2.1/INBOXTRACKDETAILS.UIX
new file mode 100644
index 0000000..12e6105
--- /dev/null
+++ b/test/2.1/INBOXTRACKDETAILS.UIX
@@ -0,0 +1,379 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:sys="assembly://mscorlib/System"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:track="res://ZuneMarketplaceResources!Track.uix"
+  xmlns:mctl="res://ZuneMarketplaceResources!Controls.uix"
+  xmlns:msgdata="res://ZuneShellResources!MessagingData.schema.xml"
+  xmlns:zmpdata="res://ZuneMarketplaceResources!MarketplaceData.schema.xml"
+  xmlns:actions="res://ZuneMarketplaceResources!TrackCollectionActions.uix"
+  xmlns:inboxdetails="res://ZuneShellResources!InboxBaseDetails.uix"
+  xmlns:me="Me">
+
+  
+  
+  
+  <UI Name="TrackCollection" Base="inboxdetails:MessageDetailsProvider">
+    <Properties>
+      <zmpdata:MarketplaceAlbumDataQuery Name="ZmpAlbumQuery" Id="" />
+    </Properties>
+
+    <Locals>
+      <actions:TrackCollectionActions Name="TrackCollectionActions"/>
+    </Locals>
+
+    <Scripts>
+
+      
+      <Script>
+        if ([ZmpAlbumQuery.Status] == iris:DataProviderQueryStatus.Complete)
+        {
+          AlbumArt.Content = new iris:Image(ZmpAlbumQuery.Result.ImageUri, 0, 0, false, true);
+          TracksListView.Visible = true;
+          
+          if (TracksListView.Content == null)
+          {
+            TracksListView.Content = ZmpAlbumQuery.Result.Tracks;
+          }
+          AlbumTitle.Content = ZmpAlbumQuery.Result.Title;
+          
+          if (ZmpAlbumQuery.Result.Artists.Count > 0)
+          {
+            ArtistName.Content = ((zmpdata:Media)ZmpAlbumQuery.Result.Artists.get_Item(0)).Title;
+          }
+          
+          if (ZmpAlbumQuery.Result.Genres.Count > 0)
+          {
+            GenreName.Content = ((zmpdata:Genre)ZmpAlbumQuery.Result.Genres.get_Item(0)).Title;
+          }
+          if ((Object)ZmpAlbumQuery.Result.ReleaseDate != null)
+          {
+            ReleaseYear.Content = ZmpAlbumQuery.Result.ReleaseDate.Year.ToString();
+          }
+          
+          TrackCollectionActions.Tracks = ZmpAlbumQuery.Result.Tracks;
+          TrackCollectionActions.CollectionType = "type:album";
+          TrackCollectionActions.CollectionName = ZmpAlbumQuery.Result.Title;
+          TrackCollectionActions.CollectionId = zune:GuidHelper.CreateFromString(ZmpAlbumQuery.Id);
+          TrackCollectionActions.CollectionPointsPrice = ZmpAlbumQuery.Result.PointsPrice;
+          
+          MessageDetailsCompleted = true;
+        }
+      </Script>
+      
+      <Script>
+        [DeclareTrigger(TrackCollectionActions.ButtonCommand)]
+        AlbumButton.Visible = (TrackCollectionActions.ButtonCommand != null &amp;&amp; TrackCollectionActions.ButtonCommand.Available);
+        AlbumButton.Model = TrackCollectionActions.ButtonCommand;
+      </Script>
+
+    </Scripts>
+    <Content>
+      <Panel Layout="Dock" Margins="10,5,0,0">
+        <Children>
+
+          
+          <inboxdetails:MessageDetailsHeader Name="Header" Model="{Model}" MessageDetailsQuery="{MessageDetailsQuery}" >
+            <LayoutInput>
+              <DockLayoutInput Position="Top"/>
+            </LayoutInput>
+          </inboxdetails:MessageDetailsHeader>
+
+          <Panel Layout="HorizontalFlow" Margins="13,0,0,0">
+            <LayoutInput>
+              <DockLayoutInput Position="Top"/>
+            </LayoutInput>
+            <Children>
+              
+              <Graphic Name="AlbumArt" MaximumSize="75,75" MinimumSize="75,75" Content="{styles:Styles.NoAlbumArt}"/>
+
+              
+              <Panel Layout="VerticalFlow" Margins="10,0,0,0">
+                <Children>
+
+                  <core:Label Name="AlbumTitle" Style="{styles:SharedStyles.InboxAlbumTitle}"/>
+
+                  <core:Label Name="ArtistName" Style="{styles:SharedStyles.InboxAlbumArtist}"/>
+
+                  <core:Label Name="GenreName" Style="{styles:SharedStyles.InboxAlbumGenre}"/>
+
+                  <core:Label Name="ReleaseYear" Style="{styles:SharedStyles.InboxAlbumRelease}"/>
+
+                  <mctl:MarketplaceActionButton Name="AlbumButton" Model="{TrackCollectionActions.ButtonCommand}" Visible="false" Margins="-3,3,0,0"/>
+                </Children>
+              </Panel>              
+
+            </Children>
+          </Panel>
+
+          
+          <track:TrackListView Name="TracksListView" Margins="0,20,0,0" Content="{null}" ColumnData="{track:Columns.Album}" Visible="false" OverrideStyle="{styles:SharedStyles.TrackListItemStyle}" ShowHeaders="false">
+            <LayoutInput>
+              <DockLayoutInput Position="Client"/>
+            </LayoutInput>
+          </track:TrackListView>
+
+          
+          <inboxdetails:MessageDetailsFooter Name="Footer" Model="{Model}" MessageDetailsQuery="{MessageDetailsQuery}" Margins="10,19,0,0">
+            <LayoutInput>
+              <DockLayoutInput Position="Bottom"/>
+            </LayoutInput>
+          </inboxdetails:MessageDetailsFooter>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="AlbumDetailsUI" Base="me:TrackCollection">
+
+    <Locals>
+      <msgdata:UriResourceZplQuery Name="ZplQuery" />
+      <zmpdata:MarketplaceSingleTrackDataQuery Name="ZmpTrackQuery" Id="" />
+      <Int32 Name="TrackIndex" Int32="-1" />
+    </Locals>
+
+    <Scripts>
+
+      
+      <Script>
+        if (!zune:GuidHelper.IsEmpty(Model.SelectedItem.MediaId))
+        {
+          ZmpAlbumQuery.Id = Model.SelectedItem.MediaId.ToString();
+        }
+      </Script>
+      
+      <Script>
+        if ([MessageDetailsQuery.Status] == iris:DataProviderQueryStatus.Complete)
+        {
+          if (zune:GuidHelper.IsEmpty(Model.SelectedItem.MediaId))
+          {
+            
+            AlbumTitle.Content = MessageDetailsQuery.Result.AlbumTitle;
+            ArtistName.Content = MessageDetailsQuery.Result.ArtistName;
+            
+            if (!String.IsNullOrEmpty(MessageDetailsQuery.Result.AltLink))
+            {
+              ZplQuery.URI = MessageDetailsQuery.Result.AltLink;
+            }
+          }
+        }
+      </Script>
+
+      
+      <Script>
+        if ([ZplQuery.Status] == iris:DataProviderQueryStatus.Complete)
+        {
+          if (!String.IsNullOrEmpty(ZplQuery.Result.Title))
+          {
+            AlbumTitle.Content = ZplQuery.Result.Title;
+          }
+          if (ZplQuery.Result.ZplTracks.Count > 0)
+          {
+            
+            TrackIndex = 0;
+          }
+        }
+      </Script>
+      
+      <Script>
+        if ([TrackIndex] >= 0)
+        {
+          if (TrackIndex == ZplQuery.Result.ZplTracks.Count)
+          {
+            
+            TrackIndex = -1;
+            
+            TracksListView.Visible = true;
+            TracksListView.Content = ZplQuery.Result.ZplTracks;
+            MessageDetailsCompleted = true;
+          }
+          else
+          {
+            zmpdata:Track track = (zmpdata:Track)ZplQuery.Result.ZplTracks.get_Item(TrackIndex);
+            if (!zune:GuidHelper.IsEmpty(track.Id))
+            {
+              
+              ZmpTrackQuery.Id = track.Id.ToString();
+            }
+            else
+            {
+              
+              TrackIndex = TrackIndex + 1;
+            }
+          }
+        }
+      </Script>
+      
+      <Script>
+        if ([ZmpTrackQuery.Status] == iris:DataProviderQueryStatus.Complete)
+        {
+          if(!zune:GuidHelper.IsEmpty(ZmpTrackQuery.Result.AlbumId))
+          {
+            ZmpAlbumQuery.Id = ZmpTrackQuery.Result.AlbumId.ToString();
+          }
+        }
+      </Script>
+
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  <UI Name="PlaylistDetailsUI" Base="me:TrackCollection">
+    <Locals>
+      <zmpdata:MarketplacePlaylistDataQuery Name="PlaylistQuery" Id="" />
+      <msgdata:UriResourceZplQuery Name="ZplQuery" />
+    </Locals>
+
+    <Scripts>
+
+      
+      <Script>
+        if (!zune:GuidHelper.IsEmpty(Model.SelectedItem.MediaId))
+        {
+          PlaylistQuery.Id = Model.SelectedItem.MediaId.ToString();
+        }
+      </Script>
+
+      
+      <Script>
+        if ([PlaylistQuery.Status] == iris:DataProviderQueryStatus.Complete)
+        {
+          AlbumArt.Content = new iris:Image(PlaylistQuery.Result.ImageUri, 0, 0, false, true);
+          TracksListView.Visible = true;
+          
+          if (TracksListView.Content == null)
+          {
+            TracksListView.Content = PlaylistQuery.Result.Tracks;
+          }
+          AlbumTitle.Content = PlaylistQuery.Result.Title;
+          ArtistName.Content = PlaylistQuery.Result.Author;
+          
+          if (PlaylistQuery.Result.Genres.Count > 0)
+          {
+            GenreName.Content = ((zmpdata:Genre)PlaylistQuery.Result.Genres.get_Item(0)).Title;
+          }
+          
+          TrackCollectionActions.Tracks = PlaylistQuery.Result.Tracks;
+          TrackCollectionActions.CollectionType = "type:playlist";
+          TrackCollectionActions.CollectionName = PlaylistQuery.Result.Title;
+          TrackCollectionActions.CollectionId = zune:GuidHelper.CreateFromString(PlaylistQuery.Id);
+
+          MessageDetailsCompleted = true;
+        }
+      </Script>
+      
+      <Script>
+        [DeclareTrigger(TrackCollectionActions.ButtonCommand)]
+        AlbumButton.Visible = (TrackCollectionActions.ButtonCommand != null &amp;&amp;
+                               TrackCollectionActions.ButtonCommand.Available &amp;&amp;
+                               !zune:GuidHelper.IsEmpty(TrackCollectionActions.CollectionId));
+        AlbumButton.Model = TrackCollectionActions.ButtonCommand;
+      </Script>
+
+      
+      <Script>
+        if ([MessageDetailsQuery.Status] == iris:DataProviderQueryStatus.Complete)
+        {
+          if (zune:GuidHelper.IsEmpty(Model.SelectedItem.MediaId))
+          {
+            
+            AlbumTitle.Content = MessageDetailsQuery.Result.PlaylistName;
+            
+            ZplQuery.URI = MessageDetailsQuery.Result.AltLink;
+          }
+        }
+      </Script>
+
+      
+      <Script>
+        if ([ZplQuery.Status] == iris:DataProviderQueryStatus.Complete)
+        {
+          if (!String.IsNullOrEmpty(ZplQuery.Result.Title))
+          {
+            AlbumTitle.Content = ZplQuery.Result.Title;
+          }
+          if (!String.IsNullOrEmpty(ZplQuery.Result.Author))
+          {
+            ArtistName.Content = ZplQuery.Result.Author;
+          }
+          TracksListView.Visible = true;
+          TracksListView.Content = ZplQuery.Result.ZplTracks;
+
+          
+          TrackCollectionActions.Tracks = ZplQuery.Result.ZplTracks;
+          TrackCollectionActions.CollectionType = "type:playlist";
+          TrackCollectionActions.CollectionName = ZplQuery.Result.Title;
+
+          MessageDetailsCompleted = true;
+        }
+      </Script>
+
+    </Scripts>
+
+  </UI>
+
+  
+  
+  
+  <UI Name="TrackDetailsUI" Base="me:TrackCollection">
+    <Locals>
+      <zmpdata:MarketplaceSingleTrackDataQuery Name="ZmpTrackQuery" Id="" />
+    </Locals>
+
+    <Scripts>
+      
+      <Script>
+        if (!zune:GuidHelper.IsEmpty(Model.SelectedItem.MediaId))
+        {
+          ZmpTrackQuery.Id = Model.SelectedItem.MediaId.ToString();
+        }
+      </Script>
+      
+      <Script>
+        if ([ZmpTrackQuery.Status] == iris:DataProviderQueryStatus.Complete)
+        {
+          ZmpAlbumQuery.Id = ZmpTrackQuery.Result.AlbumId.ToString();
+          TracksListView.Visible = true;
+          TracksListView.Content = ZmpTrackQuery.Result.Tracks;
+
+          MessageDetailsCompleted = true;
+        }
+      </Script>
+      
+      <Script>
+        if ([MessageDetailsQuery.Status] == iris:DataProviderQueryStatus.Complete)
+        {
+          AlbumTitle.Content = MessageDetailsQuery.Result.AlbumTitle;
+          ArtistName.Content = MessageDetailsQuery.Result.ArtistName;
+
+          
+          zmpdata:Track track = new zmpdata:Track();
+          track.Id = new sys:Guid();
+          track.LibraryId = -1;
+          track.Title = MessageDetailsQuery.Result.SongTitle;
+          track.AlbumTitle = MessageDetailsQuery.Result.AlbumTitle;
+          track.ArtistName = MessageDetailsQuery.Result.ArtistName;
+
+          iris:ArrayListDataSet tracks = new iris:ArrayListDataSet();
+          tracks.Add(track);
+
+          TracksListView.Visible = true;
+          TracksListView.Content = tracks;
+
+          MessageDetailsCompleted = true;
+        }
+      </Script>
+    </Scripts>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/JUMPINLIST.UIX b/test/2.1/JUMPINLIST.UIX
new file mode 100644
index 0000000..71e977f
--- /dev/null
+++ b/test/2.1/JUMPINLIST.UIX
@@ -0,0 +1,92 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:animations="res://ZuneShellResources!Animations.uix"
+  xmlns:popup="res://ZuneShellResources!Popup.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  >
+
+  <Class Name="JumpInList" Base="popup:Popup">
+    <Properties>
+      
+      
+      <zune:PopupHelper Name="Helper" IsModal="false" DismissOnMouseDown="true"
+                DismissOnWindowDeactivate="true" HandleWindowClose="false"/>
+      <PopupLayoutInput Name="LayoutInput" Placement="Center" />
+      <String Name="PopupUI" String="res://ZuneShellResources!JumpInList.uix#JumpInListUI"/>
+    </Properties>
+  </Class>
+
+  <UI Name="JumpInListUI" Base="popup:PopupUI">
+    <Locals>
+      <Color Name="TextColor" Color="{styles:Styles.JumpInListTextColor}"/>
+      <Color Name="FadeColor" Color="{styles:Styles.JumpInListFadeColor}"/>
+      <Font Name="TextFont" Font="{styles:Styles.JumpInListFont}"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        SearchString.Content = [zune:JumpInListManager.Instance.SearchString];
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Layout="Center" Name="Container" MouseInteractive="true">
+        <Animations>
+          <Animation Animation="{animations:Animations.BasicFadeIn}"/>
+          <Animation Animation="{animations:Animations.BasicFadeOut}"/>
+        </Animations>
+
+        <Children>
+          
+          <ColorFill Content="{FadeColor}" MaximumSize="500,60" Layout="Form">
+            <Children>
+              
+              <Text Name="SearchString" Color="{TextColor}" Font="{TextFont}" Margins="10,0,10,0">
+                <LayoutInput>
+                  <FormLayoutInput Horizontal="Center" Top="Parent,0"/>
+                </LayoutInput>
+              </Text>
+              
+              <Text Name="Caret" Color="{TextColor}" Font="{TextFont}" Content="_">
+                <LayoutInput>
+                  <FormLayoutInput Left="SearchString,1,-10" Bottom="SearchString,1"/>
+                </LayoutInput>
+              </Text>
+              
+              
+              <Graphic Content="{styles:Styles.JumpInBorder}" StretchingPolicy="Fill">
+                <LayoutInput>
+                  <FormLayoutInput Left="Parent,0,-1" Right="Parent,1,1" Top="Parent,0,-1" Bottom="Parent,0"/>
+                </LayoutInput>
+              </Graphic>
+              
+              
+              <Graphic Content="{styles:Styles.JumpInBorder}" StretchingPolicy="Fill">
+                <LayoutInput>
+                  <FormLayoutInput Left="Parent,0,-1" Right="Parent,1,1" Top="Parent,1" Bottom="Parent,1,1"/>
+                </LayoutInput>
+              </Graphic>
+
+              
+              <Graphic Content="{styles:Styles.JumpInBorder}" StretchingPolicy="Fill">
+                <LayoutInput>
+                  <FormLayoutInput Left="Parent,0,-1" Right="Parent,0" Top="Parent,0" Bottom="Parent,1"/>
+                </LayoutInput>
+              </Graphic>
+              
+              
+              <Graphic Content="{styles:Styles.JumpInBorder}" StretchingPolicy="Fill">
+                <LayoutInput>
+                  <FormLayoutInput Left="Parent,1" Right="Parent,1,1" Top="Parent,0" Bottom="Parent,1"/>
+                </LayoutInput>
+              </Graphic>
+              
+            </Children>
+          </ColorFill>
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+</UIX>
diff --git a/test/2.1/LABELWITHARROW.UIX b/test/2.1/LABELWITHARROW.UIX
new file mode 100644
index 0000000..8420229
--- /dev/null
+++ b/test/2.1/LABELWITHARROW.UIX
@@ -0,0 +1,38 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX 
+    xmlns="http://schemas.microsoft.com/2007/uix"
+    xmlns:styles="res://ZuneShellResources!Styles.uix"
+    xmlns:style="res://ZuneShellResources!Style.uix"
+    xmlns:core="res://ZuneShellResources!Controls.uix">
+
+  
+  <UI Name="LabelWithArrow" Base="core:Label">
+     <Properties>
+       <Boolean Name="ShowArrow" Boolean="false"/>      
+       
+       <style:Style Name="OverrideStyle" Style="{null}"/>
+       <style:Style Name="BaseStyle" Style="{styles:SharedStyles.MgmtMenuItemStyle}"/>
+
+     </Properties>
+    
+    <Scripts>
+      <Script>SelectionArrow.Alpha = (float)[ShowArrow];</Script>
+    </Scripts>
+
+    <Content>
+      
+      <Panel Layout="HorizontalFlow">
+        <Children>
+          
+          
+          
+          <Graphic Name="SelectionArrow" Content="{styles:Styles.LeftMenuSelectArrow}" Margins="-6,3,4,0"/>
+          
+          
+         <Text Name="Label" NamedStyles="{NamedStyles}" MouseInteractive="{ShowToolTipWhenClipped}"/>    
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+  
+</UIX>
diff --git a/test/2.1/LIBRARY.UIX b/test/2.1/LIBRARY.UIX
new file mode 100644
index 0000000..42ad863
--- /dev/null
+++ b/test/2.1/LIBRARY.UIX
@@ -0,0 +1,402 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:style="res://ZuneShellResources!Style.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:page="res://ZuneShellResources!PageStack.uix"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:spreadsheet="res://ZuneShellResources!SpreadSheetViewBase.uix"
+  xmlns:linkButtons="res://ZuneShellResources!LinkButtons.uix" 
+  xmlns:me="Me"
+  >
+
+  
+  <Class Name="LibraryListModel" Base="spreadsheet:SpreadSheetListModel">
+    <Properties>
+      <zune:ListPanel Name="Model"/>
+      <iris:Command Name="ToggleSelectAllCommand" Command="{null}"/>
+      <iris:Choice Name="Sorts" Choice="{null}"/>
+    </Properties>
+  </Class>
+
+  
+  <UI Name="Library" Base="page:PageBase">
+    <Properties>
+      <zune:LibraryPage Name="Page" LibraryPage="$Required"/>
+    </Properties>
+
+    <Locals>
+      
+
+
+      <Boolean Name="Dragging"/>
+    </Locals>
+
+    <Input>
+      <DropTargetHandler Name="Target" HandlerStage="Direct,Bubbled"/>
+    </Input>
+
+    <Scripts>
+      <Script>ViewPivots.Filters = [Page.Views];</Script>
+
+      <Script> Splitter.Panels = [Page.Children]; </Script>
+      
+      <Script>
+        if (!String.IsNullOrEmpty([Page.ChildrenName]))
+          Splitter.Positions = (core:SplitterPositions)me:Globals.PagePositions.GetItem(Page.ChildrenName);
+        else
+          Splitter.Positions = null;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Page.Children)]
+
+        
+        
+        
+        
+        Splitter.NavigateInto();
+      </Script>
+
+      <Script> Dragging = [Target.Dragging]; </Script>
+
+      <Script>
+        [DeclareTrigger(Dragging)]
+
+        Target.AllowedDropActions = DropAction.None;
+        if (Dragging)
+        {
+          zune:MediaType mediaType = Page.MediaType;
+
+          if (mediaType != zune:MediaType.Undefined)
+          {
+            Object value = Target.GetValue();
+            
+
+            if (value is List)
+            {
+              
+              Page.CheckCanAddMedia((List)value);
+            }
+          }
+        }
+        else
+        {
+          Page.StopCheckingCanAddMedia();
+        }
+      </Script>
+
+      <Script>
+        if ([Page.CanAddMedia] &amp;&amp; Target.Dragging)
+          Target.AllowedDropActions = DropAction.Copy;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Target.Dropped)]
+
+        Object value = Target.GetValue();
+        
+
+        if (value is List)
+        {
+          Page.AddMedia((List)value);
+        }
+        else
+        {
+          
+        }
+      </Script>
+      
+      <Script>
+        bool showEmpty = [Page.IsEmpty] &amp;&amp; 
+                          Page.EmptyUI != null &amp;&amp;
+                          !Page.ShowDeviceContents;
+        
+        if (showEmpty)
+        {
+          EmptyPage.Visible = true;
+          
+          
+          
+          LibraryContent.Alpha = 0.0;
+          Splitter.InputEnabled = false;
+          ViewPivots.InputEnabled = false;
+          EmptyPage.RequestSource(Page.EmptyUI);
+        }
+        else
+        {
+          EmptyPage.Visible = false;
+          LibraryContent.Alpha = 1.0;
+          Splitter.InputEnabled = true;
+          ViewPivots.InputEnabled = true;
+        }
+      </Script>
+
+    </Scripts>
+
+    <Content>
+      
+      <Panel MouseInteractive="true">
+        <Children>
+          
+          <me:EmptyPageBase Name="EmptyPage" Visible="false" Page="{Page}"/>
+                    
+          
+          <Panel Name="LibraryContent" Layout="Dock" Padding="0,15,0,25" >
+            <Children>
+
+              
+              <core:FilterList Name="ViewPivots" Margins="0,-40,0,30" Style="{styles:SharedStyles.LibraryPivot}">
+                <LayoutInput>
+                  <DockLayoutInput Position="Top" Alignment="Far"/>
+                </LayoutInput>
+              </core:FilterList>
+                 
+              <core:Splitter Name="Splitter" FocusOrder="0" Page="{Page}">
+                <LayoutInput>
+                  <DockLayoutInput Position="Left"/>
+                </LayoutInput>
+              </core:Splitter>
+              
+            </Children>
+          </Panel>
+          
+        </Children>
+      </Panel>
+     
+    </Content>
+  </UI>
+
+  
+  
+  
+  
+  <UI Name="Column">
+    <Properties>
+      <zune:LibraryPanel Name="Model" LibraryPanel="$Required"/>
+      <zune:ZunePage Name="Page" ZunePage="$Required"/>
+      <Boolean Name="SupportsJumpInList" Boolean="false"/>
+
+      <Int32 Name="MinimumWidth" Int32="150"/>
+      <Single Name="MinimumPercent" Single="0.1"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+        Model.MinimumWidth = [MinimumWidth];
+        Model.MinimumPercent = [MinimumPercent];
+      </Script>
+    </Scripts>
+  </UI>
+  
+  
+  <Class Name="Globals" Shared="true">
+    <Properties>
+      <Dictionary Name="PagePositions">
+        <Source>
+          
+          <core:SplitterPositions Name="MusicBrowseView" SaveKeyPrefix="MusicBrowseView">
+            <DefaultPositions>
+              
+              <Single Single="0.15"/> 
+              
+              <Single Single="0.57"/>
+              
+            </DefaultPositions>
+          </core:SplitterPositions>
+          
+          <core:SplitterPositions Name="MusicSyncRulesArtist" SaveKeyPrefix="MusicSyncRulesArtist">
+            <DefaultPositions>
+              
+              <Single Single="0.25"/>
+              
+              <Single Single="0.50"/> 
+              
+              <Single Single="0.75"/>
+              
+            </DefaultPositions>
+          </core:SplitterPositions>
+          
+          <core:SplitterPositions Name="MusicSyncRulesAlbum" SaveKeyPrefix="MusicSyncRulesAlbum">
+            <DefaultPositions>
+              
+              <Single Single="0.33"/>
+              
+              <Single Single="0.66"/> 
+              
+            </DefaultPositions>
+          </core:SplitterPositions>
+          
+          <core:SplitterPositions Name="MusicSyncRulesTrack" SaveKeyPrefix="MusicSyncRulesTrack">
+            <DefaultPositions>
+              
+              <Single Single="0.5"/>
+              
+            </DefaultPositions>
+          </core:SplitterPositions>
+          
+          <core:SplitterPositions Name="MusicSyncRulesConnect" SaveKeyPrefix="MusicSyncRulesConnect">
+            <DefaultPositions>
+              
+              <Single Single="0.5"/>
+              
+            </DefaultPositions>
+          </core:SplitterPositions>
+          
+          
+          <core:SplitterPositions Name="PhotoSyncRules" SaveKeyPrefix="PhotoSyncRules">
+            <DefaultPositions>
+              
+              <Single Single="0.0"/>
+              
+            </DefaultPositions>
+          </core:SplitterPositions>
+          
+          
+          <core:SplitterPositions Name="Playlist" SaveKeyPrefix="Playlist">
+            <DefaultPositions>
+              
+              <Single Single="0.1"/>
+              
+            </DefaultPositions>
+          </core:SplitterPositions>
+          
+          
+          <core:SplitterPositions Name="Podcast" SaveKeyPrefix="Podcast">
+            <DefaultPositions>
+              
+              <Single Single="0.18"/>
+              
+              <Single Single=".95"/>
+              
+            </DefaultPositions>
+          </core:SplitterPositions>
+          
+          <core:SplitterPositions Name="PodcastSyncAll" SaveKeyPrefix="PodcastSyncAll">
+            <DefaultPositions>
+              
+              <Single Single="0.18"/>
+              
+            </DefaultPositions>
+          </core:SplitterPositions>
+          
+          <core:SplitterPositions Name="PodcastSyncRulesSeries" SaveKeyPrefix="PodcastSyncRulesSeries">
+            <DefaultPositions>
+              
+              <Single Single="0.1"/>
+              
+              <Single Single="0.29"/>
+              
+            </DefaultPositions>
+          </core:SplitterPositions>
+          
+          <core:SplitterPositions Name="PodcastSyncRulesEpisodes" SaveKeyPrefix="PodcastSyncRulesEpisodes">
+            <DefaultPositions>
+              
+              <Single Single="0.1"/>
+              
+            </DefaultPositions>
+          </core:SplitterPositions>
+         
+          
+          <core:SplitterPositions Name="Inbox" SaveKeyPrefix="Inbox">
+            <DefaultPositions>
+              
+              <Single Single="0.618"/> 
+              
+            </DefaultPositions>
+          </core:SplitterPositions>
+        
+        </Source>
+      </Dictionary>
+    </Properties>
+  </Class>
+  
+  
+  
+  
+  
+  <UI Name="EmptyPageBase">
+    <Properties>
+      <zune:ZunePage Name="Page" ZunePage="{null}"/>
+    </Properties>
+  </UI>
+  
+  
+  
+  
+  <UI Name="EmptyPage" Base="me:EmptyPageBase">
+    <Properties>
+      <String Name="Title" String=""/>
+      <String Name="Description" String=""/>
+      
+      <iris:Command Name="Link1Command" Command="{null}"/>
+      <iris:Command Name="Link2Command" Command="{null}"/>
+      
+      <style:Style  Name="TitleStyle"  Style="{styles:SharedStyles.EmptyCollectionText}"/>
+      <style:Style  Name="DescriptionStyle"  Style="{styles:SharedStyles.InboxPrompt}"/>
+    </Properties>
+    
+    <Content>
+      <Panel Layout="VerticalFlow" Margins="0,40,0,0">
+        <Children>
+
+          <core:Label Name="TitleLabel" Content="{Title}" Style="{TitleStyle}" WordWrap="true"/>
+          
+          <core:Label Name="DescriptionLabel" Content="{Description}" Style="{DescriptionStyle}" 
+                      WordWrap="true" Visible="{!String.IsNullOrEmpty(Description)}"
+                      Margins="3,5,0,5" MaximumSize="600,0"/>
+
+          <linkButtons:MoreLink Name="Link1"
+                                Model="{Link1Command}" 
+                                Visible="{Link1Command != null}"
+                                Margins="3,0,0,-7"/>
+
+          <linkButtons:MoreLink Name="Link2" 
+                                Model="{Link2Command}" 
+                                Visible="{Link2Command != null}"
+                                Margins="3,0,0,0"/>
+
+        </Children>
+      </Panel>
+
+    </Content>
+  </UI>
+  
+  
+  
+  
+  
+  <UI Name="EmptyLibraryPage" Base="me:EmptyPage">
+    <Properties>
+      <String Name="MarketplaceDestination" String=""/>
+    </Properties>
+    <Scripts>
+      <Script>
+        [DeclareTrigger(Link1Command.Invoked)]
+
+        zune:Shell.SettingsFrame.Settings.Invoke();
+      </Script>
+      
+      <Script>
+        [DeclareTrigger(Link2Command.Invoked)]
+
+        zune:Shell.DefaultInstance.Execute(MarketplaceDestination, null);
+      </Script>
+    </Scripts>
+  </UI>
+  
+  
+  
+  
+  <UI Name="EmptyMusicPage" Base="me:EmptyLibraryPage">
+    <Properties>
+      <String Name="Title" String="{zune:Shell.LoadString(zune:StringId.IDS_MUSIC_EMPTY)}"/>
+      <iris:Command Name="Link1Command" Description="{zune:Shell.LoadString(zune:StringId.IDS_MUSIC_EMPTY_SETTINGS_LINK)}"/>
+      <iris:Command Name="Link2Command" Description="{zune:Shell.LoadString(zune:StringId.IDS_MUSIC_EMPTY_MARKETPLACE_LINK)}"/>
+      <String Name="MarketplaceDestination" String="Marketplace\Music\Home"/>
+    </Properties>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/LIBRARYCONTEXTMENU.UIX b/test/2.1/LIBRARYCONTEXTMENU.UIX
new file mode 100644
index 0000000..81bc90b
--- /dev/null
+++ b/test/2.1/LIBRARYCONTEXTMENU.UIX
@@ -0,0 +1,161 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX xmlns="http://schemas.microsoft.com/2007/uix"
+     xmlns:button="res://ZuneShellResources!Button.uix"
+     xmlns:core="res://ZuneShellResources!Controls.uix"
+     xmlns:iris="assembly://UIX/Microsoft.Iris"
+     xmlns:menu="res://ZuneShellResources!ContextMenu.uix"
+     xmlns:styles="res://ZuneShellResources!Styles.uix"   
+     xmlns:tpc="res://ZuneShellResources!TracksPanelColumns.uix" 
+     xmlns:zune="assembly://ZuneShell/ZuneUI"   
+     xmlns:me="Me">
+
+
+  
+
+
+  <Class Name="LibraryContextMenu" Base="core:ContextMenu">
+    <Properties>
+      <String Name="PopupUI" String="res://ZuneShellResources!LibraryContextMenu.uix#LibraryContextMenuUI"/>
+    </Properties>
+  </Class>
+
+  
+
+
+  <UI Name="LibraryContextMenuUI" Base="menu:ContextMenuUI">
+    <Locals>
+      <TypeSelector Name="RateSelector" ContentName="RateItemContent" Type="{typeof(me:RateCommand)}"/>
+    </Locals>
+
+    <Scripts>
+      
+      <Script>
+        Repeater.ContentSelectors.Add(RateSelector);
+      </Script>
+    </Scripts>
+
+    <Content Name="RateItemContent">
+      <me:RateMenuItemUI
+        Model="{(me:RateCommand)RepeatedItem}"
+        ContextMenu="{Popup}"
+        SharedSize="{SharedSize}"
+        SharedSizePolicy="SharesWidth,ContributesToWidth"
+        MinimumSize="30,20"
+        Visible="{!((me:RateCommand)RepeatedItem).Command.Hidden}">
+      </me:RateMenuItemUI>
+    </Content>
+  </UI>
+
+
+  
+
+  
+  <UI Name="RateMenuItemUI" Base="menu:ContextMenuItemBase">
+    <Properties>
+      <me:RateCommand Name="Model" RateCommand="$Required"/>
+      <button:CommandButtonProvider Name="Provider" />
+    </Properties>
+
+    <Locals>
+      <iris:Command Name="Unrated" Available="{Model.Command.Available}"/>
+      <iris:Command Name="LoveIt"  Available="{Model.Command.Available}"/>
+      <iris:Command Name="HateIt"  Available="{Model.Command.Available}"/>
+
+      <iris:Command Name="GoByeBye" />
+    </Locals>
+
+    <Scripts>
+
+      
+      
+      <Script>        
+        UI.KeyFocusOnMouseEnter = false;
+        Provider.Model = Model.Command;
+      </Script>
+
+      
+      
+      <Script>
+        [DeclareTrigger(GoByeBye.Invoked)]
+        Model.Command.Invoke();
+        ContextMenu.Helper.Hide();        
+      </Script>
+
+      
+      
+      <Script>
+        [DeclareTrigger(Unrated.Invoked)]
+        Model.Rating = tpc:RatingConstants.Unrated;
+        GoByeBye.Invoke();
+      </Script>
+
+      <Script>
+        [DeclareTrigger(LoveIt.Invoked)]
+        Model.Rating = tpc:RatingConstants.LoveIt;
+        GoByeBye.Invoke();
+      </Script>
+
+      <Script>
+        [DeclareTrigger(HateIt.Invoked)]
+        Model.Rating = tpc:RatingConstants.HateIt;
+        GoByeBye.Invoke();
+      </Script>
+             
+    </Scripts>
+    
+    <Content>
+      
+      <ColorFill Name="Background"
+        MinimumSize="{TileMinSize}" 
+        MaximumSize="{TileMaxSize}"
+        Navigation="Row,PreferFocusOrder"
+        Padding="10,2,10,2">
+      <Layout>
+        <DockLayout SizeToChildren="true" DefaultLayoutInput="Left,Near"/>
+      </Layout>
+        <Children>
+          
+          
+          <button:Label Name="Label" 
+            Style="{Style}" 
+            NamedStyles="{NamedStyles}" 
+            ShowToolTipWhenClipped="{ShowToolTipWhenClipped}">
+          </button:Label>
+  
+          <core:IconButton Model="{Unrated}"
+            Margins="10,2,0,0" 
+            Image="{styles:Styles.RatingNotRated}"
+            HoverImage="{styles:Styles.RatingNotRatedHover}"
+            PressedImage="{styles:Styles.RatingNotRatedPressed}"
+            KeyInteractiveNStuff="true"
+            FocusOrder="0"/>
+          
+          <core:IconButton Model="{LoveIt}"
+            Margins="0,2,0,0" 
+            Image="{styles:Styles.RatingLikeIt}"
+            HoverImage="{styles:Styles.RatingLikeItHover}"
+            PressedImage="{styles:Styles.RatingLikeItPressed}"          
+            KeyInteractiveNStuff="true"/>
+          
+          <core:IconButton Model="{HateIt}"
+            Margins="0,2,0,0" 
+            Image="{styles:Styles.RatingHateIt}"
+            HoverImage="{styles:Styles.RatingHateItHover}"
+            PressedImage="{styles:Styles.RatingHateItPressed}"               
+            KeyInteractiveNStuff="true"/>
+
+        </Children>
+      </ColorFill>
+    </Content>
+  </UI>
+
+  
+
+  
+  <Class Name="RateCommand">
+    <Properties>
+      <zune:MenuItemCommand Name="Command" Description="{zune:Shell.LoadString(zune:StringId.IDS_LIBRARY_RATE_MENU_ITEM)}"/>
+      <int Name="Rating"/>
+    </Properties>
+  </Class>
+</UIX>
diff --git a/test/2.1/LIBRARYDIALOGS.UIX b/test/2.1/LIBRARYDIALOGS.UIX
new file mode 100644
index 0000000..8bb45df
--- /dev/null
+++ b/test/2.1/LIBRARYDIALOGS.UIX
@@ -0,0 +1,1003 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX 
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris" 
+  xmlns:zune="assembly://ZuneShell/ZuneUI" 
+  xmlns:zuneshell="assembly://ZuneShell/Microsoft.Zune.Shell"
+  xmlns:svc="assembly://ZuneDBApi/Microsoft.Zune.Service"
+  xmlns:data="res://ZuneShellResources!LibraryData.schema.xml"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:style="res://ZuneShellResources!Style.uix"
+  xmlns:dialog="res://ZuneShellResources!Dialog.uix"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:spreadsheet="res://ZuneShellResources!SpreadSheetViewBase.uix"
+  xmlns:tpc="res://ZuneShellResources!TracksPanelColumns.uix"
+  xmlns:epc="res://ZuneShellResources!PodcastEpisodesColumns.uix"
+  xmlns:me="Me"
+  >
+
+  
+  
+  
+  
+  
+
+  
+  
+  
+  <Class Name="DeleteDialog" Base="dialog:Dialog">
+    <Properties>
+      
+      <List Name="ItemsToDelete" List="{null}"/>
+      
+      <String Name="ContentUI" String="res://ZuneShellResources!LibraryDialogs.uix#DeleteDialogContentUI"/>
+      <iris:BooleanChoice Name="DeleteFromComputer"/>
+      <iris:BooleanChoice Name="Remember" Description="{zune:Shell.LoadString(zune:StringId.IDS_DONT_SHOW_THIS_MESSAGE_AGAIN)}"/>
+      <iris:Command Name="Delete" Description="{zune:Shell.LoadString(zune:StringId.IDS_DIALOG_OK)}"/>
+      <String Name="AccessibleDescription" String="{zune:Shell.LoadString(zune:StringId.IDS_LIBRARY_DELETE_MENU_ITEM)}"/>
+    </Properties>
+
+    <Scripts>
+      
+      
+      <Script>
+        [DeclareTrigger(Helper.IsVisible)]
+        if (Helper.IsVisible)
+        {
+          if (!List.IsNullOrEmpty(ItemsToDelete) &amp;&amp; ItemsToDelete.GetItem(0) is data:Playlist)
+          {
+            DeleteFromComputer.Options = me:Strings.PlaylistDeleteOptions;
+          }
+          else
+          {
+            DeleteFromComputer.Options = me:Strings.LibraryDeleteOptions;
+          }
+          
+          int deleteChoice = zune:Management.Instance.LibraryDefaultDeleteChoice; 
+          if (deleteChoice != 0)
+          {
+            DeleteFromComputer.Value = (deleteChoice == 2);
+            
+            
+            Delete.Invoke();
+          }
+        }
+        else
+        {
+          
+          DeleteFromComputer.ChosenIndex = 0;
+          Remember.Value = false;
+          ItemsToDelete = null;
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(Delete.Invoked)]
+
+        zune:Shell.DeleteMedia(ItemsToDelete, DeleteFromComputer.Value);
+        
+        if (Remember.Value)
+        {
+          
+          
+          zune:Management.Instance.LibraryDefaultDeleteChoice = DeleteFromComputer.ChosenIndex + 1;
+        }
+
+        
+        Helper.Hide();
+      </Script>
+    </Scripts>
+  </Class>
+
+  <Class Name="Strings" Shared="true">
+    <Properties>
+      <List Name="LibraryDeleteOptions">
+        <Source>
+          <String String="{zune:Shell.LoadString(zune:StringId.IDS_LIBRARY_DELETE_FROMLIBRARY)}"/>
+          <String String="{zune:Shell.LoadString(zune:StringId.IDS_LIBRARY_DELETE_FROMLIBRARYANDPC)}"/>
+        </Source>
+      </List>
+
+      <List Name="PlaylistDeleteOptions">
+        <Source>
+          <String String="{zune:Shell.LoadString(zune:StringId.IDS_PLAYLIST_DELETE_FROMLIBRARY)}"/>
+          <String String="{zune:Shell.LoadString(zune:StringId.IDS_PLAYLIST_DELETE_FROMLIBRARYANDPC)}"/>
+        </Source>
+      </List>
+    </Properties>
+  </Class>
+  
+
+  
+  
+  
+  <UI Name="DeleteDialogContentUI" Base="dialog:DialogContentUI">
+    <Properties>
+      <me:DeleteDialog Name="Dialog" DeleteDialog="$Required"/>      
+    </Properties>
+
+    <Scripts>
+      <Script>
+        if (Dialog.ItemsToDelete.Count == 1)
+        {
+          object selectedItem = Dialog.ItemsToDelete.GetItem(0);
+          string title = ((data:Media)selectedItem).Title;
+          
+          QuestionText.Content = ((String)zune:Shell.LoadString(zune:StringId.IDS_LIBRARY_QUESTION_1_ITEM)).Format(title);
+        }
+        else
+        {
+          QuestionText.Content = ((String)zune:Shell.LoadString(zune:StringId.IDS_LIBRARY_QUESTION_N_ITEMS)).Format(Dialog.ItemsToDelete.Count);
+        }
+      </Script>
+    </Scripts>
+    
+    <Content>
+      <Panel Navigation="ContainAll,WrapAll" MaximumSize="400,0" Margins="10">
+        <Layout>
+          <FlowLayout ItemAlignment="Near" Orientation="Vertical"/>
+        </Layout>
+        <Children>
+
+          <core:Label Name="TitleText" Style="{styles:SharedStyles.DialogLargeHeaderStyle}" Content="{zune:Shell.LoadString(zune:StringId.IDS_COLLECTION_DELETE_TITLE)}"/>
+          
+          <core:Label Name="QuestionText" WordWrap="true" Style="{styles:SharedStyles.DialogTextStyle}"/>
+          
+          <core:RadioGroup Model="{Dialog.DeleteFromComputer}" Margins="0,10,0,0"/>
+
+          <core:CheckBox Model="{Dialog.Remember}" Margins="0,20,0,0" LabelFont="{styles:Styles.DialogText}"/>
+          
+          <Panel Margins="0,10,0,0">
+            <Layout>
+              <DockLayout SizeToChildren="true" DefaultLayoutInput="Right,Near"/>
+            </Layout>
+            <Children>
+              
+              <core:BigActionButton Model="{Dialog.Cancel}" FocusOrder="0"/>
+              <core:BigActionButton Model="{Dialog.Delete}" Margins="0,0,10,0" />
+
+            </Children>
+          </Panel>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+
+  
+  
+  
+  <Class Name="PropertiesDialog" Base="dialog:Dialog">
+    <Properties>
+      
+      <Int32 Name="LibraryId" Int32="-1"/>
+      <zune:MediaType Name="ItemType"/>
+      
+      <String Name="ContentUI" String="res://ZuneShellResources!LibraryDialogs.uix#PropertiesDialogContentUI"/>
+      <iris:Command Name="Cancel" Description="{zune:Shell.LoadString(zune:StringId.IDS_DIALOG_OK)}"/> 
+
+      <String Name="AccessibleDescription" String="{zune:Shell.LoadString(zune:StringId.IDS_LIBRARY_PROPERTIES_MENU_ITEM)}"/>
+    </Properties>
+
+    <Scripts>
+      
+      <Script>
+        [DeclareTrigger(Helper.IsVisible)]
+        if (Helper.IsVisible)
+        {
+          
+          
+          
+          if (LibraryId &lt; 0)
+          {
+            Helper.Hide();
+          }
+        }
+        else
+        {
+          LibraryId = -1;
+          ItemType = zune:MediaType.Undefined;
+        }
+      </Script>
+    </Scripts>
+  </Class>
+  
+
+  
+  
+  
+  <UI Name="PropertiesDialogContentUI" Base="dialog:DialogContentUI">
+    <Properties>
+      <me:PropertiesDialog Name="Dialog" PropertiesDialog="$Required"/> 
+    </Properties>
+
+    <Locals>
+      <Object Name="Item" Object="{null}"/>
+      <String Name="ItemTitle"/>
+      <SharedSize Name="LabelSharedSize"/>
+    </Locals>
+
+    <Scripts>
+      
+      <Script>
+        if (Dialog.LibraryId != -1)
+        {
+          if (Dialog.ItemType == zune:MediaType.Track)
+          {
+            data:Track track = new data:Track();
+
+            zune:TrackDetails.Populate(track, Dialog.LibraryId);
+            
+            Item = track;
+            ItemTitle = track.Title;
+            
+            Repeater.Source = me:MediaProperties.Audio;
+          }
+          else if (Dialog.ItemType == zune:MediaType.Photo)
+          {
+            data:Photo photo = new data:Photo();
+
+            zune:PhotoDetails.Populate(photo, Dialog.LibraryId);
+            
+            Item = photo;
+            ItemTitle = photo.Title;
+            
+            Repeater.Source = me:MediaProperties.Photo;
+          }
+          else if (Dialog.ItemType == zune:MediaType.Video)
+          {
+            data:Video video = new data:Video();
+
+            zune:VideoDetails.Populate(video, Dialog.LibraryId);
+            
+            Item = video;
+            ItemTitle = video.Title;
+
+            Repeater.Source = me:MediaProperties.Video;
+          }
+          else if (Dialog.ItemType == zune:MediaType.PodcastEpisode)
+          {
+            data:PodcastEpisode episode = new data:PodcastEpisode();
+            
+            zune:PodcastEpisodeDetails.Populate(episode, Dialog.LibraryId);
+            
+            Item = episode;
+            ItemTitle = episode.Title;
+            
+            Repeater.Source = me:MediaProperties.PodcastEpisode;
+          }
+        }
+        
+        DialogTitleLabel.Content = ItemTitle;
+      </Script>
+    </Scripts>
+    
+    <Content>
+      <Panel Navigation="ContainAll,WrapAll" MaximumSize="500,0" Margins="10" Layout="Anchor">
+        <Children>
+          <Panel Name="Body">
+            <LayoutInput>
+              <AnchorLayoutInput Top="Parent,0" Left="Parent,0"/>
+            </LayoutInput>
+            <Layout>
+              <FlowLayout ItemAlignment="Near" Orientation="Vertical"/>
+            </Layout>
+            <Children>
+
+              <core:Label Name="DialogTitleLabel"
+                          Style="{styles:SharedStyles.DialogLargeHeaderStyle}"
+                          WordWrap="true" Alignment="Center"/>
+
+              <Repeater Name="Repeater" Layout="VerticalFlow" MinimumSize="200,0">
+                <Content>
+
+                  <Panel Layout="HorizontalFlow" Margins="0,5,0,0">
+                    <Children>
+
+                      <core:Label Style="{styles:SharedStyles.DialogTextStyle}"
+                                  Content="{((me:MediaProperty)RepeatedItem).Property}"
+                                  MinimumSize="100,0" SharedSize="{LabelSharedSize}"/>
+
+                      <spreadsheet:Cell Cell="{((me:MediaProperty)RepeatedItem).UI}"
+                        Style="{styles:SharedStyles.DialogTextStyle}" ListModel="{null}" Model="{Item}"/>
+
+                    </Children>
+                  </Panel>
+
+                </Content>
+              </Repeater>
+
+
+            </Children>
+          </Panel>
+
+          <core:BigActionButton Model="{Dialog.Cancel}" Margins="0,10,10,0" FocusOrder="0">
+            <LayoutInput>
+              <AnchorLayoutInput Top="Body,1" Right="Parent,1"/>
+            </LayoutInput>
+          </core:BigActionButton>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  <Class Name="MediaProperty">
+    <Properties>
+      <String Name="Property" String="{null}"/>
+      <Type Name="UI" Type="{null}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="MediaProperties" Shared="True">
+    <Properties>
+      <List Name="Audio">
+        <Source>
+          <me:MediaProperty Property="{zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_LENGTH)}" UI="{typeof(tpc:LengthCell)}"/>
+          <me:MediaProperty Property="{zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_BITRATE)}" UI="{typeof(me:TrackBitrateCell)}"/>
+          <me:MediaProperty Property="{zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_MEDIATYPE)}" UI="{typeof(me:TrackMediaTypeCell)}"/>
+          <me:MediaProperty Property="{zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_LOCATION)}" UI="{typeof(me:TrackLocationCell)}"/>
+          <me:MediaProperty Property="{zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_ARTIST)}" UI="{typeof(tpc:ArtistCell)}"/>
+          <me:MediaProperty Property="{zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_ALBUM)}" UI="{typeof(tpc:AlbumCell)}"/>
+          <me:MediaProperty Property="{zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_COMPOSER)}" UI="{typeof(tpc:ComposerCell)}"/>
+          <me:MediaProperty Property="{zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_GENRE)}" UI="{typeof(tpc:GenreCell)}"/>
+          <me:MediaProperty Property="{zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_FILENAME)}" UI="{typeof(me:TrackFileNameCell)}"/>
+          <me:MediaProperty Property="{zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_MEDIARIGHTS)}" UI="{typeof(me:TrackDRMInfoCell)}"/>
+        </Source>
+      </List>
+
+      <List Name="Photo">
+        <Source>
+          <me:MediaProperty Property="{zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_MEDIATYPE)}" UI="{typeof(me:PhotoMediaTypeCell)}"/>
+          <me:MediaProperty Property="{zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_LOCATION)}" UI="{typeof(me:PhotoLocationCell)}"/>
+          <me:MediaProperty Property="{zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_FILENAME)}" UI="{typeof(me:PhotoFileNameCell)}"/>
+          <me:MediaProperty Property="{zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_DIMENSIONS)}" UI="{typeof(me:PhotoDimensionsCell)}"/>
+        </Source>
+      </List>
+
+      <List Name="Video">
+        <Source>
+          <me:MediaProperty Property="{zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_LENGTH)}" UI="{typeof(me:VideoLengthCell)}"/>
+          <me:MediaProperty Property="{zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_BITRATE)}" UI="{typeof(me:VideoBitrateCell)}"/>
+          <me:MediaProperty Property="{zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_MEDIATYPE)}" UI="{typeof(me:VideoMediaTypeCell)}"/>
+          <me:MediaProperty Property="{zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_LOCATION)}" UI="{typeof(me:VideoLocationCell)}"/>
+          <me:MediaProperty Property="{zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_ARTIST)}" UI="{typeof(me:VideoArtistCell)}"/>
+          <me:MediaProperty Property="{zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_RESOLUTION)}" UI="{typeof(me:VideoResolutionCell)}"/>
+          <me:MediaProperty Property="{zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_FILENAME)}" UI="{typeof(me:VideoFileNameCell)}"/>
+          <me:MediaProperty Property="{zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_FILESIZE)}" UI="{typeof(me:VideoFileSizeCell)}"/>
+        </Source>
+      </List>
+
+      <List Name="PodcastEpisode">
+        <Source>
+          <me:MediaProperty Property="{zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_SERIES_TITLE)}" UI="{typeof(me:EpisodeSeriesTitleCell)}"/>
+          <me:MediaProperty Property="{zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_SERIES_URL)}" UI="{typeof(me:EpisodeSeriesUrlCell)}"/>
+          <me:MediaProperty Property="{zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_ARTIST)}" UI="{typeof(me:EpisodeAuthorCell)}"/>
+          <me:MediaProperty Property="{zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_PUBLISHED_DATE)}" UI="{typeof(me:EpisodeDateCell)}"/>
+          <me:MediaProperty Property="{zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_LENGTH)}" UI="{typeof(epc:LengthCell)}"/>
+          <me:MediaProperty Property="{zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_MEDIATYPE)}" UI="{typeof(me:EpisodeMediaTypeCell)}"/>
+          <me:MediaProperty Property="{zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_BITRATE)}" UI="{typeof(me:EpisodeBitrateCell)}"/>
+          <me:MediaProperty Property="{zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_EPISODE_URL)}" UI="{typeof(me:EpisodeUrlCell)}"/>
+          <me:MediaProperty Property="{zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_LOCATION)}" UI="{typeof(me:EpisodeLocationCell)}"/>
+          <me:MediaProperty Property="{zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_FILENAME)}" UI="{typeof(me:EpisodeFileNameCell)}"/>
+          <me:MediaProperty Property="{zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_FILESIZE)}" UI="{typeof(me:EpisodeFileSizeCell)}"/>
+        </Source>
+      </List>
+    </Properties>
+  </Class>
+  
+  <UI Name="TrackLocationCell" Base="me:FileLinkCell">
+    <Properties>
+      <data:Track Name="Model" Track="$Required"/>
+      <Boolean Name="WordWrap" Boolean="true"/>
+    </Properties>
+    <Scripts>
+      <Script>Content = Model.FolderName;</Script>
+      <Script>FilePath = Model.FilePath;</Script>
+    </Scripts>
+  </UI>  
+
+  <UI Name="TrackBitrateCell" Base="spreadsheet:LabelCell">
+    <Scripts>
+      <Script>
+        string format = zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_BITRATE_FORMAT);
+        Content = format.Format(((data:Track)Model).Bitrate / 1000);
+      </Script>
+    </Scripts>
+  </UI>  
+
+  <UI Name="TrackFileNameCell" Base="spreadsheet:LabelCell">
+    <Scripts>
+      <Script>Content = ((data:Track)Model).FileName;</Script>
+    </Scripts>
+  </UI>
+
+  <UI Name="TrackDRMInfoCell" Base="spreadsheet:LabelCell">
+    <Scripts>
+      <Script>
+        string fileName = ((data:Track)Model).FilePath;
+        if (!String.IsNullOrEmpty(fileName))
+        {
+          svc:DRMInfo drmInfo = zuneshell:ZuneApplication.Service.GetFileDRMInfo(fileName);
+          if (drmInfo != null)
+          {
+            if (drmInfo.ValidLicense)
+            {
+              string syncRights;
+              if (drmInfo.CanSync)
+              {
+                syncRights = zune:Shell.LoadString(zune:StringId.IDS_DRM_HAS_SYNC_RIGHTS);
+              } 
+              else
+              {
+                syncRights = zune:Shell.LoadString(zune:StringId.IDS_DRM_NO_SYNC_RIGHTS);
+              }
+
+              string burnRights;
+              if (drmInfo.CanBurn)
+              {
+                burnRights = zune:Shell.LoadString(zune:StringId.IDS_DRM_HAS_BURN_RIGHTS);
+              }
+              else
+              {
+                burnRights = zune:Shell.LoadString(zune:StringId.IDS_DRM_NO_BURN_RIGHTS);
+              }
+
+              if (drmInfo.HasExpiryDate)
+              {
+                string format = zune:Shell.LoadString(zune:StringId.IDS_DRM_SUBSCRIPTION_LICENSE_DESC);
+                Content = format.Format(drmInfo.ExpiryDate.ToShortDateString(), syncRights, burnRights);
+              }
+              else
+              {
+                string format = zune:Shell.LoadString(zune:StringId.IDS_DRM_PERMANENT_LICENSE_DESC);
+                Content = format.Format(syncRights, burnRights);
+              }   
+            }
+            else if (drmInfo.NoLicense) 
+            {
+              Content = zune:Shell.LoadString(zune:StringId.IDS_DRM_NO_LICENSE_DESC);        
+            }
+            else if (drmInfo.LicenseExpired)
+            { 
+              Content = zune:Shell.LoadString(zune:StringId.IDS_DRM_LICENSE_EXPIRED_DESC);         
+            }
+          }
+          else
+          {         
+            Content = zune:Shell.LoadString(zune:StringId.IDS_PROTECTED_NO);        
+          }
+        }
+        else
+        {
+          Content = zune:Shell.LoadString(zune:StringId.IDS_DRM_UNKNOWN);        
+        } 
+      </Script>
+    </Scripts>
+  </UI>
+
+  <UI Name="TrackMediaTypeCell" Base="spreadsheet:LabelCell">
+    <Scripts>
+      <Script>Content = ((data:Track)Model).MediaType;</Script>
+    </Scripts>
+  </UI>
+
+  <UI Name="PhotoLocationCell" Base="me:FileLinkCell">
+    <Properties>
+      <data:Photo Name="Model" Photo="$Required"/>
+      <Boolean Name="WordWrap" Boolean="true"/>
+    </Properties>
+    <Scripts>
+      <Script>Content = Model.FolderName;</Script>
+      <Script>FilePath = Model.ImagePath;</Script>
+    </Scripts>
+  </UI>  
+
+  <UI Name="PhotoFileNameCell" Base="spreadsheet:LabelCell">
+    <Scripts>
+      <Script>Content = ((data:Photo)Model).FileName;</Script>
+    </Scripts>
+  </UI>
+
+  <UI Name="PhotoDimensionsCell" Base="spreadsheet:LabelCell">
+    <Scripts>
+      <Script>
+        string format = zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_DIMENSIONS_FORMAT);
+        Content = format.Format(((data:Photo)Model).Width, ((data:Photo)Model).Height);
+      </Script>
+    </Scripts>
+  </UI>
+
+  <UI Name="PhotoMediaTypeCell" Base="spreadsheet:LabelCell">
+    <Scripts>
+      <Script>Content = ((data:Photo)Model).MediaType;</Script>
+    </Scripts>
+  </UI>
+
+  <UI Name="VideoLocationCell" Base="me:FileLinkCell">
+    <Properties>
+      <data:Video Name="Model" Video="$Required"/>
+      <Boolean Name="WordWrap" Boolean="true"/>
+    </Properties>
+    <Scripts>
+      <Script>Content = Model.FolderName;</Script>
+      <Script>FilePath = Model.FilePath;</Script>
+    </Scripts>
+  </UI>
+  
+  <UI Name="VideoBitrateCell" Base="spreadsheet:LabelCell">
+    <Scripts>
+      <Script>
+        string format = zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_BITRATE_FORMAT);
+        Content = format.Format(((data:Video)Model).Bitrate / 1000);
+      </Script>
+    </Scripts>
+  </UI>
+  
+  <UI Name="VideoLengthCell" Base="spreadsheet:LengthCell">
+    <Scripts>
+      <Script>Length = ((data:Video)Model).Duration;</Script>
+    </Scripts>
+  </UI>
+  
+  <UI Name="VideoArtistCell" Base="spreadsheet:LabelCell">
+    <Scripts>
+      <Script>Content = ((data:Video)Model).ArtistName;</Script>
+    </Scripts>
+  </UI>
+  
+  <UI Name="VideoMediaTypeCell" Base="spreadsheet:LabelCell">
+    <Scripts>
+      <Script>Content = ((data:Video)Model).MediaType;</Script>
+    </Scripts>
+  </UI>
+  
+  <UI Name="VideoResolutionCell" Base="spreadsheet:LabelCell">
+    <Scripts>
+      <Script>
+        string format = zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_DIMENSIONS_FORMAT);
+        Content = format.Format(((data:Video)Model).Width, ((data:Video)Model).Height);
+      </Script>
+    </Scripts>
+  </UI>
+  
+  <UI Name="VideoFileNameCell" Base="spreadsheet:LabelCell">
+    <Scripts>
+      <Script>Content = ((data:Video)Model).FileName;</Script>
+    </Scripts>
+  </UI>
+
+  <UI Name="VideoFileSizeCell" Base="tpc:SizeCell">
+    <Properties>
+      <data:Video Name="Model" Video="$Required"/>
+      <Int64 Name="SizeData" Int64="{Model.FileSize}"/>
+    </Properties>
+  </UI>
+
+  <UI Name="FileLinkCell" Base="spreadsheet:LabelCell">
+    <Properties>
+      <String Name="FilePath"/>
+    </Properties>
+
+    <Locals>
+      <style:StatefulCompositeStyle Name="StyleState" Base="{styles:SharedStyles.ExternalLinkStyle}"/>
+    </Locals>
+    
+    <Input>
+      <ClickHandler Name="Clicker"/>
+    </Input>
+
+    <Scripts>
+      <Script>
+        Style = StyleState;
+      </Script>
+
+      
+      <Script>StyleState.State.Focused = [UI.DeepKeyFocus];</Script>
+      <Script>StyleState.State.Hovered = [UI.DeepMouseFocus];</Script>
+
+      <Script>
+        [DeclareTrigger(Clicker.Invoked)]
+        
+        zune:Shell.OpenFolderAndSelectItems(FilePath);
+      </Script>
+    </Scripts>
+  </UI>
+  
+  
+  <UI Name="EpisodeSeriesTitleCell" Base="spreadsheet:LabelCell">
+    <Properties>
+      <data:PodcastEpisode Name="Model" PodcastEpisode="$Required"/>
+    </Properties>
+    <Scripts>
+      <Script>Content = Model.SeriesTitle;</Script>
+    </Scripts>
+  </UI>
+
+  <UI Name="EpisodeSeriesUrlCell" Base="spreadsheet:LabelCell">
+    <Properties>
+      <data:PodcastEpisode Name="Model" PodcastEpisode="$Required"/>
+    </Properties>
+    <Scripts>
+      <Script>Content = Model.SeriesFeedUrl;</Script>
+    </Scripts>
+  </UI>
+
+  <UI Name="EpisodeAuthorCell" Base="spreadsheet:LabelCell">
+    <Properties>
+      <data:PodcastEpisode Name="Model" PodcastEpisode="$Required"/>
+    </Properties>
+    <Scripts>
+      <Script>Content = Model.Author;</Script>
+    </Scripts>
+  </UI>
+
+  <UI Name="EpisodeDateCell" Base="spreadsheet:DateCell">
+    <Properties>
+      <data:PodcastEpisode Name="Model" PodcastEpisode="$Required"/>
+    </Properties>
+    <Scripts>
+      <Script>Date = Model.ReleaseDate;</Script>
+    </Scripts>
+  </UI>
+
+  <UI Name="EpisodeMediaTypeCell" Base="spreadsheet:LabelCell">
+    <Properties>
+      <data:PodcastEpisode Name="Model" PodcastEpisode="$Required"/>
+    </Properties>
+    <Scripts>
+      <Script>Content = Model.MediaType;</Script>
+    </Scripts>
+  </UI>
+
+  <UI Name="EpisodeLocationCell" Base="me:FileLinkCell">
+    <Properties>
+      <data:PodcastEpisode Name="Model" PodcastEpisode="$Required"/>
+      <Boolean Name="WordWrap" Boolean="true"/>
+    </Properties>
+    <Scripts>
+      <Script>Content = Model.FolderName;</Script>
+      <Script>FilePath = Model.SourceUrl;</Script>
+    </Scripts>
+  </UI>
+
+  <UI Name="EpisodeFileNameCell" Base="spreadsheet:LabelCell">
+    <Properties>
+      <data:PodcastEpisode Name="Model" PodcastEpisode="$Required"/>
+      <Boolean Name="WordWrap" Boolean="true"/>
+    </Properties>
+    <Scripts>
+      <Script>Content = Model.FileName;</Script>
+    </Scripts>
+  </UI>
+
+  <UI Name="EpisodeFileSizeCell" Base="tpc:SizeCell">
+    <Properties>
+      <data:PodcastEpisode Name="Model" PodcastEpisode="$Required"/>
+      <Int64 Name="SizeData" Int64="{Model.FileSize}"/>
+    </Properties>
+  </UI>
+
+  <UI Name="EpisodeUrlCell" Base="spreadsheet:LabelCell">
+    <Properties>
+      <data:PodcastEpisode Name="Model" PodcastEpisode="$Required"/>
+    </Properties>
+    <Scripts>
+      <Script>Content = Model.EnclosureUrl;</Script>
+    </Scripts>
+  </UI>
+
+  <UI Name="EpisodeBitrateCell" Base="spreadsheet:LabelCell">
+    <Properties>
+      <data:PodcastEpisode Name="Model" PodcastEpisode="$Required"/>
+    </Properties>
+    <Scripts>
+      <Script>
+        if ( Model.Bitrate > 0)
+        {
+          string format = zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_BITRATE_FORMAT);
+          Content = format.Format(Model.Bitrate / 1000);
+        }
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  
+  <Class Name="EditAlbumInfoDialog" Base="dialog:Dialog">
+    <Properties>
+      
+      <data:Album Name="Album" Album="{null}"/>
+      <List Name="Tracks" List="{null}"/>
+      
+      <String Name="ContentUI" String="res://ZuneShellResources!LibraryDialogs.uix#EditAlbumInfoContentUI"/>
+      <iris:Command Name="OK" Description="{zune:Shell.LoadString(zune:StringId.IDS_DIALOG_OK)}"/>
+
+      <String Name="AccessibleDescription" String="{zune:Shell.LoadString(zune:StringId.IDS_CD_EDIT_ALBUM_INFO_DIALOG_TITLE)}"/>
+
+      <me:AlbumInfo Name="AlbumInfo"/>
+    </Properties>
+
+    <Locals>
+      <String Name="UnknownString" String="{zune:Shell.LoadString(zune:StringId.IDS_TYPE_UNKNOWN)}"/>
+    </Locals>
+
+    <Scripts>
+      
+      <Script>
+        if ([Helper.IsVisible])
+        {
+          if (Album == null)
+          {
+            Helper.Hide();
+          }
+          else
+          {
+            AlbumInfo.Artist = Album.ArtistName;
+            AlbumInfo.Title  = Album.Title;
+            
+            if (List.IsNullOrEmpty(Tracks))
+            {
+              AlbumInfo.Genre  = UnknownString;
+            }
+            else
+            {
+              AlbumInfo.Genre = zune:TrackDetails.GetGenreHelper((data:Track)Tracks.GetItem(0));
+            }
+            
+            /*
+            int year = Album.ReleaseDate.Year;
+            if (year > 1)
+            {
+              AlbumInfo.ReleaseYear = Album.ReleaseDate.Year.ToString();
+            }
+            else
+            {
+              AlbumInfo.ReleaseYear = UnknownString;
+            }
+            */            
+          }
+        }
+        else
+        {
+          Album = null;
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(OK.Invoked)]
+        
+        Album.ArtistName = AlbumInfo.Artist;
+        Album.Title = AlbumInfo.Title;
+        
+        if (!String.IsNullOrEmpty(AlbumInfo.Genre) &amp;&amp; AlbumInfo.Genre != UnknownString)
+        {
+          if (Tracks != null)
+          {
+            foreach (data:Track track in Tracks)
+            {
+              zune:TrackDetails.SetGenreHelper(track, AlbumInfo.Genre);
+            }
+          }
+        }
+        
+        /*
+        sys:DateTime date = zune:TrackDetails.ParseYear(AlbumInfo.ReleaseYear);
+        if (date.Year > 1)
+        {
+          Album.ReleaseDate = date;
+        }
+        */
+        
+        Helper.Hide();
+      </Script>
+    </Scripts>
+  </Class>
+  
+
+  
+  
+  
+  <UI Name="EditAlbumInfoContentUI" Base="dialog:DialogContentUI">
+    <Properties>
+      <me:EditAlbumInfoDialog Name="Dialog" EditAlbumInfoDialog="$Required"/> 
+    </Properties>
+
+    <Locals>
+      <SharedSize Name="LabelSharedSize"/>
+    </Locals>
+
+    <Content>
+      <Panel Navigation="ContainAll,WrapAll" Margins="10" Layout="Anchor">
+        <Children>
+          
+          <Panel Name="Body">
+            <LayoutInput>
+              <AnchorLayoutInput Top="Parent,0" Left="Parent,0"/>
+            </LayoutInput>
+            <Layout>
+              <FlowLayout ItemAlignment="Near" Orientation="Vertical"/>
+            </Layout>
+            <Children>
+
+              <core:Label Name="DialogTitleLabel"
+                          Style="{styles:SharedStyles.DialogLargeHeaderStyle}"
+                          Content="{zune:Shell.LoadString(zune:StringId.IDS_CD_EDIT_ALBUM_INFO_DIALOG_TITLE)}" 
+                          WordWrap="true"/>
+
+              <Repeater Name="Repeater" Layout="VerticalFlow" MinimumSize="200,0" Source="{me:AlbumInfoEditProperties.Properties}">
+                <Content>
+
+                  <Panel Layout="HorizontalFlow" Margins="0,5,0,0">
+                    <Children>
+
+                      <core:Label Style="{styles:SharedStyles.DialogTextStyle}"
+                                  Content="{((me:AlbumInfoEditProperty)RepeatedItem).Property}"
+                                  MinimumSize="60,0" SharedSize="{LabelSharedSize}"
+                                  Margins="0,0,10,0"
+                                  />
+
+                      <me:AlbumInfoEditBox AlbumInfoEditBox="{((me:AlbumInfoEditProperty)RepeatedItem).UI}"
+                        Album="{Dialog.AlbumInfo}" Submitted="{Dialog.OK}"/>
+
+                    </Children>
+                  </Panel>
+
+                </Content>
+              </Repeater>
+
+
+            </Children>
+          </Panel>
+
+          <core:BigActionButton Name="Cancel" Model="{Dialog.Cancel}" Margins="0,10,10,0">
+            <LayoutInput>
+              <AnchorLayoutInput Top="Body,1" Right="Body,1"/>
+            </LayoutInput>
+          </core:BigActionButton>
+
+          <core:BigActionButton Model="{Dialog.OK}" Margins="0,10,10,0">
+            <LayoutInput>
+              <AnchorLayoutInput Top="Body,1" Right="Cancel,0"/>
+            </LayoutInput>
+          </core:BigActionButton>
+          
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  <Class Name="AlbumInfo">
+    <Properties>
+      <String Name="Artist"/>
+      <String Name="Title"/>
+      <String Name="Genre"/>
+      <String Name="ReleaseYear"/>
+    </Properties>
+  </Class>
+
+  <Class Name="AlbumInfoEditProperty">
+    <Properties>
+      <String Name="Property" String="{null}"/>
+      <Type Name="UI" Type="{null}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="AlbumInfoEditProperties" Shared="True">
+    <Properties>
+      <List Name="Properties">
+        <Source>
+          <me:AlbumInfoEditProperty Property="{zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_ARTIST)}" UI="{typeof(me:AlbumInfoEditBoxArtist)}"/>
+          <me:AlbumInfoEditProperty Property="{zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_ALBUM)}" UI="{typeof(me:AlbumInfoEditBoxAlbum)}"/>
+          <me:AlbumInfoEditProperty Property="{zune:Shell.LoadString(zune:StringId.IDS_PROPERTIES_GENRE)}" UI="{typeof(me:AlbumInfoEditBoxGenre)}"/>
+          
+          
+        </Source>
+      </List>
+    </Properties>
+  </Class>
+
+  <UI Name="Editbox" Base="core:Editbox">
+    <Properties>
+      <Size Name="TileMinSize" Size="300,0"/>
+      <Size Name="TileMaxSize" Size="{TileMinSize}"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+        if ([UI.DeepKeyFocus])
+        {
+          Label.HighlightColor = TextHighlightColor;
+          Label.TextHighlightColor = TextFocusedColor;
+        }
+        else
+        {
+          Label.HighlightColor = Color.Transparent;
+          Label.TextHighlightColor = Style.Color;
+        }
+      </Script>
+    </Scripts>
+  </UI>
+
+  <UI Name="AlbumInfoEditBox">
+    <Properties>
+      <Command Name="Submitted" Command="$Required"/>
+      <me:AlbumInfo Name="Album" AlbumInfo="$Required"/>
+      <EditableTextData Name="Model"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+        if ([UI.DeepKeyFocus])
+        {
+          SearchBoxBackground.Content = styles:Styles.SearchBoxBackgroundImageActive;
+        }
+        else
+        {
+          SearchBoxBackground.Content = styles:Styles.SearchBoxBackgroundImage;
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Model.Submitted)]
+        Submitted.Invoke();
+      </Script>
+    </Scripts>
+
+    <Content>
+
+      <Panel Layout="Anchor">
+        <Children>
+
+          <me:Editbox Name="Editbox" Model="{Model}">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Parent,0" Top="Parent,0"/>
+            </LayoutInput>            
+          </me:Editbox>
+
+          <Graphic Name="SearchBoxBackground" SizingPolicy="SizeToConstraint" StretchingPolicy="Fill">
+            <LayoutInput>
+              <AnchorLayoutInput Top="Editbox,0,-4" Bottom="Editbox,1,4" Left="Editbox,0,-4" Right="Editbox,1,4" ContributesToHeight="false" ContributesToWidth="false"/>
+            </LayoutInput>
+          </Graphic>
+
+        </Children>
+      </Panel>
+
+    </Content>
+  </UI>
+  
+
+  <UI Name="AlbumInfoEditBoxArtist" Base="me:AlbumInfoEditBox">
+    <Scripts>
+      <Script>Model.Value = Album.Artist;</Script>
+      <Script>Album.Artist = [Model.Value];</Script>
+    </Scripts>
+  </UI>
+
+  <UI Name="AlbumInfoEditBoxAlbum" Base="me:AlbumInfoEditBox">
+    <Scripts>
+      <Script>Model.Value = Album.Title;</Script>
+      <Script>Album.Title = [Model.Value];</Script>
+    </Scripts>
+  </UI>
+
+  <UI Name="AlbumInfoEditBoxGenre" Base="me:AlbumInfoEditBox">
+    <Scripts>
+      <Script>Model.Value = Album.Genre;</Script>
+      <Script>Album.Genre = [Model.Value];</Script>
+    </Scripts>
+  </UI>
+
+  <UI Name="AlbumInfoEditBoxYear" Base="me:AlbumInfoEditBox">
+    <Scripts>
+      <Script>Model.Value = Album.ReleaseYear;</Script>
+      <Script>Album.ReleaseYear = [Model.Value];</Script>
+    </Scripts>
+  </UI>  
+</UIX> 
diff --git a/test/2.1/LIBRARYPANELS.UIX b/test/2.1/LIBRARYPANELS.UIX
new file mode 100644
index 0000000..cc3ddd2
--- /dev/null
+++ b/test/2.1/LIBRARYPANELS.UIX
@@ -0,0 +1,992 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:col="assembly://mscorlib/System.Collections"
+  xmlns:data="res://ZuneShellResources!LibraryData.schema.xml"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:lib="res://ZuneShellResources!Library.uix"
+  xmlns:list="res://ZuneShellResources!ContentList.uix"
+  xmlns:gp="res://ZuneShellResources!GalleryPanel.uix"
+  xmlns:thumbbutton="res://ZuneShellResources!ThumbnailButton.uix"
+  xmlns:dialogs="res://ZuneShellResources!LibraryDialogs.uix"
+  xmlns:dbapi="assembly://ZuneDBApi/"
+  xmlns:playlistdialog="res://ZuneShellResources!PlaylistDialog.uix"
+  xmlns:tpc="res://ZuneShellResources!TracksPanelColumns.uix"
+  xmlns:contextmenu="res://ZuneShellResources!LibraryContextMenu.uix"
+  xmlns:style="res://ZuneShellResources!Style.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:drag="res://ZuneShellResources!DragFeedback.uix"
+  xmlns:me="Me">
+  
+  <Class Name="SortData">
+    <Properties>
+      <List Name="Options" List="$Required"/>
+      <Int32 Name="DefaultIndex" Int32="0"/>
+      <String Name="SaveKey" String="{null}"/>
+      
+      <iris:Choice Name="Sorts"/>
+    </Properties>
+    
+    <Scripts>
+      <Script>
+        Sorts.Options = Options;
+        Sorts.ChosenIndex = zune:Shell.GetInt(SaveKey, 0, Options.Count - 1, DefaultIndex);
+      </Script>
+      
+      <Script>
+        [DeclareTrigger(Sorts.ChosenIndex)]
+
+        if (!String.IsNullOrEmpty(SaveKey))
+        {
+          zune:Shell.SaveInt(SaveKey, Sorts.ChosenIndex);
+        }
+      </Script>
+    </Scripts>
+  </Class>
+
+  
+  
+  
+  <UI Name="LibraryPanelBase" Base="lib:Column">
+    <Properties>
+      <zune:LibraryPage Name="Page" LibraryPage="$Required"/>
+      
+      <zune:ListPanel Name="Model" ListPanel="$Required"/>
+
+      
+      <me:SortData Name="SortData" SortData="{null}"/>
+
+      
+      <SelectionManager Name="SelectionManager"/>
+
+      <Inset Name="ColumnInset" Inset="0,0,0,0"/>
+      <Boolean Name="ShowContextMenuTitle" Boolean="true"/>
+
+      <Boolean Name="RequireSelection" Boolean="false"/>
+      
+      <lib:LibraryListModel Name="ListModel"/>
+      
+      <Boolean Name="BlockUpdatesDuringGrovel" Boolean="true"/>
+      
+      <Int32 Name="SelectionThreshold" Int32="0"/>
+    </Properties>
+
+    <Locals>
+      
+      <me:NavigateIntoItemRequest Name="NavigateIntoArgs"/>
+
+      
+      <contextmenu:LibraryContextMenu Name="ContextMenu"/>
+
+      
+      <Command Name="Execute"/>
+      <zune:MenuItemCommand Name="Play" Description="{zune:Shell.LoadString(zune:StringId.IDS_PLAY)}" Available="false"/>
+      <zune:MenuItemCommand Name="PlayAll" Description="{zune:Shell.LoadString(zune:StringId.IDS_PLAY_ALL)}"/>
+      <zune:MenuItemCommand Name="AddToNowPlaying" Description="{zune:Shell.LoadString(zune:StringId.IDS_MENUITEM_ADD_TO_NOW_PLAYING)}"/>
+      <zune:MenuItemCommand Name="AddToPlaylist" Description="{zune:Shell.LoadString(zune:StringId.IDS_MENUITEM_ADD_TO_DIALOG)}"/>
+      <zune:MenuItemCommand Name="AddToBurnList" Description="{zune:Shell.LoadString(zune:StringId.IDS_MENUITEM_ADD_TO_BURNLIST)}"/>
+
+      <core:MenuDivider Name="SyncDivider"/>
+      <zune:MenuItemCommand Name="Sync"/>
+      <zune:MenuItemCommand Name="SyncAllUnexclude"/>
+      <String Name="SyncBaseText" String="{zune:Shell.LoadString(zune:StringId.IDS_SYNC_TO_DEVICE_MENUITEM)}"/>
+
+      <zune:MenuItemCommand Name="Exclude"/>
+      <String Name="ExcludeBaseText" String="{zune:Shell.LoadString(zune:StringId.IDS_EXCLUDE_ITEM)}"/>
+      <zune:MenuItemCommand Name="Unexclude"/>
+      <String Name="UnexcludeBaseText" String="{zune:Shell.LoadString(zune:StringId.IDS_UNEXCLUDE_ITEM)}"/>
+
+      <iris:Command Name="ReverseSync" Description="{zune:Shell.LoadString(zune:StringId.IDS_REVERSE_SYNC_MENUITEM)}"/>
+
+      <iris:Command Name="DeleteFromDevice"/>
+      <String Name="DeleteFromDeviceBaseText" String="{zune:Shell.LoadString(zune:StringId.IDS_DELETE_FROM_DEVICE_MENUITEM)}"/>
+
+      <iris:Command Name="Delete" Description="{zune:Shell.LoadString(zune:StringId.IDS_LIBRARY_DELETE_MENU_ITEM)}"/>
+      <zune:MenuItemCommand Name="Properties" Description="{zune:Shell.LoadString(zune:StringId.IDS_LIBRARY_PROPERTIES_MENU_ITEM)}"/>
+
+      <iris:Command Name="Edit" Description="{zune:Shell.LoadString(zune:StringId.IDS_LIBRARY_EDIT_MENU_ITEM)}"/>
+
+      <iris:Command Name="ToggleSelectAllCommand"/>
+
+      <contextmenu:RateCommand Name="Rate"/>
+
+      <dialogs:DeleteDialog Name="DeleteDialog" DeleteDialog="{null}"/>
+      <dialogs:PropertiesDialog Name="PropertiesDialog" PropertiesDialog="{null}"/>
+      <playlistdialog:AddToPlaylistDialog Name="AddToPlaylistDialog" AddToPlaylistDialog="{null}"/>
+
+      <iris:BooleanChoice Name="NeverShowDeleteDialogAgain" Description="{zune:Shell.LoadString(zune:StringId.IDS_DONT_SHOW_THIS_MESSAGE_AGAIN)}"/>
+      <iris:Command Name="DoDeleteDeviceMedia" Description="{zune:Shell.LoadString(zune:StringId.IDS_DIALOG_OK)}"/>
+      <List Name="DeleteDeviceMediaSelection" List="{null}"/>
+
+      <list:CommandContainer Name="EditContext" />
+      <Accessible Name="Accessible"/>
+      
+      
+      <Boolean Name="RestoringSelection"/>
+
+      <drag:DragInfo Name="DragInfo"/>
+      <styles:WindowState Name="WindowState"/>
+    </Locals>
+
+    <Input>
+      <KeyHandler Name="DeleteKey" Key="Delete" DisallowedModifiers="Alt,Ctrl,Shift" HandlerStage="Bubbled" Command="{Delete}"/>
+      <KeyHandler Name="EditKey" Key="F2" DisallowedModifiers="Alt,Ctrl,Shift" HandlerStage="Bubbled" Handle="true"/>
+    </Input>
+
+    <Scripts>
+      <Script>
+        EditKey.Enabled = ![Page.ShowDeviceContents];
+      </Script>
+      
+      <Script> 
+        ListModel.Model = Model; 
+        ListModel.ToggleSelectAllCommand = ToggleSelectAllCommand;
+      </Script>
+      
+      <Script> 
+        if (SortData != null)
+          ListModel.Sorts = [SortData.Sorts]; 
+        else
+          ListModel.Sorts = null;
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(EditKey.Invoked)]
+
+        if (EditKey.EventContext is list:ListItemContext)
+        {
+          list:ListItemContext context = (list:ListItemContext)EditKey.EventContext;
+
+          if (context.Edit != null)
+          {
+            context.Edit.Invoke();
+          }
+        }
+
+      </Script>
+
+      
+      <Script>
+        
+        if ((col:IList)SelectionManager.SourceList != Model.Content)
+          SelectionManager.SourceList = [Model.Content];
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(NavigateIntoArgs.LibraryId)]
+        [DeclareTrigger(Model.Content)]
+
+        int libraryId = NavigateIntoArgs.LibraryId;
+
+        if (libraryId >= 0 &amp;&amp; Model.Content != null)
+        {
+          if ( SelectionThreshold == 0 || Model.Content.Count &lt; SelectionThreshold )
+          {
+            int index = Model.GetIndexFromLibraryId(libraryId);          
+          
+            if (index != -1)
+            {
+              NavigateIntoArgs.Index = index;
+              NavigateIntoArgs.Select = true;
+            }            
+          }
+          
+          
+          NavigateIntoArgs.LibraryId = -1;
+        }
+      </Script>
+
+      
+      <Script>
+  <![CDATA[
+        if ([ContextMenu.Helper.IsVisible])
+        {
+          List selectedItems = SelectionManager.SelectedItems;
+
+          bool mediaOnlyList = false;
+          bool mixedSelection = false;
+          data:Media media = null;
+
+          if (SelectionManager.Count != 0)
+          {
+            
+            mediaOnlyList = true;
+          
+            
+            foreach (object obj in selectedItems)
+            {
+              
+              
+              if (mediaOnlyList)
+              {
+                if (!(obj is data:Media))
+                {
+                  
+                  mediaOnlyList = false;
+                  
+                }
+                else
+                {
+                  data:Media found = (data:Media)obj;
+                
+                  
+                  if (media == null)
+                  {
+                    
+                    media = found;
+                  }
+                  else
+                  {
+                    if (found.Type != media.Type)
+                    {
+                      mixedSelection = true;
+                    }
+                  }
+                }
+              }
+            }
+          }
+
+          if (mediaOnlyList)
+          {
+            if (ShowContextMenuTitle)
+            {
+              
+              if (!mixedSelection)
+              {
+                if (selectedItems.Count == 1)
+                {
+                  
+                  ContextMenu.Title = media.Title;
+                }
+                else
+                {
+                  ContextMenu.Title = ((String)me:StringHelper.MenuHeaderNItems.GetItem(media.Type)).Format(selectedItems.Count);
+                }
+              }
+              else
+              {
+                ContextMenu.Title = me:StringHelper.MixedSelection.Format(selectedItems.Count);
+              }
+            }
+            
+            
+            
+            Rate.Command.Available = mixedSelection || media.Type != "MediaFolder";
+
+            
+
+            bool singleSelect = (selectedItems.Count == 1);
+
+            Edit.Available = (EditContext.Model != null) && singleSelect;
+
+            
+
+            Sync.Hidden = false;
+            SyncAllUnexclude.Hidden = true;
+            Boolean syncOperationsEnabled = zune:SyncControls.Instance.CurrentDeviceExists;
+            Exclude.Hidden = true;
+            Unexclude.Hidden = true;
+
+            foreach (object objItem in SelectionManager.SelectedItems)
+            {
+              
+              if (objItem is data:Track ||
+                  objItem is data:Video ||
+                  objItem is data:Photo ||
+                  objItem is data:PodcastEpisode)
+              {
+                if (((data:Media)objItem).SyncState == zune:SyncControls.ConvertSyncStateToInt(dbapi:ESyncState.eSyncStateExcluded))
+                {
+                  
+                  Unexclude.Hidden = false;
+                }
+                else
+                {
+                  
+                  Exclude.Hidden = false;
+                }
+                
+                
+                if (objItem is data:PodcastEpisode &&
+                    ((data:PodcastEpisode)objItem).DownloadState != zune:EpisodeDownloadCommand.ConvertDownloadStatusToInt(dbapi:EEpisodeDownloadState.eDownloadStateDownloaded))
+                {
+                  syncOperationsEnabled = false;
+                }
+              }
+            }
+            
+            if (syncOperationsEnabled)
+            {
+              Boolean currentDeviceIsGuest = zune:SyncControls.Instance.CurrentDeviceIsGuest;
+              
+              Sync.Available = (currentDeviceIsGuest ||
+                                !zune:SyncControls.Instance.GetSyncAll(Model.MediaType));
+              Sync.Hidden = !Sync.Available;
+              SyncAllUnexclude.Available = !Sync.Available;
+              SyncAllUnexclude.Hidden = !SyncAllUnexclude.Available;
+              Exclude.Available = !currentDeviceIsGuest;
+              Unexclude.Available = !currentDeviceIsGuest;
+            }
+            else
+            {
+              Sync.Available = false;
+              SyncAllUnexclude.Available = false;
+              SyncAllUnexclude.Hidden = true;
+              Exclude.Available = false;
+              Unexclude.Available = false;
+            }
+          }
+          else
+          {
+            ContextMenu.Title = null;
+
+            Rate.Command.Available = false;
+            Sync.Available = false;
+            Sync.Hidden = true;
+            SyncAllUnexclude.Available = false;
+            SyncAllUnexclude.Hidden = true;
+            Exclude.Available = false;
+            Exclude.Hidden = true;
+            Unexclude.Available = false;
+            Unexclude.Hidden = true;
+            EditContext.Model = null;
+          }
+          
+          SyncDivider.Visible = !(Sync.Hidden && SyncAllUnexclude.Hidden && Exclude.Hidden && Unexclude.Hidden);
+        }
+      ]]></Script>
+
+      
+      <Script>
+        String name = zune:Shell.LoadString(zune:StringId.IDS_SYNC_DEFAULT_DEVICE_WORD);
+
+        if ([zune:SyncControls.Instance.CurrentDeviceExists])
+        {
+          name = [zune:SyncControls.Instance.CurrentDeviceName];
+        }
+
+        Sync.Description = SyncBaseText.Format(name);
+        SyncAllUnexclude.Description = Sync.Description;
+        Exclude.Description = ExcludeBaseText.Format(name);
+        Unexclude.Description = UnexcludeBaseText.Format(name);
+        DeleteFromDevice.Description = DeleteFromDeviceBaseText.Format(name);
+      </Script>
+
+      
+      <Script>
+        bool hasSelection = [SelectionManager.Count] != 0;
+        Play.Available = hasSelection;
+        Delete.Available = hasSelection;
+        DeleteFromDevice.Available = hasSelection;
+        AddToNowPlaying.Available = hasSelection;
+        AddToPlaylist.Available = hasSelection;
+
+        
+        bool selectedOne = (SelectionManager.Count == 1);
+        Properties.Available = selectedOne;
+        PlayAll.Available = selectedOne;
+        PlayAll.Hidden = !PlayAll.Available;
+      </Script>
+
+      
+      <Script>AddToPlaylist.Hidden = (Page.PlaybackContext != zune:PlaybackContext.Music);</Script>
+
+      
+      <Script>AddToNowPlaying.Hidden = ![zune:TransportControls.Instance.IsPlaybackContextCompatible];</Script>
+      
+      
+      <Script>AddToBurnList.Available = ([SelectionManager.Count] != 0 &amp;&amp; ![zune:CDAccess.Instance.IsBurning]);</Script>
+
+      
+
+
+      <Script>
+        [DeclareTrigger(((List)Model.Content).Count)]
+        
+        bool hasSelectedLibraryIds = !List.IsNullOrEmpty(Model.SelectedLibraryIds);
+        if (hasSelectedLibraryIds || RequireSelection)
+        {
+          if (Model.Content != null &amp;&amp;
+              Model.Content.Count > 0)
+          {
+            bool selectionChanged = false;
+            
+            if ( hasSelectedLibraryIds &amp;&amp; (SelectionThreshold == 0 || Model.Content.Count &lt; SelectionThreshold) )
+            {
+              List selectedIndices = Model.ComputeSelectedIndicies();
+            
+              foreach(Int32 index in selectedIndices)
+              {
+                if (!SelectionManager.IsSelected(index))
+                {
+                  selectionChanged = true;
+                  SelectionManager.Select(index, true);
+                }
+              }
+            }
+            
+            
+            NavigateIntoArgs.Index = SelectionManager.SelectedIndex;
+            NavigateIntoArgs.Select = false;
+            
+            
+            if (RequireSelection &amp;&amp; NavigateIntoArgs.Index == -1)
+            {
+              NavigateIntoArgs.Index = 0;
+              NavigateIntoArgs.Select = true;
+            }
+            else
+            {
+              
+              
+              
+              RestoringSelection = selectionChanged;
+            }
+          }
+          else
+          {
+            
+            
+            
+            RestoringSelection = true;
+          }
+        }
+      </Script>
+      
+      
+      <Script>
+        [DeclareTrigger(SelectionManager.SelectedItems)]
+        
+        
+        if (!RestoringSelection)
+        {
+          if (SelectionManager.Count > 0)
+          {
+            
+            List selectedIds = new col:ArrayList(SelectionManager.Count);
+            foreach (object o in SelectionManager.SelectedItems)
+            {
+              if (o is data:Media)
+                selectedIds.Add(((data:Media)o).LibraryId);
+            }
+            
+            Model.SelectedLibraryIds = selectedIds;
+          }
+          else if (SelectionManager.SourceList != null)
+          {
+            
+            
+            
+            Model.SelectedLibraryIds = null;
+          }
+        }
+        else 
+        {
+          RestoringSelection = false;
+        }
+      </Script>
+      
+      
+      <Script>
+        [DeclareTrigger(Play.Invoked)]
+
+        if (!Page.ShowDeviceContents)
+        {
+          zune:TransportControls.Instance.PlayItems(SelectionManager.SelectedItems);
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(PlayAll.Invoked)]
+
+        if (!Page.ShowDeviceContents)
+        {
+          int startFromIndex = -1;
+          if (SelectionManager.Count == 1) startFromIndex = SelectionManager.SelectedIndex;
+
+          if (!List.IsNullOrEmpty(SelectionManager.SourceList))
+          {
+            zune:TransportControls.Instance.PlayItems(SelectionManager.SourceList, startFromIndex);
+          }
+        }
+      </Script>
+
+      
+      
+      <Script>
+        [DeclareTrigger(Execute.Invoked)]
+
+        if (SelectionManager.Count > 1)
+        {
+          Play.Invoke();
+        }
+        else
+        {
+          PlayAll.Invoke();
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(AddToNowPlaying.Invoked)]
+
+        if (SelectionManager.Count != 0)
+        {
+          zune:TransportControls.Instance.AddToNowPlaying(SelectionManager.SelectedItems);
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(AddToPlaylist.Invoked)]
+
+        if (SelectionManager.Count != 0)
+        {
+          if (AddToPlaylistDialog == null) AddToPlaylistDialog = new playlistdialog:AddToPlaylistDialog();
+          AddToPlaylistDialog.DragItems = SelectionManager.SelectedItems;
+          AddToPlaylistDialog.Helper.Show(AddToPlaylistDialog);
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(AddToBurnList.Invoked)]
+
+        zune:CDAccess.Instance.AddToBurnList(SelectionManager.SelectedItems);
+      </Script>
+      
+      
+      <Script>
+        [DeclareTrigger(Delete.Invoked)]
+
+        
+        if (DeleteDialog == null) DeleteDialog = new dialogs:DeleteDialog();
+
+        
+        List selectedItems = SelectionManager.SelectedItems;
+        if (!List.IsNullOrEmpty(selectedItems))
+        {
+          
+          DeleteDialog.ItemsToDelete = selectedItems;
+          DeleteDialog.Helper.Show(DeleteDialog);
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(Properties.Invoked)]
+
+        if (Properties.Available)
+        {
+          
+          if (PropertiesDialog == null) PropertiesDialog = new dialogs:PropertiesDialog();
+
+          data:Media media = (data:Media)SelectionManager.SelectedItem;
+
+          if (media != null)
+          {
+            if (media is data:PlaylistContentItem)
+            {
+              data:PlaylistContentItem playlistContentItem = (data:PlaylistContentItem)media;
+              PropertiesDialog.LibraryId = playlistContentItem.MediaId;
+              PropertiesDialog.ItemType = zune:Shell.MapIntToMediaType(playlistContentItem.MediaType);
+            }
+            else
+            {
+              PropertiesDialog.LibraryId = media.LibraryId;
+              PropertiesDialog.ItemType = zune:Shell.MapStringToMediaType(media.Type);
+            }
+          }
+
+          PropertiesDialog.Helper.Show(PropertiesDialog);
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(Edit.Invoked)]
+
+        if (EditContext.Model != null)
+        {
+          EditContext.Model.Invoke();
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Sync.Invoked)]
+        zune:SyncControls.Instance.AddSyncRule(SelectionManager.SelectedItems);
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Exclude.Invoked)]
+        zune:SyncControls.Instance.Exclude(SelectionManager.SelectedItems);
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Unexclude.Invoked)]
+        [DeclareTrigger(SyncAllUnexclude.Invoked)]
+        zune:SyncControls.Instance.Unexclude(SelectionManager.SelectedItems);
+      </Script>
+
+      <Script>
+        [DeclareTrigger(ReverseSync.Invoked)]
+        zune:SyncControls.Instance.ReverseSync(SelectionManager.SelectedItems);
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Rate.Command.Invoked)]
+        foreach (object objItem in SelectionManager.SelectedItems)
+        {
+          if (objItem is data:RateableMedia)
+          {              
+            ((data:RateableMedia)objItem).UserRating = Rate.Rating;
+          }
+        }
+      </Script>
+
+      <Script>
+        ToggleSelectAllCommand.Available = SelectionManager.SourceList != null &amp;&amp;
+                                          [SelectionManager.SourceList.Count] > 0;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(ToggleSelectAllCommand.Invoked)]
+        if (SelectionManager.Count != SelectionManager.SourceList.Count)
+          SelectionManager.SelectRange(0, SelectionManager.SourceList.Count - 1);
+        else
+          SelectionManager.Clear();
+      </Script>
+
+      <Script>
+        [DeclareTrigger(DeleteFromDevice.Invoked)]
+
+        NeverShowDeleteDialogAgain.Value = false;
+        DeleteDeviceMediaSelection = null;
+
+        DeleteDeviceMediaSelection = SelectionManager.SelectedItems;
+        if (!List.IsNullOrEmpty(DeleteDeviceMediaSelection))
+        {
+          if (zune:Management.Instance.ConfirmDeviceMediaDeletion)
+          {
+            string content = null;
+          
+            if (DeleteDeviceMediaSelection.Count == 1)
+            {
+              object selectedItem = DeleteDeviceMediaSelection.GetItem(0);
+              string title = ((data:Media)selectedItem).Title;
+              content = ((String)zune:Shell.LoadString(zune:StringId.IDS_DEVICE_QUESTION_1_ITEM)).Format(title, zune:SyncControls.Instance.CurrentDeviceName);
+            }
+            else
+            {
+              content = ((String)zune:Shell.LoadString(zune:StringId.IDS_DEVICE_QUESTION_N_ITEMS)).Format(DeleteDeviceMediaSelection.Count, zune:SyncControls.Instance.CurrentDeviceName);
+            }
+
+            zune:MessageBox.Show(null, content, DoDeleteDeviceMedia, null, NeverShowDeleteDialogAgain);
+          }
+          else
+          {
+            DoDeleteDeviceMedia.Invoke();
+          }
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(DoDeleteDeviceMedia.Invoked)]
+
+        zune:SyncControls.Instance.DeleteAndExclude(DeleteDeviceMediaSelection);
+
+        if (NeverShowDeleteDialogAgain.Value)
+        {
+          zune:Management.Instance.ConfirmDeviceMediaDeletion = false;
+        }
+
+        NeverShowDeleteDialogAgain.Value = false;
+        DeleteDeviceMediaSelection = null;
+      </Script>
+
+      <Script>
+        if ([Accessible.Enabled])
+        {
+          Accessible.Name = [Model.MediaType].ToString();
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(zune:JumpInListManager.Instance.IsActive)]
+        [DeclareTrigger(UI.DeepKeyFocus)]
+        [DeclareTrigger(Model.Content)]
+        zune:LibraryPage.BlockUpdatesFromDBList(
+            Model.Content, 
+            zune:BlockListUpdatesReason.JumpInList, 
+            zune:JumpInListManager.Instance.IsActive &amp;&amp; UI.DeepKeyFocus);
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(zune:PopupManager.Instance.IsModal)]
+        [DeclareTrigger(Model.Content)]
+        zune:LibraryPage.BlockUpdatesFromDBList(
+            Model.Content, 
+            zune:BlockListUpdatesReason.ModalUI, 
+            zune:PopupManager.Instance.IsModal);
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(DragInfo.IsDraggingInternally)]
+        [DeclareTrigger(Model.Content)]
+        zune:LibraryPage.BlockUpdatesFromDBList(
+            Model.Content, 
+            zune:BlockListUpdatesReason.DragDrop, 
+            DragInfo.IsDraggingInternally);
+      </Script>
+      
+      
+
+      <Script>
+        [DeclareTrigger(zune:MetadataNotifications.Instance.Importing)]
+        [DeclareTrigger(UI.DeepMouseFocus)]
+        [DeclareTrigger(iris:Application.Window.MouseActive)]
+        [DeclareTrigger(UI.DeepKeyFocus)]
+        [DeclareTrigger(WindowState.KeysActive)]
+        [DeclareTrigger(Model.Content)]
+        
+        if (BlockUpdatesDuringGrovel)
+        {
+          zune:LibraryPage.BlockUpdatesFromDBList(
+              Model.Content, 
+              zune:BlockListUpdatesReason.Focus, 
+              zune:MetadataNotifications.Instance.Importing &amp;&amp;
+              ((UI.DeepMouseFocus &amp;&amp; iris:Application.Window.MouseActive) || 
+              (UI.DeepKeyFocus &amp;&amp; styles:WindowState.KeysActive)));
+        }
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  
+  <UI Name="LibraryGalleryPanel" Base="me:LibraryPanelBase">
+    <Properties>
+      <Type Name="GalleryViewType" Type="{typeof(me:LibraryGalleryView)}"/>
+      <Size Name="LayoutSpacing" Size="10,0"/>
+      <Inset Name="ColumnMargins" Inset="0,0,0,0"/>
+      <Inset Name="HeaderMargins" Inset="0,0,0,22"/>
+      <Inset Name="HeaderPadding" Inset="0,0,0,0"/>
+      <iris:Command Name="SelectedItemClicked" Command="{null}"/>
+    </Properties>
+
+    <Scripts>
+      <Script>Worker.SupportsJumpInList = [SupportsJumpInList];</Script>
+      <Script>Worker.SelectedItemClicked = [SelectedItemClicked];</Script>
+      <Script>Worker.Sorts = [ListModel.Sorts];</Script>
+    </Scripts>
+
+    <Content>
+      <gp:GalleryPanelWorker Name="Worker"
+        Model="{Model}"
+        SelectionManager="{SelectionManager}"
+        ContextMenu="{ContextMenu}"
+        EditContext="{EditContext}"
+        NavigateIntoArgs="{NavigateIntoArgs}"
+        GalleryViewType="{GalleryViewType}"
+        ToggleSelectAllCommand="{ToggleSelectAllCommand}"
+        Padding="{ColumnMargins}"
+        ColumnInset="{ColumnInset}"
+        LayoutSpacing="{LayoutSpacing}" 
+        HeaderMargins="{HeaderMargins}"
+        HeaderPadding="{HeaderPadding}"/>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="LibraryGalleryView" Base="gp:GalleryView">
+    <Properties>
+      <zune:ListPanel Name="ListModel" ListPanel="$Required"/>
+      <SelectionManager Name="SelectionManager" SelectionManager="$Required"/>
+
+      <Type Name="ProviderType" Type="{typeof(me:ListItemProvider)}"/>
+    </Properties>
+  </UI>
+
+
+  
+  
+  
+  <Class Name="ListItemProvider" Base="thumbbutton:ThumbnailButtonProvider">
+    <Properties>
+      <zune:ListPanel Name="ListModel" ListPanel="$Required"/>
+      <Object Name="Model" Object="$Required"/>
+      <Index Name="Index" Index="$Required"/>
+      <SelectionManager Name="SelectionManager" SelectionManager="$Required"/>
+    </Properties>
+
+    <Scripts>
+      <Script>DragValue = SelectionManager;</Script>
+
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(((data:Media)Model).Title)]
+        if (Model is data:Media)
+        {
+          data:Media media = (data:Media)Model;
+          
+          PrimaryLabel = media.Title;
+        }
+        else if (Model is String)
+        {
+          PrimaryLabel = (String)Model;
+        }
+        else
+        {
+          if (Model == null)
+          {
+            
+          }
+          else
+          {
+            
+          }
+        }
+      </Script>
+
+      <Script><![CDATA[
+          [DeclareTrigger(PrimaryLabelEdited.Invoked)]
+
+          if (Model is data:Media)
+          {
+            ((data:Media)Model).Title = PrimaryLabel;
+          }
+      ]]></Script>
+    </Scripts>
+  </Class>
+
+  <Class Name="StringHelper" Shared="true">
+    <Properties>
+      <Dictionary Name="MenuHeader1Item">
+        <Source>
+          <String Name="Artist" String="{zune:Shell.LoadString(zune:StringId.IDS_LIBRARY_MENUITEM_HEADER_1_ARTIST)}"/>
+          <String Name="Album"  String="{zune:Shell.LoadString(zune:StringId.IDS_LIBRARY_MENUITEM_HEADER_1_ALBUM)}"/>
+          <String Name="Track"  String="{zune:Shell.LoadString(zune:StringId.IDS_LIBRARY_MENUITEM_HEADER_1_TRACK)}"/>
+          <String Name="Photo"  String="{zune:Shell.LoadString(zune:StringId.IDS_LIBRARY_MENUITEM_HEADER_1_PHOTO)}"/>
+          <String Name="Video"  String="{zune:Shell.LoadString(zune:StringId.IDS_LIBRARY_MENUITEM_HEADER_1_VIDEO)}"/>
+          <String Name="Playlist" String="{zune:Shell.LoadString(zune:StringId.IDS_LIBRARY_MENUITEM_HEADER_1_PLAYLIST)}"/>
+          <String Name="PodcastSeries" String="{zune:Shell.LoadString(zune:StringId.IDS_LIBRARY_MENUITEM_HEADER_1_PODCAST)}"/>
+          <String Name="PodcastEpisode" String="{zune:Shell.LoadString(zune:StringId.IDS_LIBRARY_MENUITEM_HEADER_1_PODCASTEPISODE)}"/>
+          <String Name="PlaylistContentItem" String="{zune:Shell.LoadString(zune:StringId.IDS_LIBRARY_MENUITEM_HEADER_1_TRACK)}"/>
+          <String Name="MediaFolder" String="{zune:Shell.LoadString(zune:StringId.IDS_LIBRARY_MENUITEM_HEADER_1_FOLDER)}"/>
+        </Source>
+      </Dictionary>
+      <Dictionary Name="MenuHeaderNItems">
+        <Source>
+          <String Name="Artist" String="{zune:Shell.LoadString(zune:StringId.IDS_LIBRARY_MENUITEM_HEADER_N_ARTISTS)}"/>
+          <String Name="Album"  String="{zune:Shell.LoadString(zune:StringId.IDS_LIBRARY_MENUITEM_HEADER_N_ALBUMS)}"/>
+          <String Name="Track"  String="{zune:Shell.LoadString(zune:StringId.IDS_LIBRARY_MENUITEM_HEADER_N_TRACKS)}"/>
+          <String Name="Photo"  String="{zune:Shell.LoadString(zune:StringId.IDS_LIBRARY_MENUITEM_HEADER_N_PHOTOS)}"/>
+          <String Name="Video"  String="{zune:Shell.LoadString(zune:StringId.IDS_LIBRARY_MENUITEM_HEADER_N_VIDEOS)}"/>
+          <String Name="Playlist" String="{zune:Shell.LoadString(zune:StringId.IDS_LIBRARY_MENUITEM_HEADER_N_PLAYLISTS)}"/>
+          <String Name="PodcastSeries" String="{zune:Shell.LoadString(zune:StringId.IDS_LIBRARY_MENUITEM_HEADER_N_PODCASTS)}"/>
+          <String Name="PodcastEpisode" String="{zune:Shell.LoadString(zune:StringId.IDS_LIBRARY_MENUITEM_HEADER_N_PODCASTEPISODES)}"/>
+          <String Name="PlaylistContentItem" String="{zune:Shell.LoadString(zune:StringId.IDS_LIBRARY_MENUITEM_HEADER_N_TRACKS)}"/>
+          <String Name="MediaFolder" String="{zune:Shell.LoadString(zune:StringId.IDS_LIBRARY_MENUITEM_HEADER_N_FOLDERS)}"/>
+        </Source>
+      </Dictionary>
+      <String Name="MixedSelection" String="{zune:Shell.LoadString(zune:StringId.IDS_LIBRARY_MENUITEM_HEADER_N_ITEMS)}"/>
+    </Properties>
+  </Class>
+
+  
+  
+  
+  <UI Name="ThumbnailCaptionArea" Base="thumbbutton:ThumbnailCaptionArea">
+    <Scripts>
+      <Script>
+        Type hostType = typeof(tpc:SyncCell);
+        style:Style hostStyle = styles:SharedStyles.ListItemStyle;
+        
+        if (zune:Shell.DefaultInstance.CurrentPage is zune:LibraryPage)
+        {
+          if (((zune:LibraryPage)zune:Shell.DefaultInstance.CurrentPage).ShowDeviceContents)
+          {
+            hostType = typeof(tpc:SizeOnDeviceCell);
+            hostStyle = SecondaryLabelStyle;
+          }
+        }
+        
+        DeviceStatus.RequestSource(hostType, "Model", (data:Media)Provider.Model, "Style", hostStyle);
+      </Script>
+    </Scripts>
+    <Content>
+
+      <Panel Layout="Anchor" MinimumSize="{LabelSize}" MaximumSize="{LabelSize}" Margins="{LabelInset}">
+        <Children>
+
+          
+          <Panel Name="StatusContainer">
+            <LayoutInput>
+              <AnchorLayoutInput Right="Parent,1" Top="Parent,0"/>
+            </LayoutInput>
+            <Children>
+
+              <Host Name="DeviceStatus"/>
+
+            </Children>
+          </Panel>
+
+          
+          <thumbbutton:LabelHostBase Name="Label" LabelHostBase="{PrimaryLabelType}" Style="{PrimaryLabelStyle}">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Parent,0" Top="Parent,0" Right="StatusContainer,0"/>
+            </LayoutInput>
+          </thumbbutton:LabelHostBase>
+
+          
+          <thumbbutton:LabelHostBase Name="SecondaryLabel" LabelHostBase="{SecondaryLabelType}" Style="{SecondaryLabelStyle}">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Parent,0" Top="Label,1" Bottom="Parent,1"/>
+            </LayoutInput>
+          </thumbbutton:LabelHostBase>
+
+        </Children>
+      </Panel>
+      
+    </Content>
+  </UI>
+
+  
+  
+  
+  <Class Name="NavigateIntoItemRequest" Base="core:NavigateIntoIndexRequest">
+    <Properties>
+      <Int32 Name="LibraryId" Int32="-1"/>
+    </Properties>
+  </Class>
+  
+  
+  
+  
+  <Class Name="Globals" Shared="true">
+    <Properties>
+      
+      <Dictionary Name="SortAscendingMap"/>
+    </Properties>
+    
+    <Scripts>
+      <Script>
+        SortAscendingMap.SetItem(false, "-");
+        SortAscendingMap.SetItem(true, "+");
+      </Script>
+    </Scripts>
+  </Class>
+</UIX>
diff --git a/test/2.1/LINKBUTTONS.UIX b/test/2.1/LINKBUTTONS.UIX
new file mode 100644
index 0000000..b049042
--- /dev/null
+++ b/test/2.1/LINKBUTTONS.UIX
@@ -0,0 +1,68 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"  
+  xmlns:button="res://ZuneShellResources!Button.uix"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:style="res://ZuneShellResources!Style.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:me="Me"
+  >
+  
+  
+  
+  
+  <UI Name="Link" Base="core:Button">
+    <Properties>
+      <style:Style Name="OverrideStyle" Font="{styles:Styles.StandardSubHeaderText}"/>
+    </Properties>
+  </UI>
+
+  
+  
+  
+  <UI Name="MicroLink" Base="core:Button">
+    <Properties>
+      <style:Style Name="OverrideStyle" Font="{styles:Styles.MicroText}"/>
+    </Properties>
+  </UI>
+
+  
+  
+  
+  <UI Name="LargeLink" Base="me:Link">
+    <Properties>
+      <style:Style Name="OverrideStyle" Style="{styles:SharedStyles.MarketplaceHeader}"/>
+    </Properties>
+  </UI>
+
+  
+  
+  
+  
+  <UI Name="MoreLink" Base="me:LargeLink">
+    <Properties>
+      <Inset Name="IconMargin" Inset="5,-3,0,0"/>
+      <Image Name="Arrow" Image="res://ZuneShellResources!Arrow.More.png"/>
+      <button:Icon Name="Icon" Image="{Arrow}" Margins="{IconMargin}"/>
+    </Properties>
+
+    <Scripts>
+      
+      <Script>
+        Label.RequestSource(typeof(button:LabelAndIconContent), "Icon", Icon);
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  
+  <UI Name="ExternalLink" Base="me:MoreLink">
+    <Properties>
+      <Inset Name="IconMargin" Inset="7,2,0,0"/>
+      <button:Icon Name="Icon" Image="res://ZuneShellResources!Icon.ExternalLink.png" Margins="{IconMargin}"/>
+      <style:Style Name="OverrideStyle" Style="{styles:SharedStyles.HyperlinkStyle}"/>
+    </Properties>
+  </UI>
+</UIX>
diff --git a/test/2.1/LISTVIEW.UIX b/test/2.1/LISTVIEW.UIX
new file mode 100644
index 0000000..f4a9e70
--- /dev/null
+++ b/test/2.1/LISTVIEW.UIX
@@ -0,0 +1,85 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX 
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:list="res://ZuneShellResources!ContentList.uix"
+  xmlns:button="res://ZuneShellResources!Button.uix"
+  xmlns:style="res://ZuneShellResources!Style.uix"
+  xmlns:me="Me">
+
+  
+  
+  
+  <UI Name="Default">
+    <Content>
+      <me:ListView>
+        <Content>
+          <iris:ArrayListDataSet>
+            <Source>
+              <iris:Command Description="Air"/>
+              <iris:Command Description="Anita o' day"/>
+              <iris:Command Description="Bjork"/>
+              <iris:Command Description="Beck"/>
+              <iris:Command Description="Crystal Method"/>
+              <iris:Command Description="Fat boy slim"/>
+              <iris:Command Description="Frou Frou"/>
+              <iris:Command Description="Fiest"/>
+              <iris:Command Description="Fiction Company"/>
+              <iris:Command Description="Figurine"/>
+              <iris:Command Description="Filter"/>
+              <iris:Command Description="Fiona Apple"/>
+              <iris:Command Description="Foo Fighters"/>
+              <iris:Command Description="Franz Ferdinand"/>
+              <iris:Command Description="Frente!"/>
+              <iris:Command Description="Funkadelic"/>
+              <iris:Command Description="Garbage"/>
+              <iris:Command Description="George Benson"/>
+              <iris:Command Description="Gilberto Gil"/>
+              <iris:Command Description="Gnarls Barkley"/>
+              <iris:Command Description="Gorillaz"/>
+              <iris:Command Description="Gus Gus"/>
+              <iris:Command Description="Heartland"/>
+            </Source>
+          </iris:ArrayListDataSet>
+        </Content>
+      </me:ListView>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="ListView" Base="list:ScrollingContentListBase">
+    <Properties>
+      <style:Style Name="OverrideStyle" Style="{null}"/>
+      <Type Name="ProviderType" Type="{typeof(button:CommandButtonProvider)}"/>
+      <Type Name="ListItemType" Type="{typeof(list:LabelListItemBase)}"/>
+      <Boolean Name="KeyInteractiveNStuff" Boolean="true"/>
+      
+      
+
+      <Object Name="ListModel" Object="{null}"/>
+      
+      <AnimationProvider Name="ItemAnimation" AnimationProvider="{null}"/>
+    </Properties>
+
+    <Content Name="Item">
+      <list:LabelListItemBase LabelListItemBase="{ListItemType}" 
+        Index="{RepeatedItemIndex}"
+        OverrideStyle="{OverrideStyle}"
+        KeyInteractiveNStuff="{KeyInteractiveNStuff}">
+        <Provider>
+          <button:ModelButtonProvider ModelButtonProvider="{ProviderType}" 
+              Model="{RepeatedItem}" 
+              Index="{RepeatedItemIndex}"
+              SelectionManager="{SelectionManager}"
+              ListModel="{ListModel}"/>
+        </Provider>
+        <Animations>
+          <AnimationProvider AnimationProvider="{ItemAnimation}"/>
+        </Animations>
+      </list:LabelListItemBase>
+    </Content>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/LISTVIEWPANEL.UIX b/test/2.1/LISTVIEWPANEL.UIX
new file mode 100644
index 0000000..c56542f
--- /dev/null
+++ b/test/2.1/LISTVIEWPANEL.UIX
@@ -0,0 +1,84 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX 
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:style="res://ZuneShellResources!Style.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:core="res://ZuneShellResources!Controls.uix">
+  
+  
+    
+  
+  <UI Name="ColumnPanelHeader" Base="core:Button">
+    <Properties>
+      <iris:Command Name="ToggleSelectAll" Command="$Required"/>
+      <iris:Choice Name="Sorts" Choice="$Required"/>
+      
+      <Inset Name="HeaderPadding" Inset="0,0,0,0"/>
+      <Boolean Name="HighlightHeader" Boolean="false"/>
+      <Boolean Name="SizeToChildren" Boolean="true"/>
+      
+      <Boolean Name="KeyInteractiveNStuff" Boolean="false"/>
+      
+      <style:Style Name="SelectAllOverrideStyle" Style="{styles:SharedStyles.ListViewColumnHeaderStyle}"/>
+      <style:Style Name="SortsOverrideStyle" Style="{styles:SharedStyles.ListViewSortsColumnHeaderStyle}"/>
+      
+      <iris:Command Name="Model"/>
+    </Properties>
+    
+    <Scripts>
+      <Script>
+        if (HighlightHeader)
+          BackgroundFocusColor = styles:Styles.ListHeaderActiveHoverBackground;
+      </Script>
+      
+      
+      <Script>
+        if ([Sorts] != null)
+          Sorts.Wrap = true;
+      </Script>
+      
+      
+      <Script>
+        [DeclareTrigger(Model.Invoked)]
+        if (Sorts != null)
+          Sorts.NextValue();
+      </Script>
+      
+      <Script>
+        if (Sorts != null &amp;&amp; [Sorts.Chosen] != null)
+        {
+          Model.Description = ((iris:Command)Sorts.Chosen).Description;
+          Sorted.Visible = true;
+          Label.Visible = true;
+        }
+        else
+        {
+          Sorted.Visible = false;
+          Label.Visible = false;
+        }
+      </Script>      
+
+      
+    </Scripts>
+
+    <Content>
+      <ColorFill Name="Background" Navigation="TabGroup" Padding="{HeaderPadding}">
+        <Layout>
+          <FlowLayout Orientation="Horizontal" FillStrip="{!SizeToChildren}"/>
+        </Layout>
+        <Children>
+
+          <core:Button Model="{ToggleSelectAll}" TileMinSize="0,16" TileMaxSize="0,16" OverrideStyle="{SelectAllOverrideStyle}"/>
+          
+          <core:Label Name="Sorted" Content="{zune:Shell.LoadString(zune:StringId.IDS_SORT_HEADER)}" Margins="4,0,4,0" Style="{SortsOverrideStyle}"/>
+          
+          <core:Label Name="Label" Margins="0,0,4,0" Style="{SortsOverrideStyle}"/>
+          
+        </Children>
+      </ColorFill>
+    </Content>
+  </UI>
+  
+</UIX>
diff --git a/test/2.1/MANAGEMENT.UIX b/test/2.1/MANAGEMENT.UIX
new file mode 100644
index 0000000..dd02cd2
--- /dev/null
+++ b/test/2.1/MANAGEMENT.UIX
@@ -0,0 +1,283 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:core="res://ZuneShellResources!CoreControls.uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:style="res://ZuneShellResources!Style.uix"  
+  xmlns:page="res://ZuneShellResources!PageStack.uix"
+  xmlns:animations="res://ZuneShellResources!Animations.uix"
+  xmlns:lwa="res://ZuneShellResources!LabelWithArrow.uix" 
+  xmlns:me="Me">
+
+  <UI Name="Default" Base="page:PageBase">
+    <Properties>
+      <zune:Shell Name="Shell" Shell="$Required"/>
+      <zune:CategoryPage Name="Page" CategoryPage="$Required"/>
+    </Properties>
+
+    <Locals>
+      <ScrollingData Name="ScrollData"/>
+      <styles:LabelStyle Name="StyleHeader" Color="{styles:Styles.TextSelected}" Font="{styles:Styles.SettingsTextDesc}"/>
+    </Locals>
+
+    <Input>
+      <ScrollingHandler Name="ScrollHandler" ScrollingData="{ScrollData}"/>
+    </Input>
+
+    <Scripts>
+      <Script>
+        zune:Category category = [Page.CurrentCategory];
+        if (category != null)
+        {
+          Display.RequestSource(category.Target, "Page", Page);
+        }
+      </Script>
+      <Script>
+        ScrollBar.RegionHover = [UI.DeepMouseFocus];
+      </Script>
+      <Script>
+        [DeclareTrigger(Page.MenuDisabled)]
+        [InitialEvaluate(true)]
+        SelectableMenu.Visible = !Page.IsWizard &amp;&amp; !Page.MenuDisabled;
+        ReadOnlyMenu.Visible = Page.IsWizard || Page.MenuDisabled;
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Layout="Anchor">
+        <Children>
+
+          <Panel Name="Menu" Padding="0,0,10,10">
+            <Layout>
+              <FlowLayout Orientation="Horizontal" Spacing="10,0" StripAlignment="Near" ItemAlignment="Center"/>
+            </Layout>
+            <LayoutInput>
+              <AnchorLayoutInput Left="Parent,0" Top="Parent,0" Right="Parent,0,154" Bottom="Parent,1"/>
+            </LayoutInput>
+            <Children>
+
+              <me:SelectableCategoryList Name="SelectableMenu" Model="{Page.Menu}"/>
+              <me:ReadOnlyCategoryList Name="ReadOnlyMenu" Model="{Page.Menu}"/>
+
+            </Children>
+          </Panel>
+
+          
+          <Graphic Name="LeftDivider"  Content="{styles:Styles.DividerVerticalSettings}">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Menu,1" Top="Parent,0" Bottom="Parent,1"/>
+            </LayoutInput>
+          </Graphic>
+
+          <core:ScrollBar Name="ScrollBar" ScrollData="{ScrollData}">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Parent,1,-26" Top="Parent,0" Bottom="MainContent,1"/>
+            </LayoutInput>
+          </core:ScrollBar>
+
+          <Scroller Name="MainContent" Orientation="Vertical" FadeSize="-1" ScrollingData="{ScrollData}">
+            <LayoutInput>
+              <AnchorLayoutInput Left="LeftDivider,1" Top="Parent,0" Right="ScrollBar,0" Bottom="Parent,1,0"/>
+            </LayoutInput>
+            <Children>
+
+              <Host Name="Display" Padding="35,0,10,10">
+                <Animations>
+                  <Animation Animation="{animations:Animations.SettingsViewContentChange}"/>
+                  <Animation Animation="{animations:Animations.SettingsViewShow}"/>
+                  
+                  <Animation Animation="{animations:Animations.MoveNow}"/>
+                </Animations>
+              </Host>
+
+            </Children>
+          </Scroller>
+          
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="CheckBox" Base="core:CheckBox">
+    <Properties>
+      <Font Name="LabelFont" Font="{styles:Styles.SettingsText}"/>
+      <Color Name="LabelColor" Color="{styles:Styles.SettingsTextActive}"/>
+    </Properties>
+  </UI>
+
+  
+  
+  
+  <UI Name="Label" Base="core:Label">
+    <Properties>
+      <styles:Style Name="Style" Color="{styles:Styles.SettingsTextActive}" Font="{styles:Styles.SettingsTextSubHeader}"/>
+    </Properties>
+  </UI>
+
+  
+  
+  
+  <UI Name="Link" Base="core:Button">
+    <Properties>
+      <style:Style Name="OverrideStyle" Style="{styles:SharedStyles.ExternalLinkStyle}"/>
+    </Properties>
+  </UI>
+
+
+  
+  
+  
+  <UI Name="SelectableCategoryList" Base="core:RadioGroup">
+    <Content Name="RadioButton">
+      <me:MenuButton
+        Available="{AvailableChoice}" 
+        Model="{Model}" 
+        OverrideStyle="{styles:SharedStyles.MgmtMenuItemStyle}"
+        Option="{RepeatedItem}" 
+        BoxNonFocusImage="{null}"
+        BoxCheckedImage="{styles:Styles.LeftMenuSelectArrow}"
+        BoxDisabledImage="{null}"
+        BoxSize="4,7"
+        >
+        <Animations>
+          <TransformByAttributeAnimation TransformByAttributeAnimation="{animations:Animations.GalleryIndexFade}"/>
+        </Animations>
+      </me:MenuButton>          
+    </Content>
+  </UI>
+
+  <UI Name="MenuButton" Base="core:RadioButton">
+    <Scripts>
+      <Script>Box.Margins = new Inset(0,2,3,0);</Script>
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  <UI Name="ReadOnlyCategoryList">
+    <Properties>
+      <iris:Choice Name="Model" Choice="$Required"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+        if ([Model] != null)
+        {
+          Repeater.Source = Model.Options;
+        }
+      </Script>      
+    </Scripts>
+    
+    <Content>
+      <Panel Name="RootPanel" Layout="VerticalFlow">
+        <Children>
+          <Repeater Name="Repeater" ContentName="MenuItem">
+            <Layout>
+              <FlowLayout Orientation="Vertical" Spacing="5,0" ItemAlignment="Near" AllowWrap="true"/>
+            </Layout>
+          </Repeater>
+
+        </Children>
+      </Panel>
+    </Content>
+
+    <Content Name="MenuItem">
+      <me:ReadOnlyCategory Model="{Model}" Option="{RepeatedItem}"/>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="ReadOnlyCategory">
+    <Properties>
+      <iris:Choice Name="Model" Choice="$Required"/>
+      <Boolean Name="WordWrap" Boolean="true"/>
+      <Object Name="Option" Object="$Required"/>
+
+      
+      <style:Style Name="OverrideStyle" Style="{null}"/>
+      <style:Style Name="BaseStyle" Style="{styles:SharedStyles.MgmtMenuItemStyle}"/>
+    </Properties>
+
+    <Locals>
+      <style:StatefulCompositeStyle Name="Style" Base="{BaseStyle}"/>
+    </Locals>
+
+    <Scripts>
+      
+      <Script>Style.Override = [OverrideStyle];</Script>
+
+      
+      <Script>
+        Style.State.Selected = ([Model.Chosen] == Option);
+        Label.ShowArrow = Style.State.Selected;
+      </Script>
+
+      <Script>
+        if ([Option] is String)
+        {
+          Label.Content = (String)Option;
+        }
+        else if (Option is iris:ModelItem)
+        {
+          Label.Content = ((iris:ModelItem)Option).Description;
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      
+      <lwa:LabelWithArrow Name="Label" Style="{Style}" WordWrap="{WordWrap}"/>
+      
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="Background" Base="page:PageBase">
+    <Properties>
+      <zune:Shell Name="Shell" Shell="$Required"/>
+      <zune:CategoryPage Name="Page" CategoryPage="$Required"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+        MainBackground.Content = new Image([zune:Management.Instance.BackgroundImage], styles:Styles.BackgroundMargins);
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Graphic
+        Name="MainBackground"
+        Layout="Fill"
+        ErrorImage="{styles:Styles.DefaultBackgroundImage}"
+        >
+        <Animations>
+          <Animation Type="ContentChangeHide">
+            <Keyframes>
+              <AlphaKeyframe Time="0.0" Value="1.0" Interpolation="Linear"/>
+              <AlphaKeyframe Time="0.25" Value="0.0"/>
+            </Keyframes>
+          </Animation>
+
+          <Animation Type="ContentChangeShow">
+            <Keyframes>
+              <AlphaKeyframe Time="0.0" Value="1.0"/>
+              <AlphaKeyframe Time="0.25" Value="1.0"/>
+            </Keyframes>
+          </Animation>
+        </Animations>
+        
+      </Graphic>
+    </Content>
+  </UI>
+  
+</UIX>
diff --git a/test/2.1/MANAGEMENTACCOUNT.UIX b/test/2.1/MANAGEMENTACCOUNT.UIX
new file mode 100644
index 0000000..c161612
--- /dev/null
+++ b/test/2.1/MANAGEMENTACCOUNT.UIX
@@ -0,0 +1,134 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:svc="assembly://ZuneDBApi/Microsoft.Zune.Service"
+  xmlns:mctl="res://ZuneMarketplaceResources!Controls.uix"
+  xmlns:sys="assembly://mscorlib/System"
+  xmlns:zuneshell="assembly://ZuneShell/Microsoft.Zune.Shell"
+  xmlns:mgmt="res://ZuneShellResources!Management.uix"
+  xmlns:signin="res://ZuneShellResources!SignInDialog.uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix">
+
+  <UI Name="Default">
+    <Properties>
+      <zune:CategoryPage Name="Page" CategoryPage="$Required" />
+    </Properties>
+
+    <Locals>
+      <zune:Shell Name="Shell" Shell="{(zune:Shell)zune:ZuneShell.DefaultInstance}"/>
+      <zune:SignIn Name="SignIn" SignIn="{zune:SignIn.Instance}"/>
+
+      <zune:ShellCommand Name="AcctMgmtLink" Description="{zune:Shell.LoadString(zune:StringId.IDS_CONTEXT_ACCTMGMT_MENUITEM)}"/>
+      <zune:ShellCommand Name="PrivacySettingsLink" Description="{zune:Shell.LoadString(zune:StringId.IDS_CONTEXT_PRIVACYSETTINGS_MENUITEM)}"/>
+      <zune:ShellCommand Name="ZunePassLink" Description="{zune:Shell.LoadString(zune:StringId.IDS_CONTEXT_ZUNEPASS_MENUITEM)}"/>
+      <zune:ShellCommand Name="PurchasePointsLink" Description="{zune:Shell.LoadString(zune:StringId.IDS_CONTEXT_PURCHPOINTS_MENUITEM)}"/>
+      <zune:ShellCommand Name="RedeemCodeLink" Description="{zune:Shell.LoadString(zune:StringId.IDS_CONTEXT_REDEEMCODE_MENUITEM)}"/>
+
+      <iris:Command Name="SignOutCommand" Description="{zune:Shell.LoadString(zune:StringId.IDS_SIGN_OUT_BUTTON)}"/>
+      <iris:Command Name="SignInCommand" Description="{zune:Shell.LoadString(zune:StringId.IDS_LOGON_BUTTON)}"/>
+
+      <Boolean Name="ServiceEndpointsInitialized"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(SignIn.SignedIn)]
+        [DeclareTrigger(SignIn.ZuneTag)]
+        [DeclareTrigger(SignIn.PointsBalance)]
+
+        bool signedIn = SignIn.SignedIn;
+        AccountMgmtPanel.Visible = signedIn;
+        MustLogOnPanel.Visible = !signedIn;
+
+        if (signedIn)
+        {
+          ZuneTagButton.Content       = SignIn.ZuneTag;
+          PointsBalanceButton.Content = sys:String.Format(zune:Shell.LoadString(zune:StringId.IDS_POINTS_TOTAL_FORMAT), SignIn.PointsBalance);
+        }
+
+        if (zuneshell:ZuneApplication.Service.BlockExplicitContent())
+        {
+          PrivacySettingsLink.Description = zune:Shell.LoadString(zune:StringId.IDS_CONTEXT_FAMILYSETTINGS_MENUITEM);
+        }
+        else
+        {
+          PrivacySettingsLink.Description = zune:Shell.LoadString(zune:StringId.IDS_CONTEXT_PRIVACYSETTINGS_MENUITEM);
+        }
+
+      </Script>
+
+      <Script>
+        <![CDATA[
+        if (!ServiceEndpointsInitialized)
+        {
+          ServiceEndpointsInitialized = true;
+          String acctendpoint = svc:Service.GetEndPointUri(svc:EServiceEndpointId.SEID_AccountManagement);
+          string netendpoint = svc:Service.GetEndPointUri(svc:EServiceEndpointId.SEID_ZuneNet);
+          string returnurl = "/social/articles/backtosoftware.htm";
+
+          AcctMgmtLink.Command        = "Web\" + acctendpoint + "/en-US/client/AccountManagement.ashx?ru=" + netendpoint + returnurl + "&aru=" + netendpoint + returnurl;
+          PrivacySettingsLink.Command = "Web\" + acctendpoint + "/en-US/client/PrivacySettings.ashx?ru=" + netendpoint + returnurl + "&aru=" + netendpoint + returnurl;
+          ZunePassLink.Command        = "Web\" + acctendpoint + "/en-US/client/BuyZunePass.ashx?ru=" + netendpoint + returnurl + "&aru=" + netendpoint + returnurl;
+          PurchasePointsLink.Command  = "Web\" + acctendpoint + "/en-US/client/BuyPoints.ashx?ru=" + netendpoint + returnurl + "&aru=" + netendpoint + returnurl;
+          RedeemCodeLink.Command      = "Web\" + acctendpoint + "/en-US/client/RedeemCode.ashx?ru=" + netendpoint + returnurl + "&aru=" + netendpoint + returnurl;
+        }
+        ]]>
+      </Script>
+      
+      <Script>
+        [DeclareTrigger(SignInCommand.Invoked)]
+        SignIn.CancelSignIn();
+        signin:SignInDialog signInDlg = new signin:SignInDialog();
+        signInDlg.Helper.Show(signInDlg);
+      </Script>
+
+      <Script>
+        [DeclareTrigger(SignOutCommand.Invoked)]
+        SignIn.SignOut();
+      </Script>
+
+    </Scripts>
+
+    <Content>
+      <Panel Layout="VerticalFlow" MaximumSize="580,0">
+        <Children>
+          <Panel Name="MustLogOnPanel" Layout="VerticalFlow" MaximumSize="580,0">
+            <Children>
+              <Text Content="{zune:Shell.LoadString(zune:StringId.IDS_ACCOUNT_MUST_LOGON_TEXT)}" Color="{styles:Styles.SettingsTextActive}" Font="{styles:Styles.SettingsText}" WordWrap="true" Padding="0,0,0,15"/>
+              <core:ActionButton Name="SignInButton" Model="{SignInCommand}" />
+            </Children>
+          </Panel>
+
+          <Panel Name="AccountMgmtPanel" Layout="VerticalFlow" MaximumSize="580,0">
+            <Children>
+              <Panel Layout="HorizontalFlow">
+                <Children>
+                  <mgmt:Label Name="ZuneTagButton" />
+                  <mgmt:Label Content=" (" />
+                  <mgmt:Label Name="PointsBalanceButton" />
+                  <Graphic Content="{styles:Styles.Points}" SizingPolicy="SizeToContent" Margins="3,10,0,0"/>
+                  <mgmt:Label Content=")" />
+                </Children>
+              </Panel>
+              <core:ActionButton Model="{SignOutCommand}" Padding="0,5,0,0" />
+
+              <mgmt:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_ZUNE_ACCOUNT_HEADER)}" Margins="0,10,0,3" />
+              <mctl:ExternalLink Name="AcctMgmtButton" Model="{AcctMgmtLink}" IconMargin="7,1,0,0" OverrideStyle="{styles:SharedStyles.ZuneNetLinkStyle}"/>
+              <mctl:ExternalLink Name="PrivacySettingsButton" Model="{PrivacySettingsLink}" IconMargin="7,1,0,0" OverrideStyle="{styles:SharedStyles.ZuneNetLinkStyle}"/>
+
+              <mgmt:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_ZUNE_MARKETPLACE_HEADER)}" Margins="0,10,0,3" />
+              <mctl:ExternalLink Name="ZunePassButton" Model="{ZunePassLink}" IconMargin="7,1,0,0" OverrideStyle="{styles:SharedStyles.ZuneNetLinkStyle}"/>
+              <mctl:ExternalLink Name="PurchasePointsButton" Model="{PurchasePointsLink}" IconMargin="7,1,0,0" OverrideStyle="{styles:SharedStyles.ZuneNetLinkStyle}"/>
+              <mctl:ExternalLink Name="RedeemCodeButton" Model="{RedeemCodeLink}" IconMargin="7,1,0,0" OverrideStyle="{styles:SharedStyles.ZuneNetLinkStyle}"/>
+            </Children>
+          </Panel>
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+</UIX>
diff --git a/test/2.1/MANAGEMENTBURN.UIX b/test/2.1/MANAGEMENTBURN.UIX
new file mode 100644
index 0000000..fcab05e
--- /dev/null
+++ b/test/2.1/MANAGEMENTBURN.UIX
@@ -0,0 +1,49 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:mgmt="res://ZuneShellResources!Management.uix">
+
+  <UI Name="Default">
+    <Properties>
+      <zune:CategoryPage Name="Page" CategoryPage="$Required" />
+    </Properties>
+    <Locals>
+      <zune:Management Name="Management" Management="{zune:Management.Instance}"/>
+    </Locals>
+
+    <Content>
+      <Panel>
+        <Children>
+
+          <Panel>
+            <Layout>
+              <FlowLayout Orientation="Vertical" Spacing="4,0" StripAlignment="Near" ItemAlignment="Near"/>
+            </Layout>
+            <Children>
+
+              <mgmt:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_BURN_FORMAT_HEADER)}" WordWrap="false"/>
+              <core:RadioGroup 
+                AccessibleDescription="{zune:Shell.LoadString(zune:StringId.IDS_BURN_FORMAT_HEADER)}"
+                Model="{Management.BurnFormat}"
+                />
+              <mgmt:CheckBox Model="{Management.AutoEjectCDAfterBurn}" Margins="0,15,0,0"/>
+
+              <mgmt:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_BURN_SPEED_HEADER)}" WordWrap="false" Margins="0,15,0,0"/>
+
+              <core:RadioGroup 
+                Padding="0,0,0,15" 
+                AccessibleDescription="{zune:Shell.LoadString(zune:StringId.IDS_BURN_SPEED_HEADER)}"
+                Model="{Management.BurnSpeed}"
+                />
+
+            </Children>
+          </Panel>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/MANAGEMENTCOLLECTION.UIX b/test/2.1/MANAGEMENTCOLLECTION.UIX
new file mode 100644
index 0000000..749adec
--- /dev/null
+++ b/test/2.1/MANAGEMENTCOLLECTION.UIX
@@ -0,0 +1,207 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:style="res://ZuneShellResources!Style.uix"  
+  xmlns:mgmt="res://ZuneShellResources!Management.uix"
+  xmlns:button="res://ZuneShellResources!Button.uix"
+  xmlns:me="Me">
+
+  <UI Name="Default">
+    <Properties>
+      <zune:CategoryPage Name="Page" CategoryPage="$Required" />
+    </Properties>
+    <Locals>
+      <SharedSize Name="ButtonSharedSize"/>
+      <styles:LabelStyle Name="StyleDetail" Color="{styles:Styles.TextActive}" Font="{styles:Styles.SettingsText}"/>
+      <iris:Command Name="RestoreFilesCommand" Description="{zune:Shell.LoadString(zune:StringId.IDS_SCAN_REMOVED_FILES_BUTTON)}"/>      
+</Locals>
+
+    <Scripts>
+      <Script>
+        MetadataOptions.Available = [MediaInfoCheckbox.Model.Value] ;
+      </Script>
+      <Script>
+        [DeclareTrigger(RestoreFilesCommand.Invoked)]
+        
+        
+        zune:Management.Instance.ScanAndClearDeletedMedia();
+      </Script>
+    </Scripts>
+    
+    <Content>
+
+      <Panel Name="NavButtons">
+        <Layout>
+          <FlowLayout Orientation="Vertical" Spacing="4,0" StripAlignment="Near" />
+        </Layout>
+        <Children>
+          <mgmt:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_MONITORED_FOLDERS_LIST)}" WordWrap="false"/>
+          
+          <core:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_MONITOR_DESCRIPTION)}" Style="{styles:SharedStyles.SettingsBodyStyle}" WordWrap="true" Padding="0,0,0,10"/>
+
+          <Panel Layout="Anchor">
+            <Children>
+              <me:MonitoredFolders Margins="0,10,20,0" 
+                Header="{zune:Shell.LoadString(zune:StringId.IDS_COLLECTION_AUDIO)}" 
+                ButtonSharedSize="{ButtonSharedSize}" 
+                List="{zune:Management.Instance.MonitoredAudioFolders}">
+                <LayoutInput>
+                  <AnchorLayoutInput Top="Parent,0" Right="Parent,.5,-10"  />
+                </LayoutInput>
+              </me:MonitoredFolders>
+
+              <me:MonitoredFolders Margins="0,10,20,0" 
+                Header="{zune:Shell.LoadString(zune:StringId.IDS_COLLECTION_VIDEO)}" 
+                ButtonSharedSize="{ButtonSharedSize}" 
+                List="{zune:Management.Instance.MonitoredVideoFolders}">
+                <LayoutInput>
+                  <AnchorLayoutInput Top="Parent,0" Left="Parent,0.5,10" Right="Parent,1" />
+                </LayoutInput>
+              </me:MonitoredFolders>
+                
+            </Children>
+          </Panel>
+
+          <Panel Margins="0,0,0,15" Layout="Anchor">
+            <Children>
+              <me:MonitoredFolders Margins="0,10,20,0" 
+                Header="{zune:Shell.LoadString(zune:StringId.IDS_COLLECTION_PHOTO)}" 
+                ButtonSharedSize="{ButtonSharedSize}" 
+                List="{zune:Management.Instance.MonitoredPhotoFolders}">
+                <LayoutInput>
+                  <AnchorLayoutInput Top="Parent,0" Right="Parent,.5,-10"  />
+                </LayoutInput>
+              </me:MonitoredFolders>                
+
+              <me:MonitoredFolders Margins="0,10,20,0" 
+                Header="{zune:Shell.LoadString(zune:StringId.IDS_COLLECTION_PODCAST)}" 
+                ButtonSharedSize="{ButtonSharedSize}" 
+                List="{zune:Management.Instance.MonitoredPodcastFolders}">
+                <LayoutInput>
+                  <AnchorLayoutInput Top="Parent,0" Left="Parent,0.5,10" Right="Parent,1" />
+                </LayoutInput>
+              </me:MonitoredFolders>
+
+            </Children>
+          </Panel>
+
+          <Panel Margins="0,8,0,15" Layout="HorizontalFlow" Visible="{!Page.InFUE}">
+            <Children>
+              <core:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_SCAN_REMOVED_FILES)}" Style="{styles:SharedStyles.SettingsBodyStyle}" WordWrap="true" Padding="0,0,0,10"/>
+              <core:ActionButton Name="RestoreFilesButton" Model="{RestoreFilesCommand}" TileMinSize="90,0" />
+            </Children>
+          </Panel>
+
+          <mgmt:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_COLLECTION_OPTIONS_HEADER)}" WordWrap="false"/>
+
+          <mgmt:CheckBox Name="MediaInfoCheckbox" Model="{zune:Management.Instance.MediaInfoChoice}"/>
+          <core:RadioGroup Name="MetadataOptions" 
+                           Model="{zune:Management.Instance.MetadataChoice}"
+                           AccessibleDescription="{zune:Shell.LoadString(zune:StringId.IDS_COLLECTION_OPTIONS_HEADER)}" 
+                           Margins="15,0,0,15"/>
+          
+        </Children>
+      </Panel>
+
+    </Content>
+  </UI>
+
+  <UI Name="MonitoredFolders">
+    <Properties>
+      <String Name="Header" String="$Required"/>
+      <iris:ListDataSet Name="List" ListDataSet="$Required"/>
+      <SharedSize Name="ButtonSharedSize" SharedSize="$Required"/>
+    </Properties>
+
+    <Content>
+      
+      <Panel Layout="VerticalFlow">
+        <Children>
+
+          <me:MonitoredFolderItem String="{Header}" List="{List}" Style="{styles:SharedStyles.MonitoredFoldersHeadersStyle}" ButtonSharedSize="{ButtonSharedSize}"/>
+
+          <Repeater Source="{List}">
+            <Layout>
+              <FlowLayout Orientation="Vertical"/>
+            </Layout>
+            <Content>
+              
+              <me:MonitoredFolderItem String="{(String)RepeatedItem}" List="{List}" Index="{RepeatedItemIndex}" ButtonSharedSize="{ButtonSharedSize}"/>
+              
+            </Content>
+          </Repeater>
+          
+        </Children>
+      </Panel>
+      
+    </Content>
+  </UI>
+
+  
+    
+  
+  
+  
+  <UI Name="MonitoredFolderItem">
+    <Properties>
+      <String Name="String" String="$Required"/>
+      <iris:ListDataSet Name="List" ListDataSet="$Required"/>
+      <Index Name="Index" Index="{null}"/>
+      <SharedSize Name="ButtonSharedSize" SharedSize="$Required"/>
+      <style:Style Name="Style" Style="{styles:SharedStyles.MonitoredFoldersLabelStyle}"/>      
+    </Properties>
+
+    <Locals>
+      <iris:Command Name="Command">
+        <Description>
+          <Script>
+            if (Index != null)
+              return zune:Shell.LoadString(zune:StringId.IDS_REMOVE_FOLDER_BUTTON);
+            return zune:Shell.LoadString(zune:StringId.IDS_ADD_FOLDER_BUTTON);
+          </Script>
+        </Description>
+      </iris:Command>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        [DeclareTrigger(Command.Invoked)]
+        if (Index != null)
+          zune:Management.Instance.RemoveMonitoredFolder(List, Index.SourceValue);
+        else
+          zune:Management.Instance.AddMonitoredFolder(List);
+      </Script>   
+      <Script>
+        if (Index != null)
+          ContentLabel.Content = zune:Shell.ReformatFolderPathName(String);
+        else
+          ContentLabel.Content = String;          
+        ContentLabel.ToolTipContent = String;
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Padding="0,1,0,1">
+        <Layout>
+          <DockLayout SizeToChildren="true" DefaultLayoutInput="Left,Near"/>
+        </Layout>
+        <Children>
+
+          <core:ActionButton Model="{Command}" SharedSize="{ButtonSharedSize}" TileMinSize="90,0">
+            <LayoutInput>
+              <DockLayoutInput Position="Right" Alignment="Near"/>
+            </LayoutInput>
+          </core:ActionButton>
+
+          <button:Label Name="ContentLabel" Style="{Style}"/>
+          
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/MANAGEMENTDEVICELIST.UIX b/test/2.1/MANAGEMENTDEVICELIST.UIX
new file mode 100644
index 0000000..034b459
--- /dev/null
+++ b/test/2.1/MANAGEMENTDEVICELIST.UIX
@@ -0,0 +1,110 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:spreadsheet="res://ZuneShellResources!SpreadSheetViewBase.uix"
+  xmlns:zunepia="assembly://ZuneDBApi/Microsoft.Zune.Configuration"
+  xmlns:me="Me">
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  <Class Name="DeviceListModel" Base="spreadsheet:SpreadSheetListModel">
+    <Properties>
+      <zune:Management Name="Instance" Management="{null}"/>
+    </Properties>
+  </Class>
+  
+  
+  
+  
+  <UI Name="DeviceListView" Base="spreadsheet:SpreadSheet">
+    <Properties>
+      <Boolean Name="ShowHeaders" Boolean="false"/>
+      <String Name="ListTitle" String="$Required"/>
+      
+      <Size Name="RowSize" Size="0,28"/>
+      
+      <spreadsheet:ColumnData Name="ColumnData">
+        <Columns>
+          
+          
+          <spreadsheet:ColumnInfo Header="{ListTitle}"
+              CellType="{typeof(me:DeviceNameCell)}">
+            <ColumnSize>
+              <SharedSize Size="160,0" MinimumSize="65,0" MaximumSize="160,0"/>
+            </ColumnSize>
+          </spreadsheet:ColumnInfo>
+
+          
+          <spreadsheet:ColumnInfo Header="{zune:Shell.LoadString(zune:StringId.IDS_REGDEVICES_LASTUSED_COLUMN_HEADER)}"
+              CellType="{typeof(me:DeviceFirstUsedDateCell)}">
+            <ColumnSize>
+              <SharedSize Size="160,0" MinimumSize="35,0" MaximumSize="160,0"/>
+            </ColumnSize>
+          </spreadsheet:ColumnInfo>
+          
+          
+          <spreadsheet:ColumnInfo Header="{zune:Shell.LoadString(zune:StringId.IDS_BLANK_COLUMN_HEADER)}"
+              CellType="{typeof(me:DeviceRemoveActionCell)}">
+            <ColumnSize>
+              <SharedSize Size="100,0" MinimumSize="100,0" MaximumSize="100,0"/>
+            </ColumnSize>
+          </spreadsheet:ColumnInfo>
+          
+        </Columns>
+      </spreadsheet:ColumnData>
+      
+      <zune:Management Name="Instance" Management="$Required"/>
+      <me:DeviceListModel Name="ListModel" Instance="{Instance}"/>
+    </Properties>
+  </UI>
+  
+  
+  
+  
+  <UI Name="DeviceNameCell" Base="spreadsheet:LabelCell">
+    <Properties>
+      <zunepia:RegDeviceInfo Name="Model" RegDeviceInfo="$Required"/>
+    </Properties>
+    <Scripts>
+      <Script>Content = Model.DeviceName;</Script>
+    </Scripts>
+  </UI>
+  
+  
+  
+  
+  <UI Name="DeviceFirstUsedDateCell" Base="spreadsheet:LongDateTimeCell">
+    <Properties>
+      <zunepia:RegDeviceInfo Name="Model" RegDeviceInfo="$Required"/>
+    </Properties>
+    <Scripts>
+      <Script>Date = Model.DateLastUsed;</Script>
+    </Scripts>
+  </UI>
+  
+  
+  
+  
+  <UI Name="DeviceRemoveActionCell" Base="spreadsheet:ActionButtonCell">
+    <Properties>
+      <zunepia:RegDeviceInfo Name="Model" RegDeviceInfo="$Required"/>
+      <iris:Command Name="Command" Description="{zune:Shell.LoadString(zune:StringId.IDS_REGDEVICES_REMOVE_BUTTON)}"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+        [DeclareTrigger(Command.Invoked)]
+        ((me:DeviceListModel)ListModel).Instance.RemoveDevice(Model);
+      </Script>
+    </Scripts>
+  </UI>
+</UIX>
diff --git a/test/2.1/MANAGEMENTDEVICES.UIX b/test/2.1/MANAGEMENTDEVICES.UIX
new file mode 100644
index 0000000..2e0c0d1
--- /dev/null
+++ b/test/2.1/MANAGEMENTDEVICES.UIX
@@ -0,0 +1,94 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:signin="res://ZuneShellResources!SignInDialog.uix"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:mgmt="res://ZuneShellResources!Management.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:devicelist="res://ZuneShellResources!ManagementDeviceList.uix">
+
+  
+  
+  
+  <UI Name="Default">
+    <Properties>
+      <zune:CategoryPage Name="Page" CategoryPage="$Required" />
+    </Properties>
+    <Locals>
+      <zune:SignIn Name="SignIn" SignIn="{zune:SignIn.Instance}"/>
+      <iris:Command Name="SignInCommand" Description="{zune:Shell.LoadString(zune:StringId.IDS_LOGON_BUTTON)}"/>
+    </Locals>
+
+    <Scripts>
+      
+      <Script>
+        [DeclareTrigger(SignInCommand.Invoked)]
+        SignIn.CancelSignIn();
+        signin:SignInDialog signInDlg = new signin:SignInDialog();
+        signInDlg.Helper.Show(signInDlg);
+      </Script>
+
+      
+      <Script>
+        bool signedIn = [SignIn.SignedIn];
+        DeviceListsPanel.Visible = signedIn;
+        MustLogOnPanel.Visible = !signedIn;
+      </Script>
+
+      <Script>
+        
+        
+        if ([SignIn.SignedIn])
+        {
+            zune:Management.Instance.RefreshDeviceList();
+        }
+      </Script>
+      
+    </Scripts>
+    
+    <Content>
+      <Panel Layout="VerticalFlow" MaximumSize="580,0">
+        <Children>
+          <mgmt:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_REGDEVICES_HEADER_TEXT)}" WordWrap="true"/>
+
+          <Text Content="{zune:Shell.LoadString(zune:StringId.IDS_REGDEVICES_PAGE_TEXT)}" Color="{styles:Styles.SettingsTextActive}" Font="{styles:Styles.SettingsText}" WordWrap="true" Padding="0,0,0,15"/>
+
+          
+          
+          <Panel Name="MustLogOnPanel" Layout="VerticalFlow">
+            <Children>
+
+              <Text Content="{zune:Shell.LoadString(zune:StringId.IDS_REGDEVICES_MUST_LOGON_TEXT)}" Color="{styles:Styles.SettingsTextActive}" Font="{styles:Styles.SettingsText}" WordWrap="true" Padding="0,0,0,15"/>
+
+              <core:ActionButton Name="SignInButton" Model="{SignInCommand}" KeyInteractiveNStuff="false"/>
+
+            </Children>
+          </Panel>
+
+          
+          <Panel Name="DeviceListsPanel" Layout="VerticalFlow">
+            <Children>
+
+              
+              
+              <devicelist:DeviceListView Name="PCListView" ListTitle="{zune:Shell.LoadString(zune:StringId.IDS_REGDEVICES_COMPUTERS_COLUMN_HEADER)}" Content="{zune:Management.Instance.ComputerList}" Instance="{zune:Management.Instance}"
+                    MaximumSize="440,140" ShowHeaders="true" Margins="-10,0,0,0">
+              </devicelist:DeviceListView>
+
+              
+              
+              <devicelist:DeviceListView Name="DeviceListView" ListTitle="{zune:Shell.LoadString(zune:StringId.IDS_REGDEVICES_DEVICES_COLUMN_HEADER)}" Content="{zune:Management.Instance.DeviceList}" Instance="{zune:Management.Instance}"
+                    MaximumSize="440,140" ShowHeaders="true" Margins="-10,0,0,0">
+              </devicelist:DeviceListView>
+
+            </Children>
+          </Panel>
+    
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/MANAGEMENTDISPLAY.UIX b/test/2.1/MANAGEMENTDISPLAY.UIX
new file mode 100644
index 0000000..acc624a
--- /dev/null
+++ b/test/2.1/MANAGEMENTDISPLAY.UIX
@@ -0,0 +1,127 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI" 
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:mgmt="res://ZuneShellResources!Management.uix"
+  >
+
+  <UI Name="Default">
+    <Properties>
+      <zune:CategoryPage Name="Page" CategoryPage="$Required" />
+    </Properties>
+
+    <Locals>
+      <iris:Choice Name="BackgroundChoice" Options="{styles:Styles.FrameBackgrounds}" ChosenIndex="{styles:Styles.DefaultBackgroundIndex}"/>
+      
+      <iris:Command Name="AccelerationButtonModel"/>
+
+      <styles:LabelStyle Name="StyleWarn" Color="{styles:Styles.TextActive}" Font="{styles:Styles.SettingsText}"/>
+    </Locals>
+
+    <Scripts>
+      
+      <Script>
+        string backgroundImage = zune:Management.Instance.BackgroundImage;
+        foreach (zune:NamedStringOption option in (List)BackgroundChoice.Options)
+        {
+          if (option.Value == backgroundImage)
+          {
+            BackgroundChoice.Chosen = option;
+          }
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(BackgroundChoice.Chosen)]
+        
+        zune:BackgroundOption backgroundOption = (zune:BackgroundOption)[BackgroundChoice.Chosen];
+        
+        zune:Management.Instance.BackgroundImage = backgroundOption.Value;
+        zune:Management.Instance.BackgroundColor = backgroundOption.Color;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(AccelerationButtonModel.Invoked)]
+        if (zune:Management.Instance.ForceGDIMode)
+        {
+            
+            zune:Management.Instance.ReevaluateVideoAccelerationPrompt();
+        }
+        else
+        {
+            
+            zune:MessageBox.Show(zune:Shell.LoadString(zune:StringId.IDS_ACCELERATION_RESTART_HEADER), zune:Shell.LoadString(zune:StringId.IDS_ACCELERATION_RESTART_TEXT), null);
+            zune:Management.Instance.ForceGDIMode = true;
+        }
+      </Script>
+
+      
+
+      <Script>
+        VideoAccelerationButton.InputEnabled = !((iris:Application.RenderingType == iris:RenderingType.GDI) &amp;&amp; 
+                                                !([zune:Management.Instance.ForceGDIMode]));
+      </Script>
+
+      
+      <Script> 
+        bool showAnimationOptions = true;
+
+        if ([zune:Management.Instance.ForceGDIMode] || (iris:Application.RenderingType == iris:RenderingType.GDI))
+        {
+            showAnimationOptions = false;
+            AccelerationButtonModel.Description = zune:Shell.LoadString(zune:StringId.IDS_ACCELERATION_BUTTON_ENABLE);
+        }
+        else
+        {
+            AccelerationButtonModel.Description = zune:Shell.LoadString(zune:StringId.IDS_ACCELERATION_BUTTON_DISABLE);
+        }
+        
+        AnimationTitle.Visible = showAnimationOptions;
+        AmbientAnimationsCheckbox.Visible = showAnimationOptions;        
+      </Script>
+
+      <Script>
+      </Script>
+    </Scripts>
+    
+    
+    <Content>
+      <Panel>
+        <Children>
+
+          <Panel>
+            <Layout>
+              <FlowLayout Orientation="Vertical" Spacing="6,0" StripAlignment="Near" ItemAlignment="Near"/>
+            </Layout>
+            <Children>
+              
+              
+              <mgmt:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_BACKGROUND_TITLE)}" />
+
+              <core:RadioGroup 
+                AccessibleDescription="{zune:Shell.LoadString(zune:StringId.IDS_BACKGROUND_TITLE)}"
+                Model="{BackgroundChoice}"
+                />
+              
+              
+              <mgmt:Label Name="AnimationTitle" Content="{zune:Shell.LoadString(zune:StringId.IDS_AMBIENTANIMATIONS_TITLE)}" Margins="0,15,0,0"/>
+              
+              <mgmt:CheckBox Name="AmbientAnimationsCheckbox" Model="{zune:Management.Instance.AmbientAnimations}"/>
+              
+              
+              <mgmt:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_ENABLE_ACCELERATION_TITLE)}" Margins="0,15,0,0"/>
+
+              <core:ActionButton Name="VideoAccelerationButton" Model="{AccelerationButtonModel}" Padding="-2,0,0,0"/>
+
+            </Children>
+          </Panel>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+</UIX>
diff --git a/test/2.1/MANAGEMENTFILETYPES.UIX b/test/2.1/MANAGEMENTFILETYPES.UIX
new file mode 100644
index 0000000..5791dcf
--- /dev/null
+++ b/test/2.1/MANAGEMENTFILETYPES.UIX
@@ -0,0 +1,74 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:mgmt="res://ZuneShellResources!Management.uix"
+  xmlns:me="Me">
+
+  <UI Name="Default">
+    <Properties>
+      <zune:CategoryPage Name="Page" CategoryPage="$Required" />
+    </Properties>
+    <Locals>
+      <iris:Command Name="SelectAllButtonModel" Description="{zune:Shell.LoadString(zune:StringId.IDS_SELECT_ALL_BUTTON)}"/>
+    </Locals>
+
+    <Scripts>
+      
+      <Script>
+        [DeclareTrigger(SelectAllButtonModel.Invoked)]
+        zune:Management.Instance.SelectAllFileTypes();
+      </Script>
+
+      <Script>
+        SelectAllButtonModel.Available = [zune:Management.Instance.CanFileAssociationBeChanged];
+      </Script>
+     
+    </Scripts>
+    
+    <Content>
+      <Panel Name="NavButtons">
+        <Layout>
+          <FlowLayout Orientation="Vertical" Spacing="4,0" StripAlignment="Near"/>
+        </Layout>
+        <Children>
+
+          <Text Content="{zune:Shell.LoadString(zune:StringId.IDS_FILE_TYPES_DESCRIPTION)}" Color="{styles:Styles.TextActive}" Font="{styles:Styles.SettingsText}" WordWrap="true" Padding="0,0,0,15"/>
+
+          
+          <Repeater Source="{zune:Management.Instance.FileTypes}" Name="FileType">
+            <Layout>
+              <FlowLayout Orientation="Vertical" Spacing="4,0" StripAlignment="Near"/>
+            </Layout>
+            <Content>
+              <me:FileTypeCheckbox CheckboxItem="{(zune:BooleanInputChoice)RepeatedItem}"/>
+            </Content>
+          </Repeater>
+
+          <core:ActionButton Model="{SelectAllButtonModel}" Padding="0,5,0,15"/>
+          
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  <UI Name="FileTypeCheckbox">
+    <Properties>
+      <zune:BooleanInputChoice Name="CheckboxItem" BooleanInputChoice="$Required"/>
+    </Properties>
+
+    <Content>
+      <Panel>
+        <Children>
+
+          <mgmt:CheckBox Model="{CheckboxItem}" Available="{CheckboxItem.Available}"/>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/MANAGEMENTGENERAL.UIX b/test/2.1/MANAGEMENTGENERAL.UIX
new file mode 100644
index 0000000..6c27022
--- /dev/null
+++ b/test/2.1/MANAGEMENTGENERAL.UIX
@@ -0,0 +1,102 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI" 
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:mgmt="res://ZuneShellResources!Management.uix"
+  xmlns:about="res://ZuneShellResources!AboutDialog.uix">
+
+  <UI Name="Default">
+    <Properties>
+      <zune:CategoryPage Name="Page" CategoryPage="$Required" />
+    </Properties>
+    <Locals>
+      <iris:Command Name="ChangeButtonModel" Description="{zune:Shell.LoadString(zune:StringId.IDS_MEDIA_FOLDER_BUTTON)}"/>
+      <iris:Command Name="CheckNowButtonModel" Description="{zune:Shell.LoadString(zune:StringId.IDS_CHECK_FOR_UPDATE_BUTTON)}"/>
+      <iris:Command Name="ResetWarningMessageButtonModel" Description="{zune:Shell.LoadString(zune:StringId.IDS_RESET_WARNINGS_BUTTON)}"/>      
+      <iris:Command Name="AboutZuneModel" Description="{zune:Shell.LoadString(zune:StringId.IDS_ABOUT)}"/>
+      <about:AboutDialog Name="AboutDialog"/>
+      <styles:LabelStyle Name="StyleWarn" Color="{styles:Styles.TextActive}" Font="{styles:Styles.SettingsText}"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        [DeclareTrigger(ChangeButtonModel.Invoked)]
+        zune:Management.Instance.ChooseMediaFolder();
+      </Script>
+      
+      <Script>MediaFolderPath.Content=[zune:Management.Instance.MediaFolder];</Script>
+      <Script>
+        [DeclareTrigger(ResetWarningMessageButtonModel.Invoked)]
+        zune:Management.Instance.ResetWarningMessages();
+      </Script>
+      
+      
+      <Script>
+        [DeclareTrigger(CheckNowButtonModel.Invoked)]
+        zune:SoftwareUpdates.Instance.CheckForUpdates(true);
+      </Script>
+
+      
+      <Script>
+        bool checking = [zune:SoftwareUpdates.Instance.CheckingForUpdates];
+        CheckNowButtonModel.Available = !checking;
+        Checking.Visible = checking;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(AboutZuneModel.Invoked)]
+        AboutDialog.Helper.Show(AboutDialog);
+      </Script>
+      
+    </Scripts>
+    
+    <Content>
+      <Panel>
+        <Children>
+
+          <Panel>
+            <Layout>
+              <FlowLayout Orientation="Vertical" Spacing="4,0" StripAlignment="Near" ItemAlignment="Near"/>
+            </Layout>
+            <Children>
+              
+              <mgmt:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_MEDIA_FOLDER_HEADER)}" Margins="0,0,0,3"/>
+              <core:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_MEDIA_FOLDER_TEXT)}" Style="{styles:SharedStyles.SettingsBodyStyle}" WordWrap="true"/>
+              <core:Label Name="MediaFolderPath" Style="{styles:SharedStyles.SettingsBodyStyle}" WordWrap="false"/>
+
+              <core:ActionButton Name="ChangeButton" Model="{ChangeButtonModel}" TileMinSize="90,0" Margins="0,4,0,0"/>
+              
+              <mgmt:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_VIEW_WARNINGS_TITLE)}" Margins="0,15,0,0"/>
+
+              <core:Label Style="{styles:SharedStyles.SettingsBodyStyle}"  WordWrap="true"
+                    Content="{zune:Shell.LoadString(zune:StringId.IDS_VIEW_WARNINGS_HEADER)}" Padding="0,3,0,4"/>
+              
+              <core:ActionButton Name="ResetWarningMessageButton" Model="{ResetWarningMessageButtonModel}" TileMinSize="125,0" Padding="-2,0,0,0"/>
+
+              <mgmt:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_CHECK_FOR_UPDATES_TITLE)}" Margins="0,15,0,3"/>
+
+              <Panel Layout="HorizontalFlow" >
+                <Children>
+                  <core:ActionButton Name="CheckNowButton" Model="{CheckNowButtonModel}" TileMinSize="105,0" Padding="-2,0,0,0"/>
+                  <core:Label 
+                        Name="Checking" 
+                        Style="{styles:SharedStyles.SettingsBodyStyle}"  
+                        Content="{zune:Shell.LoadString(zune:StringId.IDS_CHECKING_FOR_UPDATES)}" 
+                        Margins="15,1,0,0" />
+                </Children>
+              </Panel>
+
+              <mgmt:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_GENERAL_INFORMATION_HEADER)}" Margins="0,15,0,3"/>
+
+              <core:ActionButton Name="AboutZuneButton" Model="{AboutZuneModel}" Padding="-2,0,0,0"/>
+            </Children>
+          </Panel>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+</UIX>
diff --git a/test/2.1/MANAGEMENTPHOTO.UIX b/test/2.1/MANAGEMENTPHOTO.UIX
new file mode 100644
index 0000000..36fb10e
--- /dev/null
+++ b/test/2.1/MANAGEMENTPHOTO.UIX
@@ -0,0 +1,63 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:sys="assembly://mscorlib/System"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:mgmt="res://ZuneShellResources!Management.uix">
+
+  <UI Name="Default">
+    <Properties>
+      <zune:CategoryPage Name="Page" CategoryPage="$Required" />
+    </Properties>
+    <Locals>
+      <zune:Management Name="Management" Management="{zune:Management.Instance}"/>
+    </Locals>
+    
+    <Scripts>
+      <Script>
+        int speed = ([Management.SlideShowSpeed.Value] + 500) / 1000;
+
+        SlideShowSpeedValue.Content = sys:String.Format(zune:Shell.LoadString(zune:StringId.IDS_SLIDESHOW_OPTION_VALUE), speed);
+      </Script>
+    </Scripts>
+    
+    <Content>
+      <Panel>
+        <Children>
+
+          <Panel>
+            <Layout>
+              <FlowLayout Orientation="Vertical" Spacing="4,0" StripAlignment="Near" ItemAlignment="Near"/>
+            </Layout>
+            <Children>
+
+              <mgmt:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_SPEED_HEADER)}" WordWrap="false"/>
+
+              <Panel Name="SliderPanel">
+                <Layout>
+                  <FlowLayout Orientation="Horizontal" ItemAlignment="Center" Spacing="10,0"/>
+                </Layout>
+
+                <Children>
+                  <Text Content="{zune:Shell.LoadString(zune:StringId.IDS_SLIDESHOW_SHORT)}" Color="{styles:Styles.SettingsTextActive}" Font="{styles:Styles.SettingsText}" WordWrap="false"/>
+                  <core:Slider
+                    Name="Slider"
+                    Model="{Management.SlideShowSpeed}" 
+                    DiscreteValues="true"
+                    MaximumSize="75,0"/>
+                  <Text Content="{zune:Shell.LoadString(zune:StringId.IDS_SLIDESHOW_LONG)}" Color="{styles:Styles.SettingsTextActive}" Font="{styles:Styles.SettingsText}" WordWrap="false"/>
+                </Children>
+              </Panel>
+              <Text Name="SlideShowSpeedValue" Color="{styles:Styles.SettingsTextActive}" Font="{styles:Styles.SettingsText}" WordWrap="false"/>
+              
+            </Children>
+          </Panel>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/MANAGEMENTPODCAST.UIX b/test/2.1/MANAGEMENTPODCAST.UIX
new file mode 100644
index 0000000..49b83ca
--- /dev/null
+++ b/test/2.1/MANAGEMENTPODCAST.UIX
@@ -0,0 +1,66 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:mgmt="res://ZuneShellResources!Management.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:me="Me">
+
+  <UI Name="Default">
+    <Properties>
+      <zune:CategoryPage Name="Page" CategoryPage="{null}"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+        String feed = ((iris:Command) [zune:Management.Instance.PodcastDefaultKeepEpisodesChoice.Chosen]).Description;
+        FeedValue.Content = me:Strings.KeepDescription.Format(feed);
+      </Script>
+    </Scripts>
+    
+    <Content>
+      <Panel>
+        <Children>
+
+          <Panel>
+            <Layout>
+              <FlowLayout Orientation="Vertical" Spacing="10,0" StripAlignment="Near" ItemAlignment="Near"/>
+            </Layout>
+            <Children>
+
+              <mgmt:Label Content="{me:Strings.KeepCount}" WordWrap="false"/>
+
+              <core:LabeledChoiceSlider
+                  AccessibleDescription="{me:Strings.KeepCount}"
+                  Model="{zune:Management.Instance.PodcastDefaultKeepEpisodesChoice}"
+                  MinValueString="{me:Strings.Few}"
+                  MaxValueString="{me:Strings.Many}" TextStyle="{styles:SharedStyles.SettingsBodyStyle}" />
+              
+              <Text Name="FeedValue" Color="{styles:Styles.SettingsTextActive}" Font="{styles:Styles.SettingsText}" WordWrap="false"/>
+              
+              <Text Color="{styles:Styles.SettingsTextActive}" Font="{styles:Styles.SettingsTextMini}" WordWrap="true" Content="{zune:Shell.LoadString(zune:StringId.IDS_KEEP_COUNT_NOTE)}" Padding="0,0,0,15"/>
+
+              <mgmt:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_PLAYBACK_ORDER_HEADER)}" WordWrap="false"/>
+              <core:RadioGroup Padding="0,0,0,15" Model="{zune:Management.Instance.PodcastPlaybackChoice}" AccessibleDescription="{zune:Shell.LoadString(zune:StringId.IDS_PLAYBACK_ORDER_HEADER)}"/>
+
+            </Children>
+          </Panel>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  <Class Name="Strings" Shared="true">
+    <Properties>
+      <string Name="KeepCount" string="{zune:Shell.LoadString(zune:StringId.IDS_KEEP_COUNT_HEADER)}" />
+      <string Name="KeepDescription" string="{zune:Shell.LoadString(zune:StringId.IDS_PODCAST_KEEP_EPISODES)}" />
+      <string Name="KeepSeriesDescription" string="{zune:Shell.LoadString(zune:StringId.IDS_PODCAST_KEEP_SERIES_EPISODES)}" />
+      <string Name="Few" string="{zune:Shell.LoadString(zune:StringId.IDS_PODCAST_SLIDER_FEW)}" />
+      <string Name="Many" string="{zune:Shell.LoadString(zune:StringId.IDS_PODCAST_SLIDER_MANY)}" />      
+    </Properties>
+  </Class>
+
+</UIX>
diff --git a/test/2.1/MANAGEMENTPRIVACY.UIX b/test/2.1/MANAGEMENTPRIVACY.UIX
new file mode 100644
index 0000000..8089d00
--- /dev/null
+++ b/test/2.1/MANAGEMENTPRIVACY.UIX
@@ -0,0 +1,36 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:mgmt="res://ZuneShellResources!Management.uix">
+
+  <UI Name="Default">
+    <Properties>
+      <zune:CategoryPage Name="Page" CategoryPage="$Required" />
+    </Properties>
+    <Locals>
+      <zune:WebHelpCommand Name="ReadOnlineLink" 
+        Description="{zune:Shell.LoadString(zune:StringId.IDS_PRIVACY_STATEMENT_BUTTON)}"
+        Url="{zune:Shell.LoadString(zune:StringId.IDS_PRIVACY_STATEMENT_URL)}"
+        />
+    </Locals>
+
+    <Content>
+          <Panel Name="NavButtons">
+            <Layout>
+              <FlowLayout Orientation="Vertical" Spacing="4,0" StripAlignment="Near"/>
+            </Layout>
+            <Children>
+
+              <mgmt:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_USAGE_DATA_HEADER)}" WordWrap="true"/>
+              <mgmt:CheckBox Name="SqmCheckbox" Model="{zune:Management.Instance.SqmChoice}" Padding="0,0,0,15"/>
+
+              <mgmt:Link Model="{ReadOnlineLink}" Padding="0,2,0,0"/>              
+              
+            </Children>
+          </Panel>
+
+    </Content>
+  </UI>
+
+</UIX>
\ No newline at end of file
diff --git a/test/2.1/MANAGEMENTRIP.UIX b/test/2.1/MANAGEMENTRIP.UIX
new file mode 100644
index 0000000..383eb87
--- /dev/null
+++ b/test/2.1/MANAGEMENTRIP.UIX
@@ -0,0 +1,78 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:mgmt="res://ZuneShellResources!Management.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix">
+
+  <UI Name="Default">
+    <Properties>
+      <zune:CategoryPage Name="Page" CategoryPage="$Required" />
+    </Properties>
+    <Locals>
+      <zune:Management Name="Management" Management="{zune:Management.Instance}"/>
+      <iris:Choice Name="RecordRate" Choice="{null}"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        RecordRate = [Management.RecordRate];        
+        Slider.Model = RecordRate;
+        if (RecordRate == null)
+        {
+          MemoryUsage.Content = zune:Shell.LoadString(zune:StringId.IDS_RIP_WMA_LOSSLESS);
+        }
+      </Script>
+      <Script>
+        if (RecordRate != null)
+        {
+          MemoryUsage.Content = ((iris:Command) [RecordRate.Chosen]).Description;
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel>
+        <Children>
+
+          <Panel>
+            <Layout>
+              <FlowLayout Orientation="Vertical" Spacing="4,0" StripAlignment="Near" ItemAlignment="Near"/>
+            </Layout>
+            <Children>
+
+              <mgmt:CheckBox Model="{Management.AutoCopyCD}"/>
+              <mgmt:CheckBox Model="{Management.AutoEjectCD}" Padding="0,0,0,15"/>
+
+              <mgmt:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_RIP_FORMAT_HEADER)}"/>
+
+              <core:RadioGroup Padding="0,0,0,15" AccessibleDescription="{zune:Shell.LoadString(zune:StringId.IDS_RIP_FORMAT_HEADER)}"
+                Model = "{Management.RecordMode}" />
+
+              <mgmt:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_AUDIO_QUALITY_HEADER)}"/>
+              <Panel Name="SliderPanel">
+                <Layout>
+                  <FlowLayout Orientation="Horizontal" ItemAlignment="Center" Spacing="10,0"/>
+                </Layout>
+
+                <Children>
+                  <core:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_SMALLEST_BIT_RATE)}" Style="{styles:SharedStyles.SettingsBodyStyle}"  WordWrap="false"/>
+                  <core:ChoiceSlider 
+                    Name="Slider"
+                    MaximumSize="75,0"/>
+                  <core:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_LARGEST_BIT_RATE)}" Style="{styles:SharedStyles.SettingsBodyStyle}" WordWrap="false"/>
+                </Children>
+              </Panel>
+              <core:Label Name="MemoryUsage" Style="{styles:SharedStyles.SettingsBodyStyle}" WordWrap="false"/>
+
+            </Children>
+          </Panel>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/MANAGEMENTSHARING.UIX b/test/2.1/MANAGEMENTSHARING.UIX
new file mode 100644
index 0000000..83a3c0f
--- /dev/null
+++ b/test/2.1/MANAGEMENTSHARING.UIX
@@ -0,0 +1,200 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:mgmt="res://ZuneShellResources!Management.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:me="Me">
+
+  <UI Name="Default">
+    <Properties>
+      <zune:CategoryPage Name="Page" CategoryPage="$Required" />
+    </Properties>
+    <Locals>
+      <zune:WebHelpCommand Name="MoreInfoLink"
+        Description="{zune:Shell.LoadString(zune:StringId.IDS_SHARING_INFO_BUTTON)}"
+        Url="{zune:Shell.LoadString(zune:StringId.IDS_SHARING_MOREINFO_URL)}"/>
+      <iris:Command Name="ShareMediaButtonModel"/>
+      <Image Name="SecurityIcon" Image="res://ZuneShellResources!Security.png"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        [DeclareTrigger(ShareMediaButtonModel.Invoked)]
+        zune:Management.Instance.SharingEnabled = !zune:Management.Instance.SharingEnabled; 
+      </Script>
+      <Script>
+        if ( [zune:Management.Instance.SharingEnabled] )
+        {
+          ShareMediaButtonModel.Description = zune:Shell.LoadString(zune:StringId.IDS_STOP_SHARING_MEDIA);
+        }
+        else
+        {
+          ShareMediaButtonModel.Description = zune:Shell.LoadString(zune:StringId.IDS_SHARE_MEDIA);
+        }
+        SharingOptions.InputEnabled = zune:Management.Instance.SharingEnabled;
+      </Script>
+      <Script>
+          if (zune:Management.Instance.SharingEnableRequiresElevation) 
+          {
+            ShareMediaButton.Icon.Image = SecurityIcon;
+          }
+          else
+          {
+            ShareMediaButton.Icon.Image = null;
+          }
+      </Script>
+      <Script>
+        if (zune:Management.Instance.UserCanModifySharing)
+        {
+          AllSharingOptions.Visible = true;
+        }
+        else
+        {
+          
+          
+          xpRequiresAdminText.Content = zune:Shell.LoadString(zune:StringId.IDS_SHARE_MEDIA_XP_NON_ADMIN_MESSAGE);
+          xpRequiresAdminText.Visible = true;
+        }
+      </Script>
+    </Scripts>
+    
+    <Content>
+      <Panel>
+        <Children>
+
+          <Text Name="xpRequiresAdminText" Color="{styles:Styles.WarningColor}" Font="{styles:Styles.SettingsText}" Visible="false"/>
+          
+          <Panel Name="AllSharingOptions" Visible="false">
+            <Layout>
+              <FlowLayout Orientation="Vertical" Spacing="4,0" StripAlignment="Near" ItemAlignment="Near"/>
+            </Layout>
+            <Children>
+
+              <Text Color="{styles:Styles.SettingsTextActive}" Font="{styles:Styles.SettingsText}" WordWrap="false" Content="{zune:Shell.LoadString(zune:StringId.IDS_SHARE_MEDIA_HEADER)}"/>
+
+              <core:ActionButtonWithIcon Name="ShareMediaButton" Model="{ShareMediaButtonModel}" Padding="0,0,0,15"/>
+              
+              <me:Sharing Name="SharingOptions"/>
+              
+              <mgmt:Link Model="{MoreInfoLink}" Padding="4,12,0,0"/>
+              
+            </Children>
+          </Panel>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+  
+  <UI Name="Sharing">
+    <Locals>
+      <iris:Command Name="SetButton" Description="{zune:Shell.LoadString(zune:StringId.IDS_SET_NAME_BUTTON)}"/>
+    </Locals>
+    
+    <Properties>
+      <EditableTextData Name="MediaLibraryNameEditBox" MaxLength="16"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+        MediaLibraryNameEditBox.Value = [zune:Management.Instance.SharingDisplayName];
+      </Script>
+      <Script>
+        [DeclareTrigger(SetButton.Invoked)]
+        zune:Management.Instance.SharingDisplayName = MediaLibraryNameEditBox.Value;
+      </Script>
+      <Script>
+        
+        Boolean allDevicesEnabled = [zune:Management.Instance.SharingAllDevicesEnabled];
+        DeviceList.InputEnabled = !allDevicesEnabled;
+      </Script>
+    </Scripts>
+    
+    <Content>
+      <Panel>
+        <Children>
+
+          <Panel>
+            <Layout>
+              <FlowLayout Orientation="Vertical" Spacing="4,0" StripAlignment="Near" ItemAlignment="Near"/>
+            </Layout>
+            <Children>
+                  <Text Color="{styles:Styles.SettingsTextActive}" Font="{styles:Styles.SettingsText}" WordWrap="false" Content="{zune:Shell.LoadString(zune:StringId.IDS_LIBRARY_NAME)}"/>
+
+                  <Panel Layout="HorizontalFlow">
+                    <Children>
+                      <Panel Name="MediaLibraryNameBox" Layout="Anchor" Padding="0,0,0,15">
+                        <LayoutInput>
+                          <AnchorLayoutInput Left="Parent,0" Right="Parent,1"/>
+                        </LayoutInput>
+                        <Children>
+
+                          <core:Editbox Model="{MediaLibraryNameEditBox}" Name="MediaLibraryName" AccessibleDescription="{zune:Shell.LoadString(zune:StringId.IDS_LIBRARY_NAME)}"
+                                            TileMinSize="120,0" TileMaxSize="120,0"/>
+                          
+                          <ColorFill Content="{styles:Styles.EditTextBorder}" MinimumSize="120,22">
+                            <LayoutInput>
+                              <AnchorLayoutInput Left="MediaLibraryName,0" Top="MediaLibraryName,0"/>
+                            </LayoutInput>
+                            <Children>
+                              <ColorFill Content="White" MinimumSize="120,22" Margins="1,1,1,1">
+                              </ColorFill>
+                            </Children>
+                          </ColorFill>
+
+                        </Children>
+                        
+                      </Panel>
+                      
+                      <core:ActionButton Model="{SetButton}"/>
+                    </Children>
+                  </Panel>
+                  
+                  <mgmt:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_SHARE_TYPE_HEADER)}" WordWrap="false" Margins="0,5,0,0"/>
+                  
+                  <mgmt:CheckBox Model="{zune:Management.Instance.SharingEnableMusic}"/>
+                  <mgmt:CheckBox Model="{zune:Management.Instance.SharingEnableVideo}"/>
+                  <mgmt:CheckBox Model="{zune:Management.Instance.SharingEnablePhoto}" Padding="0,0,0,15"/>
+                  
+                  <core:RadioGroup Model="{zune:Management.Instance.SharingSelectDeviceChoice}" AccessibleDescription="{zune:Shell.LoadString(zune:StringId.IDS_SHARE_TYPE_HEADER)}"/>
+
+                  <me:DeviceList Name="DeviceList" Padding="15,0,0,0"/>
+                 
+                </Children>
+              </Panel>
+            </Children>
+          </Panel>
+
+    </Content>
+  </UI>
+
+  <UI Name="DeviceList">
+    <Scripts>
+      <Script>
+        Repeater.Source = [zune:Management.Instance.SharingDeviceList];
+      </Script>
+    </Scripts>
+    
+    <Content>
+      <Panel>
+        <Children>
+
+          <Repeater Name="Repeater">
+            <Layout>
+              <FlowLayout Orientation="Vertical" Spacing="4,0" StripAlignment="Near"/>
+            </Layout>
+            <Content>
+              <mgmt:CheckBox Model="{(zune:BooleanInputChoice)RepeatedItem}"/>
+            </Content>
+          </Repeater>
+          
+        </Children>
+      </Panel>
+
+    </Content>
+  </UI>
+  
+</UIX>
diff --git a/test/2.1/MUSICSYNCRULESPANEL.UIX b/test/2.1/MUSICSYNCRULESPANEL.UIX
new file mode 100644
index 0000000..95d8014
--- /dev/null
+++ b/test/2.1/MUSICSYNCRULESPANEL.UIX
@@ -0,0 +1,93 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:data="res://ZuneShellResources!LibraryData.schema.xml"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:rules="res://ZuneShellResources!SyncRules.uix">
+
+  <UI Name="MusicSyncRulesPanel" Base="rules:SyncRulesPanelBase">
+    <Properties>
+      <zune:MusicLibraryPage Name="Page" MusicLibraryPage="$Required"/>
+      <Int32 Name="MinimumWidth" Int32="45"/>
+      <Single Name="MinimumPercent" Single="0.0"/>
+    </Properties>
+    <Locals>
+      <data:LibraryArtistQuery Name="ArtistQuery"
+        RulesOnly="true"
+        DeviceId="{Page.DeviceId}"
+        ShowDeviceContents="true"/>
+      <data:LibraryAlbumQuery Name="AlbumQuery"
+        RulesOnly="true"
+        DeviceId="{Page.DeviceId}"
+        ShowDeviceContents="true"/>
+
+      <data:LibraryTrackQuery Name="TrackQuery"
+        ArtistId="-1" AlbumId="-1" RulesOnly="true"
+        Sort="+Title"
+        Detailed="false"
+        DeviceId="{Page.DeviceId}"
+        ShowDeviceContents="true"/>
+      <List Name="TrackQueryWrapper">
+        <Source>
+          <data:LibraryTrackQuery LibraryTrackQuery="{TrackQuery}"/>
+        </Source>
+      </List>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        <![CDATA[
+        int deviceID = [Page.DeviceId];
+        
+        ArtistQuery.DeviceId = deviceID;
+        AlbumQuery.DeviceId = deviceID;
+        TrackQuery.DeviceId = deviceID;
+        ]]>
+      </Script>
+
+      <Script>
+        <![CDATA[
+        [DeclareTrigger(ArtistQuery.Result.Items)]
+        [DeclareTrigger(AlbumQuery.Result.Items)]
+        [DeclareTrigger(TrackQuery.Result.Items)]
+        [InitialEvaluate(true)]
+        
+        bool devicePresent = zune:SyncControls.Instance.CurrentDeviceExists;
+        bool syncAll = zune:SyncControls.Instance.GetSyncAll(zune:MediaType.Track);
+        iris:AggregateList newList = null;
+        
+        if (Source != null)
+        {
+          UI.DisposeOwnedObject(Source);
+          Source = null;
+        }
+        
+        if (!devicePresent)
+        {
+          newList = new iris:AggregateList();
+        }
+        else if (syncAll)
+        {
+          newList = new iris:AggregateList(AllItemsText);
+        }
+        else if ([TrackQuery.Result.Items.Count] <= 0)
+        {
+          newList = new iris:AggregateList(AllItemsText,
+                                           ArtistQuery.Result.Items,
+                                           AlbumQuery.Result.Items);
+        }
+        else
+        {
+          newList = new iris:AggregateList(AllItemsText,
+                                           ArtistQuery.Result.Items,
+                                           AlbumQuery.Result.Items,
+                                           TrackQueryWrapper);
+        }
+
+        Source = newList;
+        ]]>
+      </Script>
+    </Scripts>
+  </UI>
+</UIX>
diff --git a/test/2.1/NONCLIENTCONTROLS.UIX b/test/2.1/NONCLIENTCONTROLS.UIX
new file mode 100644
index 0000000..2ecbd3e
--- /dev/null
+++ b/test/2.1/NONCLIENTCONTROLS.UIX
@@ -0,0 +1,338 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:me="Me">
+
+  
+
+  <UI Name="WindowResizeBorderLayer">
+    <Scripts>
+      <Script>
+        styles:WindowState.ResizeBorderInputActivity = [UI.DeepMouseFocus];
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Layout="Anchor">
+        <Children>
+
+           <me:WindowSizer Name="SizerNW" Mode="{me:WindowSizerModes.NW}">
+             <LayoutInput>
+               <AnchorLayoutInput Top="Parent,0" Left="Parent,0"/>
+             </LayoutInput>
+           </me:WindowSizer>
+
+           <me:WindowSizer Name="SizerNE" Mode="{me:WindowSizerModes.NE}">
+             <LayoutInput>
+               <AnchorLayoutInput Top="Parent,0" Right="Parent,1"/>
+             </LayoutInput>
+           </me:WindowSizer>
+
+           <me:WindowSizer Name="SizerSE" Mode="{me:WindowSizerModes.SE}">
+             <LayoutInput>
+               <AnchorLayoutInput Bottom="Parent,1" Right="Parent,1"/>
+             </LayoutInput>
+           </me:WindowSizer>
+
+           <me:WindowSizer Name="SizerSW" Mode="{me:WindowSizerModes.SW}">
+             <LayoutInput>
+               <AnchorLayoutInput Bottom="Parent,1" Left="Parent,0"/>
+             </LayoutInput>
+           </me:WindowSizer>
+
+           <me:WindowSizer Name="SizerN" Mode="{me:WindowSizerModes.N}">
+             <LayoutInput>
+               <AnchorLayoutInput Left="SizerNW,1" Right="SizerNE,0" Top="Parent,0"/>
+             </LayoutInput>
+           </me:WindowSizer>
+
+           <me:WindowSizer Name="SizerS" Mode="{me:WindowSizerModes.S}">
+             <LayoutInput>
+               <AnchorLayoutInput Left="SizerSW,1" Right="SizerSE,0" Bottom="Parent,1"/>
+             </LayoutInput>
+           </me:WindowSizer>
+
+           <me:WindowSizer Name="SizerE" Mode="{me:WindowSizerModes.E}">
+             <LayoutInput>
+               <AnchorLayoutInput Top="SizerNE,1" Bottom="SizerSE,0" Right="Parent,1"/>
+             </LayoutInput>
+           </me:WindowSizer>
+
+           <me:WindowSizer Name="SizerW" Mode="{me:WindowSizerModes.W}">
+             <LayoutInput>
+               <AnchorLayoutInput Top="SizerNW,1" Bottom="SizerSW,0" Left="Parent,0"/>
+             </LayoutInput>
+           </me:WindowSizer>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+
+  <Class Name="WindowSizerMode">
+    <Properties>
+      <Cursor  Name="Cursor" Cursor="$Required"/>
+      <Boolean Name="MoveN"  Boolean="false"/>
+      <Boolean Name="MoveS"  Boolean="false"/>
+      <Boolean Name="MoveE"  Boolean="false"/>
+      <Boolean Name="MoveW"  Boolean="false"/>
+    </Properties>
+  </Class>
+
+  <Class Name="WindowSizerModes" Shared="true">
+    <Properties>
+      <me:WindowSizerMode Name="N"  Cursor="{Cursor.SizeNS}"   MoveN="true" />
+      <me:WindowSizerMode Name="S"  Cursor="{Cursor.SizeNS}"   MoveS="true" />
+      <me:WindowSizerMode Name="E"  Cursor="{Cursor.SizeWE}"   MoveE="true" />
+      <me:WindowSizerMode Name="W"  Cursor="{Cursor.SizeWE}"   MoveW="true" />
+      <me:WindowSizerMode Name="NE" Cursor="{Cursor.SizeNESW}" MoveN="true" MoveE="true" />
+      <me:WindowSizerMode Name="SE" Cursor="{Cursor.SizeNWSE}" MoveS="true" MoveE="true" />
+      <me:WindowSizerMode Name="NW" Cursor="{Cursor.SizeNWSE}" MoveN="true" MoveW="true" />
+      <me:WindowSizerMode Name="SW" Cursor="{Cursor.SizeNESW}" MoveS="true" MoveW="true" />
+    </Properties>
+  </Class>
+
+  <UI Name="WindowSizer">
+
+    <Properties>
+      <Size Name="Size" Size="8,8"/>
+      <me:WindowSizerMode Name="Mode" WindowSizerMode="$Required"/>
+    </Properties>
+
+    <Locals>
+      <iris:WindowPosition Name="InitialPosition"/>
+      <iris:WindowSize Name="InitialSize"/>
+    </Locals>
+
+    <Input>
+      <DragHandler Name="Dragger" CancelOnEscape="true"/>
+    </Input>
+
+    <Scripts>
+
+      <Script>
+        [DeclareTrigger(iris:Application.Window.WindowState)]
+        [InitialEvaluate(true)]
+
+        
+        
+
+        if (iris:Application.Window.WindowState == iris:WindowState.Maximized)
+        {
+           UI.Cursor = Cursor.NotSpecified;
+           Dragger.DragCursor = Cursor.NotSpecified;
+        }
+        else
+        {
+           UI.Cursor = Mode.Cursor;
+           Dragger.DragCursor = Mode.Cursor;
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Dragger.Started)]
+        
+        
+
+        InitialPosition = iris:Application.Window.Position;
+        InitialSize = iris:Application.Window.ClientSize;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Dragger.Cancelled)]
+
+        
+        
+
+        iris:Application.Window.Position = InitialPosition;
+        iris:Application.Window.ClientSize = InitialSize;
+      </Script>
+
+      <Script><![CDATA[
+        [DeclareTrigger(Dragger.AbsoluteDragSize)]
+
+        
+
+        if (iris:Application.Window.WindowState == iris:WindowState.Maximized)
+        {
+           return;
+        }
+
+        
+        
+
+        
+        
+        
+        
+        int cxMin = 734;
+        int cyMin = 500;
+
+        int dx = Dragger.AbsoluteDragSize.Width;
+        int dy = Dragger.AbsoluteDragSize.Height;
+        int x  = InitialPosition.X;
+        int y  = InitialPosition.Y;
+        int cx = InitialSize.Width;
+        int cy = InitialSize.Height;
+
+        
+        
+
+        if ( Mode.MoveN )
+        {
+           cy = cy - dy;
+           y  = y + dy;
+        }
+        else if ( Mode.MoveS )
+        {
+           cy = cy + dy;
+        }
+
+        
+        
+
+        if ( cy < cyMin )
+        {
+           cy = cyMin;
+
+           if ( Mode.MoveN )
+           {
+              y = (InitialPosition.Y + InitialSize.Height) - cyMin;
+           }
+        }
+
+        
+        
+
+        if ( Mode.MoveW )
+        {
+           cx = cx - dx;
+           x  = x + dx;
+        }
+        else if ( Mode.MoveE )
+        {
+           cx = cx + dx;
+        }
+
+        
+        
+
+        if ( cx < cxMin )
+        {
+           cx = cxMin;
+
+           if ( Mode.MoveW )
+           {
+              x = (InitialPosition.X + InitialSize.Width) - cxMin;
+           }
+        }
+
+        
+
+        iris:WindowSize currentSize = iris:Application.Window.ClientSize;
+
+        if ( cx != currentSize.Width || cy != currentSize.Height )
+        {
+           iris:Application.Window.ClientSize = new iris:WindowSize(cx,cy);
+        }
+
+        
+
+        iris:WindowPosition currentPosition  = iris:Application.Window.Position;
+
+        if ( x != currentPosition.X || y != currentPosition.Y )
+        {
+          iris:Application.Window.Position = new iris:WindowPosition(x,y);
+        }
+
+      ]]></Script>
+
+    </Scripts>
+
+    <Content>
+      <ColorFill Content="Transparent" Name="Block" MinimumSize="{Size}"/>
+    </Content>
+  </UI>
+
+  
+
+  <UI Name="WindowCaption">
+    <Locals>
+      <iris:WindowPosition Name="InitialPosition"/>
+    </Locals>
+
+    <Input>
+      <DragHandler Name="Dragger" CancelOnEscape="true"/>
+      <ClickHandler Name="Clicker" ClickCount="Double" ClickType="LeftMouse"/>
+    </Input>
+
+    <Scripts>
+
+      <Script>
+        styles:WindowState.CaptionInputActivity = [UI.DeepMouseFocus];
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Dragger.Started)]
+        
+
+        InitialPosition = iris:Application.Window.Position;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Clicker.Invoked)]
+
+        
+        
+
+        if ( iris:Application.Window.WindowState == iris:WindowState.Maximized )
+        {
+           iris:Application.Window.WindowState = iris:WindowState.Normal;
+        }
+        else
+        {
+           iris:Application.Window.WindowState = iris:WindowState.Maximized;
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Dragger.Cancelled)]
+
+        
+        
+
+        iris:Application.Window.Position = InitialPosition;
+      </Script>
+
+      <Script><![CDATA[
+        [DeclareTrigger(Dragger.AbsoluteDragSize)]
+
+        
+
+        if (iris:Application.Window.WindowState == iris:WindowState.Maximized)
+        {
+           return;
+        }
+
+        
+
+        iris:WindowPosition pos = new iris:WindowPosition(
+           InitialPosition.X + Dragger.AbsoluteDragSize.Width,
+           InitialPosition.Y + Dragger.AbsoluteDragSize.Height
+           );
+
+        iris:Application.Window.Position = pos;
+      ]]></Script>
+
+    </Scripts>
+
+    <Content>
+      <ColorFill Content="Transparent" Name="Block"/>
+    </Content>
+  </UI>
+
+</UIX>
+
diff --git a/test/2.1/NOTIFICATIONAREA.UIX b/test/2.1/NOTIFICATIONAREA.UIX
new file mode 100644
index 0000000..0c4579f
--- /dev/null
+++ b/test/2.1/NOTIFICATIONAREA.UIX
@@ -0,0 +1,295 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX xmlns="http://schemas.microsoft.com/2007/uix"
+     xmlns:styles="res://ZuneShellResources!Styles.uix"
+     xmlns:animations="res://ZuneShellResources!Animations.uix" 
+     xmlns:zune="assembly://ZuneShell/ZuneUI"
+     xmlns:images="res://ZuneShellResources!ImageStyle.uix"
+     xmlns:iris="assembly://UIX/Microsoft.Iris"
+     xmlns:core="res://ZuneShellResources!Controls.uix" 
+     xmlns:me="Me">
+
+  <UI Name="NotificationArea">
+    <Locals>
+      <zune:NotificationArea Name="Model" NotificationArea="{zune:NotificationArea.Instance}"/>
+      <iris:Command Name="AdvanceButton" Description="{zune:Shell.LoadString(zune:StringId.IDS_NEXT_MESSAGE)}" />
+    </Locals>
+    <Scripts>
+      <Script>
+        
+        zune:Notification currentNotification = [Model.CurrentNotification];
+        
+        if (currentNotification != null)
+        {
+          if (currentNotification is zune:SyncNewRuleAddedNotification)
+          {
+            Display.RequestSource("res://ZuneShellResources!SyncNotification.uix#RuleAddedNotification", "Model", currentNotification);
+          }
+          else if (currentNotification is zune:ProgressNotification)
+          {
+            Display.RequestSource("res://ZuneShellResources!NotificationArea.uix#ProgressNotification", "Model", currentNotification);
+          }
+          else if (currentNotification is zune:MessageNotification)
+          {
+            Display.RequestSource("res://ZuneShellResources!NotificationArea.uix#MessageNotification", "Model", currentNotification);
+          }
+          else if (currentNotification is zune:NowPlayingNotification)
+          {
+            Display.RequestSource("res://ZuneShellResources!NowPlayingNotification.uix#NowPlayingNotification", "Model", currentNotification);
+          }
+          else
+          {
+            Display.RequestSource(null);
+          }
+        }
+        else
+        {
+          Display.RequestSource(null);
+        }
+        
+      </Script>
+
+      <Script>
+        [DeclareTrigger(AdvanceButton.Invoked)]
+        Model.IncrementNotification();
+      </Script>
+      <Script>
+        [InitialEvaluate(false)]
+        float alpha = 0.0;
+        bool paused = ([UI.DeepMouseFocus] || [UI.DeepKeyFocus]);
+        zune:NotificationArea.Instance.Paused = paused;
+        if (paused &amp;&amp; ([zune:NotificationArea.Instance.NotificationCount] > 1))
+        {
+          alpha = 1.0;
+        }
+          
+        PlayButton.Alpha = alpha;
+      </Script>
+    </Scripts>
+    <Content>
+      <Panel Layout="Anchor" Padding="0,10,0,10">
+        <Children>
+
+          <Host Name="Display" MouseInteractive="true" MaximumSize="226,0" MinimumSize="226,0">
+            <LayoutInput>
+              <AnchorLayoutInput Top="Parent,0" Bottom="Parent,1" Left="Parent,0"/>
+            </LayoutInput>
+            <Animations>
+              
+              <Animation Animation="{animations:Animations.MoveNow}"/>
+              <Animation Type="Show">
+                <Keyframes>
+                  <AlphaKeyframe Time="0" Value="0"/>
+                  <PositionKeyframe Time="0" Value="-10,0,0" Interpolation="EaseIn,1.0,.25"/>              
+                  <AlphaKeyframe Time=".33" Value="1"/>
+                  <PositionKeyframe Time=".33" Value="0,0,0"/>
+                </Keyframes>
+              </Animation>
+              
+              <Animation Type="ContentChangeShow">
+                <Keyframes>
+                  <AlphaKeyframe Time="0" Value="0"/>
+                  <PositionKeyframe Time="0" Value="-40,0,0" Interpolation="EaseIn,1.0,.25"/>              
+                  <AlphaKeyframe Time=".33" Value="1"/>
+                  <PositionKeyframe Time=".33" Value="0,0,0"/>
+                </Keyframes>
+              </Animation>
+
+              <Animation Type="ContentChangeHide">
+                <Keyframes>
+                  <AlphaKeyframe Time="0" Value="1"/>
+                  <PositionKeyframe Time="0" Value="0,0,0" Interpolation="EaseIn,1.0,.25"/>              
+                  <AlphaKeyframe Time=".33" Value="0"/>
+                  <PositionKeyframe Time=".33" Value="40,0,0"/>
+                </Keyframes>
+              </Animation>
+            </Animations>
+          </Host>
+
+          <core:IconButton Name="PlayButton" Alpha="0.0" Model="{AdvanceButton}"
+              TileMaxSize="12,12"
+              StretchingPolicy="Uniform"
+              KeyInteractiveNStuff="false"
+              Image="res://ZuneShellResources!Page.Next.png"
+              HoverImage="res://ZuneShellResources!Page.Next.Hover.png"
+              PressedImage="res://ZuneShellResources!Page.Next.Pressed.png"
+              DisabledImage="res://ZuneShellResources!Page.Next.Disabled.png">
+            <LayoutInput>
+              <AnchorLayoutInput Top="Parent,0" Left="Display,1"/>
+            </LayoutInput>
+          </core:IconButton>            
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  <UI Name="StandaloneProgressArea">
+    <Properties>
+      <zune:ProgressNotification Name="Model" ProgressNotification="$Required"/>
+    </Properties>
+    <Locals>
+      <iris:Timer Name="ClearNotification" AutoRepeat="false" Enabled="false" Interval="10000" />
+    </Locals>
+    <Scripts>
+      <Script>
+        if ([Model] == null)
+        {
+          ClearNotification.Start();
+        }
+        else
+        {
+          ClearNotification.Stop();
+          Notification.Model = Model;
+        }
+      </Script>
+      <Script>
+        [DeclareTrigger(ClearNotification.Tick)]
+        Notification.Model = null;
+      </Script>
+    </Scripts>
+    <Content>
+      <me:ProgressNotification Name="Notification" Model="{null}" />
+    </Content>
+  </UI>
+  
+  <UI Name="MessageNotification">
+    <Properties>
+      <zune:MessageNotification Name="Model" MessageNotification="$Required"/>
+    </Properties>
+    <Scripts>
+
+      
+      
+      
+      
+      <Script>
+        if ([images:Images.InNowPlaying.Value])
+        {
+          Message.Color = styles:Styles.SlideshowSyncHeaderColor;
+          SubMessage.Color = styles:Styles.SlideshowSyncInformation;
+        }
+        else
+        {
+          Message.Color = styles:Styles.SyncHeaderColor;
+          SubMessage.Color = styles:Styles.SyncInformation;
+        }
+      </Script>
+      
+      <Script>
+        Message.Content = [Model.Message];
+      </Script>
+
+      <Script>
+        string subMessage = [Model.SubMessage];
+        if ((subMessage == null) || (subMessage.Length == 0))
+        {
+          
+          SubMessage.Content = " ";        
+        }
+        else
+        {
+          SubMessage.Content = subMessage;        
+        }
+      </Script>
+      
+    </Scripts>
+    <Content>
+        <Panel MaximumSize="295,0" Layout="VerticalFlow" Padding="0,8,0,0">
+          <Children>
+
+            <Text Name="Message" MaximumSize="295,0" Font="{styles:Styles.SyncHeaderFont}"/>    
+
+            <Text Name="SubMessage" Font="{styles:Styles.SyncInfoFont}"/>
+
+          </Children>
+        </Panel>          
+    </Content>
+  </UI>  
+
+  <UI Name="ProgressNotification">
+    <Properties>
+      <zune:ProgressNotification Name="Model" ProgressNotification="$Required"/>
+    </Properties>
+    <Scripts>
+      
+      <Script>
+        if (Model != null)
+        {
+          Message.Content = [Model.Message];
+        }
+        else
+        {
+          Message.Content = null;
+        }
+      </Script>
+
+      <Script>
+        string subMessage = null;
+        if (Model != null)
+        {
+          subMessage = [Model.SubMessage];
+        }
+        
+        if (String.IsNullOrEmpty(subMessage))
+        {
+          
+          SubMessage.Content = " ";        
+        }
+        else
+        {
+          SubMessage.Content = subMessage;        
+        }
+      </Script>
+      
+      <Script>
+        if (Model != null)
+        {
+          PercentComplete.Content = me:Strings.Percentage.Format([Model.Percentage]);
+        }
+        else        
+        {
+          PercentComplete.Content = "";
+        }
+      </Script>
+
+    </Scripts>
+    <Content>
+      <Panel Layout="Anchor">
+        <Children>
+
+          
+          <Text Name="Spacer" Content="{me:Strings.Percentage.Format(100)}" Alpha="0.0" Font="{styles:Styles.SyncPercentComplete}">
+            <LayoutInput>
+              <FormLayoutInput Left="Parent,0" />
+            </LayoutInput>
+          </Text>
+          
+          <Text Name="PercentComplete" Color="{styles:Styles.SyncPercentColor}" Font="{styles:Styles.SyncPercentComplete}" HorizontalAlignment="Far">
+            <LayoutInput>
+              <FormLayoutInput Right="Spacer,1" Top="Spacer,0" />
+            </LayoutInput>
+          </Text>
+
+          <Panel MaximumSize="295,0" Layout="VerticalFlow">
+            <LayoutInput>
+              <FormLayoutInput Left="PercentComplete,1,8" Top="PercentComplete,0,4"/>
+            </LayoutInput>
+            <Children>
+
+              <Text Name="Message" MaximumSize="295,0" Color="{styles:Styles.SyncHeaderColor}" Font="{styles:Styles.SyncHeaderFont}"/>    
+
+              <Text Name="SubMessage" Color="{styles:Styles.SyncInformation}" Font="{styles:Styles.SyncInfoFont}"/>
+
+            </Children>
+          </Panel>
+          
+        </Children>
+      </Panel>
+    </Content>
+  </UI>  
+  
+  <Class Name="Strings" Shared="true">
+    <Properties>
+      <string Name="Percentage" string="{zune:Shell.LoadString(zune:StringId.IDS_SYNC_PERCENTAGE)}"/>
+    </Properties>
+  </Class>
+</UIX>
diff --git a/test/2.1/NOWPLAYINGLAND.UIX b/test/2.1/NOWPLAYINGLAND.UIX
new file mode 100644
index 0000000..f027e81
--- /dev/null
+++ b/test/2.1/NOWPLAYINGLAND.UIX
@@ -0,0 +1,1243 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:sys="assembly://mscorlib/System"
+  xmlns:col="assembly://mscorlib/System.Collections"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:data="res://ZuneShellResources!LibraryData.schema.xml"
+  xmlns:mpdata="res://ZuneMarketplaceResources!MarketplaceData.schema.xml"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:linkbuttons="res://ZuneShellResources!LinkButtons.uix"
+  xmlns:page="res://ZuneShellResources!PageStack.uix"
+  xmlns:spreadsheet="res://ZuneShellResources!SpreadSheetViewBase.uix"
+  xmlns:tpc="res://ZuneShellResources!TracksPanelColumns.uix"
+  xmlns:anim="res://ZuneShellResources!Animations.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:contextmenu="res://ZuneShellResources!LibraryContextMenu.uix"
+  xmlns:dialogs="res://ZuneShellResources!LibraryDialogs.uix"
+  xmlns:me="Me"
+  >
+
+  
+  
+  
+  <UI Name="NowPlayingLand" Base="page:PageBase">
+    <Properties>
+      <zune:NowPlayingLand Name="Page" NowPlayingLand="$Required"/>
+    </Properties>
+
+    <Locals>
+      <zune:TransportControls Name="TransportControls" TransportControls="{zune:TransportControls.Instance}"/>
+      <SelectionManager Name="SelectionManager"/>
+      <core:NavigateIntoIndexRequest Name="NavigateIntoArgs"/>
+      <me:NowPlayingListModel Name="NowPlayingListModel" Page="{Page}"/>
+
+      <iris:Command Name="Play" Description="{zune:Shell.LoadString(zune:StringId.IDS_PLAY_MENUITEM)}"/>
+      <iris:Command Name="Remove" Description="{zune:Shell.LoadString(zune:StringId.IDS_NOW_PLAYING_REMOVE)}"/>
+      <zune:MenuItemCommand Name="Properties" Description="{zune:Shell.LoadString(zune:StringId.IDS_LIBRARY_PROPERTIES_MENU_ITEM)}"/>
+      <contextmenu:RateCommand Name="Rate"/>
+      <zune:MenuItemCommand Name="FindInCollection" Description="{zune:Shell.LoadString(zune:StringId.IDS_FIND_IN_COLLECTION)}"/>
+      <zune:MenuItemCommand Name="FindInMarketplace" Description="{zune:Shell.LoadString(zune:StringId.IDS_NOW_PLAYING_FIND_IN_MARKETPLACE)}"/>
+
+      <contextmenu:LibraryContextMenu Name="ContextMenu">
+        <Options>
+          <iris:Command Command="{Play}"/>
+          <iris:Command Command="{Remove}"/>
+          <contextmenu:RateCommand RateCommand="{Rate}"/>
+          <iris:Command Command="{Properties}"/>
+          <iris:Command Command="{FindInCollection}"/>
+          <iris:Command Command="{FindInMarketplace}"/>
+        </Options>
+      </contextmenu:LibraryContextMenu>
+
+      <dialogs:PropertiesDialog Name="PropertiesDialog" PropertiesDialog="{null}"/>
+
+      <styles:WindowState Name="WindowState"/>
+
+      <Boolean Name="AllowMusicControls"/>
+    </Locals>
+
+    <Input>
+      <KeyHandler Name="SpaceKeyHandler" Key="Space" HandlerStage="Bubbled, Direct" Repeat="false" />
+      <KeyHandler Key="Delete" DisallowedModifiers="Alt,Ctrl,Shift" HandlerStage="Bubbled" Command="{Remove}"/>
+    </Input>
+
+    <Scripts>
+      
+      <Script>
+        UI.CreateInterestOnFocus = false;
+      </Script>
+      <Script>
+        bool playingVideo = [TransportControls.PlayingVideo];
+
+        
+        if (Page.TransportControlStyle != zune:TransportControlStyle.Photo)
+        {
+          if (playingVideo)
+          {
+            Page.TransportControlStyle = zune:TransportControlStyle.Video;
+          }
+          else
+          {
+            Page.TransportControlStyle = zune:TransportControlStyle.Music;
+          }
+        }
+      </Script>
+      <Script>
+        
+        
+        
+        AllowMusicControls = ([Page.ActiveTransportControlStyle] == zune:TransportControlStyle.Music);
+
+        
+        
+        CurrentTrack.Visible = ([Page.TransportControlStyle] == zune:TransportControlStyle.Music);
+      </Script>
+
+      
+      <Script>
+        if (CurrentTrack.Visible)
+        {
+          CurrentTrack.CurrentTrack = [TransportControls.CurrentTrack];
+        }
+        else
+        {
+          CurrentTrack.CurrentTrack = null;
+        }
+      </Script>
+
+      
+      <Script>TracksList.Content = [TransportControls.CurrentPlaylist];</Script>
+
+      
+      <Script>
+        [DeclareTrigger(Play.Invoked)]
+        if (SelectionManager.Count > 0)
+        {
+          if (SelectionManager.Count == 1)
+          {
+            TransportControls.StartPlayingAt(SelectionManager.SelectedIndex);
+          }
+          else
+          {
+            
+          }
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(SpaceKeyHandler.Invoked)]
+        if (TransportControls.PlayingVideo)
+        {
+          if (TransportControls.Playing)
+          {
+            TransportControls.Pause.Invoke();
+          }
+          else
+          {
+            TransportControls.Play.Invoke();
+          }
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(ContextMenu.Helper.IsOpening)]
+        if (ContextMenu.Helper.IsOpening)
+        {
+          int selectionCount = SelectionManager.Count;
+          Remove.Available = (selectionCount > 0);
+
+          bool selectedOne = (selectionCount == 1);
+          Play.Available = selectedOne;
+
+          zune:PlaybackTrack track = (zune:PlaybackTrack)SelectionManager.SelectedItem;
+          
+          bool selectedOneLibraryItem = selectedOne &amp;&amp;
+                                        (track is zune:LibraryPlaybackTrack);
+          bool selectedOneLibraryTrack;
+          bool isInCollection = false;
+          if (selectedOneLibraryItem)
+          {
+            zune:LibraryPlaybackTrack libraryTrack = (zune:LibraryPlaybackTrack)track;
+            selectedOneLibraryTrack = libraryTrack.MediaType == zune:MediaType.Track;
+            isInCollection = selectedOneLibraryTrack &amp;&amp; libraryTrack.IsInCollection;
+          }
+          Properties.Hidden = !selectedOneLibraryTrack;
+          Rate.Command.Hidden = !((track != null) &amp;&amp; track.CanRate);
+          FindInCollection.Hidden = !isInCollection;
+
+          bool canFindInMarketplace;
+          if (selectedOne &amp;&amp; !zune:GuidHelper.IsEmpty(track.ServiceId) &amp;&amp; track.IsMusic)
+          {
+            canFindInMarketplace = true;
+          }
+          FindInMarketplace.Hidden = !canFindInMarketplace;
+        }
+        else
+        {
+          Play.Available = true;
+          Remove.Available = true;
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(Remove.Invoked)]
+        TransportControls.RemoveFromNowPlaying(SelectionManager.SelectedIndices);
+
+        
+        NavigateIntoArgs.Select = true;
+        NavigateIntoArgs.Index = TransportControls.CurrentTrackIndex;
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(Properties.Invoked)]
+
+        
+        if (PropertiesDialog == null) PropertiesDialog = new dialogs:PropertiesDialog();
+
+        if (SelectionManager.SelectedItem is zune:LibraryPlaybackTrack)
+        {
+          zune:LibraryPlaybackTrack track = (zune:LibraryPlaybackTrack)SelectionManager.SelectedItem;
+
+          PropertiesDialog.LibraryId = track.MediaId;
+          PropertiesDialog.ItemType = track.MediaType;
+
+          PropertiesDialog.Helper.Show(PropertiesDialog);
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Rate.Command.Invoked)]
+        foreach (zune:PlaybackTrack track in SelectionManager.SelectedItems)
+        {
+          track.UserRating = Rate.Rating;
+        }
+
+        
+        Page.RatingsChanged.Invoke();
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(FindInCollection.Invoked)]
+
+        if (SelectionManager.SelectedItem is zune:LibraryPlaybackTrack)
+        {
+          zune:LibraryPlaybackTrack track = (zune:LibraryPlaybackTrack)SelectionManager.SelectedItem;
+
+          track.FindInCollection();
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(FindInMarketplace.Invoked)]
+
+        if (SelectionManager.SelectedItem != null)
+        {
+          zune:PlaybackTrack track = (zune:PlaybackTrack)SelectionManager.SelectedItem;
+
+          col:Hashtable args = new col:Hashtable();
+          args.set_Item("TrackId", track.ServiceId);
+          zune:Shell.DefaultInstance.Execute("Marketplace\Music\Artist", args);
+        }
+      </Script>
+
+      
+      <Script>
+        
+        if (!(UI.DeepMouseFocus &amp;&amp; iris:Application.Window.MouseActive ||
+              UI.DeepKeyFocus &amp;&amp; styles:WindowState.KeysActive))
+        {
+          NavigateIntoArgs.Select = false;
+          NavigateIntoArgs.Index = [TransportControls.CurrentTrackIndex];
+        }
+      </Script>
+
+      
+      <Script>
+        TracksList.Visible = [AllowMusicControls] &amp;&amp; [WindowState.InputActive];
+        TrackListBackground.Visible = TracksList.Visible;
+      </Script>
+
+      
+      
+      <Script>
+        [DeclareTrigger(TransportControls.VideoPlaybackStopped)]
+        if (Page.TransportControlStyle == zune:TransportControlStyle.Video)
+        {
+          zune:Shell.DefaultInstance.NavigateBack();
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      <ColorFill Content="Transparent" Layout="Form">
+        <Animations>
+          <Animation Animation="{anim:Animations.NowPlayingPageFadeIn}"/>
+          <Animation Animation="{anim:Animations.NowPlayingPageFadeOut}"/>
+        </Animations>
+        <Children>
+
+          
+          <me:CurrentTrackInfo Name="CurrentTrack" Page="{Page}">
+            <LayoutInput>
+              <AnchorLayoutInput
+                Left="Parent,0,45" Right="Parent,1,-20" Horizontal="Near"
+                Top="Parent,0,-30"/>
+            </LayoutInput>
+          </me:CurrentTrackInfo>
+
+          
+          <Panel Name="TracksListPanel" Margins="20,20,20,20" MaximumSize=" 270,300">
+            <LayoutInput>
+              <AnchorLayoutInput Right="Parent,1,20" Top="Parent,0,150" Bottom="Parent,1,-5" Vertical="Far"/>
+            </LayoutInput>
+            <Animations>
+              <Animation Animation="{anim:Animations.NowPlayingTrackListShow}"/>
+              <Animation Animation="{anim:Animations.NowPlayingFadeOut}"/>
+            </Animations>
+            <Children>
+
+              <me:NowPlayingSpreadSheet
+                  Name="TracksList"
+                  ListModel="{NowPlayingListModel}"
+                  SelectionManager="{SelectionManager}"
+                  NavigateIntoArgs="{NavigateIntoArgs}"
+                  ColumnData="{me:Columns.DefaultViewColumnData}"
+                  ShowHeaders="false"
+                  ContextMenu="{ContextMenu}"
+                  ExecuteCommand="{Play}">
+                <Animations>
+                  <Animation Animation="{anim:Animations.NowPlayingFadeIn}"/>
+                </Animations>
+              </me:NowPlayingSpreadSheet>
+
+            </Children>
+          </Panel>
+
+          
+          <Graphic Name="TrackListBackground" Content="{styles:Styles.NowPlayingBoxShadow}" SizingPolicy="SizeToChildren"
+              Margins="-8,-20,-19,-17" Alpha="0.90">
+            <LayoutInput>
+              <AnchorLayoutInput
+                  Left="TracksListPanel,0" Right="TracksListPanel,1"
+                  Top="TracksListPanel,0" Bottom="TracksListPanel,1"/>
+            </LayoutInput>
+            <Animations>
+              <Animation Animation="{anim:Animations.NowPlayingTrackListShow}"/>
+              <Animation Animation="{anim:Animations.NowPlayingFadeOut}"/>
+            </Animations>
+          </Graphic>
+
+        </Children>
+      </ColorFill>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="MusicNowPlayingBackground">
+    <Properties>
+      <Size Name="IdealCellSize" Size="86,86"/>
+    </Properties>
+
+    <Locals>
+      <zune:TransportControls Name="TransportControls" TransportControls="{zune:TransportControls.Instance}"/>
+
+      <data:LibraryAlbumQuery Name="AlbumQuery"/>
+
+      <Int32 Name="DesiredHorizontalItems"/>
+      <Int32 Name="DesiredVerticalItems"/>
+      <Boolean Name="EnoughAlbums"/>
+
+      <Int32 Name="MinimumAlbumsNeeded" Int32="5"/>
+      
+      <AnchorLayoutInput Name="AnchorInput" Left="Parent,0" Right="Parent,0,100" Top="Parent,0" Bottom="Parent,0,100"/>
+      <AnchorLayoutInput Name="DummyInput"/>
+
+      <sys:Random Name="Random"/>
+
+      <iris:BooleanChoice Name="HasShownIntro">
+        <Options>
+          <String String="Intro"/>
+          <String String="Normal"/>
+        </Options>
+      </iris:BooleanChoice>
+        
+      
+      <Timer Name="SwitchArtTimer" Interval="5000" AutoRepeat="true" Enabled="true"/>
+      <Int32 Name="NextAlbumToSwap"/>
+
+      <Timer Name="HideBackgroundTimer" 
+             Interval="{((int)(anim:Animations.NowPlayingGrid_Length + anim:Animations.NowPlayingGrid_MaxDelay + 5.0))*1000}" 
+             AutoRepeat="false" Enabled="false"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        iris:WindowSize currentSize = [iris:Application.Window.ClientSize];
+
+        
+        float fitHorizontalItems = ((float)currentSize.Width / (float)IdealCellSize.Width);
+        float fitVerticalItems   = ((float)currentSize.Height / (float)IdealCellSize.Height);
+
+        
+        int roundedFitHorizontalItems = (int)(fitHorizontalItems + 1.0);
+        int roundedFitVerticalItems   = (int)(fitVerticalItems + 1.0);
+
+        
+
+        
+        
+        
+        if (roundedFitHorizontalItems > DesiredHorizontalItems)
+          DesiredHorizontalItems = roundedFitHorizontalItems + 1;
+        if (roundedFitVerticalItems > DesiredVerticalItems)
+          DesiredVerticalItems = roundedFitVerticalItems + 1;
+      </Script>
+
+      <Script>
+        
+        
+        EnoughAlbums = [AlbumQuery.Result.Items.Count] > MinimumAlbumsNeeded;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(EnoughAlbums)]
+        [DeclareTrigger(DesiredHorizontalItems)]
+        [DeclareTrigger(DesiredVerticalItems)]
+
+        if (EnoughAlbums)
+        {
+          
+          Size size = new Size(DesiredHorizontalItems * IdealCellSize.Width,
+                               DesiredVerticalItems * IdealCellSize.Height);
+          AnchorInput.Right.Offset = size.Width;
+          AnchorInput.Bottom.Offset = size.Height;
+          Grid.LayoutInput = DummyInput;
+          Grid.LayoutInput = AnchorInput;
+
+          
+
+          Grid.Content = TransportControls.CreateAlbumListForBackground(AlbumQuery.Result.Items, DesiredVerticalItems, DesiredHorizontalItems);
+          if (!List.IsNullOrEmpty(Grid.Content))
+          {
+            NextAlbumToSwap = Grid.Content.Count - 1; 
+          }
+        }
+        else
+        {
+          
+          Grid.Content = null;
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(SwitchArtTimer.Tick)]
+        
+        List background = Grid.Content;
+        
+        List allAlbums = AlbumQuery.Result.Items;
+        if (!List.IsNullOrEmpty(allAlbums) &amp;&amp; !List.IsNullOrEmpty(background))
+        {
+          NextAlbumToSwap = (NextAlbumToSwap + 1) % allAlbums.Count;  
+          data:Album newAlbum = (data:Album)allAlbums.GetItem(NextAlbumToSwap);
+          
+          int guyToSwap = Random.Next(0, background.Count);
+          background.SetItem(guyToSwap, newAlbum);
+          
+          
+          
+          
+          
+          TransportControls.DisableSlowDataThumbnailExtraction(newAlbum);
+          
+          
+        }
+      </Script>
+
+      
+      <Script>
+        if ([Grid.Content] != null)
+        {
+          
+          HideBackgroundTimer.Enabled = true;
+        }
+        else
+        {
+          
+          Background.Visible = true;
+          HideBackgroundTimer.Enabled = false;
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(HideBackgroundTimer.Tick)]
+        
+        Background.Visible = false;
+        HasShownIntro.Value = true;
+      </Script>
+    </Scripts>
+
+    <Content>
+      
+      <Panel Layout="Form">
+        <Children>
+
+          
+          
+          
+          
+          
+          
+          <me:NowPlayingGrid Name="Grid" 
+              Random="{Random}" 
+              HasShownIntro="{HasShownIntro}" 
+              ReferenceSize="{IdealCellSize}" 
+              ColorFilter="180,180,180"
+              Margins="-2,-2,-4,-4">
+          </me:NowPlayingGrid>
+
+          
+          
+          <Graphic Name="Background" Content="{styles:Styles.FUEBackground}" 
+              StretchingPolicy="UniformToFill" SizingPolicy="SizeToConstraint"/>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="NowPlayingGrid">
+    <Properties>
+      <List Name="Content" List="{null}"/>
+      <Size Name="ReferenceSize" Size="$Required"/>
+      <sys:Random Name="Random" Random="$Required"/>
+      <iris:BooleanChoice Name="HasShownIntro" BooleanChoice="$Required"/>
+    </Properties>
+
+    <Scripts>
+      <Script>Repeater.Source = [Content];</Script>
+    </Scripts>
+
+    <Content>
+      <Repeater Name="Repeater">
+        <Layout>
+          <GridLayout ReferenceSize="{ReferenceSize}" AllowWrap="true"/>
+        </Layout>
+        <Content>
+
+          <me:NowPlayingGridCell Album="{(data:Album)RepeatedItem}" Random="{Random}">
+            <Animations>
+              <SwitchAnimation Type="Show" Expression="{HasShownIntro}">
+                <Options>
+                  <TransformAnimation Name="Intro" 
+                      Delay="{((Single)Random.Next(0,anim:Animations.NowPlayingGrid_DelaySlices) * 0.1) + anim:Animations.NowPlayingGrid_MinDelay}" 
+                      Source="{anim:Animations.NowPlayingGridShow}"/>
+
+                  
+                </Options>
+              </SwitchAnimation>
+
+              <Animation Animation="{anim:Animations.NowPlayingGridSwapAlbumOut}"/> 
+
+            </Animations>
+          </me:NowPlayingGridCell>
+
+        </Content>
+      </Repeater>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="NowPlayingGridCell">
+    <Properties>
+      <data:Album Name="Album" Album="$Required"/>
+      <sys:Random Name="Random" Random="$Required"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+        if ([Album.AlbumArtSmall] != null)
+        {
+          AlbumArt.Content = Album.AlbumArtSmall;
+        }
+        else
+        {
+          
+          List artList = styles:Styles.NowPlayingNoArt;
+          int randomImage = Random.Next(0, artList.Count);
+          AlbumArt.Content = (Image)artList.GetItem(randomImage);
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Graphic Name="AlbumArt" SizingPolicy="SizeToConstraint" StretchingPolicy="UniformToFill" AcquiringImage="{null}" ErrorImage="{null}"/>
+    </Content>
+  </UI>
+
+  
+
+
+
+  <UI Name="NowPlayingBackground" Base="page:PageBase">
+    <Properties>
+      <zune:NowPlayingLand Name="Page" NowPlayingLand="$Required"/>
+    </Properties>
+
+    <Locals>
+      <zune:TransportControls Name="TransportControls" TransportControls="{zune:TransportControls.Instance}"/>
+      <styles:WindowState Name="WindowState"/>
+    </Locals>
+
+    <Scripts>
+      
+      
+      <Script>
+        bool playingVideo = [TransportControls.PlayingVideo];
+
+        
+        Video.Visible = playingVideo;
+        if (playingVideo)
+        {
+          iris:VideoStream stream = [TransportControls.VideoStream];
+
+          
+          Video.VideoStream = stream;
+
+          
+          
+          if (iris:Application.RenderingType == iris:RenderingType.GDI)
+          {
+            Video.Margins = styles:Styles.VideoMarginsGDIMode;
+            GDIVideoBackground.Visible = true;
+          }
+          else
+          {
+            Video.Margins = new Inset();
+            GDIVideoBackground.Visible = false;
+          }
+        }
+        else
+        {
+          Video.VideoStream = null;
+          GDIVideoBackground.Visible = false;
+        }
+      </Script>
+
+      <Script>
+        
+        if (![TransportControls.PlayingVideo])
+          MusicBackground.RequestSource(typeof(me:MusicNowPlayingBackground));
+        else
+          MusicBackground.RequestSource(null);
+      </Script>
+
+      
+      <Script>
+        Page.AutoHideToolbars = ![zune:PopupManager.Instance.IsModal];
+      </Script>
+
+      
+      <Script>
+        Fade.Visible = [WindowState.InputActive];
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Layout="Form">
+        <Animations>
+          <Animation Animation="{anim:Animations.NowPlayingPageFadeIn}"/>
+          <Animation Animation="{anim:Animations.NowPlayingPageFadeOut}"/>
+        </Animations>
+        <Children>
+
+          <me:NowPlayingBorders>
+            <LayoutInput>
+              <FormLayoutInput
+                  Left="Parent,0" Right="Parent,1"
+                  Top="Parent,0"  Bottom="Parent,1"/>
+            </LayoutInput>
+          </me:NowPlayingBorders>
+
+          
+          <Graphic Name="Fade" Content="{styles:Styles.NowPlayingFade}" SizingPolicy="SizeToConstraint">
+            <LayoutInput>
+              <FormLayoutInput
+                  Left="Parent,0" Right="Parent,1"
+                  Top="Parent,1,-330" Bottom="Parent,1"/>
+            </LayoutInput>
+            <Animations>
+              <Animation Animation="{anim:Animations.NowPlayingFadeIn}"/>
+              <Animation Animation="{anim:Animations.NowPlayingFadeOut}"/>
+            </Animations>
+          </Graphic>
+
+
+          
+          <Video Name="Video" LetterboxColor="TVBlack" Layout="Fill" Visible="false"/>
+
+          
+          <ColorFill Name="GDIVideoBackground" Content="TVBlack" Layout="Fill" Visible="false"/>
+
+
+          
+          
+
+          <Host Name="MusicBackground"/>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  <Class Name="NowPlayingListModel" Base="spreadsheet:SpreadSheetListModel">
+    <Properties>
+      <zune:NowPlayingLand Name="Page" NowPlayingLand="$Required"/>
+    </Properties>
+  </Class>
+
+  
+
+
+
+  <UI Name="NowPlayingSpreadSheet" Base="spreadsheet:SpreadSheet">
+    <Properties>
+      <Boolean Name="CanReorder" Boolean="true"/>
+      <Size Name="LayoutSpacing" Size="{styles:Styles.LibraryListLayoutSpacing}"/>
+      <Size Name="RowSize" Size="{styles:Styles.LibraryListItemSize}"/>
+      <Inset Name="RowPadding" Inset="{styles:Styles.LibraryListItemMargins}"/>
+    </Properties>
+
+    <Scripts>
+      
+      <Script>
+        [DeclareTrigger(Target.Dropped)]
+
+        object value = Target.GetValue();
+
+        if (!(value is SelectionManager))
+        {
+          
+        }
+        else
+        {
+          SelectionManager selectionManager = (SelectionManager)value;
+          int insertAt = InsertIndex.Value;
+
+          zune:TransportControls.Instance.ReorderNowPlaying(selectionManager.SelectedIndices, insertAt);
+        }
+      </Script>
+
+      
+      <Script>
+        styles:WindowState.PageInputActivity = [UI.DeepMouseFocus];
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+
+
+  <UI Name="CurrentTrackInfo">
+    <Properties>
+      <zune:NowPlayingLand Name="Page" NowPlayingLand="$Required"/>
+      <zune:PlaybackTrack Name="CurrentTrack" PlaybackTrack="{null}"/>
+    </Properties>
+
+    <Locals>
+      <me:NowPlayingInfo Name="NowPlayingInfo"/>
+      <zune:ShellCommand Name="CurrentTrackMoreInfo"
+        Command="Marketplace\Music\Artist"
+        Description="{zune:Shell.LoadString(zune:StringId.IDS_NOW_PLAYING_LINK_TO_MARKETPLACE)}"
+        Available="false"/>
+
+      <styles:WindowState Name="WindowState"/>
+    </Locals>
+
+    <Scripts>
+      
+      <Script>
+        NowPlayingInfo.CurrentTrack = [CurrentTrack];
+        
+        Form.Visible = (CurrentTrack != null);
+      </Script>
+      <Script>
+        TrackTitle.Content = [NowPlayingInfo.TrackTitle];
+        TrackShadow.Visible = !String.IsNullOrEmpty(NowPlayingInfo.TrackTitle);
+      </Script>
+      <Script>
+        ArtistName.Content = [NowPlayingInfo.ArtistName];
+        ArtistShadow.Visible = !String.IsNullOrEmpty(NowPlayingInfo.ArtistName);
+      </Script>
+      <Script>
+        AlbumTitle.Content = [NowPlayingInfo.AlbumTitle];
+        AlbumShadow.Visible = !String.IsNullOrEmpty(NowPlayingInfo.AlbumTitle);
+      </Script>
+      <Script>
+        AlbumArt.Content = [NowPlayingInfo.AlbumArt];
+        AlbumArtShadow.Visible = (AlbumArt.Content != null);
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(CurrentTrack)]
+        bool hasServiceId = false;
+        if (CurrentTrack != null &amp;&amp; !zune:GuidHelper.IsEmpty(CurrentTrack.ServiceId) &amp;&amp; CurrentTrack.IsMusic)
+        {
+          hasServiceId = true;
+          CurrentTrackMoreInfo.CommandArguments.set_Item("TrackId", CurrentTrack.ServiceId);
+        }
+        CurrentTrackMoreInfo.Available = hasServiceId;
+      </Script>
+
+      <Script>
+        bool showMoreLink = [WindowState.InputActive] &amp;&amp; [CurrentTrackMoreInfo.Available];
+        MoreInfo.Visible = showMoreLink;
+        MoreInfoShadow.Visible = showMoreLink;
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(CurrentTrack)]
+        AlbumArtShadow.ForceContentChange();
+        LabelRoot.ForceContentChange();
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Name="Form" Layout="Form" MaximumSize="0,200">
+        <Children>
+
+          
+          <Panel Name="AlbumArtPanel">
+            <LayoutInput>
+              <FormLayoutInput Left="Parent,0" Bottom="Parent,1"/>
+            </LayoutInput>
+            <Children>
+
+              <Graphic Name="AlbumArtShadow" Content="{styles:Styles.NowPlayingBoxShadow}" SizingPolicy="SizeToChildren" Margins="-18,-20,-19,-17" Padding="18,20,19,17">
+                <Animations>
+                  <TransformAnimation TransformAnimation="{anim:Animations.NowPlayingAlbumArtShow}"/>
+                  <Animation Animation="{anim:Animations.NowPlayingAlbumArtContentShow}"/>
+                </Animations>
+                <Children>
+
+                  <Graphic Name="AlbumArt" Margins="4,4,4,4"
+                      SizingPolicy="SizeToConstraint"
+                      StretchingPolicy="Uniform"
+                      MaximumSize="200,200"/>
+
+                </Children>
+              </Graphic>
+
+            </Children>
+          </Panel>
+
+          <Panel Name="MoreInfoLinkPanel" Layout="Anchor">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Parent,0,-2" Top="Parent,1,5" Bottom="Parent,1,999" ContributesToHeight="false" ContributesToWidth="false"/>
+            </LayoutInput>
+            <Animations>
+              <TransformAnimation TransformAnimation="{anim:Animations.NowPlayingAlbumArtShow}"/>
+            </Animations>
+            <Children>
+
+              <linkbuttons:MoreLink Name="MoreInfo" Model="{CurrentTrackMoreInfo}" 
+               OverrideStyle="{styles:SharedStyles.NowPlayingLinkStyle}" ShowToolTipWhenClipped="false"
+               Arrow="res://ZuneShellResources!Arrow.More.White.png" IconMargin="5,0,0,0">
+                <Animations>
+                  <Animation Animation="{anim:Animations.NowPlayingMoreInfoShow}"/>
+                  <Animation Animation="{anim:Animations.NowPlayingMoreInfoHide}"/>
+                  <Animation Animation="{anim:Animations.MoveNow}"/>
+                </Animations>
+              </linkbuttons:MoreLink>
+
+              <Graphic Name="MoreInfoShadow" Content="{styles:Styles.NowPlayingShadow}" Margins="-20" Alpha="0.5">
+                <LayoutInput>
+                  <AnchorLayoutInput Left="MoreInfo,0,-5" Right="MoreInfo,1,-5" Top="MoreInfo,0" Bottom="MoreInfo,1" ContributesToHeight="false" ContributesToWidth="false"/>
+                </LayoutInput>
+                <Animations>
+                  <Animation Animation="{anim:Animations.NowPlayingMoreInfoShow}"/>
+                  <Animation Animation="{anim:Animations.NowPlayingMoreInfoHide}"/>
+                  <Animation Animation="{anim:Animations.MoveNow}"/>
+                </Animations>
+              </Graphic>
+
+            </Children>
+          </Panel>
+
+
+          <Panel Name="LabelRoot" Layout="Anchor">
+            <Animations>
+              <TransformAnimation TransformAnimation="{anim:Animations.NowPlayingAlbumArtShow}"/>
+              <TransformAnimation TransformAnimation="{anim:Animations.NowPlayingTitleContentShow}"/>
+              <Animation Animation="{anim:Animations.NowPlayingTitleContentHide}"/>
+              <Animation Animation="{anim:Animations.MoveNow}"/>
+            </Animations>
+            <LayoutInput>
+              <FormLayoutInput Left="AlbumArtPanel,1,20" Bottom="Parent,1" Top="Parent,0" Vertical="Center"/>
+            </LayoutInput>
+            <Children>
+
+              
+
+              <core:Label Name="ArtistName" Style="{styles:SharedStyles.NowPlayingPrimaryLabel}" ShowToolTipWhenClipped="false">
+                <LayoutInput>
+                  <AnchorLayoutInput Left="Parent,0" Top="Parent,0"/>
+                </LayoutInput>
+              </core:Label>
+
+              <core:Label Name="AlbumTitle" Style="{styles:SharedStyles.NowPlayingSecondaryLabel}" ShowToolTipWhenClipped="false">
+                <LayoutInput>
+                  <AnchorLayoutInput Left="Parent,0" Top="ArtistName,1,-20"/>
+                </LayoutInput>
+              </core:Label>
+
+              <core:Label Name="TrackTitle" Style="{styles:SharedStyles.NowPlayingSecondaryLabel}" ShowToolTipWhenClipped="false">
+                <LayoutInput>
+                  <AnchorLayoutInput Left="Parent,0" Top="AlbumTitle,1,-16"/>
+                </LayoutInput>
+              </core:Label>
+
+              
+
+              <Graphic Name="ArtistShadow" Content="{styles:Styles.NowPlayingShadow}" Margins="-10" Alpha="0.5">
+                <LayoutInput>
+                  <AnchorLayoutInput Left="ArtistName,0,-5" Right="ArtistName,1,10" Top="ArtistName,0" Bottom="ArtistName,1" ContributesToHeight="false" ContributesToWidth="false"/>
+                </LayoutInput>
+              </Graphic>
+
+              <Graphic Name="AlbumShadow" Content="{styles:Styles.NowPlayingShadow}" Margins="-12" Alpha="0.5">
+                <LayoutInput>
+                  <AnchorLayoutInput Left="AlbumTitle,0,-5" Right="AlbumTitle,1,10" Top="AlbumTitle,0" Bottom="AlbumTitle,1" ContributesToHeight="false" ContributesToWidth="false"/>
+                </LayoutInput>
+              </Graphic>
+
+              <Graphic Name="TrackShadow" Content="{styles:Styles.NowPlayingShadow}" Margins="-12" Alpha="0.5">
+                <LayoutInput>
+                  <AnchorLayoutInput Left="TrackTitle,0,-5" Right="TrackTitle,1,10" Top="TrackTitle,0" Bottom="TrackTitle,1" ContributesToHeight="false" ContributesToWidth="false"/>
+                </LayoutInput>
+              </Graphic>
+
+            </Children>
+          </Panel>
+
+        </Children>
+      </Panel>
+
+    </Content>
+  </UI>
+
+  
+
+
+  <Class Name="NowPlayingInfo">
+    <Properties>
+      
+      <zune:PlaybackTrack Name="CurrentTrack" PlaybackTrack="{null}"/>
+
+      
+      <String Name="TrackTitle" String="{null}"/>
+      <String Name="ArtistName" String="{null}"/>
+      <String Name="AlbumTitle" String="{null}"/>
+      <Image  Name="AlbumArt"   Image="{null}"/>
+    </Properties>
+
+    <Locals>
+      <zune:LibraryAlbumInfo Name="LibraryAlbumInfo" LibraryAlbumInfo="{null}"/>
+      <mpdata:MarketplaceSingleTrackDataQuery Name="MPTrackQuery" Enabled="false"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        [DeclareTrigger(CurrentTrack)]
+
+        
+        
+        
+        if (LibraryAlbumInfo != null)
+        {
+          Class.DisposeOwnedObject(LibraryAlbumInfo);
+          LibraryAlbumInfo = null;
+        }
+        
+        MPTrackQuery.Enabled = false;
+
+        zune:PlaybackTrack track = CurrentTrack;
+        if (track != null)
+        {
+          TrackTitle = track.Title;
+
+          if (track is zune:LibraryPlaybackTrack)
+          {
+            LibraryAlbumInfo = new zune:LibraryAlbumInfo((zune:LibraryPlaybackTrack)track);
+          }
+          else if (track is zune:MarketplacePlaybackTrack)
+          {
+            zune:MarketplacePlaybackTrack mptrack = (zune:MarketplacePlaybackTrack)track;
+            AlbumTitle = mptrack.Album;
+            ArtistName = mptrack.Artist;
+          }
+          else if (track is zune:MusicVideoPlaybackTrack)
+          {
+            zune:MusicVideoPlaybackTrack mvtrack = (zune:MusicVideoPlaybackTrack)track;
+            ArtistName = mvtrack.Artist;
+          }
+          
+          if (!track.IsInCollection)
+          {
+            sys:Guid serviceId = track.ServiceId;
+            if (!zune:GuidHelper.IsEmpty(serviceId))
+            {
+              MPTrackQuery.Id = serviceId.ToString();
+              MPTrackQuery.Enabled = true;
+            }
+          }
+        }
+        else
+        {
+          TrackTitle = null;
+          AlbumTitle = null;
+          ArtistName = null;
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(LibraryAlbumInfo.AlbumTitle)]
+        if (LibraryAlbumInfo != null)
+        {
+          AlbumTitle = LibraryAlbumInfo.AlbumTitle;
+        }
+        else
+        {
+          AlbumTitle = null;
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(LibraryAlbumInfo.ArtistName)]
+        if (LibraryAlbumInfo != null)
+        {
+          ArtistName = LibraryAlbumInfo.ArtistName;
+        }
+        else
+        {
+          ArtistName = null;
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(LibraryAlbumInfo.AlbumArtUrl)]
+
+        if (LibraryAlbumInfo != null)
+        {
+          if (!String.IsNullOrEmpty(LibraryAlbumInfo.AlbumArtUrl))
+          {
+            
+            
+
+            
+            AlbumArt = new Image(LibraryAlbumInfo.AlbumArtUrl, new Inset(0,0,0,0), new Size(200,200));
+          }
+          else
+          {
+            
+            AlbumArt = styles:Styles.NoAlbumArtNowPlayingBig;
+          }
+        }
+        else
+        {
+          AlbumArt = null;
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(MPTrackQuery.Result.AlbumImageUri)]
+        
+        
+        
+        
+        
+        if (!String.IsNullOrEmpty(MPTrackQuery.Result.AlbumImageUri) &amp;&amp; MPTrackQuery.Enabled)
+        {
+          AlbumArt = new Image(MPTrackQuery.Result.AlbumImageUri);
+        }
+      </Script>
+    </Scripts>
+  </Class>
+
+  
+
+
+
+  <Class Name="Columns" Shared="True">
+    <Properties>
+
+      <spreadsheet:ColumnData Name="DefaultViewColumnData" SaveKeyPrefix="NowPlaying">
+        <Columns>
+
+          <spreadsheet:ColumnInfo
+            CellType="{typeof(me:StatusCell)}"
+            Resizable="false"
+            CellPadding="0,1,0,0">
+            <ColumnSize>
+              <SharedSize Size="17,0"/>
+            </ColumnSize>
+          </spreadsheet:ColumnInfo>
+
+          <spreadsheet:ColumnInfo
+            Header="{zune:Shell.LoadString(zune:StringId.IDS_SONG_COLUMN_HEADER)}"
+            CellType="{typeof(me:SongCell)}"
+            CellPadding="5,0,5,0">
+            <ColumnSize>
+              <SharedSize Size="215,0" MinimumSize="35,0" MaximumSize="500,0"/>
+            </ColumnSize>
+          </spreadsheet:ColumnInfo>
+
+          <spreadsheet:ColumnInfo
+            HeaderIcon="{styles:Styles.RatingHeader}"
+            CellType="{typeof(me:RatingCell)}"
+            Resizable="false"
+            CellPadding="4,0,4,0">
+            <ColumnSize>
+              <SharedSize Size="25,0"/>
+            </ColumnSize>
+          </spreadsheet:ColumnInfo>
+
+        </Columns>
+      </spreadsheet:ColumnData>
+
+    </Properties>
+  </Class>
+
+  <UI Name="SongCell" Base="spreadsheet:LabelCell">
+    <Properties>
+      <zune:PlaybackTrack Name="Model" PlaybackTrack="$Required"/>
+    </Properties>
+    <Scripts>
+      <Script>Content = Model.Title;</Script>
+    </Scripts>
+  </UI>
+
+  <UI Name="StatusCell" Base="spreadsheet:MediaStatusCell">
+    <Properties>
+      <zune:PlaybackTrack Name="Model" PlaybackTrack="$Required"/>
+    </Properties>
+    <Scripts>
+      <Script>
+        IsNowPlaying = (Model == [zune:TransportControls.Instance.CurrentTrack]);
+      </Script>
+
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(zune:TransportControls.Instance.ErrorCount)]
+        ErrorCode = zune:TransportControls.Instance.GetLibraryErrorCode(Model);
+      </Script>
+    </Scripts>
+  </UI>
+
+  <UI Name="RatingCell" Base="tpc:RatingCellBase">
+    <Properties>
+      <me:NowPlayingListModel Name="ListModel" NowPlayingListModel="$Required"/>
+      <zune:PlaybackTrack Name="Model" PlaybackTrack="$Required"/>
+      <Int32 Name="UserRating" Int32="{Model.UserRating}"/>
+    </Properties>
+    <Scripts>
+      
+      <Script>
+        ChangeRating.Available = Model.CanRate;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(ListModel.Page.RatingsChanged.Invoked)]
+        UserRating = Model.UserRating;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(UserRating)]
+        if (Model.UserRating != UserRating)
+          Model.UserRating = UserRating;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(ChangeRating.Invoked)]
+
+        
+        
+        if (ListModel.SelectionManager != null &amp;&amp;
+            ListModel.SelectionManager.IsSelected(RowIndex.Value))
+        {
+          foreach (zune:PlaybackTrack track in ListModel.SelectionManager.SelectedItems)
+          {
+            if (track.UserRating != UserRating)
+              track.UserRating = UserRating;
+          }
+
+          
+          ListModel.Page.RatingsChanged.Invoke();
+        }
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+
+
+  <UI Name="NowPlayingBorders">
+    <Scripts>
+      <Script>
+        Borders.Visible = ([iris:Application.Window.WindowState] != iris:WindowState.Maximized);
+      </Script>
+    </Scripts>
+    
+    <Content>
+      <Panel Name="Borders" Layout="Form">
+        <Children>
+
+          
+          <ColorFill Content="{styles:Styles.NowPlayingBorderColor}">
+            <LayoutInput>
+              <FormLayoutInput Left="Parent,0,1"  Right="Parent,1,-1"
+                               Top="Parent,0"   Bottom="Parent,0,1"/>
+            </LayoutInput>
+          </ColorFill>
+          
+          
+          <ColorFill Content="{styles:Styles.NowPlayingBorderColor}">
+            <LayoutInput>
+              <FormLayoutInput Left="Parent,0"  Right="Parent,0,1"
+                               Top="Parent,0"   Bottom="Parent,1"/>
+            </LayoutInput>
+          </ColorFill>
+          
+          
+          <ColorFill Content="{styles:Styles.NowPlayingBorderColor}">
+            <LayoutInput>
+              <FormLayoutInput Left="Parent,1,-1"  Right="Parent,1"
+                               Top="Parent,0"   Bottom="Parent,1"/>
+            </LayoutInput>
+          </ColorFill>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/NOWPLAYINGNOTIFICATION.UIX b/test/2.1/NOWPLAYINGNOTIFICATION.UIX
new file mode 100644
index 0000000..4168dd0
--- /dev/null
+++ b/test/2.1/NOWPLAYINGNOTIFICATION.UIX
@@ -0,0 +1,333 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX 
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:images="res://ZuneShellResources!ImageStyle.uix"
+  xmlns:nowplaying="res://ZuneShellResources!NowPlayingLand.uix"
+  xmlns:animations="res://ZuneShellResources!Animations.uix"
+  xmlns:me="Me"
+  >
+
+  <UI Name="NowPlayingNotification">
+    <Properties>
+      <zune:NowPlayingNotification Name="Model" NowPlayingNotification="$Required"/>
+    </Properties>
+
+    <Input>
+      <ClickHandler Name="Clicker" ClickType="LeftMouse" HandlerStage="Bubbled,Direct"/>
+    </Input>
+
+    <Locals>
+      <zune:TransportControls Name="Controls" TransportControls="{zune:TransportControls.Instance}"/>
+      <iris:RangedValue Name="ProgressModel"/>
+      <Command Name="SliderValueUpdatedCommand"/>
+      <iris:Command Name="DurationCommand"/>
+
+      
+      
+      
+      
+      <Timer Name="RotateInfo" Interval="4000" AutoRepeat="true" Enabled="false"/>   
+      <nowplaying:NowPlayingInfo Name="NowPlayingInfo"/>
+      <int Name="RotationCode"  int="0" />
+      <List Name="RotateInfoList" List="{null}"/>
+
+      <Timer Name="OpeningTimer" Interval="750" Enabled="false" AutoRepeat="false"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        [DeclareTrigger(Clicker.Invoked)]
+        if (!UI.DeepKeyFocus)
+          ProgressBar.NavigateInto();
+      </Script>
+
+      <Script>
+        OpeningTimer.Enabled = [Controls.Opening];
+      </Script>
+
+      <Script>
+        [DeclareTrigger(OpeningTimer.Tick)]
+        PositionText.Content = zune:Shell.LoadString(zune:StringId.IDS_PLAYBACK_OPENING);
+      </Script>
+
+      <Script>
+        [DeclareTrigger(DurationCommand.Invoked)]
+        
+        
+        
+        
+        Controls.ShowTotalTime.Value = !Controls.ShowTotalTime.Value;
+      </Script>
+
+      <Script>
+        zune:PlaybackTrack track = [Controls.CurrentTrack];
+
+        NowPlayingInfo.CurrentTrack = track;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(NowPlayingInfo.TrackTitle)]
+        [DeclareTrigger(NowPlayingInfo.ArtistName)]
+        [DeclareTrigger(NowPlayingInfo.AlbumTitle)]
+        
+        RotateInfoList = new List();
+        
+        if (!String.IsNullOrEmpty(NowPlayingInfo.TrackTitle))
+        {
+          RotateInfoList.Add(NowPlayingInfo.TrackTitle);
+        }
+        if (!String.IsNullOrEmpty(NowPlayingInfo.ArtistName))
+        {
+          RotateInfoList.Add(NowPlayingInfo.ArtistName);
+        }
+        if (!String.IsNullOrEmpty(NowPlayingInfo.AlbumTitle))
+        {
+          RotateInfoList.Add(NowPlayingInfo.AlbumTitle);
+        }
+        
+        
+        
+        
+        if (RotateInfoList.Count == 0)
+        {
+          
+          RotateInfoList.Add(" ");
+        }
+        
+        
+        
+        
+        RotationCode = 0;
+        
+        
+        
+        
+        if (RotateInfoList.Count > 1)
+        {
+          RotateInfo.Start();
+        }
+        else
+        {
+          RotateInfo.Stop();
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(RotationCode)]
+        [DeclareTrigger(RotateInfoList)]
+        
+        string content = null;
+        
+        if (!List.IsNullOrEmpty(RotateInfoList))
+        {
+          RotationCode = RotationCode % RotateInfoList.Count;
+          
+          content = (string)RotateInfoList.GetItem(RotationCode);
+        }
+
+        TrackInfo.Content = content;
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(RotateInfo.Tick)]
+        
+        RotationCode = RotationCode + 1; 
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(TrackInfo.Clicked.Invoked)]
+        
+        RotationCode = RotationCode + 1;
+        
+        
+        
+        if (RotateInfo.Enabled)
+        {
+          RotateInfo.Stop();
+          RotateInfo.Start();
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(SliderValueUpdatedCommand.Invoked)]
+        zune:TransportControls.Instance.SeekToPosition(ProgressBar.UpdateValue);
+      </Script>
+
+
+      <Script>
+        [DeclareTrigger(SliderValueUpdatedCommand.Invoked)]
+        zune:TransportControls.Instance.SeekToPosition(ProgressBar.UpdateValue);
+      </Script>
+
+      <Script>
+        ProgressModel.MinValue = 0.0;
+        ProgressModel.MaxValue = [Controls.CurrentTrackDuration];
+        ProgressModel.Value    = [Controls.CurrentTrackPosition];
+      </Script>
+
+      <Script>
+        PositionText.Content = zune:TransportControls.FormatDuration([Controls.CurrentTrackPosition]);
+      </Script>
+
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(Controls.ShowTotalTime.Value)]
+        [DeclareTrigger(Controls.CurrentTrackDuration)]
+        [DeclareTrigger(ProgressBar.Dragging)]
+        
+        
+        
+        
+        if (Controls.ShowTotalTime.Value || ProgressBar.Dragging)
+        {
+            DurationCommand.Description = zune:TransportControls.FormatDuration(Controls.CurrentTrackDuration);
+        }
+      </Script>
+
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(Controls.ShowTotalTime.Value)]
+        [DeclareTrigger(Controls.CurrentTrackDuration)]
+        [DeclareTrigger(Controls.CurrentTrackPosition)]
+        [DeclareTrigger(ProgressBar.Dragging)]
+        
+        
+        
+        
+        if (!Controls.ShowTotalTime.Value &amp;&amp; !ProgressBar.Dragging)
+        {
+            float remaining = Controls.CurrentTrackDuration - Controls.CurrentTrackPosition;
+
+            DurationCommand.Description = zune:TransportControls.FormatDuration(remaining, true);
+        }
+      </Script>
+
+      <Script>
+        TrackingText.Visible = [ProgressBar.Dragging];
+      </Script>
+
+      <Script>
+        if (ProgressBar.Dragging)
+        {
+           TrackingText.Content = zune:TransportControls.FormatDuration([ProgressBar.UpdateValue]);
+        }
+      </Script>
+
+      
+      
+      
+      
+      
+      <Script>
+        if ([images:Images.InNowPlaying.Value])
+        {
+          ProgressBar.BackgroundImage         = styles:Styles.SlideshowSliderBackground;
+          ProgressBar.ThumbImage              = styles:Styles.SlideshowSliderThumb;
+          ProgressBar.ThumbImageFocus         = styles:Styles.SlideshowSliderHoverThumb;
+          ProgressBar.FilledBackgroundImage   = styles:Styles.SlideshowSliderFill;
+
+          TrackInfo.Style                     = styles:SharedStyles.SlideshowNowPlayingNotificationTitle;
+          PositionText.Style                  = styles:SharedStyles.SlideshowNowPlayingNotificationElapsedTime;
+          DurationText.OverrideStyle          = styles:SharedStyles.SlideshowNowPlayingNotificationTotalTime;
+          TrackingText.Style                  = styles:SharedStyles.SlideshowNowPlayingNotificationElapsedTime;
+        }
+        else
+        {
+          ProgressBar.BackgroundImage         = styles:Styles.SliderBackground;
+          ProgressBar.ThumbImage              = styles:Styles.SliderThumb;
+          ProgressBar.ThumbImageFocus         = styles:Styles.SliderHoverThumb;
+          ProgressBar.FilledBackgroundImage   = styles:Styles.SliderFill;
+
+          TrackInfo.Style                     = styles:SharedStyles.NowPlayingNotificationTitle;
+          PositionText.Style                  = styles:SharedStyles.NowPlayingNotificationElapsedTime;
+          DurationText.OverrideStyle          = styles:SharedStyles.NowPlayingNotificationTotalTime;
+          TrackingText.Style                  = styles:SharedStyles.NowPlayingNotificationElapsedTime;
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Padding="5,0,5,0">
+        <Layout>
+          <DockLayout DefaultLayoutInput="Top,Near" SizeToChildren="true"/>
+        </Layout>
+        <Children>
+
+          <me:AnimatingLabel Name="TrackInfo" Margins="3,0,0,0"/>
+
+          <core:Slider Name="ProgressBar"
+              Model="{ProgressModel}"
+              ValueChanged="{SliderValueUpdatedCommand}"
+              MinimumSize="16,16" 
+              FillAdjustment="4"
+              KeyDelta="-0.05"
+              KeyDeltaShift="1.0"
+              KeyDeltaCtrl="-0.20"
+              AutoUpdateDuringDrag="false"/>
+
+          <Panel Margins="3,0,3,0">
+            <Layout>
+              <DockLayout SizeToChildren="true"/>
+            </Layout>
+            <Children>
+
+              <core:Label Name="PositionText">
+                <LayoutInput>
+                  <DockLayoutInput Position="Left" Alignment="Near"/>
+                </LayoutInput>
+              </core:Label>
+
+              <core:Button Name="DurationText"
+                Model="{DurationCommand}"
+                KeyInteractiveNStuff="false"
+                KeyFocusOnMouseDown="false">
+                <LayoutInput>
+                  <DockLayoutInput Position="Right" Alignment="Near"/>
+                </LayoutInput>
+              </core:Button>
+
+              <core:Label Name="TrackingText" Alignment="Center">
+                <LayoutInput>
+                  <DockLayoutInput Position="Top" Alignment="Center"/>
+                </LayoutInput>
+                <Animations>
+                  <Animation Animation="{animations:Animations.NowPlayingNotificationTrackTimeShow}"/>
+                  <Animation Animation="{animations:Animations.NowPlayingNotificationTrackTimeHide}"/>
+                </Animations>
+              </core:Label>
+
+            </Children>
+          </Panel>
+        
+        </Children>
+      </Panel>
+
+    </Content>
+  </UI>
+
+  <UI Name="AnimatingLabel" Base="core:Label">
+    <Properties>
+      <Command Name="Clicked"/>
+    </Properties>
+    
+    <Input>
+      <ClickHandler Name="Clicker" ClickType="Mouse" Command="{Clicked}"/>
+    </Input>
+    
+    <Content>
+      <Text Name="Label" NamedStyles="{NamedStyles}" MouseInteractive="{ShowToolTipWhenClipped}">
+        <Animations>
+          <Animation Animation="{animations:Animations.NowPlayingNotificationShow}"/>
+          <Animation Animation="{animations:Animations.NowPlayingNotificationHide}"/>
+        </Animations>
+      </Text>
+    </Content>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/PAGESTACK.UIX b/test/2.1/PAGESTACK.UIX
new file mode 100644
index 0000000..f77cfc3
--- /dev/null
+++ b/test/2.1/PAGESTACK.UIX
@@ -0,0 +1,86 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:me="Me">
+
+  <UI Name="PageStack">
+    <Properties>
+      <zune:ZuneShell Name="Shell" ZuneShell="$Required"/>
+    </Properties>
+
+    <Locals>
+      <bool Name="CanGoBack" bool="true" />
+    </Locals>
+
+    <Input>
+      
+      <KeyHandler Name="BackKeyHandler" Key="Backspace" HandlerStage="Bubbled" Repeat="false" Command="{Shell.NavigateBackCommand}"/>
+      <KeyHandler Name="BackArrowHandler" Key="Left" HandlerStage="Bubbled" RequiredModifiers="Alt"
+                  DisallowedModifiers="Ctrl,Shift,Windows" Repeat="false" Command="{Shell.NavigateBackCommand}"/>
+      <ShortcutHandler Name="BackShortcutHandler" Shortcut="Back" HandlerStage="Bubbled" Command="{Shell.NavigateBackCommand}"/>
+    </Input>
+
+    <Scripts>
+      
+      
+
+
+
+
+
+
+
+
+
+
+
+      <Script>
+        bool enabled = [CanGoBack];
+        BackKeyHandler.Enabled = enabled;
+        BackArrowHandler.Enabled = enabled;
+        BackShortcutHandler.Enabled = enabled;
+      </Script>
+
+      
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(Shell.CurrentPage)]
+
+        
+        ForegroundUI.ForceContentChange();
+
+        ForegroundUI.RequestSource(Shell.CurrentPage.UI, "Page", Shell.CurrentPage);
+        BackgroundUI.RequestSource(Shell.CurrentPage.BackgroundUI, "Page", Shell.CurrentPage);
+
+        ForegroundUI.NavigateInto();
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel>
+        <Children>
+
+          <me:PageBase Name="ForegroundUI" Shell="{Shell}" Page="{Shell.CurrentPage}"/>
+
+          <me:PageBase Name="BackgroundUI" Shell="{Shell}" Page="{Shell.CurrentPage}"/>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+
+  
+  
+  <UI Name="PageBase">
+    <Properties>
+      <zune:ZuneShell Name="Shell" ZuneShell="$Required"/>
+      <zune:ZunePage Name="Page" ZunePage="$Required"/>
+    </Properties>
+
+    <Content>
+      <ColorFill Content="Pink" Layout="Fill"/>
+    </Content>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/PAGINGCONTROL.UIX b/test/2.1/PAGINGCONTROL.UIX
new file mode 100644
index 0000000..a858e4e
--- /dev/null
+++ b/test/2.1/PAGINGCONTROL.UIX
@@ -0,0 +1,101 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:button="res://ZuneShellResources!Button.uix"
+  xmlns:scrollbar="res://ZuneShellResources!ScrollBar.uix"
+  xmlns:me="Me">
+
+  
+  
+  
+  <UI Name="PagingControl" Base="scrollbar:ScrollControl">
+    <Properties>
+      <ScrollingData Name="ScrollData" ScrollingData="$Required"/>
+      <Boolean Name="Wrap" Boolean="false"/>
+    </Properties>
+
+    <Locals>
+      <iris:Command Name="NextPageCommand"/>
+      <iris:Command Name="PrevPageCommand"/>
+    </Locals>
+
+    <Scripts>
+      
+      
+      <Script>ScrollData.PageStep = 1.0;</Script>
+
+      
+      <Script>
+        bool canWrap = false;
+        if ([ScrollData.TotalPages] > 1.0)
+          canWrap = true;
+
+        PrevPageCommand.Available = [ScrollData.CanScrollUp] || (Wrap &amp;&amp; canWrap);
+        NextPageCommand.Available = [ScrollData.CanScrollDown] || (Wrap &amp;&amp; canWrap);
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(PrevPageCommand.Invoked)]
+        if (ScrollData.CanScrollUp)
+          ScrollData.PageUp();
+        else if (Wrap)
+          ScrollData.End();
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(NextPageCommand.Invoked)]
+        if (ScrollData.CanScrollDown)
+          ScrollData.PageDown();
+        else if (Wrap)
+          ScrollData.Home();
+      </Script>
+    </Scripts>
+
+    <Content>
+      <me:PrevNextArrows PrevCommand="{PrevPageCommand}" NextCommand="{NextPageCommand}"/>
+    </Content>
+  </UI>
+  
+  
+  
+  
+  <UI Name="PrevNextArrows">
+    <Properties>
+      <iris:Command Name="PrevCommand" Command="$Required"/>
+      <iris:Command Name="NextCommand" Command="$Required"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+        Root.Visible = ([PrevCommand.Available] || [NextCommand.Available]);
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Name="Root" Layout="HorizontalFlow" Padding="4,4,4,4">
+        <Children>
+
+          <button:IconButton Model="{PrevCommand}"
+              AllowDoubleClicks="false" 
+              Image="res://ZuneShellResources!Page.Prev.png"
+              HoverImage="res://ZuneShellResources!Page.Prev.Hover.png"
+              PressedImage="res://ZuneShellResources!Page.Prev.Pressed.png"
+              DisabledImage="res://ZuneShellResources!Page.Prev.Disabled.png"/>
+
+          <button:IconButton Model="{NextCommand}"
+              AllowDoubleClicks="false"
+              Image="res://ZuneShellResources!Page.Next.png"
+              HoverImage="res://ZuneShellResources!Page.Next.Hover.png"
+              PressedImage="res://ZuneShellResources!Page.Next.Pressed.png"
+              DisabledImage="res://ZuneShellResources!Page.Next.Disabled.png"/>
+
+        </Children>
+      </Panel>
+
+    </Content>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/PHOTOBUTTON.UIX b/test/2.1/PHOTOBUTTON.UIX
new file mode 100644
index 0000000..fd272dd
--- /dev/null
+++ b/test/2.1/PHOTOBUTTON.UIX
@@ -0,0 +1,53 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX 
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:style="res://ZuneShellResources!Style.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:thumbbutton="res://ZuneShellResources!ThumbnailButton.uix"
+  xmlns:lib="res://ZuneShellResources!LibraryPanels.uix"
+  xmlns:me="Me">
+  
+  
+  
+  
+  
+  <UI Name="PhotoButtonBase" Base="thumbbutton:ThumbnailButtonBase">
+    <Properties>
+      <Type Name="ThumbnailCaptionAreaType" Type="{typeof(me:ThumbnailCaptionArea)}"/>
+
+      
+      <style:Style Name="PrimaryStyle" Style="{styles:SharedStyles.PhotoVideoLabelStyle}"/>
+      <style:Style Name="SecondaryStyle" Style="{styles:SharedStyles.PhotoVideoLabelStyle}"/>
+      <style:Style Name="OverlayStyle" Style="{styles:SharedStyles.ThumbnailOverlayLabelStyle}"/>
+
+      <AnchorLayoutInput Name="LabelAnchor" 
+          Left="Image,0" Right="Image,1" Horizontal="Near" 
+          Top="Image,1,5" Bottom="Parent,1,999" Vertical="Near"/>
+
+      <StretchingPolicy Name="StretchingPolicy" StretchingPolicy="Uniform"/>    
+      
+      <Vector3 Name="HoverScale" Vector3="1.03,1.03,1.0" />
+    </Properties>
+
+    <Scripts>
+      <Script>ImageBorder.Content = Color.White;</Script>
+
+      
+      <Script>
+        Root.MouseInteractive = false;
+        ImageBorder.MouseInteractive = true;
+        LabelArea.MouseInteractive = true;
+      </Script>
+    </Scripts>
+  </UI>
+  
+  
+  
+  
+  <UI Name="ThumbnailCaptionArea" Base="lib:ThumbnailCaptionArea">
+    <Properties>
+      <Type Name="PrimaryLabelType" Type="{typeof(thumbbutton:EditableLabelHost)}"/>
+    </Properties>
+  </UI>
+  
+</UIX>
diff --git a/test/2.1/PHOTOLIBRARY.UIX b/test/2.1/PHOTOLIBRARY.UIX
new file mode 100644
index 0000000..73cc578
--- /dev/null
+++ b/test/2.1/PHOTOLIBRARY.UIX
@@ -0,0 +1,766 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:sys="assembly://mscorlib/System"
+  xmlns:col="assembly://mscorlib/System.Collections"
+  xmlns:data="res://ZuneShellResources!LibraryData.schema.xml"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:panels="res://ZuneShellResources!LibraryPanels.uix"
+  xmlns:gp="res://ZuneShellResources!GalleryPanel.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:thumbbutton="res://ZuneShellResources!ThumbnailButton.uix"
+  xmlns:photobutton="res://ZuneShellResources!PhotoButton.uix"
+  xmlns:li="res://ZuneShellResources!ContentList.uix"
+  xmlns:drag="res://ZuneShellResources!DragFeedback.uix"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:library="res://ZuneShellResources!Library.uix"
+  xmlns:me="Me">
+
+  <Class Name="PhotoPanelData" Shared="true">
+    <Properties>
+      
+
+      <iris:ArrayListDataSet Name="SortOptions">
+        <Source>
+          <zune:SortCommand Description="{me:Strings.NameSort}" Sort="+Title"     SupportsJumpInList="true"/>
+          <zune:SortCommand Description="{me:Strings.DateSort}" Sort="-DateTaken" />
+        </Source>
+      </iris:ArrayListDataSet>
+      
+      
+
+      <List Name="FolderSortOptions">
+        <Source>
+          <String String="+FileName"/>
+          <String String="-DateCreated"/>
+        </Source>
+      </List>
+      
+      <panels:SortData Name="Sorts" Options="{SortOptions}" SaveKey="PhotoSort"/>
+      
+      <Command Name="FilterFolders"/>
+    </Properties>
+  </Class>
+
+  
+  
+  
+  <UI Name="PhotoPanel" Base="panels:LibraryGalleryPanel">
+    <Properties>
+      <zune:PhotoLibraryPage Name="Page" PhotoLibraryPage="$Required"/>
+      <zune:PhotosPanel Name="Model" PhotosPanel="$Required" />
+
+      <Type Name="GalleryViewType" Type="{typeof(me:GalleryView)}"/>
+
+      <panels:SortData Name="SortData" SortData="{me:PhotoPanelData.Sorts}"/>
+
+      <Single Name="MinimumPercent" Single="0.50"/>
+      
+      <Inset Name="ColumnMargins" Inset="-24,0,0,0"/>
+      <Inset Name="ColumnInset" Inset="24,0,0,0"/>
+      <Inset Name="HeaderMargins" Inset="0,0,0,6"/>
+      <Inset Name="HeaderPadding" Inset="24,0,5,0"/>
+    </Properties>
+
+    <Locals>
+      <data:LibraryMediaFolderQuery Name="MediaFolderQuery" FolderMediaType="Photo" FolderId="0" ShowDeviceContents="{Page.ShowDeviceContents}" Enabled="false"
+                                    AntialiasImageEdges="{iris:Application.RenderingType != iris:RenderingType.GDI}" />
+      <data:LibraryPhotoQuery Name="PhotosByFolderQuery" ShowDeviceContents="{Page.ShowDeviceContents}" Enabled="false"
+                                       AntialiasImageEdges="{iris:Application.RenderingType != iris:RenderingType.GDI}" />
+
+      <zune:SlideshowLand Name="SlideShowLand" SlideShowState="{Page.SlideShowState}"/>
+
+      <zune:SlideShowState Name="State" SlideShowState='{Page.SlideShowState}'/>
+
+      
+      <Command Name="ExecutePhoto"/>
+      
+      
+      <Command Name="NavigateWorker"/>
+
+      
+      <iris:Command Name="PlaySlideshow" Description="{me:Strings.PlayCommand}" Available="false"/>
+      <zune:MenuItemCommand Name="Open" Description="{me:Strings.OpenCommand}" Available="false"/>
+      <core:MenuDivider Name="PropertiesDivider"/>      
+      <List Name="MenuOptions">
+        <Source>
+          <zune:MenuItemCommand MenuItemCommand="{Open}"/>
+          <iris:Command Command="{PlaySlideshow}"/>
+          <iris:Command Command="{AddToBurnList}"/>
+          <core:MenuDivider/>
+          <iris:Command Command="{Edit}"/>
+          <iris:Command Command="{Delete}"/>
+          <core:MenuDivider MenuDivider="{SyncDivider}"/>
+          <iris:Command Command="{Sync}"/>
+          <iris:Command Command="{SyncAllUnexclude}"/>
+          <zune:MenuItemCommand MenuItemCommand="{Exclude}"/>
+          <zune:MenuItemCommand MenuItemCommand="{Unexclude}"/>
+          <core:MenuDivider MenuDivider="{PropertiesDivider}"/>
+          <iris:Command Command="{Properties}"/>
+        </Source>
+      </List>
+
+      <List Name="DeviceMenuOptions">
+        <Source>
+          <zune:MenuItemCommand MenuItemCommand="{Open}"/>
+          <iris:Command Command="{ReverseSync}"/>
+          <iris:Command Command="{DeleteFromDevice}"/>
+        </Source>
+      </List>
+
+      <iris:AggregateList Name="AggregatingList" AggregateList="{null}"/>
+      <zune:RootFolderList Name="RootFolderList" RootFolderList="{null}"/>
+
+      <Int32 Name="PhotoCount"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        int deviceID = [Page.DeviceId];
+        MediaFolderQuery.DeviceId = deviceID;
+        PhotosByFolderQuery.DeviceId = deviceID;
+      </Script>
+
+      
+      <Script>
+        
+        
+        Worker.ExecuteCommand = ExecutePhoto;
+
+        if (!Page.ShowDeviceContents)
+        {
+          ContextMenu.Options = MenuOptions;
+        }
+        else
+        {
+          ContextMenu.Options = DeviceMenuOptions;
+          DeleteKey.Command = DeleteFromDevice;
+        }
+
+        Worker.Margins = new Inset(7,0,0,0);
+      </Script>
+
+      <Script>
+        State.Play = false;
+      </Script>
+
+      <Script>
+        
+        int folderID = [Page.FolderId];
+
+        
+        MediaFolderQuery.FolderId = folderID;
+        PhotosByFolderQuery.FolderId = folderID;
+      </Script>
+
+      <Script>
+        PhotosByFolderQuery.RulesOnly = [Page.UseRulesQuery];
+      </Script>
+
+      <Script>
+        zune:SortCommand sort = (zune:SortCommand)[SortData.Sorts.Chosen];
+
+        PhotosByFolderQuery.Sort = sort.Sort;
+        MediaFolderQuery.Sort = (string)me:PhotoPanelData.FolderSortOptions.GetItem(SortData.Sorts.ChosenIndex);
+
+        
+        
+        
+        SupportsJumpInList = sort.SupportsJumpInList &amp;&amp; ([PhotoCount] > 0);
+      </Script>
+
+      <Script>
+        MediaFolderQuery.Enabled = true;
+        PhotosByFolderQuery.Enabled = true;
+      </Script>
+
+      
+
+      <Script>
+        if (Page.FolderId == 0 &amp;&amp;
+            Page.ShowDeviceContents &amp;&amp;
+            MediaFolderQuery.Result.Items != null &amp;&amp;
+           [MediaFolderQuery.Result.Items.Count] == 1)
+        {
+          Page.FolderId = ((data:MediaFolder)((List)MediaFolderQuery.Result.Items).GetItem(0)).LibraryId;
+        }
+      </Script>
+
+      
+      <Script>
+        <![CDATA[
+        [InitialEvaluate(true)]
+        [DeclareTrigger(MediaFolderQuery.Result.Items)]
+        [DeclareTrigger(PhotosByFolderQuery.Result.Items)]
+        
+        if (Page.FolderId != 0 || Page.ShowDeviceContents)
+        {
+          if (AggregatingList != null)
+          {
+            UI.DisposeOwnedObject(AggregatingList);
+            AggregatingList = null;
+          }
+
+          
+          List folders = MediaFolderQuery.Result.Items;
+          List photos = PhotosByFolderQuery.Result.Items;
+
+          if ((folders != null) || (photos != null))
+          {
+            AggregatingList = new zune:SearchableAggregateList(folders, photos, 1);
+          }
+        }
+        else
+        {
+          if (RootFolderList == null) RootFolderList = new zune:RootFolderList();
+          
+          RootFolderList.Folders = MediaFolderQuery.Result.Items;
+          
+          
+          FolderCountMonitor.Source = MediaFolderQuery.Result.Items;
+          FolderCountMonitor.Visible = true;
+        }
+        ]]>
+      </Script>
+
+      <Script>
+        if ([Page.UseRulesQuery])
+        {
+          Model.Content = [PhotosByFolderQuery.Result.Items];
+        }
+        else if (Page.FolderId != 0 || Page.ShowDeviceContents)
+        {
+          Model.Content = [AggregatingList];
+        }
+        else 
+        {
+          Model.Content = RootFolderList.FilteredFolders;
+        }
+      </Script>
+      
+      <Script>
+        
+        Page.IsEmpty = RootFolderList != null &amp;&amp; 
+                       [RootFolderList.FilteredFolders.Count] == 0;
+      </Script>
+
+      
+      <Script>
+        int folderCount = 0;
+
+        if (![Page.UseRulesQuery])
+        {
+          if (Page.FolderId != 0 || Page.ShowDeviceContents)
+          {
+            folderCount = [MediaFolderQuery.Result.Items.Count];
+          }
+          else
+          {
+            folderCount = [RootFolderList.FilteredFolders.Count];
+          }
+        }
+        PhotoCount = [PhotosByFolderQuery.Result.Items.Count];
+
+        string header;
+
+        
+        
+        if (folderCount == 0)
+        {
+          if (PhotoCount == 1)
+          {
+            header = me:Strings.Header01;
+          }
+          else 
+          {
+            header = sys:String.Format(me:Strings.Header0N, PhotoCount);
+          }
+        }
+        else if (folderCount == 1)
+        {
+          if (PhotoCount == 0)
+          {
+            header = me:Strings.Header10;
+          }
+          else if (PhotoCount == 1)
+          {
+            header = me:Strings.Header11;
+          }
+          else 
+          {
+            header = sys:String.Format(me:Strings.Header1N, PhotoCount);
+          }
+        }
+        else 
+        {
+          if (PhotoCount == 0)
+          {
+            header = sys:String.Format(me:Strings.HeaderM0, folderCount);
+          }
+          else if (PhotoCount == 1)
+          {
+            header = sys:String.Format(me:Strings.HeaderM1, folderCount);
+          }
+          else 
+          {
+            header = sys:String.Format(me:Strings.HeaderMN, folderCount, PhotoCount);
+          }
+        }
+        ToggleSelectAllCommand.Description = header;
+
+        State.CanPlay = (PhotoCount > 0);
+      </Script>
+      
+      <Script>
+        [DeclareTrigger(me:PhotoPanelData.FilterFolders.Invoked)]
+        if (RootFolderList != null)
+          RootFolderList.Filter();
+      </Script>
+
+      <Script>
+        [DeclareTrigger(NavigateWorker.Invoked)]
+
+        Object item = SelectionManager.SelectedItem;
+
+        State.Sort = PhotosByFolderQuery.Sort;
+
+        
+        if (item is data:MediaFolder)
+        {
+          data:MediaFolder folder = (data:MediaFolder)item;
+
+          State.Index = 0;
+          State.FolderId = folder.LibraryId;
+        }
+        
+        else
+        {
+          if (SelectionManager.Count > 0)
+          {
+            State.Index = (Int32)SelectionManager.SelectedIndices.GetItem(0) - MediaFolderQuery.Result.Items.Count;
+          }
+          else
+          {
+            State.Index = 0;
+          }
+
+          State.FolderId = Page.FolderId;
+        }
+
+        zune:Shell.DefaultInstance.NavigateToPage(SlideShowLand);
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(ExecutePhoto.Invoked)]
+
+        
+        if (SelectionManager.Count == 1)
+        {
+          List selected = SelectionManager.SelectedItems;
+
+          if (SelectionManager.SelectedItems.GetItem(0) is data:MediaFolder)
+          {
+            Open.Invoke();
+          }
+          else if (!Page.ShowDeviceContents) 
+          {
+            State.Play = false;
+            NavigateWorker.Invoke();
+          }
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(State.Navigate.Invoked)]
+
+        State.Play = true;
+        NavigateWorker.Invoke();
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(PlaySlideshow.Invoked)]
+
+        if (SelectionManager.Count > 0)
+        {
+          State.Navigate.Invoke();
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(Open.Invoked)]
+
+        if (SelectionManager.Count > 0)
+        {
+          List selected = SelectionManager.SelectedItems;
+          Object item = selected.GetItem(0);
+
+          if (item is data:MediaFolder)
+          {
+            data:MediaFolder folder = (data:MediaFolder)item;
+
+            if (!Page.ShowDeviceContents) 
+            {
+              
+              col:Hashtable args = new col:Hashtable();
+              args.Add("FolderId", folder.LibraryId);
+
+              
+              String destination = "Collection\Photos";
+              zune:Shell.DefaultInstance.Execute(destination, args);
+            }
+            else 
+            {
+              
+              
+              Page.AddFolderToBackStack(Page.FolderId);
+              Page.FolderId = folder.LibraryId;
+            }
+          }
+          else
+          {
+            
+          }
+        }
+      </Script>
+
+      
+      <Script>
+        if ([ContextMenu.Helper.IsOpening])
+        {
+          
+          bool singleSelect = (SelectionManager.Count == 1);
+          PlaySlideshow.Available = singleSelect;
+          Open.Available = singleSelect;
+
+          bool folderSelected = false;
+
+          
+          foreach (object item in SelectionManager.SelectedItems)
+          {
+            if (item is data:MediaFolder)
+            {
+              folderSelected = true;
+              
+            }
+          }
+
+          Open.Hidden = !folderSelected;
+          PropertiesDivider.Visible = !folderSelected;
+          Properties.Hidden = folderSelected;
+          AddToBurnList.Hidden = folderSelected;
+        }
+      </Script>
+
+    </Scripts>
+    
+    <Content>
+      <Panel>
+        <Children>
+          
+          <gp:GalleryPanelWorker Name="Worker"
+            Model="{Model}"
+            SelectionManager="{SelectionManager}"
+            ContextMenu="{ContextMenu}"
+            EditContext="{EditContext}"
+            NavigateIntoArgs="{NavigateIntoArgs}"
+            GalleryViewType="{GalleryViewType}"
+            ToggleSelectAllCommand="{ToggleSelectAllCommand}"
+            Padding="{ColumnMargins}"
+            ColumnInset="{ColumnInset}"
+            LayoutSpacing="{LayoutSpacing}" 
+            HeaderMargins="{HeaderMargins}"
+            HeaderPadding="{HeaderPadding}"/>
+          
+          
+
+
+
+
+
+
+
+
+          <Repeater Name="FolderCountMonitor" Visible="false">
+            <Content>
+              <me:FolderCountMonitor Folder="{(data:MediaFolder)RepeatedItem}"/>
+            </Content>
+          </Repeater>
+          
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+  
+  
+  
+  
+  
+  
+  <UI Name="FolderCountMonitor">
+    <Properties>
+      <data:MediaFolder Name="Folder" MediaFolder="$Required"/>
+    </Properties>
+    
+    <Scripts>
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(Folder.TotalCount)]
+        me:PhotoPanelData.FilterFolders.Invoke();
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  <UI Name="GalleryView" Base="gp:GalleryView">
+    <Properties>
+      <Type Name="ProviderType" Type="{typeof(me:PhotoThumbnailButtonProvider)}"/>
+      <Size Name="GridCellSize" Size="190,231"/>
+      <Size Name="TileSize" Size="190,175"/>
+      <Size Name="LabelSize" Size="0,40"/>
+      <Size Name="LayoutSpacing" Size="35,3"/>
+      <Boolean Name="OnlyShowClipsWhenScrollable" Boolean="true"/>
+    </Properties>
+    <Content Name="Item">
+      <me:PhotoListItemBase
+        Index="{RepeatedItemIndex}"
+        TileSize="{TileSize}"
+        LabelSize="{LabelSize}"
+        SelectionManager="{SelectionManager}"
+        EditingList="{EditingList}">
+
+        <Provider>
+          <me:PhotoThumbnailButtonProvider PhotoThumbnailButtonProvider="{ProviderType}"
+              Model="{RepeatedItem}"
+              Index="{RepeatedItemIndex}"
+              SelectionManager="{SelectionManager}"
+              ListModel="{ListModel}"/>
+        </Provider>
+        <Animations>
+          <SwitchAnimation SwitchAnimation="{ItemShow}"/>
+          <AnimationProvider AnimationProvider="{ItemMove}"/>
+          <AnimationProvider AnimationProvider="{ItemHide}"/>
+        </Animations>
+      </me:PhotoListItemBase>
+    </Content>    
+  </UI>
+
+  
+  
+  
+  <Class Name="PhotoThumbnailButtonProvider" Base="thumbbutton:ThumbnailButtonProvider">
+    <Properties>
+      <Object Name="Model" Object="$Required"/>
+      <Index Name="Index" Index="$Required"/>
+      <SelectionManager Name="SelectionManager" SelectionManager="$Required"/>
+    </Properties>
+
+    <Scripts>
+      <Script>DragValue = SelectionManager;</Script>
+
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(((data:Photo)Model).Thumbnail)]
+        [DeclareTrigger(((data:MediaFolder)Model).Thumbnail)]
+        [DeclareTrigger(((data:Photo)Model).Title)]
+        [DeclareTrigger(((data:Photo)Model).DateTaken)]
+
+        if (Model is data:Photo)
+        {
+          data:Photo photo = (data:Photo)Model;
+          PrimaryLabel = photo.Title;
+          SecondaryLabel = photo.DateTaken.ToString("d");
+
+          Image = photo.Thumbnail;
+        }
+        else if (Model is data:MediaFolder)
+        {
+          data:MediaFolder folder = (data:MediaFolder)Model;
+
+          if (folder.ParentId == 0)
+          {
+            
+            PrimaryLabel = zune:Shell.ReformatFolderPathName(folder.FolderPath);
+          }
+          else
+          {
+            
+            PrimaryLabel = folder.Title;
+          }
+
+          Image = folder.Thumbnail;
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(PrimaryLabel)]
+        if (Model is data:Photo)
+        {
+          ((data:Media)Model).Title = PrimaryLabel;
+        }
+      </Script>
+
+      
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(SelectionManager.SelectedIndices)]
+        if (SelectionManager != null)
+        {
+          Selected = SelectionManager.IsSelected([Index.Value]);
+        }
+      </Script>
+    </Scripts>
+  </Class>
+
+  
+  
+  
+  <UI Name="PhotoListItemBase" Base="photobutton:PhotoButtonBase">
+    <Properties>
+      <Index Name="Index" Index="$Required"/>
+      <SelectionManager Name="SelectionManager" SelectionManager="{null}"/>
+      <drag:DragFeedback Name="DragFeedback" DragFeedback="{null}"/>
+    </Properties>
+
+    <Locals>
+      <li:ListItemContext Name="ListContext" Index="{Index}"/>
+    </Locals>
+
+    <Input>
+      
+      <EventContext Name="Context" Value="{ListContext}"/>
+
+      
+      <DragSourceHandler Name="DragSource" AllowedDropActions="Copy" HandlerStage="Direct, Bubbled"
+                         CancelCursor="Arrow" CopyCursor="Arrow"/>
+    </Input>
+
+    <Scripts>
+      <Script>
+        DragSource.Value = [Provider.DragValue];
+      </Script>
+
+      <Script>
+        FallbackImage = styles:Styles.NoArtWide;
+      </Script>
+
+      <Script>
+        if (Provider.Model is data:Photo)
+        {
+          
+          ListContext.Edit = Provider.EditPrimaryLabel;
+        }
+      </Script>
+      <Script>
+        
+        
+        if ([DragSource.Dragging])
+        {
+          if (DragFeedback == null)
+            DragFeedback = new drag:DragFeedback();
+
+          if (SelectionManager != null)
+          {
+            if (!SelectionManager.IsSelected(Index.Value))
+              SelectionManager.Select(Index.Value, true);
+
+            DragFeedback.Count = SelectionManager.Count;
+          }
+
+          DragFeedback.Thumbnail = Provider.Image;
+          DragFeedback.Helper.Show(DragFeedback);
+        }
+        else if (DragFeedback != null)
+        {
+          DragFeedback.Helper.Hide();
+          UI.DisposeOwnedObject(DragFeedback);
+          DragFeedback = null;
+        }
+
+        drag:DragInfo.IsDraggingInternally = DragSource.Dragging;
+      </Script>
+
+      <Script>
+        if (DragFeedback != null)
+          DragFeedback.DropAction = [DragSource.CurrentDropAction];
+      </Script>
+
+      <Script>
+        if (Provider.Model is data:MediaFolder)
+        {
+          data:MediaFolder folder = (data:MediaFolder)Provider.Model;
+          OverlayContent.Visible = true;
+          OverlayType = typeof(me:FolderCountOverlay);
+        }
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  <UI Name="FolderCountOverlay" Base="core:ThumbnailButtonOverlay">
+    <Scripts>
+      <Script>
+        Count.Content = [((data:MediaFolder)Provider.Model).TotalCount].ToString();
+        CountDrop.Content = Count.Content;
+      </Script>
+    </Scripts>
+    <Content>
+      <Panel Layout="Form">
+        <Children>
+          <core:Label Name="Count" Style="{styles:SharedStyles.PhotoFolderCountStyle}">
+            <LayoutInput>
+              <FormLayoutInput Horizontal="Center" Vertical="Center"/>
+            </LayoutInput>
+          </core:Label>
+          <Text Name="CountDrop" Font="{styles:SharedStyles.PhotoFolderCountStyle.Font}" Color="{styles:Styles.DarkGray}">
+            <LayoutInput>
+              <FormLayoutInput Left="Count,0,1" Top="Count,0,1"/>
+            </LayoutInput>
+          </Text>
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <Class Name="Strings" Shared="true">
+      <Properties>
+        <string Name="Header01" string="{zune:Shell.LoadString(zune:StringId.IDS_PHOTOS_0_1_HEADER)}" />
+        <string Name="Header0N" string="{zune:Shell.LoadString(zune:StringId.IDS_PHOTOS_0_N_HEADER)}" />
+        <string Name="Header10" string="{zune:Shell.LoadString(zune:StringId.IDS_PHOTOS_1_0_HEADER)}" />
+        <string Name="Header11" string="{zune:Shell.LoadString(zune:StringId.IDS_PHOTOS_1_1_HEADER)}" />
+        <string Name="Header1N" string="{zune:Shell.LoadString(zune:StringId.IDS_PHOTOS_1_N_HEADER)}" />
+        <string Name="HeaderM0" string="{zune:Shell.LoadString(zune:StringId.IDS_PHOTOS_M_0_HEADER)}" />
+        <string Name="HeaderM1" string="{zune:Shell.LoadString(zune:StringId.IDS_PHOTOS_M_1_HEADER)}" />
+        <string Name="HeaderMN" string="{zune:Shell.LoadString(zune:StringId.IDS_PHOTOS_M_N_HEADER)}" />
+
+
+        <string Name="NameSort" string="{zune:Shell.LoadString(zune:StringId.IDS_NAME_SORT)}" />
+        <string Name="DateSort" string="{zune:Shell.LoadString(zune:StringId.IDS_DATETAKEN_SORT)}" />
+
+        <string Name="PlayCommand" string="{zune:Shell.LoadString(zune:StringId.IDS_PHOTO_PLAY_MENUITEM)}" />
+        <string Name="OpenCommand" string="{zune:Shell.LoadString(zune:StringId.IDS_PHOTO_OPENFOLDER_MENUITEM)}" />
+      </Properties>
+  </Class>
+  
+  
+  
+  
+  
+  <UI Name="EmptyPage" Base="library:EmptyLibraryPage">
+    <Properties>
+      <String Name="Title" String="{zune:Shell.LoadString(zune:StringId.IDS_PHOTO_EMPTY)}"/>
+      <iris:Command Name="Link1Command" Description="{zune:Shell.LoadString(zune:StringId.IDS_PHOTO_EMPTY_SETTINGS_LINK)}"/>
+    </Properties>
+  </UI>
+</UIX>
diff --git a/test/2.1/PHOTOSLIDESHOW.UIX b/test/2.1/PHOTOSLIDESHOW.UIX
new file mode 100644
index 0000000..39241f7
--- /dev/null
+++ b/test/2.1/PHOTOSLIDESHOW.UIX
@@ -0,0 +1,286 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:data="res://ZuneShellResources!LibraryData.schema.xml"
+  xmlns:page="res://ZuneShellResources!PageStack.uix"
+  xmlns:menu="res://ZuneShellResources!ContextMenu.uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:anim="res://ZuneShellResources!Animations.uix"
+  xmlns:now="res://ZuneShellREsources!NowPlayingLand.uix" 
+  xmlns:styles="res://ZuneShellResources!Styles.uix">
+
+  
+  <UI Name="PhotoSlideShow" Base="page:PageBase">
+    <Properties>
+      <zune:SlideshowLand Name="Page" SlideshowLand="$Required"/>
+    </Properties>
+
+    <Locals>
+      <Timer Name="AdvanceTimer" AutoRepeat="true" Enabled="false"/>
+
+      <zune:SlideShowState Name="State" SlideShowState='{Page.SlideShowState}'/>
+
+      <data:LibraryPhotoQuery Name="PhotosByFolderQuery" Sort="{State.Sort}" FolderId="{State.FolderId}"/>
+
+      <iris:Command Name="PlayPause"/>
+      <menu:ContextMenu Name="ContextMenu" ContextMenu="{null}"/>
+
+      <Int32 Name="PreloadIndex" Int32="-1"/>
+      <Image Name="PreloadImage" Image="{null}"/>
+
+      <styles:WindowState Name="WindowState"/>
+    </Locals>
+
+    <Input>
+      <ClickHandler Name="RightClick" ClickType="RightMouse"/>
+      <KeyHandler Name="LeftKeyHandler" Key="Left" HandlerStage="Bubbled, Direct" Repeat="true" />
+      <KeyHandler Name="RightKeyHandler" Key="Right" HandlerStage="Bubbled, Direct" Repeat="true" />
+      <KeyHandler Name="SpaceKeyHandler" Key="Space" HandlerStage="Bubbled, Direct" Repeat="false" />
+      <MouseWheelHandler Name="WheelHandler"/>
+    </Input>
+
+    <Scripts>
+      
+      <Script>
+        bool fullBleed = false;
+
+        if (([Image.Content] != null) &amp;&amp; ([Image.Content.Status] == ImageStatus.Complete))
+        {
+          int picWidth  = [Image.Content.Width];
+          int picHeight = [Image.Content.Height];
+
+          
+          iris:WindowSize wndSize = iris:Application.Window.ClientSize;
+          int wndWidth            = wndSize.Width;
+          int wndHeight           = wndSize.Height;
+
+          if ((picWidth &gt; 0) &amp;&amp; (picHeight &gt; 0) &amp;&amp;
+              (wndWidth &gt; 0) &amp;&amp; (wndHeight &gt; 0))
+          {
+            float picRatio = (float)picWidth / (float)picHeight;
+            float wndRatio = (float)wndWidth / (float)wndHeight;
+            float match    = picRatio / wndRatio;
+
+            
+            
+            
+
+            
+            
+            fullBleed = ((match &gt; styles:Styles.FullBleedPhotoAspectToleranceMin) &amp;&amp;
+                         (match &lt; styles:Styles.FullBleedPhotoAspectToleranceMax));
+          }
+        }
+
+        
+        if (fullBleed)
+        {
+          Image.StretchingPolicy = StretchingPolicy.UniformToFill;
+        }
+        else
+        {
+          Image.StretchingPolicy = StretchingPolicy.Uniform;
+        }
+      </Script>
+
+      
+      <Script>
+        AdvanceTimer.Interval = [zune:Management.Instance.SlideShowSpeed.Value];
+
+        bool play = [State.Play];
+
+        AdvanceTimer.Enabled = play;
+        if (play)
+          PlayPause.Description = zune:Shell.LoadString(zune:StringId.IDS_PHOTO_PAUSE_MENUITEM);
+        else
+          PlayPause.Description = zune:Shell.LoadString(zune:StringId.IDS_PHOTO_PLAY_MENUITEM);
+      </Script>
+
+      
+      <Script>
+        [InitialEvaluate(false)]
+        if ([State.Play])
+        {
+          State.Index = State.Index + 1;
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(RightClick.Invoked)]
+
+        
+        
+        
+
+        if (ContextMenu != null)
+        {
+          UI.DisposeOwnedObject(ContextMenu);
+        }
+
+        
+        
+        
+
+        ContextMenu = new menu:ContextMenu();
+        ContextMenu.Options.Add(PlayPause);
+
+        ContextMenu.Helper.Show(ContextMenu);
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(PlayPause.Invoked)]
+        [DeclareTrigger(SpaceKeyHandler.Invoked)]
+
+        State.Play = !State.Play;
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(LeftKeyHandler.Invoked)]
+        [DeclareTrigger(WheelHandler.UpInvoked)]
+
+        State.Index = State.Index - 1;
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(RightKeyHandler.Invoked)]
+        [DeclareTrigger(WheelHandler.DownInvoked)]
+        [DeclareTrigger(AdvanceTimer.Tick)]
+
+        State.Index = State.Index + 1;
+      </Script>
+
+      
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(PhotosByFolderQuery.Result.Items.Count)] 
+
+        bool timerRunning = AdvanceTimer.Enabled;
+        AdvanceTimer.Enabled = false;
+
+        if (!List.IsNullOrEmpty(PhotosByFolderQuery.Result.Items))
+        {
+          
+          if ([State.Index] &lt; 0)
+          {
+            State.Index = State.Index + PhotosByFolderQuery.Result.Items.Count;
+          }
+
+          State.Index = State.Index % PhotosByFolderQuery.Result.Items.Count;
+
+          
+          
+          Image.AcquiringImage = Image.Content;
+
+          
+          if (State.Index == PreloadIndex)
+          {
+            Image.Content = PreloadImage;
+            
+          }
+          else
+          {
+            
+            data:Photo currentPhoto = (data:Photo)PhotosByFolderQuery.Result.Items.get_Item(State.Index);
+            Image.Content = new Image("file://" + currentPhoto.ImagePath,  new Inset(0,0,0,0), new Size(2000,2000));
+            
+          }
+
+          
+          PreloadIndex = (State.Index + 1) % PhotosByFolderQuery.Result.Items.Count;
+
+          data:Photo preloadPhoto = (data:Photo)PhotosByFolderQuery.Result.Items.get_Item(PreloadIndex);
+          PreloadImage = new Image("file://" + preloadPhoto.ImagePath,  new Inset(0,0,0,0), new Size(2000,2000));
+
+          
+          PreloadImage.Load();
+          
+        }
+
+        AdvanceTimer.Enabled = timerRunning;
+      </Script>
+
+      
+      <Script>
+        Fade.Visible = [WindowState.InputActive];
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Layout="Form" Margins="0,0,-5,0">
+        <Animations>
+          <Animation Animation="{anim:Animations.NowPlayingPageFadeIn}"/>
+          <Animation Animation="{anim:Animations.NowPlayingPageFadeOut}"/>
+        </Animations>
+        <Children>
+
+          <now:NowPlayingBorders>
+            <LayoutInput>
+              <FormLayoutInput 
+                  Left="Parent,0" Right="Parent,1,-5" 
+                  Top="Parent,0" Bottom="Parent,1"/>
+            </LayoutInput>
+          </now:NowPlayingBorders>
+
+          
+          <Graphic Name="Fade" Content="{styles:Styles.NowPlayingFade}" SizingPolicy="SizeToConstraint">
+            <LayoutInput>
+              <FormLayoutInput
+                  Left="Parent,0" Right="Parent,1"
+                  Top="Parent,1,-330" Bottom="Parent,1"/>
+            </LayoutInput>
+            <Animations>
+              <Animation Animation="{anim:Animations.NowPlayingFadeIn}"/>
+              <Animation Animation="{anim:Animations.NowPlayingFadeOut}"/>
+            </Animations>
+          </Graphic>
+
+          <Graphic Name="Image"
+              HorizontalAlignment="Center" VerticalAlignment="Center"
+              StretchingPolicy="UniformToFill" SizingPolicy="SizeToConstraint">
+            <LayoutInput>
+              <FormLayoutInput
+                  Left="Parent,0" Right="Parent,1" Horizontal="Center"
+                  Top="Parent,0" Bottom="Parent,1" Vertical="Center"/>
+            </LayoutInput>
+            <Animations>
+              <Animation Animation="{anim:Animations.SlideShowImageChangeHide}"/>
+              <Animation Animation="{anim:Animations.SlideShowImageChangeShow}"/>
+              <Animation Animation="{anim:Animations.SlideShowImageShow}" />
+            </Animations>
+          </Graphic>
+
+          <ColorFill Name="LeftBackground" Content="Black">
+            <LayoutInput>
+              <FormLayoutInput Left="Parent,0" Right="Image,0" Top="Image,0" Bottom="Image,1"/>
+            </LayoutInput>
+          </ColorFill>
+
+          <ColorFill Name="TopBackground" Content="Black">
+            <LayoutInput>
+              <FormLayoutInput Left="Parent,0" Right="Parent,1" Top="Parent,0" Bottom="Image,0"/>
+            </LayoutInput>
+          </ColorFill>
+
+          <ColorFill Name="RightBackground" Content="Black">
+            <LayoutInput>
+              <FormLayoutInput Left="Image,1" Right="Parent,1" Top="Image,0" Bottom="Image,1"/>
+            </LayoutInput>
+          </ColorFill>
+
+          <ColorFill Name="BottomBackground" Content="Black">
+            <LayoutInput>
+              <FormLayoutInput Left="Parent,0" Right="Parent,1" Top="Image,1" Bottom="Parent,1"/>
+            </LayoutInput>
+          </ColorFill>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/PHOTOSYNCRULESPANEL.UIX b/test/2.1/PHOTOSYNCRULESPANEL.UIX
new file mode 100644
index 0000000..3ffcbc6
--- /dev/null
+++ b/test/2.1/PHOTOSYNCRULESPANEL.UIX
@@ -0,0 +1,86 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:data="res://ZuneShellResources!LibraryData.schema.xml"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:rules="res://ZuneShellResources!SyncRules.uix">
+
+  <UI Name="SyncRulesPanel" Base="rules:SyncRulesPanelBase">
+    <Properties>
+      <zune:PhotoLibraryPage Name="Page" PhotoLibraryPage="$Required"/>
+      <Int32 Name="MinimumWidth" Int32="186"/>
+      <Single Name="MinimumPercent" Single="0.0"/>
+      <List Name="AllItemsText">
+        <Source>
+          <String String="{zune:Shell.LoadString(zune:StringId.IDS_ALL_PICTURE_ITEMS)}"/>
+        </Source>
+      </List>
+    </Properties>    
+    <Locals>
+      <data:LibraryMediaFolderQuery Name="FolderQuery" FolderMediaType="MediaFolder"
+                                    DeviceId="{Page.DeviceId}"
+                                    ShowDeviceContents="true" RulesOnly="true"/>
+      
+      <data:LibraryPhotoQuery Name="PhotoQuery"
+                              DeviceId="{Page.DeviceId}"
+                              ShowDeviceContents="true" RulesOnly="true"/>      
+      <List Name="PhotoQueryWrapper">
+        <Source>
+          <data:LibraryPhotoQuery LibraryPhotoQuery="{PhotoQuery}"/>
+        </Source>
+      </List>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        <![CDATA[
+        int deviceID = [Page.DeviceId];
+        
+        FolderQuery.DeviceId = deviceID;
+        PhotoQuery.DeviceId = deviceID;
+        ]]>
+      </Script>
+      <Script>
+        <![CDATA[
+        [DeclareTrigger(FolderQuery.Result.Items)]
+        [DeclareTrigger(PhotoQuery.Result.Items.Count)]
+        [InitialEvaluate(true)]
+        
+        bool devicePresent = zune:SyncControls.Instance.CurrentDeviceExists;
+        bool syncAll = zune:SyncControls.Instance.GetSyncAll(zune:MediaType.Photo);
+        iris:AggregateList newList = null;
+        
+        if (Source != null)
+        {
+          UI.DisposeOwnedObject(Source);
+          Source = null;
+        }
+        
+        if (!devicePresent)
+        {
+          newList = new iris:AggregateList();
+        }
+        else if (syncAll)
+        {
+          newList = new iris:AggregateList(AllItemsText);
+        }
+        else if (PhotoQuery.Result.Items.Count <= 0)
+        {
+          newList = new iris:AggregateList(AllItemsText,
+                                           FolderQuery.Result.Items);
+        }
+        else
+        {
+          newList = new iris:AggregateList(AllItemsText,
+                                           FolderQuery.Result.Items,
+                                           PhotoQueryWrapper);
+        }
+
+        Source = newList;
+        ]]>
+      </Script>
+    </Scripts>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/PLAYLISTCONTENTSPANEL.UIX b/test/2.1/PLAYLISTCONTENTSPANEL.UIX
new file mode 100644
index 0000000..56af5ce
--- /dev/null
+++ b/test/2.1/PLAYLISTCONTENTSPANEL.UIX
@@ -0,0 +1,294 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:data="res://ZuneShellResources!LibraryData.schema.xml"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:panels="res://ZuneShellResources!LibraryPanels.uix"
+  xmlns:spreadsheet="res://ZuneShellResources!SpreadsheetViewBase.uix"
+  xmlns:columns="res://ZuneShellResources!PlaylistContentsPanelColumns.uix"
+  xmlns:contextmenu="res://ZuneShellResources!LibraryContextMenu.uix"
+  xmlns:lib="res://ZuneShellResources!Library.uix"
+  xmlns:me="Me"
+  >
+
+  
+  
+  
+  <UI Name="PlaylistContentsPanel" Base="panels:LibraryPanelBase">
+    <Properties>
+      <zune:PlaylistContentsPanel Name="Model" PlaylistContentsPanel="$Required" />
+
+      <spreadsheet:ColumnData Name="ColumnData" ColumnData="{columns:PlaylistViewData.ColumnData}"/>
+
+      <columns:PlaylistContentsPanelListModel Name="ListModel" Model="{Model}"/>
+
+      <Boolean Name="CanEdit" Boolean="true"/>
+      <Boolean Name="CanPlay" Boolean="true"/>
+      
+      
+
+
+
+      <Boolean Name="BlockUpdatesDuringGrovel" Boolean="false"/>
+      
+      <zune:StringId Name="EmptyPlaylistMessageId" StringId="{zune:StringId.IDS_PLAYLIST_EMPTY}"/>      
+    </Properties>
+
+    <Locals>
+      <data:LibraryPlaylistContentQuery Name="TrackQuery" Enabled="false"
+        Sort="+WM/TrackNumber"
+        RulesOnly="false"
+        ShowDeviceContents="{Page.ShowDeviceContents}"
+        />
+
+
+      
+      <iris:Command Name="RemoveFromPlaylist" Description="{zune:Shell.LoadString(zune:StringId.IDS_REMOVE_FROM_PLAYLIST)}"/>
+      <zune:MenuItemCommand Name="FindInCollection"/>
+      <List Name="LibraryContextMenuOptions">
+        <Source>
+          <iris:Command Command="{PlayAll}"/>
+          <iris:Command Command="{Play}"/>
+          <iris:Command Command="{AddToNowPlaying}"/>
+          <iris:Command Command="{AddToPlaylist}"/>
+          <iris:Command Command="{AddToBurnList}"/>
+          <core:MenuDivider/>
+          <iris:Command Command="{Edit}"/>
+          <contextmenu:RateCommand RateCommand="{Rate}"/>
+          <core:MenuDivider MenuDivider="{SyncDivider}"/>
+          <iris:Command Command="{Sync}"/>
+          <iris:Command Command="{SyncAllUnexclude}"/>
+          <core:MenuDivider/>
+          <iris:Command Command="{RemoveFromPlaylist}"/>
+          <core:MenuDivider/>
+          <iris:Command Command="{Properties}"/>
+          <iris:Command Command="{FindInCollection}"/>
+        </Source>
+      </List>
+
+      <List Name="DeviceContextMenuOptions">
+        <Source>
+          
+        </Source>
+      </List>
+
+      <Boolean Name="HasSetPagePlay"/> 
+    </Locals>
+
+    <Scripts>
+      <Script>TrackQuery.DeviceId = [Page.DeviceId];</Script>
+      <Script>TrackQuery.UserId = [zune:SignIn.Instance.LastSignedInUserId];</Script>
+      
+      <Script>
+        if (Page.ShowDeviceContents)
+        {
+          ContextMenu.Options = DeviceContextMenuOptions;
+          DeleteKey.Command = DeleteFromDevice;
+          columns:PlaylistViewData.SyncColumn.Visible = false;
+          columns:PlaylistViewData.SizeOnDeviceColumn.Visible = true;
+        }
+        else
+        {
+          ContextMenu.Options = LibraryContextMenuOptions;
+          DeleteKey.Command = RemoveFromPlaylist;
+          columns:PlaylistViewData.SyncColumn.Visible = true;
+          columns:PlaylistViewData.SizeOnDeviceColumn.Visible = false;
+        }
+      </Script>
+
+      
+      <Script>TrackQuery.PlaylistId = [Model.SelectedPlaylistId];</Script>
+
+      
+      <Script>
+        spreadsheet:SortDescription sort = (spreadsheet:SortDescription)[ColumnData.SortedColumn];
+
+        string sortBy = (string)panels:Globals.SortAscendingMap.GetItem([ColumnData.SortAscending]) + 
+                        sort.Attribute;
+
+        TrackQuery.Sort = sortBy;
+        SupportsJumpInList = sort.SupportsJumpInList;
+      </Script>
+
+      <Script>
+        Worker.SupportsJumpInList = [SupportsJumpInList];
+      </Script>
+      
+      
+      <Script>TrackQuery.Enabled = true;</Script>
+
+      
+      <Script>
+        Model.Content = [TrackQuery.Result.Items];
+        Worker.Content = Model.Content;
+      </Script>
+
+      <Script>
+        if ([ContextMenu.Helper.IsOpening])
+        {
+          RemoveFromPlaylist.Available = (SelectionManager.Count > 0) &amp;&amp; CanEdit;
+          FindInCollection.Hidden = true;
+          if (SelectionManager.Count == 1)
+          {
+            data:PlaylistContentItem item = (data:PlaylistContentItem)SelectionManager.SelectedItem;
+            zune:MediaType type = zune:ZuneShell.MapIntToMediaType(item.MediaType);
+            
+            if (zune:PlaylistManager.IsInCollection(item.MediaId, type))
+            {
+              if (type == zune:MediaType.Track)
+              {
+                FindInCollection.Description = zune:Shell.LoadString(zune:StringId.IDS_FIND_IN_COLLECTION);
+                FindInCollection.Hidden = false;
+              }
+              else if (type == zune:MediaType.Video)
+              {
+                FindInCollection.Description = zune:Shell.LoadString(zune:StringId.IDS_FIND_VIDEO_IN_COLLECTION);
+                FindInCollection.Hidden = false;
+              }
+            }
+          }
+        }
+      </Script>
+
+      
+      <Script>
+        DeleteKey.Enabled = [CanEdit];
+        Worker.CanReorder = CanEdit;
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(RemoveFromPlaylist.Invoked)]
+
+        if (SelectionManager.Count > 0)
+        {
+          zune:PlaylistManager.Instance.RemoveFromPlaylist(TrackQuery.PlaylistId, SelectionManager.SelectedItems);
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(FindInCollection.Invoked)]
+
+        data:PlaylistContentItem item = (data:PlaylistContentItem)SelectionManager.SelectedItem;
+
+        if (item != null)
+        {
+          zune:MediaType type = zune:ZuneShell.MapIntToMediaType(item.MediaType);
+
+          if (type == zune:MediaType.Track)
+          {
+            zune:MusicLibraryPage.FindInCollection(item.AlbumArtistLibraryId, item.AlbumLibraryId, item.MediaId);
+          }
+          else if (type == zune:MediaType.Video)
+          {
+            zune:VideoLibraryPage.FindInCollection(item.MediaId);
+          }
+        }
+      </Script>
+
+      
+      <Script>
+        if (TrackQuery.PlaylistId >= 0 || HasSetPagePlay)
+        {
+          HasSetPagePlay = true;
+          if ([CanPlay] &amp;&amp; TrackQuery.Result.Items != null)
+          {
+            zune:TransportControls.Instance.PagePlaySelection.Available = ([TrackQuery.Result.Items.Count] > 0);
+          }
+          else
+          {
+            zune:TransportControls.Instance.PagePlaySelection.Available = false;
+          }
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(zune:TransportControls.Instance.PagePlaySelection.Invoked)]
+        Execute.Invoke();
+      </Script>
+
+      
+      <Script>
+        if ([TrackQuery.PlaylistId] >= 0)
+        {
+          bool isEmpty = [TrackQuery.Result.IsEmpty] &amp;&amp; !Page.ShowDeviceContents;
+          EmptyPlaylistPanel.Visible = isEmpty;
+          Worker.Visible = !isEmpty;
+        }
+        else
+        {
+          EmptyPlaylistPanel.Visible = false;
+          Worker.Visible = false;
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel>
+        <Children>
+
+          <me:PlaylistContentsSpreadSheet Name="Worker"
+            ListModel="{ListModel}"
+            Content="{Model.Content}"
+            ColumnData="{ColumnData}"
+            NavigateIntoArgs="{NavigateIntoArgs}"
+            SelectionManager="{SelectionManager}"
+            ContextMenu="{ContextMenu}"
+            EditContext="{EditContext}"
+            ExecuteCommand="{Execute}"
+            Margins="-5,0,-11,-11"
+            Padding="28,0,0,0"
+            HeaderSpacing="22"
+            LayoutSpacing="{styles:Styles.LibraryListLayoutSpacing}"
+            RowSize="{styles:Styles.LibraryListItemSize}"
+            RowPadding="{styles:Styles.LibraryListItemMargins}"
+            />
+
+          <lib:EmptyPage Name="EmptyPlaylistPanel" 
+                         Title="{zune:Shell.LoadString(EmptyPlaylistMessageId)}"
+                         TitleStyle="{styles:SharedStyles.NoPlaylistContentText}"
+                         Margins="30,21,0,0"/>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+
+
+
+  <UI Name="PlaylistContentsSpreadSheet" Base="spreadsheet:SpreadSheet">
+    <Properties>
+      <columns:PlaylistContentsPanelListModel Name="ListModel" PlaylistContentsPanelListModel="$Required"/>
+      <Boolean Name="CanReorder" Boolean="true"/>
+    </Properties>
+
+    <Scripts>      
+      
+      <Script>
+        [DeclareTrigger(Target.Dropped)]
+
+        object value = Target.GetValue();
+
+        if (!(value is SelectionManager))
+        {
+          
+        }
+        else
+        {
+          SelectionManager selectionManager = (SelectionManager)value;
+          int insertAt = InsertIndex.Value;
+
+          zune:PlaylistManager.Instance.ReorderInPlaylist(ListModel.Model.SelectedPlaylistId, selectionManager.SelectedItems, insertAt);
+        }
+      </Script>
+    </Scripts>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/PLAYLISTCONTENTSPANELCOLUMNS.UIX b/test/2.1/PLAYLISTCONTENTSPANELCOLUMNS.UIX
new file mode 100644
index 0000000..0fd7785
--- /dev/null
+++ b/test/2.1/PLAYLISTCONTENTSPANELCOLUMNS.UIX
@@ -0,0 +1,279 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:data="res://ZuneShellResources!LibraryData.schema.xml"
+  xmlns:spreadsheet="res://ZuneShellResources!SpreadSheetViewBase.uix"
+  xmlns:lv="res://ZuneShellResources!ListViewPanel.uix"
+  xmlns:tpc="res://ZuneShellResources!TracksPanelColumns.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:lib="res://ZuneShellResources!Library.uix"
+  xmlns:me="Me">
+
+  
+  <Class Name="PlaylistContentsPanelListModel" Base="lib:LibraryListModel">
+    <Properties>
+      <zune:PlaylistContentsPanel Name="Model" PlaylistContentsPanel="$Required" />
+    </Properties>
+  </Class>
+
+  
+  <Class Name="PlaylistViewData" Shared="True">
+    <Properties>
+
+      
+      
+      <spreadsheet:ColumnInfo Name="StatusColumn"
+                CellType="{typeof(me:StatusCell)}"
+                Resizable="false"
+                CellPadding="4,1,0,0"
+                HighlightHeader="false">
+        <ColumnSize>
+          <SharedSize Size="21,0"/>
+        </ColumnSize>
+        <LayoutInput>
+          <StackLayoutInput Priority="High"/>
+        </LayoutInput>
+      </spreadsheet:ColumnInfo>      
+
+      <spreadsheet:ColumnInfo Name="OrdinalColumn"
+            Header="{zune:Shell.LoadString(zune:StringId.IDS_BLANK_COLUMN_HEADER)}"
+            CellType="{typeof(me:OrdinalCell)}"
+            CellPadding="0,0,0,0">
+        
+        <ColumnSize>
+          <SharedSize Size="70,0" MinimumSize="70,0" MaximumSize="500,0"/>
+        </ColumnSize>
+      </spreadsheet:ColumnInfo>
+      
+      <spreadsheet:ColumnInfo Name="TitleColumn"
+            Header="{zune:Shell.LoadString(zune:StringId.IDS_SONG_COLUMN_HEADER)}"
+            CellType="{typeof(tpc:SongCell)}"
+            CellEditType="{typeof(tpc:SongEditCell)}"
+            CellPadding="5,0,0,0"
+            ShowDivider="false">
+        
+        <ColumnSize>
+          <SharedSize Size="200,0" MinimumSize="50,0" MaximumSize="500,0"/>
+        </ColumnSize>
+      </spreadsheet:ColumnInfo>
+
+      <spreadsheet:ColumnInfo Name="TimeColumn"
+            Header="{zune:Shell.LoadString(zune:StringId.IDS_LENGTH_COLUMN_HEADER)}"
+            CellType="{typeof(me:LengthCell)}">
+        
+        <ColumnSize>
+          <SharedSize Size="75,0" MinimumSize="60,0" MaximumSize="100,0"/>
+        </ColumnSize>
+      </spreadsheet:ColumnInfo>
+
+      
+      <spreadsheet:ColumnInfo Name="ArtistColumn"
+            Header="{zune:Shell.LoadString(zune:StringId.IDS_ARTIST_COLUMN_HEADER)}"
+            CellType="{typeof(me:ArtistCell)}" 
+            CellEditType="{typeof(me:ArtistEditCell)}" 
+            CellPadding="19,0,0,0">
+        
+        <ColumnSize>
+          <SharedSize Size="154,0" MinimumSize="50,0" MaximumSize="500,0"/>
+        </ColumnSize>
+      </spreadsheet:ColumnInfo>
+
+      
+      <spreadsheet:ColumnInfo Name="AlbumColumn"
+            Header="{zune:Shell.LoadString(zune:StringId.IDS_ALBUM_COLUMN_HEADER)}"
+            CellType="{typeof(me:AlbumCell)}" 
+            CellEditType="{typeof(me:AlbumEditCell)}" 
+            CellPadding="17,0,0,0">
+        
+        <ColumnSize>
+          <SharedSize Size="158,0" MinimumSize="50,0" MaximumSize="500,0"/>
+        </ColumnSize>
+      </spreadsheet:ColumnInfo>
+
+      <spreadsheet:ColumnInfo Name="RatingColumn"
+            Header="{zune:Shell.LoadString(zune:StringId.IDS_RATING_COLUMN_HEADER)}"
+            HeaderIcon="{styles:Styles.RatingHeader}"
+            CellType="{typeof(tpc:RatingCell)}"
+            Resizable="false" 
+            CellPadding="4,0,4,0">
+        
+        <ColumnSize>
+          <SharedSize Size="25,0" MinimumSize="25,0"/>
+        </ColumnSize>
+      </spreadsheet:ColumnInfo>
+
+      <spreadsheet:ColumnInfo Name="SyncColumn" 
+            Header="{zune:Shell.LoadString(zune:StringId.IDS_SYNC_STATUS_COLUMN_HEADER)}"
+            HeaderIcon="{styles:Styles.SyncHeader}"
+            CellType="{typeof(tpc:SyncCell)}"
+            Resizable="false"
+            CellPadding="{tpc:Constants.SyncCellPadding}"
+            HeaderPadding="{tpc:Constants.SyncHeaderPadding}">
+        <ColumnSize>
+          <SharedSize Size="25,0"/>
+        </ColumnSize>
+      </spreadsheet:ColumnInfo>
+
+      <spreadsheet:ColumnInfo Name="SizeOnDeviceColumn" Header="{zune:Shell.LoadString(zune:StringId.IDS_SIZE_COLUMN_HEADER)}"
+         CellType="{typeof(tpc:SizeOnDeviceCell)}"
+         Resizable="false">
+        <ColumnSize>
+          <SharedSize Size="75,0"/>
+        </ColumnSize>
+      </spreadsheet:ColumnInfo>
+      
+      <spreadsheet:ColumnData Name="ColumnData" SaveKeyPrefix="Playlist"
+                              SortedColumn="{me:SortInfo.Ordinal}">
+        <Columns>
+          <spreadsheet:ColumnInfo ColumnInfo="{StatusColumn}"/>
+          
+          <spreadsheet:ColumnInfo ColumnInfo="{TitleColumn}"/>
+          <spreadsheet:ColumnInfo ColumnInfo="{TimeColumn}"/>
+          <spreadsheet:ColumnInfo ColumnInfo="{ArtistColumn}"/>
+          <spreadsheet:ColumnInfo ColumnInfo="{AlbumColumn}"/>
+          <spreadsheet:ColumnInfo ColumnInfo="{RatingColumn}"/>
+          
+          <spreadsheet:ColumnInfo ColumnInfo="{SizeOnDeviceColumn}"/>
+        </Columns>
+      </spreadsheet:ColumnData>
+
+    </Properties>
+  </Class>
+
+  
+  <UI Name="PlaylistHeader" Base="spreadsheet:Cell">
+    <Properties>
+      <lib:LibraryListModel Name="ListModel" LibraryListModel="$Required"/>
+    </Properties>
+    <Content>
+      <lv:ColumnPanelHeader ToggleSelectAll="{ListModel.ToggleSelectAllCommand}" Sorts="{ListModel.Sorts}"
+                            SizeToChildren="false"/>
+    </Content>
+  </UI>
+
+  
+  <UI Name="PlaylistCell" Base="spreadsheet:LabelCell">
+    <Properties>
+      <data:Playlist Name="Model" Playlist="$Required"/>
+    </Properties>
+    <Scripts>
+      <Script>Content = [Model.Title];</Script>
+    </Scripts>
+  </UI>
+
+  <UI Name="LabelCell" Base="spreadsheet:LabelCell">
+    <Properties>
+      <data:PlaylistContentItem Name="Model" PlaylistContentItem="$Required"/>
+    </Properties>
+  </UI>
+
+  
+  <UI Name="OrdinalCell" Base="me:LabelCell">
+    <Scripts>
+      <Script>Content = [Model.Ordinal].ToString();</Script>
+    </Scripts>
+  </UI>
+
+  
+  <UI Name="ArtistCell" Base="me:LabelCell">
+    <Scripts>
+      <Script>Content = [Model.ArtistName];</Script>
+    </Scripts>
+  </UI>
+
+  
+  <UI Name="ArtistEditCell" Base="spreadsheet:LabelEditCell">
+    <Properties>
+      <data:PlaylistContentItem Name="Model" PlaylistContentItem="$Required"/>
+    </Properties>
+    <Scripts>
+      <Script>
+        EditableText.Value = Model.ArtistName;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(CommitValue.Invoked)]
+        Model.ArtistName = EditableText.Value;
+      </Script>
+    </Scripts>
+  </UI>
+  
+  
+  <UI Name="AlbumCell" Base="me:LabelCell">
+    <Scripts>
+      <Script>Content = [Model.AlbumName];</Script>
+    </Scripts>
+  </UI>
+
+
+  
+  <UI Name="AlbumEditCell" Base="spreadsheet:LabelEditCell">
+    <Properties>
+      <data:PlaylistContentItem Name="Model" PlaylistContentItem="$Required"/>
+    </Properties>
+    <Scripts>
+      <Script>
+        EditableText.Value = Model.AlbumName;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(CommitValue.Invoked)]
+        Model.AlbumName = EditableText.Value;
+      </Script>
+    </Scripts>
+  </UI>
+  
+  
+  <UI Name="LengthCell" Base="spreadsheet:LengthCell">
+    <Properties>
+      <data:PlaylistContentItem Name="Model" PlaylistContentItem="$Required"/>
+    </Properties>
+    <Scripts>
+      <Script>Length = [Model.Duration];</Script>
+    </Scripts>
+  </UI>
+  
+  
+  <UI Name="StatusCell" Base="spreadsheet:MediaStatusCell">
+    <Properties>
+      <data:PlaylistContentItem Name="Model" PlaylistContentItem="$Required"/>
+      <zune:MediaType Name="MediaType" MediaType="{zune:ZuneShell.MapIntToMediaType(Model.MediaType)}"/>
+      <Int32 Name="MediaId" Int32="{Model.MediaId}"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(zune:TransportControls.Instance.CurrentTrack)]
+        IsNowPlaying = zune:TransportControls.Instance.IsCurrentLibraryTrack(MediaId, MediaType);
+      </Script>
+      
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(zune:TransportControls.Instance.ErrorCount)]
+        ErrorCode = zune:TransportControls.Instance.GetLibraryErrorCode(MediaId, MediaType);
+      </Script>
+
+      
+      <Script>
+        if (MediaId &lt; 0)
+        {
+          ErrorCode = zune:PlaylistManager.ImportErrorCode;
+        }
+      </Script>
+    </Scripts>
+  </UI>  
+  
+  <Class Name="SortInfo" Shared="true">
+    <Properties>
+      <spreadsheet:SortDescription Name="Ordinal"        Attribute="WM/TrackNumber"  />
+      <spreadsheet:SortDescription Name="Title"          Attribute="Title"           SupportsJumpInList="true"/>
+      <spreadsheet:SortDescription Name="WM_AlbumArtist" Attribute="WM/AlbumArtist"  SupportsJumpInList="true"/>
+      <spreadsheet:SortDescription Name="WM_AlbumTitle"  Attribute="WM/AlbumTitle"   SupportsJumpInList="true"/>
+      <spreadsheet:SortDescription Name="Duration"       Attribute="Duration"        SupportsJumpInList="true"/>
+      <spreadsheet:SortDescription Name="UserRating"     Attribute="UserRating"      />
+    </Properties>
+  </Class>
+
+</UIX>
diff --git a/test/2.1/PLAYLISTDIALOG.UIX b/test/2.1/PLAYLISTDIALOG.UIX
new file mode 100644
index 0000000..673a16c
--- /dev/null
+++ b/test/2.1/PLAYLISTDIALOG.UIX
@@ -0,0 +1,353 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:dialog="res://ZuneShellResources!Dialog.uix"
+  xmlns:spreadsheet="res://ZuneShellResources!SpreadSheetViewBase.uix"
+  xmlns:columns="res://ZuneShellResources!PlaylistContentsPanelColumns.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:data="res://ZuneShellResources!LibraryData.schema.xml"
+  xmlns:addto="res://ZuneShellResources!AddToPlaylist.uix"
+  xmlns:me="Me"
+  >
+
+  
+  
+  
+  <Class Name="AddToPlaylistDialog" Base="dialog:Dialog">
+    <Properties>
+      <String Name="ContentUI" String="res://ZuneShellResources!PlaylistDialog.uix#AddToPlaylistDialogContentUI"/>
+      <iris:Command Name="CreatePlaylist" Description="{zune:Shell.LoadString(zune:StringId.IDS_PLAYLIST_DIALOG_CREATEPLAYLIST)}"/>
+      <List Name="DragItems" List="{null}"/>
+      <addto:AddToPlaylist Name="AddToPlaylist"/>
+    </Properties>
+
+    <Locals>
+      <me:CreatePlaylistDialog Name="CreatePlaylistDialog"/>
+    </Locals>
+
+    <Scripts>
+      
+      <Script>
+        [DeclareTrigger(CreatePlaylist.Invoked)]
+        
+        CreatePlaylistDialog.DragItems = DragItems;
+        CreatePlaylistDialog.Helper.Show(CreatePlaylistDialog);
+      </Script>
+      
+      
+      <Script>
+        [DeclareTrigger(CreatePlaylistDialog.Completed.Invoked)]
+        
+        Helper.Hide();
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(Helper.IsVisible)]
+        if (!Helper.IsVisible)
+        {
+          DragItems = null;
+        }
+      </Script>
+    </Scripts>
+  </Class>
+
+
+  
+  
+  
+  <UI Name="AddToPlaylistDialogContentUI" Base="dialog:DialogContentUI">
+    <Properties>
+      <me:AddToPlaylistDialog Name="Dialog" AddToPlaylistDialog="$Required"/>
+    </Properties>
+
+    <Locals>
+      <iris:Command Name="OK" Description="{zune:Shell.LoadString(zune:StringId.IDS_DIALOG_OK)}"/>
+      
+      <data:LibraryPlaylistQuery Name="PlaylistQuery" Sort="+Title" DeviceId="0" AutoRefresh="false"/>
+
+      <SelectionManager Name="SelectionManager" SingleSelect="true"/>
+
+      <spreadsheet:ColumnData Name="ColumnData">
+        <Columns>
+          <spreadsheet:ColumnInfo CellType="{typeof(columns:PlaylistCell)}" Resizable="false">
+            <LayoutInput>
+              <DockLayoutInput Position="Top"/>
+            </LayoutInput>
+          </spreadsheet:ColumnInfo>
+        </Columns>
+      </spreadsheet:ColumnData>
+
+      <Command Name="ExecuteCommand"/>      
+    </Locals>
+
+    <Scripts>
+      
+      <Script>OK.Available = ([SelectionManager.Count] == 1);</Script>
+
+      
+      <Script>
+        if (PlaylistQuery.Result.Items.Count == 0)
+        {
+          Dialog.CreatePlaylist.Invoke();
+          Dialog.Helper.Hide();
+        }
+      </Script>
+      
+      
+      <Script>
+        [DeclareTrigger(OK.Invoked)]
+        [DeclareTrigger(ExecuteCommand.Invoked)]
+
+        if (OK.Available)
+        {
+          data:Playlist playlist = (data:Playlist)SelectionManager.SelectedItem;
+          if (playlist != null)
+          {
+            Dialog.AddToPlaylist.PlaylistId = playlist.LibraryId;
+            Dialog.AddToPlaylist.Items = Dialog.DragItems;
+            Dialog.AddToPlaylist.Start.Invoke();
+          }
+          
+          OK.Available = false;
+          Dialog.Helper.Hide();
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Navigation="ContainAll,WrapAll" Margins="10">
+        <Layout>
+          <DockLayout SizeToChildren="true" DefaultLayoutInput="Top,Near"/>
+        </Layout>
+        <Children>
+
+          <core:Label 
+                Content="{zune:Shell.LoadString(zune:StringId.IDS_PLAYLIST_DIALOG_TITLE)}"
+                Style="{styles:SharedStyles.DialogHeaderStyle}"
+                WordWrap="true"/>
+
+          <spreadsheet:SpreadSheet Name="PlaylistsList" 
+            Content="{PlaylistQuery.Result.Items}"
+            ColumnData="{ColumnData}"
+            SelectionManager="{SelectionManager}"
+            ExecuteCommand="{ExecuteCommand}" 
+            AllowHorizontalScrolling="false"
+            Margins="5,10,0,0"
+            Padding="0"
+            MaximumSize="250,300"
+            SupportsJumpInList="true"
+            HighlightHeaders="false"
+            />
+
+          <Panel>
+            <Layout>
+              <DockLayout SizeToChildren="true" DefaultLayoutInput="Left,Near"/>
+            </Layout>
+            <Children>
+
+              <core:BigActionButton Model="{OK}" Margins="10,0,0,0"/>
+              <core:BigActionButton Model="{Dialog.Cancel}" Margins="10,0,0,0" FocusOrder="1"/>
+              <core:BigActionButton Name="CreatePlaylistButton" Model="{Dialog.CreatePlaylist}" Margins="10,0,0,0"/>
+
+            </Children>
+          </Panel>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  
+  <Class Name="CreatePlaylistDialog" Base="dialog:Dialog">
+    <Properties>
+      <String Name="ContentUI" String="res://ZuneShellResources!PlaylistDialog.uix#CreatePlaylistDialogContentUI"/>
+      <List Name="DragItems" List="{null}"/>
+      <Int32 Name="RenamePlaylistId" Int32="-1"/> 
+
+      <iris:Command Name="OK" Description="{zune:Shell.LoadString(zune:StringId.IDS_DIALOG_OK)}"/>
+      
+      <EditableTextData Name="EditData" Value="{null}"/>
+      
+      <Command Name="Completed"/>
+      <Int32 Name="CreatedPlaylistId" Int32="-1"/>
+      <addto:AddToPlaylist Name="AddToPlaylist"/>
+
+      <String Name="ErrorMessage"/>
+    </Properties>
+
+    <Scripts>
+      
+      <Script>
+        [DeclareTrigger(Helper.IsVisible)]
+        if (Helper.IsVisible)
+        {
+          CreatedPlaylistId = -1;
+          if (EditData.Value == null)
+          {
+            EditData.Value = zune:Shell.LoadString(zune:StringId.IDS_NEW_PLAYLIST_NAME);
+          }
+          OK.Available = true;
+          
+          
+          
+          
+          
+          
+          if (RenamePlaylistId >= 0)
+          {
+            OK.Invoke();
+          }
+        }
+        else
+        {
+          DragItems = null;
+          RenamePlaylistId = -1;
+          EditData.Value = null;
+          ErrorMessage = null;
+        }
+      </Script>
+      
+      
+      <Script>
+        [DeclareTrigger(OK.Invoked)]
+        [DeclareTrigger(EditData.Submitted)]
+
+        if (OK.Available)
+        {
+          zune:PlaylistResult result;
+          if (RenamePlaylistId >= 0)
+          {
+            result = zune:PlaylistManager.Instance.RenamePlaylist(RenamePlaylistId, EditData.Value);
+          }
+          else
+          {
+            result = zune:PlaylistManager.Instance.CreatePlaylist(EditData.Value);
+          
+            if (result.Error == zune:PlaylistError.Success)
+            {
+              
+              AddToPlaylist.PlaylistId = result.PlaylistId;
+              AddToPlaylist.Items = DragItems;
+              AddToPlaylist.Start.Invoke();
+              
+              CreatedPlaylistId = result.PlaylistId;
+            }
+          }
+          
+          ErrorMessage = null;
+          if (result.Error == zune:PlaylistError.Success)
+          {
+            
+            Completed.Invoke();
+            Helper.Hide();
+          }
+          else if (result.Error == zune:PlaylistError.NameExists)
+          {
+            
+            ErrorMessage = ((String)zune:Shell.LoadString(zune:StringId.IDS_PLAYLIST_DUPLICATE_NAME)).Format(EditData.Value);
+          }
+          else if (result.Error == zune:PlaylistError.InvalidName)
+          {
+            
+            ErrorMessage = ((String)zune:Shell.LoadString(zune:StringId.IDS_PLAYLIST_INVALID_NAME)).Format(EditData.Value);
+          }
+
+          OK.Available = false;
+        }
+      </Script>
+      
+      
+      <Script>
+        [DeclareTrigger(EditData.Value)]
+        ErrorMessage = null;
+        
+        
+        OK.Available = !String.IsNullOrEmpty(EditData.Value);
+      </Script>      
+    </Scripts>
+  </Class>
+
+
+  
+  
+  
+  <UI Name="CreatePlaylistDialogContentUI" Base="dialog:DialogContentUI">
+    <Properties>
+      <me:CreatePlaylistDialog Name="Dialog" CreatePlaylistDialog="$Required"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+        [DeclareTrigger(Dialog.ErrorMessage)]
+        
+        ErrorLabel.Content = Dialog.ErrorMessage;
+        ErrorLabel.Visible = (Dialog.ErrorMessage != null);
+      </Script>
+
+      <Script>
+        if (Dialog.RenamePlaylistId >= 0)
+        {
+          Title.Content = zune:Shell.LoadString(zune:StringId.IDS_PLAYLIST_RENAMEPLAYLIST_DIALOG_TITLE);
+        }
+        else
+        {
+          Title.Content = zune:Shell.LoadString(zune:StringId.IDS_PLAYLIST_CREATEPLAYLIST_DIALOG_TITLE);
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Navigation="ContainAll,WrapAll" Margins="10" MaximumSize="320,0">
+        <Layout>
+          <DockLayout SizeToChildren="true" DefaultLayoutInput="Top,Near"/>
+        </Layout>
+        <Children>
+
+          <core:Label Name="Title" 
+                Style="{styles:SharedStyles.DialogHeaderStyle}"
+                WordWrap="true"/>
+
+          <core:Editbox 
+            Model="{Dialog.EditData}" 
+            TileMinSize="300,18" TileMaxSize="300,18" 
+            TilePadding="4,0,4,0" 
+            BackgroundColor="White" 
+            Margins="5,10,5,10" 
+            FocusOrder="0"
+            />
+
+          <core:Label Name="ErrorLabel" 
+            Style="{styles:SharedStyles.DialogTextStyle}" 
+            WordWrap="true"
+            Visible="false" 
+            Margins="0,0,0,10"
+            />
+
+          <Panel>
+            <LayoutInput>
+              <DockLayoutInput Alignment="Near" Position="Right"/>
+            </LayoutInput>
+            <Layout>
+              <DockLayout SizeToChildren="true" DefaultLayoutInput="Left,Near"/>
+            </Layout>
+            <Children>
+
+              <core:BigActionButton Model="{Dialog.OK}"/>
+              <core:BigActionButton Model="{Dialog.Cancel}" Margins="10,0,0,0"/>
+
+            </Children>
+          </Panel>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+  
+</UIX>
diff --git a/test/2.1/PLAYLISTICON.UIX b/test/2.1/PLAYLISTICON.UIX
new file mode 100644
index 0000000..60d1c82
--- /dev/null
+++ b/test/2.1/PLAYLISTICON.UIX
@@ -0,0 +1,317 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX xmlns="http://schemas.microsoft.com/2007/uix"
+     xmlns:iris="assembly://UIX/Microsoft.Iris"
+     xmlns:core="res://ZuneShellResources!Controls.uix"
+     xmlns:zune="assembly://ZuneShell/ZuneUI"
+     xmlns:sys="assembly://mscorlib/System" 
+     xmlns:data="res://ZuneShellResources!LibraryData.schema.xml"
+     xmlns:mpdata="res://ZuneMarketplaceResources!MarketplaceData.schema.xml"
+     xmlns:dialog="res://ZuneShellResources!PlaylistDialog.uix"
+     xmlns:popup="res://ZuneShellResources!PlaylistPopup.uix"
+     xmlns:addto="res://ZuneShellResources!AddToPlaylist.uix"   
+     xmlns:animations="res://ZuneShellResources!Animations.uix" 
+     xmlns:zuneutil="assembly://ZuneShell/Microsoft.Zune.Util"
+     xmlns:zuneutilapi="assembly://ZuneDBApi/Microsoft.Zune.Util"
+     xmlns:me="Me"
+     >
+
+
+  <UI Name="PlaylistIcon" Base="core:ToolbarIconBase">
+    <Locals>
+      <iris:Command Name="Model"/>
+
+      <zune:PlaylistManager Name="PlaylistManager" PlaylistManager="{zune:PlaylistManager.Instance}"/>
+
+      <Timer Name="PopupShowTimer" AutoRepeat="false" Enabled="false"/>
+      
+      <dialog:AddToPlaylistDialog Name="AddToPlaylistDialog"/>
+      <popup:PlaylistPopup Name="PlaylistPopup" AddToPlaylistDialog="{AddToPlaylistDialog}"/>
+      <addto:AddToPlaylist Name="AddToPlaylist" AddToPlaylist="{null}"/>
+    </Locals>
+    
+    <Scripts>
+      <Script>
+        ToolbarActiveText = sys:String.Format(zune:Shell.LoadString(zune:StringId.IDS_BOTTOM_TOOLBAR_PLAYLIST),[PlaylistManager.DefaultPlaylistName]);        
+      </Script>
+
+      <Script>
+        ToolbarInactiveText = zune:Shell.LoadString(zune:StringId.IDS_BOTTOM_TOOLBAR_NO_DEFAULT);
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(Model.Invoked)]
+        
+        zune:PlaylistLand.NavigateToLand();
+
+        zuneutil:SQMLog.Log(zuneutilapi:SQMDataId.PlaylistLogoClicks, 1);
+      </Script>
+      
+      
+      <Script>
+        [DeclareTrigger(Target.DragEnter)]
+        
+        object value = Target.GetValue();
+        
+        List items = null;
+        if (value is List)
+        {
+           items = (List)value;
+        } 
+        else if (value is mpdata:PlaylistData)
+        {
+           items = ((mpdata:PlaylistData)value).Tracks;
+        } 
+        else if (value is SelectionManager)
+        { 
+           items = ((SelectionManager)value).SelectedItems;
+        }
+
+        if (items != null &amp;&amp; items.Count > 0)
+        {
+          foreach(object item in items)
+          {
+            
+            
+            
+            
+            if (item is data:Track || item is data:Artist || item is data:Album || 
+                item is mpdata:Track || item is mpdata:PlaylistTrack )
+            {
+              Target.AllowedDropActions = DropAction.Copy;
+              
+            }
+          }
+        }
+        
+        
+        
+        
+        if (Target.AllowedDropActions == DropAction.Copy)
+        {
+          PlaylistPopup.InDrag = true;
+          PlaylistPopup.DraggingOverIcon = true;
+          
+          
+          if (PlaylistManager.DefaultPlaylistId == PlaylistManager.InvalidPlaylistId)
+          {
+            PopupShowTimer.Interval = 0;
+          }
+          else
+          {
+            PopupShowTimer.Interval = 1000;
+          }
+          PopupShowTimer.Enabled = true;
+        }
+      </Script>
+
+      
+      <Script>
+        [InitialEvaluate(false)]
+        
+        if ([UI.DeepMouseFocus])
+        {
+          
+          
+          
+          
+          
+          
+          
+          if (PlaylistPopup.Helper.IsVisible &amp;&amp; PlaylistPopup.InDrag)
+          {
+            PlaylistPopup.Helper.Hide();
+          }
+          
+          PlaylistPopup.MousingOverIcon = true;
+          PopupShowTimer.Interval = 1000;
+          PopupShowTimer.Enabled = true;
+        }
+        else
+        {
+          PlaylistPopup.MousingOverIcon = false;
+          PopupShowTimer.Enabled = false;
+        }
+      </Script>
+
+      <Script>
+        if (![Target.Dragging])
+        {
+          Target.AllowedDropActions = DropAction.None;
+          PlaylistPopup.DraggingOverIcon = false;
+          PopupShowTimer.Enabled = false;
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(zune:Shell.DefaultInstance.CurrentPage)]
+        [DeclareTrigger(Model.Invoked)]
+        
+        PopupShowTimer.Enabled = false;
+        PlaylistPopup.Helper.Hide();
+      </Script>
+      
+      
+      <Script>
+        [DeclareTrigger(Target.Dropped)]
+        object value = Target.GetValue();
+        
+        List items = null;
+        if (value is List)
+        {
+           items = (List)value;
+        } 
+        else if (value is mpdata:PlaylistData)
+        {
+           items = ((mpdata:PlaylistData)value).Tracks;
+        } 
+        else if (value is SelectionManager)
+        { 
+           items = ((SelectionManager)value).SelectedItems;
+        }
+
+        
+        PopupShowTimer.Enabled = false;
+        PlaylistPopup.Helper.Hide();
+        
+        
+        
+        
+        if (items != null &amp;&amp; items.Count > 0)
+        {
+          int defaultPlaylistId = PlaylistManager.DefaultPlaylistId;
+          
+          if (defaultPlaylistId >= -1) 
+          {
+            if ( AddToPlaylist == null ) AddToPlaylist = new addto:AddToPlaylist();
+            AddToPlaylist.PlaylistId = defaultPlaylistId;
+            AddToPlaylist.Items = items;
+            AddToPlaylist.Start.Invoke();
+          }
+          else
+          {
+            
+            
+            
+            AddToPlaylistDialog.DragItems = items;
+            AddToPlaylistDialog.Helper.Show(AddToPlaylistDialog);
+          }
+        }
+
+        zuneutil:SQMLog.Log(zuneutilapi:SQMDataId.PlaylistLogoDrops, 1);
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(PopupShowTimer.Tick)]
+        
+        
+        
+        
+        if (Target.Dragging || PlaylistPopup.MousingOverIcon)
+        {
+          PlaylistPopup.LayoutInput.PlacementTarget = Icon;
+          
+          
+          
+          
+          if (!PlaylistPopup.Helper.IsVisible)
+          {
+            if (Target.Dragging) 
+            {
+              object value = Target.GetValue();
+
+              List items = null;
+              if (value is List)
+              {
+                 items = (List)value;
+              } 
+              else if (value is mpdata:PlaylistData)
+              {
+                 items = ((mpdata:PlaylistData)value).Tracks;
+              } 
+              else if (value is SelectionManager)
+              { 
+                 items = ((SelectionManager)value).SelectedItems;
+              }
+
+              if (items != null &amp;&amp; items.Count > 0)
+              {
+                PlaylistPopup.DragItems = items;
+              }
+            }
+            
+            PlaylistPopup.Helper.Show(PlaylistPopup);
+          }
+        }
+      </Script>
+
+      
+      <Script>
+        bool dragging = [Target.Dragging] &amp;&amp; [Target.AllowedDropActions] != DropAction.None;
+
+        if ([PlaylistManager.DefaultPlaylistId] >= -1)
+        {
+          if (dragging)
+            Icon.Image = me:Images.PlaylistDrag;
+          else
+            Icon.Image = me:Images.Playlist;
+
+          Icon.HoverImage = me:Images.PlaylistHover;
+          Icon.PressedImage = me:Images.PlaylistPressed;
+          Icon.Active = true;
+        }
+        else
+        {
+          if (dragging)
+            Icon.Image = me:Images.PlaylistEmptyDrag;
+          else
+            Icon.Image = me:Images.PlaylistEmpty;
+            
+          Icon.HoverImage = me:Images.PlaylistEmptyHover;
+          Icon.PressedImage = me:Images.PlaylistEmptyPressed;
+          Icon.Active = false;
+        }
+        IsActive = Icon.Active;
+      </Script>
+
+      <Script>
+        if ([Icon.Active])
+        {
+          Icon.AccessibleDescription = [ToolbarActiveText];
+        }
+        else
+        {
+          Icon.AccessibleDescription = [ToolbarInactiveText];
+        }
+      </Script>
+    </Scripts>
+    
+    <Content>
+      <Panel Layout="Anchor">
+        <Children>
+
+          <core:AnimatedIconButton Name="Icon" 
+              Model="{Model}"
+              IconActiveAnimation="{animations:Animations.IconContentChange}"
+              />
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  <Class Name="Images" Shared="true">
+    <Properties>
+      <Image Name="Playlist" Source="res://ZuneShellResources!Icon.Playlist.png"/>
+      <Image Name="PlaylistHover" Source="res://ZuneShellResources!Icon.Playlist.Hover.png"/>
+      <Image Name="PlaylistPressed" Source="res://ZuneShellResources!Icon.Playlist.Pressed.png"/>
+      <Image Name="PlaylistDrag" Source="res://ZuneShellResources!Icon.Playlist.Drag.png"/>
+      <Image Name="PlaylistEmpty" Source="res://ZuneShellResources!Icon.Playlist.Empty.png"/>
+      <Image Name="PlaylistEmptyHover" Source="res://ZuneShellResources!Icon.Playlist.Empty.Hover.png"/>
+      <Image Name="PlaylistEmptyPressed" Source="res://ZuneShellResources!Icon.Playlist.Empty.Pressed.png"/>
+      <Image Name="PlaylistEmptyDrag" Source="res://ZuneShellResources!Icon.Playlist.Empty.Drag.png"/>
+    </Properties>
+  </Class>
+  
+</UIX>
diff --git a/test/2.1/PLAYLISTLAND.UIX b/test/2.1/PLAYLISTLAND.UIX
new file mode 100644
index 0000000..41e05c2
--- /dev/null
+++ b/test/2.1/PLAYLISTLAND.UIX
@@ -0,0 +1,31 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX xmlns="http://schemas.microsoft.com/2007/uix"
+     xmlns:zune="assembly://ZuneShell/ZuneUI"
+     xmlns:lib="res://ZuneShellResources!Library.uix"
+     xmlns:iris="assembly://UIX/Microsoft.Iris"
+     >
+
+  <UI Name="PlaylistLand" Base="lib:Library">
+    <Properties>
+      <zune:PlaylistLand Name="Page" PlaylistLand="$Required"/>
+    </Properties>
+   
+  </UI>
+  
+  <UI Name="EmptyPage" Base="lib:EmptyPage">
+    <Properties>
+      <zune:PlaylistLand Name="Page" PlaylistLand="$Required"/>
+      <String Name="Title" String="{zune:Shell.LoadString(zune:StringId.IDS_PLAYLIST_EMPTY_TITLE)}"/>
+      <iris:Command Name="Link1Command" Description="{zune:Shell.LoadString(zune:StringId.IDS_PLAYLIST_CREATE)}"/>
+    </Properties>
+    
+    <Scripts>
+      <Script>
+        [DeclareTrigger(Link1Command.Invoked)]
+        
+        Page.CreatePlaylistCommand.Invoke();
+      </Script>
+    </Scripts>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/PLAYLISTPOPUP.UIX b/test/2.1/PLAYLISTPOPUP.UIX
new file mode 100644
index 0000000..ea978d6
--- /dev/null
+++ b/test/2.1/PLAYLISTPOPUP.UIX
@@ -0,0 +1,291 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris" 
+  xmlns:zune="assembly://ZuneShell/ZuneUI" 
+  xmlns:menu="res://ZuneShellResources!ContextMenu.uix"
+  xmlns:button="res://ZuneShellResources!Button.uix"
+  xmlns:dialog="res://ZuneShellResources!PlaylistDialog.uix"
+  xmlns:data="res://ZuneShellResources!LibraryData.schema.xml"
+  xmlns:me="Me"
+  >
+
+  
+
+
+  <Class Name="PlaylistPopup" Base="menu:ContextMenu">
+    <Properties>
+      <PopupLayoutInput Name="LayoutInput" Placement="Top" Offset="0,6"/>
+      <String Name="PopupUI" String="res://ZuneShellResources!PlaylistPopup.uix#PlaylistPopupUI"/>      
+      <Boolean Name="HideIfAllDisabled" Boolean="false"/>
+      <Boolean Name="InDrag" Boolean="false"/>
+      <Boolean Name="DraggingOverIcon" Boolean="false"/>
+      <Boolean Name="MousingOverIcon" Boolean="false"/>
+
+      <List Name="DragItems" List="{null}"/>
+
+      <iris:Command Name="MorePlaylists" Description="{zune:Shell.LoadString(zune:StringId.IDS_ADDITIONAL_PLAYLISTS)}"/>
+      <iris:Command Name="CreatePlaylist" Description="{zune:Shell.LoadString(zune:StringId.IDS_PLAYLIST_CREATE)}"/>
+
+      <dialog:AddToPlaylistDialog Name="AddToPlaylistDialog"/>
+      <dialog:CreatePlaylistDialog Name="CreatePlaylistDialog"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+        
+        
+        Helper.IsModal = false;
+      </Script>
+
+      
+      <Script>
+        if (![Helper.IsVisible])
+        {
+          DragItems = null;
+          DraggingOverIcon = false;
+          InDrag = false;
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(MorePlaylists.Invoked)]
+
+        AddToPlaylistDialog.DragItems = DragItems;
+        AddToPlaylistDialog.Helper.Show(AddToPlaylistDialog);
+        Helper.Hide();
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(CreatePlaylist.Invoked)]
+        
+        CreatePlaylistDialog.DragItems = DragItems;
+        CreatePlaylistDialog.Helper.Show(CreatePlaylistDialog);
+        Helper.Hide();
+      </Script>
+    </Scripts>
+  </Class>
+  
+  
+
+
+  <UI Name="PlaylistPopupUI" Base="menu:ContextMenuUI">
+    <Properties>
+      <me:PlaylistPopup Name="Popup" PlaylistPopup="{null}" />
+
+      <Boolean Name="StealFocusOnOpen" Boolean="false"/>
+    </Properties>
+    
+    <Locals>
+      <data:Playlist Name="NowPlaying" LibraryId="-1" Title="{zune:Shell.LoadString(zune:StringId.IDS_NOW_PLAYING)}"/>
+      <List Name="Options" />
+      
+      <data:LibraryPlaylistQuery Name="PlaylistQuery" Sort="+DateModified" AutoRefresh="false"/>
+
+      <TypeSelector Name="PlaylistSelector" ContentName="Playlist" Type="{typeof(data:Playlist)}"/>
+
+      
+
+
+
+
+
+      <Timer Name="DismissTimer" Interval="1000" AutoRepeat="false" Enabled="false"/>
+
+      <Int32 Name="MaxPlaylistsToShow" Int32="7"/>
+    </Locals>
+
+    <Input>
+      <DropTargetHandler Name="Target" AllowedDropActions="None" HandlerStage="Bubbled,Direct"/>
+    </Input>
+
+    <Scripts>
+      <Script>SharedSize.MaximumSize = new Size(400,0);</Script>
+      
+      
+      <Script>
+        Repeater.ContentSelectors.Add(PlaylistSelector);
+      </Script>
+      
+      
+      
+      <Script>
+        Options.Add(Popup.CreatePlaylist);
+        Options.Add(NowPlaying);
+
+        List playlists = PlaylistQuery.Result.Items;
+        if (!List.IsNullOrEmpty(playlists))
+        {          
+          Options.Add(new menu:MenuDivider());
+          
+          int numberToSkip = playlists.Count - MaxPlaylistsToShow;
+          if (numberToSkip > 0)
+          {
+            Options.Add(Popup.MorePlaylists);
+          }
+          else
+          {
+            numberToSkip = 0;
+          }
+          
+          
+          
+          
+          
+          
+          foreach (data:Playlist playlist in playlists)
+          {
+            
+            if (numberToSkip > 0)
+            {
+              numberToSkip = numberToSkip - 1;
+            }
+            else
+            {
+              Options.Add(playlist);
+            }
+          }
+        }
+        
+        Repeater.Source = Options;
+      </Script>
+
+      
+      <Script>
+        if (Popup.InDrag)
+        {
+          DismissTimer.Enabled = ([Popup.SelectedItem] == null) 
+                      &amp;&amp; ![Target.Dragging] 
+                      &amp;&amp; ![Popup.DraggingOverIcon];
+        }
+        else
+        {
+          DismissTimer.Enabled = ![UI.DeepMouseFocus]
+                      &amp;&amp; ![Popup.MousingOverIcon];              
+        }
+        if (DismissTimer.Enabled)
+        {
+          
+
+        }
+      </Script>
+
+      
+      <Script>
+        if ([UI.DeepMouseFocus] &amp;&amp; [Popup.InDrag])
+        {
+          
+          Popup.Helper.Hide();
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(DismissTimer.Tick)]
+        
+        Popup.Helper.Hide();
+      </Script>
+    </Scripts>
+    
+    <Content Name="CommandItem">
+      <me:CommandPlaylistMenuItem 
+          Model="{(iris:Command)RepeatedItem}" 
+          ContextMenu="{Popup}" 
+          SharedSize="{SharedSize}" 
+          SharedSizePolicy="SharesWidth,ContributesToWidth" 
+          MinimumSize="{MinimumItemSize}"/>
+    </Content>
+    
+    <Content Name="Playlist">
+      <me:PlaylistMenuItem 
+          Model="{(data:Playlist)RepeatedItem}" 
+          ContextMenu="{Popup}" 
+          SharedSize="{SharedSize}" 
+          SharedSizePolicy="SharesWidth,ContributesToWidth" 
+          MinimumSize="{MinimumItemSize}"/>
+    </Content>
+  </UI>
+  
+  
+
+
+
+  <UI Name="PlaylistMenuItemBase" Base="menu:ContextMenuItemBase">
+    <Properties>
+      <me:PlaylistPopup Name="ContextMenu" PlaylistPopup="$Required"/>
+    </Properties>
+
+    <Input>
+      <DropTargetHandler Name="Target" AllowedDropActions="Copy" HandlerStage="Bubbled,Direct"/>
+    </Input>
+
+    <Scripts>
+      
+      <Script> UI.KeyFocusOnMouseEnter = false; </Script>
+
+      
+      <Script>
+        [DeclareTrigger(Target.DragEnter)]
+        ContextMenu.SelectedItem = Model;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Target.DragLeave)]
+        
+        
+        if (!Target.Dragging)
+          ContextMenu.SelectedItem = null;
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+
+
+
+  <UI Name="PlaylistMenuItem" Base="me:PlaylistMenuItemBase">
+    <Properties>
+      <data:Playlist Name="Model" Playlist="$Required"/>
+      <button:ButtonProvider Name="Provider" PrimaryLabel="{Model.Title}"/>
+      
+      <Int32 Name="PlaylistId" Int32="{Model.LibraryId}"/>
+    </Properties>
+    
+    <Scripts>
+      
+      <Script>
+        [DeclareTrigger(Target.Dropped)]
+        [DeclareTrigger(Clicker.Invoked)]
+
+        ContextMenu.AddToPlaylistDialog.AddToPlaylist.PlaylistId = PlaylistId;
+        ContextMenu.AddToPlaylistDialog.AddToPlaylist.Items = ContextMenu.DragItems;
+        ContextMenu.AddToPlaylistDialog.AddToPlaylist.Start.Invoke();
+        ContextMenu.Helper.Hide();
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+
+
+
+  <UI Name="CommandPlaylistMenuItem" Base="me:PlaylistMenuItemBase">
+    <Properties>
+      <iris:Command Name="Model" Command="$Required"/>
+      <button:CommandButtonProvider Name="Provider" Model="{Model}"/>      
+    </Properties>
+
+    <Scripts>
+      <Script>Clicker.Command = Model;</Script>
+      
+      
+      <Script>
+        [DeclareTrigger(Target.Dropped)]
+
+        Model.Invoke();
+      </Script>
+    </Scripts>
+  </UI>
+  
+</UIX>
diff --git a/test/2.1/PLAYLISTSPANEL.UIX b/test/2.1/PLAYLISTSPANEL.UIX
new file mode 100644
index 0000000..54a6688
--- /dev/null
+++ b/test/2.1/PLAYLISTSPANEL.UIX
@@ -0,0 +1,356 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:sys="assembly://mscorlib/System"
+  xmlns:data="res://ZuneShellResources!LibraryData.schema.xml"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:panels="res://ZuneShellResources!LibraryPanels.uix"
+  xmlns:spreadsheet="res://ZuneShellResources!SpreadSheetViewBase.uix"
+  xmlns:columns="res://ZuneShellResources!PlaylistContentsPanelColumns.uix"
+  xmlns:playlistdialog="res://ZuneShellResources!PlaylistDialog.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:me="Me"
+  >
+  
+  
+  
+  
+  <Class Name="PlaylistsPanelData" Shared="true">
+    <Properties>
+      <iris:ArrayListDataSet Name="SortOptions">
+        <Source>
+          <zune:SortCommand Description="{zune:Shell.LoadString(zune:StringId.IDS_ASCENDING_SORT)}" Sort="+Title"  SupportsJumpInList="true"/>
+          <zune:SortCommand Description="{zune:Shell.LoadString(zune:StringId.IDS_DESCENDING_SORT)}" Sort="-Title" SupportsJumpInList="true"/>
+          
+
+
+
+        </Source>
+      </iris:ArrayListDataSet>
+      <iris:Choice Name="Sorts" Options="{SortOptions}"/>
+    </Properties>
+  </Class>
+
+  
+  
+  
+  <UI Name="PlaylistsPanel" Base="panels:LibraryPanelBase">
+    <Properties>
+      <Int32 Name="MinimumWidth" Int32="115"/>
+      <Single Name="MinimumPercent" Single="0.0"/>      
+      
+      <zune:PlaylistLand Name="Page" PlaylistLand="$Required"/>
+      <zune:PlaylistsPanel Name="Model" PlaylistsPanel="$Required"/>
+
+      <iris:Choice Name="Sorts" Choice="{me:PlaylistsPanelData.Sorts}"/>
+
+      
+      <spreadsheet:ColumnData Name="ColumnData">
+        <Columns>
+          <spreadsheet:ColumnInfo HeaderType="{typeof(columns:PlaylistHeader)}"
+                                  CellType="{typeof(columns:PlaylistCell)}"
+                                  CellEditType="{typeof(me:PlaylistEditCell)}"
+                                  Resizable="false" CellPadding="26,0,5,0">
+            <LayoutInput>
+              <DockLayoutInput Position="Top"/>
+            </LayoutInput>
+          </spreadsheet:ColumnInfo>
+        </Columns>
+      </spreadsheet:ColumnData>
+      
+      <Boolean Name="RequireSelection" Boolean="true"/>
+      <Boolean Name="BlockUpdatesDuringGrovel" Boolean="false"/>
+      
+    </Properties>
+
+    <Locals>
+      <data:LibraryPlaylistQuery Name="PlaylistQuery" Enabled="false"
+        ShowDeviceContents="{Page.ShowDeviceContents}"/>
+
+      <List Name="LibraryContextMenuOptions">
+        <Source>
+          <iris:Command Command="{Play}"/>
+          <iris:Command Command="{AddToNowPlaying}"/>
+          <iris:Command Command="{AddToBurnList}"/>
+          <core:MenuDivider/>
+          <iris:Command Command="{Edit}"/>
+          <iris:Command Command="{Delete}"/>
+          <core:MenuDivider MenuDivider="{SyncDivider}"/>
+          <iris:Command Command="{Sync}"/>
+          <iris:Command Command="{SyncAllUnexclude}"/>
+        </Source>
+      </List>
+
+      <List Name="DeviceContextMenuOptions">
+        <Source>
+          <iris:Command Command="{DeleteFromDevice}"/>
+        </Source>
+      </List>
+      
+      <playlistdialog:CreatePlaylistDialog Name="CreatePlaylistDialog"/>
+      
+      <iris:Command Name="CreatePlaylist" Command="{Page.CreatePlaylistCommand}"/>
+      
+      
+      <Int32 Name="CreatedPlaylistId" Int32="-1"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        if (Page.ShowDeviceContents)
+        {
+          PlaylistQuery.DeviceId = [Page.DeviceId];
+        }
+      </Script>
+      
+      <Script>
+        if (Page.ShowDeviceContents)
+        {
+          ContextMenu.Options = DeviceContextMenuOptions;
+          DeleteKey.Command = DeleteFromDevice;
+          CreateButton.Visible = false;
+        }
+        else
+        {
+          ContextMenu.Options = LibraryContextMenuOptions;
+          Worker.ExecuteCommand = Play;
+        }
+      </Script>
+
+      
+      <Script>
+          zune:SortCommand sort = (zune:SortCommand)[Sorts.Chosen];
+
+          PlaylistQuery.Sort = sort.Sort;
+          SupportsJumpInList = sort.SupportsJumpInList;
+      </Script>
+
+      
+      <Script>PlaylistQuery.Enabled = true;</Script>
+
+      
+      <Script>
+        if (Model.Content != PlaylistQuery.Result.Items)
+        {
+          Model.Content = [PlaylistQuery.Result.Items];
+          Worker.Content = Model.Content;
+          SelectionManager.SourceList = Model.Content;
+        }
+      </Script>
+      
+      <Script>
+        Page.IsEmpty = [PlaylistQuery.Result.IsEmpty];
+      </Script>
+
+      
+      <Script>
+        ToggleSelectAllCommand.Description = sys:String.Format(zune:Shell.LoadString(zune:StringId.IDS_PLAYLISTS_HEADER), [PlaylistQuery.Result.Items.Count]);
+      </Script>
+
+      <Script>
+        Worker.SupportsJumpInList = [SupportsJumpInList];
+      </Script>
+      
+      
+      <Script>
+        List libraryIds = [Model.SelectedLibraryIds];
+        
+        
+        
+        
+        
+        if (libraryIds == null &amp;&amp; Model.Content != null &amp;&amp; Model.Content.Count == 1)
+        {
+          libraryIds = new List();
+          data:Playlist playlist = (data:Playlist)Model.Content.get_Item(0);
+          libraryIds.Add(playlist.LibraryId);
+        }
+        
+        Page.ContentsPanel.SelectedPlaylistIds = libraryIds;
+      </Script>
+      
+      
+      <Script>
+        [DeclareTrigger(CreatePlaylist.Invoked)]
+        
+        CreatePlaylistDialog.Helper.Show(CreatePlaylistDialog);
+      </Script>
+
+      
+      <Script>
+        if ([PlaylistQuery.Result.Items.Count] > 0 &amp;&amp; CreatePlaylistDialog.CreatedPlaylistId >= 0)
+        {
+          RestoringSelection = false;
+          
+          
+          NavigateIntoArgs.Select = true;
+          NavigateIntoArgs.LibraryId = CreatePlaylistDialog.CreatedPlaylistId;
+          
+          
+          CreatePlaylistDialog.CreatedPlaylistId = -1;
+        }
+      </Script>
+    </Scripts>
+    <Content>
+
+      <Panel Layout="Dock">
+        <Children>
+
+          <core:BigActionButton Name="CreateButton"  Model="{CreatePlaylist}">
+            <LayoutInput>
+              <DockLayoutInput Position="Bottom" Alignment="Near"/>
+            </LayoutInput>
+          </core:BigActionButton>
+
+          <spreadsheet:SpreadSheet Name="Worker"
+            ListModel="{ListModel}"
+            Content="{Model.Content}"
+            ColumnData="{ColumnData}"
+            NavigateIntoArgs="{NavigateIntoArgs}"
+            SelectionManager="{SelectionManager}"
+            ContextMenu="{ContextMenu}"
+            EditContext="{EditContext}"
+            ListItemType="{typeof(me:PlaylistListItem)}"
+            AllowHorizontalScrolling="false"
+            HeaderSpacing="22"
+            Margins="-24,0,-2,-2"
+            LayoutSpacing="{styles:Styles.LibraryListLayoutSpacing}"
+            RowSize="{styles:Styles.LibraryListItemSize}"
+            RowPadding="{styles:Styles.LibraryListItemMargins}"
+            FocusOrder="0"
+            />
+
+        </Children>
+      </Panel>
+
+    </Content>
+  </UI>
+  
+  
+  
+  
+  <UI Name="PlaylistListItem" Base="spreadsheet:SpreadSheetListItem">
+    <Properties>
+      <data:Playlist Name="Model" Playlist="$Required"/>      
+    </Properties>
+
+    <Locals>
+      
+
+
+      <Boolean Name="LastDragging"/> 
+    </Locals>    
+    
+    <Input>
+      <DropTargetHandler Name="Target" HandlerStage="Bubbled, Direct" AllowedDropActions="Copy"/>
+    </Input>
+
+    <Scripts>
+      
+      <Script>
+        if ([Target.Dragging] == LastDragging)
+        {
+          return;
+        }
+        
+        LastDragging = [Target.Dragging];
+        
+        if (LastDragging)
+        {
+          Target.AllowedDropActions = DropAction.None;
+
+          
+          object value = Target.GetValue();
+
+          if (value is SelectionManager)
+          {
+            SelectionManager selection = (SelectionManager)value;
+            
+            if (selection.Count > 0)
+            {
+              Target.AllowedDropActions = DropAction.Copy;
+              foreach(object item in selection.SelectedItems)
+              {
+                if (!(item is data:PlaylistContentItem))
+                {
+                  Target.AllowedDropActions = DropAction.None;
+                }
+              }
+            }
+          }
+        }
+        else
+        {
+          
+          Target.AllowedDropActions = DropAction.None;
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Target.Dropped)]
+        object value = Target.GetValue();
+        
+        SelectionManager selection = (SelectionManager)value;
+
+        zune:PlaylistManager.Instance.AddToPlaylist(Model.LibraryId, selection.SelectedItems);        
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  <UI Name="PlaylistEditCell" Base="spreadsheet:LabelEditCell">
+    <Properties>
+      <data:Playlist Name="Model" Playlist="$Required"/>
+    </Properties>
+    
+    <Locals>
+      <playlistdialog:CreatePlaylistDialog Name="CreatePlaylistDialog"/>
+    </Locals>
+    
+    <Scripts>
+
+      <Script>
+        EditableText.Value = [Model.Title];
+      </Script>
+
+      <Script>
+        [DeclareTrigger(CommitValue.Invoked)]
+        
+        if (EditableText.Value != Model.Title)
+        {
+          
+          
+          CreatePlaylistDialog.RenamePlaylistId = Model.LibraryId;
+          CreatePlaylistDialog.EditData.Value = EditableText.Value;
+          CreatePlaylistDialog.Helper.Show(CreatePlaylistDialog);
+          
+          
+          IsEditing.Value = true;
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(CreatePlaylistDialog.Completed.Invoked)]
+        
+        
+        
+        
+        
+        
+        Model.Title = CreatePlaylistDialog.EditData.Value;
+        IsEditing.Value = false;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(CreatePlaylistDialog.Cancel.Invoked)]
+
+        IsEditing.Value = false;
+      </Script>
+
+    </Scripts>
+  </UI>
+  
+
+</UIX>
diff --git a/test/2.1/PODCASTDETAILSPANEL.UIX b/test/2.1/PODCASTDETAILSPANEL.UIX
new file mode 100644
index 0000000..345995f
--- /dev/null
+++ b/test/2.1/PODCASTDETAILSPANEL.UIX
@@ -0,0 +1,483 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:sys="assembly://mscorlib/System"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:lib="res://ZuneShellResources!Library.uix"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:dialogs="res://ZuneShellResources!PodcastDialogs.uix"
+  xmlns:mctl="res://ZuneMarketplaceResources!Controls.uix"  
+  xmlns:button="res://ZuneShellResources!Button.uix"  
+  xmlns:data="res://ZuneShellResources!LibraryData.schema.xml"
+  xmlns:me="Me">
+
+
+  
+  
+  
+  <UI Name="PodcastDetailsPanel" Base="lib:Column">
+    <Properties>
+      <zune:PodcastLibraryPage Name="Page" PodcastLibraryPage="$Required"/>
+      <zune:LibraryPanel Name="Model"/>
+    </Properties>
+
+    <Locals>
+      <Boolean Name="IsSeriesUrlValid" Boolean="true"/>
+    </Locals>
+
+    <Scripts>
+      
+      
+
+      
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(((data:PodcastSeries)Page.SeriesPanel.SelectedItem).FeedUrl)]
+        
+        data:PodcastSeries selectedSeries = (data:PodcastSeries)Page.SeriesPanel.SelectedItem;
+        
+        if ( selectedSeries != null )
+        {
+          IsSeriesUrlValid = !String.IsNullOrEmpty(selectedSeries.FeedUrl);
+        }
+      </Script>
+
+      
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(IsSeriesUrlValid)]
+        [DeclareTrigger(Page.SeriesClicked.Invoked)]
+        [DeclareTrigger(Page.SeriesPanel.SelectedItem)]
+      
+        
+        SeriesPanel.Visible           = IsSeriesUrlValid;
+        EpisodePanel.Visible          = false;
+        GrovelledSeriesPanel.Visible  = !IsSeriesUrlValid;
+      </Script>
+      
+      
+      <Script>
+        [DeclareTrigger(Page.EpisodeClicked.Invoked)]
+        [DeclareTrigger(Page.EpisodePanel.SelectedItem)]
+        
+        
+        SeriesPanel.Visible           = false;
+        EpisodePanel.Visible          = IsSeriesUrlValid;
+        GrovelledSeriesPanel.Visible  = !IsSeriesUrlValid;
+      </Script>
+
+    </Scripts>
+
+    <Content>
+
+      
+      <Panel Padding="10,0,10,0">
+        <Children>
+          <me:SeriesMetadataPanel Name="SeriesPanel" Page="{Page}"/>
+          <me:GrovelledSeriesMetadataPanel Name="GrovelledSeriesPanel" Page="{Page}"/>
+          <me:EpisodeMetadataPanel Name="EpisodePanel" Page="{Page}"/>
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="SeriesMetadataPanel" Base="me:PodcastMetadataPanelBase">
+    <Scripts>
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(((data:PodcastSeries)Page.SeriesPanel.SelectedItem).Title)]
+
+        data:PodcastSeries selectedSeries = (data:PodcastSeries)Page.SeriesPanel.SelectedItem;
+        
+
+        if ( selectedSeries != null )
+        {
+          Worker.Title = selectedSeries.Title;
+          Worker.DescriptionTitle = zune:Shell.LoadString(zune:StringId.IDS_SERIES_DESCRIPTION);
+          Worker.Description = selectedSeries.Description;
+          Worker.Owner = selectedSeries.OwnerName;
+          Worker.Author = selectedSeries.Author;
+          Worker.Explicit = selectedSeries.Explicit;
+          Worker.Copyright = selectedSeries.Copyright;
+        }
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  <UI Name="EpisodeMetadataPanel" Base="me:PodcastMetadataPanelBase">
+    <Scripts>
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(Page.EpisodePanel.SelectedItem)]
+
+        data:PodcastEpisode selectedEpisode = (data:PodcastEpisode)Page.EpisodePanel.SelectedItem;
+        data:PodcastSeries selectedSeries = (data:PodcastSeries)Page.SeriesPanel.SelectedItem;
+        
+        if ( selectedEpisode != null )
+        {
+          Worker.Title = selectedEpisode.SeriesTitle;
+          Worker.DescriptionTitle = zune:Shell.LoadString(zune:StringId.IDS_EPISODE_DESCRIPTION);
+          Worker.Description = selectedEpisode.Description;
+          Worker.Owner = null;
+          Worker.Duration = zune:Shell.TimeSpanToString(selectedEpisode.Duration);
+          Worker.Author = selectedEpisode.Author;
+          Worker.Explicit = selectedEpisode.Explicit;
+          if ( selectedSeries != null )
+          {
+            Worker.Copyright = selectedSeries.Copyright;
+          }
+          else
+          {
+            Worker.Copyright = null;
+          }
+        }
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  <UI Name="PodcastMetadataPanelBase">
+    
+    <Properties>
+      <zune:PodcastLibraryPage Name="Page" PodcastLibraryPage="$Required"/>
+      
+      <iris:Command Name="OfficialWebSiteCommand" Description="{zune:Shell.LoadString(zune:StringId.IDS_OFFICIAL_WEBSITE_BUTTON)}"/>
+      <iris:Command Name="SeriesStateCommand" Description="{zune:Shell.LoadString(zune:StringId.IDS_UNSUBSCRIBE_BUTTON)}"/>
+      <iris:Command Name="SeriesSettingsCommand" Description="{zune:Shell.LoadString(zune:StringId.IDS_SERIES_SETTINGS_BUTTON)}"/>
+    </Properties>
+
+    <Locals>
+      <dialogs:UnsubscribeDialog Name="UnsubscribeDialog" Page="{Page}"/>
+      <dialogs:SettingsDialog Name="SettingsDialog" Page="{Page}"/>
+      <String Name="WebSiteUrl"/>
+    </Locals>
+
+    <Scripts>
+      
+      
+      
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(Page.SeriesState)]
+
+        if ( Page.IsSubscribed() )
+        {
+          SeriesStateCommand.Description = zune:Shell.LoadString(zune:StringId.IDS_UNSUBSCRIBE_BUTTON);
+        }
+        else
+        {
+          SeriesStateCommand.Description = zune:Shell.LoadString(zune:StringId.IDS_SUBSCRIBE_BUTTON);
+        }
+      </Script>
+      
+      
+      <Script>
+        [DeclareTrigger(SeriesStateCommand.Invoked)]
+
+        if (Page.SelectedSeriesId != -1)
+        {
+          if (Page.IsSubscribed())
+          {
+            UnsubscribeDialog.SeriesId = Page.SelectedSeriesId;
+            UnsubscribeDialog.Helper.Show(UnsubscribeDialog);
+          }
+          else
+          {
+            Page.Resubscribe(Page.SelectedSeriesId);
+          }
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(((data:PodcastSeries)Page.SeriesPanel.SelectedItem).FeedUrl)]
+        
+        data:PodcastSeries selectedSeries = (data:PodcastSeries)Page.SeriesPanel.SelectedItem;
+        
+        WebSiteUrl = null;
+        
+        if ( selectedSeries != null )
+        {
+          WebSiteUrl = selectedSeries.HomeUrl;
+        }
+        
+        OfficialWebSiteButton.Visible = !string.IsNullOrEmpty(WebSiteUrl);
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(OfficialWebSiteCommand.Invoked)]
+        Page.OpenOfficialWebSite( WebSiteUrl );
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(SeriesSettingsCommand.Invoked)]
+        
+        if (Page.SelectedSeriesId != -1)
+        {
+          SettingsDialog.SeriesId = Page.SelectedSeriesId;
+          SettingsDialog.Helper.Show(SettingsDialog);
+        }
+      </Script>
+
+    </Scripts>
+    
+    <Content>
+      <Panel Layout="Dock">
+        <Children>
+          
+          
+          <me:PodcastMetadataPanelWorker Name="Worker">
+            <LayoutInput>
+              <DockLayoutInput Position="Client"/>
+            </LayoutInput>
+          </me:PodcastMetadataPanelWorker>
+
+          
+          <Panel Layout="VerticalFlow">
+            <LayoutInput>
+              <DockLayoutInput Position="Bottom"/>
+            </LayoutInput>
+            <Children>
+              
+              <mctl:ExternalLink Name="OfficialWebSiteButton" OverrideStyle="{styles:SharedStyles.ListItemStyle}"  Model="{OfficialWebSiteCommand}" Margins="4,4,0,2"/>
+              
+              <core:BigActionButton Name="SeriesStateButton" Model="{SeriesStateCommand}" Margins="0,4,0,0"/>
+              
+              <core:BigActionButton Name="SeriesSettingsButton" Model="{SeriesSettingsCommand}" Margins="0,4,0,0"/>
+              
+            </Children>
+          </Panel>
+          
+        </Children>
+      </Panel>
+
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="GrovelledSeriesMetadataPanel">
+    <Properties>
+      <zune:PodcastLibraryPage Name="Page" PodcastLibraryPage="$Required"/>
+    </Properties>
+
+    <Locals>
+      <dialogs:EnterUrlDialog Name="EnterUrlDialog" Page="{Page}"/>
+      <iris:Command Name="EnterUrlCommand" Description="{zune:Shell.LoadString(zune:StringId.IDS_ENTER_URL_BUTTON)}"/>
+      <iris:Command Name="DeleteCommand" Description="{zune:Shell.LoadString(zune:StringId.IDS_PODCAST_UNSUBSCRIBE_DELETE)}"/>
+    </Locals>
+
+    <Scripts>
+
+      
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(Page.SeriesPanel.SelectedItem)]
+        [DeclareTrigger(Page.EpisodePanel.SelectedItem)]
+        
+        data:PodcastSeries selectedSeries = (data:PodcastSeries)Page.SeriesPanel.SelectedItem;
+        data:PodcastEpisode selectedEpisode = (data:PodcastEpisode)Page.EpisodePanel.SelectedItem;
+        
+        bool isUnknownSeries    = false;
+        bool isEpisodeSelected  = false;
+        
+        if ( selectedSeries != null )
+        {
+          isUnknownSeries = (selectedSeries.Title == zune:Shell.LoadString(zune:StringId.IDS_SERIES_UNKNOWNSERIES_TITLE));
+          isEpisodeSelected = selectedEpisode != null;
+          
+
+          Worker.Title = selectedSeries.Title;
+          if ( isUnknownSeries )
+            Worker.Description = zune:Shell.LoadString(zune:StringId.IDS_SERIES_UNKNOWNSERIES_DESCRIPTION);
+          else
+            Worker.Description = zune:Shell.LoadString(zune:StringId.IDS_SERIES_GROVELLED_SERIES_DESCRIPTION);
+        }
+        
+        EnterUrlCommand.Available = (isUnknownSeries == isEpisodeSelected);
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(EnterUrlCommand.Invoked)]
+        data:PodcastSeries selectedSeries = (data:PodcastSeries)Page.SeriesPanel.SelectedItem;
+
+        if ( selectedSeries != null )
+        {
+          bool isSeriesUrlInvalid = String.IsNullOrEmpty(selectedSeries.FeedUrl);
+          bool isUnknownSeries = selectedSeries.Title == zune:Shell.LoadString(zune:StringId.IDS_SERIES_UNKNOWNSERIES_TITLE);
+          
+          EnterUrlDialog.IsUnkownSeries = isUnknownSeries;
+          
+          
+          if (isSeriesUrlInvalid)
+          {
+            EnterUrlDialog.Helper.Show(EnterUrlDialog);
+          }
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(DeleteCommand.Invoked)]
+        data:PodcastSeries selectedSeries = (data:PodcastSeries)Page.SeriesPanel.SelectedItem;
+
+        if ( selectedSeries != null )
+        {
+          Page.Unsubscribe( selectedSeries.LibraryId, true );
+        }
+      </Script>
+
+    </Scripts>
+
+    <Content>
+      <Panel Layout="Dock">
+        <Children>
+
+          
+          <me:PodcastMetadataPanelWorker Name="Worker">
+            <LayoutInput>
+              <DockLayoutInput Position="Client"/>
+            </LayoutInput>
+          </me:PodcastMetadataPanelWorker>
+
+          
+          <Panel Layout="VerticalFlow">
+            <LayoutInput>
+              <DockLayoutInput Position="Bottom"/>
+            </LayoutInput>
+            <Children>
+              <core:ActionButton Name="EnterUrlButton" Model="{EnterUrlCommand}" Margins="0,4,0,0"/>
+              <core:ActionButton Name="DeleteButton" Model="{DeleteCommand}" Margins="0,4,0,0"/>
+            </Children>
+          </Panel>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="PodcastMetadataPanelWorker">
+    
+    <Properties>
+      <string Name="Title" string="{null}"/>
+      <string Name="Owner" string="{null}"/>
+      <string Name="Author" string="{null}"/>
+      <string Name="DescriptionTitle" string="{null}"/>
+      <string Name="Description" string="{null}"/>
+      <string Name="Copyright" string="{null}"/>
+      <string Name="Duration" string="{null}"/>
+      <bool Name="Explicit" bool="false"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+        TitleText.Content = [Title];
+      </Script>
+      
+      <Script>
+        AuthorText.Content = [Author];
+        OwnerText.Content = [Owner];
+        AuthorText.Visible = sys:String.Compare( Author, Owner, true ) != 0;
+      </Script>
+
+      <Script>
+        DurationText.Content = [Duration];
+      </Script>
+      
+      <Script>
+        DescriptionText.Content = [Description];
+      </Script>
+      
+      <Script>
+        if (!String.IsNullOrEmpty(Copyright) &amp;&amp; !((sys:String)Copyright).Contains("©"))
+        {
+          Copyright = sys:String.Format( zune:Shell.LoadString(zune:StringId.IDS_PODCAST_COPYRIGHT_REPLACEMENT), Copyright );
+        }
+        CopyrightText.Content = [Copyright];
+      </Script>
+     
+      <Script>
+        ExplicitText.Visible = [Explicit];
+      </Script>
+
+      <Script>
+        ScrollBar.RegionHover = [UI.DeepMouseFocus];
+      </Script>
+    </Scripts>
+
+    <Locals>
+      <ScrollingData Name="ScrollData"/>
+    </Locals>
+
+    <Input>
+      <ScrollingHandler Name="ScrollHandler" ScrollingData="{ScrollData}"/>
+    </Input>
+
+    <Content>
+      <Panel Layout="Dock">
+        <Children>
+          <Panel Layout="VerticalFlow">
+            <LayoutInput>
+              <DockLayoutInput Position="Top"/>
+            </LayoutInput>
+            <Children>
+
+              <button:Label Content="{zune:Shell.LoadString(zune:StringId.IDS_DETAILS_HEADER)}" Style="{styles:SharedStyles.ColumnHeaderStyle}" Margins="0,0,0,28"/>
+              <button:Label Name="TitleText" Style="{styles:SharedStyles.PodcastTitle}" Margins="0,0,0,4" ShowToolTipWhenClipped="true"/>
+              <button:Label Name="OwnerText" WordWrap="true" Style="{styles:SharedStyles.PodcastText}"/>
+              <button:Label Name="AuthorText" WordWrap="true" Style="{styles:SharedStyles.PodcastText}"/>
+              <button:Label Name="DurationText" WordWrap="true" Style="{styles:SharedStyles.PodcastText}" Margins="0,4,0,0"/>
+              <mctl:ExplicitText Name="ExplicitText" Margins="0,4,0,0" Visible="false"/>
+              
+            </Children>
+          </Panel>
+
+          <Panel Layout="Dock">
+            <LayoutInput>
+              <DockLayoutInput Position="Client"/>
+            </LayoutInput>
+            <Children>
+              <core:ScrollBar Name="ScrollBar" ScrollData="{ScrollData}">
+                <LayoutInput>
+                  <DockLayoutInput Position="Right"/>
+                </LayoutInput>
+              </core:ScrollBar>
+
+              
+              <Scroller Name="MetaData" Orientation="Vertical" FadeSize="-1" ScrollingData="{ScrollData}">
+                <LayoutInput>
+                  <DockLayoutInput Position="Client"/>
+                </LayoutInput>
+                <Children>
+                  <Panel Layout="VerticalFlow">
+                    <Children>
+                      <button:Label Name="DescriptionText" Style="{styles:SharedStyles.PodcastDesc}" WordWrap="true" Margins="0,14,0,0"/>
+                      <button:Label Name="CopyrightText" Style="{styles:SharedStyles.PodcastCopyright}" WordWrap="true" Margins="0,14,0,10"/>
+                    </Children>
+                  </Panel>
+                </Children>
+              </Scroller>
+            </Children>
+          </Panel>
+        </Children>        
+      </Panel>
+    </Content>
+  </UI>
+</UIX>
\ No newline at end of file
diff --git a/test/2.1/PODCASTDIALOGS.UIX b/test/2.1/PODCASTDIALOGS.UIX
new file mode 100644
index 0000000..0572114
--- /dev/null
+++ b/test/2.1/PODCASTDIALOGS.UIX
@@ -0,0 +1,536 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:sys="assembly://mscorlib/System"
+  xmlns:system="assembly://System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL/System"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:zunedbapi="assembly://ZuneDBApi"
+  xmlns:zcfg="assembly://ZuneDBApi/Microsoft.Zune.Configuration"
+  xmlns:subscription="assembly://ZuneDBApi/Microsoft.Zune.Subscription"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:dialog="res://ZuneShellResources!Dialog.uix"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:data="res://ZuneShellResources!LibraryData.schema.xml"
+  xmlns:zmpdata="res://ZuneMarketplaceResources!PodcastData.schema.xml"
+  xmlns:podcast="res://ZuneShellResources!ManagementPodcast.uix"
+  xmlns:me="Me"
+  >
+
+  
+  
+  
+  
+  
+
+  
+  
+  
+  <Class Name="UnsubscribeDialog" Base="dialog:Dialog">
+    <Properties>
+      
+      <zune:PodcastLibraryPage Name="Page" PodcastLibraryPage="{null}"/>
+      <Int32 Name="SeriesId" Int32="-1"/>
+
+      <String Name="ContentUI" String="res://ZuneShellResources!PodcastDialogs.uix#UnsubscribeDialogContentUI"/>
+      <iris:Command Name="Save" Description="{zune:Shell.LoadString(zune:StringId.IDS_PODCAST_UNSUBSCRIBE_SAVE)}"/>
+      <iris:Command Name="Delete" Description="{zune:Shell.LoadString(zune:StringId.IDS_PODCAST_UNSUBSCRIBE_DELETE)}"/>
+      <iris:BooleanChoice Name="Remember" Description="{zune:Shell.LoadString(zune:StringId.IDS_PODCAST_UNSUBSCRIBE_REMEMBER)}"/>
+
+      <String Name="AccessibleDescription" String="{zune:Shell.LoadString(zune:StringId.IDS_PODCAST_UNSUBSCRIBE_QUESTION)}"/>
+      <Command Name="Unsubscribe"/>
+    </Properties>
+
+    <Locals>
+      <Boolean Name="DeleteEpisodes" Boolean="False"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        [DeclareTrigger(Save.Invoked)]
+        DeleteEpisodes = false;
+
+        
+        if (Remember.Value)
+        {
+          zcfg:ClientConfiguration.Series.PodcastDefaultUnsubscribeChoice = 1; 
+        }
+
+        Unsubscribe.Invoke();
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Delete.Invoked)]
+        DeleteEpisodes = true;
+
+
+        
+        if (Remember.Value)
+        {
+          zcfg:ClientConfiguration.Series.PodcastDefaultUnsubscribeChoice = 2; 
+        }
+
+        Unsubscribe.Invoke();
+      </Script>
+
+      
+      <Script>
+        if ([Helper.IsVisible])
+        {
+          int unsubscribeChoice = zcfg:ClientConfiguration.Series.PodcastDefaultUnsubscribeChoice;
+          if (unsubscribeChoice != 0)
+          {
+            DeleteEpisodes = false;
+            if (unsubscribeChoice == 2)
+            {
+              DeleteEpisodes = true;
+            }
+
+            
+            Unsubscribe.Invoke();
+          }
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Unsubscribe.Invoked)]
+
+        if (Page != null)
+        {
+          Page.Unsubscribe(SeriesId, DeleteEpisodes);
+
+          
+          SeriesId = -1;
+          DeleteEpisodes = false;
+        }
+        else
+        {
+          
+          subscription:SubscriptionManager.Instance.Unsubscribe(SeriesId, DeleteEpisodes);
+        }
+
+        
+        Helper.Hide();
+      </Script>
+    </Scripts>
+  </Class>
+
+
+  
+  
+  
+  <UI Name="UnsubscribeDialogContentUI" Base="dialog:DialogContentUI">
+    <Properties>
+      <me:UnsubscribeDialog Name="Dialog" UnsubscribeDialog="$Required"/>
+    </Properties>
+    <Content>
+      <Panel Navigation="ContainAll,WrapAll" MaximumSize="300,0" Margins="10">
+        <Layout>
+          <FlowLayout ItemAlignment="Near" Orientation="Vertical"/>
+        </Layout>
+        <Children>
+
+          <Text Content="{zune:Shell.LoadString(zune:StringId.IDS_UNSUBSCRIBE_BUTTON)}"
+                Color="{styles:Styles.TextActive}" Font="{styles:Styles.DialogHeaderText}"
+                WordWrap="true" HorizontalAlignment="Near" Margins="0,0,0,3"/>          
+          
+          <Text Content="{zune:Shell.LoadString(zune:StringId.IDS_PODCAST_UNSUBSCRIBE_QUESTION)}"
+                Font="{styles:Styles.DialogText}" Color="{styles:Styles.DialogTextColor}"
+                WordWrap="true" HorizontalAlignment="Near"/>
+
+          
+          <core:CheckBox Model="{Dialog.Remember}" Margins="0,10,0,0" LabelFont="{styles:Styles.DialogText}"/>
+          
+          <Panel Margins="-2,10,0,0">
+            <Layout>
+              <DockLayout SizeToChildren="true" DefaultLayoutInput="Left,Near"/>
+            </Layout>
+            <Children>
+
+              <core:BigActionButton Model="{Dialog.Save}" Margins="0,0,10,0"/>
+              <core:BigActionButton Model="{Dialog.Delete}" Margins="0,0,10,0"/>
+              <core:BigActionButton Model="{Dialog.Cancel}" Margins="0,0,10,0" FocusOrder="0"/>
+
+            </Children>
+          </Panel>
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+
+  
+  
+  
+  <Class Name="InputDialog" Base="dialog:Dialog">
+    <Properties>
+      <String Name="ContentUI" String="res://ZuneShellResources!PodcastDialogs.uix#InputDialogContentUI"/>
+      <String Name="Title" String="$Required"/>
+      <String Name="Message" String="$Required"/>
+      <iris:Command Name="AcceptCommand" Command="$Required"/>
+      <EditableTextData Name="EditData" EditableTextData="$Required"/>
+    </Properties>
+    <Scripts>
+      
+      
+      <Script>
+        AccessibleDescription = Title;
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(Cancel.Invoked)]
+        EditData.Value = "";
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(EditData.Submitted)]
+        if ( EditData.Value.Length > 0 )
+        {
+          AcceptCommand.Invoke();
+        }
+      </Script>
+
+    </Scripts>
+  </Class>
+
+
+  
+  
+  
+  <UI Name="InputDialogContentUI" Base="dialog:DialogContentUI">
+    <Properties>
+      <me:InputDialog Name="Dialog" InputDialog="$Required"/>
+
+      <Color Name="TextFocusedColor" Color="{styles:Styles.TextFocusedForeground}"/>
+      <Color Name="TextHighlightColor" Color="{styles:Styles.TextFocusedBackground}"/>
+
+      
+      <Size Name="TileMinSize" Size="400,0"/>
+      <Size Name="TileMaxSize" Size="400,0"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+        Dialog.AcceptCommand.Available = [Dialog.EditData.Value].Length > 0;
+      </Script>
+    </Scripts>
+    
+    <Content>
+      <Panel Navigation="ContainAll,WrapAll" Margins="10" MaximumSize="400,0">
+        <Layout>
+          <FlowLayout ItemAlignment="Near" Orientation="Vertical"/>
+        </Layout>
+        <Children>
+
+          
+          <Text Content="{Dialog.Title}"
+                Color="{styles:Styles.TextActive}" Font="{styles:Styles.DialogHeaderText}"
+                WordWrap="true" HorizontalAlignment="Near" Margins="0,0,0,3"/>
+
+          
+          <Text Content="{Dialog.Message}"
+                Font="{styles:Styles.DialogText}" Color="{styles:Styles.DialogTextColor}"
+                WordWrap="true" HorizontalAlignment="Near"/>
+
+          
+          <Panel Layout="Anchor" Margins="0,10,0,10">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Parent,0" Right="Parent,1"/>
+            </LayoutInput>
+            <Children>
+              <core:Editbox Name="EditTextBox" 
+                            Model="{Dialog.EditData}" 
+                            AccessibleDescription="{Dialog.Message}" 
+                            FocusOrder="0"
+                            TileMinSize="{TileMinSize}" 
+                            TileMaxSize="{TileMaxSize}"/>
+
+              <ColorFill Content="{styles:Styles.EditTextBorder}">
+                <LayoutInput>
+                  <AnchorLayoutInput Left="EditTextBox,0" Top="EditTextBox,0" Right="EditTextBox,1" Bottom="EditTextBox,1"/>
+                </LayoutInput>
+                <Children>
+
+                  <ColorFill Content="{styles:Styles.EditTextBackground}" Margins="1,1,1,1"/>
+
+                </Children>
+              </ColorFill>
+              
+            </Children>
+          </Panel>
+
+          
+          <Panel Margins="0,10,0,0">
+            <Layout>
+              <DockLayout SizeToChildren="true" DefaultLayoutInput="Right,Near"/>
+            </Layout>
+            <Children>
+              <core:BigActionButton Model="{Dialog.Cancel}"/>
+              <core:BigActionButton Model="{Dialog.AcceptCommand}" FocusOrder="0"/>
+            </Children>
+          </Panel>
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+  
+  
+  
+  
+  <Class Name="SubscribeDialog" Base="me:InputDialog">
+    <Properties>
+      <String Name="Title" String="{zune:Shell.LoadString(zune:StringId.IDS_SUBSCRIBE_BUTTON)}"/>
+      <String Name="Message" String="{zune:Shell.LoadString(zune:StringId.IDS_PODCAST_SUBSCRIBE_TITLE)}"/>
+
+      <iris:Command Name="AcceptCommand" Description="{zune:Shell.LoadString(zune:StringId.IDS_SUBSCRIBE_BUTTON)}"/>
+
+      <EditableTextData Name="EditData" MaxLength="1024"/> 
+    </Properties>
+
+    
+    <Locals>
+      <zmpdata:NameValueUriResourceSubmitPodcastQuery Name="SubmitQuery" Enabled="false"/>
+    </Locals>
+
+    <Scripts>
+
+      
+      <Script>
+        [DeclareTrigger(AcceptCommand.Invoked)]
+        
+        string urlString = EditData.Value;
+
+        zune:SubscriptionState result = zune:Management.Instance.SubscribeToPodcastFeed(
+          urlString,
+          urlString,
+          zunedbapi:ESubscriptionSource.eSubscriptionSourceUrl );
+
+        
+        if ( result != null )
+        {
+          
+          EditData.Value = null;
+          Helper.Hide();
+          
+          
+          if ( !String.IsNullOrEmpty(urlString) &amp;&amp; 
+               urlString.Length &lt; 32766 /* Max valid Uri length */ )
+          {
+            sys:String url = system:Uri.EscapeDataString(urlString);
+            
+            SubmitQuery.PodcastUrl = url;
+            SubmitQuery.Enabled = true;
+          }
+        }
+      </Script>
+
+    </Scripts>
+      
+  </Class>
+
+
+  
+  
+  
+  
+  <Class Name="EnterUrlDialog" Base="me:InputDialog">
+    <Properties>
+      <zune:PodcastLibraryPage Name="Page" PodcastLibraryPage="{null}"/>
+      <Boolean Name="IsUnkownSeries" Boolean="false"/>
+
+      
+      <String Name="Title" String="{zune:Shell.LoadString(zune:StringId.IDS_ENTER_URL_BUTTON)}"/>
+      <String Name="Message" String="{zune:Shell.LoadString(zune:StringId.IDS_ENTER_URL_DIALOG_TEXT)}"/>
+      <iris:Command Name="AcceptCommand" Description="{zune:Shell.LoadString(zune:StringId.IDS_ENTER_URL_BUTTON)}"/>
+      <EditableTextData Name="EditData" MaxLength="1024"/> 
+    </Properties>
+
+    <Scripts>
+      
+      <Script>
+        [DeclareTrigger(AcceptCommand.Invoked)]
+        
+        int hr;
+
+        if ( !IsUnkownSeries )
+        {
+          hr = subscription:SubscriptionManager.Instance.SetSeriesUrl( 
+            Page.SelectedSeriesId, EditData.Value );
+        }
+        else
+        {
+          hr = subscription:SubscriptionManager.Instance.SetEpisodeSeriesUrl( 
+            Page.EpisodePanel.SelectedLibraryIds, EditData.Value );
+        }
+  
+        if ( hr >= 0 )
+        {
+          EditData.Value = null;
+          Helper.Hide();
+        }
+        else
+        {
+          zune:Shell.ShowErrorDialog(hr, zune:StringId.IDS_PODCAST_SUBSCRIPTION_ERROR);
+        }
+      </Script>
+    </Scripts>
+  </Class>
+  
+
+  
+  
+  
+  <Class Name="SettingsDialog" Base="dialog:Dialog">
+    <Properties>
+      
+      <zune:PodcastLibraryPage Name="Page" PodcastLibraryPage="{null}"/>
+      <Int32 Name="SeriesId" Int32="-1"/>
+
+      <String Name="ContentUI" String="res://ZuneShellResources!PodcastDialogs.uix#SettingsDialogContentUI"/>
+      <iris:Command Name="OK" Description="{zune:Shell.LoadString(zune:StringId.IDS_DIALOG_OK)}"/>
+
+      <zune:SeriesSettings Name="SeriesSettings" SeriesSettings="{null}"/>
+
+      <String Name="AccessibleDescription" String="{zune:Shell.LoadString(zune:StringId.IDS_PODCAST_SETTINGS_TITLE)}"/>
+    </Properties>
+
+    <Scripts>
+      
+      <Script>
+        if ([Helper.IsVisible])
+        {
+          SeriesSettings = Page.GetSeriesSettings(SeriesId);
+        }
+        else
+        {
+          SeriesSettings = null;
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(OK.Invoked)]
+
+        SeriesSettings.Apply();
+
+        
+        Helper.Hide();
+      </Script>
+    </Scripts>
+  </Class>
+
+
+  
+  
+  
+  <UI Name="SettingsDialogContentUI" Base="dialog:DialogContentUI">
+    <Properties>
+      <me:SettingsDialog Name="Dialog" SettingsDialog="$Required"/>
+    </Properties>
+    <Scripts>
+      <Script>
+        zune:SeriesSettings settings = [Dialog.SeriesSettings];
+        if (settings != null)
+        {
+          KeepEpisodes.Model = settings.KeepEpisodesChoice;
+          Playback.Model = settings.PlaybackChoice;
+          Sync.Model = settings.SyncChoice;
+          if (!zune:SyncControls.Instance.CurrentDeviceExists)
+          {
+              Sync.Available = false;
+          }
+          else
+          {
+            SyncDescription.Content =
+            sys:String.Format(
+              zune:Shell.LoadString(zune:StringId.IDS_SYNC_PROMPT_PER_DEVICE),
+              zune:SyncControls.Instance.CurrentDeviceName);
+            Sync.AccessibleDescription = SyncDescription.Content;
+          }
+        }
+      </Script>
+
+      <Script>
+        data:PodcastSeries selectedSeries = (data:PodcastSeries)Dialog.Page.SeriesPanel.SelectedItem;
+        SeriesTitle.Content = selectedSeries.Title;
+      </Script>
+
+      <Script>
+        if (Dialog.SeriesSettings != null)
+        {
+          String feed = ((iris:Command) [Dialog.SeriesSettings.KeepEpisodesChoice.Chosen]).Description;
+          FeedValue.Content = podcast:Strings.KeepSeriesDescription.Format(feed);
+        }
+      </Script>
+    </Scripts>
+    <Content>
+      <Panel Navigation="ContainAll,WrapAll" Margins="10">
+        <Layout>
+          <FlowLayout Orientation="Vertical" ItemAlignment="Far" StripAlignment="Near"/>
+        </Layout>
+        <Children>
+          
+          <Panel>
+            <Layout>
+              <FlowLayout ItemAlignment="Fill" StripAlignment="Near" Orientation="Vertical"/>
+            </Layout>
+            <Children>
+
+              <Text Content="{zune:Shell.LoadString(zune:StringId.IDS_PODCAST_SETTINGS_TITLE)}"
+                    Font="{styles:Styles.DialogHeaderText}" Color="{styles:Styles.DialogTextColor}"/>
+
+              <Text Name="SeriesTitle" Font="{styles:Styles.DialogSubHeaderText}" Color="{styles:Styles.DialogTextColor}"/>
+
+              <Text Content="{podcast:Strings.KeepCount}" Margins="0,15,0,0"
+                    Font="{styles:Styles.DialogSubHeaderText}" Color="{styles:Styles.DialogTextColor}"/>
+
+              <core:LabeledChoiceSlider
+                    AccessibleDescription="{podcast:Strings.KeepCount}"
+                    Name="KeepEpisodes"
+                    Model="{null}"
+                    MinValueString="{podcast:Strings.Few}"
+                    MaxValueString="{podcast:Strings.Many}"/>
+
+              <Text Name="FeedValue" Color="{styles:Styles.TextActive}" Font="{styles:Styles.SettingsText}" WordWrap="false"/>
+
+              <Text Content="{zune:Shell.LoadString(zune:StringId.IDS_KEEP_COUNT_NOTE)}"
+                    Font="{styles:Styles.DialogText}" Color="{styles:Styles.DialogTextColor}" Margins="0,5,0,0"/>
+
+              <Text Content="{zune:Shell.LoadString(zune:StringId.IDS_PLAYBACK_ORDER_HEADER)}" Margins="0,15,0,0"
+                    Font="{styles:Styles.DialogSubHeaderText}" Color="{styles:Styles.DialogTextColor}"/>
+
+              <core:RadioGroup Name="Playback" Model="{null}" AccessibleDescription="{zune:Shell.LoadString(zune:StringId.IDS_PLAYBACK_ORDER_HEADER)}"/>
+
+              <Text Name="SyncHeader" Content="{zune:Shell.LoadString(zune:StringId.IDS_SYNC_HEADER)}" Margins="0,15,0,0"
+                    Font="{styles:Styles.DialogSubHeaderText}" Color="{styles:Styles.DialogTextColor}"/>
+              <Text Name="SyncDescription" Content="{zune:Shell.LoadString(zune:StringId.IDS_SYNC_PROMPT)}"
+                    Font="{styles:Styles.DialogText}" Color="{styles:Styles.DialogTextColor}">
+                <NamedStyles>
+                  <TextStyle Name="B" Bold="true"/>
+                </NamedStyles>
+              </Text>
+
+              <core:RadioGroup Name="Sync" Model="{null}" AccessibleDescription="{zune:Shell.LoadString(zune:StringId.IDS_SYNC_HEADER)}"/>
+
+            </Children>
+          </Panel>
+          
+          <Panel Margins="0,15,0,0" Layout="HorizontalFlow">
+            <Children>
+
+              <core:BigActionButton Model="{Dialog.OK}" Margins="10,0,0,0"/>
+
+              <core:BigActionButton Model="{Dialog.Cancel}" Margins="10,0,0,0" FocusOrder="0"/>
+
+            </Children>
+          </Panel>
+          
+        </Children>
+      </Panel>
+      
+    </Content>
+  </UI>
+
+
+</UIX>
diff --git a/test/2.1/PODCASTEPISODESCOLUMNS.UIX b/test/2.1/PODCASTEPISODESCOLUMNS.UIX
new file mode 100644
index 0000000..d942e16
--- /dev/null
+++ b/test/2.1/PODCASTEPISODESCOLUMNS.UIX
@@ -0,0 +1,372 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:data="res://ZuneShellResources!LibraryData.schema.xml"
+  xmlns:spreadsheet="res://ZuneShellResources!SpreadSheetViewBase.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"  
+  xmlns:tpc="res://ZuneShellResources!TracksPanelColumns.uix"
+  xmlns:signin="res://ZuneShellResources!SignInDialog.uix"
+  xmlns:dbapi="assembly://ZuneDBApi/"  
+  xmlns:style="res://ZuneShellResources!Style.uix"
+  xmlns:me="Me">
+
+  
+  <Class Name="Columns" Shared="True">
+    <Properties>
+
+      
+      <spreadsheet:ColumnInfo Name="ErrorColumn" 
+          CellType="{typeof(me:EpisodeStatusCell)}"
+          CellPadding="4,0,4,0"
+          Resizable="false" HighlightHeader="false">
+        <ColumnSize>
+          <SharedSize Size="25,0"/>
+        </ColumnSize>
+        <LayoutInput>
+          <StackLayoutInput Priority="High"/>
+        </LayoutInput>
+      </spreadsheet:ColumnInfo>
+      
+      
+      <spreadsheet:ColumnInfo Name="DownloadStatusButton" Header="{zune:Shell.LoadString(zune:StringId.IDS_BLANK_COLUMN_HEADER)}"
+          CellType="{typeof(me:DownloadStatusCell)}"
+          Resizable="false">
+        <ColumnSize>
+          <SharedSize Size="105,0"/>
+        </ColumnSize>
+        <LayoutInput>
+          <StackLayoutInput Priority="High"/>
+        </LayoutInput>
+      </spreadsheet:ColumnInfo>
+
+      
+      <spreadsheet:ColumnInfo Name="SignInOnlyDownloadStatusButton" Header="{zune:Shell.LoadString(zune:StringId.IDS_BLANK_COLUMN_HEADER)}"
+          CellType="{typeof(me:SignInOnlyDownloadCell)}"
+          Resizable="false">
+        <ColumnSize>
+          <SharedSize Size="105,0"/>
+        </ColumnSize>
+        <LayoutInput>
+          <StackLayoutInput Priority="High"/>
+        </LayoutInput>
+      </spreadsheet:ColumnInfo>     
+      
+      
+      <spreadsheet:ColumnInfo Name="SyncStatusColumn"
+          Header="{zune:Shell.LoadString(zune:StringId.IDS_SYNC_STATUS_COLUMN_HEADER)}"
+          HeaderIcon="{styles:Styles.SyncHeader}"
+          CellType="{typeof(tpc:SyncCell)}"
+          CellPadding="{tpc:Constants.SyncCellPadding}"
+          HeaderPadding="{tpc:Constants.SyncHeaderPadding}"
+          Resizable="false">
+        <ColumnSize>
+          <SharedSize Size="25,0"/>
+        </ColumnSize>
+        <LayoutInput>
+          <StackLayoutInput Priority="High"/>
+        </LayoutInput>
+      </spreadsheet:ColumnInfo>
+
+      
+      <spreadsheet:ColumnInfo Name="SizeOnDeviceColumn" Header="{zune:Shell.LoadString(zune:StringId.IDS_SIZE_COLUMN_HEADER)}"
+          CellType="{typeof(tpc:SizeOnDeviceCell)}"
+          Resizable="false">
+        <ColumnSize>
+          <SharedSize Size="75,0"/>
+        </ColumnSize>
+        <LayoutInput>
+          <StackLayoutInput Priority="High"/>
+        </LayoutInput>
+      </spreadsheet:ColumnInfo>
+
+       
+      <spreadsheet:ColumnInfo Name="VideoIconColumn" 
+          Header="{zune:Shell.LoadString(zune:StringId.IDS_VIDEO_EPISODE_COLUMN_HEADER)}"
+          HeaderIcon="{styles:Styles.VideoHeader}" 
+          CellType="{typeof(me:VideoIconCell)}" 
+          CellPadding="4,5,3,0" 
+          HeaderPadding="5,5,0,0"  
+          Resizable="false">
+        <ColumnSize>
+          <SharedSize Size="22,0" MinimumSize="22,0"/>
+        </ColumnSize>
+        <LayoutInput>
+          <StackLayoutInput Priority="High"/>
+        </LayoutInput>
+      </spreadsheet:ColumnInfo>
+
+      <spreadsheet:ColumnData Name="DefaultViewColumnData" SaveKeyPrefix="Podcast" SortedColumn="{me:Sorts.ReleaseDate}" SortAscending="false" HideColumns="true">
+        <Columns>
+
+          
+          <spreadsheet:ColumnInfo ColumnInfo="{ErrorColumn}"/>
+
+          
+          <spreadsheet:ColumnInfo Header="{zune:Shell.LoadString(zune:StringId.IDS_TITLE_COLUMN_HEADER)}"
+              CellType="{typeof(me:TitleCell)}"
+              SortBy="{me:Sorts.Title}"
+              ShowDivider="false"
+              Resizable="false">
+            <ColumnSize>
+              <SharedSize Size="9999,0"/>
+            </ColumnSize>
+            <LayoutInput>
+              <StackLayoutInput Priority="Medium" MinimumSize="150,0"/>
+            </LayoutInput>
+          </spreadsheet:ColumnInfo>
+
+          
+          <spreadsheet:ColumnInfo ColumnInfo="{VideoIconColumn}"/>
+
+          
+          <spreadsheet:ColumnInfo Header="{zune:Shell.LoadString(zune:StringId.IDS_DATE_COLUMN_HEADER)}"
+              CellType="{typeof(me:DateCell)}"
+              SortBy="{me:Sorts.ReleaseDate}">
+            <ColumnSize>
+              <SharedSize Size="60,0" MinimumSize="60,0" MaximumSize="100,0"/>
+            </ColumnSize>
+            <LayoutInput>
+              <StackLayoutInput Priority="High"/>
+            </LayoutInput>
+          </spreadsheet:ColumnInfo>
+
+          
+          <spreadsheet:ColumnInfo ColumnInfo="{DownloadStatusButton}"/>
+
+          
+          <spreadsheet:ColumnInfo ColumnInfo="{SyncStatusColumn}"/>
+
+          
+          <spreadsheet:ColumnInfo ColumnInfo="{SizeOnDeviceColumn}"/>
+          
+        </Columns>
+      </spreadsheet:ColumnData>
+
+      
+      <spreadsheet:ColumnData Name="MarketplaceViewColumnData" SaveKeyPrefix="MPPodcast" HideColumns="true">
+        <Columns>
+
+          
+          <spreadsheet:ColumnInfo 
+              CellType="{typeof(me:EpisodeStatusCell)}"
+              CellPadding="4,0,4,0"
+              Resizable="false">
+            <ColumnSize>
+              <SharedSize Size="25,0"/>
+            </ColumnSize>
+          </spreadsheet:ColumnInfo>
+
+          
+          <spreadsheet:ColumnInfo Header="{zune:Shell.LoadString(zune:StringId.IDS_TITLE_COLUMN_HEADER)}"
+              CellType="{typeof(me:TitleCell)}">
+            <ColumnSize>
+              <SharedSize Size="225,0" MinimumSize="100,0" MaximumSize="500,0"/>
+            </ColumnSize>
+          </spreadsheet:ColumnInfo>
+
+          
+          <spreadsheet:ColumnInfo ColumnInfo="{VideoIconColumn}"/>          
+
+          
+          <spreadsheet:ColumnInfo Header="{zune:Shell.LoadString(zune:StringId.IDS_LENGTH_COLUMN_HEADER)}"
+              CellType="{typeof(me:LengthCell)}">
+            <ColumnSize>
+              <SharedSize Size="75,0"/>
+            </ColumnSize>
+          </spreadsheet:ColumnInfo>
+
+          
+          <spreadsheet:ColumnInfo Header="{zune:Shell.LoadString(zune:StringId.IDS_DATE_COLUMN_HEADER)}"
+              CellType="{typeof(me:DateCell)}">
+            <ColumnSize>
+              <SharedSize Size="72,0" MinimumSize="60,0" MaximumSize="100,0"/>
+            </ColumnSize>
+          </spreadsheet:ColumnInfo>
+
+          
+          <spreadsheet:ColumnInfo ColumnInfo="{SignInOnlyDownloadStatusButton}"/>
+
+        </Columns>
+      </spreadsheet:ColumnData>
+
+    </Properties>
+  </Class>
+
+  
+  <UI Name="EpisodeStatusCell" Base="tpc:LibraryMediaStatusCell">
+    <Properties>
+      <data:PodcastEpisode Name="Model" PodcastEpisode="$Required"/>
+    </Properties>
+    <Scripts>
+      <Script>
+        ErrorCode = [Model.DownloadErrorCode];
+        if (ErrorCode &lt; 0)
+        {
+          ErrorTitle = zune:StringId.IDS_PODCAST_EPISODE_ERROR_DIALOG_TITLE;
+        }
+      </Script>
+      <Script>
+        [DeclareTrigger(ShowErrorDialog.Invoked)]
+        Model.DownloadErrorCode = 0;
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  <UI Name="TitleCell" Base="spreadsheet:LabelCell">
+    <Properties>
+      <data:PodcastEpisode Name="Model" PodcastEpisode="$Required"/>
+    </Properties>
+    <Scripts>
+      <Script>Content = [Model.Title];</Script>  
+    </Scripts>
+  </UI>
+
+  
+  <UI Name="VideoIconCell" Base="spreadsheet:IconCell">
+    <Properties>
+      <data:PodcastEpisode Name="Model" PodcastEpisode="$Required"/>
+    </Properties>
+    <Scripts>
+      <Script>
+        int mediaType = Model.EpisodeMediaType;
+
+        if (mediaType == 4) 
+        {
+          Icon = styles:Styles.Video;
+        }
+      </Script>
+    </Scripts>
+  </UI>
+ 
+  
+  <UI Name="DateCell" Base="spreadsheet:DateCell">
+    <Properties>
+      <data:PodcastEpisode Name="Model" PodcastEpisode="$Required"/>
+      <String Name="Format" String="MM/dd"/>
+    </Properties>
+    <Scripts>
+      <Script>Date = [Model.ReleaseDate];</Script>
+    </Scripts>
+  </UI>
+
+  
+  <UI Name="LengthCell" Base="spreadsheet:LabelCell">
+    <Properties>
+      <data:PodcastEpisode Name="Model" PodcastEpisode="$Required"/>
+    </Properties>
+    <Scripts>
+      <Script>
+        if ([Model.Duration.Ticks] != 0L)
+        {
+          Content = zune:Shell.TimeSpanToString(Model.Duration);
+        }
+        else
+        {
+          Content = null;
+        }
+     </Script>
+    </Scripts>
+  </UI>
+
+  
+  <UI Name="DownloadCell" Base="spreadsheet:ActionButtonCell">
+    <Properties>
+      <data:PodcastEpisode Name="Model" PodcastEpisode="$Required"/>
+      <zune:EpisodeDownloadCommand Name="Command" EpisodeDownloadCommand="{new zune:EpisodeDownloadCommand(null, Model)}"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+        [DeclareTrigger(Model.DownloadState)]
+        [DeclareTrigger(Model.DownloadType)]
+        Command.Refresh();
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  <UI Name="DownloadStatusCell" Base="spreadsheet:ActionButtonCell">
+    <Properties>
+      <data:PodcastEpisode Name="Model" PodcastEpisode="$Required"/>
+      <zune:EpisodeDownloadCommand Name="Command" EpisodeDownloadCommand="{new zune:EpisodeDownloadCommand(null, Model)}"/>
+      <style:Style Name="EpisodeStyle" Color="{styles:Styles.PrimaryLabel}"  Font="{styles:Styles.ButtonText}"/>
+      <Boolean Name="CollectionView" Boolean="true"/>
+    </Properties>
+
+    <Locals>
+      <Boolean Name="Downloaded"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(Model.DownloadState)]
+        [DeclareTrigger(Model.DownloadType)]
+        Command.Refresh();
+        
+        bool downloading = Model.DownloadState == zune:EpisodeDownloadCommand.ConvertDownloadStatusToInt(dbapi:EEpisodeDownloadState.eDownloadStateDownloading);
+        Downloaded = Model.DownloadState == zune:EpisodeDownloadCommand.ConvertDownloadStatusToInt(dbapi:EEpisodeDownloadState.eDownloadStateDownloaded);
+        if ((CollectionView &amp;&amp; Downloaded) || downloading)
+        {
+          Command.Available = false;
+        }
+        else
+        {
+          Command.Available = true;
+        }
+      </Script>
+      <Script>
+        Button.DisabledImage = null;
+      </Script>
+    </Scripts>
+  </UI>  
+  
+  
+  <UI Name="SignInOnlyDownloadCell" Base="me:DownloadStatusCell">
+    <Properties>
+      <Boolean Name="CollectionView" Boolean="false"/>      
+    </Properties>
+    
+    <Locals>
+      <signin:SignInDialog Name="SignInDialog" SignInDialog ="{null}"/>
+      <Command Name="ConfirmedDownload"/>
+    </Locals>
+
+    <Scripts>
+      
+      <Script>
+        Command.RequireSignIn = ![Downloaded];
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(Command.Invoked)]
+        if (!zune:SignIn.Instance.SignedIn)
+        {
+          if (SignInDialog == null) SignInDialog = new signin:SignInDialog();
+          SignInDialog.OnSuccess = ConfirmedDownload;
+          SignInDialog.Helper.Show(SignInDialog);
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(ConfirmedDownload.Invoked)]
+        Command.Invoke();
+      </Script>
+    </Scripts>
+  </UI>
+
+  <Class Name="Sorts" Shared="true">
+    <Properties>
+      <spreadsheet:SortDescription Name="Duration"         Attribute="Duration" />
+      <spreadsheet:SortDescription Name="DownloadState"    Attribute="DownloadState" />
+      <spreadsheet:SortDescription Name="EpisodeMediaType" Attribute="EpisodeMediaType" />
+      <spreadsheet:SortDescription Name="ReleaseDate"      Attribute="ReleaseDate" />
+      <spreadsheet:SortDescription Name="Title"            Attribute="Title" SupportsJumpInList="true"/>
+    </Properties>
+  </Class>
+
+</UIX>
diff --git a/test/2.1/PODCASTEPISODESPANEL.UIX b/test/2.1/PODCASTEPISODESPANEL.UIX
new file mode 100644
index 0000000..49dc6b7
--- /dev/null
+++ b/test/2.1/PODCASTEPISODESPANEL.UIX
@@ -0,0 +1,593 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:sm="assembly://ZuneDBApi/Microsoft.Zune.Subscription"
+  xmlns:util="assembly://ZuneDBApi/Microsoft.Zune.Util"
+  xmlns:col="assembly://mscorlib/System.Collections"
+  xmlns:panels="res://ZuneShellResources!LibraryPanels.uix"
+  xmlns:data="res://ZuneShellResources!LibraryData.schema.xml"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:columns="res://ZuneShellResources!PodcastEpisodesColumns.uix"
+  xmlns:spreadsheet="res://ZuneShellResources!SpreadSheetViewBase.uix"
+  xmlns:style="res://ZuneShellResources!Style.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:dialogs="res://ZuneShellResources!PodcastDialogs.uix"
+  xmlns:mctl="res://ZuneMarketplaceResources!Controls.uix"
+  xmlns:me="Me">
+
+  
+  
+  
+  <UI Name="PodcastEpisodesPanel" Base="panels:LibraryPanelBase">
+    <Properties>
+      <zune:PodcastEpisodePanel Name="Model" PodcastEpisodePanel="$Required"/>
+      <zune:PodcastLibraryPage Name="Page" PodcastLibraryPage="$Required"/>
+      <spreadsheet:ColumnData Name="ColumnData" ColumnData="{columns:Columns.DefaultViewColumnData}"/>
+      <Command Name="ExecuteCommand"/>
+    </Properties>
+
+    <Locals>
+      <data:LibraryPodcastEpisodeQuery Name="PodcastEpisodeQuery" Sort="-ReleaseDate" SeriesId="-1" Enabled="false"
+                                       DeviceId="{Page.DeviceId}"
+                                       ShowDeviceContents="{Page.ShowDeviceContents}"/>
+
+      <zune:MenuItemCommand Name="Download" Description="{zune:Shell.LoadString(zune:StringId.IDS_DOWNLOAD_MENUITEM)}"/>
+      <zune:MenuItemCommand Name="MarkAsPlayed" Description="{zune:Shell.LoadString(zune:StringId.IDS_PODCAST_MARK_AS_PLAYED_MENUITEM)}"/>
+      <zune:MenuItemCommand Name="MarkAsUnplayed" Description="{zune:Shell.LoadString(zune:StringId.IDS_PODCAST_MARK_AS_UNPLAYED_MENUITEM)}"/>
+      <zune:MenuItemCommand Name="KeepUntilIDelete" Description="{zune:Shell.LoadString(zune:StringId.IDS_PODCAST_KEEP_UNTIL_I_DELETE_MENUITEM)}"/>
+      <zune:MenuItemCommand Name="DeleteEpisode" Description="{zune:Shell.LoadString(zune:StringId.IDS_LIBRARY_DELETE_MENU_ITEM)}"/>
+      <zune:MenuItemCommand Name="CancelDownload" Description="{zune:Shell.LoadString(zune:StringId.IDS_PODCAST_CANCEL_DOWNLOAD_MENUITEM)}"/>
+      <iris:Command Name="SeriesSettings" Description="{zune:Shell.LoadString(zune:StringId.IDS_PODCAST_SERIES_SETTINGS_MENUITEM)}"/>
+
+      <List Name="LibraryContextMenuOptions">
+        <Source>
+          
+          <iris:Command Command="{Play}"/>
+          <iris:Command Command="{AddToNowPlaying}"/>
+          <iris:Command Command="{MarkAsPlayed}"/>
+          <iris:Command Command="{MarkAsUnplayed}"/>
+          <iris:Command Command="{AddToBurnList}"/>
+
+          
+          <core:MenuDivider/>
+          <iris:Command Command="{Download}"/>
+          <iris:Command Command="{CancelDownload}"/>
+          <iris:Command Command="{KeepUntilIDelete}"/>
+          <iris:Command Command="{DeleteEpisode}"/>
+          <iris:Command Command="{Properties}"/>
+          
+          <core:MenuDivider MenuDivider="{SyncDivider}"/>
+          <iris:Command Command="{Sync}"/>
+          <iris:Command Command="{SyncAllUnexclude}"/>
+          <zune:MenuItemCommand MenuItemCommand="{Exclude}"/>
+          <zune:MenuItemCommand MenuItemCommand="{Unexclude}"/>
+          
+          
+          <core:MenuDivider/>
+          <iris:Command Command="{SeriesSettings}"/>
+        </Source>
+      </List>
+
+      <List Name="DeviceContextMenuOptions">
+        <Source>
+          <iris:Command Command="{ReverseSync}"/>
+          <iris:Command Command="{DeleteFromDevice}"/>
+        </Source>
+      </List>
+
+      <dialogs:SettingsDialog Name="SettingsDialog" Page="{Page}"/>
+    </Locals>
+
+    <Input>
+      <KeyHandler Key="Escape" HandlerStage="Bubbled" Command="{CancelDownload}"/>
+    </Input>
+
+    <Scripts>
+      <Script>
+        if (Page.ShowDeviceContents)
+        {
+          DeleteKey.Command = DeleteFromDevice;
+          Worker.ExecuteCommand = null;
+          ContextMenu.Options = DeviceContextMenuOptions;
+          columns:Columns.DownloadStatusButton.Visible = false;
+          columns:Columns.SyncStatusColumn.Visible = false;
+          columns:Columns.ErrorColumn.Visible = false;
+          columns:Columns.SizeOnDeviceColumn.Visible = true;
+        }
+        else
+        {
+          DeleteKey.Command = DeleteEpisode;
+          ContextMenu.Options = LibraryContextMenuOptions;
+          columns:Columns.DownloadStatusButton.Visible = true;
+          columns:Columns.SyncStatusColumn.Visible = true;
+          columns:Columns.ErrorColumn.Visible = true;
+          columns:Columns.SizeOnDeviceColumn.Visible = false;
+        }
+      </Script>
+
+      
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(Page.SelectedSeriesId)]
+        [DeclareTrigger(Page.DeviceId)]
+        [DeclareTrigger(zune:SignIn.Instance.LastSignedInUserId)]
+        [DeclareTrigger(Page.UseRulesQuery)]
+
+        if (!Page.UseRulesQuery)
+        {
+          PodcastEpisodeQuery.SeriesId = Page.SelectedSeriesId;
+          PodcastEpisodeQuery.RulesOnly = false;
+        }
+        else
+        {
+          PodcastEpisodeQuery.SeriesId = -1;
+          PodcastEpisodeQuery.RulesOnly = true;
+        }
+        
+        PodcastEpisodeQuery.DeviceId = Page.DeviceId;
+        PodcastEpisodeQuery.UserId = zune:SignIn.Instance.LastSignedInUserId;
+
+        PodcastEpisodeQuery.Enabled = Page.SelectedSeriesId >= 0 || Page.DeviceId > 0;
+      </Script>
+
+      
+      <Script>
+        if (PodcastEpisodeQuery.Result != null)
+        {
+          Model.Content = [PodcastEpisodeQuery.Result.Items];
+        }
+      </Script>
+
+      
+      <Script>
+        spreadsheet:SortDescription sort = (spreadsheet:SortDescription)[ColumnData.SortedColumn];
+
+        string sortBy = (string)panels:Globals.SortAscendingMap.GetItem([ColumnData.SortAscending]) + 
+                        sort.Attribute;
+
+        PodcastEpisodeQuery.Sort = sortBy;
+
+        SupportsJumpInList = sort.SupportsJumpInList;
+      </Script>
+
+      <Script>Worker.Content = [Model.Content];</Script>
+      <Script>Worker.SupportsJumpInList = [SupportsJumpInList];</Script>
+
+      
+      <Script>
+        [DeclareTrigger(SelectionManager.SelectedItems)]
+
+        if (SelectionManager.Count != 0)
+        {
+          Model.SelectedItem = SelectionManager.SelectedItem;
+
+          Model.SelectedLibraryIds.Clear();
+          foreach (data:PodcastEpisode episode in SelectionManager.SelectedItems)
+          {
+            Model.SelectedLibraryIds.Add(episode.LibraryId);
+          }
+
+          Page.SelectedEpisodeId = ((data:PodcastEpisode)Model.SelectedItem).LibraryId;
+        }
+        else
+        {
+          Model.SelectedItem = null;
+          Page.SelectedEpisodeId = -1;
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(ContextMenu.Helper.IsOpening)]
+        if (ContextMenu.Helper.IsOpening)
+        {
+          
+          Play.Available = false;
+          AddToNowPlaying.Available = false;
+
+          
+          MarkAsPlayed.Hidden = true;
+          MarkAsUnplayed.Hidden = true;
+          Download.Hidden = true;
+          CancelDownload.Hidden = true;
+          KeepUntilIDelete.Hidden = true;
+
+          
+          DeleteEpisode.Available = false;
+
+          Int32 numAudio = 0;
+          Int32 numVideo = 0;
+
+          if (SelectionManager.Count > 0)
+          {
+            foreach (data:PodcastEpisode episode in SelectionManager.SelectedItems)
+            {
+              
+              if (episode.PlayedStatus == 0)
+                MarkAsPlayed.Hidden = false;
+              else
+                MarkAsUnplayed.Hidden = false;
+
+              
+              if (String.IsNullOrEmpty(episode.SourceUrl))
+              {
+                if (episode.DownloadState == 2 /* eDownloadStateDownloading */)
+                  CancelDownload.Hidden = false;
+                else
+                  Download.Hidden = false;
+              }
+              else
+              {
+                
+                
+
+                if (episode.EpisodeMediaType == 4) 
+                {
+                  numVideo = numVideo + 1;
+                }
+                else
+                {
+                  numAudio = numAudio + 1;
+                }
+
+                if( episode.DownloadType == 1 /* eDownloadTypeAutomatic */ )
+                  KeepUntilIDelete.Hidden = false;
+                else
+                  DeleteEpisode.Available = true;
+              }
+            }
+
+            
+            
+            
+            
+            
+            
+            
+            
+            
+            
+
+            if (numAudio &gt; 0 &amp;&amp; numVideo == 0)
+            {
+              Play.Available = true;
+              
+              if (!zune:TransportControls.Instance.PlayingVideo)
+                AddToNowPlaying.Available = true;
+            }
+            else if (numAudio == 0 &amp;&amp; numVideo == 1)
+            {
+              Play.Available = true;
+            }
+            
+            
+            
+            
+            AddToBurnList.Hidden = !Download.Hidden;
+          }
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(MarkAsPlayed.Invoked)]
+
+        if (SelectionManager.Count > 0)
+          foreach (data:PodcastEpisode episode in SelectionManager.SelectedItems)
+            episode.PlayedStatus = 1;
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(Page.MarkAllAsPlayed.Invoked)]
+
+        foreach (data:PodcastEpisode episode in (List)Model.Content)
+          episode.PlayedStatus = 1;
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(MarkAsUnplayed.Invoked)]
+
+        if (SelectionManager.Count > 0)
+          foreach (data:PodcastEpisode episode in SelectionManager.SelectedItems)
+          {
+            episode.PlayedStatus = 0;
+            episode.Bookmark = 0L;
+          }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(Page.MarkAllAsUnplayed.Invoked)]
+
+        foreach (data:PodcastEpisode episode in (List)Model.Content)
+        {
+          episode.PlayedStatus = 0;
+          episode.Bookmark = 0L;
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(KeepUntilIDelete.Invoked)]
+
+        if (SelectionManager.Count > 0)
+          foreach (data:PodcastEpisode episode in SelectionManager.SelectedItems)
+          {
+            sm:SubscriptionManager.Instance.SaveEpisodeToCollection(episode.SeriesId, episode.LibraryId);
+          }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(DeleteEpisode.Invoked)]
+
+        if (SelectionManager.Count > 0)
+          foreach (data:PodcastEpisode episode in SelectionManager.SelectedItems)
+          {
+            if ( episode.DownloadType != 1 /* eDownloadTypeAutomatic */ )
+            {
+              sm:SubscriptionManager.Instance.DeleteEpisode(episode.SeriesId, episode.LibraryId);
+            }
+          }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(CancelDownload.Invoked)]
+
+        if (SelectionManager.Count > 0)
+        {
+          foreach (data:PodcastEpisode episode in SelectionManager.SelectedItems)
+          {
+            util:DownloadTask downloadTask = util:DownloadManager.Instance.GetTask( episode.EnclosureUrl );
+
+            if ( downloadTask != null )
+            {
+              downloadTask.Cancel();
+            }
+          }
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(SeriesSettings.Invoked)]
+        if (Page.SelectedSeriesId != -1)
+        {
+          SettingsDialog.SeriesId = Page.SelectedSeriesId;
+          SettingsDialog.Helper.Show(SettingsDialog);
+        }
+      </Script>
+
+      
+      <Script>
+        [InitialEvaluate(true)]
+        
+        
+        
+        [DeclareTrigger(Model.Content.Count)]
+
+        NavigateIntoArgs.Select = true;
+        NavigateIntoArgs.LibraryId = Page.SelectedEpisodeId;
+      </Script>
+    </Scripts>
+
+    <Content>
+      
+      <me:PodcastSpreadSheet Name="Worker"
+        Margins="0,0,-2,0"
+        ScrollbarMargins="0,0,11,0"
+        Content="{Model.Content}"
+        ColumnData="{ColumnData}"
+        NavigateIntoArgs="{NavigateIntoArgs}"
+        SelectionManager="{SelectionManager}"
+        ContextMenu="{ContextMenu}"
+        ExecuteCommand="{ExecuteCommand}"
+        Play="{Play}"
+        Download="{Download}"
+        HeaderSpacing="22"
+        SelectedItemClicked="{Page.EpisodeClicked}"/>
+      </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="PodcastSpreadSheet" Base="mctl:SpreadSheet">
+    <Properties>
+      <SelectionManager Name="SelectionManager"/>
+      <Type Name="ListItemType" Type="{typeof(me:PodcastListItem)}"/>
+      <Boolean Name="ShowColumnDividers" Boolean="false"/>
+
+      
+      <Command Name="Play"/>
+      <Command Name="Download"/>
+      <Command Name="ExecuteCommand"/>
+    </Properties>
+
+    <Scripts>
+
+      
+      <Script>
+        [DeclareTrigger(SelectionManager.SelectedItems)]
+        [DeclareTrigger(((data:PodcastEpisode)SelectionManager.SelectedItem).SourceUrl)]   
+
+        Boolean canPlay = false;
+
+        if (SelectionManager.SourceList != null)
+        {
+          
+          
+          
+          
+          
+          
+
+          
+          
+          
+
+          Int32 numAudio   = 0;
+          Int32 numVideo   = 0;
+
+          foreach (data:PodcastEpisode episode in SelectionManager.SelectedItems)
+          {
+            if (!String.IsNullOrEmpty(episode.SourceUrl))
+            {
+              if (episode.EpisodeMediaType == 4) 
+              {
+                numVideo = numVideo + 1;
+              }
+              else
+              {
+                numAudio = numAudio + 1;
+              }
+            }
+          }
+
+          
+          
+
+          if (numAudio &gt; 0 &amp;&amp; numVideo == 0)
+          {
+            
+            canPlay = true;
+          }
+          else if (numAudio == 0 &amp;&amp; numVideo == 1)
+          {
+            
+            canPlay = true;
+          }
+        }
+        
+        zune:TransportControls.Instance.PagePlaySelection.Available = canPlay;
+      </Script>
+
+      
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(Content.Count)]
+
+        
+        spreadsheet:ColumnInfo videoColumn = columns:Columns.VideoIconColumn;
+        if (((col:IList)ColumnData.Columns).Contains(videoColumn))
+        {
+          
+          bool haveVideoPodcasts = false;
+
+          if (Content != null)
+          {
+            foreach (data:PodcastEpisode episode in Content)
+            {
+              if (episode.EpisodeMediaType == 4) 
+              {
+                haveVideoPodcasts = true;
+                
+              }
+            }
+            
+          }
+          videoColumn.Visible = haveVideoPodcasts;            
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(ExecuteCommand.Invoked)]
+
+        if ( SelectionManager.SourceList != null )
+        {
+          bool hasPlayableEpisodes = false;
+          foreach( data:PodcastEpisode episode in SelectionManager.SelectedItems )
+          {
+            hasPlayableEpisodes = hasPlayableEpisodes || !String.IsNullOrEmpty(episode.SourceUrl);
+          }
+
+          
+          
+          
+          
+
+          if (zune:TransportControls.Instance.PagePlaySelection.Available)
+          {
+            Play.Invoke(); 
+          }
+
+          Download.Invoke(); 
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(zune:TransportControls.Instance.PagePlaySelection.Invoked)]
+
+        
+        Play.Invoke();
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(Download.Invoked)]
+
+        if (SelectionManager.Count > 0)
+        {
+          foreach (data:PodcastEpisode episode in SelectionManager.SelectedItems)
+          {
+            if (String.IsNullOrEmpty(episode.SourceUrl))
+            {
+              zune:EpisodeDownloadCommand.DownloadEpisode( episode );
+            }
+          }
+        }
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+
+
+
+
+
+  <UI Name="StandalonePodcastSpreadSheet" Base="me:PodcastSpreadSheet">
+    <Scripts>
+      <Script>
+        [DeclareTrigger(Play.Invoked)]
+
+        zune:TransportControls.Instance.PlayItems(SelectionManager.SelectedItems);
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  <UI Name="PodcastListItem" Base="spreadsheet:SpreadSheetListItem">
+    <Locals>
+      <style:Style Name="EpisodeStyle" Font="{styles:Styles.EpisodeListItem}"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        StatefulStyle.Override = EpisodeStyle;
+      </Script>
+
+      <Script>
+        
+        if ( [((data:PodcastEpisode)Model).PlayedStatus] == 0 )
+        {
+          EpisodeStyle.Color = styles:Styles.ListItemText;
+        }
+        else
+        {
+          EpisodeStyle.Color = styles:Styles.EpisodePlayedColor;
+        }
+      </Script>
+    </Scripts>
+  </UI>
+
+</UIX>
\ No newline at end of file
diff --git a/test/2.1/PODCASTSERIESPANEL.UIX b/test/2.1/PODCASTSERIESPANEL.UIX
new file mode 100644
index 0000000..41c8ce2
--- /dev/null
+++ b/test/2.1/PODCASTSERIESPANEL.UIX
@@ -0,0 +1,489 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:sys="assembly://mscorlib/System"
+  xmlns:col="assembly://mscorlib/System.Collections"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:sm="assembly://ZuneDBApi/Microsoft.Zune.Subscription"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:gp="res://ZuneShellResources!GalleryPanel.uix"
+  xmlns:data="res://ZuneShellResources!LibraryData.schema.xml"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:thumbbutton="res://ZuneShellResources!ThumbnailButton.uix"
+  xmlns:dialogs="res://ZuneShellResources!PodcastDialogs.uix"
+  xmlns:panels="res://ZuneShellResources!LibraryPanels.uix"
+  xmlns:list="res://ZuneShellResources!ContentList.uix" 
+  xmlns:animations="res://ZuneShellResources!Animations.uix" 
+  xmlns:me="Me">
+
+
+  
+  
+  
+  <UI Name="SeriesPanel" Base="panels:LibraryGalleryPanel">
+    <Properties>
+      <zune:PodcastLibraryPage Name="Page" PodcastLibraryPage="$Required"/>
+      <Type Name="GalleryViewType" Type="{typeof(me:SeriesGalleryView)}"/>
+      <Inset Name="ColumnInset" Inset="0,0,0,-5"/>
+      <Inset Name="ScrollInset" Inset="0,0,10,0"/>
+      
+      <Int32 Name="MinimumWidth" Int32="115"/>
+      <Single Name="MinimumPercent" Single="0.00"/>
+      <iris:Command Name="SelectedItemClicked" Command="{Page.SeriesClicked}"/>
+    </Properties>
+
+    <Locals>
+      <data:LibraryPodcastSeriesQuery Name="PodcastSeriesQuery" Sort="+Title"
+                                      DeviceId="{Page.DeviceId}"
+                                      ShowDeviceContents="{Page.ShowDeviceContents}"/>
+
+      <iris:Command Name="AddPodcast" Description="{zune:Shell.LoadString(zune:StringId.IDS_PODCAST_ADD_URL_SERIES_BUTTON)}"/>
+      <iris:Command Name="SeriesSettings" Description="{zune:Shell.LoadString(zune:StringId.IDS_PODCAST_SERIES_SETTINGS_MENUITEM)}"/>
+      <iris:Command Name="DeleteSeriesConfirmed" Description="{zune:Shell.LoadString(zune:StringId.IDS_DIALOG_OK)}"/>
+      <zune:MenuItemCommand Name="ShowErrorInfo" Description="{zune:Shell.LoadString(zune:StringId.IDS_PODCAST_SERIES_ERROR_MENU_ITEM)}"/>
+      <zune:MenuItemCommand Name="Unsubscribe" Description="{zune:Shell.LoadString(zune:StringId.IDS_PODCAST_SERIES_UNSUBSCRIBE_MENU_ITEM)}"/>
+      <zune:MenuItemCommand Name="Resubscribe" Description="{zune:Shell.LoadString(zune:StringId.IDS_PODCAST_SERIES_RESUBSCRIBE_MENU_ITEM)}"/>
+      <zune:MenuItemCommand Name="CheckForUpdates" Description="{zune:Shell.LoadString(zune:StringId.IDS_PODCAST_CHECK_FOR_UPDATES_MENUITEM)}"/>
+      <zune:MenuItemCommand Name="DeleteSeries" Description="{zune:Shell.LoadString(zune:StringId.IDS_PODCAST_DELETE_SERIES_MENUITEM)}"/>
+
+      <List Name="LibraryMenuOptions">
+        <Source>
+          
+          <iris:Command Command="{Page.MarkAllAsPlayed}"/>
+          <iris:Command Command="{Page.MarkAllAsUnplayed}"/>
+          
+          
+          <core:MenuDivider/>
+          <iris:Command Command="{SeriesSettings}"/>
+          <iris:Command Command="{Unsubscribe}"/>
+          <iris:Command Command="{Resubscribe}"/>
+          <iris:Command Command="{ShowErrorInfo}"/>
+
+          <core:MenuDivider MenuDivider="{SyncDivider}"/>
+          <iris:Command Command="{Sync}"/>
+          <iris:Command Command="{SyncAllUnexclude}"/>
+          
+          
+          <core:MenuDivider/>
+          <iris:Command Command="{CheckForUpdates}"/>
+          <iris:Command Command="{DeleteSeries}"/>
+        </Source>
+      </List>
+
+      <List Name="DeviceMenuOptions">
+        <Source>
+          <iris:Command Command="{ReverseSync}"/>
+          <iris:Command Command="{DeleteFromDevice}"/>
+        </Source>
+      </List>
+
+      <dialogs:SubscribeDialog Name="SubscribeDialog" SubscribeDialog="{null}"/>
+      <dialogs:UnsubscribeDialog Name="UnsubscribeDialog" Page="{Page}"/>
+      <dialogs:SettingsDialog Name="SettingsDialog" Page="{Page}"/>      
+    </Locals>
+
+    <Scripts>
+      <Script>
+        if (Page.ShowDeviceContents)
+        {
+          PodcastSeriesQuery.DeviceId = [Page.DeviceId];
+        }
+      </Script>
+      
+      
+      <Script>Model.Content = [PodcastSeriesQuery.Result.Items];</Script>
+
+      
+      <Script>
+        int count = [PodcastSeriesQuery.Result.Items.Count];
+        Page.IsEmpty = [PodcastSeriesQuery.Result.IsEmpty];
+        ToggleSelectAllCommand.Description = sys:String.Format(zune:Shell.LoadString(zune:StringId.IDS_PODCASTS_HEADER), count);
+      </Script>
+      
+      
+      <Script>
+        if (Page.ShowDeviceContents)
+        {
+          Worker.Padding = new Inset(23,0,0,0);
+        }
+        else
+        {
+          Worker.Padding = new Inset(5,0,0,0);
+        }
+        Worker.LayoutSpacing = new Size(17,1);
+      </Script>
+
+      <Script>
+        if (Page.ShowDeviceContents)
+        {
+          DeleteKey.Command = DeleteFromDevice;
+          ContextMenu.Options = DeviceMenuOptions;
+          AddPodcastButton.Visible = false;
+        }
+        else
+        {
+          DeleteKey.Command = Unsubscribe;
+          ContextMenu.Options = LibraryMenuOptions;
+        }
+      </Script>
+
+      
+      <Script>
+        if ([ContextMenu.Helper.IsOpening])
+        {
+          data:PodcastSeries selectedItem = ((data:PodcastSeries)SelectionManager.SelectedItem);
+          
+          
+          if (selectedItem != null)
+            ShowErrorInfo.Hidden = selectedItem.ErrorCode >= 0;
+          else
+            ShowErrorInfo.Hidden = true;
+            
+          bool oneSelected = (SelectionManager.Count == 1);
+          bool isValidUrl = !sys:String.IsNullOrEmpty(selectedItem.FeedUrl);
+          bool isSubscribed = Page.IsSubscribed();
+          
+          Page.MarkAllAsPlayed.Available = oneSelected;
+          Page.MarkAllAsUnplayed.Available = oneSelected;
+          
+
+          Unsubscribe.Available = oneSelected;
+          Resubscribe.Available = oneSelected;
+          SeriesSettings.Available = oneSelected;
+          Unsubscribe.Hidden = !isSubscribed;
+          Resubscribe.Hidden = isSubscribed || !isValidUrl;
+          CheckForUpdates.Hidden = !isSubscribed;
+        }
+      </Script>
+      
+      
+      <Script>
+        [DeclareTrigger(AddPodcast.Invoked)]
+        
+        if (SubscribeDialog == null)
+        {
+          SubscribeDialog = new dialogs:SubscribeDialog();
+        }
+        SubscribeDialog.Helper.Show(SubscribeDialog);
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(SeriesSettings.Invoked)]
+        if (Page.SelectedSeriesId != -1)
+        {
+          SettingsDialog.SeriesId = Page.SelectedSeriesId;
+          SettingsDialog.Helper.Show(SettingsDialog);
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(ShowErrorInfo.Invoked)]
+        if (SelectionManager.Count > 0)
+        {
+          zune:Shell.ShowErrorDialog( 
+            ((data:PodcastSeries)SelectionManager.SelectedItem).ErrorCode, 
+            zune:Shell.LoadString(zune:StringId.IDS_PODCAST_SERIES_ERROR_DIALOG_TITLE));
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(CheckForUpdates.Invoked)]
+        if (SelectionManager.Count > 0)
+        {
+          foreach (data:PodcastSeries series in SelectionManager.SelectedItems)
+          {
+            sm:SubscriptionManager.Instance.Refresh(series.LibraryId);
+          }
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(DeleteSeries.Invoked)]
+        int selectedCount = SelectionManager.Count;
+        
+        if ( selectedCount > 0 )
+        {
+          string title = zune:Shell.LoadString(zune:StringId.IDS_PODCAST_DELETE_SERIES_DIALOG_TITLE);
+          
+          string message = null;
+        
+          if (selectedCount == 1)
+          {
+            message = sys:String.Format(
+              zune:Shell.LoadString(zune:StringId.IDS_PODCAST_DELETE_QUESTION_1_ITEM), 
+              ((data:PodcastSeries)SelectionManager.SelectedItem).Title );
+          }
+          else
+          {
+            message = sys:String.Format(
+              zune:Shell.LoadString(zune:StringId.IDS_PODCAST_DELETE_QUESTION_N_ITEM), 
+              selectedCount );
+          }
+          
+          zune:MessageBox.Show(title, message, DeleteSeriesConfirmed, null, null);
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(DeleteSeriesConfirmed.Invoked)]
+        if (SelectionManager.Count > 0)
+        {
+          foreach (data:PodcastSeries series in SelectionManager.SelectedItems)
+          {
+            sm:SubscriptionManager.Instance.Unsubscribe(series.LibraryId, true);
+          }
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(Unsubscribe.Invoked)]
+
+        if (Page.SelectedSeriesId != -1)
+        {
+          UnsubscribeDialog.SeriesId = Page.SelectedSeriesId;
+          UnsubscribeDialog.Helper.Show(UnsubscribeDialog);
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(Resubscribe.Invoked)]
+
+        if (SelectionManager.Count > 0)
+          foreach (data:PodcastSeries series in SelectionManager.SelectedItems)
+          {
+            Page.Resubscribe(series.LibraryId);
+          }
+      </Script>
+      
+      
+
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(SelectionManager.SelectedIndices)]
+        [DeclareTrigger(SelectionManager.SelectedItems)]
+        [DeclareTrigger(SelectionManager.SourceList.Count)]
+
+        int contentCount = 0;
+        if (SelectionManager.SourceList != null)
+          contentCount = SelectionManager.SourceList.Count;
+
+        
+        if (SelectionManager.Count == 1)
+        {
+          
+          Page.LastSelectedSeriesIndex = SelectionManager.SelectedIndex;
+
+          
+          Model.SelectedItem = SelectionManager.SelectedItem;
+          data:PodcastSeries selectedSeries = (data:PodcastSeries)SelectionManager.SelectedItem;
+          Page.SelectedSeriesId = selectedSeries.LibraryId;
+          Page.SeriesState = selectedSeries.SeriesState;
+        }
+        else
+        {
+          if (contentCount > 0)
+          {
+            SelectionManager.Select( sys:Math.Min( Page.LastSelectedSeriesIndex, contentCount - 1 ), true );
+          }
+          else
+          {
+            
+            Model.SelectedItem = null;
+            
+            if (SelectionManager.SourceList != null)
+            {
+              
+              
+              
+              Page.SelectedSeriesId = -1;
+            }
+          }
+        }
+      </Script>
+      
+      <Script>
+        <![CDATA[
+        if ([Page.SelectedSeriesId] != -1)
+        {
+          NavigateIntoArgs.Select = true;
+          NavigateIntoArgs.LibraryId = Page.SelectedSeriesId;
+        }
+        ]]>
+      </Script>      
+    </Scripts>
+    
+    <Content>
+      <Panel Layout="Dock">
+        <Children>
+          
+          
+          <gp:GalleryPanelWorker Name="Worker"
+            Margins="0,0,-2,18"
+            Model="{Model}"
+            SelectionManager="{SelectionManager}"
+            ContextMenu="{ContextMenu}"
+            EditContext="{EditContext}"
+            NavigateIntoArgs="{NavigateIntoArgs}"
+            ScrollMargins="{ScrollInset}" 
+            GalleryViewType="{GalleryViewType}"
+            ToggleSelectAllCommand="{ToggleSelectAllCommand}"
+            LayoutSpacing="17,0" 
+            Padding="{ColumnInset}"
+            HeaderMargins="{HeaderMargins}"/>
+
+          <core:BigActionButton Name="AddPodcastButton" Model="{AddPodcast}">
+            <LayoutInput>
+              <DockLayoutInput Position="Bottom" Alignment="Near"/>
+            </LayoutInput>
+          </core:BigActionButton>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="SeriesGalleryView" Base="gp:GalleryView">
+    <Properties>
+      <Type Name="ListItemType" Type="{typeof(me:SeriesThumbnailButton)}"/>
+      <Type Name="ProviderType" Type="{typeof(me:SeriesThumbnailButtonProvider)}"/>
+    </Properties>
+  </UI>
+
+
+  
+  
+  
+  <Class Name="SeriesThumbnailButtonProvider" Base="thumbbutton:ThumbnailButtonProvider">
+    <Properties>
+      <zune:ListPanel Name="ListModel" ListPanel="$Required"/>
+      <data:PodcastSeries Name="Model" PodcastSeries="$Required"/>
+      <SelectionManager Name="SelectionManager" SelectionManager="$Required"/>
+    </Properties>
+
+    <Scripts>
+      <Script>DragValue = SelectionManager;</Script>
+
+      
+      <Script>
+        
+        col:IList selectedItems = SelectionManager.SelectedItems;
+
+        if (!List.IsNullOrEmpty(selectedItems))
+        {
+          Selected = selectedItems.IndexOf((sys:Object)Model) >= 0;
+        }
+        else
+        {
+          Selected = false;
+        }
+      </Script>
+
+      
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(Model.ArtUrl)]
+        [DeclareTrigger(Model.Title)]
+
+        PrimaryLabel = Model.Title;
+        
+        if (!String.IsNullOrEmpty(Model.ArtUrl))
+        {
+          
+          Image = new Image(Model.ArtUrl, new Inset(0,0,0,0), new Size(86,86));
+        }
+        else
+        {
+          Image = styles:Styles.NoAlbumArt;
+        }
+      </Script>
+      
+      
+      <Script>
+        if (SelectionManager.SourceList != null)
+        {
+          
+          col:IList selectedItems = [SelectionManager.SelectedItems];
+          
+          if (!List.IsNullOrEmpty(selectedItems))
+          {
+            Selected = selectedItems.IndexOf((sys:Object)Model) >= 0;
+          }
+          else
+          {
+            Selected = false;
+          }
+        }
+        else
+        {
+          Selected = false;
+        }
+      </Script>
+    </Scripts>
+  </Class>
+
+  
+  
+  
+  
+  <UI Name="SeriesThumbnailButton" Base="list:ThumbnailListItemBase">
+    <Scripts>
+      
+      
+      <Script>Root.Padding = new Inset(0,10,0,0);</Script>
+      
+      
+      <Script>
+        if ( [((data:PodcastSeries)Provider.Model).ErrorCode] &lt; 0 &amp;&amp;
+          
+          
+             !( zune:Shell.DefaultInstance.CurrentPage is zune:LibraryPage &amp;&amp;
+                ((zune:LibraryPage)zune:Shell.DefaultInstance.CurrentPage).ShowDeviceContents )
+           )
+        {
+          OverlayType = typeof(me:ErrorNotificationOverlay);
+        }
+        else
+        {
+          OverlayType = null;
+        }
+      </Script>
+    </Scripts>
+  </UI>
+  
+  
+  
+  
+  
+  <UI Name="ErrorNotificationOverlay" Base="thumbbutton:ThumbnailButtonOverlay">
+
+    <Properties>
+      <Image Name="ErrorOverlayImage" Image="{styles:Styles.AttentionImage}"/>
+    </Properties>
+    
+    <Content>
+        <Graphic Name="ErrorOverlay" 
+                 Content="{ErrorOverlayImage}" 
+                 Layout="Fill" 
+                 HorizontalAlignment="Near" 
+                 VerticalAlignment="Far" 
+                 StretchingPolicy="None">
+          <Animations>
+            <Animation Animation="{animations:Animations.ErrorOverlayPulse}"/>
+          </Animations>
+        </Graphic>
+    </Content>
+  </UI>
+  
+</UIX>
+
diff --git a/test/2.1/PODCASTSYNCRULESPANEL.UIX b/test/2.1/PODCASTSYNCRULESPANEL.UIX
new file mode 100644
index 0000000..ec7c3a4
--- /dev/null
+++ b/test/2.1/PODCASTSYNCRULESPANEL.UIX
@@ -0,0 +1,94 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:data="res://ZuneShellResources!LibraryData.schema.xml"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:rules="res://ZuneShellResources!SyncRules.uix">
+
+  <UI Name="SyncRulesPanel" Base="rules:SyncRulesPanelBase">
+    <Properties>
+      <zune:PodcastLibraryPage Name="Page" PodcastLibraryPage="$Required"/>
+      <Int32 Name="MinimumWidth" Int32="144"/>
+      <Single Name="MinimumPercent" Single="0.0"/>
+      <List Name="AllItemsText">
+        <Source>
+          <String String="{zune:Shell.LoadString(zune:StringId.IDS_ALL_PODCAST_ITEMS)}"/>
+        </Source>
+      </List>
+    </Properties>
+    
+    <Locals>
+      <data:LibraryPodcastSeriesQuery Name="SeriesQuery" 
+        RulesOnly="true"
+        DeviceId="{Page.DeviceId}"
+        ShowDeviceContents="true"/>
+
+      <data:LibraryPodcastEpisodeQuery Name="EpisodeQuery"
+        RulesOnly="true"
+        DeviceId="{Page.DeviceId}"
+        ShowDeviceContents="true"/>
+      <List Name="EpisodeQueryWrapper">
+        <Source>
+          <data:LibraryPodcastEpisodeQuery LibraryPodcastEpisodeQuery="{EpisodeQuery}"/>
+        </Source>
+      </List>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        <![CDATA[
+        int deviceID = [Page.DeviceId];
+
+        SeriesQuery.DeviceId = deviceID;
+        EpisodeQuery.DeviceId = deviceID;
+        ]]>
+      </Script>
+      <Script>
+        <![CDATA[
+        [DeclareTrigger(SeriesQuery.Result.Items)]
+        [DeclareTrigger(EpisodeQuery.Result.Items)]
+        [InitialEvaluate(true)]
+        
+        bool devicePresent = zune:SyncControls.Instance.CurrentDeviceExists;
+        bool syncAll = zune:SyncControls.Instance.GetSyncAll(zune:MediaType.Podcast);
+        iris:AggregateList newList = null;
+        
+        if (Source != null)
+        {
+          UI.DisposeOwnedObject(Source);
+          Source = null;
+        }
+        
+        if (!devicePresent)
+        {
+          newList = new iris:AggregateList();
+        }
+        else if (syncAll)
+        {
+          newList = new iris:AggregateList(AllItemsText);
+        }
+        else if ([EpisodeQuery.Result.Items.Count] <= 0)
+        {
+          newList = new iris:AggregateList(AllItemsText,
+                                           SeriesQuery.Result.Items);
+        }
+        else
+        {
+          newList = new iris:AggregateList(AllItemsText,
+                                           SeriesQuery.Result.Items,
+                                           EpisodeQueryWrapper);
+        }
+
+        Source = newList;
+        ]]>
+      </Script>
+      <Script>
+        <![CDATA[
+        EpisodeQuery.UserId = [zune:SignIn.Instance.LastSignedInUserId];
+        ]]>
+      </Script>
+    </Scripts>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/POPUP.UIX b/test/2.1/POPUP.UIX
new file mode 100644
index 0000000..33ee2d6
--- /dev/null
+++ b/test/2.1/POPUP.UIX
@@ -0,0 +1,43 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX 
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI" 
+  xmlns:me="Me">
+  
+  
+  
+  
+
+  <Class Name="Popup">
+    <Properties>
+      <zune:PopupHelper Name="Helper" />
+      <PopupLayoutInput Name="LayoutInput" />
+      <String Name="PopupUI" String="{null}"/>
+      <Object Name="Model" Object="{null}"/>
+    </Properties>
+  </Class>
+
+  <UI Name="PopupHost">
+    <Properties>
+      <me:Popup Name="Popup" Popup="$Required" />
+    </Properties>
+
+    <Scripts>
+      <Script>
+        Host.RequestSource(Popup.PopupUI);
+      </Script>
+    </Scripts>
+
+    <Content>
+      <me:PopupUI Name="Host" Popup="{Popup}" Model="{Popup.Model}"/>
+    </Content>
+  </UI>
+
+  <UI Name="PopupUI">
+    <Properties>
+      <me:Popup Name="Popup" Popup="$Required"/>
+      <Object Name="Model" Object="$Required"/>
+    </Properties>
+  </UI>
+
+</UIX> 
diff --git a/test/2.1/POPUPLAYER.UIX b/test/2.1/POPUPLAYER.UIX
new file mode 100644
index 0000000..a7bdaa0
--- /dev/null
+++ b/test/2.1/POPUPLAYER.UIX
@@ -0,0 +1,107 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX 
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris" 
+  xmlns:zune="assembly://ZuneShell/ZuneUI" 
+  xmlns:popup="res://ZuneShellResources!Popup.uix" 
+  xmlns:dialog="res://ZuneShellResources!Dialog.uix" 
+  >
+  
+  
+  
+
+  <UI Name="PopupLayer">
+    <Properties>
+      <Command Name="MouseDownCommand"/>
+      
+      
+      <Boolean Name="IsModal"/>
+    </Properties>
+    
+    <Input>
+      
+      <ClickHandler Name="Clicker" ClickType="LeftMouse,RightMouse" Enabled="false"/>
+    </Input>
+
+    <Locals>
+      <zune:PopupManager Name="PopupManager" PopupManager="{zune:PopupManager.Instance}"/>
+      <dialog:Dialog Name="CurrentCodeDialog" Dialog="{null}"/>
+    </Locals>
+
+    <Scripts>
+      
+      <Script>
+        bool isModal = [PopupManager.IsModal];
+
+        IsModal = isModal;
+        Clicker.Enabled = isModal;
+        ModalLayer.Visible = isModal;
+        
+        
+        UI.KeyInteractive = isModal;
+      </Script>
+      
+      
+      <Script>
+        if ([PopupManager.PendingCodeDialogs.Count] > 0 &amp;&amp; [CurrentCodeDialog] == null)
+        {
+          zune:DialogHelper info = (zune:DialogHelper)PopupManager.PendingCodeDialogs.get_Item(0);
+          PopupManager.PendingCodeDialogs.RemoveAt(0);
+          
+          CurrentCodeDialog = new dialog:Dialog();
+          CurrentCodeDialog.ContentUI = info.ContentUI;
+          CurrentCodeDialog.Helper = info;
+          CurrentCodeDialog.Helper.Show(CurrentCodeDialog);
+        }
+      </Script>
+      
+      
+      <Script>
+        if (CurrentCodeDialog != null &amp;&amp; ![CurrentCodeDialog.Helper.IsVisible])
+        {
+          UI.DisposeOwnedObject(CurrentCodeDialog);
+          CurrentCodeDialog = null;
+        }
+      </Script>
+      
+      
+      <Script>
+        [DeclareTrigger(MouseDownCommand.Invoked)]
+
+        PopupManager.NotifyMouseDown();
+      </Script>
+
+      
+      <Script>
+        if (![iris:Application.Window.Active])
+        {
+          PopupManager.NotifyWindowDeactivated();
+        }
+      </Script>
+    </Scripts>
+    
+    <Content>
+      
+      <Panel Navigation="ContainAll,WrapAll">
+        <Layout>
+          <DockLayout DefaultLayoutInput="Client,Fill"/>
+        </Layout>
+        <Children>
+
+          <Repeater Layout="Popup" Source="{PopupManager.Popups}">
+            <Content>
+              <popup:PopupHost 
+                Popup="{(popup:Popup)(((zune:PopupHelper)RepeatedItem).Popup)}" 
+                LayoutInput="{((popup:Popup)(((zune:PopupHelper)RepeatedItem).Popup)).LayoutInput}"/>
+            </Content>
+          </Repeater>
+
+          <Panel Name="ModalLayer" Visible="true" MouseInteractive="true"/>
+
+        </Children>
+      </Panel>
+
+    </Content>
+  </UI>
+  
+</UIX> 
diff --git a/test/2.1/PURCHASEFORBURN.UIX b/test/2.1/PURCHASEFORBURN.UIX
new file mode 100644
index 0000000..b3f3e73
--- /dev/null
+++ b/test/2.1/PURCHASEFORBURN.UIX
@@ -0,0 +1,90 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:data="res://ZuneShellResources!LibraryData.schema.xml"
+  xmlns:buy="res://ZuneMarketplaceResources!PurchaseDialog.uix"
+  >
+
+  
+
+
+
+
+
+  <Class Name="PurchaseForBurn">
+    <Properties>
+      
+      <List Name="Items" List="{null}"/>
+
+      
+      <Command Name="Start"/>
+
+      <Command Name="OnSuccess"/>
+      <Command Name="OnCancel"/>
+    </Properties>
+
+    <Locals>
+      
+      <buy:PurchaseDialog Name="PurchaseDialog" PurchaseDialog="{null}"/>
+
+      <zune:CDAccess Name="CDAccess" CDAccess="{zune:CDAccess.Instance}"/>
+
+      <iris:ArrayListDataSet Name="TrackServiceIds"/>
+    </Locals>
+
+    <Scripts>
+
+      
+      <Script>
+        [DeclareTrigger(Start.Invoked)]
+        
+        
+        
+        TrackServiceIds.Clear();
+
+        
+        foreach (data:PlaylistContentItem item in Items)
+        {
+          
+          
+          if (String.IsNullOrEmpty(item.FilePath) || 
+              !CDAccess.CanBurnFile(item.FilePath))
+          {
+            
+            
+            TrackServiceIds.Add(item.ServiceId);
+          }
+        }
+
+        
+        
+        if (!List.IsNullOrEmpty(TrackServiceIds))
+        {
+          if (PurchaseDialog != null) Class.DisposeOwnedObject(PurchaseDialog);
+          PurchaseDialog = new buy:PurchaseDialog();
+          PurchaseDialog.Instance = PurchaseDialog;
+          
+          PurchaseDialog.TrackIds = TrackServiceIds;
+          PurchaseDialog.OnSuccess = OnSuccess;
+          PurchaseDialog.OnCancel = OnCancel;
+          
+          PurchaseDialog.Helper.Show(PurchaseDialog);
+        }
+        else
+        {
+          
+          OnSuccess.Invoke();
+        }
+      </Script>
+    </Scripts>
+  </Class>
+
+</UIX>
+
+
+
+
+
+
diff --git a/test/2.1/RADIOBUTTON.UIX b/test/2.1/RADIOBUTTON.UIX
new file mode 100644
index 0000000..a2bb9ff
--- /dev/null
+++ b/test/2.1/RADIOBUTTON.UIX
@@ -0,0 +1,300 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:btn="res://ZuneShellResources!Button.uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:style="res://ZuneShellResources!Style.uix"  
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:me="Me">
+
+  
+  <UI Name="Default">
+    <Locals>
+      <iris:Choice DefaultIndex="1" Name="FirstModel">
+        <Options>
+          <String String="Choice 1"/>
+          <String String="Choice 2"/>
+          <String String="Choice 3"/>
+        </Options>
+      </iris:Choice>
+      <iris:Choice DefaultIndex="2" Name="SecondModel">
+        <Options>
+          <String String="Choice 1"/>
+          <String String="Choice 2"/>
+          <String String="Choice 3"/>
+        </Options>
+      </iris:Choice>
+    </Locals>
+    <Scripts>
+       <Script>
+           FirstModel.DefaultValue();
+           SecondModel.DefaultValue();
+       </Script>
+    </Scripts>
+    <Content>
+      <ColorFill Padding="20" Content="White">
+      <Layout>
+         <FlowLayout Orientation="Vertical" Spacing="20,20" />
+      </Layout>
+      <Children>
+      <me:RadioGroup Model="{FirstModel}" />
+      <me:RadioGroup Model="{SecondModel}" />
+      </Children>
+      </ColorFill>
+    </Content>
+  </UI>
+
+  
+  <UI Name="MCRadioGroup" Base="me:RadioGroup">
+    <Properties>
+      <Size Name="ColumnSize" Size="175,0"/>
+      <Int32 Name="ColumnCount" Int32="2"/>
+      <Size Name="GridSpacing" Size="5,5"/>
+    </Properties>
+
+    <Content>
+      <Panel Name="RootPanel" Navigation="TabGroup,ContainDirectional,RememberFocus" Layout="VerticalFlow">
+        <Children>
+
+          <Repeater Name="Repeater" ContentName="RadioButton">
+            <Layout>
+              <GridLayout Orientation="{Orientation}" 
+                          AllowWrap="true" 
+                          ReferenceSize="{ColumnSize}" 
+                          Columns="{ColumnCount}" 
+                          Spacing="{GridSpacing}"/>
+            </Layout>
+          </Repeater>
+
+        </Children>
+      </Panel>
+    </Content>
+
+    <Content Name="RadioButton">
+      <me:RadioButton Available="{AvailableChoice}"
+                            Model="{Model}"
+                            Option="{RepeatedItem}"
+                            Visible="{!string.IsNullOrEmpty(((iris:Command)RepeatedItem).Description)}"/>
+    </Content>
+  </UI>
+
+  
+  <UI Name="RadioGroup">
+    <Properties>
+      <iris:Choice Name="Model" Choice="$Required"/>
+      <Orientation Name="Orientation" Orientation="Vertical"/>
+      <Boolean Name="Available" Boolean="true"/>
+      <String Name="AccessibleDescription" String="{null}"/>
+    </Properties>
+    <Locals>
+      <iris:BooleanChoice Name="AvailableChoice" Value="{Available}" />
+
+      <Accessible Name="Accessible"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        AvailableChoice.Value = [Available];
+      </Script>
+      
+      <Script>
+        if ([Model] != null)
+        {
+          Repeater.Source = Model.Options;
+         
+        }
+      </Script>
+      
+      <Script>
+        if (Model != null)
+        {
+          Repeater.DefaultFocusIndex = [Model.ChosenIndex];
+        }
+      </Script>
+
+      <Script>
+        if ([Accessible.Enabled])
+        {
+          Accessible.Name = [AccessibleDescription];
+          Accessible.Role = AccessibleRole.Grouping;
+        }
+      </Script>
+    </Scripts>
+    
+    <Content>
+      <Panel Name="RootPanel" Navigation="TabGroup,ContainDirectional,RememberFocus">
+        <Children>
+
+          <Repeater Name="Repeater" ContentName="RadioButton">
+            <Layout>
+              <FlowLayout Orientation="{Orientation}" Spacing="5,0" ItemAlignment="Near" AllowWrap="true"/>
+            </Layout>
+          </Repeater>
+
+        </Children>
+      </Panel>
+    </Content>
+
+    <Content Name="RadioButton">
+      <me:RadioButton Available="{AvailableChoice}" Model="{Model}" Option="{RepeatedItem}"/>
+    </Content>
+  </UI>
+
+  <UI Name="RadioButton">
+    <Properties>
+      <iris:Choice Name="Model" Choice="$Required"/>
+      <Boolean Name="WordWrap" Boolean="true"/>
+      <Object Name="Option" Object="$Required"/>
+      <iris:BooleanChoice Name="Available" />
+
+      <Boolean Name="ShowImage" Boolean="true" />
+      <Size Name="BoxSize" Size="18,18"/>
+
+      
+      <Image Name="BoxFocusImage" Source="res://ZuneShellResources!RadioButtonFocus.png"/>
+      <Image Name="BoxNonFocusImage" Source="res://ZuneShellResources!RadioButtonNonFocus.png"/>
+      <Image Name="BoxCheckedImage" Source="res://ZuneShellResources!RadioButtonChecked.png"/>
+      <Image Name="BoxDisabledImage" Image="res://ZuneShellResources!RadioButtonDisabled.png"/>
+
+      <String Name="AccessibleDescription" String="{null}"/>
+
+      
+      <style:Style Name="OverrideStyle" Style="{null}"/>
+      <style:Style Name="BaseStyle" Style="{styles:SharedStyles.RadioButtonStyle}"/>
+    </Properties>
+
+    <Input>
+      
+      <ClickHandler Name="Clicker" HandlerStage="Direct,Bubbled" />
+    </Input>
+
+    <Locals>
+      <style:StatefulCompositeStyle Name="Style" Base="{BaseStyle}"/>
+      <Accessible Name="Accessible"/>
+    </Locals>
+
+    <Scripts>
+      
+      <Script>Style.Override = [OverrideStyle];</Script>
+
+      
+      <Script>Style.State.Focused = [UI.DeepKeyFocus];</Script>
+      <Script>Style.State.Hovered = [UI.DeepMouseFocus];</Script>
+      <Script>Style.State.Disabled = ![UI.FullyEnabled];</Script>
+      <Script>Style.State.Selected = ([Model.Chosen] == Option);</Script>
+
+      <Script>
+        UI.Enabled = [Available.Value];
+      </Script>
+
+      <Script>
+        if ([UI.DeepKeyFocus])
+        {
+          Model.Chosen = Option;
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Clicker.Invoked)]
+        Model.Chosen = Option;
+      </Script>
+
+      <Script>
+        if ([Model.Chosen] == Option)
+        {
+          Check.Visible = true;
+        }
+        else
+        {
+          Check.Visible = false;
+        }
+      </Script>
+      
+      <Script>
+        if ([Option] is String)
+        {
+          Label.Content = (String)Option;
+        }
+        else if (Option is iris:ModelItem)
+        {
+          Label.Content = ((iris:ModelItem)Option).Description;
+        }
+      </Script>
+      
+      
+      <Script>
+        if ( ![UI.FullyEnabled] )
+        {
+          Box.Content = BoxDisabledImage;
+          Check.Alpha = 0.5;
+        }
+        else
+        {
+          Check.Alpha = 1.0;
+
+          if (UI.DeepKeyFocus || UI.DeepMouseFocus)
+          {
+            Box.Content = BoxFocusImage;
+          }
+          else
+          {
+            Box.Content = BoxNonFocusImage;
+          }
+        }
+      </Script>
+
+      <Script>
+        if ([UI.FullyEnabled] &amp;&amp; [Clicker.Clicking])
+        {
+          UI.NavigateInto();
+        }
+      </Script>
+
+      <Script>
+        if ([Accessible.Enabled])
+        {
+          if (AccessibleDescription != null)
+          {
+            Accessible.Name = [AccessibleDescription];
+          }
+          else
+          {
+            Accessible.Name = [Label.Content];
+          }
+          
+          Accessible.IsChecked = [Check.Visible];
+          Accessible.Role = AccessibleRole.RadioButton;
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel MouseInteractive="true">
+        <Layout>
+          <FlowLayout Orientation="Horizontal" ItemAlignment="Center"/>
+        </Layout>
+        <Children>
+
+          
+          <Graphic Name="Box" Visible="{ShowImage}" Content="{BoxNonFocusImage}" MaximumSize="{BoxSize}" Margins="0,0,5,0" Layout="Form">
+            <Children>
+
+              
+              <Graphic Name="Check" Content="{BoxCheckedImage}">
+                <LayoutInput>
+                  <FormLayoutInput Left="Parent,0" Top="Parent,0"/>
+                </LayoutInput>
+              </Graphic>
+
+            </Children>
+          </Graphic>
+          
+          
+          <btn:Label Name="Label" Style="{Style}" WordWrap="{WordWrap}" />
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/SCROLLBAR.UIX b/test/2.1/SCROLLBAR.UIX
new file mode 100644
index 0000000..49ea56a
--- /dev/null
+++ b/test/2.1/SCROLLBAR.UIX
@@ -0,0 +1,476 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:sys="assembly://mscorlib/System"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:animations="res://ZuneShellResources!Animations.uix"
+  xmlns:me="Me">
+
+  <UI Name="ScrollControl">
+    <Properties>
+      <ScrollingData Name="ScrollData" ScrollingData="$Required"/>
+      <Boolean Name="Horizontal" Boolean="false"/>
+      <Boolean Name="RegionHover" Boolean="false"/>
+    </Properties>
+  </UI>
+
+  <UI Name="ScrollBar" Base="me:ScrollControl">
+    <Properties>
+      <Boolean Name="ClickToPage" Boolean="true"/>
+
+      
+      <Color Name="ThumbColor" Color="{styles:Styles.ScrollBarThumb}"/>
+
+      <Color Name="BarColor" Color="{styles:Styles.ColumnDivider}"/>
+      <Color Name="PageColor" Color="{styles:Styles.ScrollBarBackground}"/>
+
+      <Color Name="ScrollPathColor" Color="{styles:Styles.ScrollPath}"/>
+
+      
+      <Int32 Name="Size" Int32="11"/>
+
+      <Int32 Name="MinimumThumbSize" Int32="25"/>
+    </Properties>
+
+    <Locals>
+      <iris:Command Name="ScrollUpCommand"/>
+      <iris:Command Name="ScrollDownCommand"/>
+    </Locals>
+
+    <Input>
+      
+      <ClickHandler Name="RightClickInterceptor" HandlerStage="Direct,Bubbled" ClickType="RightMouse" />
+    </Input>
+
+    <Scripts>
+      
+      <Script>
+        bool canScroll = ([ScrollData.CanScrollUp] || [ScrollData.CanScrollDown]);
+
+        Root.Visible = canScroll;
+        UI.Enabled = canScroll;
+      </Script>
+
+      <Script>
+        if ([Horizontal])
+        {
+          Root.MaximumSize = new Size(0, Size);
+        }
+        else
+        {
+          Root.MaximumSize = new Size(Size, 0);
+        }
+      </Script>
+
+      <Script>Bar.Horizontal = [Horizontal];</Script>
+
+      <Script>
+        if ([RegionHover])
+        {
+          Bar.RegionHover = true;
+        }
+        else
+        {
+          Bar.RegionHover = false;
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Name="Root" Layout="Dock">
+        <Children>
+
+          <me:ScrollBarArea Name="Bar" ScrollData="{ScrollData}" Horizontal="{Horizontal}"
+              ClickToPage="{ClickToPage}" ThumbColor="{ThumbColor}" BarColor="{BarColor}"
+              ScrollPathColor="{ScrollPathColor}" MinimumThumbSize="{MinimumThumbSize}">
+          </me:ScrollBarArea>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  <UI Name="ScrollBarArea">
+    <Properties>
+      <ScrollingData Name="ScrollData" ScrollingData="$Required"/>
+      <Boolean Name="Horizontal" Boolean="$Required"/>
+
+      <Boolean Name="ClickToPage" Boolean="true"/>
+
+      <Color Name="ThumbColor" Color="{styles:Styles.PrimaryLabelSelected}"/>
+      <Color Name="BarColor" Color="{styles:Styles.PrimaryLabel}"/>
+      <Color Name="ScrollPathColor" Color="{styles:Styles.SecondaryLabel}"/>
+      <Color Name="PageColor" Color="{ScrollPathColor}"/>
+
+      <Int32 Name="ArrowSize" Int32="12"/>
+
+      <Boolean Name="RegionHover" Boolean="false"/>
+
+      <Int32 Name="MinimumThumbSize" Int32="$Required"/>
+
+      <AnchorLayoutInput Name="PageUpAnchorVertical"        Top="Parent,0"        Bottom="Current,0"    Left="Current,0,3"  Right="Current,1"/>
+      <AnchorLayoutInput Name="PageDownAnchorVertical"      Top="Current,1"       Bottom="Parent,1"     Left="Current,0,3"  Right="Current,1"/>
+      <AnchorLayoutInput Name="ThumbAnchorVertical"         Top="Parent,0.5"      Bottom="Parent,0.6"   Left="Parent,0"     Right="Parent,1"/>
+      <AnchorLayoutInput Name="BackgroundAnchorVertical"    Top="Parent,0"        Bottom="Parent,1"     Left="Current,1"    Right="Current,1,1"/>
+      <AnchorLayoutInput Name="ScrollPathAnchorVertical"    Top="Parent,0"        Bottom="Parent,1"     Left="Parent,0,3"   Right="Current,1"/>
+      <AnchorLayoutInput Name="ShadowAnchorVertical"        Top="Current,0,-3"    Bottom="Current,1,3"  Left="Current,0"    Right="Current,1" ContributesToWidth="false" ContributesToHeight="false"/>
+      <AnchorLayoutInput Name="SecondArrowVertical"         Right="Parent,1"      Bottom="Parent,1,37"/>
+
+      <AnchorLayoutInput Name="PageUpAnchorHorizontal"      Left="Parent,0"       Right="Current,0"     Top="Current,0,3"   Bottom="Current,1"/>
+      <AnchorLayoutInput Name="PageDownAnchorHorizontal"    Left="Current,1"      Right="Parent,1"      Top="Current,0,3"   Bottom="Current,1"/>
+      <AnchorLayoutInput Name="ThumbAnchorHorizontal"       Left="Parent,0.5"     Right="Parent,0.6"    Top="Parent,0"      Bottom="Parent,1"/>
+      <AnchorLayoutInput Name="BackgroundAnchorHorizontal"  Left="Parent,0"       Right="Parent,1"      Top="Current,1"     Bottom="Current,1,1"/>
+      <AnchorLayoutInput Name="ScrollPathAnchorHorizontal"  Left="Parent,0"       Right="Parent,1"      Top="Current,0,3"   Bottom="Background,0"/>
+      <AnchorLayoutInput Name="ShadowAnchorHorizontal"      Left="Current,0,-3"   Right="Current,1,3"   Top="Current,0"     Bottom="Current,1" ContributesToWidth="false" ContributesToHeight="false"/>
+      <AnchorLayoutInput Name="SecondArrowHorizontal"       Right="Parent,1,37"   Bottom="Parent,1"/>
+    </Properties>
+
+    <Locals>
+      
+      <AnchorLayoutInput Name="DummyInput"/>
+      <AnchorLayoutInput Name="LayoutInput"/>
+      <AnchorLayoutInput Name="ShadowLayout"/>
+
+      <iris:Command Name="PageUpCommand" />
+      <iris:Command Name="PageDownCommand" />
+
+      
+      <Single Name="InitialPosition"/>
+    </Locals>
+
+    <Input>
+      <DragHandler Name="Dragger"/>
+    </Input>
+
+    <Scripts>
+
+      
+      <Script>
+        UI.AllowDoubleClicks = false;
+      </Script>
+
+      <Script>
+        
+        
+        Dragger.RelativeTo = ScrollableRegion;
+      </Script>
+
+      <Script>
+        if ([Horizontal])
+        {
+          ThumbAnchorHorizontal.Right.Offset = MinimumThumbSize;
+          PageDownAnchorHorizontal.Right.Offset = MinimumThumbSize;
+          BackgroundAnchorHorizontal.Right.Offset = MinimumThumbSize;
+          ScrollPathAnchorHorizontal.Right.Offset = MinimumThumbSize;
+
+          LayoutInput = ThumbAnchorHorizontal;
+
+          PageUp.LayoutInput      = PageUpAnchorHorizontal;
+          PageDown.LayoutInput    = PageDownAnchorHorizontal;
+          Background.LayoutInput  = BackgroundAnchorHorizontal;
+          ScrollPath.LayoutInput  = ScrollPathAnchorHorizontal;
+          SecondArrow.LayoutInput = SecondArrowHorizontal;
+
+          Shadow.LayoutInput = ShadowAnchorHorizontal;
+          Shadow.Content = styles:Styles.ScrollbarShadowHoverHoriz;
+
+          Current.Margins = new Inset(0,3,0,0);
+          Accent.Content = styles:Styles.ScrollbarAccentHoriz;
+
+          ScrollableRegion.Margins = new Inset(ArrowSize, 0, MinimumThumbSize + ArrowSize, 0);
+
+          FirstArrow.Content  = styles:Styles.ScrollbarArrowLeft;
+          SecondArrow.Content = styles:Styles.ScrollbarArrowRight;
+          FirstArrow.Margins = new Inset(-8,5,0,0);
+          SecondArrow.Margins = new Inset(0,0,5,1);
+
+          PageUp.Margins = new Inset(ArrowSize * -1,0,0,0);
+          PageDown.Margins = new Inset(0,0,ArrowSize * -1,0);
+
+          Background.Margins = new Inset(ArrowSize * -1,0,ArrowSize * -1,0);
+          ScrollPath.Margins = new Inset(ArrowSize * -1,0,ArrowSize * -1,0);
+        }
+        else
+        {
+          ThumbAnchorVertical.Bottom.Offset = MinimumThumbSize;
+          PageDownAnchorVertical.Bottom.Offset = MinimumThumbSize;
+          BackgroundAnchorVertical.Bottom.Offset = MinimumThumbSize;
+          ScrollPathAnchorVertical.Bottom.Offset = MinimumThumbSize;
+
+          LayoutInput = ThumbAnchorVertical;
+
+          PageUp.LayoutInput      = PageUpAnchorVertical;
+          PageDown.LayoutInput    = PageDownAnchorVertical;
+          Background.LayoutInput  = BackgroundAnchorVertical;
+          ScrollPath.LayoutInput  = ScrollPathAnchorVertical;
+          SecondArrow.LayoutInput = SecondArrowVertical;
+
+          Shadow.LayoutInput = ShadowAnchorVertical;
+          Shadow.Content = styles:Styles.ScrollbarShadowHoverVert;
+
+          Current.Margins = new Inset(3,0,0,0);
+          Accent.Content = styles:Styles.ScrollbarAccentVert;
+
+          ScrollableRegion.Margins = new Inset(0, ArrowSize, 0, MinimumThumbSize + ArrowSize);
+
+          FirstArrow.Content  = styles:Styles.ScrollbarArrowUp;
+          SecondArrow.Content = styles:Styles.ScrollbarArrowDown;
+          FirstArrow.Margins = new Inset(5,-8,0,0);
+          SecondArrow.Margins = new Inset(0,0,1,5);
+
+          PageUp.Margins = new Inset(0,ArrowSize * -1,0,0);
+          PageDown.Margins = new Inset(0,0,0,ArrowSize * -1);
+
+          Background.Margins = new Inset(0,ArrowSize * -1,0,ArrowSize * -1);
+          ScrollPath.Margins = new Inset(0,ArrowSize * -1,0,ArrowSize * -1);
+        }
+      </Script>
+
+      
+      <Script>
+        float rawPercent = [ScrollData.CurrentPage] - 1.0;
+        float rawBottomPercent = rawPercent + 1.0;
+
+        float topPercent = rawPercent / [ScrollData.TotalPages];
+        float bottomPercent = rawBottomPercent / ScrollData.TotalPages;
+
+        if ([Horizontal])
+        {
+          LayoutInput.Left.Percent = topPercent;
+          LayoutInput.Right.Percent = bottomPercent;
+        }
+        else
+        {
+          LayoutInput.Top.Percent = topPercent;
+          LayoutInput.Bottom.Percent = bottomPercent;
+        }
+
+        Current.LayoutInput = DummyInput;
+        Current.LayoutInput = LayoutInput;
+      </Script>
+
+      <Script>
+        if ([Dragger.Dragging])
+        {
+          if ([Horizontal])
+          {
+            Shadow.Content = styles:Styles.ScrollbarShadowPressedHoriz;
+          }
+          else
+          {
+            Shadow.Content = styles:Styles.ScrollbarShadowPressedVert;
+          }
+        }
+      </Script>
+
+      <Script>
+        if ([RegionHover])
+        {
+          ScrollPath.Visible = true;
+        }
+        else
+        {
+          ScrollPath.Visible = false;
+        }
+      </Script>
+
+      <Script>
+        
+        if ([Dragger.Dragging])
+          InitialPosition = (ScrollData.CurrentPage - 1.0) / ScrollData.TotalPages;
+      </Script>
+
+      <Script><![CDATA[
+       [DeclareTrigger(Dragger.EndPosition)]
+
+        float delta = 0.0;
+
+        
+        
+        int maxPerpendicularDelta = 150;
+        if (Horizontal)
+        {
+          if (sys:Math.Abs([Dragger.AbsoluteDragSize].Height) < maxPerpendicularDelta)
+            delta = Dragger.RelativeDragSize.X;
+        }
+        else
+        {
+          if (sys:Math.Abs([Dragger.AbsoluteDragSize].Width) < maxPerpendicularDelta)
+            delta = [Dragger.RelativeDragSize].Y;
+        }
+
+        
+        float trackSize = 1.0 - (1.0 / ScrollData.TotalPages);
+
+        
+        
+        
+        ScrollData.ScrollToPosition( (InitialPosition + delta) / trackSize );
+     ]]></Script>
+
+      <Script>
+        [DeclareTrigger(PageUpCommand.Invoked)]
+        ScrollData.PageUp();
+      </Script>
+
+      <Script>
+        [DeclareTrigger(PageDownCommand.Invoked)]
+        ScrollData.PageDown();
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Name="Root">
+        <Children>
+
+          <Panel Name="ScrollableRegion" Layout="Anchor">
+            <Children>
+
+              
+              
+              <me:ClickArea Name="PageUp" Visible="{ClickToPage}" FocusedColor="{PageColor}"
+                  Model="{PageUpCommand}" Alpha="0.5"/>
+
+              
+              
+              <me:ClickArea Name="PageDown" Visible="{ClickToPage}" FocusedColor="{PageColor}"
+                  Model="{PageDownCommand}" Alpha="0.5"/>
+
+              
+              <ColorFill Name="Current" Content="{ThumbColor}" Layout="Center">
+                <Children>
+
+                  <Graphic Name="Accent"/>
+
+                </Children>
+              </ColorFill>
+
+
+
+                  <Graphic Name="FirstArrow" SizingPolicy="SizeToContent" StretchingPolicy="None">
+                    <LayoutInput>
+                      <AnchorLayoutInput Left="Parent,0" Top="Parent,0"/>
+                    </LayoutInput>
+                  </Graphic>
+
+                  <Graphic Name="SecondArrow" SizingPolicy="SizeToContent" StretchingPolicy="None"/>
+
+              <Graphic Name="Shadow"/>
+
+              
+              <ColorFill Name="Background" Content="{BarColor}"/>
+
+              <ColorFill Name="ScrollPath"  Content="{ScrollPathColor}" Layout="Anchor">
+                <Animations>
+                  <Animation Animation="{animations:Animations.ComponentShow}" />
+                </Animations>
+              </ColorFill>
+
+            </Children>
+          </Panel>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  <UI Name="ClickArea">
+    <Properties>
+      <iris:Command Name="Model" Command="$Required"/>
+
+      <Color Name="Color" Color="Transparent"/>
+      <Color Name="FocusedColor" Color="LightGray"/>
+    </Properties>
+
+    <Locals>
+      <Timer Name="RepeatTimer" AutoRepeat="true" Enabled="false"/>
+    </Locals>
+
+    <Input>
+      <DragHandler Name="Dragger"/>
+    </Input>
+
+    <Scripts>
+
+      
+      <Script>
+        UI.AllowDoubleClicks = false;
+      </Script>
+
+      <Script>
+        if (![Dragger.Dragging])
+        {
+          RepeatTimer.Interval = zune:OSInfo.DefaultKeyDelay;
+        }
+      </Script>
+
+      
+
+      <Script>
+        if ([UI.MouseFocus])
+        {
+          Content.Content = FocusedColor;
+        }
+        else
+        {
+          Content.Content = Color;
+        }
+      </Script>
+
+
+      <Script><![CDATA[
+        [InitialEvaluate(false)]
+        if ([Dragger.Dragging] && Model != null)
+        {
+          Model.Invoke();
+          RepeatTimer.Enabled = true;
+        }
+        else
+        {
+          RepeatTimer.Enabled = false;
+        }
+      ]]></Script>
+
+      <Script><![CDATA[
+        [InitialEvaluate(false)]
+        [DeclareTrigger(Dragger.EndPosition)]
+
+        Vector3 draggerPosition = Dragger.EndPosition;
+        float draggerX = draggerPosition.X;
+        float draggerY = draggerPosition.Y;
+
+        bool repeatEnabled = ((draggerX >= 0.0) && (draggerX <= 1.0) &&
+                              (draggerY >= 0.0) && (draggerY <= 1.0));
+
+        RepeatTimer.Enabled = (Model != null && repeatEnabled);
+
+      ]]></Script>
+
+
+      <Script>
+        [InitialEvaluate(false)]
+        [DeclareTrigger(RepeatTimer.Tick)]
+
+        
+        if (Dragger.Dragging &amp;&amp; RepeatTimer.Enabled)
+        {
+          Model.Invoke();
+        }
+        else
+        {
+          RepeatTimer.Enabled = false;
+        }
+
+        RepeatTimer.Interval = zune:OSInfo.DefaultKeyRepeat;
+      </Script>
+    </Scripts>
+
+    <Content>
+      <ColorFill Name="Content" Layout="Fill" />
+    </Content>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/SEARCH.UIX b/test/2.1/SEARCH.UIX
new file mode 100644
index 0000000..db9b693
--- /dev/null
+++ b/test/2.1/SEARCH.UIX
@@ -0,0 +1,1404 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI" 
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:sys="assembly://mscorlib/System"
+  xmlns:col="assembly://mscorlib/System.Collections"
+  xmlns:sec="assembly://mscorlib/System.Security"
+  xmlns:data="res://ZuneShellResources!LibraryData.schema.xml"
+  xmlns:podcastdata="res://ZuneMarketplaceResources!PodcastData.schema.xml"
+  xmlns:page="res://ZuneShellResources!PageStack.uix"
+  xmlns:style="res://ZuneShellResources!Style.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:core="res://ZuneShellResources!CoreControls.uix"
+  xmlns:marketplace="res://ZuneMarketplaceResources!MarketplaceData.schema.xml"
+  xmlns:button="res://ZuneShellResources!Button.uix"
+  xmlns:thumbbutton="res://ZuneShellResources!ThumbnailButton.uix"
+  xmlns:animations="res://ZuneShellResources!Animations.uix"
+  xmlns:mctl="res://ZuneMarketplaceResources!Controls.uix"
+  xmlns:me="Me">
+
+  
+  
+  
+
+  <Class Name="PageState" Shared="true">
+    <Properties>
+      <Command Name="QueriesAllocated"/>
+      <me:LibraryQueries Name="LibraryQueries" LibraryQueries="{null}"/>
+      <me:MarketplaceQueries Name="MarketplaceQueries" MarketplaceQueries="{null}"/>
+    </Properties>
+    <Locals>
+      <iris:Command Name="Release"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(zune:Search.Instance.Executed.Invoked)]
+        if ((LibraryQueries == null) || (MarketplaceQueries == null))
+        {
+          LibraryQueries = new me:LibraryQueries();
+          MarketplaceQueries = new me:MarketplaceQueries();
+
+          
+          zune:Shell.DefaultInstance.CurrentPage.ReleaseCommand = Release;
+
+          
+          
+          QueriesAllocated.Invoke();
+        }
+
+      </Script>
+      <Script>
+        [DeclareTrigger(Release.Invoked)]
+        
+        
+        Class.DisposeOwnedObject(LibraryQueries);
+        LibraryQueries = null;
+        
+        Class.DisposeOwnedObject(MarketplaceQueries);
+        MarketplaceQueries = null;
+      </Script>
+    </Scripts>
+  </Class>
+
+  <Class Name="Queries">
+    <Properties>
+      <float Name="ScrollPosition"/>
+      <Boolean Name="ResultsFound" Boolean="false"/>
+      <Boolean Name="Completed" Boolean="false"/>
+    </Properties>
+
+    <Scripts>
+
+      <Script>
+        [DeclareTrigger(zune:Search.Instance.Keywords)]
+        
+        ScrollPosition = 0.0;
+        ResultsFound = false;
+        Completed = false;
+      </Script>
+
+    </Scripts>
+  </Class>
+
+  <Class Name="LibraryQueries" Base="me:Queries">
+    <Properties>
+      <data:LibraryArtistQuery          Name="ArtistQuery"          Sort="+Relevance" Keywords="{zune:Search.Instance.Keywords}" AutoRefresh="false"/>
+      <data:LibraryAlbumQuery           Name="AlbumQuery"           Sort="+Relevance" Keywords="{zune:Search.Instance.Keywords}" AutoRefresh="false"/>
+      <data:LibraryTrackQuery           Name="TrackQuery"           Sort="+Relevance" Keywords="{zune:Search.Instance.Keywords}" AutoRefresh="false"/>
+      <data:LibraryVideoQuery           Name="VideoQuery"           Sort="+Relevance" Keywords="{zune:Search.Instance.Keywords}" AutoRefresh="false"/>
+      <data:LibraryPodcastSeriesQuery   Name="PodcastSeriesQuery"   Sort="+Relevance" Keywords="{zune:Search.Instance.Keywords}" AutoRefresh="false"/>
+      <data:LibraryPodcastEpisodeQuery  Name="PodcastEpisodeQuery"  Sort="+Relevance" Keywords="{zune:Search.Instance.Keywords}" UserId="{zune:SignIn.Instance.LastSignedInUserId}" AutoRefresh="false"/>
+
+      <me:QueryState Name="Artist" NoStatusUpdates="true"/>
+      <me:QueryState Name="Album" NoStatusUpdates="true"/>
+      <me:QueryState Name="Track" NoStatusUpdates="true"/>
+      <me:QueryState Name="Video" NoStatusUpdates="true"/>
+      <me:QueryState Name="PodcastSeries" NoStatusUpdates="true"/>
+      <me:QueryState Name="PodcastEpisodes" NoStatusUpdates="true"/>
+    </Properties>
+
+    <Scripts>
+      <Script> Artist.Results = [ArtistQuery.Result].Items; </Script>
+      <Script> Album.Results = [AlbumQuery.Result].Items; </Script>
+      <Script> Track.Results = [TrackQuery.Result].Items; </Script>
+      <Script> Video.Results = [VideoQuery.Result].Items; </Script>
+      <Script> PodcastSeries.Results = [PodcastSeriesQuery.Result].Items; </Script>
+      <Script> PodcastEpisodes.Results = [PodcastEpisodeQuery.Result].Items; </Script>
+
+      <Script> Artist.Status = [ArtistQuery.Status]; </Script>
+      <Script> Album.Status = [AlbumQuery.Status]; </Script>
+      <Script> Track.Status = [TrackQuery.Status]; </Script>
+      <Script> Video.Status = [VideoQuery.Status]; </Script>
+      <Script> PodcastSeries.Status = [PodcastSeriesQuery.Status]; </Script>
+      <Script> PodcastEpisodes.Status = [PodcastEpisodeQuery.Status]; </Script>
+
+      <Script>
+        string keywords = [zune:Search.Instance.Keywords];
+
+        
+        ArtistQuery.Keywords = keywords;
+        AlbumQuery.Keywords = keywords;
+        TrackQuery.Keywords = keywords;
+        VideoQuery.Keywords = keywords;
+        PodcastSeriesQuery.Keywords = keywords;
+        PodcastEpisodeQuery.Keywords = keywords;
+      </Script>
+
+      <Script>
+        <![CDATA[
+          Completed = [Artist.Completed] && [Album.Completed] && [Track.Completed] && [Video.Completed] && [PodcastSeries.Completed] && [PodcastEpisodes.Completed];
+          ResultsFound = [Artist.ResultsFound] || [Album.ResultsFound] || [Track.ResultsFound] || [Video.ResultsFound] || [PodcastSeries.ResultsFound] || [PodcastEpisodes.ResultsFound];
+        ]]>
+      </Script>
+    </Scripts>
+  </Class>
+
+  <Class Name="MarketplaceQueries" Base="me:Queries">
+    <Properties>
+      <marketplace:MarketplaceSearchArtistsQuery            Name="ArtistQuery"     Keywords="{zune:Search.Instance.Keywords}"/>
+      <marketplace:MarketplaceSearchAlbumsQuery             Name="AlbumQuery"      Keywords="{zune:Search.Instance.Keywords}"/>
+      <marketplace:MarketplaceSearchTracksQuery             Name="TrackQuery"      Keywords="{zune:Search.Instance.Keywords}"/>
+      <marketplace:MarketplaceSearchPlaylistsQuery          Name="PlaylistQuery"   Keywords="{zune:Search.Instance.Keywords}"/>
+      <marketplace:MarketplaceSearchMusicVideosQuery        Name="MusicVideoQuery" Keywords="{zune:Search.Instance.Keywords}"/>
+      <podcastdata:NameValueUriResourceFindPodcastsFTSQuery Name="PodcastQuery"    Query="{zune:Search.Instance.Keywords}"/>
+
+      <me:QueryState Name="Artist"/>
+      <me:QueryState Name="Album"/>
+      <me:QueryState Name="Track"/>
+      <me:QueryState Name="Playlist"/>
+      <me:QueryState Name="MusicVideo"/>
+      <me:QueryState Name="Podcast"/>
+
+      <zune:QueryTracker Name="Tracker"/>
+    </Properties>
+
+    <Scripts>
+      <Script> Artist.Results = [ArtistQuery.Result].Artists;   </Script>
+      <Script> Album.Results = [AlbumQuery.Result].Albums;     </Script>
+      <Script> Track.Results = [TrackQuery.Result].Tracks;     </Script>
+      <Script> Podcast.Results = [PodcastQuery.Result].Items;    </Script>
+      <Script> Playlist.Results = [PlaylistQuery.Result].Playlists; </Script>
+      <Script> MusicVideo.Results = [MusicVideoQuery.Result].MusicVideos; </Script>
+
+      <Script> Artist.Status = [ArtistQuery.Status]; </Script>
+      <Script> Album.Status = [AlbumQuery.Status]; </Script>
+      <Script> Track.Status = [TrackQuery.Status]; </Script>
+      <Script> Podcast.Status = [PodcastQuery.Status]; </Script>
+      <Script> Playlist.Status = [PlaylistQuery.Status]; </Script>
+      <Script> MusicVideo.Status = [MusicVideoQuery.Status]; </Script>
+
+      <Script>
+        Tracker.Register("Artist", ArtistQuery);
+        Tracker.Register("Album", AlbumQuery);
+        Tracker.Register("Track", TrackQuery);
+        Tracker.Register("Playlist", PlaylistQuery);
+        Tracker.Register("MusicVideo", MusicVideoQuery);
+        Tracker.Register("Podcast", PodcastQuery);
+      </Script>
+
+      <Script>
+        string keywords = [zune:Search.Instance.Keywords];
+
+        
+        ArtistQuery.Keywords     = keywords;
+        AlbumQuery.Keywords      = keywords;
+        TrackQuery.Keywords      = keywords;
+        PodcastQuery.Query       = keywords;
+        PlaylistQuery.Keywords   = keywords;
+        MusicVideoQuery.Keywords = keywords;
+      </Script>
+
+      <Script>
+        <![CDATA[
+          Completed = [Artist.Completed] && [Album.Completed] && [Track.Completed] && [MusicVideo.Completed] && [Podcast.Completed] && [Playlist.Completed];
+          ResultsFound = [Artist.ResultsFound] || [Album.ResultsFound] || [Track.ResultsFound] || [MusicVideo.ResultsFound] || [Podcast.ResultsFound] || [Playlist.ResultsFound];
+        ]]>
+      </Script>
+    </Scripts>
+  </Class>
+
+  <Class Name="QueryState">
+    <Properties>
+      <iris:DataProviderQueryStatus Name="Status"/>
+      <iris:VirtualList             Name="Results"  VirtualList="{null}"/>
+      <Boolean                      Name="Expanded" Boolean="false"/>
+      <Boolean                      Name="Completed" Boolean="false"/>
+      <Boolean                      Name="ResultsFound" Boolean="false"/>
+      <Boolean                      Name="NoStatusUpdates" Boolean="false"/>
+    </Properties>
+    
+    <Scripts>
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(zune:Search.Instance.Keywords)]
+
+        Expanded = false;
+        Completed = false;
+        ResultsFound = false;
+        Results = null;
+        Status = iris:DataProviderQueryStatus.Idle;
+      </Script>
+    </Scripts>
+  </Class>
+
+  
+  
+  
+  <UI Name="Search" Base="page:PageBase">
+    <Locals>
+      <AnchorLayoutInput Name="CollectionDividerLayout"   Left="Parent,0.6" Top="Parent, 0" Bottom="Parent, 1"/>
+      <AnchorLayoutInput Name="MarketplaceDividerLayout"  Left="Parent,0.4" Top="Parent, 0" Bottom="Parent, 1"/>
+    </Locals>
+    <Scripts>
+      <Script>
+        <![CDATA[
+          sys:String rawKeywords = [zune:Search.Instance.Keywords];
+          string keywords;
+          if (rawKeywords != null)
+            keywords = sec:SecurityElement.Escape(rawKeywords);
+          SearchResultsFor.Content = sys:String.Format("<Header>{0}</Header> <Keyword>{1}</Keyword>", zune:Shell.LoadString(zune:StringId.IDS_SEARCH_HEADER), keywords);
+        ]]>
+      </Script>
+
+      <Script>
+        if ([zune:Search.Instance.CollectionEmphasized])
+        {
+          CenterDivider.LayoutInput = CollectionDividerLayout;
+        }
+        else
+        {
+          CenterDivider.LayoutInput = MarketplaceDividerLayout;
+        }
+      </Script>
+    </Scripts>
+    
+    <Content>
+      <Panel>
+        <Layout>
+          <DockLayout SizeToChildren="true"  DefaultLayoutInput="Top,Near"/>
+        </Layout>
+        <Animations>
+          
+          
+          <Animation Animation="{animations:Animations.HideNow}"/>
+        </Animations>
+        <Children>
+
+          <Text Name="SearchResultsFor" Font="{styles:Styles.ReviewSubHeader}" Margins="5,0,0,0">
+            <NamedStyles>
+              <TextStyle Name="Header"  Color="{styles:Styles.SearchKeywordHeader}" Bold="true"/>
+              <TextStyle Name="Keyword" Color="{styles:Styles.SectionHeadColor}"    Bold="true"/>
+            </NamedStyles>
+          </Text>
+
+          <Panel Layout="Anchor">
+            <Children>
+
+              
+              <me:CollectionResults Name="CollectionResults" Queries="{me:PageState.LibraryQueries}">
+                <LayoutInput>
+                  <AnchorLayoutInput Right="CenterDivider,0"/>
+                </LayoutInput>
+              </me:CollectionResults>
+
+              
+              <Graphic Name="CenterDivider" Content="{styles:Styles.DividerVertical}"/>
+
+              
+              <me:MarketplaceResults Name="MarketplaceResults" Queries="{me:PageState.MarketplaceQueries}" Page="{Page}" Shell="{Shell}">
+                <LayoutInput>
+                  <AnchorLayoutInput Left="CenterDivider,1"/>
+                </LayoutInput>
+              </me:MarketplaceResults>
+            </Children>
+          </Panel>
+
+        </Children>
+      </Panel>
+
+    </Content>
+  </UI>
+  
+  
+  
+  
+  <UI Name="ResultSet">
+    <Properties>
+      <me:QueryState    Name="QueryState"     QueryState="{null}"/>
+      <sys:String       Name="Title"   String="$Required"/>
+      <sys:String       Name="RepeatedUIName" String="RepeatedTextItem"/>
+      <sys:Boolean      Name="TextView"       Boolean="true"/>
+      <sys:Int32        Name="MaxResultSetHeight" Int32="85"/>
+      <Size             Name="ThumbnailSize" Size="86,86"/>
+      <Size             Name="ResultSize"    Size="100,0"/>
+    </Properties>
+
+    <Locals>
+      <iris:Command Name="Show"             Description="{zune:Shell.LoadString(zune:StringId.IDS_SEE_ALL_BUTTON)}"/>
+      <iris:Command Name="Hide"             Description="{zune:Shell.LoadString(zune:StringId.IDS_HIDE_ALL_BUTTON)}"/>
+      <style:Style  Name="ShowHideStyle"    Font="{styles:Styles.ButtonText}"/>
+      <ScrollingData Name="ScrollData"/>
+
+      
+      <Layout Name="TextLayout">
+        <Layout>
+          
+          
+          <GridLayout Orientation="Vertical" Spacing="4,0" Columns="1"/>
+        </Layout>
+      </Layout>
+      <Layout Name="ThumbLayout">
+        <Layout>
+          
+          
+          <GridLayout Orientation="Horizontal" AllowWrap="true"/>
+        </Layout>
+      </Layout>
+
+      <col:Hashtable Name="SearchStyles"/>
+      <TextStyle Name="KeywordStyle" Color="{styles:Styles.SearchKeywordColor}"/>
+      <string Name="KeywordTag" string="Keyword"/>
+      <Single Name="AnimDelay" Single="0.05"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        
+        SearchStyles.Add(KeywordTag, KeywordStyle);
+        
+        if (TextView)
+        {
+          ResultRepeater.Layout = TextLayout;
+        }
+        else
+        {
+          ResultRepeater.Layout = ThumbLayout;
+        }        
+      </Script>
+
+      <Script>
+        if (QueryState != null)
+        {
+          ShowButton.Visible = ![QueryState.Expanded];
+          HideButton.Visible = [QueryState.Expanded];
+          
+          if ([QueryState.Expanded])
+          {
+            ResultScroller.MaximumSize = new Size(0,0);
+          }
+          else
+          {
+            ResultScroller.MaximumSize = new Size(0,MaxResultSetHeight);
+          }
+        }
+
+      </Script>
+      
+      <Script>
+        [DeclareTrigger(Show.Invoked)]
+        if (QueryState != null)
+        {
+          QueryState.Expanded = true;
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Hide.Invoked)]
+       
+        if (QueryState != null)
+        {
+          QueryState.Expanded = false;
+        }
+      </Script>
+      
+      <Script>
+        if (QueryState != null)
+        {
+          
+          ShowHidePanel.Visible = [ScrollData.CanScrollDown] || [ScrollData.CanScrollUp] || [QueryState.Expanded];
+        }
+      </Script>
+
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(QueryState.Status)]
+        [DeclareTrigger(QueryState.Results)]
+
+        if (QueryState != null)
+        {
+          if ((QueryState.Status == iris:DataProviderQueryStatus.Complete) || (QueryState.Status == iris:DataProviderQueryStatus.Idle))
+          {
+            if ((QueryState.Status == iris:DataProviderQueryStatus.Complete) || QueryState.NoStatusUpdates)
+            {
+              QueryState.Completed = true;
+              
+              if (QueryState.Results != null)
+              {
+                if (QueryState.Results.Count > 0)
+                {
+                  ResultHeader.Content  = sys:String.Format(Title, QueryState.Results.Count);
+                  QueryState.ResultsFound = true;
+                  ResultRepeater.Source = QueryState.Results;
+                }
+              }
+            }
+            
+            
+            if (QueryState.Results == null)
+            {
+              ResultRepeater.Source = null;
+              QueryState.Completed = false;
+            }
+          }
+          else if (QueryState.Status == iris:DataProviderQueryStatus.Error)
+          {
+            QueryState.Completed = true;
+          }
+          else if (QueryState.Status == iris:DataProviderQueryStatus.RequestingData)
+          {
+            ResultRepeater.Source = null;
+            QueryState.Completed = false;
+          }
+        }
+      </Script>
+
+      <Script>
+        if (QueryState != null)
+        {
+          Results.Visible = [QueryState.ResultsFound];
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Name="Results" Padding="0,0,0,28">
+        <Layout>
+          <DockLayout SizeToChildren="true"  DefaultLayoutInput="Top,Near"/>
+        </Layout>
+
+        <Animations>
+          <Animation Animation="{animations:Animations.BasicFadeIn}"/>
+          <Animation Animation="{animations:Animations.BasicFadeOut}"/>
+        </Animations>
+
+        <Children>
+          <Panel Margins="0,2,0,0">
+            <Layout>
+              <FlowLayout Spacing="5,0" Orientation="Horizontal" ItemAlignment="Near"/>
+            </Layout>
+            <Children>
+
+              <Text Name="ResultHeader" Color="{styles:Styles.SectionHeadColor}" Font="{styles:Styles.SearchHeaderText}" Margins="0,4,0,0" Padding="0,0,0,8"/>
+              <Panel Name="ShowHidePanel" Visible="false">
+                <Animations>
+                  <Animation Animation="{animations:Animations.BasicFadeIn}"/>
+                  <Animation Animation="{animations:Animations.BasicFadeOut}"/>
+                </Animations>
+                <Children>
+                  <core:ActionButton Name="ShowButton" Model="{Show}" OverrideStyle="{ShowHideStyle}"/>
+                  <core:ActionButton Name="HideButton" Model="{Hide}" OverrideStyle="{ShowHideStyle}" Visible="false"/>
+                </Children>
+              </Panel>
+
+            </Children>
+          </Panel>
+
+          <Scroller Name="ResultScroller" Orientation="Vertical" FadeSize="-1" ScrollingData="{ScrollData}">
+            <Children>
+
+              <Repeater Name="ResultRepeater" ContentName="{RepeatedUIName}"/>
+
+            </Children>
+          </Scroller>
+        </Children>
+
+      </Panel>
+    </Content>
+
+    <Content Name="RepeatedTextItem">
+      <me:TextResult Item="{RepeatedItem}" Margins="9,0,0,0" NamedStyles="{SearchStyles}" KeywordTag="{KeywordTag}">
+        <Animations>
+          <TransformByAttributeAnimation Attribute="Index" Delay="{AnimDelay}" Source="{animations:Animations.SearchResultsExpand}" />
+          
+          <AnimationProvider AnimationProvider="{animations:Animations.MoveNow}"/>
+        </Animations>
+      </me:TextResult>
+    </Content>
+
+    <Content Name="RepeatedThumbnailItem">
+      <me:ThumbnailResult Item="{RepeatedItem}" Margins="10,0,0,0" NamedStyles="{SearchStyles}" KeywordTag="{KeywordTag}" ThumbnailSize="{ThumbnailSize}" ResultSize="{ResultSize}">
+        <Animations>
+          <TransformByAttributeAnimation Attribute="Index" Delay="{AnimDelay}" Source="{animations:Animations.GalleryFadeIn}" />
+          
+          <AnimationProvider AnimationProvider="{animations:Animations.MoveNow}"/>
+        </Animations>
+      </me:ThumbnailResult>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="SearchResults">
+    <Properties>
+      <me:Queries Name="Queries" Queries="$Required"/>
+    </Properties>
+    
+    <Locals>
+      <ScrollingData Name="ScrollData"/>
+      <Boolean Name="SetScrollerPos" Boolean="false"/>
+    </Locals>
+
+    <Input>
+      <ScrollingHandler Name="ScrollHandler" ScrollingData="{ScrollData}"/>
+    </Input>
+    
+    <Scripts>
+      <Script>
+        if ([ScrollData.TotalPages] &lt; 1.0)
+        {
+          
+          
+          SetScrollerPos = true;
+        }
+        else if (SetScrollerPos)
+        {
+          if (Queries != null)
+          {
+            
+            ScrollData.ScrollToPosition(Queries.ScrollPosition);
+            SetScrollerPos = false;
+          }
+        }
+      </Script>
+
+      <Script>
+        if ((Queries != null) &amp;&amp; ([ScrollData.TotalPages] > 1.0))
+        {
+          Queries.ScrollPosition = ([ScrollData.CurrentPage] - 1.0) / ([ScrollData.TotalPages] - 1.0);
+        }
+      </Script>
+    </Scripts>
+  </UI>
+  
+  
+  
+  
+  <UI Name="CollectionResults" Base="me:SearchResults">
+    <Scripts>
+      <Script> ScrollBar.RegionHover = [UI.DeepMouseFocus]; </Script>
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(me:PageState.QueriesAllocated.Invoked)]
+        if (me:PageState.LibraryQueries != null)
+        {
+          ArtistResults.QueryState = me:PageState.LibraryQueries.Artist;
+          AlbumResults.QueryState = me:PageState.LibraryQueries.Album;
+          TrackResults.QueryState = me:PageState.LibraryQueries.Track;
+          VideoResults.QueryState = me:PageState.LibraryQueries.Video;
+          PodcastSeriesResults.QueryState = me:PageState.LibraryQueries.PodcastSeries;
+          PodcastEpisodesResults.QueryState = me:PageState.LibraryQueries.PodcastEpisodes;
+        }
+      </Script>
+
+      <Script>
+        if (me:PageState.LibraryQueries != null)
+        {
+          NoResultsPanel.Visible = [me:PageState.LibraryQueries.Completed] &amp;&amp; ![me:PageState.LibraryQueries.ResultsFound];
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Padding="8,8,8,8" Layout="Form">
+        <Children>
+
+          <Text Name="Header" Content="{zune:Shell.LoadString(zune:StringId.IDS_SEARCH_COLLECTION_HEADER)}" Color="{styles:Styles.SectionSubHeadColor}" Font="{styles:Styles.SearchSubHeaderText}" Margins="-1,0,0,0" Padding="0,0,0,15">
+            <LayoutInput>
+              <FormLayoutInput Left="Parent,0" Top="Parent,0"/>
+            </LayoutInput>
+          </Text>
+
+          <Panel Layout="Dock">
+            <LayoutInput>
+              <FormLayoutInput Left="Parent,0" Top="Header,1" Right="Parent,1" Bottom="Parent, 1"/>
+            </LayoutInput>
+
+            <Children>
+              <core:ScrollBar Name="ScrollBar" ScrollData="{ScrollData}">
+                <LayoutInput>
+                  <DockLayoutInput Position="Right" Alignment="Near"/>
+                </LayoutInput>
+              </core:ScrollBar>
+
+              <Scroller Orientation="Vertical" FadeSize="-1" ScrollingData="{ScrollData}">
+                <Children>
+
+                  <Panel>
+                    <Layout>
+                      <DockLayout SizeToChildren="true"  DefaultLayoutInput="Top,Near"/>
+                    </Layout>
+                    <Children>
+
+                      <me:ResultSet Name="ArtistResults" Title="{zune:Shell.LoadString(zune:StringId.IDS_SEARCH_ARTISTS_HEADER)}"/>
+                      <me:ResultSet Name="AlbumResults" Title="{zune:Shell.LoadString(zune:StringId.IDS_SEARCH_ALBUMS_HEADER)}" RepeatedUIName="RepeatedThumbnailItem" TextView="false" MaxResultSetHeight="140"/>
+                      <me:ResultSet Name="TrackResults" Title="{zune:Shell.LoadString(zune:StringId.IDS_SEARCH_SONGS_HEADER)}"/>
+                      <me:ResultSet Name="VideoResults" Title="{zune:Shell.LoadString(zune:StringId.IDS_SEARCH_VIDEOS_HEADER)}"/>
+                      <me:ResultSet Name="PodcastSeriesResults" Title="{zune:Shell.LoadString(zune:StringId.IDS_SEARCH_SERIES_HEADER)}"/>
+                      <me:ResultSet Name="PodcastEpisodesResults" Title="{zune:Shell.LoadString(zune:StringId.IDS_SEARCH_EPISODES_HEADER)}"/>
+
+                    </Children>
+                  </Panel>
+
+                </Children>
+              </Scroller>
+
+            </Children>
+          </Panel>
+
+          <me:MessagePanel Name="NoResultsPanel" Message="{zune:Shell.LoadString(zune:StringId.IDS_SEARCH_COLLECTION_NORESULTS)}">
+            <LayoutInput>
+              <FormLayoutInput Left="Header,0" Top="Header,1"/>
+            </LayoutInput>
+          </me:MessagePanel>
+          
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+  
+  
+  
+  
+  <Class Name="SearchButtonProvider" Base="button:ButtonProvider">
+    <Properties>
+      <iris:Command Name="Model" Command="$Required"/>
+    </Properties>
+
+    <Scripts>
+      <Script>Available = [Model.Available];</Script>
+      <Script>Selected = [Model.Selected];</Script>
+      <Script>ClickCommand = [Model];</Script>
+    </Scripts>
+  </Class>
+  
+  
+  
+  
+  <Class Name="SearchThumbnailProvider" Base="thumbbutton:CommandThumbnailButtonProvider">
+    <Properties>
+      <String Name="SecondaryLabel"/>
+      <String Name="SecondaryToolTip"/>
+      <String Name="ThirdLabel"/>
+      <String Name="ThirdToolTip"/>
+    </Properties>
+  </Class>
+
+  
+  
+  
+  <UI Name="SearchOverlayLabel" Base="core:ThumbnailButtonOverlay">
+    <Properties>
+      <Boolean Name="WordWrap" Boolean="true"/>
+      <Int32 Name="MaximumLines" Int32="3"/>
+    </Properties>
+    
+    <Locals>
+      <style:StatefulCompositeStyle Name="Style" State="{State}" Base="{styles:SharedStyles.ThumbnailOverlayLabelStyle}"/>
+    </Locals>
+    
+    <Scripts>
+      <Script>
+        if (Provider.PrimaryLabel != null)
+          Label.Content = ((sys:String)[Provider.PrimaryLabel]).ToLower();
+        else
+          Label.Content = null;
+
+        Label.Style = Style;
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Layout="Dock">
+        <Children>
+
+          <core:Label Name="Label" Margins="4,0,4,0">
+            <LayoutInput>
+              <DockLayoutInput Position="Bottom" Alignment="Near"/>
+            </LayoutInput>
+          </core:Label>
+
+        </Children>
+      </Panel>
+    </Content>
+
+  </UI>
+
+  
+  
+  
+  <UI Name="TextResult" Base="core:LabelButtonWithBackground">
+    <Properties>
+      <Object Name="Item" Object="$Required" />
+      <iris:Command Name="Model" />
+      <me:SearchButtonProvider Name="Provider" Model="{Model}"/>
+      <string Name="KeywordTag" string ="$Required"/>
+      <style:Style Name="OverrideStyle" Style="{styles:SharedStyles.SearchResultsStyle}"/>      
+      <col:Hashtable Name="SearchStyles"/>
+      
+    </Properties>
+
+    <Scripts>
+      <Script>
+        <![CDATA[
+    
+        if ([Item] is data:Artist)
+        {
+          data:Artist artist = (data:Artist)Item;
+          Model.Description = artist.Title;
+          Provider.ToolTip = Model.Description;
+          Provider.PrimaryLabel = zune:Search.Instance.HighlightKeywords(artist.Title, KeywordTag);
+        }
+        else if (Item is data:Album)
+        {
+          data:Album album = (data:Album)Item;
+          
+          string year;
+          if (album.ReleaseDate.Year > 1)
+            year = album.ReleaseDate.Year.ToString();
+            
+          Model.Description = zune:Search.Instance.FormatResult(null, album.Title, album.ArtistName, year);          
+          Provider.ToolTip = Model.Description;
+          Provider.PrimaryLabel = zune:Search.Instance.FormatResult(KeywordTag, album.Title, album.ArtistName, year);
+        }
+        else if (Item is data:Track)
+        {
+          data:Track track = (data:Track)Item;
+
+          string year;
+          if (track.ReleaseDate.Year > 1)
+            year = track.ReleaseDate.Year.ToString();
+            
+          Model.Description = zune:Search.Instance.FormatResult(null, track.Title, track.ArtistName, year);
+          Provider.ToolTip = Model.Description;
+          Provider.PrimaryLabel = zune:Search.Instance.FormatResult(KeywordTag, track.Title, track.ArtistName, year);
+        }
+        else if (Item is data:Video)
+        {
+          data:Video video = (data:Video)Item;
+          Model.Description = zune:Search.Instance.FormatResult(null, video.Title, video.ArtistName);
+          Provider.ToolTip = Model.Description;
+          Provider.PrimaryLabel = zune:Search.Instance.FormatResult(KeywordTag, video.Title, video.ArtistName);
+        }
+        else if (Item is data:PodcastSeries)
+        {
+          data:PodcastSeries podcastSeries = (data:PodcastSeries)Item;
+          Model.Description = zune:Search.Instance.FormatResult(null, podcastSeries.Title, podcastSeries.Author);          
+          Provider.ToolTip = Model.Description;
+          Provider.PrimaryLabel = zune:Search.Instance.FormatResult(KeywordTag, podcastSeries.Title, podcastSeries.Author);
+        }
+        else if (Item is data:PodcastEpisode)
+        {
+          data:PodcastEpisode podcastEpisode = (data:PodcastEpisode)Item;
+          Model.Description = zune:Search.Instance.FormatResult(null, podcastEpisode.Title, podcastEpisode.Author);
+          Provider.ToolTip = Model.Description;
+          Provider.PrimaryLabel = zune:Search.Instance.FormatResult(KeywordTag, podcastEpisode.Title, podcastEpisode.Author);
+        }
+        else if (Item is marketplace:Artist)
+        {
+          marketplace:Artist artist = (marketplace:Artist)Item;
+          Model.Description = artist.Title;
+          Provider.ToolTip = Model.Description;
+          Provider.PrimaryLabel = zune:Search.Instance.HighlightKeywords(artist.Title, KeywordTag);
+        }
+        else if (Item is marketplace:Album)
+        {
+          marketplace:Album album = (marketplace:Album)Item;
+          
+          string year;
+          if (album.ReleaseDate.Year > 1)
+            year = album.ReleaseDate.Year.ToString();
+            
+          string artist;
+          if (album.PrimaryArtist != null)
+            artist = album.PrimaryArtist.Title;
+            
+          Model.Description = zune:Search.Instance.FormatResult(null, album.Title, artist, year);
+          Provider.ToolTip = Model.Description;
+          Provider.PrimaryLabel = zune:Search.Instance.FormatResult(KeywordTag, album.Title, artist, year);
+        }
+        else if (Item is marketplace:Track)
+        {
+          marketplace:Track track = (marketplace:Track)Item;
+          
+          string artist;
+          if (track.PrimaryArtist != null)
+            artist = track.PrimaryArtist.Title;
+            
+          Model.Description = zune:Search.Instance.FormatResult(null, track.Title, artist);
+          Provider.ToolTip = Model.Description;
+          Provider.PrimaryLabel = zune:Search.Instance.FormatResult(KeywordTag, track.Title, artist);          
+        }
+        else if (Item is marketplace:Playlist)
+        {
+          marketplace:Playlist playlist = (marketplace:Playlist)Item;
+          Model.Description = zune:Search.Instance.FormatResult(null, playlist.Title, playlist.Author, playlist.CategoryName);
+          Provider.ToolTip = Model.Description;
+          Provider.PrimaryLabel = zune:Search.Instance.FormatResult(KeywordTag, playlist.Title, playlist.Author, playlist.CategoryName);          
+        }
+        else if (Item is marketplace:MusicVideo)
+        {
+          marketplace:MusicVideo video = (marketplace:MusicVideo)Item;
+          
+          string artist;
+          if (video.PrimaryArtist != null)
+            artist = video.PrimaryArtist.Title;
+            
+          Model.Description = zune:Search.Instance.FormatResult(null, video.Title, artist);
+          Provider.ToolTip = Model.Description;
+          Provider.PrimaryLabel = zune:Search.Instance.FormatResult(KeywordTag, video.Title, artist);
+        }
+        else if (Item is podcastdata:PodcastSeries)
+        {
+          podcastdata:PodcastSeries podcast = (podcastdata:PodcastSeries)Item;
+
+          string categoryName = "";
+          if (!List.IsNullOrEmpty(podcast.Categories))
+          {
+            podcastdata:SubCategory categoryModel = (podcastdata:SubCategory)((List)podcast.Categories).GetItem(0);
+            categoryName = categoryModel.Title;
+          }
+
+          Model.Description = zune:Search.Instance.FormatResult(null, podcast.Title, podcast.Author, categoryName);
+          Provider.ToolTip = Model.Description;
+          Provider.PrimaryLabel = zune:Search.Instance.FormatResult(KeywordTag, podcast.Title, podcast.Author, categoryName);
+        }
+      ]]>
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Model.Invoked)]
+        
+        
+        string destination;
+        col:Hashtable args;
+        
+        if (Item is data:Artist)
+        {
+          data:Artist artist = (data:Artist)Item;
+          
+          destination = "Collection\Music";
+          
+          args = new col:Hashtable();
+          args.Add("ArtistLibraryId", artist.LibraryId);
+          args.Add("ViewOverrideId", zune:MusicLibraryView.Browse);
+        }
+        else if (Item is data:Album)
+        {
+          data:Album album = (data:Album)Item;
+          
+          destination = "Collection\Music";
+          
+          args = new col:Hashtable();
+          args.Add("AlbumLibraryId", album.LibraryId);
+          args.Add("ArtistLibraryId", album.ArtistLibraryId);
+          args.Add("ViewOverrideId", zune:MusicLibraryView.Browse);
+        }
+        else if (Item is data:Track)
+        {
+          data:Track track = (data:Track)Item;
+          
+          destination = "Collection\Music";
+          
+          args = new col:Hashtable();
+          args.Add("AlbumLibraryId", track.AlbumLibraryId);
+          args.Add("ArtistLibraryId", track.AlbumArtistLibraryId);
+          args.Add("TrackLibraryId", track.LibraryId);
+          args.Add("ViewOverrideId", zune:MusicLibraryView.Browse);
+        }
+        else if (Item is data:Video)
+        {
+          data:Video video = (data:Video)Item;
+        
+          destination = "Collection\Videos";
+          
+          args = new col:Hashtable();
+          args.Add("VideoLibraryId", video.LibraryId);
+        }
+        else if (Item is data:PodcastSeries)
+        {
+          data:PodcastSeries podcast = (data:PodcastSeries)Item;
+          
+          destination = "Collection\Podcasts";
+          
+          args = new col:Hashtable();
+          args.Add("SeriesLibraryId", podcast.LibraryId);
+        }
+        else if (Item is data:PodcastEpisode)
+        {
+          data:PodcastEpisode podcast = (data:PodcastEpisode)Item;
+          
+          destination = "Collection\Podcasts";
+          
+          args = new col:Hashtable();
+          args.Add("SeriesLibraryId", podcast.SeriesId);
+          args.Add("EpisodeLibraryId", podcast.LibraryId);
+        }
+        else if (Item is marketplace:Artist)
+        {
+          marketplace:Artist artist = (marketplace:Artist)Item;
+          
+          destination = "Marketplace\Music\Artist";
+          
+          args = new col:Hashtable();
+          args.Add("ArtistId", artist.Id.ToString());
+        }
+        else if (Item is marketplace:Album)
+        {
+          marketplace:Album album = (marketplace:Album)Item;
+
+          destination = "Marketplace\Music\Artist";
+          
+          args = new col:Hashtable();
+          args.Add("ArtistId", album.PrimaryArtist.Id.ToString());
+          args.Add("AlbumId", album.Id.ToString());
+          
+          
+        }
+        else if (Item is marketplace:Track)
+        {
+          marketplace:Track track = (marketplace:Track)Item;
+
+          destination = "Marketplace\Music\Artist";
+          
+          args = new col:Hashtable();
+          args.Add("ArtistId", track.PrimaryArtist.Id.ToString());
+          args.Add("AlbumId", track.AlbumId.ToString());
+          args.Add("TrackId", track.Id.ToString());
+        }
+        else if (Item is marketplace:Playlist)
+        {
+          marketplace:Playlist playlist = (marketplace:Playlist)Item;
+
+          destination = "Marketplace\Music\Playlist";
+          
+          args = new col:Hashtable();
+          args.Add("PlaylistId", playlist.Id.ToString());
+        }
+        else if (Item is marketplace:MusicVideo)
+        {
+          marketplace:MusicVideo video = (marketplace:MusicVideo)Item;
+          
+          destination = "Marketplace\Music\Artist";
+          
+          args = new col:Hashtable();
+          args.Add("VideoId", video.Id.ToString());
+        }
+        else if (Item is podcastdata:PodcastSeries)
+        {
+          podcastdata:PodcastSeries podcast = (podcastdata:PodcastSeries)Item;
+
+          destination = "Marketplace\Podcasts\Series";
+          
+          args = new col:Hashtable();
+          args.Add("PodcastId", podcast.Id);
+        }
+        
+        
+        if (!String.IsNullOrEmpty(destination))
+        {
+          zune:Shell.DefaultInstance.Execute(destination, args);
+        }
+      </Script>     
+      
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  <UI Name="ThumbnailResult">
+    <Properties>
+      <Object Name="Item" Object="$Required" />
+      <zune:ThumbnailCommand Name="Model"/>
+      <Size Name="ThumbnailSize" Size="86,86"/>
+      <Size Name="ResultSize" Size="100,0"/>
+      <string Name="KeywordTag" string ="$Required"/>
+      <col:IDictionary Name="NamedStyles" IDictionary="{null}"/>
+    </Properties>
+
+    <Locals>
+      <me:SearchThumbnailProvider Name="Provider" Model="{Model}" Image="{styles:Styles.NoAlbumArt}"/>
+      <style:Style Name="TextStyle" Style="{styles:SharedStyles.SearchResultsSmallStyle}"/>
+    </Locals>
+    
+    <Scripts>
+      <Script>
+        if ([Item] is data:Artist)
+        {
+          data:Artist artist = (data:Artist)Item;
+          Model.Description = artist.Title;
+          
+          
+          
+          Provider.Image = styles:Styles.NoAlbumArt;
+
+          
+          Provider.PrimaryLabel = zune:Search.Instance.HighlightKeywords(artist.Title, KeywordTag);
+          Provider.ToolTip = artist.Title;
+          
+          
+          ThumbButton.OverlayType = typeof(me:SearchOverlayLabel);
+        }
+      </Script>
+      
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(((data:Album)Item).AlbumArtSmall)]
+
+        if (Item is data:Album)
+        {
+          data:Album album = (data:Album)Item;
+          Model.Description = album.Title;
+
+          if (album.AlbumArtSmall != null)
+          {
+            Provider.Image = album.AlbumArtSmall;
+          }
+          else
+          {
+            Provider.Image = styles:Styles.NoAlbumArt;
+          }
+          
+          
+          Provider.PrimaryLabel = zune:Search.Instance.HighlightKeywords(album.Title, KeywordTag);
+          Provider.ToolTip = album.Title;
+          
+          Provider.SecondaryLabel = zune:Search.Instance.HighlightKeywords(album.ArtistName, KeywordTag);
+          Provider.SecondaryToolTip = album.ArtistName;
+
+          if (album.ReleaseDate.Year > 1)
+          {
+            Provider.ThirdLabel = album.ReleaseDate.Year.ToString();
+            Provider.ThirdToolTip = Provider.ThirdLabel;
+          }
+        }
+      </Script>
+      
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(((marketplace:Album)Item).ImageUri)]
+
+        if (Item is marketplace:Album)
+        {
+          marketplace:Album album = (marketplace:Album)Item;
+          Model.Description = album.Title;
+
+          if (!String.IsNullOrEmpty(album.ImageUri))
+          {
+            Provider.Image = new Image(album.ImageUri, new Inset(0,0,0,0), ThumbnailSize);
+          }
+          else
+          {
+            Provider.Image = styles:Styles.NoAlbumArt;
+          }
+
+          
+          Provider.PrimaryLabel = zune:Search.Instance.HighlightKeywords(album.Title, KeywordTag);
+          Provider.ToolTip = album.Title;
+          
+          if (album.PrimaryArtist != null)
+          {
+            Provider.SecondaryLabel = zune:Search.Instance.HighlightKeywords(album.PrimaryArtist.Title, KeywordTag);
+            Provider.SecondaryToolTip = album.PrimaryArtist.Title;
+          }
+
+          if (album.ReleaseDate.Year > 1)
+          {
+            Provider.ThirdLabel = album.ReleaseDate.Year.ToString();
+            Provider.ThirdToolTip = Provider.PrimaryLabel;
+          }
+        }
+      </Script>
+      
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(((marketplace:Artist)Item).ImageUri)]
+
+        if (Item is marketplace:Artist)
+        {
+          marketplace:Artist artist = (marketplace:Artist)Item;
+          Model.Description = artist.Title;
+          
+
+          if (!String.IsNullOrEmpty(artist.ImageUri))
+          {
+            Provider.Image = new Image(artist.ImageUri);
+          }
+          else
+          {
+            Provider.Image = styles:Styles.NoAlbumArt;
+            
+            
+            ThumbButton.OverlayType = typeof(me:SearchOverlayLabel);
+          }
+          
+          
+          Provider.PrimaryLabel = zune:Search.Instance.HighlightKeywords(artist.Title, KeywordTag);
+          Provider.ToolTip = artist.Title;
+        }
+      </Script>
+      
+      <Script>
+        [DeclareTrigger(Model.Invoked)]
+        
+        
+        string destination;
+        col:Hashtable args;
+        
+        if (Item is data:Artist)
+        {
+          data:Artist artist = (data:Artist)Item;
+          
+          destination = "Collection\Music";
+          
+          args = new col:Hashtable();
+          args.Add("ArtistLibraryId", artist.LibraryId);
+          args.Add("ViewOverrideId", zune:MusicLibraryView.Browse);
+        }
+        else if (Item is data:Album)
+        {
+          data:Album album = (data:Album)Item;
+          
+          destination = "Collection\Music";
+          
+          args = new col:Hashtable();
+          args.Add("AlbumLibraryId", album.LibraryId);
+          args.Add("ArtistLibraryId", album.ArtistLibraryId);
+          args.Add("ViewOverrideId", zune:MusicLibraryView.Browse);
+        }
+        else if (Item is marketplace:Artist)
+        {
+          marketplace:Artist artist = (marketplace:Artist)Item;
+          
+          destination = "Marketplace\Music\Artist";
+          
+          args = new col:Hashtable();
+          args.Add("ArtistId", artist.Id.ToString());
+        }
+        else if (Item is marketplace:Album)
+        {
+          marketplace:Album album = (marketplace:Album)Item;
+
+          destination = "Marketplace\Music\Artist";
+          
+          args = new col:Hashtable();
+          args.Add("ArtistId", album.PrimaryArtist.Id.ToString());
+          args.Add("AlbumId", album.Id.ToString());
+          
+          
+        }
+        
+        
+        if (!String.IsNullOrEmpty(destination))
+        {
+          zune:Shell.DefaultInstance.Execute(destination, args);
+        }
+        
+      </Script>
+    </Scripts>
+    <Content>
+      <Panel MaximumSize="{ResultSize}" MinimumSize="{ResultSize}" Margins="0,5,10,0">
+        <Layout>
+          <FlowLayout Orientation="Vertical" ItemAlignment="Near"/>
+        </Layout>
+        <Children>
+          <me:SearchThumbnailButton Name="ThumbButton" Provider="{Provider}" Model="{Model}" TileSize="{ThumbnailSize}" NamedStyles="{NamedStyles}"/>
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="SearchThumbnailButton" Base="thumbbutton:ThumbnailButton">
+    <Properties>
+      <col:IDictionary Name="NamedStyles" IDictionary="{null}"/>
+      <Type Name="ThumbnailCaptionAreaType" Type="{typeof(me:SearchThumbnailCaptionArea)}"/>
+    </Properties>
+
+    <Scripts>
+      <Script>((me:SearchThumbnailCaptionArea)LabelArea).NamedStyles = [NamedStyles];</Script>
+    </Scripts>
+  </UI>
+  
+  
+  
+  
+  <UI Name="SearchThumbnailCaptionArea" Base="thumbbutton:ThumbnailCaptionArea">
+    <Properties>
+      <col:IDictionary Name="NamedStyles" IDictionary="{null}"/>
+      <me:SearchThumbnailProvider Name="Provider" SearchThumbnailProvider="$Required"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+        Label.NamedStyles = [NamedStyles];
+        SecondaryLabel.NamedStyles = NamedStyles;
+        ThirdLabel.NamedStyles = NamedStyles;
+      </Script>
+
+      <Script> Label.ToolTipContent = [Provider.ToolTip]; </Script>
+      <Script> SecondaryLabel.ToolTipContent = [Provider.SecondaryToolTip]; </Script>
+      <Script> ThirdLabel.Content = [Provider.ThirdLabel]; </Script>
+      <Script> ThirdLabel.ToolTipContent = [Provider.ThirdToolTip]; </Script>
+    </Scripts>
+    <Content>
+      <Panel Layout="VerticalFlow" Margins="{LabelInset}">
+        <Children>
+
+          
+          <thumbbutton:LabelHost Name="Label" Style="{PrimaryLabelStyle}"/>
+
+          
+          <thumbbutton:LabelHost Name="SecondaryLabel" Style="{SecondaryLabelStyle}"/>
+
+          
+          <thumbbutton:LabelHost Name="ThirdLabel" Style="{SecondaryLabelStyle}"/>
+          
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="MarketplaceResults" Base="me:SearchResults">
+    <Properties>
+      <zune:ZuneShell Name="Shell" ZuneShell="$Required"/>
+      <zune:ZunePage Name="Page" ZunePage="$Required"/>
+    </Properties>
+
+    <Locals>
+      <string Name="NotConnectedMessage" string="{zune:Shell.LoadString(zune:StringId.IDS_SEARCH_STATUS_OFFLINE)}"/>
+      <string Name="ServiceErrorMessage" string="{zune:Shell.LoadString(zune:StringId.IDS_SERVICE_OFFLINE)}"/>
+    </Locals>
+    <Scripts>
+      <Script> ScrollBar.RegionHover = [UI.DeepMouseFocus]; </Script>
+      
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(me:PageState.QueriesAllocated.Invoked)]
+        if (me:PageState.MarketplaceQueries != null)
+        {
+          LoadStatus.Tracker = me:PageState.MarketplaceQueries.Tracker;
+
+          ArtistResults.QueryState = me:PageState.MarketplaceQueries.Artist;
+          AlbumResults.QueryState = me:PageState.MarketplaceQueries.Album;
+          TrackResults.QueryState = me:PageState.MarketplaceQueries.Track;
+          MusicVideoResults.QueryState = me:PageState.MarketplaceQueries.MusicVideo;
+          PodcastResults.QueryState = me:PageState.MarketplaceQueries.Podcast;
+          PlaylistResults.QueryState = me:PageState.MarketplaceQueries.Playlist;
+        }
+      </Script>
+      
+      <Script>
+        ErrorPanel.Visible = [LoadStatus.Failure.Value];
+
+        if ([LoadStatus.Failure.Value])
+        {
+          bool haveInternetConnection = zune:InternetConnection.IsConnected;
+          
+          if (!haveInternetConnection)
+            ErrorPanel.Message = NotConnectedMessage;
+          else
+            ErrorPanel.Message = ServiceErrorMessage;
+        }
+      </Script>
+      
+      <Script>
+        if (me:PageState.MarketplaceQueries != null)
+        {
+          NoResultsPanel.Visible = ![ErrorPanel.Visible] &amp;&amp; ([me:PageState.MarketplaceQueries.Completed] &amp;&amp; ![me:PageState.MarketplaceQueries.ResultsFound]);
+        }
+      </Script>
+    </Scripts>
+    
+    <Content>
+      <Panel Padding="8,8,8,8" Layout="Form">
+        <Children>
+
+          <Text Name="Header" Content="{zune:Shell.LoadString(zune:StringId.IDS_SEARCH_MARKETPLACE_HEADER)}" Color="{styles:Styles.SectionSubHeadColor}" Font="{styles:Styles.SearchSubHeaderText}" Padding="0,0,0,15">
+            <LayoutInput>
+              <FormLayoutInput Left="Parent,0" Top="Parent,0"/>
+            </LayoutInput>
+          </Text>
+
+          <Panel Layout="Dock">
+            <LayoutInput>
+              <FormLayoutInput Left="Parent,0" Top="Header,1" Right="Parent,1" Bottom="Parent, 1"/>
+            </LayoutInput>
+
+            <Children>
+
+              <core:ScrollBar Name="ScrollBar" ScrollData="{ScrollData}">
+                <LayoutInput>
+                  <DockLayoutInput Position="Right" Alignment="Near"/>
+                </LayoutInput>
+              </core:ScrollBar>
+
+              <Scroller Orientation="Vertical" FadeSize="-1" ScrollingData="{ScrollData}">
+                <Children>
+
+                  <Panel>
+                    <Layout>
+                      <DockLayout SizeToChildren="true"  DefaultLayoutInput="Top,Near"/>
+                    </Layout>
+                    
+                    <Children>
+                      <me:ResultSet Name="ArtistResults"     Title="{zune:Shell.LoadString(zune:StringId.IDS_SEARCH_ARTISTS_HEADER)}"/>
+                      <me:ResultSet Name="AlbumResults"      Title="{zune:Shell.LoadString(zune:StringId.IDS_SEARCH_ALBUMS_HEADER)}" RepeatedUIName="RepeatedThumbnailItem" TextView="false" MaxResultSetHeight="140"/>
+                      <me:ResultSet Name="TrackResults"      Title="{zune:Shell.LoadString(zune:StringId.IDS_SEARCH_SONGS_HEADER)}" />
+                      <me:ResultSet Name="PlaylistResults"   Title="{zune:Shell.LoadString(zune:StringId.IDS_SEARCH_PLAYLISTS_HEADER)}"/>
+                      <me:ResultSet Name="MusicVideoResults" Title="{zune:Shell.LoadString(zune:StringId.IDS_SEARCH_VIDEOS_HEADER)}"/>
+                      <me:ResultSet Name="PodcastResults"    Title="{zune:Shell.LoadString(zune:StringId.IDS_SEARCH_SERIES_HEADER)}"/>
+                    </Children>
+                  </Panel>
+
+                </Children>
+              </Scroller>
+              
+            </Children>
+          </Panel>
+          
+          <mctl:LoadStatus Name="LoadStatus" Page="{Page}" Shell="{Shell}" NavigateToErrorPageOnFailure="false" DelayAmount="0.0">
+            <LayoutInput>
+              <FormLayoutInput Left="Parent,0" Top="Header,0" Right="Parent,1" Bottom="Parent, 1"/>
+            </LayoutInput>
+          </mctl:LoadStatus>
+
+          <me:MessagePanel Name="ErrorPanel">
+            <LayoutInput>
+              <FormLayoutInput Left="Header,0" Top="Header,1"/>
+            </LayoutInput>
+          </me:MessagePanel>
+
+          <me:MessagePanel Name="NoResultsPanel" Message="{zune:Shell.LoadString(zune:StringId.IDS_SEARCH_MARKETPLACE_NORESULTS)}">
+            <LayoutInput>
+              <FormLayoutInput Left="Header,0" Top="Header,1"/>
+            </LayoutInput>
+          </me:MessagePanel>
+          
+        </Children>
+      </Panel>       
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="MessagePanel">
+    <Properties>
+      <string Name="Message"/>
+    </Properties>
+    <Scripts>
+      <Script>
+        Label.Content = [Message];
+      </Script>
+    </Scripts>
+    <Content>
+      <core:Label Name="Label" Style="{styles:SharedStyles.SearchResultsStyle}" WordWrap="true">
+        <Animations>
+          <Animation Animation="{animations:Animations.BasicFadeIn}"/>
+          <Animation Animation="{animations:Animations.BasicFadeOut}"/>
+        </Animations>
+      </core:Label>
+    </Content>
+  </UI>
+</UIX>
diff --git a/test/2.1/SIGNINDIALOG.UIX b/test/2.1/SIGNINDIALOG.UIX
new file mode 100644
index 0000000..d670c33
--- /dev/null
+++ b/test/2.1/SIGNINDIALOG.UIX
@@ -0,0 +1,504 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:sys="assembly://mscorlib/System"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:svc="assembly://ZuneDBApi/Microsoft.Zune.Service"
+  xmlns:col="assembly://mscorlib/System.Collections"
+  xmlns:dialog="res://ZuneShellResources!Dialog.uix"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"  
+  xmlns:linkButtons="res://ZuneShellResources!LinkButtons.uix" 
+  xmlns:me="Me">
+
+  
+  
+  
+  
+
+  
+  
+  
+  <Class Name="SignInDialog" Base="dialog:Dialog">
+    <Properties>
+      
+      <Command Name="OnSuccess"/>
+      <Command Name="OnCancel" Command="{null}"/>
+
+      
+      <String Name="ContentUI" String="res://ZuneShellResources!SignInDialog.uix#SignInDialogContentUI"/>
+
+      
+      <iris:Command Name="SignInCommand" Description="{zune:Shell.LoadString(zune:StringId.IDS_LOGON_BUTTON)}"/>
+      <iris:Command Name="CreateAccountCommand" Description="{zune:Shell.LoadString(zune:StringId.IDS_CREATE_ACCOUNT_BUTTON)}"/>
+      <iris:Command Name="ViewTermsOfServiceCommand" Description="{zune:Shell.LoadString(zune:StringId.IDS_VIEW_TERMS_OF_SERVICE)}"/>
+
+      <EditableTextData Name="Username" MaxLength="255" />
+      <EditableTextData Name="Password" MaxLength="255" />
+
+      <iris:BooleanChoice Name="RememberUsername" Description="{zune:Shell.LoadString(zune:StringId.IDS_REMEMBER_USERNAME)}" Value="true"/>
+      <iris:BooleanChoice Name="RememberPassword" Description="{zune:Shell.LoadString(zune:StringId.IDS_REMEMBER_PASSWORD)}" Value="true"/>
+      <iris:BooleanChoice Name="SignInAtStartup" Description="{zune:Shell.LoadString(zune:StringId.IDS_AUTO_LOGON)}" Value="false"/>
+
+      <iris:Command Name="SelectUsernameCommand"/>
+      <EditableTextData Name="SelectUsernameText"/>
+
+      <String Name="StatusText"/>
+      <String Name="WebHelpUrl"/>
+      <col:IList Name="PersistedUsernames" IList="{null}"/>
+
+      <String Name="AccessibleDescription" String="{zune:Shell.LoadString(zune:StringId.IDS_LOGON_HEADER)}"/>
+    </Properties>
+
+    <Locals>
+      <zune:SignIn Name="SignIn" SignIn="{zune:SignIn.Instance}"/>
+    </Locals>
+
+    <Scripts>
+      
+      <Script>
+        if (![Helper.IsVisible])
+        {
+          StatusText = "";
+          WebHelpUrl = "";
+        }
+      </Script>
+      
+      
+      <Script>
+        PersistedUsernames = [SignIn.PersistedUsernames];
+
+        
+        if (PersistedUsernames != null &amp;&amp; PersistedUsernames.Count > 0)
+        {
+          String username = (String)PersistedUsernames.get_Item( 0 );
+          Username.Value = username;
+          RememberUsername.Value = true;
+          SignInAtStartup.Value = SignIn.SignInAtStartup(username);
+          RememberPassword.Value = !SignIn.PasswordRequired(username);
+          if ( RememberPassword.Value )
+          {
+            Password.Value = SignIn.PseudoPassword;
+          }
+          else
+          {
+            Password.Value = "";
+          }
+        }
+      </Script>
+      
+      
+      <Script>
+        [DeclareTrigger(SelectUsernameCommand.Invoked)]
+        Username.Value = SelectUsernameText.Value;
+        RememberUsername.Value = true;
+        SignInAtStartup.Value = SignIn.SignInAtStartup(SelectUsernameText.Value);
+        RememberPassword.Value = !SignIn.PasswordRequired(SelectUsernameText.Value);
+        if ( RememberPassword.Value )
+        {
+          Password.Value = SignIn.PseudoPassword;
+        }
+        else
+        {
+          Password.Value = "";
+        }
+      </Script>
+
+      
+      <Script>
+        if (![RememberUsername.Value])
+        {
+          RememberPassword.Value = false;
+          SignInAtStartup.Value = false;
+          Password.Value = "";
+        }
+      </Script>
+
+      <Script> 
+        if (![RememberPassword.Value])
+        {
+          SignInAtStartup.Value = false;
+          Password.Value = "";
+        }
+      </Script>
+
+      <Script> if ([RememberPassword.Value]) RememberUsername.Value = true; </Script>
+
+      <Script>
+        if ([SignInAtStartup.Value])
+        {
+          RememberPassword.Value = true;
+          RememberUsername.Value = true;
+        }
+      </Script>
+
+      
+      <Script>
+        SignInCommand.Available = ![SignIn.SigningIn] &amp;&amp; ([Username.Value] != "") &amp;&amp; ([Password.Value] != "");
+        CreateAccountCommand.Available = ![SignIn.SigningIn];
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(SignInCommand.Invoked)]
+        [DeclareTrigger(Username.Submitted)]
+        [DeclareTrigger(Password.Submitted)]
+        StatusText = zune:Shell.LoadString(zune:StringId.IDS_LOGON_STATUS);
+        SignInCommand.Available = false;
+        CreateAccountCommand.Available = false;
+        SignIn.SignInUser(Username.Value, Password.Value, RememberUsername.Value, RememberPassword.Value, SignInAtStartup.Value);
+      </Script>
+
+      
+      <Script>
+        ViewTermsOfServiceCommand.Available = [SignIn.SignInTermsOfServiceError];
+      </Script>
+
+      
+      <Script>
+        if ([SignIn.SignInErrorMessage] != null)
+        {
+          SignInCommand.Available = true;
+          StatusText = SignIn.SignInErrorMessage;
+          WebHelpUrl = SignIn.SignInErrorWebHelpUrl;
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(Cancel.Invoked)]
+        SignIn.CancelSignIn();
+        Helper.Hide();
+        
+        if (OnCancel != null)
+        {
+          OnCancel.Invoke();
+        }
+      </Script>
+
+      
+      <Script>
+        if ([SignIn.SignedIn])
+        {
+          Helper.Hide();
+          OnSuccess.Invoke();
+        }
+      </Script>
+
+      
+      <Script>
+        <![CDATA[
+        [DeclareTrigger(CreateAccountCommand.Invoked)]
+
+        String endpoint = svc:Service.GetEndPointUri(svc:EServiceEndpointId.SEID_AccountManagement);
+        String netendpoint = svc:Service.GetEndPointUri(svc:EServiceEndpointId.SEID_ZuneNet);
+        String returnurl = "/social/articles/backtosoftware.htm";
+        String createAcctUrl = endpoint + "/en-US/client/CreateAccount.ashx?ru=" + netendpoint + returnurl + "&aru=" + netendpoint + returnurl;
+
+        col:Hashtable args = new col:Hashtable();
+        args.Add("DoTransferAuthState", false);
+        zune:Shell.DefaultInstance.Execute("Web\" + createAcctUrl, args);
+        ]]>
+      </Script>
+
+      
+      <Script>
+        <![CDATA[
+        [DeclareTrigger(SignIn.SignInServiceNotProvisioned)]
+        if (SignIn.SignInServiceNotProvisioned)
+        {
+          String endpoint = svc:Service.GetEndPointUri(svc:EServiceEndpointId.SEID_AccountManagement);
+          String netendpoint = svc:Service.GetEndPointUri(svc:EServiceEndpointId.SEID_ZuneNet);
+          String returnurl = "/social/articles/backtosoftware.htm";
+          String createAcctUrl = endpoint + "/en-US/client/CreateAccount.ashx?ru=" + netendpoint + returnurl + "&aru=" + netendpoint + returnurl;
+
+          col:Hashtable args = new col:Hashtable();
+          args.Add("DoTransferAuthState", true);
+          zune:Shell.DefaultInstance.Execute("Web\" + createAcctUrl, args);
+        }
+        ]]>
+      </Script>
+
+      
+      <Script>
+        <![CDATA[
+        [DeclareTrigger(ViewTermsOfServiceCommand.Invoked)]
+
+        String endpoint = svc:Service.GetEndPointUri(svc:EServiceEndpointId.SEID_AccountManagement);
+        String netendpoint = svc:Service.GetEndPointUri(svc:EServiceEndpointId.SEID_ZuneNet);
+        String returnurl = "/social/articles/backtosoftware.htm";
+        String viewTermsOfServiceUrl = endpoint + "/en-US/client/CreateAccount.ashx?ru=" + netendpoint + returnurl + "&aru=" + netendpoint + returnurl;
+
+        col:Hashtable args = new col:Hashtable();
+        args.Add("DoTransferAuthState", false);
+        zune:Shell.DefaultInstance.Execute("Web\" + viewTermsOfServiceUrl, args);
+        ]]>
+      </Script>
+      
+      <Script>
+        [DeclareTrigger(Username.Value)]
+        if(((sys:String)Username.Value).Length == 1)
+        {
+          Password.Value = "";
+        }
+      </Script>
+
+    </Scripts>
+
+  </Class>
+
+  
+  
+  
+  <UI Name="SignInDialogContentUI" Base="dialog:DialogContentUI">
+    <Properties>
+      <me:SignInDialog Name="Dialog" SignInDialog="$Required"/>
+    </Properties>
+
+    <Locals>
+      <zune:WebHelpCommand Name="WebHelp" Description="{zune:Shell.LoadString(zune:StringId.IDS_DIALOG_WEBHELP)}"/>
+    </Locals>
+
+    <Input>
+      <KeyHandler Name="Enter" Key="Enter" HandlerStage="Bubbled"/>
+    </Input>
+
+    <Scripts>
+      <Script> PersistedUsers.Visible = [Dialog.PersistedUsernames] != null; </Script>
+      <Script> PersistedUsernamesList.Source = [Dialog.PersistedUsernames]; </Script>
+      <Script> UsernameEditbox.Model = [Dialog.Username]; </Script>
+      <Script> PasswordEditbox.Model = [Dialog.Password]; </Script>
+      <Script> WebHelp.Url = [Dialog.WebHelpUrl]; </Script>
+      <Script> WebHelpLink.Visible = !String.IsNullOrEmpty( [Dialog.WebHelpUrl] ); </Script>
+      <Script> ViewTermsOfService.Visible = [Dialog.ViewTermsOfServiceCommand.Available]; </Script>
+      <Script> Title.Content = zune:Shell.LoadString(zune:StringId.IDS_LOGON_HEADER);</Script>
+      <Script> UsernameTitle.Content = zune:Shell.LoadString(zune:StringId.IDS_USERNAME_HEADER);</Script>
+      <Script> PasswordTitle.Content = zune:Shell.LoadString(zune:StringId.IDS_PASSWORD_HEADER);</Script>
+
+      <Script> 
+        StatusText.Content = [Dialog.StatusText]; 
+        
+        
+        
+        if (String.IsNullOrEmpty(StatusText.Content))
+        {
+          StatusText.Content = " ";
+        }
+      </Script>
+      
+      <Script>
+        if ([Dialog.SignInCommand.Available])
+        {
+          Enter.Command = Dialog.SignInCommand;
+        }
+        else
+        {
+          Enter.Command = null;
+        }
+      </Script>
+
+    </Scripts>
+
+    <Content>
+      <Panel Navigation="ContainAll,WrapAll" MaximumSize="394,0" Padding="10,-3,0,10">
+        <Layout>
+          <FlowLayout ItemAlignment="Near" Orientation="Vertical"/>
+        </Layout>
+        <Children>
+
+          
+          <core:Label Name="Title" WordWrap="false" Style="{styles:SharedStyles.DialogLargeHeaderStyle}"/>
+
+          
+          <Panel Margins="0,-3,0,0">
+            <Layout>
+              <FlowLayout ItemAlignment="Near" Orientation="Vertical"/>
+            </Layout>
+            <Children>
+
+              <Panel Layout="HorizontalFlow">
+                <Children>
+
+                  <Panel Margins="0,0,18,0" Layout="VerticalFlow">
+                    <Children>
+
+                      <Text Name="UsernameTitle" Color="{styles:Styles.DialogHeaderColor}" Font="{styles:Styles.ButtonText}" WordWrap="false"  Margins="0,10,0,3" />
+
+                      <Panel Name="UsernameBox" Layout="Anchor">
+                        <Children>
+
+                          <core:Editbox Name="UsernameEditbox" Model="{Dialog.Username}" AccessibleDescription="{zune:Shell.LoadString(zune:StringId.IDS_USERNAME_HEADER)}" FocusOrder="0"/>
+
+                          <ColorFill Content="{styles:Styles.EditTextBorder}">
+                            <LayoutInput>
+                              <AnchorLayoutInput Left="UsernameEditbox,0" Top="UsernameEditbox,0" Right="UsernameEditbox,1" Bottom="UsernameEditbox,1"/>
+                            </LayoutInput>
+                            <Children>
+
+                              <ColorFill Content="{styles:Styles.EditTextBackground}" Margins="1,1,1,1"/>
+
+                            </Children>
+                          </ColorFill>
+
+                        </Children>
+                      </Panel>
+
+                    </Children>
+                  </Panel>
+
+                  <Panel Margins="0,0,7,0" Layout="VerticalFlow">
+                    <Children>
+
+                      <Text Name="PasswordTitle" Color="{styles:Styles.DialogHeaderColor}" Font="{styles:Styles.ButtonText}"
+                            WordWrap="false" Margins="0,10,0,3" />
+
+                      <Panel Name="PasswordBox" Layout="Anchor">
+                        <Children>
+
+                          <core:Editbox Name="PasswordEditbox" AccessibleDescription="{zune:Shell.LoadString(zune:StringId.IDS_PASSWORD_HEADER)}"
+                                        PasswordMasked="true" Model="{Dialog.Password}" FocusOrder="1"/>
+
+                          <ColorFill Content="{styles:Styles.EditTextBorder}">
+                            <LayoutInput>
+                              <AnchorLayoutInput Left="PasswordEditbox,0" Top="PasswordEditbox,0" Right="PasswordEditbox,1" Bottom="PasswordEditbox,1"/>
+                            </LayoutInput>
+                            <Children>
+
+                              <ColorFill Content="{styles:Styles.EditTextBackground}" Margins="1,1,1,1"/>
+
+                            </Children>
+                          </ColorFill>
+
+                        </Children>
+                      </Panel>
+
+                    </Children>
+                  </Panel>
+
+                </Children>
+              </Panel>
+
+              <Panel Name="PersistedUsers"  FocusOrder="2">
+                <Layout>
+                  <FlowLayout ItemAlignment="Near" Orientation="Vertical"/>
+                </Layout>
+                <Children>
+                  
+                  <Text Name="PersistedUsernamesTitle" Margins="0,11,0,0" Content="{zune:Shell.LoadString(zune:StringId.IDS_PERSISTED_USERS_HEADER)}" 
+                        Color="{styles:Styles.DialogHeaderColor}" Font="{styles:Styles.DialogListItem}" WordWrap="false"/>
+
+                  <Repeater Name="PersistedUsernamesList" Layout="VerticalFlow" Source="{Dialog.PersistedUsernames}">
+                    <Content>
+                      <me:SignInPersistedUsernameUI Margins="10,4,0,0" Description="{(String)RepeatedItem}" 
+                                                    SelectUsernameCommand="{Dialog.SelectUsernameCommand}" 
+                                                    SelectUsernameText="{Dialog.SelectUsernameText}"/>
+                    </Content>
+                  </Repeater>
+
+                  <ColorFill Name="Line" Content="{styles:Styles.EditTextBorder}" Margins="0,10,0,0" MaximumSize="370,1" MinimumSize="370,1"/>
+                  
+                </Children>
+              </Panel>
+
+              <core:CheckBox Model="{Dialog.RememberUsername}"  LabelFont="{styles:Styles.DialogText}" Margins="-2,10,0,0"  FocusOrder="3"/>
+              
+              <core:CheckBox Model="{Dialog.RememberPassword}"  LabelFont="{styles:Styles.DialogText}" Margins="-2,4,0,0"   FocusOrder="4"/>
+              
+              <core:CheckBox Model="{Dialog.SignInAtStartup}"   LabelFont="{styles:Styles.DialogText}" Margins="-2,4,0,0"   FocusOrder="5"/>
+
+            </Children>
+          </Panel>
+
+          
+          <Text Name="StatusText" Color="{styles:Styles.TextActive}" Font="{styles:Styles.SettingsText}" WordWrap="true" Margins="0,10,0,0" MaximumSize="370,0" />
+
+          
+          <linkButtons:ExternalLink Name="WebHelpLink" Model="{WebHelp}" Margins="0,10,0,0" ToolTipEnabled="false" FocusOrder="6"/>
+
+          
+          <linkButtons:ExternalLink Name="ViewTermsOfService" Model="{Dialog.ViewTermsOfServiceCommand}" Margins="0,10,0,0" ToolTipEnabled="false" FocusOrder="7"/>
+          
+          <linkButtons:ExternalLink Model="{Dialog.CreateAccountCommand}" FocusOrder="8" Margins="0,10,0,0">
+              <LayoutInput>
+                <DockLayoutInput Alignment="Near" Position="Left"/>
+              </LayoutInput>
+          </linkButtons:ExternalLink>
+
+          
+          <Panel Margins="0,10,0,0">
+            <Layout>
+              <DockLayout SizeToChildren="true" DefaultLayoutInput="Right,Near"/>
+            </Layout>
+            <Children>
+                            
+              <core:BigActionButton Name="Cancel" Model="{Dialog.Cancel}" Margins="0,0,10,0" ToolTipEnabled="false" FocusOrder="10"/>
+
+              <core:BigActionButton Name="SignInButton" Model="{Dialog.SignInCommand}" Margins="0,0,10,0" ToolTipEnabled="false" FocusOrder="9"/>
+
+            </Children>
+          </Panel>
+
+        </Children>
+      </Panel>
+      
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="SignInPersistedUsernameUI">
+    <Properties>
+      <iris:Command Name="SelectUsernameCommand" Command="$Required"/>
+      <EditableTextData Name="SelectUsernameText" EditableTextData="$Required"/>
+      <String Name="Description" String="$Required"/>
+    </Properties>
+
+    <Locals>
+      <iris:Command Name="SelectCommand"/>
+      <iris:Command Name="RemoveCommand" Description="{zune:Shell.LoadString(zune:StringId.IDS_REMOVE_PERSISTED_USER)}"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        if ([UI.DeepMouseFocus] || [UI.DeepKeyFocus])
+        {
+          Remove.Alpha = 1.0;
+        }
+        else
+        {
+          Remove.Alpha = 0.0;
+        }
+      </Script>
+
+      <Script> 
+        SelectCommand.Description = [Description]; 
+      </Script>
+      
+      <Script>
+        [DeclareTrigger(SelectCommand.Invoked)]
+        SelectUsernameText.Value = Description;
+        SelectUsernameCommand.Invoke();
+      </Script>
+
+      <Script>
+        [DeclareTrigger(RemoveCommand.Invoked)]
+        zune:SignIn.Instance.RemovePersistedUsername(Description);
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel MouseInteractive="true">
+        <Layout>
+          <FlowLayout Orientation="Horizontal" Spacing="6,0"/>
+        </Layout>
+        <Children>
+          <core:Button OverrideStyle="{styles:SharedStyles.DialogButtonStyle}" Model="{SelectCommand}"/>
+          <core:Button OverrideStyle="{styles:SharedStyles.DialogButtonStyle}" Name="Remove" Model="{RemoveCommand}"/>
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/SLIDER.UIX b/test/2.1/SLIDER.UIX
new file mode 100644
index 0000000..6244a92
--- /dev/null
+++ b/test/2.1/SLIDER.UIX
@@ -0,0 +1,737 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:style="res://ZuneShellResources!Style.uix"  
+  xmlns:button="res://ZuneShellResources!Button.uix"  
+  xmlns:me="Me"
+  >
+
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  <UI Name="Slider">
+    <Properties>
+      <Image   Name="BackgroundImage" Image="{styles:Styles.SliderBackground}"/>
+      <Image   Name="FilledBackgroundImage" Image="{null}"/>
+      <Image   Name="ThumbImage" Image="{styles:Styles.SliderThumb}"/>
+      <Image   Name="ThumbImageFocus" Image="{styles:Styles.SliderHoverThumb}"/>
+      <Int32   Name="ThumbOffset" Int32="4"/>
+      <Single  Name="KeyDelta" Single="1.0"/>
+      <Single  Name="KeyDeltaShift" Single="0.0"/>
+      <Single  Name="KeyDeltaCtrl" Single="0.0"/>
+      <Single  Name="KeyDeltaCtrlShift" Single="0.0"/>
+      <Single  Name="KeyDeltaPage" Single="1.0"/>
+
+      
+      
+      <Int32  Name="FillAdjustment" Int32="3"/>
+
+      <Command Name="ValueChanged" Command="{null}"/>
+      <Single  Name="UpdateValue"/>
+
+      <Boolean Name="AutoUpdateDuringDrag" Boolean="true"/>
+      <Boolean Name="CancelDragOnModelChange" Boolean="true"/>
+      <Boolean Name="Dragging"/>
+      <Boolean Name="ReadOnly" Boolean="false"/>
+      <Boolean Name="DiscreteValues" Boolean="false"/>
+      <iris:RangedValue Name="Model" RangedValue="$Required"/>
+      <Boolean Name="KeyFocusOnMouseDown" Boolean="true"/>
+      <String Name="AccessibleDescription" String="{null}"/>
+      <String Name="AccessibleValue" String="{null}"/>
+    </Properties>
+
+    <Input>
+      <DragHandler Name="Dragger" CancelOnEscape="true"/>
+
+      <KeyHandler Name="KH_PGU"   Key="PageUp"   Command="{PageUpValue}"               DisallowedModifiers="Ctrl,Shift,Alt,Windows"/>
+      <KeyHandler Name="KH_PGD"   Key="PageDown" Command="{PageDownValue}"             DisallowedModifiers="Ctrl,Shift,Alt,Windows"/>
+      <KeyHandler Name="KH_HOM"   Key="Home"     Command="{OnHome}"                    DisallowedModifiers="Ctrl,Shift,Alt,Windows"/>
+      <KeyHandler Name="KH_END"   Key="End"      Command="{OnEnd}"                     DisallowedModifiers="Ctrl,Shift,Alt,Windows"/>
+
+      <KeyHandler Name="KH_L"     Key="Left"     Command="{DecrementValue}"            DisallowedModifiers="Ctrl,Shift,Alt,Windows"/>
+      <KeyHandler Name="KH_U"     Key="Up"       Command="{IncrementValue}"            DisallowedModifiers="Ctrl,Shift,Alt,Windows"/>
+      <KeyHandler Name="KH_R"     Key="Right"    Command="{IncrementValue}"            DisallowedModifiers="Ctrl,Shift,Alt,Windows"/>
+      <KeyHandler Name="KH_D"     Key="Down"     Command="{DecrementValue}"            DisallowedModifiers="Ctrl,Shift,Alt,Windows"/>
+
+      <KeyHandler Name="KH_S_L"   Key="Left"     Command="{DecrementValueShift}"       RequiredModifiers="Shift" DisallowedModifiers="Ctrl,Alt,Windows"/>
+      <KeyHandler Name="KH_S_U"   Key="Up"       Command="{IncrementValueShift}"       RequiredModifiers="Shift" DisallowedModifiers="Ctrl,Alt,Windows"/>
+      <KeyHandler Name="KH_S_R"   Key="Right"    Command="{IncrementValueShift}"       RequiredModifiers="Shift" DisallowedModifiers="Ctrl,Alt,Windows"/>
+      <KeyHandler Name="KH_S_D"   Key="Down"     Command="{DecrementValueShift}"       RequiredModifiers="Shift" DisallowedModifiers="Ctrl,Alt,Windows"/>
+
+      <KeyHandler Name="KH_C_L"   Key="Left"     Command="{DecrementValueCtrl}"        RequiredModifiers="Ctrl" DisallowedModifiers="Shift,Alt,Windows"/>
+      <KeyHandler Name="KH_C_U"   Key="Up"       Command="{IncrementValueCtrl}"        RequiredModifiers="Ctrl" DisallowedModifiers="Shift,Alt,Windows"/>
+      <KeyHandler Name="KH_C_R"   Key="Right"    Command="{IncrementValueCtrl}"        RequiredModifiers="Ctrl" DisallowedModifiers="Shift,Alt,Windows"/>
+      <KeyHandler Name="KH_C_D"   Key="Down"     Command="{DecrementValueCtrl}"        RequiredModifiers="Ctrl" DisallowedModifiers="Shift,Alt,Windows"/>
+
+      <KeyHandler Name="KH_CS_L"  Key="Left"     Command="{DecrementValueCtrlShift}"   RequiredModifiers="Ctrl,Shift" DisallowedModifiers="Alt,Windows"/>
+      <KeyHandler Name="KH_CS_U"  Key="Up"       Command="{IncrementValueCtrlShift}"   RequiredModifiers="Ctrl,Shift" DisallowedModifiers="Alt,Windows"/>
+      <KeyHandler Name="KH_CS_R"  Key="Right"    Command="{IncrementValueCtrlShift}"   RequiredModifiers="Ctrl,Shift" DisallowedModifiers="Alt,Windows"/>
+      <KeyHandler Name="KH_CS_D"  Key="Down"     Command="{DecrementValueCtrlShift}"   RequiredModifiers="Ctrl,Shift" DisallowedModifiers="Alt,Windows"/>
+    </Input>
+
+    <Locals>
+      <AnchorLayoutInput Name="ThumbLayoutInput"
+        ContributesToWidth="false" Horizontal="Center"
+        Top="Parent,0" Left="Parent,0,-999" Right="Parent,0,999"/>
+
+      <AnchorLayoutInput Name="FillLayoutInput"
+        Top="Parent,0" Left="Parent,0" Right="Parent,0"/>
+
+      <AnchorLayoutInput Name="DummyLayoutInput"/>
+
+      <Command Name="IncrementValue"/>
+      <Command Name="IncrementValueShift"/>
+      <Command Name="IncrementValueCtrl"/>
+      <Command Name="IncrementValueCtrlShift"/>
+      <Command Name="DecrementValue"/>
+      <Command Name="DecrementValueShift"/>
+      <Command Name="DecrementValueCtrl"/>
+      <Command Name="DecrementValueCtrlShift"/>
+      <Command Name="PageUpValue"/>
+      <Command Name="PageDownValue"/>
+      <Command Name="OnHome"/>
+      <Command Name="OnEnd"/>
+
+      <Single  Name="RawKeyDelta"/>
+      <Single  Name="RawKeyDeltaShift"/>
+      <Single  Name="RawKeyDeltaCtrl"/>
+      <Single  Name="RawKeyDeltaCtrlShift"/>
+      <Single  Name="RawKeyDeltaPage"/>
+
+      <float Name="InitialValue"/>
+      <float Name="ThumbPosition"/>
+
+      <Accessible Name="Accessible"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        if ([Accessible.Enabled])
+        {
+          Accessible.Name = [AccessibleDescription];
+          Accessible.Value = [AccessibleValue];
+          Accessible.Role = AccessibleRole.Slider;
+        }
+      </Script>
+
+      <Script>
+        Dragger.RelativeTo = DragRect;
+
+        DragRect.Margins = new Inset(ThumbOffset,0,ThumbOffset,0);
+
+        FilledBackground.Visible = ([FilledBackgroundImage] != null);
+      </Script>
+
+      <Script>
+        UI.KeyFocusOnMouseDown = [KeyFocusOnMouseDown];
+      </Script>
+
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(KeyDelta)]
+        [DeclareTrigger(KeyDeltaShift)]
+        [DeclareTrigger(KeyDeltaCtrl)]
+        [DeclareTrigger(KeyDeltaCtrlShift)]
+        [DeclareTrigger(KeyDeltaPage)]
+        [DeclareTrigger(Model.MaxValue)]
+        [DeclareTrigger(Model.MinValue)]
+        [DeclareTrigger(ReadOnly)]
+
+        
+
+        float range = (Model.MaxValue - Model.MinValue);
+
+        if ( [KeyDelta] &lt; 0.0 )
+        {
+           RawKeyDelta = (-1.0 * KeyDelta) * range;
+        }
+        else
+        {
+           RawKeyDelta = KeyDelta;
+        }
+
+        if ( [KeyDeltaShift] &lt; 0.0 )
+        {
+           RawKeyDeltaShift = (-1.0 * KeyDeltaShift) * range;
+        }
+        else
+        {
+           RawKeyDeltaShift = KeyDeltaShift;
+        }
+
+        if ( [KeyDeltaCtrl] &lt; 0.0 )
+        {
+           RawKeyDeltaCtrl = (-1.0 * KeyDeltaCtrl) * range;
+        }
+        else
+        {
+           RawKeyDeltaCtrl = KeyDeltaCtrl;
+        }
+
+        if ( [KeyDeltaCtrlShift] &lt; 0.0 )
+        {
+           RawKeyDeltaCtrlShift = (-1.0 * KeyDeltaCtrlShift) * range;
+        }
+        else
+        {
+           RawKeyDeltaCtrlShift = KeyDeltaCtrlShift;
+        }
+
+        if ( [KeyDeltaPage] &lt; 0.0 )
+        {
+           RawKeyDeltaPage = (-1.0 * KeyDeltaPage) * range;
+        }
+        else
+        {
+           RawKeyDeltaPage = KeyDeltaPage;
+        }
+
+        
+        
+
+        bool enable = (KeyDelta != 0.0 &amp;&amp; !ReadOnly);
+
+        KH_L.Enabled     = enable;
+        KH_U.Enabled     = enable;
+        KH_R.Enabled     = enable;
+        KH_D.Enabled     = enable;
+
+        enable = (KeyDeltaShift != 0.0 &amp;&amp; !ReadOnly);
+
+        KH_S_L.Enabled   = enable;
+        KH_S_U.Enabled   = enable;
+        KH_S_R.Enabled   = enable;
+        KH_S_D.Enabled   = enable;
+
+        enable = (KeyDeltaCtrl != 0.0 &amp;&amp; !ReadOnly);
+
+        KH_C_L.Enabled   = enable;
+        KH_C_U.Enabled   = enable;
+        KH_C_R.Enabled   = enable;
+        KH_C_D.Enabled   = enable;
+
+        enable = (KeyDeltaCtrlShift != 0.0 &amp;&amp; !ReadOnly);
+
+        KH_CS_L.Enabled  = enable;
+        KH_CS_U.Enabled  = enable;
+        KH_CS_R.Enabled  = enable;
+        KH_CS_D.Enabled  = enable;
+
+        KH_PGU.Enabled   = (KeyDeltaPage != 0.0 &amp;&amp; !ReadOnly);
+        KH_PGD.Enabled   = (KeyDeltaPage != 0.0 &amp;&amp; !ReadOnly);
+        KH_HOM.Enabled   = (!ReadOnly);
+        KH_END.Enabled   = (!ReadOnly);
+      </Script>
+
+      <Script>
+        [DeclareTrigger(OnHome.Invoked)]
+        Model.Value = Model.MinValue;
+        UpdateValue = Model.Value;
+
+        if (ValueChanged != null)
+           ValueChanged.Invoke();
+      </Script>
+
+      <Script>
+        [DeclareTrigger(OnEnd.Invoked)]
+        Model.Value = Model.MaxValue;
+        UpdateValue = Model.Value;
+
+        if (ValueChanged != null)
+           ValueChanged.Invoke();
+      </Script>
+
+      <Script>
+        [DeclareTrigger(PageUpValue.Invoked)]
+        Model.Value = Model.Value + RawKeyDeltaPage;
+        UpdateValue = Model.Value;
+
+        if (ValueChanged != null)
+           ValueChanged.Invoke();
+      </Script>
+
+      <Script>
+        [DeclareTrigger(PageDownValue.Invoked)]
+        Model.Value = Model.Value - RawKeyDeltaPage;
+        UpdateValue = Model.Value;
+
+        if (ValueChanged != null)
+           ValueChanged.Invoke();
+      </Script>
+
+      <Script>
+        [DeclareTrigger(DecrementValue.Invoked)]
+        Model.Value = Model.Value - RawKeyDelta;
+        UpdateValue = Model.Value;
+
+        if (ValueChanged != null)
+           ValueChanged.Invoke();
+      </Script>
+
+      <Script>
+        [DeclareTrigger(DecrementValueShift.Invoked)]
+        Model.Value = Model.Value - RawKeyDeltaShift;
+        UpdateValue = Model.Value;
+
+        if (ValueChanged != null)
+           ValueChanged.Invoke();
+      </Script>
+
+      <Script>
+        [DeclareTrigger(DecrementValueCtrl.Invoked)]
+        Model.Value = Model.Value - RawKeyDeltaCtrl;
+        UpdateValue = Model.Value;
+
+        if (ValueChanged != null)
+           ValueChanged.Invoke();
+      </Script>
+
+      <Script>
+        [DeclareTrigger(DecrementValueCtrlShift.Invoked)]
+        Model.Value = Model.Value - RawKeyDeltaCtrlShift;
+        UpdateValue = Model.Value;
+
+        if (ValueChanged != null)
+           ValueChanged.Invoke();
+      </Script>
+
+      <Script>
+        [DeclareTrigger(IncrementValue.Invoked)]
+        Model.Value = Model.Value + RawKeyDelta;
+        UpdateValue = Model.Value;
+
+        if (ValueChanged != null)
+           ValueChanged.Invoke();
+      </Script>
+
+      <Script>
+        [DeclareTrigger(IncrementValueShift.Invoked)]
+        Model.Value = Model.Value + RawKeyDeltaShift;
+        UpdateValue = Model.Value;
+
+        if (ValueChanged != null)
+           ValueChanged.Invoke();
+      </Script>
+
+      <Script>
+        [DeclareTrigger(IncrementValueCtrl.Invoked)]
+        Model.Value = Model.Value + RawKeyDeltaCtrl;
+        UpdateValue = Model.Value;
+
+        if (ValueChanged != null)
+           ValueChanged.Invoke();
+      </Script>
+
+      <Script>
+        [DeclareTrigger(IncrementValueCtrlShift.Invoked)]
+        Model.Value = Model.Value + RawKeyDeltaCtrlShift;
+        UpdateValue = Model.Value;
+
+        if (ValueChanged != null)
+           ValueChanged.Invoke();
+      </Script>
+
+      <Script>
+        Dragger.Enabled = ![ReadOnly];
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Model.MinValue)]
+        [DeclareTrigger(Model.MaxValue)]
+
+        
+        
+
+        if (Dragging &amp;&amp; CancelDragOnModelChange)
+        {
+           Dragger.CancelDrag();
+           Dragging = false;
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Dragger.Started)]
+        InitialValue = Model.Value;
+        UpdateValue = Model.Value;
+        Dragging = true;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Dragging)]
+        [DeclareTrigger(Dragger.EndPosition)]
+        [DeclareTrigger(Model.MaxValue)]
+        [DeclareTrigger(Model.MinValue)]
+
+        
+
+        if (Dragging)
+        {
+           float min   = Model.MinValue;
+           float max   = Model.MaxValue;
+           float step  = Model.Step;
+           float raw   = Dragger.EndPosition.X * (max - min);
+
+           
+           if (DiscreteValues)
+           {
+              raw = step * (float)(int)((raw / step) + 0.5);
+           }
+
+           float value = min + raw;
+
+           
+           
+           
+
+           if (value &lt; min)
+              value = min;
+           else if (value &gt; max)
+              value = max;
+
+           
+
+           UpdateValue = value;
+
+           
+
+           if (AutoUpdateDuringDrag)
+           {
+              Model.Value = UpdateValue;
+
+              if (ValueChanged != null)
+                 ValueChanged.Invoke();
+           }
+        }
+      </Script>
+
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(Model.MaxValue)]
+        [DeclareTrigger(Model.MinValue)]
+        [DeclareTrigger(Model.Value)]
+        [DeclareTrigger(Dragging)]
+        [DeclareTrigger(FilledBackground.Visible)]
+
+        float min = Model.MinValue;
+        float max = Model.MaxValue;
+        float pos = (Model.Value - min) / (max - min);
+
+        
+        
+
+        
+        
+        
+
+        if (FilledBackground.Visible)
+        {
+           FilledBackground.LayoutInput = DummyLayoutInput;
+
+           FillLayoutInput.Right.Percent = pos;
+           FillLayoutInput.Left.Offset = (-1 * ThumbOffset) + FillAdjustment;
+
+           FilledBackground.LayoutInput = FillLayoutInput;
+        }
+
+        
+        
+        
+        
+
+        if (AutoUpdateDuringDrag || !Dragging)
+        {
+           ThumbPosition = pos;
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(UpdateValue)]
+        [DeclareTrigger(Model.MaxValue)]
+        [DeclareTrigger(Model.MinValue)]
+        [DeclareTrigger(Dragging)]
+
+        
+        
+        
+        
+        
+
+        if (Dragging &amp;&amp; !AutoUpdateDuringDrag)
+        {
+           float min = Model.MinValue;
+           float max = Model.MaxValue;
+           float pos = (UpdateValue - min) / (max - min);
+
+           ThumbPosition = pos;
+        }
+      </Script>
+
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(ThumbPosition)]
+
+        
+
+        Thumb.LayoutInput = DummyLayoutInput;
+
+        ThumbLayoutInput.Left.Percent  = ThumbPosition;
+        ThumbLayoutInput.Right.Percent = ThumbPosition;
+
+        Thumb.LayoutInput = ThumbLayoutInput;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Dragger.Cancelled)]
+
+        
+        
+        
+        
+        
+        
+
+        if (AutoUpdateDuringDrag)
+        {
+           Model.Value = InitialValue;
+           UpdateValue = Model.Value;
+
+           if (ValueChanged != null)
+              ValueChanged.Invoke();
+        }
+
+        Dragging = false;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Dragger.Ended)]
+
+        if (!AutoUpdateDuringDrag)
+        {
+           Model.Value = UpdateValue;
+
+           if (ValueChanged != null)
+              ValueChanged.Invoke();
+        }
+
+        Dragging = false;
+      </Script>
+
+      <Script>
+        if ([UI.MouseFocus])
+        {
+           Thumb.Content = [ThumbImageFocus];
+        }
+        else
+        {
+           Thumb.Content = [ThumbImage];
+        }
+      </Script>
+
+      <Script>FilledBackground.Content = [FilledBackgroundImage];</Script>
+      <Script>Background.Content = [BackgroundImage];</Script>
+    </Scripts>
+
+    <Content>
+      <Panel Name="Root" Layout="Anchor">
+        <Children>
+
+          <Panel Name="DragRect" Layout="Form">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Background,0" Right="Background,1" Top="Background,0" Bottom="Background,1"/>
+            </LayoutInput>
+            <Children>
+              <Graphic Name="Thumb" Content="{ThumbImage}"/>
+              <Graphic Name="FilledBackground" Content="{FilledBackgroundImage}"/>
+            </Children>
+          </Panel>
+
+          <Graphic Name="Background" Content="{BackgroundImage}">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Parent,0" Right="Parent,1"/>
+            </LayoutInput>
+          </Graphic>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+
+  <UI Name="ChoiceSlider">
+    <Properties>
+      <Int32   Name="ThumbOffset" Int32="4"/>
+      <iris:Choice Name="Model"/>
+      <String Name="AccessibleDescription" String="{null}"/>
+    </Properties>
+
+    <Locals>
+      <iris:RangedValue Name="RawModel"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        RawModel.MinValue = 0.0;
+        if ((Model == null) || (Model.Options == null))
+        {
+          RawModel.MaxValue = 0.0;
+          RawModel.Value    = 0.0;
+        }
+        else
+        {
+          RawModel.MaxValue = (float)([Model.Options.Count] - 1);
+          RawModel.Value    = (float)[Model.ChosenIndex];
+        }
+      </Script>
+      <Script>
+        if ((Model != null) &amp;&amp; (Model.Options != null))
+        {
+          Model.ChosenIndex = (int)[RawModel.Value];
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      <me:Slider
+        ThumbOffset="{ThumbOffset}"
+        Model="{RawModel}"
+        DiscreteValues="true"
+        AccessibleDescription="{AccessibleDescription}"
+        />
+    </Content>
+  </UI>
+
+  
+  <UI Name="LabeledChoiceSlider">
+    <Properties>
+      <String Name="MinValueString" String="$Required"/>
+      <String Name="MaxValueString" String="$Required"/>
+      <iris:Choice Name="Model" Choice="$Required"/>
+      <String Name="AccessibleDescription" String="{null}"/>
+      <style:Style Name="TextStyle" Color="{styles:Styles.TextActive}" Font="{styles:Styles.SettingsText}"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+        Slider.Model = [Model];
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Name="SliderPanel">
+        <Layout>
+          <FlowLayout Orientation="Horizontal" ItemAlignment="Center" Spacing="10,0"/>
+        </Layout>
+
+        <Children>
+          <button:Label Content="{MinValueString}" Style="{TextStyle}"  WordWrap="false"/>
+          <me:ChoiceSlider
+            Name="Slider"
+            Model="{null}"
+            MaximumSize="75,0"
+            AccessibleDescription="{AccessibleDescription}"/>
+          <button:Label Content="{MaxValueString}" Style="{TextStyle}"  WordWrap="false"/>
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+</UIX>
diff --git a/test/2.1/SOCIALNAVIGATION.UIX b/test/2.1/SOCIALNAVIGATION.UIX
new file mode 100644
index 0000000..8043f41
--- /dev/null
+++ b/test/2.1/SOCIALNAVIGATION.UIX
@@ -0,0 +1,19 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI">
+
+  <Class Name="Navigation" Shared="true">
+    <Properties>
+      <zune:DictionaryCommandHandler Name="Root">
+        <Handlers>
+
+          
+          <zune:InboxNavigationCommandHandler Name="Inbox"/>
+
+        </Handlers>
+      </zune:DictionaryCommandHandler>
+    </Properties>
+  </Class>
+
+</UIX>
diff --git a/test/2.1/SPLITTER.UIX b/test/2.1/SPLITTER.UIX
new file mode 100644
index 0000000..d45fb81
--- /dev/null
+++ b/test/2.1/SPLITTER.UIX
@@ -0,0 +1,508 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX xmlns="http://schemas.microsoft.com/2007/uix"
+     xmlns:iris="assembly://UIX/Microsoft.Iris"
+     xmlns:zune="assembly://ZuneShell/ZuneUI" 
+     xmlns:sys="assembly://mscorlib/System"
+     xmlns:styles="res://ZuneShellResources!Styles.uix"
+     xmlns:animations="res://ZuneShellResources!Animations.uix"
+     xmlns:me="Me">
+  
+  
+
+
+  <Class Name="Positions">
+    <Properties>
+      
+
+
+      <List Name="DefaultPositions"/>
+
+      
+      <String Name="SaveKeyPrefix" String=""/>
+
+      
+      
+      <List Name="ActualPositions"/>
+      
+      
+      <Command Name="PositionsChanged"/>
+    </Properties>
+    
+    <Scripts>
+      
+      <Script>
+        List positions;
+        
+        if (!String.IsNullOrEmpty(SaveKeyPrefix))
+        {
+          positions = zune:Shell.GetPositionList(SaveKeyPrefix + "Positions", DefaultPositions.Count);
+        }
+        if (positions == null)
+        {
+          
+          positions = DefaultPositions;
+        }
+        
+        foreach(float position in positions)
+        {
+            iris:RangedValue positionRangeValue = new iris:RangedValue();
+            positionRangeValue.Value = position;
+            ActualPositions.Add(positionRangeValue);
+        }
+      </Script>
+      
+      
+      <Script>
+        [DeclareTrigger(PositionsChanged.Invoked)]
+        
+        if (!String.IsNullOrEmpty(SaveKeyPrefix))
+        {
+          zune:Shell.SaveRangedValueList(SaveKeyPrefix + "Positions", ActualPositions);
+        }
+      </Script>
+    </Scripts>
+  </Class>
+  
+  
+
+
+
+  <UI Name="SplitPanel">
+    <Properties>
+      <zune:LibraryPanel Name="Model" LibraryPanel="$Required"/>
+      <zune:ZunePage Name="Page" ZunePage="$Required"/>
+      <Command Name="PositionsChanged" Command="$Required"/>
+    </Properties>
+    <Scripts>
+      <Script> Self.RequestSource([Model.UI], "Model", Model, "Page", Page); </Script>
+      
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(Model.MinimumWidth)]
+        [DeclareTrigger(Model.MinimumPercent)]
+        PositionsChanged.Invoke();
+      </Script>
+    </Scripts>
+    <Content>
+      <Host Name="Self" FocusOrder="0">
+        <Animations>
+          <Animation Animation="{animations:Animations.ListFadeIn}"/>
+          <Animation Animation="{animations:Animations.ListContentChange}"/>
+        </Animations>
+      </Host>
+    </Content>
+  </UI>
+
+
+  
+
+
+
+  <UI Name="Splitter">
+    <Properties>
+      <zune:ZunePage Name="Page" ZunePage="$Required"/>
+      
+      
+      <iris:ArrayListDataSet Name="Panels" ArrayListDataSet="{null}"/>
+      
+      <me:Positions Name="Positions" Positions="{null}"/>
+      
+      
+      <Int32 Name="GripperWidth" Int32="10"/>
+      
+      <Int32 Name="PreviewWidth" Int32="4"/>
+      <Boolean Name="ShowPreview" Boolean="false"/>
+    </Properties>
+    
+    <Locals>
+      <Command Name="PositionsChanged"/>
+    </Locals>
+    
+    <Scripts>
+      <Script> Repeater.Source = [Panels]; </Script>
+      
+      <Script> 
+        if ([Positions] != null)
+          Grippers.Source = Positions.ActualPositions; 
+        else
+          Grippers.Source = null;
+        
+        
+        
+        
+        
+        PositionsChanged.Invoke();
+      </Script>
+      
+      <Script>  
+        [DeclareTrigger(PositionsChanged.Invoked)]
+        
+        
+        
+        
+        
+        
+        
+        int minimumWidth = 0;
+        
+        
+        
+        int i = 0;
+        foreach (zune:LibraryPanel panel in (List)Panels)
+        {
+          AnchorLayoutInput input = (AnchorLayoutInput)panel.get_Item("LayoutInput");
+          
+          if (input != null)
+          {
+            float leftPercent = 0.0;
+            
+            if (i != 0)
+            {
+              leftPercent = ((iris:RangedValue)Positions.ActualPositions.GetItem(i - 1)).Value;
+            }
+            
+            input.Left = new AnchorEdge("Parent", leftPercent, minimumWidth);
+            
+            
+            
+            
+            
+            minimumWidth = minimumWidth + panel.MinimumWidth;
+            
+            float rightPercent = 1.0;
+            
+            if (i != Panels.Count - 1)
+            {
+              rightPercent = ((iris:RangedValue)Positions.ActualPositions.GetItem(i)).Value;
+            }
+            
+            input.Right = new AnchorEdge("Parent", rightPercent, minimumWidth);
+            
+            
+
+            
+            minimumWidth = minimumWidth + GripperWidth;
+          }
+          
+          i = i + 1;
+        }
+        
+        
+        
+        
+        
+        Inset margins = new Inset(0, 0, minimumWidth, 0);
+        
+        Grippers.Margins = margins;
+        Repeater.Margins = margins;
+        
+       
+        
+        
+        Layout temp = Repeater.Layout;
+        Repeater.Layout = null;
+        Repeater.Layout = temp;
+      </Script>
+    </Scripts>
+    
+    <Content>
+      <Panel>
+        <Children>
+      
+          
+          <Repeater Name="Grippers" Layout="Form">
+            <Content>
+              
+              <me:Gripper Position="{(iris:RangedValue)RepeatedItem}" 
+                          Panels="{Panels}" Positions="{Positions}" Index="{RepeatedItemIndex}"
+                          GripperWidth="{GripperWidth}" 
+                          PreviewWidth="{PreviewWidth}" ShowPreview="{ShowPreview}" 
+                          PositionsChanged="{PositionsChanged}" />
+              
+            </Content>
+          </Repeater>
+          
+          
+          <Repeater Name="Repeater" Layout="Form">
+            <Content>
+              
+              <me:SplitPanel Model="{(zune:LibraryPanel)RepeatedItem}"
+                             Page="{Page}" 
+                             PositionsChanged="{PositionsChanged}" >
+                <LayoutInput>
+                  <Script>
+                    
+                    AnchorLayoutInput input = new AnchorLayoutInput();
+                    input.Top = new AnchorEdge("Parent", 0.0);
+                    input.Bottom = new AnchorEdge("Parent", 1.0);
+                    
+                    
+                    zune:LibraryPanel panel = (zune:LibraryPanel)RepeatedItem;
+                    panel.set_Item("LayoutInput", input);
+                    
+                    return input;
+                  </Script>
+                </LayoutInput>
+              </me:SplitPanel>
+              
+            </Content>
+          </Repeater>
+          
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+  
+  
+  
+
+
+
+  <UI Name="Gripper">
+    <Properties>
+      <iris:RangedValue Name="Position" RangedValue="$Required"/>
+      
+      <List Name="Panels" List="$Required"/>
+      <me:Positions Name="Positions" Positions="$Required"/>
+      
+      <Int32 Name="GripperWidth" Int32="$Required"/>
+      
+      <Index Name="Index" Index="$Required"/>
+      
+      <Int32 Name="PreviewWidth" Int32="4"/>
+      <Boolean Name="ShowPreview" Boolean="$Required"/>
+      
+      
+      <Command Name="PositionsChanged" Command="$Required"/>
+    </Properties>
+
+    <Locals>
+      
+      <AnchorLayoutInput Name="LayoutInput" Top="Parent,0" Bottom="Parent,1"/>
+      
+      
+      <AnchorLayoutInput Name="PreviewInput" Top="Parent,0" Bottom="Parent,1"/>
+      
+      
+      <Single Name="InitialPosition"/>
+      
+      
+      <Single Name="CurrentPosition"/>
+    </Locals>
+    
+    <Input>
+      
+      <DragHandler Name="Dragger" CancelOnEscape="true"/>
+    </Input>
+    
+    <Scripts>
+      <Script> 
+        UI.Cursor = Cursor.SizeWE; 
+        LayoutInput.Left = new AnchorEdge("Parent", 0.0);
+        LayoutInput.Right = new AnchorEdge("Parent", 0.0, GripperWidth);
+      </Script>
+      
+      <Script>
+        [DeclareTrigger(Position.Value)]
+                
+        
+        PositionsChanged.Invoke();
+      </Script>
+      
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(PositionsChanged.Invoked)]
+        LayoutInput.Left.Percent = Position.Value;
+        LayoutInput.Right.Percent = Position.Value;
+                
+        
+        
+        int minimumWidth = 0;
+        
+        int i = 0;
+        foreach (zune:LibraryPanel panel in (List)Panels)
+        {
+          minimumWidth = minimumWidth + panel.MinimumWidth + GripperWidth;
+          
+          if (i == Index.Value)
+          {
+            LayoutInput.Left.Offset = minimumWidth - GripperWidth;
+            LayoutInput.Right.Offset = minimumWidth;
+            
+          }
+          
+          i = i + 1;
+        }
+        
+        
+        
+        Layout temp = Root.Layout;
+        Root.Layout = null;
+        Root.Layout = temp;
+      </Script>
+      
+      <Script>
+        [DeclareTrigger(Dragger.Cancelled)]
+        
+        CurrentPosition = InitialPosition;
+      </Script>
+      
+      <Script>
+        [DeclareTrigger(Dragger.Started)]
+        
+        
+        InitialPosition = ((iris:RangedValue)Positions.ActualPositions.GetItem(Index.Value)).Value;
+        CurrentPosition = InitialPosition;
+        if (ShowPreview)
+        {
+          PreviewInput.Left = new AnchorEdge("Parent", 0.0);
+          PreviewInput.Right = new AnchorEdge("Parent", 0.0);
+        
+          Preview.Visible = true;
+        }
+      </Script>
+        
+      <Script>
+        [DeclareTrigger(Dragger.Ended)]
+        
+        if (ShowPreview)
+        {
+          Position.Value = CurrentPosition;
+        }
+        Preview.Visible = false;
+        
+        
+        Positions.PositionsChanged.Invoke();
+      </Script>
+      
+      <Script>
+        
+        
+        [DeclareTrigger(Dragger.RelativeDragSize)]
+        
+        
+        if (Dragger.Dragging)
+        {
+        
+          
+        
+          
+          
+          
+          
+          
+          
+          
+          
+          
+          
+          
+          
+          
+          
+                  
+          zune:LibraryPanel leftPanel = (zune:LibraryPanel)Panels.GetItem(Index.Value);
+          zune:LibraryPanel rightPanel = (zune:LibraryPanel)Panels.GetItem(Index.Value + 1);
+          
+          float previousPosition = 0.0;
+          if (Index.Value > 0)
+            previousPosition = ((iris:RangedValue)Positions.ActualPositions.GetItem(Index.Value - 1)).Value;
+          
+          float nextPosition = 1.0;
+          if (Index.Value &lt; Positions.ActualPositions.Count - 1)
+            nextPosition = ((iris:RangedValue)Positions.ActualPositions.GetItem(Index.Value + 1)).Value;
+          
+          
+          
+          
+          float min = previousPosition + leftPanel.MinimumPercent;
+          float max = nextPosition - rightPanel.MinimumPercent;
+          
+          float currentPosition = InitialPosition + Dragger.RelativeDragSize.X;
+          
+          currentPosition = sys:Math.Max(min, sys:Math.Min(currentPosition, max));
+          
+          
+          
+          
+          CurrentPosition = currentPosition;
+        
+        }
+      </Script>
+      
+      <Script>
+        [DeclareTrigger(CurrentPosition)]
+        
+        
+        if (ShowPreview)
+        {
+        
+          PreviewInput.Left.Percent = CurrentPosition;
+          PreviewInput.Right.Percent = CurrentPosition;
+          
+          
+          
+          int minimumWidth = 0;
+          
+          int i = 0;
+          foreach (zune:LibraryPanel panel in (List)Panels)
+          {
+            minimumWidth = minimumWidth + panel.MinimumWidth + GripperWidth;
+            
+            if (i == Index.Value)
+            {
+              int diff = (GripperWidth - PreviewWidth) / 2;
+              PreviewInput.Left.Offset = minimumWidth - GripperWidth + diff;
+              PreviewInput.Right.Offset = minimumWidth - diff;
+              
+            }
+            
+            i = i + 1;
+          }
+          
+          
+          
+          
+          
+          Layout temp = Root.Layout;
+          Root.Layout = null;
+          Root.Layout = temp;
+        }
+        else 
+        {
+          Position.Value = CurrentPosition;
+        }
+      </Script>
+    </Scripts>
+    
+    <Content>
+      <Panel Name="Root" Layout="Form" MouseInteractive="false">
+        <Animations>
+          <Animation Animation="{animations:Animations.ListFadeIn}"/>
+          <Animation Animation="{animations:Animations.ListContentChange}"/>
+        </Animations>
+        <Children>
+
+          
+          <Panel Name="Gripper" LayoutInput="{LayoutInput}" MouseInteractive="true"
+                 Margins="0,38,0,0" Layout="Anchor">
+            <Children>
+              
+              
+              <Graphic Content="{styles:Styles.DividerVertical}">
+                <LayoutInput>
+                  <AnchorLayoutInput Left="Parent,0" Top="Parent,0" Bottom="Parent,1"/>
+                </LayoutInput>
+              </Graphic>
+              
+            </Children>
+          </Panel>
+
+          <ColorFill Name="Preview" Content="100,0,0,0" LayoutInput="{PreviewInput}" Visible="false"/>
+          
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+  
+</UIX>
\ No newline at end of file
diff --git a/test/2.1/SPREADSHEETVIEWBASE.UIX b/test/2.1/SPREADSHEETVIEWBASE.UIX
new file mode 100644
index 0000000..f46309e
--- /dev/null
+++ b/test/2.1/SPREADSHEETVIEWBASE.UIX
@@ -0,0 +1,2429 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:sys="assembly://mscorlib/System"
+  xmlns:col="assembly://mscorlib/System.Collections"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:style="res://ZuneShellResources!Style.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:images="res://ZuneShellResources!ImageStyle.uix"
+  xmlns:animations="res://ZuneShellResources!Animations.uix"
+  xmlns:tooltip="res://ZuneShellResources!ToolTip.uix"
+  xmlns:drag="res://ZuneShellResources!DragFeedback.uix"
+  xmlns:contentList="res://ZuneShellResources!ContentList.uix"
+  xmlns:actionprogressbutton="res://ZuneShellResources!ActionProgressButton.uix"
+  xmlns:me="Me">
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+
+  
+  
+  
+  <Class Name="ColumnData">
+    <Properties>
+      <List Name="Columns" List="$Required"/>
+      <Boolean Name="CanReorderColumns" Boolean="false"/>
+
+      
+      <Boolean Name="HideColumns" Boolean="false"/>
+
+      
+      <Int32 Name="FixedColumns" Int32="0"/>
+
+      <Object Name="SortedColumn" Object="{null}"/>
+      <Boolean Name="SortAscending" Boolean="true"/>
+
+      
+      <String Name="SaveKeyPrefix" String=""/>
+
+      <Boolean Name="SaveColumnWidths" Boolean="true"/>
+      <Boolean Name="SaveColumnOrder" Boolean="false"/>
+      <Boolean Name="SaveColumnVisibility" Boolean="false"/>
+      <Boolean Name="SaveSort" Boolean="true"/>
+
+      
+
+      <List Name="OrderedColumns" List="{null}"/>
+      
+
+      <iris:ArrayListDataSet Name="DisplayedColumns"/>
+      <Command Name="ColumnWidthsChanged"/>
+      <Command Name="ColumnOrderChanged"/>
+      <Command Name="ColumnVisibilityChanged"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+        
+        foreach(me:ColumnInfoBase column in Columns)
+          column.VisibilitiesChanged.Add(ColumnVisibilityChanged);
+      </Script>
+      
+      
+      <Script>
+        if (SaveColumnWidths &amp;&amp; !String.IsNullOrEmpty(SaveKeyPrefix))
+        {
+          List savedWidths = zune:Shell.GetPositiveIntList(SaveKeyPrefix + "Widths", Columns.Count);
+
+          if (savedWidths != null)
+          {
+            int i = 0;
+            foreach(me:ColumnInfoBase column in Columns)
+            {
+              column.ColumnSize.Size = new Size((int)savedWidths.GetItem(i), 0);
+              i = i + 1;
+            }
+          }
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(ColumnWidthsChanged.Invoked)]
+
+        if (SaveColumnWidths &amp;&amp; !String.IsNullOrEmpty(SaveKeyPrefix))
+        {
+          List widths = new List();
+          foreach(me:ColumnInfoBase column in Columns)
+            widths.Add(column.ColumnSize.Size.Width);
+
+          zune:Shell.SaveIntList(SaveKeyPrefix + "Widths", widths);
+        }
+      </Script>
+
+      
+      <Script>
+        if (CanReorderColumns)
+        {
+          List savedOrder = null;
+          if (SaveColumnOrder &amp;&amp; !String.IsNullOrEmpty(SaveKeyPrefix))
+            savedOrder = zune:Shell.GetReorderedIntList(SaveKeyPrefix + "Order", Columns.Count);
+
+          OrderedColumns = new iris:ArrayListDataSet();
+          if (savedOrder != null)
+          {
+            int i = 0;
+            foreach(int orderIndex in savedOrder)
+            {
+              OrderedColumns.Add(Columns.GetItem(orderIndex));
+              i = i + 1;
+            }
+          }
+          else 
+          {
+            foreach(me:ColumnInfoBase column in Columns)
+                OrderedColumns.Add(column);
+          }
+        }
+        else
+        {
+          
+          OrderedColumns = Columns;
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(ColumnOrderChanged.Invoked)]
+        if (SaveColumnOrder &amp;&amp; !String.IsNullOrEmpty(SaveKeyPrefix))
+        {
+          List order = new List();
+          foreach(me:ColumnInfoBase column in OrderedColumns)
+          {
+            order.Add( ((col:IList)Columns).IndexOf(column) );
+          }
+
+          zune:Shell.SaveIntList(SaveKeyPrefix + "Order", order);
+        }
+      </Script>
+      
+            
+      
+      <Script>
+        if (SaveColumnVisibility &amp;&amp; !String.IsNullOrEmpty(SaveKeyPrefix))
+        {
+          List savedVisibilities = zune:Shell.GetIntList(SaveKeyPrefix + "Visibilities", Columns.Count);
+
+          if (savedVisibilities != null)
+          {
+            int i = 0;
+            foreach(int visible in savedVisibilities)
+            {
+              me:ColumnInfoBase column = (me:ColumnInfoBase)Columns.GetItem(i);
+
+              column.Visible = (bool)visible;
+
+              i = i + 1;
+            }
+          }
+        }
+        
+        
+        foreach(me:ColumnInfoBase column in OrderedColumns)
+        {
+          if (column.Visible)
+            DisplayedColumns.Add(column);
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(ColumnVisibilityChanged.Invoked)]
+        if (SaveColumnVisibility &amp;&amp; !String.IsNullOrEmpty(SaveKeyPrefix))
+        {
+          List visibilities = new List();
+          foreach(me:ColumnInfoBase column in Columns)
+          {
+            visibilities.Add((int)column.Visible);
+          }
+          
+          zune:Shell.SaveIntList(SaveKeyPrefix + "Visibilities", visibilities);
+        }
+      </Script>
+      
+      <Script>
+        [DeclareTrigger(ColumnOrderChanged.Invoked)]
+        [DeclareTrigger(ColumnVisibilityChanged.Invoked)]
+        
+        
+        
+        
+        int visibleColumnCount = 0;
+        foreach(me:ColumnInfoBase column in OrderedColumns)
+        {
+          int displayIndex = DisplayedColumns.IndexOf(column);
+          if (column.Visible)
+          {
+            if (displayIndex == -1)
+            {
+              DisplayedColumns.Insert(visibleColumnCount, column);
+            }
+            else if (displayIndex > visibleColumnCount)
+            {
+              DisplayedColumns.Move(displayIndex, visibleColumnCount);
+            }
+            else if (displayIndex &lt; visibleColumnCount)
+            {
+              
+              
+              
+            }
+            
+            visibleColumnCount = visibleColumnCount + 1;
+          }
+          else if (displayIndex != -1)
+          {
+            DisplayedColumns.RemoveAt(displayIndex);
+          }
+        }
+      </Script>
+
+      
+      <Script>
+        if (SaveSort &amp;&amp; !String.IsNullOrEmpty(SaveKeyPrefix))
+        {
+          
+          int i = 0;
+          int defaultSortedColumn = -1;
+          foreach (me:ColumnInfoBase column in Columns)
+          {
+            if (column.SortBy == SortedColumn)
+            {
+              defaultSortedColumn = i;
+              
+            }
+            i = i + 1;
+          }
+
+          
+          int sortedColumnIndex = zune:Shell.GetInt(SaveKeyPrefix + "SortColumn", 0, Columns.Count - 1, defaultSortedColumn);
+
+          if (sortedColumnIndex != -1)
+          {
+            
+            SortedColumn = ((me:ColumnInfoBase)Columns.GetItem(sortedColumnIndex)).SortBy;
+
+            
+            SortAscending = (bool)zune:Shell.GetInt(SaveKeyPrefix + "SortAscending", 0, 1, (int)SortAscending);
+          }
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(SortedColumn)]
+
+        if (SaveSort &amp;&amp; !String.IsNullOrEmpty(SaveKeyPrefix))
+        {
+          int i = 0;
+          int sortedColumn = 0;
+          foreach (me:ColumnInfoBase column in Columns)
+          {
+            if (column.SortBy == SortedColumn)
+            {
+              sortedColumn = i;
+              
+            }
+            i = i + 1;
+          }
+
+          zune:Shell.SaveInt(SaveKeyPrefix + "SortColumn", sortedColumn);
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(SortAscending)]
+
+        if (SaveSort &amp;&amp; !String.IsNullOrEmpty(SaveKeyPrefix))
+        {
+          zune:Shell.SaveInt(SaveKeyPrefix + "SortAscending", (int)SortAscending);
+        }
+      </Script>
+    </Scripts>
+  </Class>
+
+  
+  
+  
+  <Class Name="SpreadSheetListModel">
+    <Properties>
+      <me:ColumnData Name="ColumnData" ColumnData="{null}"/>
+      <SelectionManager Name="SelectionManager" SelectionManager="{null}"/>
+    </Properties>
+  </Class>
+
+
+  
+  
+  
+  
+  
+  <UI Name="SpreadSheet" Base="core:ReorderableListBase">
+    <Properties>
+      <me:ColumnData Name="ColumnData" ColumnData="$Required"/>
+      <me:SpreadSheetListModel Name="ListModel"/>
+
+      <Type Name="ListItemType" Type="{typeof(me:SpreadSheetListItem)}"/>
+
+      <Boolean Name="ShowColumnDividers" Boolean="false"/>
+
+      <Boolean Name="AllowHorizontalScrolling" Boolean="true"/>
+      <Boolean Name="AllowVerticalScrolling" Boolean="true"/>
+      <Inset Name="ScrollbarMargins" Inset="0,0,11,11"/>
+
+      <Boolean Name="SizeToChildren" Boolean="false"/>
+
+      <Boolean Name="AnimateItems" Boolean="True"/>
+      <Single Name="FadeSize" Single="-1.0"/>
+      <style:Style Name="OverrideStyle" Style="{null}"/>
+      <Boolean Name="CanDrag" Boolean="true"/>
+
+      <Boolean Name="ShowHeaders" Boolean="true"/>
+      <Boolean Name="HighlightHeaders" Boolean="true"/>
+      <style:Style Name="HeaderStyle" Style="{styles:SharedStyles.ColumnHeaderStyleSet}"/>
+
+
+
+      <Int32 Name="HeaderHeight" Int32="16"/>
+      <Int32 Name="HeaderSpacing" Int32="26"/> 
+
+      <core:ContextMenu Name="HeaderContextMenu" ContextMenu="{null}"/>
+
+      <Size Name="RowSize" Size="{styles:Styles.ListItemSize}"/>
+      <Inset Name="RowPadding" Inset="{styles:Styles.ListItemMargins}"/>
+
+      <Size Name="LayoutSpacing" Size="0,0"/>
+      <GridLayout Name="ListLayout" Orientation="Vertical" ReferenceSize="{RowSize}" Spacing="{LayoutSpacing}"/>
+
+      
+      <Int32 Name="FixedItems" Int32="0"/>
+    </Properties>
+
+    <Locals>
+      <ScrollingData Name="VerticalScrollData"/>
+      <ScrollingData Name="HorizontalScrollData"/>
+
+      
+      <DockLayout Name="NoHideColumnLayout" SizeToChildren="true" DefaultLayoutInput="Left,Near"/>
+
+      <Layout Name="ColumnLayout">
+        <Layout>
+          <Script>
+            if (ColumnData.HideColumns)
+              return (Layout)new StackLayout();
+            return (Layout)NoHideColumnLayout;
+          </Script>
+        </Layout>
+      </Layout>
+      <me:ListEditState Name="EditState"/>
+
+      <TransformAnimation Name="FadeXForm" TimeScale="1.0" Source="{animations:Animations.ListContentChange}"/>
+
+      <AnchorLayoutInput Name="VerticalScrollBarPosition" Right="Scroller,1" Horizontal="Far"
+                Top="Scroller,0" Vertical="Center"
+                ContributesToWidth="false" ContributesToHeight="false">
+        <Bottom>
+          <AnchorEdge Id="Scroller" Percent="1" Offset="{-1 * ScrollbarMargins.Bottom}"/>
+        </Bottom>
+      </AnchorLayoutInput>
+
+      <AnchorLayoutInput Name="VerticalScrollerPosition" Left="Parent,0" Top="Parent,0"/>
+
+      
+      <Command Name="ScrollUpCommand"/>
+      <Command Name="ScrollDownCommand"/>
+    </Locals>
+
+    <Input>
+      
+      <ScrollingHandler Name="VerticalScrollHandler" ScrollingData="{VerticalScrollData}"/>
+      <ScrollingHandler Name="HorizontalScrollHandler" ScrollingData="{HorizontalScrollData}"/>
+    </Input>
+
+    <Scripts>
+      <Script>
+        ListModel.ColumnData = ColumnData;
+        ListModel.SelectionManager = SelectionManager;
+      </Script>
+      <Script>
+        protected_VerticalScrollData = VerticalScrollData;
+        protected_HorizontalScrollData = HorizontalScrollData;
+      </Script>
+      <Script>
+        Headers.Visible = [ShowHeaders];
+
+        int offset = 0;
+        if (ShowHeaders)
+          offset = HeaderHeight + HeaderSpacing;
+
+        VerticalScrollBarPosition.Top.Offset = offset;
+        VerticalScrollerPosition.Top.Offset = offset;
+      </Script>
+      <Script>Dividers.Visible = [ShowColumnDividers];</Script>
+      <Script>Headers.ContextMenu = [HeaderContextMenu];</Script>
+      <Script>
+        
+        if(!AnimateItems)
+        {
+          
+          
+          
+          
+          FadeXForm.TimeScale = 0.01;
+         }
+      </Script>
+
+
+      <Script>
+        if (![AllowHorizontalScrolling])
+        {
+          HorzScrollBar.Visible = false;
+          HorizontalScrollData.Enabled = false;
+        }
+      </Script>
+      <Script>
+        if (![AllowVerticalScrolling])
+        {
+          VertScrollBar.Visible = false;
+          VerticalScrollData.Enabled = false;
+        }
+      </Script>
+
+      <Script>
+        
+        VertScrollBar.RegionHover = [UI.DeepMouseFocus] &amp;&amp; ![Headers.DeepMouseFocus];
+        HorzScrollBar.RegionHover = UI.DeepMouseFocus &amp;&amp; !Headers.DeepMouseFocus;
+      </Script>
+
+      
+      <Script>PopupRelativeToList.PlacementTarget = Scroller;</Script>
+
+      
+      <Script>
+        if ([CanReorder])
+        {
+          Repeater.ContentName = "ReorderableItem";
+          if (Content != null)
+          {
+            LastIndicator.Index = [Content.Count];
+          }
+        }
+        else
+          Repeater.ContentName = "Item";
+      </Script>
+
+
+      
+      <Script>
+        [InitialEvaluate(false)]
+        if (![UI.DeepKeyFocus])
+        {
+          EditState.InEditMode = false;
+        }
+      </Script>
+
+      <Script>
+        EditingList.Value = [EditState.InEditMode];
+      </Script>
+
+      
+      <Script>
+        bool inEditMode = [EditState.InEditMode];
+
+        if (inEditMode)
+        {
+          Repeater.Navigation = NavigationPolicies.ContainAll;
+          EditState.Cancelled = false;
+        }
+        else
+        {
+          Repeater.Navigation = NavigationPolicies.None;
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Target.EventContext)]
+        
+        object context = Target.EventContext;
+
+        if (context is Command)
+        {
+          
+          
+          ((Command)context).Invoke();
+
+          
+          
+          
+          
+          
+          
+          ScrollUp.Scale = new Vector3(0.0,1.0,1.0);
+          ScrollDown.Scale = new Vector3(0.0,1.0,1.0);
+        }
+        else if (context is int)
+        {
+          
+          
+          ScrollUp.Scale = new Vector3(1.0,1.0,1.0);
+          ScrollDown.Scale = new Vector3(1.0,1.0,1.0);
+        }
+      </Script>
+
+      <Script> ScrollUp.Visible = [VerticalScrollData.CanScrollUp];  </Script>
+      <Script> ScrollDown.Visible = [VerticalScrollData.CanScrollDown]; </Script>
+
+      
+      <Script>
+        [DeclareTrigger(ScrollUpCommand.Invoked)]
+        VerticalScrollData.ScrollUp();
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(ScrollDownCommand.Invoked)]
+        VerticalScrollData.ScrollDown();
+      </Script>
+
+    </Scripts>
+
+    <Content>
+      <Panel Layout="Anchor" Navigation="TabGroup" MouseInteractive="false">
+        <Children>
+
+          
+          <core:ScrollBar Name="VertScrollBar" ScrollData="{VerticalScrollData}"
+                          LayoutInput="{VerticalScrollBarPosition}"/>
+
+          <core:ScrollBar Name="HorzScrollBar" ScrollData="{HorizontalScrollData}" Horizontal="true">
+            <LayoutInput>
+              <AnchorLayoutInput Bottom="Scroller,1" Vertical="Far"
+                Left="Scroller,0" Right="Scroller,1,-10" Horizontal="Center"
+                ContributesToWidth="false" ContributesToHeight="false"/>
+            </LayoutInput>
+          </core:ScrollBar>
+
+          
+          <Scroller Name="Scroller" Orientation="Horizontal" ScrollingData="{HorizontalScrollData}"
+                    Margins="{ScrollbarMargins}" FadeSize="{FadeSize}">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Parent,0" Top="Parent,0"/>
+            </LayoutInput>
+            <Children>
+
+              <Panel Name="Panel" Navigation="ContainDirectional,RememberFocus">
+                <Layout>
+                  <AnchorLayout SizeToHorizontalChildren="true" SizeToVerticalChildren="{SizeToChildren}"/>
+                </Layout>
+                <Children>
+
+                  
+                  
+                  <Panel Name="HeadersPanel">
+                    <LayoutInput>
+                      <AnchorLayoutInput Left="Parent,0" Top="Parent,0"/>
+                    </LayoutInput>
+                    <Children>
+
+                      <me:ColumnHeaders Name="Headers" ColumnData="{ColumnData}"
+                                        ListModel="{ListModel}" HeaderSpacing="{HeaderSpacing}"
+                                        ListLayout="{ColumnLayout}" HighlightHeaders="{HighlightHeaders}"
+                                        HeaderHeight="{HeaderHeight}" HeaderStyle="{HeaderStyle}"
+                                        EditState="{EditState}"/>
+
+                    </Children>
+                  </Panel>
+
+                  
+                  <core:DropZone Name="ScrollUp" Context="{ScrollUpCommand}"
+                                 IsVisible="{IsDragging}">
+                    <LayoutInput>
+                      <AnchorLayoutInput Top="VertScroller,0" Bottom="VertScroller,0,30"
+                                         Left="VertScroller,0" Right="VertScroller,1"
+                                         ContributesToWidth="false" ContributesToHeight="false"/>
+                    </LayoutInput>
+                  </core:DropZone>
+
+                  
+                  <core:DropZone Name="ScrollDown" Context="{ScrollDownCommand}"
+                                 IsVisible="{IsDragging}">
+                    <LayoutInput>
+                      <AnchorLayoutInput Top="VertScroller,1,-30" Bottom="VertScroller,1"
+                                         Left="VertScroller,0" Right="VertScroller,1"
+                                         ContributesToWidth="false" ContributesToHeight="false"/>
+                    </LayoutInput>
+                  </core:DropZone>
+
+                  
+                  <me:ColumnDividers Name="Dividers" Columns="{ColumnData.DisplayedColumns}" ColumnLayout="{ColumnLayout}"
+                                     ColumnWidthsChanged="{ColumnData.ColumnWidthsChanged}">
+                    <LayoutInput>
+                      <AnchorLayoutInput Left="Parent,0" Top="VertScroller,0" Bottom="VertScroller,1"/>
+                    </LayoutInput>
+                  </me:ColumnDividers>
+
+                  
+                  <Scroller Name="VertScroller" Orientation="Vertical" ScrollingData="{VerticalScrollData}"
+                            FadeSize="{FadeSize}" Prefetch="0.5" LayoutInput="{VerticalScrollerPosition}"
+                            MouseInteractive="true">
+                    <Children>
+
+                      <Panel Layout="Anchor">
+                        <Children>
+
+                          
+                          <Graphic Name="SelectionRect" Content="{styles:Styles.DragSelectRect}"/>
+
+                          <Panel Name="Background" Layout="Anchor" FillView="{!SizeToChildren}">
+                            <LayoutInput>
+                              <AnchorLayoutInput Left="Parent,0" Top="Parent,0" />
+                            </LayoutInput>
+
+                            <Children>
+
+                              
+                              <Repeater Name="Repeater" Layout="{ListLayout}" DiscardOffscreenVisuals="true">
+                                <LayoutInput>
+                                  <AnchorLayoutInput Left="Parent,0" Top="Parent,0" />
+                                </LayoutInput>
+                                <Animations>
+                                  <TransformAnimation TransformAnimation="{FadeXForm}"/>
+                                </Animations>
+                              </Repeater>
+
+                              <core:Indicator Name="LastIndicator" InsertAtIndex="{InsertIndex}" MinimumSize="0, 1">
+                                <LayoutInput>
+                                  <AnchorLayoutInput Left="Repeater,0" Right="Repeater,1" Top="Repeater,1"/>
+                                </LayoutInput>
+                              </core:Indicator>
+
+                            </Children>
+                          </Panel>
+
+                        </Children>
+                      </Panel>
+
+                    </Children>
+                  </Scroller>
+
+                </Children>
+              </Panel>
+
+            </Children>
+          </Scroller>
+
+        </Children>
+      </Panel>
+    </Content>
+
+    <Content Name="Item">
+      <me:SpreadSheetListItem SpreadSheetListItem="{ListItemType}"
+        EditState="{EditState}"
+        Model="{RepeatedItem}"
+        ListModel="{ListModel}"
+        Index="{RepeatedItemIndex}"
+        Columns="{ColumnData.DisplayedColumns}"
+        NavigateIntoArgs="{NavigateIntoArgs}"
+        SelectionManager="{SelectionManager}"
+        OverrideStyle="{OverrideStyle}"
+        ColumnLayout="{ColumnLayout}"
+        CanDrag="{CanDrag}"
+        Navigation="Row"
+        RowPadding="{RowPadding}"
+        RowSize="{RowSize}"/>
+    </Content>
+
+    <Content Name="ReorderableItem">
+      <Panel Layout="Anchor">
+        <Children>
+
+          
+          
+          <core:ItemDropZone Index="{RepeatedItemIndex}" IsVisible="{IsDragging}"
+                             ValidTarget="{RepeatedItemIndex.Value >= FixedItems}">
+            <LayoutInput>
+              <AnchorLayoutInput Top="Item, 0" Bottom="Item, 0.5" Left="Item,0" Right="Item,1"
+                                 ContributesToWidth="false" ContributesToHeight="false"/>
+            </LayoutInput>
+          </core:ItemDropZone>
+
+          
+          <core:ItemDropZone Index="{RepeatedItemIndex}" IndexModifier="1" IsVisible="{IsDragging}"
+                             ValidTarget="{RepeatedItemIndex.Value + 1 >= FixedItems}">
+            <LayoutInput>
+              <AnchorLayoutInput Top="Item, 0.5" Left="Item,0" Right="Item,1"
+                                 ContributesToWidth="false" ContributesToHeight="false">
+                <Bottom>
+                  
+                  <AnchorEdge Id="Item" Percent="1" Offset="{LayoutSpacing.Height}"/>
+                </Bottom>
+              </AnchorLayoutInput>
+            </LayoutInput>
+          </core:ItemDropZone>
+
+          
+          <core:Indicator Index="{RepeatedItemIndex}" InsertAtIndex="{InsertIndex}"
+                          MinimumSize="0, 1">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Item, 0" Right="Item, 1"  Top="Item, 0"
+                                 ContributesToWidth="false" ContributesToHeight="false"/>
+            </LayoutInput>
+          </core:Indicator>
+
+          <me:SpreadSheetListItem Name="Item" SpreadSheetListItem="{ListItemType}"
+            EditState="{EditState}"
+            Model="{RepeatedItem}"
+            ListModel="{ListModel}"
+            Index="{RepeatedItemIndex}"
+            Columns="{ColumnData.DisplayedColumns}"
+            NavigateIntoArgs="{NavigateIntoArgs}"
+            SelectionManager="{SelectionManager}"
+            OverrideStyle="{OverrideStyle}"
+            IsDragging="{IsDragging}"
+            DraggingIndex="{DraggingIndex}"
+            ColumnLayout="{ColumnLayout}"
+            DisplayDragFeedback="false"
+            CanDrag="{RepeatedItemIndex.Value >= FixedItems &amp;&amp; CanDrag}"
+            RowPadding="{RowPadding}"
+            RowSize="{RowSize}"
+            />
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+
+  
+  
+  
+  
+  
+  <UI Name="ColumnDividers">
+    <Properties>
+      <List Name="Columns" List="$Required"/>
+      <Layout Name="ColumnLayout" Layout="$Required"/>
+      <Command Name="ColumnWidthsChanged" Command="$Required"/>
+    </Properties>
+
+    <Content>
+      <Repeater Source="{Columns}" Layout="{ColumnLayout}">
+        <Content>
+
+          <me:ColumnDivider LayoutInput="{((me:ColumnInfo)RepeatedItem).LayoutInput}"
+                            Columns="{Columns}"
+                            ColumnInfo="{(me:ColumnInfo)RepeatedItem}"
+                            ColumnWidthsChanged="{ColumnWidthsChanged}"
+                            Index="{RepeatedItemIndex}"/>
+
+        </Content>
+      </Repeater>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="ColumnDivider">
+    <Properties>
+      <List Name="Columns" List="$Required"/>
+      <me:ColumnInfo Name="ColumnInfo" ColumnInfo="$Required"/>
+      <Command Name="ColumnWidthsChanged" Command="$Required"/>
+      <Index Name="Index" Index="$Required"/>
+    </Properties>
+
+    <Scripts>
+      <Script> Line.Visible = [Index.Value] > 0 &amp;&amp; ColumnInfo.ShowDivider; </Script>
+      <Script> Resizer.Visible = [ColumnInfo.Resizable]; </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Name="Root"
+             SharedSizePolicy="SharesWidth" SharedSize="{ColumnInfo.ColumnSize}"
+             Layout="Form">
+        <Children>
+
+          <ColorFill Name="Line" Content="{styles:Styles.ColumnDivider}">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Parent,0" Right="Parent,0,1" Top="Parent,0" Bottom="Parent,1"/>
+            </LayoutInput>
+          </ColorFill>
+
+          <me:ColumnResizer Name="Resizer" ColumnInfo="{ColumnInfo}" ColumnWidthsChanged="{ColumnWidthsChanged}">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Parent,1,-7" Right="Parent,1,7" Top="Parent,0" Bottom="Parent,1"
+                                 ContributesToWidth="false"/>
+            </LayoutInput>
+          </me:ColumnResizer>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+
+  
+  
+  
+  
+  
+  <Class Name="AccessibleDescriptionReference">
+    <Properties>
+      <Boolean Name="Active"/>
+      <String Name="Value" String="{null}"/>
+    </Properties>
+  </Class>
+
+
+  
+  
+  
+  
+  <UI Name="SpreadSheetListItem" Base="core:ListItemBase">
+    <Properties>
+      <me:SpreadSheetListModel Name="ListModel" SpreadSheetListModel="{null}"/>
+      <Object Name="Model" Object="$Required"/>
+      <List Name="Columns" List="$Required"/>
+      <Layout Name="ColumnLayout" Layout="$Required"/>
+      <SelectionManager Name="SelectionManager" SelectionManager="$Required"/>
+      <me:ListEditState Name="EditState" ListEditState="$Required"/>
+
+      <style:Style Name="OverrideStyle" Style="{null}"/>
+      <Boolean Name="CanDrag" Boolean="true"/>
+      <iris:BooleanChoice Name="IsDragging" BooleanChoice="{null}"/>
+      <iris:IntRangedValue Name="DraggingIndex" IntRangedValue="{null}"/>
+      <contentList:NavigateIntoIndexRequest Name="NavigateIntoArgs" NavigateIntoIndexRequest="$Required"/>
+
+      <Boolean Name="DisplayDragFeedback" Boolean="true"/>
+
+      <Size Name="RowSize" Size="$Required"/>
+      <Inset Name="RowPadding" Inset="$Required"/>
+    </Properties>
+
+    <Locals>
+      <style:StatefulCompositeStyle Name="StatefulStyle" Base="{styles:SharedStyles.ListItemStyle}" Override="{OverrideStyle}"/>
+
+      <core:ListItemContext Name="RowContext" Index="{Index}" SelectOnMouseDown="false"/>
+
+      <me:AccessibleDescriptionReference Name="AggregateAccessibleDescription"/>
+
+      <drag:DragFeedback Name="DragFeedback" DragFeedback="{null}"/>
+
+      <Command Name="EditListItem" />
+
+      
+      <zune:BoolDisposeHelper Name="DisposeHelper" Choice="{IsDragging}"/>
+    </Locals>
+
+    <Input>
+      
+
+      <DragSourceHandler Name="DirectDragSource" AllowedDropActions="All" Value="{SelectionManager}" Enabled="{CanDrag}"/>
+      <DragSourceHandler Name="BubbledDragSource" AllowedDropActions="All" Value="{SelectionManager}" HandlerStage="Bubbled" Enabled="{CanDrag}"/>
+    </Input>
+
+    <Scripts>
+      
+      <Script>
+        Context.Value = RowContext;
+        RowContext.Edit = EditListItem;
+      </Script>
+
+      
+      <Script>
+        if (DisplayDragFeedback)
+        {
+          DirectDragSource.MoveCursor = Cursor.Arrow;
+          DirectDragSource.CopyCursor = Cursor.Arrow;
+          DirectDragSource.CancelCursor = Cursor.Arrow;
+          BubbledDragSource.MoveCursor = Cursor.Arrow;
+          BubbledDragSource.CopyCursor = Cursor.Arrow;
+          BubbledDragSource.CancelCursor = Cursor.Arrow;
+        }
+      </Script>
+
+      <Script>StatefulStyle.Override = [OverrideStyle];</Script>
+
+      <Script>StatefulStyle.State.Focused = [UI.DeepKeyFocus];</Script>
+      <Script>StatefulStyle.State.Hovered = [UI.DeepMouseFocus];</Script>
+
+      <Script>
+        if ([StatefulStyle.State.Selected])
+          Background.Content = styles:Styles.ListItemSelectedBackground;
+        else if ([StatefulStyle.State.Hovered])
+          Background.Content = styles:Styles.ListItemHoverBackground;
+        else
+          Background.Content = styles:Styles.ListItemBackground;
+      </Script>
+
+      
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(SelectionManager.SelectedIndices)]
+        if (SelectionManager != null)
+        {
+          bool selected = SelectionManager.IsSelected([Index.Value]);
+          StatefulStyle.State.Selected = selected;
+          DirectDragSource.Enabled = selected &amp;&amp; CanDrag;
+        }
+      </Script>
+
+      <Script>
+        [InitialEvaluate(false)]
+        bool isDragging = [DirectDragSource.Dragging] || [BubbledDragSource.Dragging];
+
+        if (IsDragging != null)
+        {
+          IsDragging.Value = isDragging;
+
+          
+          
+          
+          
+          DisposeHelper.ResetOnDispose = isDragging;
+        }
+
+        
+        
+        if (isDragging)
+        {
+          if (DraggingIndex != null)
+            DraggingIndex.Value = Index.Value;
+          
+          int count = 1;
+
+          if (SelectionManager != null)
+          {
+            if (!SelectionManager.IsSelected(Index.Value))
+              SelectionManager.Select(Index.Value, true);
+
+            count = SelectionManager.Count;
+          }
+
+          if (DisplayDragFeedback)
+          {
+            if (DragFeedback == null)
+              DragFeedback = new drag:DragFeedback();
+
+            DragFeedback.Count = count;
+            DragFeedback.Helper.Show(DragFeedback);
+          }
+        }
+        else if (DragFeedback != null)
+        {
+          DragFeedback.Helper.Hide();
+          UI.DisposeOwnedObject(DragFeedback);
+          DragFeedback = null;
+        }
+
+        drag:DragInfo.IsDraggingInternally = isDragging;
+      </Script>
+
+      <Script>
+        if (DirectDragSource.Dragging &amp;&amp; DragFeedback != null)
+          DragFeedback.DropAction = [DirectDragSource.CurrentDropAction];
+      </Script>
+
+      <Script>
+        if (BubbledDragSource.Dragging &amp;&amp; DragFeedback != null)
+          DragFeedback.DropAction = [BubbledDragSource.CurrentDropAction];
+      </Script>
+
+      <Script>AggregateAccessibleDescription.Active = [Accessible.Enabled];</Script>
+      <Script>AccessibleDescription = [AggregateAccessibleDescription.Value];</Script>
+
+      
+      <Script>
+        [DeclareTrigger(EditListItem.Invoked)]
+        EditState.InEditMode = true;
+        NavigateIntoArgs.Index = Index.Value;
+        NavigateIntoArgs.Select = true;
+      </Script>
+
+      
+      <Script><![CDATA[
+        [InitialEvaluate(false)]
+
+        
+        
+        
+        
+
+        if (UI.DeepKeyFocus && ![EditState.InEditMode])
+        {
+          
+          
+          
+          
+          
+          
+          
+          
+          
+          
+
+          UI.NavigateInto();
+        }
+      ]]></Script>
+
+      
+      
+      <Script>
+        if ([UI.KeyFocus] &amp;&amp; EditState.InEditMode)
+        {
+          Background.NavigateInto();
+        }
+      </Script>
+
+    </Scripts>
+
+    <Content>
+      <ColorFill Name="Background" MouseInteractive="false" Padding="{RowPadding}">
+        <Children>
+
+          <Repeater Source="{Columns}" Layout="{ColumnLayout}">
+            <Content>
+
+              <me:CellHost
+                Style="{StatefulStyle}" ListModel="{ListModel}" Model="{Model}"
+                EditState="{EditState}"
+                ColumnInfo="{(me:ColumnInfo)RepeatedItem}"
+                LayoutInput="{((me:ColumnInfo)RepeatedItem).LayoutInput}"
+                AggregateAccessibleDescription="{AggregateAccessibleDescription}"
+                RowIndex="{Index}"/>
+
+            </Content>
+          </Repeater>
+
+        </Children>
+      </ColorFill>
+    </Content>
+  </UI>
+
+  
+  
+  
+  
+  
+  
+  <Class Name="ColumnInfoBase">
+    <Properties>
+      <String Name="Header" String="{null}"/>
+      <Image Name="HeaderIcon" Image="{null}"/>
+      <Boolean Name="HighlightHeader" Boolean="true"/>
+
+      <Object Name="SortBy" Object="{null}"/>
+      <Boolean Name="SortAscendingDefault" Boolean="true"/>
+      <Inset Name="CellPadding" Inset="{styles:Styles.CellPadding}"/>
+      <Inset Name="HeaderPadding" Inset="{CellPadding}"/>
+
+      <SharedSize Name="ColumnSize" SharedSize="{null}"/>
+      <Boolean Name="Resizable" Boolean="true"/>
+      <Boolean Name="Visible" Boolean="true"/>
+      <Boolean Name="Removable" Boolean="true"/>
+      <Boolean Name="ShowDivider" Boolean="true"/>
+
+      <LayoutInput Name="LayoutInput">
+        <LayoutInput>
+          <DockLayoutInput Position="Left" Alignment="Near"/>
+        </LayoutInput>
+      </LayoutInput>
+      
+      <List Name="VisibilitiesChanged"/>
+    </Properties>
+    
+    <Scripts>
+      <Script>
+        [DeclareTrigger(Visible)]
+        foreach (Command command in VisibilitiesChanged)
+          command.Invoke();
+      </Script>
+    </Scripts>
+  </Class>
+
+  
+  
+  
+  
+  <Class Name="ColumnInfo" Base="me:ColumnInfoBase">
+    <Properties>
+      <Type Name="CellType" Type="{typeof(me:ToStringCell)}"/>
+      <Type Name="CellEditType" Type="{null}"/>
+
+      <Type Name="HeaderType" Type="{null}"/>
+    </Properties>
+    <Scripts>
+      <Script>
+        if (HeaderType == null)
+        {
+          
+          if (HeaderIcon != null)
+            HeaderType = typeof(me:HeaderIconCell);
+          else
+            HeaderType = typeof(me:HeaderCell);
+        }
+      </Script>
+    </Scripts>
+  </Class>
+
+  
+  
+  
+  
+  <UI Name="ColumnHeaders" Base="core:ReorderableListBase">
+    <Properties>
+      <me:ColumnData Name="ColumnData" ColumnData="$Required"/>
+      <List Name="Content" List="{ColumnData.DisplayedColumns}"/>
+      <Boolean Name="CanReorder" Boolean="{ColumnData.CanReorderColumns}"/>
+
+      <me:SpreadSheetListModel Name="ListModel" SpreadSheetListModel="{null}"/>
+      <Int32 Name="HeaderSpacing" Int32="$Required"/>
+      <Int32 Name="HeaderHeight" Int32="$Required"/>
+      <Boolean Name="HighlightHeaders" Boolean="$Required"/>
+      <style:Style Name="HeaderStyle" Style="{styles:SharedStyles.ColumnHeaderStyleSet}"/>
+      <me:ListEditState Name="EditState" ListEditState="$Required"/>
+    </Properties>
+
+    <Locals>
+      <iris:BooleanChoice Name="MouseOverHeaders"/>
+    </Locals>
+
+    <Input>
+      <ClickHandler Name="ClickDetector" ClickType="Any" HandlerStage="Routed" Handle="false"/>
+    </Input>
+
+    <Scripts>
+
+      
+      
+      <Script>
+        [DeclareTrigger(ClickDetector.Invoked)]
+        [DeclareTrigger(UI.DeepKeyFocus)]
+
+        EditState.InEditMode = false;
+      </Script>
+
+      <Script> MouseOverHeaders.Value = HighlightHeaders &amp;&amp; [UI.DeepMouseFocus]; </Script>
+      <Script>
+        if ([IsDragging.Value])
+        {
+          LastIndicator.Index = Content.Count;
+        }
+      </Script>
+
+      
+      <Script><![CDATA[
+        [DeclareTrigger(Target.Dropped)]
+
+        
+
+        object value = Target.GetValue();
+
+        if (!(value is int))
+        {
+          
+        }
+        else
+        {
+          int oldIndex = (int)value;
+          int insertAt = InsertIndex.Value;
+
+          if (insertAt >= 0 && insertAt <= Content.Count)
+          {
+            int newIndex;
+
+            
+            
+            if (insertAt > oldIndex)
+              newIndex = insertAt - 1;
+            else
+              newIndex = insertAt;
+
+            if (oldIndex != newIndex)
+            {
+              
+              
+              iris:ArrayListDataSet orderedColumns = (iris:ArrayListDataSet)ColumnData.OrderedColumns;
+              
+              iris:ArrayListDataSet displayedColumns = ColumnData.DisplayedColumns;
+              
+              int oldOrderedIndex = orderedColumns.IndexOf(displayedColumns.get_Item(oldIndex));
+              int newOrderedIndex = orderedColumns.IndexOf(displayedColumns.get_Item(newIndex));
+              
+              orderedColumns.Move(oldOrderedIndex, newOrderedIndex);
+              ColumnData.ColumnOrderChanged.Invoke();
+            }
+          }
+        }
+   ]]></Script>
+    </Scripts>
+
+    <Content>
+      <Panel Layout="Anchor">
+        <Children>
+
+          <Repeater Name="Repeater" ContentName="Item" Layout="{ListLayout}" DiscardOffscreenVisuals="true"/>
+
+          <core:Indicator Name="LastIndicator" InsertAtIndex="{InsertIndex}" MinimumSize="1, 0"
+                          Visible="{MouseOverHeaders}" Color="{styles:Styles.ColumnDivider}">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Repeater,1,0" Top="Repeater,0" Bottom="Repeater,1"
+                                 ContributesToWidth="false" ContributesToHeight="false"/>
+            </LayoutInput>
+          </core:Indicator>
+
+          
+          <Graphic Name="SelectionRect"/>
+          <Panel Name="Background"/>
+
+        </Children>
+      </Panel>
+    </Content>
+
+    <Content Name="Item">
+      <Panel Layout="Anchor" LayoutInput="{((me:ColumnInfo)RepeatedItem).LayoutInput}">
+        <Children>
+
+          
+          
+          <core:ItemDropZone Index="{RepeatedItemIndex}" IsVisible="{IsDragging}"
+                             ValidTarget="{RepeatedItemIndex.Value >= ColumnData.FixedColumns}">
+            <LayoutInput>
+              <AnchorLayoutInput Top="Item, 0, -15" Bottom="Item, 1, 15" Left="Item,0" Right="Item,0.5"
+                                 ContributesToWidth="false" ContributesToHeight="false"/>
+            </LayoutInput>
+          </core:ItemDropZone>
+
+          
+          <core:ItemDropZone Index="{RepeatedItemIndex}" IndexModifier="1" IsVisible="{IsDragging}"
+                             ValidTarget="{RepeatedItemIndex.Value + 1 >= ColumnData.FixedColumns}">
+            <LayoutInput>
+              <AnchorLayoutInput Top="Item, 0, -15" Bottom="Item, 1, 15"  Left="Item,0.5" Right="Item,1"
+                                 ContributesToWidth="false" ContributesToHeight="false"/>
+            </LayoutInput>
+          </core:ItemDropZone>
+
+          
+          <core:Indicator Index="{RepeatedItemIndex}" InsertAtIndex="{InsertIndex}" MinimumSize="0, 1"
+                          Visible="{MouseOverHeaders}" Color="{styles:Styles.ColumnDivider}"
+                          ForceHidden="{!((me:ColumnInfo)RepeatedItem).ShowDivider}" HideFirstIndicator="true">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Item, 0" Top="Item, 0" Bottom="Item, 1"
+                                 ContributesToWidth="false" ContributesToHeight="false"/>
+            </LayoutInput>
+          </core:Indicator>
+
+          <me:ColumnHeader Name="Item"
+              ColumnData="{ColumnData}"
+              ColumnInfo="{(me:ColumnInfo)RepeatedItem}"
+              ColumnWidthsChanged="{ColumnData.ColumnWidthsChanged}"
+              ListModel="{ListModel}"
+              HeaderSpacing="{HeaderSpacing}"
+              Index="{RepeatedItemIndex}"
+              CanReorder="{CanReorder &amp;&amp; RepeatedItemIndex.Value >= ColumnData.FixedColumns}"
+              IsDragging="{IsDragging}"
+              MouseOverHeaders="{MouseOverHeaders}"
+              HeaderHeight="{HeaderHeight}"
+              HeaderStyle="{HeaderStyle}"/>
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  
+  <UI Name="ColumnHeader">
+    <Properties>
+      <me:ColumnData Name="ColumnData" ColumnData="$Required"/>
+      <me:ColumnInfo Name="ColumnInfo" ColumnInfo="$Required"/>
+      <Command Name="ColumnWidthsChanged" Command="$Required"/>
+      <me:SpreadSheetListModel Name="ListModel" SpreadSheetListModel="{null}"/>
+      <Int32 Name="HeaderSpacing" Int32="$Required"/>
+      <Index Name="Index" Index="$Required"/>
+      <Boolean Name="CanReorder" Boolean="$Required"/>
+      <iris:BooleanChoice Name="IsDragging" BooleanChoice="$Required"/>
+      <iris:BooleanChoice Name="MouseOverHeaders" BooleanChoice="$Required"/>
+      <style:Style Name="HeaderStyle" Style="$Required"/>
+      <Int32 Name="HeaderHeight" Int32="$Required"/>
+    </Properties>
+
+    <Input>
+      
+      <DragSourceHandler Name="DragSource" Enabled="{CanReorder}" AllowedDropActions="Move"
+                         MoveCursor="Arrow" CancelCursor="Arrow" HandlerStage="Direct,Bubbled"/>
+
+      
+      <ClickHandler Name="SortHandler" ClickType="LeftMouse" Enabled="{ColumnInfo.SortBy != null}" HandlerStage="Direct,Bubbled"/>
+    </Input>
+
+    <Scripts>
+      <Script> Resizer.Visible = [ColumnInfo.Resizable]; </Script>
+
+      <Script> DragSource.Value = [Index.Value]; </Script>
+
+      <Script> IsDragging.Value = [DragSource.Dragging]; </Script>
+
+      <Script>
+        [DeclareTrigger(SortHandler.Invoked)]
+
+        if (ColumnData.SortedColumn == ColumnInfo.SortBy)
+        {
+          
+          ColumnData.SortAscending = !ColumnData.SortAscending;
+        }
+        else
+        {
+          ColumnData.SortedColumn = ColumnInfo.SortBy;
+          ColumnData.SortAscending = ColumnInfo.SortAscendingDefault;
+        }
+      </Script>
+
+      <Script>
+        Header.MouseOverSortArea = [UI.DeepMouseFocus] &amp;&amp;
+                                  ![Resizer.MouseFocus] &amp;&amp;
+                                  ![DragSource.Dragging];
+      </Script>
+
+      <Script>
+        if ([MouseOverHeaders.Value])
+        {
+          if ([UI.DeepMouseFocus] &amp;&amp; ColumnInfo.HighlightHeader)
+          {
+            Content.Content = styles:Styles.ListHeaderActiveHoverBackground;
+          }
+          else
+          {
+            Content.Content = styles:Styles.ListHeaderHoverBackground;
+          }
+        }
+        else
+        {
+          Content.Content = styles:Styles.ListHeaderBackground;
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      <ColorFill Name="Content" Layout="Anchor"
+                 SharedSize="{ColumnInfo.ColumnSize}" SharedSizePolicy="SharesWidth"
+                 MinimumSize="{new Size(0,HeaderHeight)}" MaximumSize="{new Size(0,HeaderHeight)}">
+        <Children>
+
+          <me:ColumnResizer Name="Resizer" ColumnInfo="{ColumnInfo}" ColumnWidthsChanged="{ColumnWidthsChanged}">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Parent,1,-7" Right="Parent,1,7" Top="Parent,0" Bottom="Parent,1"
+                                 ContributesToWidth="false"/>
+            </LayoutInput>
+          </me:ColumnResizer>
+
+          
+          <me:Cell Name="Header"
+              Cell="{ColumnInfo.HeaderType}"
+              Model="{ColumnInfo}"
+              ListModel="{ListModel}"
+              Padding="{ColumnInfo.HeaderPadding}"
+              Style="{HeaderStyle}">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Parent,0" Top="Parent,0"/>
+            </LayoutInput>
+          </me:Cell>
+
+        </Children>
+      </ColorFill>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="ColumnResizer">
+    <Properties>
+      <me:ColumnInfo Name="ColumnInfo" ColumnInfo="$Required"/>
+      <Command Name="ColumnWidthsChanged" Command="$Required"/>
+      <Boolean Name="MouseFocus"/>
+    </Properties>
+    <Locals>
+      <Size Name="InitialSize"/>
+    </Locals>
+
+    <Input>
+      <ClickHandler Name="Clicker" ClickType="LeftMouse" ClickCount="Double"/>
+      <DragHandler Name="Dragger" CancelOnEscape="true"/>
+    </Input>
+
+    <Scripts>
+      <Script>
+        UI.Cursor = Cursor.SizeWE;
+      </Script>
+      <Script>
+        MouseFocus = [UI.MouseFocus];
+      </Script>
+      <Script>
+        [DeclareTrigger(Dragger.Started)]
+        
+        InitialSize = ColumnInfo.ColumnSize.Size;
+      </Script>
+      <Script>
+        [DeclareTrigger(Dragger.AbsoluteDragSize)]
+        ColumnInfo.ColumnSize.Size = new Size(sys:Math.Max(0, InitialSize.Width + Dragger.AbsoluteDragSize.Width), InitialSize.Height);
+      </Script>
+      <Script>
+        [DeclareTrigger(Dragger.Ended)]
+        ColumnWidthsChanged.Invoke();
+      </Script>
+      <Script>
+        [DeclareTrigger(Dragger.Cancelled)]
+        ColumnInfo.ColumnSize.Size = InitialSize;
+      </Script>
+      <Script>
+        [DeclareTrigger(Clicker.Invoked)]
+        ColumnInfo.ColumnSize.AutoSize();
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel/>
+    </Content>
+  </UI>
+
+  
+  
+  
+  
+  <UI Name="CellHost">
+    <Properties>
+      <me:SpreadSheetListModel Name="ListModel" SpreadSheetListModel="{null}"/>
+      <Object Name="Model" Object="$Required"/>
+
+      <me:ColumnInfo Name="ColumnInfo" ColumnInfo="$Required"/>
+      <style:Style Name="Style" Style="$Required"/>
+
+      <me:AccessibleDescriptionReference Name="AggregateAccessibleDescription" AccessibleDescriptionReference="{null}"/>
+      <Index Name="RowIndex" Index="$Required"/>
+      <me:ListEditState Name="EditState" ListEditState="$Required"/>
+    </Properties>
+
+    <Locals>
+      <core:ListItemContext Name="CellContext" Index="{RowIndex}" MainContext="false"/>
+      <Command Name="EditMe" />
+      <iris:BooleanChoice Name="IsEditing" BooleanChoice="{null}"/>
+    </Locals>
+
+    <Input>
+      <EventContext Value="{CellContext}"/>
+      <KeyHandler Name="Escape" Key="Escape" Enabled="false" HandlerStage="Bubbled" />
+    </Input>
+
+    <Scripts>
+
+      
+      <Script>
+        if (ColumnInfo.CellEditType != null)
+        {
+          CellContext.Edit = EditMe;
+        }
+      </Script>
+
+
+      
+      <Script><![CDATA[
+        [DeclareTrigger(IsEditing.Value)]
+
+        Escape.Enabled = (IsEditing != null && IsEditing.Value);
+
+        if (IsEditing != null && !IsEditing.Value)
+        {
+          UI.DisposeOwnedObject(IsEditing);
+          IsEditing = null;
+
+          Content.RequestSource(ColumnInfo.CellType);
+        }
+
+      ]]></Script>
+
+      
+      <Script>
+        [DeclareTrigger(Escape.Invoked)]
+        EditState.InEditMode = false;
+        EditState.Cancelled = true;
+        if (IsEditing != null)
+        {
+          IsEditing.Value = false;
+        }
+      </Script>
+
+      
+      <Script><![CDATA[
+
+        
+        
+        
+
+        bool inEditMode = [EditState.InEditMode];
+        bool canEdit    = ColumnInfo.CellEditType != null;
+
+        if (inEditMode && canEdit)
+        {
+          UI.KeyInteractive = true;
+          Content.Navigation = NavigationPolicies.TabGroup;
+        }
+        else
+        {
+          UI.KeyInteractive = false;
+          Content.Navigation = NavigationPolicies.None;
+        }
+
+        
+        
+        Content.InputEnabled = !inEditMode || canEdit;
+
+      ]]></Script>
+
+      
+      <Script>
+        [DeclareTrigger(EditMe.Invoked)]
+        IsEditing = new iris:BooleanChoice();
+        IsEditing.Value  = true;
+        EditState.InEditMode = true;
+
+        Content.RequestSource(ColumnInfo.CellEditType, "IsEditing", IsEditing);
+        Content.NavigateInto();
+      </Script>
+
+      
+      
+      <Script><![CDATA[
+        [DeclareTrigger(UI.DeepKeyFocus)]
+
+        if (UI.DeepKeyFocus && EditState.InEditMode && IsEditing == null)
+        {
+          if (ColumnInfo.CellEditType != null)
+          {
+            EditMe.Invoke();
+          }
+        }
+      ]]></Script>
+
+    </Scripts>
+
+    <Content>
+      <me:Cell Name="Content" Cell="{ColumnInfo.CellType}"
+          Style="{Style}"
+          ListModel="{ListModel}"
+          ListEditState="{EditState}"
+          Model="{Model}"
+          RowIndex="{RowIndex}"
+          Padding="{ColumnInfo.CellPadding}"
+          SharedSize="{ColumnInfo.ColumnSize}"
+          SharedSizePolicy="ContributesToWidth,SharesWidth"
+          AggregateAccessibleDescription="{AggregateAccessibleDescription}"/>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="Cell">
+    <Properties>
+      <style:Style Name="Style" Style="$Required"/>
+      <me:SpreadSheetListModel Name="ListModel" SpreadSheetListModel="{null}"/>
+      <Object Name="Model" Object="{null}"/>
+      <Index Name="RowIndex" Index="{null}"/>
+      <String Name="AccessibleDescription" String="{null}"/>
+      <me:AccessibleDescriptionReference Name="AggregateAccessibleDescription" AccessibleDescriptionReference="{null}"/>
+      <me:ListEditState Name="ListEditState" ListEditState="{null}"/>
+      <iris:BooleanChoice Name="IsEditing" BooleanChoice="{null}"/>
+      <Boolean Name="MouseOverSortArea" Boolean="false"/>
+    </Properties>
+
+    <Scripts>
+
+      <Script>
+        <![CDATA[
+        if (AggregateAccessibleDescription != null)
+        {
+          if ([AggregateAccessibleDescription.Active] && ([AccessibleDescription] != null))
+          {
+            
+            if (AggregateAccessibleDescription.Value == null)
+            {
+              AggregateAccessibleDescription.Value = AccessibleDescription;
+            }
+            else
+            {
+              AggregateAccessibleDescription.Value = "{0}, {1}".Format(AggregateAccessibleDescription.Value, AccessibleDescription);
+            }
+          }
+        }
+        ]]>
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  
+  
+  
+  
+  <UI Name="ToolTipCell" Base="me:Cell">
+    <Properties>
+      <String Name="ToolTipText" String="{null}"/>
+      <PlacementMode Name="ToolTipPlacement" PlacementMode="Origin"/>
+      <style:Style Name="ToolTipStyle" Style="{null}"/>
+    </Properties>
+
+    <Locals>
+      
+      <tooltip:ToolTip Name="ToolTip" ToolTip="{null}"/>
+    </Locals>
+
+    <Scripts>
+      
+      
+      <Script><![CDATA[
+        [DeclareTrigger(UI.DeepMouseFocus)]
+
+        
+        
+        
+        
+        
+        
+        if (ToolTip != null)
+        {
+          UI.DisposeOwnedObject(ToolTip);
+          ToolTip = null;
+        }
+
+        if (UI.DeepMouseFocus)
+        {
+          
+          
+          
+
+          if (!String.IsNullOrEmpty(ToolTipText))
+          {
+            ToolTip = new tooltip:ToolTip();
+            PopupLayoutInput input = new PopupLayoutInput();
+            input.Placement = ToolTipPlacement;
+            input.PlacementTarget = ToolTipOrigin;
+            if (ToolTipPlacement == PlacementMode.Origin) input.Offset = tooltip:ToolTipConstants.InversePadding;
+            ToolTip.LayoutInput = input;
+            ToolTip.Model = ToolTipText;
+            if (ToolTipStyle != null)
+            {
+              ToolTip.Font = ToolTipStyle.Font;
+            }
+            else if (Style != null)
+            {
+              ToolTip.Font = Style.Font;
+            }
+            ToolTip.Helper.ShowToolTip(ToolTip);
+          }
+        }
+   ]]></Script>
+    </Scripts>
+    <Content>
+      <Panel Name="ToolTipOrigin"/>
+    </Content>
+  </UI>
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  <UI Name="EditCell" Base="me:Cell">
+      <Properties>
+
+        
+        <Command Name="ValidateValue"/>
+
+        
+        <Command Name="CommitValue"/>
+
+        
+        <Command Name="ValidateFailed"/>
+      </Properties>
+
+      <Scripts>
+        <Script><![CDATA[
+            [DeclareTrigger(UI.DeepKeyFocus)]
+
+            if (!UI.DeepKeyFocus && !ListEditState.Cancelled)
+            {
+              ValidateValue.Invoke();
+            }
+        ]]></Script>
+
+        <Script>
+          [DeclareTrigger(CommitValue.Invoked)]
+          [DeclareTrigger(ValidateFailed.Invoked)]
+
+          
+          
+
+          IsEditing.Value = false;
+        </Script>
+
+      </Scripts>
+  </UI>
+
+  
+  
+  
+  
+  
+  
+  <UI Name="LabelCell" Base="me:ToolTipCell">
+    <Properties>
+      <String Name="Content" String="{null}"/>
+
+      <Boolean Name="WordWrap" Boolean="false"/>
+      <Int32 Name="MaximumLines" Int32="0"/>
+      <Boolean Name="ShowToolTipWhenClipped" Boolean="true"/>
+
+      
+      <Boolean Name="Clipped"/>
+    </Properties>
+
+    <Locals>
+      <Accessible Name="Accessible"/>
+      <DockLayout Name="DockLayout_LeftNear_SizeToChildren" DefaultLayoutInput="Left,Near" SizeToChildren="true"/>
+    </Locals>
+
+    <Scripts>
+      <Script>private_Label.WordWrap = [WordWrap];</Script>
+      <Script>private_Label.MaximumLines = [MaximumLines];</Script>
+      <Script>private_Label.Color = [Style.Color];</Script>
+      <Script>private_Label.Font = [Style.Font];</Script>
+      <Script>private_Label.Style = [Style.TextStyle];</Script>
+      <Script>private_Label.Margins = [Style.TextMargins];</Script>
+      <Script>Clipped = [private_Label.Clipped];</Script>
+
+      <Script>private_Label.Content = [Content];</Script>
+
+      <Script>
+        private_Label.Content = [Content];
+        AccessibleDescription = Content;
+      </Script>
+
+      <Script>
+        if ([ShowToolTipWhenClipped] &amp;&amp; ([Clipped] || ![private_Label.Visible]))
+          ToolTipText = [private_Label.Content];
+        else
+          ToolTipText = null;
+      </Script>
+    </Scripts>
+
+    <Content>
+      
+
+
+
+
+
+
+
+
+
+
+
+      <Panel Name="ToolTipOrigin" Layout="{DockLayout_LeftNear_SizeToChildren}">
+        <Children>
+          
+          <Text Name="private_Label" MouseInteractive="true"/>
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  
+  <UI Name="LabelEditCell" Base="me:EditCell">
+    <Properties>
+      <EditableTextData Name="EditableText"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+        [DeclareTrigger(EditableText.Submitted)]
+
+        ValidateValue.Invoke();
+
+        
+        ListEditState.InEditMode = false;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(ValidateValue.Invoked)]
+
+        if (!String.IsNullOrEmpty(EditableText.Value))
+        {
+          CommitValue.Invoke();
+        }
+        else
+        {
+          ValidateFailed.Invoke();
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Navigation="ContainHorizontal" Layout="Anchor">
+        <Children>
+
+          <me:LabelEditbox Name="Edit" Style="{Style}" Model="{EditableText}">
+            <LayoutInput>
+              <AnchorLayoutInput Horizontal="Fill"/>
+            </LayoutInput>
+          </me:LabelEditbox>
+
+          <ColorFill Content="{styles:Styles.SearchBoxBackground}">
+            <LayoutInput>
+              <AnchorLayoutInput Top="Edit,0" Bottom="Edit,1" Horizontal="Fill"/>
+            </LayoutInput>
+          </ColorFill>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="NumberTitleCell" Base="me:ToolTipCell">
+    <Properties>
+      <Int32 Name="Number"/>
+      <String Name="Title"/>
+      <Boolean Name="ShowNumber" Boolean="true"/>
+      <Size Name="NumberSize" Size="24,0"/>
+      <style:Style Name="NumberStyle" Style="{Style}"/>
+
+      <AccessibleRole Name="Role" AccessibleRole="StaticText"/>
+    </Properties>
+
+    <Locals>
+      <Accessible Name="Accessible"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        if ([ShowNumber])
+        {
+          NumberText.Content = [Number].ToString("D2");
+          NumberText.MinimumSize = NumberSize;
+        }
+        else
+        {
+          NumberText.Content = "";
+          NumberText.MinimumSize = new Size();
+        }
+      </Script>
+      <Script> TitleText.Content = [Title]; </Script>
+
+      <Script> NumberText.Color = [NumberStyle.Color]; </Script>
+      <Script> TitleText.Color  = [Style.Color]; </Script>
+
+      <Script> NumberText.Font = [NumberStyle.Font]; </Script>
+      <Script> TitleText.Font  = [Style.Font]; </Script>
+
+      <Script> NumberText.Style = [NumberStyle.TextStyle]; </Script>
+      <Script> TitleText.Style  = [Style.TextStyle]; </Script>
+
+      <Script> NumberText.Margins = [NumberStyle.TextMargins]; </Script>
+      <Script> TitleText.Margins  = [Style.TextMargins]; </Script>
+
+      <Script>
+        if ([Accessible.Enabled])
+        {
+          if ([ShowNumber])
+            Accessible.Name = "{0} {1}".Format(Number, Title);
+          else
+            Accessible.Name = Title;
+
+          Accessible.Role = Role;
+        }
+      </Script>
+      <Script>
+        if ([TitleText.Clipped])
+        {
+          if ([ShowNumber])
+            ToolTipText = "{0}  {1}".Format(NumberText.Content, TitleText.Content);
+          else
+            ToolTipText = Title;
+        }
+        else
+        {
+          ToolTipText = null;
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Name="ToolTipOrigin">
+        <Layout>
+          
+
+
+          <DockLayout DefaultLayoutInput="Left,Near" SizeToChildren="true"/>
+        </Layout>
+        <Children>
+          
+          <Text Name="NumberText" MouseInteractive="true"/>
+          <Text Name="TitleText" MouseInteractive="true"/>
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="NumberTitleEditCell" Base="me:EditCell">
+      <Properties>
+        <Int32 Name="Number"/>
+        <String Name="Title"/>
+        <Boolean Name="ShowNumber" Boolean="true"/>
+        <Size Name="NumberSize" Size="24,0"/>
+        <style:Style Name="NumberStyle" Style="{Style}"/>
+
+        <EditableTextData Name="EditableText"/>
+      </Properties>
+
+
+      <Scripts>
+
+        <Script>
+          [DeclareTrigger(EditableText.Submitted)]
+
+
+          ValidateValue.Invoke();
+
+          
+          ListEditState.InEditMode = false;
+        </Script>
+
+        <Script>
+          [DeclareTrigger(ValidateValue.Invoked)]
+
+          if (!String.IsNullOrEmpty(EditableText.Value))
+          {
+            CommitValue.Invoke();
+          }
+          else
+          {
+            ValidateFailed.Invoke();
+          }
+        </Script>
+
+        <Script>
+          if ([ShowNumber])
+          {
+            NumberText.Content = [Number].ToString("D2");
+            NumberText.MinimumSize = NumberSize;
+          }
+          else
+          {
+            NumberText.Content = "";
+            NumberText.MinimumSize = new Size();
+          }
+        </Script>
+
+        <Script> NumberText.Color = [NumberStyle.Color]; </Script>
+        <Script> NumberText.Font = [NumberStyle.Font]; </Script>
+        <Script> NumberText.Style = [NumberStyle.TextStyle]; </Script>
+
+        <Script> NumberText.Margins = [NumberStyle.TextMargins]; </Script>
+      </Scripts>
+
+
+      <Content>
+          <Panel Navigation="ContainHorizontal" Layout="Anchor">
+            <Children>
+
+              <Text Name="NumberText">
+                <LayoutInput>
+                  <AnchorLayoutInput Left="Parent,0"/>
+                </LayoutInput>
+              </Text>
+
+              <me:LabelEditbox Name="Edit" Style="{Style}" Model="{EditableText}">
+                <LayoutInput>
+                  <AnchorLayoutInput Left="NumberText, 1" Horizontal="Fill"/>
+                </LayoutInput>
+              </me:LabelEditbox>
+
+              <ColorFill Content="{styles:Styles.SearchBoxBackground}">
+                <LayoutInput>
+                  <AnchorLayoutInput Top="Edit,0" Bottom="Edit,1" Left="Edit, 0" Horizontal="Fill"/>
+                </LayoutInput>
+              </ColorFill>
+
+            </Children>
+          </Panel>
+      </Content>
+  </UI>
+
+  
+  
+  
+  
+  <Class Name="Globals" Shared="true">
+    <Properties>
+      <String Name="Unknown" String="{zune:Shell.LoadString(zune:StringId.IDS_TYPE_UNKNOWN)}"/>
+
+      
+      <AnchorLayoutInput Name="LabelIconCellLabelPosition" Left="Parent, 0" Top="Parent, 0" />
+      <AnchorLayoutInput Name="LabelIconCellIconPosition" Left="private_Label, 1, 5" Top="Parent, 0, 5" />
+
+      
+      <AnchorLayoutInput Name="HeaderCellIconPosition" Left="private_Label,1,-10" Top="Parent, 0, 6"/>
+    </Properties>
+  </Class>
+
+
+  
+  
+  
+  
+  <UI Name="FallbackCell" Base="me:LabelCell">
+    <Properties>
+      <String Name="Fallback" String="{me:Globals.Unknown}"/>
+    </Properties>
+    <Scripts>
+      <Script>
+        if (String.IsNullOrEmpty([Content]))
+        {
+          private_Label.Content = Fallback;
+        }
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  <UI Name="DateCell" Base="me:FallbackCell">
+    <Properties>
+      <sys:DateTime Name="Date"/>
+      <String Name="Format" String="d"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+        
+        if ([Date].Year == 1)
+        {
+          Content = null;
+        }
+        else
+        {
+          
+          
+          Content = Date.ToLocalTime().ToString(Format);
+        }
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  <UI Name="LongDateTimeCell" Base="me:DateCell">
+    <Properties>
+      <String Name="Format" String="G"/>
+    </Properties>
+  </UI>
+
+  
+  
+  
+  <UI Name="LengthCell" Base="me:LabelCell">
+    <Properties>
+      <sys:TimeSpan Name="Length"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+        Content = zune:Shell.TimeSpanToString([Length]);
+     </Script>
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  <UI Name="ButtonCell" Base="me:Cell">
+    <Properties>
+      <iris:Command Name="Command"/>
+      <style:Style Name="DirectHoverStyle" Style="{styles:SharedStyles.HoveredButtonCellStyle}"/>
+    </Properties>
+
+    <Locals>
+      <style:CompositeStyle Name="CompositeStyle" Base="{Style}"/>
+    </Locals>
+
+    <Scripts>
+      <Script>Button.Model = [Command];</Script>
+
+      
+      <Script>
+        if ([UI.DeepMouseFocus])
+          CompositeStyle.Override = DirectHoverStyle;
+        else
+          CompositeStyle.Override = null;
+      </Script>
+    </Scripts>
+
+    <Content>
+      
+      
+      <Panel Layout="Anchor">
+        <Children>
+
+          <core:Button Name="Button" Model="{Command}" OverrideStyle="{CompositeStyle}" MouseInteractive="true"/>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="ActionButtonCell" Base="me:Cell">
+    <Properties>
+      
+      <iris:Command Name="Command" Command="{null}"/>
+      <Image Name="Icon" Image="null"/>
+    </Properties>
+
+    <Scripts>
+      <Script>Button.Model = [Command];</Script>
+      <Script>Button.Icon = [Icon];</Script>
+    </Scripts>
+
+    <Content>
+      <actionprogressbutton:ActionProgressButton Name="Button" Model="{Command}" />
+    </Content>
+  </UI>
+
+
+  
+  
+  
+  <UI Name="LabelIconCell" Base="me:LabelCell">
+    <Properties>
+      <Image Name="Icon" Image="{null}"/>
+      <LayoutInput Name="LabelPosition" LayoutInput="{me:Globals.LabelIconCellLabelPosition}"/>
+      <LayoutInput Name="IconPosition" LayoutInput="{me:Globals.LabelIconCellIconPosition}"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+          IconGraphic.Content = [Icon];
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Name="ToolTipOrigin" Layout="Anchor">
+        <Children>
+          <Text Name="private_Label" MouseInteractive="true" LayoutInput="{LabelPosition}"/>
+
+          
+          <Graphic Name="IconGraphic" LayoutInput="{IconPosition}"/>
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="IconCell" Base="me:ToolTipCell">
+    <Properties>
+      <Image Name="Icon" Image="{null}"/>
+      <String Name="ToolTipText" String="{null}"/>
+      <style:Style Name="ToolTipStyle" Style="{styles:SharedStyles.ToolTipStyle}"/>
+      <PlacementMode Name="ToolTipPlacement" PlacementMode="MouseBottom"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+         IconGraphic.Content = [Icon];
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Name="ToolTipOrigin" MouseInteractive="true">
+        <Children>
+          <Graphic
+            Name="IconGraphic"
+            Content="{Icon}"
+            SizingPolicy="SizeToContent"
+            StretchingPolicy="None"
+            HorizontalAlignment="Center" VerticalAlignment="Center"/>
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="ToStringCell" Base="me:LabelCell">
+    <Scripts>
+      <Script>
+        if (Model != null)
+          Content = [Model].ToString();
+        else
+          Content = "";
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  <UI Name="HeaderCell" Base="me:LabelIconCell">
+    <Properties>
+      <me:ColumnInfoBase Name="Model" ColumnInfoBase="$Required"/>
+      <LayoutInput Name="IconPosition" LayoutInput="{me:Globals.HeaderCellIconPosition}"/>
+    </Properties>
+    <Scripts>
+      <Script> Content = [Model.Header]; </Script>
+
+      <Script>
+        Image icon = null;
+        if (Model.SortBy != null)
+        {
+          bool showArrow = false;
+          bool sortAscending;
+
+          if (Model.SortBy == [ListModel.ColumnData.SortedColumn])
+          {
+            showArrow = true;
+            sortAscending = [ListModel.ColumnData.SortAscending];
+          }
+          else if ([MouseOverSortArea])
+          {
+            
+            
+            showArrow = true;
+            sortAscending = Model.SortAscendingDefault;
+          }
+
+          if (showArrow)
+          {
+            if (sortAscending)
+            {
+              icon = styles:Styles.SortArrowUp;
+            }
+            else
+            {
+              icon = styles:Styles.SortArrowDown;
+            }
+          }
+        }
+
+        Icon = icon;
+        if (Icon != null)
+        {
+          private_Label.Margins = new Inset(0,0,18,0);
+        }
+        else
+        {
+          private_Label.Margins = new Inset();
+        }
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  <UI Name="HeaderIconCell" Base="me:IconCell">
+    <Properties>
+      <me:ColumnInfoBase Name="Model" ColumnInfoBase="$Required"/>
+    </Properties>
+    <Scripts>
+      <Script> Icon = Model.HeaderIcon; </Script>
+      <Script> ToolTipText = Model.Header; </Script>
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  <UI Name="LabelEditbox" Base="core:Editbox">
+    <Properties>
+      <Size Name="TileMinSize" Size="0,0"/>
+      <Size Name="TileMaxSize" Size="0,0"/>
+      <Inset Name="TilePadding" Inset="0,0,0,0"/>
+      <Int32 Name="DefaultHeight" Int32="0"/>
+    </Properties>
+  </UI>
+
+  
+  
+  
+  <UI Name="CommandDescriptionCell" Base="me:LabelCell">
+    <Properties>
+      <iris:Command Name="Model" Command="$Required"/>
+    </Properties>
+
+    <Scripts>
+      <Script>Content = [Model.Description];</Script>
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  <UI Name="MediaStatusCell" Base="me:Cell">
+    <Properties>
+      <zune:StringId Name="ErrorTitle" StringId="{zune:StringId.IDS_PLAYBACK_CANNOT_PLAY}"/>
+      <zune:StringId Name="ErrorTooltip" StringId="{zune:StringId.IDS_PLAYBACK_CANNOT_PLAY_TOOLTIP}"/>
+      <Int32 Name="ErrorCode"/>
+      <Boolean Name="IsNowPlaying"/>
+    </Properties>
+
+    <Locals>
+      <iris:Command Name="ShowErrorDialog"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        ShowErrorDialog.Description = zune:Shell.LoadString([ErrorTooltip]);
+      </Script>
+
+      <Script>
+        if ([ErrorCode] &lt; 0)
+        {
+          Icon.Model = ShowErrorDialog;
+          Icon.Style = images:Images.ErrorIcon;
+        }
+        else if ([IsNowPlaying])
+        {
+          Icon.Model = images:Images.NowPlayingIconCommand;
+          Icon.Style = images:Images.NowPlayingIcon;
+        }
+        else
+        {
+          Icon.Model = null;
+          Icon.Style = images:Images.EmptyStyle;
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(ShowErrorDialog.Invoked)]
+        zune:Shell.ShowErrorDialog(ErrorCode, ErrorTitle);
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel>
+        <Children>
+          <images:IconButton
+              KeyInteractiveNStuff="false"
+              Name="Icon"
+              Model="{null}"
+              Style="{images:Images.EmptyStyle}"
+              />
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <Class Name="SortDescription">
+    <Properties>
+      <String  Name="Attribute"   String="$Required"/>
+      <Boolean Name="SupportsJumpInList" Boolean="false"/>
+    </Properties>
+  </Class>
+
+  
+  
+  
+  <Class Name="ListEditState">
+    <Properties>
+      <Boolean Name="InEditMode"/>
+      <Boolean Name="Cancelled"/>
+    </Properties>
+  </Class>
+
+</UIX>
+
diff --git a/test/2.1/STYLE.UIX b/test/2.1/STYLE.UIX
new file mode 100644
index 0000000..1bd7aff
--- /dev/null
+++ b/test/2.1/STYLE.UIX
@@ -0,0 +1,354 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris" 
+  xmlns:me="Me">
+
+  
+  
+  
+  
+  
+  
+  
+
+  
+  
+  
+  
+  
+  
+
+  
+  
+  
+  
+  <Class Name="Style">
+    <Properties>
+      <Color Name="Color" Color="Transparent"/>
+      <Font Name="Font" Font="Arial, 12"/>
+      <TextStyle Name="TextStyle" TextStyle="{null}"/>
+      <Inset Name="TextMargins"/>
+    </Properties>
+  </Class>
+
+  
+  
+  
+  
+  
+  
+  
+  <Class Name="CompositeStyle" Base="me:Style">
+    <Properties>
+      <me:Style Name="Base"/>
+      <me:Style Name="Override" Style="{null}"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+        <![CDATA[
+        if (Override != null && Override.Color.A > (Byte)0)
+          Color = [Override.Color];
+        else if (Base.Color.A > (Byte)0)
+          Color = [Base.Color];
+        ]]>
+      </Script>
+      <Script>
+        <![CDATA[
+        if (Override != null && Override.Font != null)
+          Font = [Override.Font];
+        else if (Base.Font != null)
+          Font = [Base.Font];
+        ]]>
+      </Script>
+      <Script>
+        <![CDATA[
+        if (Override != null && Override.TextStyle != null)
+          TextStyle = [Override.TextStyle];
+        else if (Base.TextStyle != null)
+          TextStyle = [Base.TextStyle];
+        ]]>
+      </Script>
+      <Script>
+        <![CDATA[
+        if (Override != null)
+          TextMargins = [Override.TextMargins];
+        else
+          TextMargins = [Base.TextMargins];
+        ]]>
+      </Script>
+    </Scripts>
+  </Class>
+
+  
+  
+  
+  
+  <Class Name="StyleState">
+    <Properties>
+      <Boolean Name="Disabled" Boolean="false"/>
+      <Boolean Name="Selected" Boolean="false"/>
+      <Boolean Name="Focused"  Boolean="false"/>
+      <Boolean Name="Hovered"  Boolean="false"/>
+    </Properties>
+  </Class>
+
+  
+  
+  
+  
+  <Class Name="StatefulCompositeStyle" Base="me:CompositeStyle">
+    <Properties>
+      <me:StyleState Name="State"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+        if ([Base] is me:StatefulStyleSet)
+          ((me:StatefulStyleSet)Base).State = State;
+        if ([Override] is me:StatefulStyleSet)
+          ((me:StatefulStyleSet)Override).State = State;
+      </Script>
+
+      <Script>
+        if ([Override] is me:StyleSet)
+        {
+          me:StatefulStyleSet stateful = new me:StatefulStyleSet();
+          stateful.Styles = (me:StyleSet)Override;
+          Override = stateful;
+        }
+      </Script>
+      <Script>
+        if ([Base] is me:StyleSet)
+        {
+          me:StatefulStyleSet stateful = new me:StatefulStyleSet();
+          stateful.Styles = (me:StyleSet)Base;
+          Base = stateful;
+        }
+      </Script>
+    </Scripts>
+  </Class>
+
+  
+  
+  
+  
+  
+  
+  <Class Name="StyleSet" Base="me:Style">
+    <Properties>
+      <me:Style Name="Disabled" Style="{null}"/>
+      <me:Style Name="Selected" Style="{null}"/>
+      <me:Style Name="Focused"  Style="{null}"/>
+      <me:Style Name="Hovered"  Style="{null}"/>
+      <me:Style Name="Default"  Style="{null}"/>
+    </Properties>
+
+    <Scripts>
+      
+      
+      
+      <Script>
+        Color = Default.Color;
+        Font = Default.Font;
+        TextStyle = Default.TextStyle;
+        TextMargins = Default.TextMargins;
+      </Script>
+    </Scripts>
+  </Class>
+
+  
+  
+  
+  
+  <Class Name="StatefulStyleSet" Base="me:CompositeStyle">
+    <Properties>
+      <me:StyleSet Name="Styles" StyleSet="{null}"/>
+      <me:StyleState Name="State" StyleState="{null}"/> 
+    </Properties>
+
+    <Scripts>
+      <Script>
+        <![CDATA[
+        if (Styles != null)
+        {
+          if ([State.Disabled])
+            Override = Styles.Disabled;
+          else if ([State.Hovered])
+          {
+            
+            if (Styles.Hovered != null)
+              Override = Styles.Hovered;
+            else
+              Override = Styles.Focused;
+          }
+          else if ([State.Selected])
+            Override = Styles.Selected;
+          else if ([State.Focused])
+            Override = Styles.Focused;
+          else
+            Override = Styles.Default;
+        }
+        ]]>
+      </Script>
+    </Scripts>
+  </Class>
+
+  
+
+  
+  
+  
+  <UI Name="Default">
+    <Content>
+      <Panel>
+        <Layout>
+          <GridLayout Columns="3" Rows="1" MajorAlignment="Center" MinorAlignment="Center"/>
+        </Layout>
+        <Children>
+
+          <me:StyleTester>
+            <BaseStyle>
+              <me:Style Style="{me:UnitTestStyles.SimpleStyle}"/>
+            </BaseStyle>
+          </me:StyleTester>
+
+          <me:StyleTester>
+            <BaseStyle>
+              <me:Style Style="{me:UnitTestStyles.SimpleStyle}"/>
+            </BaseStyle>
+            <OverrideStyle>
+              <me:Style Font="Courier, 16"/>
+            </OverrideStyle>
+          </me:StyleTester>
+
+          <me:StyleTester>
+            <BaseStyle>
+              <me:Style Style="{me:UnitTestStyles.SimpleStyle}"/>
+            </BaseStyle>
+            <OverrideStyle>
+              <me:Style Style="{me:UnitTestStyles.BetterStyle}"/>
+            </OverrideStyle>
+          </me:StyleTester>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <Class Name="UnitTestStyles" Shared="true">
+    <Properties>
+      <me:SimpleStyle Name="SimpleStyle"/>
+
+      <me:BetterStyle Name="BetterStyle"/>
+    </Properties>
+  </Class>
+
+  
+  
+  
+  <Class Name="SimpleStyle" Base="me:StyleSet">
+    <Properties>
+      <me:Style Name="Disabled" Color="Grey"    Font="Arial, 16" TextStyle="{null}"/>
+      <me:Style Name="Selected" Color="Purple"  Font="Arial, 16" TextStyle="{null}"/>
+      <me:Style Name="Focused"  Color="Pink"    Font="Arial, 18" TextStyle="{null}"/>
+      <me:Style Name="Hovered"  Color="Orange"  Font="Arial, 16" TextStyle="{null}"/>
+      <me:Style Name="Default"  Color="White"   Font="Arial, 16" TextStyle="{null}"/>
+    </Properties>
+  </Class>
+
+  
+  
+  
+  <Class Name="BetterStyle" Base="me:StyleSet">
+    <Properties>
+      <TextStyle Name="TightSpacing" CharacterSpacing="0"/>
+      <TextStyle Name="WideSpacing" CharacterSpacing="0"/>
+
+      <me:Style Name="Disabled" Color="Grey"    Font="Segoe UI, 16" TextStyle="{WideSpacing}"/>
+      <me:Style Name="Selected" Color="Purple"  Font="Segoe UI, 16" TextStyle="{TightSpacing}"/>
+      <me:Style Name="Focused"  Color="Pink"    Font="Segoe UI, 16" TextStyle="{TightSpacing}"/>
+      <me:Style Name="Hovered"  Color="Orange"  Font="Segoe UI, 16" TextStyle="{TightSpacing}"/>
+      <me:Style Name="Default"  Color="White"   Font="Segoe UI, 16" TextStyle="{TightSpacing}"/>
+    </Properties>
+  </Class>
+
+  
+  
+  
+  <UI Name="StyleTester">
+    <Properties>
+      <me:Style Name="BaseStyle"/>
+      <me:Style Name="OverrideStyle" Style="{null}"/>
+      <me:StyleState Name="State"/>
+    </Properties>
+
+    <Locals>
+      <me:StatefulCompositeStyle Name="Style" Base="{BaseStyle}" Override="{OverrideStyle}" State="{State}"/>
+
+      <iris:BooleanChoice Name="Hovered" Description="Hovered"/>
+      <iris:BooleanChoice Name="Focused" Description="Focused"/>
+      <iris:BooleanChoice Name="Selected" Description="Selected"/>
+      <iris:BooleanChoice Name="Disabled" Description="Disabled"/>
+    </Locals>
+
+    <Scripts>
+      <Script>Label.Font = [Style.Font];</Script>
+      <Script>Label.Color = [Style.Color];</Script>
+      <Script>Label.Style = [Style.TextStyle];</Script>
+
+      <Script>State.Hovered = [Hovered.Value];</Script>
+      <Script>State.Focused = [Focused.Value];</Script>
+      <Script>State.Selected = [Selected.Value];</Script>
+      <Script>State.Disabled = [Disabled.Value];</Script>
+    </Scripts>
+
+    <Content>
+      <Panel Layout="VerticalFlow">
+        <Children>
+
+          <Text Name="Label" Content="Test Text" Margins="0,0,0,20"/>
+
+          <me:SimpleCheckBox Model="{Hovered}"/>
+          <me:SimpleCheckBox Model="{Focused}"/>
+          <me:SimpleCheckBox Model="{Selected}"/>
+          <me:SimpleCheckBox Model="{Disabled}"/>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="SimpleCheckBox">
+    <Properties>
+      <iris:BooleanChoice Name="Model" Description="Default"/>
+    </Properties>
+
+    <Input>
+      <ClickHandler Name="Clicky"/>
+    </Input>
+
+    <Scripts>
+      <Script>
+        [DeclareTrigger(Clicky.Invoked)]
+        Model.Value = !Model.Value;
+      </Script>
+
+      <Script>
+        Label.Content = "{0}: {1}".Format([Model.Description], [Model.Value]);
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Text Name="Label" Color="White" Font="Arial, 12"/>
+    </Content>
+  </UI>
+
+</UIX>
\ No newline at end of file
diff --git a/test/2.1/STYLES.UIX b/test/2.1/STYLES.UIX
new file mode 100644
index 0000000..6b53d7e
--- /dev/null
+++ b/test/2.1/STYLES.UIX
@@ -0,0 +1,1488 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:style="res://ZuneShellResources!Style.uix"
+  xmlns:me="Me">
+
+  
+  <Class Name="Styles" Shared="True">
+    <Properties>
+      
+      <zune:FontLoader Name="FontLoader" Resource="ZuneShellResources.dll">
+        <Fonts>
+          <String String="EndurancePro-Bold.ttf"/>
+          <String String="EnduranceProCaps-Bold.ttf"/>
+          <String String="Zegoesb_U_AA.ttf"/>
+          <String String="Zegoeui_U_AA.ttf"/>
+          <String String="Zegoeuib_U_AA.ttf"/>
+          <String String="Cegoeuil_auto.ttf"/>
+          <String String="zegoecpb.ttf"/>
+        </Fonts>
+      </zune:FontLoader>
+
+      
+
+      
+      <Color Name="DarkGray"                  Color="55,46,31"/> 
+      <Color Name="WarmGray"                  Color="107,101,90"/>
+      <Color Name="LightGray"                 Color="238,238,238"/>
+      <Color Name="VeryLightGray"             Color="246,246,246"/>
+      <Color Name="RedOrange"                 Color="235,70,46"/>
+      <Color Name="Magenta"                   Color="241,13,162"/>
+
+      <Color Name="DoradoBlack"               Color="23,15,3"/>
+      <Color Name="HoverGray"                 Color="165,159,147"/>
+      <Color Name="NewWarmBrown"              Color="54,46,31"/>
+
+      <Color Name="MarketplaceDefault"        Color="{DarkGray}"/>
+      <Color Name="MarketplacePageTitle"      Color="93,85,72"/>
+
+      <Color Name="PrimaryLabel"              Color="{WarmGray}"/>
+      <Color Name="PrimaryLabelSelected"      Color="{DarkGray}"/>
+      <Color Name="PrimaryLabelDisabled"      Color="175,163,143"/>
+
+      <Color Name="LightOnDarkText"           Color="255,255,255"/>
+      <Color Name="LightOnDarkAltText"        Color="128,255,255,255"/>
+      <Color Name="LightOnDarkSubText"        Color="179,154,156"/>
+      <Color Name="SearchBoxBackground"       Color="White"/>
+
+      <Color Name="ListItemText"                Color="{DarkGray}"/>
+      <Color Name="ListItemHoverText"           Color="{WarmGray}"/>
+      <Color Name="ListItemSelectedText"        Color="{DarkGray}"/>
+      <Color Name="ListItemBackground"          Color="Transparent"/>
+      <Color Name="ListItemHoverBackground"     R="{DarkGray.R}" G="{DarkGray.G}" B="{DarkGray.B}" A="30"/>
+      <Color Name="ListItemSelectedBackground"  R="{DarkGray.R}" G="{DarkGray.G}" B="{DarkGray.B}" A="50"/>
+
+      <Color Name="ListHeaderBackground"        Color="Transparent"/>
+      <Color Name="ListHeaderHoverBackground"   Color="128,237,237,237"/>
+      <Color Name="ListHeaderActiveHoverBackground" Color="237,237,237"/>
+
+      <Color Name="SearchBoxBackgroundActive" Color="White"/>
+      <Color Name="SearchBoxTextColor"        Color="{WarmGray}"/>
+
+      <Color Name="NowPlayingBorderColor"     Color="154,154,154"/>
+
+      <Color Name="ColumnDivider"             Color="212,207,205"/>
+      <Color Name="SecondaryLabel"            Color="{MarketplacePageTitle}"/>
+
+      <Color Name="ThumbnailButton"           Color="{DarkGray}"/>
+
+      <Color Name="ThumbnailButtonSelected"   Color="{DarkGray}"/>
+      <Color Name="SecondaryThumbnailButton"  Color="{DarkGray}"/>
+      <Color Name="VideoBorderColor"          Color="179,172,158"/>
+      <Color Name="CaretColor"                Color="130,119,100"/>
+      <Color Name="HyperlinkColor"            Color="243,112,36"/>
+      <Color Name="ScrollBarThumb"            Color="58,50,31"/>
+      <Color Name="ScrollBarBackground"       Color="219,217,209"/>
+      <Color Name="ScrollPath"                Color="{ScrollBarBackground}"/>
+      <Color Name="ThumbnailRolloverColor"    Color="{Magenta}"/>
+      <Color Name="PhotoFolderCountColor"     Color="{LightOnDarkText}"/>
+      <Color Name="MenuItemSelectedBackground" Color="166,255,255,255"/>
+      <Color Name="TransportButtonPressedColor"   Color="59,41,12"/>
+      <Color Name="TransportButtonHoverColor"     Color="Black"/>
+      <Color Name="ActionButtonDisabled"      Color="211,208,197"/>
+      <Color Name="ActionButton"              Color="{WarmGray}"/>
+      <Color Name="ActionButtonProgress"      Color="{LightOnDarkText}"/>
+      <Color Name="ActionButtonShadow"        Color="{LightOnDarkText}"/>
+      <Color Name="NowPlayingButtonPressedColor"  Color="{DarkGray}"/>
+      <Color Name="NowPlayingButtonDisabledColor" Color="100,255,255,255"/>
+      <Color Name="NowPlayingButtonHoverColor"    Color="White"/>
+      <Color Name="NowPlayingButtonColor"         Color="127,255,255,255"/>
+
+      
+      <Color Name="PodcastPaneDescription"    Color="58,50,31"/>
+      <Color Name="EpisodePlayedColor"        Color="157,154,149"/>
+      <Color Name="EpisodeUnplayedColor"      Color="{WarmGray}"/>
+
+      
+      <Color Name="EditTextBackground"        Color="White"/>
+      <Color Name="EditText"                  Color="143,137,127"/>
+      <Color Name="EditTextBorder"            Color="209,204,201"/>
+      <Color Name="EditTextFocusedForeground" Color="White"/>
+      <Color Name="EditTextFocusedBackground" Color="{RedOrange}"/>
+
+      
+      <Color Name="JumpInListTextColor"        Color="White"/>
+      <Color Name="JumpInListFadeColor"        Color="150,59,41,12"/>
+
+      
+      <Color Name="SettingLinkText"           Color="{RedOrange}"/>
+      <Color Name="SettingLinkTextFocus"      Color="211,56,34"/>
+
+      <Color Name="IconNotificationTextColor"      Color="{WarmGray}"/>
+      <Color Name="IconNotificationBoldColor"      Color="{DarkGray}"/>
+
+
+      
+
+      
+
+      
+      <Color Name="ZuneMagenta"               Color="{Magenta}"/>
+      <Color Name="ZuneOrange"                Color="{RedOrange}"/>
+
+      
+      <Color Name="TextActive"                Color="{WarmGray}"/>
+      
+      <Color Name="TextInactive"              Color="128,85,87,87"/>
+      
+      <Color Name="TextSelected"              Color="{DarkGray}"/>
+
+      <Color Name="SettingsTextActive"        Color="{DarkGray}"/>
+
+      
+      <Color Name="TextFocusedForeground"     Color="{DarkGray}"/>
+      <Color Name="TextFocusedBackground"     Color="85,87,87"/>
+      
+      <Color Name="SectionHeadColor"          Color="{DarkGray}" />
+      
+      <Color Name="SectionSubHeadColor"       Color="{MarketplacePageTitle}"/>
+      
+      <Color Name="SearchResultsColor"        Color="{WarmGray}"/>
+      
+      <Color Name="SearchKeywordColor"        Color="{DarkGray}"/>
+      
+      <Color Name="SearchKeywordHeader"       Color="{WarmGray}"/>
+
+      <Color Name="DialogTextColor"           Color="{WarmGray}"/>
+      <Color Name="DialogHeaderColor"         Color="{DarkGray}"/>
+      <Color Name="DialogLinkColor"           Color="{RedOrange}"/>
+      <Color Name="DialogBackgroundFadeColor" Color="125,255,255,255"/>
+
+      <Color Name="CDLandTrackNumberDefaultColor"           Color="{WarmGray}"/>
+      <Color Name="CDLandTrackNumberSelectedColor"          Color="{DarkGray}"/>
+
+      <Color Name="DragFeedbackTextColor"     Color="White"/>
+
+      <Color Name="TransportVolumeColor"      Color="{DarkGray}"/>
+
+      <Color Name="NoCollectionHighlightText" Color="{Magenta}"/>
+
+      <Color Name="SyncPercentColor"          Color="{DarkGray}"/>
+      <Color Name="SyncHeaderColor"           Color="{DarkGray}"/>
+      <Color Name="SyncInformation"           Color="{WarmGray}"/>
+
+      <Color Name="SlideshowSyncHeaderColor"  Color="{LightOnDarkText}"/>
+      <Color Name="SlideshowSyncInformation"  Color="{LightOnDarkAltText}"/>
+
+      <Color Name="FUEWelcomeTextColor"       Color="222,219,209"/>
+      <Color Name="FUEBrightTextColor"        Color="White"/>
+      <Color Name="FUEBodyTextColor"          Color="202,199,189"/>
+      
+      <Color Name="FUEThumbColor"             Color="{DoradoBlack}"/>
+      <Color Name="FUEBarColor"               Color="{WarmGray}"/>
+      <Color Name="FUEPageColor"              Color="{FUEBodyTextColor}"/>
+      <Color Name="FUEScrollPathColor"        Color="{HoverGray}"/>
+
+      <Color Name="PodcastDescriptionColor"   Color="{WarmGray}"/>
+      <Color Name="WarningColor"              Color="Black"/>
+
+      <Color Name="InboxReadColor"            Color="157,154,149"/>
+      <Color Name="InboxUnreadColor"          Color="{WarmGray}"/>
+
+      
+
+      
+      <Font Name="ZegoeLight12"               Font="Cegoe UI Light,12"/>
+      <Font Name="ZegoeLight14"               Font="Cegoe UI Light,14"/>
+      <Font Name="ZegoeLight15"               Font="Cegoe UI Light,15"/>
+      <Font Name="ZegoeLight16"               Font="Cegoe UI Light,16"/>
+      <Font Name="ZegoeLight18"               Font="Cegoe UI Light,18"/>
+      <Font Name="ZegoeLight20"               Font="Cegoe UI Light,20"/>
+      <Font Name="ZegoeLight24"               Font="Cegoe UI Light,24"/>
+
+      <Font Name="Zegoe7"                     Font="Zegoe UI - U,7"/>
+      <Font Name="Zegoe8"                     Font="Zegoe UI - U,8"/>
+      <Font Name="Zegoe9"                     Font="Zegoe UI - U,9"/>
+      <Font Name="Zegoe10"                    Font="Zegoe UI - U,10"/>
+      <Font Name="Zegoe11"                    Font="Zegoe UI - U,11"/>
+      <Font Name="Zegoe12"                    Font="Zegoe UI - U,12"/>
+      <Font Name="Zegoe14"                    Font="Zegoe UI - U,14"/>
+      <Font Name="Zegoe16"                    Font="Zegoe UI - U,16"/>
+      <Font Name="Zegoe18"                    Font="Zegoe UI - U,18"/>
+      <Font Name="Zegoe21"                    Font="Zegoe UI - U,21"/>
+      <Font Name="Zegoe24"                    Font="Zegoe UI - U,24"/>
+      <Font Name="Zegoe42"                    Font="Zegoe UI - U,42"/>
+
+      <Font Name="ZegoeSemiBold7"             Font="Zegoe UI Semi Bold - U,7"/>
+      <Font Name="ZegoeSemiBold8"             Font="Zegoe UI Semi Bold - U,8"/>
+      <Font Name="ZegoeSemiBold9"             Font="Zegoe UI Semi Bold - U,9"/>
+      <Font Name="ZegoeSemiBold10"            Font="Zegoe UI Semi Bold - U,10"/>
+      <Font Name="ZegoeSemiBold11"            Font="Zegoe UI Semi Bold - U,11"/>
+      <Font Name="ZegoeSemiBold12"            Font="Zegoe UI Semi Bold - U,12"/>
+      <Font Name="ZegoeSemiBold14"            Font="Zegoe UI Semi Bold - U,14"/>
+
+      <Font Name="ZegoeBold7"                 Font="Zegoe UI - U,7,Bold"/>
+      <Font Name="ZegoeBold8"                 Font="Zegoe UI - U,8,Bold"/>
+      <Font Name="ZegoeBold9"                 Font="Zegoe UI - U,9,Bold"/>
+      <Font Name="ZegoeBold10"                Font="Zegoe UI - U,10,Bold"/>
+      <Font Name="ZegoeBold11"                Font="Zegoe UI - U,11,Bold"/>
+      <Font Name="ZegoeBold12"                Font="Zegoe UI - U,12,Bold"/>
+      <Font Name="ZegoeBold14"                Font="Zegoe UI - U,14,Bold"/>
+      <Font Name="ZegoeBold18"                Font="Zegoe UI - U,18,Bold"/>
+      <Font Name="ZegoeBold20"                Font="Zegoe UI - U,20,Bold"/>
+      <Font Name="ZegoeBold22"                Font="Zegoe UI - U,22,Bold"/>
+      <Font Name="ZegoeBold24"                Font="Zegoe UI - U,24,Bold"/>
+      <Font Name="ZegoeBold28"                Font="Zegoe UI - U,28,Bold"/>
+      <Font Name="ZegoeBold36"                Font="Zegoe UI - U,36,Bold"/>
+      <Font Name="ZegoeBold42"                Font="Zegoe UI - U,42,Bold"/>
+      <Font Name="ZegoeBold44"                Font="Zegoe UI - U,44,Bold"/>
+
+      <Font Name="ZegoeBold24Caps"            Font="Zegoe Caps,24,Bold"/>
+      <Font Name="ZegoeBold36Caps"            Font="Zegoe Caps,36,Bold"/>
+      
+      <Font Name="EnduranceProBold32"         Font="Endurance Pro,32,Bold"/>
+      <Font Name="EnduranceProCapsBold32"     Font="Endurance Pro Caps,32,Bold"/>
+      <Font Name="EnduranceProCapsBold36"     Font="Endurance Pro Caps,32,Bold"/>
+      <Font Name="EnduranceProCapsBold24"     Font="Endurance Pro Caps,24,Bold"/>
+      <Font Name="EnduranceProCapsBold20"     Font="Endurance Pro Caps,20,Bold"/>
+
+      <Font Name="ZegoeCaps7"                 Font="Zegoe Caps,7,Bold"/>
+      <Font Name="ZegoeCaps14"                Font="Zegoe Caps,14,Bold"/>
+      <Font Name="ZegoeCaps18"                Font="Zegoe Caps,18,Bold"/>
+      <Font Name="ZegoeCaps21"                Font="Zegoe Caps,21,Bold"/>
+      <Font Name="ZegoeCaps24"                Font="Zegoe Caps,24,Bold"/>
+
+      
+      <Font Name="PrimaryText"                Font="{ZegoeSemiBold9}"/>
+      
+      <Font Name="HeaderText"                 Font="{Zegoe8}"/>
+      <Font Name="MicroText"                  Font="{Zegoe7}"/>
+
+      
+      <Font Name="ExperienceText"             Font="{ZegoeBold10}"/>
+      
+      <Font Name="ColumnPlayText"             Font="{ZegoeBold7}"/>
+      
+      <Font Name="SelectedPivotText"          Font="{ZegoeBold10}"/>
+
+      <Font Name="ReviewHeader"               Font="{ZegoeBold42}"/>
+      <Font Name="ReviewSubHeader"            Font="{ZegoeCaps21}"/>
+      <Font Name="ReviewText"                 Font="{Zegoe10}"/>
+      <Font Name="PlaylistHeader"             Font="{ZegoeBold14}"/>
+      <Font Name="HyperlinkText"              Font="{Zegoe9}"/>
+
+      <Font Name="TransportTextPrimary"       Font="{Zegoe14}"/>
+      <Font Name="TransportTextSecondary"     Font="{Zegoe10}"/>
+      <Font Name="TransportTextTertiary"      Font="{Zegoe8}"/>
+      <Font Name="TransportVolumeFont"        Font="{ZegoeBold8}"/>
+
+      <Font Name="StandardHeaderText"         Font="{Zegoe16}"/>
+      <Font Name="StandardSubHeaderText"      Font="{Zegoe10}"/>
+
+
+      
+      <Font Name="SettingsTextHeader"         Font="{ZegoeBold42}"/>
+      <Font Name="SettingsTextDesc"           Font="{ZegoeBold24}"/>
+      <Font Name="SettingsTextSubHeader"      Font="{ZegoeSemiBold14}"/>
+      <Font Name="SettingsText"               Font="{ZegoeSemiBold10}"/>
+      <Font Name="SettingsTextMini"           Font="{Zegoe8}"/>
+
+      <Font Name="ButtonText"                 Font="{ZegoeBold7}"/>
+      <Font Name="BigButtonText"              Font="{ZegoeBold8}"/>
+
+      
+      <Font Name="MarketplaceListText"        Font="{ZegoeSemiBold10}"/>
+      <Font Name="MarketplaceHeader"          Font="{Zegoe14}"/>
+
+      <Font Name="ListItemNumber"             Font="{ZegoeSemiBold9}"/>
+
+      
+      <Font Name="SyncPercentComplete"        Font="{ZegoeLight20}"/>
+      <Font Name="SyncHeaderFont"             Font="{ZegoeSemiBold8}"/>
+      <Font Name="SyncInfoFont"               Font="{ZegoeSemiBold8}"/>
+
+      
+      <Font Name="InboxCategory"              Font="{ZegoeSemiBold14}"/>
+      <Font Name="InboxColumnHeader"          Font="{ZegoeBold7}"/>
+      <Font Name="InboxUnreadMessage"         Font="{ZegoeSemiBold10}"/>
+      <Font Name="InboxReadMessage"           Font="{ZegoeSemiBold10}"/>
+      <Font Name="DetailsSender"              Font="{ZegoeBold12}"/>
+      <Font Name="DetailsAlbumTitle"          Font="{Zegoe12}"/>
+      <Font Name="DetailsAlbumArtist"         Font="{Zegoe9}"/>
+      <Font Name="DetailsAlbumGenre"          Font="{Zegoe9}"/>
+      <Font Name="DetailsAlbumReleaseYear"    Font="{Zegoe9}"/>
+
+      
+      <Font Name="DetailTitle"            Font="{ZegoeSemiBold10}"/>
+      <Font Name="EpisodeListItem"        Font="{ZegoeSemiBold10}"/>
+
+      
+      <Font Name="DialogLargeHeaderText"  Font="{ZegoeBold22}"/>
+      <Font Name="DialogHeaderText"       Font="{ZegoeBold18}"/>
+      <Font Name="DialogSubHeaderText"    Font="{ZegoeBold9}"/>
+      <Font Name="DialogText"             Font="{ZegoeSemiBold9}"/>
+      <Font Name="DialogMediumText"       Font="{ZegoeSemiBold8}"/>
+      <Font Name="DialogSmallText"        Font="{ZegoeBold7}"/>
+      <Font Name="DialogListItem"         Font="{ZegoeSemiBold8}"/>
+
+      
+      <Font Name="DragFeedbackText"       Font="{ZegoeBold10}"/>
+
+      
+      <Font Name="SearchResultText"       Font="{ZegoeSemiBold10}"/>
+      <Font Name="SearchResultSmallText"  Font="{ZegoeSemiBold8}"/>
+      <Font Name="SearchHeaderText"       Font="{ZegoeBold7}"/>
+      <Font Name="SearchSubHeaderText"    Font="{ZegoeLight16}"/>
+
+      <Font Name="TopPivotText"           Font="{ZegoeSemiBold11}"/>
+      <Font Name="BottomPivotText"        Font="{Zegoe18}"/>
+      <Font Name="LibraryPivotText"       Font="{Zegoe14}"/>
+      <Font Name="SearchBoxText"          Font="{ZegoeSemiBold8}"/>
+      <Font Name="SignInButtonText"       Font="{ZegoeSemiBold8}"/>
+      <Font Name="SettingsButtonText"     Font="{ZegoeSemiBold8}"/> 
+
+      <Font Name="CDLandArtistName"       Font="{ZegoeBold36Caps}"/>
+      <Font Name="CDLandAlbumName"        Font="{ZegoeBold24Caps}"/>
+      <Font Name="CDLandAlbumYear"        Font="{Zegoe12}"/>
+      <Font Name="CDLandAlbumGenre"       Font="{Zegoe12}"/>
+      <Font Name="CDLandTrackNumber"      Font="{ZegoeLight14}"/>
+      <Font Name="CDLandTrackName"        Font="{ZegoeSemiBold10}"/>
+
+      <Font  Name="JumpInListFont"        Font="{ZegoeBold28}"/>
+
+      <Font Name="HyperlinkFont"          Font="{ZegoeSemiBold9}"/>
+
+      <Font Name="IconNotificationTextFont"      Font="{ZegoeSemiBold8}"/>
+
+      <Font Name="PodcastDescriptionFont"        Font="{Zegoe10}"/>
+      <Font Name="WarningFont"                   Font="{ZegoeBold7}"/>
+      <Font Name="PodcastTitleFont"              Font="{ZegoeCaps18}"/>
+
+
+      <TextStyle Name="BottomPivotTextTracking"/>
+      <TextStyle Name="MarketplaceHubListTracking"/>
+
+      
+      
+      <Single Name="FullBleedPhotoAspectToleranceMin" Single="0.85"/>
+      <Single Name="FullBleedPhotoAspectToleranceMax" Single="1.25"/>
+
+
+      <Inset Name="FrameMargins" Inset="55,22,55,0"/>
+
+      <Inset Name="VideoMarginsGDIMode" Inset="3, 40, 3, 88"/>
+
+      
+      
+      
+      
+      <Size  Name="ListItemSize" Size="0,23"/>
+      <Inset Name="ListItemMargins" Inset="0,3,0,3"/>
+
+      <Size  Name="LibraryListLayoutSpacing" Size="0,1"/>
+      <Size  Name="LibraryListItemSize" Size="0,21"/>
+      <Inset Name="LibraryListItemMargins" Inset="0,1,0,3"/>
+
+      <Inset Name="ListBoxItemPadding" Inset="0,2,0,2"/>
+      <Inset Name="CellPadding" Inset="13,0,5,0"/>
+
+
+      
+
+      <Image Name="SearchBoxBackgroundImage"       Source="res://ZuneShellResources!SearchBox.Background.png" NineGrid="4,4,4,4"/>
+      <Image Name="SearchBoxBackgroundImageActive" Source="res://ZuneShellResources!SearchBox.Background.Active.png" NineGrid="4,4,4,4"/>
+
+      <Image Name="ExternalLink"          Source="res://ZuneShellResources!Icon.ExternalLink.png"/>
+      <Image Name="Video"                 Source="res://ZuneShellResources!Icon.Video.png"/>
+      <Image Name="VideoHeader"           Source="res://ZuneShellResources!Icon.Video.Header.png"/>
+      <Image Name="PageCurrent"           Source="res://ZuneShellResources!Icon.Page.Current.png"/>
+      <Image Name="PageOther"             Source="res://ZuneShellResources!Icon.Page.Other.png"/>
+
+      <Image Name="ZuneLogo"              Source="res://ZuneShellResources!ZuneLogo.png"/>
+      <Image Name="ZuneColorLogo"         Source="res://ZuneShellResources!ZuneColorLogo.png"/>
+
+      <Image Name="RatingHeader"          Source="res://ZuneShellResources!Rating.Header.png"/>
+
+      
+      <Image Name="RatingNotRatedDefault" Source="res://ZuneShellResources!Rating.Default.png"/>
+
+      <Image Name="RatingNotRated"        Source="res://ZuneShellResources!Rating.NotRated.png"/>
+      <Image Name="RatingNotRatedHover"   Source="res://ZuneShellResources!Rating.NotRated.Hover.png"/>
+      <Image Name="RatingNotRatedPressed" Source="res://ZuneShellResources!Rating.NotRated.Click.png"/>
+
+      <Image Name="RatingLikeIt"          Source="res://ZuneShellResources!Rating.LikeIt.png"/>
+      <Image Name="RatingLikeItHover"     Source="res://ZuneShellResources!Rating.LikeIt.Hover.png"/>
+      <Image Name="RatingLikeItPressed"   Source="res://ZuneShellResources!Rating.LikeIt.Click.png"/>
+      <Image Name="RatingLikeItSelected"  Source="res://ZuneShellResources!Rating.LikeIt.Selected.png"/>
+
+      <Image Name="RatingHateIt"          Source="res://ZuneShellResources!Rating.HateIt.png"/>
+      <Image Name="RatingHateItHover"     Source="res://ZuneShellResources!Rating.HateIt.Hover.png"/>
+      <Image Name="RatingHateItPressed"   Source="res://ZuneShellResources!Rating.HateIt.Click.png"/>
+      <Image Name="RatingHateItSelected"  Source="res://ZuneShellResources!Rating.HateIt.Selected.png"/>
+
+      <Image Name="SortArrowUp"           Source="res://ZuneShellResources!SortArrow.Up.png"/>
+      <Image Name="SortArrowDown"         Source="res://ZuneShellResources!SortArrow.Down.png"/>
+
+      <Image Name="Points"                Source="res://ZuneShellResources!Points.Top.png"/>
+      <Image Name="PointsButton"          Source="res://ZuneShellResources!Points.Button.png"/>
+      <Image Name="PointsInline"          Source="res://ZuneShellResources!Points.Inline.png"/>
+
+      <Image Name="ScrollbarShadowHoverVert"      Source="res://ZuneShellResources!Scrollbar.Hover.Shadow.Vert.png" NineGrid="3,3,3,3"/>
+      <Image Name="ScrollbarShadowHoverHoriz"     Source="res://ZuneShellResources!Scrollbar.Hover.Shadow.Horiz.png" NineGrid="3,3,3,3"/>
+      <Image Name="ScrollbarShadowPressedVert"    Source="res://ZuneShellResources!Scrollbar.Pressed.Shadow.Vert.png" NineGrid="3,3,3,3"/>
+      <Image Name="ScrollbarShadowPressedHoriz"   Source="res://ZuneShellResources!Scrollbar.Pressed.Shadow.Horiz.png" NineGrid="3,3,3,3"/>
+      <Image Name="ScrollbarAccentHoriz"          Source="res://ZuneShellResources!Scrollbar.Accent.Horiz.png"/>
+      <Image Name="ScrollbarAccentVert"           Source="res://ZuneShellResources!Scrollbar.Accent.Vert.png"/>
+      <Image Name="ScrollbarArrowLeft"            Source="res://ZuneShellResources!Scrollbar.Arrow.Left.png"/>
+      <Image Name="ScrollbarArrowUp"              Source="res://ZuneShellResources!Scrollbar.Arrow.Up.png"/>
+      <Image Name="ScrollbarArrowRight"           Source="res://ZuneShellResources!Scrollbar.Arrow.Right.png"/>
+      <Image Name="ScrollbarArrowDown"            Source="res://ZuneShellResources!Scrollbar.Arrow.Down.png"/>
+
+      <Image Name="NowPlaying"                    Source="res://ZuneShellResources!Icon.NowPlaying.png"/>
+      <Image Name="SyncHeader"                    Source="res://ZuneShellResources!Sync.Header.png"/>
+      <Image Name="MP3Overlay"                    Source="res://ZuneShellResources!MP3Overlay.png"/>
+      <Image Name="NotAvailableOverlay"           Source="res://ZuneShellResources!NotAvailableOverlay.png"/>
+
+      <Image Name="JumpInBorder"         Source="res://ZuneShellResources!JumpInBorder.png"/>
+
+      
+      <Image Name="SyncingIcon" Source="res://ZuneShellResources!Sync.ActivelySyncing.png"/>
+      <Image Name="OnDeviceIcon" Source="res://ZuneShellResources!Sync.OnDevice.png"/>
+      <Image Name="OnDeviceIconHover" Source="res://ZuneShellResources!Sync.OnDevice.Hover.png"/>
+      <Image Name="ExcludedIcon" Source="res://ZuneShellResources!Sync.Excluded.png"/>
+      <Image Name="ExcludedIconHover" Source="res://ZuneShellResources!Sync.Excluded.Hover.png"/>
+      
+      
+      <List Name="SyncIconImages">
+        <Source>
+          <Image Image="{SyncingIcon}"/>
+          <Image Image="{OnDeviceIcon}"/>
+          <Image Image="{ExcludedIcon}"/>
+          <Image Image="{null}"/>
+        </Source>
+      </List>
+      
+      
+      <List Name="SyncIconHoverImages">
+        <Source>
+          <Image Image="{SyncingIcon}"/>
+          <Image Image="{OnDeviceIconHover}"/>
+          <Image Image="{ExcludedIconHover}"/>
+          <Image Image="{null}"/>
+        </Source>
+      </List>
+      
+      
+      <Color Name="GasGaugeFreeSpace"            Color="Transparent"/>
+      <Color Name="GasGaugeBorder"               Color="White"/>
+      <Color Name="GasGaugeMiniBorder"           Color="Black"/>
+      <Color Name="GasGaugeUnimportantUsedSpace" Color="{DarkGray}"/>
+      <Color Name="GasGaugeImportantUsedSpace"   Color="{LightGray}"/>
+      <Color Name="GasGaugeNewlyUsedSpace"      Color="{ZuneMagenta}"/>
+
+      <Image Name="NoAlbumArt"              Source="res://ZuneShellResources!NoArt.png"/>
+      <Image Name="NoAlbumArtNowPlayingBig" Source="res://ZuneShellResources!NoArt.NowPlaying.Big.png" AntialiasEdges="{me:ImageStyles.AntialiasEdges}"/>
+      <Image Name="NoArtWide"               Source="res://ZuneShellResources!NoArt.Wide.png"/>
+      <Image Name="NoArtWider"              Source="res://ZuneShellResources!NoArt.Wider.png"/>
+      <Image Name="NoAlbumArtRip"           Source="res://ZuneShellResources!NoArt.Rip.png" AntialiasEdges="{me:ImageStyles.AntialiasEdges}"/>
+      <Image Name="NoAlbumArtBurn"          Source="res://ZuneShellResources!NoArt.Burn.png" AntialiasEdges="{me:ImageStyles.AntialiasEdges}"/>
+
+      <Image Name="DragSelectRect"      Source="res://ZuneShellResources!DragSelectRect.png" NineGrid="2,2,2,2"/>
+      <Image Name="DragFallback"        Source="res://ZuneShellResources!DragFallback.png"/>
+      <Image Name="DragFeedbackGlow"    Source="res://ZuneShellResources!DragFeedbackGlow.png" NineGrid="6,6,6,6"/>
+      <Image Name="DragFeedbackLabel"   Source="res://ZuneShellResources!DragFeedbackLabel.png" NineGrid="4,4,4,4"/>
+      <Image Name="DragCancel"          Source="res://ZuneShellResources!DragCancel.png"/>
+      <Image Name="DragCopy"            Source="res://ZuneShellResources!DragCopy.png"/>
+
+      
+      <Inset Name="ButtonNineGrid"      Inset="11,0,11,0"/>
+      <Image Name="Button"              Source="res://ZuneShellResources!ActionButton.png"          NineGrid="{ButtonNineGrid}"/>
+      <Image Name="ButtonHover"         Source="res://ZuneShellResources!ActionButton.Hover.png"    NineGrid="{ButtonNineGrid}"/>
+      <Image Name="ButtonPressed"       Source="res://ZuneShellResources!ActionButton.Pressed.png"  NineGrid="{ButtonNineGrid}"/>
+      <Image Name="ButtonDisabled"      Source="res://ZuneShellResources!ActionButton.Disabled.png" NineGrid="{ButtonNineGrid}"/>
+      <Image Name="ButtonProgress"      Source="res://ZuneShellResources!ActionProgressButton.ProgressBar.png" NineGrid="{ButtonNineGrid}"/>
+      <Image Name="ButtonProgressBackground" Source="res://ZuneShellResources!ActionProgressButton.ProgressBackground.png" NineGrid="{ButtonNineGrid}"/>
+
+      <Inset Name="BigButtonNineGrid"   Inset="13,0,13,0"/>
+      <Image Name="BigButton"           Source="res://ZuneShellResources!BigActionButton.png"          NineGrid="{BigButtonNineGrid}"/>
+      <Image Name="BigButtonHover"      Source="res://ZuneShellResources!BigActionButton.Hover.png"    NineGrid="{BigButtonNineGrid}"/>
+      <Image Name="BigButtonPressed"    Source="res://ZuneShellResources!BigActionButton.Pressed.png"  NineGrid="{BigButtonNineGrid}"/>
+      <Image Name="BigButtonDisabled"   Source="res://ZuneShellResources!BigActionButton.Disabled.png" NineGrid="{BigButtonNineGrid}"/>
+
+      <Inset Name="NowPlayingButtonNineGrid"   Inset="15,0,15,0"/>
+      <Image Name="NowPlayingButton"           Source="res://ZuneShellResources!NowPlaying.Button.png"          NineGrid="{NowPlayingButtonNineGrid}"/>
+      <Image Name="NowPlayingButtonHover"      Source="res://ZuneShellResources!NowPlaying.Button.Hover.png"    NineGrid="{NowPlayingButtonNineGrid}"/>
+      <Image Name="NowPlayingButtonPressed"    Source="res://ZuneShellResources!NowPlaying.Button.Pressed.png"  NineGrid="{NowPlayingButtonNineGrid}"/>
+      <Image Name="NowPlayingButtonDisabled"   Source="res://ZuneShellResources!NowPlaying.Button.Disabled.png" NineGrid="{NowPlayingButtonNineGrid}"/>
+
+      <List Name="NowPlayingNoArt">
+        <Source>
+          <Image Source="res://ZuneShellResources!NowPlayingArtLogo_01.png"/>
+          <Image Source="res://ZuneShellResources!NowPlayingArtLogo_02.png"/>
+          <Image Source="res://ZuneShellResources!NowPlayingArtLogo_03.png"/>
+          <Image Source="res://ZuneShellResources!NowPlayingArtLogo_04.png"/>
+          <Image Source="res://ZuneShellResources!NowPlayingArtLogo_05.png"/>
+          <Image Source="res://ZuneShellResources!NowPlayingArtLogo_06.png"/>
+          <Image Source="res://ZuneShellResources!NowPlayingArtShape_01a.png"/>
+          <Image Source="res://ZuneShellResources!NowPlayingArtShape_01b.png"/>
+          <Image Source="res://ZuneShellResources!NowPlayingArtShape_01c.png"/>
+          <Image Source="res://ZuneShellResources!NowPlayingArtShape_01d.png"/>
+          <Image Source="res://ZuneShellResources!NowPlayingArtShape_02a.png"/>
+          <Image Source="res://ZuneShellResources!NowPlayingArtShape_02b.png"/>
+          <Image Source="res://ZuneShellResources!NowPlayingArtShape_02c.png"/>
+          <Image Source="res://ZuneShellResources!NowPlayingArtShape_02d.png"/>
+          <Image Source="res://ZuneShellResources!NowPlayingArtShape_03a.png"/>
+          <Image Source="res://ZuneShellResources!NowPlayingArtShape_03b.png"/>
+          <Image Source="res://ZuneShellResources!NowPlayingArtShape_03c.png"/>
+          <Image Source="res://ZuneShellResources!NowPlayingArtShape_03d.png"/>
+        </Source>
+      </List>
+
+      <Inset Name="TransportButtonNineGrid"   Inset="15,0,15,0"/>
+      <Image Name="TransportButton"           Source="res://ZuneShellResources!Transport.ActionButton.png"          NineGrid="{TransportButtonNineGrid}"/>
+      <Image Name="TransportButtonHover"      Source="res://ZuneShellResources!Transport.ActionButton.Hover.png"    NineGrid="{TransportButtonNineGrid}"/>
+      <Image Name="TransportButtonPressed"    Source="res://ZuneShellResources!Transport.ActionButton.Pressed.png"  NineGrid="{TransportButtonNineGrid}"/>
+      <Image Name="TransportButtonDisabled"   Source="res://ZuneShellResources!Transport.ActionButton.Disabled.png" NineGrid="{TransportButtonNineGrid}"/>
+
+      
+      
+      <Image Name="DividerVertical"           Source="res://ZuneShellResources!Divider.Vertical.png"/>
+      <Image Name="DividerHorizontal"         Source="res://ZuneShellResources!Divider.Horizontal.png"/>
+      <Image Name="DividerVerticalSettings"   Source="res://ZuneShellResources!Divider.Settings.png"/>
+
+      
+      <Image Name="DialogBackground" Source="res://ZuneShellResources!DialogBackground.png"/>
+      <Image Name="DialogDropShadow" Source="res://ZuneShellResources!DialogDropShadow.png" NineGrid="12,12,12,12"/>
+      <Image Name="ToolTipDropShadow" Source="res://ZuneShellResources!ToolTipDropShadow.png" NineGrid="5,3,5,5"/>
+      <Image Name="ContextMenuDropShadow" Source="res://ZuneShellResources!ContextMenuDropShadow.png" NineGrid="8,8,12,12"/>
+
+      
+      <Image Name="ThumbnailShadow"        Source="res://ZuneShellResources!ThumbnailShadow.png" NineGrid="4,4,4,4"/>
+      <Image Name="ThumbnailClickShadow"   Source="res://ZuneShellResources!ThumbnailClickShadow.png" NineGrid="4,4,4,4"/>
+      <Image Name="ThumbnailClickOverlay"  Source="res://ZuneShellResources!ThumbnailClickOverlay.png"/>
+      <Image Name="ThumbnailRollover"      Source="res://ZuneShellResources!ThumbnailRollover.png" NineGrid="8,8,8,8"/>
+      <Image Name="AttentionImage"         Source="res://ZuneShellResources!Attention.png"/>
+      <Image Name="AttentionBigImage"      Source="res://ZuneShellResources!Attention.Big.png"/>
+
+      
+      <Image Name="SliderBackground"     Source="res://ZuneShellResources!Slider.Background.png" NineGrid="2,2,2,2"/>
+      <Image Name="SliderThumb"          Source="res://ZuneShellResources!Slider.Tinkerbell.png"/>
+      <Image Name="SliderHoverThumb"     Source="res://ZuneShellResources!Slider.Tinkerbell.png"/>
+      <Image Name="SliderFill"           Source="res://ZuneShellResources!Slider.Filled.png"/>
+      <Image Name="SlideshowSliderBackground" Source="res://ZuneShellResources!Slider.Slideshow.Background.png" NineGrid="8,2,8,2"/>
+      <Image Name="SlideshowSliderThumb"      Source="res://ZuneShellResources!Slider.Slideshow.Tinkerbell.png"/>
+      <Image Name="SlideshowSliderHoverThumb" Source="res://ZuneShellResources!Slider.Slideshow.Tinkerbell.png"/>
+      <Image Name="SlideshowSliderFill"       Source="res://ZuneShellResources!Slider.Slideshow.Filled.png"/>
+
+      
+      <List Name="FrameBackgrounds">
+        <Source>
+          
+          <zune:BackgroundOption Description="{zune:Shell.LoadString(zune:StringId.IDS_BACKGROUND_NAME_0)}" Value="res://ZuneShellResources!FrameBackground00.png" Color="{new iris:WindowColor(243,239,241)}"/>
+          <zune:BackgroundOption Description="{zune:Shell.LoadString(zune:StringId.IDS_BACKGROUND_NAME_1)}" Value="res://ZuneShellResources!FrameBackground01.png" Color="{new iris:WindowColor(252,239,246)}"/>
+          <zune:BackgroundOption Description="{zune:Shell.LoadString(zune:StringId.IDS_BACKGROUND_NAME_2)}" Value="res://ZuneShellResources!FrameBackground02.png" Color="{new iris:WindowColor(244,244,231)}"/>
+          <zune:BackgroundOption Description="{zune:Shell.LoadString(zune:StringId.IDS_BACKGROUND_NAME_3)}" Value="res://ZuneShellResources!FrameBackground03.png" Color="{new iris:WindowColor(236,236,237)}"/>
+          <zune:BackgroundOption Description="{zune:Shell.LoadString(zune:StringId.IDS_BACKGROUND_NAME_4)}" Value="res://ZuneShellResources!FrameBackground04.png" Color="{new iris:WindowColor(239,239,239)}"/>
+          <zune:BackgroundOption Description="{zune:Shell.LoadString(zune:StringId.IDS_BACKGROUND_NAME_5)}" Value="res://ZuneShellResources!FrameBackground05.png" Color="{new iris:WindowColor(239,239,239)}"/>
+        </Source>
+      </List>
+      <Int32 Name="DefaultBackgroundIndex" Int32="0"/>
+      <Inset Name="BackgroundMargins"       Inset="100,100,100,100"/>
+      <Image Name="DefaultBackgroundImage"
+             Source="{((zune:NamedStringOption)FrameBackgrounds.GetItem(DefaultBackgroundIndex)).Value}"
+             NineGrid="{BackgroundMargins}"/>
+
+      <Image Name="EnergyBar"               Source="res://ZuneShellResources!EnergyBar.png"/>
+      <Image Name="AlbumSmallShadow"        Source="res://ZuneShellResources!Album.Small.Shadow.png" NineGrid="8,8,8,8"/>
+      <Image Name="Grabber"                 Source="res://ZuneShellResources!Grabber.png"/>
+
+      <Image Name="CDImage"                 Source="res://ZuneShellResources!Icon.Burn.png"/>
+      <Image Name="CDImageSmall"            Source="res://ZuneShellResources!SmallRipBurnIcon.png"/>
+      <Image Name="CDShine"                 Source="res://ZuneShellResources!CDLandShine.png"/>
+      <Image Name="DownloadIconSmall"       Source="res://ZuneShellResources!SmallDownloadIcon.png"/>
+
+      <Image Name="FUEBackground"           Source="res://ZuneShellResources!FUE.Background.png"/>
+      <Image Name="FUEPatternBL"            Source="res://ZuneShellResources!FUE.Pattern.BL.png"/>
+      <Image Name="FUEPatternTR"            Source="res://ZuneShellResources!FUE.Pattern.TR.png"/>
+      <Image Name="FUEPatternBR"            Source="res://ZuneShellResources!FUE.Pattern.BR.png"/>
+      <Image Name="FUESpotlight"            Source="res://ZuneShellResources!Spotlight.png"/>
+      <Image Name="FUESpotlightLarge"       Source="res://ZuneShellResources!Spotlight.Large.png"/>
+      <Image Name="FUEZuneGemFull"          Source="res://ZuneShellResources!FUE.Gem.4.png"/>
+      <Image Name="FUEZuneFull"             Source="res://ZuneShellResources!FUE.Zune.Full.png"/>
+
+      <Image Name="LoadingBackground"       Source="res://ZuneShellResources!Loading.Background.png"/>
+      <Image Name="Img_Zune_Gem0"           Source="res://ZuneShellResources!Loading.Logo.png"/>
+      <Image Name="Img_Zune_Gem1"           Source="res://ZuneShellResources!Loading.Logo.01.png"/>
+      <Image Name="Img_Zune_Gem2"           Source="res://ZuneShellResources!Loading.Logo.02.png"/>
+      <Image Name="Img_Zune_Gem3"           Source="res://ZuneShellResources!Loading.Logo.03.png"/>
+      <Image Name="Img_Zune_Gem4"           Source="res://ZuneShellResources!Loading.Logo.04.png"/>
+      <Image Name="Img_Zune_Gem5"           Source="res://ZuneShellResources!Loading.Logo.05.png"/>
+      <Image Name="Img_Zune_Gem6"           Source="res://ZuneShellResources!Loading.Logo.06.png"/>
+      <Image Name="Img_Zune_Gem7"           Source="res://ZuneShellResources!Loading.Logo.07.png"/>
+      <Image Name="Img_Zune_Gem8"           Source="res://ZuneShellResources!Loading.Logo.08.png"/>
+
+      <Image Name="WarningBackground"       Source="res://ZuneShellResources!WarningBackground.png" NineGrid="3,3,3,3"/>
+
+      <Image Name="NowPlayingBoxShadow"     Source="res://ZuneShellResources!NowPlayingBoxShadow.png" NineGrid="18,20,19,17"/>
+      <Image Name="NowPlayingShadow"        Source="res://ZuneShellResources!NowPlayingShadow.png" NineGrid="33,33,33,33"/>
+      <Image Name="NowPlayingFade"          Source="res://ZuneShellResources!NowPlayingFade.png"/>
+
+      <Image Name="SyncIconAnimBackground"  Source="res://ZuneShellResources!SyncIconAnimationBackground.png"/>
+      <Image Name="SyncGlow"                Source="res://ZuneShellResources!SyncGlow.png"/>
+
+      <Image Name="CDRipBurnGlow"           Source="res://ZuneShellResources!CDRipBurnGlow.png"/>
+      <Image Name="CDArtShadow"             Source="res://ZuneShellResources!CDArtShadow.png" NineGrid="10,10,10,10"/>
+
+      <Image Name="LeftMenuSelectArrow"     Source="res://ZuneShellResources!LeftMenu.Arrow.Selected.png"/>
+
+      
+      <Image Name="AspectFourByThree"       Source="res://ZuneShellResources!AspectRatio.FourByThree.png"/>
+
+      
+
+    </Properties>
+
+    <Scripts>
+      
+
+      <Script>
+        DefaultBackgroundImage.Load();
+        NoArtWide.Load();
+        NoArtWider.Load();
+      </Script>
+    </Scripts>
+  </Class>
+
+  <Class Name="WindowState" Shared="true">
+    <Properties>
+      <Boolean Name="InputActive"/>
+      <Boolean Name="KeysActive"/>
+
+      <Boolean Name="CanHideMouse"/>
+
+      
+      <Boolean Name="TopToolbarInputActivity"/>
+      <Boolean Name="BottomToolbarInputActivity"/>
+      <Boolean Name="CaptionInputActivity"/>
+      <Boolean Name="ResizeBorderInputActivity"/>
+      <Boolean Name="PageInputActivity"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+        bool inActiveRegion =
+             ([TopToolbarInputActivity] &amp;&amp; ![CaptionInputActivity])
+          || [BottomToolbarInputActivity]
+          || [ResizeBorderInputActivity]
+          || [PageInputActivity];
+
+        
+        
+
+        CanHideMouse = !inActiveRegion;
+      </Script>
+    </Scripts>
+  </Class>
+
+  <Class Name="SharedStyles" Shared="true">
+    <Properties>
+      <TextStyle Name="NegativeOneCharacterSpacing" CharacterSpacing="-1"/>
+      <me:ColumnHeaderStyle Name="ColumnHeaderStyle"/>
+      <me:LabelStyle Name="LabelStyle"/>
+      <me:ListItemStyle Name="ListItemStyle"/>
+      <me:InboxReadListItemStyle Name="InboxReadListItemStyle"/>
+      <me:InboxUnreadListItemStyle Name="InboxUnreadListItemStyle"/>
+      <me:TrackListItemStyle Name="TrackListItemStyle"/>
+      <me:TrackListItemDisabledStyle Name="TrackListItemDisabledStyle"/>
+      <me:ButtonStyle Name="ButtonStyle"/>
+      <me:ToggleTextStyle Name="ToggleTextStyle"/>
+      <me:SlideshowToggleTextStyle Name="SlideshowToggleTextStyle"/>
+      <me:RadioButtonStyle Name="RadioButtonStyle"/>
+      <me:ActionButtonStyle Name="ActionButtonStyle"/>
+      <me:NowPlayingButtonStyle Name="NowPlayingButtonStyle"/>
+      <me:TransportButtonStyle Name="TransportButtonStyle"/>
+      <me:LabelStyle Name="ActionButtonProgressStyle" Color="{me:Styles.ActionButtonProgress}"  Font="{me:Styles.ButtonText}"/>
+      <me:BigActionButtonShadowStyle Name="BigActionButtonShadowStyle"/>
+      <me:BigActionButtonStyle Name="BigActionButtonStyle"/>
+      <me:LabelStyle Name="ActionButtonShadowStyle"   Color="{me:Styles.ActionButtonShadow}"    Font="{me:Styles.ButtonText}"/>
+      <me:DialogButtonStyle Name="DialogButtonStyle"/>
+      <me:EditBoxStyle Name="EditBoxStyle"/>
+      <me:SearchEditBoxStyle Name="SearchEditBoxStyle"/>
+      <me:ThumbnailPrimaryLabelStyle Name="ThumbnailPrimaryLabelStyle"/>
+      <me:ThumbnailSecondaryLabelStyle Name="ThumbnailSecondaryLabelStyle"/>
+      <me:ThumbnailOverlayLabelStyle Name="ThumbnailOverlayLabelStyle"/>
+      <me:PhotoVideoLabelStyle Name="PhotoVideoLabelStyle"/>
+      <style:Style Name="PhotoFolderCountStyle" Font="{me:Styles.ZegoeBold42}" Color="{me:Styles.PhotoFolderCountColor}"/>
+      <me:SearchOverlayLabelStyle Name="SearchOverlayLabelStyle"/>
+      <me:ListViewColumnHeaderStyle Name="ListViewColumnHeaderStyle"/>
+      <me:ListViewSortsColumnHeaderStyle Name="ListViewSortsColumnHeaderStyle"/>
+      <me:ColumnHeaderDarkStyleSet Name="ColumnHeaderDarkStyleSet"/>
+      <me:ColumnHeaderStyleSet Name="ColumnHeaderStyleSet"/>
+      <me:MarketplaceExpandedSort Name="MarketplaceExpandedSort"/>
+      <me:MenuItemStyle Name="MenuItemStyle"/>
+      <me:MgmtMenuItemStyle Name="MgmtMenuItemStyle"/>
+      <me:MenuItemHeaderStyle Name="MenuItemHeaderStyle"/>
+      <me:MonitoredFoldersLabelStyle Name="MonitoredFoldersLabelStyle"/>
+      <me:MonitoredFoldersHeadersStyle Name="MonitoredFoldersHeadersStyle"/>
+      <me:DialogTextStyle Name="DialogTextStyle"/>
+      <me:DialogSmallTextStyle Name="DialogSmallTextStyle"/>
+      <me:DialogDarkTextStyle Name="DialogDarkTextStyle"/>
+      <me:DialogDarkMediumTextStyle Name="DialogDarkMediumTextStyle"/>
+      <me:DialogLinkStyle Name="DialogLinkStyle"/>
+      <me:DialogSubHeaderStyle Name="DialogSubHeaderStyle"/>
+      <me:DialogHeaderStyle Name="DialogHeaderStyle"/>
+      <me:DialogLargeHeaderStyle Name="DialogLargeHeaderStyle"/>
+      <me:DialogHyperlinkStyle Name="DialogHyperlinkStyle"/>
+      <TextStyle Name="DialogBoldTextStyle" FontFace="Zegoe UI - U" Bold="true"/>
+      <me:DragFeedbackStyle Name="DragFeedbackStyle"/>
+      <me:LabelStyle Name="GenreListText" Font="{me:Styles.Zegoe12}" Color="{me:Styles.SecondaryLabel}" TextMargins="0,-2,0,0"/>
+      <me:TopPivot Name="TopPivot"/>
+      <me:BottomPivot Name="BottomPivot"/>
+      <me:LibraryPivot Name="LibraryPivot"/>
+
+      <me:AlbumReviewHeader Name="AlbumReviewHeader"/>
+      <me:MarketplaceLeftFilter Name="MarketplaceLeftFilter"/>
+      <me:MarketplaceHeader Name="MarketplaceHeader"/>
+      <me:MarketplaceHubListPrimary Name="MarketplaceHubListPrimary"/>
+      <me:MarketplaceHubListSecondary Name="MarketplaceHubListSecondary"/>
+      <me:ZuneNetLinkStyle Name="ZuneNetLinkStyle"/>
+      <style:Style Name="PodcastAuthor"               Font="{me:Styles.DetailTitle}"                  Color="{me:Styles.WarmGray}"/>
+      <style:Style Name="PodcastCategory"             Font="{me:Styles.ZegoeSemiBold8}"               Color="{me:Styles.DarkGray}"/>
+      <style:Style Name="PodcastTitle"                Font="{me:Styles.DetailTitle}"                  Color="{me:Styles.MarketplaceDefault}"/>
+      <style:Style Name="PodcastText"                 Font="{me:Styles.SettingsText}"                 Color="{me:Styles.TextActive}"/>
+      <style:Style Name="PodcastDesc"                 Font="{me:Styles.Zegoe9}"                       Color="{me:Styles.DarkGray}"/>
+      <style:Style Name="PodcastCopyright"            Font="{me:Styles.DetailTitle}"                  Color="{me:Styles.TextActive}"/>
+      <style:Style Name="MarketplaceTitle"            Font="{me:Styles.EnduranceProCapsBold32}"       Color="{me:Styles.MarketplaceDefault}"/>
+      <style:Style Name="MarketplaceAlbumHeader"      Font="{me:Styles.ZegoeCaps18}"                  Color="{me:Styles.MarketplaceDefault}"/>
+      <me:MarketplaceInstanceMetadata Name="MarketplaceInstanceMetadata"/>
+      <me:MarketplaceSort Name="MarketplaceSort"/>
+      <style:Style Name="PlaylistMetadataPrimary"     Font="{me:Styles.Zegoe9}"                       Color="{me:Styles.DarkGray}"/>
+      <style:Style Name="PlaylistMetadataSecondary"   Font="{me:Styles.Zegoe9}"                       Color="{me:Styles.WarmGray}"/>
+
+      <style:Style Name="LargeFeaturePrimary"         Font="{me:Styles.Zegoe24}"                  Color="{me:Styles.LightOnDarkText}"      TextMargins="0,0,0,-4"/>
+      <style:Style Name="LargeFeatureSecondary"       Font="{me:Styles.ZegoeSemiBold10}"          Color="{me:Styles.LightOnDarkText}"/>
+      <style:Style Name="GridFeaturePrimary"          Font="{me:Styles.ZegoeSemiBold12}"          Color="{me:Styles.LightOnDarkText}"      TextMargins="0,0,0,-2"/>
+      <style:Style Name="GridFeatureSecondary"        Font="{me:Styles.ZegoeSemiBold8}"           Color="{me:Styles.LightOnDarkText}"/>
+      <style:Style Name="PodcastFeaturePrimary"       Font="{me:Styles.Zegoe9}"                   Color="{me:Styles.LightOnDarkText}"      TextMargins="0,0,0,-2"/>
+      <style:Style Name="PodcastFeatureSecondary"     Font="{me:Styles.Zegoe9}"                   Color="{me:Styles.LightOnDarkSubText}"/>
+      <style:Style Name="ListFeaturePrimary"          Font="{me:Styles.ZegoeCaps14}"              Color="{me:Styles.MarketplaceDefault}"   TextMargins="0,0,0,2"/>
+      <style:Style Name="ListFeatureSecondary"        Font="{me:Styles.Zegoe9}"                   Color="{me:Styles.PrimaryLabel}"/>
+      <style:Style Name="CDLandAlbumName"             Font="{me:Styles.CDLandAlbumName}"          Color="{me:Styles.PrimaryLabel}"/>
+      <style:Style Name="CDLandArtistName"            Font="{me:Styles.CDLandArtistName}"         Color="{me:Styles.PrimaryLabel}"/>
+      <style:Style Name="CDLandAlbumYear"             Font="{me:Styles.CDLandAlbumYear}"          Color="{me:Styles.PrimaryLabel}"/>
+      <style:Style Name="CDLandAlbumGenre"            Font="{me:Styles.CDLandAlbumGenre}"         Color="{me:Styles.PrimaryLabel}"/>
+      <style:Style Name="CDLandAlbumExceededCapacity" Font="{me:Styles.CDLandAlbumGenre}"         Color="{me:Styles.Magenta}"/>
+      <me:CDLandTrackNumberStyle Name="CDLandTrackNumberStyle"/>
+      <style:Style Name="CDLandStatus"                Font="{me:Styles.ButtonText}"               Color="{me:Styles.TextActive}"/>
+      <style:Style Name="CDLandStatusRipping"         Font="{me:Styles.ButtonText}"               Color="{me:Styles.TextSelected}"/>
+      <style:Style Name="CDLandStatusError"           Font="{me:Styles.ZegoeBold12}"              Color="{me:Styles.Magenta}"/>
+      <style:Style Name="ThumbnailRollover"           Font="{me:Styles.ZegoeBold11}"              Color="{me:Styles.ThumbnailRolloverColor}"/>
+      <style:Style Name="GDILoadingStatus"            Font="{me:Styles.ZegoeCaps14}"              Color="{me:Styles.MarketplaceDefault}"/>
+      <style:Style Name="EmptyCollectionText"         Font="{me:Styles.EnduranceProCapsBold20}"   Color="{me:Styles.MarketplaceDefault}"/>
+      <style:Style Name="ConnectDeviceStyle"          Font="{me:Styles.ZegoeBold20}"              Color="{me:Styles.MarketplaceDefault}"/>
+      <style:Style Name="PleaseConnectStyle"          Font="{me:Styles.ZegoeSemiBold10}"          Color="{me:Styles.DarkGray}"/>
+      <style:Style Name="NoPlaylistContentText"       Font="{me:Styles.ZegoeBold14}"              Color="{me:Styles.MarketplaceDefault}"/>
+      <style:Style Name="SyncTitle"                   Font="{me:Styles.CDLandAlbumName}"          Color="{me:Styles.MarketplaceDefault}"/>
+      <style:Style Name="SyncLink"                    Font="{me:Styles.Zegoe14}"                  Color="{me:Styles.DarkGray}"/>
+      <style:Style Name="SyncHeader"                  Font="{me:Styles.ZegoeSemiBold8}"           Color="{me:Styles.DarkGray}"/>
+      <me:SearchResultsStyle Name="SyncItem"/>
+      <TextStyle Name="NoCollectionHighlight"         Color="{me:Styles.NoCollectionHighlightText}"/>
+      <TextStyle Name="DeviceNameStyle"               Color="{me:Styles.MarketplaceDefault}"    FontSize="20" FontFace="Zegoe UI - U" Bold="true"/>
+      <TextStyle Name="DeviceSizeStyle"               Color="{me:Styles.WarmGray}"              FontSize="20" FontFace="Zegoe Light - U"/>
+      <me:HyperlinkStyle Name="HyperlinkStyle"/>
+      <style:Style Name="PodcastWarningStyle"         Font="{me:Styles.WarningFont}"      Color="{me:Styles.WarningColor}"/>
+      <style:Style Name="PodcastEpisodeTitleStyle"    Font="{me:Styles.PodcastTitleFont}" Color="{me:Styles.DarkGray}"/>
+      <me:SearchResultsStyle Name="SearchResultsStyle"/>
+      <me:SearchResultsSmallStyle Name="SearchResultsSmallStyle"/>
+      <style:Style Name="NowPlayingPrimaryLabel"      Font="{me:Styles.EnduranceProCapsBold36}" Color="{me:Styles.LightOnDarkText}" TextStyle="{NegativeOneCharacterSpacing}"/>
+      <style:Style Name="NowPlayingSecondaryLabel"    Font="{me:Styles.EnduranceProCapsBold24}" Color="{me:Styles.LightOnDarkText}"/>
+      <me:NowPlayingLinkStyle Name="NowPlayingLinkStyle"/>
+      <me:FUEHeaderStyle      Name="FUEHeaderStyle"/>
+      <me:FUEDescriptionStyle Name="FUEDescriptionStyle"/>
+      <me:FUELabelStyle       Name="FUELabelStyle"/>
+      <me:FUEHyperlinkStyle   Name="FUEHyperlinkStyle"/>
+      <me:SettingsButtonStyle Name="SettingsButtonStyle"/>
+      <me:SignInButtonStyle   Name="SignInButtonStyle"/>
+      <me:ExternalLinkStyle   Name="ExternalLinkStyle"/>
+      <me:InboxSignInHeaderStyle      Name="InboxSignInHeaderStyle"/>
+      <me:InboxSignInDescriptionStyle Name="InboxSignInDescriptionStyle"/>
+
+
+      <style:Style Name="TransportVolumeValue"          Font="{me:Styles.TransportVolumeFont}"  Color="{me:Styles.TransportVolumeColor}"/>
+      <style:Style Name="TransportVolumeLabel"          Font="{me:Styles.ButtonText}"           Color="{me:Styles.PrimaryLabel}"/>
+      <style:Style Name="SlideshowTransportVolumeValue" Font="{me:Styles.TransportVolumeFont}"  Color="{me:Styles.LightOnDarkAltText}"/>
+      <style:Style Name="SlideshowTransportVolumeLabel" Font="{me:Styles.ButtonText}"           Color="{me:Styles.LightOnDarkAltText}"/>
+
+      <style:Style Name="NowPlayingNotificationTitle"                 Font="{me:Styles.ZegoeSemiBold8}" Color="{me:Styles.WarmGray}"/>
+      <style:Style Name="NowPlayingNotificationElapsedTime"           Font="{me:Styles.ZegoeSemiBold8}" Color="{me:Styles.DarkGray}"/>
+      <style:Style Name="NowPlayingNotificationTotalTime"             Font="{me:Styles.ZegoeSemiBold8}" Color="{me:Styles.WarmGray}"/>
+      <style:Style Name="SlideshowNowPlayingNotificationTitle"        Font="{me:Styles.ZegoeSemiBold8}" Color="{me:Styles.LightOnDarkAltText}"/>
+      <style:Style Name="SlideshowNowPlayingNotificationElapsedTime"  Font="{me:Styles.ZegoeSemiBold8}" Color="{me:Styles.LightOnDarkText}"/>
+      <style:Style Name="SlideshowNowPlayingNotificationTotalTime"    Font="{me:Styles.ZegoeSemiBold8}" Color="{me:Styles.LightOnDarkAltText}"/>
+
+      <style:Style Name="LandTitle"                   Font="{me:Styles.TopPivotText}" Color="{me:Styles.TextActive}"/>
+      <style:Style Name="SlideshowLandTitle"          Font="{me:Styles.TopPivotText}" Color="{me:Styles.LightOnDarkText}"/>
+      <style:Style Name="InboxReply"                  Font="{me:Styles.ZegoeLight16}" Color="{me:Styles.DarkGray}"/>
+      <style:Style Name="InboxDetailStyle"            Font="{me:Styles.ZegoeBold10}" Color="{me:Styles.TextActive}"/>
+      <style:Style Name="InboxEmptyStyle"             Font="{me:Styles.Zegoe12}" Color="{me:Styles.TextActive}"/>
+      <style:Style Name="InboxMessageStyle"           Font="{me:Styles.Zegoe10}" Color="{me:Styles.TextActive}"/>
+      <style:Style Name="InboxAlbumTitle"             Font="{me:Styles.DetailsAlbumTitle}" Color="{me:Styles.TextActive}"/>
+      <style:Style Name="InboxAlbumArtist"            Font="{me:Styles.DetailsAlbumArtist}" Color="{me:Styles.TextActive}"/>
+      <style:Style Name="InboxAlbumGenre"             Font="{me:Styles.DetailsAlbumGenre}" Color="{me:Styles.TextActive}"/>
+      <style:Style Name="InboxAlbumRelease"           Font="{me:Styles.DetailsAlbumReleaseYear}" Color="{me:Styles.TextActive}"/>
+      <style:Style Name="InboxPrompt"                 Font="{me:Styles.ZegoeSemiBold10}" Color="{me:Styles.WarmGray}"/>
+      <style:Style Name="InboxHeader"                 Font="{me:Styles.InboxCategory}" Color="{me:Styles.DarkGray}"/>
+      <TextStyle Name="InboxDetailNameStyle"          FontSize="7" FontFace="Zegoe UI - U" Bold="true" Color="{me:Styles.DarkGray}"/>
+
+      
+      <style:Style Name="HoveredButtonCellStyle"      Font="{null}" Color="{me:Styles.RedOrange}"/>
+
+      <me:LabelStyle Name="GasGaugeCurrentSpace"  Color="{me:Styles.DarkGray}" Font="{me:Styles.ZegoeSemiBold8}"/>
+      <me:LabelStyle Name="GasGaugeFreeSpaceText" Color="{me:Styles.DarkGray}" Font="{me:Styles.ZegoeSemiBold8}"/>
+
+      <TextStyle Name="PodcastPaneDescription"    Color="{me:Styles.PodcastPaneDescription}" FontFace="Zegoe UI - U" FontSize="9" />
+      <TextStyle Name="PodcastSeriesDescription"  Color="{me:Styles.PodcastDescriptionColor}" LineSpacing="1.1" FontFace="Zegoe UI - U" FontSize="10" />
+
+      <style:Style Name="ReportAConcernError"     Font="{me:Styles.ZegoeSemiBold9}" Color="{me:Styles.RedOrange}"/>
+
+      <me:LabelStyle Name="ToolbarDarkStyle" Color="{me:Styles.IconNotificationTextColor}" Font="{me:Styles.IconNotificationTextFont}"/>
+      <me:LabelStyle Name="ToolbarLightStyle" Color="White" Font="{me:Styles.IconNotificationTextFont}"/>
+      <TextStyle Name="IconNotificationBold"          Color="{me:Styles.IconNotificationBoldColor}"   FontFace="Zegoe UI - U" Bold="true"/>
+
+      <style:Style Name="ToolTipStyle" Font="{me:Styles.ZegoeBold9}" Color="{me:Styles.EditText}"/>
+      <style:Style Name="SettingsBodyStyle" Font="{me:Styles.SettingsText}" Color="{me:Styles.SettingsTextActive}"/>
+      <TextStyle Name="SettingsBoldItalicBodyStyle" Bold="true" Italic="true" FontFace="Zegoe UI - U"/>
+
+    </Properties>
+  </Class>
+
+  <Class Name="Style" Base="style:Style"/>
+
+  <Class Name="ButtonStyle" Base="style:StyleSet">
+    <Properties>
+      <me:LabelStyle Name="Disabled" Color="{me:Styles.PrimaryLabel}"           Font="{me:Styles.ButtonText}"/>
+      <me:LabelStyle Name="Selected" Color="{me:Styles.TextSelected}"           Font="{me:Styles.ButtonText}"/>
+      <me:LabelStyle Name="Focused"  Color="{me:Styles.PrimaryLabel}"           Font="{me:Styles.ButtonText}"/>
+      <me:LabelStyle Name="Hovered"  Color="{me:Styles.TextFocusedForeground}"  Font="{me:Styles.ButtonText}"/>
+      <me:LabelStyle Name="Default"  Color="{me:Styles.PrimaryLabel}"           Font="{me:Styles.ButtonText}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="ToggleTextStyle" Base="style:StyleSet">
+    <Properties>
+      <me:LabelStyle Name="Disabled" Color="{me:Styles.PrimaryLabel}"           Font="{me:Styles.BigButtonText}"/>
+      <me:LabelStyle Name="Selected" Color="{me:Styles.PrimaryLabel}"           Font="{me:Styles.BigButtonText}"/>
+      <me:LabelStyle Name="Focused"  Color="{me:Styles.PrimaryLabel}"           Font="{me:Styles.BigButtonText}"/>
+      <me:LabelStyle Name="Hovered"  Color="{me:Styles.TextFocusedForeground}"  Font="{me:Styles.BigButtonText}"/>
+      <me:LabelStyle Name="Default"  Color="{me:Styles.PrimaryLabel}"           Font="{me:Styles.BigButtonText}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="SlideshowToggleTextStyle" Base="me:ToggleTextStyle">
+    <Properties>
+      <me:LabelStyle Name="Disabled" Color="{me:Styles.LightOnDarkAltText}"/>
+      <me:LabelStyle Name="Selected" Color="{me:Styles.LightOnDarkAltText}"/>
+      <me:LabelStyle Name="Focused"  Color="{me:Styles.LightOnDarkAltText}"/>
+      <me:LabelStyle Name="Hovered"  Color="{me:Styles.LightOnDarkText}"/>
+      <me:LabelStyle Name="Default"  Color="{me:Styles.LightOnDarkAltText}"/>
+    </Properties>
+  </Class>
+
+   <Class Name="SettingsButtonStyle" Base="style:StyleSet">
+    <Properties>
+      <me:LabelStyle Name="Disabled" Color="{me:Styles.LightGray}"          Font="{me:Styles.SettingsButtonText}"/>
+      <me:LabelStyle Name="Selected" Color="{me:Styles.DoradoBlack}"        Font="{me:Styles.SettingsButtonText}"/>
+      <me:LabelStyle Name="Focused"  Color="{me:Styles.PrimaryLabel}"       Font="{me:Styles.SettingsButtonText}"/>
+      <me:LabelStyle Name="Hovered"  Color="{me:Styles.HoverGray}"          Font="{me:Styles.SettingsButtonText}"/>
+      <me:LabelStyle Name="Default"  Color="{me:Styles.WarmGray}"           Font="{me:Styles.SettingsButtonText}"/>
+    </Properties>
+  </Class>
+
+   <Class Name="SignInButtonStyle" Base="style:StyleSet">
+    <Properties>
+      <me:LabelStyle Name="Disabled" Color="{me:Styles.LightGray}"          Font="{me:Styles.SignInButtonText}"/>
+      <me:LabelStyle Name="Selected" Color="{me:Styles.DoradoBlack}"        Font="{me:Styles.SignInButtonText}"/>
+      <me:LabelStyle Name="Focused"  Color="{me:Styles.PrimaryLabel}"       Font="{me:Styles.SignInButtonText}"/>
+      <me:LabelStyle Name="Hovered"  Color="{me:Styles.HoverGray}"          Font="{me:Styles.SignInButtonText}"/>
+      <me:LabelStyle Name="Default"  Color="{me:Styles.WarmGray}"           Font="{me:Styles.SignInButtonText}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="RadioButtonStyle" Base="style:StyleSet">
+    <Properties>
+      <me:LabelStyle Name="Disabled" Color="{me:Styles.TextInactive}"           Font="{me:Styles.SettingsText}"/>
+      <me:LabelStyle Name="Selected" Color="{me:Styles.DarkGray}"             Font="{me:Styles.SettingsText}"/>
+      <me:LabelStyle Name="Focused"  Color="{me:Styles.HoverGray}"             Font="{me:Styles.SettingsText}"/>
+      <me:LabelStyle Name="Hovered"  Color="{me:Styles.HoverGray}"  Font="{me:Styles.SettingsText}"/>
+      <me:LabelStyle Name="Default"  Color="{me:Styles.DarkGray}"             Font="{me:Styles.SettingsText}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="ActionButtonStyle" Base="style:StyleSet">
+    <Properties>
+      <me:LabelStyle Name="Disabled"  Color="{me:Styles.ActionButtonDisabled}"  Font="{me:Styles.ButtonText}"/>
+      <me:LabelStyle Name="Selected"  Color="{me:Styles.ActionButton}"          Font="{me:Styles.ButtonText}"/>
+      <me:LabelStyle Name="Focused"   Color="{me:Styles.ActionButton}"          Font="{me:Styles.ButtonText}"/>
+      <me:LabelStyle Name="Hovered"   Color="{me:Styles.ActionButton}"          Font="{me:Styles.ButtonText}"/>
+      <me:LabelStyle Name="Default"   Color="{me:Styles.ActionButton}"          Font="{me:Styles.ButtonText}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="NowPlayingButtonStyle" Base="style:StyleSet">
+    <Properties>
+      <me:LabelStyle Name="Disabled"  Color="{me:Styles.NowPlayingButtonDisabledColor}" Font="{me:Styles.BigButtonText}"/>
+      <me:LabelStyle Name="Selected"  Color="{me:Styles.NowPlayingButtonPressedColor}"  Font="{me:Styles.BigButtonText}"/>
+      <me:LabelStyle Name="Focused"   Color="{me:Styles.NowPlayingButtonColor}"         Font="{me:Styles.BigButtonText}"/>
+      <me:LabelStyle Name="Hovered"   Color="{me:Styles.NowPlayingButtonHoverColor}"    Font="{me:Styles.BigButtonText}"/>
+      <me:LabelStyle Name="Default"   Color="{me:Styles.NowPlayingButtonColor}"         Font="{me:Styles.BigButtonText}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="TransportButtonStyle" Base="style:StyleSet">
+    <Properties>
+      <me:LabelStyle Name="Disabled"  Color="{me:Styles.ActionButtonDisabled}"        Font="{me:Styles.BigButtonText}"/>
+      <me:LabelStyle Name="Selected"  Color="{me:Styles.TransportButtonPressedColor}" Font="{me:Styles.BigButtonText}"/>
+      <me:LabelStyle Name="Focused"   Color="{me:Styles.ActionButton}"                Font="{me:Styles.BigButtonText}"/>
+      <me:LabelStyle Name="Hovered"   Color="{me:Styles.TransportButtonHoverColor}"   Font="{me:Styles.BigButtonText}"/>
+      <me:LabelStyle Name="Default"   Color="{me:Styles.ActionButton}"                Font="{me:Styles.BigButtonText}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="BigActionButtonStyle" Base="style:StyleSet">
+    <Properties>
+      <me:LabelStyle Name="Disabled"  Color="{me:Styles.ActionButtonDisabled}"  Font="{me:Styles.BigButtonText}"/>
+      <me:LabelStyle Name="Selected"  Color="{me:Styles.ActionButton}"          Font="{me:Styles.BigButtonText}"/>
+      <me:LabelStyle Name="Hover"     Color="{me:Styles.ActionButton}"          Font="{me:Styles.BigButtonText}"/>
+      <me:LabelStyle Name="Focused"   Color="{me:Styles.ActionButton}"          Font="{me:Styles.BigButtonText}"/>
+      <me:LabelStyle Name="Default"   Color="{me:Styles.ActionButton}"          Font="{me:Styles.BigButtonText}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="BigActionButtonShadowStyle" Base="style:StyleSet">
+    <Properties>
+      <me:LabelStyle Name="Default"   Color="{me:Styles.ActionButtonShadow}"    Font="{me:Styles.BigButtonText}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="DialogButtonStyle" Base="style:StyleSet">
+    <Properties>
+      <me:LabelStyle Name="Disabled" Color="{me:Styles.ListItemText}"         Font="{me:Styles.DialogListItem}"/>
+      <me:LabelStyle Name="Selected" Color="{me:Styles.ListItemSelectedText}" Font="{me:Styles.DialogListItem}"/>
+      <me:LabelStyle Name="Focused"  Color="{me:Styles.ListItemHoverText}"    Font="{me:Styles.DialogListItem}"/>
+      <me:LabelStyle Name="Hovered"  Color="{me:Styles.ListItemHoverText}"    Font="{me:Styles.DialogListItem}"/>
+      <me:LabelStyle Name="Default"  Color="{me:Styles.ListItemText}"         Font="{me:Styles.DialogListItem}"/>
+    </Properties>
+  </Class>
+
+  
+
+  <Class Name="InboxReadListItemStyle" Base="me:ListItemStyle">
+    <Properties>
+      <style:Style Name="Default"  Color="{me:Styles.InboxReadColor}" Font="{me:Styles.InboxReadMessage}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="InboxUnreadListItemStyle" Base="me:ListItemStyle">
+    <Properties>
+      <style:Style Name="Default"  Color="{me:Styles.InboxUnreadColor}" Font="{me:Styles.InboxUnreadMessage}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="ListItemStyle" Base="style:StyleSet">
+    <Properties>
+      
+      <TextStyle Name="Spacing" CharacterSpacing="0"/>
+      <style:Style Name="Selected" Color="{me:Styles.DoradoBlack}"  Font="{me:Styles.ZegoeSemiBold10}" TextStyle="{Spacing}"/>
+      <style:Style Name="Focused"  Color="{me:Styles.DoradoBlack}"  Font="{me:Styles.ZegoeSemiBold10}" TextStyle="{Spacing}"/>
+      <style:Style Name="Hovered"  Color="{me:Styles.DarkGray}"     Font="{me:Styles.ZegoeSemiBold10}" TextStyle="{Spacing}"/>
+      <style:Style Name="Default"  Color="{me:Styles.DarkGray}"     Font="{me:Styles.ZegoeSemiBold10}" TextStyle="{Spacing}"/>
+      <style:Style Name="Base"     Color="{me:Styles.ListItemText}" Font="{me:Styles.ZegoeSemiBold10}" TextStyle="{Spacing}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="TopPivot" Base="style:StyleSet">
+    <Properties>
+      <style:Style Name="Selected" Color="{me:Styles.DoradoBlack}"  Font="{me:Styles.TopPivotText}"/>
+      <style:Style Name="Focused"  Color="{me:Styles.ListItemText}" Font="{me:Styles.TopPivotText}"/>
+      <style:Style Name="Hovered"  Color="{me:Styles.HoverGray}"    Font="{me:Styles.TopPivotText}"/>
+      <style:Style Name="Default"  Color="{me:Styles.WarmGray}"     Font="{me:Styles.TopPivotText}"/>
+      <style:Style Name="Base"     Color="{me:Styles.ListItemText}" Font="{me:Styles.TopPivotText}"/>
+      <style:Style Name="Disabled" Color="{me:Styles.LightGray}"    Font="{me:Styles.TopPivotText}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="BottomPivot" Base="style:StyleSet">
+    <Properties>
+      <style:Style Name="Selected"  Color="{me:Styles.DoradoBlack}"            Font="{me:Styles.BottomPivotText}"/>
+      <style:Style Name="Focused"   Color="{me:Styles.ListItemText}"           Font="{me:Styles.BottomPivotText}"/>
+      <style:Style Name="Hovered"   Color="{me:Styles.HoverGray}"              Font="{me:Styles.BottomPivotText}"/>
+      <style:Style Name="Default"   Color="{me:Styles.WarmGray}"               Font="{me:Styles.BottomPivotText}"/>
+      <style:Style Name="Base"      Color="{me:Styles.ListItemText}"           Font="{me:Styles.BottomPivotText}"/>
+      <style:Style Name="Disabled"  Color="{me:Styles.ListItemSelectedText}"   Font="{me:Styles.BottomPivotText}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="LibraryPivot" Base="style:StyleSet">
+    <Properties>
+      <style:Style Name="Selected" Color="{me:Styles.DoradoBlack}"    Font="{me:Styles.LibraryPivotText}"/>
+      <style:Style Name="Focused"  Color="{me:Styles.WarmGray}"       Font="{me:Styles.LibraryPivotText}"/>
+      <style:Style Name="Hovered"  Color="{me:Styles.HoverGray}"      Font="{me:Styles.LibraryPivotText}"/>
+      <style:Style Name="Default"  Color="{me:Styles.WarmGray}"       Font="{me:Styles.LibraryPivotText}"/>
+      <style:Style Name="Base"     Color="{me:Styles.ListItemText}"   Font="{me:Styles.LibraryPivotText}"/>
+    </Properties>
+  </Class>
+
+  
+  
+  <Class Name="TrackListItemStyle" Base="style:Style">
+    <Properties>
+      
+      <Font Name="Font"  Font="{me:Styles.MarketplaceListText}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="TrackListItemDisabledStyle" Base="style:Style">
+    <Properties>
+      <Color Name="Color" Color="{me:Styles.PrimaryLabelDisabled}"/>
+      <Font Name="Font"  Font="{me:Styles.MarketplaceListText}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="ThumbnailPrimaryLabelStyle" Base="style:StyleSet">
+    <Properties>
+      <style:Style Name="Focused"   Color="{me:Styles.TextFocusedForeground}"     Font="{me:Styles.ZegoeSemiBold8}"/>
+      <style:Style Name="Default"   Color="{me:Styles.ThumbnailButton}"           Font="{me:Styles.ZegoeSemiBold8}"/>
+      <style:Style Name="Selected"  Color="{me:Styles.ThumbnailButtonSelected}"   Font="{me:Styles.ZegoeSemiBold8}"/>
+      <style:Style Name="Hovered"   Color="{me:Styles.DoradoBlack}"               Font="{me:Styles.ZegoeSemiBold8}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="ThumbnailSecondaryLabelStyle" Base="style:StyleSet">
+    <Properties>
+      <style:Style Name="Focused" Color="{me:Styles.SecondaryLabel}"  Font="{me:Styles.ZegoeSemiBold8}"/>
+      <style:Style Name="Default"   Style="{Focused}"/>
+      <style:Style Name="Selected"  Style="{Focused}"/>
+      <style:Style Name="Hovered" Color="{me:Styles.DoradoBlack}"     Font="{me:Styles.ZegoeSemiBold8}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="ThumbnailOverlayLabelStyle" Base="style:StyleSet">
+    <Properties>
+      <style:Style Name="Focused"   Color="{me:Styles.TextFocusedForeground}"   Font="{me:Styles.ZegoeLight16}"/>
+      <style:Style Name="Default"   Color="{me:Styles.ThumbnailButton}"         Font="{me:Styles.ZegoeLight16}"/>
+      <style:Style Name="Selected"  Color="{me:Styles.ThumbnailButtonSelected}" Font="{me:Styles.ZegoeLight16}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="PhotoVideoLabelStyle" Base="style:StyleSet">
+    <Properties>
+      <style:Style Name="Focused" Color="{me:Styles.TextFocusedForeground}" Font="{me:Styles.Zegoe9}"/>
+      <style:Style Name="Default" Color="{me:Styles.ThumbnailButton}" Font="{me:Styles.Zegoe9}"/>
+      <style:Style Name="Selected" Color="{me:Styles.ThumbnailButtonSelected}" Font="{me:Styles.Zegoe9}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="SearchOverlayLabelStyle" Base="style:StyleSet">
+    <Properties>
+      <style:Style Name="Focused"   Color="{me:Styles.TextFocusedForeground}"   Font="{me:Styles.ZegoeLight14}"/>
+      <style:Style Name="Default"   Color="{me:Styles.ThumbnailButton}"         Font="{me:Styles.ZegoeLight14}"/>
+      <style:Style Name="Selected"  Color="{me:Styles.ThumbnailButtonSelected}" Font="{me:Styles.ZegoeLight14}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="ListViewSortsColumnHeaderStyle" Base="me:ListViewColumnHeaderStyle">
+    <Properties>
+      <me:ColumnHeaderStyle Name="Default" Color="{me:Styles.WarmGray}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="ListViewColumnHeaderStyle" Base="style:StyleSet">
+    <Properties>
+      <me:ColumnHeaderStyle Name="Disabled"/>
+      <me:ColumnHeaderStyle Name="Selected"/>
+      <me:ColumnHeaderStyle Name="Focused"/>
+      <me:ColumnHeaderStyle Name="Hovered" Color="{me:Styles.HoverGray}"/>
+      <me:ColumnHeaderStyle Name="Default"/>
+    </Properties>
+  </Class>
+
+  <Class Name="ColumnHeaderStyle" Base="style:Style">
+    <Properties>
+      <Color Name="Color" Color="{me:Styles.DoradoBlack}"/>
+      <Font Name="Font" Font="{me:Styles.ZegoeSemiBold8}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="SelectedColumnHeaderStyle" Base="me:ColumnHeaderStyle">
+    <Properties>
+      <Color Name="Color" Color="{me:Styles.PrimaryLabelSelected}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="ColumnHeaderStyleSet" Base="style:StyleSet">
+    <Properties>
+      <me:SelectedColumnHeaderStyle Name="Selected"/>
+      <me:SelectedColumnHeaderStyle Name="Hovered"/>
+      <me:ColumnHeaderStyle Name="Focused"/>
+      <me:ColumnHeaderStyle Name="Default"/>
+    </Properties>
+  </Class>
+
+  <Class Name="ColumnHeaderDarkStyle" Base="style:Style">
+    <Properties>
+      <Color Name="Color" Color="{me:Styles.PrimaryLabelSelected}"/>
+      <Font Name="Font" Font="{me:Styles.ZegoeBold8}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="SelectedColumnHeaderDarkStyle" Base="me:ColumnHeaderStyle">
+    <Properties>
+      <Color Name="Color" Color="{me:Styles.PrimaryLabelSelected}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="ColumnHeaderDarkStyleSet" Base="me:ColumnHeaderStyleSet">
+    <Properties>
+      <me:SelectedColumnHeaderStyle Name="Focused"/>
+      <me:SelectedColumnHeaderStyle Name="Default"/>
+    </Properties>
+  </Class>
+
+  <Class Name="LabelStyle" Base="style:Style">
+    <Properties>
+      <Color Name="Color" Color="{me:Styles.PrimaryLabel}"/>
+      <Font Name="Font" Font="{me:Styles.PrimaryText}"/>
+    </Properties>
+  </Class>
+
+  
+  
+  
+  <Class Name="EditBoxStyle" Base="style:Style">
+    <Properties>
+      <Color Name="Color" Color="{me:Styles.EditText}"/>
+      <Font Name="Font" Font="{me:Styles.SettingsText}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="SearchEditBoxStyle" Base="style:Style">
+    <Properties>
+      <Color Name="Color" Color="{me:Styles.SearchBoxTextColor}"/>
+      <Font Name="Font" Font="{me:Styles.SearchBoxText}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="DialogTextStyle" Base="style:Style">
+    <Properties>
+      <Color Name="Color" Color="{me:Styles.DialogTextColor}"/>
+      <Font Name="Font" Font="{me:Styles.DialogText}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="DialogSmallTextStyle" Base="style:Style">
+    <Properties>
+      <Color Name="Color" Color="{me:Styles.DialogTextColor}"/>
+      <Font Name="Font" Font="{me:Styles.DialogSmallText}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="DialogDarkTextStyle" Base="style:Style">
+    <Properties>
+      <Color Name="Color" Color="{me:Styles.DialogHeaderColor}"/>
+      <Font Name="Font" Font="{me:Styles.DialogText}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="DialogDarkMediumTextStyle" Base="style:Style">
+    <Properties>
+      <Color Name="Color" Color="{me:Styles.DialogHeaderColor}"/>
+      <Font Name="Font" Font="{me:Styles.DialogMediumText}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="DialogLinkStyle" Base="style:Style">
+    <Properties>
+      <Color Name="Color" Color="{me:Styles.DialogLinkColor}"/>
+      <Font Name="Font" Font="{me:Styles.DialogText}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="DialogSubHeaderStyle" Base="style:Style">
+    <Properties>
+      <Color Name="Color" Color="{me:Styles.DialogTextColor}"/>
+      <Font Name="Font" Font="{me:Styles.DialogSubHeaderText}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="DialogHeaderStyle" Base="style:Style">
+    <Properties>
+      <Color Name="Color" Color="{me:Styles.DialogHeaderColor}"/>
+      <Font Name="Font" Font="{me:Styles.DialogHeaderText}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="DialogLargeHeaderStyle" Base="style:Style">
+    <Properties>
+      <Color Name="Color" Color="{me:Styles.DialogHeaderColor}"/>
+      <Font Name="Font" Font="{me:Styles.DialogLargeHeaderText}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="DialogHyperlinkStyle" Base="style:StyleSet">
+    <Properties>
+      <style:Style Name="Focused"   Font="{me:Styles.DialogText}" Color="{me:Styles.SettingLinkTextFocus}"/>
+      <style:Style Name="Hovered"   Font="{me:Styles.DialogText}" Color="{me:Styles.SettingLinkText}"/>
+      <style:Style Name="Default"   Font="{me:Styles.DialogText}" Color="{me:Styles.DialogTextColor}"/>
+    </Properties>
+  </Class>
+
+
+  <Class Name="DragFeedbackStyle" Base="style:Style">
+    <Properties>
+      <Color Name="Color" Color="{me:Styles.DragFeedbackTextColor}"/>
+      <Font Name="Font" Font="{me:Styles.DragFeedbackText}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="MenuItemHeaderStyle" Base="style:Style">
+    <Properties>
+      <Color Name="Color" Color="{me:Styles.PrimaryLabelSelected}"/>
+      <Font Name="Font" Font="{me:Styles.ZegoeSemiBold10}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="MonitoredFoldersLabelStyle" Base="style:Style">
+    <Properties>
+      <Color Name="Color" Color="{me:Styles.DarkGray}"/>
+      <Font Name="Font" Font="{me:Styles.SettingsText}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="MonitoredFoldersHeadersStyle" Base="style:Style">
+    <Properties>
+      <Color Name="Color" Color="{me:Styles.SettingsTextActive}"/>
+      <Font Name="Font" Font="{me:Styles.SettingsTextSubHeader}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="MenuItemStyle" Base="style:StyleSet">
+    <Properties>
+      <style:Style Name="Selected" Color="{me:Styles.PrimaryLabelSelected}" Font="{me:Styles.Zegoe10}"/>
+      <style:Style Name="Focused"  Color="{me:Styles.TextFocusedForeground}" Font="{me:Styles.Zegoe10}"/>
+      <style:Style Name="Default"  Color="{me:Styles.PrimaryLabelSelected}" Font="{me:Styles.Zegoe10}"/>
+      <style:Style Name="Hovered"  Color="Black" Font="{me:Styles.Zegoe10}"/>
+      <style:Style Name="Disabled" Color="210,210,210" Font="{me:Styles.Zegoe10}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="MgmtMenuItemStyle" Base="style:StyleSet">
+    <Properties>
+      <style:Style Name="Selected" Color="{me:Styles.DarkGray}" Font="{me:Styles.ColumnPlayText}"/>
+      <style:Style Name="Focused"  Color="{me:Styles.DarkGray}" Font="{me:Styles.ColumnPlayText}"/>
+      <style:Style Name="Hovered"  Color="{me:Styles.WarmGray}" Font="{me:Styles.ColumnPlayText}"/>
+      <style:Style Name="Default"  Color="{me:Styles.DarkGray}" Font="{me:Styles.ColumnPlayText}"/>
+      <style:Style Name="Disabled" Color="210,210,210" Font="{me:Styles.ColumnPlayText}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="AlbumReviewHeader" Base="style:Style">
+    <Properties>
+      <Color Name="Color" Color="{me:Styles.MarketplaceDefault}"/>
+      <Font Name="Font" Font="{me:Styles.HeaderText}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="MarketplaceInstanceMetadata" Base="style:StyleSet">
+    <Properties>
+      <style:Style Name="Hovered" Color="{me:Styles.RedOrange}"                 Font="{me:Styles.Zegoe9}"/>
+      <style:Style Name="Focused" Color="{me:Styles.ThumbnailButton}"           Font="{me:Styles.Zegoe9}"/>
+      <style:Style Name="Default" Color="{me:Styles.ThumbnailButton}"           Font="{me:Styles.Zegoe9}"/>
+      <style:Style Name="Selected" Color="{me:Styles.ThumbnailButtonSelected}"  Font="{me:Styles.Zegoe9}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="MarketplaceSort" Base="style:StyleSet">
+    <Properties>
+      <style:Style Name="Selected" Color="{me:Styles.DoradoBlack}"    Font="{me:Styles.ZegoeSemiBold8}"/>
+      <style:Style Name="Focused"  Color="{me:Styles.ListItemText}"   Font="{me:Styles.ZegoeSemiBold8}"/>
+      <style:Style Name="Hovered"  Color="{me:Styles.HoverGray}"      Font="{me:Styles.ZegoeSemiBold8}"/>
+      <style:Style Name="Default"  Color="{me:Styles.WarmGray}"       Font="{me:Styles.ZegoeSemiBold8}"/>
+      <style:Style Name="Base"     Style="{Default}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="MarketplaceExpandedSort" Base="me:MarketplaceSort">
+    <Properties>
+      <style:Style Name="Selected" Color="{me:Styles.DoradoBlack}"    Font="{me:Styles.ZegoeBold22}" TextMargins="0,0,0,-6"/>
+      <style:Style Name="Focused"  Color="{me:Styles.ListItemText}"   Font="{me:Styles.ZegoeBold22}" TextMargins="0,0,0,-6"/>
+      <style:Style Name="Hovered"  Color="{me:Styles.HoverGray}"      Font="{me:Styles.ZegoeBold22}" TextMargins="0,0,0,-6"/>
+      <style:Style Name="Default"  Color="{me:Styles.WarmGray}"       Font="{me:Styles.ZegoeBold22}" TextMargins="0,0,0,-6"/>
+    </Properties>
+  </Class>
+
+  <Class Name="MarketplaceLeftFilter" Base="style:StyleSet">
+    <Properties>
+      <style:Style Name="Selected"  Color="{me:Styles.DarkGray}" Font="{me:Styles.ZegoeCaps7}" TextMargins="0,0,0,2"/>
+      <style:Style Name="Focused"   Color="{me:Styles.WarmGray}" Font="{me:Styles.ZegoeCaps7}" TextMargins="0,0,0,2"/>
+      <style:Style Name="Default"   Color="{me:Styles.DarkGray}" Font="{me:Styles.ZegoeCaps7}" TextMargins="0,0,0,2"/>
+      <style:Style Name="Disabled"  Style="{Default}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="MarketplaceHeader" Base="style:StyleSet">
+    <Properties>
+      <style:Style Name="Selected"  Font="{me:Styles.MarketplaceHeader}" Color="Black" TextMargins="0,0,0,5"/>
+      <style:Style Name="Focused"   Style="{Selected}"/>
+      <style:Style Name="Hovered"   Font="{me:Styles.MarketplaceHeader}" Color="{me:Styles.WarmGray}" TextMargins="0,0,0,5"/>
+      <style:Style Name="Default"   Font="{me:Styles.MarketplaceHeader}" Color="{me:Styles.DarkGray}" TextMargins="0,0,0,5"/>
+      <style:Style Name="Disabled"  Style="{Default}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="MarketplaceHubListPrimary" Base="style:StyleSet">
+    <Properties>
+      <style:Style Name="Selected"  Font="{me:Styles.PrimaryText}" Color="{me:Styles.DoradoBlack}" TextStyle="{me:Styles.MarketplaceHubListTracking}"/>
+      <style:Style Name="Focused"   Font="{me:Styles.PrimaryText}" Color="{Selected.Color}" TextStyle="{me:Styles.MarketplaceHubListTracking}"/>
+      <style:Style Name="Hovered"   Font="{me:Styles.PrimaryText}" Color="Black" TextStyle="{me:Styles.MarketplaceHubListTracking}"/>
+      <style:Style Name="Default"   Font="{me:Styles.PrimaryText}" Color="{me:Styles.DarkGray}" TextStyle="{me:Styles.MarketplaceHubListTracking}"/>
+      <style:Style Name="Disabled"  Style="{Default}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="MarketplaceHubListSecondary" Base="style:StyleSet">
+    <Properties>
+      <style:Style Name="Selected"  Font="{me:Styles.PrimaryText}" Color="{me:Styles.DoradoBlack}" TextStyle="{me:Styles.MarketplaceHubListTracking}"/>
+      <style:Style Name="Focused"   Font="{me:Styles.PrimaryText}" Color="{Selected.Color}" TextStyle="{me:Styles.MarketplaceHubListTracking}"/>
+      <style:Style Name="Hovered"   Font="{me:Styles.PrimaryText}" Color="Black" TextStyle="{me:Styles.MarketplaceHubListTracking}"/>
+      <style:Style Name="Default"   Font="{me:Styles.PrimaryText}" Color="{me:Styles.WarmGray}" TextStyle="{me:Styles.MarketplaceHubListTracking}"/>
+      <style:Style Name="Disabled"  Style="{Default}"/>
+    </Properties>
+  </Class>
+  <Class Name="CDLandTrackNumberStyle" Base="style:Style">
+    <Properties>
+      <Color Name="Color" Color="{me:Styles.CDLandTrackNumberDefaultColor}"/>
+      <Color Name="SelectedColor" Color="{me:Styles.CDLandTrackNumberSelectedColor}"/>
+      <Font Name="Font" Font="{me:Styles.CDLandTrackNumber}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="HyperlinkStyle" Base="style:StyleSet">
+    <Properties>
+      <style:Style Name="Disabled"  Font="{me:Styles.HyperlinkFont}" Color="{me:Styles.WarmGray}"/>
+      <style:Style Name="Selected"  Font="{me:Styles.HyperlinkFont}" Color="{me:Styles.SettingLinkTextFocus}"/>
+      <style:Style Name="Focused"   Font="{me:Styles.HyperlinkFont}" Color="{me:Styles.SettingLinkTextFocus}"/>
+      <style:Style Name="Hovered"   Font="{me:Styles.HyperlinkFont}" Color="{me:Styles.SettingLinkText}"/>
+      <style:Style Name="Default"   Font="{me:Styles.HyperlinkFont}" Color="{me:Styles.HyperlinkColor}"/>
+    </Properties>
+  </Class>
+  <Class Name="SearchResultsStyle" Base="style:StyleSet">
+    <Properties>
+      <style:Style Name="Selected" Color="Black"                            Font="{me:Styles.SearchResultText}"/>
+      <style:Style Name="Focused"  Style="{Selected}"/>
+      <style:Style Name="Hovered"  Color="{me:Styles.DarkGray}"             Font="{me:Styles.SearchResultText}"/>
+      <style:Style Name="Default"  Color="{me:Styles.SearchResultsColor}"   Font="{me:Styles.SearchResultText}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="SearchResultsSmallStyle" Base="style:StyleSet">
+    <Properties>
+      <style:Style Name="Selected" Color="Black"                            Font="{me:Styles.SearchResultSmallText}"/>
+      <style:Style Name="Focused"  Style="{Selected}"/>
+      <style:Style Name="Hovered"  Color="{me:Styles.DarkGray}"             Font="{me:Styles.SearchResultSmallText}"/>
+      <style:Style Name="Default"  Color="{me:Styles.SearchResultsColor}"   Font="{me:Styles.SearchResultSmallText}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="ZuneNetLinkStyle" Base="style:StyleSet">
+    <Properties>
+      <style:Style Name="Selected"  Font="{me:Styles.Zegoe12}" Color="{me:Styles.MarketplaceDefault}" TextMargins="0,-3,0,0"/>
+      <style:Style Name="Focused"   Style="{Selected}"/>
+      <style:Style Name="Hovered"   Font="{me:Styles.Zegoe12}" Color="Black" TextMargins="0,-3,0,0"/>
+      <style:Style Name="Default"   Font="{me:Styles.Zegoe12}" Color="{me:Styles.SecondaryLabel}" TextMargins="0,-3,0,0"/>
+      <style:Style Name="Disabled"  Style="{Default}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="FUEHeaderStyle" Base="style:StyleSet">
+    <Properties>
+      <me:LabelStyle Name="Selected"  Font="{me:Styles.SettingsTextSubHeader}" Color="{me:Styles.FUEBrightTextColor}"/>
+      <me:LabelStyle Name="Hovered"   LabelStyle="{Selected}"/>
+      <me:LabelStyle Name="Default"   Font="{me:Styles.SettingsTextSubHeader}" Color="{me:Styles.FUEWelcomeTextColor}"/>
+      <me:LabelStyle Name="Focused"   LabelStyle="{Default}"/>
+      <me:LabelStyle Name="Disabled"  LabelStyle="{Default}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="FUELabelStyle" Base="style:StyleSet">
+    <Properties>
+      <me:LabelStyle Name="Selected"  Font="{me:Styles.SettingsText}" Color="{me:Styles.FUEBrightTextColor}"/>
+      <me:LabelStyle Name="Hovered"   LabelStyle="{Selected}"/>
+      <me:LabelStyle Name="Default"   Font="{me:Styles.SettingsText}" Color="{me:Styles.FUEBodyTextColor}"/>
+      <me:LabelStyle Name="Focused"   LabelStyle="{Default}"/>
+      <me:LabelStyle Name="Disabled"  LabelStyle="{Default}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="FUEDescriptionStyle" Base="style:StyleSet">
+    <Properties>
+      <me:LabelStyle Name="Selected"  Font="{me:Styles.SettingsText}" Color="{me:Styles.FUEBrightTextColor}"/>
+      <me:LabelStyle Name="Hovered"   LabelStyle="{Selected}"/>
+      <me:LabelStyle Name="Default"   Font="{me:Styles.SettingsText}" Color="{me:Styles.WarmGray}"/>
+      <me:LabelStyle Name="Focused"   LabelStyle="{Default}"/>
+      <me:LabelStyle Name="Disabled"  LabelStyle="{Default}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="FUEHyperlinkStyle" Base="style:StyleSet">
+    <Properties>
+      <style:Style Name="Selected"  Font="{me:Styles.HyperlinkFont}" Color="{me:Styles.SettingLinkTextFocus}"/>
+      <style:Style Name="Focused"   Font="{me:Styles.HyperlinkFont}" Color="{me:Styles.SettingLinkTextFocus}"/>
+      <style:Style Name="Hovered"   Font="{me:Styles.HyperlinkFont}" Color="White"/>
+      <style:Style Name="Default"   Font="{me:Styles.HyperlinkFont}" Color="{me:Styles.HyperlinkColor}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="NowPlayingLinkStyle" Base="style:StyleSet">
+    <Properties>
+      <style:Style Name="Focused"   Font="{me:Styles.Zegoe14}" Color="{me:Styles.LightOnDarkText}"/>
+      <style:Style Name="Hovered"   Font="{me:Styles.Zegoe14}" Color="{me:Styles.SettingLinkText}"/>
+      <style:Style Name="Default"   Font="{me:Styles.Zegoe14}" Color="{me:Styles.LightOnDarkText}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="ExternalLinkStyle" Base="style:StyleSet">
+    <Properties>
+      <style:Style Name="Focused"   Font="{me:Styles.PrimaryText}" Color="{me:Styles.SettingLinkTextFocus}"/>
+      <style:Style Name="Hovered"   Font="{me:Styles.PrimaryText}" Color="{me:Styles.SettingLinkTextFocus}"/>
+      <style:Style Name="Default"   Font="{me:Styles.PrimaryText}" Color="{me:Styles.SettingLinkText}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="InboxSignInHeaderStyle" Base="style:StyleSet">
+    <Properties>
+      <me:LabelStyle Name="Selected"  Font="{me:Styles.SettingsTextSubHeader}" Color="{me:Styles.DarkGray}"/>
+      <me:LabelStyle Name="Hovered"   LabelStyle="{Selected}"/>
+      <me:LabelStyle Name="Default"   Font="{me:Styles.SettingsTextSubHeader}" Color="{me:Styles.HoverGray}"/>
+      <me:LabelStyle Name="Focused"   LabelStyle="{Default}"/>
+      <me:LabelStyle Name="Disabled"  LabelStyle="{Default}"/>
+    </Properties>
+  </Class>
+
+  <Class Name="InboxSignInDescriptionStyle" Base="style:StyleSet">
+    <Properties>
+      <me:LabelStyle Name="Selected"  Font="{me:Styles.SettingsText}" Color="{me:Styles.WarmGray}"/>
+      <me:LabelStyle Name="Hovered"   LabelStyle="{Selected}"/>
+      <me:LabelStyle Name="Default"   Font="{me:Styles.SettingsText}" Color="{me:Styles.HoverGray}"/>
+      <me:LabelStyle Name="Focused"   LabelStyle="{Default}"/>
+      <me:LabelStyle Name="Disabled"  LabelStyle="{Default}"/>
+    </Properties>
+  </Class>
+  
+  
+  <Class Name="ImageStyles" Shared="true">
+    <Properties>
+      <Boolean Name="AntialiasEdges"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+        AntialiasEdges = (iris:Application.RenderingType != iris:RenderingType.GDI);
+      </Script>
+    </Scripts>
+  </Class>
+
+
+</UIX>
diff --git a/test/2.1/SYNCANIMATION.UIX b/test/2.1/SYNCANIMATION.UIX
new file mode 100644
index 0000000..ee57ca1
--- /dev/null
+++ b/test/2.1/SYNCANIMATION.UIX
@@ -0,0 +1,190 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX xmlns="http://schemas.microsoft.com/2007/uix"
+     xmlns:styles="res://ZuneShellResources!Styles.uix"
+     xmlns:animations="res://ZuneShellResources!Animations.uix"
+     xmlns:me="Me"
+     >
+
+  
+  
+  
+  <UI Name="SyncAnimation">
+    <Locals>
+      
+      <List Name="Curves">
+        <Source>
+          <Vector3 Vector3="-15,-15,0"/>
+          <Vector3 Vector3="-15,15,0"/>
+          <Vector3 Vector3="15,-15,0"/>
+          <Vector3 Vector3="15,15,0"/>
+          <Vector3 Vector3="0,-15,0"/>
+          <Vector3 Vector3="0,15,0"/>
+        </Source>
+      </List>
+      
+      <Single Name="FrameOverlap" Single="0.5"/>
+      <Single Name="FrameLength" Single="1.0"/>
+    </Locals>
+    
+    <Content>
+      <Panel Layout="Form" Visible="true">
+        <Animations>
+          
+          <Animation Type="Show">
+            <Keyframes>
+              <AlphaKeyframe Time="0.0" Value="0.0"/>
+              <AlphaKeyframe Time="0.25" Value="1.0" />
+            </Keyframes>
+          </Animation>
+
+        </Animations>
+        <Children>
+
+          <Repeater Name="Repeater" Source="{Curves}">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Indicator,0,-15" Top="Indicator,0,-15" Right="Indicator,1,15" Bottom="Indicator,1,15"/>
+            </LayoutInput>
+            <Content>
+
+              <me:SimpleCurve Image="{styles:Styles.SyncGlow}"
+                              StartX="{(Single)((Vector3)RepeatedItem).X}"
+                              StartY="{(Single)((Vector3)RepeatedItem).Y}"
+                              StartScale="0.3,0.3,1.0"
+                              EndScale="1.2,1.2,1.0"
+                              AnimLength="{FrameLength}"
+                              Overlap="{FrameOverlap}" 
+                              ItemNumber="{(Single)RepeatedItemIndex.Value}"
+                              TotalItems="{(Single)Curves.Count}"
+                              />
+            </Content>
+          </Repeater>
+
+          
+          <Graphic Name="Indicator" Content="{styles:Styles.SyncIconAnimBackground}">
+            <LayoutInput>
+              <FormLayoutInput Horizontal="Center" Vertical="Center"/>
+            </LayoutInput>
+            <Animations>
+              <Animation Animation="{animations:Animations.BasicFadeIn}"/>
+            </Animations>
+          </Graphic>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+
+  
+  
+  <UI Name="SimpleCurve">
+    <Properties>
+      <Image Name="Image"         Image="$Required"/>
+      <Vector3 Name="StartScale"  Vector3="1.0,1.0,1.0"/>
+      <Vector3 Name="EndScale"    Vector3="1.0,1.0,1.0"/>
+      <Single Name="StartX"       Single="$Required"/>
+      <Single Name="StartY"       Single="$Required"/>
+      <Single Name="AnimLength"   Single="1.0"/>
+      <Single Name="Overlap"      Single="0.5"/>
+      <Single Name="ItemNumber"   Single="0.0"/>
+      <Single Name="TotalItems"  Single="1.0"/>
+    </Properties>
+
+    <Locals>
+      <Vector3 Name="VerticalValue"   X="0.0"      Y="{StartY}" Z="0.0"/>
+      <Vector3 Name="HorizontalValue" X="{StartX}" Y="0.0"      Z="0.0"/>
+
+      
+      <Animation Name="VerticalMove" Type="Idle" Loop="-1">
+        <Keyframes>
+          <PositionKeyframe Time="0.0" Value="{VerticalValue}"/>
+          <PositionKeyframe Time="0.5" Value="0,0,0"/>
+        </Keyframes>
+      </Animation>
+      
+      
+      
+      <Animation Name="HorizontalMove" Type="Idle" CenterPointPercent="0.5,0.5,1.0" Loop="-1">
+        <Keyframes>
+          <PositionKeyframe Time="0.0" Value="{HorizontalValue}" Interpolation="Log,1.0"/>
+          <PositionKeyframe Time="0.5" RelativeTo="Final"/>
+          <ScaleKeyframe    Time="0.0" Value="{StartScale}"/>
+          <ScaleKeyframe    Time="0.5" RelativeTo="Final" Interpolation="EaseIn,1.5,0.8"/>
+          <ScaleKeyframe    Time="0.65" Value="{StartScale}"/>
+          <ScaleKeyframe    Time="1.0" Value="{EndScale}"/>
+          <AlphaKeyframe    Time="0.0" Value="0.0"/>
+          <AlphaKeyframe    Time="0.2" Value="1.0"/>
+          <AlphaKeyframe    Time="0.5" Value="1.0" Interpolation="EaseIn,1.5,0.8"/>
+          <AlphaKeyframe    Time="1.0" Value="0.0"/>
+        </Keyframes>
+      </Animation>
+    </Locals>
+    
+    <Content>
+      <Panel Name="Container">
+        <Animations>
+          
+          
+          <TransformAnimation TimeScale="{AnimLength}">
+             <Source>
+
+              
+              
+              
+              <MergeAnimation>
+                <Sources>
+                  
+                  <TransformAnimation Delay="{ItemNumber}">
+                    <Source>
+                      <Animation Animation="{VerticalMove}"/>
+                    </Source>
+                  </TransformAnimation>
+                  
+                  <Animation Loop="-1">
+                    <Keyframes>
+                      <PositionKeyframe Time="{(Single)TotalItems + Overlap}" RelativeTo="Final"/>                      
+                    </Keyframes>
+                  </Animation>
+                </Sources>
+              </MergeAnimation>
+            </Source>
+          </TransformAnimation>
+        </Animations>
+
+        <Children>
+          <Graphic Content="{Image}">
+            <Animations>
+              <TransformAnimation TimeScale="{AnimLength}">
+                <Source>
+
+                  
+                  
+                  
+                  <MergeAnimation>
+                    <Sources>
+                      <TransformAnimation Delay="{ItemNumber}">
+                        <Source>
+                          <Animation Animation="{HorizontalMove}"/>
+                        </Source>
+                      </TransformAnimation>
+                      
+                      <Animation Loop="-1">
+                        <Keyframes>
+                          <PositionKeyframe Time="{(Single)TotalItems + Overlap}" RelativeTo="Final"/>
+                          <ScaleKeyframe Time="{(Single)TotalItems + Overlap}" RelativeTo="Final"/>   
+                          <AlphaKeyframe Time="{(Single)TotalItems + Overlap}" Value="0.0"/>
+                        </Keyframes>
+                      </Animation>
+                    </Sources>
+                  </MergeAnimation>
+                </Source>
+              </TransformAnimation>
+            </Animations>
+          </Graphic>
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+  
+
+</UIX>
\ No newline at end of file
diff --git a/test/2.1/SYNCNOTIFICATION.UIX b/test/2.1/SYNCNOTIFICATION.UIX
new file mode 100644
index 0000000..775b4c3
--- /dev/null
+++ b/test/2.1/SYNCNOTIFICATION.UIX
@@ -0,0 +1,46 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX xmlns="http://schemas.microsoft.com/2007/uix"
+     xmlns:styles="res://ZuneShellResources!Styles.uix"
+     xmlns:zune="assembly://ZuneShell/ZuneUI"
+     xmlns:gasgauge="res://ZuneShellResources!GasGauge.uix">
+
+  <UI Name="RuleAddedNotification">
+    <Properties>
+      <zune:SyncNewRuleAddedNotification Name="Model" SyncNewRuleAddedNotification="$Required"/>
+    </Properties>
+    <Locals>
+      <Timer Name="HideTimer" Interval="10000" Enabled="true" AutoRepeat="false"/>
+    </Locals>
+    <Scripts>
+      <Script>
+        GasGauge.NewSize = [Model.NewSize];
+        HideTimer.Stop();
+        HideTimer.Start();
+      </Script>
+      <Script>
+        [DeclareTrigger(HideTimer.Tick)]
+        zune:NotificationArea.Instance.EndOverride(Model);
+      </Script>
+    </Scripts>
+    <Content>
+
+      <Panel MaximumSize="400,0">
+        <Layout>
+          <FlowLayout Orientation="Vertical" StripAlignment="Center" ItemAlignment="Center" Spacing="8,0"/>
+        </Layout>
+        <Children>
+          
+          <Text Name="Message" MaximumSize="295,0" Color="{styles:Styles.SyncHeaderColor}" Font="{styles:Styles.SyncHeaderFont}" Content="{Model.Message}"/>
+
+          <gasgauge:MiniGasGauge Name="GasGauge"
+                                 OldSize="{Model.OldSize}"
+                                 NewSize="{Model.OldSize}"
+                                 TotalSize="{Model.TotalSize}"/>
+          
+        </Children>
+      </Panel>
+      
+    </Content>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/SYNCRULES.UIX b/test/2.1/SYNCRULES.UIX
new file mode 100644
index 0000000..3560f82
--- /dev/null
+++ b/test/2.1/SYNCRULES.UIX
@@ -0,0 +1,238 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:panels="res://ZuneShellResources!LibraryPanels.uix"
+  xmlns:data="res://ZuneShellResources!LibraryData.schema.xml"
+  xmlns:spreadsheet="res://ZuneShellResources!SpreadSheetViewBase.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:lib="res://ZuneShellResources!Library.uix"
+  xmlns:me="Me">
+
+  
+  <Class Name="RuleListModel" Base="lib:LibraryListModel">
+    <Properties>
+      <Int32 Name="Count" Int32="0"/>
+    </Properties>
+  </Class>
+
+  <Class Name="RuleColumns" Shared="true">
+    <Properties>
+      
+      <spreadsheet:ColumnData Name="ColumnData">
+        <Columns>
+          <spreadsheet:ColumnInfo HeaderType="{typeof(me:RuleHeader)}"
+                                  CellType="{typeof(me:RuleCell)}"
+                                  Resizable="false" CellPadding="5,4,5,4"
+                                  HeaderPadding="5,0,5,0">
+            <LayoutInput>
+              <DockLayoutInput Position="Top"/>
+            </LayoutInput>
+          </spreadsheet:ColumnInfo>
+        </Columns>
+      </spreadsheet:ColumnData>
+    </Properties>
+  </Class>
+
+  <UI Name="SyncRulesPanelBase" Base="panels:LibraryPanelBase">
+    <Properties>
+      <List Name="AllItemsText">
+        <Source>
+          <String String="{zune:Shell.LoadString(zune:StringId.IDS_ALL_SYNCED_ITEMS)}"/>
+        </Source>
+      </List>
+      <me:RuleListModel Name="ListModel"/>
+    </Properties>
+    <Locals>
+      <zune:ISyncRulesPanel Name="RulesPanel" ISyncRulesPanel="{null}"/>
+
+      <iris:AggregateList Name="Source" AggregateList="{null}"/>
+
+      <iris:Command Name="RemoveRule" Description="{zune:Shell.LoadString(zune:StringId.IDS_REMOVE_SYNC_RULE)}"/>
+      <List Name="ContextMenuOptions">
+        <Source>
+          <iris:Command Command="{RemoveRule}"/>
+        </Source>
+      </List>
+
+      <spreadsheet:ColumnData Name="ColumnData" ColumnData="{me:RuleColumns.ColumnData}"/>
+
+      <Boolean Name="Initialized" Boolean="false"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        DeleteKey.Command = RemoveRule;
+        ContextMenu.Options = ContextMenuOptions;
+      </Script>
+
+      <Script>
+        RulesPanel = (zune:ISyncRulesPanel)[Model];
+      </Script>
+
+      <Script>
+        [DeclareTrigger(SelectionManager.SelectedItems)]
+
+        
+
+        RemoveRule.Available = true;
+
+        if (SelectionManager.Count == 1)
+        {
+          if (SelectionManager.SelectedItem is String)
+          {
+            RulesPanel.AllItemsSelected();
+            RemoveRule.Available = false;
+          }
+          else if (SelectionManager.SelectedItem is data:Media)
+          {
+            data:Media media = (data:Media)SelectionManager.SelectedItem;
+            RulesPanel.RuleSelected(zune:Shell.MapStringToMediaType(media.Type), media.LibraryId);
+          }
+          else
+          {
+            RulesPanel.IndividualItemsQuerySelected();
+            RemoveRule.Available = false;
+          }
+        }
+        else
+        {
+          RulesPanel.NothingSelected();
+        }
+      </Script>
+
+      <Script>
+        if (Source != null)
+        {
+          ListModel.Count = [Source.Count];
+        }
+        else
+        {
+          ListModel.Count = 0;
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(RemoveRule.Invoked)]
+
+        if (RemoveRule.Available)
+        {
+          
+          zune:SyncControls.Instance.RemoveSyncRule(SelectionManager.SelectedItems);
+
+          SelectionManager.Select(0, true);
+        }
+      </Script>
+
+      <Script>
+        Worker.Content = [Source];
+      </Script>
+      <Script>
+        Worker.ContextMenu = [ContextMenu];
+      </Script>
+
+      <Script>
+        if (SelectionManager.SourceList != null &amp;&amp;
+            [SelectionManager.SourceList.Count] > 0 &amp;&amp;
+            !Initialized)
+        {
+          SelectionManager.Select(0, true);
+          Initialized = true;
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+
+      <spreadsheet:SpreadSheet Name="Worker"
+        ListModel="{ListModel}"
+        Content="{Source}"
+        ColumnData="{ColumnData}"
+        NavigateIntoArgs="{NavigateIntoArgs}"
+        SelectionManager="{SelectionManager}"
+        ContextMenu="{ContextMenu}"
+        AllowHorizontalScrolling="false"
+        Margins="0,0,15,0"
+        HeaderSpacing="26"
+        HighlightHeaders="false"
+        OverrideStyle="{styles:SharedStyles.SyncHeader}"
+        RowSize="0,33"
+        />
+    </Content>
+  </UI>
+
+  
+  <UI Name="RuleHeader" Base="spreadsheet:LabelCell">
+    <Properties>
+      <me:RuleListModel Name="ListModel" RuleListModel="$Required"/>
+    </Properties>
+    <Locals>
+      <String Name="BaseText" String="{zune:Shell.LoadString(zune:StringId.IDS_SYNC_GROUPS_HEADER)}"/>
+    </Locals>
+    <Scripts>
+      <Script>
+        
+        Content = BaseText.Format([ListModel.Count] - 1);
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  <UI Name="RuleCell" Base="spreadsheet:LabelCell">
+    <Scripts>
+      <Script>
+        if (Model is data:Media)
+        {
+          data:Media media = (data:Media)Model;
+          String baseText = "{0}";
+
+          if (media is data:Artist)
+          {
+            baseText = me:RuleBaseTexts.Artist;
+          }
+          else if (media is data:Album)
+          {
+            baseText = me:RuleBaseTexts.Album;
+          }
+          else if (media is data:MediaFolder)
+          {
+            baseText = me:RuleBaseTexts.Folder;
+          }
+          else if (media is data:PodcastSeries)
+          {
+            baseText = me:RuleBaseTexts.PodcastSeries;
+          }
+
+          Content = baseText.Format(media.Title);
+        }
+        
+        else if (Model is data:LibraryTrackQuery)
+        {
+          Content = zune:Shell.LoadString(zune:StringId.IDS_INDIVIDUAL_TRACKS);
+        }
+        else if (Model is data:LibraryPodcastEpisodeQuery)
+        {
+          Content = zune:Shell.LoadString(zune:StringId.IDS_INDIVIDUAL_EPISODES);
+        }
+        else if (Model is data:LibraryPhotoQuery)
+        {
+          Content = zune:Shell.LoadString(zune:StringId.IDS_INDIVIDUAL_PHOTOS);
+        }
+        else if (Model is String)
+        {
+          Content = (String)Model;
+        }
+      </Script>
+    </Scripts>
+  </UI>
+
+  <Class Name="RuleBaseTexts" Shared="true">
+    <Properties>
+      <String Name="Artist" String="{zune:Shell.LoadString(zune:StringId.IDS_ARTIST_RULE_BASE)}"/>
+      <String Name="Album" String="{zune:Shell.LoadString(zune:StringId.IDS_ALBUM_RULE_BASE)}"/>
+      <String Name="Folder" String="{zune:Shell.LoadString(zune:StringId.IDS_FOLDER_RULE_BASE)}"/>
+      <String Name="PodcastSeries" String="{zune:Shell.LoadString(zune:StringId.IDS_PODCAST_SERIES_RULE_BASE)}"/>
+    </Properties>
+  </Class>
+</UIX>
diff --git a/test/2.1/TEXTAREA.UIX b/test/2.1/TEXTAREA.UIX
new file mode 100644
index 0000000..2224822
--- /dev/null
+++ b/test/2.1/TEXTAREA.UIX
@@ -0,0 +1,84 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:scroll="res://ZuneShellResources!ScrollBar.uix"
+  xmlns:button="res://ZuneShellResources!Button.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  >
+
+  <UI Name="TextArea">
+    <Properties>
+      <String Name="Text" String="$Required"/>
+      <styles:LabelStyle Name="Style" Color="{styles:Styles.TextActive}" Font="{styles:Styles.StandardSubHeaderText}"/>
+      <Color Name="Background" Color="Transparent"/>
+    </Properties>
+    
+    <Locals>
+      <ScrollingData Name="ScrollData"/>
+    </Locals>
+    
+    <Scripts>
+      <Script>
+        ScrollBar.RegionHover = [UI.DeepMouseFocus];
+      </Script>
+    </Scripts>
+    
+    <Input>
+      <ScrollingHandler Name="ScrollHandler" ScrollingData="{ScrollData}"/>
+    </Input>
+    
+    <Content>
+      <Panel Layout="Dock">
+        <Children>
+
+          <ColorFill Name="TopScrollerBorder" Content="{styles:Styles.ScrollBarBackground}" MinimumSize="0,1">
+            <LayoutInput>
+              <DockLayoutInput Position="Top"/>
+            </LayoutInput>
+          </ColorFill>
+
+          <ColorFill Name="LeftScrollerBorder" Content="{styles:Styles.ScrollBarBackground}" MinimumSize="1,0">
+            <LayoutInput>
+              <DockLayoutInput Position="Left"/>
+            </LayoutInput>
+          </ColorFill>
+
+          <ColorFill Name="RightScrollerBorder" Content="{styles:Styles.ScrollBarBackground}" MinimumSize="1,0">
+            <LayoutInput>
+              <DockLayoutInput Position="Right"/>
+            </LayoutInput>
+          </ColorFill>
+          
+          <ColorFill Name="BottomScrollerBorder" Content="{styles:Styles.ScrollBarBackground}" MinimumSize="0,1">
+            <LayoutInput>
+              <DockLayoutInput Position="Bottom"/>
+            </LayoutInput>
+          </ColorFill>
+
+          <scroll:ScrollBar Name="ScrollBar" ScrollData="{ScrollData}">
+            <LayoutInput>
+              <DockLayoutInput Position="Right"/>
+            </LayoutInput>
+          </scroll:ScrollBar>
+
+          <Scroller Name="TextAreaScroller" Orientation="Vertical" FadeSize="-1" ScrollingData="{ScrollData}">
+            <LayoutInput>
+              <DockLayoutInput Position="Client"/>
+            </LayoutInput>
+            <Children>
+
+              <ColorFill Content="{Background}" Padding="5,5,0,5">
+                <Children>
+
+                  <button:Label Content="{Text}" WordWrap="true" Style="{Style}"/>
+
+                </Children>
+              </ColorFill>
+
+            </Children>
+          </Scroller>
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+</UIX>
diff --git a/test/2.1/THUMBNAILBUTTON.UIX b/test/2.1/THUMBNAILBUTTON.UIX
new file mode 100644
index 0000000..f895421
--- /dev/null
+++ b/test/2.1/THUMBNAILBUTTON.UIX
@@ -0,0 +1,702 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:style="res://ZuneShellResources!Style.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:button="res://ZuneShellResources!Button.uix"
+  xmlns:edit="res://ZuneShellResources!Editbox.uix"
+  xmlns:animations="res://ZuneShellResources!Animations.uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:col="assembly://mscorlib/System.Collections"
+  xmlns:me="Me">
+
+  
+  
+  
+  <UI Name="Default">
+    <Content>
+      <me:ThumbnailButtonBase>
+        <Provider>
+          <me:ThumbnailButtonProvider PrimaryLabel="Hello" SecondaryLabel="World" Image="{styles:Styles.NoAlbumArt}"/>
+        </Provider>
+      </me:ThumbnailButtonBase>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <Class Name="ThumbnailButtonProvider" Base="button:ModelButtonProvider">
+    <Properties>
+      
+      <Image Name="Image" Image="{null}"/>
+      <Command Name="PrimaryLabelEdited" />
+    </Properties>
+  </Class>
+
+  
+  
+  
+  <Class Name="CommandThumbnailButtonProvider" Base="me:ThumbnailButtonProvider">
+    <Properties>
+      <zune:IThumbnailCommand Name="Model" IThumbnailCommand="{null}"/>
+    </Properties>
+
+    <Scripts>
+      <Script>if (Model != null) PrimaryLabel = [Model.Description];</Script>
+      <Script>if (Model != null) Available = [Model.Available];</Script>
+      <Script>if (Model != null) Selected = [Model.Selected];</Script>
+      <Script>if (Model != null) ClickCommand = [Model];</Script>
+      <Script>if (Model != null) Image = [Model.Image];</Script>
+    </Scripts>
+  </Class>
+
+  
+  
+  
+  
+  <UI Name="ThumbnailButton" Base="me:ThumbnailButtonBase">
+    <Properties>
+      
+      <zune:IThumbnailCommand Name="Model" IThumbnailCommand="$Required"/>
+      <me:CommandThumbnailButtonProvider Name="Provider"/>
+    </Properties>
+
+    <Scripts>
+      <Script>Provider.Model = [Model];</Script>
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  
+  <UI Name="ThumbnailButtonBase" Base="button:ButtonBase">
+    <Properties>
+      <me:ThumbnailButtonProvider Name="Provider"/>
+
+      <Type Name="ThumbnailCaptionAreaType" Type="{typeof(me:ThumbnailCaptionArea)}"/>
+
+      <Image Name="FallbackImage" Image="{null}"/>
+
+      <Image Name="DisplayedImage" Image="{null}"/>
+
+      <Boolean Name="AlwaysDisplayAsSelected" Boolean="false"/>
+
+      <AnchorAlignment Name="ImageAlignment" AnchorAlignment="Center"/>
+
+      
+      <Image Name="DefaultBackgroundImage" Image="{null}"/>
+      <Image Name="FocusedBackgroundImage" Image="{styles:Styles.ThumbnailShadow}"/>
+      <Image Name="SelectedBackgroundImage" Image="{styles:Styles.ThumbnailClickShadow}"/>
+      <Image Name="SelectedOverlayImage" Image="{styles:Styles.ThumbnailClickOverlay}"/>
+
+      
+      <Boolean Name="ShowLabel" Boolean="true"/>
+
+      
+      <style:Style Name="PrimaryStyle" Style="{styles:SharedStyles.ThumbnailPrimaryLabelStyle}"/>
+      <style:Style Name="SecondaryStyle" Style="{styles:SharedStyles.ThumbnailSecondaryLabelStyle}"/>
+
+      
+      <Size Name="TileSize" Size="75,75"/>
+      <Size Name="LabelSize" Size="0,20"/>
+
+      
+      <Vector3 Name="HoverScale" Vector3="1.05,1.05,1.0"/>
+      <Vector3 Name="HoverOffScale" Vector3="1,1,1"/>
+      <Vector3 Name="ClickScale" Vector3="1,1,1"/>
+
+      <Inset Name="LabelInset" Inset="0,4,0,0"/>
+
+      
+      <StretchingPolicy Name="StretchingPolicy" StretchingPolicy="UniformToFill"/>
+
+      
+      <AnchorLayoutInput Name="LabelAnchor"
+          Left="TileBase,0" Right="TileBase,1" Horizontal="Near"
+          Top="TileBase,1,0" Bottom="TileBase,1,999" Vertical="Near"/>
+      <AnchorLayoutInput Name="BorderAnchor"
+          Left="Image,0" Right="Image,1"
+          Top="Image,0" Bottom="Image,1"/>
+
+      <Int32 Name="BorderWidth" Int32="4"/>
+
+      
+      <Type Name="OverlayType" Type="{null}"/>
+
+      
+      <Single Name="SelectionBorderFadeInLength" Single="0.2"/>
+
+      <iris:BooleanChoice Name="EditingList" BooleanChoice="{null}"/>
+    </Properties>
+
+    <Locals>
+      <style:StatefulCompositeStyle Name="PrimaryLabelStyle"/>
+      <style:StatefulCompositeStyle Name="SecondaryLabelStyle"/>
+
+      <AnchorLayoutInput Name="SelectionBorderAnchor"
+            Left="ImageBorder,0" Right="ImageBorder,1"
+            Top="ImageBorder,0" Bottom="ImageBorder,1"
+            ContributesToHeight="false"
+            ContributesToWidth="false"/>
+
+      <AnchorLayoutInput Name="ShadowAnchorUnselected"
+            Left="ImageBorder,0,-4" Right="ImageBorder,1,4"
+            Top="ImageBorder,0,-4" Bottom="ImageBorder,1,4"
+            ContributesToHeight="false"
+            ContributesToWidth="false"/>
+
+      <AnchorLayoutInput Name="ShadowAnchorSelected"
+            Left="SelectionBorder,0,-4" Right="SelectionBorder,1,4"
+            Top="SelectionBorder,0,-4" Bottom="SelectionBorder,1,4"
+            ContributesToHeight="false"
+            ContributesToWidth="false"/>
+
+      <Command Name="RefreshFocus"/>
+    </Locals>
+
+    <Scripts>
+      <Script>PrimaryLabelStyle.Base = [PrimaryStyle];</Script>
+      <Script>SecondaryLabelStyle.Base = [SecondaryStyle];</Script>
+      <Script>SecondaryLabelStyle.State = [PrimaryLabelStyle.State];</Script>
+
+      <Script>
+        SelectionBorderAnchor.Left.Offset = BorderWidth * -1;
+        SelectionBorderAnchor.Top.Offset = BorderWidth * -1;
+        SelectionBorderAnchor.Right.Offset = BorderWidth;
+        SelectionBorderAnchor.Bottom.Offset = BorderWidth;
+      </Script>
+
+      
+      <Script>
+        if (Provider != null)
+        {
+          if ([Provider.Image] != null)
+            Image.Content = Provider.Image;
+          else
+            Image.Content = [FallbackImage];
+        }
+      </Script>
+
+      <Script>
+        DisplayedImage = [Image.Content];
+      </Script>
+
+      <Script>
+        if (Provider != null)
+        {
+          PrimaryLabelStyle.State.Selected = [Provider.Selected];
+        }
+      </Script>
+
+      
+      
+      
+      
+      <Script>
+        if ([LabelSize.Width] > 0)
+        {
+          LabelAnchor.Right.Percent = 0.0;
+          LabelAnchor.Right.Offset = LabelSize.Width + 2;
+        }
+      </Script>
+
+      
+      <Script>
+        PrimaryLabelStyle.State.Focused = [UI.DeepKeyFocus];
+      </Script>
+      <Script>
+        PrimaryLabelStyle.State.Hovered = [UI.DeepMouseFocus];
+      </Script>
+
+      <Script>
+        Vector3 scale = HoverOffScale;
+        Image content = DefaultBackgroundImage;
+        Single selectionOverlayAlpha = 0.0;
+        Single selectionAlpha = 0.0;
+
+        if ([PrimaryLabelStyle.State.Selected] || AlwaysDisplayAsSelected)
+        {
+          
+          
+          
+          scale = HoverOffScale;
+          content = FocusedBackgroundImage;
+
+          
+          
+          
+          selectionAlpha = 1.0;
+
+          
+          
+          Background.LayoutInput = ShadowAnchorSelected;
+        }
+        else
+        {
+          Background.LayoutInput = ShadowAnchorUnselected;
+        }
+
+        if ([UI.DeepMouseFocus])
+        {
+          scale = HoverScale;
+          content = FocusedBackgroundImage;
+        }
+
+        if ([Clicker.Clicking])
+        {
+          scale = ClickScale;
+          content = SelectedBackgroundImage;
+          selectionOverlayAlpha = 1.0;
+          selectionAlpha = 0.0;
+        }
+
+        Background.Scale = scale;
+        Background.Content = content;
+
+        Image.Scale = scale;
+
+        ImageBorder.Scale = scale;
+
+        SelectionBorder.Scale = scale;
+        SelectionBorder.Alpha = selectionAlpha;
+
+        SelectionOverlay.Alpha = selectionOverlayAlpha;
+
+        OverlayContent.Scale = scale;
+      </Script>
+      
+      <Script>LabelArea.Visible = [ShowLabel];</Script>
+
+      
+      <Script>
+        TileBase.MinimumSize = [TileSize];
+        TileBase.MaximumSize = TileSize;
+      </Script>
+
+
+      
+      <Script>
+        if ([OverlayType] != null)
+        {
+          OverlayContent.RequestSource(OverlayType, "State", PrimaryLabelStyle.State, "Provider", Provider);
+        }
+        else
+        {
+          OverlayContent.RequestSource(null);
+        }
+      </Script>
+
+      
+      <Script>
+        bool isEditing = [LabelArea.IsEditing];
+
+        Clicker.Enabled = !isEditing;
+
+        if (EditingList != null)
+        {
+          EditingList.Value = isEditing;
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(RefreshFocus.Invoked)]
+        UI.NavigateInto();
+      </Script>
+
+      <Script>
+        UI.FocusInterestTarget = Image;
+        UI.FocusInterestTargetMargins = new Inset(6,6,6,6);
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Name="Root" Layout="Anchor" MouseInteractive="true">
+        <Children>
+
+          
+          <me:ThumbnailButtonOverlay Name="OverlayContent">
+            <LayoutInput>
+              <AnchorLayoutInput
+                  Left="Image,0" Top="Image,0" ContributesToWidth="false"
+                  Right="Image,1" Bottom="Image,1" ContributesToHeight="false"/>
+            </LayoutInput>
+            <Animations>
+              <Animation Animation="{animations:Animations.ButtonScale}"/>
+            </Animations>
+          </me:ThumbnailButtonOverlay>
+
+          <me:ThumbnailCaptionArea Name="LabelArea" ThumbnailCaptionArea="{ThumbnailCaptionAreaType}"
+              LabelSize="{LabelSize}"
+              Provider="{Provider}"
+              PrimaryLabelStyle="{PrimaryLabelStyle}"
+              SecondaryLabelStyle="{SecondaryLabelStyle}"
+              LabelInset="{LabelInset}"
+              RefreshFocus="{RefreshFocus}">
+            <LayoutInput>
+              <AnchorLayoutInput AnchorLayoutInput="{LabelAnchor}"/>
+            </LayoutInput>
+          </me:ThumbnailCaptionArea>
+
+          
+          
+          
+          
+          
+          <Graphic Name="Image" SizingPolicy="SizeToConstraint" StretchingPolicy="{StretchingPolicy}"
+              AcquiringImage="{FallbackImage}" ErrorImage="{FallbackImage}">
+            <LayoutInput>
+              <AnchorLayoutInput Left="TileBase,0" Right="TileBase,1" Top="TileBase,0" Bottom="TileBase,1" Horizontal="{ImageAlignment}" Vertical="Center"/>
+            </LayoutInput>
+            <Animations>
+              <Animation Animation="{animations:Animations.ButtonAlpha}"/>
+              <Animation Animation="{animations:Animations.ButtonScale}"/>
+            </Animations>
+            <Children>
+
+              <Graphic Name="SelectionOverlay" Content="{SelectedOverlayImage}" Layout="Fill" />
+
+            </Children>
+          </Graphic>
+
+          <ColorFill Name="ImageBorder" Content="Transparent">
+            <LayoutInput>
+              <AnchorLayoutInput AnchorLayoutInput="{BorderAnchor}"/>
+            </LayoutInput>
+            <Animations>
+              <Animation Animation="{animations:Animations.ButtonScale}"/>
+            </Animations>
+          </ColorFill>
+
+          <ColorFill Name="SelectionBorder" Content="White" Alpha="0.0">
+            <LayoutInput>
+              <AnchorLayoutInput AnchorLayoutInput="{SelectionBorderAnchor}"/>
+            </LayoutInput>
+            <Animations>
+              <Animation Animation="{animations:Animations.ButtonScale}"/>
+              <Animation Name="SelectionBorderAlpha" Type="Alpha">
+                <Keyframes>
+                  <AlphaKeyframe Time="0.0" Value="1.0" RelativeTo="Current" Interpolation="{animations:Animations.PopInterpolation}"/>
+                  <AlphaKeyframe Time="{SelectionBorderFadeInLength}" Value="1.0" RelativeTo="Final"/>
+                </Keyframes>
+              </Animation>
+            </Animations>
+          </ColorFill>
+
+          
+          
+
+
+
+
+          <Panel Name="TileBase"/>
+
+          
+          <Graphic Name="Background" StretchingPolicy="Fill">
+            <Animations>
+              <Animation Animation="{animations:Animations.ButtonScale}"/>
+            </Animations>
+          </Graphic>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="ThumbnailCaptionArea">
+    <Properties>
+      <me:ThumbnailButtonProvider Name="Provider" ThumbnailButtonProvider="$Required"/>
+      <Size Name="LabelSize" Size="$Required"/>
+      <style:Style Name="PrimaryLabelStyle" Style="$Required"/>
+      <style:Style Name="SecondaryLabelStyle" Style="$Required"/>
+      <Inset Name="LabelInset" Inset="0,4,0,0"/>
+
+      <Type Name="PrimaryLabelType" Type="{typeof(me:LabelHost)}"/>
+      <Type Name="SecondaryLabelType" Type="{typeof(me:LabelHost)}"/>
+
+      <Boolean Name="IsEditing"/>
+      <Command Name="RefreshFocus" Command="{null}"/>
+    </Properties>
+
+    <Scripts>
+
+      <Script>
+        if (Provider != null)
+        {
+          Label.Content= [Provider.PrimaryLabel];
+        }
+      </Script>
+
+      
+      <Script>
+        if (Provider != null)
+        {
+          Provider.EditPrimaryLabel = Label.EditMe;
+        }
+      </Script>
+
+      <Script>
+        if (Provider != null)
+        {
+          SecondaryLabel.Content = [Provider.SecondaryLabel];
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(Label.CommitEdit.Invoked)]
+
+        if (Provider != null &amp;&amp; Provider.PrimaryLabel != Label.Content)
+        {
+          Provider.PrimaryLabel = Label.Content;
+          Provider.PrimaryLabelEdited.Invoke();
+        }
+      </Script>
+
+      
+      
+      <Script>
+        IsEditing = [Label.IsEditing];
+      </Script>
+
+      
+      <Script>
+        Label.RefreshFocus          = RefreshFocus;
+        SecondaryLabel.RefreshFocus = RefreshFocus;
+      </Script>
+
+    </Scripts>
+
+    <Content>
+      <Panel Layout="VerticalFlow" MinimumSize="{LabelSize}" MaximumSize="{LabelSize}" Margins="{LabelInset}">
+        <Children>
+
+          
+          <me:LabelHostBase Name="Label" Style="{PrimaryLabelStyle}" LabelHostBase="{PrimaryLabelType}" />
+
+          
+          <me:LabelHostBase Name="SecondaryLabel" Margins="0,-2,0,0" Style="{SecondaryLabelStyle}" LabelHostBase="{SecondaryLabelType}" />
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="LabelHostBase">
+    <Properties>
+      <String Name="Content"/>
+      <Command Name="EditMe" Command="{null}"/>
+      <Command Name="RefreshFocus" Command="{null}"/>
+      <Command Name="CommitEdit"  Command="{null}"/>
+      <style:Style Name="Style" Style="$Required"/>
+      <Boolean Name="IsEditing"/>
+      <Boolean Name="WordWrap" />
+      <Int32 Name="MaximumLines" />
+      <col:IDictionary Name="NamedStyles" IDictionary="{null}"/>
+      <String Name="ToolTipContent"/>
+    </Properties>
+
+    <Scripts>
+      <Script> Label.WordWrap = [WordWrap]; </Script>
+      <Script> Label.MaximumLines = [MaximumLines]; </Script>
+      <Script> Label.NamedStyles = [NamedStyles]; </Script>
+      <Script> Label.ToolTipContent = [ToolTipContent]; </Script>
+    </Scripts>
+
+    <Content>
+      <button:Label Name="Label" Style="{Style}"/>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="LabelHost" Base="me:LabelHostBase">
+    <Scripts>
+      <Script>
+        Label.Content = [Content];
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  <UI Name="EditableLabelHost" Base="me:LabelHost">
+    <Locals>
+      
+      
+      
+      
+      <EditableTextData Name="EditData" />
+    </Locals>
+
+    <Properties>
+      <Command Name="EditMe" />
+      <Command Name="CommitEdit" />
+    </Properties>
+
+    <Input>
+      <KeyHandler Name="Escape" Key="Escape" HandlerStage="Bubbled" Handle="true"/>
+    </Input>
+
+    <Scripts>
+
+      
+      <Script>
+        [DeclareTrigger(EditMe.Invoked)]
+        EditData.Value = Label.Content;
+        Label.RequestSource(typeof(me:LabelEditBox), "Model", EditData);
+        Label.NavigateInto();
+        IsEditing = true;
+      </Script>
+
+      
+      <Script>
+        Escape.Enabled = [IsEditing];
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(EditData.Submitted)]
+
+        if (!String.IsNullOrEmpty(EditData.Value))
+        {
+          CommitEdit.Invoke();
+          Content = EditData.Value;
+        }
+        else
+        {
+          Label.Content = Content;
+        }
+
+        IsEditing = false;
+        Label.RequestSource(typeof(button:Label));
+
+        if (RefreshFocus != null)
+        {
+          RefreshFocus.Invoke();
+        }
+      </Script>
+
+      
+      <Script>
+        [InitialEvaluate(false)]
+        if (![UI.DeepKeyFocus])
+        {
+          if (!String.IsNullOrEmpty(EditData.Value))
+          {
+            Content = EditData.Value;
+          }
+          else
+          {
+            Label.Content = Content;
+          }
+
+          IsEditing = false;
+          Label.RequestSource(typeof(button:Label));
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(Escape.Invoked)]
+        EditData.Value = Content;
+        Label.Content = Content;
+        IsEditing = false;
+        Label.RequestSource(typeof(button:Label));
+
+        if (RefreshFocus != null)
+        {
+          RefreshFocus.Invoke();
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      <button:Label Name="Label" Style="{Style}"/>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="LabelEditBox" Base="edit:Editbox">
+    <Properties>
+      <Size Name="TileMinSize" Size="0,0"/>
+      <Size Name="TileMaxSize" Size="0,0"/>
+      <Inset Name="TilePadding" Inset="0,0,0,0"/>
+      <Int32 Name="DefaultHeight" Int32="0"/>
+    </Properties>
+  </UI>
+
+  
+  
+  
+  <UI Name="ThumbnailButtonOverlay">
+    <Properties>
+      <style:StyleState Name="State"/>
+      <Object Name="Model" Object="{null}"/>
+      <me:ThumbnailButtonProvider Name="Provider" ThumbnailButtonProvider="{null}"/>
+    </Properties>
+  </UI>
+
+  
+  
+  
+  <UI Name="ThumbnailIconCaptionArea" Base="me:ThumbnailCaptionArea">
+    <Properties>
+      <Image Name="Image" Image="{null}"/>
+      <Boolean Name="ImageVisible"/>
+    </Properties>
+
+    <Scripts>
+      <Script>Icon.Content = [Image];</Script>
+      <Script>Icon.Visible = [ImageVisible];</Script>
+    </Scripts>
+
+    <Content>
+      <Panel Layout="Anchor" MinimumSize="{LabelSize}" MaximumSize="{LabelSize}" Margins="{LabelInset}">
+        <Children>
+
+          
+          <Panel Name="IconContainer">
+            <LayoutInput>
+              <AnchorLayoutInput Right="Parent,1" Top="Parent,0,3"/>
+            </LayoutInput>
+            <Children>
+
+              <Graphic Name="Icon"/>
+
+            </Children>
+          </Panel>
+
+          
+          <me:LabelHostBase Name="Label" LabelHostBase="{PrimaryLabelType}" Style="{PrimaryLabelStyle}">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Parent,0" Top="Parent,0" Right="IconContainer,0"/>
+            </LayoutInput>
+          </me:LabelHostBase>
+
+          
+          <me:LabelHostBase Name="SecondaryLabel" LabelHostBase="{SecondaryLabelType}" Style="{SecondaryLabelStyle}">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Parent,0" Top="Label,1" Bottom="Parent,1"/>
+            </LayoutInput>
+          </me:LabelHostBase>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+</UIX>
\ No newline at end of file
diff --git a/test/2.1/TOOLBARICON.UIX b/test/2.1/TOOLBARICON.UIX
new file mode 100644
index 0000000..9659503
--- /dev/null
+++ b/test/2.1/TOOLBARICON.UIX
@@ -0,0 +1,47 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX xmlns="http://schemas.microsoft.com/2007/uix"
+     >
+
+  
+  
+  
+  
+  <UI Name="ToolbarIconBase">
+    <Properties>
+      <String Name="ToolbarText"/>
+    </Properties>
+    <Locals>      
+      <String Name="ToolbarActiveText"/>
+      <String Name="ToolbarInactiveText"/>
+      <Boolean Name="IsActive"/>
+    </Locals>
+
+    <Input>
+      <DropTargetHandler Name="Target" HandlerStage="Bubbled"/>      
+    </Input>
+   
+    <Scripts>
+      
+      
+      <Script>
+        [DeclareTrigger(UI.DeepMouseFocus)]
+        [DeclareTrigger(Target.Dragging)]
+        if (Target.Dragging || UI.DeepMouseFocus)
+        {
+          if(IsActive)
+          {
+            ToolbarText = ToolbarActiveText;
+          } 
+          else 
+          {
+            ToolbarText = ToolbarInactiveText;
+          }
+        } 
+        else 
+        {
+          ToolbarText = "";
+        }
+      </Script>    
+    </Scripts>
+  </UI>
+</UIX>
diff --git a/test/2.1/TOOLTIP.UIX b/test/2.1/TOOLTIP.UIX
new file mode 100644
index 0000000..e7c6a93
--- /dev/null
+++ b/test/2.1/TOOLTIP.UIX
@@ -0,0 +1,97 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX 
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:anim="res://ZuneShellResources!Animations.uix"
+  xmlns:popup="res://ZuneShellResources!Popup.uix"
+  xmlns:me="Me"
+  >
+  
+  
+  
+  
+  
+
+  <Class Name="ToolTip" Base="popup:Popup">
+    <Properties>
+      <PopupLayoutInput Name="LayoutInput" Placement="MouseBottom" />
+      <String Name="PopupUI" String="res://ZuneShellResources!ToolTip.uix#ToolTipUI"/>
+      <Int32 Name="AutoHideDelay" Int32="5000"/>
+      <Font Name="Font" Font="{styles:SharedStyles.ToolTipStyle.Font}"/>
+    </Properties>
+    <Scripts>
+      <Script>
+        Helper.DismissOnMouseDown = true;
+        Helper.DismissOnWindowDeactivate = true;
+      </Script>
+      <Script>Helper.AutoHideDelay = [AutoHideDelay];</Script>
+    </Scripts>
+  </Class>
+
+  <Class Name="ToolTipConstants" Shared="true">
+    <Properties>
+      <Point Name="InversePadding" Point="-5,-3"/>
+    </Properties>
+  </Class>
+
+  <UI Name="ToolTipUI" Base="popup:PopupUI">
+    <Properties>
+      <String Name="ContentUI" String="res://ZuneShellResources!ToolTip.uix#ToolTipContentUI"/>
+      
+      
+      <me:ToolTip Name="Popup" ToolTip="$Required" />
+    </Properties>
+
+    <Scripts>
+      <Script>
+        if (ContentUI != null)
+          Host.RequestSource(ContentUI, "Model", Model, "ToolTip", Popup);
+      </Script>
+    </Scripts>
+
+    <Content>
+      
+      
+      
+      <Graphic Content="{styles:Styles.ToolTipDropShadow}" Padding="5,3,5,5" SizingPolicy="SizeToChildren">
+        <Animations>
+          <Animation Animation="{anim:Animations.MenuFadeIn}"/>
+          <Animation Animation="{anim:Animations.MenuFadeOut}"/>
+        </Animations>
+        <Children>
+
+          <Host Name="Host"/>
+
+        </Children>
+      </Graphic>
+    </Content>
+  </UI>
+
+  <UI Name="ToolTipContentUI">
+    <Properties>
+      <String Name="Model" String="$Required"/>
+      <me:ToolTip Name="ToolTip" ToolTip="$Required" />
+    </Properties>
+
+    <Locals>
+      <Accessible Name="Accessible"/>
+    </Locals>
+
+    <Scripts>
+      <Script>Text.Content = [Model];</Script>
+
+      <Script>
+        if ([Accessible.Enabled])
+        {
+          Accessible.Name = [Model];
+          Accessible.Role = AccessibleRole.ToolTip;
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Text Name="Text" Font="{ToolTip.Font}" Color="{styles:SharedStyles.ToolTipStyle.Color}" WordWrap="true"/>
+    </Content>
+  </UI>
+
+</UIX> 
diff --git a/test/2.1/TOPTOOLBAR.UIX b/test/2.1/TOPTOOLBAR.UIX
new file mode 100644
index 0000000..1e4e187
--- /dev/null
+++ b/test/2.1/TOPTOOLBAR.UIX
@@ -0,0 +1,798 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:sys="assembly://mscorlib/System"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:zcfg="assembly://ZuneDBApi/Microsoft.Zune.Configuration"
+  xmlns:zuneutil="assembly://ZuneShell/Microsoft.Zune.Util"
+  xmlns:zuneutilapi="assembly://ZuneDBApi/Microsoft.Zune.Util"
+  xmlns:signinstatus="res://ZuneShellResources!TopToolbarSignIn.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:style="res://ZuneShellResources!Style.uix"
+  xmlns:menu="res://ZuneShellResources!ContextMenu.uix"
+  xmlns:images="res://ZuneShellResources!ImageStyle.uix"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:nonclient="res://ZuneShellResources!NonClientControls.uix"
+  xmlns:anim="res://ZuneShellResources!Animations.uix"
+  xmlns:button="res://ZuneShellResources!Button.uix"
+  xmlns:msgdata="res://ZuneShellResources!MessagingData.schema.xml"
+  xmlns:animations="res://ZuneShellResources!Animations.uix"
+  xmlns:listcore="res://ZuneShellResources!ContentList.uix"
+  xmlns:scroll="res://ZuneShellResources!ScrollBar.uix"
+  xmlns:me="Me">
+
+  
+  <UI Name="TopToolbar">
+    <Properties>
+      <zune:Shell Name="Shell" Shell="$Required"/>
+      <iris:Command Name="SettingsButtonModel" Description="{zune:Shell.LoadString(zune:StringId.IDS_SETTINGS_LAND_HEADER)}"/>
+      <sys:Boolean Name="InvisibleMode"/>
+      <iris:Command Name="MenuCommand" />
+    </Properties>
+
+    <Locals>
+      
+      <Timer Name="CheckMessageCountTimer" Enabled="false" Interval="600000" AutoRepeat="true"/>
+      <msgdata:MessagingStringResultQuery Name="UnreadMessagesQuery"/>
+      <Boolean Name="QueryServiceForUnreadCount"/>
+      <zune:ShellMessagingNotifier Name="MessagingNotifier"/>
+
+      <zune:ZunePage Name="Page" ZunePage="{null}"/>
+      <zune:SignIn Name="SignIn" SignIn="{zune:SignIn.Instance}"/>
+
+      <Image Name="ZuneMenuLogo" Source="res://ZuneShellResources!ZuneLogoText.png"/>
+      
+      <iris:BooleanChoice Name="CaptionHasInput"/>
+
+      <iris:Command Name="MinimizeCommand" Description="{zune:Shell.LoadString(zune:StringId.IDS_FRAME_MINIMIZE_TOOLTIP)}"/>
+      <iris:Command Name="RestoreCommand" Description="{zune:Shell.LoadString(zune:StringId.IDS_FRAME_RESTORE_TOOLTIP)}"/>
+      <iris:Command Name="MaximizeCommand" Description="{zune:Shell.LoadString(zune:StringId.IDS_FRAME_MAXIMIZE_TOOLTIP)}"/>
+      <iris:Command Name="CloseCommand" Description="{zune:Shell.LoadString(zune:StringId.IDS_FRAME_CLOSE_TOOLTIP)}"/>
+
+      <core:ContextMenu Name="SysMenu">
+        <Options>
+          <iris:Command Command="{RestoreCommand}" />
+          <iris:Command Description="{zune:Shell.LoadString(zune:StringId.IDS_FRAME_MOVE_TOOLTIP)}" Available="false" />
+          <iris:Command Description="{zune:Shell.LoadString(zune:StringId.IDS_FRAME_SIZE_TOOLTIP)}" Available="false" />
+          <iris:Command Command="{MinimizeCommand}" />
+          <iris:Command Command="{MaximizeCommand}" />
+          <menu:MenuDivider />
+          <iris:Command Command="{CloseCommand}" />
+        </Options>
+      </core:ContextMenu>
+      
+    </Locals>
+
+    <Input>
+      <ClickHandler Name="RightClick" ClickType="RightMouse" HandlerStage="Bubbled"/>
+    </Input>
+
+    <Scripts>
+
+      <Script>
+        [DeclareTrigger(CloseCommand.Invoked)]
+        iris:Application.Window.Close();
+      </Script>
+
+      <Script>
+        [DeclareTrigger(MinimizeCommand.Invoked)]
+        iris:Application.Window.WindowState = iris:WindowState.Minimized;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(RestoreCommand.Invoked)]
+        iris:Application.Window.WindowState = iris:WindowState.Normal;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(MaximizeCommand.Invoked)]
+        iris:Application.Window.WindowState = iris:WindowState.Maximized;
+      </Script>
+
+      <Script>
+        iris:WindowState windowState = [iris:Application.Window.WindowState];
+       
+        MinimizeCommand.Available = (windowState != iris:WindowState.Minimized);
+        RestoreCommand.Available = (windowState != iris:WindowState.Normal);
+        MaximizeCommand.Available = (windowState != iris:WindowState.Maximized);
+      </Script>
+      
+      
+      <Script>
+        [DeclareTrigger(MessagingNotifier.NewDeviceMessageCount)]
+        
+        CheckMessageCountTimer.Stop();
+        CheckMessageCountTimer.Interval = zcfg:ClientConfiguration.Messaging.ServiceThrottlingInterval;
+        CheckMessageCountTimer.Start();
+      </Script>
+      
+      <Script>
+        [DeclareTrigger(CheckMessageCountTimer.Tick)]
+        
+        
+        
+        QueryServiceForUnreadCount = !(zune:Shell.DefaultInstance.CurrentPage is zune:InboxPage);
+        
+        CheckMessageCountTimer.Stop();
+        CheckMessageCountTimer.Interval = zcfg:ClientConfiguration.Messaging.UnreadMessageCountPollInterval;
+        CheckMessageCountTimer.Start();
+      </Script>
+      
+      <Script>
+        if ([QueryServiceForUnreadCount])
+        {
+          
+          QueryServiceForUnreadCount = false;
+
+          String zuneTag = SignIn.ZuneTag;
+          if (zuneTag != null)
+          {
+            
+            UnreadMessagesQuery.ZuneTag = null;
+            UnreadMessagesQuery.ZuneTag = zuneTag;
+          }
+        }
+      </Script>
+      
+      <Script>
+        bool signedIn = [SignIn.ZuneTag] != null;
+        CheckMessageCountTimer.Enabled = signedIn;
+        if (signedIn)
+        {
+          CheckMessageCountTimer.Interval = zcfg:ClientConfiguration.Messaging.UnreadMessageCountPollInterval;
+          
+          
+          
+          QueryServiceForUnreadCount = !(zune:Shell.DefaultInstance.CurrentPage is zune:InboxPage);
+        }
+        else
+        {
+          Shell.MainFrame.Social.MessageCount = 0;
+        }
+      </Script>
+
+      
+      <Script>
+        [InitialEvaluate(false)]
+        String result = [UnreadMessagesQuery.Result.ReturnValue];
+        if (SignIn.ZuneTag == UnreadMessagesQuery.ZuneTag)
+        {
+          int newMessageCount = zune:StringParserHelper.ParseInt32(result);
+          if (Shell.MainFrame.Social.MessageCount != newMessageCount)
+          {
+            Shell.MainFrame.Social.MessageCount = newMessageCount;
+          }
+        }
+      </Script>
+
+      <Script>
+        if (Shell.CurrentFrame != null)
+          TopPivot.Content = [Shell.CurrentFrame.Experiences.Options];
+      </Script>
+      <Script>
+        if (Shell.CurrentExperience != null)
+          BottomPivot.Content = [Shell.CurrentExperience.Nodes.Options];
+      </Script>
+
+      <Script>
+        BottomPivot.Visible = ![Shell.PivotMismatch];
+      </Script>
+
+      <Script>
+        
+        [DeclareTrigger(SettingsButtonModel.Invoked)]
+        Page.InvokeSettings();
+        zuneutil:SQMLog.Log(zuneutilapi:SQMDataId.SettingsClicks, 1);
+      </Script>
+      
+      
+      <Script>
+        Page = [Shell.CurrentPage];
+
+        SearchBox.Visible = Page.ShowSearch;
+        SignInStatus.Visible = Page.ShowSettings;
+        SettingsButton.Visible = Page.ShowSettings;
+        SettingsSeparator.Visible = Page.ShowSettings;
+        SignInSeparator.Visible = Page.ShowSettings;  
+
+        Pivots.Visible = Page.ShowPivots;
+
+        if (Page.ShowLogo)
+        {
+          Logo.Visible = true;
+          Body.MaximumSize = new Size(0,100);
+        }
+        else
+        {
+          Logo.Visible = false;
+          Body.MaximumSize = new Size(0,32);
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(Shell.CurrentPage)]
+        bool nowPlayingPage = Shell.CurrentPage is zune:NowPlayingLand;
+        images:Images.InNowPlaying.Value = nowPlayingPage;
+      </Script>
+
+      <Script>
+        BackButton.Visible = [Shell.CurrentPage.ShowBackArrow];
+      </Script>
+
+      
+      <Script>
+        WindowControls.Visible = !iris:Application.Window.ShowWindowFrame;
+        Caption.Visible = !iris:Application.Window.ShowWindowFrame;
+      </Script>
+
+      <Script>
+        bool hidden = [InvisibleMode];
+
+        float alpha = 1.0;
+        if (hidden)
+        {
+          alpha = 0.0;
+        }
+
+        Body.Alpha = alpha;
+      </Script>
+
+      <Script>
+        styles:WindowState.TopToolbarInputActivity = [UI.DeepMouseFocus];
+      </Script>
+
+      <Script>
+        if ([images:Images.InNowPlaying.Value])
+        {
+          Logo.Visible = false;
+          SignInStatus.Visible = false;
+          SignInSeparator.Visible = false;
+          SettingsButton.Visible = false;
+          SettingsSeparator.Visible = false;
+        }
+        else
+        {
+          Logo.Visible = true;
+          SignInStatus.Visible = true;
+          SignInSeparator.Visible = true;
+          SettingsButton.Visible = true;
+          SettingsSeparator.Visible = true;
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(RightClick.Invoked)]
+
+        SysMenu.LayoutInput = new PopupLayoutInput();
+        SysMenu.LayoutInput.Placement = PlacementMode.MouseOrigin;
+        SysMenu.Helper.Show(SysMenu);
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(MenuCommand.Invoked)]
+
+        SysMenu.LayoutInput = new PopupLayoutInput();
+        SysMenu.LayoutInput.Offset = new Point(0,2);
+        SysMenu.LayoutInput.Placement = PlacementMode.Bottom;
+        SysMenu.LayoutInput.PlacementTarget = Logo;
+        SysMenu.Helper.Show(SysMenu);
+      </Script>
+
+      
+    </Scripts>
+
+    <Content>
+      <Panel Name="Body" Layout="Form" MaximumSize="0,100">
+        <Animations>
+          <Animation Animation="{animations:Animations.ToolbarAlpha}"/>
+        </Animations>
+        <Children>
+
+          
+          <Graphic Name="Logo" Content="res://ZuneShellResources!ZuneLogo.png">
+            <LayoutInput>
+              <FormLayoutInput Left="Parent,0,15" Top="Parent,0,27"/>
+            </LayoutInput>
+          </Graphic>
+
+          
+          <images:IconButton Name="BackButton" Model="{Shell.NavigateBackCommand}"
+              Style="{images:Images.WindowBack}">
+            <LayoutInput>
+              <FormLayoutInput Left="Parent,0,54" Bottom="Parent,1"/>
+            </LayoutInput>
+          </images:IconButton>
+
+          
+          <Panel Name="Pivots" Layout="VerticalFlow">
+            <LayoutInput>
+              <FormLayoutInput Left="Parent,0,55" Right="WindowControlContainer,0,-20"
+                               Top="Parent,0,21"/>
+            </LayoutInput>
+            <Children>
+
+              
+              <me:Pivot Name="TopPivot"
+                  FocusOrder="2"
+                  OverrideStyle="{styles:SharedStyles.TopPivot}"
+                  ItemAnimation="{null}">
+                <ListLayout>
+                  <FlowLayout Orientation="Horizontal" Spacing="18,0"/>
+                </ListLayout>
+                <ScrollControlHorizontal>
+                  <AnchorLayoutInput Right="Scroller,1" Top="Scroller,0,3"  
+                                     ContributesToWidth="false" ContributesToHeight="false"/>
+                </ScrollControlHorizontal>
+              </me:Pivot>
+
+              
+              <me:Pivot Name="BottomPivot"
+                  FocusOrder="1"
+                  OverrideStyle="{styles:SharedStyles.BottomPivot}"
+                  ListItemType="{typeof(me:BottomPivotLabelListItem)}"
+                  Margins="{me:Constants.OverlapMargins}">
+                <ListLayout>
+                  <FlowLayout Orientation="Horizontal" Spacing="15,0"/>
+                </ListLayout>
+              </me:Pivot>
+
+            </Children>
+          </Panel>
+
+          
+          <me:SearchBox Name="SearchBox" Shell="{Shell}" FocusOrder="5">
+            <LayoutInput>
+              <FormLayoutInput Right="Parent,1,-55" Left="Parent,1,-239" Top="Parent,0,41" Bottom="Parent,0,67"/>
+            </LayoutInput>
+            <Animations>
+              
+              <Animation Type="Hide">
+                <Keyframes>
+                  <AlphaKeyframe Time="0" Value="0" RelativeTo="Absolute"/>
+                  <AlphaKeyframe Time="0.01" Value="0" RelativeTo="Absolute"/>
+                </Keyframes>
+              </Animation>
+            </Animations>
+          </me:SearchBox>
+
+          <Panel Name="WindowControlContainer" Layout="HorizontalFlow">
+            <LayoutInput>
+              <FormLayoutInput Right="Parent,1" Top="Parent,0"/>
+            </LayoutInput>
+            <Children>
+              
+              <signinstatus:SignInStatus Name="SignInStatus" Shell="{Shell}" FocusOrder="3" Margins="0,12,10,0"/>
+
+              
+              <ColorFill Name="SignInSeparator" Content="{styles:SharedStyles.SettingsButtonStyle.Default.Color}" MinimumSize="1,9" Margins="0,15,10,0"/>
+              
+              
+              <core:Button Name="SettingsButton" OverrideStyle="{styles:SharedStyles.SettingsButtonStyle}"  Model="{SettingsButtonModel}" FocusOrder="4" Margins="0,12,10,0" />       
+              
+              
+              <ColorFill Name="SettingsSeparator" Content="{styles:SharedStyles.SettingsButtonStyle.Default.Color}" MinimumSize="1,9" Margins="0,15,7,0"/>
+
+              
+              <me:WindowControls 
+                    Name="WindowControls" 
+                    FocusOrder="6"
+                    MinimizeCommand="{MinimizeCommand}"
+                    MaximizeCommand="{MaximizeCommand}"
+                    RestoreCommand="{RestoreCommand}"
+                    CloseCommand="{CloseCommand}" />
+            </Children>
+          </Panel>
+
+          
+          
+          <nonclient:WindowCaption Name="Caption" Layout="Fill" MaximumSize="0,70">
+            <LayoutInput>
+              <FormLayoutInput Left="Parent,0" Top="Parent,0"/>
+            </LayoutInput>
+          </nonclient:WindowCaption>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  <UI Name="WindowControls">
+    <Properties>
+      <iris:Command Name="MinimizeCommand" Command="$Required" />
+      <iris:Command Name="RestoreCommand" Command="$Required"  />
+      <iris:Command Name="MaximizeCommand" Command="$Required" />
+      <iris:Command Name="CloseCommand" Command="$Required" />
+    </Properties>
+    <Locals>
+      <iris:Command Name="HelpCommand" Description="{zune:Shell.LoadString(zune:StringId.IDS_FRAME_HELP_TOOLTIP)}"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        [DeclareTrigger(HelpCommand.Invoked)]
+        
+        string helpPath = "Help\" + zune:Shell.LoadString(zune:StringId.IDS_ZUNECLIENT_LOCALE) + "\LandingPage.htm";
+        zune:Shell.DefaultInstance.Execute(helpPath, null);
+        zuneutil:SQMLog.Log(zuneutilapi:SQMDataId.HelpClicks, 1);        
+      </Script>
+
+      <Script>
+        
+        
+        if ([iris:Application.Window.WindowState] == iris:WindowState.Maximized)
+        {
+          MaximizeButton.Style = images:Images.ContextualWindowRestore;
+          MaximizeButton.Model = RestoreCommand;
+        }
+        else
+        {
+          MaximizeButton.Style = images:Images.ContextualWindowMaximize;
+          MaximizeButton.Model = MaximizeCommand;
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel>
+        <Layout>
+          <FlowLayout Orientation="Horizontal"/>
+        </Layout>
+        <Children>
+
+          <images:IconButton
+              TileMinSize="18,25"
+              TilePadding="0,1,20,3"
+              VerticalAlignment="Far"
+              HorizontalAlignment="Center"
+              Style="{images:Images.ContextualWindowHelp}"
+              KeyInteractiveNStuff="false"
+              Model="{HelpCommand}"
+              Margins="0,0,24,0"/>
+
+          <images:IconButton
+              TileMinSize="18,25"
+              TilePadding="0,1,0,3"
+              VerticalAlignment="Far"
+              HorizontalAlignment="Center"
+              Style="{images:Images.ContextualWindowMinimize}"
+              KeyInteractiveNStuff="false"
+              Model="{MinimizeCommand}"/>
+
+          <images:IconButton
+              Name="MaximizeButton"
+              TileMinSize="18,25"
+              TilePadding="0,1,0,3"
+              VerticalAlignment="Far"
+              HorizontalAlignment="Center"
+              KeyInteractiveNStuff="false"
+              Model="{null}"/>
+
+          <images:IconButton
+              TileMinSize="18,25"
+              TilePadding="0,1,1,3"
+              VerticalAlignment="Far"
+              Style="{images:Images.ContextualWindowClose}"
+              KeyInteractiveNStuff="false"
+              Model="{CloseCommand}"/>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+  
+  
+
+
+  <UI Name="SearchBox">
+    <Properties>
+      <zune:Shell Name="Shell" Shell="$Required"/>
+      <iris:Command Name="SearchButton"/>
+      <EditableTextData Name="SearchBoxModel" Value=""/>
+    </Properties>
+    
+    <Scripts>
+      <Script>
+        [DeclareTrigger(SearchButton.Invoked)]
+        [DeclareTrigger(SearchBoxModel.Submitted)]
+        if ( zune:Search.Instance.IsValidKeyword(SearchBoxModel.Value) )
+        {
+          zuneutil:SQMLog.Log(zuneutilapi:SQMDataId.SearchExecuted, 1);
+          zune:Search.Instance.Execute(SearchBoxModel.Value);
+          Shell.SearchButton.Invoke();
+        }
+      </Script>
+
+      <Script>
+        if ([UI.DeepKeyFocus])
+        {
+          SearchBoxBackground.Content = styles:Styles.SearchBoxBackgroundImageActive;
+        }
+        else
+        {
+          SearchBoxBackground.Content = styles:Styles.SearchBoxBackgroundImage;
+        }
+      </Script>
+      
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(SearchBoxModel.Value)]
+        SearchButton.Available = zune:Search.Instance.IsValidKeyword(SearchBoxModel.Value);
+      </Script>
+
+      <Script>
+        [DeclareTrigger(zune:Search.Instance.SearchFocusHotkey.Invoked)]
+        SearchEditBox.NavigateInto(); 
+      </Script>
+    </Scripts>
+    
+    <Content>
+      <Panel Layout="Anchor">
+        <Children>
+
+          <me:SearchEditbox Name="SearchEditBox" Model="{SearchBoxModel}" FocusOrder="1">
+            <LayoutInput>
+              <AnchorLayoutInput Top="SearchBoxBackground,0,4" Left="SearchBoxBackground,0,4"/>
+            </LayoutInput>
+          </me:SearchEditbox>
+          
+          <core:IconButton Name="SearchActionButton" Model="{SearchButton}"
+              Image="res://ZuneShellResources!Search.Icon.png"
+              FocusImage="res://ZuneShellResources!Search.Icon.png"
+              DisabledImage="res://ZuneShellResources!Search.Icon.Disabled.png"
+              PressedImage="res://ZuneShellResources!Search.Icon.Clicked.png"
+              KeyInteractiveNStuff="false"
+              FocusOrder="2"
+              TileMinSize="22,18">
+            <LayoutInput>
+              <AnchorLayoutInput Left="SearchEditBox,1" Right="Parent,1" Top="SearchEditBox,0" Bottom="SearchEditBox,1"/>
+            </LayoutInput>
+          </core:IconButton>
+
+          <Graphic Name="SearchBoxBackground" SizingPolicy="SizeToConstraint" StretchingPolicy="Uniform">
+            <LayoutInput>
+              <AnchorLayoutInput Top="Parent,0" Bottom="Parent,1" Left="Parent,0" Right="Parent,1"/>
+            </LayoutInput>
+          </Graphic>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+
+
+  <UI Name="SearchEditbox">
+    <Properties>
+      
+      <EditableTextData Name="Model" EditableTextData="$Required"/>
+
+      
+      <style:Style Name="Style" Style="{styles:SharedStyles.SearchEditBoxStyle}"/>
+      <Color Name="TextFocusedColor" Color="{styles:Styles.EditTextFocusedForeground}"/>
+      <Color Name="TextHighlightColor" Color="{styles:Styles.EditTextFocusedBackground}"/>
+
+      
+      <Inset Name="TilePadding" Inset="4,2,4,0"/>
+      <Size Name="TileMinSize" Size="154,18"/>
+      <Size Name="TileMaxSize" Size="154,18"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+        <![CDATA[
+        Overlay.Visible = (![UI.DeepKeyFocus] && String.IsNullOrEmpty([Model.Value]));
+        ]]>
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Layout="Anchor">
+        <Children>
+
+          
+          <Text Name="Overlay" Content="{zune:Shell.LoadString(zune:StringId.IDS_SEARCH_STARTER_TEXT)}"
+                FadeSize="1"  Font="{Style.Font}" Color="{Style.Color}"
+                HighlightColor="{TextHighlightColor}" TextHighlightColor="{TextFocusedColor}">
+            <LayoutInput>
+              <AnchorLayoutInput Top="SearchEditBox,0,1" Left="SearchEditBox,0,4"/>
+            </LayoutInput>
+            <Animations>
+              <Animation Type="Hide">
+                <Keyframes>
+                  <AlphaKeyframe Time="0" Value="1.0" RelativeTo="Current" Interpolation="Log, 500.0"/>
+                  <AlphaKeyframe Time="0.5" Value="0" RelativeTo="Final"/>
+                </Keyframes>
+              </Animation>
+              <Animation Type="Show">
+                <Keyframes>
+                  <AlphaKeyframe Time="0" Value="0" RelativeTo="Current" Interpolation="Log, 5.0"/>
+                  <AlphaKeyframe Time="0.5" Value="1.0" RelativeTo="Final"/>
+                </Keyframes>
+              </Animation>
+            </Animations>
+          </Text>
+
+          
+          <core:Editbox Name="SearchEditBox" Model="{Model}" AccessibleDescription="{zune:Shell.LoadString(zune:StringId.IDS_SEARCH_STARTER_TEXT)}"  Style="{Style}" TextFocusedColor="{TextFocusedColor}"
+                TextHighlightColor="{TextHighlightColor}" TilePadding="{TilePadding}" TileMinSize="{TileMinSize}"
+                TileMaxSize="{TileMaxSize}" BackgroundColor="{styles:Styles.SearchBoxBackground}"
+                BackgroundColorFocus="{styles:Styles.SearchBoxBackgroundActive}"/>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="Pivot" Base="core:ListView">
+    <Properties>
+      <Type Name="ProviderType" Type="{typeof(button:CommandButtonProvider)}"/>
+
+      <TransformByAttributeAnimation Name="ItemAnimation" Attribute="Index" Delay="0.125" Source="{anim:Animations.PivotShowAnim}"/>
+      
+      <Type Name="ScrollControlType" Type="{typeof(me:ScrollArrows)}"/>
+      <AnchorLayoutInput Name="ScrollControlHorizontal"
+        Right="Scroller,1" Top="Scroller,0,12"  
+        ContributesToWidth="false" ContributesToHeight="false"/>
+      
+      <Orientation Name="ScrollOrientation" Orientation="Horizontal"/>
+      
+      <Inset Name="HorizontalScrollMargins" Inset="0,0,30,0"/>
+      
+      <Single Name="FadeSize" Single="10.0"/>
+      <Single Name="FadeAmount" Single="1.0"/>
+      
+      <Animation Name="ScrollMove" Type="Move">
+        <Keyframes>
+          <PositionKeyframe Time="0.00" RelativeTo="Current" Interpolation="EaseIn"/>
+          <PositionKeyframe Time="0.10" RelativeTo="Final"/>
+        </Keyframes>
+      </Animation>
+      
+      <Timer Name="SetFadeTimer" Interval="100" AutoRepeat="false"/>
+    </Properties>
+    
+    <Scripts>
+      <Script> 
+        
+        
+        Scroller.Prefetch = 2.0; 
+      </Script>
+      
+      <Script> 
+        [DeclareTrigger(ScrollData.CanScrollUp)]
+        [DeclareTrigger(ScrollData.CanScrollDown)]
+        
+        
+        
+        
+        
+        
+        if (ScrollData.CanScrollUp)
+          Scroller.ShowNear = true; 
+          
+        if (ScrollData.CanScrollDown)
+          Scroller.ShowFar = true;
+          
+        if (!ScrollData.CanScrollUp || !ScrollData.CanScrollDown)
+            SetFadeTimer.Start();
+      </Script>
+      
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(SetFadeTimer.Tick)]
+        Scroller.ShowNear = ScrollData.CanScrollUp; 
+        Scroller.ShowFar = ScrollData.CanScrollDown; 
+      </Script>
+    </Scripts>
+  </UI>
+  
+  
+  
+
+
+
+  <UI Name="ScrollArrows" Base="scroll:ScrollControl">
+    <Locals>
+      <iris:Command Name="ScrollLeftCommand"/>
+      <iris:Command Name="ScrollRightCommand"/>
+    </Locals>
+    
+    <Scripts>
+      <Script>
+        ScrollLeftCommand.Available = [ScrollData.CanScrollUp];
+        ScrollRightCommand.Available = [ScrollData.CanScrollDown];
+        
+        
+        float disabledAlpha = 0.0;
+        if (ScrollData.CanScrollUp || ScrollData.CanScrollDown)
+          disabledAlpha = 0.4;
+        
+        if (ScrollData.CanScrollUp)
+          ScrollLeft.Alpha = 1.0;
+        else
+          ScrollLeft.Alpha = disabledAlpha; 
+        
+        if (ScrollData.CanScrollDown)
+          ScrollRight.Alpha = 1.0; 
+        else
+          ScrollRight.Alpha = disabledAlpha; 
+      </Script>
+      
+      <Script>
+        [DeclareTrigger(ScrollLeftCommand.Invoked)]
+        ScrollData.ScrollUp();
+      </Script>
+      
+      <Script>
+        [DeclareTrigger(ScrollRightCommand.Invoked)]
+        ScrollData.ScrollDown();
+      </Script>
+    </Scripts>
+    
+    <Content>
+      <Panel Layout="HorizontalFlow">
+        <Children>
+          
+          <images:IconButton Name="ScrollLeft" Model="{ScrollLeftCommand}"
+                  Style="{me:ScrollArrowImages.LeftArrow}"
+                  KeyInteractiveNStuff="false"
+                  AllowDoubleClicks="false"
+                  HandlerTransition="Down"/>
+          
+          <images:IconButton Name="ScrollRight" Model="{ScrollRightCommand}"
+                  Style="{me:ScrollArrowImages.RightArrow}"
+                  KeyInteractiveNStuff="false"
+                  AllowDoubleClicks="false"
+                  HandlerTransition="Down"/>
+          
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+  
+  
+
+
+
+  <Class Name="ScrollArrowImages" Shared="true">
+    <Properties>
+      <images:ImageStyle Name="LeftArrow"
+                         Image="res://ZuneShellResources!Pivot.Scroll.Left.png"
+                         HoverImage="res://ZuneShellResources!Pivot.Scroll.Left.Hover.png"
+                         PressedImage="res://ZuneShellResources!Pivot.Scroll.Left.Click.png"/>
+        
+      <images:ImageStyle Name="RightArrow"
+                         Image="res://ZuneShellResources!Pivot.Scroll.Right.png"
+                         HoverImage="res://ZuneShellResources!Pivot.Scroll.Right.Hover.png"
+                         PressedImage="res://ZuneShellResources!Pivot.Scroll.Right.Click.png"/>
+    </Properties>
+  </Class>
+
+  
+
+
+
+
+  <UI Name="BottomPivotLabelListItem" Base="listcore:LabelListItemBase">
+    <Scripts>
+      <Script>UI.FocusInterestTargetMargins = me:Constants.OverlapMargins;</Script>
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  <Class Name="Constants" Shared="true">
+    <Properties>
+      <Inset Name="OverlapMargins" Inset="0,-6,0,0"/>
+    </Properties>
+  </Class>
+
+</UIX>
diff --git a/test/2.1/TOPTOOLBARSIGNIN.UIX b/test/2.1/TOPTOOLBARSIGNIN.UIX
new file mode 100644
index 0000000..33a0550
--- /dev/null
+++ b/test/2.1/TOPTOOLBARSIGNIN.UIX
@@ -0,0 +1,86 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:signin="res://ZuneShellResources!SignInDialog.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix" 
+  xmlns:core="res://ZuneShellResources!Controls.uix">
+
+  
+
+
+
+
+
+  <UI Name="SignInStatus">
+    <Properties>
+      <zune:Shell Name="Shell" Shell="$Required"/>
+    </Properties>
+
+    <Locals>
+      
+      <iris:Command Name="SignInCommand" Description="{zune:Shell.LoadString(zune:StringId.IDS_LOG_ON_BUTTON)}"/>
+      <iris:Command Name="SigningInCommand" Description="{zune:Shell.LoadString(zune:StringId.IDS_LOGON_STATUS_BUTTON)}"/>
+      <iris:Command Name="SignedInUserCommand"/>
+
+      
+      <zune:SignIn Name="SignIn" SignIn="{zune:SignIn.Instance}"/>
+   
+      
+      <Boolean Name="ServiceEndpointsInitialized"/>
+
+      <signin:SignInDialog Name="SignInDlg" SignInDialog="{null}"/>
+    </Locals>
+
+    <Scripts>
+      
+      <Script>
+        <![CDATA[
+        bool signedIn = [SignIn.SignedIn];
+        bool signingIn = [SignIn.SigningIn];
+        SignedInUserButton.Visible = signedIn;
+        SignInButton.Visible = (!signedIn && !signingIn);
+        SigningInButton.Visible = signingIn;
+        ]]>
+      </Script>
+
+      
+      <Script> 
+        SignedInUserCommand.Description = [SignIn.ZuneTag]; 
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(SignedInUserCommand.Invoked)]
+        zune:Shell.SettingsFrame.Settings.Account.Invoke(zune:SettingCategories.Account);
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(SignInCommand.Invoked)]
+        [DeclareTrigger(SigningInCommand.Invoked)]
+        SignIn.CancelSignIn();
+        if (SignInDlg == null) SignInDlg = new signin:SignInDialog();
+        SignInDlg.Helper.Show( SignInDlg );
+      </Script>
+
+    </Scripts>
+
+    <Content>
+      <Panel>
+        <Layout>
+          <FlowLayout Orientation="Horizontal" Spacing="6,0"/>
+        </Layout>
+        <Children>
+
+          
+          <core:Button Name="SigningInButton" OverrideStyle="{styles:SharedStyles.SignInButtonStyle}" Model="{SigningInCommand}" />
+          <core:Button Name="SignedInUserButton" OverrideStyle="{styles:SharedStyles.SignInButtonStyle}" Model="{SignedInUserCommand}" />
+          <core:Button Name="SignInButton" OverrideStyle="{styles:SharedStyles.SignInButtonStyle}" Model="{SignInCommand}" />
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/TRACKSPANEL.UIX b/test/2.1/TRACKSPANEL.UIX
new file mode 100644
index 0000000..3a72835
--- /dev/null
+++ b/test/2.1/TRACKSPANEL.UIX
@@ -0,0 +1,437 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:sys="assembly://mscorlib/System"
+  xmlns:data="res://ZuneShellResources!LibraryData.schema.xml"
+  xmlns:columns="res://ZuneShellResources!TracksPanelColumns.uix"
+  xmlns:spreadsheet="res://ZuneShellResources!SpreadSheetViewBase.uix"
+  xmlns:panels="res://ZuneShellResources!LibraryPanels.uix"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:contextmenu="res://ZuneShellResources!LibraryContextMenu.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:me="Me">
+
+  
+  
+  
+  
+  <UI Name="TracksPanelBase" Base="panels:LibraryPanelBase">
+    <Properties>
+      <zune:MusicLibraryPage Name="Page" MusicLibraryPage="$Required"/>
+      <zune:TracksPanel Name="Model" TracksPanel="$Required" />
+      <Boolean Name="DetailedQuery" Boolean="false"/>
+      <Int32 Name="SelectionThreshold" Int32="1000"/>
+    </Properties>
+
+    <Locals>
+      <data:LibraryTrackQuery Name="TrackQuery" Enabled="false"
+        RulesOnly="false"
+        Detailed="{DetailedQuery}"
+        ShowDeviceContents="{Page.ShowDeviceContents}"
+        />
+
+      <List Name="LibraryContextMenuOptions">
+        <Source>
+          <iris:Command Command="{PlayAll}"/>
+          <iris:Command Command="{Play}"/>
+          <iris:Command Command="{AddToNowPlaying}"/>
+          <iris:Command Command="{AddToPlaylist}"/>
+          <iris:Command Command="{AddToBurnList}"/>
+          <core:MenuDivider/>
+          <iris:Command Command="{Edit}"/>
+          <contextmenu:RateCommand RateCommand="{Rate}"/>
+          <iris:Command Command="{Delete}"/>
+          <core:MenuDivider MenuDivider="{SyncDivider}"/>
+          <iris:Command Command="{Sync}"/>
+          <iris:Command Command="{SyncAllUnexclude}"/>
+          <zune:MenuItemCommand MenuItemCommand="{Exclude}"/>
+          <zune:MenuItemCommand MenuItemCommand="{Unexclude}"/>
+          <core:MenuDivider/>
+          <iris:Command Command="{Properties}"/>
+        </Source>
+      </List>
+
+      <List Name="DeviceContextMenuOptions">
+        <Source>
+          <iris:Command Command="{ReverseSync}"/>
+          <iris:Command Command="{DeleteFromDevice}"/>
+        </Source>
+      </List>
+    </Locals>
+
+    <Scripts>
+      <Script>TrackQuery.DeviceId = [Page.DeviceId];</Script>
+      <Script>TrackQuery.UserId = [zune:SignIn.Instance.LastSignedInUserId];</Script>
+
+      <Script>
+        if (Page.ShowDeviceContents)
+        {
+          ContextMenu.Options = DeviceContextMenuOptions;
+          DeleteKey.Command = DeleteFromDevice;
+          columns:BrowseViewData.SyncColumn.Visible = false;
+          columns:BrowseViewData.SizeOnDeviceColumn.Visible = true;
+          Page.AlbumsChanged.Invoke();
+
+          MinimumWidth = 100;
+        }
+        else
+        {
+          ContextMenu.Options = LibraryContextMenuOptions;
+          columns:BrowseViewData.SyncColumn.Visible = true;
+          columns:BrowseViewData.SizeOnDeviceColumn.Visible = false;
+        }
+      </Script>
+
+      <Script>
+        if (Page.UseRulesQuery)
+        {
+          TrackQuery.RulesOnly = true;
+          TrackQuery.Detailed = false;
+        }
+      </Script>
+
+      
+      <Script>
+        if (TrackQuery.Result != null)
+        {
+          
+          Model.Content = [TrackQuery.Result.Items];
+        }
+      </Script>
+
+      <Script>
+        Worker.Content = [Model.Content];
+      </Script>
+
+      <Script>
+        Worker.SupportsJumpInList = [SupportsJumpInList];
+      </Script>
+
+      
+      <Script>
+        zune:TransportControls.Instance.PagePlaySelection.Available = TrackQuery.Result != null &amp;&amp;
+                                                                    ([TrackQuery.Result.Items.Count] > 0);
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(zune:TransportControls.Instance.PagePlaySelection.Invoked)]
+        Execute.Invoke();
+      </Script>
+    </Scripts>
+
+    <Content>
+      <spreadsheet:SpreadSheet Name="Worker" ColumnData="{null}"/>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <Class Name="TracksPanelData" Shared="true">
+    <Properties>
+
+      
+
+      <iris:ArrayListDataSet Name="SortOptions">
+        <Source>
+          <zune:SortCommand Description="{zune:Shell.LoadString(zune:StringId.IDS_ASCENDING_SORT)}"
+              Sort="+Title"  SupportsJumpInList="true"/>
+          <zune:SortCommand Description="{zune:Shell.LoadString(zune:StringId.IDS_DESCENDING_SORT)}"
+              Sort="-Title" SupportsJumpInList="true"/>
+          <zune:SortCommand Description="{zune:Shell.LoadString(zune:StringId.IDS_ASCENDING_TRACK_SORT)}"
+              Sort="+DiscIndex,+WM/TrackNumber"/> 
+          <zune:SortCommand Description="{zune:Shell.LoadString(zune:StringId.IDS_DESCENDING_RATING_SORT)}"
+              Sort="-UserRating,+Title"/>
+        </Source>
+      </iris:ArrayListDataSet>
+
+      
+      <panels:SortData Name="MultipleAlbumsSorts" Options="{SortOptions}"
+                       SaveKey="TrackMultiAlbumSort" DefaultIndex="0"/> 
+
+      
+      <panels:SortData Name="SingleAlbumSorts" Options="{SortOptions}"
+                       SaveKey="TrackSingleAlbumSort" DefaultIndex="2"/> 
+    </Properties>
+  </Class>
+
+  
+  
+  
+  <UI Name="TracksPanel" Base="me:TracksPanelBase">
+    <Properties>
+      <spreadsheet:ColumnData Name="ColumnData" ColumnData="{columns:BrowseViewData.ColumnData}"/>
+      <panels:SortData Name="SortData" SortData="{me:TracksPanelData.MultipleAlbumsSorts}"/>
+
+      <columns:TracksPanelListModel Name="ListModel" ShowTrackNumber="false"/>
+    </Properties>
+
+    <Locals>
+      <Boolean Name="QueryReady" Boolean="false"/>
+      <Timer Name="UpdateTimer" Interval="0" AutoRepeat="false" Enabled="false"/>
+    </Locals>
+
+    <Scripts>
+      
+      <Script>
+        int count = 0;
+        if (TrackQuery.Result != null)
+          count = [TrackQuery.Result.Items.Count];
+        ToggleSelectAllCommand.Description = sys:String.Format(zune:Shell.LoadString(zune:StringId.IDS_TRACKS_HEADER), count);
+      </Script>
+
+      
+
+      
+
+
+      <Script>
+        [DeclareTrigger(Page.SelectedAlbumIds)]
+
+        
+        
+        
+        
+        
+
+        Int32 interval;
+
+        if (Page.SelectedAlbumIds == null || Page.SelectedAlbumIds.Count == 1)
+        {
+          interval = 100;
+        }
+        else
+        {
+          interval = 250;
+        }
+
+        UpdateTimer.Stop();
+        UpdateTimer.Interval = interval;
+        UpdateTimer.Start();
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Page.AlbumsChanged.Invoked)]
+        [DeclareTrigger(Page.AlbumsCount)]
+        [DeclareTrigger(UpdateTimer.Tick)]
+
+        UpdateTimer.Stop();
+
+        
+        if (Page.AlbumsCount != 0)
+        {
+          List  artistIds   = null;
+          Int32 artistId    = -1;
+          List  albumIds    = null;
+          Int32 albumId     = -1;
+          bool  multiSelect = false;
+
+          bool singleAlbumSelected = Page.AlbumsCount == 1;
+
+          if (Page.SelectedAlbumIds != null &amp;&amp; !Page.AllAlbumsSelected)
+          {
+            if(Page.SelectedAlbumIds.Count > 1)
+            {
+              albumIds    = Page.SelectedAlbumIds;
+              multiSelect = true;
+            }
+            else
+            {
+              albumId = (int)Page.SelectedAlbumIds.get_Item(0);
+              singleAlbumSelected = true;
+            }
+          }
+          else if (Page.SelectedArtistIds != null &amp;&amp; !Page.AllArtistsSelected)
+          {
+            if(Page.SelectedArtistIds.Count > 1)
+            {
+              artistIds = Page.SelectedArtistIds;
+              multiSelect = true;
+            }
+            else
+            {
+              artistId = (int)Page.SelectedArtistIds.get_Item(0);
+            }
+          }
+
+          panels:SortData newSorts;
+          
+          if (singleAlbumSelected)
+          {
+            
+            newSorts = me:TracksPanelData.SingleAlbumSorts;
+          }
+          else
+          {
+            
+            newSorts = me:TracksPanelData.MultipleAlbumsSorts;
+          }
+
+          TrackQuery.ArtistIds   = artistIds;
+          TrackQuery.ArtistId    = artistId;
+          TrackQuery.AlbumIds    = albumIds;
+          TrackQuery.AlbumId     = albumId;
+          TrackQuery.MultiSelect = multiSelect;
+
+          
+          
+          QueryReady = (SortData == newSorts);
+          SortData = newSorts;
+        }
+      </Script>
+
+      
+      <Script>
+        zune:SortCommand sort = (zune:SortCommand)[SortData.Sorts.Chosen];
+
+        TrackQuery.Sort = sort.Sort;
+        SupportsJumpInList = sort.SupportsJumpInList;
+
+        
+        
+        
+        zune:SortCommand singleSort = (zune:SortCommand)me:TracksPanelData.SingleAlbumSorts.Sorts.Chosen;
+        Page.TrackListSortSingleAlbum = singleSort.Sort;
+        zune:SortCommand multipleSort = (zune:SortCommand)me:TracksPanelData.MultipleAlbumsSorts.Sorts.Chosen;
+        Page.TrackListSortMultipleAlbums = multipleSort.Sort;
+
+        
+        if (SortData.Sorts.ChosenIndex != 3)
+          ColumnData.SortedColumn = null;
+      </Script>
+
+      <Script>
+        
+        if ([ColumnData.SortedColumn] == columns:SortInfo.UserRating)
+          SortData.Sorts.ChosenIndex = 3;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(SortData.Sorts.Chosen)]
+        QueryReady = true;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Page.AlbumsChanged.Invoked)]
+        [DeclareTrigger(Page.SelectedAlbumIds)]
+        [DeclareTrigger(QueryReady)]
+        TrackQuery.Enabled = QueryReady;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Page.ArtistClicked.Invoked)]
+        [DeclareTrigger(Page.SelectedArtistIds)]
+        [DeclareTrigger(Page.AlbumClicked.Invoked)]
+        [DeclareTrigger(Page.SelectedAlbumIds)]
+
+        
+        SelectionManager.Clear();
+      </Script>
+
+      
+      
+      <Script>
+        [DeclareTrigger(Worker.Content)]
+
+        
+        ListModel.ShowTrackNumber = SortData.Sorts.ChosenIndex == 2; 
+
+        spreadsheet:ColumnInfo artistColumn = columns:BrowseViewData.ArtistColumn;
+
+        artistColumn.Visible = Page.AlbumArtistCount > 1;
+      </Script>
+    </Scripts>
+
+    <Content>
+      
+      <spreadsheet:SpreadSheet Name="Worker"
+        ListModel="{ListModel}"
+        Content="{Model.Content}"
+        ColumnData="{ColumnData}"
+        NavigateIntoArgs="{NavigateIntoArgs}"
+        SelectionManager="{SelectionManager}"
+        ContextMenu="{ContextMenu}"
+        EditContext="{EditContext}"
+        ExecuteCommand="{Execute}"
+        HeaderSpacing="22"
+        LayoutSpacing="{styles:Styles.LibraryListLayoutSpacing}"
+        RowSize="{styles:Styles.LibraryListItemSize}"
+        RowPadding="{styles:Styles.LibraryListItemMargins}"
+        Margins="0,0,0,-11"
+        />
+    </Content>
+
+  </UI>
+
+  
+  
+  
+  
+  
+  <UI Name="DetailedTracksPanel" Base="me:TracksPanelBase">
+    <Properties>
+      <spreadsheet:ColumnData Name="ColumnData" ColumnData="{columns:DetailedViewData.ColumnData}"/>
+
+      <Boolean Name="DetailedQuery" Boolean="true"/>
+    </Properties>
+
+    <Locals>
+      <iris:Command Name="ChooseColumns" Description="{zune:Shell.LoadString(zune:StringId.IDS_CHOOSE_COLUMN_MENU_ITEM)}"/>
+
+      <core:ContextMenu Name="HeaderContextMenu">
+        <Options>
+          <iris:Command Command="{ChooseColumns}"/>
+        </Options>
+      </core:ContextMenu>
+
+      <columns:ColumnChooserDialog Name="ColumnChooser"/>
+    </Locals>
+
+    <Scripts>
+      <Script>Worker.HeaderContextMenu = HeaderContextMenu;</Script>
+
+      <Script>Worker.ShowColumnDividers = true;</Script>
+
+      
+      
+      <Script>
+        
+        spreadsheet:SortDescription sort = (spreadsheet:SortDescription)[ColumnData.SortedColumn];
+
+        string sortBy = (string)panels:Globals.SortAscendingMap.GetItem([ColumnData.SortAscending]) +
+                        sort.Attribute;
+
+        TrackQuery.Sort = sortBy;
+        Page.TrackListSort = sortBy;
+        SupportsJumpInList = sort.SupportsJumpInList;
+      </Script>
+
+      
+      <Script>TrackQuery.Enabled = true;</Script>
+
+      <Script>
+        [DeclareTrigger(ChooseColumns.Invoked)]
+        ColumnChooser.Helper.Show(ColumnChooser);
+      </Script>
+    </Scripts>
+
+    <Content>
+      <spreadsheet:SpreadSheet Name="Worker"
+        AccessibleDescription="{zune:Shell.LoadString(zune:StringId.IDS_INDIVIDUAL_TRACKS)}"
+        Content="{Model.Content}"
+        ColumnData="{ColumnData}"
+        NavigateIntoArgs="{NavigateIntoArgs}"
+        SelectionManager="{SelectionManager}"
+        ContextMenu="{ContextMenu}"
+        EditContext="{EditContext}"
+        ExecuteCommand="{Execute}"
+        LayoutSpacing="{styles:Styles.LibraryListLayoutSpacing}"
+        RowSize="{styles:Styles.LibraryListItemSize}"
+        RowPadding="{styles:Styles.LibraryListItemMargins}"
+        Margins="-24,0,0,0"/>
+    </Content>
+  </UI>
+</UIX>
diff --git a/test/2.1/TRACKSPANELCOLUMNS.UIX b/test/2.1/TRACKSPANELCOLUMNS.UIX
new file mode 100644
index 0000000..2ddf700
--- /dev/null
+++ b/test/2.1/TRACKSPANELCOLUMNS.UIX
@@ -0,0 +1,1153 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:data="res://ZuneShellResources!LibraryData.schema.xml"
+  xmlns:spreadsheet="res://ZuneShellResources!SpreadSheetViewBase.uix"
+  xmlns:style="res://ZuneShellResources!Style.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:lv="res://ZuneShellResources!ListViewPanel.uix"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:dialog="res://ZuneShellResources!Dialog.uix"
+  xmlns:lib="res://ZuneShellResources!Library.uix"  
+  xmlns:me="Me">
+
+
+  
+  <Class Name="TracksPanelListModel" Base="lib:LibraryListModel">
+    <Properties>
+      <Boolean Name="ShowTrackNumber" Boolean="$Required"/>
+    </Properties>
+  </Class>
+  
+  <Class Name="Constants" Shared="True">
+    <Properties>
+      <Inset Name="SyncCellPadding" Inset="2,2,0,0"/>
+      <Inset Name="SyncHeaderPadding" Inset="4,1,0,0"/>
+    </Properties>
+  </Class>
+
+  
+  <Class Name="BrowseViewData" Shared="True">
+    <Properties>
+
+      
+
+      <spreadsheet:ColumnInfo Name="TrackStatusColumn"
+                CellType="{typeof(me:LibraryMediaStatusCell)}"
+                Resizable="false"
+                CellPadding="4,1,0,0"
+                HighlightHeader="false">
+        <ColumnSize>
+          <SharedSize Size="21,0"/>
+        </ColumnSize>
+        <LayoutInput>
+          <StackLayoutInput Priority="High"/>
+        </LayoutInput>
+      </spreadsheet:ColumnInfo>
+
+      <spreadsheet:ColumnInfo Name="TitleColumn"
+            HeaderType="{typeof(me:BrowseViewSongHeader)}"
+            CellType="{typeof(me:BrowseViewSongCell)}"
+            CellEditType="{typeof(me:BrowseViewEditSongCell)}"
+            Resizable="false"
+            CellPadding="5,0,5,0"
+            ShowDivider="false">
+        <ColumnSize>
+          <SharedSize Size="9999,0"/>
+        </ColumnSize>
+        <LayoutInput>
+          <StackLayoutInput Priority="Medium" MinimumSize="150,0"/>
+        </LayoutInput>
+      </spreadsheet:ColumnInfo>
+
+      
+      <spreadsheet:ColumnInfo Name="ArtistColumn"
+            Header="{zune:Shell.LoadString(zune:StringId.IDS_ARTIST_COLUMN_HEADER)}"
+            CellType="{typeof(me:ArtistCell)}"
+            CellEditType="{typeof(me:ArtistEditCell)}"
+            Resizable="false"
+            Visible="false">
+        <ColumnSize>
+          <SharedSize Size="120,0"/>
+        </ColumnSize>
+        <LayoutInput>
+          <StackLayoutInput Priority="High"/>
+        </LayoutInput>
+      </spreadsheet:ColumnInfo>
+
+      <spreadsheet:ColumnInfo Name="TimeColumn"
+            Header="{zune:Shell.LoadString(zune:StringId.IDS_LENGTH_COLUMN_HEADER)}"
+            CellType="{typeof(me:LengthCell)}"
+            Resizable="false">
+        <ColumnSize>
+          <SharedSize Size="75,0"/>
+        </ColumnSize>
+        <LayoutInput>
+          <StackLayoutInput Priority="High"/>
+        </LayoutInput>
+      </spreadsheet:ColumnInfo>
+
+      <spreadsheet:ColumnInfo Name="RatingColumn"
+            Header="{zune:Shell.LoadString(zune:StringId.IDS_RATING_COLUMN_HEADER)}"
+            HeaderIcon="{styles:Styles.RatingHeader}"
+            CellType="{typeof(me:RatingCell)}"
+            CellPadding="4,0,4,0"
+            SortBy="{me:SortInfo.UserRating}"
+            Resizable="false">
+        <ColumnSize>
+          <SharedSize Size="25,0"/>
+        </ColumnSize>
+        <LayoutInput>
+          <StackLayoutInput Priority="High"/>
+        </LayoutInput>
+      </spreadsheet:ColumnInfo>
+
+      <spreadsheet:ColumnInfo Name="SyncColumn"
+            Header="{zune:Shell.LoadString(zune:StringId.IDS_SYNC_STATUS_COLUMN_HEADER)}"
+            HeaderIcon="{styles:Styles.SyncHeader}"
+            CellType="{typeof(me:SyncCell)}"
+            CellPadding="{me:Constants.SyncCellPadding}"
+            HeaderPadding="{me:Constants.SyncHeaderPadding}"
+            Resizable="false">
+        <ColumnSize>
+          <SharedSize Size="25,0"/>
+        </ColumnSize>
+        <LayoutInput>
+          <StackLayoutInput Priority="High"/>
+        </LayoutInput>
+      </spreadsheet:ColumnInfo>
+
+      <spreadsheet:ColumnInfo Name="SizeOnDeviceColumn" Header="{zune:Shell.LoadString(zune:StringId.IDS_SIZE_COLUMN_HEADER)}"
+               CellType="{typeof(me:SizeOnDeviceCell)}"
+               Resizable="false">
+        <ColumnSize>
+          <SharedSize Size="75,0"/>
+        </ColumnSize>
+        <LayoutInput>
+          <StackLayoutInput Priority="High"/>
+        </LayoutInput>
+      </spreadsheet:ColumnInfo>
+      
+      <spreadsheet:ColumnData Name="ColumnData" HideColumns="true">
+        <Columns>
+          
+          <spreadsheet:ColumnInfo ColumnInfo="{TrackStatusColumn}"/>
+          <spreadsheet:ColumnInfo ColumnInfo="{TitleColumn}"/>
+          <spreadsheet:ColumnInfo ColumnInfo="{ArtistColumn}"/>
+          
+          <spreadsheet:ColumnInfo ColumnInfo="{RatingColumn}"/>
+          <spreadsheet:ColumnInfo ColumnInfo="{SyncColumn}"/>
+          <spreadsheet:ColumnInfo ColumnInfo="{SizeOnDeviceColumn}"/>
+        </Columns>
+      </spreadsheet:ColumnData>
+    </Properties>
+  </Class>
+
+  <Class Name="DetailedViewData" Shared="True" >
+    <Properties>
+      
+      <spreadsheet:ColumnData Name="ColumnData" SortedColumn="{me:SortInfo.Title}"
+                              CanReorderColumns="true" FixedColumns="2" 
+                              SaveKeyPrefix="TrackList" SaveColumnWidths="true" 
+                              SaveColumnOrder="true" SaveColumnVisibility="true" >
+        <Columns>
+
+          <spreadsheet:ColumnInfo Header="{zune:Shell.LoadString(zune:StringId.IDS_STATUS_COLUMN_HEADER)}"
+                         HeaderType="{typeof(spreadsheet:Cell)}"
+                         CellType="{typeof(me:LibraryMediaStatusCell)}"
+                         Resizable="false" Removable="false"
+                         CellPadding="4,1,0,0" HighlightHeader="false">
+            <ColumnSize>
+              <SharedSize Size="21,0"/>
+            </ColumnSize>
+          </spreadsheet:ColumnInfo>
+
+          <spreadsheet:ColumnInfo Header="{zune:Shell.LoadString(zune:StringId.IDS_SONG_COLUMN_HEADER)}"
+                         CellType="{typeof(me:SongCell)}"
+                         CellEditType="{typeof(me:SongEditCell)}"
+                         CellPadding="5,0,5,0" 
+                         SortBy="{me:SortInfo.Title}"
+                         Removable="false"
+                         ShowDivider="false">
+            <ColumnSize>
+              <SharedSize Size="200,0" MinimumSize="50,0" MaximumSize="500,0"/>
+            </ColumnSize>
+          </spreadsheet:ColumnInfo>
+
+          <spreadsheet:ColumnInfo Header="{zune:Shell.LoadString(zune:StringId.IDS_ARTIST_COLUMN_HEADER)}"
+                         CellType="{typeof(me:ArtistCell)}"
+                         CellEditType="{typeof(me:ArtistEditCell)}"
+                         SortBy="{me:SortInfo.DisplayArtist}">
+            <ColumnSize>
+              <SharedSize Size="150,0" MinimumSize="50,0" MaximumSize="500,0"/>
+            </ColumnSize>
+          </spreadsheet:ColumnInfo>
+
+          <spreadsheet:ColumnInfo Header="{zune:Shell.LoadString(zune:StringId.IDS_ALBUM_COLUMN_HEADER)}"
+                         CellType="{typeof(me:AlbumCell)}"
+                         CellEditType="{typeof(me:AlbumEditCell)}"
+                         SortBy="{me:SortInfo.WM_AlbumTitle}">
+            <ColumnSize>
+              <SharedSize Size="200,0" MinimumSize="50,0" MaximumSize="500,0"/>
+            </ColumnSize>
+          </spreadsheet:ColumnInfo>
+
+          <spreadsheet:ColumnInfo Header="{zune:Shell.LoadString(zune:StringId.IDS_GENRE_COLUMN_HEADER)}"
+                         CellType="{typeof(me:GenreCell)}"
+                         CellEditType="{typeof(me:GenreEditCell)}"
+                         SortBy="{me:SortInfo.WM_Genre}">
+            <ColumnSize>
+              <SharedSize Size="120,0" MinimumSize="50,0" MaximumSize="500,0"/>
+            </ColumnSize>
+          </spreadsheet:ColumnInfo>
+
+          <spreadsheet:ColumnInfo Header="{zune:Shell.LoadString(zune:StringId.IDS_LENGTH_COLUMN_HEADER)}"
+                         CellType="{typeof(me:LengthCell)}"
+                         SortBy="{me:SortInfo.Duration}"
+                         Visible="false">
+            <ColumnSize>
+              <SharedSize Size="75,0" MinimumSize="50,0" MaximumSize="100,0"/>
+            </ColumnSize>
+          </spreadsheet:ColumnInfo>
+
+          <spreadsheet:ColumnInfo Header="{zune:Shell.LoadString(zune:StringId.IDS_RATING_COLUMN_HEADER)}"
+                         HeaderIcon="{styles:Styles.RatingHeader}"
+                         CellType="{typeof(me:RatingCell)}"
+                         SortBy="{me:SortInfo.UserRating}"
+                         SortAscendingDefault="false"
+                         CellPadding="4,0,4,0"
+                         Resizable="false" Removable="false">
+            <ColumnSize>
+              <SharedSize Size="25,0"/>
+            </ColumnSize>
+          </spreadsheet:ColumnInfo>
+
+          <spreadsheet:ColumnInfo Header="{zune:Shell.LoadString(zune:StringId.IDS_SYNC_STATUS_COLUMN_HEADER)}"
+                        HeaderIcon="{styles:Styles.SyncHeader}"
+                        CellType="{typeof(me:SyncCell)}"
+                        SortBy="{null}"
+                        CellPadding="{me:Constants.SyncCellPadding}"
+                        HeaderPadding="{me:Constants.SyncHeaderPadding}"
+                        Resizable="false" Removable="false">
+            <ColumnSize>
+              <SharedSize Size="25,0"/>
+            </ColumnSize>
+          </spreadsheet:ColumnInfo>
+
+          <spreadsheet:ColumnInfo Header="{zune:Shell.LoadString(zune:StringId.IDS_DATE_ADDED_COLUMN_HEADER)}"
+                         CellType="{typeof(me:DateAddedCell)}"
+                         SortBy="{me:SortInfo.DateAdded}"
+                         Visible="false">
+            <ColumnSize>
+              <SharedSize Size="100,0" MinimumSize="50,0" MaximumSize="150,0"/>
+            </ColumnSize>
+          </spreadsheet:ColumnInfo>
+
+          <spreadsheet:ColumnInfo Header="{zune:Shell.LoadString(zune:StringId.IDS_ALBUM_ARTIST_COLUMN_HEADER)}"
+                         CellType="{typeof(me:AlbumArtistCell)}"
+                         CellEditType="{typeof(me:AlbumArtistEditCell)}"
+                         SortBy="{me:SortInfo.WM_AlbumArtist}"
+                         Visible="false">
+            <ColumnSize>
+              <SharedSize Size="150,0" MinimumSize="50,0" MaximumSize="500,0"/>
+            </ColumnSize>
+          </spreadsheet:ColumnInfo>
+          
+          <spreadsheet:ColumnInfo Header="{zune:Shell.LoadString(zune:StringId.IDS_CONTRIBUTING_ARTISTS_COLUMN_HEADER)}"
+                         CellType="{typeof(me:ContributingArtistsCell)}"
+                         Visible="false">
+            <ColumnSize>
+              <SharedSize Size="150,0" MinimumSize="50,0" MaximumSize="500,0"/>
+            </ColumnSize>
+          </spreadsheet:ColumnInfo>
+          
+          <spreadsheet:ColumnInfo Header="{zune:Shell.LoadString(zune:StringId.IDS_DATE_LAST_PLAYED_COLUMN_HEADER)}"
+                         CellType="{typeof(me:DateLastPlayedCell)}"
+                         SortBy="{me:SortInfo.UserLastPlayedDate}"
+                         Visible="false">
+            <ColumnSize>
+              <SharedSize Size="100,0" MinimumSize="50,0" MaximumSize="150,0"/>
+            </ColumnSize>
+          </spreadsheet:ColumnInfo>
+
+          <spreadsheet:ColumnInfo Header="{zune:Shell.LoadString(zune:StringId.IDS_PLAY_COUNT_COLUMN_HEADER)}"
+                         CellType="{typeof(me:PlayCountCell)}"
+                         SortBy="{me:SortInfo.UserPlayCount}"
+                         Visible="false">
+            <ColumnSize>
+              <SharedSize Size="60,0" MinimumSize="40,0" MaximumSize="100,0"/>
+            </ColumnSize>
+          </spreadsheet:ColumnInfo>
+
+          <spreadsheet:ColumnInfo Header="{zune:Shell.LoadString(zune:StringId.IDS_SIZE_COLUMN_HEADER)}"
+                         CellType="{typeof(me:FileSizeCell)}"
+                         Visible="false">
+            <ColumnSize>
+              <SharedSize Size="75,0" MinimumSize="50,0" MaximumSize="150,0"/>
+            </ColumnSize>
+          </spreadsheet:ColumnInfo>
+
+          <spreadsheet:ColumnInfo Header="{zune:Shell.LoadString(zune:StringId.IDS_SONG_NUMBER_COLUMN_HEADER)}"
+                         CellType="{typeof(me:TrackNumberCell)}"
+                         SortBy="{me:SortInfo.WM_TrackNumber}"
+                         Visible="false">
+            <ColumnSize>
+              <SharedSize Size="60,0" MinimumSize="40,0" MaximumSize="100,0"/>
+            </ColumnSize>
+          </spreadsheet:ColumnInfo>
+
+          <spreadsheet:ColumnInfo Header="{zune:Shell.LoadString(zune:StringId.IDS_RELEASE_YEAR_COLUMN_HEADER)}"
+                         CellType="{typeof(me:ReleaseYearCell)}"
+                         SortBy="{me:SortInfo.WM_Year}"
+                         Visible="false">
+            <ColumnSize>
+              <SharedSize Size="75,0" MinimumSize="50,0" MaximumSize="100,0"/>
+            </ColumnSize>
+          </spreadsheet:ColumnInfo>
+
+          <spreadsheet:ColumnInfo Header="{zune:Shell.LoadString(zune:StringId.IDS_COMPOSER_COLUMN_HEADER)}"
+                         CellType="{typeof(me:ComposerCell)}"
+                         SortBy="{me:SortInfo.WM_Composer}"
+                         Visible="false">
+            <ColumnSize>
+              <SharedSize Size="100,0" MinimumSize="50,0" MaximumSize="500,0"/>
+            </ColumnSize>
+          </spreadsheet:ColumnInfo>
+
+      
+
+
+
+
+
+
+
+          <spreadsheet:ColumnInfo Header="{zune:Shell.LoadString(zune:StringId.IDS_PROTECTED_COLUMN_HEADER)}"
+                         CellType="{typeof(me:ProtectedCell)}"
+                         Visible="false">
+            <ColumnSize>
+              <SharedSize Size="40,0" MinimumSize="35,0" MaximumSize="75,0"/>
+            </ColumnSize>
+          </spreadsheet:ColumnInfo>
+
+      
+
+
+
+
+
+
+
+          <spreadsheet:ColumnInfo Header="{zune:Shell.LoadString(zune:StringId.IDS_CONDUCTOR_COLUMN_HEADER)}"
+                         CellType="{typeof(me:ConductorCell)}"
+                         SortBy="{me:SortInfo.WM_Conductor}"
+                         Visible="false">
+            <ColumnSize>
+              <SharedSize Size="100,0" MinimumSize="50,0" MaximumSize="500,0"/>
+            </ColumnSize>
+          </spreadsheet:ColumnInfo>
+
+      
+
+
+
+
+
+
+
+        </Columns>
+      </spreadsheet:ColumnData>
+      
+    </Properties>
+  </Class>
+
+  
+  <UI Name="BrowseViewSongHeader" Base="spreadsheet:Cell">
+    <Properties>
+      <me:TracksPanelListModel Name="ListModel" TracksPanelListModel="$Required"/>
+    </Properties>
+    <Scripts>
+      <Script> Header.Sorts = [ListModel.Sorts]; </Script>
+    </Scripts>
+    <Content>
+      <lv:ColumnPanelHeader Name="Header" ToggleSelectAll="{ListModel.ToggleSelectAllCommand}" Sorts="{ListModel.Sorts}"/>
+    </Content>
+  </UI>
+
+
+  
+  <UI Name="BrowseViewSongCell" Base="spreadsheet:NumberTitleCell">
+    <Properties>
+      <me:TracksPanelListModel Name="ListModel" TracksPanelListModel="$Required"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(((data:Track)Model).TrackNumber)]
+        [DeclareTrigger(((data:Track)Model).Title)]
+      
+        data:Track track = (data:Track)Model;
+        Number = track.TrackNumber;
+        Title = track.Title;
+        AccessibleDescription = "{0} {1}".Format(track.TrackNumber, track.Title);
+      </Script>
+
+      <Script> ShowNumber = [ListModel.ShowTrackNumber]; </Script>
+    </Scripts>
+  </UI>
+
+  
+  <UI Name="BrowseViewEditSongCell" Base="spreadsheet:NumberTitleEditCell">
+    <Properties>
+      <me:TracksPanelListModel Name="ListModel" TracksPanelListModel="$Required"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+        data:Track track = (data:Track)Model;
+        Number = track.TrackNumber;
+        EditableText.Value = track.Title;
+      </Script>
+
+      <Script> ShowNumber = [ListModel.ShowTrackNumber]; </Script>
+
+      <Script>
+        [DeclareTrigger(CommitValue.Invoked)]
+        ((data:Track)Model).Title = EditableText.Value;
+      </Script>
+
+    </Scripts>
+  </UI>
+
+
+  
+  <UI Name="SongCell" Base="spreadsheet:LabelCell">
+    <Scripts>
+      <Script>Content = [((data:Media)Model).Title];</Script>
+    </Scripts>
+  </UI>
+
+  
+  <UI Name="SongEditCell" Base="spreadsheet:LabelEditCell">
+    <Scripts>
+      <Script>
+        EditableText.Value = ((data:Media)Model).Title;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(CommitValue.Invoked)]
+        ((data:Media)Model).Title = EditableText.Value;
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  <UI Name="TrackNumberCell" Base="spreadsheet:LabelCell">
+    <Scripts>
+      <Script>Content = [((data:Track)Model).TrackNumber].ToString();</Script>
+    </Scripts>
+  </UI>
+
+  
+  <UI Name="ArtistCell" Base="spreadsheet:LabelCell">
+    <Scripts>
+      <Script>Content = [((data:Track)Model).ArtistName];</Script>
+    </Scripts>
+  </UI>
+
+  
+  <UI Name="ArtistEditCell" Base="spreadsheet:LabelEditCell">
+    <Scripts>
+      <Script>
+        EditableText.Value = ((data:Track)Model).ArtistName;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(CommitValue.Invoked)]
+        ((data:Track)Model).ArtistName = EditableText.Value;
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  <UI Name="AlbumCell" Base="spreadsheet:LabelCell">
+    <Scripts>
+      <Script>Content = [((data:Track)Model).AlbumName];</Script>
+    </Scripts>
+  </UI>
+
+
+  <UI Name="AlbumEditCell" Base="spreadsheet:LabelEditCell">
+    <Scripts>
+      <Script>
+        EditableText.Value = ((data:Track)Model).AlbumName;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(CommitValue.Invoked)]
+        ((data:Track)Model).AlbumName = EditableText.Value;
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  <UI Name="GenreCell" Base="spreadsheet:FallbackCell">
+    <Scripts>
+      <Script>Content = [((data:Track)Model).Genre];</Script>
+    </Scripts>
+  </UI>
+
+  <UI Name="GenreEditCell" Base="spreadsheet:LabelEditCell">
+    <Scripts>
+      <Script>
+        EditableText.Value = ((data:Track)Model).Genre;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(CommitValue.Invoked)]
+        ((data:Track)Model).Genre = EditableText.Value;
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  <UI Name="LengthCell" Base="spreadsheet:LengthCell">
+    <Scripts>
+      <Script>Length = [((data:Track)Model).Duration];</Script>
+    </Scripts>
+  </UI>
+  
+  
+  <UI Name="RatingCellBase" Base="spreadsheet:ToolTipCell">
+    <Properties>
+      <Int32 Name="UserRating"/>
+      <style:StatefulCompositeStyle Name="Style" StatefulCompositeStyle="$Required"/>
+      <style:Style Name="ToolTipStyle" Style="{styles:SharedStyles.ToolTipStyle}"/>
+      <PlacementMode Name="ToolTipPlacement" PlacementMode="MouseBottom"/>
+    </Properties>
+
+    <Locals>
+      <iris:Command Name="ChangeRating"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        if ([UserRating] == me:RatingConstants.Unrated)
+        {
+          ToolTipText       = me:Strings.RatingToolTipUnrated;
+          Rating.Image      = styles:Styles.RatingNotRatedDefault;
+          Rating.HoverImage = styles:Styles.RatingNotRatedHover;       
+
+          
+          
+          if ([Style.State.Hovered] &amp;&amp; ChangeRating.Available)
+            Rating.Image      = styles:Styles.RatingNotRated;
+          Rating.PressedImage = styles:Styles.RatingNotRatedPressed;
+        }
+        else if (UserRating &lt;= me:RatingConstants.MaxHateIt)
+        {
+          ToolTipText         = me:Strings.RatingToolTipHate;
+          
+          if ([Style.State.Selected] || Style.State.Hovered)
+            Rating.Image      = styles:Styles.RatingHateItSelected;
+          else
+            Rating.Image      = styles:Styles.RatingHateIt;
+            
+          Rating.HoverImage   = styles:Styles.RatingHateItHover;
+          Rating.PressedImage = styles:Styles.RatingHateItPressed;
+        }
+        else 
+        {
+          ToolTipText         = me:Strings.RatingToolTipLove;
+          
+          if (Style.State.Selected || Style.State.Hovered)
+            Rating.Image      = styles:Styles.RatingLikeItSelected;
+          else
+            Rating.Image      = styles:Styles.RatingLikeIt;
+          
+          Rating.HoverImage   = styles:Styles.RatingLikeItHover;
+          Rating.PressedImage = styles:Styles.RatingLikeItPressed;
+        }
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(ChangeRating.Invoked)]
+        if (UserRating == me:RatingConstants.Unrated)
+        {
+          
+          UserRating = me:RatingConstants.LoveIt;
+        }
+        else if (UserRating &lt;= me:RatingConstants.MaxHateIt)
+        {
+          
+          UserRating = me:RatingConstants.Unrated;
+        }
+        else 
+        {
+          
+          UserRating = me:RatingConstants.HateIt;
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Name="ToolTipOrigin">
+        <Children>
+          
+          <core:IconButton Name="Rating" Model="{ChangeRating}"
+                  Margins="0,2,0,0"
+                  KeyInteractiveNStuff="false"
+                  AllowDoubleClicks="false"/>
+          
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  <UI Name="RatingCell" Base="me:RatingCellBase">
+    <Properties>
+      <data:RateableMedia Name="Model" RateableMedia="$Required"/>
+      <Int32 Name="UserRating" Int32="{Model.UserRating}"/>
+    </Properties>
+    <Scripts>
+      <Script>
+        [DeclareTrigger(Model.UserRating)]
+        UserRating = Model.UserRating;
+      </Script>
+      <Script>
+        [DeclareTrigger(UserRating)]
+        if (Model.UserRating != UserRating)
+          Model.UserRating = UserRating;
+      </Script>
+      
+      <Script>
+        [DeclareTrigger(ChangeRating.Invoked)]
+        
+        
+        
+        if (ListModel.SelectionManager != null &amp;&amp;
+            ListModel.SelectionManager.IsSelected(RowIndex.Value))
+        {
+          foreach (data:RateableMedia media in ListModel.SelectionManager.SelectedItems)
+          {
+            if (media.UserRating != UserRating)
+              media.UserRating = UserRating;
+          }
+        }
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  <UI Name="SyncCell" Base="spreadsheet:IconCell">
+    <Properties>
+      <data:Media Name="Model" Media="$Required"/>
+    </Properties>
+    <Scripts>
+      <Script>
+        <![CDATA[
+        [DeclareTrigger(Model.SyncState)]
+        [DeclareTrigger(zune:SyncControls.Instance.SyncProgressed.Invoked)]
+        [InitialEvaluate(true)]
+
+        Int32 state = Model.SyncState;
+
+        
+        if (state < 0 ||
+            state >= styles:Styles.SyncIconImages.Count)
+        {
+          state = styles:Styles.SyncIconImages.Count - 1;
+        }
+        
+        bool hover = false;
+        
+        if (Style is style:StatefulCompositeStyle)
+        {
+          hover = [((style:StatefulCompositeStyle)Style).State.Selected] || 
+                  [((style:StatefulCompositeStyle)Style).State.Hovered];
+        }
+        
+        if (hover)
+        {
+          Icon = (Image)styles:Styles.SyncIconHoverImages.GetItem(state);
+        }
+        else
+        {
+          Icon = (Image)styles:Styles.SyncIconImages.GetItem(state);
+        }
+        
+        ToolTipText = (String)me:Strings.SyncIconToolTips.GetItem(state);
+        ]]>
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  <UI Name="DateAddedCell" Base="spreadsheet:DateCell">
+    <Scripts>
+      <Script> Date = ((data:Track)Model).DateAdded;</Script>
+    </Scripts>
+  </UI>
+
+  
+  <UI Name="AlbumArtistCell" Base="spreadsheet:LabelCell">
+    <Scripts>
+      <Script>Content = [((data:Track)Model).AlbumArtistName];</Script>
+    </Scripts>
+  </UI>
+  
+  
+  <UI Name="AlbumArtistEditCell" Base="spreadsheet:LabelEditCell">
+    <Scripts>
+      <Script>
+        EditableText.Value = ((data:Track)Model).AlbumArtistName;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(CommitValue.Invoked)]
+        ((data:Track)Model).AlbumArtistName = EditableText.Value;
+      </Script>
+    </Scripts>
+  </UI>
+  
+  
+  <UI Name="ContributingArtistsCell" Base="spreadsheet:LabelCell">
+    <Scripts>
+      <Script>
+        string content = "";
+        
+        List artists = (List)((data:Track)Model).ContributingArtistNames;
+        
+        string separator = me:Strings.ContributingArtistSeparator;
+        
+        if (!List.IsNullOrEmpty(artists))
+        {
+          foreach (string name in artists)
+          {
+            if (content.Length == 0)
+              content = name;
+            else
+              content = separator.Format(content, name);
+          }
+        }
+        
+        Content = content;
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  <UI Name="DateLastPlayedCell" Base="spreadsheet:DateCell">
+    <Scripts>
+      <Script> Date =[((data:Track)Model).DateLastPlayed];</Script>
+    </Scripts>
+  </UI>
+
+  
+  <UI Name="PlayCountCell" Base="spreadsheet:LabelCell">
+    <Scripts>
+      <Script> Content = [((data:Track)Model).PlayCount].ToString();</Script>
+    </Scripts>
+  </UI>
+
+  
+  <UI Name="SizeCell" Base="spreadsheet:LabelCell">
+    <Properties>
+      <Int64 Name="SizeData" Int64="{(Int64)0}"/>
+      <String Name="FormatString"/>
+    </Properties>
+
+    <Scripts>
+      <Script> <![CDATA[
+        if ([SizeData] > (Int64)0)
+        {
+          float bytesPerK = 1024.0;
+          float size = (float)SizeData / bytesPerK;
+          if (size < 1.0)
+            size = 1.0;
+
+          string units;
+          string format = "{0:#,0.#} {1}";
+          if (size < bytesPerK)
+          {
+            
+            format = "{0:#,0} {1}";
+            units = "KB";
+          }
+          else
+          {
+            size = size / bytesPerK;
+            if (size < bytesPerK)
+            {
+              units = "MB";
+            }
+            else
+            {
+              size = size / bytesPerK;
+              units = "GB";
+            }
+          }
+
+          Content = format.Format(size, units);
+          
+          if (!String.IsNullOrEmpty(FormatString))
+          {
+            Content = FormatString.Format(Content);
+          }
+        }
+        else
+        {
+          Content = "";
+        }
+   ]]></Script>
+    </Scripts>
+  </UI>
+
+  <UI Name="FileSizeCell" Base="me:SizeCell">
+    <Properties>
+      <data:Track Name="Model" Track="$Required"/>
+      <Int64 Name="SizeData" Int64="{Model.FileSize}"/>
+    </Properties>
+    <Scripts>
+      <Script>SizeData = [Model.FileSize];</Script>
+    </Scripts>
+  </UI>
+
+  <UI Name="SizeOnDeviceCell" Base="me:SizeCell">
+    <Properties>
+      <data:Media Name="Model" Media="$Required"/>
+      <Int64 Name="SizeData" Int64="{Model.DeviceFileSize}"/>
+    </Properties>
+    <Scripts>
+      <Script>SizeData = [Model.DeviceFileSize];</Script>
+    </Scripts>
+  </UI>
+  
+  
+  <UI Name="ReleaseYearCell" Base="spreadsheet:DateCell">
+     <Properties>
+      <String Name="Format" String="yyyy"/>
+    </Properties>
+    <Scripts>
+      <Script> Date = [((data:Track)Model).ReleaseDate];</Script>
+    </Scripts>
+  </UI>
+  
+  
+  <UI Name="ComposerCell" Base="spreadsheet:FallbackCell">
+    <Scripts>
+      <Script>Content = ((data:Track)Model).ComposerName;</Script>
+    </Scripts>
+  </UI>
+
+  
+  
+
+
+
+
+
+  
+  <UI Name="ProtectedCell" Base="spreadsheet:FallbackCell">
+    <Properties>
+      <data:Track Name="Model" Track="$Required"/>
+    </Properties>
+    <Scripts>
+      <Script>
+        if ([Model.IsProtected] == 1)
+          Content = zune:Shell.LoadString(zune:StringId.IDS_PROTECTED_YES);
+        else if (Model.IsProtected == 0)
+          Content = zune:Shell.LoadString(zune:StringId.IDS_PROTECTED_NO);
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  
+
+
+
+
+
+  
+  <UI Name="ConductorCell" Base="spreadsheet:FallbackCell">
+    <Scripts>
+      <Script>Content = [((data:Track)Model).ConductorName];</Script>
+    </Scripts>
+  </UI>
+
+  
+  
+
+
+
+
+
+  
+  <UI Name="LibraryMediaStatusCell" Base="spreadsheet:MediaStatusCell">
+    <Properties>
+      <data:Media Name="Model" Media="$Required"/>
+      <zune:MediaType Name="MediaType" MediaType="{zune:Shell.MapStringToMediaType(Model.Type)}"/>
+      <Int32 Name="MediaId" Int32="{Model.LibraryId}"/>
+    </Properties>
+
+    <Scripts>
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(zune:TransportControls.Instance.CurrentTrack)]
+        IsNowPlaying = zune:TransportControls.Instance.IsCurrentLibraryTrack(MediaId, MediaType);
+      </Script>
+      
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(zune:TransportControls.Instance.ErrorCount)]
+        ErrorCode = zune:TransportControls.Instance.GetLibraryErrorCode(MediaId, MediaType);
+      </Script>
+    </Scripts>
+  </UI>
+
+
+  <Class Name="SortInfo" Shared="true">
+      <Properties>
+          <spreadsheet:SortDescription Name="DateAdded"      Attribute="DateAdded"/>
+          <spreadsheet:SortDescription Name="DisplayArtist"  Attribute="DisplayArtist"        SupportsJumpInList="true"/>
+          <spreadsheet:SortDescription Name="Duration"       Attribute="Duration"/>
+          <spreadsheet:SortDescription Name="Title"          Attribute="Title"                SupportsJumpInList="true"/>
+          <spreadsheet:SortDescription Name="UserLastPlayedDate" Attribute="UserLastPlayedDate"/>
+          <spreadsheet:SortDescription Name="UserPlayCount"  Attribute="UserPlayCount"/>
+          <spreadsheet:SortDescription Name="UserRating"     Attribute="UserRating"/>
+          <spreadsheet:SortDescription Name="WM_AlbumArtist" Attribute="WM/AlbumArtist"       SupportsJumpInList="true"/>
+          <spreadsheet:SortDescription Name="WM_AlbumTitle"  Attribute="WM/AlbumTitle"        SupportsJumpInList="true"/>
+          <spreadsheet:SortDescription Name="WM_Composer"    Attribute="WM/Composer"          SupportsJumpInList="true"/>
+          <spreadsheet:SortDescription Name="WM_Conductor"   Attribute="WM/Conductor"         SupportsJumpInList="true"/>
+          <spreadsheet:SortDescription Name="WM_Genre"       Attribute="WM/Genre"             SupportsJumpInList="true"/>
+          <spreadsheet:SortDescription Name="WM_TrackNumber" Attribute="WM/TrackNumber"/>
+          <spreadsheet:SortDescription Name="WM_Year"        Attribute="WM/Year"/>
+      </Properties>
+  </Class>
+
+  <Class Name="RatingConstants" Shared="true">
+    <Properties>   
+      
+      <Int32 Name="Unrated" Int32="0"/>
+      <Int32 Name="HateIt"  Int32="2"/>
+      <Int32 Name="LoveIt"  Int32="8"/>
+      
+      
+      <Int32 Name="MaxHateIt" Int32="5"/>
+      <Int32 Name="MaxLoveIt" Int32="10"/>
+    </Properties>
+  </Class>
+  
+  
+  
+  
+  
+  <Class Name="ColumnChooserDialog" Base="dialog:Dialog">
+    <Properties>
+      <String Name="ContentUI" String="res://ZuneShellResources!TracksPanelColumns.uix#ColumnChooserDialogUI"/>
+    </Properties>
+  </Class>
+  
+  
+  
+  
+  
+  
+  <Class Name="ColumnChooserOption">
+    <Properties>
+      <spreadsheet:ColumnInfo Name="ColumnInfo" ColumnInfo="{null}"/>
+      <iris:BooleanChoice Name="Visible"/>
+    </Properties>
+  </Class>
+  
+  
+  
+  
+  <UI Name="ColumnChooserDialogUI" Base="dialog:DialogContentUI">
+    <Properties>
+      <me:ColumnChooserDialog Name="Dialog" ColumnChooserDialog="$Required"/> 
+    </Properties>
+    
+    <Locals>
+      <iris:Command Name="OK" Description="{zune:Shell.LoadString(zune:StringId.IDS_DIALOG_OK)}"/>
+    </Locals>
+    
+    <Scripts>
+      <Script>
+        
+        
+        iris:ArrayListDataSet content = new iris:ArrayListDataSet();
+        
+        foreach(spreadsheet:ColumnInfo visible in me:DetailedViewData.ColumnData.OrderedColumns)
+        {
+          me:ColumnChooserOption option = new me:ColumnChooserOption();
+          option.ColumnInfo = visible;
+          option.Visible.Value = option.ColumnInfo.Visible;
+          
+          content.Add(option);
+        }
+                
+        Spreadsheet.Content = content;
+      </Script>
+      
+      <Script>
+        [DeclareTrigger(OK.Invoked)]
+        
+        
+        me:DetailedViewData.ColumnData.OrderedColumns.Clear();
+        
+        foreach(me:ColumnChooserOption option in Spreadsheet.Content)
+        {
+          me:DetailedViewData.ColumnData.OrderedColumns.Add(option.ColumnInfo);
+          option.ColumnInfo.Visible = option.Visible.Value;
+        }
+        
+        me:DetailedViewData.ColumnData.ColumnOrderChanged.Invoke();
+       
+        Dialog.Helper.Hide();
+      </Script>
+    </Scripts>
+    
+    <Content>
+      <Panel Navigation="ContainAll,WrapAll" MaximumSize="360,0" Margins="10">
+        <Layout>
+          <AnchorLayout/>
+        </Layout>
+        <Children>
+          
+          <core:Label Name="Title" 
+                Content="{zune:Shell.LoadString(zune:StringId.IDS_CHOOSE_COLUMN_TITLE)}"
+                Style="{styles:SharedStyles.DialogHeaderStyle}">
+             <LayoutInput>
+              <AnchorLayoutInput Left="Parent,0" Top="Parent, 0"/>
+            </LayoutInput>
+          </core:Label>
+          
+
+          <me:ColumnReorderSpreadSheet Name="Spreadsheet" Margins="0,0,0,50" MaximumSize="200,0"
+                                       FixedItems="{me:DetailedViewData.ColumnData.FixedColumns}">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Parent,0" Top="Title,1,10"/>
+            </LayoutInput>
+          </me:ColumnReorderSpreadSheet>
+          
+          <Panel>
+            <LayoutInput>
+              <AnchorLayoutInput Left="Parent,0" Top="Spreadsheet,1,-40"/>
+            </LayoutInput>
+            <Layout>
+              <DockLayout SizeToChildren="true" DefaultLayoutInput="Left,Near"/>
+            </Layout>
+            <Children>
+              
+              <core:ActionButton Model="{OK}" Margins="0,0,10,0" ToolTipEnabled="false"/>
+              <core:ActionButton Model="{Dialog.Cancel}" Margins="10,0,10,0" ToolTipEnabled="false" FocusOrder="0"/>
+
+            </Children>
+          </Panel>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+    
+  
+  
+  
+  <UI Name="ColumnReorderSpreadSheet" Base="spreadsheet:SpreadSheet">
+    <Properties>
+      <Boolean Name="CanReorder" Boolean="true"/>
+    
+      <spreadsheet:ColumnData Name="ColumnData" >
+        <Columns>
+          <spreadsheet:ColumnInfo  CellType="{typeof(me:ColumnOptionCell)}"
+                                   Resizable="false">
+            <LayoutInput>
+              <DockLayoutInput Position="Top"/>
+            </LayoutInput>
+          </spreadsheet:ColumnInfo>
+        </Columns>
+      </spreadsheet:ColumnData>
+      
+      <Boolean Name="ShowHeaders" Boolean="false"/>
+      <SelectionManager Name="SelectionManager" SingleSelect="true"/>
+      <Boolean Name="AllowHorizontalScrolling" Boolean="false"/>
+      <Boolean Name="SizeToChildren" Boolean="true"/>
+    </Properties>
+
+    <Scripts>
+      
+      <Script>
+        [DeclareTrigger(Target.Dropped)]
+
+        object value = Target.GetValue();
+        
+        if (!(value is SelectionManager))
+        {
+          
+        }
+        else
+        {
+          SelectionManager selectionManager = (SelectionManager)value;
+          int insertAt = InsertIndex.Value;
+          
+          if (insertAt >= 0)
+          {
+            iris:ArrayListDataSet list = (iris:ArrayListDataSet)Content;
+            list.Reorder(selectionManager.SelectedIndices, insertAt);
+          }
+        }
+      </Script>
+    </Scripts>
+  </UI>
+  
+  
+  
+  
+  <UI Name="ColumnOptionCell" Base="spreadsheet:Cell">
+    <Properties>
+      <me:ColumnChooserOption Name="Model" ColumnChooserOption="$Required"/>
+    </Properties>
+    
+    <Content>
+      <Panel Layout="HorizontalFlow" MouseInteractive="true">
+        <Children>
+          
+          <core:CheckBox Model="{Model.Visible}" Margins="0,0,10,0" Available="{Model.ColumnInfo.Removable}"/>
+          <core:Label Content="{Model.ColumnInfo.Header}" Margins="0,0,5,0"/>
+          <Graphic Content="{Model.ColumnInfo.HeaderIcon}" Margins="0,2,0,0"/>
+          
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <Class Name="Strings" Shared="true">
+    <Properties>
+      <string Name="ContributingArtistSeparator" string="{zune:Shell.LoadString(zune:StringId.IDS_CONTRIBUTING_ARTISTS_SEPARATOR)}" />
+      <string Name="RatingToolTipHeader" string="{zune:Shell.LoadString(zune:StringId.IDS_RATING_COLUMN_HEADER_TOOLTIP)}" />
+      <string Name="RatingToolTipUnrated" string="{zune:Shell.LoadString(zune:StringId.IDS_RATING_COLUMN_TOOLTIP_UNRATED)}" />
+      <string Name="RatingToolTipLove" string="{zune:Shell.LoadString(zune:StringId.IDS_RATING_COLUMN_TOOLTIP_RATED_LOVE)}" />
+      <string Name="RatingToolTipHate" string="{zune:Shell.LoadString(zune:StringId.IDS_RATING_COLUMN_TOOLTIP_RATED_HATE)}" />
+      
+      
+      <List Name="SyncIconToolTips">
+        <Source>
+          <String String="{zune:Shell.LoadString(zune:StringId.IDS_SYNC_STATUS_COLUMN_TOOLTIP_SYNCING)}"/>
+          <String String="{zune:Shell.LoadString(zune:StringId.IDS_SYNC_STATUS_COLUMN_TOOLTIP_ONDEVICE)}"/>
+          <String String="{zune:Shell.LoadString(zune:StringId.IDS_SYNC_STATUS_COLUMN_TOOLTIP_EXCLUDED)}"/>
+          <String String="{null}"/>
+        </Source>
+      </List>      
+    </Properties>
+  </Class>
+  
+</UIX>
diff --git a/test/2.1/TRANSPORTCONTROLS.UIX b/test/2.1/TRANSPORTCONTROLS.UIX
new file mode 100644
index 0000000..f299f3d
--- /dev/null
+++ b/test/2.1/TRANSPORTCONTROLS.UIX
@@ -0,0 +1,592 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX 
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:sys="assembly://mscorlib/System"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:images="res://ZuneShellResources!ImageStyle.uix"
+  xmlns:animations="res://ZuneShellResources!Animations.uix"
+  xmlns:me="Me">
+
+  
+  
+  
+  <UI Name="TransportControls">
+    <Properties>
+      <zune:TransportControlStyle Name="Style"/>
+    </Properties>
+
+    <Locals>
+      <zune:ZunePage Name="Page" ZunePage="{null}"/>
+
+      <zune:TransportControls Name="Controls" TransportControls="{zune:TransportControls.Instance}"/>
+      <iris:Command Name="EnterNowPlaying" Description="{zune:Shell.LoadString(zune:StringId.IDS_NOW_PLAYING_TOOLTIP)}"/>
+      <iris:Command Name="ExitNowPlaying" Description="{zune:Shell.LoadString(zune:StringId.IDS_EXIT_NOW_PLAYING_BUTTON)}"/>
+      <iris:BooleanChoice Name="ShowAudioVideoControls">
+        <Options>
+          <String String="{zune:Shell.LoadString(zune:StringId.IDS_TRANSPORT_MUSIC_SELECTOR)}"/>
+          <String String="{zune:Shell.LoadString(zune:StringId.IDS_TRANSPORT_SLIDESHOW_SELECTOR)}"/>
+        </Options>
+      </iris:BooleanChoice>
+      <Boolean Name="ShowShuffle"/>
+      <Boolean Name="ShowRepeating"/>
+    </Locals>
+
+    <Scripts>
+      <Script>Page = [zune:Shell.DefaultInstance.CurrentPage];</Script>
+
+      <Script>
+        
+        
+        
+        
+        
+        if ([Style] == zune:TransportControlStyle.Music)
+        {
+           ShowAudioVideoControls.Value = true;
+           ModeSwitch.Visible           = false;
+           ShowShuffle                  = true;
+           ShowRepeating                = true;
+        }
+        else if (Style == zune:TransportControlStyle.Video)
+        {
+           ShowAudioVideoControls.Value = true;
+           ModeSwitch.Visible           = false;
+           ShowShuffle                  = false;
+           ShowRepeating                = true;
+        }
+        else if (Style == zune:TransportControlStyle.Photo)
+        {
+           ShowAudioVideoControls.Value = false;
+           ModeSwitch.Visible           = Controls.HasPlaylist &amp;&amp; !Controls.PlayingVideo;
+           ShowShuffle                  = false;
+           ShowRepeating                = false;
+        }
+      </Script>
+
+      <Script>
+        zune:TransportControlStyle active;
+
+        
+        
+        
+        
+        
+        
+        
+        
+        if ([ShowAudioVideoControls.Value])
+        {
+          PrimaryAudioVideoControls.Visible  = true;
+          PrimaryPhotoControls.Visible       = false;
+          Shuffle.Visible                    = [ShowShuffle];
+          Repeating.Visible                  = [ShowRepeating];
+          VolumeControls.Visible             = true;
+          ShowAudioVideoControls.Description = zune:Shell.LoadString(zune:StringId.IDS_PHOTO_TRANSPORT_SHOWPHOTO_TOOLTIP);
+
+          
+          if (Style == zune:TransportControlStyle.Video)
+            active = Style;
+          else
+            active = zune:TransportControlStyle.Music;
+        }
+        else
+        {
+          PrimaryPhotoControls.Visible       = true;
+          PrimaryAudioVideoControls.Visible  = false;
+          Shuffle.Visible                    = false;
+          Repeating.Visible                  = false;
+          VolumeControls.Visible             = false;
+          ShowAudioVideoControls.Description = zune:Shell.LoadString(zune:StringId.IDS_PHOTO_TRANSPORT_SHOWMUSIC_TOOLTIP);
+          
+          
+          active = zune:TransportControlStyle.Photo;
+        }
+        
+        if ([Page] is zune:NowPlayingLand)
+          ((zune:NowPlayingLand)Page).ActiveTransportControlStyle = active;
+      </Script>
+
+      <Script>
+        Shuffle.Description = [Controls.Shuffling.Description];
+      </Script>
+
+      <Script>
+        Repeating.Description = [Controls.Repeating.Description];
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(EnterNowPlaying.Invoked)]
+        zune:NowPlayingLand.NavigateToLand();
+      </Script>
+
+      <Script>
+        [DeclareTrigger(ExitNowPlaying.Invoked)]
+        zune:Shell.DefaultInstance.NavigateBackCommand.Invoke();
+      </Script>
+      
+      
+      <Script>
+        
+        
+        
+        
+        
+        
+        
+
+        NowPlayingButton.Visible = [ShowAudioVideoControls.Value] &amp;&amp;
+                                   [Controls.HasPlaylist] &amp;&amp;
+                                   ![images:Images.InNowPlaying.Value] &amp;&amp;
+                                   ![zune:Shell.DefaultInstance.CurrentPage.ShowNowPlayingX];
+      </Script>
+
+      <Script>
+        ExitNowPlayingButton.Visible = [zune:Shell.DefaultInstance.CurrentPage.ShowNowPlayingX];
+      </Script>
+      <Script>
+        if ([images:Images.InNowPlaying.Value])
+        {
+          ModeSwitch.OverrideStyle      = styles:SharedStyles.NowPlayingButtonStyle;
+        }
+        else
+        {
+          ModeSwitch.OverrideStyle      = styles:SharedStyles.TransportButtonStyle;
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Margins="0,8,20,0" Layout="Anchor">       
+        <Children>
+
+          <Panel Name="SecondaryControls" Layout="HorizontalFlow">
+            <LayoutInput>
+              <AnchorLayoutInput Right="PrimaryControls,0,-4" Top="Parent,0,5"/>
+            </LayoutInput>
+            <Children>
+
+               <images:ToggleIconButton Name="Repeating"
+                  Model="{Controls.Repeating}"
+                  OnStyle="{images:Images.ContextualTransportRepeatingOn}" 
+                  OffStyle="{images:Images.ContextualTransportRepeatingOff}"
+                  Margins="0,1,0,0"/>
+
+              <images:ToggleIconButton Name="Shuffle"
+                  Model="{Controls.Shuffling}"
+                  OnStyle="{images:Images.ContextualTransportShuffleOn}" 
+                  OffStyle="{images:Images.ContextualTransportShuffleOff}"
+                  Margins="0,1,0,0"/>
+
+              <images:ToggleActionButton Name="ModeSwitch" 
+                  Margins="0,0,3,0" 
+                  ImageStyle="{images:Images.ContextualTransportActionButton}" 
+                  Model="{ShowAudioVideoControls}"
+                  FixedHeight="0,24"
+                  ShowShadowLabel="false"
+                  ButtonInset="10,4,10,0"
+                  TileMinSize="0,0"/>
+
+            </Children>
+          </Panel>
+
+          <Panel Name="PrimaryControls">
+            <LayoutInput>
+              <AnchorLayoutInput Right="NowPlayingContainer,0" Top="Parent,0"/>
+            </LayoutInput>
+            <Children>
+
+              <me:PrimaryAudioVideoControls Name="PrimaryAudioVideoControls" Margins="0,0,5,0"/>
+
+              <me:PrimaryPhotoControls Name="PrimaryPhotoControls" Margins="0,5,0,0"/>
+
+            </Children>
+          </Panel>
+
+          <Panel Name="NowPlayingContainer" MinimumSize="68,0" MaximumSize="68,0" Layout="HorizontalFlow">
+            <LayoutInput>
+              <AnchorLayoutInput Left="Parent,1,-68" Top="Parent,0,5" Horizontal="Near"/>
+            </LayoutInput>
+            <Children>
+
+              <images:IconButton Name="NowPlayingButton"
+                  Model="{EnterNowPlaying}"
+                  Style="{images:Images.EnterNowPlaying}"
+                  Margins="4,4,0,0">
+
+                <Animations>
+                  <Animation Animation="{animations:Animations.BasicShowSlide}"/>
+                </Animations>
+              </images:IconButton>
+              
+              <images:ActionButton Name="ExitNowPlayingButton"
+                  Model="{ExitNowPlaying}"
+                  ImageStyle="{images:Images.ContextualTransportActionButton}" 
+                  OverrideStyle="{styles:SharedStyles.NowPlayingButtonStyle}" 
+                  FixedHeight="0,24"
+                  ShowShadowLabel="false"
+                  ButtonInset="10,4,10,0"
+                  TileMinSize="0,0"/>
+
+            </Children>
+          </Panel>
+
+          <me:VolumeControls Name="VolumeControls">
+            <LayoutInput>
+              <AnchorLayoutInput Left="PrimaryControls,0,-25" Right="NowPlayingContainer,0,25" Top="PrimaryControls,1"/>
+            </LayoutInput>
+          </me:VolumeControls>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="PrimaryAudioVideoControls">
+    <Locals>
+      <zune:TransportControls Name="Controls" TransportControls="{zune:TransportControls.Instance}"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(Controls.Playing)]
+        [DeclareTrigger(Controls.IsPlaybackContextCompatible)]
+
+        if (!Controls.Playing)
+        {
+           BigButton.Model                 = Controls.Play;
+           BigButton.AccessibleDescription = Controls.Play.Description;
+           BigButton.Style                 = images:Images.ContextualTransportPlay;
+        }
+        else
+        {
+           
+           
+           
+           
+           
+           
+           
+           
+           
+
+           if (Controls.IsPlaybackContextCompatible)
+           {
+              BigButton.Model                 = Controls.Pause;
+              BigButton.AccessibleDescription = Controls.Pause.Description;
+              BigButton.Style                 = images:Images.ContextualTransportPause;
+           }
+           else
+           {
+              BigButton.Model                 = Controls.Stop;
+              BigButton.AccessibleDescription = Controls.Stop.Description;
+              BigButton.Style                 = images:Images.ContextualTransportStop;
+           }
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel>
+        <Layout>
+          <FlowLayout Orientation="Horizontal" ItemAlignment="Center"/>
+        </Layout>
+        <Children>
+
+          <images:PressAndHoldIconButton
+              ClickCommand="{Controls.Back}"
+              Holding="{Controls.Rewinding}"
+              AccessibleDescription="{Controls.Back.Description}"
+              AllowDoubleClicks="false"
+              Style="{images:Images.ContextualTransportBack}"/>
+
+          <images:IconButton Name="BigButton" Model="{null}"/>
+
+          <images:PressAndHoldIconButton
+              ClickCommand="{Controls.Forward}"
+              Holding="{Controls.Fastforwarding}"
+              AccessibleDescription="{Controls.Forward.Description}"
+              AllowDoubleClicks="false"
+              Style="{images:Images.ContextualTransportForward}"/>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="VolumeControls">
+    <Locals>
+      <zune:TransportControls Name="Controls" TransportControls="{zune:TransportControls.Instance}"/>
+      <iris:Command Name="ShowControls"/>
+      <Timer Name="HideTimer" Interval="1000" Enabled="false" AutoRepeat="false"/>
+      <Single Name="HideLength" Single="0.4"/>
+
+      <iris:Choice Name="ControlsShowHide">
+        <Options>
+          <String String="Dynamic"/>
+          <String String="Static"/>
+        </Options>
+      </iris:Choice>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        Muted.Description = [Controls.Muted.Description];
+      </Script>
+
+      <Script>
+        if([UI.DeepMouseFocus] || [UI.DeepKeyFocus])
+        {
+          ControlsShowHide.Chosen = "Dynamic";
+          StaticControls.Alpha = 0.0;
+          DynamicControls.Alpha = 1.0;
+        }
+      </Script>
+
+      <Script>
+        VolumeValue.Content = ((int)[Controls.Volume.Value]).ToString("00");
+      </Script>
+
+      <Script>
+        if ([Controls.Muted.Value])
+        {
+           VolumeLabel.Content = zune:Shell.LoadString(zune:StringId.IDS_VOLUME_LABEL_MUTED);
+        }
+        else
+        {
+           VolumeLabel.Content = sys:String.Format(
+               zune:Shell.LoadString(zune:StringId.IDS_VOLUME_LABEL),
+               (int)[Controls.Volume.Value]);
+        }
+
+        Slider.AccessibleValue = ((int)Controls.Volume.Value).ToString();
+      </Script>
+
+      <Script>
+        HideTimer.Enabled = ![UI.DeepMouseFocus] &amp;&amp; ![UI.DeepKeyFocus];
+      </Script>
+
+      <Script>
+        [DeclareTrigger(HideTimer.Tick)]
+        ControlsShowHide.Chosen = "Static";
+        DynamicControls.Alpha = 0.0;
+        StaticControls.Alpha = 1.0;
+      </Script>
+
+      
+      
+      
+      
+      
+      <Script>
+        if ([images:Images.InNowPlaying.Value])
+        {
+          Slider.BackgroundImage        = styles:Styles.SlideshowSliderBackground;
+          Slider.ThumbImage             = styles:Styles.SlideshowSliderThumb;
+          Slider.ThumbImageFocus        = styles:Styles.SlideshowSliderHoverThumb;
+          Slider.FilledBackgroundImage  = styles:Styles.SlideshowSliderFill;
+
+          VolumeValue.Style = styles:SharedStyles.SlideshowTransportVolumeValue;
+          VolumeLabel.Style = styles:SharedStyles.SlideshowTransportVolumeLabel;
+        }
+        else
+        {
+          Slider.BackgroundImage        = styles:Styles.SliderBackground;
+          Slider.ThumbImage             = styles:Styles.SliderThumb;
+          Slider.ThumbImageFocus        = styles:Styles.SliderHoverThumb;
+          Slider.FilledBackgroundImage  = styles:Styles.SliderFill;
+
+          VolumeValue.Style = styles:SharedStyles.TransportVolumeValue;
+          VolumeLabel.Style = styles:SharedStyles.TransportVolumeLabel;
+        }
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel MouseInteractive="true" Layout="Dock" MaximumSize="0,16">
+        <Children>
+
+          <Panel Name="DynamicControls" Alpha="0">
+            <Layout>
+              <FlowLayout Orientation="Horizontal" ItemAlignment="Center" Spacing="3,0"/>
+            </Layout>
+            <LayoutInput>
+              <DockLayoutInput Alignment="Center"/>
+            </LayoutInput>
+            <Animations>
+              <SwitchAnimation Expression="{ControlsShowHide}" Type="Alpha">
+                <Options>
+                  <TransformAnimation Name="Dynamic" TransformAnimation="{animations:Animations.TextIconToggleShow}"/>
+                  <Animation Name="Static" Animation="{animations:Animations.TextIconToggleHide}"/>
+                </Options>
+              </SwitchAnimation>
+            </Animations>
+            <Children>
+
+              <images:ToggleIconButton Name="Muted"
+                  Model="{Controls.Muted}"
+                  KeyFocusOnMouseDown="false"
+                  OnStyle="{images:Images.ContextualTransportMuteOn}"
+                  OffStyle="{images:Images.ContextualTransportMuteOff}"/>
+
+              <core:Slider Name="Slider" 
+                  Model="{Controls.Volume}"
+                  KeyFocusOnMouseDown="false"
+                  KeyDelta="5.0"
+                  KeyDeltaShift="1.0"
+                  KeyDeltaCtrl="10.0"
+                  KeyDeltaPage="20.0"
+                  MaximumSize="61,0"
+                  AccessibleDescription="{zune:Shell.LoadString(zune:StringId.IDS_VOLUME_TOOLTIP)}"/>
+
+              <core:Label Name="VolumeValue" Alignment="Far" MinimumSize="20,0" Margins="0,-1,0,0"/>
+
+            </Children>
+          </Panel>
+
+          <Panel Name="StaticControls">
+            <LayoutInput>
+              <DockLayoutInput Alignment="Center"/>
+            </LayoutInput>
+            <Animations>
+              <SwitchAnimation Expression="{ControlsShowHide}" Type="Alpha">
+                <Options>
+                  <TransformAnimation Name="Static" TransformAnimation="{animations:Animations.TextIconToggleShow}"/>
+                  <Animation Name="Dynamic" Animation="{animations:Animations.TextIconToggleHide}"/>
+                </Options>
+              </SwitchAnimation>
+            </Animations>
+            <Children>
+
+              <core:Label Name="VolumeLabel" Style="{styles:SharedStyles.TransportVolumeLabel}"/>
+
+            </Children>
+          </Panel>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+  
+  
+  <UI Name="PrimaryPhotoControls">
+    <Locals>
+      <zune:ZunePage Name="Page" ZunePage="{null}"/>
+
+      <iris:Command Name="PlayButtonCommand" Description="{zune:Shell.LoadString(zune:StringId.IDS_PHOTO_PLAY_TOOLTIP)}"/>
+      <iris:Command Name="ContinueButtonCommand" Description="{zune:Shell.LoadString(zune:StringId.IDS_PHOTO_CONTINUE_TOOLTIP)}"/>
+      <iris:Command Name="PauseButtonCommand" Description="{zune:Shell.LoadString(zune:StringId.IDS_PHOTO_PAUSE_TOOLTIP)}"/>
+      <iris:Command Name="NextButtonCommand" Description="{zune:Shell.LoadString(zune:StringId.IDS_PHOTO_NEXT_TOOLTIP)}"/>
+      <iris:Command Name="BackButtonCommand" Description="{zune:Shell.LoadString(zune:StringId.IDS_PHOTO_PREVIOUS_TOOLTIP)}"/>
+
+      <zune:SlideShowState Name="State" SlideShowState="{null}"/>
+    </Locals>
+
+    <Scripts>
+      <Script>
+        Page = [zune:Shell.DefaultInstance.CurrentPage];
+      </Script>
+
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(((zune:ISlideShowStateOwner)Page).SlideShowState)]
+
+        
+        if (Page is zune:ISlideShowStateOwner)
+        {
+          State = ((zune:ISlideShowStateOwner)Page).SlideShowState;
+        }
+        else
+        {
+          State = null;
+        }
+
+        
+        
+        bool inProgress = ((State != null) &amp;&amp; (Page is zune:SlideshowLand));
+
+        if (inProgress)
+          PlayButton.Model = ContinueButtonCommand;
+        else
+          PlayButton.Model = PlayButtonCommand;
+
+        NextButtonCommand.Available = inProgress;
+        BackButtonCommand.Available = inProgress;
+      </Script>
+
+      <Script>
+        PlayButtonCommand.Available = (State != null) &amp;&amp; [State.CanPlay];
+      </Script>
+
+      <Script>
+        if (State == null)
+        {
+          PlayButton.Visible = true;
+          PauseButton.Visible = false;
+        }
+        else
+        {
+          PlayButton.Visible = ![State.Play];
+          PauseButton.Visible = State.Play;
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(PlayButtonCommand.Invoked)]
+        State.Navigate.Invoke();
+      </Script>
+
+      <Script>
+        [DeclareTrigger(ContinueButtonCommand.Invoked)]
+        State.Play = true;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(PauseButtonCommand.Invoked)]
+        State.Play = false;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(NextButtonCommand.Invoked)]
+        State.Index = State.Index + 1;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(BackButtonCommand.Invoked)]
+        State.Index = State.Index - 1;
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Margins="0,0,6,21">
+        <Layout>
+          <FlowLayout Orientation="Horizontal" ItemAlignment="Center"/>
+        </Layout>
+        <Children>
+
+          <images:IconButton Model="{BackButtonCommand}" Style="{images:Images.ContextualSlideshowBack}" Margins="0,0,5,0"/>
+
+          <images:IconButton Model="{PlayButtonCommand}" Name="PlayButton" Style="{images:Images.ContextualSlideshowPlay}"/>
+
+          <images:IconButton Model="{PauseButtonCommand}" Name="PauseButton" Style="{images:Images.ContextualSlideshowPause}"/>
+
+          <images:IconButton Model="{NextButtonCommand}" Style="{images:Images.ContextualSlideshowNext}" Margins="6,0,0,0"/>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+</UIX>
diff --git a/test/2.1/VIDEOLIBRARY.UIX b/test/2.1/VIDEOLIBRARY.UIX
new file mode 100644
index 0000000..c172ded
--- /dev/null
+++ b/test/2.1/VIDEOLIBRARY.UIX
@@ -0,0 +1,260 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX
+  xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:zune="assembly://ZuneShell/ZuneUI"
+  xmlns:sys="assembly://mscorlib/System"
+  xmlns:data="res://ZuneShellResources!LibraryData.schema.xml"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:panels="res://ZuneShellResources!LibraryPanels.uix"
+  xmlns:style="res://ZuneShellResources!Style.uix"
+  xmlns:styles="res://ZuneShellResources!Styles.uix"
+  xmlns:thumbbutton="res://ZuneShellResources!ThumbnailButton.uix"
+  xmlns:core="res://ZuneShellResources!Controls.uix"
+  xmlns:lib="res://ZuneShellResources!LibraryPanels.uix"
+  xmlns:library="res://ZuneShellResources!Library.uix"
+  xmlns:me="Me">
+
+  
+  
+  
+  <Class Name="VideoPanelData" Shared="true">
+    <Properties>
+      
+
+      <iris:ArrayListDataSet Name="SortOptions">
+        <Source>
+          <zune:SortCommand Description="{zune:Shell.LoadString(zune:StringId.IDS_NAME_SORT)}"
+              Sort="+Title" SupportsJumpInList="true"/>
+          <zune:SortCommand Description="{zune:Shell.LoadString(zune:StringId.IDS_DATE_ADDED_SORT)}"
+              Sort="+DateAdded"/>
+        </Source>
+      </iris:ArrayListDataSet>
+      <panels:SortData Name="Sorts" Options="{SortOptions}" SaveKey="VideoSort"/>
+    </Properties>
+  </Class>
+
+  
+  
+  
+  <UI Name="VideoPanel" Base="panels:LibraryGalleryPanel">
+    <Properties>
+      <zune:VideoLibraryPage Name="Page" VideoLibraryPage="$Required"/>
+      <zune:VideosPanel Name="Model" VideosPanel="$Required"/>
+
+      <Type Name="GalleryViewType" Type="{typeof(me:GalleryView)}"/>
+
+      <panels:SortData Name="SortData" SortData="{me:VideoPanelData.Sorts}"/>
+
+      <Size Name="LayoutSpacing" Size="28,34"/>
+      
+      <Inset Name="ColumnMargins" Inset="-24,0,0,0"/>
+      <Inset Name="ColumnInset" Inset="24,0,0,0"/>
+      <Inset Name="HeaderMargins" Inset="0,0,0,17"/>
+      <Inset Name="HeaderPadding" Inset="24,0,5,0"/>
+    </Properties>
+
+    <Locals>
+      <data:LibraryVideoQuery Name="VideoQuery"
+        ShowDeviceContents="{Page.ShowDeviceContents}"
+        Enabled="false" AntialiasImageEdges="{iris:Application.RenderingType != iris:RenderingType.GDI}" />
+
+      
+      <List Name="LibraryMenuOptions">
+        <Source>
+          <iris:Command Command="{Play}"/>
+          <iris:Command Command="{AddToBurnList}"/>
+          <core:MenuDivider/>
+          <iris:Command Command="{Edit}"/>
+          <iris:Command Command="{Delete}"/>
+          <core:MenuDivider MenuDivider="{SyncDivider}"/>
+          <iris:Command Command="{Sync}"/>
+          <iris:Command Command="{SyncAllUnexclude}"/>
+          <zune:MenuItemCommand MenuItemCommand="{Exclude}"/>
+          <zune:MenuItemCommand MenuItemCommand="{Unexclude}"/>
+          <core:MenuDivider/>
+          <iris:Command Command="{Properties}"/>
+        </Source>
+      </List>
+
+      <List Name="DeviceMenuOptions">
+        <Source>
+          <iris:Command Command="{ReverseSync}"/>
+          <iris:Command Command="{DeleteFromDevice}"/>
+        </Source>
+      </List>
+    </Locals>
+
+    <Scripts>
+      <Script>Play.Description = zune:Shell.LoadString(zune:StringId.IDS_VIDEO_PLAY_MENUITEM);</Script>
+      <Script>
+        VideoQuery.DeviceId = [Page.DeviceId];
+      </Script>
+
+      
+      <Script>
+        if (Page.ShowDeviceContents)
+        {
+          ContextMenu.Options = DeviceMenuOptions;
+          DeleteKey.Command = DeleteFromDevice;
+        }
+        else
+        {
+          ContextMenu.Options = LibraryMenuOptions;
+        }
+        Worker.MaximumSize = new Size(0,0);
+        Worker.ExecuteCommand = Play;
+        Worker.Margins = new Inset(5,0,0,0);
+      </Script>
+
+      <Script>
+        zune:SortCommand sort = (zune:SortCommand)[SortData.Sorts.Chosen];
+
+        VideoQuery.Sort = sort.Sort;
+        SupportsJumpInList = sort.SupportsJumpInList;
+      </Script>
+
+      
+      <Script>
+        bool canPlay = false;
+        if ([SelectionManager.Count] == 1)
+        {
+          canPlay = true;
+        }
+
+        Play.Available = canPlay;
+        zune:TransportControls.Instance.PagePlaySelection.Available = canPlay;
+      </Script>
+
+      
+      <Script>
+        [DeclareTrigger(zune:TransportControls.Instance.PagePlaySelection.Invoked)]
+        Play.Invoke();
+      </Script>
+
+      
+      <Script>
+        VideoQuery.Enabled = true;
+      </Script>
+
+      
+      <Script> Model.Content = [VideoQuery.Result.Items]; </Script>
+      
+      <Script> Page.IsEmpty = [VideoQuery.Result.IsEmpty]; </Script>
+
+      <Script>
+        ToggleSelectAllCommand.Description = sys:String.Format(zune:Shell.LoadString(zune:StringId.IDS_VIDEOS_HEADER), [VideoQuery.Result.Items.Count]);
+      </Script>
+    </Scripts>
+  </UI>
+
+  
+  
+  
+  <UI Name="GalleryView" Base="lib:LibraryGalleryView">
+    <Properties>
+      <Type Name="ThumbnailCaptionAreaType" Type="{typeof(me:VideoGalleryCaptionArea)}"/>
+      <Type Name="ListItemType" Type="{typeof(me:VideoListItemBase)}"/>
+      <Type Name="ProviderType" Type="{typeof(me:VideoThumbnailButtonProvider)}"/>
+      <Size Name="LabelSize" Size="119,35"/>
+      <Size Name="LayoutSpacing" Size="27,35"/>
+      <Size Name="TileSize" Size="119,89"/>
+      <Boolean Name="OnlyShowClipsWhenScrollable" Boolean="true"/>
+    </Properties>
+  </UI>
+
+
+  
+  
+  
+  <UI Name="VideoGalleryCaptionArea" Base="lib:ThumbnailCaptionArea">
+    <Properties>
+      <Type Name="PrimaryLabelType" Type="{typeof(thumbbutton:EditableLabelHost)}"/>
+    </Properties>
+  </UI>
+
+  
+  
+  
+  <Class Name="VideoThumbnailButtonProvider" Base="thumbbutton:ThumbnailButtonProvider">
+    <Properties>
+      <data:Video Name="Model" Video="$Required"/>
+      <Index Name="Index" Index="$Required"/>
+      <SelectionManager Name="SelectionManager" SelectionManager="$Required"/>
+    </Properties>
+
+    <Scripts>
+      <Script>DragValue = SelectionManager;</Script>
+
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(Model.Thumbnail)]
+
+        PrimaryLabel = [Model.Title];
+        SecondaryLabel = [Model.DateAdded].ToString("d");
+
+        if (Model.Thumbnail != null)
+        {
+          Image = Model.Thumbnail;
+        }
+        else
+        {
+          Image = styles:Styles.NoArtWide;
+        }
+      </Script>
+
+      
+      <Script>
+        [InitialEvaluate(true)]
+        [DeclareTrigger(SelectionManager.SelectedIndices)]
+        if (SelectionManager != null)
+        {
+          Selected = SelectionManager.IsSelected([Index.Value]);
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(PrimaryLabel)]
+        Model.Title = PrimaryLabel;
+      </Script>
+    </Scripts>
+  </Class>
+
+  
+  
+  
+  
+  <UI Name="VideoListItemBase" Base="core:ThumbnailListItemBase">
+    <Properties>
+      <Type Name="ThumbnailCaptionAreaType" Type="{typeof(lib:ThumbnailCaptionArea)}"/>
+
+      
+      <style:Style Name="PrimaryStyle" Style="{styles:SharedStyles.PhotoVideoLabelStyle}"/>
+      <style:Style Name="SecondaryStyle" Style="{styles:SharedStyles.PhotoVideoLabelStyle}"/>
+      <style:Style Name="OverlayStyle" Style="{styles:SharedStyles.ThumbnailOverlayLabelStyle}"/>
+
+      <Size Name="LabelSize" Size="119,35"/>
+
+      <AnchorLayoutInput Name="LabelAnchor"
+          Left="TileBase,0" Right="TileBase,1" Horizontal="Near"
+          Top="TileBase,1,5" Bottom="TileBase,1,999" Vertical="Near"/>
+      <AnchorLayoutInput Name="BorderAnchor"
+          Left="Image,0,-1" Right="Image,1,1"
+          Top="Image,0,-1" Bottom="Image,1,1" 
+          ContributesToWidth="false" ContributesToHeight="false"/>
+    </Properties>
+
+    <Scripts>
+      <Script>ImageBorder.Content = styles:Styles.VideoBorderColor;</Script>
+    </Scripts>
+  </UI>
+  
+  <UI Name="EmptyPage" Base="library:EmptyLibraryPage">
+    <Properties>
+      <String Name="Title" String="{zune:Shell.LoadString(zune:StringId.IDS_VIDEO_EMPTY)}"/>
+      <iris:Command Name="Link1Command" Description="{zune:Shell.LoadString(zune:StringId.IDS_VIDEO_EMPTY_SETTINGS_LINK)}"/>
+      <iris:Command Name="Link2Command" Description="{zune:Shell.LoadString(zune:StringId.IDS_VIDEO_EMPTY_MARKETPLACE_LINK)}"/>
+      <String Name="MarketplaceDestination" String="Marketplace\Music\Home"/>
+    </Properties>
+  </UI>
+
+</UIX>
\ No newline at end of file