diff --git a/samples/XamlTestApplicationPcl/TextBox.paml b/samples/XamlTestApplicationPcl/TextBox.paml
index 6d19cdbedd..322f90499c 100644
--- a/samples/XamlTestApplicationPcl/TextBox.paml
+++ b/samples/XamlTestApplicationPcl/TextBox.paml
@@ -27,8 +27,7 @@
                 <TextBlock Name="watermark"
                            Opacity="0.5"
                            Text="{TemplateBinding Watermark}"
-                           IsVisible="{TemplateBinding Path=Text, Converter={Static local:StringNullOrEmpty.Instance}}">
-                </TextBlock>
+                           IsVisible="{TemplateBinding Path=Text, Converter={Static local:StringNullOrEmpty.Instance}}"/>
                 <TextPresenter Name="PART_TextPresenter"
                                CaretIndex="{TemplateBinding CaretIndex}"
                                SelectionStart="{TemplateBinding SelectionStart}"
diff --git a/src/Markup/Perspex.Markup.Xaml/MarkupExtensions/BindingExtension.cs b/src/Markup/Perspex.Markup.Xaml/MarkupExtensions/BindingExtension.cs
index fc805c29cd..4c5f8bc283 100644
--- a/src/Markup/Perspex.Markup.Xaml/MarkupExtensions/BindingExtension.cs
+++ b/src/Markup/Perspex.Markup.Xaml/MarkupExtensions/BindingExtension.cs
@@ -6,25 +6,29 @@ using Perspex.Markup.Xaml.Data;
 
 namespace Perspex.Markup.Xaml.MarkupExtensions
 {
-    public class RelativeSourceExtension : MarkupExtension
+    public class BindingExtension : MarkupExtension
     {
-        public RelativeSourceExtension()
+        public BindingExtension()
         {
         }
 
-        public RelativeSourceExtension(RelativeSourceMode mode)
+        public BindingExtension(string path)
         {
-            Mode = mode;
+            Path = path;
         }
 
         public override object ProvideValue(MarkupExtensionContext extensionContext)
         {
-            return new RelativeSource
+            return new Binding
             {
+                Converter = Converter,
                 Mode = Mode,
+                SourcePropertyPath = Path,
             };
         }
 
-        public RelativeSourceMode Mode { get; set; }
+        public IValueConverter Converter { get; set; }
+        public BindingMode Mode { get; set; }
+        public string Path { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Markup/Perspex.Markup.Xaml/MarkupExtensions/RelativeSourceExtension.cs b/src/Markup/Perspex.Markup.Xaml/MarkupExtensions/RelativeSourceExtension.cs
index dfa0e322d2..fc805c29cd 100644
--- a/src/Markup/Perspex.Markup.Xaml/MarkupExtensions/RelativeSourceExtension.cs
+++ b/src/Markup/Perspex.Markup.Xaml/MarkupExtensions/RelativeSourceExtension.cs
@@ -6,28 +6,25 @@ using Perspex.Markup.Xaml.Data;
 
 namespace Perspex.Markup.Xaml.MarkupExtensions
 {
-    public class BindingExtension : MarkupExtension
+    public class RelativeSourceExtension : MarkupExtension
     {
-        public BindingExtension()
+        public RelativeSourceExtension()
         {
         }
 
-        public BindingExtension(string path)
+        public RelativeSourceExtension(RelativeSourceMode mode)
         {
-            Path = path;
+            Mode = mode;
         }
 
         public override object ProvideValue(MarkupExtensionContext extensionContext)
         {
-            return new Data.Binding
+            return new RelativeSource
             {
                 Mode = Mode,
-                SourcePropertyPath = Path,
             };
         }
 
-        public object Converter { get; set; }
-        public BindingMode Mode { get; set; }
-        public string Path { get; set; }
+        public RelativeSourceMode Mode { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Markup/Perspex.Markup.Xaml/MarkupExtensions/TemplateBindingExtension.cs b/src/Markup/Perspex.Markup.Xaml/MarkupExtensions/TemplateBindingExtension.cs
index c4967d60cb..0fdd5339cf 100644
--- a/src/Markup/Perspex.Markup.Xaml/MarkupExtensions/TemplateBindingExtension.cs
+++ b/src/Markup/Perspex.Markup.Xaml/MarkupExtensions/TemplateBindingExtension.cs
@@ -21,6 +21,7 @@ namespace Perspex.Markup.Xaml.MarkupExtensions
         {
             return new Data.Binding
             {
+                Converter = Converter,
                 Mode = Mode,
                 Priority = BindingPriority.TemplatedParent,
                 RelativeSource = new RelativeSource(RelativeSourceMode.TemplatedParent),
@@ -28,7 +29,7 @@ namespace Perspex.Markup.Xaml.MarkupExtensions
             };
         }
 
-        public object Converter { get; set; }
+        public IValueConverter Converter { get; set; }
         public BindingMode Mode { get; set; }
         public string Path { get; set; }
     }