diff --git a/.gitignore b/.gitignore
index e31828c..5411c96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.idea/
 package-lock.json
 node_modules
 platforms/
diff --git a/.travis.yml b/.travis.yml
index 1a44027..34a3d2b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,7 +49,7 @@ matrix:
       jdk: oraclejdk8
       before_install: nvm install 8.6.0
       script:
-        - npm run ci.android.build
+        - npm run android.build
         - "curl -u $SAUCE_USER:$SAUCE_KEY -X POST -H 'Content-Type: application/octet-stream' $ANDROID_SAUCE_STORAGE --data-binary @$ANDROID_PACKAGE_FOLDER/$ANDROID_PACKAGE"
     - os: osx
       env:
@@ -60,7 +60,7 @@ matrix:
       node_js: "8"
       jdk: oraclejdk8
       script:
-        - npm run ci.ios.build
+        - npm run ios.build
         - cd $IOS_PACKAGE_FOLDER && zip -r $IOS_PACKAGE nativescriptvueuitests.app/ &> /dev/null
         - echo $SAUCE_USER:$SAUCE_KEY
         - "curl -u $SAUCE_USER:$SAUCE_KEY -X POST -H 'Content-Type: application/octet-stream' $IOS_SAUCE_STORAGE --data-binary @$IOS_PACKAGE_FOLDER/$IOS_PACKAGE"
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..0b13651
--- /dev/null
+++ b/README.md
@@ -0,0 +1,22 @@
+# NativeScript-Vue UI tests
+This project uses Appium to test Vue UI components, and also serves as a source for the
+component screenshots at [nativescript-vue.org](https://nativescript-vue.org/).
+
+## System requirements
+* Node 7.6 or higher (for async function support).
+* The [Appium](http://appium.io/) client. Just download and install the latest [from GitHub](https://github.com/appium/appium-desktop/releases/latest).
+
+## Running the tests locally
+Start Appium, or you'll receive an error `127.0.0.1` can't be reached.
+
+### Android
+```bash
+npm run android.build
+npm run android.screenshots
+```
+
+### iOS
+```bash
+npm run ios.build
+npm run ios.screenshots
+```
diff --git a/app/app.css b/app/app.css
new file mode 100644
index 0000000..339b78b
--- /dev/null
+++ b/app/app.css
@@ -0,0 +1,24 @@
+.m-5 {
+    margin: 5;
+}
+
+.m-15 {
+    margin: 15;
+}
+
+.m-20 {
+    margin: 20;
+}
+
+.home-list Button {
+    border-width: 1;
+    border-color: #3e495c;
+    border-radius: 4;
+    margin: 6;
+    font-size: 14;
+    text-transform: none;
+    height: 34;
+    padding: 4 8;
+    color: #fff;
+    background-color: #52617a;
+}
\ No newline at end of file
diff --git a/app/app.js b/app/app.js
index ea8d18b..55e1440 100644
--- a/app/app.js
+++ b/app/app.js
@@ -88,31 +88,29 @@ new Vue({
                 component: () => require('./elements/dialogs/Confirm')
             },
             {
-              name: 'LoginDialog',
-              component: () => require('./elements/dialogs/Login')
+                name: 'LoginDialog',
+                component: () => require('./elements/dialogs/Login')
             },
             {
-              name: 'PromptDialog',
-              component: () => require('./elements/dialogs/Prompt')
+                name: 'PromptDialog',
+                component: () => require('./elements/dialogs/Prompt')
             },
         ]
     },
 
 
     methods: {
-        showElement(e) {
-            const element = e.item;
+        showElement(element) {
             this.$navigateTo(element.component())
         }
     },
 
     template: `
         <Page>
-            <ListView for="el in elements" @itemTap="showElement">
-                <v-template>
-                    <Label :text="el.name" style="font-size: 15;" />
-                </v-template>
-            </ListView>
+            <ActionBar title="Home"></ActionBar>
+            <WrapLayout class="m-5 home-list">
+                <Button :text="el.name" v-for="el in elements" @tap="showElement(el)" />
+            </WrapLayout>
         </Page>
     `,
 }).$start();
\ No newline at end of file
diff --git a/app/elements/components/ActivityIndicator.js b/app/elements/components/ActivityIndicator.js
index bb1f160..24685a4 100644
--- a/app/elements/components/ActivityIndicator.js
+++ b/app/elements/components/ActivityIndicator.js
@@ -1,6 +1,6 @@
 module.exports = {
     template: `
-        <StackLayout>
+        <StackLayout class="m-20">
             <ActivityIndicator busy="true"/>
         </StackLayout>
     `
diff --git a/app/elements/components/Button.js b/app/elements/components/Button.js
index acd866b..39338ec 100644
--- a/app/elements/components/Button.js
+++ b/app/elements/components/Button.js
@@ -1,6 +1,6 @@
 module.exports = {
     template: `
-        <StackLayout>
+        <StackLayout class="m-20">
             <Button text="Button"/>
         </StackLayout>
     `
diff --git a/app/elements/components/DatePicker.js b/app/elements/components/DatePicker.js
index 38311a6..92e7bba 100644
--- a/app/elements/components/DatePicker.js
+++ b/app/elements/components/DatePicker.js
@@ -1,6 +1,6 @@
 module.exports = {
     template: `
-        <StackLayout>
+        <StackLayout class="m-20">
             <DatePicker/>
         </StackLayout>
     `
diff --git a/app/elements/components/HtmlView.js b/app/elements/components/HtmlView.js
index 8e1dfed..bccda0d 100644
--- a/app/elements/components/HtmlView.js
+++ b/app/elements/components/HtmlView.js
@@ -1,6 +1,6 @@
 module.exports = {
     template: `
-        <StackLayout>
+        <StackLayout class="m-20">
             <HtmlView :html="html"/>
         </StackLayout>
     `,
diff --git a/app/elements/components/Image.js b/app/elements/components/Image.js
index 4c5cebf..0636d83 100644
--- a/app/elements/components/Image.js
+++ b/app/elements/components/Image.js
@@ -1,6 +1,6 @@
 module.exports = {
     template: `
-        <GridLayout rows="auto">
+        <GridLayout rows="auto" class="m-20">
             <Image src="res://icon" stretch="none"/>
         </GridLayout>
     `
diff --git a/app/elements/components/Label.js b/app/elements/components/Label.js
index b76caf5..8067dbc 100644
--- a/app/elements/components/Label.js
+++ b/app/elements/components/Label.js
@@ -1,6 +1,6 @@
 module.exports = {
     template: `
-        <StackLayout>
+        <StackLayout class="m-20">
             <Label text="Label"/>
         </StackLayout>
     `
diff --git a/app/elements/components/ListPicker.js b/app/elements/components/ListPicker.js
index e527b1a..2cf2dd7 100644
--- a/app/elements/components/ListPicker.js
+++ b/app/elements/components/ListPicker.js
@@ -1,6 +1,6 @@
 module.exports = {
     template: `
-        <StackLayout>
+        <StackLayout class="m-20">
             <ListPicker :items="items"></ListPicker>
         </StackLayout>
     `,
diff --git a/app/elements/components/ListView.js b/app/elements/components/ListView.js
index 956330c..73dd8f1 100644
--- a/app/elements/components/ListView.js
+++ b/app/elements/components/ListView.js
@@ -2,7 +2,7 @@ module.exports = {
     template: `
         <ListView for="item in items">
             <v-template>
-                <Label :text="item.text"/>
+                <Label :text="item.text" class="m-15"/>
             </v-template>
         </ListView>
     `,
diff --git a/app/elements/components/Progress.js b/app/elements/components/Progress.js
index 8f662d5..87c70ef 100644
--- a/app/elements/components/Progress.js
+++ b/app/elements/components/Progress.js
@@ -1,7 +1,7 @@
 module.exports = {
     template: `
         <StackLayout>
-            <Progress value="50"/>
+            <Progress value="20" maxValue="50"/>
         </StackLayout>
     `
 };
\ No newline at end of file
diff --git a/app/elements/components/SegmentedBar.js b/app/elements/components/SegmentedBar.js
index 43b9ab2..31f21da 100644
--- a/app/elements/components/SegmentedBar.js
+++ b/app/elements/components/SegmentedBar.js
@@ -1,6 +1,6 @@
 module.exports = {
     template: `
-        <StackLayout>
+        <StackLayout class="m-20">
             <SegmentedBar>
                 <SegmentedBarItem title="First" />
                 <SegmentedBarItem title="Second" />
diff --git a/app/elements/components/Slider.js b/app/elements/components/Slider.js
index a5424b8..cd494ec 100644
--- a/app/elements/components/Slider.js
+++ b/app/elements/components/Slider.js
@@ -1,7 +1,7 @@
 module.exports = {
     template: `
-        <StackLayout>
-            <Slider value="50"/>
+        <StackLayout class="m-20">
+            <Slider value="60"/>
         </StackLayout>
     `
 };
\ No newline at end of file
diff --git a/app/elements/components/Switch.js b/app/elements/components/Switch.js
index cb2bc19..e3303cf 100644
--- a/app/elements/components/Switch.js
+++ b/app/elements/components/Switch.js
@@ -1,7 +1,7 @@
 module.exports = {
     template: `
-        <StackLayout>
-            <Switch />
+        <StackLayout class="m-20">
+            <Switch checked="true"/>
         </StackLayout>
     `
 };
\ No newline at end of file
diff --git a/app/elements/components/TextField.js b/app/elements/components/TextField.js
index 3b22123..ee25b9d 100644
--- a/app/elements/components/TextField.js
+++ b/app/elements/components/TextField.js
@@ -1,6 +1,6 @@
 module.exports = {
     template: `
-        <StackLayout>
+        <StackLayout class="m-20">
             <TextField text="TextField" />
         </StackLayout>
     `
diff --git a/app/elements/components/TextView.js b/app/elements/components/TextView.js
index b8fb7d4..58c7e40 100644
--- a/app/elements/components/TextView.js
+++ b/app/elements/components/TextView.js
@@ -1,6 +1,6 @@
 module.exports = {
     template: `
-        <StackLayout>
+        <StackLayout class="m-20">
             <TextView text="TextView\nHas\nMultiple\nLines" />
         </StackLayout>
     `
diff --git a/app/elements/components/TimePicker.js b/app/elements/components/TimePicker.js
index 138c9c1..1eec9a3 100644
--- a/app/elements/components/TimePicker.js
+++ b/app/elements/components/TimePicker.js
@@ -1,6 +1,6 @@
 module.exports = {
     template: `
-        <StackLayout>
+        <StackLayout class="m-20">
             <TimePicker />
         </StackLayout>
     `
diff --git a/app/elements/dialogs/Action.js b/app/elements/dialogs/Action.js
index b65b897..9fc4118 100644
--- a/app/elements/dialogs/Action.js
+++ b/app/elements/dialogs/Action.js
@@ -1,7 +1,7 @@
-const dialogs = require('ui/dialogs');
+const dialogs = require('tns-core-modules/ui/dialogs');
 
 module.exports = {
-  mounted() {
-    dialogs.action('Choose one!', 'Or cancel...', ['cheese', 'wine'])
-  }
+    mounted() {
+        setTimeout(() => dialogs.action('Choose one!', 'Or cancel...', ['cheese', 'wine']))
+    }
 };
\ No newline at end of file
diff --git a/app/elements/dialogs/Alert.js b/app/elements/dialogs/Alert.js
index 6858902..9c5fd34 100644
--- a/app/elements/dialogs/Alert.js
+++ b/app/elements/dialogs/Alert.js
@@ -1,7 +1,7 @@
-const dialogs = require('ui/dialogs');
+const dialogs = require('tns-core-modules/ui/dialogs');
 
 module.exports = {
-  mounted() {
-    dialogs.alert('Hello!')
-  }
+    mounted() {
+        setTimeout(() => dialogs.alert('Hello!'))
+    }
 };
\ No newline at end of file
diff --git a/app/elements/dialogs/Confirm.js b/app/elements/dialogs/Confirm.js
index 3057646..f5c9b3a 100644
--- a/app/elements/dialogs/Confirm.js
+++ b/app/elements/dialogs/Confirm.js
@@ -1,7 +1,7 @@
-const dialogs = require('ui/dialogs');
+const dialogs = require('tns-core-modules/ui/dialogs');
 
 module.exports = {
-  mounted() {
-    dialogs.confirm('Are you ready?')
-  }
+    mounted() {
+        setTimeout(() => dialogs.confirm('Are you ready?'))
+    }
 };
\ No newline at end of file
diff --git a/app/elements/dialogs/Login.js b/app/elements/dialogs/Login.js
index 4c97fb0..639d262 100644
--- a/app/elements/dialogs/Login.js
+++ b/app/elements/dialogs/Login.js
@@ -1,7 +1,7 @@
-const dialogs = require('ui/dialogs');
+const dialogs = require('tns-core-modules/ui/dialogs');
 
 module.exports = {
-  mounted() {
-    dialogs.login('Please log in', 'Username', 'Password')
-  }
+    mounted() {
+        setTimeout(() => dialogs.login('Please log in', 'Username', 'Password'))
+    }
 };
\ No newline at end of file
diff --git a/app/elements/dialogs/Prompt.js b/app/elements/dialogs/Prompt.js
index 9048880..87cd8a5 100644
--- a/app/elements/dialogs/Prompt.js
+++ b/app/elements/dialogs/Prompt.js
@@ -1,7 +1,7 @@
-const dialogs = require('ui/dialogs');
+const dialogs = require('tns-core-modules/ui/dialogs');
 
 module.exports = {
-  mounted() {
-    dialogs.prompt('How are you?', 'Amazing!')
-  }
+    mounted() {
+        setTimeout(() => dialogs.prompt('How are you?', 'Amazing!'))
+    }
 };
\ No newline at end of file
diff --git a/appium.capabilities.json b/appium.capabilities.json
index 26d842e..b9206ed 100644
--- a/appium.capabilities.json
+++ b/appium.capabilities.json
@@ -1,17 +1,17 @@
 {
   "android23": {
-    "browserName": "",
     "platformName": "Android",
     "platformVersion": "6.0",
     "deviceName": "Android Emulator",
     "noReset": false,
-    "app": ""
+    "appPackage": "org.nativescript.nativescriptvueuitests",
+    "appActivity": "com.tns.NativeScriptActivity"
   },
   "ios-simulator103iPhone6": {
-    "browserName": "",
     "platformName": "iOS",
     "platformVersion": "10.3",
-    "deviceName": "iPhone 6 Simulator",
+    "deviceName": "iPhone Simulator",
+    "bundleId": "org.nativescript.nativescriptvueuitests",
     "app": ""
   }
 }
\ No newline at end of file
diff --git a/generate-screenshots.js b/generate-screenshots.js
index 5f33afe..0b3b2bf 100644
--- a/generate-screenshots.js
+++ b/generate-screenshots.js
@@ -1,82 +1,103 @@
 const argv = require('yargs').argv;
-const AppiumDriver = require('nativescript-dev-appium/lib/appium-driver').AppiumDriver;
+const AppiumDriver = require('nativescript-dev-appium').AppiumDriver;
 const fs = require('fs');
 
 const components = [
-  'ActivityIndicator',
-  'Button',
-  'DatePicker',
-  'HtmlView',
-  'Image',
-  'Label',
-  'ListPicker',
-  'ListView',
-  'Progress',
-  'SearchBar',
-  'SegmentedBar',
-  'Slider',
-  'Switch',
-  'TabView',
-  'TextField',
-  'TextView',
-  'TimePicker',
-  'WebView',
-  'ActionDialog',
-  'AlertDialog',
-  'ConfirmDialog',
-  'LoginDialog',
-  'PromptDialog',
+    'ActivityIndicator',
+    'Button',
+    'DatePicker',
+    'HtmlView',
+    'Image',
+    'Label',
+    'ListPicker',
+    'ListView',
+    'Progress',
+    'SearchBar',
+    'SegmentedBar',
+    'Slider',
+    'Switch',
+    'TabView',
+    'TextField',
+    'TextView',
+    'TimePicker',
+    'WebView',
+    'ActionDialog',
+    'AlertDialog',
+    'ConfirmDialog',
+    'LoginDialog',
+    'PromptDialog',
 ];
 
 const makeDir = (path) => {
-  if (!fs.existsSync(path)) {
-    fs.mkdirSync(path);
-  }
+    if (!fs.existsSync(path)) {
+        fs.mkdirSync(path);
+    }
 };
 
 (async function () {
-  makeDir('screenshots');
-  makeDir(`screenshots/${argv.runType}`);
+    makeDir('screenshots');
+    makeDir(`screenshots/${argv.runType}`);
 
-  AppiumDriver.createAppiumDriver(4723, {
-    isSauceLab: argv.sauceLab || false,
-    runType: argv.runType,
-    appPath: argv.appPath, //'nativescriptvueuitests-debug.apk',
-    appiumCaps: require('./appium.capabilities.json')[argv.runType],
-    verbose: argv.verbose || false,
-  })
-    .then(driver => run(driver))
-    .then(() => console.log('Buh-Bye...'))
-    .catch((err) => console.log(err));
+    AppiumDriver.createAppiumDriver(4723, {
+        isSauceLab: argv.sauceLab || false,
+        runType: argv.runType,
+        appPath: argv.appPath, //'nativescriptvueuitests-debug.apk',
+        appiumCaps: require('./appium.capabilities.json')[argv.runType],
+        verbose: argv.verbose || false,
+    })
+        .then(driver => run(driver))
+        .then(() => console.log('Buh-Bye...'))
+        .catch((err) => console.log(err));
 })();
 
 const run = async (driver) => {
-  for (let component of components) {
-    await screenshotComponent(driver, component)
-  }
-  await driver.quit();
+    for (let component of components) {
+        await screenshotComponent(driver, component)
+    }
+    await driver.quit();
 };
 
 const screenshotComponent = async (driver, component) => {
-  console.log(`[${argv.runType}] >>>>> ${component} >>>>>`);
+    console.log(`[${argv.runType}] >>>>> ${component} >>>>>`);
 
-  const listItem = await driver.findElementByText(component);
-  await listItem.tap();
+    const isIOS = argv.runType.toLowerCase().indexOf("ios") > -1;
 
-  await driver._driver.sleep(1000);
+    let listItem;
+    if (isIOS) {
+        listItem = await driver.findElementByText(component);
+    } else {
+        listItem = await driver.findElementByXPath(`//*[contains(@text,'${component}')]`);
+    }
 
-  if (component === 'HtmlView' || component === 'WebView') {
-    await driver._driver.sleep(4000);
-  }
+    await listItem.tap();
 
-  await driver.takeScreenshot(`screenshots/${argv.runType}/${component}.png`);
-  await driver.navBack();
+    await driver._driver.sleep(1000);
 
-  if(component.includes('Dialog')) {
-    await driver.navBack();
-  }
+    if (component === 'HtmlView' || component === 'WebView') {
+        await driver._driver.sleep(4000);
+    }
+
+    await driver.takeScreenshot(`screenshots/${argv.runType}/${component}.png`);
+
+    if (component.includes('Dialog')) {
+        if (isIOS) {
+            await driver._driver.sleep(1000);
+            const button = component === "ActionDialog" ? "cancel" : "OK";
+            const dialogItem = await driver.findElementByText(button, 1); // 1 = 'contains'
+            if (dialogItem) {
+                dialogItem.tap();
+                await driver._driver.sleep(1500);
+            } else {
+                console.log("Could not find button to dismiss the dialog!");
+            }
+        } else {
+            await driver.navBack();
+        }
+    }
 
-  if (component === 'SearchBar' && argv.runType.toLowerCase().indexOf('android') > -1) {
     await driver.navBack();
-  }
+
+    if (component === 'SearchBar' && argv.runType.toLowerCase().indexOf('android') > -1) {
+        await driver.navBack();
+    }
 };
\ No newline at end of file
diff --git a/package.json b/package.json
index 0756f42..3c129a7 100644
--- a/package.json
+++ b/package.json
@@ -5,27 +5,30 @@
   "repository": "<fill-your-repository-here>",
   "nativescript": {
     "id": "org.nativescript.nativescriptvueuitests",
-    "tns-android": {
-      "version": "3.4.0"
-    },
     "tns-ios": {
-      "version": "3.4.0"
+      "version": "3.4.1"
+    },
+    "tns-android": {
+      "version": "3.4.1"
     }
   },
   "dependencies": {
     "appium": "^1.7.1",
     "nativescript-dev-appium": "^3.1.0-2017-10-6-1",
-    "nativescript-vue": "^0.7.10",
-    "tns-core-modules": "^3.4.0",
+    "nativescript-vue": "^1.0.0",
+    "tns-core-modules": "~3.4.0",
     "yargs": "^9.0.1"
   },
   "scripts": {
     "appium": "node generate-screenshots.js",
-    "ci.android.build": "tns build android",
-    "ci.android.screenshots": "npm run appium --runtype=android23 --sauceLab=true",
-    "ci.ios.build": "tns build ios",
-    "ci.ios.screenshots": "npm run appium --runtype=ios-simulator103iPhone6 --sauceLab=true",
-    "deploy": "bash deploy.sh"
+    "android.build": "tns build android",
+    "android.screenshots": "npm run appium -- --runType=android23",
+    "ci.android.screenshots": "npm run appium -- --runType=android23 --sauceLab=true",
+    "ci.ios.screenshots": "npm run appium -- --runType=ios-simulator103iPhone6",
+    "deploy": "bash deploy.sh",
+    "e2e": "mocha --opts ./e2e/config/mocha.opts",
+    "ios.build": "tns build ios",
+    "ios.screenshots": "npm run appium -- --runType=ios-simulator103iPhone6 --sauceLab=true"
   },
   "devDependencies": {
     "babel-traverse": "6.26.0",
@@ -33,4 +36,4 @@
     "babylon": "6.18.0",
     "lazy": "1.0.11"
   }
-}
\ No newline at end of file
+}
diff --git a/screenshots/android23/ActionDialog.png b/screenshots/android23/ActionDialog.png
new file mode 100644
index 0000000..3e1a1f7
Binary files /dev/null and b/screenshots/android23/ActionDialog.png differ
diff --git a/screenshots/android23/ActivityIndicator.png b/screenshots/android23/ActivityIndicator.png
index 648c2ab..d8cce25 100644
Binary files a/screenshots/android23/ActivityIndicator.png and b/screenshots/android23/ActivityIndicator.png differ
diff --git a/screenshots/android23/AlertDialog.png b/screenshots/android23/AlertDialog.png
new file mode 100644
index 0000000..02a206c
Binary files /dev/null and b/screenshots/android23/AlertDialog.png differ
diff --git a/screenshots/android23/Button.png b/screenshots/android23/Button.png
index 9496a1d..a5a4773 100644
Binary files a/screenshots/android23/Button.png and b/screenshots/android23/Button.png differ
diff --git a/screenshots/android23/ConfirmDialog.png b/screenshots/android23/ConfirmDialog.png
new file mode 100644
index 0000000..0514129
Binary files /dev/null and b/screenshots/android23/ConfirmDialog.png differ
diff --git a/screenshots/android23/DatePicker.png b/screenshots/android23/DatePicker.png
index 5567762..d7ff5d0 100644
Binary files a/screenshots/android23/DatePicker.png and b/screenshots/android23/DatePicker.png differ
diff --git a/screenshots/android23/HtmlView.png b/screenshots/android23/HtmlView.png
index f554054..f9ba0c8 100644
Binary files a/screenshots/android23/HtmlView.png and b/screenshots/android23/HtmlView.png differ
diff --git a/screenshots/android23/Image.png b/screenshots/android23/Image.png
index 5c29559..b31609d 100644
Binary files a/screenshots/android23/Image.png and b/screenshots/android23/Image.png differ
diff --git a/screenshots/android23/Label.png b/screenshots/android23/Label.png
index 7204dc4..fce381b 100644
Binary files a/screenshots/android23/Label.png and b/screenshots/android23/Label.png differ
diff --git a/screenshots/android23/ListPicker.png b/screenshots/android23/ListPicker.png
index cb93e47..4b3ba22 100644
Binary files a/screenshots/android23/ListPicker.png and b/screenshots/android23/ListPicker.png differ
diff --git a/screenshots/android23/ListView.png b/screenshots/android23/ListView.png
index 8d1b113..f13cff5 100644
Binary files a/screenshots/android23/ListView.png and b/screenshots/android23/ListView.png differ
diff --git a/screenshots/android23/LoginDialog.png b/screenshots/android23/LoginDialog.png
new file mode 100644
index 0000000..4517f55
Binary files /dev/null and b/screenshots/android23/LoginDialog.png differ
diff --git a/screenshots/android23/Progress.png b/screenshots/android23/Progress.png
index f16904a..276bf92 100644
Binary files a/screenshots/android23/Progress.png and b/screenshots/android23/Progress.png differ
diff --git a/screenshots/android23/PromptDialog.png b/screenshots/android23/PromptDialog.png
new file mode 100644
index 0000000..1f639df
Binary files /dev/null and b/screenshots/android23/PromptDialog.png differ
diff --git a/screenshots/android23/SearchBar.png b/screenshots/android23/SearchBar.png
index c05aedb..e1e6450 100644
Binary files a/screenshots/android23/SearchBar.png and b/screenshots/android23/SearchBar.png differ
diff --git a/screenshots/android23/SegmentedBar.png b/screenshots/android23/SegmentedBar.png
index c8277ab..900ba94 100644
Binary files a/screenshots/android23/SegmentedBar.png and b/screenshots/android23/SegmentedBar.png differ
diff --git a/screenshots/android23/Slider.png b/screenshots/android23/Slider.png
index 00d8a71..8ad8dd0 100644
Binary files a/screenshots/android23/Slider.png and b/screenshots/android23/Slider.png differ
diff --git a/screenshots/android23/Switch.png b/screenshots/android23/Switch.png
index 4e21180..540a444 100644
Binary files a/screenshots/android23/Switch.png and b/screenshots/android23/Switch.png differ
diff --git a/screenshots/android23/TabView.png b/screenshots/android23/TabView.png
index 1befe3e..bf9c45a 100644
Binary files a/screenshots/android23/TabView.png and b/screenshots/android23/TabView.png differ
diff --git a/screenshots/android23/TextField.png b/screenshots/android23/TextField.png
index ff2ef94..007fece 100644
Binary files a/screenshots/android23/TextField.png and b/screenshots/android23/TextField.png differ
diff --git a/screenshots/android23/TextView.png b/screenshots/android23/TextView.png
index 3363038..869683e 100644
Binary files a/screenshots/android23/TextView.png and b/screenshots/android23/TextView.png differ
diff --git a/screenshots/android23/TimePicker.png b/screenshots/android23/TimePicker.png
index 77180c4..0efbf56 100644
Binary files a/screenshots/android23/TimePicker.png and b/screenshots/android23/TimePicker.png differ
diff --git a/screenshots/android23/WebView.png b/screenshots/android23/WebView.png
index 0a3d193..f39bef0 100644
Binary files a/screenshots/android23/WebView.png and b/screenshots/android23/WebView.png differ
diff --git a/screenshots/ios-simulator103iPhone6/ActionDialog.png b/screenshots/ios-simulator103iPhone6/ActionDialog.png
new file mode 100644
index 0000000..1f8fecf
Binary files /dev/null and b/screenshots/ios-simulator103iPhone6/ActionDialog.png differ
diff --git a/screenshots/ios-simulator103iPhone6/ActivityIndicator.png b/screenshots/ios-simulator103iPhone6/ActivityIndicator.png
index f75d56f..bae0bbe 100644
Binary files a/screenshots/ios-simulator103iPhone6/ActivityIndicator.png and b/screenshots/ios-simulator103iPhone6/ActivityIndicator.png differ
diff --git a/screenshots/ios-simulator103iPhone6/AlertDialog.png b/screenshots/ios-simulator103iPhone6/AlertDialog.png
new file mode 100644
index 0000000..f5c1298
Binary files /dev/null and b/screenshots/ios-simulator103iPhone6/AlertDialog.png differ
diff --git a/screenshots/ios-simulator103iPhone6/Button.png b/screenshots/ios-simulator103iPhone6/Button.png
index 1407845..edf16c6 100644
Binary files a/screenshots/ios-simulator103iPhone6/Button.png and b/screenshots/ios-simulator103iPhone6/Button.png differ
diff --git a/screenshots/ios-simulator103iPhone6/ConfirmDialog.png b/screenshots/ios-simulator103iPhone6/ConfirmDialog.png
new file mode 100644
index 0000000..6996c7a
Binary files /dev/null and b/screenshots/ios-simulator103iPhone6/ConfirmDialog.png differ
diff --git a/screenshots/ios-simulator103iPhone6/DatePicker.png b/screenshots/ios-simulator103iPhone6/DatePicker.png
index 36ad103..f9c906a 100644
Binary files a/screenshots/ios-simulator103iPhone6/DatePicker.png and b/screenshots/ios-simulator103iPhone6/DatePicker.png differ
diff --git a/screenshots/ios-simulator103iPhone6/HtmlView.png b/screenshots/ios-simulator103iPhone6/HtmlView.png
index 6ec6b8b..1fa9c1c 100644
Binary files a/screenshots/ios-simulator103iPhone6/HtmlView.png and b/screenshots/ios-simulator103iPhone6/HtmlView.png differ
diff --git a/screenshots/ios-simulator103iPhone6/Image.png b/screenshots/ios-simulator103iPhone6/Image.png
index e196045..9da3e91 100644
Binary files a/screenshots/ios-simulator103iPhone6/Image.png and b/screenshots/ios-simulator103iPhone6/Image.png differ
diff --git a/screenshots/ios-simulator103iPhone6/Label.png b/screenshots/ios-simulator103iPhone6/Label.png
index 40a6242..9f61ab8 100644
Binary files a/screenshots/ios-simulator103iPhone6/Label.png and b/screenshots/ios-simulator103iPhone6/Label.png differ
diff --git a/screenshots/ios-simulator103iPhone6/ListPicker.png b/screenshots/ios-simulator103iPhone6/ListPicker.png
index 558116c..cdf23f4 100644
Binary files a/screenshots/ios-simulator103iPhone6/ListPicker.png and b/screenshots/ios-simulator103iPhone6/ListPicker.png differ
diff --git a/screenshots/ios-simulator103iPhone6/ListView.png b/screenshots/ios-simulator103iPhone6/ListView.png
index 35a11c0..cec5bd2 100644
Binary files a/screenshots/ios-simulator103iPhone6/ListView.png and b/screenshots/ios-simulator103iPhone6/ListView.png differ
diff --git a/screenshots/ios-simulator103iPhone6/LoginDialog.png b/screenshots/ios-simulator103iPhone6/LoginDialog.png
new file mode 100644
index 0000000..1671262
Binary files /dev/null and b/screenshots/ios-simulator103iPhone6/LoginDialog.png differ
diff --git a/screenshots/ios-simulator103iPhone6/Progress.png b/screenshots/ios-simulator103iPhone6/Progress.png
index dfd9138..88540f7 100644
Binary files a/screenshots/ios-simulator103iPhone6/Progress.png and b/screenshots/ios-simulator103iPhone6/Progress.png differ
diff --git a/screenshots/ios-simulator103iPhone6/PromptDialog.png b/screenshots/ios-simulator103iPhone6/PromptDialog.png
new file mode 100644
index 0000000..7173f78
Binary files /dev/null and b/screenshots/ios-simulator103iPhone6/PromptDialog.png differ
diff --git a/screenshots/ios-simulator103iPhone6/SearchBar.png b/screenshots/ios-simulator103iPhone6/SearchBar.png
index 16eea07..d2f1cae 100644
Binary files a/screenshots/ios-simulator103iPhone6/SearchBar.png and b/screenshots/ios-simulator103iPhone6/SearchBar.png differ
diff --git a/screenshots/ios-simulator103iPhone6/SegmentedBar.png b/screenshots/ios-simulator103iPhone6/SegmentedBar.png
index efc411c..8591c24 100644
Binary files a/screenshots/ios-simulator103iPhone6/SegmentedBar.png and b/screenshots/ios-simulator103iPhone6/SegmentedBar.png differ
diff --git a/screenshots/ios-simulator103iPhone6/Slider.png b/screenshots/ios-simulator103iPhone6/Slider.png
index e1fdd14..f4346ea 100644
Binary files a/screenshots/ios-simulator103iPhone6/Slider.png and b/screenshots/ios-simulator103iPhone6/Slider.png differ
diff --git a/screenshots/ios-simulator103iPhone6/Switch.png b/screenshots/ios-simulator103iPhone6/Switch.png
index 2f7d7c8..17956e6 100644
Binary files a/screenshots/ios-simulator103iPhone6/Switch.png and b/screenshots/ios-simulator103iPhone6/Switch.png differ
diff --git a/screenshots/ios-simulator103iPhone6/TabView.png b/screenshots/ios-simulator103iPhone6/TabView.png
index 0ad611a..1694f0e 100644
Binary files a/screenshots/ios-simulator103iPhone6/TabView.png and b/screenshots/ios-simulator103iPhone6/TabView.png differ
diff --git a/screenshots/ios-simulator103iPhone6/TextField.png b/screenshots/ios-simulator103iPhone6/TextField.png
index 3d6e5ef..afba88e 100644
Binary files a/screenshots/ios-simulator103iPhone6/TextField.png and b/screenshots/ios-simulator103iPhone6/TextField.png differ
diff --git a/screenshots/ios-simulator103iPhone6/TextView.png b/screenshots/ios-simulator103iPhone6/TextView.png
index cffb8d5..3d6965f 100644
Binary files a/screenshots/ios-simulator103iPhone6/TextView.png and b/screenshots/ios-simulator103iPhone6/TextView.png differ
diff --git a/screenshots/ios-simulator103iPhone6/TimePicker.png b/screenshots/ios-simulator103iPhone6/TimePicker.png
index 21e4c11..182c906 100644
Binary files a/screenshots/ios-simulator103iPhone6/TimePicker.png and b/screenshots/ios-simulator103iPhone6/TimePicker.png differ
diff --git a/screenshots/ios-simulator103iPhone6/WebView.png b/screenshots/ios-simulator103iPhone6/WebView.png
index 09d27a1..90a5fef 100644
Binary files a/screenshots/ios-simulator103iPhone6/WebView.png and b/screenshots/ios-simulator103iPhone6/WebView.png differ