diff --git a/ReactWindows/Playground/App.xaml b/ReactWindows/Playground/App.xaml
index 33929dda240..1db0328c427 100644
--- a/ReactWindows/Playground/App.xaml
+++ b/ReactWindows/Playground/App.xaml
@@ -4,5 +4,4 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:Playground"
     RequestedTheme="Light">
-
 </Application>
diff --git a/ReactWindows/ReactNative.Tests/ReactNative.Tests.csproj b/ReactWindows/ReactNative.Tests/ReactNative.Tests.csproj
index 2de50f43ac3..867e3d2a92a 100644
--- a/ReactWindows/ReactNative.Tests/ReactNative.Tests.csproj
+++ b/ReactWindows/ReactNative.Tests/ReactNative.Tests.csproj
@@ -181,6 +181,32 @@
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <NoStdLib>true</NoStdLib>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/ReactWindows/ReactNative.sln b/ReactWindows/ReactNative.sln
index b27578ddf15..101f86ce18f 100644
--- a/ReactWindows/ReactNative.sln
+++ b/ReactWindows/ReactNative.sln
@@ -38,6 +38,8 @@ Global
 		{C7673AD5-E3AA-468C-A5FD-FA38154E205C}.Release|x86.ActiveCfg = Release|x86
 		{C7673AD5-E3AA-468C-A5FD-FA38154E205C}.Release|x86.Build.0 = Release|x86
 		{D52267B5-396F-424A-BB26-C9E750032846}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{D52267B5-396F-424A-BB26-C9E750032846}.Debug|Any CPU.Build.0 = Debug|x86
+		{D52267B5-396F-424A-BB26-C9E750032846}.Debug|Any CPU.Deploy.0 = Debug|x86
 		{D52267B5-396F-424A-BB26-C9E750032846}.Debug|ARM.ActiveCfg = Debug|ARM
 		{D52267B5-396F-424A-BB26-C9E750032846}.Debug|ARM.Build.0 = Debug|ARM
 		{D52267B5-396F-424A-BB26-C9E750032846}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -57,7 +59,9 @@ Global
 		{D52267B5-396F-424A-BB26-C9E750032846}.Release|x86.ActiveCfg = Release|x86
 		{D52267B5-396F-424A-BB26-C9E750032846}.Release|x86.Build.0 = Release|x86
 		{D52267B5-396F-424A-BB26-C9E750032846}.Release|x86.Deploy.0 = Release|x86
-		{5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
 		{5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.Debug|ARM.ActiveCfg = Debug|ARM
 		{5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.Debug|ARM.Build.0 = Debug|ARM
 		{5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -67,7 +71,9 @@ Global
 		{5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.Debug|x86.ActiveCfg = Debug|x86
 		{5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.Debug|x86.Build.0 = Debug|x86
 		{5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.Debug|x86.Deploy.0 = Debug|x86
-		{5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.Release|Any CPU.ActiveCfg = Release|x86
+		{5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.Release|Any CPU.Deploy.0 = Release|Any CPU
 		{5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.Release|ARM.ActiveCfg = Release|ARM
 		{5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.Release|ARM.Build.0 = Release|ARM
 		{5AC8108B-1C39-4C4A-8653-DBBE4ECCE691}.Release|ARM.Deploy.0 = Release|ARM
diff --git a/ReactWindows/ReactNative/ReactNative.csproj b/ReactWindows/ReactNative/ReactNative.csproj
index 0be8d9a4354..76beb576a35 100644
--- a/ReactWindows/ReactNative/ReactNative.csproj
+++ b/ReactWindows/ReactNative/ReactNative.csproj
@@ -159,6 +159,7 @@
     <Compile Include="UIManager\BorderedContentControl.cs" />
     <Compile Include="UIManager\ColorHelpers.cs" />
     <Compile Include="UIManager\CSSNodeExtensions.cs" />
+    <Compile Include="UIManager\BorderedContentControl.DependencyProperties.cs" />
     <Compile Include="UIManager\Events\IOnIntercepTextGotFocusEventListener.cs" />
     <Compile Include="UIManager\Events\IOnInterceptTextInputEventListener.cs" />
     <Compile Include="LifecycleState.cs" />
@@ -293,6 +294,12 @@
       <HintPath>..\References\Facebook.CSSLayout.dll</HintPath>
     </Reference>
   </ItemGroup>
+  <ItemGroup>
+    <Page Include="Themes\Generic.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
diff --git a/ReactWindows/ReactNative/ReactRootView.cs b/ReactWindows/ReactNative/ReactRootView.cs
index ec66892ee29..d397799b50e 100644
--- a/ReactWindows/ReactNative/ReactRootView.cs
+++ b/ReactWindows/ReactNative/ReactRootView.cs
@@ -1,10 +1,6 @@
 using ReactNative.Bridge;
 using ReactNative.UIManager;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Windows.UI.Xaml;
 using Windows.Foundation;
 
diff --git a/ReactWindows/ReactNative/Themes/Generic.xaml b/ReactWindows/ReactNative/Themes/Generic.xaml
new file mode 100644
index 00000000000..4549b3ec208
--- /dev/null
+++ b/ReactWindows/ReactNative/Themes/Generic.xaml
@@ -0,0 +1,43 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:ReactNative.UIManager">
+    <Style TargetType="local:BorderedContentControl">
+        <Setter Property="HorizontalContentAlignment" Value="Left"/>
+        <Setter Property="VerticalContentAlignment" Value="Top"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="local:BorderedContentControl">
+                    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                        <Path x:Name="LeftBorderPath"
+                              Stroke="{TemplateBinding LeftBorderBrush}" 
+                              StrokeThickness="{TemplateBinding LeftBorderWidth}"
+                              Data="{TemplateBinding LeftBorderGeometry}">
+                        </Path>
+                        <Path x:Name="TopBorderPath"
+                              Stroke="{TemplateBinding TopBorderBrush}" 
+                              StrokeThickness="{TemplateBinding TopBorderWidth}"
+                              Data="{TemplateBinding TopBorderGeometry}">
+                        </Path>
+                        <Path x:Name="RightBorderPath"
+                              Stroke="{TemplateBinding RightBorderBrush}" 
+                              StrokeThickness="{TemplateBinding RightBorderWidth}"
+                              Data="{TemplateBinding RightBorderGeometry}">
+                        </Path>
+                        <Path x:Name="BottomBorderPath"
+                              Stroke="{TemplateBinding BottomBorderBrush}" 
+                              StrokeThickness="{TemplateBinding BottomBorderWidth}"
+                              Data="{TemplateBinding BottomBorderGeometry}">
+                        </Path>
+                        <ContentPresenter Content="{TemplateBinding Content}"
+                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                              Margin="{TemplateBinding Padding}"
+                              ContentTransitions="{TemplateBinding ContentTransitions}"
+                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
diff --git a/ReactWindows/ReactNative/UIManager/BorderedContentControl.DependencyProperties.cs b/ReactWindows/ReactNative/UIManager/BorderedContentControl.DependencyProperties.cs
new file mode 100644
index 00000000000..eed83490599
--- /dev/null
+++ b/ReactWindows/ReactNative/UIManager/BorderedContentControl.DependencyProperties.cs
@@ -0,0 +1,201 @@
+using Windows.UI;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Media;
+
+namespace ReactNative.UIManager
+{
+    public partial class BorderedContentControl
+    {
+        #region DependencyProperties
+        public static DependencyProperty CornerRadiusProperty { get; } = DependencyProperty.Register("CornerRadius",
+            typeof(CornerRadius),
+            typeof(BorderedContentControl),
+            new PropertyMetadata(null));
+
+        /// <summary>
+        /// Gets or sets the corner radius of the control.
+        /// </summary>
+        public CornerRadius CornerRadius
+        {
+            get { return (CornerRadius)GetValue(CornerRadiusProperty); }
+            set { SetValue(CornerRadiusProperty, value); }
+        }
+
+        #region Left Border
+        public static DependencyProperty LeftBorderGeometryProperty { get; } = DependencyProperty.Register(nameof(LeftBorderGeometry),
+            typeof(GeometryGroup),
+            typeof(BorderedContentControl),
+            new PropertyMetadata(null));
+
+        /// <summary>
+        /// Gets or sets the geometry used for the left component of the border.
+        /// </summary>
+        public GeometryGroup LeftBorderGeometry
+        {
+            get { return (GeometryGroup)GetValue(LeftBorderGeometryProperty); }
+            set { SetValue(LeftBorderGeometryProperty, value); }
+        }
+
+        public static DependencyProperty LeftBorderWidthProperty { get; } = DependencyProperty.Register(nameof(LeftBorderWidth),
+            typeof(double),
+            typeof(BorderedContentControl),
+            new PropertyMetadata(0.0));
+
+        /// <summary>
+        /// Gets or sets the border width of the left component of the border.
+        /// </summary>
+        public double LeftBorderWidth
+        {
+            get { return (double)GetValue(LeftBorderWidthProperty); }
+            set { SetValue(LeftBorderWidthProperty, value); }
+        }
+
+        public static DependencyProperty LeftBorderBrushProperty { get; } = DependencyProperty.Register(nameof(LeftBorderBrush),
+            typeof(Brush),
+            typeof(BorderedContentControl),
+            new PropertyMetadata(new SolidColorBrush(Colors.Black)));
+
+        /// <summary>
+        /// Gets or sets the brush for the left border component.
+        /// </summary>
+        public Brush LeftBorderBrush
+        {
+            get { return (Brush)GetValue(LeftBorderBrushProperty); }
+            set { SetValue(LeftBorderBrushProperty, value); }
+        }
+        #endregion
+
+        #region TopBorder
+        public static DependencyProperty TopBorderGeometryProperty { get; } = DependencyProperty.Register(nameof(TopBorderGeometry),
+            typeof(GeometryGroup),
+            typeof(BorderedContentControl),
+            new PropertyMetadata(null));
+
+        /// <summary>
+        /// Gets or sets the geometry used for the top component of the border.
+        /// </summary>
+        public GeometryGroup TopBorderGeometry
+        {
+            get { return (GeometryGroup)GetValue(TopBorderGeometryProperty); }
+            set { SetValue(TopBorderGeometryProperty, value); }
+        }
+
+        public static DependencyProperty TopBorderWidthProperty { get; } = DependencyProperty.Register(nameof(TopBorderWidth),
+            typeof(double),
+            typeof(BorderedContentControl),
+            new PropertyMetadata(0.0));
+
+        /// <summary>
+        /// Gets or sets the border width of the top component of the border.
+        /// </summary>
+        public double TopBorderWidth
+        {
+            get { return (double)GetValue(TopBorderWidthProperty); }
+            set { SetValue(TopBorderWidthProperty, value); }
+        }
+
+        public static DependencyProperty TopBorderBrushProperty { get; } = DependencyProperty.Register("TopBorderBrush",
+            typeof(Brush),
+            typeof(BorderedContentControl),
+            new PropertyMetadata(new SolidColorBrush(Colors.Black)));
+
+        /// <summary>
+        /// Gets or sets the brush for the top border component.
+        /// </summary>
+        public Brush TopBorderBrush
+        {
+            get { return (Brush)GetValue(TopBorderBrushProperty); }
+            set { SetValue(TopBorderBrushProperty, value); }
+        }
+        #endregion
+
+        #region RightBorder
+        public static DependencyProperty RightBorderGeometryProperty { get; } = DependencyProperty.Register(nameof(RightBorderGeometry),
+            typeof(GeometryGroup),
+            typeof(BorderedContentControl),
+            new PropertyMetadata(null));
+
+        /// <summary>
+        /// Gets or sets the geometry used for the right component of the border.
+        /// </summary>
+        public GeometryGroup RightBorderGeometry
+        {
+            get { return (GeometryGroup)GetValue(RightBorderGeometryProperty); }
+            set { SetValue(RightBorderGeometryProperty, value); }
+        }
+
+        public static DependencyProperty RightBorderWidthProperty { get; } = DependencyProperty.Register(nameof(RightBorderWidth),
+            typeof(double),
+            typeof(BorderedContentControl),
+            new PropertyMetadata(0.0));
+
+        /// <summary>
+        /// Gets or sets the border width of the right component of the border.
+        /// </summary>
+        public double RightBorderWidth
+        {
+            get { return (double)GetValue(RightBorderWidthProperty); }
+            set { SetValue(RightBorderWidthProperty, value); }
+        }
+
+        public static DependencyProperty RightBorderBrushProperty { get; } = DependencyProperty.Register(nameof(RightBorderBrush),
+            typeof(Brush),
+            typeof(BorderedContentControl),
+            new PropertyMetadata(new SolidColorBrush(Colors.Black)));
+
+        /// <summary>
+        /// Gets or sets the brush for the right border component.
+        /// </summary>
+        public Brush RightBorderBrush
+        {
+            get { return (Brush)GetValue(RightBorderBrushProperty); }
+            set { SetValue(RightBorderBrushProperty, value); }
+        }
+        #endregion
+
+        #region BottomBorder
+        public static DependencyProperty BottomBorderGeometryProperty { get; } = DependencyProperty.Register(nameof(BottomBorderGeometry),
+             typeof(GeometryGroup),
+             typeof(BorderedContentControl),
+             new PropertyMetadata(null));
+
+        /// <summary>
+        /// Gets or sets the geometry used for the bottom component of the border.
+        /// </summary>
+        public GeometryGroup BottomBorderGeometry
+        {
+            get { return (GeometryGroup)GetValue(BottomBorderGeometryProperty); }
+            set { SetValue(BottomBorderGeometryProperty, value); }
+        }
+
+        public static DependencyProperty BottomBorderWidthProperty { get; } = DependencyProperty.Register(nameof(BottomBorderWidth),
+            typeof(double),
+            typeof(BorderedContentControl),
+            new PropertyMetadata(0.0));
+
+        /// <summary>
+        /// Gets or sets the border width of the bottom component of the border.
+        /// </summary>
+        public double BottomBorderWidth
+        {
+            get { return (double)GetValue(BottomBorderWidthProperty); }
+            set { SetValue(BottomBorderWidthProperty, value); }
+        }
+
+        public static DependencyProperty BottomBorderBrushProperty { get; } = DependencyProperty.Register(nameof(BottomBorderBrush),
+            typeof(Brush),
+            typeof(BorderedContentControl),
+            new PropertyMetadata(new SolidColorBrush(Colors.Black)));
+
+        /// <summary>
+        /// Gets or sets the brush for the bottom component of the border.
+        /// </summary>
+        public Brush BottomBorderBrush
+        {
+            get { return (Brush)GetValue(BottomBorderBrushProperty); }
+            set { SetValue(BottomBorderBrushProperty, value); }
+        }
+        #endregion
+        #endregion
+    }
+}
diff --git a/ReactWindows/ReactNative/UIManager/BorderedContentControl.cs b/ReactWindows/ReactNative/UIManager/BorderedContentControl.cs
index 9c0f5f51500..800d4958fba 100644
--- a/ReactWindows/ReactNative/UIManager/BorderedContentControl.cs
+++ b/ReactWindows/ReactNative/UIManager/BorderedContentControl.cs
@@ -1,5 +1,6 @@
 using Facebook.CSSLayout;
-using System.Diagnostics;
+using System.Numerics;
+using Windows.Foundation;
 using Windows.UI;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
@@ -10,60 +11,15 @@ namespace ReactNative.UIManager
     /// <summary>
     /// A single child control for managing a border.
     /// </summary>
-    public class BorderedContentControl : ContentControl
+    public partial class BorderedContentControl : ContentControl
     {
-        private static readonly SolidColorBrush s_defaultBorderBrush = new SolidColorBrush(Colors.Black);
-
-        private Border _customBorder;
-        private Border _customLeftBorder;
-        private Border _customRightBorder;
-        private Border _customTopBorder;
-        private Border _customBottomBorder;
-
         /// <summary>
         /// Instantiates the <see cref="BorderedContentControl"/>.
         /// </summary>
-        /// <param name="content">The content.</param>
-        public BorderedContentControl(object content)
+        public BorderedContentControl()
         {
             DefaultStyleKey = typeof(BorderedContentControl);
-            BorderBrush = s_defaultBorderBrush;
-            base.Content = content;
-        }
-
-        private bool HasCustomBorder
-        {
-            get
-            {
-                return _customBorder != null ||
-                    _customLeftBorder != null ||
-                    _customRightBorder != null ||
-                    _customTopBorder != null ||
-                    _customBottomBorder != null;
-            }
-        }
-
-        /// <summary>
-        /// An intentional override of the <see cref="ContentControl.Content"/>
-        /// property that returns the child without any borders.
-        /// </summary>
-        public new UIElement Content
-        {
-            get
-            {
-                if (!HasCustomBorder)
-                {
-                    return (UIElement)base.Content;
-                }
-                else if (_customBorder != null)
-                {
-                    return _customBorder.Child;
-                }
-                else
-                {
-                    return _customBottomBorder.Child;
-                }
-            }
+            SizeChanged += BorderedContentControl_SizeChanged;
         }
 
         /// <summary>
@@ -72,19 +28,11 @@ private bool HasCustomBorder
         /// <param name="width">The width.</param>
         public void SetBorderWidth(double width)
         {
-            EnsureBorder();
-
-            if (_customBorder != null)
-            {
-                _customBorder.BorderThickness = new Thickness(width);
-            }
-            else if (_customBorder == null)
-            {
-                _customLeftBorder.BorderThickness = new Thickness(width, 0, 0, 0);
-                _customTopBorder.BorderThickness = new Thickness(0, width, 0, 0);
-                _customRightBorder.BorderThickness = new Thickness(0, 0, width, 0);
-                _customBottomBorder.BorderThickness = new Thickness(0, 0, 0, width);
-            }
+            LeftBorderWidth = width;
+            TopBorderWidth = width;
+            RightBorderWidth = width;
+            BottomBorderWidth = width;
+            Padding = new Thickness(width);
         }
 
         /// <summary>
@@ -98,49 +46,29 @@ public void SetBorderWidth(CSSSpacingType kind, double width)
             {
                 SetBorderWidth(width);
             }
-
-            EnsureBorder();
-
-            if (_customBorder != null)
-            {
-                var thickness = _customBorder.BorderThickness;
-                switch (kind)
-                {
-                    case CSSSpacingType.Left:
-                        thickness.Left = width;
-                        break;
-                    case CSSSpacingType.Top:
-                        thickness.Top = width;
-                        break;
-                    case CSSSpacingType.Right:
-                        thickness.Right = width;
-                        break;
-                    case CSSSpacingType.Bottom:
-                        thickness.Bottom = width;
-                        break;
-                    case CSSSpacingType.All:
-                        thickness = new Thickness(width);
-                        break;
-                }
-                _customBorder.BorderThickness = thickness;
-            }
             else
             {
+                var padding = Padding;
                 switch (kind)
                 {
                     case CSSSpacingType.Left:
-                        _customLeftBorder.BorderThickness = new Thickness(width, 0, 0, 0);
+                        LeftBorderWidth = width;
+                        padding.Left = width;
                         break;
                     case CSSSpacingType.Top:
-                        _customTopBorder.BorderThickness = new Thickness(0, width, 0, 0);
+                        TopBorderWidth = width;
+                        padding.Top = width;
                         break;
                     case CSSSpacingType.Right:
-                        _customRightBorder.BorderThickness = new Thickness(0, 0, width, 0);
+                        RightBorderWidth = width;
+                        padding.Right = width;
                         break;
                     case CSSSpacingType.Bottom:
-                        _customBottomBorder.BorderThickness = new Thickness(0, 0, 0, width);
+                        BottomBorderWidth = width;
+                        padding.Bottom = width;
                         break;
                 }
+                Padding = padding;
             }
         }
 
@@ -150,26 +78,11 @@ public void SetBorderWidth(CSSSpacingType kind, double width)
         /// <param name="color">The masked color.</param>
         public void SetBorderColor(uint color)
         {
-            EnsureBorder();
-
             var brush = new SolidColorBrush(ColorHelpers.Parse(color));
-
-            if (_customBorder != null)
-            {
-                _customBorder.BorderBrush = brush;
-            }
-            else
-            {
-                Debug.Assert(_customLeftBorder != null);
-                Debug.Assert(_customTopBorder != null);
-                Debug.Assert(_customRightBorder != null);
-                Debug.Assert(_customBottomBorder != null);
-
-                _customLeftBorder.BorderBrush = brush;
-                _customTopBorder.BorderBrush = brush;
-                _customRightBorder.BorderBrush = brush;
-                _customBottomBorder.BorderBrush = brush;
-            }
+            LeftBorderBrush = brush;
+            TopBorderBrush = brush;
+            RightBorderBrush = brush;
+            BottomBorderBrush = brush;
         }
 
         /// <summary>
@@ -187,21 +100,19 @@ public void SetBorderColor(CSSSpacingType kind, uint color)
             {
                 var brush = new SolidColorBrush(ColorHelpers.Parse(color));
 
-                EnsureSideBorders();
-
                 switch (kind)
                 {
                     case CSSSpacingType.Left:
-                        _customLeftBorder.BorderBrush = brush;
+                        LeftBorderBrush = brush;
                         break;
                     case CSSSpacingType.Top:
-                        _customTopBorder.BorderBrush = brush;
+                        TopBorderBrush = brush;
                         break;
                     case CSSSpacingType.Right:
-                        _customRightBorder.BorderBrush = brush;
+                        RightBorderBrush = brush;
                         break;
                     case CSSSpacingType.Bottom:
-                        _customBottomBorder.BorderBrush = brush;
+                        BottomBorderBrush = brush;
                         break;
                 }
             }
@@ -213,86 +124,167 @@ public void SetBorderColor(CSSSpacingType kind, uint color)
         /// <param name="radius">The radius.</param>
         public void SetBorderRadius(double radius)
         {
-            var cornerRadius = new CornerRadius(radius);
+            CornerRadius = new CornerRadius(radius);
+        }
 
-            EnsureBorder();
-            
-            if (_customBorder != null)
-            {
-                _customBorder.CornerRadius = cornerRadius;
-            }
-            else
-            {
-                Debug.Assert(_customLeftBorder != null);
-                Debug.Assert(_customTopBorder != null);
-                Debug.Assert(_customRightBorder != null);
-                Debug.Assert(_customBottomBorder != null);
-
-                _customLeftBorder.CornerRadius = new CornerRadius(radius, 0, 0, 0);
-                _customTopBorder.CornerRadius = new CornerRadius(0, radius, 0, 0);
-                _customRightBorder.CornerRadius = new CornerRadius(0, 0, radius, 0);
-                _customBottomBorder.CornerRadius = new CornerRadius(0, 0, 0, radius);
-            }
+        private void BorderedContentControl_SizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            LayoutBorderGeometry(e.NewSize);
         }
 
-        private void EnsureBorder()
+        private void LayoutBorderGeometry(Size newSize)
         {
-            if (HasCustomBorder)
+            var upperLeftLowerPoint = new Point(LeftBorderWidth / 2, (TopBorderWidth / 2) + CornerRadius.TopLeft);
+            var upperLeftUpperPoint = new Point((LeftBorderWidth / 2) + CornerRadius.TopLeft, TopBorderWidth / 2);
+            var upperLeftCenterPoint = new Point((LeftBorderWidth / 2) + CornerRadius.TopLeft, (TopBorderWidth / 2) + CornerRadius.TopLeft);
+
+            var upperRightUpperPoint = new Point(newSize.Width - ((RightBorderWidth / 2) + CornerRadius.TopRight), TopBorderWidth / 2);
+            var upperRightLowerPoint = new Point(newSize.Width - (RightBorderWidth / 2), (TopBorderWidth / 2) + CornerRadius.TopRight);
+            var upperRightCenterPoint = new Point(newSize.Width - ((RightBorderWidth / 2) + CornerRadius.TopRight), (TopBorderWidth / 2) + CornerRadius.TopRight);
+
+            var lowerRightUpperPoint = new Point(newSize.Width - (RightBorderWidth / 2), newSize.Height - ((BottomBorderWidth / 2) + CornerRadius.BottomRight));
+            var lowerRigthLowerPoint = new Point(newSize.Width - ((RightBorderWidth / 2) + CornerRadius.BottomRight), newSize.Height - (BottomBorderWidth / 2));
+            var lowerRightCenterPoint = new Point(newSize.Width - ((RightBorderWidth / 2) + CornerRadius.BottomRight), newSize.Height - ((BottomBorderWidth / 2) + CornerRadius.BottomRight));
+
+            var lowerLeftLowerPoint = new Point((LeftBorderWidth / 2) + CornerRadius.BottomLeft, newSize.Height - (BottomBorderWidth / 2));
+            var lowerLeftUpperPoint = new Point(LeftBorderWidth / 2, newSize.Height - ((BottomBorderWidth / 2) + CornerRadius.BottomLeft));
+            var lowerLeftCenterPoint = new Point((LeftBorderWidth / 2) + CornerRadius.TopLeft, newSize.Height - ((BottomBorderWidth / 2) + CornerRadius.BottomRight));
+
+            // left geometry
+            var leftGeometry = new GeometryGroup();
+
+            // upper left lower corner
+            leftGeometry.Children.Add(CreateCornerGeometry(upperLeftLowerPoint,
+                    upperLeftUpperPoint,
+                    upperLeftCenterPoint,
+                    CornerRadius.TopLeft,
+                    SweepDirection.Clockwise));
+
+            leftGeometry.Children.Add(new LineGeometry()
             {
-                return;
-            }
+                StartPoint = upperLeftLowerPoint,
+                EndPoint = lowerLeftUpperPoint
+            });
 
-            var inner = Content;
-            base.Content = null;
-            _customBorder = new Border();
-            _customBorder.BorderThickness = BorderThickness;
-            _customBorder.BorderBrush = BorderBrush;
-            base.Content = _customBorder;
-            _customBorder.Child = inner;
-        }
+            // lower left upper half
+            leftGeometry.Children.Add(CreateCornerGeometry(lowerLeftUpperPoint,
+                    lowerLeftLowerPoint,
+                    lowerLeftCenterPoint,
+                    CornerRadius.BottomLeft,
+                    SweepDirection.Counterclockwise));
 
-        private void EnsureSideBorders()
-        {
-            if (HasCustomBorder && _customBorder == null)
+            LeftBorderGeometry = leftGeometry;
+
+            // top geometry
+            var topGeometry = new GeometryGroup();
+
+            // upper left upper half
+            topGeometry.Children.Add(CreateCornerGeometry(upperLeftUpperPoint,
+                    upperLeftLowerPoint,
+                    upperLeftCenterPoint,
+                    CornerRadius.TopLeft,
+                    SweepDirection.Counterclockwise));
+
+            topGeometry.Children.Add(new LineGeometry()
             {
-                return;
-            }
+                StartPoint = upperLeftUpperPoint,
+                EndPoint = upperRightUpperPoint
+            });
 
-            _customLeftBorder = new Border();
-            _customRightBorder = new Border();
-            _customTopBorder = new Border();
-            _customBottomBorder = new Border();
+            // upper right upper half
+            topGeometry.Children.Add(CreateCornerGeometry(upperRightUpperPoint,
+                    upperRightLowerPoint,
+                    upperRightCenterPoint,
+                    CornerRadius.TopRight,
+                    SweepDirection.Clockwise));
 
-            _customLeftBorder.Child = _customTopBorder;
-            _customTopBorder.Child = _customRightBorder;
-            _customRightBorder.Child = _customBottomBorder;
+            TopBorderGeometry = topGeometry;
 
-            var borderThickness = _customBorder != null ? _customBorder.BorderThickness : BorderThickness;
-            var cornerRadius = _customBorder != null ? _customBorder.CornerRadius : new CornerRadius();
-            var borderBrush = _customBorder != null ? _customBorder.BorderBrush : BorderBrush;
-            var child = _customBorder != null ? _customBorder.Child : (UIElement)Content;
+            // right geometry
+            var rightGeometry = new GeometryGroup();
 
-            if (_customBorder != null)
+            //upper right lower half
+            rightGeometry.Children.Add(CreateCornerGeometry(upperRightLowerPoint,
+                    upperRightUpperPoint,
+                    upperRightCenterPoint,
+                    CornerRadius.TopRight,
+                    SweepDirection.Counterclockwise));
+
+            rightGeometry.Children.Add(new LineGeometry()
+            {
+                StartPoint = upperRightLowerPoint,
+                EndPoint = lowerRightUpperPoint
+            });
+
+            // lower right upper half
+            rightGeometry.Children.Add(CreateCornerGeometry(lowerRightUpperPoint,
+                    lowerRigthLowerPoint,
+                    lowerRightCenterPoint,
+                    CornerRadius.BottomRight,
+                    SweepDirection.Clockwise));
+
+            RightBorderGeometry = rightGeometry;
+
+            // bottom geometry
+            var bottomGeometry = new GeometryGroup();
+
+            //lower right lower half
+            bottomGeometry.Children.Add(CreateCornerGeometry(lowerRigthLowerPoint,
+                    lowerRightUpperPoint,
+                    lowerRightCenterPoint,
+                    CornerRadius.BottomRight,
+                    SweepDirection.Counterclockwise));
+
+            bottomGeometry.Children.Add(new LineGeometry()
             {
-                _customBorder.Child = null;
-                _customBorder = null;
+                StartPoint = lowerRigthLowerPoint,
+                EndPoint = lowerLeftLowerPoint
+            });
+
+            // lower left lower half
+            bottomGeometry.Children.Add(CreateCornerGeometry(lowerLeftLowerPoint,
+                    lowerLeftUpperPoint,
+                    lowerLeftCenterPoint,
+                    CornerRadius.BottomLeft,
+                    SweepDirection.Clockwise));
+
+            BottomBorderGeometry = bottomGeometry;
+        }
+
+        private PathGeometry CreateCornerGeometry(Point startPoint, Point endPoint, Point centerPoint, double radius, SweepDirection sweepDirection)
+        {
+            var geometry = new PathGeometry();
+
+            var figure = new PathFigure() { StartPoint = startPoint };
+            if (radius > 0)
+            {
+                figure.Segments.Add(CreateArcSegment(startPoint, endPoint, centerPoint, radius, sweepDirection));
+            }
+            else
+            {
+                figure.Segments.Add(new LineSegment() { Point = endPoint });
             }
+            geometry.Figures.Add(figure);
+            return geometry;
+        }
 
-            _customLeftBorder.BorderThickness = new Thickness(borderThickness.Left, 0, 0, 0);
-            _customLeftBorder.CornerRadius = new CornerRadius(cornerRadius.TopLeft, 0, 0, cornerRadius.BottomLeft);
-            _customLeftBorder.BorderBrush = borderBrush;
-            _customTopBorder.BorderThickness = new Thickness(0, borderThickness.Top, 0, 0);
-            _customTopBorder.CornerRadius = new CornerRadius(0, cornerRadius.TopRight, 0, 0);
-            _customTopBorder.BorderBrush = borderBrush;
-            _customRightBorder.BorderThickness = new Thickness(0, 0, borderThickness.Right, 0);
-            _customRightBorder.CornerRadius = new CornerRadius(0, 0, cornerRadius.BottomRight, 0);
-            _customRightBorder.BorderBrush = borderBrush;
-            _customBottomBorder.BorderThickness = new Thickness(0, 0, 0, borderThickness.Bottom);
-            _customBottomBorder.CornerRadius = new CornerRadius();
-            _customBottomBorder.BorderBrush = borderBrush;
-            _customBottomBorder.Child = child;
-
-            base.Content = _customLeftBorder;
+        private ArcSegment CreateArcSegment(Point startPoint, Point endPoint, Point centerPoint, double radius, SweepDirection sweepDirection)
+        {
+            return new ArcSegment()
+            {
+                Point = GetArcMidPoint(startPoint.ToVector2(),
+                    endPoint.ToVector2(),
+                    centerPoint.ToVector2(), (float)radius),
+                Size = new Size(radius, radius),
+                SweepDirection = sweepDirection
+            };
+        }
+
+        private Point GetArcMidPoint(Vector2 a, Vector2 b, Vector2 center, float radius)
+        {
+            var m = (a - center) + (b - center);
+            m = Vector2.Normalize(m) * new Vector2(radius, radius);
+            return new Point(center.X + m.X, center.Y + m.Y);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/ReactWindows/ReactNative/UIManager/UIManagerModule.cs b/ReactWindows/ReactNative/UIManager/UIManagerModule.cs
index d140a142734..244ef2724b9 100644
--- a/ReactWindows/ReactNative/UIManager/UIManagerModule.cs
+++ b/ReactWindows/ReactNative/UIManager/UIManagerModule.cs
@@ -2,10 +2,8 @@
 using ReactNative.Bridge;
 using ReactNative.Tracing;
 using ReactNative.UIManager.Events;
-using ReactNative.Views;
 using System;
 using System.Collections.Generic;
-using Windows.UI.Xaml;
 
 namespace ReactNative.UIManager
 {
diff --git a/ReactWindows/ReactNative/Views/View/ReactPanel.cs b/ReactWindows/ReactNative/Views/View/ReactPanel.cs
index 307767f5fa0..f51c66f0030 100644
--- a/ReactWindows/ReactNative/Views/View/ReactPanel.cs
+++ b/ReactWindows/ReactNative/Views/View/ReactPanel.cs
@@ -23,7 +23,7 @@ public class ReactPanel : Canvas, ICatalystInterceptingViewGroup, ReactPointerEv
 
         public ReactPanel() : base()
         {
-            this.SizeChanged += OnBoundsChanged;
+            SizeChanged += OnBoundsChanged;
         }
 
         public PointerEvents PointerEvents
diff --git a/ReactWindows/ReactNative/Views/View/ReactViewManager.cs b/ReactWindows/ReactNative/Views/View/ReactViewManager.cs
index 4e7c949448e..77f2b6faca4 100644
--- a/ReactWindows/ReactNative/Views/View/ReactViewManager.cs
+++ b/ReactWindows/ReactNative/Views/View/ReactViewManager.cs
@@ -186,7 +186,7 @@ public void SetBorderColor(BorderedContentControl view, int index, uint? color)
         /// <returns>The view instance.</returns>
         protected override FrameworkElement CreateViewInstance(ThemedReactContext reactContext)
         {
-            return new BorderedContentControl(new ReactPanel());
+            return new BorderedContentControl() { Content = new ReactPanel()};
         }
 
         private ReactPanel GetPanel(FrameworkElement element)