diff --git a/samples/BindingTest/MainWindow.paml b/samples/BindingTest/MainWindow.paml
index 3a378fcd24..3293f6d4f9 100644
--- a/samples/BindingTest/MainWindow.paml
+++ b/samples/BindingTest/MainWindow.paml
@@ -4,9 +4,9 @@
     <TabItem Header="Basic">
       <StackPanel Orientation="Vertical">
         <StackPanel Orientation="Horizontal">
-          <StackPanel Margin="18" Gap="4" Width="200">
+          <StackPanel Margin="18" Gap="4" Width="200">x
             <TextBlock FontSize="16" Text="Simple Bindings"/>
-            <TextBox Watermark="Two Way" UseFloatingWatermark="True" Text="{Binding Path=StringValue}"/>
+            <TextBox Watermark="Two Way" UseFloatingWatermark="True" Text="{xBinding Path=StringValue}"/>
             <TextBox Watermark="One Way" UseFloatingWatermark="True" Text="{Binding Path=StringValue, Mode=OneWay}"/>
             <TextBox Watermark="One Time" UseFloatingWatermark="True" Text="{Binding Path=StringValue, Mode=OneTime}"/>
             <TextBox Watermark="One Way To Source" UseFloatingWatermark="True" Text="{Binding Path=StringValue, Mode=OneWayToSource}"/>
diff --git a/src/Markup/Perspex.Markup.Xaml/OmniXAML b/src/Markup/Perspex.Markup.Xaml/OmniXAML
index 06f74f30af..7cab30177d 160000
--- a/src/Markup/Perspex.Markup.Xaml/OmniXAML
+++ b/src/Markup/Perspex.Markup.Xaml/OmniXAML
@@ -1 +1 @@
-Subproject commit 06f74f30af7945467101fad95a1759a5b70a2b55
+Subproject commit 7cab30177dbcb75777815c6629966034fa30ed96
diff --git a/src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj b/src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj
index 60046e001c..f9cbe13deb 100644
--- a/src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj
+++ b/src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj
@@ -116,9 +116,10 @@
     <Compile Include="OmniXAML\Source\OmniXaml\ITypeProvider.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\IValueConverter.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\IWiringContext.cs" />
-    <Compile Include="OmniXAML\Source\OmniXaml\IXamlLoader.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\IXamlParser.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\IXamlParserFactory.cs" />
+    <Compile Include="OmniXAML\Source\OmniXaml\IXamlXmlLoader.cs" />
+    <Compile Include="OmniXAML\Source\OmniXaml\LoadMixin.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\LookaheadBuffer.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\MarkupExtension.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\MarkupExtensionContext.cs" />
@@ -170,7 +171,6 @@
     <Compile Include="OmniXAML\Source\OmniXaml\Parsers\ProtoParser\IXmlReader.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\Parsers\ProtoParser\NodeType.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\Parsers\ProtoParser\NsPrefix.cs" />
-    <Compile Include="OmniXAML\Source\OmniXaml\Parsers\ProtoParser\ProtoXamlInstructionExtensions.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\Parsers\ProtoParser\UnprocessedAttributeBase.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\Parsers\ProtoParser\XamlProtoInstructionParser.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\Parsers\ProtoParser\XmlCompatibilityReader.cs" />
@@ -232,9 +232,9 @@
     <Compile Include="OmniXAML\Source\OmniXaml\WiringContext.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\XamlInstruction.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\XamlInstructionType.cs" />
-    <Compile Include="OmniXAML\Source\OmniXaml\XamlLoader.cs" />
-    <Compile Include="OmniXAML\Source\OmniXaml\XamlLoaderExtensions.cs" />
+    <Compile Include="OmniXAML\Source\OmniXaml\XamlLoadException.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\XamlParseException.cs" />
+    <Compile Include="OmniXAML\Source\OmniXaml\XamlXmlLoader.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\XamlXmlParser.cs" />
     <Compile Include="Parsers\SelectorParser.cs" />
     <Compile Include="Parsers\SelectorGrammar.cs" />
diff --git a/src/Markup/Perspex.Markup.Xaml/PerspexXamlLoader.cs b/src/Markup/Perspex.Markup.Xaml/PerspexXamlLoader.cs
index 3ed26ee3a5..cfdd6c1da1 100644
--- a/src/Markup/Perspex.Markup.Xaml/PerspexXamlLoader.cs
+++ b/src/Markup/Perspex.Markup.Xaml/PerspexXamlLoader.cs
@@ -14,7 +14,7 @@ namespace Perspex.Markup.Xaml
     /// <summary>
     /// Loads XAML for a perspex application.
     /// </summary>
-    public class PerspexXamlLoader : XamlLoader
+    public class PerspexXamlLoader : XamlXmlLoader
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="PerspexXamlLoader"/> class.