diff --git a/.circleci/config.yml b/.circleci/config.yml
index 10d516f594..16c40c66b9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,4 +1,6 @@
-version: 2
+version: 2.1
+orbs:
+  codecov: codecov/codecov@1.0.2
 jobs:
   build:
     docker:
@@ -6,4 +8,6 @@ jobs:
     steps:
     - checkout
     - run: flutter --version
-    - run: flutter test
\ No newline at end of file
+    - run: flutter test --coverage
+    - codecov/upload:
+        file: coverage/lcov.info
diff --git a/.github/flutter_html_screenshot.png b/.github/flutter_html_screenshot.png
index dabafb0807..d8ecc1ac28 100644
Binary files a/.github/flutter_html_screenshot.png and b/.github/flutter_html_screenshot.png differ
diff --git a/.github/flutter_html_screenshot2.png b/.github/flutter_html_screenshot2.png
new file mode 100644
index 0000000000..dae0da9143
Binary files /dev/null and b/.github/flutter_html_screenshot2.png differ
diff --git a/.github/flutter_html_screenshot3.png b/.github/flutter_html_screenshot3.png
new file mode 100644
index 0000000000..75a065879d
Binary files /dev/null and b/.github/flutter_html_screenshot3.png differ
diff --git a/.gitignore b/.gitignore
index 6668947c28..faea8257c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -146,3 +146,5 @@ modules.xml
 # End of https://www.gitignore.io/api/flutter,jetbrains+all
 
 **/.flutter-plugins-dependencies
+
+**/flutter_export_environment.sh
diff --git a/.metadata b/.metadata
new file mode 100644
index 0000000000..45789c722a
--- /dev/null
+++ b/.metadata
@@ -0,0 +1,10 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled and should not be manually edited.
+
+version:
+  revision: 20e59316b8b8474554b38493b8ca888794b0234a
+  channel: stable
+
+project_type: package
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51bd0eb420..1c20251fd6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,33 @@
+# [1.0.0]
+* BREAKING CHANGES (see the [Migration Guide](https://github.com/Sub6Resources/flutter_html/wiki/1.0.0-Migration-Guide) for a full overview of breaking changes.):
+  * The default parser has been completely rewritten and the RichText parser has been removed.
+  * `useRichText` no longer is necessary (The new parser uses RichText under the hood)
+  * `customRender` now works for the default parser.
+* Adds support for `<audio>`, `<video>`, `<iframe>`, `<svg>`, `<ruby>`, `<rt>`, `<rp>`, `<sub>`, and `<sup>`
+* Adds support for over 20 CSS attributes when using the `style` parameter.
+* Fixes many many issues (see the list at [#122](https://github.com/Sub6Resources/flutter_html/pull/122))
+* The following parameters of `Html` have been removed and should no longer be used (see the migration guide):
+  * `useRichText`
+  * `padding`
+  * `backgroundColor`
+  * `defaultTextStyle`
+  * `renderNewlines`
+  * `customEdgeInsets`
+  * `customTextStyle`
+  * `blockSpacing`
+  * `customTextAlign`
+  * `linkStyle`
+  * `imageProperties`
+  * `showImages`
+* The default text style now matches the app's Material `TextTheme.bodyText2` (Fixes [#18](https://github.com/Sub6Resources/flutter_html/issues/18)).
+* Requires Flutter v1.17.0 or greater
+* Fixed quite a few issues with `img`
+* Added a fancy new `style` attribute (this should be used in place of the deprecated styling parameters).
+
+## [1.0.0-pre.1] - December 27, 2019
+
+* For a list of pre-release changes, including several BREAKING CHANGES, see release notes for 1.0.0 above.
+
 ## [0.11.1] - December 14, 2019:
 
 * Add support for `AssetImage`s using the `asset:` prefix ([#162](https://github.com/Sub6Resources/flutter_html/pull/162)).
@@ -42,7 +72,6 @@
 * Add support for `address` tag in `RichText` parser.
 
 ## [0.9.7] - May 13, 2019:
-
 * Added onImageError callback
 * Added custom textstyle and edgeinsets callback ([#72](https://github.com/Sub6Resources/flutter_html/pull/72))
 * Update dependency versions ([#84](https://github.com/Sub6Resources/flutter_html/issues/84))
diff --git a/README.md b/README.md
index 1749999edd..241bb9d509 100644
--- a/README.md
+++ b/README.md
@@ -1,119 +1,72 @@
 # flutter_html
 [![pub package](https://img.shields.io/pub/v/flutter_html.svg)](https://pub.dev/packages/flutter_html)
+[![codecov](https://codecov.io/gh/Sub6Resources/flutter_html/branch/master/graph/badge.svg)](https://codecov.io/gh/Sub6Resources/flutter_html)
 [![CircleCI](https://circleci.com/gh/Sub6Resources/flutter_html.svg?style=svg)](https://circleci.com/gh/Sub6Resources/flutter_html)
+[![MIT License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat)](https://github.com/Sub6Resources/flutter_html/blob/master/LICENSE)
 
-> **Note: 1.0.0-pre.1 has been released! See the [Migration Guide](https://github.com/Sub6Resources/flutter_html/wiki/1.0.0-Migration-Guide) if you'd like to take advantage of all the new features of 1.0.0! Also, check out the [Prerelease Changelog](https://github.com/Sub6Resources/flutter_html/blob/new-parser/PRE_CHANGELOG.md).** Version 1.0.0 is currently on the `new-parser` branch. This README will be updated when 1.0.0 is merged into the master branch.
-
-A Flutter widget for rendering static html tags as Flutter widgets. (Will render over 70 different html tags!)
+A Flutter widget for rendering html and css as Flutter widgets.
 
 <img alt="A Screenshot of flutter_html" src=".github/flutter_html_screenshot.png" width="300"/>
+<img alt="Another Screenshot of flutter_html" src=".github/flutter_html_screenshot2.png" width="300"/>
+<img alt="Yet another Screenshot of flutter_html" src=".github/flutter_html_screenshot3.png" width="300"/>
 
 ## Installing:
 
 Add the following to your `pubspec.yaml` file:
 
     dependencies:
-      flutter_html: ^0.11.1
+      flutter_html: ^1.0.0-pre.1
 
 ## Currently Supported HTML Tags:
 `a`, `abbr`, `acronym`, `address`, `article`, `aside`, `b`, `bdi`, `bdo`, `big`, `blockquote`, `body`, `br`, `caption`, `cite`, `code`, `data`, `dd`, `del`, `dfn`, `div`, `dl`, `dt`, `em`, `figcaption`, `figure`, `footer`, `h1`, `h2`, `h3`, `h4`, `h5`, `h6`, `header`, `hr`, `i`, `img`, `ins`, `kbd`, `li`, `main`, `mark`, `nav`, `noscript`, `ol`, `p`, `pre`, `q`, `rp`, `rt`, `ruby`, `s`, `samp`, `section`, `small`, `span`, `strike`, `strong`, `sub`, `sup`, `table`, `tbody`, `td`, `template`, `tfoot`, `th`, `thead`, `time`, `tr`, `tt`, `u`, `ul`, `var`
  
-## Roadmap
-[View the development roadmap in the wiki](https://github.com/Sub6Resources/flutter_html/wiki/Roadmap)
- 
-### Partially supported elements:
-> These are common elements that aren't yet fully supported, but won't be ignored and will still render somewhat correctly.
-
-`center`, `font`
+## Currently Supported CSS Attributes:
+> Coming soon!
  
-### List of _planned_ supported elements:
-> These are elements that are planned, but present a specific challenge that makes them somewhat difficult to implement.
-
-`audio`, `details`, `source`, `summary`, `svg`, `track`, `video`, `wbr`
-
-### List of elements that I don't plan on implementing:
+### Elements with planned support:
 
-> Feel free to open an issue if you have a good reason and feel like you can convince me to implement
- them. A _well written_ and _complete_ pull request implementing one of these is always welcome,
- though I cannot promise I will merge them.
-
-> Note: These unsupported tags will just be ignored.
-
-`applet`, `area`, `base`, `basefont`, `button`, `canvas`, `col`, `colgroup`, `datalist`, `dialog`, `dir`, `embed`, `fieldset`, `form`, `frame`, `frameset`, `head`, `iframe`, `input`, `label`, `legend`, `link`, `map`, `meta`, `meter`, `noframe`, `object`, `optgroup`, `option`, `output`, `param`, `picture`, `progress`, `script`, `select`, `style`, `textarea`, `title`
- 
+See the [development roadmap](https://github.com/Sub6Resources/flutter_html/wiki/Roadmap) for the list of elements and css attributes I plan on supporting.
 
 ## Why this package?
 
-This package is designed with simplicity in mind. Flutter currently does not support rendering of web content
-into the widget tree. This package is designed to be a reasonable alternative for rendering static web content
-until official support is added.
-
-### Update:
-The official Flutter WebView package has been created and is in a developer preview. It's not stable yet, so I'll continue to support this project at least until webview_flutter hits 1.0.0.
-
-Check out the official Flutter WebView package here: https://pub.dartlang.org/packages/webview_flutter
-
+This package is designed with simplicity in mind. Originally created to allow basic rendering of HTML content into the Flutter widget tree,
+this project has expanded to include support for basic styling as well!.
 
 ## Example Usage:
-
-    Html(
+(For a much more extensive example, look at example/main.dart).
+```dart
+    Widget html = Html(
       data: """
-        <!--For a much more extensive example, look at example/main.dart-->
         <div>
           <h1>Demo Page</h1>
-          <p>This is a fantastic nonexistent product that you should buy!</p>
-          <h2>Pricing</h2>
-          <p>Lorem ipsum <b>dolor</b> sit amet.</p>
-          <h2>The Team</h2>
-          <p>There isn't <i>really</i> a team...</p>
-          <h2>Installation</h2>
-          <p>You <u>cannot</u> install a nonexistent product!</p>
+          <p>This is a fantastic product that you should buy!</p>
+          <h3>Features</h3>
+          <ul>
+            <li>It actually works</li>
+            <li>It exists</li>
+            <li>It doesn't cost much!</li>
+          </ul>
           <!--You can pretty much put any html in here!-->
         </div>
       """,
       //Optional parameters:
-      padding: EdgeInsets.all(8.0),
       backgroundColor: Colors.white70,
-      defaultTextStyle: TextStyle(fontFamily: 'serif'),
-      linkStyle: const TextStyle(
-        color: Colors.redAccent,
-      ),
       onLinkTap: (url) {
         // open url in a webview
       },
+      style: {
+        "div": Style(
+          block: Block(
+            margin: EdgeInsets.all(16),
+            border: Border.all(width: 6),
+            backgroundColor: Colors.grey,
+          ),
+          textStyle: TextStyle(
+            color: Colors.red,
+          ),
+        ),
+      },
       onImageTap: (src) {
         // Display the image in large form.
       },
-      //Must have useRichText set to false for this to work.
-      customRender: (node, children) {
-        if(node is dom.Element) {
-          switch(node.localName) {
-            case "video": return Chewie(...);
-            case "custom_tag": return CustomWidget(...);
-          }
-        }
-      },
-      customTextAlign: (dom.Node node) {
-        if (node is dom.Element) {
-          switch (node.localName) {
-            case "p":
-              return TextAlign.justify;
-          }
-        }
-      },
-      customTextStyle: (dom.Node node, TextStyle baseStyle) {
-        if (node is dom.Element) {
-          switch (node.localName) {
-            case "p":
-              return baseStyle.merge(TextStyle(height: 2, fontSize: 20));
-          }
-        }
-        return baseStyle;
-      },
-    )
-
-## `useRichText` parameter
-
-This package has a known issue where text does not wrap correctly. Setting `useRichText` to true fixes the issue
-by using an alternate parser. The alternate parser, however, does not support the `customRender` callback, and several elements
-supported by the default parser are not supported by the alternate parser (see [#61](https://github.com/Sub6Resources/flutter_html/issues/61) for a list).
+    );
diff --git a/example/.gitignore b/example/.gitignore
new file mode 100644
index 0000000000..d89c3ce537
--- /dev/null
+++ b/example/.gitignore
@@ -0,0 +1,75 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+**/doc/api/
+.dart_tool/
+.flutter-plugins
+.packages
+.pub-cache/
+.pub/
+/build/
+
+# Android related
+**/android/**/gradle-wrapper.jar
+**/android/.gradle
+**/android/captures/
+**/android/gradlew
+**/android/gradlew.bat
+**/android/local.properties
+**/android/**/GeneratedPluginRegistrant.java
+
+# iOS/XCode related
+**/ios/**/*.mode1v3
+**/ios/**/*.mode2v3
+**/ios/**/*.moved-aside
+**/ios/**/*.pbxuser
+**/ios/**/*.perspectivev3
+**/ios/**/*sync/
+**/ios/**/.sconsign.dblite
+**/ios/**/.tags*
+**/ios/**/.vagrant/
+**/ios/**/DerivedData/
+**/ios/**/Icon?
+**/ios/**/Pods/
+**/ios/**/.symlinks/
+**/ios/**/profile
+**/ios/**/xcuserdata
+**/ios/.generated/
+**/ios/Flutter/App.framework
+**/ios/Flutter/Flutter.framework
+**/ios/Flutter/Generated.xcconfig
+**/ios/Flutter/app.flx
+**/ios/Flutter/app.zip
+**/ios/Flutter/flutter_assets/
+**/ios/ServiceDefinitions.json
+**/ios/Runner/GeneratedPluginRegistrant.*
+
+# Exceptions to above rules.
+!**/ios/**/default.mode1v3
+!**/ios/**/default.mode2v3
+!**/ios/**/default.pbxuser
+!**/ios/**/default.perspectivev3
+!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
+
+**/.flutter-plugins-dependencies
+**/ios/Flutter/flutter_export_environment.sh
\ No newline at end of file
diff --git a/example/.metadata b/example/.metadata
new file mode 100644
index 0000000000..e0236519dc
--- /dev/null
+++ b/example/.metadata
@@ -0,0 +1,10 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled and should not be manually edited.
+
+version:
+  revision: 20e59316b8b8474554b38493b8ca888794b0234a
+  channel: stable
+
+project_type: app
diff --git a/example/README.md b/example/README.md
new file mode 100644
index 0000000000..a135626028
--- /dev/null
+++ b/example/README.md
@@ -0,0 +1,16 @@
+# example
+
+A new Flutter project.
+
+## Getting Started
+
+This project is a starting point for a Flutter application.
+
+A few resources to get you started if this is your first Flutter project:
+
+- [Lab: Write your first Flutter app](https://flutter.dev/docs/get-started/codelab)
+- [Cookbook: Useful Flutter samples](https://flutter.dev/docs/cookbook)
+
+For help getting started with Flutter, view our
+[online documentation](https://flutter.dev/docs), which offers tutorials,
+samples, guidance on mobile development, and a full API reference.
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
new file mode 100644
index 0000000000..f27be5dcd9
--- /dev/null
+++ b/example/android/app/build.gradle
@@ -0,0 +1,61 @@
+def localProperties = new Properties()
+def localPropertiesFile = rootProject.file('local.properties')
+if (localPropertiesFile.exists()) {
+    localPropertiesFile.withReader('UTF-8') { reader ->
+        localProperties.load(reader)
+    }
+}
+
+def flutterRoot = localProperties.getProperty('flutter.sdk')
+if (flutterRoot == null) {
+    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
+}
+
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
+apply plugin: 'com.android.application'
+apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
+
+android {
+    compileSdkVersion 28
+
+    lintOptions {
+        disable 'InvalidPackage'
+    }
+
+    defaultConfig {
+        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
+        applicationId "com.example.example"
+        minSdkVersion 16
+        targetSdkVersion 28
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            // TODO: Add your own signing config for the release build.
+            // Signing with the debug keys for now, so `flutter run --release` works.
+            signingConfig signingConfigs.debug
+        }
+    }
+}
+
+flutter {
+    source '../..'
+}
+
+dependencies {
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+}
diff --git a/example/android/app/src/debug/AndroidManifest.xml b/example/android/app/src/debug/AndroidManifest.xml
new file mode 100644
index 0000000000..c208884f30
--- /dev/null
+++ b/example/android/app/src/debug/AndroidManifest.xml
@@ -0,0 +1,7 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.example.example">
+    <!-- Flutter needs it to communicate with the running application
+         to allow setting breakpoints, to provide hot reload, etc.
+    -->
+    <uses-permission android:name="android.permission.INTERNET"/>
+</manifest>
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..287714028b
--- /dev/null
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -0,0 +1,33 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.example.example">
+
+    <!-- io.flutter.app.FlutterApplication is an android.app.Application that
+         calls FlutterMain.startInitialization(this); in its onCreate method.
+         In most cases you can leave this as-is, but you if you want to provide
+         additional functionality it is fine to subclass or reimplement
+         FlutterApplication and put your custom class here. -->
+    <application
+        android:name="io.flutter.app.FlutterApplication"
+        android:label="example"
+        android:icon="@mipmap/ic_launcher">
+        <activity
+            android:name=".MainActivity"
+            android:launchMode="singleTop"
+            android:theme="@style/LaunchTheme"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
+            android:hardwareAccelerated="true"
+            android:windowSoftInputMode="adjustResize">
+            <!-- This keeps the window background of the activity showing
+                 until Flutter renders its first frame. It can be removed if
+                 there is no splash screen (such as the default splash screen
+                 defined in @style/LaunchTheme). -->
+            <meta-data
+                android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
+                android:value="true" />
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
diff --git a/example/android/app/src/main/java/com/example/example/MainActivity.java b/example/android/app/src/main/java/com/example/example/MainActivity.java
new file mode 100644
index 0000000000..84f8920f66
--- /dev/null
+++ b/example/android/app/src/main/java/com/example/example/MainActivity.java
@@ -0,0 +1,13 @@
+package com.example.example;
+
+import android.os.Bundle;
+import io.flutter.app.FlutterActivity;
+import io.flutter.plugins.GeneratedPluginRegistrant;
+
+public class MainActivity extends FlutterActivity {
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    GeneratedPluginRegistrant.registerWith(this);
+  }
+}
diff --git a/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt b/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt
new file mode 100644
index 0000000000..e2c0fd32a6
--- /dev/null
+++ b/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt
@@ -0,0 +1,13 @@
+package com.example.example
+
+import android.os.Bundle
+
+import io.flutter.app.FlutterActivity
+import io.flutter.plugins.GeneratedPluginRegistrant
+
+class MainActivity: FlutterActivity() {
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    GeneratedPluginRegistrant.registerWith(this)
+  }
+}
diff --git a/example/android/app/src/main/res/drawable/launch_background.xml b/example/android/app/src/main/res/drawable/launch_background.xml
new file mode 100644
index 0000000000..304732f884
--- /dev/null
+++ b/example/android/app/src/main/res/drawable/launch_background.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Modify this file to customize your launch splash screen -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@android:color/white" />
+
+    <!-- You can insert your own image assets here -->
+    <!-- <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/launch_image" />
+    </item> -->
+</layer-list>
diff --git a/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000000..db77bb4b7b
Binary files /dev/null and b/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000000..17987b79bb
Binary files /dev/null and b/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000000..09d4391482
Binary files /dev/null and b/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000000..d5f1c8d34e
Binary files /dev/null and b/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000000..4d6372eebd
Binary files /dev/null and b/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/example/android/app/src/main/res/values/styles.xml b/example/android/app/src/main/res/values/styles.xml
new file mode 100644
index 0000000000..00fa4417cf
--- /dev/null
+++ b/example/android/app/src/main/res/values/styles.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <!-- Show a splash screen on the activity. Automatically removed when
+             Flutter draws its first frame -->
+        <item name="android:windowBackground">@drawable/launch_background</item>
+    </style>
+</resources>
diff --git a/example/android/app/src/profile/AndroidManifest.xml b/example/android/app/src/profile/AndroidManifest.xml
new file mode 100644
index 0000000000..c208884f30
--- /dev/null
+++ b/example/android/app/src/profile/AndroidManifest.xml
@@ -0,0 +1,7 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.example.example">
+    <!-- Flutter needs it to communicate with the running application
+         to allow setting breakpoints, to provide hot reload, etc.
+    -->
+    <uses-permission android:name="android.permission.INTERNET"/>
+</manifest>
diff --git a/example/android/build.gradle b/example/android/build.gradle
new file mode 100644
index 0000000000..6de372893d
--- /dev/null
+++ b/example/android/build.gradle
@@ -0,0 +1,29 @@
+buildscript {
+    repositories {
+        google()
+        jcenter()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.5.3'
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+    }
+}
+
+rootProject.buildDir = '../build'
+subprojects {
+    project.buildDir = "${rootProject.buildDir}/${project.name}"
+}
+subprojects {
+    project.evaluationDependsOn(':app')
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
diff --git a/example/android/gradle.properties b/example/android/gradle.properties
new file mode 100644
index 0000000000..2324ab5b7a
--- /dev/null
+++ b/example/android/gradle.properties
@@ -0,0 +1,5 @@
+org.gradle.jvmargs=-Xmx1536M
+
+android.enableR8=true
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000000..b1d705c8f6
--- /dev/null
+++ b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Thu Dec 12 15:22:42 MST 2019
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/example/android/settings.gradle b/example/android/settings.gradle
new file mode 100644
index 0000000000..5a2f14fb18
--- /dev/null
+++ b/example/android/settings.gradle
@@ -0,0 +1,15 @@
+include ':app'
+
+def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
+
+def plugins = new Properties()
+def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins')
+if (pluginsFile.exists()) {
+    pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) }
+}
+
+plugins.each { name, path ->
+    def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile()
+    include ":$name"
+    project(":$name").projectDir = pluginDirectory
+}
diff --git a/example/ios/Flutter/AppFrameworkInfo.plist b/example/ios/Flutter/AppFrameworkInfo.plist
new file mode 100644
index 0000000000..6b4c0f78a7
--- /dev/null
+++ b/example/ios/Flutter/AppFrameworkInfo.plist
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>$(DEVELOPMENT_LANGUAGE)</string>
+  <key>CFBundleExecutable</key>
+  <string>App</string>
+  <key>CFBundleIdentifier</key>
+  <string>io.flutter.flutter.app</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundleName</key>
+  <string>App</string>
+  <key>CFBundlePackageType</key>
+  <string>FMWK</string>
+  <key>CFBundleShortVersionString</key>
+  <string>1.0</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>1.0</string>
+  <key>MinimumOSVersion</key>
+  <string>8.0</string>
+</dict>
+</plist>
diff --git a/example/ios/Flutter/Debug.xcconfig b/example/ios/Flutter/Debug.xcconfig
new file mode 100644
index 0000000000..e8efba1146
--- /dev/null
+++ b/example/ios/Flutter/Debug.xcconfig
@@ -0,0 +1,2 @@
+#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
+#include "Generated.xcconfig"
diff --git a/example/ios/Flutter/Flutter.podspec b/example/ios/Flutter/Flutter.podspec
new file mode 100644
index 0000000000..5ca30416ba
--- /dev/null
+++ b/example/ios/Flutter/Flutter.podspec
@@ -0,0 +1,18 @@
+#
+# NOTE: This podspec is NOT to be published. It is only used as a local source!
+#
+
+Pod::Spec.new do |s|
+  s.name             = 'Flutter'
+  s.version          = '1.0.0'
+  s.summary          = 'High-performance, high-fidelity mobile apps.'
+  s.description      = <<-DESC
+Flutter provides an easy and productive way to build and deploy high-performance mobile apps for Android and iOS.
+                       DESC
+  s.homepage         = 'https://flutter.io'
+  s.license          = { :type => 'MIT' }
+  s.author           = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' }
+  s.source           = { :git => 'https://github.com/flutter/engine', :tag => s.version.to_s }
+  s.ios.deployment_target = '8.0'
+  s.vendored_frameworks = 'Flutter.framework'
+end
diff --git a/example/ios/Flutter/Release.xcconfig b/example/ios/Flutter/Release.xcconfig
new file mode 100644
index 0000000000..399e9340e6
--- /dev/null
+++ b/example/ios/Flutter/Release.xcconfig
@@ -0,0 +1,2 @@
+#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
+#include "Generated.xcconfig"
diff --git a/example/ios/Podfile b/example/ios/Podfile
new file mode 100644
index 0000000000..64ba7492ea
--- /dev/null
+++ b/example/ios/Podfile
@@ -0,0 +1,72 @@
+# Uncomment this line to define a global platform for your project
+# platform :ios, '9.0'
+
+# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
+ENV['COCOAPODS_DISABLE_STATS'] = 'true'
+
+project 'Runner', {
+  'Debug' => :debug,
+  'Profile' => :release,
+  'Release' => :release,
+}
+
+def parse_KV_file(file, separator='=')
+  file_abs_path = File.expand_path(file)
+  if !File.exists? file_abs_path
+    return [];
+  end
+  pods_ary = []
+  skip_line_start_symbols = ["#", "/"]
+  File.foreach(file_abs_path) { |line|
+      next if skip_line_start_symbols.any? { |symbol| line =~ /^\s*#{symbol}/ }
+      plugin = line.split(pattern=separator)
+      if plugin.length == 2
+        podname = plugin[0].strip()
+        path = plugin[1].strip()
+        podpath = File.expand_path("#{path}", file_abs_path)
+        pods_ary.push({:name => podname, :path => podpath});
+      else
+        puts "Invalid plugin specification: #{line}"
+      end
+  }
+  return pods_ary
+end
+
+target 'Runner' do
+  # Prepare symlinks folder. We use symlinks to avoid having Podfile.lock
+  # referring to absolute paths on developers' machines.
+  system('rm -rf .symlinks')
+  system('mkdir -p .symlinks/plugins')
+
+  # Flutter Pods
+  generated_xcode_build_settings = parse_KV_file('./Flutter/Generated.xcconfig')
+  if generated_xcode_build_settings.empty?
+    puts "Generated.xcconfig must exist. If you're running pod install manually, make sure flutter pub get is executed first."
+  end
+  generated_xcode_build_settings.map { |p|
+    if p[:name] == 'FLUTTER_FRAMEWORK_DIR'
+      symlink = File.join('.symlinks', 'flutter')
+      File.symlink(File.dirname(p[:path]), symlink)
+      pod 'Flutter', :path => File.join(symlink, File.basename(p[:path]))
+    end
+  }
+
+  # Plugin Pods
+  plugin_pods = parse_KV_file('../.flutter-plugins')
+  plugin_pods.map { |p|
+    symlink = File.join('.symlinks', 'plugins', p[:name])
+    File.symlink(p[:path], symlink)
+    pod p[:name], :path => File.join(symlink, 'ios')
+  }
+end
+
+# Prevent Cocoapods from embedding a second Flutter framework and causing an error with the new Xcode build system.
+install! 'cocoapods', :disable_input_output_paths => true
+
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    target.build_configurations.each do |config|
+      config.build_settings['ENABLE_BITCODE'] = 'NO'
+    end
+  end
+end
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
new file mode 100644
index 0000000000..1f14e61d3d
--- /dev/null
+++ b/example/ios/Podfile.lock
@@ -0,0 +1,46 @@
+PODS:
+  - Flutter (1.0.0)
+  - screen (0.0.1):
+    - Flutter
+  - video_player (0.0.1):
+    - Flutter
+  - video_player_web (0.0.1):
+    - Flutter
+  - wakelock (0.0.1):
+    - Flutter
+  - webview_flutter (0.0.1):
+    - Flutter
+
+DEPENDENCIES:
+  - Flutter (from `.symlinks/flutter/ios`)
+  - screen (from `.symlinks/plugins/screen/ios`)
+  - video_player (from `.symlinks/plugins/video_player/ios`)
+  - video_player_web (from `.symlinks/plugins/video_player_web/ios`)
+  - wakelock (from `.symlinks/plugins/wakelock/ios`)
+  - webview_flutter (from `.symlinks/plugins/webview_flutter/ios`)
+
+EXTERNAL SOURCES:
+  Flutter:
+    :path: ".symlinks/flutter/ios"
+  screen:
+    :path: ".symlinks/plugins/screen/ios"
+  video_player:
+    :path: ".symlinks/plugins/video_player/ios"
+  video_player_web:
+    :path: ".symlinks/plugins/video_player_web/ios"
+  wakelock:
+    :path: ".symlinks/plugins/wakelock/ios"
+  webview_flutter:
+    :path: ".symlinks/plugins/webview_flutter/ios"
+
+SPEC CHECKSUMS:
+  Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
+  screen: abd91ca7bf3426e1cc3646d27e9b2358d6bf07b0
+  video_player: 9cc823b1d9da7e8427ee591e8438bfbcde500e6e
+  video_player_web: da8cadb8274ed4f8dbee8d7171b420dedd437ce7
+  wakelock: 0d4a70faf8950410735e3f61fb15d517c8a6efc4
+  webview_flutter: d2b4d6c66968ad042ad94cbb791f5b72b4678a96
+
+PODFILE CHECKSUM: 7fb83752f59ead6285236625b82473f90b1cb932
+
+COCOAPODS: 1.8.3
diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj
new file mode 100644
index 0000000000..fd37a24c78
--- /dev/null
+++ b/example/ios/Runner.xcodeproj/project.pbxproj
@@ -0,0 +1,565 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
+		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
+		9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; };
+		978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
+		97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
+		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
+		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
+		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
+		A65EE5648FB89B4FBB7BE7EF /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 49DCEF6F09B6F3E8BBB9D4EA /* libPods-Runner.a */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		9705A1C41CF9048500538489 /* Embed Frameworks */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+			);
+			name = "Embed Frameworks";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
+		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
+		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
+		49DCEF6F09B6F3E8BBB9D4EA /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
+		7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
+		7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
+		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
+		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
+		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		97C146F21CF9000F007C117D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+		97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
+		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
+		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		A7CDEE80872A41183CD903E6 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
+		DD595D932B697B14AB4BA7CB /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
+		F2E16627F28351910CCEBD53 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		97C146EB1CF9000F007C117D /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A65EE5648FB89B4FBB7BE7EF /* libPods-Runner.a in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		092B7351CFBC8F0782F51612 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				49DCEF6F09B6F3E8BBB9D4EA /* libPods-Runner.a */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		9740EEB11CF90186004384FC /* Flutter */ = {
+			isa = PBXGroup;
+			children = (
+				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
+				9740EEB21CF90195004384FC /* Debug.xcconfig */,
+				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
+				9740EEB31CF90195004384FC /* Generated.xcconfig */,
+			);
+			name = Flutter;
+			sourceTree = "<group>";
+		};
+		97C146E51CF9000F007C117D = {
+			isa = PBXGroup;
+			children = (
+				9740EEB11CF90186004384FC /* Flutter */,
+				97C146F01CF9000F007C117D /* Runner */,
+				97C146EF1CF9000F007C117D /* Products */,
+				CEDA619A9460C453C4DE104D /* Pods */,
+				092B7351CFBC8F0782F51612 /* Frameworks */,
+			);
+			sourceTree = "<group>";
+		};
+		97C146EF1CF9000F007C117D /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				97C146EE1CF9000F007C117D /* Runner.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		97C146F01CF9000F007C117D /* Runner */ = {
+			isa = PBXGroup;
+			children = (
+				7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */,
+				7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */,
+				97C146FA1CF9000F007C117D /* Main.storyboard */,
+				97C146FD1CF9000F007C117D /* Assets.xcassets */,
+				97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
+				97C147021CF9000F007C117D /* Info.plist */,
+				97C146F11CF9000F007C117D /* Supporting Files */,
+				1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */,
+				1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,
+			);
+			path = Runner;
+			sourceTree = "<group>";
+		};
+		97C146F11CF9000F007C117D /* Supporting Files */ = {
+			isa = PBXGroup;
+			children = (
+				97C146F21CF9000F007C117D /* main.m */,
+			);
+			name = "Supporting Files";
+			sourceTree = "<group>";
+		};
+		CEDA619A9460C453C4DE104D /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				DD595D932B697B14AB4BA7CB /* Pods-Runner.debug.xcconfig */,
+				A7CDEE80872A41183CD903E6 /* Pods-Runner.release.xcconfig */,
+				F2E16627F28351910CCEBD53 /* Pods-Runner.profile.xcconfig */,
+			);
+			name = Pods;
+			path = Pods;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		97C146ED1CF9000F007C117D /* Runner */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
+			buildPhases = (
+				8446656B443667928C090391 /* [CP] Check Pods Manifest.lock */,
+				9740EEB61CF901F6004384FC /* Run Script */,
+				97C146EA1CF9000F007C117D /* Sources */,
+				97C146EB1CF9000F007C117D /* Frameworks */,
+				97C146EC1CF9000F007C117D /* Resources */,
+				9705A1C41CF9048500538489 /* Embed Frameworks */,
+				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
+				450FC00D9CC4F56F4423DF9E /* [CP] Embed Pods Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = Runner;
+			productName = Runner;
+			productReference = 97C146EE1CF9000F007C117D /* Runner.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		97C146E61CF9000F007C117D /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 1020;
+				ORGANIZATIONNAME = "The Chromium Authors";
+				TargetAttributes = {
+					97C146ED1CF9000F007C117D = {
+						CreatedOnToolsVersion = 7.3.1;
+					};
+				};
+			};
+			buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = en;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+				Base,
+			);
+			mainGroup = 97C146E51CF9000F007C117D;
+			productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				97C146ED1CF9000F007C117D /* Runner */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		97C146EC1CF9000F007C117D /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
+				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
+				9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */,
+				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
+				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Thin Binary";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
+		};
+		450FC00D9CC4F56F4423DF9E /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		8446656B443667928C090391 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
+		9740EEB61CF901F6004384FC /* Run Script */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Run Script";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		97C146EA1CF9000F007C117D /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */,
+				97C146F31CF9000F007C117D /* main.m in Sources */,
+				1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXVariantGroup section */
+		97C146FA1CF9000F007C117D /* Main.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				97C146FB1CF9000F007C117D /* Base */,
+			);
+			name = Main.storyboard;
+			sourceTree = "<group>";
+		};
+		97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				97C147001CF9000F007C117D /* Base */,
+			);
+			name = LaunchScreen.storyboard;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+		249021D3217E4FDB00AE95B9 /* Profile */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = iphoneos;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Profile;
+		};
+		249021D4217E4FDB00AE95B9 /* Profile */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = S8QB4VV633;
+				ENABLE_BITCODE = NO;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Flutter",
+				);
+				INFOPLIST_FILE = Runner/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Flutter",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.example;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				VERSIONING_SYSTEM = "apple-generic";
+			};
+			name = Profile;
+		};
+		97C147031CF9000F007C117D /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Debug;
+		};
+		97C147041CF9000F007C117D /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = iphoneos;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		97C147061CF9000F007C117D /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				ENABLE_BITCODE = NO;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Flutter",
+				);
+				INFOPLIST_FILE = Runner/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Flutter",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.example;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				VERSIONING_SYSTEM = "apple-generic";
+			};
+			name = Debug;
+		};
+		97C147071CF9000F007C117D /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				ENABLE_BITCODE = NO;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Flutter",
+				);
+				INFOPLIST_FILE = Runner/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Flutter",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.example;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				VERSIONING_SYSTEM = "apple-generic";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				97C147031CF9000F007C117D /* Debug */,
+				97C147041CF9000F007C117D /* Release */,
+				249021D3217E4FDB00AE95B9 /* Profile */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				97C147061CF9000F007C117D /* Debug */,
+				97C147071CF9000F007C117D /* Release */,
+				249021D4217E4FDB00AE95B9 /* Profile */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 97C146E61CF9000F007C117D /* Project object */;
+}
diff --git a/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000000..1d526a16ed
--- /dev/null
+++ b/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:Runner.xcodeproj">
+   </FileRef>
+</Workspace>
diff --git a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
new file mode 100644
index 0000000000..a28140cfdb
--- /dev/null
+++ b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1020"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+               BuildableName = "Runner.app"
+               BlueprintName = "Runner"
+               ReferencedContainer = "container:Runner.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+            BuildableName = "Runner.app"
+            BlueprintName = "Runner"
+            ReferencedContainer = "container:Runner.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+            BuildableName = "Runner.app"
+            BlueprintName = "Runner"
+            ReferencedContainer = "container:Runner.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Profile"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+            BuildableName = "Runner.app"
+            BlueprintName = "Runner"
+            ReferencedContainer = "container:Runner.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/example/ios/Runner.xcworkspace/contents.xcworkspacedata b/example/ios/Runner.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000000..21a3cc14c7
--- /dev/null
+++ b/example/ios/Runner.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:Runner.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
+</Workspace>
diff --git a/example/ios/Runner/AppDelegate.h b/example/ios/Runner/AppDelegate.h
new file mode 100644
index 0000000000..36e21bbf9c
--- /dev/null
+++ b/example/ios/Runner/AppDelegate.h
@@ -0,0 +1,6 @@
+#import <Flutter/Flutter.h>
+#import <UIKit/UIKit.h>
+
+@interface AppDelegate : FlutterAppDelegate
+
+@end
diff --git a/example/ios/Runner/AppDelegate.m b/example/ios/Runner/AppDelegate.m
new file mode 100644
index 0000000000..59a72e90be
--- /dev/null
+++ b/example/ios/Runner/AppDelegate.m
@@ -0,0 +1,13 @@
+#include "AppDelegate.h"
+#include "GeneratedPluginRegistrant.h"
+
+@implementation AppDelegate
+
+- (BOOL)application:(UIApplication *)application
+    didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+  [GeneratedPluginRegistrant registerWithRegistry:self];
+  // Override point for customization after application launch.
+  return [super application:application didFinishLaunchingWithOptions:launchOptions];
+}
+
+@end
diff --git a/example/ios/Runner/AppDelegate.swift b/example/ios/Runner/AppDelegate.swift
new file mode 100644
index 0000000000..70693e4a8c
--- /dev/null
+++ b/example/ios/Runner/AppDelegate.swift
@@ -0,0 +1,13 @@
+import UIKit
+import Flutter
+
+@UIApplicationMain
+@objc class AppDelegate: FlutterAppDelegate {
+  override func application(
+    _ application: UIApplication,
+    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
+  ) -> Bool {
+    GeneratedPluginRegistrant.register(with: self)
+    return super.application(application, didFinishLaunchingWithOptions: launchOptions)
+  }
+}
diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
new file mode 100644
index 0000000000..d36b1fab2d
--- /dev/null
+++ b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,122 @@
+{
+  "images" : [
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-20x20@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-20x20@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-29x29@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-29x29@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-29x29@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-40x40@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-40x40@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-60x60@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-60x60@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-20x20@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-20x20@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-29x29@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-29x29@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-40x40@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-40x40@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-76x76@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-76x76@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "83.5x83.5",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-83.5x83.5@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "Icon-App-1024x1024@1x.png",
+      "scale" : "1x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
new file mode 100644
index 0000000000..3d43d11e66
Binary files /dev/null and b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ
diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
new file mode 100644
index 0000000000..28c6bf0301
Binary files /dev/null and b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ
diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
new file mode 100644
index 0000000000..2ccbfd967d
Binary files /dev/null and b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ
diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
new file mode 100644
index 0000000000..f091b6b0bc
Binary files /dev/null and b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ
diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
new file mode 100644
index 0000000000..4cde12118d
Binary files /dev/null and b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ
diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
new file mode 100644
index 0000000000..d0ef06e7ed
Binary files /dev/null and b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ
diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
new file mode 100644
index 0000000000..dcdc2306c2
Binary files /dev/null and b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ
diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
new file mode 100644
index 0000000000..2ccbfd967d
Binary files /dev/null and b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ
diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
new file mode 100644
index 0000000000..c8f9ed8f5c
Binary files /dev/null and b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ
diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
new file mode 100644
index 0000000000..a6d6b8609d
Binary files /dev/null and b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ
diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
new file mode 100644
index 0000000000..a6d6b8609d
Binary files /dev/null and b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ
diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
new file mode 100644
index 0000000000..75b2d164a5
Binary files /dev/null and b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ
diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
new file mode 100644
index 0000000000..c4df70d39d
Binary files /dev/null and b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ
diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
new file mode 100644
index 0000000000..6a84f41e14
Binary files /dev/null and b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ
diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
new file mode 100644
index 0000000000..d0e1f58536
Binary files /dev/null and b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ
diff --git a/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
new file mode 100644
index 0000000000..0bedcf2fd4
--- /dev/null
+++ b/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "LaunchImage.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "LaunchImage@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "LaunchImage@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
new file mode 100644
index 0000000000..9da19eacad
Binary files /dev/null and b/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png differ
diff --git a/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
new file mode 100644
index 0000000000..9da19eacad
Binary files /dev/null and b/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png differ
diff --git a/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
new file mode 100644
index 0000000000..9da19eacad
Binary files /dev/null and b/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png differ
diff --git a/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md
new file mode 100644
index 0000000000..89c2725b70
--- /dev/null
+++ b/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md
@@ -0,0 +1,5 @@
+# Launch Screen Assets
+
+You can customize the launch screen with your own desired assets by replacing the image files in this directory.
+
+You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images.
\ No newline at end of file
diff --git a/example/ios/Runner/Base.lproj/LaunchScreen.storyboard b/example/ios/Runner/Base.lproj/LaunchScreen.storyboard
new file mode 100644
index 0000000000..f2e259c7c9
--- /dev/null
+++ b/example/ios/Runner/Base.lproj/LaunchScreen.storyboard
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="EHf-IW-A2E">
+            <objects>
+                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="Ydg-fD-yQy"/>
+                        <viewControllerLayoutGuide type="bottom" id="xbc-2k-c8Z"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4">
+                            </imageView>
+                        </subviews>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="1a2-6s-vTC"/>
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="4X2-HB-R7a"/>
+                        </constraints>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="53" y="375"/>
+        </scene>
+    </scenes>
+    <resources>
+        <image name="LaunchImage" width="168" height="185"/>
+    </resources>
+</document>
diff --git a/example/ios/Runner/Base.lproj/Main.storyboard b/example/ios/Runner/Base.lproj/Main.storyboard
new file mode 100644
index 0000000000..f3c28516fb
--- /dev/null
+++ b/example/ios/Runner/Base.lproj/Main.storyboard
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+    </dependencies>
+    <scenes>
+        <!--Flutter View Controller-->
+        <scene sceneID="tne-QT-ifu">
+            <objects>
+                <viewController id="BYZ-38-t0r" customClass="FlutterViewController" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
+                        <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
+            </objects>
+        </scene>
+    </scenes>
+</document>
diff --git a/example/ios/Runner/Info.plist b/example/ios/Runner/Info.plist
new file mode 100644
index 0000000000..6641e74e9e
--- /dev/null
+++ b/example/ios/Runner/Info.plist
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>example</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>$(FLUTTER_BUILD_NAME)</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>$(FLUTTER_BUILD_NUMBER)</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIMainStoryboardFile</key>
+	<string>Main</string>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<false/>
+	<key>io.flutter.embedded_views_preview</key>
+	<string>YES</string>
+</dict>
+</plist>
diff --git a/example/ios/Runner/Runner-Bridging-Header.h b/example/ios/Runner/Runner-Bridging-Header.h
new file mode 100644
index 0000000000..7335fdf900
--- /dev/null
+++ b/example/ios/Runner/Runner-Bridging-Header.h
@@ -0,0 +1 @@
+#import "GeneratedPluginRegistrant.h"
\ No newline at end of file
diff --git a/example/ios/Runner/main.m b/example/ios/Runner/main.m
new file mode 100644
index 0000000000..dff6597e45
--- /dev/null
+++ b/example/ios/Runner/main.m
@@ -0,0 +1,9 @@
+#import <Flutter/Flutter.h>
+#import <UIKit/UIKit.h>
+#import "AppDelegate.h"
+
+int main(int argc, char* argv[]) {
+  @autoreleasepool {
+    return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
+  }
+}
diff --git a/example/lib/main.dart b/example/lib/main.dart
new file mode 100644
index 0000000000..b16831ba73
--- /dev/null
+++ b/example/lib/main.dart
@@ -0,0 +1,190 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_html/flutter_html.dart';
+import 'package:flutter_html/html_parser.dart';
+import 'package:flutter_html/style.dart';
+
+void main() => runApp(new MyApp());
+
+class MyApp extends StatelessWidget {
+  // This widget is the root of your application.
+  @override
+  Widget build(BuildContext context) {
+    return new MaterialApp(
+      title: 'Flutter Demo',
+      theme: new ThemeData(
+        primarySwatch: Colors.deepPurple,
+      ),
+      home: new MyHomePage(title: 'flutter_html Example'),
+    );
+  }
+}
+
+class MyHomePage extends StatefulWidget {
+  MyHomePage({Key key, this.title}) : super(key: key);
+
+  final String title;
+
+  @override
+  _MyHomePageState createState() => new _MyHomePageState();
+}
+
+const htmlData = """
+<h1>Header 1</h1>
+<h2>Header 2</h2>
+<h3>Header 3</h3>
+<h4>Header 4</h4>
+<h5>Header 5</h5>
+<h6>Header 6</h6>
+<h3>Ruby Support:</h3>
+      <p>
+        <ruby>
+          漢<rt>かん</rt>
+          字<rt>じ</rt>
+        </ruby>
+        &nbsp;is Japanese Kanji.
+      </p>
+      <h3>Support for <code>sub</code>/<code>sup</code></h3>
+      Solve for <var>x<sub>n</sub></var>: log<sub>2</sub>(<var>x</var><sup>2</sup>+<var>n</var>) = 9<sup>3</sup>
+      <p>One of the most <span>common</span> equations in all of physics is <br /><var>E</var>=<var>m</var><var>c</var><sup>2</sup>.</p>
+      <h3>Table support (with custom styling!):</h3>
+      <p>
+      <q>Famous quote...</q>
+      </p>
+      <table>
+      <colgroup>
+        <col width="50%" />
+        <col width="25%" />
+        <col width="25%" />
+      </colgroup>
+      <thead>
+      <tr><th>One</th><th>Two</th><th>Three</th></tr>
+      </thead>
+      <tbody>
+      <tr>
+        <td>Data</td><td>Data</td><td>Data</td>
+      </tr>
+      <tr>
+        <td>Data</td><td>Data</td><td>Data</td>
+      </tr>
+      </tbody>
+      <tfoot>
+      <tr><td>fData</td><td>fData</td><td>fData</td></tr>
+      </tfoot>
+      </table>
+      <h3>Custom Element Support:</h3>
+      <flutter></flutter>
+      <flutter horizontal></flutter>
+      <h3>SVG support:</h3>
+      <svg id='svg1' viewBox='0 0 100 100' xmlns='http://www.w3.org/2000/svg'>
+            <circle r="32" cx="35" cy="65" fill="#F00" opacity="0.5"/>
+            <circle r="32" cx="65" cy="65" fill="#0F0" opacity="0.5"/>
+            <circle r="32" cx="50" cy="35" fill="#00F" opacity="0.5"/>
+      </svg>
+      <h3>List support:</h3>
+      <ol>
+            <li>This</li>
+            <li><p>is</p></li>
+            <li>an</li>
+            <li>
+            ordered
+            <ul>
+            <li>With<br /><br />...</li>
+            <li>a</li>
+            <li>nested</li>
+            <li>unordered
+            <ol>
+            <li>With a nested</li>
+            <li>ordered list.</li>
+            </ol>
+            </li>
+            <li>list</li>
+            </ul>
+            </li>
+            <li>list! Lorem ipsum dolor sit amet.</li>
+            <li><h2>Header 2</h2></li>
+            <h2><li>Header 2</li></h2>
+      </ol>
+      <h3>Link support:</h3>
+      <p>
+        Linking to <a href='https://github.com'>websites</a> has never been easier.
+      </p>
+      <h3>Image support:</h3>
+      <p>
+        <img alt='Google' src='https://www.google.com/images/branding/googlelogo/2x/googlelogo_color_92x30dp.png' />
+        <a href='https://google.com'><img alt='Google' src='https://www.google.com/images/branding/googlelogo/2x/googlelogo_color_92x30dp.png' /></a>
+        <img alt='Alt Text of an intentionally broken image' src='https://www.google.com/images/branding/googlelogo/2x/googlelogo_color_92x30d' />
+      </p>
+      <!--
+      <h3>Video support:</h3>
+      <video controls>
+        <source src="https://www.w3schools.com/html/mov_bbb.mp4" />
+      </video>
+      <h3>Audio support:</h3>
+      <audio controls>
+        <source src="https://www.w3schools.com/html/horse.mp3" />
+      </audio>
+      <h3>IFrame support:</h3>
+      <iframe src="https://google.com"></iframe>
+      -->
+""";
+
+class _MyHomePageState extends State<MyHomePage> {
+  @override
+  Widget build(BuildContext context) {
+    return new Scaffold(
+      appBar: AppBar(
+        title: Text('flutter_html Example'),
+        centerTitle: true,
+      ),
+      body: SingleChildScrollView(
+        child: Html(
+          data: htmlData,
+          //Optional parameters:
+          style: {
+            "html": Style(
+              backgroundColor: Colors.black12,
+//              color: Colors.white,
+            ),
+//            "h1": Style(
+//              textAlign: TextAlign.center,
+//            ),
+            "table": Style(
+              backgroundColor: Color.fromARGB(0x50, 0xee, 0xee, 0xee),
+            ),
+            "tr": Style(
+              border: Border(bottom: BorderSide(color: Colors.grey)),
+            ),
+            "th": Style(
+              padding: EdgeInsets.all(6),
+              backgroundColor: Colors.grey,
+            ),
+            "td": Style(
+              padding: EdgeInsets.all(6),
+            ),
+            "var": Style(fontFamily: 'serif'),
+          },
+          customRender: {
+            "flutter": (RenderContext context, Widget child, attributes, _) {
+              return FlutterLogo(
+                style: (attributes['horizontal'] != null)
+                    ? FlutterLogoStyle.horizontal
+                    : FlutterLogoStyle.markOnly,
+                textColor: context.style.color,
+                size: context.style.fontSize.size * 5,
+              );
+            },
+          },
+          onLinkTap: (url) {
+            print("Opening $url...");
+          },
+          onImageTap: (src) {
+            print(src);
+          },
+          onImageError: (exception, stackTrace) {
+            print(exception);
+          },
+        ),
+      ),
+    );
+  }
+}
diff --git a/example/main.dart b/example/main.dart
deleted file mode 100644
index 4a5260c9e1..0000000000
--- a/example/main.dart
+++ /dev/null
@@ -1,168 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_html/flutter_html.dart';
-import 'package:html/dom.dart' as dom;
-
-void main() => runApp(new MyApp());
-
-class MyApp extends StatelessWidget {
-  // This widget is the root of your application.
-  @override
-  Widget build(BuildContext context) {
-    return new MaterialApp(
-      title: 'Flutter Demo',
-      theme: new ThemeData(
-        primarySwatch: Colors.blue,
-      ),
-      home: new MyHomePage(title: 'Flutter Demo Home Page'),
-    );
-  }
-}
-
-class MyHomePage extends StatefulWidget {
-  MyHomePage({Key key, this.title}) : super(key: key);
-
-  final String title;
-
-  @override
-  _MyHomePageState createState() => new _MyHomePageState();
-}
-
-class _MyHomePageState extends State<MyHomePage> {
-  @override
-  Widget build(BuildContext context) {
-    return new Scaffold(
-      appBar: new AppBar(
-        title: new Text(widget.title),
-      ),
-      body: new Center(
-        child: SingleChildScrollView(
-          child: Html(
-            data: """
-    <div>
-      <div id="header_set">
-      <h1>Header 1</h1>
-      <h2>Header 2</h2>
-      <h3>Header 3</h3>
-      <h4>Header 4</h4>
-      <h5>Header 5</h5>
-      <h6>Header 6</h6>
-      <hr />
-      Below hr
-      <b>Bold</b>
-      </div>
-      <h1>Demo Page</h1>
-      <p>This is a <u>fantastic</u> nonexistent product that you should really really really consider buying!</p>
-      <a href="https://github.com">https://github.com</a><br />
-      <br />
-      <h2>Pricing</h2>
-      <p>Lorem ipsum <b>dolor</b> sit amet.</p>
-      <center>
-        This is some center text... <abbr>ABBR</abbr> and <acronym>ACRONYM</acronym>
-      </center>
-      <h2>The Team</h2>
-      <p>There isn't <i>really</i> a team...</p>
-      <h2>Installation</h2>
-      <p>You <u>cannot</u> install a nonexistent product!</p>
-      <h2>Don't ask me to find <em>x</em> in</h2>
-      <p>log<sub>2</sub>(<em>x</em><sup>2</sup> - 6<em>x</em>) = 3 + log<sub>2</sub>(1 - <em>x</em>)</p>
-      <div id="bdi_test">
-        <h3><code>bdi</code> and <code>bdo</code> Test:</h3>
-        <p>
-        In the example below, usernames are shown along with the number of points in a contest.
-        If the bdi element is not supported in the browser, the username of the Arabic user would confuse the text (the bidirectional algorithm would put the colon and the number "90" next to the word "User" rather than next to the word "points").
-        </p>
-        
-        <ul>
-         <li>User <bdi>hrefs</bdi>: 60 points</li>
-         <li>User <bdi>jdoe</bdi>: 80 points</li>
-         <li>User <bdi>إيان</bdi>: 90 points</li>
-         <bdo dir="rtl">Swapped!</bdo>
-         <bdo dir="ltr">This text will go left to right!</bdo>
-         <bdo dir="rtl">With bdi: User <bdi>إيان</bdi>: 90 points</bdo>
-         <bdo dir="rtl">Without bdi: User إيان: 90 points</bdo>
-         <bdo dir="ltr">ltr w/ bdi: User <bdi>إيان</bdi>: 90 points</bdo>
-         <bdo dir="ltr">ltr w/o bdi: User إيان: 90 points</bdo>
-        </ul>
-      </div>
-            <div>
-              <table>
-              <caption>This is the table's caption</caption>
-                <tr><th>Head 1<sup>*</sup></th><th>Head 2</th><th>Head 3</th></tr>
-                <tr><td>Data 1</td><td>Long Data 2</td><td>Really, realllllly, long data 3</td></tr>
-                <tr><td>Data 1</td><td>Long <b>Data</b> 2</td><td>Really, realllllly, long data 3</td></tr>
-                <tr><td>Data 1</td><td>Long Data 2</td><td>Really, realllllly, long data 3</td></tr>
-                <tr><td>Different 1</td><td>Different reallllllly long 2</td><td>Diff 3</td></tr>
-                <tr><td colspan="2">This spans 2 columns</td><td>Normal td</td></tr>
-                <tfoot>
-                <tr><td>In foot 1</td><td>In foot 2</td><td>In foot long 2</td></tr>
-                </tfoot>
-              </table>
-            </div>
-            <div>Nested div</div>
-            <div>
-            <pre>
-            jQuery("#monkey");
-            </pre>
-            <br />
-            <p><q>This is a fancy quote</q></p>
-            <br />
-            <br />
-            Second nested div<br />
-            <figure>
-            <img src="https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png" />
-            <figcaption>Available on GitHub</figcaption>
-            </figure>
-            </div>
-            <div>Third nested div</div>
-          </div>
-          <h1>Second header</h1>
-          <h1>Third header</h1>
-          <div>Fourth div</div>
-  """,
-            //Optional parameters:
-            padding: EdgeInsets.all(8.0),
-            linkStyle: const TextStyle(
-              color: Colors.redAccent,
-              decorationColor: Colors.redAccent,
-              decoration: TextDecoration.underline,
-            ),
-            onLinkTap: (url) {
-              print("Opening $url...");
-            },
-            onImageTap: (src) {
-              print(src);
-            },
-            //Must have useRichText set to false for this to work
-            customRender: (node, children) {
-              if (node is dom.Element) {
-                switch (node.localName) {
-                  case "custom_tag":
-                    return Column(children: children);
-                }
-              }
-              return null;
-            },
-            customTextAlign: (dom.Node node) {
-              if (node is dom.Element) {
-                switch (node.localName) {
-                  case "p":
-                    return TextAlign.justify;
-                }
-              }
-              return null;
-            },
-            customTextStyle: (dom.Node node, TextStyle baseStyle) {
-              if (node is dom.Element) {
-                switch (node.localName) {
-                  case "p":
-                    return baseStyle.merge(TextStyle(height: 2, fontSize: 20));
-                }
-              }
-              return baseStyle;
-            },
-          ),
-        ),
-      ),
-    );
-  }
-}
diff --git a/example/pubspec.lock b/example/pubspec.lock
new file mode 100644
index 0000000000..adbeff69b9
--- /dev/null
+++ b/example/pubspec.lock
@@ -0,0 +1,306 @@
+# Generated by pub
+# See https://dart.dev/tools/pub/glossary#lockfile
+packages:
+  archive:
+    dependency: transitive
+    description:
+      name: archive
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.13"
+  args:
+    dependency: transitive
+    description:
+      name: args
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.6.0"
+  async:
+    dependency: transitive
+    description:
+      name: async
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.4.1"
+  boolean_selector:
+    dependency: transitive
+    description:
+      name: boolean_selector
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.0"
+  charcode:
+    dependency: transitive
+    description:
+      name: charcode
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.3"
+  chewie:
+    dependency: transitive
+    description:
+      name: chewie
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.9.10"
+  chewie_audio:
+    dependency: transitive
+    description:
+      name: chewie_audio
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.0+1"
+  collection:
+    dependency: transitive
+    description:
+      name: collection
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.14.12"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.1"
+  crypto:
+    dependency: transitive
+    description:
+      name: crypto
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.4"
+  css_colors:
+    dependency: transitive
+    description:
+      name: css_colors
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.2"
+  csslib:
+    dependency: transitive
+    description:
+      name: csslib
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.16.1"
+  cupertino_icons:
+    dependency: "direct main"
+    description:
+      name: cupertino_icons
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.2"
+  flutter:
+    dependency: "direct main"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  flutter_html:
+    dependency: "direct main"
+    description:
+      path: ".."
+      relative: true
+    source: path
+    version: "1.0.0"
+  flutter_svg:
+    dependency: transitive
+    description:
+      name: flutter_svg
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.17.4"
+  flutter_test:
+    dependency: "direct dev"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  flutter_web_plugins:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  html:
+    dependency: transitive
+    description:
+      name: html
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.14.0+3"
+  image:
+    dependency: transitive
+    description:
+      name: image
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.12"
+  matcher:
+    dependency: transitive
+    description:
+      name: matcher
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.12.6"
+  meta:
+    dependency: transitive
+    description:
+      name: meta
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.8"
+  open_iconic_flutter:
+    dependency: transitive
+    description:
+      name: open_iconic_flutter
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.3.0"
+  path:
+    dependency: transitive
+    description:
+      name: path
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.6.4"
+  path_drawing:
+    dependency: transitive
+    description:
+      name: path_drawing
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.4.1"
+  path_parsing:
+    dependency: transitive
+    description:
+      name: path_parsing
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.4"
+  petitparser:
+    dependency: transitive
+    description:
+      name: petitparser
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.4.0"
+  quiver:
+    dependency: transitive
+    description:
+      name: quiver
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.3"
+  screen:
+    dependency: transitive
+    description:
+      name: screen
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.0.5"
+  sky_engine:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.99"
+  source_span:
+    dependency: transitive
+    description:
+      name: source_span
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.7.0"
+  stack_trace:
+    dependency: transitive
+    description:
+      name: stack_trace
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.9.3"
+  stream_channel:
+    dependency: transitive
+    description:
+      name: stream_channel
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.0"
+  string_scanner:
+    dependency: transitive
+    description:
+      name: string_scanner
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.5"
+  term_glyph:
+    dependency: transitive
+    description:
+      name: term_glyph
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.0"
+  test_api:
+    dependency: transitive
+    description:
+      name: test_api
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.2.15"
+  typed_data:
+    dependency: transitive
+    description:
+      name: typed_data
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.6"
+  vector_math:
+    dependency: transitive
+    description:
+      name: vector_math
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.8"
+  video_player:
+    dependency: transitive
+    description:
+      name: video_player
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.10.10"
+  video_player_platform_interface:
+    dependency: transitive
+    description:
+      name: video_player_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.2"
+  video_player_web:
+    dependency: transitive
+    description:
+      name: video_player_web
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.3"
+  wakelock:
+    dependency: transitive
+    description:
+      name: wakelock
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.4+1"
+  webview_flutter:
+    dependency: transitive
+    description:
+      name: webview_flutter
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.3.21"
+  xml:
+    dependency: transitive
+    description:
+      name: xml
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.6.1"
+sdks:
+  dart: ">=2.7.0 <3.0.0"
+  flutter: ">=1.17.0 <2.0.0"
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
new file mode 100644
index 0000000000..1d2f936f70
--- /dev/null
+++ b/example/pubspec.yaml
@@ -0,0 +1,74 @@
+name: example
+description: A new Flutter project.
+
+# The following defines the version and build number for your application.
+# A version number is three numbers separated by dots, like 1.2.43
+# followed by an optional build number separated by a +.
+# Both the version and the builder number may be overridden in flutter
+# build by specifying --build-name and --build-number, respectively.
+# In Android, build-name is used as versionName while build-number used as versionCode.
+# Read more about Android versioning at https://developer.android.com/studio/publish/versioning
+# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
+# Read more about iOS versioning at
+# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
+version: 1.0.0+1
+
+environment:
+  sdk: ">=2.1.0 <3.0.0"
+
+dependencies:
+  flutter_html:
+    path: ..
+  flutter:
+    sdk: flutter
+
+  # The following adds the Cupertino Icons font to your application.
+  # Use with the CupertinoIcons class for iOS style icons.
+  cupertino_icons: ^0.1.2
+
+dev_dependencies:
+  flutter_test:
+    sdk: flutter
+
+
+# For information on the generic Dart part of this file, see the
+# following page: https://dart.dev/tools/pub/pubspec
+
+# The following section is specific to Flutter.
+flutter:
+
+  # The following line ensures that the Material Icons font is
+  # included with your application, so that you can use the icons in
+  # the material Icons class.
+  uses-material-design: true
+
+  # To add assets to your application, add an assets section, like this:
+  # assets:
+  #  - images/a_dot_burr.jpeg
+  #  - images/a_dot_ham.jpeg
+
+  # An image asset can refer to one or more resolution-specific "variants", see
+  # https://flutter.dev/assets-and-images/#resolution-aware.
+
+  # For details regarding adding assets from package dependencies, see
+  # https://flutter.dev/assets-and-images/#from-packages
+
+  # To add custom fonts to your application, add a fonts section here,
+  # in this "flutter" section. Each entry in this list should have a
+  # "family" key with the font family name, and a "fonts" key with a
+  # list giving the asset and other descriptors for the font. For
+  # example:
+  # fonts:
+  #   - family: Schyler
+  #     fonts:
+  #       - asset: fonts/Schyler-Regular.ttf
+  #       - asset: fonts/Schyler-Italic.ttf
+  #         style: italic
+  #   - family: Trajan Pro
+  #     fonts:
+  #       - asset: fonts/TrajanPro.ttf
+  #       - asset: fonts/TrajanPro_Bold.ttf
+  #         weight: 700
+  #
+  # For details regarding fonts from package dependencies,
+  # see https://flutter.dev/custom-fonts/#from-packages
diff --git a/example/test/widget_test.dart b/example/test/widget_test.dart
new file mode 100644
index 0000000000..747db1da35
--- /dev/null
+++ b/example/test/widget_test.dart
@@ -0,0 +1,30 @@
+// This is a basic Flutter widget test.
+//
+// To perform an interaction with a widget in your test, use the WidgetTester
+// utility that Flutter provides. For example, you can send tap and scroll
+// gestures. You can also use WidgetTester to find child widgets in the widget
+// tree, read text, and verify that the values of widget properties are correct.
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+import 'package:example/main.dart';
+
+void main() {
+  testWidgets('Counter increments smoke test', (WidgetTester tester) async {
+    // Build our app and trigger a frame.
+    await tester.pumpWidget(MyApp());
+
+    // Verify that our counter starts at 0.
+    expect(find.text('0'), findsOneWidget);
+    expect(find.text('1'), findsNothing);
+
+    // Tap the '+' icon and trigger a frame.
+    await tester.tap(find.byIcon(Icons.add));
+    await tester.pump();
+
+    // Verify that our counter has incremented.
+    expect(find.text('0'), findsNothing);
+    expect(find.text('1'), findsOneWidget);
+  });
+}
diff --git a/lib/flutter_html.dart b/lib/flutter_html.dart
index a58ba80f20..06b6985c8f 100644
--- a/lib/flutter_html.dart
+++ b/lib/flutter_html.dart
@@ -2,96 +2,78 @@ library flutter_html;
 
 import 'package:flutter/material.dart';
 import 'package:flutter_html/html_parser.dart';
-import 'package:flutter_html/rich_text_parser.dart';
-
-import 'image_properties.dart';
+import 'package:flutter_html/style.dart';
 
 class Html extends StatelessWidget {
+  /// The `Html` widget takes HTML as input and displays a RichText
+  /// tree of the parsed HTML content.
+  ///
+  /// **Attributes**
+  /// **data** *required* takes in a String of HTML data.
+  ///
+  ///
+  /// **onLinkTap** This function is called whenever a link (`<a href>`)
+  /// is tapped.
+  /// **customRender** This function allows you to return your own widgets
+  /// for existing or custom HTML tags.
+  /// See [its wiki page](https://github.com/Sub6Resources/flutter_html/wiki/All-About-customRender) for more info.
+  ///
+  /// **onImageError** This is called whenever an image fails to load or
+  /// display on the page.
+  ///
+  /// **shrinkWrap** This makes the Html widget take up only the width it
+  /// needs and no more.
+  ///
+  /// **onImageTap** This is called whenever an image is tapped.
+  ///
+  /// **blacklistedElements** Tag names in this array are ignored during parsing and rendering.
+  ///
+  /// **style** Pass in the style information for the Html here.
+  /// See [its wiki page](https://github.com/Sub6Resources/flutter_html/wiki/Style) for more info.
   Html({
     Key key,
     @required this.data,
-    this.padding,
-    this.backgroundColor,
-    this.defaultTextStyle,
     this.onLinkTap,
-    this.renderNewlines = false,
     this.customRender,
-    this.customEdgeInsets,
-    this.customTextStyle,
-    this.customTextAlign,
-    this.blockSpacing = 14.0,
-    this.useRichText = true,
     this.onImageError,
-    this.linkStyle = const TextStyle(
-        decoration: TextDecoration.underline,
-        color: Colors.blueAccent,
-        decorationColor: Colors.blueAccent),
-    this.shrinkToFit = false,
-    this.imageProperties,
+    this.shrinkWrap = false,
     this.onImageTap,
-    this.showImages = true,
+    this.blacklistedElements = const [],
+    this.style,
   }) : super(key: key);
 
   final String data;
-  final EdgeInsetsGeometry padding;
-  final Color backgroundColor;
-  final TextStyle defaultTextStyle;
-  final OnLinkTap onLinkTap;
-  final bool renderNewlines;
-  final double blockSpacing;
-  final bool useRichText;
+  final OnTap onLinkTap;
   final ImageErrorListener onImageError;
-  final TextStyle linkStyle;
-  final bool shrinkToFit;
+  final bool shrinkWrap;
 
   /// Properties for the Image widget that gets rendered by the rich text parser
-  final ImageProperties imageProperties;
-  final OnImageTap onImageTap;
-  final bool showImages;
+  final OnTap onImageTap;
+
+  final List<String> blacklistedElements;
 
   /// Either return a custom widget for specific node types or return null to
   /// fallback to the default rendering.
-  final CustomRender customRender;
-  final CustomEdgeInsets customEdgeInsets;
-  final CustomTextStyle customTextStyle;
-  final CustomTextAlign customTextAlign;
+  final Map<String, CustomRender> customRender;
+
+  /// Fancy New Parser parameters
+  final Map<String, Style> style;
 
   @override
   Widget build(BuildContext context) {
-    final double width = shrinkToFit ? null : MediaQuery.of(context).size.width;
+    final double width = shrinkWrap ? null : MediaQuery.of(context).size.width;
 
     return Container(
-      padding: padding,
-      color: backgroundColor,
       width: width,
-      child: DefaultTextStyle.merge(
-        style: defaultTextStyle ?? DefaultTextStyle.of(context).style,
-        child: (useRichText)
-            ? HtmlRichTextParser(
-                shrinkToFit: shrinkToFit,
-                onLinkTap: onLinkTap,
-                renderNewlines: renderNewlines,
-                customEdgeInsets: customEdgeInsets,
-                customTextStyle: customTextStyle,
-                customTextAlign: customTextAlign,
-                html: data,
-                onImageError: onImageError,
-                linkStyle: linkStyle,
-                imageProperties: imageProperties,
-                onImageTap: onImageTap,
-                showImages: showImages,
-              )
-            : HtmlOldParser(
-                width: width,
-                onLinkTap: onLinkTap,
-                renderNewlines: renderNewlines,
-                customRender: customRender,
-                html: data,
-                blockSpacing: blockSpacing,
-                onImageError: onImageError,
-                linkStyle: linkStyle,
-                showImages: showImages,
-              ),
+      child: HtmlParser(
+        htmlData: data,
+        onLinkTap: onLinkTap,
+        onImageTap: onImageTap,
+        onImageError: onImageError,
+        shrinkWrap: shrinkWrap,
+        style: style,
+        customRender: customRender,
+        blacklistedElements: blacklistedElements,
       ),
     );
   }
diff --git a/lib/html_parser.dart b/lib/html_parser.dart
index b89006af7f..da6601b887 100644
--- a/lib/html_parser.dart
+++ b/lib/html_parser.dart
@@ -1,941 +1,727 @@
-import 'dart:convert';
+import 'dart:collection';
+import 'dart:math';
 
+import 'package:csslib/parser.dart' as cssparser;
+import 'package:csslib/visitor.dart' as css;
 import 'package:flutter/material.dart';
-import 'package:flutter_html/rich_text_parser.dart';
+import 'package:flutter_html/flutter_html.dart';
+import 'package:flutter_html/src/html_elements.dart';
+import 'package:flutter_html/src/layout_element.dart';
+import 'package:flutter_html/src/utils.dart';
+import 'package:flutter_html/style.dart';
 import 'package:html/dom.dart' as dom;
-import 'package:html/parser.dart' as parser;
+import 'package:html/parser.dart' as htmlparser;
 
-class HtmlOldParser extends StatelessWidget {
-  HtmlOldParser({
-    @required this.width,
+typedef OnTap = void Function(String url);
+typedef CustomRender = Widget Function(
+  RenderContext context,
+  Widget parsedChild,
+  Map<String, String> attributes,
+  dom.Element element,
+);
+
+class HtmlParser extends StatelessWidget {
+  final String htmlData;
+  final OnTap onLinkTap;
+  final OnTap onImageTap;
+  final ImageErrorListener onImageError;
+  final bool shrinkWrap;
+
+  final Map<String, Style> style;
+  final Map<String, CustomRender> customRender;
+  final List<String> blacklistedElements;
+
+  HtmlParser({
+    @required this.htmlData,
     this.onLinkTap,
-    this.renderNewlines = false,
-    this.customRender,
-    this.blockSpacing,
-    this.html,
+    this.onImageTap,
     this.onImageError,
-    this.linkStyle = const TextStyle(
-        decoration: TextDecoration.underline,
-        color: Colors.blueAccent,
-        decorationColor: Colors.blueAccent),
-    this.showImages = true,
+    this.shrinkWrap,
+    this.style,
+    this.customRender,
+    this.blacklistedElements,
   });
 
-  final double width;
-  final OnLinkTap onLinkTap;
-  final bool renderNewlines;
-  final CustomRender customRender;
-  final double blockSpacing;
-  final String html;
-  final ImageErrorListener onImageError;
-  final TextStyle linkStyle;
-  final bool showImages;
-
-  static const _supportedElements = [
-    "a",
-    "abbr",
-    "acronym",
-    "address",
-    "article",
-    "aside",
-    "b",
-    "bdi",
-    "bdo",
-    "big",
-    "blockquote",
-    "body",
-    "br",
-    "caption",
-    "cite",
-    "center",
-    "code",
-    "data",
-    "dd",
-    "del",
-    "dfn",
-    "div",
-    "dl",
-    "dt",
-    "em",
-    "figcaption",
-    "figure",
-    "font",
-    "footer",
-    "h1",
-    "h2",
-    "h3",
-    "h4",
-    "h5",
-    "h6",
-    "header",
-    "hr",
-    "i",
-    "img",
-    "ins",
-    "kbd",
-    "li",
-    "main",
-    "mark",
-    "nav",
-    "noscript",
-    "ol", //partial
-    "p",
-    "pre",
-    "q",
-    "rp",
-    "rt",
-    "ruby",
-    "s",
-    "samp",
-    "section",
-    "small",
-    "span",
-    "strike",
-    "strong",
-    "sub",
-    "sup",
-    "table",
-    "tbody",
-    "td",
-    "template",
-    "tfoot",
-    "th",
-    "thead",
-    "time",
-    "tr",
-    "tt",
-    "u",
-    "ul", //partial
-    "var",
-  ];
-
   @override
   Widget build(BuildContext context) {
-    return Wrap(
-      alignment: WrapAlignment.start,
-      children: parse(html),
+    dom.Document document = parseHTML(htmlData);
+    StyledElement lexedTree = lexDomTree(
+      document,
+      customRender?.keys?.toList() ?? [],
+      blacklistedElements,
+    );
+    StyledElement styledTree = applyCSS(lexedTree);
+    StyledElement inlineStyledTree = applyInlineStyles(styledTree);
+    StyledElement customStyledTree = _applyCustomStyles(inlineStyledTree);
+    StyledElement cascadedStyledTree = _cascadeStyles(customStyledTree);
+    StyledElement cleanedTree = cleanTree(cascadedStyledTree);
+    InlineSpan parsedTree = parseTree(
+      RenderContext(
+        buildContext: context,
+        parser: this,
+        style: Style.fromTextStyle(Theme.of(context).textTheme.bodyText2),
+      ),
+      cleanedTree,
     );
+
+    return StyledText(textSpan: parsedTree, style: cleanedTree.style);
   }
 
-  ///Parses an html string and returns a list of widgets that represent the body of your html document.
-  List<Widget> parse(String data) {
-    List<Widget> widgetList = new List<Widget>();
+  /// [parseHTML] converts a string of HTML to a DOM document using the dart `html` library.
+  static dom.Document parseHTML(String data) {
+    return htmlparser.parse(data);
+  }
 
-    if (renderNewlines) {
-      data = data.replaceAll("\n", "<br />");
-    }
-    dom.Document document = parser.parse(data);
-    widgetList.add(_parseNode(document.body));
-    return widgetList;
+  /// [parseCSS] converts a string of CSS to a CSS stylesheet using the dart `csslib` library.
+  static css.StyleSheet parseCSS(String data) {
+    return cssparser.parse(data);
+  }
+
+  /// [lexDomTree] converts a DOM document to a simplified tree of [StyledElement]s.
+  static StyledElement lexDomTree(
+    dom.Document html,
+    List<String> customRenderTags,
+    List<String> blacklistedElements,
+  ) {
+    StyledElement tree = StyledElement(
+      name: "[Tree Root]",
+      children: new List<StyledElement>(),
+      node: html.documentElement,
+    );
+
+    html.nodes.forEach((node) {
+      tree.children
+          .add(_recursiveLexer(node, customRenderTags, blacklistedElements));
+    });
+
+    return tree;
   }
 
-  Widget _parseNode(dom.Node node) {
-    if (customRender != null) {
-      final Widget customWidget =
-          customRender(node, _parseNodeList(node.nodes));
-      if (customWidget != null) {
-        return customWidget;
+  /// [_recursiveLexer] is the recursive worker function for [lexDomTree].
+  ///
+  /// It runs the parse functions of every type of
+  /// element and returns a [StyledElement] tree representing the element.
+  static StyledElement _recursiveLexer(
+    dom.Node node,
+    List<String> customRenderTags,
+    List<String> blacklistedElements,
+  ) {
+    List<StyledElement> children = List<StyledElement>();
+
+    node.nodes.forEach((childNode) {
+      children.add(
+          _recursiveLexer(childNode, customRenderTags, blacklistedElements));
+    });
+
+    //TODO(Sub6Resources): There's probably a more efficient way to look this up.
+    if (node is dom.Element) {
+      if (blacklistedElements?.contains(node.localName) ?? false) {
+        return EmptyContentElement();
+      }
+      if (STYLED_ELEMENTS.contains(node.localName)) {
+        return parseStyledElement(node, children);
+      } else if (INTERACTABLE_ELEMENTS.contains(node.localName)) {
+        return parseInteractableElement(node, children);
+      } else if (REPLACED_ELEMENTS.contains(node.localName)) {
+        return parseReplacedElement(node);
+      } else if (LAYOUT_ELEMENTS.contains(node.localName)) {
+        return parseLayoutElement(node, children);
+      } else if (TABLE_STYLE_ELEMENTS.contains(node.localName)) {
+        return parseTableDefinitionElement(node, children);
+      } else if (customRenderTags.contains(node.localName)) {
+        return parseStyledElement(node, children);
+      } else {
+        return EmptyContentElement();
       }
+    } else if (node is dom.Text) {
+      return TextContentElement(text: node.text);
+    } else {
+      return EmptyContentElement();
     }
+  }
 
-    if (node is dom.Element) {
-      if (!_supportedElements.contains(node.localName)) {
-        return Container();
+  ///TODO document
+  static StyledElement applyCSS(StyledElement tree) {
+    //Make sure style is never null.
+    if (tree.style == null) {
+      tree.style = Style();
+    }
+
+    tree.children?.forEach((e) => applyCSS(e));
+
+    return tree;
+  }
+
+  ///TODO document
+  static StyledElement applyInlineStyles(StyledElement tree) {
+    //TODO
+
+    return tree;
+  }
+
+  /// [applyCustomStyles] applies the [Style] objects passed into the [Html]
+  /// widget onto the [StyledElement] tree, no cascading of styles is done at this point.
+  StyledElement _applyCustomStyles(StyledElement tree) {
+    if (style == null) return tree;
+    style.forEach((key, style) {
+      if (tree.matchesSelector(key)) {
+        if (tree.style == null) {
+          tree.style = style;
+        } else {
+          tree.style = tree.style.merge(style);
+        }
       }
+    });
+    tree.children?.forEach(_applyCustomStyles);
 
-      switch (node.localName) {
-        case "a":
-          return GestureDetector(
-              child: DefaultTextStyle.merge(
-                child: Wrap(
-                  children: _parseNodeList(node.nodes),
-                ),
-                style: linkStyle,
-              ),
-              onTap: () {
-                if (node.attributes.containsKey('href') && onLinkTap != null) {
-                  String url = node.attributes['href'];
-                  onLinkTap(url);
-                }
-              });
-        case "abbr":
-          return DefaultTextStyle.merge(
-            child: Wrap(
-              children: _parseNodeList(node.nodes),
-            ),
-            style: const TextStyle(
-              decoration: TextDecoration.underline,
-              decorationStyle: TextDecorationStyle.dotted,
-            ),
-          );
-        case "acronym":
-          return DefaultTextStyle.merge(
-            child: Wrap(
-              children: _parseNodeList(node.nodes),
-            ),
-            style: const TextStyle(
-              decoration: TextDecoration.underline,
-              decorationStyle: TextDecorationStyle.dotted,
-            ),
-          );
-        case "address":
-          return DefaultTextStyle.merge(
-            child: Wrap(
-              children: _parseNodeList(node.nodes),
-            ),
-            style: const TextStyle(
-              fontStyle: FontStyle.italic,
-            ),
-          );
-        case "article":
-          return Container(
-            width: width,
-            child: Wrap(
-              crossAxisAlignment: WrapCrossAlignment.center,
-              children: _parseNodeList(node.nodes),
-            ),
-          );
-        case "aside":
-          return Container(
-            width: width,
-            child: Wrap(
-              crossAxisAlignment: WrapCrossAlignment.center,
-              children: _parseNodeList(node.nodes),
-            ),
-          );
-        case "b":
-          return DefaultTextStyle.merge(
-            child: Wrap(
-              children: _parseNodeList(node.nodes),
-            ),
-            style: const TextStyle(
-              fontWeight: FontWeight.bold,
-            ),
-          );
-        case "bdi":
-          return Wrap(
-            children: _parseNodeList(node.nodes),
-          );
-        case "bdo":
-          if (node.attributes["dir"] != null) {
-            return Directionality(
-              child: Wrap(
-                children: _parseNodeList(node.nodes),
-              ),
-              textDirection: node.attributes["dir"] == "rtl"
-                  ? TextDirection.rtl
-                  : TextDirection.ltr,
-            );
-          }
-          //Direction attribute is required, just render the text normally now.
-          return Wrap(
-            children: _parseNodeList(node.nodes),
-          );
-        case "big":
-          return DefaultTextStyle.merge(
-            child: Wrap(
-              children: _parseNodeList(node.nodes),
-            ),
-            style: const TextStyle(
-              fontSize: 20.0,
-            ),
-          );
-        case "blockquote":
-          return Padding(
-            padding:
-                EdgeInsets.fromLTRB(40.0, blockSpacing, 40.0, blockSpacing),
-            child: Container(
-              width: width,
-              child: Wrap(
-                crossAxisAlignment: WrapCrossAlignment.center,
-                children: _parseNodeList(node.nodes),
+    return tree;
+  }
+
+  /// [_cascadeStyles] cascades all of the inherited styles down the tree, applying them to each
+  /// child that doesn't specify a different style.
+  StyledElement _cascadeStyles(StyledElement tree) {
+    tree.children?.forEach((child) {
+      child.style = tree.style.copyOnlyInherited(child.style);
+      _cascadeStyles(child);
+    });
+
+    return tree;
+  }
+
+  /// [cleanTree] optimizes the [StyledElement] tree so all [BlockElement]s are
+  /// on the first level, redundant levels are collapsed, empty elements are
+  /// removed, and specialty elements are processed.
+  static StyledElement cleanTree(StyledElement tree) {
+    tree = _processInternalWhitespace(tree);
+    tree = _processInlineWhitespace(tree);
+    tree = _removeEmptyElements(tree);
+    tree = _processListCharacters(tree);
+    tree = _processBeforesAndAfters(tree);
+    tree = _collapseMargins(tree);
+    tree = _processFontSize(tree);
+    return tree;
+  }
+
+  /// [parseTree] converts a tree of [StyledElement]s to an [InlineSpan] tree.
+  ///
+  /// [parseTree] is responsible for handling the [customRender] parameter and
+  /// deciding what different `Style.display` options look like as Widgets.
+  InlineSpan parseTree(RenderContext context, StyledElement tree) {
+    // Merge this element's style into the context so that children
+    // inherit the correct style
+    RenderContext newContext = RenderContext(
+      buildContext: context.buildContext,
+      parser: this,
+      style: context.style.copyOnlyInherited(tree.style),
+    );
+
+    if (customRender?.containsKey(tree.name) ?? false) {
+      return WidgetSpan(
+        child: ContainerSpan(
+          newContext: newContext,
+          style: tree.style,
+          shrinkWrap: context.parser.shrinkWrap,
+          child: customRender[tree.name].call(
+            newContext,
+            ContainerSpan(
+              newContext: newContext,
+              style: tree.style,
+              shrinkWrap: context.parser.shrinkWrap,
+              children: tree.children
+                      ?.map((tree) => parseTree(newContext, tree))
+                      ?.toList() ??
+                  [],
+            ),
+            tree.attributes,
+            tree.element,
+          ),
+        ),
+      );
+    }
+
+    //Return the correct InlineSpan based on the element type.
+    if (tree.style?.display == Display.BLOCK) {
+      return WidgetSpan(
+        child: ContainerSpan(
+          newContext: newContext,
+          style: tree.style,
+          shrinkWrap: context.parser.shrinkWrap,
+          children: tree.children
+                  ?.map((tree) => parseTree(newContext, tree))
+                  ?.toList() ??
+              [],
+        ),
+      );
+    } else if (tree.style?.display == Display.LIST_ITEM) {
+      return WidgetSpan(
+        child: ContainerSpan(
+          newContext: newContext,
+          style: tree.style,
+          shrinkWrap: context.parser.shrinkWrap,
+          child: Stack(
+            children: <Widget>[
+              PositionedDirectional(
+                width: 30, //TODO derive this from list padding.
+                start: 0,
+                child: Text('${newContext.style.markerContent}\t',
+                    textAlign: TextAlign.right,
+                    style: newContext.style.generateTextStyle()),
               ),
-            ),
-          );
-        case "body":
-          return Container(
-            width: width,
-            child: Wrap(
-              crossAxisAlignment: WrapCrossAlignment.center,
-              children: _parseNodeList(node.nodes),
-            ),
-          );
-        case "br":
-          if (_isNotFirstBreakTag(node)) {
-            return Container(width: width, height: blockSpacing);
-          }
-          return Container(width: width);
-        case "caption":
-          return Container(
-            width: width,
-            child: Wrap(
-              crossAxisAlignment: WrapCrossAlignment.center,
-              alignment: WrapAlignment.center,
-              children: _parseNodeList(node.nodes),
-            ),
-          );
-        case "center":
-          return Container(
-              width: width,
-              child: Wrap(
-                crossAxisAlignment: WrapCrossAlignment.center,
-                children: _parseNodeList(node.nodes),
-                alignment: WrapAlignment.center,
-              ));
-        case "cite":
-          return DefaultTextStyle.merge(
-            child: Wrap(
-              children: _parseNodeList(node.nodes),
-            ),
-            style: const TextStyle(
-              fontStyle: FontStyle.italic,
-            ),
-          );
-        case "code":
-          return DefaultTextStyle.merge(
-            child: Wrap(
-              children: _parseNodeList(node.nodes),
-            ),
-            style: const TextStyle(
-              fontFamily: 'monospace',
-            ),
-          );
-        case "data":
-          return Wrap(
-            children: _parseNodeList(node.nodes),
-          );
-        case "dd":
-          return Padding(
-              padding: EdgeInsets.only(left: 40.0),
-              child: Container(
-                width: width,
-                child: Wrap(
-                  crossAxisAlignment: WrapCrossAlignment.center,
-                  children: _parseNodeList(node.nodes),
+              Padding(
+                padding: EdgeInsets.only(
+                    left: 30), //TODO derive this from list padding.
+                child: StyledText(
+                  textSpan: TextSpan(
+                    children: tree.children
+                            ?.map((tree) => parseTree(newContext, tree))
+                            ?.toList() ??
+                        [],
+                    style: newContext.style.generateTextStyle(),
+                  ),
+                  style: newContext.style,
                 ),
-              ));
-        case "del":
-          return DefaultTextStyle.merge(
-            child: Wrap(
-              children: _parseNodeList(node.nodes),
-            ),
-            style: const TextStyle(
-              decoration: TextDecoration.lineThrough,
-            ),
-          );
-        case "dfn":
-          return DefaultTextStyle.merge(
-            child: Wrap(
-              children: _parseNodeList(node.nodes),
-            ),
-            style: const TextStyle(
-              fontStyle: FontStyle.italic,
-            ),
-          );
-        case "div":
-          return Container(
-            width: width,
-            child: Wrap(
-              crossAxisAlignment: WrapCrossAlignment.center,
-              children: _parseNodeList(node.nodes),
-            ),
-          );
-        case "dl":
-          return Padding(
-              padding: EdgeInsets.only(top: blockSpacing, bottom: blockSpacing),
-              child: Column(
-                children: _parseNodeList(node.nodes),
-                crossAxisAlignment: CrossAxisAlignment.start,
-              ));
-        case "dt":
-          return Wrap(
-            children: _parseNodeList(node.nodes),
-          );
-        case "em":
-          return DefaultTextStyle.merge(
-            child: Wrap(
-              children: _parseNodeList(node.nodes),
-            ),
-            style: const TextStyle(
-              fontStyle: FontStyle.italic,
-            ),
-          );
-        case "figcaption":
-          return Wrap(
-            children: _parseNodeList(node.nodes),
-          );
-        case "figure":
-          return Padding(
-              padding:
-                  EdgeInsets.fromLTRB(40.0, blockSpacing, 40.0, blockSpacing),
-              child: Column(
-                children: _parseNodeList(node.nodes),
-                crossAxisAlignment: CrossAxisAlignment.center,
-              ));
-        case "font":
-          return Wrap(
-            children: _parseNodeList(node.nodes),
-          );
-        case "footer":
-          return Container(
-            width: width,
-            child: Wrap(
-              crossAxisAlignment: WrapCrossAlignment.center,
-              children: _parseNodeList(node.nodes),
-            ),
-          );
-        case "h1":
-          return DefaultTextStyle.merge(
-            child: Container(
-              width: width,
-              child: Wrap(
-                crossAxisAlignment: WrapCrossAlignment.center,
-                children: _parseNodeList(node.nodes),
-              ),
-            ),
-            style: const TextStyle(
-              fontSize: 28.0,
-              fontWeight: FontWeight.bold,
-            ),
-          );
-        case "h2":
-          return DefaultTextStyle.merge(
-            child: Container(
-              width: width,
-              child: Wrap(
-                crossAxisAlignment: WrapCrossAlignment.center,
-                children: _parseNodeList(node.nodes),
-              ),
-            ),
-            style: const TextStyle(
-              fontSize: 21.0,
-              fontWeight: FontWeight.bold,
-            ),
-          );
-        case "h3":
-          return DefaultTextStyle.merge(
-            child: Container(
-              width: width,
-              child: Wrap(
-                crossAxisAlignment: WrapCrossAlignment.center,
-                children: _parseNodeList(node.nodes),
-              ),
-            ),
-            style: const TextStyle(
-              fontSize: 16.0,
-              fontWeight: FontWeight.bold,
-            ),
-          );
-        case "h4":
-          return DefaultTextStyle.merge(
-            child: Container(
-              width: width,
-              child: Wrap(
-                crossAxisAlignment: WrapCrossAlignment.center,
-                children: _parseNodeList(node.nodes),
-              ),
-            ),
-            style: const TextStyle(
-              fontSize: 14.0,
-              fontWeight: FontWeight.bold,
-            ),
-          );
-        case "h5":
-          return DefaultTextStyle.merge(
-            child: Container(
-              width: width,
-              child: Wrap(
-                crossAxisAlignment: WrapCrossAlignment.center,
-                children: _parseNodeList(node.nodes),
-              ),
-            ),
-            style: const TextStyle(
-              fontSize: 12.0,
-              fontWeight: FontWeight.bold,
-            ),
-          );
-        case "h6":
-          return DefaultTextStyle.merge(
-            child: Container(
-              width: width,
-              child: Wrap(
-                crossAxisAlignment: WrapCrossAlignment.center,
-                children: _parseNodeList(node.nodes),
-              ),
-            ),
-            style: const TextStyle(
-              fontSize: 10.0,
-              fontWeight: FontWeight.bold,
-            ),
-          );
-        case "header":
-          return Container(
-            width: width,
-            child: Wrap(
-              crossAxisAlignment: WrapCrossAlignment.center,
-              children: _parseNodeList(node.nodes),
-            ),
-          );
-        case "hr":
-          return Padding(
-            padding: EdgeInsets.only(top: 7.0, bottom: 7.0),
-            child: Divider(height: 1.0, color: Colors.black38),
-          );
-        case "i":
-          return DefaultTextStyle.merge(
-            child: Wrap(
-              children: _parseNodeList(node.nodes),
-            ),
-            style: const TextStyle(
-              fontStyle: FontStyle.italic,
-            ),
-          );
-        case "img":
-          return Builder(
-            builder: (BuildContext context) {
-              if (showImages) {
-                if (node.attributes['src'] != null) {
-                  if (node.attributes['src'].startsWith("data:image") &&
-                      node.attributes['src'].contains("base64,")) {
-                    precacheImage(
-                      MemoryImage(base64.decode(
-                          node.attributes['src'].split("base64,")[1].trim())),
-                      context,
-                      onError: onImageError,
-                    );
-                    return Image.memory(base64.decode(
-                        node.attributes['src'].split("base64,")[1].trim()));
-                  }
-                  precacheImage(
-                    NetworkImage(node.attributes['src']),
-                    context,
-                    onError: onImageError,
-                  );
-                  return Image.network(node.attributes['src']);
-                } else if (node.attributes['alt'] != null) {
-                  //Temp fix for https://github.com/flutter/flutter/issues/736
-                  if (node.attributes['alt'].endsWith(" ")) {
-                    return Container(
-                        padding: EdgeInsets.only(right: 2.0),
-                        child: Text(node.attributes['alt']));
-                  } else {
-                    return Text(node.attributes['alt']);
-                  }
-                }
-              }
-              return Container();
-            },
-          );
-        case "ins":
-          return DefaultTextStyle.merge(
-            child: Wrap(
-              children: _parseNodeList(node.nodes),
-            ),
-            style: const TextStyle(
-              decoration: TextDecoration.underline,
-            ),
-          );
-        case "kbd":
-          return DefaultTextStyle.merge(
-            child: Wrap(
-              children: _parseNodeList(node.nodes),
-            ),
-            style: const TextStyle(
-              fontFamily: 'monospace',
-            ),
-          );
-        case "li":
-          String type = node.parent.localName; // Parent type; usually ol or ul
-          const EdgeInsets markPadding = EdgeInsets.symmetric(horizontal: 4.0);
-          Widget mark;
-          switch (type) {
-            case "ul":
-              mark = Container(child: Text('•'), padding: markPadding);
-              break;
-            case "ol":
-              int index = node.parent.children.indexOf(node) + 1;
-              mark = Container(child: Text("$index."), padding: markPadding);
-              break;
-            default: //Fallback to middle dot
-              mark = Container(width: 0.0, height: 0.0);
-              break;
-          }
-          return Container(
-            width: width,
-            child: Wrap(
-              crossAxisAlignment: WrapCrossAlignment.center,
-              children: <Widget>[
-                mark,
-                Wrap(
-                    crossAxisAlignment: WrapCrossAlignment.center,
-                    children: _parseNodeList(node.nodes))
-              ],
-            ),
-          );
-        case "main":
-          return Container(
-            width: width,
-            child: Wrap(
-              crossAxisAlignment: WrapCrossAlignment.center,
-              children: _parseNodeList(node.nodes),
-            ),
-          );
-        case "mark":
-          return DefaultTextStyle.merge(
-            child: Wrap(
-              children: _parseNodeList(node.nodes),
-            ),
-            style: TextStyle(
-              color: Colors.black,
-              background: _getPaint(Colors.yellow),
-            ),
-          );
-        case "nav":
-          return Container(
-            width: width,
-            child: Wrap(
-              crossAxisAlignment: WrapCrossAlignment.center,
-              children: _parseNodeList(node.nodes),
-            ),
-          );
-        case "noscript":
-          return Container(
-            width: width,
-            child: Wrap(
-              crossAxisAlignment: WrapCrossAlignment.center,
-              alignment: WrapAlignment.start,
-              children: _parseNodeList(node.nodes),
-            ),
-          );
-        case "ol":
-          return Column(
-            children: _parseNodeList(node.nodes),
-            crossAxisAlignment: CrossAxisAlignment.start,
-          );
-        case "p":
-          return Padding(
-            padding: EdgeInsets.only(top: blockSpacing, bottom: blockSpacing),
-            child: Container(
-              width: width,
-              child: Wrap(
-                crossAxisAlignment: WrapCrossAlignment.center,
-                alignment: WrapAlignment.start,
-                children: _parseNodeList(node.nodes),
-              ),
-            ),
-          );
-        case "pre":
-          return Padding(
-            padding: EdgeInsets.all(blockSpacing),
-            child: DefaultTextStyle.merge(
-              child: Text(node.innerHtml),
-              style: const TextStyle(
-                fontFamily: 'monospace',
-              ),
-            ),
-          );
-        case "q":
-          List<Widget> children = List<Widget>();
-          children.add(Text("\""));
-          children.addAll(_parseNodeList(node.nodes));
-          children.add(Text("\""));
-          return DefaultTextStyle.merge(
-            child: Wrap(
-              children: children,
-            ),
-            style: const TextStyle(
-              fontStyle: FontStyle.italic,
-            ),
-          );
-        case "rp":
-          return Wrap(
-            children: _parseNodeList(node.nodes),
-          );
-        case "rt":
-          return Wrap(
-            children: _parseNodeList(node.nodes),
-          );
-        case "ruby":
-          return Wrap(
-            children: _parseNodeList(node.nodes),
-          );
-        case "s":
-          return DefaultTextStyle.merge(
-            child: Wrap(
-              children: _parseNodeList(node.nodes),
-            ),
-            style: const TextStyle(
-              decoration: TextDecoration.lineThrough,
-            ),
-          );
-        case "samp":
-          return DefaultTextStyle.merge(
-            child: Wrap(
-              children: _parseNodeList(node.nodes),
-            ),
-            style: const TextStyle(
-              fontFamily: 'monospace',
-            ),
-          );
-        case "section":
-          return Container(
-            width: width,
-            child: Wrap(
-              crossAxisAlignment: WrapCrossAlignment.center,
-              children: _parseNodeList(node.nodes),
-            ),
-          );
-        case "small":
-          return DefaultTextStyle.merge(
-            child: Wrap(
-              children: _parseNodeList(node.nodes),
-            ),
-            style: const TextStyle(
-              fontSize: 10.0,
-            ),
-          );
-        case "span":
-          return Wrap(
-            children: _parseNodeList(node.nodes),
-          );
-        case "strike":
-          return DefaultTextStyle.merge(
-            child: Wrap(
-              children: _parseNodeList(node.nodes),
-            ),
-            style: const TextStyle(
-              decoration: TextDecoration.lineThrough,
-            ),
-          );
-        case "strong":
-          return DefaultTextStyle.merge(
-            child: Wrap(
-              children: _parseNodeList(node.nodes),
-            ),
-            style: const TextStyle(
-              fontWeight: FontWeight.bold,
-            ),
-          );
-        case "sub":
-        case "sup":
-          //Use builder to capture the parent font to inherit the font styles
-          return Builder(builder: (BuildContext context) {
-            final DefaultTextStyle parent = DefaultTextStyle.of(context);
-            TextStyle parentStyle = parent.style;
-
-            var painter = new TextPainter(
-                text: new TextSpan(
-                  text: node.text,
-                  style: parentStyle,
-                ),
-                textDirection: TextDirection.ltr);
-            painter.layout();
-            //print(painter.size);
-
-            //Get the height from the default text
-            var height = painter.size.height *
-                1.35; //compute a higher height for the text to increase the offset of the Positioned text
-
-            painter = new TextPainter(
-                text: new TextSpan(
-                  text: node.text,
-                  style: parentStyle.merge(TextStyle(
-                      fontSize:
-                          parentStyle.fontSize * OFFSET_TAGS_FONT_SIZE_FACTOR)),
-                ),
-                textDirection: TextDirection.ltr);
-            painter.layout();
-            //print(painter.size);
-
-            //Get the width from the reduced/positioned text
-            var width = painter.size.width;
-
-            //print("Width: $width, Height: $height");
-
-            return DefaultTextStyle.merge(
-              child: Wrap(
-                crossAxisAlignment: WrapCrossAlignment.center,
-                children: [
-                  Stack(
-                    fit: StackFit.loose,
-                    children: [
-                      //The Stack needs a non-positioned object for the next widget to respect the space so we create
-                      //a sized box to fill the required space
-                      SizedBox(
-                        width: width,
-                        height: height,
-                      ),
-                      DefaultTextStyle.merge(
-                        child: Positioned(
-                          child: Wrap(children: _parseNodeList(node.nodes)),
-                          bottom: node.localName == "sub" ? 0 : null,
-                          top: node.localName == "sub" ? null : 0,
-                        ),
-                        style: TextStyle(
-                            fontSize: parentStyle.fontSize *
-                                OFFSET_TAGS_FONT_SIZE_FACTOR),
-                      )
-                    ],
-                  )
-                ],
-              ),
-            );
-          });
-        case "table":
-          return Column(
-            children: _parseNodeList(node.nodes),
-            crossAxisAlignment: CrossAxisAlignment.start,
-          );
-        case "tbody":
-          return Column(
-            children: _parseNodeList(node.nodes),
-            crossAxisAlignment: CrossAxisAlignment.start,
-          );
-        case "td":
-          int colspan = 1;
-          if (node.attributes['colspan'] != null) {
-            colspan = int.tryParse(node.attributes['colspan']);
-          }
-          return Expanded(
-            flex: colspan,
-            child: Wrap(
-              crossAxisAlignment: WrapCrossAlignment.center,
-              children: _parseNodeList(node.nodes),
-            ),
-          );
-        case "template":
-          //Not usually displayed in HTML
-          return Container();
-        case "tfoot":
-          return Column(
-            children: _parseNodeList(node.nodes),
-            crossAxisAlignment: CrossAxisAlignment.start,
-          );
-        case "th":
-          int colspan = 1;
-          if (node.attributes['colspan'] != null) {
-            colspan = int.tryParse(node.attributes['colspan']);
-          }
-          return DefaultTextStyle.merge(
-            child: Expanded(
-              flex: colspan,
-              child: Wrap(
-                crossAxisAlignment: WrapCrossAlignment.center,
-                alignment: WrapAlignment.center,
-                children: _parseNodeList(node.nodes),
-              ),
-            ),
-            style: const TextStyle(
-              fontWeight: FontWeight.bold,
-            ),
-          );
-        case "thead":
-          return Column(
-            children: _parseNodeList(node.nodes),
-            crossAxisAlignment: CrossAxisAlignment.start,
-          );
-        case "time":
-          return Wrap(
-            children: _parseNodeList(node.nodes),
-          );
-        case "tr":
-          return Row(
-            children: _parseNodeList(node.nodes),
-            crossAxisAlignment: CrossAxisAlignment.center,
-          );
-        case "tt":
-          return DefaultTextStyle.merge(
-            child: Wrap(
-              children: _parseNodeList(node.nodes),
-            ),
-            style: const TextStyle(
-              fontFamily: 'monospace',
-            ),
-          );
-        case "u":
-          return DefaultTextStyle.merge(
-            child: Wrap(
-              children: _parseNodeList(node.nodes),
-            ),
-            style: const TextStyle(
-              decoration: TextDecoration.underline,
-            ),
-          );
-        case "ul":
-          return Column(
-            children: _parseNodeList(node.nodes),
-            crossAxisAlignment: CrossAxisAlignment.start,
-          );
-        case "var":
-          return DefaultTextStyle.merge(
-            child: Wrap(
-              children: _parseNodeList(node.nodes),
-            ),
-            style: const TextStyle(
-              fontStyle: FontStyle.italic,
-            ),
-          );
+              )
+            ],
+          ),
+        ),
+      );
+    } else if (tree is ReplacedElement) {
+      if (tree is TextContentElement) {
+        return TextSpan(text: tree.text);
+      } else {
+        return WidgetSpan(
+          alignment: tree.alignment,
+          baseline: TextBaseline.alphabetic,
+          child: tree.toWidget(context),
+        );
       }
-    } else if (node is dom.Text) {
-      //We don't need to worry about rendering extra whitespace
-      if (node.text.trim() == "" && node.text.indexOf(" ") == -1) {
-        return Wrap();
+    } else if (tree is InteractableElement) {
+      return WidgetSpan(
+        child: RawGestureDetector(
+          gestures: {
+            MultipleTapGestureRecognizer: GestureRecognizerFactoryWithHandlers<
+                MultipleTapGestureRecognizer>(
+              () => MultipleTapGestureRecognizer(),
+              (instance) {
+                instance..onTap = () => onLinkTap?.call(tree.href);
+              },
+            ),
+          },
+          child: StyledText(
+            textSpan: TextSpan(
+              style: newContext.style.generateTextStyle(),
+              children: tree.children
+                      .map((tree) => parseTree(newContext, tree))
+                      .toList() ??
+                  [],
+            ),
+            style: newContext.style,
+          ),
+        ),
+      );
+    } else if (tree is LayoutElement) {
+      return WidgetSpan(
+        child: tree.toWidget(context),
+      );
+    } else if (tree.style.verticalAlign != null &&
+        tree.style.verticalAlign != VerticalAlign.BASELINE) {
+      double verticalOffset;
+      switch (tree.style.verticalAlign) {
+        case VerticalAlign.SUB:
+          verticalOffset = tree.style.fontSize.size / 2.5;
+          break;
+        case VerticalAlign.SUPER:
+          verticalOffset = tree.style.fontSize.size / -2.5;
+          break;
+        default:
+          break;
       }
-      if (node.text.trim() == "" && node.text.indexOf(" ") != -1) {
-        node.text = " ";
+      //Requires special layout features not available in the TextStyle API.
+      return WidgetSpan(
+        child: Transform.translate(
+          offset: Offset(0, verticalOffset),
+          child: StyledText(
+            textSpan: TextSpan(
+              style: newContext.style.generateTextStyle(),
+              children: tree.children
+                      .map((tree) => parseTree(newContext, tree))
+                      .toList() ??
+                  [],
+            ),
+            style: newContext.style,
+          ),
+        ),
+      );
+    } else {
+      ///[tree] is an inline element.
+      return TextSpan(
+        style: newContext.style.generateTextStyle(),
+        children:
+            tree.children.map((tree) => parseTree(newContext, tree)).toList(),
+      );
+    }
+  }
+
+  /// [processWhitespace] removes unnecessary whitespace from the StyledElement tree.
+  ///
+  /// The criteria for determining which whitespace is replaceable is outlined
+  /// at https://www.w3.org/TR/css-text-3/
+  /// and summarized at https://medium.com/@patrickbrosset/when-does-white-space-matter-in-html-b90e8a7cdd33
+  static StyledElement _processInternalWhitespace(StyledElement tree) {
+    if ((tree.style?.whiteSpace ?? WhiteSpace.NORMAL) == WhiteSpace.PRE) {
+      // Preserve this whitespace
+    } else if (tree is TextContentElement) {
+      tree.text = _removeUnnecessaryWhitespace(tree.text);
+    } else {
+      tree.children?.forEach(_processInternalWhitespace);
+    }
+    return tree;
+  }
+
+  /// [_processInlineWhitespace] is responsible for removing redundant whitespace
+  /// between and among inline elements. It does so by creating a boolean [Context]
+  /// and passing it to the [_processInlineWhitespaceRecursive] function.
+  static StyledElement _processInlineWhitespace(StyledElement tree) {
+    final whitespaceParsingContext = Context(false);
+    tree = _processInlineWhitespaceRecursive(tree, whitespaceParsingContext);
+    return tree;
+  }
+
+  /// [_processInlineWhitespaceRecursive] analyzes the whitespace between and among different
+  /// inline elements, and replaces any instance of two or more spaces with a single space, according
+  /// to the w3's HTML whitespace processing specification linked to above.
+  static StyledElement _processInlineWhitespaceRecursive(
+    StyledElement tree,
+    Context<bool> wpc,
+  ) {
+    if (tree.style.display == Display.BLOCK) {
+      wpc.data = false;
+    }
+
+    if (tree is ImageContentElement || tree is SvgContentElement) {
+      wpc.data = false;
+    }
+
+    if (tree is TextContentElement) {
+      if (wpc.data && tree.text.startsWith(' ')) {
+        tree.text = tree.text.replaceFirst(' ', '');
       }
 
-      String finalText = trimStringHtml(node.text);
-      //Temp fix for https://github.com/flutter/flutter/issues/736
-      if (finalText.endsWith(" ")) {
-        return Container(
-            padding: EdgeInsets.only(right: 2.0), child: Text(finalText));
+      if (tree.text.endsWith(' ') || tree.text.endsWith('\n')) {
+        wpc.data = true;
       } else {
-        return Text(finalText);
+        wpc.data = false;
       }
     }
-    return Wrap();
+
+    tree.children?.forEach((e) => _processInlineWhitespaceRecursive(e, wpc));
+
+    return tree;
   }
 
-  List<Widget> _parseNodeList(List<dom.Node> nodeList) {
-    return nodeList.map((node) {
-      return _parseNode(node);
-    }).toList();
+  /// [removeUnnecessaryWhitespace] removes "unnecessary" white space from the given String.
+  ///
+  /// The steps for removing this whitespace are as follows:
+  /// (1) Remove any whitespace immediately preceding or following a newline.
+  /// (2) Replace all newlines with a space
+  /// (3) Replace all tabs with a space
+  /// (4) Replace any instances of two or more spaces with a single space.
+  static String _removeUnnecessaryWhitespace(String text) {
+    return text
+        .replaceAll(RegExp("\ *(?=\n)"), "\n")
+        .replaceAll(RegExp("(?:\n)\ *"), "\n")
+        .replaceAll("\n", " ")
+        .replaceAll("\t", " ")
+        .replaceAll(RegExp(" {2,}"), " ");
   }
 
-  Paint _getPaint(Color color) {
-    Paint paint = new Paint();
-    paint.color = color;
-    return paint;
+  /// [processListCharacters] adds list characters to the front of all list items.
+  ///
+  /// The function uses the [_processListCharactersRecursive] function to do most of its work.
+  static StyledElement _processListCharacters(StyledElement tree) {
+    final olStack = ListQueue<Context<int>>();
+    tree = _processListCharactersRecursive(tree, olStack);
+    return tree;
   }
 
-  String trimStringHtml(String stringToTrim) {
-    stringToTrim = stringToTrim.replaceAll("\n", "");
-    while (stringToTrim.indexOf("  ") != -1) {
-      stringToTrim = stringToTrim.replaceAll("  ", " ");
+  /// [_processListCharactersRecursive] uses a Stack of integers to properly number and
+  /// bullet all list items according to the [ListStyleType] they have been given.
+  static StyledElement _processListCharactersRecursive(
+      StyledElement tree, ListQueue<Context<int>> olStack) {
+    if (tree.name == 'ol') {
+      olStack.add(Context(0));
+    } else if (tree.style.display == Display.LIST_ITEM) {
+      switch (tree.style.listStyleType) {
+        case ListStyleType.DISC:
+          tree.style.markerContent = '•';
+          break;
+        case ListStyleType.DECIMAL:
+          olStack.last.data += 1;
+          tree.style.markerContent = '${olStack.last.data}.';
+      }
     }
-    return stringToTrim;
+
+    tree.children?.forEach((e) => _processListCharactersRecursive(e, olStack));
+
+    if (tree.name == 'ol') {
+      olStack.removeLast();
+    }
+
+    return tree;
   }
 
-  bool _isNotFirstBreakTag(dom.Node node) {
-    int index = node.parentNode.nodes.indexOf(node);
-    if (index == 0) {
-      if (node.parentNode == null) {
-        return false;
+  /// [_processBeforesAndAfters] adds text content to the beginning and end of
+  /// the list of the trees children according to the `before` and `after` Style
+  /// properties.
+  static StyledElement _processBeforesAndAfters(StyledElement tree) {
+    if (tree.style?.before != null) {
+      tree.children?.insert(
+          0, TextContentElement(text: tree.style.before, style: tree.style));
+    }
+    if (tree.style?.after != null) {
+      tree.children
+          ?.add(TextContentElement(text: tree.style.after, style: tree.style));
+    } else {
+      tree.children?.forEach(_processBeforesAndAfters);
+    }
+    return tree;
+  }
+
+  /// [collapseMargins] follows the specifications at https://www.w3.org/TR/CSS21/box.html#collapsing-margins
+  /// for collapsing margins of block-level boxes. This prevents the doubling of margins between
+  /// boxes, and makes for a more correct rendering of the html content.
+  ///
+  /// Paraphrased from the CSS specification:
+  /// Margins are collapsed if both belong to vertically-adjacent box edges, i.e form one of the following pairs:
+  /// (1) Top margin of a box and top margin of its first in-flow child
+  /// (2) Bottom margin of a box and top margin of its next in-flow following sibling
+  /// (3) Bottom margin of a last in-flow child and bottom margin of its parent (if the parent's height is not explicit)
+  /// (4) Top and Bottom margins of a box with a height of zero or no in-flow children.
+  static StyledElement _collapseMargins(StyledElement tree) {
+    //Short circuit if we've reached a leaf of the tree
+    if (tree.children == null || tree.children.isEmpty) {
+      // Handle case (4) from above.
+      if ((tree.style.height ?? 0) == 0) {
+        tree.style.margin = EdgeInsets.zero;
+      }
+      return tree;
+    }
+
+    //Collapsing should be depth-first.
+    tree.children?.forEach(_collapseMargins);
+
+    //The root boxes do not collapse.
+    if (tree.name == '[Tree Root]' || tree.name == 'html') {
+      return tree;
+    }
+
+    // Handle case (1) from above.
+    // Top margins cannot collapse if the element has padding
+    if ((tree.style.padding?.top ?? 0) == 0) {
+      final parentTop = tree.style.margin?.top ?? 0;
+      final firstChildTop = tree.children.first.style.margin?.top ?? 0;
+      final newOuterMarginTop = max(parentTop, firstChildTop);
+
+      // Set the parent's margin
+      if (tree.style.margin == null) {
+        tree.style.margin = EdgeInsets.only(top: newOuterMarginTop);
+      } else {
+        tree.style.margin = tree.style.margin.copyWith(top: newOuterMarginTop);
+      }
+
+      // And remove the child's margin
+      if (tree.children.first.style.margin == null) {
+        tree.children.first.style.margin = EdgeInsets.zero;
+      } else {
+        tree.children.first.style.margin =
+            tree.children.first.style.margin.copyWith(top: 0);
       }
-      return _isNotFirstBreakTag(node.parentNode);
-    } else if (node.parentNode.nodes[index - 1] is dom.Element) {
-      if ((node.parentNode.nodes[index - 1] as dom.Element).localName == "br") {
-        return true;
+    }
+
+    // Handle case (3) from above.
+    // Bottom margins cannot collapse if the element has padding
+    if ((tree.style.padding?.bottom ?? 0) == 0) {
+      final parentBottom = tree.style.margin?.bottom ?? 0;
+      final lastChildBottom = tree.children.last.style.margin?.bottom ?? 0;
+      final newOuterMarginBottom = max(parentBottom, lastChildBottom);
+
+      // Set the parent's margin
+      if (tree.style.margin == null) {
+        tree.style.margin = EdgeInsets.only(bottom: newOuterMarginBottom);
+      } else {
+        tree.style.margin =
+            tree.style.margin.copyWith(bottom: newOuterMarginBottom);
       }
-      return false;
-    } else if (node.parentNode.nodes[index - 1] is dom.Text) {
-      if ((node.parentNode.nodes[index - 1] as dom.Text).text.trim() == "") {
-        return _isNotFirstBreakTag(node.parentNode.nodes[index - 1]);
+
+      // And remove the child's margin
+      if (tree.children.last.style.margin == null) {
+        tree.children.last.style.margin = EdgeInsets.zero;
       } else {
-        return false;
+        tree.children.last.style.margin =
+            tree.children.last.style.margin.copyWith(bottom: 0);
       }
     }
-    return false;
+
+    // Handle case (2) from above.
+    if (tree.children.length > 1) {
+      for (int i = 1; i < tree.children.length; i++) {
+        final previousSiblingBottom =
+            tree.children[i - 1].style.margin?.bottom ?? 0;
+        final thisTop = tree.children[i].style.margin?.top ?? 0;
+        final newInternalMargin = max(previousSiblingBottom, thisTop) / 2;
+
+        if (tree.children[i - 1].style.margin == null) {
+          tree.children[i - 1].style.margin =
+              EdgeInsets.only(bottom: newInternalMargin);
+        } else {
+          tree.children[i - 1].style.margin = tree.children[i - 1].style.margin
+              .copyWith(bottom: newInternalMargin);
+        }
+
+        if (tree.children[i].style.margin == null) {
+          tree.children[i].style.margin =
+              EdgeInsets.only(top: newInternalMargin);
+        } else {
+          tree.children[i].style.margin =
+              tree.children[i].style.margin.copyWith(top: newInternalMargin);
+        }
+      }
+    }
+
+    return tree;
+  }
+
+  /// [removeEmptyElements] recursively removes empty elements.
+  ///
+  /// An empty element is any [EmptyContentElement], any empty [TextContentElement],
+  /// or any block-level [TextContentElement] that contains only whitespace and doesn't follow
+  /// a block element or a line break.
+  static StyledElement _removeEmptyElements(StyledElement tree) {
+    List<StyledElement> toRemove = new List<StyledElement>();
+    bool lastChildBlock = true;
+    tree.children?.forEach((child) {
+      if (child is EmptyContentElement) {
+        toRemove.add(child);
+      } else if (child is TextContentElement && (child.text.isEmpty)) {
+        toRemove.add(child);
+      } else if (child is TextContentElement &&
+          child.style.whiteSpace != WhiteSpace.PRE &&
+          tree.style.display == Display.BLOCK &&
+          child.text.trim().isEmpty &&
+          lastChildBlock) {
+        toRemove.add(child);
+      } else {
+        _removeEmptyElements(child);
+      }
+
+      // This is used above to check if the previous element is a block element or a line break.
+      lastChildBlock = (child.style.display == Display.BLOCK ||
+          child.style.display == Display.LIST_ITEM ||
+          (child is TextContentElement && child.text == '\n'));
+    });
+    tree.children?.removeWhere((element) => toRemove.contains(element));
+
+    return tree;
+  }
+
+  /// [_processFontSize] changes percent-based font sizes (negative numbers in this implementation)
+  /// to pixel-based font sizes.
+  static StyledElement _processFontSize(StyledElement tree) {
+    double parentFontSize = tree.style?.fontSize?.size ?? FontSize.medium.size;
+
+    tree.children?.forEach((child) {
+      if ((child.style.fontSize?.size ?? parentFontSize) < 0) {
+        child.style.fontSize =
+            FontSize(parentFontSize * -child.style.fontSize.size);
+      }
+
+      _processFontSize(child);
+    });
+    return tree;
+  }
+}
+
+/// The [RenderContext] is available when parsing the tree. It contains information
+/// about the [BuildContext] of the `Html` widget, contains the configuration available
+/// in the [HtmlParser], and contains information about the [Style] of the current
+/// tree root.
+class RenderContext {
+  final BuildContext buildContext;
+  final HtmlParser parser;
+  final Style style;
+
+  RenderContext({
+    this.buildContext,
+    this.parser,
+    this.style,
+  });
+}
+
+/// A [ContainerSpan] is a widget with an [InlineSpan] child or children.
+///
+/// A [ContainerSpan] can have a border, background color, height, width, padding, and margin
+/// and can represent either an INLINE or BLOCK-level element.
+class ContainerSpan extends StatelessWidget {
+  final Widget child;
+  final List<InlineSpan> children;
+  final Style style;
+  final RenderContext newContext;
+  final bool shrinkWrap;
+
+  ContainerSpan({
+    this.child,
+    this.children,
+    this.style,
+    this.newContext,
+    this.shrinkWrap = false,
+  });
+
+  @override
+  Widget build(BuildContext _) {
+    return Container(
+      decoration: BoxDecoration(
+        border: style?.border,
+        color: style?.backgroundColor,
+      ),
+      height: style?.height,
+      width: style?.width,
+      padding: style?.padding,
+      margin: style?.margin,
+      alignment: shrinkWrap ? null : style?.alignment,
+      child: child ??
+          StyledText(
+            textSpan: TextSpan(
+              style: newContext.style.generateTextStyle(),
+              children: children,
+            ),
+            style: newContext.style,
+          ),
+    );
+  }
+}
+
+class StyledText extends StatelessWidget {
+  final InlineSpan textSpan;
+  final Style style;
+
+  const StyledText({
+    this.textSpan,
+    this.style,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      width:
+          style.display == Display.BLOCK || style.display == Display.LIST_ITEM
+              ? double.infinity
+              : null,
+      child: Text.rich(
+        textSpan,
+        style: style.generateTextStyle(),
+        textAlign: style.textAlign,
+        textDirection: style.direction,
+      ),
+    );
   }
 }
diff --git a/lib/image_properties.dart b/lib/image_properties.dart
deleted file mode 100644
index 62dfab5b63..0000000000
--- a/lib/image_properties.dart
+++ /dev/null
@@ -1,34 +0,0 @@
-import 'package:flutter/material.dart';
-
-@immutable
-class ImageProperties {
-  final String semanticLabel;
-  final bool excludeFromSemantics;
-  final double width;
-  final double height;
-  final Color color;
-  final BlendMode colorBlendMode;
-  final BoxFit fit;
-  final AlignmentGeometry alignment;
-  final ImageRepeat repeat;
-  final Rect centerSlice;
-  final bool matchTextDirection;
-  final FilterQuality filterQuality;
-  final double scale;
-
-  const ImageProperties({
-    this.scale = 1,
-    this.semanticLabel,
-    this.excludeFromSemantics = false,
-    this.width,
-    this.height,
-    this.color,
-    this.colorBlendMode,
-    this.fit,
-    this.alignment = Alignment.center,
-    this.repeat = ImageRepeat.noRepeat,
-    this.centerSlice,
-    this.matchTextDirection = false,
-    this.filterQuality = FilterQuality.low,
-  });
-}
diff --git a/lib/rich_text_parser.dart b/lib/rich_text_parser.dart
deleted file mode 100644
index e842b808fd..0000000000
--- a/lib/rich_text_parser.dart
+++ /dev/null
@@ -1,1027 +0,0 @@
-import 'dart:convert';
-
-import 'package:flutter/gestures.dart';
-import 'package:flutter/material.dart';
-import 'package:html/dom.dart' as dom;
-import 'package:html/parser.dart' as parser;
-
-import 'image_properties.dart';
-
-typedef CustomRender = Widget Function(dom.Node node, List<Widget> children);
-typedef CustomTextStyle = TextStyle Function(
-  dom.Node node,
-  TextStyle baseStyle,
-);
-typedef CustomTextAlign = TextAlign Function(dom.Element elem);
-typedef CustomEdgeInsets = EdgeInsets Function(dom.Node node);
-typedef OnLinkTap = void Function(String url);
-typedef OnImageTap = void Function(String source);
-
-const OFFSET_TAGS_FONT_SIZE_FACTOR =
-    0.7; //The ratio of the parent font for each of the offset tags: sup or sub
-
-class LinkTextSpan extends TextSpan {
-  // Beware!
-  //
-  // This class is only safe because the TapGestureRecognizer is not
-  // given a deadline and therefore never allocates any resources.
-  //
-  // In any other situation -- setting a deadline, using any of the less trivial
-  // recognizers, etc -- you would have to manage the gesture recognizer's
-  // lifetime and call dispose() when the TextSpan was no longer being rendered.
-  //
-  // Since TextSpan itself is @immutable, this means that you would have to
-  // manage the recognizer from outside the TextSpan, e.g. in the State of a
-  // stateful widget that then hands the recognizer to the TextSpan.
-  final String url;
-
-  LinkTextSpan(
-      {TextStyle style,
-      this.url,
-      String text,
-      OnLinkTap onLinkTap,
-      List<TextSpan> children})
-      : super(
-          style: style,
-          text: text,
-          children: children ?? <TextSpan>[],
-          recognizer: TapGestureRecognizer()
-            ..onTap = () {
-              onLinkTap?.call(url);
-            },
-        );
-}
-
-class LinkBlock extends Container {
-  // final String url;
-  // final EdgeInsets padding;
-  // final EdgeInsets margin;
-  // final OnLinkTap onLinkTap;
-  final List<Widget> children;
-
-  LinkBlock({
-    String url,
-    EdgeInsets padding,
-    EdgeInsets margin,
-    OnLinkTap onLinkTap,
-    this.children,
-  }) : super(
-          padding: padding,
-          margin: margin,
-          child: GestureDetector(
-            onTap: () {
-              onLinkTap(url);
-            },
-            child: Column(
-              children: children,
-            ),
-          ),
-        );
-}
-
-class BlockText extends StatelessWidget {
-  final RichText child;
-  final EdgeInsets padding;
-  final EdgeInsets margin;
-  final Decoration decoration;
-  final bool shrinkToFit;
-
-  BlockText({
-    @required this.child,
-    @required this.shrinkToFit,
-    this.padding,
-    this.margin,
-    this.decoration,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      width: shrinkToFit ? null : double.infinity,
-      padding: this.padding,
-      margin: this.margin,
-      decoration: this.decoration,
-      child: child,
-    );
-  }
-}
-
-class ParseContext {
-  List<Widget> rootWidgetList; // the widgetList accumulator
-  dynamic parentElement; // the parent spans accumulator
-  int indentLevel = 0;
-  int listCount = 0;
-  String listChar = '•';
-  String blockType; // blockType can be 'p', 'div', 'ul', 'ol', 'blockquote'
-  bool condenseWhitespace = true;
-  bool spansOnly = false;
-  bool inBlock = false;
-  TextStyle childStyle;
-
-  ParseContext({
-    this.rootWidgetList,
-    this.parentElement,
-    this.indentLevel = 0,
-    this.listCount = 0,
-    this.listChar = '•',
-    this.blockType,
-    this.condenseWhitespace = true,
-    this.spansOnly = false,
-    this.inBlock = false,
-    this.childStyle,
-  }) {
-    childStyle = childStyle ?? TextStyle();
-  }
-
-  ParseContext.fromContext(ParseContext parseContext) {
-    rootWidgetList = parseContext.rootWidgetList;
-    parentElement = parseContext.parentElement;
-    indentLevel = parseContext.indentLevel;
-    listCount = parseContext.listCount;
-    listChar = parseContext.listChar;
-    blockType = parseContext.blockType;
-    condenseWhitespace = parseContext.condenseWhitespace;
-    spansOnly = parseContext.spansOnly;
-    inBlock = parseContext.inBlock;
-    childStyle = parseContext.childStyle ?? TextStyle();
-  }
-}
-
-class HtmlRichTextParser extends StatelessWidget {
-  HtmlRichTextParser({
-    this.shrinkToFit,
-    this.onLinkTap,
-    this.renderNewlines = false,
-    this.html,
-    this.customEdgeInsets,
-    this.customTextStyle,
-    this.customTextAlign,
-    this.onImageError,
-    this.linkStyle = const TextStyle(
-      decoration: TextDecoration.underline,
-      color: Colors.blueAccent,
-      decorationColor: Colors.blueAccent,
-    ),
-    this.imageProperties,
-    this.onImageTap,
-    this.showImages = true,
-  });
-
-  final double indentSize = 10.0;
-
-  final bool shrinkToFit;
-  final onLinkTap;
-  final bool renderNewlines;
-  final String html;
-  final CustomEdgeInsets customEdgeInsets;
-  final CustomTextStyle customTextStyle;
-  final CustomTextAlign customTextAlign;
-  final ImageErrorListener onImageError;
-  final TextStyle linkStyle;
-  final ImageProperties imageProperties;
-  final OnImageTap onImageTap;
-  final bool showImages;
-
-  // style elements set a default style
-  // for all child nodes
-  // treat ol, ul, and blockquote like style elements also
-  static const _supportedStyleElements = [
-    "b",
-    "i",
-    "address",
-    "cite",
-    "var",
-    "em",
-    "strong",
-    "kbd",
-    "samp",
-    "tt",
-    "code",
-    "ins",
-    "u",
-    "small",
-    "abbr",
-    "acronym",
-    "mark",
-    "ol",
-    "ul",
-    "blockquote",
-    "del",
-    "s",
-    "strike",
-    "ruby",
-    "rp",
-    "rt",
-    "bdi",
-    "data",
-    "time",
-    "span",
-    "big",
-    "sub",
-  ];
-
-  // specialty elements require unique handling
-  // eg. the "a" tag can contain a block of text or an image
-  // sometimes "a" will be rendered with a textspan and recognizer
-  // sometimes "a" will be rendered with a clickable Block
-  static const _supportedSpecialtyElements = [
-    "a",
-    "br",
-    "table",
-    "tbody",
-    "caption",
-    "td",
-    "tfoot",
-    "th",
-    "thead",
-    "tr",
-    "q",
-  ];
-
-  // block elements are always rendered with a new
-  // block-level widget, if a block level element
-  // is found inside another block level element,
-  // we simply treat it as a new block level element
-  static const _supportedBlockElements = [
-    "article",
-    "aside",
-    "body",
-    "center",
-    "dd",
-    "dfn",
-    "div",
-    "dl",
-    "dt",
-    "figcaption",
-    "figure",
-    "footer",
-    "h1",
-    "h2",
-    "h3",
-    "h4",
-    "h5",
-    "h6",
-    "header",
-    "hr",
-    "img",
-    "li",
-    "main",
-    "nav",
-    "noscript",
-    "p",
-    "pre",
-    "section",
-  ];
-
-  static get _supportedElements => List()
-    ..addAll(_supportedStyleElements)
-    ..addAll(_supportedSpecialtyElements)
-    ..addAll(_supportedBlockElements);
-
-  // this function is called recursively for each child
-  // however, the first time it is called, we make sure
-  // to ignore the node itself, so we only pay attention
-  // to the children
-  bool _hasBlockChild(dom.Node node, {bool ignoreSelf = true}) {
-    bool retval = false;
-    if (node is dom.Element) {
-      if (_supportedBlockElements.contains(node.localName) && !ignoreSelf)
-        return true;
-      node.nodes.forEach((dom.Node node) {
-        if (_hasBlockChild(node, ignoreSelf: false)) retval = true;
-      });
-    }
-    return retval;
-  }
-
-  // Parses an html string and returns a list of RichText widgets that represent the body of your html document.
-
-  @override
-  Widget build(BuildContext context) {
-    String data = html;
-
-    if (renderNewlines) {
-      data = data.replaceAll("\n", "<br />");
-    }
-    dom.Document document = parser.parse(data);
-    dom.Node body = document.body;
-
-    List<Widget> widgetList = new List<Widget>();
-    ParseContext parseContext = ParseContext(
-      rootWidgetList: widgetList,
-      childStyle: DefaultTextStyle.of(context).style,
-    );
-
-    // don't ignore the top level "body"
-    _parseNode(body, parseContext, context);
-
-    // filter out empty widgets
-    List<Widget> children = [];
-    widgetList.forEach((dynamic w) {
-      if (w is BlockText) {
-        if (w.child.text == null) return;
-        TextSpan childTextSpan = w.child.text;
-        if ((childTextSpan.text == null || childTextSpan.text.isEmpty) &&
-            (childTextSpan.children == null || childTextSpan.children.isEmpty))
-          return;
-      } else if (w is LinkBlock) {
-        if (w.children.isEmpty) return;
-      } else if (w is LinkTextSpan) {
-        if (w.text.isEmpty && w.children.isEmpty) return;
-      }
-      children.add(w);
-    });
-
-    return Column(
-      children: children,
-    );
-  }
-
-  // THE WORKHORSE FUNCTION!!
-  // call the function with the current node and a ParseContext
-  // the ParseContext is used to do a number of things
-  // first, since we call this function recursively, the parseContext holds references to
-  // all the data that is relevant to a particular iteration and its child iterations
-  // it holds information about whether to indent the text, whether we are in a list, etc.
-  //
-  // secondly, it holds the 'global' widgetList that accumulates all the block-level widgets
-  //
-  // thirdly, it holds a reference to the most recent "parent" so that this iteration of the
-  // function can add child nodes to the parent if it should
-  //
-  // each iteration creates a new parseContext as a copy of the previous one if it needs to
-  void _parseNode(
-      dom.Node node, ParseContext parseContext, BuildContext buildContext) {
-    // TEXT ONLY NODES
-    // a text only node is a child of a tag with no inner html
-    if (node is dom.Text) {
-      // WHITESPACE CONSIDERATIONS ---
-      // truly empty nodes should just be ignored
-      if (node.text.trim() == "" && node.text.indexOf(" ") == -1) {
-        return;
-      }
-
-      // we might want to preserve internal whitespace
-      // empty strings of whitespace might be significant or not, condense it by default
-      String finalText = node.text;
-      if (parseContext.condenseWhitespace) {
-        finalText = condenseHtmlWhitespace(node.text);
-
-        // if this is part of a string of spans, we will preserve leading
-        // and trailing whitespace unless the previous character is whitespace
-        if (parseContext.parentElement == null)
-          finalText = finalText.trimLeft();
-        else if (parseContext.parentElement is TextSpan ||
-            parseContext.parentElement is LinkTextSpan) {
-          String lastString = parseContext.parentElement.text ?? '';
-          if (!parseContext.parentElement.children.isEmpty) {
-            lastString = parseContext.parentElement.children.last.text ?? '';
-          }
-          if (lastString.endsWith(' ') || lastString.endsWith('\n')) {
-            finalText = finalText.trimLeft();
-          }
-        }
-      }
-
-      // if the finalText is actually empty, just return (unless it's just a space)
-      if (finalText.trim().isEmpty && finalText != " ") return;
-
-      // NOW WE HAVE OUR TRULY FINAL TEXT
-      // debugPrint("Plain Text Node: '$finalText'");
-
-      // create a span by default
-      TextSpan span = TextSpan(
-          text: finalText,
-          children: <TextSpan>[],
-          style: parseContext.childStyle);
-
-      // in this class, a ParentElement must be a BlockText, LinkTextSpan, Row, Column, TextSpan
-
-      // the parseContext might actually be a block level style element, so we
-      // need to honor the indent and styling specified by that block style.
-      // e.g. ol, ul, blockquote
-      bool treatLikeBlock =
-          ['blockquote', 'ul', 'ol'].indexOf(parseContext.blockType) != -1;
-
-      // if there is no parentElement, contain the span in a BlockText
-      if (parseContext.parentElement == null) {
-        // if this is inside a context that should be treated like a block
-        // but the context is not actually a block, create a block
-        // and append it to the root widget tree
-        if (treatLikeBlock) {
-          Decoration decoration;
-          if (parseContext.blockType == 'blockquote') {
-            decoration = BoxDecoration(
-              border:
-                  Border(left: BorderSide(color: Colors.black38, width: 2.0)),
-            );
-            parseContext.childStyle = parseContext.childStyle.merge(TextStyle(
-              fontStyle: FontStyle.italic,
-            ));
-          }
-          BlockText blockText = BlockText(
-            shrinkToFit: shrinkToFit,
-            margin: EdgeInsets.only(
-                top: 8.0,
-                bottom: 8.0,
-                left: parseContext.indentLevel * indentSize),
-            padding: EdgeInsets.all(2.0),
-            decoration: decoration,
-            child: RichText(
-              textAlign: TextAlign.left,
-              text: span,
-            ),
-          );
-          parseContext.rootWidgetList.add(blockText);
-        } else {
-          parseContext.rootWidgetList.add(BlockText(
-            child: RichText(text: span),
-            shrinkToFit: shrinkToFit,
-          ));
-        }
-
-        // this allows future items to be added as children of this item
-        parseContext.parentElement = span;
-
-        // if the parent is a LinkTextSpan, keep the main attributes of that span going.
-      } else if (parseContext.parentElement is LinkTextSpan) {
-        // add this node to the parent as another LinkTextSpan
-        parseContext.parentElement.children.add(LinkTextSpan(
-          style:
-              parseContext.parentElement.style.merge(parseContext.childStyle),
-          url: parseContext.parentElement.url,
-          text: finalText,
-          onLinkTap: onLinkTap,
-        ));
-
-        // if the parent is a normal span, just add this to that list
-      } else if (!(parseContext.parentElement.children is List<Widget>)) {
-        parseContext.parentElement.children.add(span);
-      } else {
-        // Doing nothing... we shouldn't ever get here
-      }
-      return;
-    }
-
-    // OTHER ELEMENT NODES
-    else if (node is dom.Element) {
-      if (!_supportedElements.contains(node.localName)) {
-        return;
-      }
-
-      // make a copy of the current context so that we can modify
-      // pieces of it for the next iteration of this function
-      ParseContext nextContext = new ParseContext.fromContext(parseContext);
-
-      // handle style elements
-      if (_supportedStyleElements.contains(node.localName)) {
-        TextStyle childStyle = parseContext.childStyle ?? TextStyle();
-
-        switch (node.localName) {
-          //"b","i","em","strong","code","u","small","abbr","acronym"
-          case "b":
-          case "strong":
-            childStyle =
-                childStyle.merge(TextStyle(fontWeight: FontWeight.bold));
-            break;
-          case "i":
-          case "address":
-          case "cite":
-          case "var":
-          case "em":
-            childStyle =
-                childStyle.merge(TextStyle(fontStyle: FontStyle.italic));
-            break;
-          case "kbd":
-          case "samp":
-          case "tt":
-          case "code":
-            childStyle = childStyle.merge(TextStyle(fontFamily: 'monospace'));
-            break;
-          case "ins":
-          case "u":
-            childStyle = childStyle
-                .merge(TextStyle(decoration: TextDecoration.underline));
-            break;
-          case "abbr":
-          case "acronym":
-            childStyle = childStyle.merge(TextStyle(
-              decoration: TextDecoration.underline,
-              decorationStyle: TextDecorationStyle.dotted,
-            ));
-            break;
-          case "big":
-            childStyle = childStyle.merge(TextStyle(fontSize: 20.0));
-            break;
-          case "small":
-            childStyle = childStyle.merge(TextStyle(fontSize: 10.0));
-            break;
-          case "mark":
-            childStyle = childStyle.merge(
-                TextStyle(backgroundColor: Colors.yellow, color: Colors.black));
-            break;
-          case "sub":
-            childStyle = childStyle.merge(
-              TextStyle(
-                fontSize: childStyle.fontSize * OFFSET_TAGS_FONT_SIZE_FACTOR,
-              ),
-            );
-            break;
-          case "del":
-          case "s":
-          case "strike":
-            childStyle = childStyle
-                .merge(TextStyle(decoration: TextDecoration.lineThrough));
-            break;
-          case "ol":
-            nextContext.indentLevel += 1;
-            nextContext.listChar = '#';
-            nextContext.listCount = 0;
-            nextContext.blockType = 'ol';
-            break;
-          case "ul":
-            nextContext.indentLevel += 1;
-            nextContext.listChar = '•';
-            nextContext.listCount = 0;
-            nextContext.blockType = 'ul';
-            break;
-          case "blockquote":
-            nextContext.indentLevel += 1;
-            nextContext.blockType = 'blockquote';
-            break;
-          case "ruby":
-          case "rt":
-          case "rp":
-          case "bdi":
-          case "data":
-          case "time":
-          case "span":
-            //No additional styles
-            break;
-        }
-
-        if (customTextStyle != null) {
-          final TextStyle customStyle = customTextStyle(node, childStyle);
-          if (customStyle != null) {
-            childStyle = customStyle;
-          }
-        }
-
-        nextContext.childStyle = childStyle;
-      }
-
-      // handle specialty elements
-      else if (_supportedSpecialtyElements.contains(node.localName)) {
-        // should support "a","br","table","tbody","thead","tfoot","th","tr","td"
-
-        switch (node.localName) {
-          case "a":
-            // if this item has block children, we create
-            // a container and gesture recognizer for the entire
-            // element, otherwise, we create a LinkTextSpan
-            String url = node.attributes['href'] ?? null;
-
-            if (_hasBlockChild(node)) {
-              LinkBlock linkContainer = LinkBlock(
-                url: url,
-                margin: EdgeInsets.only(
-                    left: parseContext.indentLevel * indentSize),
-                onLinkTap: onLinkTap,
-                children: <Widget>[],
-              );
-              nextContext.parentElement = linkContainer;
-              nextContext.rootWidgetList.add(linkContainer);
-            } else {
-              TextStyle _linkStyle = parseContext.childStyle.merge(linkStyle);
-              LinkTextSpan span = LinkTextSpan(
-                style: _linkStyle,
-                url: url,
-                onLinkTap: onLinkTap,
-                children: <TextSpan>[],
-              );
-              if (parseContext.parentElement is TextSpan) {
-                nextContext.parentElement.children.add(span);
-              } else {
-                // start a new block element for this link and its text
-                BlockText blockElement = BlockText(
-                  shrinkToFit: shrinkToFit,
-                  margin: EdgeInsets.only(
-                      left: parseContext.indentLevel * indentSize, top: 10.0),
-                  child: RichText(text: span),
-                );
-                parseContext.rootWidgetList.add(blockElement);
-                nextContext.inBlock = true;
-              }
-              nextContext.childStyle = linkStyle;
-              nextContext.parentElement = span;
-            }
-            break;
-
-          case "br":
-            if (parseContext.parentElement != null &&
-                parseContext.parentElement is TextSpan) {
-              parseContext.parentElement.children
-                  .add(TextSpan(text: '\n', children: []));
-            }
-            break;
-
-          case "table":
-            // new block, so clear out the parent element
-            parseContext.parentElement = null;
-            nextContext.parentElement = Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: <Widget>[],
-            );
-            nextContext.rootWidgetList.add(Container(
-                margin: EdgeInsets.symmetric(vertical: 12.0),
-                child: nextContext.parentElement));
-            break;
-
-          // we don't handle tbody, thead, or tfoot elements separately for now
-          case "tbody":
-          case "thead":
-          case "tfoot":
-            break;
-
-          case "td":
-          case "th":
-            int colspan = 1;
-            if (node.attributes['colspan'] != null) {
-              colspan = int.tryParse(node.attributes['colspan']);
-            }
-            nextContext.childStyle = nextContext.childStyle.merge(TextStyle(
-                fontWeight: (node.localName == 'th')
-                    ? FontWeight.bold
-                    : FontWeight.normal));
-            RichText text =
-                RichText(text: TextSpan(text: '', children: <TextSpan>[]));
-            Expanded cell = Expanded(
-              flex: colspan,
-              child: Container(padding: EdgeInsets.all(1.0), child: text),
-            );
-            nextContext.parentElement.children.add(cell);
-            nextContext.parentElement = text.text;
-            break;
-
-          case "tr":
-            Row row = Row(
-              crossAxisAlignment: CrossAxisAlignment.center,
-              children: <Widget>[],
-            );
-            nextContext.parentElement.children.add(row);
-            nextContext.parentElement = row;
-            break;
-
-          // treat captions like a row with one expanded cell
-          case "caption":
-            // create the row
-            Row row = Row(
-              crossAxisAlignment: CrossAxisAlignment.center,
-              children: <Widget>[],
-            );
-
-            // create an expanded cell
-            RichText text = RichText(
-                textAlign: TextAlign.center,
-                textScaleFactor: 1.2,
-                text: TextSpan(text: '', children: <TextSpan>[]));
-            Expanded cell = Expanded(
-              child: Container(padding: EdgeInsets.all(2.0), child: text),
-            );
-            row.children.add(cell);
-            nextContext.parentElement.children.add(row);
-            nextContext.parentElement = text.text;
-            break;
-          case "q":
-            if (parseContext.parentElement != null &&
-                parseContext.parentElement is TextSpan) {
-              parseContext.parentElement.children
-                  .add(TextSpan(text: '"', children: []));
-              TextSpan content = TextSpan(text: '', children: []);
-              parseContext.parentElement.children.add(content);
-              parseContext.parentElement.children
-                  .add(TextSpan(text: '"', children: []));
-              nextContext.parentElement = content;
-            }
-            break;
-        }
-
-        if (customTextStyle != null) {
-          final TextStyle customStyle =
-              customTextStyle(node, nextContext.childStyle);
-          if (customStyle != null) {
-            nextContext.childStyle = customStyle;
-          }
-        }
-      }
-
-      // handle block elements
-      else if (_supportedBlockElements.contains(node.localName)) {
-        // block elements only show up at the "root" widget level
-        // so if we have a block element, reset the parentElement to null
-        parseContext.parentElement = null;
-        TextAlign textAlign = TextAlign.left;
-        if (customTextAlign != null) {
-          textAlign = customTextAlign(node) ?? textAlign;
-        }
-
-        EdgeInsets _customEdgeInsets;
-        if (customEdgeInsets != null) {
-          _customEdgeInsets = customEdgeInsets(node);
-        }
-
-        switch (node.localName) {
-          case "hr":
-            parseContext.rootWidgetList
-                .add(Divider(height: 1.0, color: Colors.black38));
-            break;
-          case "img":
-            if (showImages) {
-              if (node.attributes['src'] != null) {
-                final width = imageProperties?.width ??
-                    ((node.attributes['width'] != null)
-                        ? double.tryParse(node.attributes['width'])
-                        : null);
-                final height = imageProperties?.height ??
-                    ((node.attributes['height'] != null)
-                        ? double.tryParse(node.attributes['height'])
-                        : null);
-
-                if (node.attributes['src'].startsWith("data:image") &&
-                    node.attributes['src'].contains("base64,")) {
-                  precacheImage(
-                    MemoryImage(
-                      base64.decode(
-                        node.attributes['src'].split("base64,")[1].trim(),
-                      ),
-                    ),
-                    buildContext,
-                    onError: onImageError ?? (_, __) {},
-                  );
-                  parseContext.rootWidgetList.add(GestureDetector(
-                    child: Image.memory(
-                      base64.decode(
-                          node.attributes['src'].split("base64,")[1].trim()),
-                      width: (width ?? -1) > 0 ? width : null,
-                      height: (height ?? -1) > 0 ? width : null,
-                      scale: imageProperties?.scale ?? 1.0,
-                      matchTextDirection:
-                          imageProperties?.matchTextDirection ?? false,
-                      centerSlice: imageProperties?.centerSlice,
-                      filterQuality:
-                          imageProperties?.filterQuality ?? FilterQuality.low,
-                      alignment: imageProperties?.alignment ?? Alignment.center,
-                      colorBlendMode: imageProperties?.colorBlendMode,
-                      fit: imageProperties?.fit,
-                      color: imageProperties?.color,
-                      repeat: imageProperties?.repeat ?? ImageRepeat.noRepeat,
-                      semanticLabel: imageProperties?.semanticLabel,
-                      excludeFromSemantics:
-                          (imageProperties?.semanticLabel == null)
-                              ? true
-                              : false,
-                    ),
-                    onTap: () {
-                      if (onImageTap != null) {
-                        onImageTap(node.attributes['src']);
-                      }
-                    },
-                  ));
-                } else if (node.attributes['src'].startsWith('asset:')) {
-                  final assetPath = node.attributes['src'].replaceFirst('asset:', '');
-                  precacheImage(
-                    AssetImage(assetPath),
-                    buildContext,
-                    onError: onImageError ?? (_, __) {},
-                  );
-                  parseContext.rootWidgetList.add(GestureDetector(
-                    child: Image.asset(
-                      assetPath,
-                      frameBuilder: (context, child, frame, _) {
-                        if (node.attributes['alt'] != null && frame == null) {
-                          return BlockText(
-                            child: RichText(
-                              textAlign: TextAlign.center,
-                              text: TextSpan(
-                                text: node.attributes['alt'],
-                                style: nextContext.childStyle,
-                              ),
-                            ),
-                            shrinkToFit: shrinkToFit,
-                          );
-                        }
-                        if (frame != null) {
-                          return child;
-                        }
-                        return Container();
-                      },
-                      width: (width ?? -1) > 0 ? width : null,
-                      height: (height ?? -1) > 0 ? height : null,
-                      scale: imageProperties?.scale ?? 1.0,
-                      matchTextDirection:
-                          imageProperties?.matchTextDirection ?? false,
-                      centerSlice: imageProperties?.centerSlice,
-                      filterQuality:
-                          imageProperties?.filterQuality ?? FilterQuality.low,
-                      alignment: imageProperties?.alignment ?? Alignment.center,
-                      colorBlendMode: imageProperties?.colorBlendMode,
-                      fit: imageProperties?.fit,
-                      color: imageProperties?.color,
-                      repeat: imageProperties?.repeat ?? ImageRepeat.noRepeat,
-                      semanticLabel: imageProperties?.semanticLabel,
-                      excludeFromSemantics:
-                          (imageProperties?.semanticLabel == null)
-                              ? true
-                              : false,
-                    ),
-                    onTap: () {
-                      if (onImageTap != null) {
-                        onImageTap(node.attributes['src']);
-                      }
-                    },
-                  ));
-                } else {
-                  precacheImage(
-                    NetworkImage(node.attributes['src']),
-                    buildContext,
-                    onError: onImageError ?? (_, __) {},
-                  );
-                  parseContext.rootWidgetList.add(GestureDetector(
-                    child: Image.network(
-                      node.attributes['src'],
-                      frameBuilder: (context, child, frame, _) {
-                        if (node.attributes['alt'] != null && frame == null) {
-                          return BlockText(
-                            child: RichText(
-                              textAlign: TextAlign.center,
-                              text: TextSpan(
-                                text: node.attributes['alt'],
-                                style: nextContext.childStyle,
-                              ),
-                            ),
-                            shrinkToFit: shrinkToFit,
-                          );
-                        }
-                        if (frame != null) {
-                          return child;
-                        }
-                        return Container();
-                      },
-                      width: (width ?? -1) > 0 ? width : null,
-                      height: (height ?? -1) > 0 ? height : null,
-                      scale: imageProperties?.scale ?? 1.0,
-                      matchTextDirection:
-                          imageProperties?.matchTextDirection ?? false,
-                      centerSlice: imageProperties?.centerSlice,
-                      filterQuality:
-                          imageProperties?.filterQuality ?? FilterQuality.low,
-                      alignment: imageProperties?.alignment ?? Alignment.center,
-                      colorBlendMode: imageProperties?.colorBlendMode,
-                      fit: imageProperties?.fit,
-                      color: imageProperties?.color,
-                      repeat: imageProperties?.repeat ?? ImageRepeat.noRepeat,
-                      semanticLabel: imageProperties?.semanticLabel,
-                      excludeFromSemantics:
-                          (imageProperties?.semanticLabel == null)
-                              ? true
-                              : false,
-                    ),
-                    onTap: () {
-                      if (onImageTap != null) {
-                        onImageTap(node.attributes['src']);
-                      }
-                    },
-                  ));
-                }
-              }
-            }
-            break;
-          case "li":
-            String leadingChar = parseContext.listChar;
-            if (parseContext.blockType == 'ol') {
-              // nextContext will handle nodes under this 'li'
-              // but we want to increment the count at this level
-              parseContext.listCount += 1;
-              leadingChar = parseContext.listCount.toString() + '.';
-            }
-            BlockText blockText = BlockText(
-              shrinkToFit: shrinkToFit,
-              margin: EdgeInsets.only(
-                  left: parseContext.indentLevel * indentSize, top: 3.0),
-              child: RichText(
-                text: TextSpan(
-                  text: '$leadingChar  ',
-                  style: DefaultTextStyle.of(buildContext).style,
-                  children: <TextSpan>[
-                    TextSpan(text: '', style: nextContext.childStyle)
-                  ],
-                ),
-              ),
-            );
-            parseContext.rootWidgetList.add(blockText);
-            nextContext.parentElement = blockText.child.text;
-            nextContext.spansOnly = true;
-            nextContext.inBlock = true;
-            break;
-
-          case "h1":
-            nextContext.childStyle = nextContext.childStyle.merge(
-              TextStyle(fontSize: 26.0, fontWeight: FontWeight.bold),
-            );
-            continue myDefault;
-          case "h2":
-            nextContext.childStyle = nextContext.childStyle.merge(
-              TextStyle(fontSize: 24.0, fontWeight: FontWeight.bold),
-            );
-            continue myDefault;
-          case "h3":
-            nextContext.childStyle = nextContext.childStyle.merge(
-              TextStyle(fontSize: 22.0, fontWeight: FontWeight.bold),
-            );
-            continue myDefault;
-          case "h4":
-            nextContext.childStyle = nextContext.childStyle.merge(
-              TextStyle(fontSize: 20.0, fontWeight: FontWeight.w100),
-            );
-            continue myDefault;
-          case "h5":
-            nextContext.childStyle = nextContext.childStyle.merge(
-              TextStyle(fontSize: 18.0, fontWeight: FontWeight.bold),
-            );
-            continue myDefault;
-          case "h6":
-            nextContext.childStyle = nextContext.childStyle.merge(
-              TextStyle(fontSize: 18.0, fontWeight: FontWeight.w100),
-            );
-            continue myDefault;
-
-          case "pre":
-            nextContext.condenseWhitespace = false;
-            continue myDefault;
-
-          case "center":
-            textAlign = TextAlign.center;
-            // no break here
-            continue myDefault;
-
-          myDefault:
-          default:
-            Decoration decoration;
-            if (parseContext.blockType == 'blockquote') {
-              decoration = BoxDecoration(
-                border:
-                    Border(left: BorderSide(color: Colors.black38, width: 2.0)),
-              );
-              nextContext.childStyle = nextContext.childStyle.merge(TextStyle(
-                fontStyle: FontStyle.italic,
-              ));
-            }
-            BlockText blockText = BlockText(
-              shrinkToFit: shrinkToFit,
-              margin: node.localName != 'body'
-                  ? _customEdgeInsets ??
-                      EdgeInsets.only(
-                          top: 8.0,
-                          bottom: 8.0,
-                          left: parseContext.indentLevel * indentSize)
-                  : EdgeInsets.zero,
-              padding: EdgeInsets.all(2.0),
-              decoration: decoration,
-              child: RichText(
-                textAlign: textAlign,
-                text: TextSpan(
-                  text: '',
-                  style: nextContext.childStyle,
-                  children: <TextSpan>[],
-                ),
-              ),
-            );
-            parseContext.rootWidgetList.add(blockText);
-            nextContext.parentElement = blockText.child.text;
-            nextContext.spansOnly = true;
-            nextContext.inBlock = true;
-        }
-
-        if (customTextStyle != null) {
-          final TextStyle customStyle =
-              customTextStyle(node, nextContext.childStyle);
-          if (customStyle != null) {
-            nextContext.childStyle = customStyle;
-          }
-        }
-      }
-
-      node.nodes.forEach((dom.Node childNode) {
-        _parseNode(childNode, nextContext, buildContext);
-      });
-    }
-  }
-
-  String condenseHtmlWhitespace(String stringToTrim) {
-    stringToTrim = stringToTrim.replaceAll("\n", " ");
-    while (stringToTrim.indexOf("  ") != -1) {
-      stringToTrim = stringToTrim.replaceAll("  ", " ");
-    }
-    return stringToTrim;
-  }
-}
diff --git a/lib/src/html_elements.dart b/lib/src/html_elements.dart
new file mode 100644
index 0000000000..c31afb224e
--- /dev/null
+++ b/lib/src/html_elements.dart
@@ -0,0 +1,188 @@
+export 'styled_element.dart';
+export 'interactable_element.dart';
+export 'replaced_element.dart';
+
+const STYLED_ELEMENTS = [
+  "abbr",
+  "acronym",
+  "address",
+  "b",
+  "bdi",
+  "bdo",
+  "big",
+  "cite",
+  "code",
+  "data",
+  "del",
+  "dfn",
+  "em",
+  "font",
+  "i",
+  "ins",
+  "kbd",
+  "mark",
+  "q",
+  "s",
+  "samp",
+  "small",
+  "span",
+  "strike",
+  "strong",
+  "sub",
+  "sup",
+  "td",
+  "th",
+  "time",
+  "tt",
+  "u",
+  "var",
+  "wbr",
+
+  //BLOCK ELEMENTS
+  "article",
+  "aside",
+  "blockquote",
+  "body",
+  "center",
+  "dd",
+  "div",
+  "dl",
+  "dt",
+  "figcaption",
+  "figure",
+  "footer",
+  "h1",
+  "h2",
+  "h3",
+  "h4",
+  "h5",
+  "h6",
+  "header",
+  "hr",
+  "html",
+  "li",
+  "main",
+  "nav",
+  "noscript",
+  "ol",
+  "p",
+  "pre",
+  "section",
+  "ul",
+];
+
+const INTERACTABLE_ELEMENTS = [
+  "a",
+];
+
+const REPLACED_ELEMENTS = [
+  "audio",
+  "br",
+  "head",
+  "iframe",
+  "img",
+  "svg",
+  "template",
+  "video",
+  "rp",
+  "rt",
+  "ruby",
+];
+
+const LAYOUT_ELEMENTS = [
+  "table",
+  "tr",
+  "tbody",
+  "tfoot",
+  "thead",
+];
+
+const TABLE_STYLE_ELEMENTS = ["col", "colgroup"];
+
+/**
+  Here is a list of elements with planned support:
+    a         - i [x]
+    abbr      - s [x]
+    acronym   - s [x]
+    address   - s [x]
+    audio     - c [x]
+    article   - b [x]
+    aside     - b [x]
+    b         - s [x]
+    bdi       - s [x]
+    bdo       - s [x]
+    big       - s [x]
+    blockquote- b [x]
+    body      - b [x]
+    br        - b [x]
+    button    - i [ ]
+    caption   - b [ ]
+    center    - b [x]
+    cite      - s [x]
+    code      - s [x]
+    data      - s [x]
+    dd        - b [x]
+    del       - s [x]
+    dfn       - s [x]
+    div       - b [x]
+    dl        - b [x]
+    dt        - b [x]
+    em        - s [x]
+    figcaption- b [x]
+    figure    - b [x]
+    font      - s [x]
+    footer    - b [x]
+    h1        - b [x]
+    h2        - b [x]
+    h3        - b [x]
+    h4        - b [x]
+    h5        - b [x]
+    h6        - b [x]
+    head      - e [x]
+    header    - b [x]
+    hr        - b [x]
+    html      - b [x]
+    i         - s [x]
+    img       - c [x]
+    ins       - s [x]
+    kbd       - s [x]
+    li        - b [x]
+    main      - b [x]
+    mark      - s [x]
+    nav       - b [x]
+    noscript  - b [x]
+    ol        - b [x] post
+    p         - b [x]
+    pre       - b [x]
+    q         - s [x] post
+    rp        - s [x]
+    rt        - s [x]
+    ruby      - s [x]
+    s         - s [x]
+    samp      - s [x]
+    section   - b [x]
+    small     - s [x]
+    source    -   [-] child of content
+    span      - s [x]
+    strike    - s [x]
+    strong    - s [x]
+    sub       - s [x]
+    sup       - s [x]
+    svg       - c [x]
+    table     - b [x]
+    tbody     - b [x]
+    td        - s [ ]
+    template  - e [x]
+    tfoot     - b [x]
+    th        - s [ ]
+    thead     - b [x]
+    time      - s [x]
+    tr        - ? [ ]
+    track     -   [-] child of content
+    tt        - s [x]
+    u         - s [x]
+    ul        - b [x] post
+    var       - s [x]
+    video     - c [x]
+    wbr       - s [x]
+ */
diff --git a/lib/src/interactable_element.dart b/lib/src/interactable_element.dart
new file mode 100644
index 0000000000..e19351df94
--- /dev/null
+++ b/lib/src/interactable_element.dart
@@ -0,0 +1,43 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_html/src/html_elements.dart';
+import 'package:flutter_html/style.dart';
+import 'package:html/dom.dart' as dom;
+
+/// An [InteractableElement] is a [StyledElement] that takes user gestures (e.g. tap).
+class InteractableElement extends StyledElement {
+  String href;
+
+  InteractableElement({
+    String name,
+    List<StyledElement> children,
+    Style style,
+    this.href,
+    dom.Node node,
+  }) : super(name: name, children: children, style: style, node: node);
+}
+
+/// A [Gesture] indicates the type of interaction by a user.
+enum Gesture {
+  TAP,
+}
+
+InteractableElement parseInteractableElement(
+    dom.Element element, List<StyledElement> children) {
+  InteractableElement interactableElement = InteractableElement(
+    name: element.localName,
+    children: children,
+    node: element,
+  );
+
+  switch (element.localName) {
+    case "a":
+      interactableElement.href = element.attributes['href'];
+      interactableElement.style = Style(
+        color: Colors.blue,
+        textDecoration: TextDecoration.underline,
+      );
+      break;
+  }
+
+  return interactableElement;
+}
diff --git a/lib/src/layout_element.dart b/lib/src/layout_element.dart
new file mode 100644
index 0000000000..d3c652f929
--- /dev/null
+++ b/lib/src/layout_element.dart
@@ -0,0 +1,196 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_html/html_parser.dart';
+import 'package:flutter_html/src/html_elements.dart';
+import 'package:flutter_html/src/styled_element.dart';
+import 'package:flutter_html/style.dart';
+import 'package:html/dom.dart' as dom;
+
+/// A [LayoutElement] is an element that breaks the normal Inline flow of
+/// an html document with a more complex layout. LayoutElements handle
+abstract class LayoutElement extends StyledElement {
+  LayoutElement({
+    String name,
+    List<StyledElement> children,
+    Style style,
+    dom.Element node,
+  }) : super(name: name, children: children, style: style, node: node);
+
+  Widget toWidget(RenderContext context);
+}
+
+class TableLayoutElement extends LayoutElement {
+  TableLayoutElement({
+    String name,
+    Style style,
+    @required List<StyledElement> children,
+    dom.Element node,
+  }) : super(name: name, style: style, children: children, node: node);
+
+  @override
+  Widget toWidget(RenderContext context) {
+    final colWidths = children
+        .where((c) => c.name == "colgroup")
+        .map((group) {
+          return group.children.where((c) => c.name == "col").map((c) {
+            final widthStr = c.attributes["width"] ?? "";
+            if (widthStr.endsWith("%")) {
+              final width =
+                  double.tryParse(widthStr.substring(0, widthStr.length - 1)) *
+                      0.01;
+              return FractionColumnWidth(width);
+            } else {
+              final width = double.tryParse(widthStr);
+              return FixedColumnWidth(width);
+            }
+          });
+        })
+        .expand((i) => i)
+        .toList()
+        .asMap();
+
+    return Container(
+        decoration: BoxDecoration(
+          color: style.backgroundColor,
+          border: style.border,
+        ),
+        width: style.width,
+        height: style.height,
+        child: Table(
+          columnWidths: colWidths,
+          children: children
+              .map((c) {
+                if (c is TableSectionLayoutElement) {
+                  return c.toTableRows(context);
+                }
+                return null;
+              })
+              .where((t) {
+                return t != null;
+              })
+              .toList()
+              .expand((i) => i)
+              .toList(),
+        ));
+  }
+}
+
+class TableSectionLayoutElement extends LayoutElement {
+  TableSectionLayoutElement({
+    String name,
+    @required List<StyledElement> children,
+  }) : super(name: name, children: children);
+
+  @override
+  Widget toWidget(RenderContext context) {
+    return Container(child: Text("TABLE SECTION"));
+  }
+
+  List<TableRow> toTableRows(RenderContext context) {
+    return children.map((c) {
+      if (c is TableRowLayoutElement) {
+        return c.toTableRow(context);
+      }
+      return null;
+    }).where((t) {
+      return t != null;
+    }).toList();
+  }
+}
+
+class TableRowLayoutElement extends LayoutElement {
+  TableRowLayoutElement({
+    String name,
+    @required List<StyledElement> children,
+    dom.Element node,
+  }) : super(name: name, children: children, node: node);
+
+  @override
+  Widget toWidget(RenderContext context) {
+    return Container(child: Text("TABLE ROW"));
+  }
+
+  TableRow toTableRow(RenderContext context) {
+    return TableRow(
+        decoration: BoxDecoration(
+          border: style.border,
+          color: style.backgroundColor,
+        ),
+        children: children
+            .map((c) {
+              if (c is StyledElement && c.name == 'td' || c.name == 'th') {
+                return TableCell(
+                    child: Container(
+                        padding: c.style.padding,
+                        decoration: BoxDecoration(
+                          color: c.style.backgroundColor,
+                          border: c.style.border,
+                        ),
+                        child: StyledText(
+                          textSpan: context.parser.parseTree(context, c),
+                          style: c.style,
+                        )));
+              }
+              return null;
+            })
+            .where((c) => c != null)
+            .toList());
+  }
+}
+
+class TableStyleElement extends StyledElement {
+  TableStyleElement({
+    String name,
+    List<StyledElement> children,
+    Style style,
+    dom.Element node,
+  }) : super(name: name, children: children, style: style, node: node);
+}
+
+TableStyleElement parseTableDefinitionElement(
+  dom.Element element,
+  List<StyledElement> children,
+) {
+  switch (element.localName) {
+    case "colgroup":
+    case "col":
+      return TableStyleElement(
+        name: element.localName,
+        children: children,
+        node: element,
+      );
+    default:
+      return TableStyleElement();
+  }
+}
+
+LayoutElement parseLayoutElement(
+  dom.Element element,
+  List<StyledElement> children,
+) {
+  switch (element.localName) {
+    case "table":
+      return TableLayoutElement(
+        name: element.localName,
+        children: children,
+        node: element,
+      );
+      break;
+    case "thead":
+    case "tbody":
+    case "tfoot":
+      return TableSectionLayoutElement(
+        name: element.localName,
+        children: children,
+      );
+      break;
+    case "tr":
+      return TableRowLayoutElement(
+        name: element.localName,
+        children: children,
+        node: element,
+      );
+      break;
+    default:
+      return TableLayoutElement(children: children);
+  }
+}
diff --git a/lib/src/replaced_element.dart b/lib/src/replaced_element.dart
new file mode 100644
index 0000000000..6a6bac48cd
--- /dev/null
+++ b/lib/src/replaced_element.dart
@@ -0,0 +1,456 @@
+import 'dart:convert';
+import 'dart:math';
+
+import 'package:chewie/chewie.dart';
+import 'package:chewie_audio/chewie_audio.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/gestures.dart';
+import 'package:flutter_html/src/utils.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:video_player/video_player.dart';
+import 'package:webview_flutter/webview_flutter.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
+import 'package:flutter_html/html_parser.dart';
+import 'package:flutter_html/src/html_elements.dart';
+import 'package:flutter_html/style.dart';
+import 'package:html/dom.dart' as dom;
+
+/// A [ReplacedElement] is a type of [StyledElement] that does not require its [children] to be rendered.
+///
+/// A [ReplacedElement] may use its children nodes to determine relevant information
+/// (e.g. <video>'s <source> tags), but the children nodes will not be saved as [children].
+abstract class ReplacedElement extends StyledElement {
+  PlaceholderAlignment alignment;
+
+  ReplacedElement(
+      {String name,
+      Style style,
+      dom.Element node,
+      this.alignment = PlaceholderAlignment.aboveBaseline})
+      : super(name: name, children: null, style: style, node: node);
+
+  static List<String> parseMediaSources(List<dom.Element> elements) {
+    return elements
+        .where((element) => element.localName == 'source')
+        .map((element) {
+      return element.attributes['src'];
+    }).toList();
+  }
+
+  Widget toWidget(RenderContext context);
+}
+
+/// [TextContentElement] is a [ContentElement] with plaintext as its content.
+class TextContentElement extends ReplacedElement {
+  String text;
+
+  TextContentElement({
+    Style style,
+    this.text,
+  }) : super(name: "[text]", style: style);
+
+  @override
+  String toString() {
+    return "\"${text.replaceAll("\n", "\\n")}\"";
+  }
+
+  @override
+  Widget toWidget(_) => null;
+}
+
+/// [ImageContentElement] is a [ReplacedElement] with an image as its content.
+/// https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img
+class ImageContentElement extends ReplacedElement {
+  final String src;
+  final String alt;
+
+  ImageContentElement({
+    String name,
+    Style style,
+    this.src,
+    this.alt,
+    dom.Element node,
+  }) : super(name: name, style: style, node: node);
+
+  @override
+  Widget toWidget(RenderContext context) {
+    Widget imageWidget;
+    if (src == null) {
+      imageWidget = Text(alt ?? "", style: context.style.generateTextStyle());
+    } else if (src.startsWith("data:image") && src.contains("base64,")) {
+      final decodedImage = base64.decode(src.split("base64,")[1].trim());
+      precacheImage(
+        MemoryImage(decodedImage),
+        context.buildContext,
+        onError: (exception, StackTrace stackTrace) {
+          context.parser.onImageError?.call(exception, stackTrace);
+        },
+      );
+      imageWidget = Image.memory(
+        decodedImage,
+        frameBuilder: (ctx, child, frame, _) {
+          if (frame == null) {
+            return Text(alt ?? "", style: context.style.generateTextStyle());
+          }
+          return child;
+        },
+      );
+    } else if (src.startsWith("asset:")) {
+      final assetPath = src.replaceFirst('asset:', '');
+      precacheImage(
+        AssetImage(assetPath),
+        context.buildContext,
+        onError: (exception, StackTrace stackTrace) {
+          context.parser.onImageError?.call(exception, stackTrace);
+        },
+      );
+      imageWidget = Image.asset(
+        assetPath,
+        frameBuilder: (ctx, child, frame, _) {
+          if (frame == null) {
+            return Text(alt ?? "", style: context.style.generateTextStyle());
+          }
+          return child;
+        },
+      );
+    } else {
+      precacheImage(
+        NetworkImage(src),
+        context.buildContext,
+        onError: (exception, StackTrace stackTrace) {
+          context.parser.onImageError?.call(exception, stackTrace);
+        },
+      );
+      imageWidget = Image.network(
+        src,
+        frameBuilder: (ctx, child, frame, _) {
+          if (frame == null) {
+            return Text(alt ?? "", style: context.style.generateTextStyle());
+          }
+          return child;
+        },
+      );
+    }
+
+    return ContainerSpan(
+      style: style,
+      newContext: context,
+      shrinkWrap: context.parser.shrinkWrap,
+      child: RawGestureDetector(
+        child: imageWidget,
+        gestures: {
+          MultipleTapGestureRecognizer: GestureRecognizerFactoryWithHandlers<
+              MultipleTapGestureRecognizer>(
+            () => MultipleTapGestureRecognizer(),
+            (instance) {
+              instance..onTap = () => context.parser.onImageTap?.call(src);
+            },
+          ),
+        },
+      ),
+    );
+  }
+}
+
+/// [IframeContentElement is a [ReplacedElement] with web content.
+class IframeContentElement extends ReplacedElement {
+  final String src;
+  final double width;
+  final double height;
+
+  IframeContentElement({
+    String name,
+    Style style,
+    this.src,
+    this.width,
+    this.height,
+    dom.Element node,
+  }) : super(name: name, style: style, node: node);
+
+  @override
+  Widget toWidget(RenderContext context) {
+    return Container(
+      width: width ?? (height ?? 150) * 2,
+      height: height ?? (width ?? 300) / 2,
+      child: WebView(
+        initialUrl: src,
+        javascriptMode: JavascriptMode.unrestricted,
+        gestureRecognizers: {
+          Factory(() => PlatformViewVerticalGestureRecognizer())
+        },
+      ),
+    );
+  }
+}
+
+/// [AudioContentElement] is a [ContentElement] with an audio file as its content.
+class AudioContentElement extends ReplacedElement {
+  final List<String> src;
+  final bool showControls;
+  final bool autoplay;
+  final bool loop;
+  final bool muted;
+
+  AudioContentElement({
+    String name,
+    Style style,
+    this.src,
+    this.showControls,
+    this.autoplay,
+    this.loop,
+    this.muted,
+    dom.Element node,
+  }) : super(name: name, style: style, node: node);
+
+  @override
+  Widget toWidget(RenderContext context) {
+    return Container(
+      width: context.style.width ?? 300,
+      child: ChewieAudio(
+        controller: ChewieAudioController(
+          videoPlayerController: VideoPlayerController.network(
+            src.first ?? "",
+          ),
+          autoPlay: autoplay,
+          looping: loop,
+          showControls: showControls,
+          autoInitialize: true,
+        ),
+      ),
+    );
+  }
+}
+
+/// [VideoContentElement] is a [ContentElement] with a video file as its content.
+class VideoContentElement extends ReplacedElement {
+  final List<String> src;
+  final String poster;
+  final bool showControls;
+  final bool autoplay;
+  final bool loop;
+  final bool muted;
+  final double width;
+  final double height;
+
+  VideoContentElement({
+    String name,
+    Style style,
+    this.src,
+    this.poster,
+    this.showControls,
+    this.autoplay,
+    this.loop,
+    this.muted,
+    this.width,
+    this.height,
+    dom.Element node,
+  }) : super(name: name, style: style, node: node);
+
+  @override
+  Widget toWidget(RenderContext context) {
+    return Container(
+      width: width ?? (height ?? 150) * 2,
+      height: height ?? (width ?? 300) / 2,
+      child: Chewie(
+        controller: ChewieController(
+          videoPlayerController: VideoPlayerController.network(
+            src.first ?? "",
+          ),
+          placeholder: poster != null
+              ? Image.network(poster)
+              : Container(color: Colors.black),
+          autoPlay: autoplay,
+          looping: loop,
+          showControls: showControls,
+          autoInitialize: true,
+        ),
+      ),
+    );
+  }
+}
+
+/// [SvgContentElement] is a [ReplacedElement] with an SVG as its contents.
+class SvgContentElement extends ReplacedElement {
+  final String data;
+  final double width;
+  final double height;
+
+  SvgContentElement({
+    this.data,
+    this.width,
+    this.height,
+  });
+
+  @override
+  Widget toWidget(RenderContext context) {
+    return SvgPicture.string(
+      data,
+      width: width,
+      height: height,
+    );
+  }
+}
+
+class EmptyContentElement extends ReplacedElement {
+  EmptyContentElement({String name = "empty"}) : super(name: name);
+
+  @override
+  Widget toWidget(_) => null;
+}
+
+class RubyElement extends ReplacedElement {
+  dom.Element element;
+
+  RubyElement({@required this.element, String name = "ruby"})
+      : super(name: name, alignment: PlaceholderAlignment.middle);
+
+  @override
+  Widget toWidget(RenderContext context) {
+    dom.Node textNode;
+    List<Widget> widgets = List<Widget>();
+    //TODO calculate based off of parent font size.
+    final rubySize = max(9.0, context.style.fontSize.size / 2);
+    final rubyYPos = rubySize + rubySize / 2;
+    element.nodes.forEach((c) {
+      if (c.nodeType == dom.Node.TEXT_NODE) {
+        textNode = c;
+      }
+      if (c is dom.Element) {
+        if (c.localName == "rt" && textNode != null) {
+          final widget = Stack(
+            alignment: Alignment.center,
+            children: <Widget>[
+              Container(
+                  alignment: Alignment.bottomCenter,
+                  child: Center(
+                      child: Transform(
+                          transform:
+                              Matrix4.translationValues(0, -(rubyYPos), 0),
+                          child: Text(c.innerHtml,
+                              style: context.style
+                                  .generateTextStyle()
+                                  .copyWith(fontSize: rubySize))))),
+              Container(
+                  child: Text(textNode.text.trim(),
+                      style: context.style.generateTextStyle())),
+            ],
+          );
+          widgets.add(widget);
+        }
+      }
+    });
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.end,
+      textBaseline: TextBaseline.alphabetic,
+      mainAxisSize: MainAxisSize.min,
+      children: widgets,
+    );
+  }
+}
+
+ReplacedElement parseReplacedElement(dom.Element element) {
+  switch (element.localName) {
+    case "audio":
+      final sources = <String>[
+        if (element.attributes['src'] != null) element.attributes['src'],
+        ...ReplacedElement.parseMediaSources(element.children),
+      ];
+      return AudioContentElement(
+        name: "audio",
+        src: sources,
+        showControls: element.attributes['controls'] != null,
+        loop: element.attributes['loop'] != null,
+        autoplay: element.attributes['autoplay'] != null,
+        muted: element.attributes['muted'] != null,
+        node: element,
+      );
+    case "br":
+      return TextContentElement(
+        text: "\n",
+        style: Style(whiteSpace: WhiteSpace.PRE),
+      );
+    case "iframe":
+      return IframeContentElement(
+        name: "iframe",
+        src: element.attributes['src'],
+        width: double.tryParse(element.attributes['width'] ?? ""),
+        height: double.tryParse(element.attributes['height'] ?? ""),
+      );
+    case "img":
+      return ImageContentElement(
+        name: "img",
+        src: element.attributes['src'],
+        alt: element.attributes['alt'],
+        node: element,
+      );
+    case "video":
+      final sources = <String>[
+        if (element.attributes['src'] != null) element.attributes['src'],
+        ...ReplacedElement.parseMediaSources(element.children),
+      ];
+      return VideoContentElement(
+        name: "video",
+        src: sources,
+        poster: element.attributes['poster'],
+        showControls: element.attributes['controls'] != null,
+        loop: element.attributes['loop'] != null,
+        autoplay: element.attributes['autoplay'] != null,
+        muted: element.attributes['muted'] != null,
+        width: double.tryParse(element.attributes['width'] ?? ""),
+        height: double.tryParse(element.attributes['height'] ?? ""),
+        node: element,
+      );
+    case "svg":
+      return SvgContentElement(
+        data: element.outerHtml,
+        width: double.tryParse(element.attributes['width'] ?? ""),
+        height: double.tryParse(element.attributes['height'] ?? ""),
+      );
+    case "ruby":
+      return RubyElement(
+        element: element,
+      );
+    default:
+      return EmptyContentElement(name: element.localName);
+  }
+}
+
+// TODO(Sub6Resources): Remove when https://github.com/flutter/flutter/issues/36304 is resolved
+class PlatformViewVerticalGestureRecognizer
+    extends VerticalDragGestureRecognizer {
+  PlatformViewVerticalGestureRecognizer({PointerDeviceKind kind})
+      : super(kind: kind);
+
+  Offset _dragDistance = Offset.zero;
+
+  @override
+  void addPointer(PointerEvent event) {
+    startTrackingPointer(event.pointer);
+  }
+
+  @override
+  void handleEvent(PointerEvent event) {
+    _dragDistance = _dragDistance + event.delta;
+    if (event is PointerMoveEvent) {
+      final double dy = _dragDistance.dy.abs();
+      final double dx = _dragDistance.dx.abs();
+
+      if (dy > dx && dy > kTouchSlop) {
+        // vertical drag - accept
+        resolve(GestureDisposition.accepted);
+        _dragDistance = Offset.zero;
+      } else if (dx > kTouchSlop && dx > dy) {
+        // horizontal drag - stop tracking
+        stopTrackingPointer(event.pointer);
+        _dragDistance = Offset.zero;
+      }
+    }
+  }
+
+  @override
+  String get debugDescription => 'horizontal drag (platform view)';
+
+  @override
+  void didStopTrackingLastPointer(int pointer) {}
+}
diff --git a/lib/src/styled_element.dart b/lib/src/styled_element.dart
new file mode 100644
index 0000000000..aaa0dc90e9
--- /dev/null
+++ b/lib/src/styled_element.dart
@@ -0,0 +1,369 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_html/style.dart';
+import 'package:html/dom.dart' as dom;
+//TODO(Sub6Resources): don't use the internal code of the html package as it may change unexpectedly.
+import 'package:html/src/query_selector.dart';
+
+/// A [StyledElement] applies a style to all of its children.
+class StyledElement {
+  final String name;
+  final String elementId;
+  final List<String> elementClasses;
+  List<StyledElement> children;
+  Style style;
+  final dom.Node _node;
+
+  StyledElement({
+    this.name = "[[No name]]",
+    this.elementId,
+    this.elementClasses,
+    this.children,
+    this.style,
+    dom.Element node,
+  }) : this._node = node;
+
+  bool matchesSelector(String selector) =>
+      _node != null && matches(_node, selector);
+
+  Map<String, String> get attributes => _node.attributes.map((key, value) {
+        return MapEntry(key, value);
+      });
+
+  dom.Element get element => _node;
+
+  @override
+  String toString() {
+    String selfData =
+        "[$name] ${children?.length ?? 0} ${elementClasses?.isNotEmpty == true ? 'C:${elementClasses.toString()}' : ''}${elementId?.isNotEmpty == true ? 'ID: $elementId' : ''}";
+    children?.forEach((child) {
+      selfData += ("\n${child.toString()}")
+          .replaceAll(RegExp("^", multiLine: true), "-");
+    });
+    return selfData;
+  }
+}
+
+StyledElement parseStyledElement(
+    dom.Element element, List<StyledElement> children) {
+  StyledElement styledElement = StyledElement(
+    name: element.localName,
+    elementId: element.id,
+    elementClasses: element.classes.toList(),
+    children: children,
+    node: element,
+  );
+
+  switch (element.localName) {
+    case "abbr":
+    case "acronym":
+      styledElement.style = Style(
+        textDecoration: TextDecoration.underline,
+        textDecorationStyle: TextDecorationStyle.dotted,
+      );
+      break;
+    case "address":
+      continue italics;
+    case "article":
+      styledElement.style = Style(
+        display: Display.BLOCK,
+      );
+      break;
+    case "aside":
+      styledElement.style = Style(
+        display: Display.BLOCK,
+      );
+      break;
+    bold:
+    case "b":
+      styledElement.style = Style(
+        fontWeight: FontWeight.bold,
+      );
+      break;
+    case "bdo":
+      TextDirection textDirection =
+          ((element.attributes["dir"] ?? "ltr") == "rtl")
+              ? TextDirection.rtl
+              : TextDirection.ltr;
+      styledElement.style = Style(
+        direction: textDirection,
+      );
+      break;
+    case "big":
+      styledElement.style = Style(
+        fontSize: FontSize.larger,
+      );
+      break;
+    case "blockquote":
+      //TODO(Sub6Resources) this is a workaround for collapsing margins. Remove.
+      if (element.parent.localName == "blockquote") {
+        styledElement.style = Style(
+          margin: const EdgeInsets.only(left: 40.0, right: 40.0, bottom: 14.0),
+          display: Display.BLOCK,
+        );
+      } else {
+        styledElement.style = Style(
+          margin: const EdgeInsets.symmetric(horizontal: 40.0, vertical: 14.0),
+          display: Display.BLOCK,
+        );
+      }
+      break;
+    case "body":
+      styledElement.style = Style(
+        margin: EdgeInsets.all(8.0),
+        display: Display.BLOCK,
+      );
+      break;
+    case "center":
+      styledElement.style = Style(
+        alignment: Alignment.center,
+        display: Display.BLOCK,
+      );
+      break;
+    case "cite":
+      continue italics;
+    monospace:
+    case "code":
+      styledElement.style = Style(
+        fontFamily: 'Monospace',
+      );
+      break;
+    case "dd":
+      styledElement.style = Style(
+        margin: EdgeInsets.only(left: 40.0),
+        display: Display.BLOCK,
+      );
+      break;
+    strikeThrough:
+    case "del":
+      styledElement.style = Style(
+        textDecoration: TextDecoration.lineThrough,
+      );
+      break;
+    case "dfn":
+      continue italics;
+    case "div":
+      styledElement.style = Style(
+        margin: EdgeInsets.all(0),
+        display: Display.BLOCK,
+      );
+      break;
+    case "dl":
+      styledElement.style = Style(
+        margin: EdgeInsets.symmetric(vertical: 14.0),
+        display: Display.BLOCK,
+      );
+      break;
+    case "dt":
+      styledElement.style = Style(
+        display: Display.BLOCK,
+      );
+      break;
+    case "em":
+      continue italics;
+    case "figcaption":
+      styledElement.style = Style(
+        display: Display.BLOCK,
+      );
+      break;
+    case "figure":
+      styledElement.style = Style(
+        margin: EdgeInsets.symmetric(vertical: 14.0, horizontal: 40.0),
+        display: Display.BLOCK,
+      );
+      break;
+    case "footer":
+      styledElement.style = Style(
+        display: Display.BLOCK,
+      );
+      break;
+    case "h1":
+      styledElement.style = Style(
+        fontSize: FontSize.xxLarge,
+        fontWeight: FontWeight.bold,
+        margin: EdgeInsets.symmetric(vertical: 18.67),
+        display: Display.BLOCK,
+      );
+      break;
+    case "h2":
+      styledElement.style = Style(
+        fontSize: FontSize.xLarge,
+        fontWeight: FontWeight.bold,
+        margin: EdgeInsets.symmetric(vertical: 17.5),
+        display: Display.BLOCK,
+      );
+      break;
+    case "h3":
+      styledElement.style = Style(
+        fontSize: FontSize(16.38),
+        fontWeight: FontWeight.bold,
+        margin: EdgeInsets.symmetric(vertical: 16.5),
+        display: Display.BLOCK,
+      );
+      break;
+    case "h4":
+      styledElement.style = Style(
+        fontSize: FontSize.medium,
+        fontWeight: FontWeight.bold,
+        margin: EdgeInsets.symmetric(vertical: 18.5),
+        display: Display.BLOCK,
+      );
+      break;
+    case "h5":
+      styledElement.style = Style(
+        fontSize: FontSize(11.62),
+        fontWeight: FontWeight.bold,
+        margin: EdgeInsets.symmetric(vertical: 19.25),
+        display: Display.BLOCK,
+      );
+      break;
+    case "h6":
+      styledElement.style = Style(
+        fontSize: FontSize(9.38),
+        fontWeight: FontWeight.bold,
+        margin: EdgeInsets.symmetric(vertical: 22),
+        display: Display.BLOCK,
+      );
+      break;
+    case "header":
+      styledElement.style = Style(
+        display: Display.BLOCK,
+      );
+      break;
+    case "hr":
+      styledElement.style = Style(
+        margin: EdgeInsets.symmetric(vertical: 7.0),
+        width: double.infinity,
+        border: Border(bottom: BorderSide(width: 1.0)),
+        display: Display.BLOCK,
+      );
+      break;
+    case "html":
+      styledElement.style = Style(
+        display: Display.BLOCK,
+      );
+      break;
+    italics:
+    case "i":
+      styledElement.style = Style(
+        fontStyle: FontStyle.italic,
+      );
+      break;
+    case "ins":
+      continue underline;
+    case "kbd":
+      continue monospace;
+    case "li":
+      styledElement.style = Style(
+        display: Display.LIST_ITEM,
+      );
+      break;
+    case "main":
+      styledElement.style = Style(
+        display: Display.BLOCK,
+      );
+      break;
+    case "mark":
+      styledElement.style = Style(
+        color: Colors.black,
+        backgroundColor: Colors.yellow,
+      );
+      break;
+    case "nav":
+      styledElement.style = Style(
+        display: Display.BLOCK,
+      );
+      break;
+    case "noscript":
+      styledElement.style = Style(
+        display: Display.BLOCK,
+      );
+      break;
+    case "ol":
+    case "ul":
+      //TODO(Sub6Resources): This is a workaround for collapsed margins. Remove.
+      if (element.parent.localName == "li") {
+        styledElement.style = Style(
+//          margin: EdgeInsets.only(left: 30.0),
+          display: Display.BLOCK,
+          listStyleType: element.localName == "ol"
+              ? ListStyleType.DECIMAL
+              : ListStyleType.DISC,
+        );
+      } else {
+        styledElement.style = Style(
+//          margin: EdgeInsets.only(left: 30.0, top: 14.0, bottom: 14.0),
+          display: Display.BLOCK,
+          listStyleType: element.localName == "ol"
+              ? ListStyleType.DECIMAL
+              : ListStyleType.DISC,
+        );
+      }
+      break;
+    case "p":
+      styledElement.style = Style(
+        margin: EdgeInsets.symmetric(vertical: 14.0),
+        display: Display.BLOCK,
+      );
+      break;
+    case "pre":
+      styledElement.style = Style(
+        fontFamily: 'monospace',
+        margin: EdgeInsets.symmetric(vertical: 14.0),
+        whiteSpace: WhiteSpace.PRE,
+        display: Display.BLOCK,
+      );
+      break;
+    case "q":
+      styledElement.style = Style(
+        before: "\"",
+        after: "\"",
+      );
+      break;
+    case "s":
+      continue strikeThrough;
+    case "samp":
+      continue monospace;
+    case "section":
+      styledElement.style = Style(
+        display: Display.BLOCK,
+      );
+      break;
+    case "small":
+      styledElement.style = Style(
+        fontSize: FontSize.smaller,
+      );
+      break;
+    case "strike":
+      continue strikeThrough;
+    case "strong":
+      continue bold;
+    case "sub":
+      styledElement.style = Style(
+        fontSize: FontSize.smaller,
+        verticalAlign: VerticalAlign.SUB,
+      );
+      break;
+    case "sup":
+      styledElement.style = Style(
+        fontSize: FontSize.smaller,
+        verticalAlign: VerticalAlign.SUPER,
+      );
+      break;
+    case "th":
+      continue bold;
+    case "tt":
+      continue monospace;
+    underline:
+    case "u":
+      styledElement.style = Style(
+        textDecoration: TextDecoration.underline,
+      );
+      break;
+    case "var":
+      continue italics;
+  }
+
+  return styledElement;
+}
+
+typedef ListCharacter = String Function(int i);
diff --git a/lib/src/utils.dart b/lib/src/utils.dart
new file mode 100644
index 0000000000..fddb87d88e
--- /dev/null
+++ b/lib/src/utils.dart
@@ -0,0 +1,45 @@
+import 'package:flutter/gestures.dart';
+
+class Context<T> {
+  T data;
+
+  Context(this.data);
+}
+
+// This class is a workaround so that both an image
+// and a link can detect taps at the same time.
+class MultipleTapGestureRecognizer extends TapGestureRecognizer {
+  bool _ready = false;
+
+  @override
+  void addAllowedPointer(PointerDownEvent event) {
+    if (state == GestureRecognizerState.ready) {
+      _ready = true;
+    }
+    super.addAllowedPointer(event);
+  }
+
+  @override
+  void handlePrimaryPointer(PointerEvent event) {
+    if (event is PointerCancelEvent) {
+      _ready = false;
+    }
+    super.handlePrimaryPointer(event);
+  }
+
+  @override
+  void resolve(GestureDisposition disposition) {
+    if (_ready && disposition == GestureDisposition.rejected) {
+      _ready = false;
+    }
+    super.resolve(disposition);
+  }
+
+  @override
+  void rejectGesture(int pointer) {
+    if (_ready) {
+      acceptGesture(pointer);
+      _ready = false;
+    }
+  }
+}
diff --git a/lib/style.dart b/lib/style.dart
new file mode 100644
index 0000000000..a7c81c33ba
--- /dev/null
+++ b/lib/style.dart
@@ -0,0 +1,418 @@
+import 'dart:ui';
+
+import 'package:flutter/material.dart';
+
+///This class represents all the available CSS attributes
+///for this package.
+class Style {
+  /// CSS attribute "`background-color`"
+  ///
+  /// Inherited: no,
+  /// Default: Colors.transparent,
+  Color backgroundColor;
+
+  /// CSS attribute "`color`"
+  ///
+  /// Inherited: yes,
+  /// Default: unspecified,
+  Color color;
+
+  /// CSS attribute "`direction`"
+  ///
+  /// Inherited: yes,
+  /// Default: TextDirection.ltr,
+  TextDirection direction;
+
+  /// CSS attribute "`display`"
+  ///
+  /// Inherited: no,
+  /// Default: unspecified,
+  Display display;
+
+  /// CSS attribute "`font-family`"
+  ///
+  /// Inherited: yes,
+  /// Default: Theme.of(context).style.textTheme.body1.fontFamily
+  String fontFamily;
+
+  /// CSS attribute "`font-feature-settings`"
+  ///
+  /// Inherited: yes,
+  /// Default: normal
+  List<FontFeature> fontFeatureSettings;
+
+  /// CSS attribute "`font-size`"
+  ///
+  /// Inherited: yes,
+  /// Default: FontSize.medium
+  FontSize fontSize;
+
+  /// CSS attribute "`font-style`"
+  ///
+  /// Inherited: yes,
+  /// Default: FontStyle.normal,
+  FontStyle fontStyle;
+
+  /// CSS attribute "`font-weight`"
+  ///
+  /// Inherited: yes,
+  /// Default: FontWeight.normal,
+  FontWeight fontWeight;
+
+  /// CSS attribute "`height`"
+  ///
+  /// Inherited: no,
+  /// Default: Unspecified (null),
+  double height;
+
+  /// CSS attribute "`letter-spacing`"
+  ///
+  /// Inherited: yes,
+  /// Default: normal (0),
+  double letterSpacing;
+
+  /// CSS attribute "`list-style-type`"
+  ///
+  /// Inherited: yes,
+  /// Default: ListStyleType.DISC
+  ListStyleType listStyleType;
+
+  /// CSS attribute "`padding`"
+  ///
+  /// Inherited: no,
+  /// Default: EdgeInsets.zero
+  EdgeInsets padding;
+
+  /// CSS attribute "`margin`"
+  ///
+  /// Inherited: no,
+  /// Default: EdgeInsets.zero
+  EdgeInsets margin;
+
+  /// CSS attribute "`text-align`"
+  ///
+  /// Inherited: yes,
+  /// Default: TextAlign.start,
+  TextAlign textAlign;
+
+  /// CSS attribute "`text-decoration`"
+  ///
+  /// Inherited: no,
+  /// Default: TextDecoration.none,
+  TextDecoration textDecoration;
+
+  /// CSS attribute "`text-decoration-color`"
+  ///
+  /// Inherited: no,
+  /// Default: Current color
+  Color textDecorationColor;
+
+  /// CSS attribute "`text-decoration-style`"
+  ///
+  /// Inherited: no,
+  /// Default: TextDecorationStyle.solid,
+  TextDecorationStyle textDecorationStyle;
+
+  /// Loosely based on CSS attribute "`text-decoration-thickness`"
+  ///
+  /// Uses a percent modifier based on the font size.
+  ///
+  /// Inherited: no,
+  /// Default: 1.0 (specified by font size)
+  // TODO(Sub6Resources): Possibly base this more closely on the CSS attribute.
+  double textDecorationThickness;
+
+  /// CSS attribute "`text-shadow`"
+  ///
+  /// Inherited: yes,
+  /// Default: none,
+  List<Shadow> textShadow;
+
+  /// CSS attribute "`vertical-align`"
+  ///
+  /// Inherited: no,
+  /// Default: VerticalAlign.BASELINE,
+  VerticalAlign verticalAlign;
+
+  /// CSS attribute "`white-space`"
+  ///
+  /// Inherited: yes,
+  /// Default: WhiteSpace.NORMAL,
+  WhiteSpace whiteSpace;
+
+  /// CSS attribute "`width`"
+  ///
+  /// Inherited: no,
+  /// Default: unspecified (null)
+  double width;
+
+  /// CSS attribute "`word-spacing`"
+  ///
+  /// Inherited: yes,
+  /// Default: normal (0)
+  double wordSpacing;
+
+  //TODO modify these to match CSS styles
+  String before;
+  String after;
+  Border border;
+  Alignment alignment;
+  String markerContent;
+
+  Style({
+    this.backgroundColor = Colors.transparent,
+    this.color,
+    this.direction,
+    this.display,
+    this.fontFamily,
+    this.fontFeatureSettings,
+    this.fontSize,
+    this.fontStyle,
+    this.fontWeight,
+    this.height,
+    this.letterSpacing,
+    this.listStyleType,
+    this.padding,
+    this.margin,
+    this.textAlign,
+    this.textDecoration,
+    this.textDecorationColor,
+    this.textDecorationStyle,
+    this.textDecorationThickness,
+    this.textShadow,
+    this.verticalAlign,
+    this.whiteSpace,
+    this.width,
+    this.wordSpacing,
+    this.before,
+    this.after,
+    this.border,
+    this.alignment,
+    this.markerContent,
+  }) {
+    if (this.alignment == null &&
+        (display == Display.BLOCK || display == Display.LIST_ITEM)) {
+      this.alignment = Alignment.centerLeft;
+    }
+  }
+
+  TextStyle generateTextStyle() {
+    return TextStyle(
+      backgroundColor: backgroundColor,
+      color: color,
+      decoration: textDecoration,
+      decorationColor: textDecorationColor,
+      decorationStyle: textDecorationStyle,
+      decorationThickness: textDecorationThickness,
+      fontFamily: fontFamily,
+      fontFeatures: fontFeatureSettings,
+      fontSize: fontSize?.size,
+      fontStyle: fontStyle,
+      fontWeight: fontWeight,
+      letterSpacing: letterSpacing,
+      shadows: textShadow,
+      wordSpacing: wordSpacing,
+      //TODO background
+      //TODO textBaseline
+      //TODO height
+    );
+  }
+
+  @override
+  String toString() {
+    return "Style";
+  }
+
+  Style merge(Style other) {
+    if (other == null) return this;
+
+    return copyWith(
+      backgroundColor: other.backgroundColor,
+      color: other.color,
+      direction: other.direction,
+      display: other.display,
+      fontFamily: other.fontFamily,
+      fontFeatureSettings: other.fontFeatureSettings,
+      fontSize: other.fontSize,
+      fontStyle: other.fontStyle,
+      fontWeight: other.fontWeight,
+      height: other.height,
+      letterSpacing: other.letterSpacing,
+      listStyleType: other.listStyleType,
+      padding: other.padding,
+      //TODO merge EdgeInsets
+      margin: other.margin,
+      //TODO merge EdgeInsets
+      textAlign: other.textAlign,
+      textDecoration: other.textDecoration,
+      textDecorationColor: other.textDecorationColor,
+      textDecorationStyle: other.textDecorationStyle,
+      textDecorationThickness: other.textDecorationThickness,
+      textShadow: other.textShadow,
+      verticalAlign: other.verticalAlign,
+      whiteSpace: other.whiteSpace,
+      width: other.width,
+      wordSpacing: other.wordSpacing,
+
+      before: other.before,
+      after: other.after,
+      border: other.border,
+      //TODO merge border
+      alignment: other.alignment,
+      markerContent: other.markerContent,
+    );
+  }
+
+  Style copyOnlyInherited(Style child) {
+    if (child == null) return this;
+
+    return child.copyWith(
+      color: child.color ?? color,
+      direction: child.direction ?? direction,
+      fontFamily: child.fontFamily ?? fontFamily,
+      fontFeatureSettings: child.fontFeatureSettings ?? fontFeatureSettings,
+      fontSize: child.fontSize ?? fontSize,
+      fontStyle: child.fontStyle ?? fontStyle,
+      fontWeight: child.fontWeight ?? fontWeight,
+      letterSpacing: child.letterSpacing ?? letterSpacing,
+      listStyleType: child.listStyleType ?? listStyleType,
+      textAlign: child.textAlign ?? textAlign,
+      textShadow: child.textShadow ?? textShadow,
+      whiteSpace: child.whiteSpace ?? whiteSpace,
+      wordSpacing: child.wordSpacing ?? wordSpacing,
+    );
+  }
+
+  Style copyWith({
+    Color backgroundColor,
+    Color color,
+    TextDirection direction,
+    Display display,
+    String fontFamily,
+    List<FontFeature> fontFeatureSettings,
+    FontSize fontSize,
+    FontStyle fontStyle,
+    FontWeight fontWeight,
+    double height,
+    double letterSpacing,
+    ListStyleType listStyleType,
+    EdgeInsets padding,
+    EdgeInsets margin,
+    TextAlign textAlign,
+    TextDecoration textDecoration,
+    Color textDecorationColor,
+    TextDecorationStyle textDecorationStyle,
+    double textDecorationThickness,
+    List<Shadow> textShadow,
+    VerticalAlign verticalAlign,
+    WhiteSpace whiteSpace,
+    double width,
+    double wordSpacing,
+    String before,
+    String after,
+    Border border,
+    Alignment alignment,
+    String markerContent,
+  }) {
+    return Style(
+      backgroundColor: backgroundColor ?? this.backgroundColor,
+      color: color ?? this.color,
+      direction: direction ?? this.direction,
+      display: display ?? this.display,
+      fontFamily: fontFamily ?? this.fontFamily,
+      fontFeatureSettings: fontFeatureSettings ?? this.fontFeatureSettings,
+      fontSize: fontSize ?? this.fontSize,
+      fontStyle: fontStyle ?? this.fontStyle,
+      fontWeight: fontWeight ?? this.fontWeight,
+      height: height ?? this.height,
+      letterSpacing: letterSpacing ?? this.letterSpacing,
+      listStyleType: listStyleType ?? this.listStyleType,
+      padding: padding ?? this.padding,
+      margin: margin ?? this.margin,
+      textAlign: textAlign ?? this.textAlign,
+      textDecoration: textDecoration ?? this.textDecoration,
+      textDecorationColor: textDecorationColor ?? this.textDecorationColor,
+      textDecorationStyle: textDecorationStyle ?? this.textDecorationStyle,
+      textDecorationThickness:
+          textDecorationThickness ?? this.textDecorationThickness,
+      textShadow: textShadow ?? this.textShadow,
+      verticalAlign: verticalAlign ?? this.verticalAlign,
+      whiteSpace: whiteSpace ?? this.whiteSpace,
+      width: width ?? this.width,
+      wordSpacing: wordSpacing ?? this.wordSpacing,
+      before: before ?? this.before,
+      after: after ?? this.after,
+      border: border ?? this.border,
+      alignment: alignment ?? this.alignment,
+      markerContent: markerContent ?? this.markerContent,
+    );
+  }
+
+  Style.fromTextStyle(TextStyle textStyle) {
+    this.backgroundColor = textStyle.backgroundColor;
+    this.color = textStyle.color;
+    this.textDecoration = textStyle.decoration;
+    this.textDecorationColor = textStyle.decorationColor;
+    this.textDecorationStyle = textStyle.decorationStyle;
+    this.textDecorationThickness = textStyle.decorationThickness;
+    this.fontFamily = textStyle.fontFamily;
+    this.fontFeatureSettings = textStyle.fontFeatures;
+    this.fontSize = FontSize(textStyle.fontSize);
+    this.fontStyle = textStyle.fontStyle;
+    this.fontWeight = textStyle.fontWeight;
+    this.letterSpacing = textStyle.letterSpacing;
+    this.textShadow = textStyle.shadows;
+    this.wordSpacing = textStyle.wordSpacing;
+  }
+}
+
+enum Display {
+  BLOCK,
+  INLINE,
+  INLINE_BLOCK,
+  LIST_ITEM,
+}
+
+class FontSize {
+  final double size;
+
+  const FontSize(this.size);
+
+  /// A percentage of the parent style's font size.
+  factory FontSize.percent(int percent) {
+    return FontSize(percent.toDouble() / -100.0);
+  }
+
+  // These values are calculated based off of the default (`medium`)
+  // being 14px.
+  //
+  // TODO(Sub6Resources): This seems to override Flutter's accessibility text scaling.
+  //
+  // Negative values are computed during parsing to be a percentage of
+  // the parent style's font size.
+  static const xxSmall = FontSize(7.875);
+  static const xSmall = FontSize(8.75);
+  static const small = FontSize(11.375);
+  static const medium = FontSize(14.0);
+  static const large = FontSize(15.75);
+  static const xLarge = FontSize(21.0);
+  static const xxLarge = FontSize(28.0);
+  static const smaller = FontSize(-0.83);
+  static const larger = FontSize(-1.2);
+}
+
+enum ListStyleType {
+  DISC,
+  DECIMAL,
+}
+
+enum VerticalAlign {
+  BASELINE,
+  SUB,
+  SUPER,
+}
+
+enum WhiteSpace {
+  NORMAL,
+  PRE,
+}
diff --git a/pubspec.lock b/pubspec.lock
index 2785ac7e47..38d864d304 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -7,42 +7,56 @@ packages:
       name: archive
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.11"
+    version: "2.0.13"
   args:
     dependency: transitive
     description:
       name: args
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.2"
+    version: "1.6.0"
   async:
     dependency: transitive
     description:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.4.0"
+    version: "2.4.1"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.5"
+    version: "2.0.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.2"
+    version: "1.1.3"
+  chewie:
+    dependency: "direct main"
+    description:
+      name: chewie
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.9.10"
+  chewie_audio:
+    dependency: "direct main"
+    description:
+      name: chewie_audio
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.0+1"
   collection:
     dependency: transitive
     description:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.14.11"
+    version: "1.14.12"
   convert:
     dependency: transitive
     description:
@@ -56,38 +70,57 @@ packages:
       name: crypto
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.3"
+    version: "2.1.4"
+  css_colors:
+    dependency: "direct main"
+    description:
+      name: css_colors
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.2"
   csslib:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: csslib
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.16.0"
+    version: "0.16.1"
   flutter:
     dependency: "direct main"
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_svg:
+    dependency: "direct main"
+    description:
+      name: flutter_svg
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.17.4"
   flutter_test:
     dependency: "direct dev"
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_web_plugins:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   html:
     dependency: "direct main"
     description:
       name: html
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.14.0+2"
+    version: "0.14.0+3"
   image:
     dependency: transitive
     description:
       name: image
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.12"
   matcher:
     dependency: transitive
     description:
@@ -102,6 +135,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.8"
+  open_iconic_flutter:
+    dependency: transitive
+    description:
+      name: open_iconic_flutter
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.3.0"
   path:
     dependency: transitive
     description:
@@ -109,13 +149,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.6.4"
-  pedantic:
+  path_drawing:
+    dependency: transitive
+    description:
+      name: path_drawing
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.4.1"
+  path_parsing:
     dependency: transitive
     description:
-      name: pedantic
+      name: path_parsing
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0+1"
+    version: "0.1.4"
   petitparser:
     dependency: transitive
     description:
@@ -129,7 +176,14 @@ packages:
       name: quiver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.5"
+    version: "2.1.3"
+  screen:
+    dependency: transitive
+    description:
+      name: screen
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.0.5"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -141,7 +195,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.5"
+    version: "1.7.0"
   stack_trace:
     dependency: transitive
     description:
@@ -176,7 +230,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.11"
+    version: "0.2.15"
   typed_data:
     dependency: transitive
     description:
@@ -191,13 +245,48 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.8"
+  video_player:
+    dependency: "direct main"
+    description:
+      name: video_player
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.10.10"
+  video_player_platform_interface:
+    dependency: transitive
+    description:
+      name: video_player_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.2"
+  video_player_web:
+    dependency: transitive
+    description:
+      name: video_player_web
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.3"
+  wakelock:
+    dependency: transitive
+    description:
+      name: wakelock
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.3+4"
+  webview_flutter:
+    dependency: "direct main"
+    description:
+      name: webview_flutter
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.3.21"
   xml:
     dependency: transitive
     description:
       name: xml
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.5.0"
+    version: "3.6.1"
 sdks:
-  dart: ">=2.4.0 <3.0.0"
-  flutter: ">=0.5.0"
+  dart: ">=2.7.0 <3.0.0"
+  flutter: ">=1.17.0 <2.0.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index e7f8fb76ce..79d2362932 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,15 +1,33 @@
 name: flutter_html
-description: A Flutter widget for rendering static html tags as Flutter widgets. (Will render over 70 different html tags!)
-version: 0.11.1
-author: Matthew Whitaker <sub6resources@gmail.com>
+description: A Flutter widget rendering static HTML and CSS as Flutter widgets.
+version: 1.0.0
 homepage: https://github.com/Sub6Resources/flutter_html
 
 environment:
-  sdk: '>=1.19.0 <3.0.0'
-  flutter: '>=0.5.0'
+  sdk: '>=2.2.2 <3.0.0'
+  flutter: '>=1.17.0'
 
 dependencies:
-  html: ^0.14.0
+  # Plugin for parsing html
+  html: ^0.14.0+3
+
+  # Plugins for parsing css
+  csslib: ^0.16.1
+  css_colors: ^1.0.2
+
+  # Plugins for rendering the <video> tag.
+  video_player: ^0.10.10
+  chewie: ^0.9.10
+
+  # Plugin for rendering the <iframe> tag.
+  webview_flutter: ^0.3.21
+
+  # Plugins for rendering the <audio> tag.
+  chewie_audio: ^1.0.0+1
+
+  # Plugins for rendering the <svg> tag.
+  flutter_svg: ^0.17.4
+
   flutter:
     sdk: flutter
 
diff --git a/test/golden_test.dart b/test/golden_test.dart
index 9dd6595996..e381b3cda1 100644
--- a/test/golden_test.dart
+++ b/test/golden_test.dart
@@ -31,13 +31,37 @@ void testHtml(String name, String htmlData) {
         ),
       ),
     );
-    await expectLater(find.byType(Html), matchesGoldenFile('./goldens/$name.png'));
+    expect(find.byType(Html), findsOneWidget);
+//    await expectLater(find.byType(Html), matchesGoldenFile('./goldens/$name.png'));
   });
 }
 
 void main() {
+  //Test each HTML element
   testData.forEach((key, value) {
     testHtml(key, value);
   });
-  File.fromUri(Uri(path: './goldens/a.png')).readAsBytesSync();
+
+  //Test whitespace processing:
+  testWidgets('whitespace golden test', (WidgetTester tester) async {
+    await tester.pumpWidget(
+      TestApp(
+        Html(data: """
+          <p id='whitespace'>
+      These two lines should have an identical length:<br /><br />
+
+            The     quick   <b> brown </b><u><i> fox </i></u> jumped over   the
+             lazy
+
+
+
+
+             dog.<br />
+            The quick brown fox jumped over the lazy dog.
+      </p>
+          """),
+      ),
+    );
+//    await expectLater(find.byType(Html), matchesGoldenFile('./goldens/whitespace.png'));
+  });
 }
diff --git a/test/goldens/a.png b/test/goldens/a.png
index 69250f4fac..4645438c32 100644
Binary files a/test/goldens/a.png and b/test/goldens/a.png differ
diff --git a/test/goldens/abbr.png b/test/goldens/abbr.png
index b2518f038a..9688ab8801 100644
Binary files a/test/goldens/abbr.png and b/test/goldens/abbr.png differ
diff --git a/test/goldens/acronym.png b/test/goldens/acronym.png
index 43b503400e..f87b50de60 100644
Binary files a/test/goldens/acronym.png and b/test/goldens/acronym.png differ
diff --git a/test/goldens/address.png b/test/goldens/address.png
index ae39747288..92912ab24b 100644
Binary files a/test/goldens/address.png and b/test/goldens/address.png differ
diff --git a/test/goldens/article.png b/test/goldens/article.png
index c45a824417..26180bbce7 100644
Binary files a/test/goldens/article.png and b/test/goldens/article.png differ
diff --git a/test/goldens/aside.png b/test/goldens/aside.png
index 9006d77628..c095a913c0 100644
Binary files a/test/goldens/aside.png and b/test/goldens/aside.png differ
diff --git a/test/goldens/b.png b/test/goldens/b.png
index 61384dbd6b..76859cf1b4 100644
Binary files a/test/goldens/b.png and b/test/goldens/b.png differ
diff --git a/test/goldens/bdi.png b/test/goldens/bdi.png
index 3b4446b10f..bc56061fce 100644
Binary files a/test/goldens/bdi.png and b/test/goldens/bdi.png differ
diff --git a/test/goldens/bdo.png b/test/goldens/bdo.png
index 3da5bf131b..bc56061fce 100644
Binary files a/test/goldens/bdo.png and b/test/goldens/bdo.png differ
diff --git a/test/goldens/big.png b/test/goldens/big.png
index eb736d45d7..595eb88849 100644
Binary files a/test/goldens/big.png and b/test/goldens/big.png differ
diff --git a/test/goldens/blockquote.png b/test/goldens/blockquote.png
index 3b4446b10f..15a960ed2e 100644
Binary files a/test/goldens/blockquote.png and b/test/goldens/blockquote.png differ
diff --git a/test/goldens/body.png b/test/goldens/body.png
index 3b4446b10f..bc56061fce 100644
Binary files a/test/goldens/body.png and b/test/goldens/body.png differ
diff --git a/test/goldens/br.png b/test/goldens/br.png
index ced901e3c3..61ab0344c3 100644
Binary files a/test/goldens/br.png and b/test/goldens/br.png differ
diff --git a/test/goldens/caption.png b/test/goldens/caption.png
index 3b4446b10f..bc56061fce 100644
Binary files a/test/goldens/caption.png and b/test/goldens/caption.png differ
diff --git a/test/goldens/center.png b/test/goldens/center.png
index fade4ad919..bc56061fce 100644
Binary files a/test/goldens/center.png and b/test/goldens/center.png differ
diff --git a/test/goldens/cite.png b/test/goldens/cite.png
index 2987852081..6faca6a8bb 100644
Binary files a/test/goldens/cite.png and b/test/goldens/cite.png differ
diff --git a/test/goldens/code.png b/test/goldens/code.png
index 3b4446b10f..bc56061fce 100644
Binary files a/test/goldens/code.png and b/test/goldens/code.png differ
diff --git a/test/goldens/data.png b/test/goldens/data.png
index 3b4446b10f..bc56061fce 100644
Binary files a/test/goldens/data.png and b/test/goldens/data.png differ
diff --git a/test/goldens/dd.png b/test/goldens/dd.png
index 86c9318cc9..149ffc04a1 100644
Binary files a/test/goldens/dd.png and b/test/goldens/dd.png differ
diff --git a/test/goldens/del.png b/test/goldens/del.png
index 0f5e382f5b..8d6141fab3 100644
Binary files a/test/goldens/del.png and b/test/goldens/del.png differ
diff --git a/test/goldens/dfn.png b/test/goldens/dfn.png
index 86c9318cc9..6faca6a8bb 100644
Binary files a/test/goldens/dfn.png and b/test/goldens/dfn.png differ
diff --git a/test/goldens/div.png b/test/goldens/div.png
index 86c9318cc9..bc56061fce 100644
Binary files a/test/goldens/div.png and b/test/goldens/div.png differ
diff --git a/test/goldens/dl.png b/test/goldens/dl.png
index 86c9318cc9..29d8b14aad 100644
Binary files a/test/goldens/dl.png and b/test/goldens/dl.png differ
diff --git a/test/goldens/dt.png b/test/goldens/dt.png
index 86c9318cc9..bc56061fce 100644
Binary files a/test/goldens/dt.png and b/test/goldens/dt.png differ
diff --git a/test/goldens/em.png b/test/goldens/em.png
index 2987852081..6faca6a8bb 100644
Binary files a/test/goldens/em.png and b/test/goldens/em.png differ
diff --git a/test/goldens/figcaption_figure.png b/test/goldens/figcaption_figure.png
index 86c9318cc9..15a960ed2e 100644
Binary files a/test/goldens/figcaption_figure.png and b/test/goldens/figcaption_figure.png differ
diff --git a/test/goldens/font.png b/test/goldens/font.png
index 3da5bf131b..bc56061fce 100644
Binary files a/test/goldens/font.png and b/test/goldens/font.png differ
diff --git a/test/goldens/footer.png b/test/goldens/footer.png
index 86c9318cc9..bc56061fce 100644
Binary files a/test/goldens/footer.png and b/test/goldens/footer.png differ
diff --git a/test/goldens/h1.png b/test/goldens/h1.png
index d23e67a14a..d36fed5ce7 100644
Binary files a/test/goldens/h1.png and b/test/goldens/h1.png differ
diff --git a/test/goldens/h2.png b/test/goldens/h2.png
index 1d3d88d816..8d077062d1 100644
Binary files a/test/goldens/h2.png and b/test/goldens/h2.png differ
diff --git a/test/goldens/h3.png b/test/goldens/h3.png
index f5848c9204..1f678110f2 100644
Binary files a/test/goldens/h3.png and b/test/goldens/h3.png differ
diff --git a/test/goldens/h4.png b/test/goldens/h4.png
index b622477051..c85f2f1fb3 100644
Binary files a/test/goldens/h4.png and b/test/goldens/h4.png differ
diff --git a/test/goldens/h5.png b/test/goldens/h5.png
index 9da4a6149f..c71d610a78 100644
Binary files a/test/goldens/h5.png and b/test/goldens/h5.png differ
diff --git a/test/goldens/h6.png b/test/goldens/h6.png
index afba7a4ce4..4529f9a141 100644
Binary files a/test/goldens/h6.png and b/test/goldens/h6.png differ
diff --git a/test/goldens/header.png b/test/goldens/header.png
index 86c9318cc9..bc56061fce 100644
Binary files a/test/goldens/header.png and b/test/goldens/header.png differ
diff --git a/test/goldens/hr.png b/test/goldens/hr.png
index 629a5a2caf..de25a2ace3 100644
Binary files a/test/goldens/hr.png and b/test/goldens/hr.png differ
diff --git a/test/goldens/i.png b/test/goldens/i.png
index 2987852081..6faca6a8bb 100644
Binary files a/test/goldens/i.png and b/test/goldens/i.png differ
diff --git a/test/goldens/img.png b/test/goldens/img.png
index 6e4b17577d..bc56061fce 100644
Binary files a/test/goldens/img.png and b/test/goldens/img.png differ
diff --git a/test/goldens/img_alt.png b/test/goldens/img_alt.png
index 6e4b17577d..bc56061fce 100644
Binary files a/test/goldens/img_alt.png and b/test/goldens/img_alt.png differ
diff --git a/test/goldens/ins.png b/test/goldens/ins.png
index d4220c574b..822013efbf 100644
Binary files a/test/goldens/ins.png and b/test/goldens/ins.png differ
diff --git a/test/goldens/kbd.png b/test/goldens/kbd.png
index 3b4446b10f..bc56061fce 100644
Binary files a/test/goldens/kbd.png and b/test/goldens/kbd.png differ
diff --git a/test/goldens/li_ol.png b/test/goldens/li_ol.png
index 85f8a7835d..8e60eb691d 100644
Binary files a/test/goldens/li_ol.png and b/test/goldens/li_ol.png differ
diff --git a/test/goldens/li_ul.png b/test/goldens/li_ul.png
index 0bed171442..bba0fa2f49 100644
Binary files a/test/goldens/li_ul.png and b/test/goldens/li_ul.png differ
diff --git a/test/goldens/main.png b/test/goldens/main.png
index 86c9318cc9..bc56061fce 100644
Binary files a/test/goldens/main.png and b/test/goldens/main.png differ
diff --git a/test/goldens/mark.png b/test/goldens/mark.png
index aad59d7146..e14bf4fc3f 100644
Binary files a/test/goldens/mark.png and b/test/goldens/mark.png differ
diff --git a/test/goldens/nav.png b/test/goldens/nav.png
index 86c9318cc9..bc56061fce 100644
Binary files a/test/goldens/nav.png and b/test/goldens/nav.png differ
diff --git a/test/goldens/noscript.png b/test/goldens/noscript.png
index 3da5bf131b..8520bfef78 100644
Binary files a/test/goldens/noscript.png and b/test/goldens/noscript.png differ
diff --git a/test/goldens/p.png b/test/goldens/p.png
index 86c9318cc9..29d8b14aad 100644
Binary files a/test/goldens/p.png and b/test/goldens/p.png differ
diff --git a/test/goldens/pre.png b/test/goldens/pre.png
index 86c9318cc9..29d8b14aad 100644
Binary files a/test/goldens/pre.png and b/test/goldens/pre.png differ
diff --git a/test/goldens/q.png b/test/goldens/q.png
index 86abb55c35..6e28a5c2df 100644
Binary files a/test/goldens/q.png and b/test/goldens/q.png differ
diff --git a/test/goldens/rp.png b/test/goldens/rp.png
index a65dffce57..8520bfef78 100644
Binary files a/test/goldens/rp.png and b/test/goldens/rp.png differ
diff --git a/test/goldens/rt.png b/test/goldens/rt.png
index a65dffce57..03910f6eb8 100644
Binary files a/test/goldens/rt.png and b/test/goldens/rt.png differ
diff --git a/test/goldens/ruby.png b/test/goldens/ruby.png
index a65dffce57..03910f6eb8 100644
Binary files a/test/goldens/ruby.png and b/test/goldens/ruby.png differ
diff --git a/test/goldens/s.png b/test/goldens/s.png
index 0f5e382f5b..8d6141fab3 100644
Binary files a/test/goldens/s.png and b/test/goldens/s.png differ
diff --git a/test/goldens/samp.png b/test/goldens/samp.png
index 3b4446b10f..bc56061fce 100644
Binary files a/test/goldens/samp.png and b/test/goldens/samp.png differ
diff --git a/test/goldens/section.png b/test/goldens/section.png
index 86c9318cc9..bc56061fce 100644
Binary files a/test/goldens/section.png and b/test/goldens/section.png differ
diff --git a/test/goldens/small.png b/test/goldens/small.png
index 0af20b4fd7..0c548bc2f6 100644
Binary files a/test/goldens/small.png and b/test/goldens/small.png differ
diff --git a/test/goldens/span.png b/test/goldens/span.png
index 3b4446b10f..bc56061fce 100644
Binary files a/test/goldens/span.png and b/test/goldens/span.png differ
diff --git a/test/goldens/strike.png b/test/goldens/strike.png
index 0f5e382f5b..8d6141fab3 100644
Binary files a/test/goldens/strike.png and b/test/goldens/strike.png differ
diff --git a/test/goldens/strong.png b/test/goldens/strong.png
index 61384dbd6b..76859cf1b4 100644
Binary files a/test/goldens/strong.png and b/test/goldens/strong.png differ
diff --git a/test/goldens/sub.png b/test/goldens/sub.png
index 4cba49cd8b..c1629a85af 100644
Binary files a/test/goldens/sub.png and b/test/goldens/sub.png differ
diff --git a/test/goldens/sup.png b/test/goldens/sup.png
index 3da5bf131b..71d14a1332 100644
Binary files a/test/goldens/sup.png and b/test/goldens/sup.png differ
diff --git a/test/goldens/table.png b/test/goldens/table.png
index 4a2baae45a..23959ff9c4 100644
Binary files a/test/goldens/table.png and b/test/goldens/table.png differ
diff --git a/test/goldens/tbody.png b/test/goldens/tbody.png
index 4a2baae45a..23959ff9c4 100644
Binary files a/test/goldens/tbody.png and b/test/goldens/tbody.png differ
diff --git a/test/goldens/td.png b/test/goldens/td.png
index 4a2baae45a..23959ff9c4 100644
Binary files a/test/goldens/td.png and b/test/goldens/td.png differ
diff --git a/test/goldens/template.png b/test/goldens/template.png
index 3da5bf131b..8520bfef78 100644
Binary files a/test/goldens/template.png and b/test/goldens/template.png differ
diff --git a/test/goldens/tfoot.png b/test/goldens/tfoot.png
index 4a2baae45a..23959ff9c4 100644
Binary files a/test/goldens/tfoot.png and b/test/goldens/tfoot.png differ
diff --git a/test/goldens/th.png b/test/goldens/th.png
index 4a2baae45a..23959ff9c4 100644
Binary files a/test/goldens/th.png and b/test/goldens/th.png differ
diff --git a/test/goldens/thead.png b/test/goldens/thead.png
index 4a2baae45a..23959ff9c4 100644
Binary files a/test/goldens/thead.png and b/test/goldens/thead.png differ
diff --git a/test/goldens/time.png b/test/goldens/time.png
index 70cd8df8c2..b30f50ca26 100644
Binary files a/test/goldens/time.png and b/test/goldens/time.png differ
diff --git a/test/goldens/tr.png b/test/goldens/tr.png
index 4a2baae45a..23959ff9c4 100644
Binary files a/test/goldens/tr.png and b/test/goldens/tr.png differ
diff --git a/test/goldens/tt.png b/test/goldens/tt.png
index 3b4446b10f..bc56061fce 100644
Binary files a/test/goldens/tt.png and b/test/goldens/tt.png differ
diff --git a/test/goldens/u.png b/test/goldens/u.png
index d4220c574b..822013efbf 100644
Binary files a/test/goldens/u.png and b/test/goldens/u.png differ
diff --git a/test/goldens/var.png b/test/goldens/var.png
index 2987852081..6faca6a8bb 100644
Binary files a/test/goldens/var.png and b/test/goldens/var.png differ
diff --git a/test/goldens/whitespace.png b/test/goldens/whitespace.png
new file mode 100644
index 0000000000..93b1f4422b
Binary files /dev/null and b/test/goldens/whitespace.png differ
diff --git a/test/html_parser_test.dart b/test/html_parser_test.dart
index 44cb709f94..97af4b2593 100644
--- a/test/html_parser_test.dart
+++ b/test/html_parser_test.dart
@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_html/rich_text_parser.dart';
+import 'package:flutter_html/src/html_elements.dart';
+import 'package:flutter_html/html_parser.dart';
+import 'package:flutter_html/style.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_html/flutter_html.dart';
 
@@ -11,1120 +13,110 @@ void main() {
         home: Scaffold(
           body: Html(
             data: "",
-            useRichText: false,
           ),
         ),
       ),
     );
   });
 
-  testWidgets("Check that RichText parser does not fail on empty data",
-      (tester) async {
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: "",
-            useRichText: true,
-          ),
-        ),
-      ),
-    );
-  });
-
-  //`a` tag tests
-
-  testWidgets("Check that `a` tag is rendered by both parsers", (tester) async {
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: "<a href='https://github.com'>Test link</a>",
-            useRichText: false,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.text("Test link"), findsOneWidget);
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: "<a href='https://github.com'>Test link</a>",
-            useRichText: true,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.byType(RichText), findsOneWidget);
-  });
-
-  testWidgets("Check that tapping on the `a` tag calls the callback",
-      (tester) async {
-    String html = "<a href='https://github.com'>Test link</a>";
-    String urlTapped;
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            onLinkTap: (url) {
-              urlTapped = url;
-            },
-            useRichText: false,
-          ),
-        ),
-      ),
-    );
-    await tester.tap(find.text("Test link"));
-    expect(urlTapped, "https://github.com");
-  });
-
-  testWidgets(
-      "Check that tapping on the `a` tag calls the callback `RichText` parser",
-      (tester) async {
-    String html = "<a href='https://github.com'>Test link</a>";
-    String urlTapped;
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            onLinkTap: (url) {
-              urlTapped = url;
-            },
-            useRichText: true,
-          ),
-        ),
-      ),
-    );
-    await tester.tap(find.byType(RichText));
-    expect(urlTapped, "https://github.com");
-  });
-
-  // `abbr` tag tests
-  testWidgets("Check that `abbr` tag renders", (tester) async {
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: "<abbr>Abbreviation</abbr>",
-            useRichText: false,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.text("Abbreviation"), findsOneWidget);
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: "<abbr>Abbreviation</abbr>",
-            useRichText: true,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.byType(RichText), findsOneWidget);
-  });
-
-  testWidgets("Check that `acronym` tag renders", (tester) async {
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: "<acronym>Acronym</acronym>",
-            useRichText: false,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.text("Acronym"), findsOneWidget);
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: "<acronym>Acronym</acronym>",
-            useRichText: true,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.byType(RichText), findsOneWidget);
-  });
-
-  testWidgets("Check that `address` tag renders", (tester) async {
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: "<address>Address</address>",
-            useRichText: false
-          ),
-        ),
-      ),
-    );
-
-    expect(find.text("Address"), findsOneWidget);
-
-    //Not supported in `RichText` parser.
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: "<address>Address</address>",
-            useRichText: true,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.byType(RichText), findsOneWidget);
-  });
-
-  testWidgets("Check that `article` tag renders", (tester) async {
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: "<article>Article</article>",
-            useRichText: false,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.text("Article"), findsOneWidget);
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: "<article>Article</article>",
-            useRichText: true,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.byType(BlockText), findsOneWidget);
-  });
-
-  testWidgets("Check that `aside` tag renders", (tester) async {
-    String html = "<aside>Aside</aside>";
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: false,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.text("Aside"), findsOneWidget);
-
-    //Not supported in `RichText` parser.
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: true,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.byType(RichText), findsOneWidget);
-  });
-
-  testWidgets("Check that `b` tag renders", (tester) async {
-    String html = "<b>B</b>";
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: false,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.text("B"), findsOneWidget);
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: true,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.byType(RichText), findsOneWidget);
-  });
-
-  testWidgets("Check that `bdi` tag renders", (tester) async {
-    String html = "<bdi>Bdi</bdi>";
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: false,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.text("Bdi"), findsOneWidget);
-
-    //Not supported in `RichText` parser.
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: true,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.byType(RichText), findsOneWidget);
-  });
-
-  testWidgets("Check that `bdo` tag renders", (tester) async {
-    String html = "<bdo>Bdo</bdo>";
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: false,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.text("Bdo"), findsOneWidget);
-
-    //Not supported in `RichText` parser.
-//    await tester.pumpWidget(
-//      MaterialApp(
-//        home: Scaffold(
-//          body: Html(
-//            data: html,
-//            useRichText: true,
-//          ),
-//        ),
-//      ),
-//    );
-//
-//    expect(find.byType(RichText), findsOneWidget);
-  });
-
-  testWidgets("Check that `big` tag renders", (tester) async {
-    String html = "<big>Big</big>";
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: false,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.text("Big"), findsOneWidget);
-
-    //Not supported in `RichText` parser.
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: true,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.byType(RichText), findsOneWidget);
-  });
-
-  testWidgets("Check that `blockquote` tag renders", (tester) async {
-    String html = "<blockquote>Blockquote</blockquote>";
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: false,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.text("Blockquote"), findsOneWidget);
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: true,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.byType(BlockText), findsOneWidget);
-  });
-
-  testWidgets("Check that `body` tag renders", (tester) async {
-    String html = "<body>Body</body>";
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: false,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.text("Body"), findsOneWidget);
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: true,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.byType(BlockText), findsOneWidget);
-  });
-
-  testWidgets("Check that `br` tag renders", (tester) async {
-    String html = "Text<br />broken";
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: false,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.text("Text"), findsOneWidget);
-    expect(find.text("broken"), findsOneWidget);
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: true,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.byType(RichText), findsOneWidget);
-  });
-
-  testWidgets("Check that `caption` tag renders", (tester) async {
-    String html = "<caption>Caption</caption>";
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: false,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.text("Caption"), findsOneWidget);
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: true,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.byType(RichText), findsOneWidget);
-  });
-
-  testWidgets("Check that `cite` tag renders", (tester) async {
-    String html = "<cite>Cite</cite>";
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: false,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.text("Cite"), findsOneWidget);
-
-    //Not supported in `RichText` parser.
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: true,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.byType(RichText), findsOneWidget);
-  });
-
-  testWidgets("Check that `code` tag renders", (tester) async {
-    String html = "<code>Code</code>";
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: false,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.text("Code"), findsOneWidget);
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: true,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.byType(RichText), findsOneWidget);
-  });
-
-  testWidgets("Check that `data` tag renders", (tester) async {
-    String html = "<data>Data</data>";
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: false,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.text("Data"), findsOneWidget);
-
-    //Not supported in `RichText` parser.
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: true,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.byType(RichText), findsOneWidget);
-  });
-
-  testWidgets("Check that `dd` tag renders", (tester) async {
-    String html = "<dd>DD</dd>";
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: false,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.text("DD"), findsOneWidget);
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: true,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.byType(RichText), findsOneWidget);
-  });
-
-  testWidgets("Check that `dfn` tag renders", (tester) async {
-    String html = "<dfn>Dfn</dfn>";
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: false,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.text("Dfn"), findsOneWidget);
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: true,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.byType(RichText), findsOneWidget);
-  });
-
-  testWidgets("Check that `div` tag renders", (tester) async {
-    String html = "<div>Div</div>";
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: false,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.text("Div"), findsOneWidget);
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: true,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.byType(BlockText), findsOneWidget);
-  });
-
-  testWidgets("Check that `dl` tag renders", (tester) async {
-    String html = "<dl>Dl</dl>";
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: false,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.text("Dl"), findsOneWidget);
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: true,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.byType(RichText), findsOneWidget);
-  });
-
-  testWidgets("Check that `dt` tag renders", (tester) async {
-    String html = "<dt>Dt</dt>";
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: false,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.text("Dt"), findsOneWidget);
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: true,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.byType(RichText), findsOneWidget);
-  });
-
-  testWidgets("Check that `em` tag renders", (tester) async {
-    String html = "<em>Em</em>";
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: false,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.text("Em"), findsOneWidget);
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: true,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.byType(RichText), findsOneWidget);
-  });
-
-  testWidgets("Check that `figcaption` tag renders", (tester) async {
-    String html = "<figcaption>Figcaption</figcaption>";
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: false,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.text("Figcaption"), findsOneWidget);
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: true,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.byType(RichText), findsOneWidget);
-  });
-
-  testWidgets("Check that `figure` tag renders", (tester) async {
-    String html = "<figure>Figure</figure>";
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: false,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.text("Figure"), findsOneWidget);
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: true,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.byType(RichText), findsOneWidget);
-  });
-
-  testWidgets("Check that `footer` tag renders", (tester) async {
-    String html = "<b>Footer</b>";
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: false,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.text("Footer"), findsOneWidget);
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: true,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.byType(BlockText), findsOneWidget);
-  });
-
-  testWidgets("Check that `h1` tag renders", (tester) async {
-    String html = "<h1>h1</h1>";
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: false,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.text("h1"), findsOneWidget);
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: true,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.byType(BlockText), findsOneWidget);
-  });
-
-  testWidgets("Check that `h2` tag renders", (tester) async {
-    String html = "<h2>h2</h2>";
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: false,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.text("h2"), findsOneWidget);
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: true,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.byType(BlockText), findsOneWidget);
-  });
-
-  testWidgets("Check that `h3` tag renders", (tester) async {
-    String html = "<h3>h3</h3>";
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: false,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.text("h3"), findsOneWidget);
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: true,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.byType(BlockText), findsOneWidget);
-  });
-
-  testWidgets("Check that `h4` tag renders", (tester) async {
-    String html = "<h4>h4</h4>";
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: false,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.text("h4"), findsOneWidget);
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: true,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.byType(BlockText), findsOneWidget);
-  });
-
-  testWidgets("Check that `h5` tag renders", (tester) async {
-    String html = "<h5>h5</h5>";
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: false,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.text("h5"), findsOneWidget);
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: true,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.byType(BlockText), findsOneWidget);
-  });
-
-  testWidgets("Check that `h6` tag renders", (tester) async {
-    String html = "<h6>h6</h6>";
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: false,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.text("h6"), findsOneWidget);
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: true,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.byType(BlockText), findsOneWidget);
-  });
-
-  testWidgets("Check that `header` tag renders", (tester) async {
-    String html = "<header>header</header>";
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: false,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.text("header"), findsOneWidget);
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: true,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.byType(BlockText), findsOneWidget);
-  });
-
-  testWidgets("Check that `hr` tag renders", (tester) async {
-    String html = "<hr />";
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: false,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.byType(Divider), findsOneWidget);
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: true,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.byType(Divider), findsOneWidget);
-  });
-
-  testWidgets("Check that `i` tag renders", (tester) async {
-    String html = "<i>i</i>";
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: false,
-          ),
-        ),
-      ),
-    );
-
-    expect(find.text("i"), findsOneWidget);
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: Html(
-            data: html,
-            useRichText: true,
-          ),
-        ),
-      ),
-    );
+  testNewParser();
+}
 
-    expect(find.byType(RichText), findsOneWidget);
+void testNewParser() {
+  test("Html Parser works correctly", () {
+    HtmlParser.parseHTML("<b>Hello, World!</b>");
+  });
+
+  test("lexDomTree works correctly", () {
+    StyledElement tree = HtmlParser.lexDomTree(
+        HtmlParser.parseHTML(
+            "Hello! <b>Hello, World!</b><i>Hello, New World!</i>"),
+        [],
+        []);
+    print(tree.toString());
+  });
+
+  test("InteractableElements work correctly", () {
+    StyledElement tree = HtmlParser.lexDomTree(
+        HtmlParser.parseHTML(
+            "Hello, World! <a href='https://example.com'>This is a link</a>"),
+        [],
+        []);
+    print(tree.toString());
+  });
+
+  test("ContentElements work correctly", () {
+    StyledElement tree = HtmlParser.lexDomTree(
+        HtmlParser.parseHTML("<img src='https://image.example.com' />"),
+        [],
+        []);
+    print(tree.toString());
+  });
+
+  test("Nesting of elements works correctly", () {
+    StyledElement tree = HtmlParser.lexDomTree(
+        HtmlParser.parseHTML(
+            "<div><div><div><div><a href='link'>Link</a><div>Hello, World! <b>Bold and <i>Italic</i></b></div></div></div></div></div>"),
+        [],
+        []);
+    print(tree.toString());
+  });
+
+  test("Video Content Source Parser works correctly", () {
+    ReplacedElement videoContentElement =
+        parseReplacedElement(HtmlParser.parseHTML("""
+      <video width="320" height="240" controls>
+       <source src="movie.mp4" type="video/mp4">
+       <source src="movie.ogg" type="video/ogg">
+       Your browser does not support the video tag.
+      </video>
+    """).getElementsByTagName("video")[0]);
+
+    expect(videoContentElement, isA<VideoContentElement>());
+    if (videoContentElement is VideoContentElement) {
+      expect(videoContentElement.showControls, equals(true),
+          reason: "Controls isn't working");
+      expect(videoContentElement.src, hasLength(2),
+          reason: "Not enough sources...");
+    }
+  });
+
+  test("Audio Content Source Parser works correctly", () {
+    ReplacedElement audioContentElement =
+        parseReplacedElement(HtmlParser.parseHTML("""
+      <audio controls>
+        <source src='audio.mp3' type='audio/mpeg'>
+        <source src='audio.wav' type='audio/wav'>
+        Your browser does not support the audio tag.
+      </audio>
+    """).getElementsByTagName("audio")[0]);
+    expect(audioContentElement, isA<AudioContentElement>());
+    if (audioContentElement is AudioContentElement) {
+      expect(audioContentElement.showControls, equals(true),
+          reason: "Controls isn't working");
+      expect(audioContentElement.src, hasLength(2),
+          reason: "Not enough sources...");
+    }
+  });
+
+  test("Test style merging", () {
+    Style style1 = Style(
+      display: Display.BLOCK,
+      fontWeight: FontWeight.bold,
+    );
+
+    Style style2 = Style(
+      before: "* ",
+      direction: TextDirection.rtl,
+      fontStyle: FontStyle.italic,
+    );
+
+    Style finalStyle = style1.merge(style2);
+
+    expect(finalStyle.display, equals(Display.BLOCK));
+    expect(finalStyle.before, equals("* "));
+    expect(finalStyle.direction, equals(TextDirection.rtl));
+    expect(finalStyle.fontStyle, equals(FontStyle.italic));
+    expect(finalStyle.fontWeight, equals(FontWeight.bold));
   });
 }
diff --git a/test/test_data.dart b/test/test_data.dart
index f28ae5ffb2..a23d7c43b5 100644
--- a/test/test_data.dart
+++ b/test/test_data.dart
@@ -24,7 +24,8 @@ const testData = <String, String>{
   'dl': '<dl>Hello, World!</dl>',
   'dt': '<dt>Hello, World!</dt>',
   'em': '<em>Hello, World!</em>',
-  'figcaption_figure': '<figure><figcaption>Hello, World!</figcaption></figure>',
+  'figcaption_figure':
+      '<figure><figcaption>Hello, World!</figcaption></figure>',
   'font': '<font>Hello, World!</font>',
   'footer': '<footer>Hello, World!</footer>',
   'h1': '<h1>Hello, World!</h1>',
@@ -36,7 +37,8 @@ const testData = <String, String>{
   'header': '<header>Hello, World!</header>',
   'hr': '<div>Hello</div><hr /><div>World!</div>',
   'i': '<i>Hello, World!</i>',
-  'img': '<img alt="Hello, World!" src="https://www.google.com/images/branding/googlelogo/2x/googlelogo_color_272x92dp.png" />',
+  'img':
+      '<img alt="Hello, World!" src="https://www.google.com/images/branding/googlelogo/2x/googlelogo_color_272x92dp.png" />',
   'img_alt': '<img alt="Hello, World!" src="" />',
   'ins': '<ins>Hello, World!</ins>',
   'kbd': '<kbd>Hello, World!</kbd>',
@@ -61,16 +63,23 @@ const testData = <String, String>{
   'strong': '<strong>Hello, World!</strong>',
   'sub': '<sub>Hello, World!</sub>',
   'sup': '<sup>Hello, World!</sup>',
-  'table': '<table><tr><th>Hello</th><th>World!</th></tr><tr><td>Hello</td><td>World!</td></tr></table>',
-  'tbody': '<table><tr><th>Hello</th><th>World!</th></tr><tbody><tr><td>Hello</td><td>World!</td></tr></tbody></table>',
-  'td': '<table><tr><th>Hello</th><th>World!</th></tr><tr><td>Hello</td><td>World!</td></tr></table>',
+  'table':
+      '<table><tr><th>Hello</th><th>World!</th></tr><tr><td>Hello</td><td>World!</td></tr></table>',
+  'tbody':
+      '<table><tr><th>Hello</th><th>World!</th></tr><tbody><tr><td>Hello</td><td>World!</td></tr></tbody></table>',
+  'td':
+      '<table><tr><th>Hello</th><th>World!</th></tr><tr><td>Hello</td><td>World!</td></tr></table>',
   'template': '<template>Hello, World!</template>',
-  'tfoot': '<table><tr><th>Hello</th><th>World!</th></tr><tfoot><tr><td>Hello</td><td>World!</td></tr></tfoot></table>',
-  'th': '<table><tr><th>Hello</th><th>World!</th></tr><tr><td>Hello</td><td>World!</td></tr></table>',
-  'thead': '<table><thead><tr><th>Hello</th><th>World!</th></tr></thead><tr><td>Hello</td><td>World!</td></tr></table>',
+  'tfoot':
+      '<table><tr><th>Hello</th><th>World!</th></tr><tfoot><tr><td>Hello</td><td>World!</td></tr></tfoot></table>',
+  'th':
+      '<table><tr><th>Hello</th><th>World!</th></tr><tr><td>Hello</td><td>World!</td></tr></table>',
+  'thead':
+      '<table><thead><tr><th>Hello</th><th>World!</th></tr></thead><tr><td>Hello</td><td>World!</td></tr></table>',
   'time': '<time>3:00 PM</time>',
-  'tr': '<table><tr><th>Hello</th><th>World!</th></tr><tr><td>Hello</td><td>World!</td></tr></table>',
+  'tr':
+      '<table><tr><th>Hello</th><th>World!</th></tr><tr><td>Hello</td><td>World!</td></tr></table>',
   'tt': '<tt>Hello, World!</tt>',
   'u': '<u>Hello, World!</u>',
   'var': '<var>Hello, World!</var>',
-};
\ No newline at end of file
+};