diff --git a/samples/XamlTestApplicationPcl/ContentControl.paml b/samples/XamlTestApplicationPcl/ContentControl.paml
index a73a844e83..d45974fa68 100644
--- a/samples/XamlTestApplicationPcl/ContentControl.paml
+++ b/samples/XamlTestApplicationPcl/ContentControl.paml
@@ -1,8 +1,12 @@
 <Style xmlns="https://github.com/perspex" Selector="ContentControl">
   <Setter Property="Template">
     <ControlTemplate>
-      <Border Background="{TemplateBinding Background}">
-        <ContentPresenter Content="{TemplateBinding Content}" Margin="{TemplateBinding Padding}"/>
+      <Border Background="{TemplateBinding Background}"
+              BorderBrush="{TemplateBinding BorderBrush}"
+              BorderThickness="{TemplateBinding BorderThickness}">
+        <ContentPresenter Name="PART_ContentPresenter" 
+                          Content="{TemplateBinding Content}" 
+                          Margin="{TemplateBinding Padding}"/>
       </Border>
     </ControlTemplate>
   </Setter>
diff --git a/samples/XamlTestApplicationPcl/ItemsControl.paml b/samples/XamlTestApplicationPcl/ItemsControl.paml
new file mode 100644
index 0000000000..62dceef695
--- /dev/null
+++ b/samples/XamlTestApplicationPcl/ItemsControl.paml
@@ -0,0 +1,10 @@
+<Style xmlns="https://github.com/perspex" Selector="ItemsControl">
+  <Setter Property="Template">
+    <ControlTemplate>
+      <ItemsPresenter Name="PART_ItemsPresenter"
+                      Items="{TemplateBinding Items}"
+                      ItemsPanel="{TemplateBinding ItemsPanel}"
+                      MemberSelector="{TemplateBinding MemberSelector}"/>
+    </ControlTemplate>
+  </Setter>
+</Style>
\ No newline at end of file
diff --git a/samples/XamlTestApplicationPcl/ListBox.paml b/samples/XamlTestApplicationPcl/ListBox.paml
new file mode 100644
index 0000000000..2a151889a0
--- /dev/null
+++ b/samples/XamlTestApplicationPcl/ListBox.paml
@@ -0,0 +1,18 @@
+<Style xmlns="https://github.com/perspex" Selector="ListBox">
+  <Setter Property="BorderBrush" Value="Black"/>
+  <Setter Property="BorderThickness" Value="1"/>
+  <Setter Property="Template">
+    <ControlTemplate>
+      <Border Background="{TemplateBinding Background}"
+              BorderBrush="{TemplateBinding BorderBrush}"
+              BorderThickness="{TemplateBinding BorderThickness}">
+        <ScrollViewer>
+          <ItemsPresenter Name="PART_ItemsPresenter"
+                          Items="{TemplateBinding Items}"
+                          ItemsPanel="{TemplateBinding ItemsPanel}"
+                          MemberSelector="{TemplateBinding MemberSelector}"/>
+        </ScrollViewer>
+      </Border>
+    </ControlTemplate>
+  </Setter>
+</Style>
\ No newline at end of file
diff --git a/samples/XamlTestApplicationPcl/ListBoxItem.paml b/samples/XamlTestApplicationPcl/ListBoxItem.paml
new file mode 100644
index 0000000000..7896e521aa
--- /dev/null
+++ b/samples/XamlTestApplicationPcl/ListBoxItem.paml
@@ -0,0 +1,22 @@
+<Styles xmlns="https://github.com/perspex">
+  <Style Selector="ListBoxItem">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="border"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}">
+          <ContentPresenter Name="PART_ContentPresenter"
+                            Content="{TemplateBinding Content}"
+                            Margin="{TemplateBinding Padding}"/>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+  <Style Selector="ListBoxItem:selected /template/ Border#border">
+    <Setter Property="Background" Value="#fff0f0f0"/>
+  </Style>
+  <Style Selector="ListBoxItem:selected:focus /template/ Border#border">
+    <Setter Property="Background" Value="#ffd0d0d0"/>
+  </Style>
+</Styles>
\ No newline at end of file
diff --git a/samples/XamlTestApplicationPcl/TreeView.paml b/samples/XamlTestApplicationPcl/TreeView.paml
new file mode 100644
index 0000000000..e4a57400be
--- /dev/null
+++ b/samples/XamlTestApplicationPcl/TreeView.paml
@@ -0,0 +1,19 @@
+<Style xmlns="https://github.com/perspex" Selector="TreeView">
+  <Setter Property="BorderBrush" Value="Black"/>
+  <Setter Property="BorderThickness" Value="1"/>
+  <Setter Property="Template">
+    <ControlTemplate>
+      <Border Background="{TemplateBinding Background}"
+              BorderBrush="{TemplateBinding BorderBrush}"
+              BorderThickness="{TemplateBinding BorderThickness}"
+              Padding="4">
+        <ScrollViewer CanScrollHorizontally="True">
+          <ItemsPresenter Name="PART_ItemsPresenter"
+                          Items="{TemplateBinding Items}"
+                          ItemsPanel="{TemplateBinding ItemsPanel}"
+                          MemberSelector="{TemplateBinding MemberSelector}"/>
+        </ScrollViewer>
+      </Border>
+    </ControlTemplate>
+  </Setter>
+</Style>
\ No newline at end of file
diff --git a/samples/XamlTestApplicationPcl/TreeViewItem.paml b/samples/XamlTestApplicationPcl/TreeViewItem.paml
new file mode 100644
index 0000000000..28ebcb39fa
--- /dev/null
+++ b/samples/XamlTestApplicationPcl/TreeViewItem.paml
@@ -0,0 +1,74 @@
+<Styles xmlns="https://github.com/perspex">
+  <Style Selector="TreeViewItem">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <StackPanel>
+          <Grid ColumnDefinitions="16, Auto">
+            <ToggleButton Name="expander"
+                          Focusable="False"
+                          IsChecked="{TemplateBinding Path=IsExpanded, Mode=TwoWay}"/>
+            <Border Name="header"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Grid.Column="1">
+              <ContentPresenter Name="PART_ContentPresenter"
+                                Content="{TemplateBinding Header}"
+                                Margin="{TemplateBinding Padding}"/>
+            </Border>
+            <!--<Rectangle Name="focus"
+                       IsVisible="{TemplateBinding IsFocused}"
+                       Stroke="Black"
+                       StrokeThickness="1"
+                       StrokeDashArray="1,2"
+                       Grid.Column="1"/>-->
+          </Grid>
+          <ItemsPresenter Name="PART_ItemsPresenter"
+                          IsVisible="{TemplateBinding IsExpanded}"
+                          Items="{TemplateBinding Items}"
+                          ItemsPanel="{TemplateBinding ItemsPanel}"
+                          Margin="24,0,0,0"
+                          MemberSelector="{TemplateBinding MemberSelector}"/>
+        </StackPanel>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+  <Style Selector="TreeViewItem /template/ ToggleButton#expander">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Width="14"
+                Height="12"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center">
+          <Path Fill="Black"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Data="M 0 2 L 4 6 L 0 10 Z"/>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+  <Style Selector="TreeViewItem /template/ Border#header">
+    <Setter Property="Padding" Value="2"/>
+  </Style>
+  
+  <Style Selector="TreeViewItem:selected /template/ Border#header">
+    <Setter Property="Background" Value="#fff0f0f0"/>
+  </Style>
+  
+  <Style Selector="TreeViewItem:selected:focus /template/ Border#header">
+    <Setter Property="Background" Value="#ffd0d0d0"/>
+  </Style>
+  
+  <Style Selector="TreeViewItem /template/ ToggleButton#expander:checked">
+    <Setter Property="RenderTransform">
+      <RotateTransform Angle="45"/>
+    </Setter>
+  </Style>
+
+  <Style Selector="TreeViewItem:empty /template/ ToggleButton#expander">
+    <Setter Property="IsVisible" Value="False"/>
+  </Style>
+</Styles>
\ No newline at end of file
diff --git a/samples/XamlTestApplicationPcl/XamlTestApp.paml b/samples/XamlTestApplicationPcl/XamlTestApp.paml
index 965fe4ee45..2bd6b163c1 100644
--- a/samples/XamlTestApplicationPcl/XamlTestApp.paml
+++ b/samples/XamlTestApplicationPcl/XamlTestApp.paml
@@ -5,6 +5,9 @@
     <StyleInclude Source="resource://application/XamlTestApplicationPcl/XamlTestApplication.Button.paml"/>
     <StyleInclude Source="resource://application/XamlTestApplicationPcl/XamlTestApplication.Carousel.paml"/>
     <StyleInclude Source="resource://application/XamlTestApplicationPcl/XamlTestApplication.CheckBox.paml"/>
+    <StyleInclude Source="resource://application/XamlTestApplicationPcl/XamlTestApplication.ItemsControl.paml"/>
+    <StyleInclude Source="resource://application/XamlTestApplicationPcl/XamlTestApplication.ListBox.paml"/>
+    <StyleInclude Source="resource://application/XamlTestApplicationPcl/XamlTestApplication.ListBoxItem.paml"/>
     <StyleInclude Source="resource://application/XamlTestApplicationPcl/XamlTestApplication.RadioButton.paml"/>
     <StyleInclude Source="resource://application/XamlTestApplicationPcl/XamlTestApplication.ScrollBar.paml"/>
     <StyleInclude Source="resource://application/XamlTestApplicationPcl/XamlTestApplication.ScrollViewer.paml"/>
@@ -13,6 +16,8 @@
     <StyleInclude Source="resource://application/XamlTestApplicationPcl/XamlTestApplication.TabStrip.paml"/>
     <StyleInclude Source="resource://application/XamlTestApplicationPcl/XamlTestApplication.TextBox.paml"/>
     <StyleInclude Source="resource://application/XamlTestApplicationPcl/XamlTestApplication.ToggleButton.paml"/>
+    <StyleInclude Source="resource://application/XamlTestApplicationPcl/XamlTestApplication.TreeView.paml"/>
+    <StyleInclude Source="resource://application/XamlTestApplicationPcl/XamlTestApplication.TreeViewItem.paml"/>
     <StyleInclude Source="resource://application/XamlTestApplicationPcl/XamlTestApplication.Window.paml"/>
   </Application.Styles>
 </Application>
\ No newline at end of file
diff --git a/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj b/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj
index 9849e6cde4..8c61559dce 100644
--- a/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj
+++ b/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj
@@ -151,6 +151,21 @@
     <EmbeddedResource Include="RadioButton.paml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="ItemsControl.paml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ListBox.paml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ListBoxItem.paml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="TreeView.paml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="TreeViewItem.paml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <None Include="packages.config" />
     <EmbeddedResource Include="Button.paml">
       <SubType>Designer</SubType>
diff --git a/src/Perspex.Controls/GridLength.cs b/src/Perspex.Controls/GridLength.cs
index af1aa32d61..43ce1efa4c 100644
--- a/src/Perspex.Controls/GridLength.cs
+++ b/src/Perspex.Controls/GridLength.cs
@@ -210,7 +210,7 @@ namespace Perspex.Controls
         /// <returns>The <see cref="GridLength"/>.</returns>
         public static IEnumerable<GridLength> ParseLengths(string s, CultureInfo culture)
         {
-            return s.Split(new[] { ',', ' ' }).Select(x => Parse(x, culture));
+            return s.Split(new[] { ',', ' ' }, StringSplitOptions.RemoveEmptyEntries).Select(x => Parse(x, culture));
         }
     }
 }
\ No newline at end of file
diff --git a/src/Perspex.Controls/ItemsControl.cs b/src/Perspex.Controls/ItemsControl.cs
index 000f1eae1e..9da2ae45ba 100644
--- a/src/Perspex.Controls/ItemsControl.cs
+++ b/src/Perspex.Controls/ItemsControl.cs
@@ -149,7 +149,7 @@ namespace Perspex.Controls
         /// <inheritdoc/>
         protected override void OnTemplateApplied()
         {
-            Presenter = this.FindTemplateChild<IItemsPresenter>("itemsPresenter");
+            Presenter = this.FindTemplateChild<IItemsPresenter>("PART_ItemsPresenter");
         }
 
         /// <summary>
diff --git a/src/Perspex.Themes.Default/ItemsControlStyle.cs b/src/Perspex.Themes.Default/ItemsControlStyle.cs
index 91565b4471..377afe4cfa 100644
--- a/src/Perspex.Themes.Default/ItemsControlStyle.cs
+++ b/src/Perspex.Themes.Default/ItemsControlStyle.cs
@@ -41,7 +41,7 @@ namespace Perspex.Themes.Default
         {
             return new ItemsPresenter
             {
-                Name = "itemsPresenter",
+                Name = "PART_ItemsPresenter",
                 MemberSelector = control.MemberSelector,
                 [~ItemsPresenter.ItemsProperty] = control[~ItemsControl.ItemsProperty],
                 [~ItemsPresenter.ItemsPanelProperty] = control[~ItemsControl.ItemsPanelProperty],
diff --git a/tests/Perspex.Controls.UnitTests/GridLengthTests.cs b/tests/Perspex.Controls.UnitTests/GridLengthTests.cs
index f90b585d3d..b798e178da 100644
--- a/tests/Perspex.Controls.UnitTests/GridLengthTests.cs
+++ b/tests/Perspex.Controls.UnitTests/GridLengthTests.cs
@@ -87,5 +87,21 @@ namespace Perspex.Controls.UnitTests
                 },
                 result);
         }
+
+        [Fact]
+        public void ParseLengths_Accepts_Comma_Separators_With_Spaces()
+        {
+            var result = GridLength.ParseLengths("*, Auto, 2* ,4", CultureInfo.InvariantCulture).ToList();
+
+            Assert.Equal(
+                new[]
+                {
+                    new GridLength(1, GridUnitType.Star),
+                    GridLength.Auto,
+                    new GridLength(2, GridUnitType.Star),
+                    new GridLength(4, GridUnitType.Pixel),
+                },
+                result);
+        }
     }
 }
diff --git a/tests/Perspex.Controls.UnitTests/ItemsControlTests.cs b/tests/Perspex.Controls.UnitTests/ItemsControlTests.cs
index bb57daa004..e066866a05 100644
--- a/tests/Perspex.Controls.UnitTests/ItemsControlTests.cs
+++ b/tests/Perspex.Controls.UnitTests/ItemsControlTests.cs
@@ -361,7 +361,7 @@ namespace Perspex.Controls.UnitTests
                     Background = new Media.SolidColorBrush(0xffffffff),
                     Child = new ItemsPresenter
                     {
-                        Name = "itemsPresenter",
+                        Name = "PART_ItemsPresenter",
                         MemberSelector = parent.MemberSelector,
                         [~ItemsPresenter.ItemsProperty] = parent[~ItemsControl.ItemsProperty],
                     }
diff --git a/tests/Perspex.Controls.UnitTests/ListBoxTests.cs b/tests/Perspex.Controls.UnitTests/ListBoxTests.cs
index b1baf4b099..0f1a60b902 100644
--- a/tests/Perspex.Controls.UnitTests/ListBoxTests.cs
+++ b/tests/Perspex.Controls.UnitTests/ListBoxTests.cs
@@ -97,7 +97,7 @@ namespace Perspex.Controls.UnitTests
                 Template = new FuncControlTemplate(CreateScrollViewerTemplate),
                 Content = new ItemsPresenter
                 {
-                    Name = "itemsPresenter",
+                    Name = "PART_ItemsPresenter",
                     [~ItemsPresenter.ItemsProperty] = parent.GetObservable(ItemsControl.ItemsProperty),
                 }
             };
diff --git a/tests/Perspex.Controls.UnitTests/ListBoxTests_Single.cs b/tests/Perspex.Controls.UnitTests/ListBoxTests_Single.cs
index 1d77a18af0..a6f02dc27b 100644
--- a/tests/Perspex.Controls.UnitTests/ListBoxTests_Single.cs
+++ b/tests/Perspex.Controls.UnitTests/ListBoxTests_Single.cs
@@ -205,7 +205,7 @@ namespace Perspex.Controls.UnitTests
                 Template = new FuncControlTemplate(CreateScrollViewerTemplate),
                 Content = new ItemsPresenter
                 {
-                    Name = "itemsPresenter",
+                    Name = "PART_ItemsPresenter",
                     [~ItemsPresenter.ItemsProperty] = parent.GetObservable(ItemsControl.ItemsProperty),
                 }
             };
diff --git a/tests/Perspex.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs b/tests/Perspex.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs
index ecdc3def92..d348ab126c 100644
--- a/tests/Perspex.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs
+++ b/tests/Perspex.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs
@@ -434,7 +434,7 @@ namespace Perspex.Controls.UnitTests.Primitives
             return new FuncControlTemplate<SelectingItemsControl>(control =>
                 new ItemsPresenter
                 {
-                    Name = "itemsPresenter",
+                    Name = "PART_ItemsPresenter",
                     [~ItemsPresenter.ItemsProperty] = control[~ItemsControl.ItemsProperty],
                     [~ItemsPresenter.ItemsPanelProperty] = control[~ItemsControl.ItemsPanelProperty],
                 });
diff --git a/tests/Perspex.Controls.UnitTests/TreeViewTests.cs b/tests/Perspex.Controls.UnitTests/TreeViewTests.cs
index 7308b016aa..2db62dd619 100644
--- a/tests/Perspex.Controls.UnitTests/TreeViewTests.cs
+++ b/tests/Perspex.Controls.UnitTests/TreeViewTests.cs
@@ -215,7 +215,7 @@ namespace Perspex.Controls.UnitTests
         {
             return new FuncControlTemplate<TreeView>(parent => new ItemsPresenter
             {
-                Name = "itemsPresenter",
+                Name = "PART_ItemsPresenter",
                 [~ItemsPresenter.ItemsProperty] = parent[~ItemsControl.ItemsProperty],
             });
         }
@@ -224,7 +224,7 @@ namespace Perspex.Controls.UnitTests
         {
             return new FuncControlTemplate<TreeViewItem>(parent => new ItemsPresenter
             {
-                Name = "itemsPresenter",
+                Name = "PART_ItemsPresenter",
                 [~ItemsPresenter.ItemsProperty] = parent[~ItemsControl.ItemsProperty],
             });
         }