diff --git a/gulp/tasks/rollup.js b/gulp/tasks/rollup.js
index b554296e8d..27b4464574 100644
--- a/gulp/tasks/rollup.js
+++ b/gulp/tasks/rollup.js
@@ -6,7 +6,8 @@ gulp.task('run_rollup', () => {
   return gulp.src([
     'js/core.js',
     'js/compatibility.js',
-    'js/editor/editor.js',
+    'js/automation-editor/automation-editor.js',
+    'js/script-editor/script-editor.js',
     'demo_data/demo_data.js',
   ])
   .pipe(rollupEach(rollupConfig))
diff --git a/js/editor/editor.js b/js/automation-editor/automation-editor.js
similarity index 100%
rename from js/editor/editor.js
rename to js/automation-editor/automation-editor.js
diff --git a/js/editor/automation.js b/js/automation-editor/automation.js
similarity index 97%
rename from js/editor/automation.js
rename to js/automation-editor/automation.js
index 08c4f1c36a..12108f46e2 100644
--- a/js/editor/automation.js
+++ b/js/automation-editor/automation.js
@@ -1,8 +1,8 @@
 import { h, Component } from 'preact';
 
 import Trigger from './trigger';
-import Condition from './condition';
-import Script from './script';
+import Condition from '../common/component/condition';
+import Script from '../common/component/script';
 
 export default class Automation extends Component {
   constructor() {
diff --git a/js/editor/trigger/event.js b/js/automation-editor/trigger/event.js
similarity index 88%
rename from js/editor/trigger/event.js
rename to js/automation-editor/trigger/event.js
index 11d032206d..1c270233f0 100644
--- a/js/editor/trigger/event.js
+++ b/js/automation-editor/trigger/event.js
@@ -1,8 +1,8 @@
 import { h, Component } from 'preact';
 
-import JSONTextArea from '../json_textarea';
+import JSONTextArea from '../../common/component/json_textarea';
 
-import { onChangeEvent } from '../util';
+import { onChangeEvent } from '../../common/util/event';
 
 export default class EventTrigger extends Component {
   constructor() {
diff --git a/js/editor/trigger/homeassistant.js b/js/automation-editor/trigger/homeassistant.js
similarity index 100%
rename from js/editor/trigger/homeassistant.js
rename to js/automation-editor/trigger/homeassistant.js
diff --git a/js/editor/trigger/index.js b/js/automation-editor/trigger/index.js
similarity index 100%
rename from js/editor/trigger/index.js
rename to js/automation-editor/trigger/index.js
diff --git a/js/editor/trigger/mqtt.js b/js/automation-editor/trigger/mqtt.js
similarity index 92%
rename from js/editor/trigger/mqtt.js
rename to js/automation-editor/trigger/mqtt.js
index 59540ea92c..ba50998ac2 100644
--- a/js/editor/trigger/mqtt.js
+++ b/js/automation-editor/trigger/mqtt.js
@@ -1,6 +1,6 @@
 import { h, Component } from 'preact';
 
-import { onChangeEvent } from '../util';
+import { onChangeEvent } from '../../common/util/event';
 
 export default class MQTTTrigger extends Component {
   constructor() {
diff --git a/js/editor/trigger/numeric_state.js b/js/automation-editor/trigger/numeric_state.js
similarity index 95%
rename from js/editor/trigger/numeric_state.js
rename to js/automation-editor/trigger/numeric_state.js
index ff7f4e5c41..0f212f53ca 100644
--- a/js/editor/trigger/numeric_state.js
+++ b/js/automation-editor/trigger/numeric_state.js
@@ -1,6 +1,6 @@
 import { h, Component } from 'preact';
 
-import { onChangeEvent } from '../util';
+import { onChangeEvent } from '../../common/util/event';
 
 export default class NumericStateTrigger extends Component {
   constructor() {
diff --git a/js/editor/trigger/state.js b/js/automation-editor/trigger/state.js
similarity index 94%
rename from js/editor/trigger/state.js
rename to js/automation-editor/trigger/state.js
index 5537f6ecaf..32ae9a3c46 100644
--- a/js/editor/trigger/state.js
+++ b/js/automation-editor/trigger/state.js
@@ -1,6 +1,6 @@
 import { h, Component } from 'preact';
 
-import { onChangeEvent } from '../util';
+import { onChangeEvent } from '../../common/util/event';
 
 export default class StateTrigger extends Component {
   constructor() {
diff --git a/js/editor/trigger/sun.js b/js/automation-editor/trigger/sun.js
similarity index 95%
rename from js/editor/trigger/sun.js
rename to js/automation-editor/trigger/sun.js
index 88a4a55224..4beb94d2d4 100644
--- a/js/editor/trigger/sun.js
+++ b/js/automation-editor/trigger/sun.js
@@ -1,6 +1,6 @@
 import { h, Component } from 'preact';
 
-import { onChangeEvent } from '../util';
+import { onChangeEvent } from '../../common/util/event';
 
 export default class SunTrigger extends Component {
   constructor() {
diff --git a/js/editor/trigger/template.js b/js/automation-editor/trigger/template.js
similarity index 91%
rename from js/editor/trigger/template.js
rename to js/automation-editor/trigger/template.js
index 701ca05f27..6cfc310bf1 100644
--- a/js/editor/trigger/template.js
+++ b/js/automation-editor/trigger/template.js
@@ -1,6 +1,6 @@
 import { h, Component } from 'preact';
 
-import { onChangeEvent } from '../util';
+import { onChangeEvent } from '../../common/util/event';
 
 export default class TemplateTrigger extends Component {
   constructor() {
diff --git a/js/editor/trigger/time.js b/js/automation-editor/trigger/time.js
similarity index 89%
rename from js/editor/trigger/time.js
rename to js/automation-editor/trigger/time.js
index 0cc8487f24..723d36244b 100644
--- a/js/editor/trigger/time.js
+++ b/js/automation-editor/trigger/time.js
@@ -1,6 +1,6 @@
 import { h, Component } from 'preact';
 
-import { onChangeEvent } from '../util';
+import { onChangeEvent } from '../../common/util/event';
 
 export default class TimeTrigger extends Component {
   constructor() {
diff --git a/js/editor/trigger/trigger_edit.js b/js/automation-editor/trigger/trigger_edit.js
similarity index 100%
rename from js/editor/trigger/trigger_edit.js
rename to js/automation-editor/trigger/trigger_edit.js
diff --git a/js/editor/trigger/trigger_row.js b/js/automation-editor/trigger/trigger_row.js
similarity index 100%
rename from js/editor/trigger/trigger_row.js
rename to js/automation-editor/trigger/trigger_row.js
diff --git a/js/editor/trigger/zone.js b/js/automation-editor/trigger/zone.js
similarity index 95%
rename from js/editor/trigger/zone.js
rename to js/automation-editor/trigger/zone.js
index 86fbc38b03..38db36d6ac 100644
--- a/js/editor/trigger/zone.js
+++ b/js/automation-editor/trigger/zone.js
@@ -1,6 +1,6 @@
 import { h, Component } from 'preact';
 
-import { onChangeEvent } from '../util';
+import { onChangeEvent } from '../../common/util/event';
 
 export default class ZoneTrigger extends Component {
   constructor() {
diff --git a/js/editor/condition/condition_edit.js b/js/common/component/condition/condition_edit.js
similarity index 100%
rename from js/editor/condition/condition_edit.js
rename to js/common/component/condition/condition_edit.js
diff --git a/js/editor/condition/condition_row.js b/js/common/component/condition/condition_row.js
similarity index 100%
rename from js/editor/condition/condition_row.js
rename to js/common/component/condition/condition_row.js
diff --git a/js/editor/condition/index.js b/js/common/component/condition/index.js
similarity index 100%
rename from js/editor/condition/index.js
rename to js/common/component/condition/index.js
diff --git a/js/editor/condition/numeric_state.js b/js/common/component/condition/numeric_state.js
similarity index 95%
rename from js/editor/condition/numeric_state.js
rename to js/common/component/condition/numeric_state.js
index 7849c8a9db..0597d62c4b 100644
--- a/js/editor/condition/numeric_state.js
+++ b/js/common/component/condition/numeric_state.js
@@ -1,6 +1,6 @@
 import { h, Component } from 'preact';
 
-import { onChangeEvent } from '../util';
+import { onChangeEvent } from '../../util/event';
 
 export default class NumericStateCondition extends Component {
   constructor() {
diff --git a/js/editor/condition/state.js b/js/common/component/condition/state.js
similarity index 94%
rename from js/editor/condition/state.js
rename to js/common/component/condition/state.js
index 0eafaca80d..5312559325 100644
--- a/js/editor/condition/state.js
+++ b/js/common/component/condition/state.js
@@ -1,6 +1,6 @@
 import { h, Component } from 'preact';
 
-import { onChangeEvent } from '../util';
+import { onChangeEvent } from '../../util/event';
 
 export default class StateCondition extends Component {
   constructor() {
diff --git a/js/editor/condition/sun.js b/js/common/component/condition/sun.js
similarity index 97%
rename from js/editor/condition/sun.js
rename to js/common/component/condition/sun.js
index 23064c6b0d..e8dbdaa127 100644
--- a/js/editor/condition/sun.js
+++ b/js/common/component/condition/sun.js
@@ -1,6 +1,6 @@
 import { h, Component } from 'preact';
 
-import { onChangeEvent } from '../util';
+import { onChangeEvent } from '../../util/event';
 
 export default class SunCondition extends Component {
   constructor() {
diff --git a/js/editor/condition/template.js b/js/common/component/condition/template.js
similarity index 92%
rename from js/editor/condition/template.js
rename to js/common/component/condition/template.js
index 2427879d34..34c3bac498 100644
--- a/js/editor/condition/template.js
+++ b/js/common/component/condition/template.js
@@ -1,6 +1,6 @@
 import { h, Component } from 'preact';
 
-import { onChangeEvent } from '../util';
+import { onChangeEvent } from '../../util/event';
 
 export default class TemplateCondition extends Component {
   constructor() {
diff --git a/js/editor/condition/time.js b/js/common/component/condition/time.js
similarity index 93%
rename from js/editor/condition/time.js
rename to js/common/component/condition/time.js
index b6efe42aa7..1e8bc3355e 100644
--- a/js/editor/condition/time.js
+++ b/js/common/component/condition/time.js
@@ -1,6 +1,6 @@
 import { h, Component } from 'preact';
 
-import { onChangeEvent } from '../util';
+import { onChangeEvent } from '../../util/event';
 
 export default class StateCondition extends Component {
   constructor() {
diff --git a/js/editor/condition/zone.js b/js/common/component/condition/zone.js
similarity index 93%
rename from js/editor/condition/zone.js
rename to js/common/component/condition/zone.js
index 10a2da8c04..c0c27ce2dc 100644
--- a/js/editor/condition/zone.js
+++ b/js/common/component/condition/zone.js
@@ -1,6 +1,6 @@
 import { h, Component } from 'preact';
 
-import { onChangeEvent } from '../util';
+import { onChangeEvent } from '../../util/event';
 
 export default class ZoneCondition extends Component {
   constructor() {
diff --git a/js/editor/json_textarea.js b/js/common/component/json_textarea.js
similarity index 100%
rename from js/editor/json_textarea.js
rename to js/common/component/json_textarea.js
diff --git a/js/editor/script/action_edit.js b/js/common/component/script/action_edit.js
similarity index 100%
rename from js/editor/script/action_edit.js
rename to js/common/component/script/action_edit.js
diff --git a/js/editor/script/action_row.js b/js/common/component/script/action_row.js
similarity index 100%
rename from js/editor/script/action_row.js
rename to js/common/component/script/action_row.js
diff --git a/js/editor/script/call_service.js b/js/common/component/script/call_service.js
similarity index 95%
rename from js/editor/script/call_service.js
rename to js/common/component/script/call_service.js
index 2112c3b84f..17d20ba200 100644
--- a/js/editor/script/call_service.js
+++ b/js/common/component/script/call_service.js
@@ -1,7 +1,7 @@
 import { h, Component } from 'preact';
 
 import JSONTextArea from '../json_textarea';
-import { onChangeEvent } from '../util';
+import { onChangeEvent } from '../../util/event';
 
 export default class CallServiceAction extends Component {
   constructor() {
diff --git a/js/editor/script/condition.js b/js/common/component/script/condition.js
similarity index 100%
rename from js/editor/script/condition.js
rename to js/common/component/script/condition.js
diff --git a/js/editor/script/delay.js b/js/common/component/script/delay.js
similarity index 91%
rename from js/editor/script/delay.js
rename to js/common/component/script/delay.js
index a20d29722b..cb7ea2ddb4 100644
--- a/js/editor/script/delay.js
+++ b/js/common/component/script/delay.js
@@ -1,5 +1,5 @@
 import { h, Component } from 'preact';
-import { onChangeEvent } from '../util';
+import { onChangeEvent } from '../../util/event';
 
 export default class DelayAction extends Component {
   constructor() {
diff --git a/js/editor/script/event.js b/js/common/component/script/event.js
similarity index 94%
rename from js/editor/script/event.js
rename to js/common/component/script/event.js
index c554a1a579..67cb438291 100644
--- a/js/editor/script/event.js
+++ b/js/common/component/script/event.js
@@ -1,7 +1,7 @@
 import { h, Component } from 'preact';
 
 import JSONTextArea from '../json_textarea';
-import { onChangeEvent } from '../util';
+import { onChangeEvent } from '../../util/event';
 
 export default class EventAction extends Component {
   constructor() {
diff --git a/js/editor/script/index.js b/js/common/component/script/index.js
similarity index 100%
rename from js/editor/script/index.js
rename to js/common/component/script/index.js
diff --git a/js/editor/script/wait.js b/js/common/component/script/wait.js
similarity index 95%
rename from js/editor/script/wait.js
rename to js/common/component/script/wait.js
index a473d2277b..27cec6d3cd 100644
--- a/js/editor/script/wait.js
+++ b/js/common/component/script/wait.js
@@ -1,5 +1,5 @@
 import { h, Component } from 'preact';
-import { onChangeEvent } from '../util';
+import { onChangeEvent } from '../../util/event';
 
 export default class WaitAction extends Component {
   constructor() {
diff --git a/js/common/util/entity.js b/js/common/util/entity.js
new file mode 100644
index 0000000000..50670c8a33
--- /dev/null
+++ b/js/common/util/entity.js
@@ -0,0 +1,3 @@
+export function validEntityId(entityId) {
+  return /^(\w+)\.(\w+)$/.test(entityId);
+}
diff --git a/js/editor/util.js b/js/common/util/event.js
similarity index 78%
rename from js/editor/util.js
rename to js/common/util/event.js
index 939cf78d88..42c05f3fcf 100644
--- a/js/editor/util.js
+++ b/js/common/util/event.js
@@ -1,7 +1,3 @@
-export function validEntityId(entityId) {
-  return /^(\w+)\.(\w+)$/.test(entityId);
-}
-
 export function onChangeEvent(prop, ev) {
   const data = { ...this.props[prop] };
 
diff --git a/js/script-editor/script-editor.js b/js/script-editor/script-editor.js
new file mode 100644
index 0000000000..4c5663e227
--- /dev/null
+++ b/js/script-editor/script-editor.js
@@ -0,0 +1,10 @@
+import { h, render } from 'preact';
+import Script from './script';
+
+window.ScriptEditor = function (mountEl, props, mergeEl) {
+  return render(h(Script, props), mountEl, mergeEl);
+};
+
+window.unmountPreact = function (mountEl, mergeEl) {
+  render(() => null, mountEl, mergeEl);
+};
diff --git a/js/script-editor/script.js b/js/script-editor/script.js
new file mode 100644
index 0000000000..c3e0a268e8
--- /dev/null
+++ b/js/script-editor/script.js
@@ -0,0 +1,62 @@
+import { h, Component } from 'preact';
+
+import Script from '../common/component/script';
+
+export default class ScriptEditor extends Component {
+  constructor() {
+    super();
+
+    this.onChange = this.onChange.bind(this);
+    this.sequenceChanged = this.sequenceChanged.bind(this);
+  }
+
+  onChange(ev) {
+    this.props.onChange({
+      ...this.props.script,
+      [ev.target.name]: ev.target.value,
+    });
+  }
+
+  sequenceChanged(sequence) {
+    this.props.onChange({
+      ...this.props.script,
+      sequence,
+    });
+  }
+
+  render({ script, isWide }) {
+    const { alias, sequence } = script;
+
+    return (
+      <div>
+        <ha-config-section is-wide={isWide}>
+          <span slot='header'>{alias}</span>
+          <span slot='introduction'>
+            Use scripts to execute a sequence of actions.
+          </span>
+          <paper-card>
+            <div class='card-content'>
+              <paper-input
+                label="Name"
+                name="alias"
+                value={alias}
+                onChange={this.onChange}
+              />
+            </div>
+          </paper-card>
+        </ha-config-section>
+
+        <ha-config-section is-wide={isWide}>
+          <span slot='header'>Sequence</span>
+          <span slot='introduction'>
+            The sequence of actions of this script.
+            <p><a href="https://home-assistant.io/docs/scripts/" target="_blank">
+              Learn more about available actions.
+            </a></p>
+          </span>
+          <Script script={sequence} onChange={this.sequenceChanged} />
+        </ha-config-section>
+      </div>
+    );
+  }
+}
diff --git a/panels/config/automation/ha-automation-editor.html b/panels/config/automation/ha-automation-editor.html
index 2928914416..837ffac19d 100644
--- a/panels/config/automation/ha-automation-editor.html
+++ b/panels/config/automation/ha-automation-editor.html
@@ -18,7 +18,7 @@
 
 <link rel="import" href="../ha-config-section.html">
 
-<script src='../../../build-temp/editor.js'></script>
+<script src='../../../build-temp/automation-editor.js'></script>
 
 <dom-module id="ha-automation-editor">
   <template>
diff --git a/panels/config/automation/ha-config-automation.html b/panels/config/automation/ha-config-automation.html
index 247767a6f1..e6ba7cc5e4 100644
--- a/panels/config/automation/ha-config-automation.html
+++ b/panels/config/automation/ha-config-automation.html
@@ -16,7 +16,7 @@
       route='[[route]]'
       pattern='/edit/:automation'
       data="{{_routeData}}"
-      active="{{_edittingAddon}}"
+      active="{{_edittingAutomation}}"
     ></app-route>
     <app-route
       route='[[route]]'
@@ -57,7 +57,7 @@ Polymer({
     _routeData: Object,
     _routeMatches: Boolean,
     _creatingNew: Boolean,
-    _edittingAddon: Boolean,
+    _edittingAutomation: Boolean,
 
     automations: {
       type: Array,
@@ -66,12 +66,12 @@ Polymer({
 
     automation: {
       type: Object,
-      computed: 'computeAutomation(automations, _edittingAddon, _routeData)',
+      computed: 'computeAutomation(automations, _edittingAutomation, _routeData)',
     },
 
     showEditor: {
       type: Boolean,
-      computed: 'computeShowEditor(_edittingAddon, _creatingNew)',
+      computed: 'computeShowEditor(_edittingAutomation, _creatingNew)',
     }
   },
 
@@ -115,8 +115,8 @@ Polymer({
     });
   },
 
-  computeShowEditor: function (_edittingAddon, _creatingNew) {
-    return _creatingNew || _edittingAddon;
+  computeShowEditor: function (_edittingAutomation, _creatingNew) {
+    return _creatingNew || _edittingAutomation;
   },
 });
 </script>
diff --git a/panels/config/dashboard/ha-config-dashboard.html b/panels/config/dashboard/ha-config-dashboard.html
index 1725137d50..55f6a9328e 100644
--- a/panels/config/dashboard/ha-config-dashboard.html
+++ b/panels/config/dashboard/ha-config-dashboard.html
@@ -34,27 +34,10 @@
       </app-header>
 
       <div class$='[[computeClasses(isWide)]]'>
-        <!--
-          Sortable.js doesn't work in Polymer 2 making this panel useless.
-          Disabling for now.
-        <ha-config-section-group
-          is-wide='[[isWide]]'
-          hass='[[hass]]'
-        ></ha-config-section-group>
-        -->
-
         <ha-config-navigation
           is-wide='[[isWide]]'
           hass='[[hass]]'
         ></ha-config-navigation>
-
-        <!-- <template is='dom-if' if='[[computeIsZwaveLoaded(hass)]]'>
-          <div class='border'></div>
-          <ha-config-section-zwave
-            is-wide='[[isWide]]'
-            hass='[[hass]]'
-          ></ha-config-section-zwave>
-        </template> -->
       </div>
     </app-header-layout>
   </template>
diff --git a/panels/config/dashboard/ha-config-navigation.html b/panels/config/dashboard/ha-config-navigation.html
index ecdd373ac3..68ae696c86 100644
--- a/panels/config/dashboard/ha-config-navigation.html
+++ b/panels/config/dashboard/ha-config-navigation.html
@@ -57,16 +57,21 @@ Polymer({
     pages: {
       type: Array,
       value: [
+        {
+          domain: 'core',
+          caption: 'General',
+          description: 'Validate your configuration file and control the server.',
+          loaded: true,
+        },
         {
           domain: 'automation',
           caption: 'Automation',
           description: 'Create and edit automations.',
         },
         {
-          domain: 'core',
-          caption: 'Configuration.yaml',
-          description: 'Manage your configuration file and the server.',
-          loaded: true,
+          domain: 'script',
+          caption: 'Script',
+          description: 'Create and edit scripts.',
         },
         {
           domain: 'zwave',
diff --git a/panels/config/ha-panel-config.html b/panels/config/ha-panel-config.html
index 3a413a4937..d45dd75884 100644
--- a/panels/config/ha-panel-config.html
+++ b/panels/config/ha-panel-config.html
@@ -8,6 +8,7 @@
 <link rel="import" href="./dashboard/ha-config-dashboard.html">
 <link rel="import" href="./core/ha-config-core.html">
 <link rel="import" href="./automation/ha-config-automation.html">
+<link rel="import" href="./script/ha-config-script.html">
 <link rel="import" href="./zwave/ha-config-zwave.html">
 
 <dom-module id="ha-panel-config">
@@ -48,6 +49,13 @@
         is-wide='[[isWide]]'
       ></ha-config-automation>
 
+      <ha-config-script
+        page-name='script'
+        route='[[_routeTail]]'
+        hass='[[hass]]'
+        is-wide='[[isWide]]'
+      ></ha-config-script>
+
       <ha-config-zwave
         page-name='zwave'
         hass='[[hass]]'
diff --git a/panels/config/script/ha-config-script.html b/panels/config/script/ha-config-script.html
new file mode 100644
index 0000000000..d6dd2f97de
--- /dev/null
+++ b/panels/config/script/ha-config-script.html
@@ -0,0 +1,119 @@
+<link rel="import" href="../../../bower_components/polymer/polymer.html">
+<link rel='import' href='../../../bower_components/app-route/app-route.html'>
+
+<link rel="import" href="./ha-script-picker.html">
+<link rel="import" href="./ha-script-editor.html">
+
+<dom-module id="ha-config-script">
+  <template>
+    <style>
+      ha-script-picker,
+      ha-script-editor {
+        height: 100%;
+      }
+    </style>
+    <app-route
+      route='[[route]]'
+      pattern='/edit/:script'
+      data="{{_routeData}}"
+      active="{{_edittingScript}}"
+    ></app-route>
+    <app-route
+      route='[[route]]'
+      pattern='/new'
+      active="{{_creatingNew}}"
+    ></app-route>
+
+    <template is='dom-if' if='[[!showEditor]]'>
+      <ha-script-picker
+        narrow='[[narrow]]'
+        show-menu='[[showMenu]]'
+        scripts='[[scripts]]'
+        is-wide='[[isWide]]'
+      ></ha-script-picker>
+    </template>
+
+    <template is='dom-if' if='[[showEditor]]' restamp>
+      <ha-script-editor
+        hass='[[hass]]'
+        script='[[script]]'
+        is-wide='[[isWide]]'
+        creating-new='[[_creatingNew]]'
+      ></ha-script-editor>
+    </template>
+  </template>
+</dom-module>
+
+<script>
+Polymer({
+  is: 'ha-config-script',
+
+  properties: {
+    hass: Object,
+    narrow: Boolean,
+    showMenu: Boolean,
+    route: Object,
+    isWide: Boolean,
+    _routeData: Object,
+    _routeMatches: Boolean,
+    _creatingNew: Boolean,
+    _edittingScript: Boolean,
+
+    scripts: {
+      type: Array,
+      computed: 'computeScripts(hass)',
+    },
+
+    script: {
+      type: Object,
+      computed: 'computeScript(scripts, _edittingScript, _routeData)',
+    },
+
+    showEditor: {
+      type: Boolean,
+      computed: 'computeShowEditor(_edittingScript, _creatingNew)',
+    }
+  },
+
+  computeScript: function (scripts, edittingAddon, routeData) {
+    if (!scripts || !edittingAddon) {
+      return null;
+    }
+    for (var i = 0; i < scripts.length; i++) {
+      if (scripts[i].entity_id === routeData.script) {
+        return scripts[i];
+      }
+    }
+    return null;
+  },
+
+  computeScripts: function (hass) {
+    var scripts = [];
+
+    Object.keys(hass.states).forEach(function (key) {
+      var entity = hass.states[key];
+
+      if (window.hassUtil.computeDomain(entity) === 'script') {
+        scripts.push(entity);
+      }
+    });
+
+    return scripts.sort(function entitySortBy(entityA, entityB) {
+      var nameA = window.hassUtil.computeStateName(entityA);
+      var nameB = window.hassUtil.computeStateName(entityB);
+
+      if (nameA < nameB) {
+        return -1;
+      }
+      if (nameA > nameB) {
+        return 1;
+      }
+      return 0;
+    });
+  },
+
+  computeShowEditor: function (_edittingScript, _creatingNew) {
+    return _creatingNew || _edittingScript;
+  },
+});
+</script>
diff --git a/panels/config/script/ha-script-editor.html b/panels/config/script/ha-script-editor.html
new file mode 100644
index 0000000000..a24f1feef0
--- /dev/null
+++ b/panels/config/script/ha-script-editor.html
@@ -0,0 +1,265 @@
+<link rel="import" href="../../../bower_components/polymer/polymer.html">
+<link rel="import" href="../../../bower_components/app-layout/app-header-layout/app-header-layout.html">
+<link rel="import" href="../../../bower_components/app-layout/app-header/app-header.html">
+<link rel="import" href="../../../bower_components/app-layout/app-toolbar/app-toolbar.html">
+<link rel="import" href="../../../bower_components/paper-card/paper-card.html">
+<link rel="import" href="../../../bower_components/paper-item/paper-item.html">
+<link rel="import" href="../../../bower_components/paper-item/paper-item-body.html">
+<link rel="import" href="../../../bower_components/paper-icon-button/paper-icon-button.html">
+<link rel="import" href="../../../bower_components/paper-input/paper-input.html">
+<link rel="import" href="../../../bower_components/paper-input/paper-textarea.html">
+<link rel="import" href="../../../bower_components/paper-radio-button/paper-radio-button.html">
+<link rel="import" href="../../../bower_components/paper-radio-group/paper-radio-group.html">
+<link rel="import" href="../../../bower_components/paper-dropdown-menu/paper-dropdown-menu-light.html">
+<link rel="import" href="../../../bower_components/paper-listbox/paper-listbox.html">
+<link rel="import" href="../../../bower_components/paper-menu-button/paper-menu-button.html">
+<link rel="import" href="../../../bower_components/paper-fab/paper-fab.html">
+<link rel="import" href="../../../bower_components/iron-autogrow-textarea/iron-autogrow-textarea.html">
+
+<link rel="import" href="../ha-config-section.html">
+
+<script src='../../../build-temp/script-editor.js'></script>
+
+<dom-module id="ha-script-editor">
+  <template>
+    <style include="ha-style">
+      .errors {
+        padding: 20px;
+        font-weight: bold;
+        color: var(--google-red-500);
+      }
+      .content {
+        padding-bottom: 20px;
+      }
+      paper-card {
+        display: block;
+      }
+      .triggers,
+      .script {
+        margin-top: -16px;
+      }
+      .triggers paper-card,
+      .script paper-card {
+        margin-top: 16px;
+      }
+      .add-card paper-button {
+        display: block;
+        text-align: center;
+      }
+      .card-menu {
+        position: absolute;
+        top: 0;
+        right: 0;
+        z-index: 1;
+        color: var(--primary-text-color);
+      }
+      .card-menu paper-item {
+        cursor: pointer;
+      }
+      span[slot=introduction] a {
+        color: var(--primary-color);
+      }
+      paper-fab {
+        position: fixed;
+        bottom: 16px;
+        right: 16px;
+        z-index: 1;
+        margin-bottom: -80px;
+        transition: margin-bottom .3s;
+      }
+
+      paper-fab[is-wide] {
+        bottom: 24px;
+        right: 24px;
+      }
+
+      paper-fab[dirty] {
+        margin-bottom: 0;
+      }
+    </style>
+
+    <app-header-layout has-scrolling-region>
+      <app-header slot="header" fixed>
+        <app-toolbar>
+          <paper-icon-button
+            icon='mdi:arrow-left'
+            on-tap='backTapped'
+          ></paper-icon-button>
+          <div main-title>Script [[name]]</div>
+        </app-toolbar>
+      </app-header>
+
+      <div class='content'>
+        <template is='dom-if' if='[[errors]]'>
+          <div class='errors'>[[errors]]</div>
+        </template>
+        <div id='root'></div>
+        <paper-fab
+          is-wide$='[[isWide]]'
+          dirty$='[[dirty]]'
+          icon='mdi:content-save'
+          title='Save'
+          on-tap='saveScript'
+        ></paper-fab>
+      </div>
+    </app-header-layout>
+
+  </template>
+</dom-module>
+
+<script>
+Polymer({
+  is: 'ha-script-editor',
+
+  properties: {
+    hass: {
+      type: Object,
+    },
+
+    narrow: {
+      type: Boolean,
+    },
+
+    showMenu: {
+      type: Boolean,
+      value: false,
+    },
+
+    errors: {
+      type: Object,
+      value: null,
+    },
+
+    dirty: {
+      type: Boolean,
+      value: false,
+    },
+
+    config: {
+      type: Object,
+      value: null,
+    },
+
+    script: {
+      type: Object,
+      observer: 'scriptChanged',
+    },
+
+    creatingNew: {
+      type: Boolean,
+      observer: 'creatingNewChanged',
+    },
+
+    name: {
+      type: String,
+      computed: 'computeName(script)'
+    },
+
+    isWide: {
+      type: Boolean,
+      observer: 'isWideChanged',
+    },
+  },
+
+  created: function () {
+    this.configChanged = this.configChanged.bind(this);
+    this._rendered = null;
+  },
+
+  detached: function () {
+    if (this._rendered) {
+      window.unmountPreact(this._rendered);
+    }
+  },
+
+  configChanged: function (config) {
+    // onChange gets called a lot during initial rendering causing recursing calls.
+    if (this._rendered === null) return;
+    this.config = config;
+    this.errors = null;
+    this.dirty = true;
+    this._updateComponent(config);
+  },
+
+  scriptChanged: function (newVal, oldVal) {
+    if (!newVal) return;
+    if (!this.hass) {
+      setTimeout(this.scriptChanged.bind(this, newVal, oldVal), 0);
+      return;
+    }
+    if (oldVal && oldVal.entity_id === newVal.entity_id) {
+      return;
+    }
+    this.hass.callApi('get', 'config/script/config/' + window.hassUtil.computeObjectId(newVal))
+      .then(function (config) {
+        // Normalize data: ensure sequence is a list
+        // Happens when people copy paste their scripts into the config
+        var value = config.sequence;
+        if (value && !Array.isArray(value)) {
+          config.sequence = [value];
+        }
+
+        this.dirty = false;
+        this.config = config;
+        this._updateComponent();
+      }.bind(this));
+  },
+
+  creatingNewChanged: function (newVal) {
+    if (!newVal) {
+      return;
+    }
+    this.dirty = false;
+    this.config = {
+      alias: 'New Script',
+      sequence: [
+        { service: '', data: {} },
+      ],
+    };
+    this._updateComponent();
+  },
+
+  isWideChanged: function () {
+    if (this.config === null) return;
+    this._updateComponent();
+  },
+
+  backTapped: function () {
+    if (this.dirty &&
+        // eslint-disable-next-line
+        !confirm('You have unsaved changes. Are you sure you want to leave?')) {
+      return;
+    }
+    history.back();
+  },
+
+  _updateComponent: function () {
+    this._rendered = window.ScriptEditor(
+      this.$.root, {
+        script: this.config,
+        onChange: this.configChanged,
+        isWide: this.isWide,
+      }, this._rendered);
+  },
+
+  saveScript: function () {
+    var id = this.creatingNew ? '' + Date.now() : window.hassUtil.computeObjectId(this.script);
+    this.hass.callApi(
+      'post', 'config/script/config/' + id, this.config).then(function () {
+        this.dirty = false;
+
+        if (this.creatingNew) {
+          history.replaceState(null, null, '/config/script/edit/' + id);
+          this.fire('location-changed');
+        }
+      }.bind(this), function (errors) {
+        this.errors = errors.body.message;
+        throw errors;
+      }.bind(this));
+  },
+
+  computeName: function (script) {
+    return script && window.hassUtil.computeStateName(script);
+  },
+});
+</script>
diff --git a/panels/config/script/ha-script-picker.html b/panels/config/script/ha-script-picker.html
new file mode 100644
index 0000000000..7aae6fa95d
--- /dev/null
+++ b/panels/config/script/ha-script-picker.html
@@ -0,0 +1,142 @@
+<link rel="import" href="../../../bower_components/polymer/polymer.html">
+<link rel="import" href="../../../bower_components/app-layout/app-header-layout/app-header-layout.html">
+<link rel="import" href="../../../bower_components/app-layout/app-header/app-header.html">
+<link rel="import" href="../../../bower_components/app-layout/app-toolbar/app-toolbar.html">
+<link rel="import" href="../../../bower_components/paper-card/paper-card.html">
+<link rel="import" href="../../../bower_components/paper-item/paper-item.html">
+<link rel="import" href="../../../bower_components/paper-item/paper-item-body.html">
+<link rel="import" href="../../../bower_components/paper-fab/paper-fab.html">
+<link rel="import" href="../../../bower_components/paper-icon-button/paper-icon-button.html">
+
+<link rel="import" href="../ha-config-section.html">
+
+<dom-module id="ha-script-picker">
+  <template>
+    <style include="ha-style">
+      :host {
+        display: block;
+      }
+
+      paper-item {
+        cursor: pointer;
+      }
+
+      paper-fab {
+        position: fixed;
+        bottom: 16px;
+        right: 16px;
+        z-index: 1;
+      }
+
+      paper-fab[is-wide] {
+        bottom: 24px;
+        right: 24px;
+      }
+
+      a {
+        color: var(--primary-color);
+      }
+    </style>
+
+    <app-header-layout has-scrolling-region>
+      <app-header slot="header" fixed>
+        <app-toolbar>
+          <paper-icon-button
+            icon='mdi:arrow-left'
+            on-tap='_backTapped'
+          ></paper-icon-button>
+          <div main-title>Scripts</div>
+        </app-toolbar>
+      </app-header>
+
+      <ha-config-section
+        is-wide='[[isWide]]'
+      >
+        <div slot='header'>Script editor</div>
+        <div slot='introduction'>
+          The script editor allows you to create and edit scripts.
+          Please read <a href='https://home-assistant.io/docs/script/editor/' target='_blank'>the instructions</a> to make sure that you have configured Home Assistant correctly.
+        </div>
+
+        <paper-card heading='Pick script to edit'>
+          <template is='dom-if' if='[[!scripts.length]]'>
+            <div class='card-content'>
+              <p>We couldn't find any editable scripts.</p>
+            </div>
+          </template>
+          <template is='dom-repeat' items='[[scripts]]' as='script'>
+            <paper-item>
+              <paper-item-body two-line on-tap='scriptTapped'>
+                <div>[[computeName(script)]]</div>
+                <div secondary>[[computeDescription(script)]]</div>
+              </paper-item-body>
+              <iron-icon icon='mdi:chevron-right'></iron-icon>
+            </paper-item>
+          </template>
+        </paper-card>
+      </ha-config-section>
+
+      <paper-fab
+        is-wide$='[[isWide]]'
+        icon='mdi:plus'
+        title='Add Script'
+        on-tap='addScript'
+      ></paper-fab>
+    </app-header-layout>
+
+  </template>
+</dom-module>
+
+<script>
+Polymer({
+  is: 'ha-script-picker',
+
+  properties: {
+    hass: {
+      type: Object,
+    },
+
+    narrow: {
+      type: Boolean,
+    },
+
+    showMenu: {
+      type: Boolean,
+      value: false,
+    },
+
+    scripts: {
+      type: Array,
+    },
+
+    isWide: {
+      type: Boolean,
+    },
+  },
+
+  scriptTapped: function (ev) {
+    history.pushState(
+      null, null, '/config/script/edit/' + this.scripts[ev.model.index].entity_id);
+    this.fire('location-changed');
+  },
+
+  addScript: function () {
+    history.pushState(null, null, '/config/script/new');
+    this.fire('location-changed');
+  },
+
+  computeName: function (script) {
+    return window.hassUtil.computeStateName(script);
+  },
+
+  // Still thinking of something to add here.
+  // eslint-disable-next-line
+  computeDescription: function (script) {
+    return '';
+  },
+
+  _backTapped: function () {
+    history.back();
+  },
+});
+</script>
diff --git a/src/util/hass-util.html b/src/util/hass-util.html
index 07c9385116..c95314b84f 100644
--- a/src/util/hass-util.html
+++ b/src/util/hass-util.html
@@ -430,6 +430,14 @@ window.hassUtil.computeDomain = function (stateObj) {
   return stateObj._domain;
 };
 
+window.hassUtil.computeObjectId = function (stateObj) {
+  if (!stateObj._object_id) {
+    stateObj._object_id = window.HAWS.extractObjectId(stateObj.entity_id);
+  }
+
+  return stateObj._object_id;
+};
+
 window.hassUtil.computeStateName = function (stateObj) {
   if (stateObj._entityDisplay === undefined) {
     stateObj._entityDisplay = (