diff --git a/.pyup.yml b/.pyup.yml
new file mode 100644
index 00000000..29c7c230
--- /dev/null
+++ b/.pyup.yml
@@ -0,0 +1,3 @@
+# see https://pyup.io/docs/configuration/ for all available options
+
+schedule: every week
diff --git a/.travis.yml b/.travis.yml
index eee45206..ad655cb2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,11 @@ _aliases:
     language: node_js
     node_js: stable
 
+cache:
+  directories:
+    - node_modules
+cache: pip
+
 sudo: required
 jobs:
   include:
@@ -52,6 +57,7 @@ jobs:
         provider: pages
         on:
           branch: master
+          python: '3.6'
         skip_cleanup: true
         local_dir: site
         github_token: $GITHUB_TOKEN
diff --git a/docs/.dir-locals.el b/docs/.dir-locals.el
new file mode 100644
index 00000000..e23c659d
--- /dev/null
+++ b/docs/.dir-locals.el
@@ -0,0 +1,2 @@
+((markdown-mode
+  (mode . visual-line)))
diff --git a/docs/accessibility-test-plan.md b/docs/accessibility-test-plan.md
new file mode 100644
index 00000000..ebc28d2b
--- /dev/null
+++ b/docs/accessibility-test-plan.md
@@ -0,0 +1,48 @@
+# Manual Test Plan
+
+## Keyboard Navigation
+_< 3 hours_
+
+Navigate the web content using only the keyboard
+- Tab Order:`TAB`, as well as `SHIFT + TAB`, follows a logical and intuitive order.
+- All controls, links, buttons, etc., get focused.
+- Focus should be visibly apparent.
+- When a modal or pop up window opens, focus shifts to the pop up.
+  - Focus and tab order is constrained within the modal.
+  - Modal can be exited via keyboard.
+  - When a pop up window is closed, focus returns to a logical point.
+- Ensure that all content that is visually hidden is also hidden from the keyboard and/or a screen reader. _Except content specifically for screen reader users._
+- Firefox toolbar icon can be accessed by keyboard and screen reader users.
+
+## Page Structure
+_3 hours_
+- Links and buttons have text that give context.
+- All images contain alt text to describe the purpose or content of the image to a non-sighted user.
+- A logical hierarchy of header tags has been used.
+- [ARIA landmark roles](https://accessibility.oit.ncsu.edu/it-accessibility-at-nc-state/developers/accessibility-handbook/aria-landmarks/) have been utilized where applicable.
+- ARIA attributes have been put into use.
+  - Any custom controls have been given the proper role attribute.
+    - State changes are provided via [ARIA states](http://www.w3.org/TR/wai-aria/states_and_properties#attrs_widgets_header).
+- Form input fields and buttons have been labeled for screen reader users.
+
+## Color
+_< 1 hour_
+- Text has sufficient color contrast against its background.
+  - Contrast ratio of 4.5:1 for normal text (less than 18 point or 14 point bold.)
+  - Contrast ratio of 3:1 for large text (at least 18 point or 14 point bold).
+- Information conveyed via color is also available by other means.
+- Buttons and links are visually apparent when they have focus.
+- Focus remains apparent, and contrast remains sufficient, when simulating varying types of colorblindness.  [Color blind simulators](https://www.toptal.com/designers/colorfilter)
+
+## UX Design Considerations
+- Interactions available with a mouse are also available using a keyboard.
+- Information conveyed visually is also available by other means.
+  - Pop-ups and other state changes are announced to screen readers using appropriate ARIA attributes.
+  - Temporary on-screen events give users ample time to receive conveyed information.
+- Animations are not excessively flashy, as this can cause seizures in some users.
+
+## Tools and Resources
+Use a variety of testing tools to analyze pages:
+- aXe developer tools by Deque
+- Browser developer tools to inspect HTML for logical heading structure and ARIA roles
+- [Color blind simulators](https://www.toptal.com/designers/colorfilter)
diff --git a/docs/contributing.md b/docs/contributing.md
index 773ddd14..ee6f2fb8 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -6,7 +6,7 @@ The following are guidelines for contributing to this project.
 
 ## Code of Conduct
 
-This repository is governed by Mozilla's code of conduct and etiquette guidelines. For more details please see the [Mozilla Community Participation Guidelines](https://www.mozilla.org/about/governance/policies/participation/) and [Developer Etiquette Guidelines](https://bugzilla.mozilla.org/page.cgi?id=etiquette.html).
+This repository is governed by Mozilla's code of conduct and etiquette guidelines. For more details please see the [Mozilla Community Participation Guidelines][community-guidelines] and [Developer Etiquette Guidelines][etiquette-guidelines].
 
 ## How to Get Started
 
@@ -14,16 +14,32 @@ Please refer to installation and build instructions in the [install documentatio
 
 ## How to Report Bugs
 
-Please open [a new issue in the appropriate GitHub repository](https://github.com/mozilla-lockbox/lockbox-extension/issues/new) with steps to reproduce the problem you're experiencing.
+Please open [a new issue in the appropriate GitHub repository][new-issue] with steps to reproduce the problem you're experiencing.
 
 Be sure to include as much information including screenshots, text output, and both your expected and actual results.
 
 ## How to Request Enhancements
 
-First, please refer to the applicable [GitHub repository](https://github.com/orgs/mozilla-lockbox/) and search [the repository's GitHub issues](https://github.com/mozilla-lockbox/lockbox-extension/issues) to make sure your idea has not been (or is not still) considered. It may also be easier to see and search across all projects combined on our [Waffle.io planning board](https://waffle.io/mozilla-lockbox/lockbox-extension).
+First, please refer to the applicable [GitHub repository][github-repos] and search [the repository's GitHub issues][issues-list] to make sure your idea has not been (or is not still) considered. It may also be easier to see and search across all projects combined on our [Waffle.io planning board][waffle].
 
-Then, please [create a new issue in the GitHub repository](https://github.com/mozilla-lockbox/lockbox-extension/issues/new) describing your enhancement.
+Then, please [create a new issue in the GitHub repository][new-issue] describing your enhancement.
 
 Be sure to include as much detail as possible including step-by-step descriptions, specific examples, screenshots or mockups, and reasoning for why the enhancement might be worthwhile.
 
 Please keep in mind, by opening an issue we provide no guarantee the enhancement will be implemented.
+
+## How to Contribute Code
+
+Before you get started writing code, be sure what you plan to work on is something we'll be able to accept. The easiest way is to look through out list of [good first issues][good-first-issues] and find something that sounds interesting.
+
+If there's something else you'd like to work on, just add a comment in the relevant issue and we'll be happy to discuss your plans. If you have an idea that doesn't have an issue at all, be sure to [file an issue](#how-to-request-enhancements) first.
+
+Once you have a patch ready, submit a pull request and request a review from **@mozilla-lockbox/engineering**. From there, we'll guide you through the review process to the eventual landing of your code! We aim to respond to all review requests within two business days.
+
+[community-guidelines]: https://www.mozilla.org/about/governance/policies/participation/
+[etiquette-guidelines]: https://bugzilla.mozilla.org/page.cgi?id=etiquette.html
+[new-issue]: https://github.com/mozilla-lockbox/lockbox-extension/issues/new
+[github-repos]: https://github.com/orgs/mozilla-lockbox/
+[issues-list]: https://github.com/mozilla-lockbox/lockbox-extension/issues
+[waffle]: https://waffle.io/mozilla-lockbox/lockbox-extension
+[good-first-issues]: https://github.com/mozilla-lockbox/lockbox-extension/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22
diff --git a/docs/metrics.md b/docs/metrics.md
index 513cd2de..dc84ec48 100644
--- a/docs/metrics.md
+++ b/docs/metrics.md
@@ -1,60 +1,72 @@
 # Lockbox Metrics Plan
 
-_Last Updated: Nov 28, 2017_
+_Last Updated: Feb 19, 2018_
 
 <!-- TOC depthFrom:2 depthTo:6 withLinks:1 updateOnSave:1 orderedList:0 -->
 
 - [Analysis](#analysis)
 - [Collection](#collection)
 	- [Event Registration and Recording](#event-registration-and-recording)
-- [Metrics Overview](#metrics-overview)
-- [Non-Event Metrics](#non-event-metrics)
+- [Scalar Metrics](#scalar-metrics)
 - [List of Events Currently Recorded](#list-of-events-currently-recorded)
+- [Sketch of iOS Telemetry Plan](#sketch-of-ios-telemetry-plan)
 - [References](#references)
 
 <!-- /TOC -->
 
-This is the metrics collection plan for Lockbox's alpha release. It documents all events currently collected through telemetry, as well those planned for collection but not currently implemented. It will be updated to reflect all new and planned data collection.
+This is the metrics collection plan for Lockbox. It documents all events currently collected through telemetry, as well those planned for collection but not currently implemented. It will be updated periodically to reflect all new and planned data collection.
 
 ## Analysis
 
-Data collection is done solely for the purpose of product development, improvement and maintenance. We are particularly interested in data that will help us answer the following questions.
+Data collection is done solely for the purpose of product development, improvement and maintenance. Specifically, it is done to help its creators examine the validity of the following hypothesis.
+
+Core Hypothesis: **We believe that people want the browser to do more than only remember their passwords.**
+
+We will know this to be true when:
+
+1. The password generator is clicked 20% of the time a new entry is created. **This will indicate that users value the ability to create secure passwords.** (Events regarding password generation will be added when feature development is complete)
+
+2. 75% of Lockbox downloads result in a Firefox account attached. **This will indicate that users value secure storage for their credentials.** We currently record the event `fxaUpgrade` to know whether a user has attached an Firefox account to their lockbox installation.
+
+3. 60% of users choose to import their existing credentials from Firefox into Lockbox. **This will indicate that users trust lockbox more than the browser for managing their credentials.** (Events regarding the importing of credentials from the firefox password manager will be added when feature development is complete)
+
+4. We observe increased engagement with the management system (Create-Read-Update-Delete; CRUD) for users that import their credentials. **This will indicate that users value greater visibility into the number of accounts that they have.** We currently record `render` events when a user opens the credential manager.
+
+5. CRUD usage rates are comparable to Firefox login manager usage prior to lockbox installation. **This will indicate that users value Lockbox's credential management system, and use it to access credentials when they are needed.** Firefox telemetry currently collects data on password autofill usage, which requires credentials be stored in the firefox password manager. We plan to compare lockbox credential usage (e.g. via the `usernameCopied` and `passwordCopied` lockbox events) to pre-lockbox autofill frequencies on a per-user basis.
+
+6. 20% of Lockbox users access their datastore on more than 1 device, **indicating that users value having a single datastore of credentials.**
+
+
+Other questions we aim to answer through data collection, but are not directly related to the hypothesis above:
 
 - Do people Save Passwords in Lockbox?
-    - How many? (measured by count of items saved per user)
-    - How often? (number of credentials saved per user per time interval)
+	- How many? (measured by count of items saved per user)
+	- How often? (number of credentials saved per user per time interval)
 - Do people create their own passwords or use Lockbox to generate them?
-    - Ratio: (Number of times the PW generator is used when storing an item) / (number of credentials stored)
+	- Ratio: (Number of times the PW generator is used when storing an item) / (number of credentials stored)
+- When using the pw generator, do people create purely random passwords or customize them with their own input? (if this is going to be in the final design)
 - Do people use the passwords they store on Lockbox?
-    - How many times (per some unit of time) do stored credentials get auto-filled or copied to the clipboard?
-    - How many times do users click to reveal a password?
-- How well does does auto-filling credentials work **(not in alpha)**?
-    - When credentials are auto-filled, are they filled into the correct fields?
-    - How often must the user make a change to what fields were filled?
-        - How to measure these things??? is there an easier way than just asking if the auto-fill didn't work?
+	- How many times (per some unit of time) do stored credentials get filled?
+	- How many times (per some unit of time) do stored credentials get copied?
+- How many times do users click to reveal a password?
 - Do people continue to use Lockbox after first use?
-    - Out of those who install, how many use it more than once?
+	- Out of those who install, how many use it more than once?
 - Where are the drop-off points in the user flow?
-    - Do the majority of people make it all the way through the setup process?
-    - Once initially setup, do people continue to add credentials?
-- What are people's opinions on LB
-    - Feedback forms
-- Do people sync their passwords **(not in alpha)**?
-    - How does syncing affect engagement?
-- What type of sites do people use Lockbox with?
-    - Do they use Lockbox only for their most sensitive accounts?
+	- Do the majority of people make it all the way through the setup process?
+	- Once initially setup, do people continue to add credentials?
+- Do people sync their passwords between Firefox instances?
+	- How does syncing affect engagement?
 
-## Collection
 
-**Note:** *This is the collection plan for our internal alpha release. For our beta release will be taking advantage of test pilot's telemetry API. The metrics plan for beta will be described in a separate document.*
+## Collection
 
 At this point, all measurements related to Lockbox will be made client-side. However, future releases will give users the option to sync their Lockbox data via an FxA account, at which point additional measurements will be logged server-side through the FxA data pipeline. We are not directly responsible for the measurements made through that mechanism.
 
-For our internal alpha release, we will be making use of the public JavaScript API that allows recording and sending of event data through an add-on. **This means that for our alpha release we will only be collecting event-based data**. The API is documented here:
+For our internal alpha release, we will be making use of the public JavaScript API that allows recording and sending of event data and scalar data through an add-on. The API is documented here:
 
 https://firefox-source-docs.mozilla.org/toolkit/components/telemetry/telemetry/collection/events.html#the-api
 
-Once the events are logged in the client they should appear in [about:telemetry](about:telemetry). From there they will be submitted in the main ping payload under `processes.dynamic.events` and available through the usual services (STMO and ATMO), as well as amplitude.
+Once events are logged in the client they should appear in [about:telemetry](about:telemetry). From there they will be submitted in the main ping payload under `processes.dynamic.events` and available through the usual services (STMO and ATMO), as well as amplitude.
 
 ### Event Registration and Recording
 
@@ -94,33 +106,35 @@ When recording, we can use `null` for `value`.
 
 See the Events section for specific examples of event registration and recording.
 
-## Metrics Overview
-
-(this section may redundant with analysis section)
-For alpha, we'd like to (ideally) like to be able to track the following general categories of things:
+#### Scalar recording
 
-- The setup flow, so we can know at what points (if any) people quit the flow before finishing it
-- Top-level interactions centered around use of the Lockbox toolbar icon. This includes interactions within the initial doorhanger that is displayed when the user clicks the icon.
-- Interactions with the list of the user's Lockbox items (credentials)
-- Interactions with the add / modify dialogs used to enter / edit item information
-- Changes to the datastore that actually contains the user's items, in addition to user actions that lead to those changes
-- When the user submits feedback about Lockbox
-- Usage of the copy and reveal functions for stored Lockbox items.
+We use the js api for scalar recording as well. Here registration happens with the following syntax:
 
-Each of these are described below within their own Events subsection.
-
-
-## Non-Event Metrics
+```javascript
+Services.telemetry.registerScalars(category, {
+	"scalar_name": {
+		kind: services.Telemetry.SCALAR_TYPE_COUNT, // SCALAR_TYPE_COUNT, SCALAR_TYPE_BOOLEAN. or SCALAR_TYPE_STRING
+		keyed: false,
+		record_on_release: false, // NEEDS TO BE SET TO RECORD ON RELEASE CHANNEL
+		expired: false,
+	}
+```
+We set scalar values in the following way:
 
-These are the metrics we plan to collect regarding the state of user datastores. Note that we won't be able to record these directly for alpha. We will have to infer them from the event data.
+```javascript
+Services.telemetry.scalarSet(
+	"category.scalar_name", value
+);
+```
+e.g. `lockboxV1.datastoreCount` for the scalar name.
 
-- `n_items` The number of credentials that exist in the user's datastore. Integer
+We can also use `scalarAdd` to increment a scalar value by some amount.
 
-- `n_notes` The number of items for which the user has manually entered custom notes for. Integer
+## Scalar Metrics
 
-- `timestamp_last` The timestamp of the last edit the user made to the datastore. Does not necessarily correspond to the last time they opened the CRUD editor.
+These are the metrics we currently collect regarding the state of user datastores.
 
-- `n_uses` The number of times a user copied or auto-filled a Lockbox item.
+- `datastoreCount` (integer). Current count of the number of items in the user's datastore. Note that this scalar is only updated when the user renders their full item list, either in the management view or in the doorhanger. So when testing whether this scalar is accurately updated, please re-render the item list.
 
 ## List of Events Currently Recorded
 
@@ -150,20 +164,35 @@ All events are currently implemented under the **category: lockboxV0**. The `ext
 
 12. `resetCompleted` fires when the user completes a reset of their Lockbox data in the Lockbox settings. **objects**: settings
 
-## List of Planned Events
+13. `fxaStart` fires when a user clicks the sign-in or sign-up button from the manager or firstrun screen. used to log user initiating fxa auth process. **objects**: welcomeSignin, manageAcctCreate, manageAcctSignin, unlockSignin
+
+14. `fxaAuth` has methods `fxaUpgrade`, `fxaSignin` and `fxaSignout` that fire when the user initially adds their fxa account to lockbox, signs in after having added their fxa account previously, or signs out of fxa. **object**: accounts
+
+15. `fxaFail` fires when the fxa process fails **objects**: accounts
+
+## Sketch of iOS Telemetry Plan
+
+These events are based on the invisionapp design plan
+
+1. `fxaStart` fires when a user taps the sign-in or sign-up button from the welcome screen. used to log user initiating fxa auth process.
+
+2. `fxaAuth` has methods `fxaSignin` and `fxaSignout` that fire when the user signs into or out of their fxa account.
+
+3. `touchIdEnabled`, `faceIdEnabled`, `touchIdSkipped`, `faceIdSkipped` fire when a user successfully authorizes the use of touchID/faceID to unlock lockbox or taps to skip.
 
-These events will be implemented once the corresponding functionality is available.
+4. `browserEnabled` fires when user successfully adds lockbox integration to their browser. **objects**: `firefox`, `chrome`, `safari`
 
-1. `fxaSignIn` fires when someone clicks the signin button during firstrun. **objects**: fxaSignInPage.
+5. `usernameCopied` and `passwordCopied` fire when a user copies their username or password from an item. **objects**: itemList
 
-2. `confirmPW` fires when the user clicks the button to confirm their FxA pw. **objects**: confirmPWButton
+6. `itemSelected` fires when a user taps an item in the itemlist. **objects** itemList
 
-3. `doorhangerItemSelected` fires when a user clicks an item in the doorhanger's itemlist. **objects** doorhanger  
+7. `itemShow` fires when a user taps to view item details in the itemlist. **objects** itemList
 
-4. `doorhangerItemCopied` fires when a user copies an item's username/password from the doorhanger's entry view. **objects** doorhangerEntryDetails.  
+8. `settingsTap` fires when a user taps an entry on the settings page. **object** will label the setting that was tapped
 
-5. `doorhangerAddClick` fires when the user clicks to add a new entry from the doorhanger. **objects** doorhanger  
+9. `settingsChanged` fires when a user toggles a changeable setting. **object** will label the setting that was toggled
 
+10. `feedbackSent` Fires when a user sends feedback through the feedback form.
 
 ---
 
diff --git a/docs/release-notes.md b/docs/release-notes.md
index 31f60b1f..67ec2e72 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -1,8 +1,36 @@
 # Lockbox Release Notes
 
+## 0.1.8-alpha
+
+_Date: 2018-03-08_
+
+### What's New
+
+- Added support For Telemetry Scalars so we can easily tell how many items are stored in your Lockbox datastore ([#552](https://github.com/mozilla-lockbox/lockbox-extension/pull/552))
+- Made it so the search box is automatically focused so you can start typing to search your entries immediately ([#573](https://github.com/mozilla-lockbox/lockbox-extension/issues/573))
+- The doorhanger also automatically fills the search with the domain of the current page you're viewing to help you quickly see matching entries ([#616](https://github.com/mozilla-lockbox/lockbox-extension/pull/616))
+- Improved contrast and colors of the entry list for accessibility ([#560](https://github.com/mozilla-lockbox/lockbox-extension/pull/560))
+- Improved interface colors and styles for entry list items ([#553](https://github.com/mozilla-lockbox/lockbox-extension/pull/553))
+- Improved search bar interface style with a simpler "Clear" button ([#562](https://github.com/mozilla-lockbox/lockbox-extension/pull/562))
+- Re-ordered the create/edit entry interface with improved spacing and styles ([#567](https://github.com/mozilla-lockbox/lockbox-extension/pull/567))
+
+### What's Fixed
+
+- Item notes with line breaks properly show those separate lines when editing ([#596](https://github.com/mozilla-lockbox/lockbox-extension/pull/596))
+- The "reset Lockbox" settings interface fits better in about:addons ([#603](https://github.com/mozilla-lockbox/lockbox-extension/pull/603))
+- Fixed alignment on the entry detail view so the buttons don't jump when switching between edit and view modes ([#608](https://github.com/mozilla-lockbox/lockbox-extension/pull/608))
+
+### Known Issues
+
+* Profile information about you is only fetched and updated when you sign in; any changes made to your Firefox Accounts display name or avatar will not be displayed in Lockbox until you sign in again.
+* Once you link a Firefox Account to Lockbox, you cannot unlink it from that account.
+* Once you link a Firefox Account to Lockbox, signing in with a different account can render Lockbox unusable until you quit and restart Firefox.
+* Once you link a Firefox Account to Lockbox, resetting your Firefox Account password through "forgot your password" will render all your logins inaccessible; the only recourse is to reset Lockbox and start over.
+* Firefox's default prompt to save logins is only disabled on new installs of this extension; updating Lockbox will not change your current Firefox preferences.
+
 ## 0.1.7-alpha1
 
-_Dtae: 2018-02-23_
+_Date: 2018-02-23_
 
 This release is to address a critical defect from the previous release.
 
@@ -10,6 +38,8 @@ This release is to address a critical defect from the previous release.
 
 * If you linked your Firefox Account, Lockbox would stop working when you restart Firefox ([#568](https://github.com/mozilla-lockbox/lockbox-extension/issues/568))
 
+### Known Issues
+
 * Profile information about you is only fetched and updated when you sign in; any changes made to your Firefox Accounts display name or avatar will not be displayed in Lockbox until you sign in again.
 * Once you link a Firefox Account to Lockbox, you cannot unlink it from that account.
 * Once you link a Firefox Account to Lockbox, signing in with a different account can render Lockbox unusable until you quit and restart Firefox.
diff --git a/package-lock.json b/package-lock.json
index af74f704..dfc547af 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "lockbox",
-  "version": "0.1.7-alpha1",
+  "version": "0.1.8-alpha",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -361,7 +361,7 @@
     "arr-flatten": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
       "dev": true
     },
     "arr-union": {
@@ -1253,6 +1253,90 @@
         "babel-core": "6.26.0",
         "babel-preset-minify": "0.3.0",
         "webpack-sources": "1.0.1"
+      },
+      "dependencies": {
+        "babel-plugin-transform-member-expression-literals": {
+          "version": "6.9.0",
+          "resolved": "https://registry.npmjs.org/babel-plugin-transform-member-expression-literals/-/babel-plugin-transform-member-expression-literals-6.9.0.tgz",
+          "integrity": "sha512-bxtac+8w755ctVeDs4vU98RhWY49eW1wO02HAN+eirZYSKk/dVrKONIznXbHmxWKxT4UX1rpTKOCyezuzLpbTw==",
+          "dev": true
+        },
+        "babel-plugin-transform-merge-sibling-variables": {
+          "version": "6.9.0",
+          "resolved": "https://registry.npmjs.org/babel-plugin-transform-merge-sibling-variables/-/babel-plugin-transform-merge-sibling-variables-6.9.0.tgz",
+          "integrity": "sha512-9G1URVEEKoQLDqe0GwqYudECN7kE/q0OCNo5TiD1iwWnnaKi97xY915l5r2KKUvNflXEm9c3faNWknSXYQ7h6Q==",
+          "dev": true
+        },
+        "babel-plugin-transform-minify-booleans": {
+          "version": "6.9.0",
+          "resolved": "https://registry.npmjs.org/babel-plugin-transform-minify-booleans/-/babel-plugin-transform-minify-booleans-6.9.0.tgz",
+          "integrity": "sha512-JtpyTRyF+wF/r7GSxpRbNCrVve5M/aCC8xoGcnFItaPUDqjxKmFYvBzMc9u+g0lgo8NWjuZLc16MYaIwkHKD/A==",
+          "dev": true
+        },
+        "babel-plugin-transform-property-literals": {
+          "version": "6.9.0",
+          "resolved": "https://registry.npmjs.org/babel-plugin-transform-property-literals/-/babel-plugin-transform-property-literals-6.9.0.tgz",
+          "integrity": "sha512-B8s+71+4DPye9+pmZiPGgLPy3YqcmIuvE/9UcZLczPlwL5ALwF6qRUdLC3Fk17NhL6jxp4u33ZVZ8R4kvASPzw==",
+          "dev": true,
+          "requires": {
+            "esutils": "2.0.2"
+          }
+        },
+        "babel-plugin-transform-remove-console": {
+          "version": "6.9.0",
+          "resolved": "https://registry.npmjs.org/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.9.0.tgz",
+          "integrity": "sha512-mck9//yGTwObqqqDzY/sISO88/5/XfIB3ILb4uJLXk2xq124NT4yQVjFSRgVSbLcNq8OyBAn2acxKUqg4W/okQ==",
+          "dev": true
+        },
+        "babel-plugin-transform-remove-debugger": {
+          "version": "6.9.0",
+          "resolved": "https://registry.npmjs.org/babel-plugin-transform-remove-debugger/-/babel-plugin-transform-remove-debugger-6.9.0.tgz",
+          "integrity": "sha512-i/HWGjsmL2d1N2dl+eIzf44XpSP5v7hi1/GXB0xzom9kjrU8js3T8Kadizn95ZxfHK592Vg8P4JJWP/fvimEWw==",
+          "dev": true
+        },
+        "babel-plugin-transform-simplify-comparison-operators": {
+          "version": "6.9.0",
+          "resolved": "https://registry.npmjs.org/babel-plugin-transform-simplify-comparison-operators/-/babel-plugin-transform-simplify-comparison-operators-6.9.0.tgz",
+          "integrity": "sha512-EJyfYeph0CSekwQuwWVwJqy2go/bETkR95iaWQ/HTUis7tkCGNYmXngaFzuIXdmoPXfvmXYCvAXR4/93hqHVjw==",
+          "dev": true
+        },
+        "babel-plugin-transform-undefined-to-void": {
+          "version": "6.9.0",
+          "resolved": "https://registry.npmjs.org/babel-plugin-transform-undefined-to-void/-/babel-plugin-transform-undefined-to-void-6.9.0.tgz",
+          "integrity": "sha512-AVDVEmp0S9mbF1O8zekWbsOOmqnR08PZah5NRZJqSvJnFgiL0ep4Lwo4EymH8OieJR2QgQdR3q71TNW+wiVn4g==",
+          "dev": true
+        },
+        "babel-preset-minify": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/babel-preset-minify/-/babel-preset-minify-0.3.0.tgz",
+          "integrity": "sha512-+VV2GWEyak3eDOmzT1DDMuqHrw3VbE9nBNkx2LLVs4pH/Me32ND8DRpVDd8IRvk1xX5p75nygyRPtkMh6GIAbQ==",
+          "dev": true,
+          "requires": {
+            "babel-plugin-minify-builtins": "0.3.0",
+            "babel-plugin-minify-constant-folding": "0.3.0",
+            "babel-plugin-minify-dead-code-elimination": "0.3.0",
+            "babel-plugin-minify-flip-comparisons": "0.3.0",
+            "babel-plugin-minify-guarded-expressions": "0.3.0",
+            "babel-plugin-minify-infinity": "0.3.0",
+            "babel-plugin-minify-mangle-names": "0.3.0",
+            "babel-plugin-minify-numeric-literals": "0.3.0",
+            "babel-plugin-minify-replace": "0.3.0",
+            "babel-plugin-minify-simplify": "0.3.0",
+            "babel-plugin-minify-type-constructors": "0.3.0",
+            "babel-plugin-transform-inline-consecutive-adds": "0.3.0",
+            "babel-plugin-transform-member-expression-literals": "6.9.0",
+            "babel-plugin-transform-merge-sibling-variables": "6.9.0",
+            "babel-plugin-transform-minify-booleans": "6.9.0",
+            "babel-plugin-transform-property-literals": "6.9.0",
+            "babel-plugin-transform-regexp-constructors": "0.3.0",
+            "babel-plugin-transform-remove-console": "6.9.0",
+            "babel-plugin-transform-remove-debugger": "6.9.0",
+            "babel-plugin-transform-remove-undefined": "0.3.0",
+            "babel-plugin-transform-simplify-comparison-operators": "6.9.0",
+            "babel-plugin-transform-undefined-to-void": "6.9.0",
+            "lodash.isplainobject": "4.0.6"
+          }
+        }
       }
     },
     "babel-plugin-check-es2015-constants": {
@@ -1996,24 +2080,6 @@
       "integrity": "sha512-iZsYAIjYLLfLK0yN5WVT7Xf7Y3wQ9Z75j9A8q/0IglQSpUt2ppTdHlwl/GeaXnxdaSmsxBu861klbTBbv2n+RA==",
       "dev": true
     },
-    "babel-plugin-transform-member-expression-literals": {
-      "version": "6.9.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-member-expression-literals/-/babel-plugin-transform-member-expression-literals-6.9.0.tgz",
-      "integrity": "sha512-bxtac+8w755ctVeDs4vU98RhWY49eW1wO02HAN+eirZYSKk/dVrKONIznXbHmxWKxT4UX1rpTKOCyezuzLpbTw==",
-      "dev": true
-    },
-    "babel-plugin-transform-merge-sibling-variables": {
-      "version": "6.9.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-merge-sibling-variables/-/babel-plugin-transform-merge-sibling-variables-6.9.0.tgz",
-      "integrity": "sha512-9G1URVEEKoQLDqe0GwqYudECN7kE/q0OCNo5TiD1iwWnnaKi97xY915l5r2KKUvNflXEm9c3faNWknSXYQ7h6Q==",
-      "dev": true
-    },
-    "babel-plugin-transform-minify-booleans": {
-      "version": "6.9.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-minify-booleans/-/babel-plugin-transform-minify-booleans-6.9.0.tgz",
-      "integrity": "sha512-JtpyTRyF+wF/r7GSxpRbNCrVve5M/aCC8xoGcnFItaPUDqjxKmFYvBzMc9u+g0lgo8NWjuZLc16MYaIwkHKD/A==",
-      "dev": true
-    },
     "babel-plugin-transform-object-rest-spread": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz",
@@ -2036,15 +2102,6 @@
         }
       }
     },
-    "babel-plugin-transform-property-literals": {
-      "version": "6.9.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-property-literals/-/babel-plugin-transform-property-literals-6.9.0.tgz",
-      "integrity": "sha512-B8s+71+4DPye9+pmZiPGgLPy3YqcmIuvE/9UcZLczPlwL5ALwF6qRUdLC3Fk17NhL6jxp4u33ZVZ8R4kvASPzw==",
-      "dev": true,
-      "requires": {
-        "esutils": "2.0.2"
-      }
-    },
     "babel-plugin-transform-react-display-name": {
       "version": "6.25.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.25.0.tgz",
@@ -2100,18 +2157,6 @@
       "integrity": "sha512-h92YHzyl042rb0naKO8frTHntpRFwRgKkfWD8602kFHoQingjJNtbvZzvxqHncJ6XmKVyYvfrBpDOSkCTDIIxw==",
       "dev": true
     },
-    "babel-plugin-transform-remove-console": {
-      "version": "6.9.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.9.0.tgz",
-      "integrity": "sha512-mck9//yGTwObqqqDzY/sISO88/5/XfIB3ILb4uJLXk2xq124NT4yQVjFSRgVSbLcNq8OyBAn2acxKUqg4W/okQ==",
-      "dev": true
-    },
-    "babel-plugin-transform-remove-debugger": {
-      "version": "6.9.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-remove-debugger/-/babel-plugin-transform-remove-debugger-6.9.0.tgz",
-      "integrity": "sha512-i/HWGjsmL2d1N2dl+eIzf44XpSP5v7hi1/GXB0xzom9kjrU8js3T8Kadizn95ZxfHK592Vg8P4JJWP/fvimEWw==",
-      "dev": true
-    },
     "babel-plugin-transform-remove-undefined": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-remove-undefined/-/babel-plugin-transform-remove-undefined-0.3.0.tgz",
@@ -2130,12 +2175,6 @@
         "babel-runtime": "6.23.0"
       }
     },
-    "babel-plugin-transform-simplify-comparison-operators": {
-      "version": "6.9.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-simplify-comparison-operators/-/babel-plugin-transform-simplify-comparison-operators-6.9.0.tgz",
-      "integrity": "sha512-EJyfYeph0CSekwQuwWVwJqy2go/bETkR95iaWQ/HTUis7tkCGNYmXngaFzuIXdmoPXfvmXYCvAXR4/93hqHVjw==",
-      "dev": true
-    },
     "babel-plugin-transform-strict-mode": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
@@ -2146,12 +2185,6 @@
         "babel-types": "6.25.0"
       }
     },
-    "babel-plugin-transform-undefined-to-void": {
-      "version": "6.9.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-undefined-to-void/-/babel-plugin-transform-undefined-to-void-6.9.0.tgz",
-      "integrity": "sha512-AVDVEmp0S9mbF1O8zekWbsOOmqnR08PZah5NRZJqSvJnFgiL0ep4Lwo4EymH8OieJR2QgQdR3q71TNW+wiVn4g==",
-      "dev": true
-    },
     "babel-polyfill": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
@@ -2266,37 +2299,6 @@
         "babel-plugin-transform-flow-strip-types": "6.22.0"
       }
     },
-    "babel-preset-minify": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-minify/-/babel-preset-minify-0.3.0.tgz",
-      "integrity": "sha512-+VV2GWEyak3eDOmzT1DDMuqHrw3VbE9nBNkx2LLVs4pH/Me32ND8DRpVDd8IRvk1xX5p75nygyRPtkMh6GIAbQ==",
-      "dev": true,
-      "requires": {
-        "babel-plugin-minify-builtins": "0.3.0",
-        "babel-plugin-minify-constant-folding": "0.3.0",
-        "babel-plugin-minify-dead-code-elimination": "0.3.0",
-        "babel-plugin-minify-flip-comparisons": "0.3.0",
-        "babel-plugin-minify-guarded-expressions": "0.3.0",
-        "babel-plugin-minify-infinity": "0.3.0",
-        "babel-plugin-minify-mangle-names": "0.3.0",
-        "babel-plugin-minify-numeric-literals": "0.3.0",
-        "babel-plugin-minify-replace": "0.3.0",
-        "babel-plugin-minify-simplify": "0.3.0",
-        "babel-plugin-minify-type-constructors": "0.3.0",
-        "babel-plugin-transform-inline-consecutive-adds": "0.3.0",
-        "babel-plugin-transform-member-expression-literals": "6.9.0",
-        "babel-plugin-transform-merge-sibling-variables": "6.9.0",
-        "babel-plugin-transform-minify-booleans": "6.9.0",
-        "babel-plugin-transform-property-literals": "6.9.0",
-        "babel-plugin-transform-regexp-constructors": "0.3.0",
-        "babel-plugin-transform-remove-console": "6.9.0",
-        "babel-plugin-transform-remove-debugger": "6.9.0",
-        "babel-plugin-transform-remove-undefined": "0.3.0",
-        "babel-plugin-transform-simplify-comparison-operators": "6.9.0",
-        "babel-plugin-transform-undefined-to-void": "6.9.0",
-        "lodash.isplainobject": "4.0.6"
-      }
-    },
     "babel-preset-react": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-preset-react/-/babel-preset-react-6.24.1.tgz",
@@ -2636,10 +2638,16 @@
       "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=",
       "dev": true
     },
+    "base64-arraybuffer-es6": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/base64-arraybuffer-es6/-/base64-arraybuffer-es6-0.3.1.tgz",
+      "integrity": "sha512-TrhBheudYaff9adiTAqjSScjvtmClQ4vF9l4cqkPNkVsA11m4/NRdH4LkZ/tAMmpzzwfI20BXnJ/PTtafECCNA=="
+    },
     "base64-js": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz",
-      "integrity": "sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw=="
+      "integrity": "sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw==",
+      "dev": true
     },
     "base64id": {
       "version": "1.0.0",
@@ -4280,29 +4288,6 @@
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
       "dev": true
     },
-    "cosmiconfig": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-3.1.0.tgz",
-      "integrity": "sha512-zedsBhLSbPBms+kE7AH4vHg6JsKDz6epSv2/+5XHs8ILHlgDciSJfSWf8sX9aQ52Jb7KI7VswUTsLpR/G0cr2Q==",
-      "dev": true,
-      "requires": {
-        "is-directory": "0.3.1",
-        "js-yaml": "3.10.0",
-        "parse-json": "3.0.0",
-        "require-from-string": "2.0.1"
-      },
-      "dependencies": {
-        "parse-json": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-3.0.0.tgz",
-          "integrity": "sha1-+m9HsY4jgm6tMvJj50TQ4ehH+xM=",
-          "dev": true,
-          "requires": {
-            "error-ex": "1.3.1"
-          }
-        }
-      }
-    },
     "crc": {
       "version": "3.4.4",
       "resolved": "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz",
@@ -4887,9 +4872,9 @@
       }
     },
     "dexie": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/dexie/-/dexie-2.0.1.tgz",
-      "integrity": "sha1-ptxOYHRhxNpfk0YhkXoqiTmhjpc="
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/dexie/-/dexie-2.0.2.tgz",
+      "integrity": "sha512-WsUVH7nrgAaYc658D8Z4MAN7h13uBUzpLTFITp1GT0kVnnxjfWvquyHUdyZ5HO0a/MuTF1cCdOSuo+PsuHkawg=="
     },
     "di": {
       "version": "0.0.1",
@@ -5397,6 +5382,14 @@
       "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=",
       "dev": true
     },
+    "domexception": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz",
+      "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==",
+      "requires": {
+        "webidl-conversions": "4.0.2"
+      }
+    },
     "domhandler": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz",
@@ -6317,231 +6310,10 @@
       }
     },
     "eslint-plugin-no-unsanitized": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-no-unsanitized/-/eslint-plugin-no-unsanitized-2.0.2.tgz",
-      "integrity": "sha1-pCqDybPZOGEB1v1pFcQXWfp6N/c=",
-      "dev": true,
-      "requires": {
-        "eslint": "3.19.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "4.11.8",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
-          "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
-          "dev": true,
-          "requires": {
-            "co": "4.6.0",
-            "json-stable-stringify": "1.0.1"
-          }
-        },
-        "ajv-keywords": {
-          "version": "1.5.1",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz",
-          "integrity": "sha1-MU3QpLM2j609/NxU7eYXG4htrzw=",
-          "dev": true
-        },
-        "ansi-escapes": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
-          "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=",
-          "dev": true
-        },
-        "cli-cursor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
-          "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
-          "dev": true,
-          "requires": {
-            "restore-cursor": "1.0.1"
-          }
-        },
-        "eslint": {
-          "version": "3.19.0",
-          "resolved": "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz",
-          "integrity": "sha1-yPxiAcf0DdCJQbh8CFdnOGpnmsw=",
-          "dev": true,
-          "requires": {
-            "babel-code-frame": "6.22.0",
-            "chalk": "1.1.3",
-            "concat-stream": "1.6.0",
-            "debug": "2.6.8",
-            "doctrine": "2.1.0",
-            "escope": "3.6.0",
-            "espree": "3.5.2",
-            "esquery": "1.0.0",
-            "estraverse": "4.2.0",
-            "esutils": "2.0.2",
-            "file-entry-cache": "2.0.0",
-            "glob": "7.1.2",
-            "globals": "9.18.0",
-            "ignore": "3.3.7",
-            "imurmurhash": "0.1.4",
-            "inquirer": "0.12.0",
-            "is-my-json-valid": "2.16.0",
-            "is-resolvable": "1.0.1",
-            "js-yaml": "3.10.0",
-            "json-stable-stringify": "1.0.1",
-            "levn": "0.3.0",
-            "lodash": "4.11.1",
-            "mkdirp": "0.5.1",
-            "natural-compare": "1.4.0",
-            "optionator": "0.8.2",
-            "path-is-inside": "1.0.2",
-            "pluralize": "1.2.1",
-            "progress": "1.1.8",
-            "require-uncached": "1.0.3",
-            "shelljs": "0.7.8",
-            "strip-bom": "3.0.0",
-            "strip-json-comments": "2.0.1",
-            "table": "3.8.3",
-            "text-table": "0.2.0",
-            "user-home": "2.0.0"
-          }
-        },
-        "figures": {
-          "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
-          "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
-          "dev": true,
-          "requires": {
-            "escape-string-regexp": "1.0.5",
-            "object-assign": "4.1.0"
-          }
-        },
-        "inquirer": {
-          "version": "0.12.0",
-          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz",
-          "integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=",
-          "dev": true,
-          "requires": {
-            "ansi-escapes": "1.4.0",
-            "ansi-regex": "2.1.1",
-            "chalk": "1.1.3",
-            "cli-cursor": "1.0.2",
-            "cli-width": "2.2.0",
-            "figures": "1.7.0",
-            "lodash": "4.11.1",
-            "readline2": "1.0.1",
-            "run-async": "0.1.0",
-            "rx-lite": "3.1.2",
-            "string-width": "1.0.2",
-            "strip-ansi": "3.0.1",
-            "through": "2.3.8"
-          }
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        },
-        "onetime": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
-          "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
-          "dev": true
-        },
-        "pluralize": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz",
-          "integrity": "sha1-0aIUg/0iu0HlihL6NCGCMUCJfEU=",
-          "dev": true
-        },
-        "progress": {
-          "version": "1.1.8",
-          "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
-          "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=",
-          "dev": true
-        },
-        "restore-cursor": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
-          "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
-          "dev": true,
-          "requires": {
-            "exit-hook": "1.1.1",
-            "onetime": "1.1.0"
-          }
-        },
-        "run-async": {
-          "version": "0.1.0",
-          "resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz",
-          "integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=",
-          "dev": true,
-          "requires": {
-            "once": "1.4.0"
-          }
-        },
-        "rx-lite": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz",
-          "integrity": "sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI=",
-          "dev": true
-        },
-        "slice-ansi": {
-          "version": "0.0.4",
-          "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz",
-          "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=",
-          "dev": true
-        },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-          "dev": true
-        },
-        "table": {
-          "version": "3.8.3",
-          "resolved": "https://registry.npmjs.org/table/-/table-3.8.3.tgz",
-          "integrity": "sha1-K7xULw/amGGnVdOUf+/Ys/UThV8=",
-          "dev": true,
-          "requires": {
-            "ajv": "4.11.8",
-            "ajv-keywords": "1.5.1",
-            "chalk": "1.1.3",
-            "lodash": "4.11.1",
-            "slice-ansi": "0.0.4",
-            "string-width": "2.1.1"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-              "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-              "dev": true
-            },
-            "string-width": {
-              "version": "2.1.1",
-              "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-              "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-              "dev": true,
-              "requires": {
-                "is-fullwidth-code-point": "2.0.0",
-                "strip-ansi": "4.0.0"
-              }
-            },
-            "strip-ansi": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-              "dev": true,
-              "requires": {
-                "ansi-regex": "3.0.0"
-              }
-            }
-          }
-        },
-        "user-home": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz",
-          "integrity": "sha1-nHC/2Babwdy/SGBODwS4tJzenp8=",
-          "dev": true,
-          "requires": {
-            "os-homedir": "1.0.2"
-          }
-        }
-      }
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-no-unsanitized/-/eslint-plugin-no-unsanitized-3.0.0.tgz",
+      "integrity": "sha1-FEi1LN14cfF0PCkAEXuwh8/nuAY=",
+      "dev": true
     },
     "eslint-plugin-node": {
       "version": "6.0.0",
@@ -6735,12 +6507,6 @@
       "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz",
       "integrity": "sha1-KueOhdmJQVhnCwPUe+wfA72Ru50="
     },
-    "exit-hook": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz",
-      "integrity": "sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=",
-      "dev": true
-    },
     "expand-braces": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz",
@@ -6885,12 +6651,12 @@
       "dev": true
     },
     "fake-indexeddb": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/fake-indexeddb/-/fake-indexeddb-2.0.3.tgz",
-      "integrity": "sha1-YxmwzBaxxjQ/Ri1c+VKRyxGktYs=",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/fake-indexeddb/-/fake-indexeddb-2.0.4.tgz",
+      "integrity": "sha1-QBcV3rf8lQGGbJ8ym953QlmeLeg=",
       "requires": {
         "core-js": "2.4.1",
-        "realistic-structured-clone": "1.0.1",
+        "realistic-structured-clone": "2.0.1",
         "setimmediate": "1.0.5"
       }
     },
@@ -8600,7 +8366,7 @@
     "globals": {
       "version": "9.18.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-      "integrity": "sha1-qjiWs+abSH8X4x7SFD1pqOMMLYo=",
+      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
       "dev": true
     },
     "globals-docs": {
@@ -8984,7 +8750,7 @@
     "hosted-git-info": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz",
-      "integrity": "sha1-bWDjSzq7yDEwYsO3mO+NkBoHrzw=",
+      "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==",
       "dev": true
     },
     "html": {
@@ -9317,7 +9083,8 @@
     "ieee754": {
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz",
-      "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q="
+      "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=",
+      "dev": true
     },
     "iferr": {
       "version": "0.1.5",
@@ -9572,9 +9339,7 @@
       "dev": true
     },
     "intl-pluralrules": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/intl-pluralrules/-/intl-pluralrules-0.1.0.tgz",
-      "integrity": "sha1-0mD7YUxu23nBwYJzq8gH5EquDX8="
+      "version": "github:projectfluent/IntlPluralRules#94cb0fa1c23ad943bc5aafef43cea132fa51d68b"
     },
     "invariant": {
       "version": "2.2.2",
@@ -10747,12 +10512,6 @@
         "graceful-fs": "4.1.11"
       }
     },
-    "known-css-properties": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.5.0.tgz",
-      "integrity": "sha512-LOS0CoS8zcZnB1EjLw4LLqDXw8nvt3AGH5dXLQP3D9O1nLLA+9GC5GnPl5mmF+JiQAtSX4VyZC7KvEtcA4kUtA==",
-      "dev": true
-    },
     "labeled-stream-splicer": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.0.tgz",
@@ -10928,8 +10687,8 @@
     "lockbox-datastore": {
       "version": "github:mozilla-lockbox/lockbox-datastore#0e90e67f122d900bb1871a06f405b682a1cf0954",
       "requires": {
-        "dexie": "2.0.1",
-        "fake-indexeddb": "2.0.3",
+        "dexie": "2.0.2",
+        "fake-indexeddb": "2.0.4",
         "joi": "13.1.2",
         "joi-browser": "13.0.1",
         "json-merge-patch": "0.2.3",
@@ -10985,11 +10744,6 @@
       "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.4.tgz",
       "integrity": "sha1-3MHXVS4VCgZABzupyzHXDwMpUOc="
     },
-    "lodash._basefor": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/lodash._basefor/-/lodash._basefor-3.0.3.tgz",
-      "integrity": "sha1-dVC06SGO8J+tJDQ7YSAhx5tMIMI="
-    },
     "lodash.assign": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
@@ -11039,31 +10793,12 @@
       "resolved": "https://registry.npmjs.org/lodash.intersection/-/lodash.intersection-4.4.0.tgz",
       "integrity": "sha1-ChG6Yx0OlcI8fy9Mu5ppLtF45wU="
     },
-    "lodash.isarguments": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo="
-    },
-    "lodash.isarray": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U="
-    },
     "lodash.isplainobject": {
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
       "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
       "dev": true
     },
-    "lodash.keysin": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.keysin/-/lodash.keysin-3.0.8.tgz",
-      "integrity": "sha1-IsRJPrvtsUJ5YqVLRFssinZ/tH8=",
-      "requires": {
-        "lodash.isarguments": "3.1.0",
-        "lodash.isarray": "3.0.4"
-      }
-    },
     "lodash.memoize": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
@@ -11102,6 +10837,11 @@
       "integrity": "sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=",
       "dev": true
     },
+    "lodash.sortby": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
+      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg="
+    },
     "lodash.uniq": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
@@ -11741,9 +11481,9 @@
       "dev": true
     },
     "mocha": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-4.1.0.tgz",
-      "integrity": "sha512-0RVnjg1HJsXY2YFDoTNzcc1NKhYuXKRrBAG2gDygmJJA136Cs2QlRliZG1mA0ap7cuaT30mw16luAeln+4RiNA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.0.1.tgz",
+      "integrity": "sha512-SpwyojlnE/WRBNGtvJSNfllfm5PqEDFxcWluSIgLeSBJtXG4DmoX2NNAeEA7rP5kK+79VgtVq8nG6HskaL1ykg==",
       "dev": true,
       "requires": {
         "browser-stdout": "1.3.0",
@@ -12337,7 +12077,7 @@
     "normalize-package-data": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-      "integrity": "sha1-EvlaMH1YNSB1oEkHuErIvpisAS8=",
+      "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
       "dev": true,
       "requires": {
         "hosted-git-info": "2.5.0",
@@ -12962,20 +12702,11 @@
         "readable-stream": "2.3.3"
       },
       "dependencies": {
-        "buffer": {
-          "version": "4.9.1",
-          "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
-          "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
-          "requires": {
-            "base64-js": "1.2.1",
-            "ieee754": "1.1.8",
-            "isarray": "1.0.0"
-          }
-        },
         "isarray": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.3",
@@ -14072,81 +13803,6 @@
         }
       }
     },
-    "postcss-sass": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.2.0.tgz",
-      "integrity": "sha512-cUmYzkP747fPCQE6d+CH2l1L4VSyIlAzZsok3HPjb5Gzsq3jE+VjpAdGlPsnQ310WKWI42sw+ar0UNN59/f3hg==",
-      "dev": true,
-      "requires": {
-        "gonzales-pe": "4.2.3",
-        "postcss": "6.0.16"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-          "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
-          "dev": true,
-          "requires": {
-            "color-convert": "1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-          "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "3.2.0",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "4.5.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "4.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-              "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-              "dev": true,
-              "requires": {
-                "has-flag": "2.0.0"
-              }
-            }
-          }
-        },
-        "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "6.0.16",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.16.tgz",
-          "integrity": "sha512-m758RWPmSjFH/2MyyG3UOW1fgYbR9rtdzz5UNJnlm7OLtu4B2h9C6gi+bE4qFKghsBRFfZT8NzoQBs6JhLotoA==",
-          "dev": true,
-          "requires": {
-            "chalk": "2.3.0",
-            "source-map": "0.6.1",
-            "supports-color": "5.1.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz",
-          "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "2.0.0"
-          }
-        }
-      }
-    },
     "postcss-scss": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-1.0.3.tgz",
@@ -14327,7 +13983,7 @@
     "promise": {
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
-      "integrity": "sha1-BktyYCsY+Q8pGSuLG8QY/9Hr078=",
+      "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
       "requires": {
         "asap": "2.0.6"
       }
@@ -14548,7 +14204,7 @@
     "randomatic": {
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
-      "integrity": "sha1-x6vpzIuHwLqodrGf3oP9RkeX44w=",
+      "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==",
       "dev": true,
       "requires": {
         "is-number": "3.0.0",
@@ -14894,42 +14550,21 @@
         }
       }
     },
-    "readline2": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz",
-      "integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=",
-      "dev": true,
-      "requires": {
-        "code-point-at": "1.1.0",
-        "is-fullwidth-code-point": "1.0.0",
-        "mute-stream": "0.0.5"
-      },
-      "dependencies": {
-        "mute-stream": {
-          "version": "0.0.5",
-          "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz",
-          "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=",
-          "dev": true
-        }
-      }
-    },
     "realistic-structured-clone": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/realistic-structured-clone/-/realistic-structured-clone-1.0.1.tgz",
-      "integrity": "sha1-Gr6CrwuAzXsQn9r10pMIAyhS1F0=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/realistic-structured-clone/-/realistic-structured-clone-2.0.1.tgz",
+      "integrity": "sha1-q5ULxeY4WrjRtDhYj0LlWtsqTGc=",
       "requires": {
-        "lodash.isplainobject": "3.2.0"
+        "core-js": "2.5.3",
+        "domexception": "1.0.1",
+        "typeson": "5.8.2",
+        "typeson-registry": "1.0.0-alpha.21"
       },
       "dependencies": {
-        "lodash.isplainobject": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-3.2.0.tgz",
-          "integrity": "sha1-moI4rhayAEMpYM1zRlEtASP79MU=",
-          "requires": {
-            "lodash._basefor": "3.0.3",
-            "lodash.isarguments": "3.1.0",
-            "lodash.keysin": "3.0.8"
-          }
+        "core-js": {
+          "version": "2.5.3",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz",
+          "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4="
         }
       }
     },
@@ -15587,7 +15222,7 @@
     "safe-buffer": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-      "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM=",
+      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
       "dev": true
     },
     "safe-json-parse": {
@@ -16127,7 +15762,7 @@
     "source-list-map": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz",
-      "integrity": "sha1-qqR0A/eyRakvvJfqCPJQ1gh+0IU=",
+      "integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==",
       "dev": true
     },
     "source-map": {
@@ -16545,6 +16180,11 @@
           "requires": {
             "safe-buffer": "5.1.1"
           }
+        },
+        "type-detect": {
+          "version": "4.0.6",
+          "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.6.tgz",
+          "integrity": "sha512-qZ3bAurt2IXGPR3c57PyaSYEnQiLRwPeS60G9TahElBZsdOABo+iKYch/PhRjSTZJ5/DF08x43XMt9qec2g3ig=="
         }
       }
     },
@@ -16796,9 +16436,9 @@
       "dev": true
     },
     "style-loader": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.20.2.tgz",
-      "integrity": "sha512-FrLMGaOLVhS5pvoez3eJyc0ktchT1inEZziBSjBq1hHQBK3GFkF57Qd825DcrUhjaAWQk70MKrIl5bfjadR/Dg==",
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.20.1.tgz",
+      "integrity": "sha512-NtlwQOHQvUgEKuPs4JoUMQUkML8UNMxLbXM2JAZerIQVVVMgO5VVRjYQA8zzkpBu/X2OnTt+5ZKe8IbGk5TjRA==",
       "dev": true,
       "requires": {
         "loader-utils": "1.1.0",
@@ -16841,15 +16481,15 @@
       "dev": true
     },
     "stylelint": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-8.4.0.tgz",
-      "integrity": "sha512-56hPH5mTFnk8LzlEuTWq0epa34fHuS54UFYQidBOFt563RJBNi1nz1F2HK2MoT1X1waq47milvRsRahFCCJs/Q==",
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-9.1.1.tgz",
+      "integrity": "sha512-BYhAUd8ZiMcRx9cgVOWhckiixK93zXfYB2IwBZxcH+sFE7fp2nvs6xbx97P/wa3obhRLVukrIOH/1BHiukcuOQ==",
       "dev": true,
       "requires": {
-        "autoprefixer": "7.2.5",
+        "autoprefixer": "8.1.0",
         "balanced-match": "1.0.0",
-        "chalk": "2.3.0",
-        "cosmiconfig": "3.1.0",
+        "chalk": "2.3.2",
+        "cosmiconfig": "4.0.0",
         "debug": "3.1.0",
         "execall": "1.0.0",
         "file-entry-cache": "2.0.0",
@@ -16859,26 +16499,27 @@
         "html-tags": "2.0.0",
         "ignore": "3.3.7",
         "imurmurhash": "0.1.4",
-        "known-css-properties": "0.5.0",
-        "lodash": "4.17.4",
+        "known-css-properties": "0.6.1",
+        "lodash": "4.17.5",
         "log-symbols": "2.1.0",
         "mathml-tag-names": "2.0.1",
         "meow": "4.0.0",
         "micromatch": "2.3.11",
         "normalize-selector": "0.2.0",
         "pify": "3.0.0",
-        "postcss": "6.0.16",
+        "postcss": "6.0.19",
         "postcss-html": "0.12.0",
         "postcss-less": "1.1.3",
         "postcss-media-query-parser": "0.2.3",
         "postcss-reporter": "5.0.0",
         "postcss-resolve-nested-selector": "0.1.1",
         "postcss-safe-parser": "3.0.1",
-        "postcss-sass": "0.2.0",
+        "postcss-sass": "0.3.0",
         "postcss-scss": "1.0.3",
         "postcss-selector-parser": "3.1.1",
         "postcss-value-parser": "3.3.0",
         "resolve-from": "4.0.0",
+        "signal-exit": "3.0.2",
         "specificity": "0.3.2",
         "string-width": "2.1.1",
         "style-search": "0.1.0",
@@ -16894,36 +16535,36 @@
           "dev": true
         },
         "ansi-styles": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-          "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
             "color-convert": "1.9.0"
           }
         },
         "autoprefixer": {
-          "version": "7.2.5",
-          "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.2.5.tgz",
-          "integrity": "sha512-XqHfo8Ht0VU+T5P+eWEVoXza456KJ4l62BPewu3vpNf3LP9s2+zYXkXBznzYby4XeECXgG3N4i+hGvOhXErZmA==",
+          "version": "8.1.0",
+          "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-8.1.0.tgz",
+          "integrity": "sha512-b6mjq6VZ0guW6evRkKXL5sSSvIXICAE9dyWReZ3l/riidU7bVaJMe5cQ512SmaLA4Pvgnhi5MFsMs/Mvyh9//Q==",
           "dev": true,
           "requires": {
-            "browserslist": "2.11.3",
-            "caniuse-lite": "1.0.30000792",
+            "browserslist": "3.1.1",
+            "caniuse-lite": "1.0.30000812",
             "normalize-range": "0.1.2",
             "num2fraction": "1.2.2",
-            "postcss": "6.0.16",
+            "postcss": "6.0.19",
             "postcss-value-parser": "3.3.0"
           }
         },
         "browserslist": {
-          "version": "2.11.3",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz",
-          "integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==",
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.1.1.tgz",
+          "integrity": "sha512-zHGaPnTt70ywm+glR7uMJFZSl+ADGO67SgD2ae20L+Y3KJUeH4fVa89OkTqKCqAnXFE9mO4LTHBKBqKRlr7VNw==",
           "dev": true,
           "requires": {
-            "caniuse-lite": "1.0.30000792",
-            "electron-to-chromium": "1.3.31"
+            "caniuse-lite": "1.0.30000812",
+            "electron-to-chromium": "1.3.34"
           }
         },
         "camelcase": {
@@ -16944,31 +16585,32 @@
           }
         },
         "caniuse-lite": {
-          "version": "1.0.30000792",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000792.tgz",
-          "integrity": "sha1-0M6pgfgRjzlhRxr7tDyaHlu/AzI=",
+          "version": "1.0.30000812",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000812.tgz",
+          "integrity": "sha512-j+l55ayQ9BO4Sy9iVfbf99+G+4ddAmkXoiEt73WCW4vJ83usrlHzDkFEnNXe5/swkVqE7YBm5i8M2uRXlx9vWg==",
           "dev": true
         },
         "chalk": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-          "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "3.2.0",
+            "ansi-styles": "3.2.1",
             "escape-string-regexp": "1.0.5",
-            "supports-color": "4.5.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "4.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-              "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-              "dev": true,
-              "requires": {
-                "has-flag": "2.0.0"
-              }
-            }
+            "supports-color": "5.3.0"
+          }
+        },
+        "cosmiconfig": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-4.0.0.tgz",
+          "integrity": "sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==",
+          "dev": true,
+          "requires": {
+            "is-directory": "0.3.1",
+            "js-yaml": "3.10.0",
+            "parse-json": "4.0.0",
+            "require-from-string": "2.0.1"
           }
         },
         "debug": {
@@ -16980,6 +16622,12 @@
             "ms": "2.0.0"
           }
         },
+        "electron-to-chromium": {
+          "version": "1.3.34",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.34.tgz",
+          "integrity": "sha1-2TSY9AORuwwWpgPYJBuZUUBBV+0=",
+          "dev": true
+        },
         "get-stdin": {
           "version": "5.0.1",
           "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz",
@@ -16987,9 +16635,9 @@
           "dev": true
         },
         "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
           "dev": true
         },
         "indent-string": {
@@ -17004,6 +16652,12 @@
           "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
           "dev": true
         },
+        "known-css-properties": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.6.1.tgz",
+          "integrity": "sha512-nQRpMcHm1cQ6gmztdvLcIvxocznSMqH/y6XtERrWrHaymOYdDGroRqetJvJycxGEr1aakXiigDgn7JnzuXlk6A==",
+          "dev": true
+        },
         "load-json-file": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
@@ -17017,9 +16671,9 @@
           }
         },
         "lodash": {
-          "version": "4.17.4",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-          "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
+          "version": "4.17.5",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz",
+          "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==",
           "dev": true
         },
         "map-obj": {
@@ -17077,14 +16731,24 @@
           "dev": true
         },
         "postcss": {
-          "version": "6.0.16",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.16.tgz",
-          "integrity": "sha512-m758RWPmSjFH/2MyyG3UOW1fgYbR9rtdzz5UNJnlm7OLtu4B2h9C6gi+bE4qFKghsBRFfZT8NzoQBs6JhLotoA==",
+          "version": "6.0.19",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.19.tgz",
+          "integrity": "sha512-f13HRz0HtVwVaEuW6J6cOUCBLFtymhgyLPV7t4QEk2UD3twRI9IluDcQNdzQdBpiixkXj2OmzejhhTbSbDxNTg==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
+            "chalk": "2.3.2",
             "source-map": "0.6.1",
-            "supports-color": "5.1.0"
+            "supports-color": "5.3.0"
+          }
+        },
+        "postcss-sass": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.3.0.tgz",
+          "integrity": "sha512-nZJEFS2bT007CmzMjlZfZwcZKpSJ/JeFiVEdgrgvGZtAnORU+5BvN0cioNuDAVxwXHXp3hksCJzbZYPWkuw41Q==",
+          "dev": true,
+          "requires": {
+            "gonzales-pe": "4.2.3",
+            "postcss": "6.0.19"
           }
         },
         "postcss-selector-parser": {
@@ -17173,12 +16837,12 @@
           "dev": true
         },
         "supports-color": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz",
-          "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==",
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
           "dev": true,
           "requires": {
-            "has-flag": "2.0.0"
+            "has-flag": "3.0.0"
           }
         },
         "trim-newlines": {
@@ -17190,9 +16854,9 @@
       }
     },
     "stylelint-config-recommended": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-2.0.1.tgz",
-      "integrity": "sha512-FXdgdOEGpaFQoKGhsi8IbsCI6dkxHQPa1CCqIybkN1d8LKtdxrn/A1rgu8DpJ6J+/4L30FOJeVdPttGfxCDHBQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-2.1.0.tgz",
+      "integrity": "sha512-ajMbivOD7JxdsnlS5945KYhvt7L/HwN6YeYF2BH6kE4UCLJR0YvXMf+2j7nQpJyYLZx9uZzU5G1ZOSBiWAc6yA==",
       "dev": true
     },
     "subarg": {
@@ -17880,6 +17544,21 @@
         "punycode": "1.4.1"
       }
     },
+    "tr46": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
+      "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
+      "requires": {
+        "punycode": "2.1.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz",
+          "integrity": "sha1-X4Y+3Im5bbCQdLrXlHvwkFbKTn0="
+        }
+      }
+    },
     "traverse": {
       "version": "0.3.9",
       "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
@@ -17979,6 +17658,29 @@
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
       "dev": true
     },
+    "typeson": {
+      "version": "5.8.2",
+      "resolved": "https://registry.npmjs.org/typeson/-/typeson-5.8.2.tgz",
+      "integrity": "sha512-AFuyvVdHdkGlVIalOrSFjylmeLeWFtKu77uDjEilP4B9+Jk0DCM1m1A4Q2s3AwROhgiFFVPI8oARaD9S61lOkg=="
+    },
+    "typeson-registry": {
+      "version": "1.0.0-alpha.21",
+      "resolved": "https://registry.npmjs.org/typeson-registry/-/typeson-registry-1.0.0-alpha.21.tgz",
+      "integrity": "sha512-D7aj2KAzOaLvzCAYNhoFW536uWwbmSz5gSaO5fWETERLFheCOEIiMifGI4GDyGatxRvUJMz0ydp/ZEYYzs9iwQ==",
+      "requires": {
+        "base64-arraybuffer-es6": "0.3.1",
+        "typeson": "5.8.2",
+        "uuid": "3.2.1",
+        "whatwg-url": "6.4.0"
+      },
+      "dependencies": {
+        "uuid": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz",
+          "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA=="
+        }
+      }
+    },
     "ua-parser-js": {
       "version": "0.7.13",
       "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.13.tgz",
@@ -18725,6 +18427,11 @@
         }
       }
     },
+    "webidl-conversions": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
+      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
+    },
     "webpack": {
       "version": "3.10.0",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.10.0.tgz",
@@ -18958,7 +18665,7 @@
     "webpack-sources": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz",
-      "integrity": "sha1-xzVkNqTRMSO+LiQmoF0drZy+Zc8=",
+      "integrity": "sha512-05tMxipUCwHqYaVS8xc7sYPTly8PzXayRCB4dTxLhWTqlKUiwH6ezmEe0OSreL1c30LAuA3Zqmc+uEBUGFJDjw==",
       "dev": true,
       "requires": {
         "source-list-map": "2.0.0",
@@ -18986,6 +18693,16 @@
       "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz",
       "integrity": "sha1-nITsLc9oGH/wC8ZOEnS0QhduHIQ="
     },
+    "whatwg-url": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.4.0.tgz",
+      "integrity": "sha512-Z0CVh/YE217Foyb488eo+iBv+r7eAQ0wSTyApi9n06jhcA3z6Nidg/EGvl0UFkg7kMdKxfBzzr+o9JF+cevgMg==",
+      "requires": {
+        "lodash.sortby": "4.7.0",
+        "tr46": "1.0.1",
+        "webidl-conversions": "4.0.2"
+      }
+    },
     "when": {
       "version": "3.7.2",
       "resolved": "https://registry.npmjs.org/when/-/when-3.7.2.tgz",
diff --git a/package.json b/package.json
index a395414c..3b264833 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "title": "Lockbox",
   "name": "lockbox",
   "id": "lockbox@mozilla.com",
-  "version": "0.1.7-alpha1",
+  "version": "0.1.8-alpha",
   "main": "dist/bootstrap.js",
   "description": "The simple way to store, retrieve and manage website login info",
   "author": "Lockbox Team <lockbox-dev@mozilla.com>",
@@ -96,14 +96,14 @@
     "copy-webpack-plugin": "^4.3.1",
     "cross-env": "^5.1.3",
     "css-loader": "^0.28.9",
-    "documentation": "^5.3.5",
+    "documentation": "^6.0.0",
     "enzyme": "^3.3.0",
     "enzyme-adapter-react-16": "^1.1.1",
     "eslint": "^4.15.0",
     "eslint-config-standard": "^11.0.0-beta.0",
     "eslint-plugin-import": "^2.8.0",
     "eslint-plugin-mozilla": "0.6.0",
-    "eslint-plugin-no-unsanitized": "^2.0.2",
+    "eslint-plugin-no-unsanitized": "^3.0.0",
     "eslint-plugin-node": "^6.0.0",
     "eslint-plugin-only-warn": "^1.0.1",
     "eslint-plugin-promise": "^3.6.0",
@@ -124,7 +124,7 @@
     "karma-mocha-reporter": "^2.2.5",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^2.0.9",
-    "mocha": "^4.1.0",
+    "mocha": "^5.0.1",
     "nsp": "^3.1.0",
     "react-document-title": "^2.0.3",
     "react-test-renderer": "^16.2.0",
@@ -133,8 +133,8 @@
     "sinon-chai": "^2.14.0",
     "source-map-support": "^0.5.1",
     "style-loader": "^0.20.1",
-    "stylelint": "8.4.0",
-    "stylelint-config-recommended": "2.0.1",
+    "stylelint": "9.1.1",
+    "stylelint-config-recommended": "2.1.0",
     "webpack": "^3.10.0",
     "webpack-combine-loaders": "^2.0.3",
     "webpack-node-externals": "^1.6.0"
diff --git a/requirements/flake8.txt b/requirements/flake8.txt
index 29226fd5..42a2c164 100644
--- a/requirements/flake8.txt
+++ b/requirements/flake8.txt
@@ -1,3 +1,3 @@
 flake8==3.5.0
-flake8-isort==2.2.2
-flake8-docstrings==1.1.0
+flake8-isort==2.4
+flake8-docstrings==1.3.0
diff --git a/requirements/tests.txt b/requirements/tests.txt
index ad662a78..fa009eb9 100644
--- a/requirements/tests.txt
+++ b/requirements/tests.txt
@@ -1,6 +1,6 @@
 fxapom==1.10.1
-PyPOM==1.2.0
-pytest==3.3.1
-pytest-selenium==1.11.3
-pytest-xdist==1.20.1
-selenium==3.8.0
+PyPOM==1.3.0
+pytest==3.4.1
+pytest-selenium==1.11.4
+pytest-xdist==1.22.2
+selenium==3.10.0
\ No newline at end of file
diff --git a/src/bootstrap.js b/src/bootstrap.js
index fa785480..ea808f05 100644
--- a/src/bootstrap.js
+++ b/src/bootstrap.js
@@ -162,6 +162,24 @@ function startup({webExtension}, reason) {
     }
   }
 
+  try {
+    Services.telemetry.registerScalars(TELEMETRY_CATEGORY, {
+      "datastoreCount": {
+        kind: Services.telemetry.SCALAR_TYPE_COUNT,
+        keyed: false,
+        record_on_release: false,
+        expired: false,
+      },
+    });
+  } catch (e) {
+    if (e.message === "Attempt to register scalar that is already registered.") {
+      // eslint-disable-next-line no-console
+      console.log("telemetry scalar already registered; skipping registration");
+    } else {
+      throw e;
+    }
+  }
+
   webExtension.startup().then(({browser}) => {
     Services.telemetry.recordEvent(TELEMETRY_CATEGORY, "startup",
                                    "webextension");
@@ -173,6 +191,12 @@ function startup({webExtension}, reason) {
           message.extra || null
         );
         respond({});
+        break;
+      case "telemetry_scalar":
+        Services.telemetry.scalarSet(
+          `${TELEMETRY_CATEGORY}.${message.name}`, message.value
+        );
+        respond({});
       }
     });
 
diff --git a/src/webextension/background/message-ports.js b/src/webextension/background/message-ports.js
index c019141a..14e2542d 100644
--- a/src/webextension/background/message-ports.js
+++ b/src/webextension/background/message-ports.js
@@ -161,8 +161,10 @@ export default function initializeMessagePorts() {
 
     case "list_items":
       return openDataStore().then(async (ds) => {
-        return {items: Array.from((await ds.list()).values(),
-                                  makeItemSummary)};
+        var entries = Array.from((await ds.list()).values(),
+                                  makeItemSummary);
+        telemetry.setScalar("datastoreCount", entries.length);
+        return {items: entries};
       });
     case "add_item":
       return openDataStore().then(async (ds) => {
@@ -186,7 +188,6 @@ export default function initializeMessagePorts() {
       return openDataStore().then(async (ds) => {
         return {item: await ds.get(message.id)};
       });
-
     case "proxy_telemetry_event":
       return telemetry.recordEvent(message.method, message.object,
                                    message.extra);
diff --git a/src/webextension/background/telemetry.js b/src/webextension/background/telemetry.js
index 1bad78ad..cb66d0b1 100644
--- a/src/webextension/background/telemetry.js
+++ b/src/webextension/background/telemetry.js
@@ -14,3 +14,9 @@ export async function recordEvent(method, object, extra) {
     type: "telemetry_event", method, object, extra,
   });
 }
+
+export async function setScalar(name, value) {
+  return browser.runtime.sendMessage({
+    type: "telemetry_scalar", name, value,
+  });
+}
diff --git a/src/webextension/icons/arrowhead-down-16.svg b/src/webextension/icons/arrowhead-down-16.svg
deleted file mode 100644
index a56e6870..00000000
--- a/src/webextension/icons/arrowhead-down-16.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
-  <path fill="#2A2A2E" d="M8,12 C7.73176054,11.9961885 7.47589632,11.8867973 7.28813686,11.6956526 L2.20340014,6.62319658 C1.8997496,6.21930704 1.94001206,5.65413954 2.29786765,5.29714824 C2.65572324,4.94015694 3.22225904,4.89999173 3.62712642,5.20290889 L8,9.56522109 L12.3728736,5.20290889 C12.777741,4.89999173 13.3442768,4.94015694 13.7021323,5.29714824 C14.0599879,5.65413954 14.1002504,6.21930704 13.7965999,6.62319658 L8.71186314,11.6956526 C8.52410368,11.8867973 8.26823946,11.9961885 8,12 Z"/>
-</svg>
diff --git a/src/webextension/icons/arrowhead-right-16.svg b/src/webextension/icons/arrowhead-right-16.svg
deleted file mode 100644
index cc6a0285..00000000
--- a/src/webextension/icons/arrowhead-right-16.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
-  <path fill="context-fill" d="M6 14a1 1 0 0 1-.707-1.707L9.586 8 5.293 3.707a1 1 0 0 1 1.414-1.414l5 5a1 1 0 0 1 0 1.414l-5 5A1 1 0 0 1 6 14z"></path>
-</svg>
diff --git a/src/webextension/icons/chevron-right.svg b/src/webextension/icons/chevron-right.svg
new file mode 100644
index 00000000..b2a2bef8
--- /dev/null
+++ b/src/webextension/icons/chevron-right.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="5" height="9" viewBox="0 0 5 9">
+  <path fill="#737373" d="M0.714194646,9 C0.425324014,8.99993517 0.164924819,8.817017 0.0543871589,8.53651631 C-0.056150501,8.25601562 0.00493439271,7.93315324 0.209165941,7.71843768 L3.27576882,4.49538728 L0.209165941,1.27233689 C-0.0615438815,0.977751066 -0.0576723503,0.509492152 0.217867453,0.219895256 C0.493407256,-0.0697016392 0.938936787,-0.0737706826 1.21922335,0.210749823 L4.79085493,3.96459375 C5.06971502,4.25776885 5.06971502,4.73300572 4.79085493,5.02618082 L1.21922335,8.78002475 C1.08529236,8.92083096 0.90363028,8.99995748 0.714194646,9 Z"/>
+</svg>
diff --git a/src/webextension/icons/clear.svg b/src/webextension/icons/clear.svg
new file mode 100644
index 00000000..52782336
--- /dev/null
+++ b/src/webextension/icons/clear.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="#B1B1B3" fill-rule="evenodd" d="M2.34314575,13.6568542 C-0.781048583,10.5326599 -0.781048583,5.46734008 2.34314575,2.34314575 C5.46734008,-0.781048583 10.5326599,-0.781048583 13.6568542,2.34314575 C16.7810486,5.46734008 16.7810486,10.5326599 13.6568542,13.6568542 C10.5326599,16.7810486 5.46734008,16.7810486 2.34314575,13.6568542 Z M11.7712362,10.6937401 L9.07749605,8 L11.7712362,5.30625988 C12.0687785,5.00871756 12.0687785,4.52630615 11.7712362,4.22876383 C11.4736938,3.93122152 10.9912824,3.93122152 10.6937401,4.22876383 L8,6.92250395 L5.30625988,4.22876383 C5.00871756,3.93122152 4.52630615,3.93122152 4.22876383,4.22876383 C3.93122152,4.52630615 3.93122152,5.00871756 4.22876383,5.30625988 L6.92250395,8 L4.22876383,10.6937401 C3.93122152,10.9912824 3.93122152,11.4736938 4.22876383,11.7712362 C4.52630615,12.0687785 5.00871756,12.0687785 5.30625988,11.7712362 L8,9.07749605 L10.6937401,11.7712362 C10.9912824,12.0687785 11.4736938,12.0687785 11.7712362,11.7712362 C12.0687785,11.4736938 12.0687785,10.9912824 11.7712362,10.6937401 Z"/>
+</svg>
diff --git a/src/webextension/icons/hide.svg b/src/webextension/icons/hide.svg
new file mode 100644
index 00000000..dbbbbd44
--- /dev/null
+++ b/src/webextension/icons/hide.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd" transform="translate(0 1)">
+    <path stroke="#0C0C0D" stroke-opacity=".6" stroke-width="2" d="M1,6.95041322 C1,9.20254695 4.73761678,11.9008264 8,11.9008264 C11.2623832,11.9008264 15,9.20254695 15,6.95041322 C15,4.6982795 11.2623832,2 8,2 C4.73761678,2 1,4.6982795 1,6.95041322 Z"/>
+    <path fill="#6D6D6E" d="M14.0160542,0.675736079 C14.3979633,1.05764518 14.3979633,1.67684218 14.0160542,2.05875128 L2.95193261,13.1228729 C2.5700235,13.504782 1.95082651,13.504782 1.56891741,13.1228729 C1.1870083,12.7409638 1.1870083,12.1217668 1.56891741,11.7398577 L12.633039,0.675736079 C13.0149481,0.293826977 13.6341451,0.293826977 14.0160542,0.675736079 Z"/>
+    <path fill="#6D6D6E" d="M9.60800171,4.46955872 C9.1423119,4.17216421 8.59352469,4 8,4 C6.34314575,4 5,5.34314575 5,7 C5,7.5968592 5.1629633,8.14651554 5.46343994,8.61383057 L9.60800171,4.46955872 Z"/>
+  </g>
+</svg>
diff --git a/src/webextension/icons/search.svg b/src/webextension/icons/search.svg
new file mode 100644
index 00000000..689a5f68
--- /dev/null
+++ b/src/webextension/icons/search.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="#0C0C0D" fill-opacity=".4" d="M15.758773,14.3442769 L10.9234032,9.50890701 C12.737938,6.95888863 12.2955018,3.44377439 9.90564952,1.42294873 C7.51579721,-0.597876924 3.97603357,-0.45005508 1.76298925,1.76298925 C-0.45005508,3.97603357 -0.597876924,7.51579721 1.42294873,9.90564952 C3.44377439,12.2955018 6.95888863,12.737938 9.50890701,10.9234032 L14.3442769,15.758773 C14.7423023,16.0996333 15.3356221,16.0767159 15.706169,15.706169 C16.0767159,15.3356221 16.0996333,14.7423023 15.758773,14.3442769 Z M6.01781012,10.0405971 C3.8016267,10.0405971 2.00505507,8.24402543 2.00505507,6.02784201 C2.00505507,3.81165859 3.8016267,2.01508696 6.01781012,2.01508696 C8.23399354,2.01508696 10.0305652,3.81165859 10.0305652,6.02784201 C10.0305652,7.09209082 9.60779398,8.11275077 8.85525643,8.86528832 C8.10271888,9.61782587 7.08205893,10.0405971 6.01781012,10.0405971 Z"/>
+</svg>
diff --git a/src/webextension/icons/show.svg b/src/webextension/icons/show.svg
new file mode 100644
index 00000000..4f184003
--- /dev/null
+++ b/src/webextension/icons/show.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd" transform="translate(0 2)">
+    <path stroke="#0C0C0D" stroke-opacity=".6" stroke-width="2" d="M1,5.95041322 C1,8.20254695 4.73761678,10.9008264 8,10.9008264 C11.2623832,10.9008264 15,8.20254695 15,5.95041322 C15,3.6982795 11.2623832,1 8,1 C4.73761678,1 1,3.6982795 1,5.95041322 Z"/>
+    <circle cx="8" cy="6" r="3" fill="#0C0C0D" fill-opacity=".6"/>
+  </g>
+</svg>
diff --git a/src/webextension/images/nessie_v2.svg b/src/webextension/images/nessie_v2.svg
index 8a202723..5999a97a 100644
--- a/src/webextension/images/nessie_v2.svg
+++ b/src/webextension/images/nessie_v2.svg
@@ -1,367 +1,114 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 275 141" style="enable-background:new 0 0 275 141;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#EAEAEE;}
-	.st1{fill:#FFFFFF;}
-	.st2{fill:url(#SVGID_1_);}
-	.st3{fill:url(#SVGID_2_);}
-	.st4{fill:url(#SVGID_3_);}
-	.st5{fill:url(#SVGID_4_);}
-	.st6{fill:url(#SVGID_5_);}
-	.st7{fill:url(#SVGID_6_);}
-	.st8{fill:url(#SVGID_7_);}
-	.st9{fill:url(#SVGID_8_);}
-	.st10{fill:url(#SVGID_9_);}
-	.st11{fill:url(#SVGID_10_);}
-	.st12{fill:url(#SVGID_11_);}
-	.st13{fill:url(#SVGID_12_);}
-	.st14{fill:url(#SVGID_13_);}
-	.st15{fill:url(#SVGID_14_);}
-	.st16{fill:url(#SVGID_15_);}
-	.st17{fill:#F9F9FA;}
-	.st18{fill:url(#SVGID_16_);}
-	.st19{fill:url(#SVGID_17_);}
-	.st20{fill:url(#SVGID_18_);}
-</style>
-<g>
-	<path class="st0" d="M157.9,61.1c0.6,0,1-0.4,1-1s-0.4-1-1-1h-52c-0.2,0.6-0.5,1.3-0.7,2H157.9z"/>
-	<path class="st0" d="M136.5,55c-0.3,0-0.5,0.2-0.5,0.5s0.2,0.5,0.5,0.5h12c0.3,0,0.5-0.2,0.5-0.5s-0.2-0.5-0.5-0.5H136.5z"/>
-	<path class="st0" d="M109.8,64.6c-0.3,0-0.5,0.2-0.5,0.5s0.2,0.5,0.5,0.5h3c0.3,0,0.5-0.2,0.5-0.5s-0.2-0.5-0.5-0.5H109.8z"/>
-	<path class="st0" d="M104.8,64.6c-0.3,0-0.5,0.2-0.5,0.5s0.2,0.5,0.5,0.5h1c0.3,0,0.5-0.2,0.5-0.5s-0.2-0.5-0.5-0.5H104.8z"/>
-	<path class="st0" d="M120.8,64.6c-0.3,0-0.5,0.2-0.5,0.5s0.2,0.5,0.5,0.5h12c0.3,0,0.5-0.2,0.5-0.5s-0.2-0.5-0.5-0.5H120.8z"/>
-	<path class="st1" d="M61.3,96c4.6,0.3,8.6-1.8,11.5-3.9c3.3-5.2,8.6-11.2,16.5-18.1c10-8.6,14-24.3,13-31l-0.6,1.4
-		c-0.1,0.2-0.3,0.3-0.5,0.3c-0.1,0-0.1,0-0.2,0c-0.3-0.1-0.4-0.4-0.3-0.6l1.1-2.6c0,0,0,0,0-0.1l0.4-1.2l-1.1-0.3
-		c-1.6-3.1-3.7-5.9-6.1-8.6c-0.1,0.8-0.2,1.4-0.2,1.6c-0.1,0.2-0.3,0.3-0.5,0.3c-0.1,0-0.1,0-0.2,0c-0.3-0.1-0.4-0.4-0.3-0.6
-		c0.1-0.2,0.2-1.1,0.3-2.2c0,0-0.1-0.1-0.1-0.1L94,26.4l-3.9,0.1c-3.2-2.7-6.8-5-10.4-7L78.2,14l-4.7,1.3l2.3,1
-		c0.3,0.1,0.4,0.4,0.3,0.7c-0.1,0.2-0.3,0.3-0.5,0.3c-0.1,0-0.1,0-0.2,0L72,15.7l-0.5,0.1c-5.4-2-10.7-3.2-14.9-3.2
-		c-0.5,0-1,0-1.5,0.1c-7.8,0.5-20.6,10.5-30.8,20.5c0,0,0,0,0,0c-3,3.3-10.4,12.1-11.8,19.3C10.8,61,15,70.8,21.9,74.3
-		c8,4.2,25.6,2,31.5,1.1c1.2-0.4,1.8-0.7,1.9-0.8c0.5-0.2,1.1,0,1.3,0.5c0.2,0.5,0,1.1-0.5,1.3c-0.1,0.1-1.2,0.5-2.9,1.2
-		c-0.6,1.3-2,4.6-1.8,8.2C51.5,90.5,53.7,95.5,61.3,96z M31.2,51.2c-0.3,0.2-0.5,0.2-0.8,0.2c-0.5,0-1-0.2-1.3-0.7
-		c0,0-0.9-1.3-2.5-1.3c-1.7,0-2.5,1.3-2.5,1.3c-0.4,0.7-1.4,0.9-2.1,0.4c-0.7-0.5-0.9-1.4-0.4-2.1c0.1-0.1,1.3-1.9,3.6-2.5
-		C25,46.4,25,46.2,25,46v-3.2c0-0.8,0.6-1.4,1.4-1.4c0.8,0,1.4,0.6,1.4,1.4V46c0,0.2,0,0.4-0.1,0.6c2.6,0.5,3.9,2.4,4,2.5
-		C32.1,49.8,31.9,50.7,31.2,51.2z M56.2,50.7c-0.5,0.7-1.4,0.9-2.1,0.4s-0.9-1.4-0.4-2.1c0.1-0.1,1.3-1.9,3.6-2.5
-		c-0.1-0.2-0.2-0.4-0.2-0.6v-3.2c0-0.8,0.6-1.4,1.4-1.4c0.8,0,1.4,0.6,1.4,1.4V46c0,0.2,0,0.4-0.1,0.6c2.6,0.5,3.9,2.4,4,2.5
-		c0.5,0.7,0.3,1.6-0.4,2.1c-0.3,0.2-0.5,0.2-0.8,0.2c-0.5,0-1-0.2-1.3-0.7c0,0-0.9-1.3-2.5-1.3C57.1,49.4,56.2,50.7,56.2,50.7z"/>
-	<path class="st1" d="M30.5,116.6c0.4-12.8,4.5-24.5,12.4-34.7c-2.6,0.4-5.6,0.6-8.7,0.6c-3.6,0-6.7-0.3-7.8-0.4
-		c-6.7-0.9-10.8-3.2-15-8.5C8,69.4,4.2,60.4,6,53.4c1.2-4.7,4.6-9.1,7.3-11.9c3.7-5.1,8.5-9.5,8.6-9.7c0.5-0.4,1-0.7,1.7-0.7
-		c5.7-5.5,21.2-19.6,31.3-20.3c0.5,0,1.1-0.1,1.7-0.1c4.4,0,9.6,1.1,15,3.1l6-1.6c0.2,0,0.4-0.1,0.5-0.1c0.3,0,0.7,0.1,1,0.3
-		c0.5,0.3,0.8,0.7,0.9,1.2l1.3,4.7c3.4,1.9,6.5,4,9.4,6.3l3.1-0.1c0,0,0,0,0,0c0.5,0,1,0.2,1.4,0.6c0.4,0.4,0.6,0.9,0.6,1.4l0.1,3
-		c2.7,2.8,4.8,5.8,6.5,8.8l0.3,0.1c0.5,0.2,0.9,0.5,1.2,1c0.2,0.5,0.3,1,0.1,1.5l-0.2,0.5c1,3.4,0.4,9.2-1.5,15.4
-		c-1.4,4.5-4.9,12.9-11.8,18.8C78.9,85.6,72,94.9,70,103.1c-1.4,6,0.1,10.4,1.4,13.8c0.8-0.4,1.5-0.8,2.3-1.2
-		c0.4-0.2,0.8-0.4,1.3-0.7c-2.5-6.4-4.7-16.9,18.2-36.5c6.2-5.3,9.9-12.4,11.9-17.5c0.3-0.7,0.5-1.4,0.7-2c0.1-0.4,0.3-0.8,0.4-1.2
-		c0.8-2.5,3.1-10.5,1.9-16.6c0.3-1.3,0.1-2.7-0.6-3.9c-0.5-1-1.3-1.8-2.2-2.3c-1.5-2.5-3.3-5-5.4-7.3l0-1.5c0-1.6-0.7-3.1-1.9-4.2
-		c-1.1-1.1-2.6-1.7-4.1-1.7c0,0-0.1,0-0.1,0l-1.7,0c-2.3-1.8-4.7-3.4-7.3-4.9l-0.9-3.2c-0.4-1.5-1.4-2.8-2.8-3.6
-		c-0.9-0.5-1.9-0.8-3-0.8c-0.5,0-1.1,0.1-1.6,0.2l-4.8,1.3c-5.5-1.9-10.7-2.9-15.2-2.9h0c-0.7,0-1.3,0-2,0.1
-		c-4.7,0.3-15.1,3.5-33,20.7c-0.9,0.3-1.7,0.8-2.4,1.5c-0.2,0.2-5.1,4.8-9,10.1c-4.2,4.6-7,9.2-8.1,13.5c-2.3,8.8,2.5,19.2,6,23.7
-		c4.8,6.1,9.9,9,17.6,10c0.1,0,3.5,0.5,8.3,0.5c0.3,0,0.5,0,0.8,0c-5.3,9.1-8.2,19.1-8.5,30c0,0.5,0,1,0.1,1.5
-		C28.2,117.7,29.4,117.2,30.5,116.6C30.5,116.6,30.5,116.6,30.5,116.6z"/>
-	<path class="st1" d="M213.6,100.4l-0.8-0.1L213.6,100.4C213.6,100.4,213.6,100.4,213.6,100.4z"/>
-	<path class="st1" d="M182.7,117.6c2.6-0.9,5.2-1.9,7.6-3l2.4-5.8c0.5-1.2,1.7-2,3.1-2c0.4,0,0.9,0.1,1.3,0.2l4.2,1.7
-		c1.4-0.9,2.7-1.8,3.8-2.7l0.8-5.4c0.2-1.6,1.6-2.8,3.3-2.8c0.2,0,0.3,0,0.5,0l3.6,0.5c1.1-1.2,2.1-2.5,3-3.7l-0.7-2.9
-		c-0.2-0.9-0.1-1.7,0.4-2.5c0.5-0.8,1.2-1.3,2.1-1.5l2.8-0.7c1.6-3.3,3-5.8,6.6-6.4c0.2,0,0.3,0,0.5,0c4.6,0,10,9.6,11.6,12.6
-		c3.5,6.6,5.9,13.7,6.8,20.2c1.1-0.3,2.5-0.4,4-0.5c-1.3-9.2-5-17.2-7.3-21.6c-5.2-9.7-10.3-14.7-15.1-14.7c-0.4,0-0.8,0-1.1,0.1
-		c-4.8,0.7-7,3.9-8.7,6.9l-1,0.2c-1.9,0.5-3.5,1.6-4.5,3.3c-1,1.7-1.3,3.6-0.9,5.5l0.3,1.1c-0.1,0.1-0.2,0.2-0.3,0.4l-1.5-0.2
-		c-0.3,0-0.7-0.1-1-0.1c-3.6,0-6.7,2.7-7.2,6.3l-0.5,3.8c-0.2,0.1-0.4,0.3-0.6,0.4l-2.2-0.9c-0.9-0.4-1.8-0.5-2.8-0.5
-		c-3,0-5.6,1.8-6.8,4.5l-1.7,4.2c-2.2,0.9-4.5,1.8-6.9,2.6c-1.2,0.2-2.1,0.5-2.9,0.8c0.5,0.3,1,0.5,1.5,0.8
-		C180.1,116.4,181.3,117.1,182.7,117.6z"/>
-	<polygon class="st1" points="192.5,114.5 192.6,114.5 192.7,114.1 	"/>
-	<path class="st1" d="M201.1,110.8l-0.2-0.1L201.1,110.8C201.1,110.8,201.1,110.8,201.1,110.8z"/>
-	<path class="st1" d="M150.3,107.5c2.6-4.1,2.9-8.1,2.8-10c-0.1,0.5-0.1,0.9-0.1,0.9c0,0.3-0.2,0.4-0.5,0.4c0,0,0,0-0.1,0
-		c-0.3,0-0.5-0.3-0.4-0.6c0-0.2,0.5-3.7,0.7-5.5c0-0.7-0.1-1.4-0.6-1.7c-0.1-0.1-0.3-0.1-0.5-0.1c-1.2,0-3.5,1.3-4.5,1.3
-		c-0.1,0-0.2,0-0.3-0.1c-5.1-3.1-11.1-5.1-17.6-5.2c-0.3,0-0.5,0-0.6,0c0.4,0.3,0.6,0.5,0.6,0.5c0.2,0.2,0.3,0.5,0.1,0.7
-		c-0.1,0.1-0.2,0.2-0.4,0.2c-0.1,0-0.2,0-0.3-0.1c-0.1,0-0.7-0.6-1.6-1.4c-1.2-0.8-3-3.3-4-3.3c0,0-0.1,0-0.1,0
-		c-1.5,0.2-3.1,4.7-4.2,5c-3.3,0.9-4.9,1.9-7.4,3.1l1,0.5c0.2,0.1,0.3,0.4,0.2,0.7c-0.1,0.2-0.3,0.3-0.4,0.3c-0.1,0-0.2,0-0.2-0.1
-		l-1.9-1c-1.1-0.3-3.4-1.8-4.7-1.8c-0.2,0-0.5,0.1-0.6,0.2c-1.5,0.7-0.8,5.8-1.8,6.7c-3.7,3-6.6,6.2-8.8,9.4
-		c0.2,1.7,1.5,5.9,10.3,9.6c1.8,0.8,3.8,1.4,5.8,1.8c2.2-0.5,3.7-1.3,5.3-2.2c2.7-1.4,5.4-2.9,10.9-2.9c0,0,0,0,0,0c0,0,0,0,0,0
-		c5.5,0,8.2,1.5,10.9,2.9c0.1,0.1,0.3,0.1,0.4,0.2C143.5,113.9,148.1,110.9,150.3,107.5z"/>
-	<path class="st1" d="M155.1,98.4c1.3,1.3,2.9,3.1,4.6,5C158.4,101.8,156.9,100.1,155.1,98.4z"/>
-	<path class="st1" d="M87.9,113c2.4-5,6.5-11.6,13.4-17.2c0.1-0.4,0.2-1.2,0.2-1.8c0.2-2,0.4-4.3,2.1-5.2c0.4-0.2,0.9-0.5,1.6-0.5
-		c1.3,0,2.7,0.7,4.1,1.3c0.3,0.1,0.6,0.3,0.9,0.4c0.6-0.3,1.1-0.5,1.5-0.8c1.9-0.9,3.5-1.7,6.2-2.5c0.2-0.3,0.6-0.9,0.9-1.4
-		c1-1.7,2.1-3.5,3.9-3.8c0.1,0,0.2,0,0.4,0c1.4,0,2.6,1.2,3.7,2.4c0.3,0.3,0.8,0.8,1.1,1.1c0.3,0,0.5,0,0.7,0c0.1,0,0.3,0,0.5,0
-		l0.3,0c6.2,0.1,12.3,1.8,18.1,5.2c0.3-0.1,0.7-0.3,1-0.4c1.1-0.4,2.2-0.9,3.2-0.9c0.6,0,1.1,0.1,1.6,0.4c1.9,1.2,1.6,3.6,1.3,5.2
-		c0,0.2-0.1,0.4-0.1,0.6c6.3,5.1,10.5,11.6,11.8,17.6c0.5,0,1.1-0.1,1.7-0.1c0.9,0,1.7,0,2.4,0.1c-1.2-6.7-5.4-13.6-11.7-19.3
-		c0.1-2.2-0.2-5.5-3.3-7.5c-1.1-0.7-2.3-1-3.7-1c-1.4,0-2.8,0.4-3.9,0.8c-5.8-3-12-4.7-18.2-4.8c-1.5-1.5-3.4-3.5-6.5-3.5
-		c-0.3,0-0.6,0-0.9,0.1c-3.6,0.5-5.4,3.5-6.7,5.7c0,0,0,0,0,0.1c-2.1,0.7-3.7,1.5-5.2,2.2c-1.4-0.7-3.1-1.3-4.9-1.3
-		c-1.3,0-2.6,0.3-3.7,1c-3.5,1.9-3.8,5.9-4,8.3c0,0,0,0.1,0,0.1c-7.4,6.4-11.6,13.7-13.9,19.1c0.3,0,0.7,0,1,0
-		C85.9,112.8,86.9,112.9,87.9,113z"/>
-	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-2.9949" y1="75.7704" x2="222.2551" y2="178.0204">
-		<stop  offset="0" style="stop-color:#CCFBFF"/>
-		<stop  offset="1" style="stop-color:#C9E4FF"/>
-	</linearGradient>
-	<path class="st2" d="M72.8,92.1C70,94.2,66,96.3,61.3,96c-7.7-0.5-9.8-5.5-10-10.2c-0.1-3.6,1.2-6.8,1.8-8.2
-		c-1.4,0.5-3.3,1.2-5.6,1.8c-2.8,3.1-14,15.3-15,36.1c2.5-1.4,5.3-2.7,10.5-2.7c5.5,0,8.2,1.5,10.9,2.9c2.6,1.4,5,2.7,9.9,2.7
-		c2.4,0,4.2-0.3,5.8-0.8C67.5,112.4,65,104.3,72.8,92.1z"/>
-	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="8.8364" y1="49.7068" x2="234.0864" y2="151.9568">
-		<stop  offset="0" style="stop-color:#CCFBFF"/>
-		<stop  offset="1" style="stop-color:#C9E4FF"/>
-	</linearGradient>
-	<path class="st3" d="M21.9,74.3C15,70.8,10.8,61,12.4,52.5c1.4-7.2,8.8-16,11.8-19.3C24.1,33.1,24,33,23.8,33
-		c-0.2,0-0.3,0.1-0.4,0.2c-0.3,0.2-4.9,4.6-8.5,9.5c-2.6,2.8-5.8,6.9-6.9,11.2c-1.6,6.4,2.1,14.9,4.9,18.4c3.9,4.9,7.6,7,13.7,7.8
-		c0.3,0,1.1,0.1,2.1,0.2c0.1-0.1,0.3-0.1,0.4-0.1c10.9-0.2,20.4-3.3,24.2-4.8C47.5,76.3,29.9,78.5,21.9,74.3z"/>
-	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="0.3544" y1="68.392" x2="225.6044" y2="170.642">
-		<stop  offset="0" style="stop-color:#CCFBFF"/>
-		<stop  offset="1" style="stop-color:#C9E4FF"/>
-	</linearGradient>
-	<path class="st4" d="M94,106.6c-1.7,2.4-3,4.8-4.1,6.9c2.3,0.6,4,1.5,5.6,2.3c2.6,1.4,5,2.7,9.9,2.7c1.8,0,3.3-0.2,4.6-0.5
-		c-2-0.4-3.9-1-5.8-1.8C95.5,112.5,94.2,108.2,94,106.6z"/>
-	<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="10.8236" y1="45.3291" x2="236.0736" y2="147.5791">
-		<stop  offset="0" style="stop-color:#CCFBFF"/>
-		<stop  offset="1" style="stop-color:#C9E4FF"/>
-	</linearGradient>
-	<path class="st5" d="M155.1,98.4c-0.6-0.6-1.2-1.1-1.9-1.7c0,0.3-0.1,0.5-0.1,0.7c0.1,1.9-0.1,5.9-2.8,10
-		c-2.2,3.4-6.9,6.4-12.7,8.5c2.4,1.3,4.8,2.5,9.5,2.5c5,0,7.4-1.3,9.9-2.7c2-1.1,4-2.2,7.2-2.7c-0.7-3.1-2.2-6.4-4.6-9.6
-		C158.1,101.5,156.4,99.7,155.1,98.4z"/>
-	<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="-5.1815" y1="32.7574" x2="229.8185" y2="156.7574">
-		<stop  offset="0" style="stop-color:#00C8D7"/>
-		<stop  offset="1" style="stop-color:#0A84FF"/>
-	</linearGradient>
-	<path class="st6" d="M70,103.1c1.9-8.2,8.9-17.5,20.6-27.6c6.9-5.9,10.4-14.3,11.8-18.8c2-6.1,2.6-12,1.5-15.4l0.2-0.5
-		c0.2-0.5,0.1-1.1-0.1-1.5c-0.2-0.5-0.7-0.8-1.2-1l-0.3-0.1c-1.7-3.1-3.9-6-6.5-8.8l-0.1-3c0-0.5-0.2-1-0.6-1.4
-		c-0.4-0.4-0.9-0.6-1.4-0.6c0,0,0,0,0,0l-3.1,0.1c-2.9-2.3-6-4.4-9.4-6.3l-1.3-4.7c-0.1-0.5-0.5-0.9-0.9-1.2c-0.3-0.2-0.6-0.3-1-0.3
-		c-0.2,0-0.4,0-0.5,0.1l-6,1.6c-5.5-2-10.7-3.1-15-3.1c-0.6,0-1.1,0-1.7,0.1C44.8,11.4,29.3,25.5,23.6,31c-0.6,0-1.2,0.3-1.7,0.7
-		c-0.2,0.2-4.9,4.6-8.6,9.7c-2.7,2.9-6.1,7.3-7.3,11.9c-1.8,7,2,16,5.3,20.2c4.2,5.3,8.3,7.6,15,8.5c1.1,0.1,4.2,0.4,7.8,0.4
-		c3.2,0,6.1-0.2,8.7-0.6c-7.9,10.2-12,21.8-12.4,34.7c0,0,0,0,0,0c0.5-0.3,1.1-0.6,1.6-0.9c0.1-0.1,0.3-0.2,0.4-0.2
-		c1-20.7,12.2-32.9,15-36.1c2.3-0.6,4.2-1.3,5.6-1.8c1.7-0.6,2.7-1.1,2.9-1.2c0.5-0.2,0.7-0.8,0.5-1.3c-0.2-0.5-0.8-0.7-1.3-0.5
-		c0,0-0.7,0.3-1.9,0.8c-3.9,1.5-13.3,4.6-24.2,4.8c-0.2,0-0.3,0-0.4,0.1c-1.1-0.1-1.8-0.2-2.1-0.2c-6.1-0.8-9.8-2.9-13.7-7.8
-		C10.1,68.8,6.3,60.3,8,53.9c1.1-4.3,4.3-8.3,6.9-11.2c3.6-4.9,8.2-9.3,8.5-9.5c0.1-0.1,0.3-0.2,0.4-0.2c0.2,0,0.3,0.1,0.4,0.2
-		c0,0,0,0,0,0c10.2-10,23-20,30.8-20.5c0.5,0,1-0.1,1.5-0.1c4.3,0,9.5,1.1,14.9,3.2l0.5-0.1l3.4,1.5c0.1,0,0.1,0,0.2,0
-		c0.2,0,0.4-0.1,0.5-0.3c0.1-0.3,0-0.5-0.3-0.7l-2.3-1l4.7-1.3l1.5,5.6c3.6,2,7.2,4.3,10.4,7l3.9-0.1l0.1,3.7c0,0,0.1,0.1,0.1,0.1
-		c-0.1,1.2-0.2,2.1-0.3,2.2c-0.1,0.3,0.1,0.5,0.3,0.6c0.1,0,0.1,0,0.2,0c0.2,0,0.4-0.1,0.5-0.3c0.1-0.2,0.1-0.8,0.2-1.6
-		c2.4,2.6,4.5,5.5,6.1,8.6l1.1,0.3l-0.4,1.2c0,0,0,0,0,0.1l-1.1,2.6c-0.1,0.3,0,0.5,0.3,0.6c0.1,0,0.1,0,0.2,0
-		c0.2,0,0.4-0.1,0.5-0.3l0.6-1.4c1,6.6-3,22.4-13,31c-8,6.8-13.2,12.8-16.5,18.1c-7.8,12.2-5.3,20.3-3.2,25.6
-		c0.7-0.2,1.3-0.5,1.9-0.7C70.1,113.6,68.6,109.1,70,103.1z"/>
-	<g>
-		<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="23.6526" y1="17.0677" x2="248.9026" y2="119.3177">
-			<stop  offset="0" style="stop-color:#CCFBFF"/>
-			<stop  offset="1" style="stop-color:#C9E4FF"/>
-		</linearGradient>
-		<path class="st7" d="M227.9,82.6c-0.1,0-0.1,0-0.2,0c-2.8,0.4-3.7,2.5-5.5,6.1l2.9-0.3c0.4,0,0.7,0.1,0.9,0.4c0.2,0.3,0.2,0.7,0,1
-			l-4.9,8.7c-0.2,0.3-0.5,0.5-0.9,0.5c0,0-0.1,0-0.1,0c-0.4,0-0.7-0.3-0.8-0.7l-0.9-3.2c-1.2,1.6-2.6,3.4-4.3,5.4l-0.4-0.1
-			c0,0,0,0.1-0.1,0.1l2.4,0.6c0.4,0.1,0.6,0.4,0.7,0.8c0.1,0.4-0.1,0.8-0.4,1l-7.8,6.3c-0.2,0.1-0.4,0.2-0.6,0.2
-			c-0.2,0-0.3,0-0.5-0.1c-0.4-0.2-0.6-0.6-0.5-1l0.1-1.3l-0.1,0.1l0,0.1c-1.8,1.4-3.6,2.7-5.5,3.9l-0.3-0.1c0,0,0,0,0,0l1.5,0.8
-			c0.3,0.2,0.5,0.5,0.5,0.9c0,0.4-0.2,0.7-0.6,0.9l-9.3,4.3c-0.1,0.1-0.3,0.1-0.4,0.1c-0.2,0-0.5-0.1-0.7-0.3
-			c-0.3-0.3-0.4-0.7-0.3-1.1l0.2-0.6l-0.1,0.1l0,0.1c-0.1,0.1-0.3,0.1-0.4,0.2l-0.2,0.1c0,0-0.1,0-0.1,0c-1.6,0.7-3.2,1.4-4.8,2
-			c0.7,0.1,1.6,0.1,2.4,0.1c5,0,7.4-1.3,9.9-2.7c2.7-1.4,5.4-2.9,10.9-2.9c5.5,0,8.2,1.5,10.9,2.9c2.6,1.4,5,2.7,9.9,2.7
-			c5,0,7.4-1.3,9.9-2.7c1.2-0.7,2.4-1.3,3.9-1.8C242.2,98.3,231.8,82.6,227.9,82.6z"/>
-		<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="28.9561" y1="5.3844" x2="254.2061" y2="107.6344">
-			<stop  offset="0" style="stop-color:#CCFBFF"/>
-			<stop  offset="1" style="stop-color:#C9E4FF"/>
-		</linearGradient>
-		<path class="st8" d="M223.3,90.5l-4.1,0.4l0.1,0.4c0.1-0.1,0.4-0.2,0.5-0.1c0.3,0.1,0.4,0.4,0.3,0.7c-0.1,0.3-0.3,0.6-0.4,0.8
-			l0.8,2.7L223.3,90.5z"/>
-		<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="28.8335" y1="5.6544" x2="254.0835" y2="107.9044">
-			<stop  offset="0" style="stop-color:#CCFBFF"/>
-			<stop  offset="1" style="stop-color:#C9E4FF"/>
-		</linearGradient>
-		<path class="st9" d="M220.1,99c0,0,0.1,0,0.1,0c0.4,0,0.7-0.2,0.9-0.5l4.9-8.7c0.2-0.3,0.2-0.7,0-1c-0.2-0.3-0.6-0.5-0.9-0.4
-			l-2.9,0.3c0,0,0,0.1,0,0.1l-3.7,0.9c-0.7,0.2-1.1,0.9-1,1.6l0.6,2.5c0.4-0.6,0.8-1.3,1.1-2.1c0-0.1,0.1-0.1,0.1-0.2l-0.1-0.4
-			l4.1-0.4l-2.8,4.9l-0.8-2.7c-0.4,0.9-0.9,1.6-1.4,2.2l0,0.1c0,0,0,0.1-0.1,0.1l0.9,3.2C219.4,98.7,219.7,99,220.1,99z"/>
-		<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="22.8892" y1="18.7494" x2="248.1392" y2="120.9994">
-			<stop  offset="0" style="stop-color:#CCFBFF"/>
-			<stop  offset="1" style="stop-color:#C9E4FF"/>
-		</linearGradient>
-		<path class="st10" d="M213.5,102.5l-3.9-1l-0.2,1.9c0.2-0.1,0.4,0,0.6,0.1c0.2,0.2,0.2,0.5,0,0.7l-0.7,0.6l-0.1,1.2L213.5,102.5z"
-			/>
-		<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="22.6235" y1="19.3348" x2="247.8735" y2="121.5848">
-			<stop  offset="0" style="stop-color:#CCFBFF"/>
-			<stop  offset="1" style="stop-color:#C9E4FF"/>
-		</linearGradient>
-		<path class="st11" d="M207.4,109.2c0.1,0.1,0.3,0.1,0.5,0.1c0.2,0,0.4-0.1,0.6-0.2l7.8-6.3c0.3-0.2,0.4-0.6,0.4-1
-			c-0.1-0.4-0.4-0.7-0.7-0.8l-2.4-0.6l-0.8-0.2l-3.5-0.5c-0.1,0-0.1,0-0.2,0c-0.6,0-1.2,0.5-1.3,1.1l-0.6,4.5l2.1-1.9
-			c0,0,0.1-0.1,0.1-0.1l0.2-1.9l3.9,1l-4.4,3.5l0.1-1.2l-2.2,2.1l-0.1,1.3C206.8,108.6,207,109,207.4,109.2z"/>
-		<linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="16.9965" y1="31.7307" x2="242.2465" y2="133.9807">
-			<stop  offset="0" style="stop-color:#CCFBFF"/>
-			<stop  offset="1" style="stop-color:#C9E4FF"/>
-		</linearGradient>
-		<path class="st12" d="M199.9,112.4l-3.7-2l-1,2.7c0.2,0,0.3,0.1,0.4,0.2c0.1,0.2,0,0.5-0.2,0.7l-0.7,0.4l-0.2,0.4L199.9,112.4z"/>
-		<linearGradient id="SVGID_12_" gradientUnits="userSpaceOnUse" x1="16.6343" y1="32.5285" x2="241.8843" y2="134.7785">
-			<stop  offset="0" style="stop-color:#CCFBFF"/>
-			<stop  offset="1" style="stop-color:#C9E4FF"/>
-		</linearGradient>
-		<path class="st13" d="M192.1,117.6c0.2,0.2,0.4,0.3,0.7,0.3c0.1,0,0.3,0,0.4-0.1l9.3-4.3c0.3-0.2,0.6-0.5,0.6-0.9
-			c0-0.4-0.2-0.7-0.5-0.9l-1.5-0.8l-0.2-0.1l-4.6-1.9c-0.2-0.1-0.3-0.1-0.5-0.1c-0.5,0-1,0.3-1.2,0.8l-1.9,4.6l-0.1,0.4l2.3-1.3
-			c0.1,0,0.2-0.1,0.3-0.1l1-2.7l3.7,2l-5.3,2.5l0.2-0.4l-2.6,1.4l-0.2,0.6C191.7,116.9,191.8,117.3,192.1,117.6z"/>
-	</g>
-	<linearGradient id="SVGID_13_" gradientUnits="userSpaceOnUse" x1="13.4007" y1="-2.459" x2="248.4007" y2="121.541">
-		<stop  offset="0" style="stop-color:#00C8D7"/>
-		<stop  offset="1" style="stop-color:#0A84FF"/>
-	</linearGradient>
-	<path class="st14" d="M227.9,80.6c-0.2,0-0.3,0-0.5,0c-3.6,0.6-4.9,3.1-6.6,6.4l-2.8,0.7c-0.9,0.2-1.6,0.7-2.1,1.5
-		c-0.5,0.8-0.6,1.6-0.4,2.5l0.7,2.9c-0.9,1.2-1.9,2.5-3,3.7l-3.6-0.5c-0.2,0-0.3,0-0.5,0c-1.6,0-3,1.2-3.3,2.8l-0.8,5.4
-		c-1.2,0.9-2.5,1.8-3.8,2.7L197,107c-0.4-0.2-0.8-0.2-1.3-0.2c-1.3,0-2.5,0.8-3.1,2l-2.4,5.8c-2.4,1.1-5,2.1-7.6,3
-		c1,0.4,2.2,0.6,3.7,0.8c1.6-0.6,3.2-1.3,4.8-2c0,0,0.1,0,0.1,0l0.2-0.1c0.1-0.1,0.3-0.1,0.4-0.2l0-0.1l0.1-0.1l2.6-1.4l0.7-0.4
-		c0.2-0.1,0.3-0.4,0.2-0.7c-0.1-0.2-0.2-0.2-0.4-0.2c-0.1,0-0.2,0-0.3,0.1l-2.3,1.3l0,0l0.2-0.4l1.9-4.6c0.2-0.5,0.7-0.8,1.2-0.8
-		c0.2,0,0.3,0,0.5,0.1l4.6,1.9l0.2,0.1l0.3,0.1c1.9-1.2,3.7-2.5,5.5-3.9l0-0.1l0.1-0.1l2.2-2.1l0.7-0.6c0.2-0.2,0.2-0.5,0-0.7
-		c-0.1-0.2-0.4-0.2-0.6-0.1c-0.1,0-0.1,0-0.1,0.1l-2.1,1.9l0.6-4.5c0.1-0.7,0.7-1.1,1.3-1.1c0.1,0,0.1,0,0.2,0l3.5,0.5l0.8,0.1
-		l0.4,0.1c1.8-1.9,3.2-3.7,4.3-5.4c0,0,0-0.1,0.1-0.1l0-0.1c0.4-0.6,0.9-1.3,1.4-2.2c0.1-0.3,0.3-0.5,0.4-0.8c0.1-0.3,0-0.5-0.3-0.7
-		c-0.2-0.1-0.4,0-0.5,0.1c0,0-0.1,0.1-0.1,0.2c-0.4,0.8-0.8,1.5-1.1,2.1l-0.6-2.5c-0.2-0.7,0.3-1.4,1-1.6l3.7-0.9c0,0,0-0.1,0-0.1
-		c1.8-3.5,2.7-5.6,5.5-6.1c0.1,0,0.1,0,0.2,0c3.9,0,14.3,15.7,16.5,31.4c0.6-0.2,1.2-0.4,1.9-0.6c-1-6.5-3.4-13.7-6.8-20.2
-		C237.9,90.2,232.4,80.6,227.9,80.6z"/>
-	<linearGradient id="SVGID_14_" gradientUnits="userSpaceOnUse" x1="-6.0651" y1="34.4319" x2="228.9349" y2="158.4319">
-		<stop  offset="0" style="stop-color:#00C8D7"/>
-		<stop  offset="1" style="stop-color:#0A84FF"/>
-	</linearGradient>
-	<path class="st15" d="M154.5,95.2c0-0.2,0-0.4,0.1-0.6c0.2-1.6,0.5-4-1.3-5.2c-0.4-0.3-1-0.4-1.6-0.4c-1,0-2.2,0.4-3.2,0.9
-		c-0.3,0.1-0.7,0.3-1,0.4c-5.8-3.3-11.8-5.1-18.1-5.2l-0.3,0c-0.2,0-0.3,0-0.5,0c-0.2,0-0.4,0-0.7,0c-0.3-0.3-0.8-0.8-1.1-1.1
-		c-1.2-1.2-2.3-2.4-3.7-2.4c-0.1,0-0.2,0-0.4,0c-1.8,0.3-2.8,2-3.9,3.8c-0.3,0.4-0.6,1.1-0.9,1.4c-2.7,0.8-4.3,1.6-6.2,2.5
-		c-0.5,0.2-1,0.5-1.5,0.8c-0.3-0.1-0.6-0.3-0.9-0.4c-1.4-0.7-2.8-1.3-4.1-1.3c-0.7,0-1.3,0.2-1.6,0.5c-1.7,0.9-1.9,3.2-2.1,5.2
-		c-0.1,0.6-0.1,1.4-0.2,1.8c-6.9,5.6-11.1,12.2-13.4,17.2c0.7,0.1,1.4,0.2,2.1,0.4c1-2.1,2.3-4.4,4.1-6.9c2.2-3.1,5.1-6.4,8.8-9.4
-		c1.1-0.9,0.3-6,1.8-6.7c0.2-0.1,0.4-0.2,0.6-0.2c1.3,0,3.6,1.4,4.7,1.8l1.9,1c0.1,0,0.2,0.1,0.2,0.1c0.2,0,0.4-0.1,0.4-0.3
-		c0.1-0.2,0-0.5-0.2-0.7l-1-0.5c2.5-1.2,4.1-2.2,7.4-3.1c1.1-0.3,2.7-4.8,4.2-5c0,0,0.1,0,0.1,0c1,0,2.8,2.5,4,3.3
-		c0.9,0.9,1.6,1.4,1.6,1.4c0.1,0.1,0.2,0.1,0.3,0.1c0.1,0,0.3-0.1,0.4-0.2c0.2-0.2,0.1-0.5-0.1-0.7c0,0-0.2-0.2-0.6-0.5
-		c0.1,0,0.3,0,0.6,0c6.5,0.1,12.5,2.1,17.6,5.2c0.1,0,0.2,0.1,0.3,0.1c0.9,0,3.3-1.3,4.5-1.3c0.2,0,0.4,0,0.5,0.1
-		c0.5,0.3,0.6,0.9,0.6,1.7c-0.2,1.7-0.7,5.3-0.7,5.5c0,0.3,0.2,0.5,0.4,0.6c0,0,0,0,0.1,0c0.2,0,0.5-0.2,0.5-0.4c0,0,0-0.4,0.1-0.9
-		c0-0.2,0.1-0.5,0.1-0.7c0.7,0.5,1.3,1.1,1.9,1.7c1.8,1.6,3.3,3.3,4.6,5c2.4,3.2,3.9,6.5,4.6,9.6c0.6-0.1,1.3-0.2,2-0.2
-		C165.1,106.8,160.8,100.4,154.5,95.2z"/>
-	<path class="st0" d="M171.4,40l12,0c0.3,0,0.5-0.2,0.5-0.5c0-0.3-0.2-0.5-0.5-0.5l-12,0c-0.3,0-0.5,0.2-0.5,0.5
-		C170.9,39.8,171.1,40,171.4,40z"/>
-	<path class="st0" d="M239.2,40.4c0.1,0.2,0.3,0.3,0.4,0.3h0.6c0.3,0,0.5-0.2,0.5-0.5s-0.2-0.5-0.5-0.5H240c-0.2-0.4-0.6-1-1.1-1.9
-		c-0.1-0.2-0.5-0.3-0.7-0.2c-0.2,0.1-0.3,0.5-0.2,0.7C238.7,39.4,239.1,40.1,239.2,40.4z"/>
-	<path class="st0" d="M214.3,29.1c0.1,0.1,0.2,0.2,0.4,0.2c0.1,0,0.2,0,0.3-0.1c0.2-0.2,0.2-0.5,0.1-0.7c-0.7-0.8-1.4-1.6-2.1-2.2
-		c-0.2-0.2-0.5-0.2-0.7,0c-0.2,0.2-0.2,0.5,0,0.7C213,27.6,213.7,28.3,214.3,29.1z"/>
-	<path class="st0" d="M194.2,25.5c0.1,0,0.2,0,0.3-0.1c1.4-1.1,3.3-1.9,5.7-2.2c1.9-0.3,3.6-0.2,5.3,0.2c0.3,0.1,0.5-0.1,0.6-0.4
-		c0.1-0.3-0.1-0.5-0.4-0.6c-1.8-0.4-3.7-0.5-5.7-0.2c-2.6,0.4-4.7,1.2-6.2,2.4c-0.2,0.2-0.3,0.5-0.1,0.7
-		C193.9,25.4,194.1,25.5,194.2,25.5z"/>
-	<path class="st0" d="M254.2,40.6l4,0c0.3,0,0.5-0.2,0.5-0.5c0-0.3-0.2-0.5-0.5-0.5l-4,0c-0.3,0-0.5,0.2-0.5,0.5
-		C253.7,40.4,254,40.6,254.2,40.6z"/>
-	<path class="st0" d="M216.9,33.2c0.1,0.2,0.3,0.3,0.4,0.3c0.1,0,0.1,0,0.2-0.1c0.2-0.1,0.4-0.4,0.2-0.7c-0.1-0.3-0.3-0.6-0.5-0.9
-		c-0.1-0.2-0.4-0.3-0.7-0.2c-0.2,0.1-0.3,0.4-0.2,0.7C216.7,32.7,216.8,33,216.9,33.2z"/>
-	<path class="st0" d="M222.8,28.6c1.1-0.4,2.4-0.4,3.9-0.2c2.1,0.4,4.3,1.7,6.4,3.7c0.1,0.1,0.2,0.1,0.3,0.1c0.1,0,0.3-0.1,0.4-0.2
-		c0.2-0.2,0.2-0.5,0-0.7c-2.3-2.2-4.6-3.5-6.9-4c-1.6-0.3-3.1-0.2-4.4,0.2c-0.3,0.1-0.4,0.4-0.3,0.6
-		C222.3,28.5,222.6,28.6,222.8,28.6z"/>
-	<path class="st0" d="M244.2,40.6h1c0.3,0,0.5-0.2,0.5-0.5s-0.2-0.5-0.5-0.5h-1c-0.3,0-0.5,0.2-0.5,0.5S244,40.6,244.2,40.6z"/>
-	<path class="st0" d="M191.2,34.5C191.3,34.5,191.3,34.5,191.2,34.5c0.3,0,0.5-0.3,0.5-0.6c0-0.3-0.1-0.6-0.1-1
-		c0-0.3-0.3-0.5-0.5-0.5c0,0-0.1,0-0.1,0c-0.2,0.1-0.4,0.3-0.4,0.5c0,0.3,0.1,0.7,0.1,1c0,0.1,0,0.1,0,0.2
-		C190.9,34.4,191,34.5,191.2,34.5z"/>
-	<path class="st0" d="M193.1,39.8c0.1-0.1,0.1-0.3,0-0.5c0,0-0.3-0.6-0.6-1.5c-0.1-0.3-0.4-0.4-0.6-0.3c-0.3,0.1-0.4,0.4-0.3,0.6
-		c0.1,0.4,0.2,0.7,0.3,0.9h-0.6c0,0-0.1,0-0.1,0c-0.2,0.1-0.4,0.2-0.4,0.5c0,0.3,0.2,0.5,0.5,0.5h0.1l1.2,0
-		C192.9,40,193,39.9,193.1,39.8z"/>
-	<path class="st1" d="M171,44.4l87.9,0h0c0.6,0,1-0.4,1-1c0-0.6-0.4-1-1-1l-20.4,0c-1.8-3.4-6.3-10.5-12-11.6c-7.5-1.4-9,6.1-9,6.1
-		s-5-13-17.6-11.3c-5.8,0.8-8.1,3.7-8.8,7c0,0,0.1,0,0.1,0c0.3,0,0.5,0.2,0.5,0.5c0,0.3,0,0.6,0.1,1c0,0.3-0.2,0.5-0.4,0.6
-		c0,0,0,0-0.1,0c-0.2,0-0.4-0.1-0.4-0.3c-0.1,1.7,0.1,3.4,0.5,4.8c0,0,0.1,0,0.1,0h0.6c-0.1-0.2-0.2-0.6-0.3-0.9
-		c-0.1-0.3,0.1-0.5,0.3-0.6c0.3-0.1,0.5,0.1,0.6,0.3c0.3,0.9,0.6,1.5,0.6,1.5c0.1,0.2,0.1,0.3,0,0.5s-0.2,0.2-0.4,0.2l-1.2,0
-		c0.4,1.3,0.8,2.3,0.8,2.4l-21.3,0h0c-0.6,0-1,0.4-1,1C170,44,170.4,44.4,171,44.4z"/>
-	<path class="st0" d="M127,7.2c0,0,0.1,0,0.1,0c0.2,0,0.4-0.1,0.5-0.4c0.3-0.9,1.1-2.8,3.4-2.8c0.3,0,0.6,0,0.9,0.1
-		c1.4,0.3,2.9,1.2,4.3,2.7c0.2,0.2,0.5,0.2,0.7,0c0.2-0.2,0.2-0.5,0-0.7c-1.6-1.7-3.2-2.7-4.9-3c-0.4-0.1-0.8-0.1-1.1-0.1
-		c-3.1,0-4.2,2.7-4.4,3.6C126.6,6.9,126.7,7.2,127,7.2z"/>
-	<path class="st0" d="M120,1.3c0.3,0.1,0.6,0.1,0.9,0.2c0.1,0,0.1,0,0.2,0c0.2,0,0.4-0.1,0.5-0.3c0.1-0.3-0.1-0.5-0.3-0.6
-		c-0.3-0.1-0.7-0.2-1-0.3c-0.3,0-0.5,0.1-0.6,0.4C119.5,1,119.7,1.3,120,1.3z"/>
-	<path class="st0" d="M113.5,2.9c0.1,0,0.3-0.1,0.4-0.2c0.6-0.6,1.4-1,2.4-1.3c0.3-0.1,0.4-0.3,0.4-0.6c-0.1-0.3-0.3-0.4-0.6-0.4
-		c-1.2,0.3-2.1,0.8-2.8,1.6c-0.2,0.2-0.2,0.5,0,0.7C113.3,2.9,113.4,2.9,113.5,2.9z"/>
-	<path class="st0" d="M143,10.5l3,0c0.3,0,0.5-0.2,0.5-0.5c0-0.3-0.2-0.5-0.5-0.5l-3,0c-0.3,0-0.5,0.2-0.5,0.5
-		C142.5,10.2,142.7,10.5,143,10.5z"/>
-	<path class="st0" d="M113.5,10.4c0.1-0.1,0.1-0.3,0-0.5l0-0.1c-0.1-0.3-0.4-0.4-0.7-0.3c-0.1,0-0.1,0.1-0.2,0.1l-0.7,0l-10.8,0
-		c-0.3,0-0.5,0.2-0.5,0.5c0,0.3,0.2,0.5,0.5,0.5l11,0l0.8,0C113.3,10.6,113.4,10.5,113.5,10.4z"/>
-	<path class="st1" d="M101.1,13.9l48.9,0h0c0.6,0,1-0.4,1-1c0-0.6-0.4-1-1-1l-11.6,0c-1-1.9-3.5-5.9-6.7-6.5c-4.2-0.8-5,3.4-5,3.4
-		s-2.8-7.2-9.8-6.3c-5.2,0.7-5.3,4.5-4.9,7l0.7,0c0,0,0.1-0.1,0.2-0.1c0.3-0.1,0.5,0,0.7,0.3l0,0.1c0.1,0.2,0.1,0.3,0,0.5
-		c-0.1,0.1-0.2,0.2-0.4,0.2l-0.8,0c0.2,0.8,0.4,1.3,0.5,1.3l-11.6,0h0c0,0,0,0,0,0h-0.2l0.2,0c-0.5,0-1,0.5-1,1
-		C100.1,13.5,100.6,13.9,101.1,13.9z"/>
-	<path class="st1" d="M142.9,0.6C142.8,0.6,142.8,0.7,142.9,0.6L142.9,0.6z"/>
-	<linearGradient id="SVGID_15_" gradientUnits="userSpaceOnUse" x1="3.9583" y1="15.436" x2="238.9583" y2="139.436">
-		<stop  offset="0" style="stop-color:#00C8D7"/>
-		<stop  offset="1" style="stop-color:#0A84FF"/>
-	</linearGradient>
-	<path class="st16" d="M59.9,46.5c0.1-0.2,0.1-0.4,0.1-0.6v-3.2c0-0.8-0.6-1.4-1.4-1.4c-0.8,0-1.4,0.6-1.4,1.4V46
-		c0,0.2,0.1,0.4,0.2,0.6c0.4-0.1,0.9-0.2,1.5-0.2C59.2,46.4,59.5,46.5,59.9,46.5z"/>
-	<path class="st17" d="M61.3,50.7c0.3,0.4,0.8,0.7,1.3,0.7c0.3,0,0.6-0.1,0.8-0.2c0.7-0.5,0.9-1.4,0.4-2.1c-0.1-0.1-1.4-2.1-4-2.5
-		c-0.3-0.1-0.7-0.1-1.1-0.1c-0.5,0-1,0.1-1.5,0.2c-2.3,0.6-3.5,2.4-3.6,2.5c-0.5,0.7-0.3,1.6,0.4,2.1s1.6,0.3,2.1-0.4
-		c0,0,0.9-1.3,2.5-1.3C60.4,49.4,61.3,50.7,61.3,50.7z M55.6,50.4c-0.3,0.5-0.9,0.6-1.4,0.3c-0.5-0.3-0.6-0.9-0.3-1.4
-		c0.1-0.1,1.6-2.4,4.6-2.4s4.6,2.3,4.6,2.4c0.3,0.5,0.2,1.1-0.3,1.4c-0.2,0.1-0.4,0.2-0.5,0.2c-0.3,0-0.6-0.2-0.8-0.5
-		c0-0.1-1-1.5-3-1.5C56.6,48.9,55.6,50.4,55.6,50.4z"/>
-	<linearGradient id="SVGID_16_" gradientUnits="userSpaceOnUse" x1="1.7443" y1="19.6318" x2="236.7443" y2="143.6318">
-		<stop  offset="0" style="stop-color:#00C8D7"/>
-		<stop  offset="1" style="stop-color:#0A84FF"/>
-	</linearGradient>
-	<path class="st18" d="M61.5,50.4c0.2,0.3,0.5,0.5,0.8,0.5c0.2,0,0.4-0.1,0.5-0.2c0.5-0.3,0.6-0.9,0.3-1.4c-0.1-0.1-1.6-2.4-4.6-2.4
-		s-4.6,2.3-4.6,2.4c-0.3,0.5-0.2,1.1,0.3,1.4c0.5,0.3,1.1,0.2,1.4-0.3c0,0,1-1.5,3-1.5C60.5,48.9,61.5,50.4,61.5,50.4z"/>
-	<linearGradient id="SVGID_17_" gradientUnits="userSpaceOnUse" x1="-3.0472" y1="28.7125" x2="231.9528" y2="152.7125">
-		<stop  offset="0" style="stop-color:#00C8D7"/>
-		<stop  offset="1" style="stop-color:#0A84FF"/>
-	</linearGradient>
-	<path class="st19" d="M27.7,46.5c0.1-0.2,0.1-0.4,0.1-0.6v-3.2c0-0.8-0.6-1.4-1.4-1.4c-0.8,0-1.4,0.6-1.4,1.4V46
-		c0,0.2,0.1,0.4,0.2,0.6c0.4-0.1,0.9-0.2,1.5-0.2C27,46.4,27.4,46.5,27.7,46.5z"/>
-	<path class="st17" d="M27.7,46.5c-0.3-0.1-0.7-0.1-1.1-0.1c-0.5,0-1,0.1-1.5,0.2c-2.3,0.6-3.5,2.4-3.6,2.5
-		c-0.5,0.7-0.3,1.6,0.4,2.1c0.7,0.5,1.6,0.3,2.1-0.4c0,0,0.9-1.3,2.5-1.3c1.7,0,2.5,1.2,2.5,1.3c0.3,0.4,0.8,0.7,1.3,0.7
-		c0.3,0,0.6-0.1,0.8-0.2c0.7-0.5,0.9-1.4,0.4-2.1C31.6,49,30.3,47,27.7,46.5z M30.7,50.7c-0.2,0.1-0.4,0.2-0.5,0.2
-		c-0.3,0-0.6-0.2-0.8-0.5c0-0.1-1-1.5-3-1.5c-1.9,0-3,1.5-3,1.5c-0.3,0.5-0.9,0.6-1.4,0.3c-0.5-0.3-0.6-0.9-0.3-1.4
-		c0.1-0.1,1.6-2.4,4.6-2.4s4.6,2.3,4.6,2.4C31.3,49.8,31.2,50.4,30.7,50.7z"/>
-	<linearGradient id="SVGID_18_" gradientUnits="userSpaceOnUse" x1="-5.2611" y1="32.9083" x2="229.7389" y2="156.9083">
-		<stop  offset="0" style="stop-color:#00C8D7"/>
-		<stop  offset="1" style="stop-color:#0A84FF"/>
-	</linearGradient>
-	<path class="st20" d="M26.4,46.9c-3,0-4.6,2.3-4.6,2.4c-0.3,0.5-0.2,1.1,0.3,1.4c0.5,0.3,1.1,0.2,1.4-0.3c0,0,1-1.5,3-1.5
-		c1.9,0,2.9,1.4,3,1.5c0.2,0.3,0.5,0.5,0.8,0.5c0.2,0,0.4-0.1,0.5-0.2c0.5-0.3,0.6-0.9,0.3-1.4C31,49.2,29.4,46.9,26.4,46.9z"/>
-	<path class="st0" d="M70.2,127.5c-0.1-0.3-0.4-0.4-0.6-0.3c-0.3,0.1-0.6,0.2-0.9,0.3c-0.3,0.1-0.4,0.3-0.4,0.6
-		c0.1,0.2,0.3,0.4,0.5,0.4c0,0,0.1,0,0.1,0c0.3-0.1,0.7-0.2,1-0.3C70.1,128,70.2,127.7,70.2,127.5z"/>
-	<path class="st0" d="M99.9,127.3c-0.9-0.3-1.8-0.6-2.7-1c-0.2-0.1-0.5,0-0.7,0.2c-0.1,0.2,0,0.5,0.2,0.7c1,0.5,1.9,0.8,2.9,1.1
-		c0,0,0.1,0,0.1,0c0.2,0,0.4-0.1,0.5-0.4C100.3,127.7,100.1,127.4,99.9,127.3z"/>
-	<path class="st0" d="M159.5,124c-0.9,0.4-1.7,0.8-2.4,1.2c-2.3,1.3-4.5,2.5-8.6,2.7c-0.3,0-0.5,0.3-0.5,0.5c0,0.3,0.2,0.5,0.5,0.5
-		c0,0,0,0,0,0c4.3-0.3,6.7-1.6,9-2.8c0.8-0.4,1.5-0.8,2.4-1.2c0.3-0.1,0.4-0.4,0.2-0.7C160.1,124,159.8,123.9,159.5,124z"/>
-	<path class="st0" d="M104.7,128c-0.3,0-0.7,0-1,0c-0.3,0-0.5,0.2-0.5,0.5s0.2,0.5,0.5,0.5c0.3,0,0.7,0,1,0c0,0,0,0,0,0
-		c0.3,0,0.5-0.2,0.5-0.5C105.2,128.2,105,128,104.7,128z"/>
-	<path class="st0" d="M89.8,122.9c-1.6-0.4-3.3-0.6-5.3-0.6c0,0,0,0,0,0c-2.6,0-4.8,0.3-6.8,1.1c-0.3,0.1-0.4,0.4-0.3,0.6
-		c0.1,0.2,0.3,0.3,0.5,0.3c0.1,0,0.1,0,0.2,0c1.9-0.7,4-1,6.4-1c0,0,0,0,0,0c1.9,0,3.6,0.2,5.1,0.6c0.3,0.1,0.5-0.1,0.6-0.4
-		C90.2,123.3,90.1,123,89.8,122.9z"/>
-	<path class="st0" d="M53.9,126.6c0.1,0,0.2,0.1,0.2,0.1c0.2,0,0.4-0.1,0.4-0.3c0.1-0.2,0-0.5-0.2-0.7l-0.9-0.5
-		c-2.6-1.4-5.3-2.9-10.6-2.9c-0.3,0-0.5,0.2-0.5,0.5s0.2,0.5,0.5,0.5c5.1,0,7.6,1.3,10.2,2.8L53.9,126.6z"/>
-	<path class="st0" d="M64.8,128.9c0.3,0,0.5-0.2,0.5-0.5s-0.3-0.5-0.5-0.5c-0.9,0-2,0-2.9,0c-0.3,0-0.5,0.2-0.5,0.5
-		c0,0.3,0.2,0.5,0.5,0.5c0.6,0,1.2,0.1,1.9,0.1C64,129,64.4,129,64.8,128.9z"/>
-	<path class="st0" d="M139.9,126.8c-0.3-0.1-0.6-0.2-0.9-0.4c-0.3-0.1-0.5,0-0.7,0.2c-0.1,0.3,0,0.5,0.2,0.7
-		c0.3,0.1,0.6,0.3,0.9,0.4c0.1,0,0.1,0,0.2,0c0.2,0,0.4-0.1,0.5-0.3C140.3,127.1,140.2,126.9,139.9,126.8z"/>
-	<path class="st0" d="M188.6,128c-1.8,0-3.5-0.2-4.9-0.5c-0.3-0.1-0.5,0.1-0.6,0.4s0.1,0.5,0.4,0.6c1.6,0.4,3.3,0.6,5.2,0.6
-		c0.3,0,0.5-0.2,0.5-0.5S188.8,128,188.6,128z"/>
-	<path class="st0" d="M175.5,123.8c-0.3-0.1-0.6-0.3-1-0.4c-0.3-0.1-0.5,0-0.6,0.3c-0.1,0.3,0,0.5,0.3,0.6c0.3,0.1,0.6,0.2,0.9,0.4
-		c0.1,0,0.1,0,0.2,0c0.2,0,0.4-0.1,0.5-0.3C175.9,124.2,175.8,123.9,175.5,123.8z"/>
-	<path class="st0" d="M124.6,122.4c-4.4,0.2-6.8,1.6-9.1,2.8c-0.7,0.4-1.5,0.8-2.2,1.1c-0.3,0.1-0.4,0.4-0.2,0.7
-		c0.1,0.2,0.3,0.3,0.5,0.3c0.1,0,0.1,0,0.2,0c0.8-0.4,1.6-0.8,2.3-1.2c2.4-1.3,4.6-2.5,8.7-2.7c0.3,0,0.5-0.3,0.5-0.5
-		C125.1,122.6,124.9,122.4,124.6,122.4z"/>
-	<path class="st0" d="M167.5,123.3l0.2,0c1,0,1.9,0,2.7,0.1c0,0,0,0,0.1,0c0.3,0,0.5-0.2,0.5-0.4c0-0.3-0.2-0.5-0.4-0.6
-		c-0.9-0.1-1.8-0.2-2.8-0.2l-0.2,0c-0.3,0-0.5,0.2-0.5,0.5C167,123.1,167.3,123.3,167.5,123.3C167.5,123.3,167.5,123.3,167.5,123.3z
-		"/>
-	<path class="st0" d="M135,125.4c0.1,0,0.2,0.1,0.2,0.1c0.2,0,0.4-0.1,0.4-0.3c0.1-0.2,0-0.5-0.2-0.7c-1.1-0.5-1.9-0.9-2.8-1.2
-		c-0.3-0.1-0.5,0.1-0.6,0.3c-0.1,0.3,0.1,0.5,0.3,0.6C133.2,124.6,134,124.9,135,125.4z"/>
-	<path class="st0" d="M153.4,137.6c-0.3,0.1-0.6,0.2-0.9,0.3c-0.3,0.1-0.4,0.3-0.4,0.6c0.1,0.2,0.3,0.4,0.5,0.4c0,0,0.1,0,0.1,0
-		c0.3-0.1,0.7-0.2,1-0.3c0.3-0.1,0.4-0.4,0.3-0.6C153.9,137.7,153.7,137.5,153.4,137.6z"/>
-	<path class="st0" d="M148.6,138.4c-0.9,0-2,0-2.9,0c-0.3,0-0.5,0.2-0.5,0.5c0,0.3,0.2,0.5,0.5,0.5c0.6,0,1.2,0.1,1.9,0.1
-		c0.4,0,0.8,0,1.2,0c0.3,0,0.5-0.2,0.5-0.5C149.1,138.6,148.9,138.4,148.6,138.4z"/>
-	<path class="st0" d="M138.3,136.2c-0.3-0.2-0.6-0.3-0.9-0.5c-2.6-1.4-5.3-2.9-10.6-2.9c-0.3,0-0.5,0.2-0.5,0.5s0.2,0.5,0.5,0.5
-		c5.1,0,7.6,1.3,10.2,2.8c0.3,0.2,0.6,0.3,0.9,0.5c0.1,0,0.2,0.1,0.2,0.1c0.2,0,0.4-0.1,0.4-0.3
-		C138.6,136.6,138.5,136.3,138.3,136.2z"/>
-	<path class="st0" d="M173.7,133.4c-1.6-0.4-3.3-0.6-5.3-0.6c0,0,0,0,0,0c-2.6,0-4.7,0.3-6.8,1.1c-0.3,0.1-0.4,0.4-0.3,0.6
-		c0.1,0.2,0.3,0.3,0.5,0.3c0.1,0,0.1,0,0.2,0c1.9-0.7,4-1,6.4-1c0,0,0,0,0,0c1.9,0,3.6,0.2,5.1,0.6c0.3,0.1,0.5-0.1,0.6-0.4
-		C174.1,133.7,173.9,133.5,173.7,133.4z"/>
-	<path class="st0" d="M188.5,138.4c-0.3,0-0.7,0-1,0c-0.3,0-0.5,0.2-0.5,0.5s0.2,0.5,0.5,0.5c0.3,0,0.7,0,1,0c0,0,0,0,0,0
-		c0.3,0,0.5-0.2,0.5-0.5C189,138.7,188.8,138.4,188.5,138.4z"/>
-	<path class="st0" d="M208.5,132.8c-4.4,0.2-6.8,1.6-9.1,2.8c-0.7,0.4-1.4,0.8-2.2,1.1c-0.3,0.1-0.4,0.4-0.2,0.7
-		c0.1,0.2,0.3,0.3,0.5,0.3c0.1,0,0.1,0,0.2,0c0.8-0.4,1.6-0.8,2.3-1.2c2.4-1.3,4.6-2.5,8.7-2.7c0.3,0,0.5-0.3,0.5-0.5
-		C209,133,208.7,132.8,208.5,132.8z"/>
-	<path class="st0" d="M183.7,137.8c-0.9-0.3-1.8-0.6-2.7-1c-0.3-0.1-0.5,0-0.7,0.2c-0.1,0.2,0,0.5,0.2,0.7c1,0.5,1.9,0.8,2.9,1.1
-		c0,0,0.1,0,0.1,0c0.2,0,0.4-0.1,0.5-0.4C184.2,138.1,184,137.8,183.7,137.8z"/>
-	<path class="st0" d="M85.8,132.8c-2.6,0-4.7,0.3-6.8,1.1c-0.3,0.1-0.4,0.4-0.3,0.6c0.1,0.2,0.3,0.3,0.5,0.3c0.1,0,0.1,0,0.2,0
-		c1.9-0.7,4-1,6.4-1c0,0,0,0,0,0c0.3,0,0.5-0.2,0.5-0.5C86.3,133,86.1,132.8,85.8,132.8z"/>
-	<path class="st0" d="M55.8,136.2c-0.3-0.2-0.6-0.3-0.9-0.5c-2.6-1.4-5.3-2.9-10.6-2.9c-0.3,0-0.5,0.2-0.5,0.5s0.2,0.5,0.5,0.5
-		c5.1,0,7.6,1.3,10.2,2.8c0.3,0.2,0.6,0.3,0.9,0.5c0.1,0,0.2,0.1,0.2,0.1c0.2,0,0.4-0.1,0.4-0.3C56.1,136.6,56,136.3,55.8,136.2z"/>
-	<path class="st0" d="M70.9,137.6c-0.3,0.1-0.6,0.2-0.9,0.3c-0.3,0.1-0.4,0.3-0.4,0.6c0.1,0.2,0.3,0.4,0.5,0.4c0,0,0.1,0,0.1,0
-		c0.3-0.1,0.7-0.2,1-0.3c0.3-0.1,0.4-0.4,0.3-0.6C71.4,137.7,71.2,137.5,70.9,137.6z"/>
-	<path class="st0" d="M66.1,138.4c-0.9,0-2,0-2.9,0c-0.3,0-0.5,0.2-0.5,0.5c0,0.3,0.2,0.5,0.5,0.5c0.6,0,1.2,0.1,1.9,0.1
-		c0.4,0,0.8,0,1.2,0c0.3,0,0.5-0.2,0.5-0.5C66.6,138.6,66.4,138.4,66.1,138.4z"/>
-	<path class="st0" d="M272.2,118.5c-5,0-7.4-1.3-9.9-2.7c-2.7-1.4-5.4-2.9-10.9-2.9c-0.4,0-0.7,0-1.1,0c-1.5,0.1-2.8,0.2-4,0.5
-		c-0.7,0.2-1.3,0.4-1.9,0.6c-1.5,0.5-2.7,1.2-3.9,1.8c-2.6,1.4-5,2.7-9.9,2.7c-5,0-7.4-1.3-9.9-2.7c-2.7-1.4-5.4-2.9-10.9-2.9
-		c-5.5,0-8.2,1.5-10.9,2.9c-2.6,1.4-5,2.7-9.9,2.7c-0.9,0-1.7,0-2.4-0.1c-1.4-0.2-2.6-0.4-3.7-0.8c-1.4-0.5-2.6-1.1-3.8-1.8
-		c-0.5-0.3-1-0.5-1.5-0.8c-1.8-0.9-3.9-1.8-7-2c-0.7-0.1-1.5-0.1-2.4-0.1c-0.6,0-1.1,0-1.7,0.1c-0.7,0-1.4,0.1-2,0.2
-		c-3.2,0.5-5.2,1.6-7.2,2.7c-2.6,1.4-5,2.7-9.9,2.7c-4.7,0-7.1-1.2-9.5-2.5c-0.1-0.1-0.3-0.1-0.4-0.2c-2.7-1.4-5.4-2.9-10.9-2.9
-		c0,0,0,0,0,0c0,0,0,0,0,0c-5.5,0-8.2,1.5-10.9,2.9c-1.6,0.9-3.2,1.7-5.3,2.2c-1.3,0.3-2.8,0.5-4.6,0.5c-5,0-7.4-1.3-9.9-2.7
-		c-1.6-0.9-3.3-1.8-5.6-2.3c-0.6-0.2-1.3-0.3-2.1-0.4c-1-0.1-2-0.2-3.2-0.2c-0.4,0-0.7,0-1,0c-4,0.1-6.5,1.1-8.6,2.3
-		c-0.4,0.2-0.8,0.4-1.3,0.7c-0.8,0.4-1.5,0.8-2.3,1.2c-0.6,0.3-1.2,0.5-1.9,0.7c-1.5,0.5-3.3,0.8-5.8,0.8c-5,0-7.4-1.3-9.9-2.7
-		c-2.7-1.4-5.4-2.9-10.9-2.9c-5.2,0-7.9,1.3-10.5,2.7c-0.1,0.1-0.3,0.2-0.4,0.2c-0.5,0.3-1.1,0.6-1.6,0.9c-1.1,0.6-2.4,1.1-3.9,1.4
-		c-1.2,0.3-2.7,0.4-4.4,0.4c-5,0-7.4-1.3-9.9-2.7c-2.7-1.4-5.4-2.9-10.9-2.9c-0.6,0-1,0.4-1,1s0.4,1,1,1c5,0,7.4,1.3,9.9,2.7
-		c2.7,1.4,5.4,2.9,10.9,2.9s8.2-1.5,10.9-2.9c2.6-1.4,5-2.7,9.9-2.7c5,0,7.4,1.3,9.9,2.7c2.7,1.4,5.4,2.9,10.9,2.9
-		c5.5,0,8.2-1.5,10.9-2.9c2.6-1.4,5-2.7,9.9-2.7s7.4,1.3,9.9,2.7c2.7,1.4,5.4,2.9,10.9,2.9c5.5,0,8.2-1.5,10.9-2.9
-		c2.6-1.4,5-2.7,9.9-2.7s7.4,1.3,9.9,2.7c2.7,1.4,5.4,2.9,10.9,2.9c0,0,0,0,0,0c0,0,0,0,0,0c5.5,0,8.2-1.5,10.9-2.9
-		c2.6-1.4,5-2.7,9.9-2.7c5,0,7.4,1.3,9.9,2.7c2.7,1.4,5.4,2.9,10.9,2.9c5.5,0,8.2-1.5,10.9-2.9c2.6-1.4,5-2.7,9.9-2.7
-		s7.4,1.3,9.9,2.7c2.7,1.4,5.4,2.9,10.9,2.9c5.5,0,8.2-1.5,10.9-2.9c2.6-1.4,5-2.7,9.9-2.7s7.4,1.3,9.9,2.7
-		c2.7,1.4,5.4,2.9,10.9,2.9c0.6,0,1-0.4,1-1S272.7,118.5,272.2,118.5z"/>
-</g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="279" height="143" viewBox="0 0 279 143" xmlns="http://www.w3.org/2000/svg">
+  <title>
+    Global / Nessie
+  </title>
+  <defs>
+    <linearGradient x1="-88.252%" y1="-4.725%" x2="471.083%" y2="245.428%" id="a">
+      <stop stop-color="#CCFBFF" offset="0%"/>
+      <stop stop-color="#C9E4FF" offset="100%"/>
+    </linearGradient>
+    <linearGradient x1="2.866%" y1="35.306%" x2="495.113%" y2="251.394%" id="b">
+      <stop stop-color="#CCFBFF" offset="0%"/>
+      <stop stop-color="#C9E4FF" offset="100%"/>
+    </linearGradient>
+    <linearGradient x1="-445.203%" y1="-321.302%" x2="673.467%" y2="539.392%" id="c">
+      <stop stop-color="#CCFBFF" offset="0%"/>
+      <stop stop-color="#C9E4FF" offset="100%"/>
+    </linearGradient>
+    <linearGradient x1="-475.977%" y1="-237.251%" x2="369.365%" y2="234.399%" id="d">
+      <stop stop-color="#CCFBFF" offset="0%"/>
+      <stop stop-color="#C9E4FF" offset="100%"/>
+    </linearGradient>
+    <linearGradient x1="-10.712%" y1="20.676%" x2="226.45%" y2="136.651%" id="e">
+      <stop stop-color="#00C8D7" offset="0%"/>
+      <stop stop-color="#0A84FF" offset="100%"/>
+    </linearGradient>
+    <linearGradient x1="-280.937%" y1="-182.657%" x2="107.94%" y2="102.629%" id="f">
+      <stop stop-color="#CCFBFF" offset="0%"/>
+      <stop stop-color="#C9E4FF" offset="100%"/>
+    </linearGradient>
+    <linearGradient x1="-4648.315%" y1="-1714.13%" x2="853.341%" y2="344.555%" id="g">
+      <stop stop-color="#CCFBFF" offset="0%"/>
+      <stop stop-color="#C9E4FF" offset="100%"/>
+    </linearGradient>
+    <linearGradient x1="-2147.367%" y1="-769.021%" x2="417.622%" y2="183.121%" id="h">
+      <stop stop-color="#CCFBFF" offset="0%"/>
+      <stop stop-color="#C9E4FF" offset="100%"/>
+    </linearGradient>
+    <linearGradient x1="-4269.02%" y1="-1787.436%" x2="894.072%" y2="420.429%" id="i">
+      <stop stop-color="#CCFBFF" offset="0%"/>
+      <stop stop-color="#C9E4FF" offset="100%"/>
+    </linearGradient>
+    <linearGradient x1="-1889.66%" y1="-850.787%" x2="420.769%" y2="229.657%" id="j">
+      <stop stop-color="#CCFBFF" offset="0%"/>
+      <stop stop-color="#C9E4FF" offset="100%"/>
+    </linearGradient>
+    <linearGradient x1="-3348.934%" y1="-1750.631%" x2="899.178%" y2="523.14%" id="k">
+      <stop stop-color="#CCFBFF" offset="0%"/>
+      <stop stop-color="#C9E4FF" offset="100%"/>
+    </linearGradient>
+    <linearGradient x1="-1553.941%" y1="-834.585%" x2="444.091%" y2="285.582%" id="l">
+      <stop stop-color="#CCFBFF" offset="0%"/>
+      <stop stop-color="#C9E4FF" offset="100%"/>
+    </linearGradient>
+    <linearGradient x1="-265.672%" y1="-219.594%" x2="103.271%" y2="108.555%" id="m">
+      <stop stop-color="#00C8D7" offset="0%"/>
+      <stop stop-color="#0A84FF" offset="100%"/>
+    </linearGradient>
+    <linearGradient x1="-119.885%" y1="-148.666%" x2="179.882%" y2="241.098%" id="n">
+      <stop stop-color="#00C8D7" offset="0%"/>
+      <stop stop-color="#0A84FF" offset="100%"/>
+    </linearGradient>
+    <linearGradient x1="-1887.893%" y1="-502.205%" x2="6448.476%" y2="1897.121%" id="o">
+      <stop stop-color="#00C8D7" offset="0%"/>
+      <stop stop-color="#0A84FF" offset="100%"/>
+    </linearGradient>
+    <linearGradient x1="-541.907%" y1="-686.193%" x2="1904.535%" y2="2427.212%" id="p">
+      <stop stop-color="#00C8D7" offset="0%"/>
+      <stop stop-color="#0A84FF" offset="100%"/>
+    </linearGradient>
+    <linearGradient x1="-995.929%" y1="-245.313%" x2="7340.44%" y2="2154.014%" id="q">
+      <stop stop-color="#00C8D7" offset="0%"/>
+      <stop stop-color="#0A84FF" offset="100%"/>
+    </linearGradient>
+    <linearGradient x1="-279.447%" y1="-348.963%" x2="2166.995%" y2="2730.173%" id="r">
+      <stop stop-color="#00C8D7" offset="0%"/>
+      <stop stop-color="#0A84FF" offset="100%"/>
+    </linearGradient>
+  </defs>
+  <g fill-rule="nonzero" fill="none">
+    <path d="M160.97 63c.55 0 1.03-.467 1.03-1 0-.533-.48-1-1.03-1h-53.215c-.206.6-.48 1.267-.755 2h53.97zM139.472 57c-.27 0-.472.214-.472.5 0 .286.202.5.472.5h12.056c.27 0 .472-.214.472-.5 0-.286-.202-.5-.472-.5h-12.056zM112.475 66c-.272 0-.475.214-.475.5 0 .286.203.5.475.5h3.05c.272 0 .475-.214.475-.5 0-.286-.203-.5-.475-.5h-3.05zM106.483 66a.48.48 0 0 0-.483.5c0 .286.207.5.483.5h1.034a.48.48 0 0 0 .483-.5.48.48 0 0 0-.483-.5h-1.034zM123.472 66c-.27 0-.472.214-.472.5 0 .286.202.5.472.5h12.056c.27 0 .472-.214.472-.5 0-.286-.202-.5-.472-.5h-12.056z" fill="#D7D7DB"/>
+    <path d="M62.57 98.975c4.767.277 8.843-1.801 11.813-4.087 3.454-5.404 8.842-11.57 17.062-18.636 10.292-8.868 14.437-25.08 13.4-31.938l-.552 1.455a.52.52 0 0 1-.484.346c-.069 0-.138 0-.207-.069-.276-.139-.414-.416-.276-.693l1.105-2.702v-.069l.345-1.178-1.105-.346c-1.658-3.187-3.799-6.166-6.286-8.868-.069.832-.138 1.455-.207 1.663a.52.52 0 0 1-.483.346h-.139c-.276-.069-.414-.346-.345-.623.07-.208.138-1.109.276-2.286l-.138-.139-.069-3.88-4.006.07c-3.316-2.771-6.977-5.196-10.707-7.205l-1.589-5.75-4.766 1.316 2.417 1.108c.277.139.346.416.277.693-.07.208-.277.277-.484.277-.069 0-.138 0-.207-.069l-3.523-1.593-.483.138C67.613 14.178 62.225 13 57.805 13c-.553 0-1.106 0-1.59.07-8.012.554-21.206 10.876-31.705 21.199-3.04 3.394-10.707 12.47-12.158 19.952-1.658 8.73 2.694 18.844 9.74 22.516 8.22 4.295 26.387 2.009 32.397 1.108 1.174-.485 1.865-.762 1.934-.762.484-.208 1.105 0 1.382.485.207.485 0 1.108-.484 1.385-.138.07-1.174.555-2.97 1.178-.622 1.386-2.004 4.78-1.865 8.452 0 4.711 2.21 9.838 10.085 10.392zM31.556 52.628c-.276.138-.552.277-.828.277-.484 0-.968-.277-1.313-.693 0-.07-.898-1.316-2.625-1.316-1.727 0-2.625 1.316-2.625 1.316-.483.693-1.45.9-2.141.485-.69-.485-.898-1.455-.484-2.148.07-.07 1.313-1.94 3.73-2.563-.069-.208-.138-.416-.138-.624v-3.325c0-.831.622-1.455 1.451-1.455.829 0 1.45.624 1.45 1.455v3.256c0 .208-.068.416-.138.554 2.694.485 4.007 2.494 4.076 2.633.553.762.345 1.732-.415 2.148zm25.766-.416c-.484.693-1.45.9-2.141.485-.691-.416-.898-1.455-.484-2.148.07-.07 1.313-1.94 3.73-2.563-.069-.208-.138-.416-.138-.624v-3.325c0-.831.622-1.455 1.45-1.455.83 0 1.451.624 1.451 1.455v3.256c0 .208-.069.416-.138.554 2.694.485 4.007 2.494 4.076 2.633.483.693.276 1.663-.484 2.148-.276.138-.553.277-.829.277-.483 0-.967-.277-1.312-.693 0-.07-.898-1.316-2.625-1.316-1.658 0-2.556 1.316-2.556 1.316z" fill="#FFF"/>
+    <path d="M30.664 119.694c.346-13.124 4.624-25.081 12.698-35.526-2.691.412-5.728.619-8.971.619-3.727 0-6.9-.275-8.005-.413-6.97-.893-11.11-3.298-15.458-8.727-3.381-4.26-7.315-13.468-5.451-20.683 1.242-4.742 4.761-9.277 7.521-12.232 3.865-5.222 8.695-9.757 8.902-9.963a3.265 3.265 0 0 1 1.726-.756c5.796-5.635 21.806-20.134 32.157-20.821.552-.069 1.173-.069 1.725-.069 4.486 0 9.8 1.1 15.458 3.16l6.21-1.717c.208-.069.346-.069.553-.069.345 0 .69.069 1.035.275.483.275.828.687.966 1.237l1.311 4.879a73.76 73.76 0 0 1 9.661 6.46l3.244-.07h.069c.552 0 1.035.207 1.449.55.414.344.621.894.621 1.443l.069 3.024c2.76 2.886 4.969 5.91 6.694 9.07l.276.069c.552.137.966.55 1.242 1.03.276.482.276 1.031.138 1.581l-.138.55c1.035 3.436.483 9.483-1.587 15.736-1.518 4.604-5.038 13.193-12.146 19.24-12.076 10.308-19.253 19.86-21.185 28.243-1.45 6.115.069 10.72 1.518 14.155.828-.343 1.587-.756 2.346-1.168.415-.206.829-.48 1.312-.687-2.623-6.597-4.762-17.317 18.7-37.382 6.418-5.497 10.145-12.643 12.215-17.866.276-.756.552-1.443.76-2.061.137-.413.275-.825.413-1.168.828-2.612 3.175-10.72 1.932-16.973a5.93 5.93 0 0 0-.62-4.055 6.911 6.911 0 0 0-2.278-2.405c-1.518-2.61-3.381-5.085-5.52-7.49l-.07-1.511c-.069-1.65-.69-3.161-1.932-4.33-1.173-1.099-2.691-1.717-4.278-1.717h-.138l-1.725.068a84.504 84.504 0 0 0-7.522-5.085l-.897-3.23c-.414-1.58-1.45-2.885-2.899-3.71a6.116 6.116 0 0 0-3.036-.825c-.552 0-1.104.069-1.656.206l-4.969 1.375C67.514 8.03 62.132 7 57.508 7c-.69 0-1.38 0-2 .069-4.831.343-15.527 3.573-33.884 21.164-.897.344-1.794.825-2.484 1.512-.207.206-5.175 4.879-9.247 10.307-4.347 4.742-7.177 9.346-8.28 13.812-2.347 9.07 2.552 19.653 6.21 24.188 4.968 6.254 10.213 9.208 18.149 10.24.138 0 3.657.48 8.557.48h.828c-5.452 9.346-8.419 19.584-8.695 30.716 0 .481.069 1.031.138 1.512 1.45-.206 2.691-.756 3.864-1.306z" fill="#F9F9FA"/>
+    <path d="M219 103.2l-1-.2.917.3s0-.1.083-.1z" fill="#FFF"/>
+    <path d="M186.387 121c2.693-.964 5.386-1.997 7.873-3.098l2.417-5.922c.552-1.308 1.795-2.134 3.177-2.134.414 0 .897.069 1.312.275l4.282 1.79a57.343 57.343 0 0 0 3.936-2.822l.829-5.509c.207-1.652 1.657-2.891 3.384-2.891.138 0 .345 0 .483.068l3.73.551a54.256 54.256 0 0 0 3.107-3.856l-.69-3.029c-.208-.895-.07-1.79.414-2.548a3.457 3.457 0 0 1 2.14-1.514l2.832-.689c1.727-3.374 3.039-5.99 6.768-6.54.207 0 .346-.07.553-.07 4.696 0 10.29 9.846 11.947 12.876 3.591 6.747 6.009 14.046 7.044 20.793a22.429 22.429 0 0 1 4.075-.55c-1.381-9.433-5.11-17.696-7.528-22.102C243.155 84.095 237.906 79 232.934 79c-.415 0-.76 0-1.174.069-4.904.757-7.252 3.993-8.91 7.092l-1.035.206a7.759 7.759 0 0 0-4.696 3.374c-1.036 1.721-1.381 3.718-.898 5.646l.276 1.102c-.069.137-.207.275-.276.413l-1.52-.207c-.345-.069-.69-.069-1.035-.069-3.73 0-6.906 2.754-7.459 6.404l-.552 3.855-.622.413-2.279-.895c-.898-.344-1.864-.55-2.831-.55-3.039 0-5.801 1.79-6.975 4.613l-1.796 4.337c-2.28.964-4.696 1.86-7.113 2.686-1.174.206-2.141.481-3.039.826.552.275 1.036.55 1.52.826 1.173.689 2.347 1.308 3.867 1.859z" fill="#F9F9FA"/>
+    <path fill="#FFF" d="M197 117.6v-.1l.2-.5zM205.4 114.1l-.4-.1.4.1c0 .1 0 0 0 0zM154.13 110.431c2.703-4.186 2.98-8.235 2.841-10.225-.069.549-.138.892-.138.892 0 .275-.277.48-.485.48h-.07c-.277-.068-.484-.274-.415-.549 0-.205.485-3.843.762-5.558 0-.755-.139-1.373-.554-1.716-.139-.069-.277-.137-.485-.137-1.247 0-3.672 1.372-4.642 1.372-.139 0-.208 0-.278-.068-5.265-3.157-11.432-5.216-18.152-5.285h-.624c.346.343.624.48.624.48.207.207.277.481.069.687-.07.137-.277.206-.416.206-.138 0-.208-.069-.346-.137-.07-.07-.762-.618-1.732-1.51C128.84 88.608 127.04 86 126 86h-.07c-1.524.206-3.187 4.804-4.295 5.078-3.395.961-5.058 1.922-7.622 3.157l.97.48c.277.138.347.412.208.687-.07.206-.277.274-.485.274-.07 0-.138 0-.208-.068l-2.009-1.03c-1.109-.343-3.534-1.853-4.85-1.853-.277 0-.485.07-.624.206-1.524.687-.762 5.971-1.87 6.794-3.811 3.02-6.79 6.383-9.146 9.608.208 1.716 1.594 6.04 10.67 9.814 1.87.755 3.88 1.373 5.959 1.853 2.217-.549 3.81-1.373 5.473-2.265 2.772-1.51 5.612-3.02 11.224-3.02h.07c5.612 0 8.453 1.51 11.224 3.02l.416.206c5.958-1.921 10.808-5.01 13.095-8.51zM159 101a78.391 78.391 0 0 1 5 5c-1.397-1.667-3.015-3.4-5-5z"/>
+    <path d="M89.467 116c2.406-5.114 6.667-11.795 13.745-17.523.07-.409.207-1.227.207-1.84.206-2.046.412-4.364 2.13-5.319.344-.273.962-.477 1.65-.477 1.305 0 2.748.682 4.192 1.364.275.136.618.34.962.409.55-.273 1.1-.546 1.58-.75 1.925-.955 3.574-1.773 6.323-2.523.275-.341.619-.955.894-1.432 1.1-1.773 2.199-3.545 3.986-3.818h.344c1.443 0 2.611 1.159 3.848 2.386.344.341.825.887 1.169 1.091h1.443c6.391.068 12.645 1.841 18.487 5.25.275-.068.687-.273 1.03-.409 1.1-.409 2.269-.886 3.3-.886.618 0 1.168.136 1.58.409 1.925 1.159 1.581 3.613 1.375 5.25 0 .204-.069.409-.069.613 6.46 5.182 10.79 11.728 12.165 17.932.55 0 1.1-.068 1.718-.068.893 0 1.718.068 2.474.136-1.237-6.75-5.498-13.84-12.027-19.636.137-2.25-.206-5.59-3.436-7.636-1.1-.682-2.406-1.023-3.78-1.023-1.512 0-2.818.41-4.055.886-5.91-3.068-12.302-4.704-18.625-4.84-1.512-1.5-3.505-3.546-6.666-3.546-.344 0-.619 0-.962.068-3.712.546-5.567 3.546-6.873 5.727v.069c-2.2.75-3.78 1.5-5.292 2.25-1.443-.682-3.23-1.364-5.086-1.364-1.374 0-2.68.34-3.78 1.023-3.504 1.977-3.917 6-4.123 8.454v.137c-7.56 6.477-11.89 13.977-14.295 19.363h1.03c1.375.068 2.406.205 3.437.273z" fill="#F9F9FA"/>
+    <path d="M74 94.759c-2.87 2.207-6.97 4.344-11.685 4.069-7.79-.483-10.045-5.656-10.182-10.414-.136-3.655 1.23-7.035 1.845-8.414-1.435.552-3.416 1.172-5.74 1.862C45.437 85.103 33.957 97.655 33 118.966c2.597-1.38 5.398-2.76 10.66-2.76 5.535 0 8.337 1.518 11.07 3.035C57.327 120.69 59.787 122 64.843 122c2.46 0 4.305-.345 5.877-.828-2.187-5.517-4.647-13.862 3.28-26.413z" fill="url(#a)"/>
+    <path d="M21.737 76.814c-7.032-3.684-11.375-13.831-9.72-22.588 1.448-7.507 9.1-16.612 12.133-20.017a.623.623 0 0 0-.483-.209.742.742 0 0 0-.482.209c-.276.278-5.033 4.795-8.686 9.869-2.689 2.92-5.93 7.159-7.101 11.538-1.655 6.602 2.206 15.43 5.032 19.113 3.999 5.074 7.79 7.228 14.133 8.062.275.07 1.103.14 2.137.209.138-.07.276-.139.413-.139 11.168-.139 20.958-3.406 24.887-4.935-5.929.904-24.06 3.197-32.263-1.112z" fill="url(#b)"/>
+    <path d="M96.2 110c-1.82 2.44-3.15 4.814-4.2 6.915 2.38.543 4.13 1.492 5.81 2.373 2.66 1.424 5.18 2.712 10.36 2.712 1.96 0 3.5-.203 4.83-.475-2.1-.474-4.13-1.017-6.02-1.83-9.24-3.729-10.64-8-10.78-9.695z" fill="url(#c)"/>
+    <path d="M158.683 100.703c-.612-.545-1.293-1.158-1.973-1.703-.068.272-.068.545-.068.75a17.734 17.734 0 0 1-2.788 10.148c-2.244 3.474-7.005 6.539-12.854 8.582 2.448 1.294 4.897 2.52 9.657 2.52 5.033 0 7.482-1.362 10.066-2.724 2.04-1.09 4.08-2.18 7.277-2.725-.748-3.133-2.244-6.47-4.693-9.74a76.743 76.743 0 0 0-4.624-5.108z" fill="url(#d)"/>
+    <path d="M71.53 106.154c2.004-8.494 9.12-18.023 21.212-28.38 7.116-6.077 10.709-14.778 12.16-19.335 2.072-6.353 2.625-12.36 1.589-15.813l.138-.553c.138-.552.138-1.104-.138-1.588-.277-.483-.691-.828-1.244-1.036l-.276-.069c-1.728-3.176-4.008-6.214-6.702-9.114l-.07-3.039c0-.552-.206-1.036-.621-1.45-.415-.345-.898-.552-1.45-.552h-.07l-3.247.069c-2.971-2.417-6.218-4.558-9.673-6.491L81.825 13.9c-.138-.552-.483-.967-.967-1.243a1.95 1.95 0 0 0-1.036-.276c-.208 0-.346 0-.553.07l-6.218 1.725C67.385 12.105 62.065 11 57.575 11c-.622 0-1.175 0-1.728.07-10.363.69-26.392 15.26-32.196 20.922-.622.069-1.243.276-1.727.76-.207.207-5.044 4.764-8.913 10.012-2.763 2.97-6.287 7.527-7.53 12.291-1.866 7.25 2.072 16.504 5.458 20.785 4.352 5.455 8.498 7.872 15.476 8.77 1.174.138 4.283.414 8.014.414 3.248 0 6.288-.207 8.982-.622-8.084 10.496-12.367 22.442-12.713 35.7.553-.276 1.106-.552 1.659-.897l.414-.208c.967-21.337 12.575-33.904 15.407-37.15 2.35-.69 4.353-1.312 5.804-1.864 1.796-.621 2.833-1.105 2.97-1.174.484-.207.76-.828.484-1.38a1.015 1.015 0 0 0-1.381-.484s-.691.345-1.935.76c-4.007 1.518-13.749 4.764-24.942 4.902-.138 0-.276.07-.414.138-1.106-.069-1.866-.138-2.142-.207-6.356-.829-10.156-2.97-14.164-8.01-2.901-3.66-6.77-12.43-5.043-18.99 1.105-4.35 4.353-8.562 7.116-11.462 3.662-5.04 8.498-9.53 8.706-9.805a.627.627 0 0 1 .483-.208c.138 0 .346.07.484.208 10.502-10.29 23.698-20.578 31.712-21.13.484-.07 1.037-.07 1.59-.07 4.421 0 9.81 1.174 15.407 3.246l.483-.138 3.524 1.588c.069 0 .138.07.207.07.207 0 .415-.139.484-.277.138-.276 0-.552-.277-.69l-2.418-1.105 4.768-1.312 1.589 5.73c3.73 2.003 7.392 4.42 10.709 7.182l4.007-.069.069 3.867.138.138c-.138 1.174-.207 2.14-.276 2.279-.07.276.069.552.345.622h.138a.52.52 0 0 0 .484-.346c.07-.207.138-.828.207-1.657 2.488 2.693 4.63 5.662 6.288 8.839l1.105.345-.345 1.174v.069l-1.106 2.693c-.138.276 0 .552.277.69.069 0 .138.07.207.07a.52.52 0 0 0 .483-.346l.553-1.45c1.036 6.836-3.109 23.064-13.403 31.833-8.222 7.043-13.611 13.19-17.066 18.575C66.073 107.26 68.63 115.614 70.84 121c.69-.207 1.313-.483 1.934-.76-1.174-3.383-2.694-7.94-1.243-14.086z" fill="url(#e)"/>
+    <path d="M42.62.137h-.206c-2.897.48-3.793 2.604-5.655 6.167l2.965-.343c.414-.068.759.137.966.48.207.342.207.753.069 1.096l-5.035 8.839c-.207.343-.552.548-.896.548h-.138a1.122 1.122 0 0 1-.897-.754l-.965-3.289a52.497 52.497 0 0 1-4.483 5.482l-.414-.069-.069.069 2.414.617c.345.068.69.41.758.753.07.343-.068.754-.344 1.028l-8 6.372a1.117 1.117 0 0 1-.621.206c-.138 0-.345-.069-.483-.137-.345-.206-.552-.617-.552-1.028l.138-1.37-.069.068v.137c-1.793 1.44-3.724 2.741-5.655 3.974l-.345-.137 1.518.823c.345.205.551.548.551.959 0 .41-.206.753-.62.89l-9.518 4.454c-.137.069-.275.069-.413.069-.276 0-.483-.069-.69-.274-.276-.274-.414-.686-.276-1.097l.207-.616-.138.068v.069l-.414.205-.207.137h-.137A76.054 76.054 0 0 1 0 36.59c.759.068 1.586.137 2.483.137 5.103 0 7.586-1.37 10.207-2.74 2.758-1.508 5.586-3.016 11.172-3.016s8.414 1.508 11.172 3.015c2.621 1.44 5.104 2.74 10.207 2.74 5.104 0 7.587-1.37 10.207-2.74 1.242-.685 2.483-1.37 4.07-1.918C57.31 16.239 46.69.137 42.62.137z" fill="url(#f)" transform="translate(191 85)"/>
+    <path d="M38 8.29l-4.207.48.138.411c.138-.137.345-.205.552-.068.276.137.345.411.276.685l-.414.822.827 2.741L38 8.291z" fill="url(#g)" transform="translate(191 85)"/>
+    <path d="M34.69 16.924h.138c.344 0 .69-.205.896-.548l5.035-8.839a.925.925 0 0 0-.07-1.096c-.206-.343-.551-.48-.965-.48l-2.965.343s0 .068-.07.068l-3.792.891c-.69.137-1.173.89-.966 1.576l.62 2.535c.415-.617.828-1.302 1.173-2.193 0-.068.07-.137.138-.137l-.138-.41 4.207-.48-2.897 5.07-.827-2.74a27.74 27.74 0 0 1-1.38 2.26v.069l-.068.068.965 3.29c.207.41.552.753.966.753z" fill="url(#h)" transform="translate(191 85)"/>
+    <path d="M27.862 20.556l-4-1.028-.207 1.918c.207-.068.414-.068.552.137a.535.535 0 0 1 0 .754l-.69.685-.138 1.234 4.483-3.7z" fill="url(#i)" transform="translate(191 85)"/>
+    <path d="M21.586 27.339c.138.068.345.137.483.137.207 0 .483-.069.62-.206l8-6.372c.277-.274.414-.617.345-1.028-.068-.342-.344-.685-.758-.753l-2.414-.617-.759-.206-3.586-.48h-.207c-.69 0-1.241.48-1.31 1.166l-.69 4.59 2.138-1.987c.07-.068.07-.068.138-.068l.207-1.919 4 1.028-4.483 3.563.138-1.233-2.276 2.124-.138 1.37c0 .343.207.685.552.89z" fill="url(#j)" transform="translate(191 85)"/>
+    <path d="M13.862 30.696l-3.793-2.055-1.035 2.809c.138 0 .345.069.414.274.138.274.07.548-.207.685l-.69.343-.137.48 5.448-2.536z" fill="url(#k)" transform="translate(191 85)"/>
+    <path d="M5.931 35.904c.207.205.414.274.69.274.138 0 .276 0 .413-.069l9.518-4.453c.345-.137.551-.48.62-.891 0-.411-.206-.754-.551-.96l-1.518-.822-.206-.137-4.69-1.918c-.138-.069-.345-.069-.483-.069-.552 0-1.034.343-1.241.822l-1.931 4.66-.138.41 2.345-1.301c.069-.069.207-.069.275-.069l1.035-2.809 3.793 2.056-5.448 2.535.138-.48-2.69 1.44-.207.616c-.138.48-.069.89.276 1.165z" fill="url(#l)" transform="translate(191 85)"/>
+    <path d="M233.164 83c-.205 0-.342 0-.548.07-3.698.553-5.068 3.255-6.712 6.58l-2.808.693a3.43 3.43 0 0 0-2.123 1.524c-.48.762-.617 1.662-.411 2.563l.685 3.048c-.96 1.316-1.987 2.563-3.083 3.879l-3.698-.554c-.137 0-.343-.07-.48-.07-1.644 0-3.082 1.247-3.356 2.91l-.822 5.542c-1.233.97-2.534 1.87-3.904 2.84l-4.246-1.801c-.411-.139-.822-.277-1.302-.277-1.37 0-2.603.831-3.15 2.147l-2.398 5.958a102.341 102.341 0 0 1-7.808 3.117c1.096.346 2.26.692 3.767.831 1.575-.623 3.22-1.316 4.932-2.078h.137l.205-.139.411-.208v-.069l.137-.07 2.671-1.454.685-.346c.274-.139.343-.416.206-.693-.069-.138-.274-.277-.411-.277-.069 0-.206 0-.274.07l-2.329 1.316.137-.416 1.918-4.71c.205-.555.685-.832 1.233-.832.137 0 .342 0 .48.07l4.657 1.939.274.07.342.138c1.918-1.247 3.836-2.563 5.617-4.018v-.138l.068-.07 2.26-2.147.685-.693a.548.548 0 0 0 0-.762c-.137-.138-.41-.208-.548-.138-.068 0-.068.069-.137.069L212 108.423l.685-4.641c.068-.693.685-1.178 1.301-1.178h.206l3.561.485.822.138.411.07c1.85-2.01 3.288-3.81 4.452-5.542l.069-.07v-.069c.48-.623.959-1.385 1.37-2.286l.41-.83c.138-.278 0-.555-.273-.694-.206-.069-.411-.069-.548.07l-.137.138c-.411.831-.754 1.593-1.165 2.217l-.616-2.563c-.206-.693.274-1.455.959-1.593l3.767-.9s0-.07.068-.07c1.85-3.672 2.74-5.819 5.617-6.235h.205c3.973 0 14.59 16.21 16.85 32.35.616-.208 1.233-.415 1.986-.554-.959-6.72-3.425-14.131-6.986-20.92C243.37 92.976 237.822 83 233.164 83z" fill="url(#m)"/>
+    <path d="M157.945 97.994c0-.21.069-.418.069-.627.205-1.67.548-4.177-1.37-5.36a2.965 2.965 0 0 0-1.576-.418c-1.027 0-2.191.487-3.287.905-.274.139-.685.278-1.028.417-5.89-3.48-12.054-5.29-18.424-5.36h-1.439c-.342-.279-.822-.766-1.164-1.114-1.233-1.253-2.329-2.437-3.836-2.437h-.342c-1.78.278-2.877 2.089-3.973 3.899-.274.487-.685 1.114-.89 1.462-2.74.766-4.384 1.601-6.301 2.576-.48.278-1.028.487-1.576.766-.274-.14-.616-.279-.959-.418-1.37-.696-2.876-1.393-4.178-1.393-.753 0-1.301.21-1.644.488-1.712.974-1.917 3.342-2.123 5.43-.068.627-.137 1.462-.205 1.88-7.055 5.848-11.302 12.67-13.699 17.892.753.07 1.438.21 2.123.418a53.516 53.516 0 0 1 4.11-7.101c2.26-3.272 5.205-6.684 9.041-9.747 1.096-.905.342-6.196 1.85-6.893.136-.139.342-.208.616-.208 1.301 0 3.698 1.531 4.794 1.88l1.987 1.044c.068.07.137.07.205.07.206 0 .342-.07.48-.28.136-.278 0-.556-.206-.695l-.959-.488c2.534-1.253 4.178-2.228 7.534-3.202 1.096-.279 2.74-4.943 4.247-5.152h.068c1.028 0 2.809 2.645 4.042 3.411.958.905 1.643 1.462 1.712 1.532.068.07.205.14.342.14.137 0 .274-.07.411-.21.206-.209.137-.557-.068-.696 0 0-.206-.209-.617-.487h.617c6.644.07 12.74 2.228 17.945 5.36.068.07.137.07.274.07.959 0 3.288-1.392 4.589-1.392.205 0 .342.07.48.139.479.278.616.975.547 1.74-.274 1.74-.685 5.5-.753 5.64-.069.278.137.557.41.557h.07c.273 0 .479-.21.479-.488 0 0 .068-.348.137-.905 0-.209.068-.487.068-.766a44.404 44.404 0 0 1 1.987 1.74c1.78 1.672 3.356 3.412 4.657 5.222 2.466 3.342 4.041 6.823 4.726 9.956.617-.07 1.302-.209 2.055-.209-1.301-6.544-5.616-13.228-12.055-18.588z" fill="url(#n)"/>
+    <path d="M175.472 41h12.056c.27 0 .472-.214.472-.5 0-.286-.202-.5-.472-.5h-12.056c-.27 0-.472.214-.472.5 0 .214.202.5.472.5zM245.37 41.736c.074.132.296.264.518.264h.593c.297 0 .519-.198.519-.462s-.222-.461-.519-.461h-.296c-.222-.396-.667-.99-1.186-1.847-.148-.198-.519-.33-.74-.132-.223.132-.371.462-.149.66.667.989 1.112 1.714 1.26 1.978zM219.1 29.81c.066.127.261.19.391.19s.196-.063.326-.127c.195-.19.26-.444.065-.635-.651-.762-1.303-1.46-2.019-2.095a.52.52 0 0 0-.716 0 .49.49 0 0 0 0 .698 11.354 11.354 0 0 1 1.953 1.969zM198.546 27c.14 0 .21-.078.35-.156 1.467-1.323 3.494-2.179 5.94-2.49 1.957-.311 3.774-.233 5.521.234.28.077.56-.156.63-.467a.608.608 0 0 0-.42-.7c-1.887-.468-3.844-.546-5.87-.234-2.657.389-4.893 1.323-6.5 2.801-.21.234-.28.545-.07.779.07.155.21.233.419.233zM260.473 42h4.054c.27 0 .473-.214.473-.5 0-.286-.203-.5-.473-.5h-4.054c-.27 0-.473.214-.473.5 0 .214.203.5.473.5zM221.727 34.724c.091.207.364.276.637.276.09 0 .181 0 .272-.069.364-.138.455-.414.273-.69l-.636-.965c-.182-.276-.637-.345-.91-.207-.363.138-.454.483-.272.69.273.413.454.758.636.965zM227.633 29.34c1.162-.4 2.461-.4 3.965-.134 2.12.4 4.376 1.664 6.564 3.66a.53.53 0 0 0 .342.134.53.53 0 0 0 .342-.133.512.512 0 0 0 0-.732c-2.325-2.197-4.718-3.528-7.042-3.927-1.641-.333-3.146-.266-4.445.2-.273.066-.41.399-.342.599.069.266.342.399.616.332zM249.483 42h1.034a.48.48 0 0 0 .483-.5.48.48 0 0 0-.483-.5h-1.034a.48.48 0 0 0-.483.5c0 .214.207.5.483.5zM195.561 36c.061 0 .061 0 0 0 .305-.069.488-.276.427-.552-.06-.345-.06-.69-.06-.965a.496.496 0 0 0-.489-.483h-.122c-.183.069-.366.276-.305.483 0 .345.061.69.061 1.034 0 .07 0 .138.061.138.122.207.244.345.427.345zM196.918 41.777c.058-.157.116-.394.058-.551 0 0-.233-.71-.465-1.812-.058-.315-.29-.473-.523-.394-.232.079-.349.394-.29.709.116.394.174.788.29 1.103h-.639a.655.655 0 0 0-.349.551c0 .315.174.552.407.552H196.569c.174.157.29 0 .349-.158z" fill="#D7D7DB"/>
+    <path d="M175.166 46h89.805c.549 0 1.029-.494 1.029-1.06 0-.564-.48-1.058-1.03-1.058h-20.855c-1.853-3.531-6.518-11.087-12.28-12.216-7.684-1.483-9.194 6.355-9.194 6.355s-5.076-13.629-18.043-11.863c-5.9.847-8.301 3.954-8.987 7.344h.137c.274 0 .549.211.549.494 0 .353.068.706.068.988 0 .283-.137.565-.48.565h-.068c-.206 0-.343-.14-.48-.282-.138 1.765.137 3.601.48 5.013h.754c-.068-.282-.206-.565-.343-.988-.068-.283.069-.565.343-.636.275-.07.55.07.618.353.274.989.549 1.624.549 1.624a.445.445 0 0 1-.07.495c-.068.14-.274.212-.41.212h-1.236c.412 1.412.755 2.4.824 2.542h-21.817c-.549 0-1.029.494-1.029 1.059.137.565.617 1.059 1.166 1.059z" fill="#FFF"/>
+    <path d="M129.417 7h.14c.208 0 .416-.127.486-.317.278-.826 1.112-2.667 3.545-2.667.278 0 .625 0 .973.063 1.46.254 2.989 1.143 4.518 2.604.209.19.556.19.765 0a.468.468 0 0 0 0-.699c-1.669-1.587-3.337-2.54-5.075-2.857-.417-.064-.764-.127-1.181-.127-3.198 0-4.31 2.603-4.588 3.365 0 .318.209.572.417.635zM122.42.835c.34.055.612.11.951.165h.136c.204 0 .408-.11.476-.275.068-.22-.068-.44-.34-.494-.34-.11-.679-.165-1.019-.22-.271-.055-.543.11-.61.33-.069.22.135.44.407.494zM115.617 3c.15 0 .299-.057.374-.113.598-.511 1.495-.851 2.616-1.078.3-.057.449-.284.374-.51-.075-.228-.374-.341-.673-.285-1.346.284-2.392.738-3.14 1.305-.224.17-.224.454 0 .624.15 0 .3.057.449.057zM146.475 11h3.05c.272 0 .475-.214.475-.5 0-.286-.203-.5-.475-.5h-3.05c-.272 0-.475.214-.475.5 0 .286.203.5.475.5zM115.904 10.83c.068-.12.136-.301.068-.422l-.068-.12c-.136-.24-.408-.361-.68-.24-.067 0-.135.06-.135.06H103.475c-.271 0-.475.18-.475.42 0 .242.204.422.475.422H115.43c.203.12.34 0 .475-.12z" fill="#D7D7DB"/>
+    <path d="M102.969 15h50c.55 0 1.031-.493 1.031-1.056 0-.563-.48-1.056-1.03-1.056h-11.814c-1.03-1.972-3.64-6.126-6.8-6.76-4.257-.845-5.15 3.52-5.15 3.52s-2.816-7.604-10.028-6.547c-5.288.704-5.495 4.717-4.945 7.393h.687c.068-.07.068-.07.137-.07.275-.141.55 0 .687.281l.069.14a.442.442 0 0 1-.07.494c-.068.14-.274.21-.411.21h-.824c.206.846.48 1.339.48 1.41l-12.019-.071h-.206.206c-.55 0-.962.493-.962 1.056-.068.563.344 1.056.962 1.056zM146.1 1c-.1 0-.1.1-.1.1l.1-.1z" fill="#FFF"/>
+    <path d="M60.857 48c.072-.195.143-.325.143-.52v-3.116c0-.78-.643-1.364-1.5-1.364s-1.5.584-1.5 1.364v3.052c0 .194.071.454.143.584.5-.13 1-.195 1.571-.195.429.065.786.13 1.143.195z" fill="url(#o)"/>
+    <path d="M62.137 52.28c.279.468.767.669 1.324.669.28 0 .558-.067.837-.268.697-.468.906-1.404.487-2.073-.07-.067-1.463-2.073-4.111-2.541C60.325 48 59.977 48 59.559 48c-.558 0-1.046.067-1.533.2-2.44.603-3.694 2.341-3.764 2.475-.487.669-.278 1.605.488 2.073.767.468 1.673.268 2.16-.468 0 0 .907-1.27 2.649-1.27 1.672 0 2.509 1.203 2.578 1.27zm-5.993-.267c-.279.468-.976.601-1.463.267-.488-.267-.628-.936-.28-1.404.07-.067 1.673-2.408 4.81-2.408 3.135 0 4.738 2.274 4.808 2.408.279.468.209 1.07-.279 1.404-.209.134-.348.134-.557.134-.349 0-.697-.134-.906-.468-.07-.067-1.046-1.472-3.067-1.472-1.951 0-2.996 1.539-3.066 1.539z" fill="#F9F9FA"/>
+    <path d="M63.06 51.505c.209.27.558.472.907.472.21 0 .42-.067.56-.135.489-.27.628-.943.279-1.415-.07-.068-1.677-2.427-4.821-2.427-3.145 0-4.752 2.292-4.822 2.427-.279.472-.21 1.078.28 1.415.49.27 1.118.203 1.467-.27 0 0 1.048-1.482 3.075-1.482 1.956-.135 3.004 1.348 3.074 1.415z" fill="url(#p)"/>
+    <path d="M27.857 48c.072-.195.143-.325.143-.52v-3.116c0-.78-.643-1.364-1.5-1.364s-1.5.584-1.5 1.364v3.052c0 .194.071.454.143.584.5-.13 1-.195 1.571-.195.357.065.786.13 1.143.195z" fill="url(#q)"/>
+    <path d="M27.632 48.067C27.286 48 26.939 48 26.524 48a5.58 5.58 0 0 0-1.524.2c-2.423.603-3.67 2.341-3.74 2.475-.484.669-.276 1.605.486 2.073.692.468 1.662.268 2.146-.468 0 0 .9-1.27 2.632-1.27 1.731 0 2.631 1.203 2.631 1.27.277.468.762.669 1.316.669.277 0 .554-.067.831-.268.693-.468.9-1.404.485-2.073-.139-.134-1.524-2.14-4.155-2.541zm3.116 4.146c-.208.134-.346.134-.554.134-.346 0-.692-.134-.9-.468-.07-.067-1.039-1.471-3.047-1.471s-3.047 1.47-3.047 1.47c-.277.469-.97.603-1.454.268-.485-.267-.624-.936-.277-1.404.069-.067 1.662-2.408 4.778-2.408 3.116 0 4.709 2.274 4.778 2.408.346.535.208 1.204-.277 1.471z" fill="#F9F9FA"/>
+    <path d="M26.985 48c-3.145 0-4.752 2.267-4.822 2.4-.279.467-.21 1.067.28 1.4.49.267 1.118.2 1.467-.267 0 0 1.048-1.466 3.075-1.466 2.026 0 3.074 1.466 3.074 1.466.21.267.56.467.908.467.21 0 .42-.067.56-.133.489-.267.628-.934.279-1.4 0-.2-1.607-2.467-4.821-2.467z" fill="url(#r)"/>
+    <path d="M70.955 131.273c-.069-.208-.346-.312-.623-.26-.276.052-.622.156-.968.208-.277.052-.416.26-.346.467.069.156.276.312.484.312h.138c.346-.052.692-.156 1.038-.208.208-.104.416-.311.277-.52zM101.631 131.025c-.981-.26-1.823-.584-2.875-.974-.28-.13-.56 0-.701.26-.14.26 0 .52.28.65a21.02 21.02 0 0 0 3.016 1.039h.14c.21 0 .421-.13.491-.325.07-.325-.07-.585-.35-.65zM162.377 127.026c-.865.408-1.663.817-2.395 1.226-2.329 1.295-4.524 2.521-8.516 2.726-.266 0-.466.272-.466.545s.266.477.466.477c4.191-.273 6.587-1.567 8.915-2.862.732-.409 1.53-.818 2.329-1.227.266-.136.333-.408.266-.681-.067-.204-.333-.273-.599-.204zM106.576 131.063c-.343 0-.685 0-1.028-.063-.274 0-.548.188-.548.438s.206.5.48.5c.342 0 .685.062 1.027.062.274 0 .48-.188.48-.438.068-.312-.137-.5-.411-.5zM91.592 126.58c-1.631-.386-3.398-.58-5.37-.58-2.65 0-4.826.323-6.865 1.032-.272.065-.408.387-.34.645a.51.51 0 0 0 .476.323h.204c1.971-.645 4.01-.968 6.525-.968 1.904 0 3.603.194 5.166.58.272.065.544-.064.612-.322 0-.387-.136-.645-.408-.71zM55.223 129.938c.07.062.141.062.212.062a.55.55 0 0 0 .494-.25c.142-.25.071-.5-.212-.625l-.989-.438C51.973 127.376 49.147 126 43.495 126c-.283 0-.495.188-.495.438s.212.437.495.437c5.37 0 7.983 1.25 10.739 2.563l.989.5zM65.533 132c.267 0 .467-.25.467-.5s-.267-.438-.533-.438c-.934.063-2 0-2.934-.062-.266 0-.533.188-.533.438s.2.5.467.5c.6.062 1.266.062 1.866.062h1.2zM142.653 130.623a10.302 10.302 0 0 1-.904-.551c-.278-.184-.556 0-.694.367a.762.762 0 0 0 .277.918c.348.184.626.368.973.551.07 0 .14.092.209.092.208 0 .417-.184.486-.459 0-.367-.139-.826-.347-.918zM192.535 131.71c-1.795 0-3.39-.258-4.92-.688-.266-.086-.532.086-.598.43-.067.344.066.688.332.774 1.53.516 3.258.774 5.12.774.265 0 .531-.258.531-.602s-.2-.688-.465-.688zM179.67 127.309c-.344-.099-.62-.197-.964-.296-.275-.05-.55.05-.688.197-.07.198.068.395.344.494.344.099.62.148.895.247.07 0 .138.049.207.049.206 0 .413-.099.482-.247.138-.148 0-.345-.276-.444zM126.47 126.01c-4.3.274-6.682 1.573-8.998 2.871-.728.41-1.456.82-2.183 1.162-.265.137-.331.41-.265.684.066.205.265.273.463.273.066 0 .132 0 .199-.068.794-.41 1.521-.82 2.25-1.23 2.315-1.3 4.499-2.53 8.6-2.734.266 0 .464-.274.464-.547 0-.205-.265-.479-.53-.41zM171.6 126.882h.2c.933 0 1.867.06 2.667.118h.066c.267 0 .467-.176.467-.412 0-.235-.133-.47-.467-.47-.866-.06-1.8-.118-2.8-.118h-.266c-.267 0-.467.176-.467.47.133.236.333.412.6.412zM138.215 128.938c.073.062.145.062.218.062a.573.573 0 0 0 .509-.248c.145-.248 0-.496-.218-.62-1.163-.496-2.107-.868-3.052-1.116-.29-.062-.58.062-.653.31-.073.248.072.496.363.558.872.248 1.743.558 2.833 1.054zM156.305 141.038c-.271.05-.61.152-.949.203-.271.05-.407.253-.339.455a.563.563 0 0 0 .475.304h.135c.34-.05.678-.152 1.017-.203.271-.05.407-.253.339-.455-.068-.304-.407-.405-.678-.304zM151.516 142.072c-.946.061-2.028 0-2.975-.062-.27-.062-.541.185-.541.433s.203.495.473.495c.609.062 1.285.062 1.894.062h1.15c.27 0 .472-.248.472-.495.068-.248-.202-.433-.473-.433zM141.717 139.125c-.353-.125-.635-.313-.989-.438-2.755-1.312-5.581-2.687-11.233-2.687-.283 0-.495.188-.495.438s.212.437.495.437c5.37 0 7.913 1.25 10.739 2.563.353.187.636.312.989.5.07.062.141.062.212.062a.55.55 0 0 0 .494-.25c.142-.188.071-.5-.212-.625zM177.618 136.58c-1.626-.386-3.387-.58-5.42-.58-2.642 0-4.81.323-6.842 1.032-.271.065-.406.387-.339.645a.508.508 0 0 0 .474.323h.204c1.964-.645 3.997-.968 6.503-.968 1.897 0 3.591.194 5.15.58.27.065.541-.064.609-.322.135-.387-.068-.645-.339-.71zM192.558 142.063c-.339 0-.678 0-1.016-.063-.271 0-.542.188-.542.438s.203.5.474.5c.339 0 .677.062 1.016.062.27 0 .474-.188.474-.438.135-.312-.135-.5-.406-.5zM212.47 136c-4.3.274-6.682 1.575-8.998 2.877-.728.41-1.456.822-2.183 1.164-.265.137-.331.411-.265.685.066.206.265.274.463.274.066 0 .132 0 .199-.068.794-.411 1.521-.822 2.25-1.233 2.315-1.302 4.499-2.535 8.6-2.74.266 0 .464-.274.464-.548 0-.206-.265-.411-.53-.411zM187.635 142.025c-.983-.26-1.825-.584-2.878-.974-.28-.13-.562 0-.702.26-.14.26 0 .52.28.65 1.054.454 2.037.78 3.02 1.039h.14c.21 0 .421-.13.491-.325a.557.557 0 0 0-.35-.65zM87.495 136c-2.75 0-5.008.323-7.124 1.032-.282.065-.424.387-.353.645.07.194.282.323.494.323h.211c2.046-.645 4.162-.968 6.772-.968.282 0 .494-.193.494-.451.07-.387-.212-.581-.494-.581zM56.73 139.125c-.353-.125-.636-.313-.99-.438-2.758-1.312-5.587-2.687-11.245-2.687-.283 0-.495.188-.495.438s.212.437.495.437c5.375 0 7.992 1.25 10.75 2.563.354.187.637.312.99.5.072.062.142.062.213.062a.552.552 0 0 0 .495-.25c.142-.188 0-.5-.212-.625zM72.305 141.038c-.271.05-.61.152-.949.203-.271.05-.407.253-.339.455a.563.563 0 0 0 .475.304h.135c.34-.05.678-.152 1.017-.203.271-.05.407-.253.339-.455-.136-.304-.407-.405-.678-.304zM67.516 142.072c-.946.061-2.028 0-2.975-.062-.27-.062-.541.185-.541.433s.203.495.473.495c.609.062 1.285.062 1.894.062h1.15c.27 0 .472-.248.472-.495.068-.248-.202-.433-.473-.433zM278.083 121.965c-5.085 0-7.558-1.404-10.17-2.807-2.748-1.544-5.565-3.088-11.131-3.088h-1.1c-1.58.07-2.886.28-4.054.562-.687.14-1.374.35-1.992.561-1.512.561-2.818 1.263-4.054 1.965-2.612 1.474-5.085 2.807-10.17 2.807s-7.558-1.404-10.17-2.807c-2.748-1.544-5.565-3.088-11.131-3.088s-8.383 1.544-11.132 3.088c-2.61 1.474-5.084 2.807-10.17 2.807-.893 0-1.717-.07-2.473-.14-1.443-.14-2.68-.421-3.78-.843-1.442-.49-2.679-1.193-3.916-1.894-.48-.281-1.03-.562-1.512-.842-1.855-.983-3.985-1.825-7.146-2.106-.756-.07-1.58-.14-2.473-.14-.619 0-1.169 0-1.718.07-.756.07-1.443.14-2.062.21-3.23.492-5.36 1.685-7.352 2.808-2.611 1.473-5.085 2.807-10.17 2.807-4.81 0-7.283-1.263-9.757-2.597l-.412-.21c-2.749-1.544-5.566-3.088-11.132-3.088h-.068c-5.566 0-8.383 1.544-11.132 3.088-1.65.912-3.23 1.754-5.428 2.316-1.306.28-2.818.49-4.742.49-5.084 0-7.558-1.403-10.17-2.806-1.648-.913-3.366-1.895-5.702-2.456a58.85 58.85 0 0 0-2.13-.421c-.962-.14-2.062-.211-3.299-.211h-1.03c-4.123.14-6.597 1.193-8.796 2.386-.412.21-.893.491-1.305.702-.756.42-1.512.842-2.337 1.193-.618.28-1.236.561-1.924.772-1.58.49-3.435.842-5.909.842-5.085 0-7.558-1.404-10.17-2.807C52.017 117.544 49.2 116 43.634 116c-5.29 0-8.108 1.404-10.72 2.807l-.412.21c-.55.281-1.099.632-1.649.913-1.168.561-2.405 1.123-3.985 1.474-1.306.28-2.749.49-4.535.49-5.085 0-7.559-1.403-10.17-2.806C9.414 117.544 6.596 116 1.031 116 .48 116 0 116.491 0 117.053c0 .561.481 1.052 1.03 1.052 5.085 0 7.56 1.404 10.17 2.807C13.95 122.456 16.766 124 22.332 124s8.383-1.544 11.131-3.088c2.612-1.473 5.085-2.807 10.17-2.807s7.558 1.404 10.17 2.807C56.55 122.456 59.368 124 64.934 124s8.383-1.544 11.132-3.088c2.61-1.473 5.084-2.807 10.17-2.807 5.084 0 7.558 1.404 10.169 2.807 2.748 1.544 5.566 3.088 11.131 3.088 5.566 0 8.383-1.544 11.132-3.088 2.611-1.473 5.085-2.807 10.17-2.807 5.084 0 7.558 1.404 10.17 2.807 2.748 1.544 5.565 3.088 11.13 3.088 5.566 0 8.384-1.544 11.132-3.088 2.611-1.473 5.085-2.807 10.17-2.807s7.558 1.404 10.17 2.807c2.748 1.544 5.565 3.088 11.131 3.088s8.383-1.544 11.132-3.088c2.61-1.473 5.084-2.807 10.17-2.807 5.084 0 7.558 1.404 10.169 2.807 2.748 1.544 5.566 3.088 11.131 3.088 5.566 0 8.383-1.544 11.132-3.088 2.611-1.473 5.085-2.807 10.17-2.807 5.084 0 7.558 1.404 10.169 2.807 2.749 1.544 5.566 3.088 11.132 3.088.55 0 1.03-.491 1.03-1.053.138-.49-.343-.982-.893-.982z" fill="#D7D7DB"/>
+  </g>
 </svg>
diff --git a/src/webextension/list/components/item-fields.css b/src/webextension/list/components/item-fields.css
index 33d4b63c..171a7a83 100644
--- a/src/webextension/list/components/item-fields.css
+++ b/src/webextension/list/components/item-fields.css
@@ -5,7 +5,7 @@
 .item-fields {
   display: grid;
   grid-template-columns: minmax(200px, 1fr);
-  max-width: 320px;
+  max-width: 360px;
 }
 
 .item-fields > label,
@@ -17,12 +17,24 @@
   resize: none;
 }
 
-.first-label {
-  margin-top: 0;
+.input {
+  max-width: 242px;
+}
+
+.password {
+  max-width: 258px;
+}
+
+.notes {
+  min-height: 60px;
+}
+
+.notes-read-only {
+  min-height: 73px;
 }
 
-.copy-button {
-  color: #0060df;
+.first-label {
+  margin-top: 0;
 }
 
 .inline-button {
diff --git a/src/webextension/list/components/item-fields.js b/src/webextension/list/components/item-fields.js
index df00ec0a..97b9c1fc 100644
--- a/src/webextension/list/components/item-fields.js
+++ b/src/webextension/list/components/item-fields.js
@@ -28,26 +28,26 @@ const fieldsPropTypes = PropTypes.shape({
 export function ItemFields({fields, onCopy}) {
   return (
     <div className={styles.itemFields}>
+      <div className={styles.field}>
+        <Localized id="item-fields-title">
+          <LabelText className={styles.firstLabel}>tITLe</LabelText>
+        </Localized>
+        <FieldText data-name="title">{fields.title}</FieldText>
+      </div>
       <div className={styles.field}>
         <Localized id="item-fields-origin">
-          <LabelText className={styles.firstLabel}>oRIGIn</LabelText>
+          <LabelText>oRIGIn</LabelText>
         </Localized>
         <FieldText data-name="origin">
           {fields.origin}
         </FieldText>
       </div>
-      <div className={styles.field}>
-        <Localized id="item-fields-title">
-          <LabelText>tITLe</LabelText>
-        </Localized>
-        <FieldText data-name="title">{fields.title}</FieldText>
-      </div>
       <div className={styles.field}>
         <Localized id="item-fields-username">
           <LabelText>uSERNAMe</LabelText>
         </Localized>
         <div className={styles.inlineButton}>
-          <FieldText monospace data-name="username">
+          <FieldText data-name="username">
             {fields.username}
           </FieldText>
           <Localized id="item-fields-copy-username">
@@ -74,7 +74,7 @@ export function ItemFields({fields, onCopy}) {
         <Localized id="item-fields-notes">
           <LabelText>nOTEs</LabelText>
         </Localized>
-        <FieldText data-name="notes">{fields.notes}</FieldText>
+        <FieldText className={styles.notesReadOnly} data-name="notes">{fields.notes}</FieldText>
       </div>
     </div>
   );
@@ -108,23 +108,23 @@ export class EditItemFields extends React.Component {
     return (
       <div className={styles.itemFields}>
         <label>
-          <Localized id="item-fields-origin">
-            <LabelText className={styles.firstLabel}>oRIGIn</LabelText>
+          <Localized id="item-fields-title">
+            <LabelText className={styles.firstLabel}>tITLe</LabelText>
           </Localized>
-          <Localized id="item-fields-origin-input">
-            <Input type="text"
-                   placeholder="wWw.eXAMPLe.cOm"
-                   ref={(element) => this._firstField = element}
-                   {...controlledProps("origin")}/>
+          <Localized id="item-fields-title-input">
+            <Input className={styles.input} type="text" {...controlledProps("title")}
+                   placeholder="eNTRy nAMe"
+                   ref={(element) => this._firstField = element} />
           </Localized>
         </label>
         <label>
-          <Localized id="item-fields-title">
-            <LabelText>tITLe</LabelText>
+          <Localized id="item-fields-origin">
+            <LabelText>oRIGIn</LabelText>
           </Localized>
-          <Localized id="item-fields-title-input">
-            <Input type="text" {...controlledProps("title")}
-                   placeholder="eNTRy nAMe"/>
+          <Localized id="item-fields-origin-input">
+            <Input className={styles.input} type="text"
+                   placeholder="wWw.eXAMPLe.cOm"
+                   {...controlledProps("origin")}/>
           </Localized>
         </label>
         <label>
@@ -132,7 +132,7 @@ export class EditItemFields extends React.Component {
             <LabelText>uSERNAMe</LabelText>
           </Localized>
           <Localized id="item-fields-username-input">
-            <Input type="text" monospace
+            <Input className={styles.input} type="text"
                    placeholder="nAMe@eXAMPLe.cOm"
                    {...controlledProps("username")}/>
           </Localized>
@@ -141,14 +141,14 @@ export class EditItemFields extends React.Component {
           <Localized id="item-fields-password">
             <LabelText>pASSWORd</LabelText>
           </Localized>
-          <PasswordInput {...controlledProps("password")}/>
+          <PasswordInput className={styles.password} {...controlledProps("password")}/>
         </label>
         <label>
           <Localized id="item-fields-notes">
             <LabelText>nOTEs</LabelText>
           </Localized>
           <Localized id="item-fields-notes-input">
-            <TextArea {...controlledProps("notes", 10000)}/>
+            <TextArea className={styles.notes} {...controlledProps("notes", 10000)}/>
           </Localized>
         </label>
       </div>
diff --git a/src/webextension/list/components/item-list.css b/src/webextension/list/components/item-list.css
index 072c2e83..e0029e0e 100644
--- a/src/webextension/list/components/item-list.css
+++ b/src/webextension/list/components/item-list.css
@@ -5,11 +5,10 @@
 .empty {
   text-align: center;
   white-space: pre-wrap;
-  margin: 1em 1em;
-  padding: 20px;
+  padding: 40px;
   overflow: hidden;
   overflow-wrap: break-word;
-  color: #737373;
+  color: #4a4a4f;
   font-size: 15px;
   line-height: 1.5;
   letter-spacing: 0.2px;
@@ -18,12 +17,5 @@
 .item {
   color: #0c0c0d;
   border-bottom: 1px solid #d7d7db;
-}
-
-.item:nth-child(2n + 1) {
-  background-color: #ededf0;
-}
-
-.item:nth-child(2n) {
-  background-color: #f9f9fa;
+  background-color: #ffffff;
 }
diff --git a/src/webextension/list/components/item-summary.css b/src/webextension/list/components/item-summary.css
index d1beab2a..6f5f45ca 100644
--- a/src/webextension/list/components/item-summary.css
+++ b/src/webextension/list/components/item-summary.css
@@ -3,23 +3,19 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 .item-summary {
-  padding: 0.5em;
+  padding: 16px 20px;
   font-size: 15px;
 }
 
 .item-summary::before {
-  background-image: url(/icons/arrowhead-right-16.svg);
+  background-image: url(/icons/chevron-right.svg);
   background-repeat: no-repeat;
-  background-size: 16px 16px;
+  background-size: 5px 9px;
   content: "";
   float: right;
-  height: 16px;
-  width: 16px;
-  margin: 14px 0;
-}
-
-[data-selected] .item-summary::before {
-  display: none;
+  height: 9px;
+  width: 5px;
+  margin: 16px 0;
 }
 
 .title,
diff --git a/src/webextension/list/components/item-summary.js b/src/webextension/list/components/item-summary.js
index 4ded2352..e6d58d01 100644
--- a/src/webextension/list/components/item-summary.js
+++ b/src/webextension/list/components/item-summary.js
@@ -13,13 +13,15 @@ export default function ItemSummary({id, title, username}) {
   title = title.trim();
   username = username.trim();
 
-  const titleId = `item-summary-${id === NEW_ITEM_ID ? "new-title" : "title"}`;
+  const idModifier = id === NEW_ITEM_ID ? "new-" : "";
+  const titleId = `item-summary-${idModifier}title`;
+  const usernameId = `item-summary-${idModifier}username`;
   return (
     <div className={styles.itemSummary}>
       <Localized id={titleId} $title={title} $length={title.length}>
         <div className={styles.title}>no tITLe</div>
       </Localized>
-      <Localized id="item-summary-username" $username={username}
+      <Localized id={usernameId} $username={username}
                  $length={username.length}>
         <div className={styles.subtitle}>no uSERNAMe</div>
       </Localized>
diff --git a/src/webextension/list/containers/item-filter.js b/src/webextension/list/containers/item-filter.js
index 33986bba..9e573f7b 100644
--- a/src/webextension/list/containers/item-filter.js
+++ b/src/webextension/list/containers/item-filter.js
@@ -3,23 +3,28 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 import { Localized } from "fluent-react";
+import PropTypes from "prop-types";
 import React from "react";
 import { connect } from "react-redux";
 
 import { filterItems } from "../actions";
 import FilterInput from "../../widgets/filter-input";
 
-function ItemFilter(props) {
+function ItemFilter({inputRef, ...props}) {
   return (
     <Localized id="item-filter">
-      <FilterInput placeholder="fILTEr…" {...props}/>
+      <FilterInput placeholder="fILTEr…" ref={inputRef} {...props}/>
     </Localized>
   );
 }
 
+ItemFilter.propTypes = {
+  inputRef: PropTypes.func,
+};
+
 export default connect(
   (state) => ({
-    value: state.filter,
+    value: state.list.filter,
     disabled: state.cache.items.length === 0,
   }),
   (dispatch) => ({
diff --git a/src/webextension/list/manage/components/account-summary.css b/src/webextension/list/manage/components/account-summary.css
index b7004f7a..3c2a8fa3 100644
--- a/src/webextension/list/manage/components/account-summary.css
+++ b/src/webextension/list/manage/components/account-summary.css
@@ -38,13 +38,13 @@
   margin-inline-start: 1ch;
 }
 
-.button:active > .avatar:after {
+.button:active > .avatar::after {
   display: block;
   position: absolute;
   top: 0;
   width: 100%;
   height: 100%;
-  content: '';
+  content: "";
   border-radius: 50%;
   background: rgba(0,0,0,.1);
 }
@@ -68,7 +68,7 @@
      more flexible in the future. */
   top: 60px;
   right: 14px;
-  min-width: 150px;
+  min-width: 160px;
   padding: 8px 0;
   border: 1px solid #d4d4d5;
   border-radius: 6px;
@@ -114,7 +114,7 @@
   color: #0c0c0d;
   display: block;
   width: 100%;
-  text-align: left;
+  text-align: start;
   padding: 8px 16px;
   border-radius: 0;
   cursor: default;
@@ -122,7 +122,7 @@
 
 .dropdown-link:hover,
 .dropdown-link:focus {
-  background-color: #e5effa;
+  background-color: #ededf0;
 }
 
 .dropdown-link:hover,
@@ -135,7 +135,7 @@
 }
 
 .dropdown-link:active {
-  background-color: #cce0f4;
+  background-color: #d7d7db;
   color: #0c0c0d;
 }
 
@@ -146,7 +146,7 @@
   height: 16px;
   background-repeat: no-repeat;
   background-size: 16px 16px;
-  margin-right: 1ch;
+  margin-inline-end: 1ch;
   vertical-align: middle;
   margin-top: -2px;
 }
diff --git a/src/webextension/list/manage/components/app.css b/src/webextension/list/manage/components/app.css
index 91198db6..c678ffa7 100644
--- a/src/webextension/list/manage/components/app.css
+++ b/src/webextension/list/manage/components/app.css
@@ -32,11 +32,15 @@ body > main,
   grid-column-start: span 2;
 }
 
+.navigation > * + * {
+  margin-inline-start: 40px;
+}
+
 .app-main > aside {
   grid-column: 1;
   min-width: 150px;
   min-height: 0;
-  background-color: rgba(215, 215, 219, 0.75);
+  background-color: #ededf0;
   display: grid;
   grid-template-rows: auto 1fr auto;
 }
@@ -48,13 +52,6 @@ body > main,
   overflow: auto;
 }
 
-.filter {
-  border: 1px solid #d1d1d2;
-  border-inline-start: 0px;
-  border-radius: 0;
-}
-
-.filter:focus-within,
-.filter:focus-within:hover {
-  box-shadow: none;
+.filter-bar {
+  padding: 12px;
 }
diff --git a/src/webextension/list/manage/components/app.js b/src/webextension/list/manage/components/app.js
index 2ebbe952..2363e2cc 100644
--- a/src/webextension/list/manage/components/app.js
+++ b/src/webextension/list/manage/components/app.js
@@ -19,31 +19,42 @@ import Toolbar, { ToolbarSpace } from "../../../widgets/toolbar";
 
 import styles from "./app.css";
 
-export default function App() {
-  return (
-    <Localized id="document">
-      <DocumentTitle title="lOCKBOx eNTRIEs">
-        <div className={styles.app}>
-          <section className={styles.appMain}>
-            <Toolbar className={styles.navigation}>
-              <AddItem/>
-              <GoHome/>
-              <ToolbarSpace/>
-              <OpenFAQ/>
-              <SendFeedback/>
-              <CurrentAccountSummary/>
-            </Toolbar>
-            <aside>
-              <ItemFilter className={styles.filter}/>
-              <AllItems/>
-            </aside>
-            <article>
-              <CurrentSelection/>
-            </article>
-          </section>
-          <ModalRoot/>
-        </div>
-      </DocumentTitle>
-    </Localized>
-  );
+export default class App extends React.Component {
+  componentDidMount() {
+    this._filterField.focus(true);
+  }
+
+  render() {
+    return (
+      <Localized id="document">
+        <DocumentTitle title="lOCKBOx eNTRIEs">
+          <div className={styles.app}>
+            <section className={styles.appMain}>
+              <Toolbar className={styles.navigation}>
+                <AddItem/>
+                <GoHome/>
+                <ToolbarSpace/>
+                <OpenFAQ/>
+                <SendFeedback/>
+                <CurrentAccountSummary/>
+              </Toolbar>
+              <aside>
+                <Toolbar className={styles.filterBar}>
+                  <ItemFilter className={styles.filter}
+                              inputRef={(element) => {
+                                this._filterField = element;
+                              }}/>
+                </Toolbar>
+                <AllItems/>
+              </aside>
+              <article>
+                <CurrentSelection/>
+              </article>
+            </section>
+            <ModalRoot/>
+          </div>
+        </DocumentTitle>
+      </Localized>
+    );
+  }
 }
diff --git a/src/webextension/list/manage/components/edit-item-details.js b/src/webextension/list/manage/components/edit-item-details.js
index 98f3f9bd..20649f3d 100644
--- a/src/webextension/list/manage/components/edit-item-details.js
+++ b/src/webextension/list/manage/components/edit-item-details.js
@@ -73,7 +73,7 @@ export default class EditItemDetails extends React.Component {
                         onChange={(e) => this.handleChange(e)}/>
         <Toolbar className={styles.buttons}>
           <Localized id={`item-details-save-${newItem ? "new" : "existing"}`}>
-            <Button type="submit" theme="primary">sAVe</Button>
+            <Button type="submit" theme="primary" size="wide">sAVe</Button>
           </Localized>
           <Localized id="item-details-cancel">
             <Button type="button" onClick={() => onCancel()}>
diff --git a/src/webextension/list/manage/components/intro-page.css b/src/webextension/list/manage/components/intro-page.css
index 1d7eb66a..cf2b95ea 100644
--- a/src/webextension/list/manage/components/intro-page.css
+++ b/src/webextension/list/manage/components/intro-page.css
@@ -8,9 +8,9 @@
   grid-template-columns: 1fr 1fr 1fr;
   grid-template-rows: auto auto auto;
   grid-column-gap: 4em;
-  margin: 4em auto;
+  margin: 8em auto 4em;
   padding: 0 4em;
-  max-width: 800px;
+  max-width: 880px;
 }
 
 .intro-image {
@@ -25,9 +25,9 @@
 
 .intro-image > img {
   width: 100%;
-  border: 1px solid rgba(12, 12, 13, 0.3);
+  border: 1px solid #d7d7db;
   border-radius: 5px;
-  box-shadow: 0 0 10px rgba(12, 12, 13, 0.3);
+  box-shadow: 0 1px 4px rgba(12, 12, 13, 0.1);
 }
 
 .intro-image > h1 {
@@ -37,4 +37,5 @@
 
 .intro-image > p {
   font-size: 15px;
+  line-height: 1.5;
 }
diff --git a/src/webextension/list/manage/components/item-details.css b/src/webextension/list/manage/components/item-details.css
index 6d6b269e..cb5e4d7d 100644
--- a/src/webextension/list/manage/components/item-details.css
+++ b/src/webextension/list/manage/components/item-details.css
@@ -3,13 +3,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 .item-details {
-  padding: 2em;
+  padding: 1em 4.6em 4.6em;
   background-color: #f9f9fa;
 }
 
 .item-details > h1 {
   font-weight: 300;
   font-size: 22px;
+  margin: 0 0 1.5em;
+  padding-bottom: 1em;
+  border-bottom: 1px solid #d7e7db;
 }
 
 .buttons {
diff --git a/src/webextension/list/manage/containers/all-items.css b/src/webextension/list/manage/containers/all-items.css
index ad297ed9..a86672ef 100644
--- a/src/webextension/list/manage/containers/all-items.css
+++ b/src/webextension/list/manage/containers/all-items.css
@@ -7,10 +7,15 @@
 }
 
 .all-items > .item[data-selected] {
-  background-color: #b1b1b3;
+  background-color: #ebF5ff;
+  border-bottom-color: #99bff2;
+  box-shadow: 0 -1px 0 #99bff2;
 }
 
-.all-items:focus > .item[data-selected] {
-  box-shadow: inset 0 0 0 2px #0a84ff;
+.all-items > .item:first-child[data-selected] {
+  border-top-color: #99bff2;
 }
 
+.all-items:focus > .item[data-selected] {
+  box-shadow: inset 0 1px 0 #0a84ff, inset 0 -1px 0 #0a84ff;
+}
diff --git a/src/webextension/list/manage/containers/modals.js b/src/webextension/list/manage/containers/modals.js
index 7a4cc9d7..ffff01c2 100644
--- a/src/webextension/list/manage/containers/modals.js
+++ b/src/webextension/list/manage/containers/modals.js
@@ -12,6 +12,7 @@ import { hideModal, removeItem, cancelEditing, selectItem } from
 export const DeleteItemModal = connect(
   (state) => ({
     l10nId: "modal-delete",
+    theme: "danger",
   }),
   (dispatch, {itemId}) => ({
     onConfirm: () => { dispatch(removeItem(itemId)); },
diff --git a/src/webextension/list/popup/components/app.js b/src/webextension/list/popup/components/app.js
index 2ff5571a..7d6bea99 100644
--- a/src/webextension/list/popup/components/app.js
+++ b/src/webextension/list/popup/components/app.js
@@ -10,14 +10,22 @@ import CurrentSelection from "../containers/current-selection";
 
 import styles from "./app.css";
 
-export default function App() {
-  return (
-    <Localized id="document">
-      <DocumentTitle title="lOCKBOx eNTRIEs">
-        <div className={styles.app}>
-          <CurrentSelection/>
-        </div>
-      </DocumentTitle>
-    </Localized>
-  );
+export default class App extends React.Component {
+  componentDidMount() {
+    this._filterField.focus(true);
+  }
+
+  render() {
+    return (
+      <Localized id="document">
+        <DocumentTitle title="lOCKBOx eNTRIEs">
+          <div className={styles.app}>
+            <CurrentSelection inputRef={(element) => {
+              this._filterField = element;
+            }}/>
+          </div>
+        </DocumentTitle>
+      </Localized>
+    );
+  }
 }
diff --git a/src/webextension/list/popup/components/item-list-panel.js b/src/webextension/list/popup/components/item-list-panel.js
index 27a8d206..eadb8c3a 100644
--- a/src/webextension/list/popup/components/item-list-panel.js
+++ b/src/webextension/list/popup/components/item-list-panel.js
@@ -3,15 +3,15 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 import { Localized } from "fluent-react";
+import PropTypes from "prop-types";
 import React from "react";
 
-import Button from "../../../widgets/button";
-import Panel, { PanelHeader, PanelBody, PanelFooter } from
+import Panel, { PanelHeader, PanelBody, PanelFooter, PanelFooterButton } from
        "../../../widgets/panel";
 import ItemFilter from "../../containers/item-filter";
 import AllItems from "../containers/all-items";
 
-export default function ItemListPanel() {
+export default function ItemListPanel({inputRef}) {
   const openManager = () => {
     browser.runtime.sendMessage({
       type: "open_view",
@@ -23,7 +23,7 @@ export default function ItemListPanel() {
   return (
     <Panel>
       <PanelHeader>
-        <ItemFilter/>
+        <ItemFilter inputRef={inputRef}/>
       </PanelHeader>
 
       <PanelBody>
@@ -32,11 +32,15 @@ export default function ItemListPanel() {
 
       <PanelFooter>
         <Localized id="manage-lockbox-button">
-          <Button theme="ghost" onClick={openManager}>
+          <PanelFooterButton onClick={openManager}>
             mANAGe lOCKBox
-          </Button>
+          </PanelFooterButton>
         </Localized>
       </PanelFooter>
     </Panel>
   );
 }
+
+ItemListPanel.propTypes = {
+  inputRef: PropTypes.func,
+};
diff --git a/src/webextension/list/popup/containers/current-selection.js b/src/webextension/list/popup/containers/current-selection.js
index 15de934b..0510719e 100644
--- a/src/webextension/list/popup/containers/current-selection.js
+++ b/src/webextension/list/popup/containers/current-selection.js
@@ -21,15 +21,16 @@ const ConnectedItemDetailsPanel = connect(
   })
 )(ItemDetailsPanel);
 
-function CurrentSelection({item}) {
+function CurrentSelection({item, inputRef}) {
   if (item) {
     return <ConnectedItemDetailsPanel item={item}/>;
   }
-  return <ItemListPanel/>;
+  return <ItemListPanel inputRef={inputRef}/>;
 }
 
 CurrentSelection.propTypes = {
   item: PropTypes.object,
+  inputRef: PropTypes.func,
 };
 
 export default connect(
diff --git a/src/webextension/list/popup/index.js b/src/webextension/list/popup/index.js
index 0e1abb68..141e3b0c 100644
--- a/src/webextension/list/popup/index.js
+++ b/src/webextension/list/popup/index.js
@@ -10,7 +10,7 @@ import thunk from "redux-thunk";
 
 import AppLocalizationProvider from "../../l10n";
 import App from "./components/app";
-import { listItems } from "../actions";
+import { filterItems, listItems } from "../actions";
 import reducer from "./reducers";
 import initializeMessagePorts from "../message-ports";
 import * as telemetry from "../../telemetry";
@@ -19,6 +19,17 @@ import telemetryLogger from "./telemetry";
 const store = createStore(reducer, undefined, applyMiddleware(
   thunk, telemetryLogger
 ));
+
+// Pre-fill the URL of the current tab.
+// XXX: Eventually, we'll probably want to put this in another file.
+browser.tabs.query({ active: true, currentWindow: true }).then((result) => {
+  const validProtocols = ["http:", "https:"];
+  const url = new URL(result[0].url);
+  if (validProtocols.includes(url.protocol)) {
+    store.dispatch(filterItems(url.hostname));
+  }
+});
+
 store.dispatch(listItems());
 initializeMessagePorts(store);
 
diff --git a/src/webextension/locales/en-US/list.ftl b/src/webextension/locales/en-US/list.ftl
index b83b9041..72b726db 100644
--- a/src/webextension/locales/en-US/list.ftl
+++ b/src/webextension/locales/en-US/list.ftl
@@ -3,10 +3,10 @@
 document
   .title = Lockbox Entries
 
-item-fields-title = Site Name
+item-fields-title = Name
 item-fields-title-input
-  .placeholder = Primary Bank
-item-fields-origin = Site Address
+  .placeholder = e.g. primary bank
+item-fields-origin = Website Address
 item-fields-origin-input
   .placeholder = www.example.com
 item-fields-username = Username
@@ -25,6 +25,7 @@ item-summary-title =
      [0]     (no site name)
     *[other] { $title }
   }
+item-summary-new-username = (enter your login details)
 item-summary-username =
   { $length ->
      [0]     (no username)
@@ -32,7 +33,7 @@ item-summary-username =
   }
 
 item-filter
-  .placeholder = Search Lockbox Entries
+  .placeholder = Search Lockbox
 
 [[manage]]
 
@@ -46,7 +47,7 @@ account-summary-options = Preferences
 account-summary-signout = Sign Out
 
 all-items-empty =
-  When you add an Entry, it automatically shows up here.
+  When you add an entry, it automatically shows up here.
 
 all-items-filtered = No results
 
diff --git a/src/webextension/locales/en-US/unlock.ftl b/src/webextension/locales/en-US/unlock.ftl
index 8c7a8339..9355a850 100644
--- a/src/webextension/locales/en-US/unlock.ftl
+++ b/src/webextension/locales/en-US/unlock.ftl
@@ -1,3 +1,6 @@
+document
+  .title = Unlock Lockbox
+
 unlock-title = { product-title }
 unlock-tagline = { product-tagline }
 
diff --git a/src/webextension/locales/en-US/widgets.ftl b/src/webextension/locales/en-US/widgets.ftl
index 5c48fb59..891625d1 100644
--- a/src/webextension/locales/en-US/widgets.ftl
+++ b/src/webextension/locales/en-US/widgets.ftl
@@ -1,13 +1,16 @@
 copy-to-clipboard-button = Copy
 copy-to-clipboard-copied = ✔ Copied
 
-filter-input-clear = Clear
+filter-input-clear
+  .title = Clear
 
 modal-root
   .contentLabel = Modal dialog
 
-password-input-show = Show
-password-input-hide = Hide
+password-input-show
+  .title = Show
+password-input-hide 
+  .title = Hide
 
 panel-back-button
   .alt = Go Back
diff --git a/src/webextension/settings/components/app.css b/src/webextension/settings/components/app.css
index 43efcb73..5211cf21 100644
--- a/src/webextension/settings/components/app.css
+++ b/src/webextension/settings/components/app.css
@@ -2,12 +2,18 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+html {
+ display: flex;
+}
+
 body {
   padding: 0;
-  margin: 0;
+  margin: 1em;
+  min-height: 150px;
   color: #0c0c0d;
   background-color: #f9f9fa;
   font: caption;
   font-size: 13px;
   -moz-user-select: none;
+  display: flex;
 }
diff --git a/src/webextension/settings/containers/modals.js b/src/webextension/settings/containers/modals.js
index 554fb11f..2635120f 100644
--- a/src/webextension/settings/containers/modals.js
+++ b/src/webextension/settings/containers/modals.js
@@ -11,6 +11,7 @@ import { hideModal, localReset } from "../actions";
 export const LocalResetModal = connect(
   (state) => ({
     l10nId: "modal-local-reset",
+    theme: "danger",
   }),
   (dispatch) => ({
     onConfirm: () => { dispatch(localReset()); },
diff --git a/src/webextension/unlock/components/app.css b/src/webextension/unlock/components/app.css
index f9aab67f..a5ce7b30 100644
--- a/src/webextension/unlock/components/app.css
+++ b/src/webextension/unlock/components/app.css
@@ -5,70 +5,40 @@
 body {
   padding: 0;
   margin: 0;
-  width: 344px;
+  width: 320px;
   color: #0c0c0d;
-  background-color: #f9f9fa;
+  background-color: #ededf0;
   font: caption;
   font-size: 13px;
   -moz-user-select: none;
 }
 
-.unlock {
-  margin: 0;
-  display: flex;
-  flex-flow: column nowrap;
-  align-items: center;
+.lockie {
+  display: block;
+  margin: 3em auto 0;
+  width: 200px;
 }
 
-.unlock > img {
-  margin: 2em auto;
-  width: 229px;
-}
-
-.unlock > .content {
-  margin: 2em auto;
-  width: 229px;
+.unlock-content {
+  margin: 1em auto 3em;
+  width: 250px;
   display: flex;
   flex-flow: column nowrap;
   align-items: center;
 }
 
-.unlock > .content > h1 {
-  font-size: 2em;
-  font-weight: bold;
+.unlock-content > h1 {
+  font-size: 2.5em;
+  font-weight: 300;
   text-align: center;
-  margin: 0 0 .5em;
+  margin: 0 0 0.25em;
 }
 
-.unlock > .content > h2 {
-  font-size: 1.5em;
-  font-weight: normal;
+.unlock-content > h2 {
+  font-size: 1.3em;
+  font-weight: 300;
   font-style: italic;
   text-align: center;
   text-transform: lowercase;
   margin: 0;
 }
-
-.unlock > menu {
-  margin: 0;
-  padding: 0;
-  width: 100vw;
-  display: flex;
-  flex-flow: row nowrap;
-  align-items: stretch;
-}
-
-.unlock > menu > * {
-  width: 50%;
-  flex-grow: 1;
-  border-top-left-radius: 0;
-  border-top-right-radius: 0;
-}
-
-.unlock > menu > *:first-child {
-  border-bottom-right-radius: 0;
-}
-
-.unlock > menu > *:last-child {
-  border-bottom-left-radius: 0;
-}
diff --git a/src/webextension/unlock/components/app.js b/src/webextension/unlock/components/app.js
index 5ec9ddec..c3e98185 100644
--- a/src/webextension/unlock/components/app.js
+++ b/src/webextension/unlock/components/app.js
@@ -4,8 +4,10 @@
 
 import { Localized } from "fluent-react";
 import React from "react";
+import DocumentTitle from "react-document-title";
 
-import Button from "../../widgets/button";
+import Panel, { PanelBody, PanelFooter, PanelFooterButton }
+       from "../../widgets/panel";
 import * as telemetry from "../../telemetry";
 
 import styles from "./app.css";
@@ -26,27 +28,35 @@ export default function App() {
   };
 
   return (
-    <article className={styles.unlock}>
-      <img src={imgSrc} alt="" />
-      <section className={styles.content}>
-        <Localized id="unlock-title">
-          <h1>lOCKBOx</h1>
-        </Localized>
-        <Localized id="unlock-tagline">
-          <h2>lOCKBOx tAGLINe</h2>
-        </Localized>
-      </section>
-      <menu>
-        <Localized id="unlock-action-signin">
-          <Button size="puffy"
-                  theme="primary"
-                  onClick={doSignIn}>sIGn iN</Button>
-        </Localized>
-        <Localized id="unlock-action-prefs">
-          <Button size="puffy"
-                  onClick={doPrefs}>pREFs</Button>
-        </Localized>
-      </menu>
-    </article>
+    <Localized id="document">
+      <DocumentTitle title="lOCKBOx eNTRIEs">
+        <Panel>
+          <PanelBody>
+            <img className={styles.lockie} src={imgSrc} alt=""/>
+            <section className={styles.unlockContent}>
+              <Localized id="unlock-title">
+                <h1>lOCKBOx</h1>
+              </Localized>
+              <Localized id="unlock-tagline">
+                <h2>lOCKBOx tAGLINe</h2>
+              </Localized>
+            </section>
+          </PanelBody>
+
+          <PanelFooter>
+            <Localized id="unlock-action-signin">
+              <PanelFooterButton theme="primary" onClick={doSignIn}>
+                sIGn iN
+              </PanelFooterButton>
+            </Localized>
+            <Localized id="unlock-action-prefs">
+              <PanelFooterButton onClick={doPrefs}>
+                pREFs
+              </PanelFooterButton>
+            </Localized>
+          </PanelFooter>
+        </Panel>
+      </DocumentTitle>
+    </Localized>
   );
 }
diff --git a/src/webextension/widgets/button.css b/src/webextension/widgets/button.css
index 24859385..356beafb 100644
--- a/src/webextension/widgets/button.css
+++ b/src/webextension/widgets/button.css
@@ -25,6 +25,10 @@
   box-shadow: 0 0 0 1px #0a84ff inset, 0 0 0 1px #0a84ff, 0 0 0 4px rgba(10, 132, 255, 0.3);
 }
 
+.button.danger-theme:focus {
+  box-shadow: 0 0 0 1px #ff0039 inset, 0 0 0 1px #ff0039, 0 0 0 4px rgba(215, 0, 34, 0.3);
+}
+
 .button::-moz-focus-inner {
   border: none;
 }
@@ -44,6 +48,11 @@
   background-color: transparent;
 }
 
+.danger-theme {
+  color: #ffffff;
+  background-color: #d70022;
+}
+
 .primary-theme:not([disabled]):hover {
   background-color: #003eaa;
 }
@@ -71,10 +80,10 @@
 
 .normal-size {
   height: 32px;
-  min-width: 80px;
   padding: 0 8px;
   font-size: 13px;
   border-radius: 2px;
+  min-width: 80px;
 }
 
 .micro-size {
@@ -83,3 +92,7 @@
   font-size: 11px;
   border-radius: 2px;
 }
+
+.wide-size {
+  min-width: 132px;
+}
diff --git a/src/webextension/widgets/button.js b/src/webextension/widgets/button.js
index 335691e5..b072b908 100644
--- a/src/webextension/widgets/button.js
+++ b/src/webextension/widgets/button.js
@@ -11,12 +11,14 @@ const THEME_CLASS_NAME = {
   primary: `${styles.primaryTheme}`,
   normal: `${styles.normalTheme}`,
   ghost: `${styles.ghostTheme}`,
+  danger: `${styles.dangerTheme}`,
 };
 
 const SIZE_CLASS_NAME = {
   puffy: `${styles.puffySize}`,
   normal: `${styles.normalSize}`,
   micro: `${styles.microSize}`,
+  wide: `${styles.normalSize} ${styles.wideSize}`,
 };
 
 export default class Button extends React.Component {
diff --git a/src/webextension/widgets/dialog-box.css b/src/webextension/widgets/dialog-box.css
index 2a3f2bba..ae4e947a 100644
--- a/src/webextension/widgets/dialog-box.css
+++ b/src/webextension/widgets/dialog-box.css
@@ -3,17 +3,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 .modal-dialog {
-  padding: 1em;
-  font-size: 17px;
+  padding: 1.5em 1.5em 1em;
+  font-size: 22px;
   font-weight: 300;
   text-align: center;
 }
 
 .modal-dialog > menu {
-  margin: 1em 0 0 0;
+  margin: 1.5em 0 0 0;
   padding: 0;
 }
 
 .modal-dialog > menu > button + button {
-  margin-inline-start: 1ch;
+  margin-inline-start: 2.5ch;
 }
diff --git a/src/webextension/widgets/dialog-box.js b/src/webextension/widgets/dialog-box.js
index b53ede4d..8423d120 100644
--- a/src/webextension/widgets/dialog-box.js
+++ b/src/webextension/widgets/dialog-box.js
@@ -14,7 +14,15 @@ export default class DialogBox extends React.Component {
   static get propTypes() {
     return {
       children: PropTypes.node.isRequired,
-      buttonLabels: PropTypes.arrayOf(PropTypes.string).isRequired,
+      buttons: PropTypes.arrayOf(
+        PropTypes.oneOf([
+          PropTypes.shape({ label: PropTypes.string }),
+          PropTypes.shape({
+            label: PropTypes.string,
+            theme: Button.propTypes.theme,
+          }),
+        ])
+      ).isRequired,
       onClick: PropTypes.func.isRequired,
       onClose: PropTypes.func.isRequired,
     };
@@ -25,25 +33,27 @@ export default class DialogBox extends React.Component {
   }
 
   render() {
-    const {children, buttonLabels, onClick, onClose} = this.props;
+    const {children, buttons, onClick, onClose} = this.props;
     return (
       <section className={styles.modalDialog}>
         <div>
           {children}
         </div>
         <menu>
-          {buttonLabels.map((label, i) => {
-            let primaryProps = {};
+          {buttons.map(({label, theme}, i) => {
+            let extraProps = {};
             if (i === 0) {
-              primaryProps = {
-                theme: "primary",
+              if (!theme) {
+                theme = "primary";
+              }
+              extraProps = {
                 ref: (element) => this._primaryButton = element,
               };
             }
 
             return (
               <Button key={i} onClick={() => { onClick(i); onClose(); }}
-                      {...primaryProps}>
+                      theme={theme} {...extraProps}>
                 {label}
               </Button>
             );
@@ -54,10 +64,13 @@ export default class DialogBox extends React.Component {
   }
 }
 
-export function ConfirmDialog({confirmLabel, cancelLabel, onConfirm,
+export function ConfirmDialog({confirmLabel, cancelLabel, theme, onConfirm,
                                ...props}) {
   return (
-    <DialogBox buttonLabels={[confirmLabel, cancelLabel]}
+    <DialogBox buttons={[
+                 {label: confirmLabel, theme},
+                 {label: cancelLabel},
+               ]}
                onClick={(i) => { if (i === 0) { onConfirm(); } }}
                {...props}/>
   );
@@ -67,14 +80,15 @@ ConfirmDialog.propTypes = {
   children: PropTypes.node.isRequired,
   confirmLabel: PropTypes.string.isRequired,
   cancelLabel: PropTypes.string.isRequired,
+  theme: Button.propTypes.theme,
   onConfirm: PropTypes.func.isRequired,
   onClose: PropTypes.func.isRequired,
 };
 
-export function LocalizedConfirmDialog({l10nId, onConfirm, onClose}) {
+export function LocalizedConfirmDialog({l10nId, theme, onConfirm, onClose}) {
   return (
     <Localized id={l10nId}>
-      <ConfirmDialog confirmLabel="yEs" cancelLabel="no"
+      <ConfirmDialog confirmLabel="yEs" cancelLabel="no" theme={theme}
                      onConfirm={onConfirm} onClose={onClose}>
         aRe yOu sURe?
       </ConfirmDialog>
@@ -84,6 +98,7 @@ export function LocalizedConfirmDialog({l10nId, onConfirm, onClose}) {
 
 LocalizedConfirmDialog.propTypes = {
   l10nId: PropTypes.string.isRequired,
+  theme: Button.propTypes.theme,
   onConfirm: PropTypes.func.isRequired,
   onClose: PropTypes.func.isRequired,
 };
diff --git a/src/webextension/widgets/filter-input.js b/src/webextension/widgets/filter-input.js
index 403e0fc8..c0e2c9f8 100644
--- a/src/webextension/widgets/filter-input.js
+++ b/src/webextension/widgets/filter-input.js
@@ -43,24 +43,29 @@ export default class FilterInput extends React.Component {
     }
   }
 
+  focus(select = false) {
+    this.inputElement.focus();
+    if (select) {
+      this.inputElement.setSelectionRange(0, this.inputElement.value.length);
+    }
+  }
+
   render() {
     // eslint-disable-next-line no-unused-vars
     const {className, onChange, value, disabled, ...props} = this.props;
     const disabledClass = disabled ? ` ${styles.disabled}` : "";
     const finalClassName = (
-      `${styles.inputWrapper}${disabledClass} ${className}`
+      `${styles.filter} ${styles.inputWrapper}${disabledClass} ${className}`
     ).trimRight();
 
     return (
       <div className={finalClassName}>
-        <input type="search" {...props} disabled={disabled}
-               value={this.state.value}
-               onChange={(e) => this.updateValue(e.target.value)}/>
+        <input type="search" disabled={disabled} value={this.state.value}
+               onChange={(e) => this.updateValue(e.target.value)}
+               ref={(element) => this.inputElement = element} {...props}/>
         <Localized id="filter-input-clear">
-          <button type="button" disabled={disabled}
-                  onClick={() => this.updateValue("")}>
-            cLEAr
-          </button>
+          <button type="button" title="cLEAr" disabled={disabled}
+                  onClick={() => this.updateValue("")}/>
         </Localized>
       </div>
     );
diff --git a/src/webextension/widgets/input.css b/src/webextension/widgets/input.css
index 4e4be3e2..3fa5c2d9 100644
--- a/src/webextension/widgets/input.css
+++ b/src/webextension/widgets/input.css
@@ -15,23 +15,27 @@
 .input-wrapper {
   height: 30px;
   width: -moz-available;
-  background-color: #f9f9fa;
+  background-color: #ffffff;
   border: 1px solid rgba(12, 12, 13, 0.3);
   border-radius: 2px;
 }
 
 .input[disabled],
 .input-wrapper.disabled {
-  background-color: #ededf0;
+  opacity: 0.7;
   cursor: not-allowed;
 }
 
 .input {
   padding: 0 8px;
-  font-size: 13px;
+  font-size: 15px;
   color: #0c0c0d;
 }
 
+input::placeholder {
+  color: #737373;
+}
+
 .input:not([disabled]):hover,
 .input-wrapper:not(.disabled):hover {
   border-color: rgba(12, 12, 13, 0.5);
@@ -69,7 +73,7 @@
 .input-wrapper button {
   white-space: nowrap;
   text-align: center;
-  height: 28px;
+  height: 30px;
   font-size: 13px;
   border: 0;
   color: #0060df;
@@ -97,9 +101,65 @@
   -moz-user-select: text;
   overflow: hidden;
   overflow-wrap: break-word;
+  white-space: pre-wrap;
 }
 
 .label-text {
-  margin: 10px 0 3px 0;
+  margin: 16px 0 4px 0;
   font-size: 13px;
 }
+
+.password button::before {
+  background-repeat: no-repeat;
+  background-size: 16px 16px;
+  content: "";
+  display: inline-block;
+  height: 16px;
+  width: 16px;
+}
+
+.show-btn::before {
+  background-image: url(/icons/show.svg);
+}
+
+.hide-btn::before {
+  background-image: url(/icons/hide.svg);
+}
+
+.filter {
+  position: relative;
+}
+
+.filter::before {
+  content: "";
+  display: block;
+  background-image: url(/icons/search.svg);
+  background-repeat: no-repeat;
+  background-size: 16px 16px;
+  height: 16px;
+  width: 16px;
+  position: absolute;
+  top: 7px;
+  left: 8px;
+}
+
+.filter input {
+  padding-left: 32px;
+}
+
+.filter button {
+  padding: 0;
+  width: 32px;
+  height: 100%;
+}
+
+.filter button::before {
+  background-image: url(/icons/clear.svg);
+  background-repeat: no-repeat;
+  background-size: 16px 16px;
+  content: "";
+  float: right;
+  height: 16px;
+  width: 16px;
+  margin-right: 8px;
+}
diff --git a/src/webextension/widgets/input.js b/src/webextension/widgets/input.js
index fd7815c0..5ee56d64 100644
--- a/src/webextension/widgets/input.js
+++ b/src/webextension/widgets/input.js
@@ -22,8 +22,11 @@ export default class Input extends React.Component {
     };
   }
 
-  focus() {
+  focus(select = false) {
     this.inputElement.focus();
+    if (select) {
+      this.inputElement.setSelectionRange(0, this.inputElement.value.length);
+    }
   }
 
   render() {
diff --git a/src/webextension/widgets/panel.css b/src/webextension/widgets/panel.css
index 572715f5..3270877f 100644
--- a/src/webextension/widgets/panel.css
+++ b/src/webextension/widgets/panel.css
@@ -15,9 +15,7 @@
   font-weight: 500;
   height: 32px;
   padding: 2px 5px;
-  /* Ensure the box shadow overlays the body. */
-  z-index: 10;
-  box-shadow: 0 -3px 3px 3px rgba(12, 12, 13, 0.5);
+  border-bottom: 1px solid rgba(12, 12, 13, 0.3);
 }
 
 .panel-header > span {
@@ -35,11 +33,54 @@
 .panel-footer {
   display: flex;
   align-items: center;
-  justify-content: center;
-  height: 32px;
-  padding: 12px;
-  text-align: center;
-  /* Ensure the box shadow overlays the body. */
-  z-index: 10;
-  box-shadow: 0 5px 5px 5px rgba(12, 12, 13, 0.5);
+  min-height: 40px;
+  border-top: 1px solid rgba(12, 12, 13, 0.3);
+}
+
+.panel-footer-button {
+  flex: 1;
+  height: 40px;
+  padding: 0 16px;
+  font-size: 13px;
+}
+
+.panel-footer-button:focus {
+  box-shadow: inset 0 0 0 2px #0a84ff;
+}
+
+.panel-footer-button + .panel-footer-button {
+  border-inline-start: 1px solid rgba(12, 12, 13, 0.3);
+}
+
+.primary-theme {
+  color: #ffffff;
+  background-color: #0060df;
+  /* This color is the equivalent of #0060df overlaid by
+     rgba(12, 12, 13, 0.3). */
+  box-shadow: 0 -1px #03469e;
+}
+
+.primary-theme:focus {
+  box-shadow: 0 -1px #03469e, inset 0 0 0 2px #0a84ff;
+}
+
+.normal-theme {
+  color: #262626;
+  background-color: #f9f9fa;
+}
+
+.primary-theme:not([disabled]):hover {
+  background-color: #003eaa;
+}
+
+.normal-theme:not([disabled]):hover {
+  background-color: #d7d7db;
+}
+
+.primary-theme:not([disabled]):active:hover {
+  background-color: #002275;
+}
+
+.normal-theme:not([disabled]):active:hover {
+  background-color: #b1b1b3;
 }
diff --git a/src/webextension/widgets/panel.js b/src/webextension/widgets/panel.js
index 08325ee3..5d830271 100644
--- a/src/webextension/widgets/panel.js
+++ b/src/webextension/widgets/panel.js
@@ -8,6 +8,7 @@ import PropTypes from "prop-types";
 
 import Button from "./button";
 
+import buttonStyles from "./button.css";
 import styles from "./panel.css";
 
 export function PanelHeader({className, onBack, children}) {
@@ -73,6 +74,45 @@ PanelFooter.defaultProps = {
   className: "",
 };
 
+const THEME_CLASS_NAME = {
+  primary: `${styles.primaryTheme}`,
+  normal: `${styles.normalTheme}`,
+};
+
+export class PanelFooterButton extends React.Component {
+  static get propTypes() {
+    return {
+      theme: PropTypes.oneOf(Object.keys(THEME_CLASS_NAME)),
+      className: PropTypes.string,
+    };
+  }
+
+  static get defaultProps() {
+    return {
+      theme: "normal",
+      className: "",
+    };
+  }
+
+  focus() {
+    this.buttonElement.focus();
+  }
+
+  render() {
+    const {theme, className, ...props} = this.props;
+    const themeClass = THEME_CLASS_NAME[theme];
+    const finalClassName = (
+      `${buttonStyles.button} ${styles.panelFooterButton} ${themeClass} ` +
+      `${className}`
+    ).trimRight();
+
+    return (
+      <button className={finalClassName} {...props}
+              ref={(element) => this.buttonElement = element}/>
+    );
+  }
+}
+
 export default function Panel({className, children}) {
   const finalClassName = `${styles.panel} ${className}`.trimRight();
   return (
diff --git a/src/webextension/widgets/password-input.js b/src/webextension/widgets/password-input.js
index c11d8de0..f2024edd 100644
--- a/src/webextension/widgets/password-input.js
+++ b/src/webextension/widgets/password-input.js
@@ -48,7 +48,7 @@ export default class PasswordInput extends React.Component {
     const {showPassword} = this.state;
     const disabledClass = disabled ? ` ${styles.disabled}` : "";
     const finalClassName = (
-      `${styles.inputWrapper}${disabledClass} ${className}`
+      `${styles.password} ${styles.inputWrapper}${disabledClass} ${className}`
     ).trimRight();
     const selectedIndex = showPassword ? 1 : 0;
 
@@ -59,12 +59,12 @@ export default class PasswordInput extends React.Component {
                ref={(element) => this.inputElement = element} {...props}/>
         <ButtonStack selectedIndex={selectedIndex}>
           <Localized id="password-input-show">
-            <button type="button" disabled={disabled}
-                    onClick={() => this.showPassword(true)}>sHOw</button>
+            <button className={styles.showBtn} type="button" title="sHOw" disabled={disabled}
+                    onClick={() => this.showPassword(true)}></button>
           </Localized>
           <Localized id="password-input-hide">
-            <button type="button" disabled={disabled}
-                    onClick={() => this.showPassword(false)}>hIDe</button>
+            <button className={styles.hideBtn} type="button" title="hIDe" disabled={disabled}
+                    onClick={() => this.showPassword(false)}></button>
           </Localized>
         </ButtonStack>
       </div>
diff --git a/src/webextension/widgets/text-area.css b/src/webextension/widgets/text-area.css
index 46b159ae..bae03be3 100644
--- a/src/webextension/widgets/text-area.css
+++ b/src/webextension/widgets/text-area.css
@@ -7,7 +7,7 @@
   font: caption;
   font-size: 13px;
   color: #0c0c0d;
-  background-color: #f9f9fa;
+  background-color: #ffffff;
   border: 1px solid rgba(12, 12, 13, 0.3);
   border-radius: 2px;
 }
@@ -18,7 +18,7 @@
 
 .text-area:focus {
   border-color: #0a84ff;
-  /* Note: This is a best-guess from the screenshots for the Photon spec, since
-     the box shadow isn't actually specified. */
-  box-shadow: 0 0 3px rgba(10, 168, 255, 0.5);
+  /* Note: This is adapted from the Photon button spec, since the input fields
+     spec doesn't define this. */
+  box-shadow: 0 0 0 3px rgba(10, 132, 255, 0.3);
 }
diff --git a/src/webextension/widgets/text-area.js b/src/webextension/widgets/text-area.js
index 0e80dece..26e984d5 100644
--- a/src/webextension/widgets/text-area.js
+++ b/src/webextension/widgets/text-area.js
@@ -20,8 +20,13 @@ export default class TextArea extends React.Component {
     };
   }
 
-  focus() {
+  focus(select = false) {
     this.textAreaElement.focus();
+    if (select) {
+      this.textAreaElement.setSelectionRange(
+        0, this.textAreaElement.value.length
+      );
+    }
   }
 
   render() {
diff --git a/src/webextension/widgets/toolbar.css b/src/webextension/widgets/toolbar.css
index 5afe3229..32372ba9 100644
--- a/src/webextension/widgets/toolbar.css
+++ b/src/webextension/widgets/toolbar.css
@@ -4,13 +4,13 @@
 
 .toolbar {
   margin: 0;
-  padding: 1ch;
+  padding: 10px;
   display: flex;
   align-items: center;
 }
 
 .toolbar > * + * {
-  margin-inline-start: 5ch;
+  margin-inline-start: 20px;
 }
 
 .toolbar-space {
diff --git a/test/unit/background/telemetry-test.js b/test/unit/background/telemetry-test.js
index e956e916..41744c3a 100644
--- a/test/unit/background/telemetry-test.js
+++ b/test/unit/background/telemetry-test.js
@@ -38,6 +38,16 @@ describe("background > telemetry", () => {
       });
     });
 
+    it("setScalar()", async () => {
+      const result = await telemetry.setScalar("name", "value");
+      expect(result).to.deep.equal({});
+      expect(onMessage).to.have.been.calledWith({
+        type: "telemetry_scalar",
+        name: "name",
+        value: "value",
+      });
+    });
+
     it("recordEvent() with extra", async () => {
       const result = await telemetry.recordEvent("method", "object",
                                                  {extra: "value"});
diff --git a/test/unit/bootstrap-test.js b/test/unit/bootstrap-test.js
index ad5ceccf..d144f36e 100644
--- a/test/unit/bootstrap-test.js
+++ b/test/unit/bootstrap-test.js
@@ -41,10 +41,16 @@ describe("bootstrap", () => {
       }});
 
       await waitUntil(() => webextStartup.callCount === 1);
-      const result = await browser.runtime.sendMessage(
+      let result;
+      result = await browser.runtime.sendMessage(
         {type: "telemetry_event"}
       );
       expect(result).to.deep.equal({});
+
+      result = await browser.runtime.sendMessage(
+        {type: "telemetry_scalar"}
+      );
+      expect(result).to.deep.equal({});
     });
 
     it("re-registering telemetry doesn't throw", async () => {
@@ -59,6 +65,18 @@ describe("bootstrap", () => {
       await waitUntil(() => webextStartup.callCount === 1);
     });
 
+    it("re-registering scalar doesn't throw", async () => {
+      sinon.stub(Services.telemetry, "registerScalars").throws(new Error(
+        "Attempt to register scalar that is already registered."
+      ));
+      expect(() => startup({webExtension: {
+        startup: webextStartup,
+      }})).to.not.throw();
+      Services.telemetry.registerScalars.restore();
+
+      await waitUntil(() => webextStartup.callCount === 1);
+    });
+
     it("other errors do throw", () => {
       sinon.stub(Services.telemetry, "registerEvents").throws(new Error(
         "something else"
diff --git a/test/unit/chai-focus.js b/test/unit/chai-focus.js
index 13767e5c..089b763c 100644
--- a/test/unit/chai-focus.js
+++ b/test/unit/chai-focus.js
@@ -17,4 +17,21 @@ export default function chaiFocus(chai, utils) {
       doc.activeElement.tagName
     );
   });
+
+  chai.Assertion.addMethod("selection", function(start = 0, end = null) {
+    const obj = this._obj instanceof ReactWrapper ? this._obj.instance() :
+                this._obj;
+
+    if (end === null) {
+      end = obj.value.length;
+    }
+
+    this.assert(
+      obj.selectionStart === start && obj.selectionEnd === end,
+      "expected #{exp} of #{this} to be selected but got #{act}",
+      "expected not #{exp} of #{this} to be selected",
+      `[${start}, ${end})`,
+      `[${obj.selectionStart}, ${obj.selectionEnd})`,
+    );
+  });
 }
diff --git a/test/unit/common.js b/test/unit/common.js
index 87a75681..525eac1e 100644
--- a/test/unit/common.js
+++ b/test/unit/common.js
@@ -2,7 +2,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-export function simulateTyping(wrapper, value) {
-  wrapper.instance().value = value;
+export function simulateTyping(wrapper, value, {clear = false} = {}) {
+  if (clear) {
+    wrapper.instance().value = value;
+  } else {
+    wrapper.instance().value += value;
+  }
   wrapper.simulate("change");
 }
diff --git a/test/unit/list/components/item-summary-test.js b/test/unit/list/components/item-summary-test.js
index 5ee44e83..29a6443e 100644
--- a/test/unit/list/components/item-summary-test.js
+++ b/test/unit/list/components/item-summary-test.js
@@ -34,7 +34,7 @@ describe("list > components > <ItemSummary/>", () => {
       "id", "item-summary-new-title"
     );
     expect(wrapper.find(Localized).at(1)).to.have.prop(
-      "id", "item-summary-username"
+      "id", "item-summary-new-username"
     );
   });
 });
diff --git a/test/unit/list/containers/item-filter-test.js b/test/unit/list/containers/item-filter-test.js
index 4556cf43..4f8e13e9 100644
--- a/test/unit/list/containers/item-filter-test.js
+++ b/test/unit/list/containers/item-filter-test.js
@@ -2,7 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-import { expect } from "chai";
+import chai, { expect } from "chai";
+import chaiEnzyme from "chai-enzyme";
 import React from "react";
 import configureStore from "redux-mock-store";
 import { Provider } from "react-redux";
@@ -14,6 +15,8 @@ import { filledState } from "../manage/mock-redux-state";
 import { FILTER_ITEMS } from "src/webextension/list/actions";
 import ItemFilter from "src/webextension/list/containers/item-filter";
 
+chai.use(chaiEnzyme());
+
 const middlewares = [thunk];
 const mockStore = configureStore(middlewares);
 
@@ -21,7 +24,13 @@ describe("list > containers > <ItemFilter/>", () => {
   let store, wrapper;
 
   beforeEach(() => {
-    store = mockStore(filledState);
+    store = mockStore({
+      ...filledState,
+      list: {
+        ...filledState.list,
+        filter: "filter",
+      },
+    });
     wrapper = mountWithL10n(
       <Provider store={store}>
         <ItemFilter/>
@@ -29,20 +38,23 @@ describe("list > containers > <ItemFilter/>", () => {
     );
   });
 
+  it("filter rendered", () => {
+    expect(wrapper.find("input")).to.have.prop("value", "filter");
+  });
+
   it("filterItems() dispatched on text input", () => {
-    simulateTyping(wrapper.find("input"), "my filter");
+    simulateTyping(wrapper.find("input"), "text");
 
     expect(store.getActions()[0]).to.deep.equal({
       type: FILTER_ITEMS,
-      filter: "my filter",
+      filter: "filtertext",
     });
   });
 
   it("filterItems() dispatched on reset", () => {
-    simulateTyping(wrapper.find("input"), "my filter");
     wrapper.find("button").simulate("click");
 
-    expect(store.getActions()[1]).to.deep.equal({
+    expect(store.getActions()[0]).to.deep.equal({
       type: FILTER_ITEMS,
       filter: "",
     });
diff --git a/test/unit/list/manage/components/app-test.js b/test/unit/list/manage/components/app-test.js
index e18718d1..1789ca6f 100644
--- a/test/unit/list/manage/components/app-test.js
+++ b/test/unit/list/manage/components/app-test.js
@@ -9,8 +9,9 @@ import React from "react";
 import configureStore from "redux-mock-store";
 import { Provider } from "react-redux";
 
-import { initialState } from "../mock-redux-state";
-import mountWithL10n from "test/mocks/l10n";
+import { initialState, filledState } from "../mock-redux-state";
+import chaiFocus from "test/chai-focus";
+import mountWithL10n, { mountWithL10nIntoDOM } from "test/mocks/l10n";
 import App from "src/webextension/list/manage/components/app";
 import AddItem from "src/webextension/list/manage/containers/add-item";
 import AllItems from "src/webextension/list/manage/containers/all-items";
@@ -19,6 +20,7 @@ import CurrentSelection from
 import ModalRootWidget from "src/webextension/widgets/modal-root";
 
 chai.use(chaiEnzyme());
+chai.use(chaiFocus);
 
 const middlewares = [];
 const mockStore = configureStore(middlewares);
@@ -58,4 +60,22 @@ describe("list > manage > components > <App/>", () => {
     expect(wrapper).to.contain(<AllItems/>);
     expect(wrapper).to.contain(<CurrentSelection/>);
   });
+
+  it("filter input focused/selected", () => {
+    const store = mockStore({
+      ...filledState,
+      list: {
+        ...filledState.list,
+        filter: "filter",
+      },
+    });
+    const wrapper = mountWithL10nIntoDOM(
+      <Provider store={store}>
+        <App/>
+      </Provider>
+    );
+
+    expect(wrapper.find("input")).to.be.focused();
+    expect(wrapper.find("input")).to.have.selection();
+  });
 });
diff --git a/test/unit/list/manage/components/edit-item-details-test.js b/test/unit/list/manage/components/edit-item-details-test.js
index d725a5e8..65f82b3f 100644
--- a/test/unit/list/manage/components/edit-item-details-test.js
+++ b/test/unit/list/manage/components/edit-item-details-test.js
@@ -124,7 +124,7 @@ describe("list > manage > components > <EditItemDetails/>", () => {
       for (let i in updatedFields) {
         simulateTyping(wrapper.find(`[name="${i}"]`).filterWhere((x) => {
           return typeof x.type() === "string";
-        }), updatedFields[i]);
+        }), updatedFields[i], {clear: true});
       }
       wrapper.findWhere((x) => x.prop("id") === "item-details-save-existing")
              .find("button").simulate("submit");
diff --git a/test/unit/list/popup/components/app-test.js b/test/unit/list/popup/components/app-test.js
index 7ac2df4f..987165fd 100644
--- a/test/unit/list/popup/components/app-test.js
+++ b/test/unit/list/popup/components/app-test.js
@@ -8,13 +8,15 @@ import React from "react";
 import configureStore from "redux-mock-store";
 import { Provider } from "react-redux";
 
-import { initialState } from "../mock-redux-state";
-import mountWithL10n from "test/mocks/l10n";
+import { initialState, filledState } from "../mock-redux-state";
+import chaiFocus from "test/chai-focus";
+import mountWithL10n, { mountWithL10nIntoDOM } from "test/mocks/l10n";
 import App from "src/webextension/list/popup/components/app";
 import CurrentSelection from
        "src/webextension/list/popup/containers/current-selection";
 
 chai.use(chaiEnzyme());
+chai.use(chaiFocus);
 
 const middlewares = [];
 const mockStore = configureStore(middlewares);
@@ -28,6 +30,29 @@ describe("list > popup > components > <App/>", () => {
       </Provider>
     );
 
-    expect(wrapper).to.contain(<CurrentSelection/>);
+    expect(wrapper).to.have.descendants(CurrentSelection);
+  });
+
+  it("filter input focused/selected", () => {
+    const store = mockStore({
+      ...filledState,
+      cache: {
+        ...filledState.cache,
+        currentItem: null,
+      },
+      list: {
+        ...filledState.list,
+        filter: "filter",
+        selectedItemid: null,
+      },
+    });
+    const wrapper = mountWithL10nIntoDOM(
+      <Provider store={store}>
+        <App/>
+      </Provider>
+    );
+
+    expect(wrapper.find("input")).to.be.focused();
+    expect(wrapper.find("input")).to.have.selection();
   });
 });
diff --git a/test/unit/mocks/xpcom.js b/test/unit/mocks/xpcom.js
index dadd1f5f..336c2805 100644
--- a/test/unit/mocks/xpcom.js
+++ b/test/unit/mocks/xpcom.js
@@ -40,5 +40,7 @@ window.Services = {
   telemetry: {
     registerEvents() {},
     recordEvent() {},
+    registerScalars() {},
+    scalarSet() {},
   },
 };
diff --git a/test/unit/widgets/button-stack-test.js b/test/unit/widgets/button-stack-test.js
index be18f387..66f6b3ab 100644
--- a/test/unit/widgets/button-stack-test.js
+++ b/test/unit/widgets/button-stack-test.js
@@ -10,7 +10,7 @@ import { mount } from "enzyme";
 import React from "react";
 import sinon from "sinon";
 
-chai.use(chaiEnzyme);
+chai.use(chaiEnzyme());
 
 import ButtonStack from "src/webextension/widgets/button-stack";
 
diff --git a/test/unit/widgets/dialog-box-test.js b/test/unit/widgets/dialog-box-test.js
index 8b7a560e..b88dbc5c 100644
--- a/test/unit/widgets/dialog-box-test.js
+++ b/test/unit/widgets/dialog-box-test.js
@@ -20,7 +20,11 @@ describe("widgets > <DialogBox/>", () => {
     onClick = sinon.spy();
     onClose = sinon.spy();
     wrapper = mount(
-      <DialogBox buttonLabels={["ok", "cancel"]} {...{onClick, onClose}}>
+      <DialogBox buttons={[
+                   {label: "ok"},
+                   {label: "cancel"},
+                 ]}
+                 {...{onClick, onClose}}>
         message
       </DialogBox>
     );
@@ -30,6 +34,21 @@ describe("widgets > <DialogBox/>", () => {
     expect(wrapper.find("div")).to.have.text("message");
   });
 
+  it("render dialog box with custom theme", () => {
+    wrapper = mount(
+      <DialogBox buttons={[
+                   {label: "ok", theme: "danger"},
+                   {label: "cancel"},
+                 ]}
+                 {...{onClick, onClose}}>
+        message
+      </DialogBox>
+    );
+    expect(wrapper.find("button").at(0).prop("className")).to.match(
+      /danger-theme/
+    );
+  });
+
   it("onClick + onClose fired for first button", () => {
     wrapper.find("button").first().simulate("click");
     expect(onClick).to.have.been.calledWith(0);
@@ -50,7 +69,7 @@ describe("widgets > <ConfirmDialog/>", () => {
     onClose = sinon.spy();
     wrapper = mount(
       <ConfirmDialog confirmLabel="ok" cancelLabel="cancel"
-                 {...{onConfirm, onClose}}>
+                     {...{onConfirm, onClose}}>
         message
       </ConfirmDialog>
     );
@@ -60,6 +79,18 @@ describe("widgets > <ConfirmDialog/>", () => {
     expect(wrapper.find("div")).to.have.text("message");
   });
 
+  it("render confirm dialog with custom theme", () => {
+    wrapper = mount(
+      <ConfirmDialog confirmLabel="ok" cancelLabel="cancel" theme="danger"
+                     {...{onConfirm, onClose}}>
+        message
+      </ConfirmDialog>
+    );
+    expect(wrapper.find("button").at(0).prop("className")).to.match(
+      /danger-theme/
+    );
+  });
+
   it("onConfirm + onClose fired for first button", () => {
     wrapper.find("button").first().simulate("click");
     expect(onConfirm).to.have.been.calledWith();
diff --git a/test/unit/widgets/filter-input-test.js b/test/unit/widgets/filter-input-test.js
index e4bdadf2..7da297a3 100644
--- a/test/unit/widgets/filter-input-test.js
+++ b/test/unit/widgets/filter-input-test.js
@@ -8,11 +8,13 @@ import React from "react";
 import sinon from "sinon";
 import sinonChai from "sinon-chai";
 
+import chaiFocus from "test/chai-focus";
 import { simulateTyping } from "test/common";
-import mountWithL10n from "test/mocks/l10n";
+import mountWithL10n, { mountWithL10nIntoDOM } from "test/mocks/l10n";
 import FilterInput from "src/webextension/widgets/filter-input";
 
 chai.use(chaiEnzyme());
+chai.use(chaiFocus);
 chai.use(sinonChai);
 
 describe("widgets > <FilterInput/>", () => {
@@ -20,7 +22,7 @@ describe("widgets > <FilterInput/>", () => {
     const wrapper = mountWithL10n(<FilterInput value="some text"/>);
     expect(wrapper.find("input")).to.have.prop("value", "some text");
     expect(wrapper.childAt(0).prop("className")).to.match(
-      /^\S+input-wrapper\S+$/
+      /^\S+filter\S+ \S+input-wrapper\S+$/
     );
   });
 
@@ -31,7 +33,7 @@ describe("widgets > <FilterInput/>", () => {
     expect(wrapper.find("input")).to.have.prop("disabled", true);
     expect(wrapper.find("button")).to.have.prop("disabled", true);
     expect(wrapper.childAt(0).prop("className")).to.match(
-      /^\S+input-wrapper\S+ \S+disabled\S+$/
+      /^\S+filter\S+ \S+input-wrapper\S+ \S+disabled\S+$/
     );
   });
 
@@ -40,7 +42,7 @@ describe("widgets > <FilterInput/>", () => {
       <FilterInput className="foo" value="some text"/>
     );
     expect(wrapper.childAt(0).prop("className")).to.match(
-      /^\S+input-wrapper\S+ foo$/
+      /^\S+filter\S+ \S+input-wrapper\S+ foo$/
     );
   });
 
@@ -76,5 +78,22 @@ describe("widgets > <FilterInput/>", () => {
 
     expect(onChange).to.have.callCount(0);
   });
-});
 
+  it("focus() focuses input", () => {
+    const wrapper = mountWithL10nIntoDOM(
+      <FilterInput value="filter text" onChange={() => {}}/>
+    );
+    wrapper.instance().focus();
+    expect(wrapper.find("input")).to.be.focused();
+    expect(wrapper.find("input")).to.have.selection(0, 0);
+  });
+
+  it("focus(true) focuses/selects input", () => {
+    const wrapper = mountWithL10nIntoDOM(
+      <FilterInput value="filter text" onChange={() => {}}/>
+    );
+    wrapper.instance().focus(true);
+    expect(wrapper.find("input")).to.be.focused();
+    expect(wrapper.find("input")).to.have.selection();
+  });
+});
diff --git a/test/unit/widgets/input-test.js b/test/unit/widgets/input-test.js
index c8184fe3..4116875c 100644
--- a/test/unit/widgets/input-test.js
+++ b/test/unit/widgets/input-test.js
@@ -52,9 +52,19 @@ describe("widgets > <Input/>", () => {
 
   it("focus() focuses input", () => {
     const wrapper = mountIntoDOM(
-      <Input className="foo" value="some text" onChange={() => {}}/>
+      <Input value="some text" onChange={() => {}}/>
     );
     wrapper.instance().focus();
     expect(wrapper.find("input")).to.be.focused();
+    expect(wrapper.find("input")).to.have.selection(0, 0);
+  });
+
+  it("focus(true) focuses/selects input", () => {
+    const wrapper = mountIntoDOM(
+      <Input value="some text" onChange={() => {}}/>
+    );
+    wrapper.instance().focus(true);
+    expect(wrapper.find("input")).to.be.focused();
+    expect(wrapper.find("input")).to.have.selection();
   });
 });
diff --git a/test/unit/widgets/password-input-test.js b/test/unit/widgets/password-input-test.js
index cc7ae3cc..b69c6fd3 100644
--- a/test/unit/widgets/password-input-test.js
+++ b/test/unit/widgets/password-input-test.js
@@ -20,7 +20,7 @@ describe("widgets > <PasswordInput/>", () => {
     );
     expect(wrapper.find("input")).to.have.prop("value", "my password");
     expect(wrapper.childAt(0).prop("className")).to.match(
-      /^\S+input-wrapper\S+$/
+      /^\S+password\S+ \S+input-wrapper\S+$/
     );
     expect(wrapper.find("input").prop("className")).to.match(
       /^\S+monospace\S+$/
@@ -32,7 +32,7 @@ describe("widgets > <PasswordInput/>", () => {
       <PasswordInput className="foo" value="some text" onChange={() => {}}/>
     );
     expect(wrapper.childAt(0).prop("className")).to.match(
-      /^\S+input-wrapper\S+ foo$/
+      /^\S+password\S+ \S+input-wrapper\S+ foo$/
     );
   });
 
diff --git a/test/unit/widgets/text-area-test.js b/test/unit/widgets/text-area-test.js
index 34fc6748..878d8f08 100644
--- a/test/unit/widgets/text-area-test.js
+++ b/test/unit/widgets/text-area-test.js
@@ -30,9 +30,19 @@ describe("widgets > <TextArea/>", () => {
 
   it("focus() focuses textarea", () => {
     const wrapper = mountIntoDOM(
-      <TextArea value="text" onChange={() => {}}/>
+      <TextArea value="some text" onChange={() => {}}/>
     );
     wrapper.instance().focus();
     expect(wrapper.find("textarea")).to.be.focused();
+    expect(wrapper.find("textarea")).to.have.selection(0, 0);
+  });
+
+  it("focus(true) focuses/selects textarea", () => {
+    const wrapper = mountIntoDOM(
+      <TextArea value="some text" onChange={() => {}}/>
+    );
+    wrapper.instance().focus(true);
+    expect(wrapper.find("textarea")).to.be.focused();
+    expect(wrapper.find("textarea")).to.have.selection();
   });
 });