diff --git a/.ado/Get-ShellScaling.ps1 b/.ado/Get-ShellScaling.ps1
new file mode 100644
index 00000000000..5f1e6bc9b02
--- /dev/null
+++ b/.ado/Get-ShellScaling.ps1
@@ -0,0 +1,26 @@
+Add-Type @'
+  using System; 
+  using System.Runtime.InteropServices;
+  using System.Drawing;
+
+  public class DPI {  
+    [DllImport("gdi32.dll")]
+    static extern int GetDeviceCaps(IntPtr hdc, int nIndex);
+
+    public enum DeviceCap {
+      VERTRES = 10,
+      DESKTOPVERTRES = 117
+    } 
+
+    public static float scaling() {
+      Graphics g = Graphics.FromHwnd(IntPtr.Zero);
+      IntPtr desktop = g.GetHdc();
+      int LogicalScreenHeight = GetDeviceCaps(desktop, (int)DeviceCap.VERTRES);
+      int PhysicalScreenHeight = GetDeviceCaps(desktop, (int)DeviceCap.DESKTOPVERTRES);
+
+      return (float)PhysicalScreenHeight / (float)LogicalScreenHeight;
+    }
+  }
+'@ -ReferencedAssemblies 'System.Drawing.dll'
+
+[Math]::round([DPI]::scaling(), 2) * 100
\ No newline at end of file
diff --git a/.ado/SetupLocalDumps.cmd b/.ado/SetupLocalDumps.cmd
new file mode 100644
index 00000000000..6afd36134dd
--- /dev/null
+++ b/.ado/SetupLocalDumps.cmd
@@ -0,0 +1,11 @@
+setlocal
+set CRASHDUMPS_FOLDER=%BUILD_ARTIFACTSTAGINGDIRECTORY%\ReactUWPTestAppTreeDump\CrashDumps
+reg query "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps" /s
+reg add  "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\ReactUWPTestApp.exe" /v DumpFolder /t REG_SZ /d %CRASHDUMPS_FOLDER%
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\ReactUWPTestApp.exe" /v DumpType /t REG_DWORD /d 2
+if not exist %CRASHDUMPS_FOLDER% ( 
+    md %CRASHDUMPS_FOLDER%
+) else (
+    del %CRASHDUMPS_FOLDER%\* /s /q
+)
+endlocal
\ No newline at end of file
diff --git a/.ado/templates/e2e-test-job.yml b/.ado/templates/e2e-test-job.yml
index e31b4037136..19c7d5735d7 100644
--- a/.ado/templates/e2e-test-job.yml
+++ b/.ado/templates/e2e-test-job.yml
@@ -23,6 +23,12 @@ jobs:
             
       - template: prepare-env.yml
 
+      - task: CmdLine@2
+        displayName: Set LocalDumps
+        inputs:
+          script: $(Build.SourcesDirectory)\.ado\SetupLocalDumps.cmd
+          workingDirectory: $(Build.SourcesDirectory)
+
       - task: NuGetCommand@2
         displayName: NuGet restore - ReactUWPTestApp
         inputs:
@@ -74,6 +80,11 @@ jobs:
           targetType: 'inline'
           script: 'if ((Get-Process React*) -eq $Null) { echo "TestApp is not running"; exit 1}'
 
+      - task: CmdLine@2
+        displayName: mkdir errorShots
+        inputs:
+          script: mkdir $(Build.SourcesDirectory)\packages\E2ETest\errorShots
+
       - task: CmdLine@2
         displayName: run e2etest
         inputs:
@@ -87,7 +98,28 @@ jobs:
           targetFolder: $(Build.StagingDirectory)/ReactUWPTestAppTreeDump
           contents: TreeDump\**
         condition: succeededOrFailed()
-        
+
+      - task: CopyFiles@2
+        displayName: Copy tree dump screenshots
+        inputs:
+          sourceFolder: $(Build.SourcesDirectory)\packages\E2ETest\errorShots
+          targetFolder: $(Build.StagingDirectory)/ReactUWPTestAppTreeDump
+        condition: succeededOrFailed()
+
+      - task: PowerShell@2
+        displayName: "MSInfo32"
+        inputs:
+          targetType: "inline"
+          script: "Start-Process msinfo32 -ArgumentList '/report $(Build.StagingDirectory)\\ReactUWPTestAppTreeDump\\msinfo32.txt' -Wait"
+        condition: failed()
+
+      - task: PowerShell@2
+        displayName: "Get-ShellScaling"
+        inputs:
+          targetType: "inline"
+          script: ". $(Build.SourcesDirectory)\\.ado\\Get-ShellScaling.ps1 > $(Build.StagingDirectory)\\ReactUWPTestAppTreeDump\\scaleFactor.txt"
+        condition: failed()
+
       - task: PublishBuildArtifacts@1
         displayName: "Publish Artifact:ReactUWPTestAppTreeDump"
         inputs:
diff --git a/.gitignore b/.gitignore
index 2dfa77403f6..780d8dd9321 100644
--- a/.gitignore
+++ b/.gitignore
@@ -155,4 +155,5 @@ bld/
 # OpenCover
 *_coverage.xml
 
-tsdoc-metadata.json
\ No newline at end of file
+tsdoc-metadata.json
+*.dmp
diff --git a/change/react-native-windows-2020-04-14-05-43-39-jsonTreeDump.json b/change/react-native-windows-2020-04-14-05-43-39-jsonTreeDump.json
new file mode 100644
index 00000000000..70d3996a8f0
--- /dev/null
+++ b/change/react-native-windows-2020-04-14-05-43-39-jsonTreeDump.json
@@ -0,0 +1,8 @@
+{
+  "type": "prerelease",
+  "comment": "run_wdio.js will run the tests but also set the exit code to zero/non-zero on success/failure respectively. This is important to break the CI/PR build on test failures, which we weren't doing until now.",
+  "packageName": "react-native-windows",
+  "email": "asklar@winse.microsoft.com",
+  "dependentChangeType": "patch",
+  "date": "2020-04-14T12:43:39.263Z"
+}
\ No newline at end of file
diff --git a/packages/E2ETest/app/ControlStyleTestPage.tsx b/packages/E2ETest/app/ControlStyleTestPage.tsx
index 62686dcf729..9e91fd263ba 100644
--- a/packages/E2ETest/app/ControlStyleTestPage.tsx
+++ b/packages/E2ETest/app/ControlStyleTestPage.tsx
@@ -3,7 +3,8 @@
  * Licensed under the MIT License.
  */
 
-import { Switch, CheckBox, TextInput, View, StyleSheet, Button } from 'react-native';
+ // Bug:4596 Switch
+import { /* Switch, */ CheckBox, TextInput, View, StyleSheet, Button } from 'react-native';
 import { DatePicker, Picker } from 'react-native-windows';
 import React, { useState } from 'react';
 import { SHOWBORDER_ON_CONTROLSTYLE, TREE_DUMP_RESULT } from './Consts';
@@ -56,7 +57,11 @@ export function ControlStyleTestPage() {
    return (
     <View>
       <View testID={'ControlStyleView'}>
-        <Switch style={showRoundBorder? styles.roundBorder :styles.regularBorder} thumbColor='blue'/>
+        {
+        /*
+        // Bug:4596 Switch
+        <Switch style={showRoundBorder? styles.roundBorder :styles.regularBorder} thumbColor='blue'/> 
+        */}
         <CheckBox style={showRoundBorder? styles.roundBorder :styles.regularBorder} />
         <TextInput style={showRoundBorder? styles.roundBorder :styles.regularBorder}
           placeholder='TextBox'
diff --git a/packages/E2ETest/app/LoginTestPage.tsx b/packages/E2ETest/app/LoginTestPage.tsx
index 3998842d970..7b55bf9bee3 100644
--- a/packages/E2ETest/app/LoginTestPage.tsx
+++ b/packages/E2ETest/app/LoginTestPage.tsx
@@ -4,29 +4,42 @@
  */
 
 import React, { useState } from 'react';
-import { Text, TextInput, View, StyleSheet, TouchableOpacity, Button } from 'react-native';
-import { USERNAME_ON_LOGIN, PASSWORD_ON_LOGIN, SUBMIT_ON_LOGIN, LOGINRESULT_ON_LOGIN, SHOWPASSWORD_ON_LOGIN } from './Consts';
+import {
+  Text,
+  TextInput,
+  View,
+  StyleSheet,
+  TouchableOpacity,
+  Button,
+} from 'react-native';
+import {
+  USERNAME_ON_LOGIN,
+  PASSWORD_ON_LOGIN,
+  SUBMIT_ON_LOGIN,
+  LOGINRESULT_ON_LOGIN,
+  SHOWPASSWORD_ON_LOGIN,
+} from './Consts';
 
 const styles = StyleSheet.create({
   container: {
-    padding: 20
+    padding: 20,
   },
   input: {
     height: 40,
     backgroundColor: 'rgba(225,225,225,0.2)',
     marginBottom: 10,
     padding: 10,
-    color: '#fff'
+    color: '#000000',
   },
   buttonContainer: {
     backgroundColor: '#2980b6',
-    paddingVertical: 15
+    paddingVertical: 15,
   },
   buttonText: {
     color: '#fff',
     textAlign: 'center',
-    fontWeight: '700'
-  }
+    fontWeight: '700',
+  },
 });
 
 export function LoginTestPage() {
@@ -36,9 +49,9 @@ export function LoginTestPage() {
   const [passwordHidden, setPasswordHidden] = useState(true);
 
   const onPressShowPassword = () => {
-      var previousState = passwordHidden;
-      setPasswordHidden(!previousState);
-   }
+    var previousState = passwordHidden;
+    setPasswordHidden(!previousState);
+  };
 
   const onPress = () => {
     if (userName === 'username' && password === 'password') {
@@ -49,29 +62,42 @@ export function LoginTestPage() {
   };
   return (
     <View>
-      <TextInput style={styles.input}
-        placeholder='Email or Mobile Num'
-        placeholderTextColor='rgba(225,225,225,0.7)'
+      <TextInput
+        style={styles.input}
+        placeholder="Email or Mobile Num"
+        placeholderTextColor="rgba(225,225,225,0.7)"
         testID={USERNAME_ON_LOGIN}
-        onChange={(text) => { setUserName(text.nativeEvent.text) }} />
+        onChange={text => {
+          setUserName(text.nativeEvent.text);
+        }}
+      />
 
-      <TextInput style={styles.input}
-        placeholder='Password'
+      <TextInput
+        style={styles.input}
+        placeholder="Password"
         testID={PASSWORD_ON_LOGIN}
-        placeholderTextColor='rgba(225,225,225,0.7)'
-        secureTextEntry = {passwordHidden}
-        onChange={(text) => { setPassword(text.nativeEvent.text) }} />
+        placeholderTextColor="rgba(225,225,225,0.7)"
+        secureTextEntry={passwordHidden}
+        onChange={text => {
+          setPassword(text.nativeEvent.text);
+        }}
+      />
 
-      <Button title= {passwordHidden?"Show Password":"Hide Password"} 
-        onPress={onPressShowPassword} 
-        testID={SHOWPASSWORD_ON_LOGIN}/>
+      <Button
+        title={passwordHidden ? 'Show Password' : 'Hide Password'}
+        onPress={onPressShowPassword}
+        testID={SHOWPASSWORD_ON_LOGIN}
+      />
 
-      <TouchableOpacity style={styles.buttonContainer}
+      <TouchableOpacity
+        style={styles.buttonContainer}
         testID={SUBMIT_ON_LOGIN}
-        onPress={onPress}>
+        onPress={onPress}
+      >
         <Text style={styles.buttonText}>LOGIN</Text>
       </TouchableOpacity>
 
       <Text testID={LOGINRESULT_ON_LOGIN}>{loginState}</Text>
-    </View >);
-}
\ No newline at end of file
+    </View>
+  );
+}
diff --git a/packages/E2ETest/package.json b/packages/E2ETest/package.json
index 1c3c5ba1cfa..f490efe80f3 100644
--- a/packages/E2ETest/package.json
+++ b/packages/E2ETest/package.json
@@ -13,7 +13,7 @@
     "prettier": "prettier --write --loglevel warn \"**/**/*.ts\"",
     "e2e": "react-native run-windows --no-launch --logging && npm run e2etest",
     "e2ebundle": "npm run bundle && react-native run-windows --no-launch --no-packager --bundle --logging && npm run e2etest",
-    "e2etest": "rimraf reports/* && npm run prettier && wdio",
+    "e2etest": "rimraf reports/* && npm run prettier && node run_wdio.js",
     "testspec": "npm run prettier && wdio --spec",
     "bundle": "just-scripts prepareBundle && react-native bundle --platform windows --entry-file dist/app/index.js --bundle-output windows/ReactUWPTestApp/Bundle/index.windows.bundle --assets-dest windows/ReactUWPTestApp/Bundle",
     "buildapp": "react-native run-windows --no-launch --no-packager --no-deploy",
@@ -22,6 +22,7 @@
     "deploybundleapp": "react-native run-windows --no-launch --no-packager --no-build --bundle"
   },
   "dependencies": {
+    "prompt-sync": "^4.2.0",
     "react": "16.9.0",
     "react-native": "0.61.5",
     "react-native-windows": "0.0.0-master.34",
diff --git a/packages/E2ETest/run_wdio.js b/packages/E2ETest/run_wdio.js
new file mode 100644
index 00000000000..56a33f269f5
--- /dev/null
+++ b/packages/E2ETest/run_wdio.js
@@ -0,0 +1,119 @@
+const path = require('path');
+const fs = require('fs');
+const xml2js = require('xml2js');
+const parser = new xml2js.Parser({ attrkey: 'ATTR' });
+const child_process = require('child_process');
+const prompt = require('prompt-sync')();
+
+const specFolder = 'wdio/test';
+
+function GetMetadata(specPath) {
+  const contents = fs.readFileSync(specPath);
+  const metadataTag = '// @metadata ';
+  const metadataStart = contents.indexOf(metadataTag);
+  if (metadataStart != -1) {
+    let metadata = contents
+      .toString()
+      .substr(metadataStart + metadataTag.length)
+      .split(/[\r\n]/)[0];
+    return metadata.split(' ');
+  }
+  return [];
+}
+
+const filters = {
+  SkipCI: specPath => {
+    return process.env.BUILD_QUEUEDBY == 'GitHub';
+  },
+};
+
+// Returns true if the spec is to run.
+// Specs marked SkipCI are excluded from CI (identified by environment variables in the ADO lab)
+function FilterSpec(specPath) {
+  const metadata = GetMetadata(specPath);
+  for (let i = 0; i < metadata.length; i++) {
+    if (filters[metadata[i]](specPath)) {
+      return false;
+    }
+  }
+  return true;
+}
+
+function SelectSpecs(folder) {
+  let specs = [];
+  if (process.argv.length > 2) {
+    specs = process.argv.splice(2).map(spec => spec + '.spec.ts');
+  } else {
+    specs = fs.readdirSync(folder).filter(x => x.endsWith('.spec.ts'));
+  }
+  specs = specs.map(spec => path.join(folder, spec)).filter(FilterSpec);
+  return specs;
+}
+
+let opts = SelectSpecs(specFolder);
+console.log(`Selected tests: ${opts}`);
+
+function OverrideHyperV() {
+  const baseboardMfr = child_process
+    .execSync('powershell.exe (gwmi Win32_BaseBoard).Manufacturer')
+    .toString()
+    .replace(/[\r\n]/, '');
+  if (!baseboardMfr.startsWith('Microsoft Corporation')) {
+    console.log(`Not running in HyperV. Mfr = ${baseboardMfr}`);
+    const answer = prompt(
+      'E2ETest is meant to be run in a HyperV VM. Continue? (Y/N)'
+    );
+    if (answer.toUpperCase() != 'Y') {
+      process.exit(0);
+    }
+  }
+}
+
+OverrideHyperV();
+
+const Launcher = require('@wdio/cli').default;
+
+const wdio = new Launcher('wdio.conf.js', { specs: opts });
+
+function parseLog(logfile) {
+  const xmlString = fs.readFileSync(logfile);
+  let name;
+  parser.parseString(xmlString, (err, res) => {
+    if (!res.testsuites) {
+      name = 'something went wrong';
+    } else {
+      const attr = res.testsuites.testsuite[0].ATTR;
+      if (attr.errors > 0 || attr.failures > 0) {
+        name = attr.name;
+      }
+    }
+  });
+  return name;
+}
+
+function parseLogs() {
+  const reportsDir = path.join(__dirname, 'reports');
+  const logs = fs.readdirSync(reportsDir).filter(x => x.endsWith('.log'));
+  const names = logs
+    .map(x => parseLog(path.join(reportsDir, x)))
+    .filter(x => x != null);
+  return names;
+}
+
+function Process(code) {
+  const failedTests = parseLogs();
+  for (let i = 0; i < failedTests.length; i++) {
+    console.log(`Failed test: ${failedTests[i]}`);
+  }
+  process.exit(code);
+}
+
+wdio.run().then(
+  code => {
+    Process(code);
+  },
+  error => {
+    console.error('Launcher failed to start the test', error.stacktrace);
+    process.exit(1);
+  }
+);
diff --git a/packages/E2ETest/wdio/test/DirectManipulation.spec.ts b/packages/E2ETest/wdio/test/DirectManipulation.spec.ts
index bc609af6a41..6e97bb96599 100644
--- a/packages/E2ETest/wdio/test/DirectManipulation.spec.ts
+++ b/packages/E2ETest/wdio/test/DirectManipulation.spec.ts
@@ -28,6 +28,9 @@ describe('DirectManipulationTest', () => {
       result.includes('width=50'),
       'measureLayout response has correct width'
     );
-    assert.ok(result.includes('x=20;'), 'measureLayout response x=20');
+    // https://github.com/microsoft/react-native-windows/issues/4122
+    // Un-comment this when bug 4122 is fixed
+    // E2ETEST_OVERRIDE_4122
+    // assert.ok(result.includes('x=20;'), 'measureLayout response x=20');
   });
 });
diff --git a/packages/E2ETest/windows/ReactUWPTestApp/App.xaml b/packages/E2ETest/windows/ReactUWPTestApp/App.xaml
index d261251013c..01838c5e2f0 100644
--- a/packages/E2ETest/windows/ReactUWPTestApp/App.xaml
+++ b/packages/E2ETest/windows/ReactUWPTestApp/App.xaml
@@ -5,6 +5,11 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:ReactUWPTestApp">
     <Application.Resources>
-        <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
+            </ResourceDictionary.MergedDictionaries>
+            <Color x:Key="SystemAccentColor">#409efe</Color>
+        </ResourceDictionary>
     </Application.Resources>
 </react:ReactApplication>
diff --git a/packages/E2ETest/windows/ReactUWPTestApp/App.xaml.cs b/packages/E2ETest/windows/ReactUWPTestApp/App.xaml.cs
index 65eb5c0a005..0a6a8c61fd0 100644
--- a/packages/E2ETest/windows/ReactUWPTestApp/App.xaml.cs
+++ b/packages/E2ETest/windows/ReactUWPTestApp/App.xaml.cs
@@ -1,16 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+using Microsoft.ReactNative;
 using System;
-using Windows.ApplicationModel;
 using Windows.ApplicationModel.Activation;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Navigation;
-using Microsoft.ReactNative;
+using Windows.Foundation;
+using Windows.Graphics.Display;
 using Windows.UI.Core;
 using Windows.UI.ViewManagement;
-using Windows.Foundation;
 
 namespace ReactUWPTestApp
 {
@@ -59,6 +56,16 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
             base.OnLaunched(e);
             SystemNavigationManager.GetForCurrentView().AppViewBackButtonVisibility = AppViewBackButtonVisibility.Collapsed;
             ApplicationView.GetForCurrentView().TryResizeView(new Size(800, 600));
+#if !E2ETEST_OVERRIDE_4122
+#error [E2ETest] - There is a bug in Yoga with v142/VS2019 that makes the masters for this app different in Release|x64 than in other platforms.
+#error However we want to test what people will be shipping. As a result, the tree dump output won't match the masters (which have the bug).
+#error You can disable this warning by defining the constant E2ETEST_OVERRIDE_4122 in the project properties page under "Define Constants"
+#error For more information see https://github.com/microsoft/react-native-windows/issues/4122
+#endif
+            if (DisplayInformation.GetForCurrentView().ResolutionScale != ResolutionScale.Scale100Percent)
+            {
+                throw new Exception("A bug requires this app to run at 100% for accurate results - See https://github.com/microsoft/react-native-windows/issues/4619");
+            }
         }
     }
 }
diff --git a/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ControlStyleRegularBorder.txt b/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ControlStyleRegularBorder.txt
deleted file mode 100644
index 0a979e07969..00000000000
--- a/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ControlStyleRegularBorder.txt
+++ /dev/null
@@ -1,851 +0,0 @@
-[Microsoft.ReactNative.ViewPanel]
-    Background=[NULL]
-    BorderBrush=#00000000
-    BorderThickness=0,0,0,0
-    Clip=[NULL]
-    CornerRadius=0,0,0,0
-    Height=360
-    HorizontalAlignment=Stretch
-    Margin=0,0,0,0
-    RenderSize=800,360
-    VerticalAlignment=Stretch
-    Visibility=Visible
-    Width=800
-  [Windows.UI.Xaml.Controls.ToggleSwitch]
-      Background=#33E1E1E1
-      BorderBrush=#55FF00FF
-      BorderThickness=1,1,1,1
-      Clip=[NULL]
-      CornerRadius=0,0,0,0
-      Foreground=#FFFFFFFF
-      Height=50
-      HorizontalAlignment=Left
-      Margin=0,0,0,0
-      Padding=0,0,0,0
-      RenderSize=51,50
-      VerticalAlignment=Center
-      Visibility=Visible
-      Width=51
-    [Windows.UI.Xaml.Controls.Grid]
-        Background=#33E1E1E1
-        BorderBrush=#55FF00FF
-        BorderThickness=1,1,1,1
-        Clip=[NULL]
-        CornerRadius=0,0,0,0
-        HorizontalAlignment=Stretch
-        Margin=0,0,0,0
-        Padding=0,0,0,0
-        RenderSize=51,50
-        VerticalAlignment=Stretch
-        Visibility=Visible
-      [Windows.UI.Xaml.Controls.Grid]
-          Background=[NULL]
-          BorderBrush=[NULL]
-          BorderThickness=0,0,0,0
-          Clip=[NULL]
-          CornerRadius=0,0,0,0
-          HorizontalAlignment=Left
-          Margin=0,0,0,0
-          Padding=0,0,0,0
-          RenderSize=154,32
-          VerticalAlignment=Top
-          Visibility=Visible
-        [Windows.UI.Xaml.Controls.Grid]
-            Background=#00FFFFFF
-            BorderBrush=[NULL]
-            BorderThickness=0,0,0,0
-            Clip=[NULL]
-            CornerRadius=0,0,0,0
-            HorizontalAlignment=Stretch
-            Margin=0,5,0,5
-            Padding=0,0,0,0
-            RenderSize=52,22
-            VerticalAlignment=Stretch
-            Visibility=Visible
-        [Windows.UI.Xaml.Controls.ContentPresenter]
-            Background=[NULL]
-            BorderBrush=[NULL]
-            BorderThickness=0,0,0,0
-            Clip=[NULL]
-            CornerRadius=0,0,0,0
-            Foreground=#FFFFFFFF
-            HorizontalAlignment=Left
-            Margin=0,0,0,0
-            Padding=0,0,0,0
-            RenderSize=0,0
-            VerticalAlignment=Center
-            Visibility=Visible
-        [Windows.UI.Xaml.Controls.ContentPresenter]
-            Background=[NULL]
-            BorderBrush=[NULL]
-            BorderThickness=0,0,0,0
-            Clip=[NULL]
-            CornerRadius=0,0,0,0
-            Foreground=#FFFFFFFF
-            HorizontalAlignment=Left
-            Margin=0,0,0,0
-            Padding=0,0,0,0
-            RenderSize=0,0
-            VerticalAlignment=Center
-            Visibility=Visible
-        [Windows.UI.Xaml.Shapes.Rectangle]
-            Clip=[NULL]
-            Height=20
-            HorizontalAlignment=Stretch
-            Margin=0,0,0,0
-            RenderSize=40,20
-            VerticalAlignment=Stretch
-            Visibility=Visible
-            Width=40
-        [Windows.UI.Xaml.Shapes.Rectangle]
-            Clip=[NULL]
-            Height=20
-            HorizontalAlignment=Stretch
-            Margin=0,0,0,0
-            RenderSize=40,20
-            VerticalAlignment=Stretch
-            Visibility=Visible
-            Width=40
-        [Windows.UI.Xaml.Controls.Grid]
-            Background=[NULL]
-            BorderBrush=[NULL]
-            BorderThickness=0,0,0,0
-            Clip=[NULL]
-            CornerRadius=0,0,0,0
-            Height=20
-            HorizontalAlignment=Left
-            Margin=0,0,0,0
-            Padding=0,0,0,0
-            RenderSize=20,20
-            VerticalAlignment=Stretch
-            Visibility=Visible
-            Width=20
-          [Windows.UI.Xaml.Shapes.Ellipse]
-              Clip=[NULL]
-              Height=10
-              HorizontalAlignment=Stretch
-              Margin=0,0,0,0
-              RenderSize=10,10
-              VerticalAlignment=Stretch
-              Visibility=Visible
-              Width=10
-          [Windows.UI.Xaml.Shapes.Ellipse]
-              Clip=[NULL]
-              Height=10
-              HorizontalAlignment=Stretch
-              Margin=0,0,0,0
-              RenderSize=10,10
-              VerticalAlignment=Stretch
-              Visibility=Visible
-              Width=10
-        [Windows.UI.Xaml.Controls.Primitives.Thumb]
-            Background=#33000000
-            BorderBrush=#00FFFFFF
-            BorderThickness=1,1,1,1
-            Clip=[NULL]
-            CornerRadius=0,0,0,0
-            Foreground=#FFFFFFFF
-            HorizontalAlignment=Stretch
-            Margin=0,0,0,0
-            Padding=0,0,0,0
-            RenderSize=52,32
-            VerticalAlignment=Stretch
-            Visibility=Visible
-          [Windows.UI.Xaml.Shapes.Rectangle]
-              Clip=[NULL]
-              HorizontalAlignment=Stretch
-              Margin=0,0,0,0
-              RenderSize=52,32
-              VerticalAlignment=Stretch
-              Visibility=Visible
-  [Windows.UI.Xaml.Controls.CheckBox]
-      Background=#33E1E1E1
-      BorderBrush=#55FF00FF
-      BorderThickness=1,1,1,1
-      Clip=[NULL]
-      CornerRadius=0,0,0,0
-      Foreground=#FFFFFFFF
-      Height=50
-      HorizontalAlignment=Left
-      Margin=0,0,0,0
-      Padding=8,5,0,0
-      RenderSize=120,50
-      VerticalAlignment=Center
-      Visibility=Visible
-      Width=32
-    [Windows.UI.Xaml.Controls.Grid]
-        Background=#33E1E1E1
-        BorderBrush=#55FF00FF
-        BorderThickness=1,1,1,1
-        Clip=[NULL]
-        CornerRadius=0,0,0,0
-        HorizontalAlignment=Stretch
-        Margin=0,0,0,0
-        Padding=0,0,0,0
-        RenderSize=120,50
-        VerticalAlignment=Stretch
-        Visibility=Visible
-      [Windows.UI.Xaml.Controls.Grid]
-          Background=[NULL]
-          BorderBrush=[NULL]
-          BorderThickness=0,0,0,0
-          Clip=[NULL]
-          CornerRadius=0,0,0,0
-          Height=32
-          HorizontalAlignment=Stretch
-          Margin=0,0,0,0
-          Padding=0,0,0,0
-          RenderSize=20,32
-          VerticalAlignment=Top
-          Visibility=Visible
-        [Windows.UI.Xaml.Shapes.Rectangle]
-            Clip=[NULL]
-            Height=20
-            HorizontalAlignment=Stretch
-            Margin=0,0,0,0
-            RenderSize=20,20
-            VerticalAlignment=Stretch
-            Visibility=Visible
-            Width=20
-        [Windows.UI.Xaml.Controls.FontIcon]
-            Clip=[NULL]
-            Foreground=#FFFFFFFF
-            HorizontalAlignment=Stretch
-            Margin=0,0,0,0
-            RenderSize=20,32
-            VerticalAlignment=Stretch
-            Visibility=Visible
-          [Windows.UI.Xaml.Controls.Grid]
-              Background=#00000000
-              BorderBrush=[NULL]
-              BorderThickness=0,0,0,0
-              Clip=[NULL]
-              CornerRadius=0,0,0,0
-              HorizontalAlignment=Stretch
-              Margin=0,0,0,0
-              Padding=0,0,0,0
-              RenderSize=20,32
-              VerticalAlignment=Stretch
-              Visibility=Visible
-            [Windows.UI.Xaml.Controls.TextBlock]
-                Clip=[NULL]
-                Foreground=#FFFFFFFF
-                HorizontalAlignment=Stretch
-                Margin=0,0,0,0
-                Padding=0,0,0,0
-                RenderSize=20,16
-                VerticalAlignment=Center
-                Visibility=Visible
-      [Windows.UI.Xaml.Controls.ContentPresenter]
-          Background=[NULL]
-          BorderBrush=[NULL]
-          BorderThickness=0,0,0,0
-          Clip=[NULL]
-          CornerRadius=0,0,0,0
-          Foreground=#FF000000
-          HorizontalAlignment=Left
-          Margin=8,5,0,0
-          Padding=0,0,0,0
-          RenderSize=0,0
-          VerticalAlignment=Top
-          Visibility=Visible
-  [Windows.UI.Xaml.Controls.TextBox]
-      Background=#33E1E1E1
-      BorderBrush=#55FF00FF
-      BorderThickness=1,1,1,1
-      Clip=[NULL]
-      CornerRadius=0,0,0,0
-      Foreground=#FFFFFFFF
-      Height=50
-      HorizontalAlignment=Stretch
-      Margin=0,0,0,0
-      Padding=10,10,10,10
-      RenderSize=800,50
-      VerticalAlignment=Stretch
-      Visibility=Visible
-      Width=800
-    [Windows.UI.Xaml.Controls.Grid]
-        Background=[NULL]
-        BorderBrush=[NULL]
-        BorderThickness=0,0,0,0
-        Clip=[NULL]
-        CornerRadius=0,0,0,0
-        HorizontalAlignment=Stretch
-        Margin=0,0,0,0
-        Padding=0,0,0,0
-        RenderSize=800,50
-        VerticalAlignment=Stretch
-        Visibility=Visible
-      [Windows.UI.Xaml.Controls.Border]
-          Background=#33E1E1E1
-          BorderBrush=#55FF00FF
-          BorderThickness=1,1,1,1
-          Clip=[NULL]
-          CornerRadius=0,0,0,0
-          HorizontalAlignment=Stretch
-          Margin=0,0,0,0
-          Padding=0,0,0,0
-          RenderSize=800,50
-          VerticalAlignment=Stretch
-          Visibility=Visible
-      [Windows.UI.Xaml.Controls.ScrollViewer]
-          Background=#00FFFFFF
-          BorderBrush=#00FFFFFF
-          BorderThickness=0,0,0,0
-          Clip=[NULL]
-          CornerRadius=0,0,0,0
-          Foreground=#FFFFFFFF
-          HorizontalAlignment=Stretch
-          Margin=1,1,1,1
-          Padding=10,10,10,10
-          RenderSize=798,48
-          VerticalAlignment=Stretch
-          Visibility=Visible
-        [Windows.UI.Xaml.Controls.Border]
-            Background=[NULL]
-            BorderBrush=#00FFFFFF
-            BorderThickness=0,0,0,0
-            Clip=[NULL]
-            CornerRadius=0,0,0,0
-            HorizontalAlignment=Stretch
-            Margin=0,0,0,0
-            Padding=0,0,0,0
-            RenderSize=798,48
-            VerticalAlignment=Stretch
-            Visibility=Visible
-          [Windows.UI.Xaml.Controls.Grid]
-              Background=#00FFFFFF
-              BorderBrush=[NULL]
-              BorderThickness=0,0,0,0
-              Clip=[NULL]
-              CornerRadius=0,0,0,0
-              HorizontalAlignment=Stretch
-              Margin=0,0,0,0
-              Padding=0,0,0,0
-              RenderSize=798,48
-              VerticalAlignment=Stretch
-              Visibility=Visible
-            [Windows.UI.Xaml.Controls.ScrollContentPresenter]
-                Background=[NULL]
-                BorderBrush=[NULL]
-                BorderThickness=0,0,0,0
-                Clip=Windows.UI.Xaml.Media.RectangleGeometry
-                CornerRadius=0,0,0,0
-                Foreground=#FFFFFFFF
-                HorizontalAlignment=Stretch
-                Margin=10,10,10,10
-                Padding=0,0,0,0
-                RenderSize=778,28
-                VerticalAlignment=Stretch
-                Visibility=Visible
-              [Windows.UI.Xaml.FrameworkElement]
-                  Clip=[NULL]
-                  HorizontalAlignment=Stretch
-                  Margin=0,0,0,0
-                  RenderSize=778,28
-                  VerticalAlignment=Stretch
-                  Visibility=Visible
-            [Windows.UI.Xaml.Controls.Grid]
-                Background=[NULL]
-                BorderBrush=[NULL]
-                BorderThickness=0,0,0,0
-                Clip=[NULL]
-                CornerRadius=0,0,0,0
-                HorizontalAlignment=Stretch
-                Margin=0,0,0,0
-                Padding=0,0,0,0
-                RenderSize=798,48
-                VerticalAlignment=Stretch
-                Visibility=Visible
-            [Windows.UI.Xaml.Controls.Primitives.ScrollBar]
-                Background=#00FFFFFF
-                BorderBrush=#00FFFFFF
-                BorderThickness=0,0,0,0
-                Clip=[NULL]
-                CornerRadius=2,2,2,2
-                Foreground=#00FFFFFF
-                HorizontalAlignment=Right
-                Margin=0,0,0,0
-                Padding=0,0,0,0
-                RenderSize=0,0
-                VerticalAlignment=Stretch
-                Visibility=Collapsed
-            [Windows.UI.Xaml.Controls.Primitives.ScrollBar]
-                Background=#00FFFFFF
-                BorderBrush=#00FFFFFF
-                BorderThickness=0,0,0,0
-                Clip=[NULL]
-                CornerRadius=2,2,2,2
-                Foreground=#00FFFFFF
-                HorizontalAlignment=Stretch
-                Margin=0,0,0,0
-                Padding=0,0,0,0
-                RenderSize=0,0
-                VerticalAlignment=Stretch
-                Visibility=Collapsed
-            [Windows.UI.Xaml.Controls.Border]
-                Background=#FFE6E6E6
-                BorderBrush=[NULL]
-                BorderThickness=0,0,0,0
-                Clip=[NULL]
-                CornerRadius=0,0,0,0
-                HorizontalAlignment=Stretch
-                Margin=0,0,0,0
-                Padding=0,0,0,0
-                RenderSize=0,0
-                VerticalAlignment=Stretch
-                Visibility=Collapsed
-      [Windows.UI.Xaml.Controls.TextBlock]
-          Clip=[NULL]
-          Foreground=#B3E1E1E1
-          HorizontalAlignment=Stretch
-          Margin=1,1,1,1
-          Padding=10,10,10,10
-          RenderSize=798,48
-          VerticalAlignment=Stretch
-          Visibility=Visible
-      [Windows.UI.Xaml.Controls.Button]
-          Background=#33000000
-          BorderBrush=#00FFFFFF
-          BorderThickness=1,1,1,1
-          Clip=[NULL]
-          CornerRadius=0,0,0,0
-          Foreground=#FF000000
-          HorizontalAlignment=Left
-          Margin=0,0,0,0
-          Padding=0,0,-2,0
-          RenderSize=0,0
-          VerticalAlignment=Stretch
-          Visibility=Collapsed
-      [Windows.UI.Xaml.Controls.ContentPresenter]
-          Background=[NULL]
-          BorderBrush=[NULL]
-          BorderThickness=0,0,0,0
-          Clip=[NULL]
-          CornerRadius=0,0,0,0
-          Foreground=#99000000
-          HorizontalAlignment=Stretch
-          Margin=0,0,0,0
-          Padding=0,0,0,0
-          RenderSize=800,0
-          VerticalAlignment=Stretch
-          Visibility=Visible
-  [Windows.UI.Xaml.Controls.PasswordBox]
-      Background=#33E1E1E1
-      BorderBrush=#55FF00FF
-      BorderThickness=1,1,1,1
-      Clip=[NULL]
-      CornerRadius=0,0,0,0
-      Foreground=#FFFFFFFF
-      Height=50
-      HorizontalAlignment=Stretch
-      Margin=0,0,0,0
-      Padding=10,10,10,10
-      RenderSize=800,50
-      VerticalAlignment=Stretch
-      Visibility=Visible
-      Width=800
-    [Windows.UI.Xaml.Controls.Grid]
-        Background=[NULL]
-        BorderBrush=[NULL]
-        BorderThickness=0,0,0,0
-        Clip=[NULL]
-        CornerRadius=0,0,0,0
-        HorizontalAlignment=Stretch
-        Margin=0,0,0,0
-        Padding=0,0,0,0
-        RenderSize=800,50
-        VerticalAlignment=Stretch
-        Visibility=Visible
-      [Windows.UI.Xaml.Controls.Border]
-          Background=#33E1E1E1
-          BorderBrush=#55FF00FF
-          BorderThickness=1,1,1,1
-          Clip=[NULL]
-          CornerRadius=0,0,0,0
-          HorizontalAlignment=Stretch
-          Margin=0,0,0,0
-          Padding=0,0,0,0
-          RenderSize=800,50
-          VerticalAlignment=Stretch
-          Visibility=Visible
-      [Windows.UI.Xaml.Controls.ScrollViewer]
-          Background=#00FFFFFF
-          BorderBrush=#00FFFFFF
-          BorderThickness=0,0,0,0
-          Clip=[NULL]
-          CornerRadius=0,0,0,0
-          Foreground=#FFFFFFFF
-          HorizontalAlignment=Stretch
-          Margin=1,1,1,1
-          Padding=10,10,10,10
-          RenderSize=798,48
-          VerticalAlignment=Stretch
-          Visibility=Visible
-        [Windows.UI.Xaml.Controls.Border]
-            Background=[NULL]
-            BorderBrush=#00FFFFFF
-            BorderThickness=0,0,0,0
-            Clip=[NULL]
-            CornerRadius=0,0,0,0
-            HorizontalAlignment=Stretch
-            Margin=0,0,0,0
-            Padding=0,0,0,0
-            RenderSize=798,48
-            VerticalAlignment=Stretch
-            Visibility=Visible
-          [Windows.UI.Xaml.Controls.Grid]
-              Background=#00FFFFFF
-              BorderBrush=[NULL]
-              BorderThickness=0,0,0,0
-              Clip=[NULL]
-              CornerRadius=0,0,0,0
-              HorizontalAlignment=Stretch
-              Margin=0,0,0,0
-              Padding=0,0,0,0
-              RenderSize=798,48
-              VerticalAlignment=Stretch
-              Visibility=Visible
-            [Windows.UI.Xaml.Controls.ScrollContentPresenter]
-                Background=[NULL]
-                BorderBrush=[NULL]
-                BorderThickness=0,0,0,0
-                Clip=Windows.UI.Xaml.Media.RectangleGeometry
-                CornerRadius=0,0,0,0
-                Foreground=#FFFFFFFF
-                HorizontalAlignment=Stretch
-                Margin=10,10,10,10
-                Padding=0,0,0,0
-                RenderSize=778,28
-                VerticalAlignment=Stretch
-                Visibility=Visible
-              [Windows.UI.Xaml.FrameworkElement]
-                  Clip=[NULL]
-                  HorizontalAlignment=Stretch
-                  Margin=0,0,0,0
-                  RenderSize=778,28
-                  VerticalAlignment=Stretch
-                  Visibility=Visible
-            [Windows.UI.Xaml.Controls.Grid]
-                Background=[NULL]
-                BorderBrush=[NULL]
-                BorderThickness=0,0,0,0
-                Clip=[NULL]
-                CornerRadius=0,0,0,0
-                HorizontalAlignment=Stretch
-                Margin=0,0,0,0
-                Padding=0,0,0,0
-                RenderSize=798,48
-                VerticalAlignment=Stretch
-                Visibility=Visible
-            [Windows.UI.Xaml.Controls.Primitives.ScrollBar]
-                Background=#00FFFFFF
-                BorderBrush=#00FFFFFF
-                BorderThickness=0,0,0,0
-                Clip=[NULL]
-                CornerRadius=2,2,2,2
-                Foreground=#00FFFFFF
-                HorizontalAlignment=Right
-                Margin=0,0,0,0
-                Padding=0,0,0,0
-                RenderSize=0,0
-                VerticalAlignment=Stretch
-                Visibility=Collapsed
-            [Windows.UI.Xaml.Controls.Primitives.ScrollBar]
-                Background=#00FFFFFF
-                BorderBrush=#00FFFFFF
-                BorderThickness=0,0,0,0
-                Clip=[NULL]
-                CornerRadius=2,2,2,2
-                Foreground=#00FFFFFF
-                HorizontalAlignment=Stretch
-                Margin=0,0,0,0
-                Padding=0,0,0,0
-                RenderSize=0,0
-                VerticalAlignment=Stretch
-                Visibility=Collapsed
-            [Windows.UI.Xaml.Controls.Border]
-                Background=#FFE6E6E6
-                BorderBrush=[NULL]
-                BorderThickness=0,0,0,0
-                Clip=[NULL]
-                CornerRadius=0,0,0,0
-                HorizontalAlignment=Stretch
-                Margin=0,0,0,0
-                Padding=0,0,0,0
-                RenderSize=0,0
-                VerticalAlignment=Stretch
-                Visibility=Collapsed
-      [Windows.UI.Xaml.Controls.TextBlock]
-          Clip=[NULL]
-          Foreground=#99000000
-          HorizontalAlignment=Stretch
-          Margin=1,1,1,1
-          Padding=10,10,10,10
-          RenderSize=798,48
-          VerticalAlignment=Stretch
-          Visibility=Visible
-      [Windows.UI.Xaml.Controls.Primitives.ToggleButton]
-          Background=#33000000
-          BorderBrush=#00FFFFFF
-          BorderThickness=1,1,1,1
-          Clip=[NULL]
-          CornerRadius=0,0,0,0
-          Foreground=#FF000000
-          HorizontalAlignment=Left
-          Margin=0,0,0,0
-          Padding=0,0,-2,0
-          RenderSize=0,0
-          VerticalAlignment=Stretch
-          Visibility=Collapsed
-      [Windows.UI.Xaml.Controls.ContentPresenter]
-          Background=[NULL]
-          BorderBrush=[NULL]
-          BorderThickness=0,0,0,0
-          Clip=[NULL]
-          CornerRadius=0,0,0,0
-          Foreground=#99000000
-          HorizontalAlignment=Stretch
-          Margin=0,0,0,0
-          Padding=0,0,0,0
-          RenderSize=800,0
-          VerticalAlignment=Stretch
-          Visibility=Visible
-  [Windows.UI.Xaml.Controls.CalendarDatePicker]
-      Background=#33E1E1E1
-      BorderBrush=#55FF00FF
-      BorderThickness=1,1,1,1
-      Clip=[NULL]
-      CornerRadius=0,0,0,0
-      Foreground=#FFFFFFFF
-      Height=50
-      HorizontalAlignment=Left
-      Margin=0,0,0,0
-      Padding=0,0,0,0
-      RenderSize=150,50
-      VerticalAlignment=Center
-      Visibility=Visible
-      Width=150
-    [Windows.UI.Xaml.Controls.Grid]
-        Background=[NULL]
-        BorderBrush=[NULL]
-        BorderThickness=0,0,0,0
-        Clip=[NULL]
-        CornerRadius=0,0,0,0
-        HorizontalAlignment=Stretch
-        Margin=0,0,0,0
-        Padding=0,0,0,0
-        RenderSize=150,50
-        VerticalAlignment=Stretch
-        Visibility=Visible
-      [Windows.UI.Xaml.Controls.Border]
-          Background=#33E1E1E1
-          BorderBrush=#55FF00FF
-          BorderThickness=1,1,1,1
-          Clip=[NULL]
-          CornerRadius=0,0,0,0
-          HorizontalAlignment=Stretch
-          Margin=0,0,0,0
-          Padding=0,0,0,0
-          RenderSize=150,50
-          VerticalAlignment=Stretch
-          Visibility=Visible
-      [Windows.UI.Xaml.Controls.TextBlock]
-          Clip=[NULL]
-          Foreground=#99000000
-          HorizontalAlignment=Left
-          Margin=0,0,0,0
-          Padding=12,0,0,2
-          RenderSize=90,21
-          VerticalAlignment=Center
-          Visibility=Visible
-      [Windows.UI.Xaml.Controls.FontIcon]
-          Clip=[NULL]
-          Foreground=#CC000000
-          HorizontalAlignment=Center
-          Margin=0,0,0,0
-          RenderSize=12,12
-          VerticalAlignment=Center
-          Visibility=Visible
-        [Windows.UI.Xaml.Controls.Grid]
-            Background=#00000000
-            BorderBrush=[NULL]
-            BorderThickness=0,0,0,0
-            Clip=[NULL]
-            CornerRadius=0,0,0,0
-            HorizontalAlignment=Stretch
-            Margin=0,0,0,0
-            Padding=0,0,0,0
-            RenderSize=12,12
-            VerticalAlignment=Stretch
-            Visibility=Visible
-          [Windows.UI.Xaml.Controls.TextBlock]
-              Clip=[NULL]
-              Foreground=#CC000000
-              HorizontalAlignment=Stretch
-              Margin=0,0,0,0
-              Padding=0,0,0,0
-              RenderSize=12,12
-              VerticalAlignment=Center
-              Visibility=Visible
-      [Windows.UI.Xaml.Controls.ContentPresenter]
-          Background=[NULL]
-          BorderBrush=[NULL]
-          BorderThickness=0,0,0,0
-          Clip=[NULL]
-          CornerRadius=0,0,0,0
-          Foreground=#99000000
-          HorizontalAlignment=Stretch
-          Margin=0,0,0,0
-          Padding=0,0,0,0
-          RenderSize=150,0
-          VerticalAlignment=Stretch
-          Visibility=Visible
-  [Windows.UI.Xaml.Controls.ComboBox]
-      Background=#33E1E1E1
-      BorderBrush=#55FF00FF
-      BorderThickness=1,1,1,1
-      Clip=[NULL]
-      CornerRadius=0,0,0,0
-      Foreground=#FFFFFFFF
-      Height=50
-      HorizontalAlignment=Left
-      Margin=0,0,0,0
-      Padding=12,5,0,7
-      RenderSize=800,50
-      VerticalAlignment=Top
-      Visibility=Visible
-      Width=800
-    [Windows.UI.Xaml.Controls.Grid]
-        Background=[NULL]
-        BorderBrush=[NULL]
-        BorderThickness=0,0,0,0
-        Clip=[NULL]
-        CornerRadius=0,0,0,0
-        HorizontalAlignment=Stretch
-        Margin=0,0,0,0
-        Padding=0,0,0,0
-        RenderSize=800,50
-        VerticalAlignment=Stretch
-        Visibility=Visible
-      [Windows.UI.Xaml.Controls.Border]
-          Background=#33E1E1E1
-          BorderBrush=#55FF00FF
-          BorderThickness=1,1,1,1
-          Clip=[NULL]
-          CornerRadius=0,0,0,0
-          HorizontalAlignment=Stretch
-          Margin=0,0,0,0
-          Padding=0,0,0,0
-          RenderSize=800,50
-          VerticalAlignment=Stretch
-          Visibility=Visible
-      [Windows.UI.Xaml.Controls.Border]
-          Background=#FF0078D7
-          BorderBrush=#66000000
-          BorderThickness=1,1,1,1
-          Clip=[NULL]
-          CornerRadius=0,0,0,0
-          HorizontalAlignment=Stretch
-          Margin=0,0,0,0
-          Padding=0,0,0,0
-          RenderSize=800,50
-          VerticalAlignment=Stretch
-          Visibility=Visible
-      [Windows.UI.Xaml.Controls.ContentPresenter]
-          Background=[NULL]
-          BorderBrush=[NULL]
-          BorderThickness=0,0,0,0
-          Clip=[NULL]
-          CornerRadius=0,0,0,0
-          Foreground=#FFFFFFFF
-          HorizontalAlignment=Stretch
-          Margin=12,5,0,7
-          Padding=0,0,0,0
-          RenderSize=756,19
-          VerticalAlignment=Center
-          Visibility=Visible
-        [Windows.UI.Xaml.Controls.TextBlock]
-            Clip=[NULL]
-            Foreground=#FF000000
-            HorizontalAlignment=Stretch
-            Margin=0,0,0,0
-            Padding=0,0,0,0
-            RenderSize=756,19
-            VerticalAlignment=Stretch
-            Visibility=Visible
-      [Windows.UI.Xaml.Controls.TextBox]
-          Background=#66FFFFFF
-          BorderBrush=#00FFFFFF
-          BorderThickness=1,1,1,1
-          Clip=[NULL]
-          CornerRadius=0,0,0,0
-          Foreground=#FF000000
-          HorizontalAlignment=Stretch
-          Margin=0,0,0,0
-          Padding=11,5,32,6
-          RenderSize=0,0
-          VerticalAlignment=Center
-          Visibility=Collapsed
-      [Windows.UI.Xaml.Controls.Border]
-          Background=#00FFFFFF
-          BorderBrush=[NULL]
-          BorderThickness=0,0,0,0
-          Clip=[NULL]
-          CornerRadius=0,0,0,0
-          HorizontalAlignment=Right
-          Margin=0,1,1,1
-          Padding=0,0,0,0
-          RenderSize=0,0
-          VerticalAlignment=Stretch
-          Visibility=Collapsed
-          Width=30
-      [Windows.UI.Xaml.Controls.FontIcon]
-          Clip=[NULL]
-          Foreground=#CC000000
-          HorizontalAlignment=Right
-          Margin=0,0,10,0
-          RenderSize=12,32
-          VerticalAlignment=Center
-          Visibility=Visible
-        [Windows.UI.Xaml.Controls.Grid]
-            Background=#00000000
-            BorderBrush=[NULL]
-            BorderThickness=0,0,0,0
-            Clip=[NULL]
-            CornerRadius=0,0,0,0
-            HorizontalAlignment=Stretch
-            Margin=0,0,0,0
-            Padding=0,0,0,0
-            RenderSize=12,32
-            VerticalAlignment=Stretch
-            Visibility=Visible
-          [Windows.UI.Xaml.Controls.TextBlock]
-              Clip=[NULL]
-              Foreground=#CC000000
-              HorizontalAlignment=Stretch
-              Margin=0,0,0,0
-              Padding=0,0,0,0
-              RenderSize=12,12
-              VerticalAlignment=Center
-              Visibility=Visible
-      [Windows.UI.Xaml.Controls.ContentPresenter]
-          Background=[NULL]
-          BorderBrush=[NULL]
-          BorderThickness=0,0,0,0
-          Clip=[NULL]
-          CornerRadius=0,0,0,0
-          Foreground=#99000000
-          HorizontalAlignment=Stretch
-          Margin=0,0,0,0
-          Padding=0,0,0,0
-          RenderSize=800,0
-          VerticalAlignment=Stretch
-          Visibility=Visible
-      [Windows.UI.Xaml.Controls.Primitives.Popup]
-          Clip=[NULL]
-          HorizontalAlignment=Stretch
-          Margin=0,0,0,0
-          RenderSize=768,0
-          VerticalAlignment=Stretch
-          Visibility=Visible
diff --git a/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ControlStyleRoundBorder.txt b/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ControlStyleRoundBorder.txt
deleted file mode 100644
index d498431e020..00000000000
--- a/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ControlStyleRoundBorder.txt
+++ /dev/null
@@ -1,851 +0,0 @@
-[Microsoft.ReactNative.ViewPanel]
-    Background=[NULL]
-    BorderBrush=#00000000
-    BorderThickness=0,0,0,0
-    Clip=[NULL]
-    CornerRadius=0,0,0,0
-    Height=360
-    HorizontalAlignment=Stretch
-    Margin=0,0,0,0
-    RenderSize=800,360
-    VerticalAlignment=Stretch
-    Visibility=Visible
-    Width=800
-  [Windows.UI.Xaml.Controls.ToggleSwitch]
-      Background=#33000000
-      BorderBrush=#5500FF00
-      BorderThickness=10,10,10,10
-      Clip=[NULL]
-      CornerRadius=10,10,10,10
-      Foreground=#FF000000
-      Height=50
-      HorizontalAlignment=Left
-      Margin=0,0,0,0
-      Padding=0,0,0,0
-      RenderSize=51,50
-      VerticalAlignment=Center
-      Visibility=Visible
-      Width=51
-    [Windows.UI.Xaml.Controls.Grid]
-        Background=#33000000
-        BorderBrush=#5500FF00
-        BorderThickness=10,10,10,10
-        Clip=[NULL]
-        CornerRadius=10,10,10,10
-        HorizontalAlignment=Stretch
-        Margin=0,0,0,0
-        Padding=0,0,0,0
-        RenderSize=51,50
-        VerticalAlignment=Stretch
-        Visibility=Visible
-      [Windows.UI.Xaml.Controls.Grid]
-          Background=[NULL]
-          BorderBrush=[NULL]
-          BorderThickness=0,0,0,0
-          Clip=[NULL]
-          CornerRadius=0,0,0,0
-          HorizontalAlignment=Left
-          Margin=0,0,0,0
-          Padding=0,0,0,0
-          RenderSize=154,32
-          VerticalAlignment=Top
-          Visibility=Visible
-        [Windows.UI.Xaml.Controls.Grid]
-            Background=#00FFFFFF
-            BorderBrush=[NULL]
-            BorderThickness=0,0,0,0
-            Clip=[NULL]
-            CornerRadius=0,0,0,0
-            HorizontalAlignment=Stretch
-            Margin=0,5,0,5
-            Padding=0,0,0,0
-            RenderSize=52,22
-            VerticalAlignment=Stretch
-            Visibility=Visible
-        [Windows.UI.Xaml.Controls.ContentPresenter]
-            Background=[NULL]
-            BorderBrush=[NULL]
-            BorderThickness=0,0,0,0
-            Clip=[NULL]
-            CornerRadius=0,0,0,0
-            Foreground=#FF000000
-            HorizontalAlignment=Left
-            Margin=0,0,0,0
-            Padding=0,0,0,0
-            RenderSize=0,0
-            VerticalAlignment=Center
-            Visibility=Visible
-        [Windows.UI.Xaml.Controls.ContentPresenter]
-            Background=[NULL]
-            BorderBrush=[NULL]
-            BorderThickness=0,0,0,0
-            Clip=[NULL]
-            CornerRadius=0,0,0,0
-            Foreground=#FF000000
-            HorizontalAlignment=Left
-            Margin=0,0,0,0
-            Padding=0,0,0,0
-            RenderSize=0,0
-            VerticalAlignment=Center
-            Visibility=Visible
-        [Windows.UI.Xaml.Shapes.Rectangle]
-            Clip=[NULL]
-            Height=20
-            HorizontalAlignment=Stretch
-            Margin=0,0,0,0
-            RenderSize=40,20
-            VerticalAlignment=Stretch
-            Visibility=Visible
-            Width=40
-        [Windows.UI.Xaml.Shapes.Rectangle]
-            Clip=[NULL]
-            Height=20
-            HorizontalAlignment=Stretch
-            Margin=0,0,0,0
-            RenderSize=40,20
-            VerticalAlignment=Stretch
-            Visibility=Visible
-            Width=40
-        [Windows.UI.Xaml.Controls.Grid]
-            Background=[NULL]
-            BorderBrush=[NULL]
-            BorderThickness=0,0,0,0
-            Clip=[NULL]
-            CornerRadius=0,0,0,0
-            Height=20
-            HorizontalAlignment=Left
-            Margin=0,0,0,0
-            Padding=0,0,0,0
-            RenderSize=20,20
-            VerticalAlignment=Stretch
-            Visibility=Visible
-            Width=20
-          [Windows.UI.Xaml.Shapes.Ellipse]
-              Clip=[NULL]
-              Height=10
-              HorizontalAlignment=Stretch
-              Margin=0,0,0,0
-              RenderSize=10,10
-              VerticalAlignment=Stretch
-              Visibility=Visible
-              Width=10
-          [Windows.UI.Xaml.Shapes.Ellipse]
-              Clip=[NULL]
-              Height=10
-              HorizontalAlignment=Stretch
-              Margin=0,0,0,0
-              RenderSize=10,10
-              VerticalAlignment=Stretch
-              Visibility=Visible
-              Width=10
-        [Windows.UI.Xaml.Controls.Primitives.Thumb]
-            Background=#33000000
-            BorderBrush=#00FFFFFF
-            BorderThickness=1,1,1,1
-            Clip=[NULL]
-            CornerRadius=0,0,0,0
-            Foreground=#FF000000
-            HorizontalAlignment=Stretch
-            Margin=0,0,0,0
-            Padding=0,0,0,0
-            RenderSize=52,32
-            VerticalAlignment=Stretch
-            Visibility=Visible
-          [Windows.UI.Xaml.Shapes.Rectangle]
-              Clip=[NULL]
-              HorizontalAlignment=Stretch
-              Margin=0,0,0,0
-              RenderSize=52,32
-              VerticalAlignment=Stretch
-              Visibility=Visible
-  [Windows.UI.Xaml.Controls.CheckBox]
-      Background=#33000000
-      BorderBrush=#5500FF00
-      BorderThickness=10,10,10,10
-      Clip=[NULL]
-      CornerRadius=10,10,10,10
-      Foreground=#FF000000
-      Height=50
-      HorizontalAlignment=Left
-      Margin=0,0,0,0
-      Padding=8,5,0,0
-      RenderSize=120,50
-      VerticalAlignment=Center
-      Visibility=Visible
-      Width=40
-    [Windows.UI.Xaml.Controls.Grid]
-        Background=#33000000
-        BorderBrush=#5500FF00
-        BorderThickness=10,10,10,10
-        Clip=[NULL]
-        CornerRadius=10,10,10,10
-        HorizontalAlignment=Stretch
-        Margin=0,0,0,0
-        Padding=0,0,0,0
-        RenderSize=120,50
-        VerticalAlignment=Stretch
-        Visibility=Visible
-      [Windows.UI.Xaml.Controls.Grid]
-          Background=[NULL]
-          BorderBrush=[NULL]
-          BorderThickness=0,0,0,0
-          Clip=[NULL]
-          CornerRadius=0,0,0,0
-          Height=32
-          HorizontalAlignment=Stretch
-          Margin=0,0,0,0
-          Padding=0,0,0,0
-          RenderSize=20,32
-          VerticalAlignment=Top
-          Visibility=Visible
-        [Windows.UI.Xaml.Shapes.Rectangle]
-            Clip=[NULL]
-            Height=20
-            HorizontalAlignment=Stretch
-            Margin=0,0,0,0
-            RenderSize=20,20
-            VerticalAlignment=Stretch
-            Visibility=Visible
-            Width=20
-        [Windows.UI.Xaml.Controls.FontIcon]
-            Clip=[NULL]
-            Foreground=#FFFFFFFF
-            HorizontalAlignment=Stretch
-            Margin=0,0,0,0
-            RenderSize=20,32
-            VerticalAlignment=Stretch
-            Visibility=Visible
-          [Windows.UI.Xaml.Controls.Grid]
-              Background=#00000000
-              BorderBrush=[NULL]
-              BorderThickness=0,0,0,0
-              Clip=[NULL]
-              CornerRadius=0,0,0,0
-              HorizontalAlignment=Stretch
-              Margin=0,0,0,0
-              Padding=0,0,0,0
-              RenderSize=20,32
-              VerticalAlignment=Stretch
-              Visibility=Visible
-            [Windows.UI.Xaml.Controls.TextBlock]
-                Clip=[NULL]
-                Foreground=#FFFFFFFF
-                HorizontalAlignment=Stretch
-                Margin=0,0,0,0
-                Padding=0,0,0,0
-                RenderSize=20,16
-                VerticalAlignment=Center
-                Visibility=Visible
-      [Windows.UI.Xaml.Controls.ContentPresenter]
-          Background=[NULL]
-          BorderBrush=[NULL]
-          BorderThickness=0,0,0,0
-          Clip=[NULL]
-          CornerRadius=0,0,0,0
-          Foreground=#FF000000
-          HorizontalAlignment=Left
-          Margin=8,5,0,0
-          Padding=0,0,0,0
-          RenderSize=0,0
-          VerticalAlignment=Top
-          Visibility=Visible
-  [Windows.UI.Xaml.Controls.TextBox]
-      Background=#33000000
-      BorderBrush=#5500FF00
-      BorderThickness=10,10,10,10
-      Clip=[NULL]
-      CornerRadius=10,10,10,10
-      Foreground=#FF000000
-      Height=50
-      HorizontalAlignment=Stretch
-      Margin=0,0,0,0
-      Padding=10,10,10,10
-      RenderSize=800,50
-      VerticalAlignment=Stretch
-      Visibility=Visible
-      Width=800
-    [Windows.UI.Xaml.Controls.Grid]
-        Background=[NULL]
-        BorderBrush=[NULL]
-        BorderThickness=0,0,0,0
-        Clip=[NULL]
-        CornerRadius=0,0,0,0
-        HorizontalAlignment=Stretch
-        Margin=0,0,0,0
-        Padding=0,0,0,0
-        RenderSize=800,50
-        VerticalAlignment=Stretch
-        Visibility=Visible
-      [Windows.UI.Xaml.Controls.Border]
-          Background=#33000000
-          BorderBrush=#5500FF00
-          BorderThickness=10,10,10,10
-          Clip=[NULL]
-          CornerRadius=10,10,10,10
-          HorizontalAlignment=Stretch
-          Margin=0,0,0,0
-          Padding=0,0,0,0
-          RenderSize=800,50
-          VerticalAlignment=Stretch
-          Visibility=Visible
-      [Windows.UI.Xaml.Controls.ScrollViewer]
-          Background=#00FFFFFF
-          BorderBrush=#00FFFFFF
-          BorderThickness=0,0,0,0
-          Clip=[NULL]
-          CornerRadius=0,0,0,0
-          Foreground=#FF000000
-          HorizontalAlignment=Stretch
-          Margin=10,10,10,10
-          Padding=10,10,10,10
-          RenderSize=780,30
-          VerticalAlignment=Stretch
-          Visibility=Visible
-        [Windows.UI.Xaml.Controls.Border]
-            Background=[NULL]
-            BorderBrush=#00FFFFFF
-            BorderThickness=0,0,0,0
-            Clip=[NULL]
-            CornerRadius=0,0,0,0
-            HorizontalAlignment=Stretch
-            Margin=0,0,0,0
-            Padding=0,0,0,0
-            RenderSize=780,30
-            VerticalAlignment=Stretch
-            Visibility=Visible
-          [Windows.UI.Xaml.Controls.Grid]
-              Background=#00FFFFFF
-              BorderBrush=[NULL]
-              BorderThickness=0,0,0,0
-              Clip=[NULL]
-              CornerRadius=0,0,0,0
-              HorizontalAlignment=Stretch
-              Margin=0,0,0,0
-              Padding=0,0,0,0
-              RenderSize=780,30
-              VerticalAlignment=Stretch
-              Visibility=Visible
-            [Windows.UI.Xaml.Controls.ScrollContentPresenter]
-                Background=[NULL]
-                BorderBrush=[NULL]
-                BorderThickness=0,0,0,0
-                Clip=Windows.UI.Xaml.Media.RectangleGeometry
-                CornerRadius=0,0,0,0
-                Foreground=#FF000000
-                HorizontalAlignment=Stretch
-                Margin=10,10,10,10
-                Padding=0,0,0,0
-                RenderSize=760,10
-                VerticalAlignment=Stretch
-                Visibility=Visible
-              [Windows.UI.Xaml.FrameworkElement]
-                  Clip=[NULL]
-                  HorizontalAlignment=Stretch
-                  Margin=0,0,0,0
-                  RenderSize=760,10
-                  VerticalAlignment=Stretch
-                  Visibility=Visible
-            [Windows.UI.Xaml.Controls.Grid]
-                Background=[NULL]
-                BorderBrush=[NULL]
-                BorderThickness=0,0,0,0
-                Clip=[NULL]
-                CornerRadius=0,0,0,0
-                HorizontalAlignment=Stretch
-                Margin=0,0,0,0
-                Padding=0,0,0,0
-                RenderSize=780,30
-                VerticalAlignment=Stretch
-                Visibility=Visible
-            [Windows.UI.Xaml.Controls.Primitives.ScrollBar]
-                Background=#00FFFFFF
-                BorderBrush=#00FFFFFF
-                BorderThickness=0,0,0,0
-                Clip=[NULL]
-                CornerRadius=2,2,2,2
-                Foreground=#00FFFFFF
-                HorizontalAlignment=Right
-                Margin=0,0,0,0
-                Padding=0,0,0,0
-                RenderSize=0,0
-                VerticalAlignment=Stretch
-                Visibility=Collapsed
-            [Windows.UI.Xaml.Controls.Primitives.ScrollBar]
-                Background=#00FFFFFF
-                BorderBrush=#00FFFFFF
-                BorderThickness=0,0,0,0
-                Clip=[NULL]
-                CornerRadius=2,2,2,2
-                Foreground=#00FFFFFF
-                HorizontalAlignment=Stretch
-                Margin=0,0,0,0
-                Padding=0,0,0,0
-                RenderSize=0,0
-                VerticalAlignment=Stretch
-                Visibility=Collapsed
-            [Windows.UI.Xaml.Controls.Border]
-                Background=#FFE6E6E6
-                BorderBrush=[NULL]
-                BorderThickness=0,0,0,0
-                Clip=[NULL]
-                CornerRadius=0,0,0,0
-                HorizontalAlignment=Stretch
-                Margin=0,0,0,0
-                Padding=0,0,0,0
-                RenderSize=0,0
-                VerticalAlignment=Stretch
-                Visibility=Collapsed
-      [Windows.UI.Xaml.Controls.TextBlock]
-          Clip=[NULL]
-          Foreground=#B3E1E1E1
-          HorizontalAlignment=Stretch
-          Margin=10,10,10,10
-          Padding=10,10,10,10
-          RenderSize=780,39
-          VerticalAlignment=Stretch
-          Visibility=Visible
-      [Windows.UI.Xaml.Controls.Button]
-          Background=#33000000
-          BorderBrush=#00FFFFFF
-          BorderThickness=10,10,10,10
-          Clip=[NULL]
-          CornerRadius=0,10,10,0
-          Foreground=#FF000000
-          HorizontalAlignment=Left
-          Margin=0,0,0,0
-          Padding=0,0,-2,0
-          RenderSize=0,0
-          VerticalAlignment=Stretch
-          Visibility=Collapsed
-      [Windows.UI.Xaml.Controls.ContentPresenter]
-          Background=[NULL]
-          BorderBrush=[NULL]
-          BorderThickness=0,0,0,0
-          Clip=[NULL]
-          CornerRadius=0,0,0,0
-          Foreground=#99000000
-          HorizontalAlignment=Stretch
-          Margin=0,0,0,0
-          Padding=0,0,0,0
-          RenderSize=800,0
-          VerticalAlignment=Stretch
-          Visibility=Visible
-  [Windows.UI.Xaml.Controls.PasswordBox]
-      Background=#33000000
-      BorderBrush=#5500FF00
-      BorderThickness=10,10,10,10
-      Clip=[NULL]
-      CornerRadius=10,10,10,10
-      Foreground=#FF000000
-      Height=50
-      HorizontalAlignment=Stretch
-      Margin=0,0,0,0
-      Padding=10,10,10,10
-      RenderSize=800,50
-      VerticalAlignment=Stretch
-      Visibility=Visible
-      Width=800
-    [Windows.UI.Xaml.Controls.Grid]
-        Background=[NULL]
-        BorderBrush=[NULL]
-        BorderThickness=0,0,0,0
-        Clip=[NULL]
-        CornerRadius=0,0,0,0
-        HorizontalAlignment=Stretch
-        Margin=0,0,0,0
-        Padding=0,0,0,0
-        RenderSize=800,50
-        VerticalAlignment=Stretch
-        Visibility=Visible
-      [Windows.UI.Xaml.Controls.Border]
-          Background=#33000000
-          BorderBrush=#5500FF00
-          BorderThickness=10,10,10,10
-          Clip=[NULL]
-          CornerRadius=10,10,10,10
-          HorizontalAlignment=Stretch
-          Margin=0,0,0,0
-          Padding=0,0,0,0
-          RenderSize=800,50
-          VerticalAlignment=Stretch
-          Visibility=Visible
-      [Windows.UI.Xaml.Controls.ScrollViewer]
-          Background=#00FFFFFF
-          BorderBrush=#00FFFFFF
-          BorderThickness=0,0,0,0
-          Clip=[NULL]
-          CornerRadius=0,0,0,0
-          Foreground=#FF000000
-          HorizontalAlignment=Stretch
-          Margin=10,10,10,10
-          Padding=10,10,10,10
-          RenderSize=780,30
-          VerticalAlignment=Stretch
-          Visibility=Visible
-        [Windows.UI.Xaml.Controls.Border]
-            Background=[NULL]
-            BorderBrush=#00FFFFFF
-            BorderThickness=0,0,0,0
-            Clip=[NULL]
-            CornerRadius=0,0,0,0
-            HorizontalAlignment=Stretch
-            Margin=0,0,0,0
-            Padding=0,0,0,0
-            RenderSize=780,30
-            VerticalAlignment=Stretch
-            Visibility=Visible
-          [Windows.UI.Xaml.Controls.Grid]
-              Background=#00FFFFFF
-              BorderBrush=[NULL]
-              BorderThickness=0,0,0,0
-              Clip=[NULL]
-              CornerRadius=0,0,0,0
-              HorizontalAlignment=Stretch
-              Margin=0,0,0,0
-              Padding=0,0,0,0
-              RenderSize=780,30
-              VerticalAlignment=Stretch
-              Visibility=Visible
-            [Windows.UI.Xaml.Controls.ScrollContentPresenter]
-                Background=[NULL]
-                BorderBrush=[NULL]
-                BorderThickness=0,0,0,0
-                Clip=Windows.UI.Xaml.Media.RectangleGeometry
-                CornerRadius=0,0,0,0
-                Foreground=#FF000000
-                HorizontalAlignment=Stretch
-                Margin=10,10,10,10
-                Padding=0,0,0,0
-                RenderSize=760,10
-                VerticalAlignment=Stretch
-                Visibility=Visible
-              [Windows.UI.Xaml.FrameworkElement]
-                  Clip=[NULL]
-                  HorizontalAlignment=Stretch
-                  Margin=0,0,0,0
-                  RenderSize=760,10
-                  VerticalAlignment=Stretch
-                  Visibility=Visible
-            [Windows.UI.Xaml.Controls.Grid]
-                Background=[NULL]
-                BorderBrush=[NULL]
-                BorderThickness=0,0,0,0
-                Clip=[NULL]
-                CornerRadius=0,0,0,0
-                HorizontalAlignment=Stretch
-                Margin=0,0,0,0
-                Padding=0,0,0,0
-                RenderSize=780,30
-                VerticalAlignment=Stretch
-                Visibility=Visible
-            [Windows.UI.Xaml.Controls.Primitives.ScrollBar]
-                Background=#00FFFFFF
-                BorderBrush=#00FFFFFF
-                BorderThickness=0,0,0,0
-                Clip=[NULL]
-                CornerRadius=2,2,2,2
-                Foreground=#00FFFFFF
-                HorizontalAlignment=Right
-                Margin=0,0,0,0
-                Padding=0,0,0,0
-                RenderSize=0,0
-                VerticalAlignment=Stretch
-                Visibility=Collapsed
-            [Windows.UI.Xaml.Controls.Primitives.ScrollBar]
-                Background=#00FFFFFF
-                BorderBrush=#00FFFFFF
-                BorderThickness=0,0,0,0
-                Clip=[NULL]
-                CornerRadius=2,2,2,2
-                Foreground=#00FFFFFF
-                HorizontalAlignment=Stretch
-                Margin=0,0,0,0
-                Padding=0,0,0,0
-                RenderSize=0,0
-                VerticalAlignment=Stretch
-                Visibility=Collapsed
-            [Windows.UI.Xaml.Controls.Border]
-                Background=#FFE6E6E6
-                BorderBrush=[NULL]
-                BorderThickness=0,0,0,0
-                Clip=[NULL]
-                CornerRadius=0,0,0,0
-                HorizontalAlignment=Stretch
-                Margin=0,0,0,0
-                Padding=0,0,0,0
-                RenderSize=0,0
-                VerticalAlignment=Stretch
-                Visibility=Collapsed
-      [Windows.UI.Xaml.Controls.TextBlock]
-          Clip=[NULL]
-          Foreground=#99000000
-          HorizontalAlignment=Stretch
-          Margin=10,10,10,10
-          Padding=10,10,10,10
-          RenderSize=780,39
-          VerticalAlignment=Stretch
-          Visibility=Visible
-      [Windows.UI.Xaml.Controls.Primitives.ToggleButton]
-          Background=#33000000
-          BorderBrush=#00FFFFFF
-          BorderThickness=10,10,10,10
-          Clip=[NULL]
-          CornerRadius=0,10,10,0
-          Foreground=#FF000000
-          HorizontalAlignment=Left
-          Margin=0,0,0,0
-          Padding=0,0,-2,0
-          RenderSize=0,0
-          VerticalAlignment=Stretch
-          Visibility=Collapsed
-      [Windows.UI.Xaml.Controls.ContentPresenter]
-          Background=[NULL]
-          BorderBrush=[NULL]
-          BorderThickness=0,0,0,0
-          Clip=[NULL]
-          CornerRadius=0,0,0,0
-          Foreground=#99000000
-          HorizontalAlignment=Stretch
-          Margin=0,0,0,0
-          Padding=0,0,0,0
-          RenderSize=800,0
-          VerticalAlignment=Stretch
-          Visibility=Visible
-  [Windows.UI.Xaml.Controls.CalendarDatePicker]
-      Background=#33000000
-      BorderBrush=#5500FF00
-      BorderThickness=10,10,10,10
-      Clip=[NULL]
-      CornerRadius=10,10,10,10
-      Foreground=#FF000000
-      Height=50
-      HorizontalAlignment=Left
-      Margin=0,0,0,0
-      Padding=0,0,0,0
-      RenderSize=150,50
-      VerticalAlignment=Center
-      Visibility=Visible
-      Width=150
-    [Windows.UI.Xaml.Controls.Grid]
-        Background=[NULL]
-        BorderBrush=[NULL]
-        BorderThickness=0,0,0,0
-        Clip=[NULL]
-        CornerRadius=0,0,0,0
-        HorizontalAlignment=Stretch
-        Margin=0,0,0,0
-        Padding=0,0,0,0
-        RenderSize=150,50
-        VerticalAlignment=Stretch
-        Visibility=Visible
-      [Windows.UI.Xaml.Controls.Border]
-          Background=#33000000
-          BorderBrush=#5500FF00
-          BorderThickness=10,10,10,10
-          Clip=[NULL]
-          CornerRadius=10,10,10,10
-          HorizontalAlignment=Stretch
-          Margin=0,0,0,0
-          Padding=0,0,0,0
-          RenderSize=150,50
-          VerticalAlignment=Stretch
-          Visibility=Visible
-      [Windows.UI.Xaml.Controls.TextBlock]
-          Clip=[NULL]
-          Foreground=#99000000
-          HorizontalAlignment=Left
-          Margin=0,0,0,0
-          Padding=12,0,0,2
-          RenderSize=90,21
-          VerticalAlignment=Center
-          Visibility=Visible
-      [Windows.UI.Xaml.Controls.FontIcon]
-          Clip=[NULL]
-          Foreground=#CC000000
-          HorizontalAlignment=Center
-          Margin=0,0,0,0
-          RenderSize=12,12
-          VerticalAlignment=Center
-          Visibility=Visible
-        [Windows.UI.Xaml.Controls.Grid]
-            Background=#00000000
-            BorderBrush=[NULL]
-            BorderThickness=0,0,0,0
-            Clip=[NULL]
-            CornerRadius=0,0,0,0
-            HorizontalAlignment=Stretch
-            Margin=0,0,0,0
-            Padding=0,0,0,0
-            RenderSize=12,12
-            VerticalAlignment=Stretch
-            Visibility=Visible
-          [Windows.UI.Xaml.Controls.TextBlock]
-              Clip=[NULL]
-              Foreground=#CC000000
-              HorizontalAlignment=Stretch
-              Margin=0,0,0,0
-              Padding=0,0,0,0
-              RenderSize=12,12
-              VerticalAlignment=Center
-              Visibility=Visible
-      [Windows.UI.Xaml.Controls.ContentPresenter]
-          Background=[NULL]
-          BorderBrush=[NULL]
-          BorderThickness=0,0,0,0
-          Clip=[NULL]
-          CornerRadius=0,0,0,0
-          Foreground=#99000000
-          HorizontalAlignment=Stretch
-          Margin=0,0,0,0
-          Padding=0,0,0,0
-          RenderSize=150,0
-          VerticalAlignment=Stretch
-          Visibility=Visible
-  [Windows.UI.Xaml.Controls.ComboBox]
-      Background=#33000000
-      BorderBrush=#5500FF00
-      BorderThickness=10,10,10,10
-      Clip=[NULL]
-      CornerRadius=10,10,10,10
-      Foreground=#FF000000
-      Height=50
-      HorizontalAlignment=Left
-      Margin=0,0,0,0
-      Padding=12,5,0,7
-      RenderSize=800,50
-      VerticalAlignment=Top
-      Visibility=Visible
-      Width=800
-    [Windows.UI.Xaml.Controls.Grid]
-        Background=[NULL]
-        BorderBrush=[NULL]
-        BorderThickness=0,0,0,0
-        Clip=[NULL]
-        CornerRadius=0,0,0,0
-        HorizontalAlignment=Stretch
-        Margin=0,0,0,0
-        Padding=0,0,0,0
-        RenderSize=800,50
-        VerticalAlignment=Stretch
-        Visibility=Visible
-      [Windows.UI.Xaml.Controls.Border]
-          Background=#33000000
-          BorderBrush=#5500FF00
-          BorderThickness=10,10,10,10
-          Clip=[NULL]
-          CornerRadius=10,10,10,10
-          HorizontalAlignment=Stretch
-          Margin=0,0,0,0
-          Padding=0,0,0,0
-          RenderSize=800,50
-          VerticalAlignment=Stretch
-          Visibility=Visible
-      [Windows.UI.Xaml.Controls.Border]
-          Background=#FF0078D7
-          BorderBrush=#66000000
-          BorderThickness=10,10,10,10
-          Clip=[NULL]
-          CornerRadius=10,10,10,10
-          HorizontalAlignment=Stretch
-          Margin=0,0,0,0
-          Padding=0,0,0,0
-          RenderSize=800,50
-          VerticalAlignment=Stretch
-          Visibility=Visible
-      [Windows.UI.Xaml.Controls.ContentPresenter]
-          Background=[NULL]
-          BorderBrush=[NULL]
-          BorderThickness=0,0,0,0
-          Clip=[NULL]
-          CornerRadius=0,0,0,0
-          Foreground=#FF000000
-          HorizontalAlignment=Stretch
-          Margin=12,5,0,7
-          Padding=0,0,0,0
-          RenderSize=756,19
-          VerticalAlignment=Center
-          Visibility=Visible
-        [Windows.UI.Xaml.Controls.TextBlock]
-            Clip=[NULL]
-            Foreground=#FF000000
-            HorizontalAlignment=Stretch
-            Margin=0,0,0,0
-            Padding=0,0,0,0
-            RenderSize=756,19
-            VerticalAlignment=Stretch
-            Visibility=Visible
-      [Windows.UI.Xaml.Controls.TextBox]
-          Background=#66FFFFFF
-          BorderBrush=#00FFFFFF
-          BorderThickness=1,1,1,1
-          Clip=[NULL]
-          CornerRadius=10,10,10,10
-          Foreground=#FF000000
-          HorizontalAlignment=Stretch
-          Margin=0,0,0,0
-          Padding=11,5,32,6
-          RenderSize=0,0
-          VerticalAlignment=Center
-          Visibility=Collapsed
-      [Windows.UI.Xaml.Controls.Border]
-          Background=#00FFFFFF
-          BorderBrush=[NULL]
-          BorderThickness=0,0,0,0
-          Clip=[NULL]
-          CornerRadius=0,0,0,0
-          HorizontalAlignment=Right
-          Margin=0,1,1,1
-          Padding=0,0,0,0
-          RenderSize=0,0
-          VerticalAlignment=Stretch
-          Visibility=Collapsed
-          Width=30
-      [Windows.UI.Xaml.Controls.FontIcon]
-          Clip=[NULL]
-          Foreground=#CC000000
-          HorizontalAlignment=Right
-          Margin=0,0,10,0
-          RenderSize=12,32
-          VerticalAlignment=Center
-          Visibility=Visible
-        [Windows.UI.Xaml.Controls.Grid]
-            Background=#00000000
-            BorderBrush=[NULL]
-            BorderThickness=0,0,0,0
-            Clip=[NULL]
-            CornerRadius=0,0,0,0
-            HorizontalAlignment=Stretch
-            Margin=0,0,0,0
-            Padding=0,0,0,0
-            RenderSize=12,32
-            VerticalAlignment=Stretch
-            Visibility=Visible
-          [Windows.UI.Xaml.Controls.TextBlock]
-              Clip=[NULL]
-              Foreground=#CC000000
-              HorizontalAlignment=Stretch
-              Margin=0,0,0,0
-              Padding=0,0,0,0
-              RenderSize=12,12
-              VerticalAlignment=Center
-              Visibility=Visible
-      [Windows.UI.Xaml.Controls.ContentPresenter]
-          Background=[NULL]
-          BorderBrush=[NULL]
-          BorderThickness=0,0,0,0
-          Clip=[NULL]
-          CornerRadius=0,0,0,0
-          Foreground=#99000000
-          HorizontalAlignment=Stretch
-          Margin=0,0,0,0
-          Padding=0,0,0,0
-          RenderSize=800,0
-          VerticalAlignment=Stretch
-          Visibility=Visible
-      [Windows.UI.Xaml.Controls.Primitives.Popup]
-          Clip=[NULL]
-          HorizontalAlignment=Stretch
-          Margin=0,0,0,0
-          RenderSize=768,0
-          VerticalAlignment=Stretch
-          Visibility=Visible
diff --git a/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ImageRTL.txt b/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ImageRTL.txt
deleted file mode 100644
index f90ce43e291..00000000000
--- a/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ImageRTL.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-[Windows.UI.Xaml.Controls.Border]
-    Background=#FFFFFF00
-    BorderBrush=[NULL]
-    BorderThickness=0,0,0,0
-    Clip=[NULL]
-    CornerRadius=0,0,0,0
-    FlowDirection=LeftToRight
-    Height=300
-    HorizontalAlignment=Stretch
-    Margin=0,0,0,0
-    Padding=0,0,0,0
-    RenderSize=500,300
-    VerticalAlignment=Stretch
-    Visibility=Visible
-    Width=500
-  [Microsoft.ReactNative.ViewPanel]
-      Background=[NULL]
-      BorderBrush=#00000000
-      BorderThickness=0,0,0,0
-      Clip=[NULL]
-      CornerRadius=0,0,0,0
-      FlowDirection=LeftToRight
-      HorizontalAlignment=Stretch
-      Margin=0,0,0,0
-      RenderSize=500,300
-      VerticalAlignment=Stretch
-      Visibility=Visible
-    [Windows.UI.Xaml.DependencyObject]
diff --git a/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ImageWithBorder.txt b/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ImageWithBorder.txt
deleted file mode 100644
index a9a9072b5b9..00000000000
--- a/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ImageWithBorder.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-[Windows.UI.Xaml.Controls.Border]
-    Background=#FFFFFF00
-    BorderBrush=#5500FF00
-    BorderThickness=10,10,10,10
-    Clip=[NULL]
-    CornerRadius=10,10,10,10
-    Height=300
-    HorizontalAlignment=Stretch
-    Margin=0,0,0,0
-    Padding=0,0,0,0
-    RenderSize=500,300
-    VerticalAlignment=Stretch
-    Visibility=Visible
-    Width=500
-  [Microsoft.ReactNative.ViewPanel]
-      Background=[NULL]
-      BorderBrush=#5500FF00
-      BorderThickness=10,10,10,10
-      Clip=[NULL]
-      CornerRadius=10,10,10,10
-      HorizontalAlignment=Stretch
-      Margin=0,0,0,0
-      RenderSize=480,280
-      VerticalAlignment=Stretch
-      Visibility=Visible
-    [Windows.UI.Xaml.DependencyObject]
diff --git a/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ImageWithoutBorder-Subsequent.txt b/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ImageWithoutBorder-Subsequent.txt
deleted file mode 100644
index 39971f8b2c1..00000000000
--- a/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ImageWithoutBorder-Subsequent.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-[Windows.UI.Xaml.Controls.Border]
-    Background=#FFFFFF00
-    BorderBrush=[NULL]
-    BorderThickness=0,0,0,0
-    Clip=[NULL]
-    CornerRadius=0,0,0,0
-    Height=300
-    HorizontalAlignment=Stretch
-    Margin=0,0,0,0
-    Padding=0,0,0,0
-    RenderSize=500,300
-    VerticalAlignment=Stretch
-    Visibility=Visible
-    Width=500
-  [Microsoft.ReactNative.ViewPanel]
-      Background=[NULL]
-      BorderBrush=#00000000
-      BorderThickness=0,0,0,0
-      Clip=[NULL]
-      CornerRadius=0,0,0,0
-      HorizontalAlignment=Stretch
-      Margin=0,0,0,0
-      RenderSize=500,300
-      VerticalAlignment=Stretch
-      Visibility=Visible
-    [Windows.UI.Xaml.DependencyObject]
diff --git a/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ImageWithoutBorder.txt b/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ImageWithoutBorder.txt
deleted file mode 100644
index 55c2c907c00..00000000000
--- a/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ImageWithoutBorder.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-[Microsoft.ReactNative.ViewPanel]
-    Background=#FFFFFF00
-    BorderBrush=#00000000
-    BorderThickness=0,0,0,0
-    Clip=[NULL]
-    CornerRadius=0,0,0,0
-    Height=300
-    HorizontalAlignment=Stretch
-    Margin=0,0,0,0
-    RenderSize=500,300
-    VerticalAlignment=Stretch
-    Visibility=Visible
-    Width=500
-  [Windows.UI.Xaml.DependencyObject]
diff --git a/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/masters/ControlStyleRegularBorder.json b/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/masters/ControlStyleRegularBorder.json
new file mode 100644
index 00000000000..e566a06df93
--- /dev/null
+++ b/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/masters/ControlStyleRegularBorder.json
@@ -0,0 +1,977 @@
+{
+    "XamlType": "Microsoft.ReactNative.ViewPanel",
+    "Background": null,
+    "BorderBrush": "#00000000",
+    "BorderThickness": "0,0,0,0",
+    "Clip": null,
+    "CornerRadius": "0,0,0,0",
+    "FlowDirection": "LeftToRight",
+    "Height": 300,
+    "HorizontalAlignment": "Stretch",
+    "Margin": "0,0,0,0",
+    "RenderSize": [800, 300],
+    "VerticalAlignment": "Stretch",
+    "Visibility": "Visible",
+    "Width": 800,
+    "children": [
+    {
+        "XamlType": "Windows.UI.Xaml.Controls.CheckBox",
+        "Background": "#33E1E1E1",
+        "BorderBrush": "#55FF00FF",
+        "BorderThickness": "1,1,1,1",
+        "Clip": null,
+        "CornerRadius": "0,0,0,0",
+        "FlowDirection": "LeftToRight",
+        "Foreground": "#FFFFFFFF",
+        "Height": 50,
+        "HorizontalAlignment": "Left",
+        "Margin": "0,0,0,0",
+        "Padding": "8,5,0,0",
+        "RenderSize": [120, 50],
+        "VerticalAlignment": "Center",
+        "Visibility": "Visible",
+        "Width": 32,
+        "children": [
+        {
+            "XamlType": "Windows.UI.Xaml.Controls.Grid",
+            "Background": "#33E1E1E1",
+            "BorderBrush": "#55FF00FF",
+            "BorderThickness": "1,1,1,1",
+            "Clip": null,
+            "CornerRadius": "0,0,0,0",
+            "FlowDirection": "LeftToRight",
+            "HorizontalAlignment": "Stretch",
+            "Margin": "0,0,0,0",
+            "Name": "RootGrid",
+            "Padding": "0,0,0,0",
+            "RenderSize": [120, 50],
+            "VerticalAlignment": "Stretch",
+            "Visibility": "Visible",
+            "children": [
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.Grid",
+                "Background": null,
+                "BorderBrush": null,
+                "BorderThickness": "0,0,0,0",
+                "Clip": null,
+                "CornerRadius": "0,0,0,0",
+                "FlowDirection": "LeftToRight",
+                "Height": 32,
+                "HorizontalAlignment": "Stretch",
+                "Margin": "0,0,0,0",
+                "Padding": "0,0,0,0",
+                "RenderSize": [20, 32],
+                "VerticalAlignment": "Top",
+                "Visibility": "Visible",
+                "children": [
+                {
+                    "XamlType": "Windows.UI.Xaml.Shapes.Rectangle",
+                    "Clip": null,
+                    "FlowDirection": "LeftToRight",
+                    "Height": 20,
+                    "HorizontalAlignment": "Stretch",
+                    "Margin": "0,0,0,0",
+                    "Name": "NormalRectangle",
+                    "RenderSize": [20, 20],
+                    "VerticalAlignment": "Stretch",
+                    "Visibility": "Visible",
+                    "Width": 20
+                },
+                {
+                    "XamlType": "Windows.UI.Xaml.Controls.FontIcon",
+                    "Clip": null,
+                    "FlowDirection": "LeftToRight",
+                    "Foreground": "#FFFFFFFF",
+                    "HorizontalAlignment": "Stretch",
+                    "Margin": "0,0,0,0",
+                    "Name": "CheckGlyph",
+                    "RenderSize": [20, 32],
+                    "VerticalAlignment": "Stretch",
+                    "Visibility": "Visible",
+                    "children": [
+                    {
+                        "XamlType": "Windows.UI.Xaml.Controls.Grid",
+                        "Background": "#00000000",
+                        "BorderBrush": null,
+                        "BorderThickness": "0,0,0,0",
+                        "Clip": null,
+                        "CornerRadius": "0,0,0,0",
+                        "FlowDirection": "LeftToRight",
+                        "HorizontalAlignment": "Stretch",
+                        "Margin": "0,0,0,0",
+                        "Padding": "0,0,0,0",
+                        "RenderSize": [20, 32],
+                        "VerticalAlignment": "Stretch",
+                        "Visibility": "Visible",
+                        "children": [
+                        {
+                            "XamlType": "Windows.UI.Xaml.Controls.TextBlock",
+                            "Clip": null,
+                            "FlowDirection": "LeftToRight",
+                            "Foreground": "#FFFFFFFF",
+                            "HorizontalAlignment": "Stretch",
+                            "Margin": "0,0,0,0",
+                            "Padding": "0,0,0,0",
+                            "RenderSize": [20, 16],
+                            "VerticalAlignment": "Center",
+                            "Visibility": "Visible"
+                        }
+                        ]
+                    }
+                    ]
+                }
+                ]
+            },
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.ContentPresenter",
+                "Background": null,
+                "BorderBrush": null,
+                "BorderThickness": "0,0,0,0",
+                "Clip": null,
+                "CornerRadius": "0,0,0,0",
+                "FlowDirection": "LeftToRight",
+                "Foreground": "#FF000000",
+                "HorizontalAlignment": "Left",
+                "Margin": "8,5,0,0",
+                "Name": "ContentPresenter",
+                "Padding": "0,0,0,0",
+                "RenderSize": [0, 0],
+                "VerticalAlignment": "Top",
+                "Visibility": "Visible"
+            }
+            ]
+        }
+        ]
+    },
+    {
+        "XamlType": "Windows.UI.Xaml.Controls.TextBox",
+        "Background": "#33E1E1E1",
+        "BorderBrush": "#55FF00FF",
+        "BorderThickness": "1,1,1,1",
+        "Clip": null,
+        "CornerRadius": "0,0,0,0",
+        "FlowDirection": "LeftToRight",
+        "Foreground": "#FFFFFFFF",
+        "Height": 41,
+        "HorizontalAlignment": "Stretch",
+        "Margin": "0,0,0,0",
+        "Padding": "10,10,10,10",
+        "RenderSize": [800, 41],
+        "VerticalAlignment": "Stretch",
+        "Visibility": "Visible",
+        "Width": 800,
+        "children": [
+        {
+            "XamlType": "Windows.UI.Xaml.Controls.Grid",
+            "Background": null,
+            "BorderBrush": null,
+            "BorderThickness": "0,0,0,0",
+            "Clip": null,
+            "CornerRadius": "0,0,0,0",
+            "FlowDirection": "LeftToRight",
+            "HorizontalAlignment": "Stretch",
+            "Margin": "0,0,0,0",
+            "Padding": "0,0,0,0",
+            "RenderSize": [800, 41],
+            "VerticalAlignment": "Stretch",
+            "Visibility": "Visible",
+            "children": [
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.Border",
+                "Background": "#33E1E1E1",
+                "BorderBrush": "#55FF00FF",
+                "BorderThickness": "1,1,1,1",
+                "Clip": null,
+                "CornerRadius": "0,0,0,0",
+                "FlowDirection": "LeftToRight",
+                "HorizontalAlignment": "Stretch",
+                "Margin": "0,0,0,0",
+                "Name": "BorderElement",
+                "Padding": "0,0,0,0",
+                "RenderSize": [800, 41],
+                "VerticalAlignment": "Stretch",
+                "Visibility": "Visible"
+            },
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.ScrollViewer",
+                "Background": "#00FFFFFF",
+                "BorderBrush": "#00FFFFFF",
+                "BorderThickness": "0,0,0,0",
+                "Clip": null,
+                "CornerRadius": "0,0,0,0",
+                "FlowDirection": "LeftToRight",
+                "Foreground": "#FFFFFFFF",
+                "HorizontalAlignment": "Stretch",
+                "Margin": "1,1,1,1",
+                "Name": "ContentElement",
+                "Padding": "10,10,10,10",
+                "RenderSize": [798, 39],
+                "VerticalAlignment": "Stretch",
+                "Visibility": "Visible",
+                "children": [
+                {
+                    "XamlType": "Windows.UI.Xaml.Controls.Border",
+                    "Background": null,
+                    "BorderBrush": "#00FFFFFF",
+                    "BorderThickness": "0,0,0,0",
+                    "Clip": null,
+                    "CornerRadius": "0,0,0,0",
+                    "FlowDirection": "LeftToRight",
+                    "HorizontalAlignment": "Stretch",
+                    "Margin": "0,0,0,0",
+                    "Name": "Root",
+                    "Padding": "0,0,0,0",
+                    "RenderSize": [798, 39],
+                    "VerticalAlignment": "Stretch",
+                    "Visibility": "Visible",
+                    "children": [
+                    {
+                        "XamlType": "Windows.UI.Xaml.Controls.Grid",
+                        "Background": "#00FFFFFF",
+                        "BorderBrush": null,
+                        "BorderThickness": "0,0,0,0",
+                        "Clip": null,
+                        "CornerRadius": "0,0,0,0",
+                        "FlowDirection": "LeftToRight",
+                        "HorizontalAlignment": "Stretch",
+                        "Margin": "0,0,0,0",
+                        "Padding": "0,0,0,0",
+                        "RenderSize": [798, 39],
+                        "VerticalAlignment": "Stretch",
+                        "Visibility": "Visible",
+                        "children": [
+                        {
+                            "XamlType": "Windows.UI.Xaml.Controls.ScrollContentPresenter",
+                            "Background": null,
+                            "BorderBrush": null,
+                            "BorderThickness": "0,0,0,0",
+                            "Clip": "Windows.UI.Xaml.Media.RectangleGeometry",
+                            "CornerRadius": "0,0,0,0",
+                            "FlowDirection": "LeftToRight",
+                            "Foreground": "#FFFFFFFF",
+                            "HorizontalAlignment": "Stretch",
+                            "Margin": "10,10,10,10",
+                            "Name": "ScrollContentPresenter",
+                            "Padding": "0,0,0,0",
+                            "RenderSize": [778, 19],
+                            "VerticalAlignment": "Stretch",
+                            "Visibility": "Visible",
+                            "children": [
+                            {
+                                "XamlType": "Windows.UI.Xaml.FrameworkElement",
+                                "Clip": null,
+                                "FlowDirection": "LeftToRight",
+                                "HorizontalAlignment": "Stretch",
+                                "Margin": "0,0,0,0",
+                                "RenderSize": [778, 19],
+                                "VerticalAlignment": "Stretch",
+                                "Visibility": "Visible"
+                            }
+                            ]
+                        },
+                        {
+                            "XamlType": "Windows.UI.Xaml.Controls.Grid",
+                            "Background": null,
+                            "BorderBrush": null,
+                            "BorderThickness": "0,0,0,0",
+                            "Clip": null,
+                            "CornerRadius": "0,0,0,0",
+                            "FlowDirection": "LeftToRight",
+                            "HorizontalAlignment": "Stretch",
+                            "Margin": "0,0,0,0",
+                            "Padding": "0,0,0,0",
+                            "RenderSize": [798, 39],
+                            "VerticalAlignment": "Stretch",
+                            "Visibility": "Visible"
+                        },
+                        {
+                            "XamlType": "Windows.UI.Xaml.Controls.Primitives.ScrollBar",
+                            "Background": "#00FFFFFF",
+                            "BorderBrush": "#00FFFFFF",
+                            "BorderThickness": "0,0,0,0",
+                            "Clip": null,
+                            "CornerRadius": "2,2,2,2",
+                            "FlowDirection": "LeftToRight",
+                            "Foreground": "#00FFFFFF",
+                            "HorizontalAlignment": "Right",
+                            "Margin": "0,0,0,0",
+                            "Name": "VerticalScrollBar",
+                            "Padding": "0,0,0,0",
+                            "RenderSize": [0, 0],
+                            "VerticalAlignment": "Stretch",
+                            "Visibility": "Collapsed"
+                        },
+                        {
+                            "XamlType": "Windows.UI.Xaml.Controls.Primitives.ScrollBar",
+                            "Background": "#00FFFFFF",
+                            "BorderBrush": "#00FFFFFF",
+                            "BorderThickness": "0,0,0,0",
+                            "Clip": null,
+                            "CornerRadius": "2,2,2,2",
+                            "FlowDirection": "LeftToRight",
+                            "Foreground": "#00FFFFFF",
+                            "HorizontalAlignment": "Stretch",
+                            "Margin": "0,0,0,0",
+                            "Name": "HorizontalScrollBar",
+                            "Padding": "0,0,0,0",
+                            "RenderSize": [0, 0],
+                            "VerticalAlignment": "Stretch",
+                            "Visibility": "Collapsed"
+                        },
+                        {
+                            "XamlType": "Windows.UI.Xaml.Controls.Border",
+                            "Background": "#FFE6E6E6",
+                            "BorderBrush": null,
+                            "BorderThickness": "0,0,0,0",
+                            "Clip": null,
+                            "CornerRadius": "0,0,0,0",
+                            "FlowDirection": "LeftToRight",
+                            "HorizontalAlignment": "Stretch",
+                            "Margin": "0,0,0,0",
+                            "Name": "ScrollBarSeparator",
+                            "Padding": "0,0,0,0",
+                            "RenderSize": [0, 0],
+                            "VerticalAlignment": "Stretch",
+                            "Visibility": "Collapsed"
+                        }
+                        ]
+                    }
+                    ]
+                }
+                ]
+            },
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.TextBlock",
+                "Clip": null,
+                "FlowDirection": "LeftToRight",
+                "Foreground": "#B3E1E1E1",
+                "HorizontalAlignment": "Stretch",
+                "Margin": "1,1,1,1",
+                "Name": "PlaceholderTextContentPresenter",
+                "Padding": "10,10,10,10",
+                "RenderSize": [798, 39],
+                "VerticalAlignment": "Stretch",
+                "Visibility": "Visible"
+            },
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.Button",
+                "Background": "#33000000",
+                "BorderBrush": "#00FFFFFF",
+                "BorderThickness": "1,1,1,1",
+                "Clip": null,
+                "CornerRadius": "0,0,0,0",
+                "FlowDirection": "LeftToRight",
+                "Foreground": "#FF000000",
+                "HorizontalAlignment": "Left",
+                "Margin": "0,0,0,0",
+                "Name": "DeleteButton",
+                "Padding": "0,0,-2,0",
+                "RenderSize": [0, 0],
+                "VerticalAlignment": "Stretch",
+                "Visibility": "Collapsed"
+            },
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.ContentPresenter",
+                "Background": null,
+                "BorderBrush": null,
+                "BorderThickness": "0,0,0,0",
+                "Clip": null,
+                "CornerRadius": "0,0,0,0",
+                "FlowDirection": "LeftToRight",
+                "Foreground": "#99000000",
+                "HorizontalAlignment": "Stretch",
+                "Margin": "0,0,0,0",
+                "Name": "DescriptionPresenter",
+                "Padding": "0,0,0,0",
+                "RenderSize": [800, 0],
+                "VerticalAlignment": "Stretch",
+                "Visibility": "Visible"
+            }
+            ]
+        }
+        ]
+    },
+    {
+        "XamlType": "Windows.UI.Xaml.Controls.PasswordBox",
+        "Background": "#33E1E1E1",
+        "BorderBrush": "#55FF00FF",
+        "BorderThickness": "1,1,1,1",
+        "Clip": null,
+        "CornerRadius": "0,0,0,0",
+        "FlowDirection": "LeftToRight",
+        "Foreground": "#FFFFFFFF",
+        "Height": 41,
+        "HorizontalAlignment": "Stretch",
+        "Margin": "0,0,0,0",
+        "Padding": "10,10,10,10",
+        "RenderSize": [800, 41],
+        "VerticalAlignment": "Stretch",
+        "Visibility": "Visible",
+        "Width": 800,
+        "children": [
+        {
+            "XamlType": "Windows.UI.Xaml.Controls.Grid",
+            "Background": null,
+            "BorderBrush": null,
+            "BorderThickness": "0,0,0,0",
+            "Clip": null,
+            "CornerRadius": "0,0,0,0",
+            "FlowDirection": "LeftToRight",
+            "HorizontalAlignment": "Stretch",
+            "Margin": "0,0,0,0",
+            "Padding": "0,0,0,0",
+            "RenderSize": [800, 41],
+            "VerticalAlignment": "Stretch",
+            "Visibility": "Visible",
+            "children": [
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.Border",
+                "Background": "#33E1E1E1",
+                "BorderBrush": "#55FF00FF",
+                "BorderThickness": "1,1,1,1",
+                "Clip": null,
+                "CornerRadius": "0,0,0,0",
+                "FlowDirection": "LeftToRight",
+                "HorizontalAlignment": "Stretch",
+                "Margin": "0,0,0,0",
+                "Name": "BorderElement",
+                "Padding": "0,0,0,0",
+                "RenderSize": [800, 41],
+                "VerticalAlignment": "Stretch",
+                "Visibility": "Visible"
+            },
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.ScrollViewer",
+                "Background": "#00FFFFFF",
+                "BorderBrush": "#00FFFFFF",
+                "BorderThickness": "0,0,0,0",
+                "Clip": null,
+                "CornerRadius": "0,0,0,0",
+                "FlowDirection": "LeftToRight",
+                "Foreground": "#FFFFFFFF",
+                "HorizontalAlignment": "Stretch",
+                "Margin": "1,1,1,1",
+                "Name": "ContentElement",
+                "Padding": "10,10,10,10",
+                "RenderSize": [798, 39],
+                "VerticalAlignment": "Stretch",
+                "Visibility": "Visible",
+                "children": [
+                {
+                    "XamlType": "Windows.UI.Xaml.Controls.Border",
+                    "Background": null,
+                    "BorderBrush": "#00FFFFFF",
+                    "BorderThickness": "0,0,0,0",
+                    "Clip": null,
+                    "CornerRadius": "0,0,0,0",
+                    "FlowDirection": "LeftToRight",
+                    "HorizontalAlignment": "Stretch",
+                    "Margin": "0,0,0,0",
+                    "Name": "Root",
+                    "Padding": "0,0,0,0",
+                    "RenderSize": [798, 39],
+                    "VerticalAlignment": "Stretch",
+                    "Visibility": "Visible",
+                    "children": [
+                    {
+                        "XamlType": "Windows.UI.Xaml.Controls.Grid",
+                        "Background": "#00FFFFFF",
+                        "BorderBrush": null,
+                        "BorderThickness": "0,0,0,0",
+                        "Clip": null,
+                        "CornerRadius": "0,0,0,0",
+                        "FlowDirection": "LeftToRight",
+                        "HorizontalAlignment": "Stretch",
+                        "Margin": "0,0,0,0",
+                        "Padding": "0,0,0,0",
+                        "RenderSize": [798, 39],
+                        "VerticalAlignment": "Stretch",
+                        "Visibility": "Visible",
+                        "children": [
+                        {
+                            "XamlType": "Windows.UI.Xaml.Controls.ScrollContentPresenter",
+                            "Background": null,
+                            "BorderBrush": null,
+                            "BorderThickness": "0,0,0,0",
+                            "Clip": "Windows.UI.Xaml.Media.RectangleGeometry",
+                            "CornerRadius": "0,0,0,0",
+                            "FlowDirection": "LeftToRight",
+                            "Foreground": "#FFFFFFFF",
+                            "HorizontalAlignment": "Stretch",
+                            "Margin": "10,10,10,10",
+                            "Name": "ScrollContentPresenter",
+                            "Padding": "0,0,0,0",
+                            "RenderSize": [778, 19],
+                            "VerticalAlignment": "Stretch",
+                            "Visibility": "Visible",
+                            "children": [
+                            {
+                                "XamlType": "Windows.UI.Xaml.FrameworkElement",
+                                "Clip": null,
+                                "FlowDirection": "LeftToRight",
+                                "HorizontalAlignment": "Stretch",
+                                "Margin": "0,0,0,0",
+                                "RenderSize": [778, 19],
+                                "VerticalAlignment": "Stretch",
+                                "Visibility": "Visible"
+                            }
+                            ]
+                        },
+                        {
+                            "XamlType": "Windows.UI.Xaml.Controls.Grid",
+                            "Background": null,
+                            "BorderBrush": null,
+                            "BorderThickness": "0,0,0,0",
+                            "Clip": null,
+                            "CornerRadius": "0,0,0,0",
+                            "FlowDirection": "LeftToRight",
+                            "HorizontalAlignment": "Stretch",
+                            "Margin": "0,0,0,0",
+                            "Padding": "0,0,0,0",
+                            "RenderSize": [798, 39],
+                            "VerticalAlignment": "Stretch",
+                            "Visibility": "Visible"
+                        },
+                        {
+                            "XamlType": "Windows.UI.Xaml.Controls.Primitives.ScrollBar",
+                            "Background": "#00FFFFFF",
+                            "BorderBrush": "#00FFFFFF",
+                            "BorderThickness": "0,0,0,0",
+                            "Clip": null,
+                            "CornerRadius": "2,2,2,2",
+                            "FlowDirection": "LeftToRight",
+                            "Foreground": "#00FFFFFF",
+                            "HorizontalAlignment": "Right",
+                            "Margin": "0,0,0,0",
+                            "Name": "VerticalScrollBar",
+                            "Padding": "0,0,0,0",
+                            "RenderSize": [0, 0],
+                            "VerticalAlignment": "Stretch",
+                            "Visibility": "Collapsed"
+                        },
+                        {
+                            "XamlType": "Windows.UI.Xaml.Controls.Primitives.ScrollBar",
+                            "Background": "#00FFFFFF",
+                            "BorderBrush": "#00FFFFFF",
+                            "BorderThickness": "0,0,0,0",
+                            "Clip": null,
+                            "CornerRadius": "2,2,2,2",
+                            "FlowDirection": "LeftToRight",
+                            "Foreground": "#00FFFFFF",
+                            "HorizontalAlignment": "Stretch",
+                            "Margin": "0,0,0,0",
+                            "Name": "HorizontalScrollBar",
+                            "Padding": "0,0,0,0",
+                            "RenderSize": [0, 0],
+                            "VerticalAlignment": "Stretch",
+                            "Visibility": "Collapsed"
+                        },
+                        {
+                            "XamlType": "Windows.UI.Xaml.Controls.Border",
+                            "Background": "#FFE6E6E6",
+                            "BorderBrush": null,
+                            "BorderThickness": "0,0,0,0",
+                            "Clip": null,
+                            "CornerRadius": "0,0,0,0",
+                            "FlowDirection": "LeftToRight",
+                            "HorizontalAlignment": "Stretch",
+                            "Margin": "0,0,0,0",
+                            "Name": "ScrollBarSeparator",
+                            "Padding": "0,0,0,0",
+                            "RenderSize": [0, 0],
+                            "VerticalAlignment": "Stretch",
+                            "Visibility": "Collapsed"
+                        }
+                        ]
+                    }
+                    ]
+                }
+                ]
+            },
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.TextBlock",
+                "Clip": null,
+                "FlowDirection": "LeftToRight",
+                "Foreground": "#B3E1E1E1",
+                "HorizontalAlignment": "Stretch",
+                "Margin": "1,1,1,1",
+                "Name": "PlaceholderTextContentPresenter",
+                "Padding": "10,10,10,10",
+                "RenderSize": [798, 39],
+                "VerticalAlignment": "Stretch",
+                "Visibility": "Visible"
+            },
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.Primitives.ToggleButton",
+                "Background": "#33000000",
+                "BorderBrush": "#00FFFFFF",
+                "BorderThickness": "1,1,1,1",
+                "Clip": null,
+                "CornerRadius": "0,0,0,0",
+                "FlowDirection": "LeftToRight",
+                "Foreground": "#FF000000",
+                "HorizontalAlignment": "Left",
+                "Margin": "0,0,0,0",
+                "Name": "RevealButton",
+                "Padding": "0,0,-2,0",
+                "RenderSize": [0, 0],
+                "VerticalAlignment": "Stretch",
+                "Visibility": "Collapsed"
+            },
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.ContentPresenter",
+                "Background": null,
+                "BorderBrush": null,
+                "BorderThickness": "0,0,0,0",
+                "Clip": null,
+                "CornerRadius": "0,0,0,0",
+                "FlowDirection": "LeftToRight",
+                "Foreground": "#99000000",
+                "HorizontalAlignment": "Stretch",
+                "Margin": "0,0,0,0",
+                "Name": "DescriptionPresenter",
+                "Padding": "0,0,0,0",
+                "RenderSize": [800, 0],
+                "VerticalAlignment": "Stretch",
+                "Visibility": "Visible"
+            }
+            ]
+        }
+        ]
+    },
+    {
+        "XamlType": "Windows.UI.Xaml.Controls.CalendarDatePicker",
+        "Background": "#33E1E1E1",
+        "BorderBrush": "#55FF00FF",
+        "BorderThickness": "1,1,1,1",
+        "Clip": null,
+        "CornerRadius": "0,0,0,0",
+        "FlowDirection": "LeftToRight",
+        "Foreground": "#FFFFFFFF",
+        "Height": 50,
+        "HorizontalAlignment": "Left",
+        "Margin": "0,0,0,0",
+        "Padding": "0,0,0,0",
+        "RenderSize": [150, 50],
+        "VerticalAlignment": "Center",
+        "Visibility": "Visible",
+        "Width": 150,
+        "children": [
+        {
+            "XamlType": "Windows.UI.Xaml.Controls.Grid",
+            "Background": null,
+            "BorderBrush": null,
+            "BorderThickness": "0,0,0,0",
+            "Clip": null,
+            "CornerRadius": "0,0,0,0",
+            "FlowDirection": "LeftToRight",
+            "HorizontalAlignment": "Stretch",
+            "Margin": "0,0,0,0",
+            "Name": "Root",
+            "Padding": "0,0,0,0",
+            "RenderSize": [150, 50],
+            "VerticalAlignment": "Stretch",
+            "Visibility": "Visible",
+            "children": [
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.Border",
+                "Background": "#33E1E1E1",
+                "BorderBrush": "#55FF00FF",
+                "BorderThickness": "1,1,1,1",
+                "Clip": null,
+                "CornerRadius": "0,0,0,0",
+                "FlowDirection": "LeftToRight",
+                "HorizontalAlignment": "Stretch",
+                "Margin": "0,0,0,0",
+                "Name": "Background",
+                "Padding": "0,0,0,0",
+                "RenderSize": [150, 50],
+                "VerticalAlignment": "Stretch",
+                "Visibility": "Visible"
+            },
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.TextBlock",
+                "Clip": null,
+                "FlowDirection": "LeftToRight",
+                "Foreground": "#99000000",
+                "HorizontalAlignment": "Left",
+                "Margin": "0,0,0,0",
+                "Name": "DateText",
+                "Padding": "12,0,0,2",
+                "RenderSize": [90, 21],
+                "VerticalAlignment": "Center",
+                "Visibility": "Visible"
+            },
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.FontIcon",
+                "Clip": null,
+                "FlowDirection": "LeftToRight",
+                "Foreground": "#CC000000",
+                "HorizontalAlignment": "Center",
+                "Margin": "0,0,0,0",
+                "Name": "CalendarGlyph",
+                "RenderSize": [12, 12],
+                "VerticalAlignment": "Center",
+                "Visibility": "Visible",
+                "children": [
+                {
+                    "XamlType": "Windows.UI.Xaml.Controls.Grid",
+                    "Background": "#00000000",
+                    "BorderBrush": null,
+                    "BorderThickness": "0,0,0,0",
+                    "Clip": null,
+                    "CornerRadius": "0,0,0,0",
+                    "FlowDirection": "LeftToRight",
+                    "HorizontalAlignment": "Stretch",
+                    "Margin": "0,0,0,0",
+                    "Padding": "0,0,0,0",
+                    "RenderSize": [12, 12],
+                    "VerticalAlignment": "Stretch",
+                    "Visibility": "Visible",
+                    "children": [
+                    {
+                        "XamlType": "Windows.UI.Xaml.Controls.TextBlock",
+                        "Clip": null,
+                        "FlowDirection": "LeftToRight",
+                        "Foreground": "#CC000000",
+                        "HorizontalAlignment": "Stretch",
+                        "Margin": "0,0,0,0",
+                        "Padding": "0,0,0,0",
+                        "RenderSize": [12, 12],
+                        "VerticalAlignment": "Center",
+                        "Visibility": "Visible"
+                    }
+                    ]
+                }
+                ]
+            },
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.ContentPresenter",
+                "Background": null,
+                "BorderBrush": null,
+                "BorderThickness": "0,0,0,0",
+                "Clip": null,
+                "CornerRadius": "0,0,0,0",
+                "FlowDirection": "LeftToRight",
+                "Foreground": "#99000000",
+                "HorizontalAlignment": "Stretch",
+                "Margin": "0,0,0,0",
+                "Name": "DescriptionPresenter",
+                "Padding": "0,0,0,0",
+                "RenderSize": [150, 0],
+                "VerticalAlignment": "Stretch",
+                "Visibility": "Visible"
+            }
+            ]
+        }
+        ]
+    },
+    {
+        "XamlType": "Windows.UI.Xaml.Controls.ComboBox",
+        "Background": "#33E1E1E1",
+        "BorderBrush": "#55FF00FF",
+        "BorderThickness": "1,1,1,1",
+        "Clip": null,
+        "CornerRadius": "0,0,0,0",
+        "FlowDirection": "LeftToRight",
+        "Foreground": "#FFFFFFFF",
+        "Height": 32,
+        "HorizontalAlignment": "Left",
+        "Margin": "0,0,0,0",
+        "Padding": "12,5,0,7",
+        "RenderSize": [800, 32],
+        "VerticalAlignment": "Top",
+        "Visibility": "Visible",
+        "Width": 800,
+        "children": [
+        {
+            "XamlType": "Windows.UI.Xaml.Controls.Grid",
+            "Background": null,
+            "BorderBrush": null,
+            "BorderThickness": "0,0,0,0",
+            "Clip": null,
+            "CornerRadius": "0,0,0,0",
+            "FlowDirection": "LeftToRight",
+            "HorizontalAlignment": "Stretch",
+            "Margin": "0,0,0,0",
+            "Name": "LayoutRoot",
+            "Padding": "0,0,0,0",
+            "RenderSize": [800, 32],
+            "VerticalAlignment": "Stretch",
+            "Visibility": "Visible",
+            "children": [
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.Border",
+                "Background": "#33E1E1E1",
+                "BorderBrush": "#55FF00FF",
+                "BorderThickness": "1,1,1,1",
+                "Clip": null,
+                "CornerRadius": "0,0,0,0",
+                "FlowDirection": "LeftToRight",
+                "HorizontalAlignment": "Stretch",
+                "Margin": "0,0,0,0",
+                "Name": "Background",
+                "Padding": "0,0,0,0",
+                "RenderSize": [800, 32],
+                "VerticalAlignment": "Stretch",
+                "Visibility": "Visible"
+            },
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.Border",
+                "Background": "#FF409EFE",
+                "BorderBrush": "#66000000",
+                "BorderThickness": "1,1,1,1",
+                "Clip": null,
+                "CornerRadius": "0,0,0,0",
+                "FlowDirection": "LeftToRight",
+                "HorizontalAlignment": "Stretch",
+                "Margin": "0,0,0,0",
+                "Name": "HighlightBackground",
+                "Padding": "0,0,0,0",
+                "RenderSize": [800, 32],
+                "VerticalAlignment": "Stretch",
+                "Visibility": "Visible"
+            },
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.ContentPresenter",
+                "Background": null,
+                "BorderBrush": null,
+                "BorderThickness": "0,0,0,0",
+                "Clip": null,
+                "CornerRadius": "0,0,0,0",
+                "FlowDirection": "LeftToRight",
+                "Foreground": "#FFFFFFFF",
+                "HorizontalAlignment": "Stretch",
+                "Margin": "12,5,0,7",
+                "Name": "ContentPresenter",
+                "Padding": "0,0,0,0",
+                "RenderSize": [756, 19],
+                "VerticalAlignment": "Center",
+                "Visibility": "Visible",
+                "children": [
+                {
+                    "XamlType": "Windows.UI.Xaml.Controls.TextBlock",
+                    "Clip": null,
+                    "FlowDirection": "LeftToRight",
+                    "Foreground": "#FF000000",
+                    "HorizontalAlignment": "Stretch",
+                    "Margin": "0,0,0,0",
+                    "Name": "PlaceholderTextBlock",
+                    "Padding": "0,0,0,0",
+                    "RenderSize": [756, 19],
+                    "VerticalAlignment": "Stretch",
+                    "Visibility": "Visible"
+                }
+                ]
+            },
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.TextBox",
+                "Background": "#66FFFFFF",
+                "BorderBrush": "#00FFFFFF",
+                "BorderThickness": "1,1,1,1",
+                "Clip": null,
+                "CornerRadius": "0,0,0,0",
+                "FlowDirection": "LeftToRight",
+                "Foreground": "#FF000000",
+                "HorizontalAlignment": "Stretch",
+                "Margin": "0,0,0,0",
+                "Name": "EditableText",
+                "Padding": "11,5,32,6",
+                "RenderSize": [0, 0],
+                "VerticalAlignment": "Center",
+                "Visibility": "Collapsed"
+            },
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.Border",
+                "Background": "#00FFFFFF",
+                "BorderBrush": null,
+                "BorderThickness": "0,0,0,0",
+                "Clip": null,
+                "CornerRadius": "0,0,0,0",
+                "FlowDirection": "LeftToRight",
+                "HorizontalAlignment": "Right",
+                "Margin": "0,1,1,1",
+                "Name": "DropDownOverlay",
+                "Padding": "0,0,0,0",
+                "RenderSize": [0, 0],
+                "VerticalAlignment": "Stretch",
+                "Visibility": "Collapsed",
+                "Width": 30
+            },
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.FontIcon",
+                "Clip": null,
+                "FlowDirection": "LeftToRight",
+                "Foreground": "#CC000000",
+                "HorizontalAlignment": "Right",
+                "Margin": "0,0,10,0",
+                "Name": "DropDownGlyph",
+                "RenderSize": [12, 32],
+                "VerticalAlignment": "Center",
+                "Visibility": "Visible",
+                "children": [
+                {
+                    "XamlType": "Windows.UI.Xaml.Controls.Grid",
+                    "Background": "#00000000",
+                    "BorderBrush": null,
+                    "BorderThickness": "0,0,0,0",
+                    "Clip": null,
+                    "CornerRadius": "0,0,0,0",
+                    "FlowDirection": "LeftToRight",
+                    "HorizontalAlignment": "Stretch",
+                    "Margin": "0,0,0,0",
+                    "Padding": "0,0,0,0",
+                    "RenderSize": [12, 32],
+                    "VerticalAlignment": "Stretch",
+                    "Visibility": "Visible",
+                    "children": [
+                    {
+                        "XamlType": "Windows.UI.Xaml.Controls.TextBlock",
+                        "Clip": null,
+                        "FlowDirection": "LeftToRight",
+                        "Foreground": "#CC000000",
+                        "HorizontalAlignment": "Stretch",
+                        "Margin": "0,0,0,0",
+                        "Padding": "0,0,0,0",
+                        "RenderSize": [12, 12],
+                        "VerticalAlignment": "Center",
+                        "Visibility": "Visible"
+                    }
+                    ]
+                }
+                ]
+            },
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.ContentPresenter",
+                "Background": null,
+                "BorderBrush": null,
+                "BorderThickness": "0,0,0,0",
+                "Clip": null,
+                "CornerRadius": "0,0,0,0",
+                "FlowDirection": "LeftToRight",
+                "Foreground": "#99000000",
+                "HorizontalAlignment": "Stretch",
+                "Margin": "0,0,0,0",
+                "Name": "DescriptionPresenter",
+                "Padding": "0,0,0,0",
+                "RenderSize": [800, 0],
+                "VerticalAlignment": "Stretch",
+                "Visibility": "Visible"
+            },
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.Primitives.Popup",
+                "Clip": null,
+                "FlowDirection": "LeftToRight",
+                "HorizontalAlignment": "Stretch",
+                "Margin": "0,0,0,0",
+                "Name": "Popup",
+                "RenderSize": [768, 0],
+                "VerticalAlignment": "Stretch",
+                "Visibility": "Visible"
+            }
+            ]
+        }
+        ]
+    }
+    ]
+}
diff --git a/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/masters/ControlStyleRoundBorder.json b/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/masters/ControlStyleRoundBorder.json
new file mode 100644
index 00000000000..cf9079004f0
--- /dev/null
+++ b/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/masters/ControlStyleRoundBorder.json
@@ -0,0 +1,977 @@
+{
+    "XamlType": "Microsoft.ReactNative.ViewPanel",
+    "Background": null,
+    "BorderBrush": "#00000000",
+    "BorderThickness": "0,0,0,0",
+    "Clip": null,
+    "CornerRadius": "0,0,0,0",
+    "FlowDirection": "LeftToRight",
+    "Height": 300,
+    "HorizontalAlignment": "Stretch",
+    "Margin": "0,0,0,0",
+    "RenderSize": [800, 300],
+    "VerticalAlignment": "Stretch",
+    "Visibility": "Visible",
+    "Width": 800,
+    "children": [
+    {
+        "XamlType": "Windows.UI.Xaml.Controls.CheckBox",
+        "Background": "#33000000",
+        "BorderBrush": "#5500FF00",
+        "BorderThickness": "10,10,10,10",
+        "Clip": null,
+        "CornerRadius": "10,10,10,10",
+        "FlowDirection": "LeftToRight",
+        "Foreground": "#FF000000",
+        "Height": 50,
+        "HorizontalAlignment": "Left",
+        "Margin": "0,0,0,0",
+        "Padding": "8,5,0,0",
+        "RenderSize": [120, 50],
+        "VerticalAlignment": "Center",
+        "Visibility": "Visible",
+        "Width": 32,
+        "children": [
+        {
+            "XamlType": "Windows.UI.Xaml.Controls.Grid",
+            "Background": "#33000000",
+            "BorderBrush": "#5500FF00",
+            "BorderThickness": "10,10,10,10",
+            "Clip": null,
+            "CornerRadius": "10,10,10,10",
+            "FlowDirection": "LeftToRight",
+            "HorizontalAlignment": "Stretch",
+            "Margin": "0,0,0,0",
+            "Name": "RootGrid",
+            "Padding": "0,0,0,0",
+            "RenderSize": [120, 50],
+            "VerticalAlignment": "Stretch",
+            "Visibility": "Visible",
+            "children": [
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.Grid",
+                "Background": null,
+                "BorderBrush": null,
+                "BorderThickness": "0,0,0,0",
+                "Clip": null,
+                "CornerRadius": "0,0,0,0",
+                "FlowDirection": "LeftToRight",
+                "Height": 32,
+                "HorizontalAlignment": "Stretch",
+                "Margin": "0,0,0,0",
+                "Padding": "0,0,0,0",
+                "RenderSize": [20, 32],
+                "VerticalAlignment": "Top",
+                "Visibility": "Visible",
+                "children": [
+                {
+                    "XamlType": "Windows.UI.Xaml.Shapes.Rectangle",
+                    "Clip": null,
+                    "FlowDirection": "LeftToRight",
+                    "Height": 20,
+                    "HorizontalAlignment": "Stretch",
+                    "Margin": "0,0,0,0",
+                    "Name": "NormalRectangle",
+                    "RenderSize": [20, 20],
+                    "VerticalAlignment": "Stretch",
+                    "Visibility": "Visible",
+                    "Width": 20
+                },
+                {
+                    "XamlType": "Windows.UI.Xaml.Controls.FontIcon",
+                    "Clip": null,
+                    "FlowDirection": "LeftToRight",
+                    "Foreground": "#FFFFFFFF",
+                    "HorizontalAlignment": "Stretch",
+                    "Margin": "0,0,0,0",
+                    "Name": "CheckGlyph",
+                    "RenderSize": [20, 32],
+                    "VerticalAlignment": "Stretch",
+                    "Visibility": "Visible",
+                    "children": [
+                    {
+                        "XamlType": "Windows.UI.Xaml.Controls.Grid",
+                        "Background": "#00000000",
+                        "BorderBrush": null,
+                        "BorderThickness": "0,0,0,0",
+                        "Clip": null,
+                        "CornerRadius": "0,0,0,0",
+                        "FlowDirection": "LeftToRight",
+                        "HorizontalAlignment": "Stretch",
+                        "Margin": "0,0,0,0",
+                        "Padding": "0,0,0,0",
+                        "RenderSize": [20, 32],
+                        "VerticalAlignment": "Stretch",
+                        "Visibility": "Visible",
+                        "children": [
+                        {
+                            "XamlType": "Windows.UI.Xaml.Controls.TextBlock",
+                            "Clip": null,
+                            "FlowDirection": "LeftToRight",
+                            "Foreground": "#FFFFFFFF",
+                            "HorizontalAlignment": "Stretch",
+                            "Margin": "0,0,0,0",
+                            "Padding": "0,0,0,0",
+                            "RenderSize": [20, 16],
+                            "VerticalAlignment": "Center",
+                            "Visibility": "Visible"
+                        }
+                        ]
+                    }
+                    ]
+                }
+                ]
+            },
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.ContentPresenter",
+                "Background": null,
+                "BorderBrush": null,
+                "BorderThickness": "0,0,0,0",
+                "Clip": null,
+                "CornerRadius": "0,0,0,0",
+                "FlowDirection": "LeftToRight",
+                "Foreground": "#FF000000",
+                "HorizontalAlignment": "Left",
+                "Margin": "8,5,0,0",
+                "Name": "ContentPresenter",
+                "Padding": "0,0,0,0",
+                "RenderSize": [0, 0],
+                "VerticalAlignment": "Top",
+                "Visibility": "Visible"
+            }
+            ]
+        }
+        ]
+    },
+    {
+        "XamlType": "Windows.UI.Xaml.Controls.TextBox",
+        "Background": "#33000000",
+        "BorderBrush": "#5500FF00",
+        "BorderThickness": "10,10,10,10",
+        "Clip": null,
+        "CornerRadius": "10,10,10,10",
+        "FlowDirection": "LeftToRight",
+        "Foreground": "#FF000000",
+        "Height": 59,
+        "HorizontalAlignment": "Stretch",
+        "Margin": "0,0,0,0",
+        "Padding": "10,10,10,10",
+        "RenderSize": [800, 59],
+        "VerticalAlignment": "Stretch",
+        "Visibility": "Visible",
+        "Width": 800,
+        "children": [
+        {
+            "XamlType": "Windows.UI.Xaml.Controls.Grid",
+            "Background": null,
+            "BorderBrush": null,
+            "BorderThickness": "0,0,0,0",
+            "Clip": null,
+            "CornerRadius": "0,0,0,0",
+            "FlowDirection": "LeftToRight",
+            "HorizontalAlignment": "Stretch",
+            "Margin": "0,0,0,0",
+            "Padding": "0,0,0,0",
+            "RenderSize": [800, 59],
+            "VerticalAlignment": "Stretch",
+            "Visibility": "Visible",
+            "children": [
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.Border",
+                "Background": "#33000000",
+                "BorderBrush": "#5500FF00",
+                "BorderThickness": "10,10,10,10",
+                "Clip": null,
+                "CornerRadius": "10,10,10,10",
+                "FlowDirection": "LeftToRight",
+                "HorizontalAlignment": "Stretch",
+                "Margin": "0,0,0,0",
+                "Name": "BorderElement",
+                "Padding": "0,0,0,0",
+                "RenderSize": [800, 59],
+                "VerticalAlignment": "Stretch",
+                "Visibility": "Visible"
+            },
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.ScrollViewer",
+                "Background": "#00FFFFFF",
+                "BorderBrush": "#00FFFFFF",
+                "BorderThickness": "0,0,0,0",
+                "Clip": null,
+                "CornerRadius": "0,0,0,0",
+                "FlowDirection": "LeftToRight",
+                "Foreground": "#FF000000",
+                "HorizontalAlignment": "Stretch",
+                "Margin": "10,10,10,10",
+                "Name": "ContentElement",
+                "Padding": "10,10,10,10",
+                "RenderSize": [780, 39],
+                "VerticalAlignment": "Stretch",
+                "Visibility": "Visible",
+                "children": [
+                {
+                    "XamlType": "Windows.UI.Xaml.Controls.Border",
+                    "Background": null,
+                    "BorderBrush": "#00FFFFFF",
+                    "BorderThickness": "0,0,0,0",
+                    "Clip": null,
+                    "CornerRadius": "0,0,0,0",
+                    "FlowDirection": "LeftToRight",
+                    "HorizontalAlignment": "Stretch",
+                    "Margin": "0,0,0,0",
+                    "Name": "Root",
+                    "Padding": "0,0,0,0",
+                    "RenderSize": [780, 39],
+                    "VerticalAlignment": "Stretch",
+                    "Visibility": "Visible",
+                    "children": [
+                    {
+                        "XamlType": "Windows.UI.Xaml.Controls.Grid",
+                        "Background": "#00FFFFFF",
+                        "BorderBrush": null,
+                        "BorderThickness": "0,0,0,0",
+                        "Clip": null,
+                        "CornerRadius": "0,0,0,0",
+                        "FlowDirection": "LeftToRight",
+                        "HorizontalAlignment": "Stretch",
+                        "Margin": "0,0,0,0",
+                        "Padding": "0,0,0,0",
+                        "RenderSize": [780, 39],
+                        "VerticalAlignment": "Stretch",
+                        "Visibility": "Visible",
+                        "children": [
+                        {
+                            "XamlType": "Windows.UI.Xaml.Controls.ScrollContentPresenter",
+                            "Background": null,
+                            "BorderBrush": null,
+                            "BorderThickness": "0,0,0,0",
+                            "Clip": "Windows.UI.Xaml.Media.RectangleGeometry",
+                            "CornerRadius": "0,0,0,0",
+                            "FlowDirection": "LeftToRight",
+                            "Foreground": "#FF000000",
+                            "HorizontalAlignment": "Stretch",
+                            "Margin": "10,10,10,10",
+                            "Name": "ScrollContentPresenter",
+                            "Padding": "0,0,0,0",
+                            "RenderSize": [760, 19],
+                            "VerticalAlignment": "Stretch",
+                            "Visibility": "Visible",
+                            "children": [
+                            {
+                                "XamlType": "Windows.UI.Xaml.FrameworkElement",
+                                "Clip": null,
+                                "FlowDirection": "LeftToRight",
+                                "HorizontalAlignment": "Stretch",
+                                "Margin": "0,0,0,0",
+                                "RenderSize": [760, 19],
+                                "VerticalAlignment": "Stretch",
+                                "Visibility": "Visible"
+                            }
+                            ]
+                        },
+                        {
+                            "XamlType": "Windows.UI.Xaml.Controls.Grid",
+                            "Background": null,
+                            "BorderBrush": null,
+                            "BorderThickness": "0,0,0,0",
+                            "Clip": null,
+                            "CornerRadius": "0,0,0,0",
+                            "FlowDirection": "LeftToRight",
+                            "HorizontalAlignment": "Stretch",
+                            "Margin": "0,0,0,0",
+                            "Padding": "0,0,0,0",
+                            "RenderSize": [780, 39],
+                            "VerticalAlignment": "Stretch",
+                            "Visibility": "Visible"
+                        },
+                        {
+                            "XamlType": "Windows.UI.Xaml.Controls.Primitives.ScrollBar",
+                            "Background": "#00FFFFFF",
+                            "BorderBrush": "#00FFFFFF",
+                            "BorderThickness": "0,0,0,0",
+                            "Clip": null,
+                            "CornerRadius": "2,2,2,2",
+                            "FlowDirection": "LeftToRight",
+                            "Foreground": "#00FFFFFF",
+                            "HorizontalAlignment": "Right",
+                            "Margin": "0,0,0,0",
+                            "Name": "VerticalScrollBar",
+                            "Padding": "0,0,0,0",
+                            "RenderSize": [0, 0],
+                            "VerticalAlignment": "Stretch",
+                            "Visibility": "Collapsed"
+                        },
+                        {
+                            "XamlType": "Windows.UI.Xaml.Controls.Primitives.ScrollBar",
+                            "Background": "#00FFFFFF",
+                            "BorderBrush": "#00FFFFFF",
+                            "BorderThickness": "0,0,0,0",
+                            "Clip": null,
+                            "CornerRadius": "2,2,2,2",
+                            "FlowDirection": "LeftToRight",
+                            "Foreground": "#00FFFFFF",
+                            "HorizontalAlignment": "Stretch",
+                            "Margin": "0,0,0,0",
+                            "Name": "HorizontalScrollBar",
+                            "Padding": "0,0,0,0",
+                            "RenderSize": [0, 0],
+                            "VerticalAlignment": "Stretch",
+                            "Visibility": "Collapsed"
+                        },
+                        {
+                            "XamlType": "Windows.UI.Xaml.Controls.Border",
+                            "Background": "#FFE6E6E6",
+                            "BorderBrush": null,
+                            "BorderThickness": "0,0,0,0",
+                            "Clip": null,
+                            "CornerRadius": "0,0,0,0",
+                            "FlowDirection": "LeftToRight",
+                            "HorizontalAlignment": "Stretch",
+                            "Margin": "0,0,0,0",
+                            "Name": "ScrollBarSeparator",
+                            "Padding": "0,0,0,0",
+                            "RenderSize": [0, 0],
+                            "VerticalAlignment": "Stretch",
+                            "Visibility": "Collapsed"
+                        }
+                        ]
+                    }
+                    ]
+                }
+                ]
+            },
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.TextBlock",
+                "Clip": null,
+                "FlowDirection": "LeftToRight",
+                "Foreground": "#B3E1E1E1",
+                "HorizontalAlignment": "Stretch",
+                "Margin": "10,10,10,10",
+                "Name": "PlaceholderTextContentPresenter",
+                "Padding": "10,10,10,10",
+                "RenderSize": [780, 39],
+                "VerticalAlignment": "Stretch",
+                "Visibility": "Visible"
+            },
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.Button",
+                "Background": "#33000000",
+                "BorderBrush": "#00FFFFFF",
+                "BorderThickness": "10,10,10,10",
+                "Clip": null,
+                "CornerRadius": "0,10,10,0",
+                "FlowDirection": "LeftToRight",
+                "Foreground": "#FF000000",
+                "HorizontalAlignment": "Left",
+                "Margin": "0,0,0,0",
+                "Name": "DeleteButton",
+                "Padding": "0,0,-2,0",
+                "RenderSize": [0, 0],
+                "VerticalAlignment": "Stretch",
+                "Visibility": "Collapsed"
+            },
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.ContentPresenter",
+                "Background": null,
+                "BorderBrush": null,
+                "BorderThickness": "0,0,0,0",
+                "Clip": null,
+                "CornerRadius": "0,0,0,0",
+                "FlowDirection": "LeftToRight",
+                "Foreground": "#99000000",
+                "HorizontalAlignment": "Stretch",
+                "Margin": "0,0,0,0",
+                "Name": "DescriptionPresenter",
+                "Padding": "0,0,0,0",
+                "RenderSize": [800, 0],
+                "VerticalAlignment": "Stretch",
+                "Visibility": "Visible"
+            }
+            ]
+        }
+        ]
+    },
+    {
+        "XamlType": "Windows.UI.Xaml.Controls.PasswordBox",
+        "Background": "#33000000",
+        "BorderBrush": "#5500FF00",
+        "BorderThickness": "10,10,10,10",
+        "Clip": null,
+        "CornerRadius": "10,10,10,10",
+        "FlowDirection": "LeftToRight",
+        "Foreground": "#FF000000",
+        "Height": 59,
+        "HorizontalAlignment": "Stretch",
+        "Margin": "0,0,0,0",
+        "Padding": "10,10,10,10",
+        "RenderSize": [800, 59],
+        "VerticalAlignment": "Stretch",
+        "Visibility": "Visible",
+        "Width": 800,
+        "children": [
+        {
+            "XamlType": "Windows.UI.Xaml.Controls.Grid",
+            "Background": null,
+            "BorderBrush": null,
+            "BorderThickness": "0,0,0,0",
+            "Clip": null,
+            "CornerRadius": "0,0,0,0",
+            "FlowDirection": "LeftToRight",
+            "HorizontalAlignment": "Stretch",
+            "Margin": "0,0,0,0",
+            "Padding": "0,0,0,0",
+            "RenderSize": [800, 59],
+            "VerticalAlignment": "Stretch",
+            "Visibility": "Visible",
+            "children": [
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.Border",
+                "Background": "#33000000",
+                "BorderBrush": "#5500FF00",
+                "BorderThickness": "10,10,10,10",
+                "Clip": null,
+                "CornerRadius": "10,10,10,10",
+                "FlowDirection": "LeftToRight",
+                "HorizontalAlignment": "Stretch",
+                "Margin": "0,0,0,0",
+                "Name": "BorderElement",
+                "Padding": "0,0,0,0",
+                "RenderSize": [800, 59],
+                "VerticalAlignment": "Stretch",
+                "Visibility": "Visible"
+            },
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.ScrollViewer",
+                "Background": "#00FFFFFF",
+                "BorderBrush": "#00FFFFFF",
+                "BorderThickness": "0,0,0,0",
+                "Clip": null,
+                "CornerRadius": "0,0,0,0",
+                "FlowDirection": "LeftToRight",
+                "Foreground": "#FF000000",
+                "HorizontalAlignment": "Stretch",
+                "Margin": "10,10,10,10",
+                "Name": "ContentElement",
+                "Padding": "10,10,10,10",
+                "RenderSize": [780, 39],
+                "VerticalAlignment": "Stretch",
+                "Visibility": "Visible",
+                "children": [
+                {
+                    "XamlType": "Windows.UI.Xaml.Controls.Border",
+                    "Background": null,
+                    "BorderBrush": "#00FFFFFF",
+                    "BorderThickness": "0,0,0,0",
+                    "Clip": null,
+                    "CornerRadius": "0,0,0,0",
+                    "FlowDirection": "LeftToRight",
+                    "HorizontalAlignment": "Stretch",
+                    "Margin": "0,0,0,0",
+                    "Name": "Root",
+                    "Padding": "0,0,0,0",
+                    "RenderSize": [780, 39],
+                    "VerticalAlignment": "Stretch",
+                    "Visibility": "Visible",
+                    "children": [
+                    {
+                        "XamlType": "Windows.UI.Xaml.Controls.Grid",
+                        "Background": "#00FFFFFF",
+                        "BorderBrush": null,
+                        "BorderThickness": "0,0,0,0",
+                        "Clip": null,
+                        "CornerRadius": "0,0,0,0",
+                        "FlowDirection": "LeftToRight",
+                        "HorizontalAlignment": "Stretch",
+                        "Margin": "0,0,0,0",
+                        "Padding": "0,0,0,0",
+                        "RenderSize": [780, 39],
+                        "VerticalAlignment": "Stretch",
+                        "Visibility": "Visible",
+                        "children": [
+                        {
+                            "XamlType": "Windows.UI.Xaml.Controls.ScrollContentPresenter",
+                            "Background": null,
+                            "BorderBrush": null,
+                            "BorderThickness": "0,0,0,0",
+                            "Clip": "Windows.UI.Xaml.Media.RectangleGeometry",
+                            "CornerRadius": "0,0,0,0",
+                            "FlowDirection": "LeftToRight",
+                            "Foreground": "#FF000000",
+                            "HorizontalAlignment": "Stretch",
+                            "Margin": "10,10,10,10",
+                            "Name": "ScrollContentPresenter",
+                            "Padding": "0,0,0,0",
+                            "RenderSize": [760, 19],
+                            "VerticalAlignment": "Stretch",
+                            "Visibility": "Visible",
+                            "children": [
+                            {
+                                "XamlType": "Windows.UI.Xaml.FrameworkElement",
+                                "Clip": null,
+                                "FlowDirection": "LeftToRight",
+                                "HorizontalAlignment": "Stretch",
+                                "Margin": "0,0,0,0",
+                                "RenderSize": [760, 19],
+                                "VerticalAlignment": "Stretch",
+                                "Visibility": "Visible"
+                            }
+                            ]
+                        },
+                        {
+                            "XamlType": "Windows.UI.Xaml.Controls.Grid",
+                            "Background": null,
+                            "BorderBrush": null,
+                            "BorderThickness": "0,0,0,0",
+                            "Clip": null,
+                            "CornerRadius": "0,0,0,0",
+                            "FlowDirection": "LeftToRight",
+                            "HorizontalAlignment": "Stretch",
+                            "Margin": "0,0,0,0",
+                            "Padding": "0,0,0,0",
+                            "RenderSize": [780, 39],
+                            "VerticalAlignment": "Stretch",
+                            "Visibility": "Visible"
+                        },
+                        {
+                            "XamlType": "Windows.UI.Xaml.Controls.Primitives.ScrollBar",
+                            "Background": "#00FFFFFF",
+                            "BorderBrush": "#00FFFFFF",
+                            "BorderThickness": "0,0,0,0",
+                            "Clip": null,
+                            "CornerRadius": "2,2,2,2",
+                            "FlowDirection": "LeftToRight",
+                            "Foreground": "#00FFFFFF",
+                            "HorizontalAlignment": "Right",
+                            "Margin": "0,0,0,0",
+                            "Name": "VerticalScrollBar",
+                            "Padding": "0,0,0,0",
+                            "RenderSize": [0, 0],
+                            "VerticalAlignment": "Stretch",
+                            "Visibility": "Collapsed"
+                        },
+                        {
+                            "XamlType": "Windows.UI.Xaml.Controls.Primitives.ScrollBar",
+                            "Background": "#00FFFFFF",
+                            "BorderBrush": "#00FFFFFF",
+                            "BorderThickness": "0,0,0,0",
+                            "Clip": null,
+                            "CornerRadius": "2,2,2,2",
+                            "FlowDirection": "LeftToRight",
+                            "Foreground": "#00FFFFFF",
+                            "HorizontalAlignment": "Stretch",
+                            "Margin": "0,0,0,0",
+                            "Name": "HorizontalScrollBar",
+                            "Padding": "0,0,0,0",
+                            "RenderSize": [0, 0],
+                            "VerticalAlignment": "Stretch",
+                            "Visibility": "Collapsed"
+                        },
+                        {
+                            "XamlType": "Windows.UI.Xaml.Controls.Border",
+                            "Background": "#FFE6E6E6",
+                            "BorderBrush": null,
+                            "BorderThickness": "0,0,0,0",
+                            "Clip": null,
+                            "CornerRadius": "0,0,0,0",
+                            "FlowDirection": "LeftToRight",
+                            "HorizontalAlignment": "Stretch",
+                            "Margin": "0,0,0,0",
+                            "Name": "ScrollBarSeparator",
+                            "Padding": "0,0,0,0",
+                            "RenderSize": [0, 0],
+                            "VerticalAlignment": "Stretch",
+                            "Visibility": "Collapsed"
+                        }
+                        ]
+                    }
+                    ]
+                }
+                ]
+            },
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.TextBlock",
+                "Clip": null,
+                "FlowDirection": "LeftToRight",
+                "Foreground": "#B3E1E1E1",
+                "HorizontalAlignment": "Stretch",
+                "Margin": "10,10,10,10",
+                "Name": "PlaceholderTextContentPresenter",
+                "Padding": "10,10,10,10",
+                "RenderSize": [780, 39],
+                "VerticalAlignment": "Stretch",
+                "Visibility": "Visible"
+            },
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.Primitives.ToggleButton",
+                "Background": "#33000000",
+                "BorderBrush": "#00FFFFFF",
+                "BorderThickness": "10,10,10,10",
+                "Clip": null,
+                "CornerRadius": "0,10,10,0",
+                "FlowDirection": "LeftToRight",
+                "Foreground": "#FF000000",
+                "HorizontalAlignment": "Left",
+                "Margin": "0,0,0,0",
+                "Name": "RevealButton",
+                "Padding": "0,0,-2,0",
+                "RenderSize": [0, 0],
+                "VerticalAlignment": "Stretch",
+                "Visibility": "Collapsed"
+            },
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.ContentPresenter",
+                "Background": null,
+                "BorderBrush": null,
+                "BorderThickness": "0,0,0,0",
+                "Clip": null,
+                "CornerRadius": "0,0,0,0",
+                "FlowDirection": "LeftToRight",
+                "Foreground": "#99000000",
+                "HorizontalAlignment": "Stretch",
+                "Margin": "0,0,0,0",
+                "Name": "DescriptionPresenter",
+                "Padding": "0,0,0,0",
+                "RenderSize": [800, 0],
+                "VerticalAlignment": "Stretch",
+                "Visibility": "Visible"
+            }
+            ]
+        }
+        ]
+    },
+    {
+        "XamlType": "Windows.UI.Xaml.Controls.CalendarDatePicker",
+        "Background": "#33000000",
+        "BorderBrush": "#5500FF00",
+        "BorderThickness": "10,10,10,10",
+        "Clip": null,
+        "CornerRadius": "10,10,10,10",
+        "FlowDirection": "LeftToRight",
+        "Foreground": "#FF000000",
+        "Height": 50,
+        "HorizontalAlignment": "Left",
+        "Margin": "0,0,0,0",
+        "Padding": "0,0,0,0",
+        "RenderSize": [150, 50],
+        "VerticalAlignment": "Center",
+        "Visibility": "Visible",
+        "Width": 150,
+        "children": [
+        {
+            "XamlType": "Windows.UI.Xaml.Controls.Grid",
+            "Background": null,
+            "BorderBrush": null,
+            "BorderThickness": "0,0,0,0",
+            "Clip": null,
+            "CornerRadius": "0,0,0,0",
+            "FlowDirection": "LeftToRight",
+            "HorizontalAlignment": "Stretch",
+            "Margin": "0,0,0,0",
+            "Name": "Root",
+            "Padding": "0,0,0,0",
+            "RenderSize": [150, 50],
+            "VerticalAlignment": "Stretch",
+            "Visibility": "Visible",
+            "children": [
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.Border",
+                "Background": "#33000000",
+                "BorderBrush": "#5500FF00",
+                "BorderThickness": "10,10,10,10",
+                "Clip": null,
+                "CornerRadius": "10,10,10,10",
+                "FlowDirection": "LeftToRight",
+                "HorizontalAlignment": "Stretch",
+                "Margin": "0,0,0,0",
+                "Name": "Background",
+                "Padding": "0,0,0,0",
+                "RenderSize": [150, 50],
+                "VerticalAlignment": "Stretch",
+                "Visibility": "Visible"
+            },
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.TextBlock",
+                "Clip": null,
+                "FlowDirection": "LeftToRight",
+                "Foreground": "#99000000",
+                "HorizontalAlignment": "Left",
+                "Margin": "0,0,0,0",
+                "Name": "DateText",
+                "Padding": "12,0,0,2",
+                "RenderSize": [90, 21],
+                "VerticalAlignment": "Center",
+                "Visibility": "Visible"
+            },
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.FontIcon",
+                "Clip": null,
+                "FlowDirection": "LeftToRight",
+                "Foreground": "#CC000000",
+                "HorizontalAlignment": "Center",
+                "Margin": "0,0,0,0",
+                "Name": "CalendarGlyph",
+                "RenderSize": [12, 12],
+                "VerticalAlignment": "Center",
+                "Visibility": "Visible",
+                "children": [
+                {
+                    "XamlType": "Windows.UI.Xaml.Controls.Grid",
+                    "Background": "#00000000",
+                    "BorderBrush": null,
+                    "BorderThickness": "0,0,0,0",
+                    "Clip": null,
+                    "CornerRadius": "0,0,0,0",
+                    "FlowDirection": "LeftToRight",
+                    "HorizontalAlignment": "Stretch",
+                    "Margin": "0,0,0,0",
+                    "Padding": "0,0,0,0",
+                    "RenderSize": [12, 12],
+                    "VerticalAlignment": "Stretch",
+                    "Visibility": "Visible",
+                    "children": [
+                    {
+                        "XamlType": "Windows.UI.Xaml.Controls.TextBlock",
+                        "Clip": null,
+                        "FlowDirection": "LeftToRight",
+                        "Foreground": "#CC000000",
+                        "HorizontalAlignment": "Stretch",
+                        "Margin": "0,0,0,0",
+                        "Padding": "0,0,0,0",
+                        "RenderSize": [12, 12],
+                        "VerticalAlignment": "Center",
+                        "Visibility": "Visible"
+                    }
+                    ]
+                }
+                ]
+            },
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.ContentPresenter",
+                "Background": null,
+                "BorderBrush": null,
+                "BorderThickness": "0,0,0,0",
+                "Clip": null,
+                "CornerRadius": "0,0,0,0",
+                "FlowDirection": "LeftToRight",
+                "Foreground": "#99000000",
+                "HorizontalAlignment": "Stretch",
+                "Margin": "0,0,0,0",
+                "Name": "DescriptionPresenter",
+                "Padding": "0,0,0,0",
+                "RenderSize": [150, 0],
+                "VerticalAlignment": "Stretch",
+                "Visibility": "Visible"
+            }
+            ]
+        }
+        ]
+    },
+    {
+        "XamlType": "Windows.UI.Xaml.Controls.ComboBox",
+        "Background": "#33000000",
+        "BorderBrush": "#5500FF00",
+        "BorderThickness": "10,10,10,10",
+        "Clip": null,
+        "CornerRadius": "10,10,10,10",
+        "FlowDirection": "LeftToRight",
+        "Foreground": "#FF000000",
+        "Height": 32,
+        "HorizontalAlignment": "Left",
+        "Margin": "0,0,0,0",
+        "Padding": "12,5,0,7",
+        "RenderSize": [800, 32],
+        "VerticalAlignment": "Top",
+        "Visibility": "Visible",
+        "Width": 800,
+        "children": [
+        {
+            "XamlType": "Windows.UI.Xaml.Controls.Grid",
+            "Background": null,
+            "BorderBrush": null,
+            "BorderThickness": "0,0,0,0",
+            "Clip": null,
+            "CornerRadius": "0,0,0,0",
+            "FlowDirection": "LeftToRight",
+            "HorizontalAlignment": "Stretch",
+            "Margin": "0,0,0,0",
+            "Name": "LayoutRoot",
+            "Padding": "0,0,0,0",
+            "RenderSize": [800, 32],
+            "VerticalAlignment": "Stretch",
+            "Visibility": "Visible",
+            "children": [
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.Border",
+                "Background": "#33000000",
+                "BorderBrush": "#5500FF00",
+                "BorderThickness": "10,10,10,10",
+                "Clip": null,
+                "CornerRadius": "10,10,10,10",
+                "FlowDirection": "LeftToRight",
+                "HorizontalAlignment": "Stretch",
+                "Margin": "0,0,0,0",
+                "Name": "Background",
+                "Padding": "0,0,0,0",
+                "RenderSize": [800, 32],
+                "VerticalAlignment": "Stretch",
+                "Visibility": "Visible"
+            },
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.Border",
+                "Background": "#FF409EFE",
+                "BorderBrush": "#66000000",
+                "BorderThickness": "10,10,10,10",
+                "Clip": null,
+                "CornerRadius": "10,10,10,10",
+                "FlowDirection": "LeftToRight",
+                "HorizontalAlignment": "Stretch",
+                "Margin": "0,0,0,0",
+                "Name": "HighlightBackground",
+                "Padding": "0,0,0,0",
+                "RenderSize": [800, 32],
+                "VerticalAlignment": "Stretch",
+                "Visibility": "Visible"
+            },
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.ContentPresenter",
+                "Background": null,
+                "BorderBrush": null,
+                "BorderThickness": "0,0,0,0",
+                "Clip": null,
+                "CornerRadius": "0,0,0,0",
+                "FlowDirection": "LeftToRight",
+                "Foreground": "#FF000000",
+                "HorizontalAlignment": "Stretch",
+                "Margin": "12,5,0,7",
+                "Name": "ContentPresenter",
+                "Padding": "0,0,0,0",
+                "RenderSize": [756, 19],
+                "VerticalAlignment": "Center",
+                "Visibility": "Visible",
+                "children": [
+                {
+                    "XamlType": "Windows.UI.Xaml.Controls.TextBlock",
+                    "Clip": null,
+                    "FlowDirection": "LeftToRight",
+                    "Foreground": "#FF000000",
+                    "HorizontalAlignment": "Stretch",
+                    "Margin": "0,0,0,0",
+                    "Name": "PlaceholderTextBlock",
+                    "Padding": "0,0,0,0",
+                    "RenderSize": [756, 19],
+                    "VerticalAlignment": "Stretch",
+                    "Visibility": "Visible"
+                }
+                ]
+            },
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.TextBox",
+                "Background": "#66FFFFFF",
+                "BorderBrush": "#00FFFFFF",
+                "BorderThickness": "1,1,1,1",
+                "Clip": null,
+                "CornerRadius": "10,10,10,10",
+                "FlowDirection": "LeftToRight",
+                "Foreground": "#FF000000",
+                "HorizontalAlignment": "Stretch",
+                "Margin": "0,0,0,0",
+                "Name": "EditableText",
+                "Padding": "11,5,32,6",
+                "RenderSize": [0, 0],
+                "VerticalAlignment": "Center",
+                "Visibility": "Collapsed"
+            },
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.Border",
+                "Background": "#00FFFFFF",
+                "BorderBrush": null,
+                "BorderThickness": "0,0,0,0",
+                "Clip": null,
+                "CornerRadius": "0,0,0,0",
+                "FlowDirection": "LeftToRight",
+                "HorizontalAlignment": "Right",
+                "Margin": "0,1,1,1",
+                "Name": "DropDownOverlay",
+                "Padding": "0,0,0,0",
+                "RenderSize": [0, 0],
+                "VerticalAlignment": "Stretch",
+                "Visibility": "Collapsed",
+                "Width": 30
+            },
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.FontIcon",
+                "Clip": null,
+                "FlowDirection": "LeftToRight",
+                "Foreground": "#CC000000",
+                "HorizontalAlignment": "Right",
+                "Margin": "0,0,10,0",
+                "Name": "DropDownGlyph",
+                "RenderSize": [12, 32],
+                "VerticalAlignment": "Center",
+                "Visibility": "Visible",
+                "children": [
+                {
+                    "XamlType": "Windows.UI.Xaml.Controls.Grid",
+                    "Background": "#00000000",
+                    "BorderBrush": null,
+                    "BorderThickness": "0,0,0,0",
+                    "Clip": null,
+                    "CornerRadius": "0,0,0,0",
+                    "FlowDirection": "LeftToRight",
+                    "HorizontalAlignment": "Stretch",
+                    "Margin": "0,0,0,0",
+                    "Padding": "0,0,0,0",
+                    "RenderSize": [12, 32],
+                    "VerticalAlignment": "Stretch",
+                    "Visibility": "Visible",
+                    "children": [
+                    {
+                        "XamlType": "Windows.UI.Xaml.Controls.TextBlock",
+                        "Clip": null,
+                        "FlowDirection": "LeftToRight",
+                        "Foreground": "#CC000000",
+                        "HorizontalAlignment": "Stretch",
+                        "Margin": "0,0,0,0",
+                        "Padding": "0,0,0,0",
+                        "RenderSize": [12, 12],
+                        "VerticalAlignment": "Center",
+                        "Visibility": "Visible"
+                    }
+                    ]
+                }
+                ]
+            },
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.ContentPresenter",
+                "Background": null,
+                "BorderBrush": null,
+                "BorderThickness": "0,0,0,0",
+                "Clip": null,
+                "CornerRadius": "0,0,0,0",
+                "FlowDirection": "LeftToRight",
+                "Foreground": "#99000000",
+                "HorizontalAlignment": "Stretch",
+                "Margin": "0,0,0,0",
+                "Name": "DescriptionPresenter",
+                "Padding": "0,0,0,0",
+                "RenderSize": [800, 0],
+                "VerticalAlignment": "Stretch",
+                "Visibility": "Visible"
+            },
+            {
+                "XamlType": "Windows.UI.Xaml.Controls.Primitives.Popup",
+                "Clip": null,
+                "FlowDirection": "LeftToRight",
+                "HorizontalAlignment": "Stretch",
+                "Margin": "0,0,0,0",
+                "Name": "Popup",
+                "RenderSize": [768, 0],
+                "VerticalAlignment": "Stretch",
+                "Visibility": "Visible"
+            }
+            ]
+        }
+        ]
+    }
+    ]
+}
diff --git a/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/masters/ImageRTL.json b/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/masters/ImageRTL.json
new file mode 100644
index 00000000000..c00ab2049da
--- /dev/null
+++ b/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/masters/ImageRTL.json
@@ -0,0 +1,38 @@
+{
+    "XamlType": "Windows.UI.Xaml.Controls.Border",
+    "Background": "#FFFFFF00",
+    "BorderBrush": null,
+    "BorderThickness": "0,0,0,0",
+    "Clip": null,
+    "CornerRadius": "0,0,0,0",
+    "FlowDirection": "LeftToRight",
+    "Height": 300,
+    "HorizontalAlignment": "Stretch",
+    "Margin": "0,0,0,0",
+    "Padding": "0,0,0,0",
+    "RenderSize": [500, 300],
+    "VerticalAlignment": "Stretch",
+    "Visibility": "Visible",
+    "Width": 500,
+    "children": [
+    {
+        "XamlType": "Microsoft.ReactNative.ViewPanel",
+        "Background": null,
+        "BorderBrush": "#00000000",
+        "BorderThickness": "0,0,0,0",
+        "Clip": null,
+        "CornerRadius": "0,0,0,0",
+        "FlowDirection": "LeftToRight",
+        "HorizontalAlignment": "Stretch",
+        "Margin": "0,0,0,0",
+        "RenderSize": [500, 300],
+        "VerticalAlignment": "Stretch",
+        "Visibility": "Visible",
+        "children": [
+        {
+            "XamlType": "Windows.UI.Xaml.DependencyObject"
+        }
+        ]
+    }
+    ]
+}
diff --git a/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/masters/ImageWithBorder.json b/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/masters/ImageWithBorder.json
new file mode 100644
index 00000000000..753214da826
--- /dev/null
+++ b/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/masters/ImageWithBorder.json
@@ -0,0 +1,38 @@
+{
+    "XamlType": "Windows.UI.Xaml.Controls.Border",
+    "Background": "#FFFFFF00",
+    "BorderBrush": "#5500FF00",
+    "BorderThickness": "10,10,10,10",
+    "Clip": null,
+    "CornerRadius": "10,10,10,10",
+    "FlowDirection": "LeftToRight",
+    "Height": 300,
+    "HorizontalAlignment": "Stretch",
+    "Margin": "0,0,0,0",
+    "Padding": "0,0,0,0",
+    "RenderSize": [500, 300],
+    "VerticalAlignment": "Stretch",
+    "Visibility": "Visible",
+    "Width": 500,
+    "children": [
+    {
+        "XamlType": "Microsoft.ReactNative.ViewPanel",
+        "Background": null,
+        "BorderBrush": "#5500FF00",
+        "BorderThickness": "10,10,10,10",
+        "Clip": null,
+        "CornerRadius": "10,10,10,10",
+        "FlowDirection": "LeftToRight",
+        "HorizontalAlignment": "Stretch",
+        "Margin": "0,0,0,0",
+        "RenderSize": [480, 280],
+        "VerticalAlignment": "Stretch",
+        "Visibility": "Visible",
+        "children": [
+        {
+            "XamlType": "Windows.UI.Xaml.DependencyObject"
+        }
+        ]
+    }
+    ]
+}
diff --git a/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/masters/ImageWithoutBorder-Subsequent.json b/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/masters/ImageWithoutBorder-Subsequent.json
new file mode 100644
index 00000000000..c00ab2049da
--- /dev/null
+++ b/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/masters/ImageWithoutBorder-Subsequent.json
@@ -0,0 +1,38 @@
+{
+    "XamlType": "Windows.UI.Xaml.Controls.Border",
+    "Background": "#FFFFFF00",
+    "BorderBrush": null,
+    "BorderThickness": "0,0,0,0",
+    "Clip": null,
+    "CornerRadius": "0,0,0,0",
+    "FlowDirection": "LeftToRight",
+    "Height": 300,
+    "HorizontalAlignment": "Stretch",
+    "Margin": "0,0,0,0",
+    "Padding": "0,0,0,0",
+    "RenderSize": [500, 300],
+    "VerticalAlignment": "Stretch",
+    "Visibility": "Visible",
+    "Width": 500,
+    "children": [
+    {
+        "XamlType": "Microsoft.ReactNative.ViewPanel",
+        "Background": null,
+        "BorderBrush": "#00000000",
+        "BorderThickness": "0,0,0,0",
+        "Clip": null,
+        "CornerRadius": "0,0,0,0",
+        "FlowDirection": "LeftToRight",
+        "HorizontalAlignment": "Stretch",
+        "Margin": "0,0,0,0",
+        "RenderSize": [500, 300],
+        "VerticalAlignment": "Stretch",
+        "Visibility": "Visible",
+        "children": [
+        {
+            "XamlType": "Windows.UI.Xaml.DependencyObject"
+        }
+        ]
+    }
+    ]
+}
diff --git a/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/masters/ImageWithoutBorder.json b/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/masters/ImageWithoutBorder.json
new file mode 100644
index 00000000000..9406a02556a
--- /dev/null
+++ b/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/masters/ImageWithoutBorder.json
@@ -0,0 +1,21 @@
+{
+    "XamlType": "Microsoft.ReactNative.ViewPanel",
+    "Background": "#FFFFFF00",
+    "BorderBrush": "#00000000",
+    "BorderThickness": "0,0,0,0",
+    "Clip": null,
+    "CornerRadius": "0,0,0,0",
+    "FlowDirection": "LeftToRight",
+    "Height": 300,
+    "HorizontalAlignment": "Stretch",
+    "Margin": "0,0,0,0",
+    "RenderSize": [500, 300],
+    "VerticalAlignment": "Stretch",
+    "Visibility": "Visible",
+    "Width": 500,
+    "children": [
+    {
+        "XamlType": "Windows.UI.Xaml.DependencyObject"
+    }
+    ]
+}
diff --git a/packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.csproj b/packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.csproj
index 4c3f53bfa5a..6611c1e40c4 100644
--- a/packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.csproj
+++ b/packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.csproj
@@ -71,7 +71,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;</DefineConstants>
     <NoWarn>;2008</NoWarn>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
@@ -81,7 +81,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP;E2ETEST_OVERRIDE_4122</DefineConstants>
     <Optimize>true</Optimize>
     <NoWarn>;2008</NoWarn>
     <DebugType>pdbonly</DebugType>
@@ -132,7 +132,7 @@
     <None Include="ReactUWPTestApp_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Assets\TreeDump\*.txt" />
+    <Content Include="Assets\TreeDump\masters\*.json" />
     <Content Include="Properties\Default.rd.xml" />
     <Content Include="Assets\LockScreenLogo.scale-200.png" />
     <Content Include="Assets\SplashScreen.scale-200.png" />
@@ -176,8 +176,8 @@
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <PropertyGroup>
     <BundleCommand>
-    echo WorkingDir %CD%
-    npx --no-install yarn run bundle
+      echo WorkingDir %CD%
+      npx --no-install yarn run bundle
     </BundleCommand>
   </PropertyGroup>
   <Import Project="$(ReactNativeWindowsDir)\PropertySheets\Bundle.targets" />
diff --git a/packages/E2ETest/windows/ReactUWPTestApp/copyTreeDump.cmd b/packages/E2ETest/windows/ReactUWPTestApp/copyTreeDump.cmd
index 93578825c21..4b40165390b 100644
--- a/packages/E2ETest/windows/ReactUWPTestApp/copyTreeDump.cmd
+++ b/packages/E2ETest/windows/ReactUWPTestApp/copyTreeDump.cmd
@@ -1 +1 @@
-copy %LocalAppData%\Packages\ReactUWPTestApp_kc2bncckyf4ap\LocalState\TreeDump\*.out Assets\TreeDump\*.txt
\ No newline at end of file
+@copy /d %LocalAppData%\Packages\ReactUWPTestApp_kc2bncckyf4ap\LocalState\TreeDump\*.json %~dp0%\Assets\TreeDump\masters\*.json
diff --git a/packages/E2ETest/windows/TreeDumpLibrary/DefaultVisualTreeLogger.cs b/packages/E2ETest/windows/TreeDumpLibrary/DefaultVisualTreeLogger.cs
new file mode 100644
index 00000000000..ab558d3f0ee
--- /dev/null
+++ b/packages/E2ETest/windows/TreeDumpLibrary/DefaultVisualTreeLogger.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System.Text;
+using Windows.UI.Xaml;
+
+namespace TreeDumpLibrary
+{
+    public sealed class DefaultVisualTreeLogger : IVisualTreeLogger
+    {
+        public void BeginNode(int indent, string nodeName, DependencyObject obj, bool hasProperties)
+        {
+            AppendLogger(indent, $"[{nodeName}]");
+        }
+
+        public void EndNode(int indent, string nodeName, DependencyObject obj, bool isLast)
+        { // no-op
+        }
+
+        public void LogProperty(int indent, string propertyName, object propertyValue, bool isLast)
+        {
+            AppendLogger(indent, $"{propertyName}={propertyValue}");
+        }
+
+        public override string ToString()
+        {
+            return _logger.ToString();
+        }
+
+        private readonly StringBuilder _logger = new StringBuilder();
+        private void AppendLogger(int indent, string s)
+        {
+            _logger.AppendLine(s.PadLeft(2 * indent + s.Length));
+        }
+
+        public void BeginArray(int indent, string propertyName)
+        { // no-op
+        }
+
+        public void EndArray(int indent, string propertyName)
+        {
+        }
+    }
+}
diff --git a/packages/E2ETest/windows/TreeDumpLibrary/IPropertyValueTranslator.cs b/packages/E2ETest/windows/TreeDumpLibrary/IPropertyValueTranslator.cs
new file mode 100644
index 00000000000..5bcc26823f6
--- /dev/null
+++ b/packages/E2ETest/windows/TreeDumpLibrary/IPropertyValueTranslator.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+namespace TreeDumpLibrary
+{
+    public interface IPropertyValueTranslator
+    {
+        string PropertyValueToString(string propertyName, object propertyObject);
+    }
+}
\ No newline at end of file
diff --git a/packages/E2ETest/windows/TreeDumpLibrary/IVisualTreeLogger.cs b/packages/E2ETest/windows/TreeDumpLibrary/IVisualTreeLogger.cs
new file mode 100644
index 00000000000..4cddddc9cb2
--- /dev/null
+++ b/packages/E2ETest/windows/TreeDumpLibrary/IVisualTreeLogger.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using Windows.UI.Xaml;
+
+namespace TreeDumpLibrary
+{
+    public interface IVisualTreeLogger
+    {
+        void BeginNode(int indent, string nodeName, DependencyObject obj, bool hasProperties);
+        void EndNode(int indent, string nodeName, DependencyObject obj, bool isLast);
+        void LogProperty(int indent, string propertyName, object propertyValue, bool isLast);
+        string ToString();
+        void BeginArray(int indent, string propertyName);
+        void EndArray(int indent, string propertyName);
+    }
+}
diff --git a/packages/E2ETest/windows/TreeDumpLibrary/JsonVisualTreeLogger.cs b/packages/E2ETest/windows/TreeDumpLibrary/JsonVisualTreeLogger.cs
new file mode 100644
index 00000000000..7cf52ca97ab
--- /dev/null
+++ b/packages/E2ETest/windows/TreeDumpLibrary/JsonVisualTreeLogger.cs
@@ -0,0 +1,53 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System.Text;
+using Windows.UI.Xaml;
+
+namespace TreeDumpLibrary
+{
+    public sealed class JsonVisualTreeLogger : IVisualTreeLogger
+    {
+        private readonly StringBuilder _logger = new StringBuilder();
+        public void BeginArray(int indent, string propertyName)
+        {
+            AppendLogger(indent, $"\"{propertyName}\": [");
+        }
+
+        public void BeginNode(int indent, string nodeName, DependencyObject obj, bool hasProperties)
+        {
+            AppendLogger(indent, "{");
+            LogProperty(indent + 2, "XamlType", JsonPropertyValueTranslator.Quote(nodeName), !hasProperties);
+        }
+
+        public void EndArray(int indent, string propertyName)
+        {
+            AppendLogger(indent, "]");
+        }
+
+        public void EndNode(int indent, string nodeName, DependencyObject obj, bool isLast)
+        {
+            AppendLogger(indent, $"}}{GetDelimiter(isLast)}");
+        }
+
+        private string GetDelimiter(bool isLast)
+        {
+            return isLast ? "" : ",";
+        }
+
+        public void LogProperty(int indent, string propertyName, object propertyValue, bool isLast)
+        {
+            AppendLogger(indent, $"\"{propertyName}\": {propertyValue}{GetDelimiter(isLast)}");
+        }
+
+        public override string ToString()
+        {
+            return _logger.ToString();
+        }
+
+        private void AppendLogger(int indent, string s)
+        {
+            _logger.AppendLine(s.PadLeft(2 * indent + s.Length));
+        }
+    }
+}
diff --git a/packages/E2ETest/windows/TreeDumpLibrary/TreeDumpControlViewManager.cs b/packages/E2ETest/windows/TreeDumpLibrary/TreeDumpControlViewManager.cs
index 69681eb5da6..1e12a33264b 100644
--- a/packages/E2ETest/windows/TreeDumpLibrary/TreeDumpControlViewManager.cs
+++ b/packages/E2ETest/windows/TreeDumpLibrary/TreeDumpControlViewManager.cs
@@ -1,19 +1,21 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using System.Diagnostics;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Controls;
-
 using Microsoft.ReactNative;
 using Microsoft.ReactNative.Managed;
-using Windows.UI.Xaml;
-using Windows.UI.ViewManagement;
-using System.Threading.Tasks;
 using System;
+using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
+using System.Threading.Tasks;
+using Windows.ApplicationModel.DataTransfer;
+using Windows.Data.Json;
 using Windows.Storage;
-using System.Collections.Generic;
+using Windows.UI.ViewManagement;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Documents;
+using Windows.UI.Xaml.Media;
 
 namespace TreeDumpLibrary
 {
@@ -32,7 +34,7 @@ public FrameworkElement CreateView()
                 if (bounds.Width != 800 || bounds.Height != 600)
                 {
                     // Dump disabled when window size is not 800x600!
-                    UpdateResult(false /*matchDump*/, "Window has been resized, dump comparison is only valid at default launch size: 800x600!, current size:" + bounds.ToString());
+                    UpdateResult(false /*matchDump*/ , "Window has been resized, dump comparison is only valid at default launch size: 800x600!, current size:" + bounds.ToString());
                 }
                 else
                 {
@@ -45,7 +47,7 @@ public FrameworkElement CreateView()
                 }
             };
 
-            m_textBlock.PointerPressed += (soruce, e) =>
+            m_textBlock.PointerPressed += (source, e) =>
             {
                 if (!m_dumpMatchExpected)
                 {
@@ -54,7 +56,7 @@ public FrameworkElement CreateView()
                         m_timer.Stop();
                     }
                     m_errStringShowing = true;
-                    m_textBlock.Text = m_errString;
+                    errors.Apply(m_textBlock);
                     m_textBlock.IsTextSelectionEnabled = true;
                 }
             };
@@ -75,25 +77,18 @@ public void UpdateProperties(FrameworkElement view, IJSValueReader propertyMapRe
                 {
                     SetUIAID((TextBlock)view, kvp.Value.AsString());
                 }
-                else if(kvp.Key == "additionalProperties")
+                else if (kvp.Key == "additionalProperties")
                 {
                     SetAdditionalProperties(kvp.Value.AsArray());
                 }
             }
         }
 
-        IReadOnlyDictionary<string, ViewManagerPropertyType> IViewManagerWithNativeProperties.NativeProps
-        {
-            get
-            {
-                return new Dictionary<string, ViewManagerPropertyType>
-                {
-                    { "dumpID", ViewManagerPropertyType.String },
-                    { "uiaID", ViewManagerPropertyType.String },
-                    { "additionalProperties", ViewManagerPropertyType.Array }
-                };
-            }
-        }
+        IReadOnlyDictionary<string, ViewManagerPropertyType> IViewManagerWithNativeProperties.NativeProps => new Dictionary<string, ViewManagerPropertyType>
+        { { "dumpID", ViewManagerPropertyType.String },
+            { "uiaID", ViewManagerPropertyType.String },
+            { "additionalProperties", ViewManagerPropertyType.Array }
+        };
 
         public void SetDumpID(TextBlock view, string value)
         {
@@ -101,6 +96,7 @@ public void SetDumpID(TextBlock view, string value)
             m_dumpMatchExpected = false;
             m_dumpExpectedText = null;
             m_errString = "";
+            errors = new TreeDumpErrors();
             m_errStringShowing = false;
             if (m_textBlock != null)
             {
@@ -119,7 +115,7 @@ public void SetUIAID(TextBlock view, string value)
 
         public void SetAdditionalProperties(IReadOnlyList<JSValue> additionalProperties)
         {
-            foreach(var property in additionalProperties)
+            foreach (var property in additionalProperties)
             {
                 m_additionalProperties.Add(property.AsString());
             }
@@ -175,55 +171,184 @@ private async Task MatchTreeDumpFromLayoutUpdateAsync()
                 }
             }
 
-            String dumpText = VisualTreeDumper.DumpTree(dumpRoot, m_textBlock /* exclude */, m_additionalProperties);
+            string dumpText = VisualTreeDumper.DumpTree(dumpRoot, m_textBlock /* exclude */ , m_additionalProperties, mode);
             if (dumpText != m_dumpExpectedText)
             {
                 await MatchDump(dumpText);
             }
         }
 
+        private readonly DumpTreeMode mode = DumpTreeMode.Json;
+
         private async Task MatchDump(string dumpText)
         {
+            StorageFile masterFile = await Windows.ApplicationModel.Package.Current.InstalledLocation.GetFileAsync($@"Assets\{GetMasterFile()}");
             if (m_dumpExpectedText == null)
             {
                 try
                 {
-                    var file = await Windows.ApplicationModel.Package.Current.InstalledLocation.GetFileAsync(@"Assets\TreeDump\" + m_dumpID + ".txt");
-                    m_dumpExpectedText = await Windows.Storage.FileIO.ReadTextAsync(file);
+                    m_dumpExpectedText = await FileIO.ReadTextAsync(masterFile);
 
                     StorageFolder storageFolder = ApplicationData.Current.LocalFolder;
-                    string copyFileName = "TreeDump\\" + m_dumpID + ".txt";
+                    string copyFileName = GetMasterFile();
                     var copyDumpFile = await storageFolder.CreateFileAsync(copyFileName, CreationCollisionOption.ReplaceExisting);
-                    await Windows.Storage.FileIO.WriteTextAsync(copyDumpFile, m_dumpExpectedText);
+                    await FileIO.WriteTextAsync(copyDumpFile, m_dumpExpectedText);
                 }
                 catch (IOException)
                 {
-                    UpdateResult(false /*matchDump*/, "Tree dump master file not found in testapp package!");
+                    UpdateResult(false /*matchDump*/ , "Tree dump master file not found in testapp package!");
                 }
             }
 
-            if (m_dumpExpectedText != dumpText)
+            if (!DumpsAreEqual(m_dumpExpectedText, dumpText))
             {
                 StorageFolder storageFolder = ApplicationData.Current.LocalFolder;
-                string fileName = "TreeDump\\" + m_dumpID + ".out";
+                string fileName = GetOutputFile();
                 try
                 {
                     StorageFile outFile = await storageFolder.CreateFileAsync(fileName, CreationCollisionOption.ReplaceExisting);
-                    await Windows.Storage.FileIO.WriteTextAsync(outFile, dumpText);
-                    UpdateResult(false /*matchDump*/, "Tree dump file does not match master! See output at " + outFile.Path);
+                    await FileIO.WriteTextAsync(outFile, dumpText);
+                    UpdateResult(false /*matchDump*/ ,
+                        $"Tree dump file does not match master at {masterFile.Path} - See output at {outFile.Path}",
+                        GetInlines(masterFile, outFile, m_textBlock));
                 }
                 catch (IOException)
                 {
-                    UpdateResult(false /*matchDump*/, "Can't write dump output file:" + fileName);
+                    UpdateResult(false /*matchDump*/ , "Can't write dump output file:" + fileName);
                 }
             }
             else
             {
-                UpdateResult(true /*matchDump*/, "");
+                UpdateResult(true /*matchDump*/ , "");
+            }
+        }
+
+        private bool DumpsAreEqual(string dumpExpectedText, string dumpText)
+        {
+            if (mode == DumpTreeMode.Default)
+            {
+                return dumpExpectedText == dumpText;
+            }
+            else
+            {
+                JsonValue expected = JsonValue.Parse(dumpExpectedText);
+                JsonValue actual = JsonValue.Parse(dumpText);
+                return JsonComparesEqual(expected, actual);
             }
         }
 
-        private async void UpdateResult(bool matchDump, string helpText)
+        private bool JsonComparesEqual(IJsonValue expected, IJsonValue actual)
+        {
+            if (expected.ValueType != actual.ValueType)
+            {
+                return false;
+            }
+            switch (expected.ValueType)
+            {
+                case JsonValueType.String:
+                    if (expected.GetString() == actual.GetString())
+                    {
+                        return true;
+                    }
+                    else { Debug.WriteLine($"Expected {expected.GetString()} got {actual.GetString()}"); return false; }
+                case JsonValueType.Number:
+                    return expected.GetNumber() == actual.GetNumber();
+                case JsonValueType.Boolean:
+                    return expected.GetBoolean() == actual.GetBoolean();
+                case JsonValueType.Null:
+                    return true;
+                case JsonValueType.Array:
+                    {
+                        var ea = expected.GetArray();
+                        var aa = actual.GetArray();
+                        if (ea.Count != aa.Count) { return false; }
+                        for (uint i = 0; i < ea.Count; i++)
+                        {
+                            if (!JsonComparesEqual(ea[(int)i], aa[(int)i]))
+                            {
+                                return false;
+                            }
+                        }
+                        return true;
+                    }
+                case JsonValueType.Object:
+                    {
+                        var eo = expected.GetObject();
+                        var ao = actual.GetObject();
+                        if (eo.Keys.Count != ao.Keys.Count) { return false; }
+                        foreach (var key in eo.Keys)
+                        {
+                            if (!JsonComparesEqual(eo.GetNamedValue(key), ao.GetNamedValue(key)))
+                            {
+                                return false;
+                            }
+                        }
+                        return true;
+                    }
+                default:
+                    throw new ArgumentException();
+            }
+        }
+
+        private string GetOutputFile()
+        {
+            return "TreeDump\\" + m_dumpID + (mode == DumpTreeMode.Json ? ".json" : ".out");
+        }
+
+        private string GetMasterFile()
+        {
+            return "TreeDump\\masters\\" + m_dumpID + (mode == DumpTreeMode.Json ? ".json" : ".txt");
+        }
+
+        private static IList<Inline> GetInlines(StorageFile masterFile, StorageFile outFile, UIElement anchor)
+        {
+            Hyperlink masterLink = new Hyperlink();
+            masterLink.Click += (_1, _2) => { Windows.System.Launcher.LaunchFileAsync(masterFile); };
+            masterLink.Inlines.Add(new Run() { Text = "master" });
+            Hyperlink outLink = new Hyperlink();
+            outLink.Click += (_1, _2) => { Windows.System.Launcher.LaunchFileAsync(outFile); };
+            outLink.Inlines.Add(new Run() { Text = "output" });
+            List<Inline> inlines = new List<Inline>()
+            {
+                new Run () { Text = "Tree dump " },
+                outLink,
+                new Run () { Text = " does not match " },
+                masterLink
+            };
+
+            #region Diff support - Replace with LaunchUriAsync when we find the VSCode protocol handler Uri for diffing
+            string code_cmd = Environment.ExpandEnvironmentVariables(@"%UserProfile%\AppData\Local\Programs\Microsoft VS Code\bin\code.cmd");
+            Hyperlink diffLink = new Hyperlink();
+            diffLink.Click += (_1, _2) =>
+            {
+                string commandLine = $"code.cmd --diff \"{masterFile.Path}\" \"{outFile.Path}\"";
+                DataPackage dataPackage = new DataPackage();
+                dataPackage.SetText(commandLine);
+                Clipboard.SetContent(dataPackage);
+                ToolTip toolTip = new ToolTip() { Content = "Copied to clipboard" };
+                ToolTipService.SetToolTip(anchor, toolTip);
+                toolTip.Opened += (_3, _4) =>
+                {
+                    var timer = Windows.System.DispatcherQueue.GetForCurrentThread().CreateTimer();
+                    timer.IsRepeating = false;
+                    timer.Interval = TimeSpan.FromSeconds(1);
+                    timer.Tick += (_5, _6) =>
+                    {
+                        toolTip.IsOpen = false;
+                        ToolTipService.SetToolTip(anchor, null);
+                    };
+                    timer.Start();
+                };
+                toolTip.IsOpen = true;
+            };
+            diffLink.Inlines.Add(new Run() { Text = "copy diff command to clipboard" });
+            inlines.Add(new Run() { Text = " - " });
+            inlines.Add(diffLink);
+            #endregion
+            return inlines;
+        }
+
+        private async void UpdateResult(bool matchDump, string helpText, IList<Inline> inlines = null)
         {
             if (matchDump)
             {
@@ -233,23 +358,37 @@ private async void UpdateResult(bool matchDump, string helpText)
             {
                 UpdateTextBlockText("TreeDump:Failed, click to see more!");
                 m_errString += "\r\n" + helpText;
-
-                StorageFolder storageFolder = ApplicationData.Current.LocalFolder;
-                string fileNameError = "TreeDump\\" + m_dumpID + ".err";
-                try
+                errors.Inlines.Clear();
+                if (inlines != null)
                 {
-                    StorageFile errFile = await storageFolder.CreateFileAsync(fileNameError, CreationCollisionOption.GenerateUniqueName);
-                    await Windows.Storage.FileIO.WriteTextAsync(errFile, m_errString);
+                    errors.Inlines.AddRange(inlines);
                 }
-                catch (Exception e)
+                else
                 {
-                    UpdateTextBlockText("Creat err file failed: " + e.ToString());
+                    errors.Inlines.Add(new Run() { Text = helpText });
                 }
+                errors.Inlines.Add(new LineBreak());
+                await WriteErrorFile();
             }
 
             m_dumpMatchExpected = matchDump;
         }
 
+        private async Task WriteErrorFile()
+        {
+            StorageFolder storageFolder = ApplicationData.Current.LocalFolder;
+            string fileNameError = "TreeDump\\" + m_dumpID + ".err";
+            try
+            {
+                StorageFile errFile = await storageFolder.CreateFileAsync(fileNameError, CreationCollisionOption.GenerateUniqueName);
+                await FileIO.WriteTextAsync(errFile, m_errString);
+            }
+            catch (Exception e)
+            {
+                UpdateTextBlockText("Create err file failed: " + e.ToString());
+            }
+        }
+
         private void UpdateTextBlockText(string text)
         {
             if (!m_errStringShowing && m_textBlock.Text != text)
@@ -263,10 +402,28 @@ private void UpdateTextBlockText(string text)
         private bool m_dumpMatchExpected = false;
         private bool m_errStringShowing = false;
         private string m_errString = "";
+        private TreeDumpErrors errors = new TreeDumpErrors();
         private string m_uiaID = null;
-        private List<string> m_additionalProperties = new List<string>();
+        private readonly List<string> m_additionalProperties = new List<string>();
 
         private DispatcherTimer m_timer = null;
+    }
+
+    internal class TreeDumpErrors
+    {
+        readonly List<Inline> inlines = new List<Inline>();
+
+        public List<Inline> Inlines => inlines;
 
+        public void Apply(TextBlock textBlock)
+        {
+            textBlock.Text = "";
+            textBlock.Inlines.Clear();
+            foreach (var inline in Inlines)
+            {
+                textBlock.Inlines.Add(inline);
+            }
+            textBlock.Width = 800;
+        }
     }
 }
diff --git a/packages/E2ETest/windows/TreeDumpLibrary/TreeDumpLibrary.csproj b/packages/E2ETest/windows/TreeDumpLibrary/TreeDumpLibrary.csproj
index 0b24b8cc6fa..7407afba744 100644
--- a/packages/E2ETest/windows/TreeDumpLibrary/TreeDumpLibrary.csproj
+++ b/packages/E2ETest/windows/TreeDumpLibrary/TreeDumpLibrary.csproj
@@ -106,6 +106,10 @@
     <ReactNativeWindowsDir Condition="'$(ReactNativeWindowsDir)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\</ReactNativeWindowsDir>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="DefaultVisualTreeLogger.cs" />
+    <Compile Include="IPropertyValueTranslator.cs" />
+    <Compile Include="IVisualTreeLogger.cs" />
+    <Compile Include="JsonVisualTreeLogger.cs" />
     <Compile Include="TreeDumpControlViewManager.cs" />
     <Compile Include="ReactPackageProvider.cs" />
     <Compile Include="VisualTreeDumper.cs" />
@@ -137,4 +141,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/packages/E2ETest/windows/TreeDumpLibrary/VisualTreeDumper.cs b/packages/E2ETest/windows/TreeDumpLibrary/VisualTreeDumper.cs
index d44de541d9a..32a43aa7bd2 100644
--- a/packages/E2ETest/windows/TreeDumpLibrary/VisualTreeDumper.cs
+++ b/packages/E2ETest/windows/TreeDumpLibrary/VisualTreeDumper.cs
@@ -5,38 +5,42 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
+using Windows.Foundation;
 using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Media;
 
 namespace TreeDumpLibrary
 {
-    public sealed  class VisualTreeDumper
+    public enum DumpTreeMode
+    {
+        Default,
+        Json
+    }
+
+    public sealed class VisualTreeDumper
     {
         class Visitor
         {
-            private DefaultVisualTreeLogger _logger;
+            private readonly IVisualTreeLogger _logger;
             private int _indent;
-            private DefaultFilter _filter;
-            private DefaultPropertyValueTranslator _translator;
-            public Visitor(DefaultFilter filter, DefaultPropertyValueTranslator translator, DefaultVisualTreeLogger logger)
+            private readonly DefaultFilter _filter;
+            private readonly IPropertyValueTranslator _translator;
+            public Visitor(DefaultFilter filter, IPropertyValueTranslator translator, IVisualTreeLogger logger)
             {
                 _indent = 0;
                 _filter = filter;
                 _translator = translator;
                 _logger = logger;
             }
-            public void EndVisitNode(DependencyObject obj)
+            public void EndVisitNode(DependencyObject obj, bool isLast)
             {
                 _indent--;
-                _logger.EndNode(_indent, obj.GetType().FullName, obj);
+                _logger.EndNode(_indent, obj.GetType().FullName, obj, isLast);
             }
 
-            public void BeginVisitNode(DependencyObject obj)
+            public void BeginVisitNode(DependencyObject obj, bool hasProperties)
             {
-                _logger.BeginNode(_indent, obj.GetType().FullName, obj);
+                _logger.BeginNode(_indent, obj.GetType().FullName, obj, hasProperties);
                 _indent++;
             }
 
@@ -55,70 +59,114 @@ public bool ShouldVisitProperty(PropertyInfo propertyInfo)
                 return _filter.ShouldVisitProperty(propertyInfo.Name);
             }
 
-            public void VisitProperty(string propertyName, object value)
+            public void VisitProperty(string propertyName, object value, bool isLast)
             {
                 var v = _translator.PropertyValueToString(propertyName, value);
-                if (_filter.ShouldVisitPropertyValue(v))
+                _logger.LogProperty(_indent + 1, propertyName, v, isLast);
+            }
+
+            public void BeginChildren()
+            {
+                _logger.BeginArray(++_indent, "children");
+            }
+
+            public void EndChildren()
+            {
+                _logger.EndArray(_indent--, "children");
+            }
+
+            public bool ShouldVisitPropertyValue(string propertyName, object value)
+            {
+                string s = _translator.PropertyValueToString(propertyName, value);
+                if (propertyName == "Name")
                 {
-                    _logger.LogProperty(_indent + 1, propertyName, v);
+                    string name = value as string;
+                    return !name.StartsWith("<reacttag>:") &&
+                        name != "";
                 }
+                return _filter.ShouldVisitPropertyValue(s);
             }
         }
 
-        public static string DumpTree(DependencyObject root, DependencyObject excludedNode, IList<string> additionalProperties)
+        public static string DumpTree(DependencyObject root, DependencyObject excludedNode, IList<string> additionalProperties, DumpTreeMode mode)
         {
             var propertyFilter = new DefaultFilter();
             ((List<string>)propertyFilter.PropertyNameAllowList).AddRange(additionalProperties);
 
-            Visitor visitor = new Visitor(propertyFilter,
-                new DefaultPropertyValueTranslator(),
+            IPropertyValueTranslator translator = (mode == DumpTreeMode.Json ?
+                new JsonPropertyValueTranslator() as IPropertyValueTranslator :
+                new DefaultPropertyValueTranslator());
+            IVisualTreeLogger logger = (mode == DumpTreeMode.Json ?
+                new JsonVisualTreeLogger() as IVisualTreeLogger :
                 new DefaultVisualTreeLogger());
+            Visitor visitor = new Visitor(propertyFilter, translator, logger);
+
             WalkThroughTree(root, excludedNode, visitor);
 
             return visitor.ToString();
         }
 
-        private static void WalkThroughProperties(DependencyObject node, Visitor visitor)
+        private static void WalkThroughProperties(DependencyObject node, Visitor visitor, bool hasChildren)
         {
             if (visitor.ShouldVisitPropertiesForNode(node))
             {
-                var properties = node.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance).OrderBy(x => x.Name);
-                foreach (var property in properties)
-                {
-                    if (visitor.ShouldVisitProperty(property))
-                    {
-                        Object value = null;
+                var properties = (from property in node.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance)
+                                  where visitor.ShouldVisitProperty(property) &&
+                                        visitor.ShouldVisitPropertyValue(property.Name,
+                                            GetObjectProperty(node, property))
+                                  orderby property.Name
+                                  select property).ToArray();
 
-                        try
-                        {
-                            value = property.GetValue(obj: node, index: null);
-                        }
-                        catch (Exception e)
-                        {
-                            value = "Exception when read " + property.Name + e.ToString();
-                        }
-                        visitor.VisitProperty(property.Name, value);
-                    }
+                for (int i = 0; i < properties.Length; i++)
+                {
+                    var property = properties[i];
+                    object value = null;
+                    value = GetObjectProperty(node, property);
+                    bool isLast = (i == properties.Length - 1) && !hasChildren;
+                    visitor.VisitProperty(property.Name, value, isLast);
                 }
             }
         }
-        private static void WalkThroughTree(DependencyObject node, DependencyObject excludedNode, Visitor visitor)
+
+        private static object GetObjectProperty(DependencyObject node, PropertyInfo property)
+        {
+            object value;
+            try
+            {
+                value = property.GetValue(node);
+            }
+            catch (Exception e)
+            {
+                value = "Exception when reading " + property.Name + e.ToString();
+            }
+
+            return value;
+        }
+
+        private static void WalkThroughTree(DependencyObject node, DependencyObject excludedNode, Visitor visitor, bool isLast = true)
         {
             if (node != null)
             {
-                visitor.BeginVisitNode(node);
+                // Assume that if we have a UIElement, we'll have some properties
+                visitor.BeginVisitNode(node, node is UIElement);
 
-                WalkThroughProperties(node, visitor);
-                for (int i = 0; i < VisualTreeHelper.GetChildrenCount(node); i++)
+                var childrenCount = VisualTreeHelper.GetChildrenCount(node);
+                WalkThroughProperties(node, visitor, childrenCount != 0);
+                if (childrenCount != 0)
                 {
-                    var child = VisualTreeHelper.GetChild(node, i);
-                    if (child != excludedNode)
+                    visitor.BeginChildren();
+                    for (int i = 0; i < childrenCount; i++)
                     {
-                        WalkThroughTree(child, excludedNode, visitor);
+                        var child = VisualTreeHelper.GetChild(node, i);
+                        if (child != excludedNode)
+                        {
+                            bool isLastChild = (i == childrenCount - 1);
+                            WalkThroughTree(child, excludedNode, visitor, isLastChild);
+                        }
                     }
+                    visitor.EndChildren();
                 }
-
-                visitor.EndVisitNode(node);
+                visitor.EndVisitNode(node, isLast);
             }
         }
     }
@@ -128,8 +176,26 @@ public sealed class DefaultFilter
 
         public DefaultFilter()
         {
-            PropertyNameAllowList = new List<string> {"Foreground", "Background", "Padding", "Margin", "RenderSize", "Visibility", "CornerRadius", "BorderThickness",
-            "Width", "Height", "BorderBrush", "VerticalAlignment", "HorizontalAlignment", "Clip", /*"ActualOffset" 19h1*/};
+            PropertyNameAllowList = new List<string>
+            {
+                "Foreground",
+                "Background",
+                "Padding",
+                "Margin",
+                "RenderSize",
+                "Visibility",
+                "CornerRadius",
+                "BorderThickness",
+                "Width",
+                "Height",
+                "BorderBrush",
+                "VerticalAlignment",
+                "HorizontalAlignment",
+                "Clip",
+                "FlowDirection",
+                "Name",
+                /*"ActualOffset" 19h1*/
+            };
         }
 
         public bool ShouldVisitPropertyValue(string propertyValue)
@@ -142,7 +208,7 @@ public bool ShouldVisitProperty(string propertyName)
             return (PropertyNameAllowList.Contains(propertyName));
         }
     }
-    public sealed class DefaultPropertyValueTranslator
+    public sealed class DefaultPropertyValueTranslator : IPropertyValueTranslator
     {
         public string PropertyValueToString(string propertyName, object propertyObject)
         {
@@ -151,39 +217,48 @@ public string PropertyValueToString(string propertyName, object propertyObject)
                 return "[NULL]";
             }
 
-            var brush = propertyObject as SolidColorBrush;
-            if (brush != null)
+            if (propertyObject is SolidColorBrush)
+            {
+                return (propertyObject as SolidColorBrush).Color.ToString();
+            }
+            else if (propertyObject is Size)
             {
-                return brush.Color.ToString();
+                // comparing doubles is numerically unstable so just compare their integer parts
+                Size size = (Size)propertyObject;
+                return $"{(int)size.Width},{(int)size.Height}";
             }
             return propertyObject.ToString();
         }
     }
-    public sealed class DefaultVisualTreeLogger
-    {
-        public void BeginNode(int indent, string nodeName, DependencyObject obj)
-        {
-            AppendLogger(indent, string.Format("[{0}]", nodeName));
-        }
-
-        public void EndNode(int indent, string nodeName, DependencyObject obj)
-        {
-        }
 
-        public void LogProperty(int indent, string propertyName, object propertyValue)
-        {
-            AppendLogger(indent, string.Format("{0}={1}", propertyName, propertyValue));
-        }
-
-        public override string ToString()
+    public sealed class JsonPropertyValueTranslator : IPropertyValueTranslator
+    {
+        public string PropertyValueToString(string propertyName, object propertyObject)
         {
-            return _logger.ToString();
+            if (propertyObject == null)
+            {
+                return "null";
+            }
+            else if (propertyObject is int || propertyObject is bool || propertyObject is double)
+            {
+                return propertyObject.ToString();
+            }
+            else if (propertyObject is SolidColorBrush)
+            {
+                return Quote((propertyObject as SolidColorBrush).Color.ToString());
+            }
+            else if (propertyObject is Size)
+            {
+                // comparing doubles is numerically unstable so just compare their integer parts
+                Size size = (Size)propertyObject;
+                return $"[{(int)size.Width}, {(int)size.Height}]";
+            }
+            return Quote(propertyObject.ToString());
         }
 
-        private StringBuilder _logger = new StringBuilder();
-        private void AppendLogger(int indent, string s)
+        public static string Quote(string s)
         {
-            _logger.AppendLine(s.PadLeft(2 * indent + s.Length));
+            return '"' + s.Replace("\"", "\\\"") + '"';
         }
     }
 }
diff --git a/vnext/ReactUWP/Views/DynamicAutomationPeer.cpp b/vnext/ReactUWP/Views/DynamicAutomationPeer.cpp
index 38d0c5a0887..2b2ef36bdba 100644
--- a/vnext/ReactUWP/Views/DynamicAutomationPeer.cpp
+++ b/vnext/ReactUWP/Views/DynamicAutomationPeer.cpp
@@ -261,7 +261,7 @@ winrt::hstring DynamicAutomationPeer::GetContentName() const {
 
         for (auto const &child : viewPanel.Children()) {
           if (auto const &textBlock = child.try_as<winrt::TextBlock>()) {
-            name = (name.empty() ? L"" : L" ") + name + textBlock.Text();
+            name = name.empty() ? textBlock.Text() : (L" " + name + textBlock.Text());
           } else if (auto const &stringableName = child.try_as<winrt::IStringable>()) {
             name = (name.empty() ? L"" : L" ") + name + stringableName.ToString();
           }
diff --git a/yarn.lock b/yarn.lock
index b7e701e374d..e50e788d4b8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11080,6 +11080,13 @@ promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
+prompt-sync@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/prompt-sync/-/prompt-sync-4.2.0.tgz#0198f73c5b70e3b03e4b9033a50540a7c9a1d7f4"
+  integrity sha512-BuEzzc5zptP5LsgV5MZETjDaKSWfchl5U9Luiu8SKp7iZWD5tZalOxvNcZRwv+d2phNFr8xlbxmFNcRKfJOzJw==
+  dependencies:
+    strip-ansi "^5.0.0"
+
 prompts@^2.0.1, prompts@^2.3.0, prompts@^2.3.1:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.3.2.tgz#480572d89ecf39566d2bd3fe2c9fccb7c4c0b068"