diff --git a/demo/index.js b/demo/index.js
index 64984b4..c408631 100644
--- a/demo/index.js
+++ b/demo/index.js
@@ -1,28 +1,17 @@
-import { html, render } from 'lit-html';
-import { LitElement } from 'lit-element';
-import { ApiDemoPageBase } from '@advanced-rest-client/arc-demo-helper/ApiDemoPage.js';
-import { AmfHelperMixin } from '@api-components/amf-helper-mixin/amf-helper-mixin.js';
+import { html } from 'lit-html';
+import { ApiDemoPage } from '@advanced-rest-client/arc-demo-helper';
 import '@anypoint-web-components/anypoint-checkbox/anypoint-checkbox.js';
-import '@advanced-rest-client/arc-demo-helper/arc-demo-helper.js';
 import '@advanced-rest-client/arc-demo-helper/arc-interactive-demo.js';
-import '@api-components/api-navigation/api-navigation.js';
 import '@advanced-rest-client/xhr-simple-request/xhr-simple-request.js';
 import '../api-request-editor.js';
 
-class DemoElement extends AmfHelperMixin(LitElement) {}
-window.customElements.define('demo-element', DemoElement);
-
-class ComponentDemo extends ApiDemoPageBase {
+class ComponentDemo extends ApiDemoPage {
   constructor() {
     super();
-    this._componentName = 'api-request-editor';
-
     this.initObservableProperties([
       'outlined',
-      'compatibility',
       'readOnly',
       'disabled',
-      'narrow',
       'selectedAmfId',
       'allowCustom',
       'allowHideOptional',
@@ -31,9 +20,14 @@ class ComponentDemo extends ApiDemoPageBase {
       'noUrlEditor',
       'responseBody'
     ]);
+    this.componentName = 'api-request-editor';
     this.allowCustom = false;
     this.allowHideOptional = true;
     this.allowDisableParams = true;
+    this.readOnly = false;
+    this.disabled = false;
+    this.noDocs = false;
+    this.noUrlEditor = false;
 
     this.demoStates = ['Filled', 'Outlined', 'Anypoint'];
     this._demoStateHandler = this._demoStateHandler.bind(this);
@@ -48,11 +42,7 @@ class ComponentDemo extends ApiDemoPageBase {
     const state = e.detail.value;
     this.outlined = state === 1;
     this.compatibility = state === 2;
-  }
-
-  _toggleMainOption(e) {
-    const { name, checked } = e.target;
-    this[name] = checked;
+    this._updateCompatibility();
   }
 
   _authSettingsChanged(e) {
@@ -61,13 +51,6 @@ class ComponentDemo extends ApiDemoPageBase {
     this.authSettingsValue = value ? JSON.stringify(value, null, 2) : '';
   }
 
-  get helper() {
-    if (!this.__helper) {
-      this.__helper = document.getElementById('helper');
-    }
-    return this.__helper;
-  }
-
   _navChanged(e) {
     this.selectedAmfId = undefined;
     this.responseBody = undefined;
@@ -94,8 +77,8 @@ class ComponentDemo extends ApiDemoPageBase {
       ['oauth-flows', 'OAS OAuth Flow'],
       ['oas-bearer', 'OAS Bearer'],
     ].map(([file, label]) => html`
-      <paper-item data-src="${file}-compact.json">${label} - compact model</paper-item>
-      <paper-item data-src="${file}.json">${label}</paper-item>
+      <anypoint-item data-src="${file}-compact.json">${label} - compact model</anypoint-item>
+      <anypoint-item data-src="${file}.json">${label}</anypoint-item>
       `);
   }
 
@@ -135,102 +118,97 @@ class ComponentDemo extends ApiDemoPageBase {
     <section class="documentation-section">
       <h3>Interactive demo</h3>
       <p>
-        This demo lets you preview the OAuth2 authorization method element with various
+        This demo lets you preview the API Request Editor element with various
         configuration options.
       </p>
 
-      <section class="horizontal-section-container centered main">
-        ${this._apiNavigationTemplate()}
-        <div class="demo-container">
-
-          <arc-interactive-demo
-            .states="${demoStates}"
-            @state-chanegd="${this._demoStateHandler}"
-            ?dark="${darkThemeActive}"
-          >
 
-            <div slot="content">
-              <api-request-editor
-                .amf="${amf}"
-                .selected="${selectedAmfId}"
-                ?allowCustom="${allowCustom}"
-                ?allowHideOptional="${allowHideOptional}"
-                ?allowDisableParams="${allowDisableParams}"
-                ?narrow="${narrow}"
-                ?outlined="${outlined}"
-                ?compatibility="${compatibility}"
-                ?readOnly="${readOnly}"
-                ?disabled="${disabled}"
-                ?noDocs="${noDocs}"
-                ?noUrlEditor="${noUrlEditor}"
-                .redirectUri="${redirectUri}"
-                @api-request="${this._apiRequestHandler}"></api-request-editor>
-              ${responseBody ? html`<h3>Latest response</h3>
-              <output class="response-output" tabindex="0">${responseBody}</output>` : ''}
-            </div>
-            <label slot="options" id="mainOptionsLabel">Options</label>
-            <anypoint-checkbox
-              aria-describedby="mainOptionsLabel"
-              slot="options"
-              name="readOnly"
-              @change="${this._toggleMainOption}"
-              >Read only</anypoint-checkbox
-            >
-            <anypoint-checkbox
-              aria-describedby="mainOptionsLabel"
-              slot="options"
-              name="disabled"
-              @change="${this._toggleMainOption}"
-              >Disabled</anypoint-checkbox
-            >
-            <anypoint-checkbox
-              aria-describedby="mainOptionsLabel"
-              slot="options"
-              name="allowCustom"
-              .checked="${allowCustom}"
-              @change="${this._toggleMainOption}"
-              >Allow custom</anypoint-checkbox
-            >
-            <anypoint-checkbox
-              aria-describedby="mainOptionsLabel"
-              slot="options"
-              name="allowHideOptional"
-              .checked="${allowHideOptional}"
-              @change="${this._toggleMainOption}"
-              >Allow hide optional</anypoint-checkbox
-            >
-            <anypoint-checkbox
-              aria-describedby="mainOptionsLabel"
-              slot="options"
-              name="allowDisableParams"
-              .checked="${allowDisableParams}"
-              @change="${this._toggleMainOption}"
-              >Allow disable params</anypoint-checkbox
-            >
-            <anypoint-checkbox
-              aria-describedby="mainOptionsLabel"
-              slot="options"
-              name="narrow"
-              @change="${this._toggleMainOption}"
-              >Narrow view</anypoint-checkbox
-            >
-            <anypoint-checkbox
-              aria-describedby="mainOptionsLabel"
-              slot="options"
-              name="noDocs"
-              @change="${this._toggleMainOption}"
-              >No docs</anypoint-checkbox
-            >
-            <anypoint-checkbox
-              aria-describedby="mainOptionsLabel"
-              slot="options"
-              name="noUrlEditor"
-              @change="${this._toggleMainOption}"
-              >No url editor</anypoint-checkbox
-            >
-          </arc-interactive-demo>
+      <arc-interactive-demo
+        .states="${demoStates}"
+        @state-chanegd="${this._demoStateHandler}"
+        ?dark="${darkThemeActive}"
+      >
+
+        <div slot="content">
+          <api-request-editor
+            .amf="${amf}"
+            .selected="${selectedAmfId}"
+            ?allowCustom="${allowCustom}"
+            ?allowHideOptional="${allowHideOptional}"
+            ?allowDisableParams="${allowDisableParams}"
+            ?narrow="${narrow}"
+            ?outlined="${outlined}"
+            ?compatibility="${compatibility}"
+            ?readOnly="${readOnly}"
+            ?disabled="${disabled}"
+            ?noDocs="${noDocs}"
+            ?noUrlEditor="${noUrlEditor}"
+            .redirectUri="${redirectUri}"
+            @api-request="${this._apiRequestHandler}"></api-request-editor>
+          ${responseBody ? html`<h3>Latest response</h3>
+          <output class="response-output" tabindex="0">${responseBody}</output>` : ''}
         </div>
-      </section>
+        <label slot="options" id="mainOptionsLabel">Options</label>
+        <anypoint-checkbox
+          aria-describedby="mainOptionsLabel"
+          slot="options"
+          name="readOnly"
+          @change="${this._toggleMainOption}"
+          >Read only</anypoint-checkbox
+        >
+        <anypoint-checkbox
+          aria-describedby="mainOptionsLabel"
+          slot="options"
+          name="disabled"
+          @change="${this._toggleMainOption}"
+          >Disabled</anypoint-checkbox
+        >
+        <anypoint-checkbox
+          aria-describedby="mainOptionsLabel"
+          slot="options"
+          name="allowCustom"
+          .checked="${allowCustom}"
+          @change="${this._toggleMainOption}"
+          >Allow custom</anypoint-checkbox
+        >
+        <anypoint-checkbox
+          aria-describedby="mainOptionsLabel"
+          slot="options"
+          name="allowHideOptional"
+          .checked="${allowHideOptional}"
+          @change="${this._toggleMainOption}"
+          >Allow hide optional</anypoint-checkbox
+        >
+        <anypoint-checkbox
+          aria-describedby="mainOptionsLabel"
+          slot="options"
+          name="allowDisableParams"
+          .checked="${allowDisableParams}"
+          @change="${this._toggleMainOption}"
+          >Allow disable params</anypoint-checkbox
+        >
+        <anypoint-checkbox
+          aria-describedby="mainOptionsLabel"
+          slot="options"
+          name="narrow"
+          @change="${this._toggleMainOption}"
+          >Narrow view</anypoint-checkbox
+        >
+        <anypoint-checkbox
+          aria-describedby="mainOptionsLabel"
+          slot="options"
+          name="noDocs"
+          @change="${this._toggleMainOption}"
+          >No docs</anypoint-checkbox
+        >
+        <anypoint-checkbox
+          aria-describedby="mainOptionsLabel"
+          slot="options"
+          name="noUrlEditor"
+          @change="${this._toggleMainOption}"
+          >No url editor</anypoint-checkbox
+        >
+      </arc-interactive-demo>
     </section>`;
   }
 
@@ -347,21 +325,14 @@ class ComponentDemo extends ApiDemoPageBase {
       </section>`;
   }
 
-  _render() {
-    const { amf } = this;
-    render(html`
-      ${this.headerTemplate()}
-
-      <demo-element id="helper" .amf="${amf}"></demo-element>
-      <xhr-simple-request @api-response="${this._responseReady}"></xhr-simple-request>
-
-      <div role="main">
-        <h2 class="centered main">API request editor</h2>
-        ${this._demoTemplate()}
-        ${this._introductionTemplate()}
-        ${this._usageTemplate()}
-      </div>
-      `, document.querySelector('#demo'));
+  contentTemplate() {
+    return html`
+    <xhr-simple-request @api-response="${this._responseReady}"></xhr-simple-request>
+    <h2 class="centered main">API request editor</h2>
+    ${this._demoTemplate()}
+    ${this._introductionTemplate()}
+    ${this._usageTemplate()}
+    `;
   }
 }
 const instance = new ComponentDemo();
diff --git a/package-lock.json b/package-lock.json
index 061eb99..54bb1f0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,26 +10,26 @@
       "integrity": "sha512-lJoNk2YP+Zcc7iBohp+35vXvl0eKxsZUJuISHpcsveIoKK4j7K3bvweFEIU6B5XLSggM0L9TcMe6WYKiTbqaBg=="
     },
     "@advanced-rest-client/arc-demo-helper": {
-      "version": "1.0.17",
-      "resolved": "https://registry.npmjs.org/@advanced-rest-client/arc-demo-helper/-/arc-demo-helper-1.0.17.tgz",
-      "integrity": "sha512-W51/1qd2ndaP4CQTqOtMjskX6zbTOUvahcOOskEYGmU2ohCX5wQaridsLctb+y+6ylJSTyp5tkHr2M8bx4dPww==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@advanced-rest-client/arc-demo-helper/-/arc-demo-helper-2.1.4.tgz",
+      "integrity": "sha512-Mju3M5NyDfcGU20iTx3Kq0avE3dUN7nQvPk+uvx3plJB+HdpRaJZV8lxXSU9nNqyhu1rhc1gsLW4uLQ/5J1Y5Q==",
       "dev": true,
       "requires": {
+        "@advanced-rest-client/arc-icons": "^3.0.5",
+        "@anypoint-web-components/anypoint-button": "^1.0.15",
+        "@anypoint-web-components/anypoint-dropdown-menu": "^0.1.14",
+        "@anypoint-web-components/anypoint-item": "^1.0.5",
+        "@anypoint-web-components/anypoint-listbox": "^1.0.4",
+        "@anypoint-web-components/anypoint-menu-button": "^0.1.0",
+        "@anypoint-web-components/anypoint-switch": "^0.1.3",
+        "@anypoint-web-components/anypoint-tabs": "^0.1.10",
+        "@api-components/amf-helper-mixin": "^4.0.26",
+        "@api-components/api-navigation": "^4.1.0",
         "@api-components/raml-aware": "^3.0.0",
         "@polymer/font-roboto": "^3.0.2",
-        "@polymer/iron-icon": "^3.0.1",
-        "@polymer/iron-icons": "^3.0.1",
-        "@polymer/paper-button": "^3.0.0",
-        "@polymer/paper-dropdown-menu": "^3.1.0",
-        "@polymer/paper-icon-button": "^3.0.2",
-        "@polymer/paper-item": "^3.0.0",
-        "@polymer/paper-listbox": "^3.0.0",
-        "@polymer/paper-menu-button": "^3.0.1",
-        "@polymer/paper-tabs": "^3.1.0",
-        "@polymer/paper-toggle-button": "^3.0.1",
-        "lit-element": "^2.2.1",
-        "lit-html": "^1.1.2",
-        "prismjs": "^1.17.1",
+        "lit-element": "^2.3.1",
+        "lit-html": "^1.2.1",
+        "prismjs": "^1.20.0",
         "web-animations-js": "^2.3.1"
       }
     },
@@ -464,6 +464,18 @@
         "lit-html": "^1.1.2"
       }
     },
+    "@anypoint-web-components/anypoint-menu-button": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/@anypoint-web-components/anypoint-menu-button/-/anypoint-menu-button-0.1.0.tgz",
+      "integrity": "sha512-CdDnVR2oSQ/719pwmAMMeBf+cS27rLgJore10CWpRCgGrsPYPwUlPuc93vUjhMjyd43O0BASSEDiykj3a1njSg==",
+      "dev": true,
+      "requires": {
+        "@anypoint-web-components/anypoint-control-mixins": "^1.0.2",
+        "@anypoint-web-components/anypoint-dropdown": "^1.0.0",
+        "lit-element": "^2.0.1",
+        "lit-html": "^1.0.0"
+      }
+    },
     "@anypoint-web-components/anypoint-menu-mixin": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/@anypoint-web-components/anypoint-menu-mixin/-/anypoint-menu-mixin-1.0.2.tgz",
@@ -513,6 +525,22 @@
         "lit-element": "^2.0.1"
       }
     },
+    "@anypoint-web-components/anypoint-tabs": {
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/@anypoint-web-components/anypoint-tabs/-/anypoint-tabs-0.1.10.tgz",
+      "integrity": "sha512-Up6iUdNv24x8JIRlPboUp+tLKRrOch7kMynFC73HyWnCL3HL+egOv4Rrow0HHdvM/7ywWQ27pR7pPsDAC7x49A==",
+      "dev": true,
+      "requires": {
+        "@advanced-rest-client/arc-resizable-mixin": "^1.0.0",
+        "@anypoint-web-components/anypoint-button": "^1.0.13",
+        "@anypoint-web-components/anypoint-control-mixins": "^1.0.2",
+        "@anypoint-web-components/anypoint-menu-mixin": "^1.0.2",
+        "@polymer/iron-icon": "^3.0.1",
+        "@polymer/paper-ripple": "^3.0.1",
+        "lit-element": "^2.0.1",
+        "lit-html": "^1.1.2"
+      }
+    },
     "@anypoint-web-components/validatable-mixin": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/@anypoint-web-components/validatable-mixin/-/validatable-mixin-1.0.2.tgz",
@@ -2539,39 +2567,6 @@
         "@polymer/polymer": "^3.0.0"
       }
     },
-    "@polymer/iron-autogrow-textarea": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@polymer/iron-autogrow-textarea/-/iron-autogrow-textarea-3.0.3.tgz",
-      "integrity": "sha512-5r0VkWrIlm0JIp5E5wlnvkw7slK72lFRZXncmrsLZF+6n1dg2rI8jt7xpFzSmUWrqpcyXwyKaGaDvUjl3j4JLA==",
-      "dev": true,
-      "requires": {
-        "@polymer/iron-behaviors": "^3.0.0-pre.26",
-        "@polymer/iron-flex-layout": "^3.0.0-pre.26",
-        "@polymer/iron-validatable-behavior": "^3.0.0-pre.26",
-        "@polymer/polymer": "^3.0.0"
-      }
-    },
-    "@polymer/iron-behaviors": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@polymer/iron-behaviors/-/iron-behaviors-3.0.1.tgz",
-      "integrity": "sha512-IMEwcv1lhf1HSQxuyWOUIL0lOBwmeaoSTpgCJeP9IBYnuB1SPQngmfRuHKgK6/m9LQ9F9miC7p3HeQQUdKAE0w==",
-      "dev": true,
-      "requires": {
-        "@polymer/iron-a11y-keys-behavior": "^3.0.0-pre.26",
-        "@polymer/polymer": "^3.0.0"
-      }
-    },
-    "@polymer/iron-checked-element-behavior": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@polymer/iron-checked-element-behavior/-/iron-checked-element-behavior-3.0.1.tgz",
-      "integrity": "sha512-aDr0cbCNVq49q+pOqa6CZutFh+wWpwPMLpEth9swx+GkAj+gCURhuQkaUYhIo5f2egDbEioR1aeHMnPlU9dQZA==",
-      "dev": true,
-      "requires": {
-        "@polymer/iron-form-element-behavior": "^3.0.0-pre.26",
-        "@polymer/iron-validatable-behavior": "^3.0.0-pre.26",
-        "@polymer/polymer": "^3.0.0"
-      }
-    },
     "@polymer/iron-collapse": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/@polymer/iron-collapse/-/iron-collapse-3.0.1.tgz",
@@ -2581,18 +2576,6 @@
         "@polymer/polymer": "^3.0.0"
       }
     },
-    "@polymer/iron-dropdown": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@polymer/iron-dropdown/-/iron-dropdown-3.0.1.tgz",
-      "integrity": "sha512-22yLhepfcKjuQMfFmRHi/9MPKTqkzgRrmWWW0P5uqK++xle53k2QBO5VYUAYiCN3ZcxIi9lEhZ9YWGeQj2JBig==",
-      "dev": true,
-      "requires": {
-        "@polymer/iron-behaviors": "^3.0.0-pre.26",
-        "@polymer/iron-overlay-behavior": "^3.0.0-pre.27",
-        "@polymer/neon-animation": "^3.0.0-pre.26",
-        "@polymer/polymer": "^3.0.0"
-      }
-    },
     "@polymer/iron-fit-behavior": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/@polymer/iron-fit-behavior/-/iron-fit-behavior-3.0.2.tgz",
@@ -2618,15 +2601,6 @@
         "@polymer/polymer": "^3.0.0"
       }
     },
-    "@polymer/iron-form-element-behavior": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@polymer/iron-form-element-behavior/-/iron-form-element-behavior-3.0.1.tgz",
-      "integrity": "sha512-G/e2KXyL5AY7mMjmomHkGpgS0uAf4ovNpKhkuUTRnMuMJuf589bKqE85KN4ovE1Tzhv2hJoh/igyD6ekHiYU1A==",
-      "dev": true,
-      "requires": {
-        "@polymer/polymer": "^3.0.0"
-      }
-    },
     "@polymer/iron-icon": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/@polymer/iron-icon/-/iron-icon-3.0.1.tgz",
@@ -2637,17 +2611,6 @@
         "@polymer/polymer": "^3.0.0"
       }
     },
-    "@polymer/iron-icons": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@polymer/iron-icons/-/iron-icons-3.0.1.tgz",
-      "integrity": "sha512-xtEI8erH2GIBiF3QxEMyW81XuVjguu6Le5WjEEpX67qd9z7jjmc4T/ke3zRUlnDydex9p8ytcwVpMIKcyvjYAQ==",
-      "dev": true,
-      "requires": {
-        "@polymer/iron-icon": "^3.0.0-pre.26",
-        "@polymer/iron-iconset-svg": "^3.0.0-pre.26",
-        "@polymer/polymer": "^3.0.0"
-      }
-    },
     "@polymer/iron-iconset-svg": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/@polymer/iron-iconset-svg/-/iron-iconset-svg-3.0.1.tgz",
@@ -2657,29 +2620,6 @@
         "@polymer/polymer": "^3.0.0"
       }
     },
-    "@polymer/iron-input": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@polymer/iron-input/-/iron-input-3.0.1.tgz",
-      "integrity": "sha512-WLx13kEcbH9GKbj9+pWR6pbJkA5kxn3796ynx6eQd2rueMyUfVTR3GzOvadBKsciUuIuzrxpBWZ2+3UcueVUQQ==",
-      "dev": true,
-      "requires": {
-        "@polymer/iron-a11y-announcer": "^3.0.0-pre.26",
-        "@polymer/iron-validatable-behavior": "^3.0.0-pre.26",
-        "@polymer/polymer": "^3.0.0"
-      }
-    },
-    "@polymer/iron-menu-behavior": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@polymer/iron-menu-behavior/-/iron-menu-behavior-3.0.2.tgz",
-      "integrity": "sha512-8dpASkFNBIkxAJWsFLWIO1M7tKM0+wKs3PqdeF/dDdBciwoaaFgC2K1XCZFZnbe2t9/nJgemXxVugGZAWpYCGg==",
-      "dev": true,
-      "requires": {
-        "@polymer/iron-a11y-keys-behavior": "^3.0.0-pre.26",
-        "@polymer/iron-flex-layout": "^3.0.0-pre.26",
-        "@polymer/iron-selector": "^3.0.0-pre.26",
-        "@polymer/polymer": "^3.0.0"
-      }
-    },
     "@polymer/iron-meta": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/@polymer/iron-meta/-/iron-meta-3.0.1.tgz",
@@ -2715,15 +2655,6 @@
         "@polymer/polymer": "^3.0.0"
       }
     },
-    "@polymer/iron-selector": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@polymer/iron-selector/-/iron-selector-3.0.1.tgz",
-      "integrity": "sha512-sBVk2uas6prW0glUe2xEJJYlvxmYzM40Au9OKbfDK2Qekou/fLKcBRyIYI39kuI8zWRaip8f3CI8qXcUHnKb1A==",
-      "dev": true,
-      "requires": {
-        "@polymer/polymer": "^3.0.0"
-      }
-    },
     "@polymer/iron-test-helpers": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/@polymer/iron-test-helpers/-/iron-test-helpers-3.0.1.tgz",
@@ -2733,136 +2664,6 @@
         "@polymer/polymer": "^3.0.0"
       }
     },
-    "@polymer/iron-validatable-behavior": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@polymer/iron-validatable-behavior/-/iron-validatable-behavior-3.0.1.tgz",
-      "integrity": "sha512-wwpYh6wOa4fNI+jH5EYKC7TVPYQ2OfgQqocWat7GsNWcsblKYhLYbwsvEY5nO0n2xKqNfZzDLrUom5INJN7msQ==",
-      "dev": true,
-      "requires": {
-        "@polymer/iron-meta": "^3.0.0-pre.26",
-        "@polymer/polymer": "^3.0.0"
-      }
-    },
-    "@polymer/neon-animation": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@polymer/neon-animation/-/neon-animation-3.0.1.tgz",
-      "integrity": "sha512-cDDc0llpVCe0ATbDS3clDthI54Bc8YwZIeTGGmBJleKOvbRTUC5+ssJmRL+VwVh+VM5FlnQlx760ppftY3uprg==",
-      "dev": true,
-      "requires": {
-        "@polymer/iron-resizable-behavior": "^3.0.0-pre.26",
-        "@polymer/iron-selector": "^3.0.0-pre.26",
-        "@polymer/polymer": "^3.0.0"
-      }
-    },
-    "@polymer/paper-behaviors": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@polymer/paper-behaviors/-/paper-behaviors-3.0.1.tgz",
-      "integrity": "sha512-6knhj69fPJejv8qR0kCSUY+Q0XjaUf0OSnkjRjmTJPAwSrRYtgqE+l6P1FfA+py1X/cUjgne9EF5rMZAKJIg1g==",
-      "dev": true,
-      "requires": {
-        "@polymer/iron-behaviors": "^3.0.0-pre.26",
-        "@polymer/iron-checked-element-behavior": "^3.0.0-pre.26",
-        "@polymer/paper-ripple": "^3.0.0-pre.26",
-        "@polymer/polymer": "^3.0.0"
-      }
-    },
-    "@polymer/paper-button": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@polymer/paper-button/-/paper-button-3.0.1.tgz",
-      "integrity": "sha512-JRNBc+Oj9EWnmyLr7FcCr8T1KAnEHPh6mosln9BUdkM+qYaYsudSICh3cjTIbnj6AuF5OJidoLkM1dlyj0j6Zg==",
-      "dev": true,
-      "requires": {
-        "@polymer/iron-flex-layout": "^3.0.0-pre.26",
-        "@polymer/paper-behaviors": "^3.0.0-pre.27",
-        "@polymer/paper-styles": "^3.0.0-pre.26",
-        "@polymer/polymer": "^3.0.0"
-      }
-    },
-    "@polymer/paper-dropdown-menu": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@polymer/paper-dropdown-menu/-/paper-dropdown-menu-3.1.0.tgz",
-      "integrity": "sha512-orxH2FzBCjUleXex//STZHjgWXm7z09+JRPnhJld7xEheRDE7XrKsrsS0Xl7f8bBqUrisdaL9HTX9yBJ/k8bbQ==",
-      "dev": true,
-      "requires": {
-        "@polymer/iron-a11y-keys-behavior": "^3.0.0-pre.26",
-        "@polymer/iron-form-element-behavior": "^3.0.0-pre.26",
-        "@polymer/iron-icon": "^3.0.0-pre.26",
-        "@polymer/iron-iconset-svg": "^3.0.0-pre.26",
-        "@polymer/iron-validatable-behavior": "^3.0.0-pre.26",
-        "@polymer/paper-behaviors": "^3.0.0-pre.27",
-        "@polymer/paper-input": "^3.1.0",
-        "@polymer/paper-menu-button": "^3.0.0-pre.26",
-        "@polymer/paper-ripple": "^3.0.0-pre.26",
-        "@polymer/paper-styles": "^3.0.0-pre.26",
-        "@polymer/polymer": "^3.3.1"
-      }
-    },
-    "@polymer/paper-icon-button": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@polymer/paper-icon-button/-/paper-icon-button-3.0.2.tgz",
-      "integrity": "sha512-kOdxQgnKL097bggFF6PWvsBYuWg+MCcoHoTHX6bh/MuZoWFZNjrFntFqwuB4oEbpjCpfm4moA33muPJFj7CihQ==",
-      "dev": true,
-      "requires": {
-        "@polymer/iron-icon": "^3.0.0-pre.26",
-        "@polymer/paper-behaviors": "^3.0.0-pre.27",
-        "@polymer/paper-styles": "^3.0.0-pre.26",
-        "@polymer/polymer": "^3.0.0"
-      }
-    },
-    "@polymer/paper-input": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/@polymer/paper-input/-/paper-input-3.2.1.tgz",
-      "integrity": "sha512-6ghgwQKM6mS0hAQxQqj+tkeEY1VUBqAsrasAm8V5RpNcfSWQC/hhRFxU0beGuKTAhndzezDzWYP6Zz4b8fExGg==",
-      "dev": true,
-      "requires": {
-        "@polymer/iron-a11y-keys-behavior": "^3.0.0-pre.26",
-        "@polymer/iron-autogrow-textarea": "^3.0.0-pre.26",
-        "@polymer/iron-behaviors": "^3.0.0-pre.26",
-        "@polymer/iron-form-element-behavior": "^3.0.0-pre.26",
-        "@polymer/iron-input": "^3.0.0-pre.26",
-        "@polymer/paper-styles": "^3.0.0-pre.26",
-        "@polymer/polymer": "^3.0.0"
-      }
-    },
-    "@polymer/paper-item": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@polymer/paper-item/-/paper-item-3.0.1.tgz",
-      "integrity": "sha512-KTk2N+GsYiI/HuubL3sxebZ6tteQbBOAp4QVLAnbjSPmwl+mJSDWk+omuadesU0bpkCwaWVs3fHuQsmXxy4pkw==",
-      "dev": true,
-      "requires": {
-        "@polymer/iron-behaviors": "^3.0.0-pre.26",
-        "@polymer/iron-flex-layout": "^3.0.0-pre.26",
-        "@polymer/paper-styles": "^3.0.0-pre.26",
-        "@polymer/polymer": "^3.0.0"
-      }
-    },
-    "@polymer/paper-listbox": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@polymer/paper-listbox/-/paper-listbox-3.0.1.tgz",
-      "integrity": "sha512-vMLWFpYcggAPmEDBmK+96fFefacOG3GLB1EguTn8+ZkqI+328hNfw1MzHjH68rgCIIUtjmm+9qgB1Sy/MN0a/A==",
-      "dev": true,
-      "requires": {
-        "@polymer/iron-behaviors": "^3.0.0-pre.26",
-        "@polymer/iron-menu-behavior": "^3.0.0-pre.26",
-        "@polymer/paper-styles": "^3.0.0-pre.26",
-        "@polymer/polymer": "^3.0.0"
-      }
-    },
-    "@polymer/paper-menu-button": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@polymer/paper-menu-button/-/paper-menu-button-3.0.1.tgz",
-      "integrity": "sha512-Rxte2Fp7N2BMI2FMM7tB25IkvD11DhjMklcg97JP1jnlHbJNrXPh5SSX2bdtabz49UE8vejIsrxZ+AGsB5nqIQ==",
-      "dev": true,
-      "requires": {
-        "@polymer/iron-a11y-keys-behavior": "^3.0.0-pre.26",
-        "@polymer/iron-behaviors": "^3.0.0-pre.26",
-        "@polymer/iron-dropdown": "^3.0.0-pre.26",
-        "@polymer/iron-fit-behavior": "^3.0.0-pre.26",
-        "@polymer/neon-animation": "^3.0.0-pre.26",
-        "@polymer/paper-styles": "^3.0.0-pre.26",
-        "@polymer/polymer": "^3.0.0"
-      }
-    },
     "@polymer/paper-progress": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/@polymer/paper-progress/-/paper-progress-3.0.1.tgz",
@@ -2902,24 +2703,6 @@
         "@polymer/polymer": "^3.0.0"
       }
     },
-    "@polymer/paper-tabs": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@polymer/paper-tabs/-/paper-tabs-3.1.0.tgz",
-      "integrity": "sha512-t8G+3CiyI0R+wA077UNQXR/oG9GlsqRRO1KMsFHHjBSsYqWXghNsqxUG827wEj+PafI5u9tZ3vVt1S++Lg4B2g==",
-      "dev": true,
-      "requires": {
-        "@polymer/iron-behaviors": "^3.0.0-pre.26",
-        "@polymer/iron-flex-layout": "^3.0.0-pre.26",
-        "@polymer/iron-icon": "^3.0.0-pre.26",
-        "@polymer/iron-iconset-svg": "^3.0.0-pre.26",
-        "@polymer/iron-menu-behavior": "^3.0.0-pre.26",
-        "@polymer/iron-resizable-behavior": "^3.0.0-pre.26",
-        "@polymer/paper-behaviors": "^3.0.0-pre.27",
-        "@polymer/paper-icon-button": "^3.0.0-pre.26",
-        "@polymer/paper-styles": "^3.0.0-pre.26",
-        "@polymer/polymer": "^3.0.0"
-      }
-    },
     "@polymer/paper-toast": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/@polymer/paper-toast/-/paper-toast-3.0.1.tgz",
@@ -2931,18 +2714,6 @@
         "@polymer/polymer": "^3.0.0"
       }
     },
-    "@polymer/paper-toggle-button": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@polymer/paper-toggle-button/-/paper-toggle-button-3.0.1.tgz",
-      "integrity": "sha512-jadZB60fycT7YnSAH0H23LYo6/2HYmMZTtNr9LpdSIRFPLX6mqqxewex92cFz019bMKaRJgORn308hRlJo2u6A==",
-      "dev": true,
-      "requires": {
-        "@polymer/iron-checked-element-behavior": "^3.0.0-pre.26",
-        "@polymer/paper-behaviors": "^3.0.0-pre.27",
-        "@polymer/paper-styles": "^3.0.0-pre.26",
-        "@polymer/polymer": "^3.0.0"
-      }
-    },
     "@polymer/polymer": {
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/@polymer/polymer/-/polymer-3.3.1.tgz",
diff --git a/package.json b/package.json
index 8e4aa64..19daa98 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "lit-html": "^1.2.1"
   },
   "devDependencies": {
-    "@advanced-rest-client/arc-demo-helper": "^1.0.17",
+    "@advanced-rest-client/arc-demo-helper": "^2.1.4",
     "@advanced-rest-client/eslint-config": "^1.1.5",
     "@advanced-rest-client/prettier-config": "^0.1.0",
     "@advanced-rest-client/testing-karma-sl": "^1.2.0",