diff --git a/.eslintrc-hound.json b/.eslintrc-hound.json
index dc053e517d..3361247052 100644
--- a/.eslintrc-hound.json
+++ b/.eslintrc-hound.json
@@ -16,6 +16,7 @@
     "__DEMO__": false,
     "__BUILD__": false,
     "__VERSION__": false,
+    "__ROOT__": false,
     "Polymer": true,
     "webkitSpeechRecognition": false,
     "ResizeObserver": false
diff --git a/.eslintrc.json b/.eslintrc.json
index e0c225a1f1..9954ffbaba 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -8,6 +8,7 @@
     "browser": true
   },
   "rules": {
-    "import/no-unresolved": 2
+    "import/no-unresolved": 2,
+    "linebreak-style": 0
   }
 }
diff --git a/bower.json b/bower.json
index 41c13814f1..50eb05342b 100644
--- a/bower.json
+++ b/bower.json
@@ -55,7 +55,10 @@
     "vaadin-combo-box": "vaadin/vaadin-combo-box#^3.0.2",
     "vaadin-date-picker": "vaadin/vaadin-date-picker#^2.0.0",
     "web-animations-js": "^2.2.5",
-    "webcomponentsjs": "^1.0.10"
+    "webcomponentsjs": "^1.0.10",
+    "chart.js": "~2.7.1",
+    "moment": "^2.20.0",
+    "chartjs-chart-timeline": "fanthos/chartjs-chart-timeline#^0.1.3"
   },
   "devDependencies": {
     "web-component-tester": "^6.3.0"
diff --git a/gulp/tasks/build.js b/gulp/tasks/build.js
index cbd546755c..396a72fb37 100644
--- a/gulp/tasks/build.js
+++ b/gulp/tasks/build.js
@@ -36,6 +36,7 @@ function build(es6) {
     stripImportsStrategy([
       'bower_components/font-roboto/roboto.html',
       'bower_components/paper-styles/color.html',
+      'src/resources/ha-chart-scripts.html',
     ]),
     stripAllButEntrypointStrategy('panels/hassio/ha-panel-hassio.html')
   ]);
diff --git a/gulp/tasks/rollup.js b/gulp/tasks/rollup.js
index 16f6803208..07d3c5ee16 100644
--- a/gulp/tasks/rollup.js
+++ b/gulp/tasks/rollup.js
@@ -58,6 +58,7 @@ function getRollupInputOptions(es6) {
           __DEMO__: JSON.stringify(DEMO),
           __BUILD__: JSON.stringify(es6 ? 'latest' : 'es5'),
           __VERSION__: JSON.stringify(VERSION),
+          __ROOT__: JSON.stringify(es6 ? 'frontend_latest' : 'frontend_es5'),
         },
       }),
     ],
diff --git a/js/core.js b/js/core.js
index 31a0434dd4..9367a03597 100644
--- a/js/core.js
+++ b/js/core.js
@@ -5,6 +5,7 @@ window.HASS_DEMO = __DEMO__;
 window.HASS_DEV = __DEV__;
 window.HASS_BUILD = __BUILD__;
 window.HASS_VERSION = __VERSION__;
+window.HASS_ROOT = __ROOT__;
 
 const init = window.createHassConnection = function (password) {
   const proto = window.location.protocol === 'https:' ? 'wss' : 'ws';
diff --git a/panels/history/ha-panel-history.html b/panels/history/ha-panel-history.html
index ea6a4703e6..0931617998 100644
--- a/panels/history/ha-panel-history.html
+++ b/panels/history/ha-panel-history.html
@@ -82,9 +82,11 @@
           </paper-dropdown-menu>
         </div>
         <state-history-charts
+          hass='[[hass]]'
           history-data="[[stateHistoryOutput]]"
           is-loading-data="[[isLoadingData]]"
-          end-time="[[endTime]]">
+          end-time="[[endTime]]"
+          no-single>
         </state-history-charts>
       </div>
     </app-header-layout>
diff --git a/polymer.json b/polymer.json
index eb40c8d42e..f6339c29e7 100644
--- a/polymer.json
+++ b/polymer.json
@@ -16,7 +16,8 @@
     "panels/logbook/ha-panel-logbook.html",
     "panels/map/ha-panel-map.html",
     "panels/shopping-list/ha-panel-shopping-list.html",
-    "panels/mailbox/ha-panel-mailbox.html"
+    "panels/mailbox/ha-panel-mailbox.html",
+    "src/resources/ha-chart-scripts.html"
   ],
   "sources": [
     "src/**/*",
diff --git a/script/build_frontend b/script/build_frontend
index 047cd11d0c..afb778d8f2 100755
--- a/script/build_frontend
+++ b/script/build_frontend
@@ -27,6 +27,10 @@ cp build/panels/*.html $OUTPUT_DIR/panels
 mkdir $OUTPUT_DIR_ES5/panels
 cp build-es5/panels/*.html $OUTPUT_DIR_ES5/panels
 
+# Chart code
+cp build/src/resources/ha-chart-scripts.html $OUTPUT_DIR
+cp build-es5/src/resources/ha-chart-scripts.html $OUTPUT_DIR_ES5
+
 # Translations
 cp -r build-translations/output $OUTPUT_DIR/translations
 
diff --git a/src/components/entity/ha-chart-base.html b/src/components/entity/ha-chart-base.html
new file mode 100644
index 0000000000..4e7b55da31
--- /dev/null
+++ b/src/components/entity/ha-chart-base.html
@@ -0,0 +1,484 @@
+<link rel='import' href='../../../bower_components/polymer/polymer-element.html'>
+<link rel='import' href='../../resources/ha-chart-scripts.html'>
+
+<dom-module id="ha-chart-base">
+  <template>
+    <style>
+      .chartHeader {
+        padding: 6px 0 0 0;
+      }
+      .chartHeader div {
+        display: inline-block;
+        vertical-align: top;
+      }
+      .chartTitle {
+        margin: 0 12px 0 8px;
+      }
+      :root{
+        user-select: none;
+        -moz-user-select: none;
+        -webkit-user-select: none;
+        -ms-user-select: none;
+      }
+      .chartTooltip {
+        opacity: 1;
+        position: absolute;
+        background: rgba(0, 0, 0, .7);
+        color: white;
+        border-radius: 3px;
+        pointer-events: none;
+        transform: translate(-50%, 0);
+        z-index: 1000;
+        width: 200px;
+      }
+      .chartLegend ul,
+      .chartTooltip ul {
+        display: inline-block;
+        padding: 0 0px;
+        margin: 0 0 8px 0;
+        width: 100%
+      }
+      .chartTooltip li {
+        display: block;
+        white-space: pre-line;
+      }
+      .chartTooltip .title {
+        text-align: center;
+      }
+      .chartLegend li {
+        display: inline-block;
+        padding: 0 5px;
+        max-width: 49%;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+        box-sizing: border-box;
+      }
+      .chartLegend li.hidden {
+        text-decoration: line-through;
+      }
+      .chartLegend em,
+      .chartTooltip em {
+        border-radius: 5px;
+        display: inline-block;
+        height: 10px;
+        margin-right: 6px;
+        width: 10px;
+      }
+    </style>
+    <template is="dom-if" if="[[unit]]">
+      <div class="chartHeader">
+        <div class="chartTitle">[[unit]]</div>
+        <div class="chartLegend">
+          <ul>
+            <template is="dom-repeat" items="[[metas]]">
+              <li data-lid$="[[itemsIndex]]" on-click="_legendClick" class$="[[item.hidden]]">
+                <em style$="background-color:[[item.bgColor]]"></em>
+                [[item.label]]
+              </li>
+            </template>
+          </ul>
+        </div>
+      </div>
+    </template>
+    <div id="chartTarget" style="height:40px; width:100%">
+      <canvas id="chartCanvas"></canvas>
+      <div class$="chartTooltip [[tooltip.yAlign]]"
+      style$="opacity:[[tooltip.opacity]]; top:[[tooltip.top]]; left:[[tooltip.left]]; padding:[[tooltip.yPadding]]px [[tooltip.xPadding]]px">
+        <div class="title">[[tooltip.title]]</div>
+        <div>
+          <ul >
+            <template is="dom-repeat" items="[[tooltip.lines]]">
+              <li><em style$="background-color:[[item.bgColor]]"></em>[[item.text]]</li>
+            </template>
+          </ul>
+        </div>
+      </div>
+    </div>
+  </template>
+</dom-module>
+<script>
+// eslint-disable-next-line no-unused-vars
+/* global Chart moment Color */
+{
+  let SCRIPT_LOADED = window.HASS_DEV;
+
+  class HaChartBase extends Polymer.Element {
+    get chart() {
+      return this._chart;
+    }
+    static get is() { return 'ha-chart-base'; }
+    static get properties() {
+      return {
+        publish: {
+          type: Boolean,
+          observer: 'onPropsChange'
+        },
+        data: {
+          type: Object,
+          observer: 'onPropsChange'
+        },
+      };
+    }
+    connectedCallback() {
+      super.connectedCallback();
+      this._isAttached = true;
+      this.set('tooltip', {
+        opacity: '0',
+        left: '0',
+        top: '0',
+        xPadding: '0',
+        yPadding: '0'
+      });
+      if (!this._chart) {
+        this.onPropsChange();
+      }
+      this._resizeListener = () => {
+        this._debouncer = Polymer.Debouncer.debounce(
+          this._debouncer,
+          Polymer.Async.timeOut.after(10),
+          () => {
+            if (this._isAttached) {
+              this.resizeChart();
+            }
+          }
+        );
+      };
+      window.addEventListener('resize', this._resizeListener);
+
+      if (!SCRIPT_LOADED) {
+        Polymer.importHref(
+          `${window.HASS_ROOT}/ha-chart-scripts.html`,
+          () => {
+            SCRIPT_LOADED = true;
+            this.onPropsChange();
+          },
+        );
+      }
+    }
+    disconnectedCallback() {
+      super.disconnectedCallback();
+      this._isAttached = false;
+      window.removeEventListener('resize', this._resizeListener);
+
+      if (this._resizeTimer !== undefined) {
+        clearInterval(this._resizeTimer);
+        this._resizeTimer = undefined;
+      }
+    }
+    onPropsChange() {
+      if (!this._isAttached || !SCRIPT_LOADED || !this.publish || !this.data) {
+        return;
+      }
+      this.drawChart();
+    }
+    _customTooltips(tooltip) {
+      // Hide if no tooltip
+      if (tooltip.opacity === 0) {
+        this.set(['tooltip', 'opacity'], 0);
+        return;
+      }
+      // Set caret Position
+      if (tooltip.yAlign) {
+        this.set(['tooltip', 'yAlign'], tooltip.yAlign);
+      } else {
+        this.set(['tooltip', 'yAlign'], 'no-transform');
+      }
+      const title = tooltip.title ? tooltip.title[0] || '' : '';
+      let str1;
+      if (title instanceof Date) {
+        str1 = moment(title).format('L LTS');
+      } else if (title instanceof moment) {
+        str1 = title.format('L LTS');
+      } else {
+        str1 = title;
+      }
+      this.set(['tooltip', 'title'], str1);
+      const bodyLines = tooltip.body.map(n => n.lines);
+
+      // Set Text
+      if (tooltip.body) {
+        this.set(['tooltip', 'lines'], bodyLines.map((body, i) => {
+          const colors = tooltip.labelColors[i];
+          return {
+            color: colors.borderColor,
+            bgColor: colors.backgroundColor,
+            text: body.join('\n'),
+          };
+        }));
+      }
+      const parentWidth = this.$.chartTarget.clientWidth;
+      let positionX = tooltip.caretX;
+      const positionY = this._chart.canvas.offsetTop + tooltip.caretY;
+      if (tooltip.caretX + 100 > parentWidth) {
+        positionX = parentWidth - 100;
+      } else if (tooltip.caretX < 100) {
+        positionX = 100;
+      }
+      positionX += this._chart.canvas.offsetLeft;
+      // Display, position, and set styles for font
+      this.set(['tooltip', 'opacity'], 1);
+      this.set(['tooltip', 'left'], positionX + 'px');
+      this.set(['tooltip', 'top'], positionY + 'px');
+      this.set(['tooltip', 'yPadding'], tooltip.yPadding);
+      this.set(['tooltip', 'xPadding'], tooltip.xPadding);
+    }
+    _legendClick(event) {
+      event = event || window.event;
+      let target = event.target || event.srcElement;
+      while (target.nodeName !== 'LI') {
+        target = target.parentElement;
+      }
+      const index = target.getAttribute('data-lid');
+
+      const meta = this._chart.getDatasetMeta(index);
+      meta.hidden = meta.hidden === null ? !this._chart.data.datasets[index].hidden : null;
+      this.set(['metas', index, 'hidden'], this._chart.isDatasetVisible(index) ? null : 'hidden');
+      this._chart.update();
+    }
+    _drawLegend() {
+      const chart = this._chart;
+      this.set('metas', this._chart.data.datasets.map((x, i) => ({
+        label: x.label,
+        color: x.color,
+        bgColor: x.backgroundColor,
+        hidden: chart.isDatasetVisible(i)
+      })));
+      this.set('unit', this.data.unit);
+    }
+    drawChart() {
+      const data = this.data.data;
+      const ctx = this.$.chartCanvas;
+
+      if ((!data.datasets || !data.datasets.length) && !this._chart) {
+        return;
+      }
+      if (this.data.type !== 'timeline' && data.datasets.length > 0) {
+        let cnt = 0;
+        cnt = data.datasets.length;
+        const colors = this.constructor.getColorList(cnt);
+        for (let loopI = 0; loopI < cnt; loopI++) {
+          data.datasets[loopI].borderColor = colors[loopI].rgbString();
+          data.datasets[loopI].backgroundColor = colors[loopI].alpha(0.6).rgbaString();
+        }
+      }
+
+      if (this._chart) {
+        this._customTooltips({ opacity: 0 });
+        this._chart.data = data;
+        this._chart.update({ duration: 0 });
+        if (this.isTimeline !== true && this.data.legend === true) {
+          this._drawLegend();
+        }
+        this.resizeChart();
+      } else {
+        if (!data.datasets) {
+          return;
+        }
+        this._customTooltips({ opacity: 0 });
+        let options = {
+          responsive: true,
+          maintainAspectRatio: false,
+          animation: {
+            duration: 0,
+          },
+          hover: {
+            animationDuration: 0,
+          },
+          responsiveAnimationDuration: 0,
+          tooltips: {
+            enabled: false,
+            custom: this._customTooltips.bind(this),
+          },
+          legend: {
+            display: false,
+          },
+          line: {
+            spanGaps: true,
+          },
+          elements: {
+            font: "12px 'Roboto', 'sans-serif'",
+          },
+          ticks: {
+            fontFamily: "'Roboto', 'sans-serif'",
+          }
+        };
+        options = Chart.helpers.merge(options, this.data.options);
+        if (this.data.type === 'timeline') {
+          this.set('isTimeline', true);
+          if (this.data.colors !== undefined) {
+            this._colorFunc = this.constructor.getColorGenerator(
+              this.data.colors.staticColors,
+              this.data.colors.staticColorIndex
+            );
+          }
+          if (this._colorFunc !== undefined) {
+            options.colorFunction = this._colorFunc;
+          }
+          if (data.datasets.length === 1) {
+            if (options.scales.yAxes[0].ticks) {
+              options.scales.yAxes[0].ticks.display = false;
+            } else {
+              options.scales.yAxes[0].ticks = { display: false };
+            }
+          }
+        }
+        this.$.chartTarget.style.height = '160px';
+        this.$.chartTarget.height = '160px';
+        const chartData = {
+          type: this.data.type,
+          data: this.data.data,
+          options: options
+        };
+        // Async resize after dom update
+        this._chart = new Chart(ctx, chartData);
+        if (this.isTimeline !== true && this.data.legend === true) {
+          this._drawLegend();
+        }
+        this.resizeChart();
+      }
+    }
+    resizeChart() {
+      if (!this._chart) return;
+      // Chart not ready
+      if (this.$.chartTarget.clientWidth === 0) {
+        if (this._resizeTimer === undefined) {
+          this._resizeTimer = setInterval(this.resizeChart.bind(this), 10);
+          return;
+        }
+      }
+
+      clearInterval(this._resizeTimer);
+      this._resizeTimer = undefined;
+
+      this._resizeChart();
+    }
+
+    _resizeChart() {
+      const chartTarget = this.$.chartTarget;
+
+      const options = this.data;
+      const data = options.data;
+
+      if (data.datasets.length === 0) {
+        return;
+      }
+
+      if (!this.isTimeline) {
+        this._chart.resize();
+        return;
+      }
+
+      // Recalculate chart height for Timeline chart
+      var axis = this._chart.boxes.filter(x => x.position === 'bottom')[0];
+      if (axis && axis.height > 0) {
+        this._axisHeight = axis.height;
+      }
+      if (!this._axisHeight) {
+        chartTarget.style.height = '100px';
+        chartTarget.height = '100px';
+        this._chart.resize();
+        axis = this._chart.boxes.filter(x => x.position === 'bottom')[0];
+        if (axis && axis.height > 0) {
+          this._axisHeight = axis.height;
+        }
+      }
+      if (this._axisHeight) {
+        const cnt = data.datasets.length;
+        const targetHeight = ((30 * cnt) + this._axisHeight) + 'px';
+        if (chartTarget.style.height !== targetHeight) {
+          chartTarget.style.height = targetHeight;
+          chartTarget.height = targetHeight;
+        }
+        this._chart.resize();
+      }
+    }
+
+    // Get HSL distributed color list
+    static getColorList(count) {
+      let processL = false;
+      if (count > 10) {
+        processL = true;
+        count = Math.ceil(count / 2);
+      }
+      const h1 = 360 / count;
+      const result = [];
+      for (let loopI = 0; loopI < count; loopI++) {
+        result[loopI] = Color().hsl(h1 * loopI, 80, 38);
+        if (processL) {
+          result[loopI + count] = Color().hsl(h1 * loopI, 80, 62);
+        }
+      }
+      return result;
+    }
+    static getColorGenerator(staticColors, startIndex) {
+      // Known colors for static data,
+      // should add for very common state string manually.
+      // Distribute the color data like complete binary tree
+      function getColorRange(x) {
+        if (x === 0) return 0;
+        if (x === 1) return 0.5;
+        const y = Math.floor(Math.log(x) / Math.LN2);
+        // eslint-disable-next-line no-restricted-properties
+        const e = Math.pow(2, y);
+        const n = x - e;
+        let a;
+        if (y % 2 === 1) {
+          if (n % 2 === 0) {
+            a = n + 1;
+          } else {
+            a = n + e;
+          }
+        } else {
+          // eslint-disable-next-line no-lonely-if
+          if (n % 2 === 0) {
+            a = e - n - 1;
+          } else {
+            a = (e + e) - n;
+          }
+        }
+        return a / (e + e);
+      }
+      function getColorIndex(idx) {
+        const hIndex = Math.floor(idx / 6);
+        const h1 = getColorRange(hIndex);
+        const c1 = (h1 + (idx % 3)) * 120;
+        const l1 = idx % 6 < 3 ? 62 : 38;
+        return Color().hsl(c1, 75, l1);
+      }
+      const colorDict = {};
+      let colorIndex = 0;
+      if (startIndex > 0) colorIndex = startIndex;
+      if (staticColors) {
+        Object.keys(staticColors).forEach((c) => {
+          const c1 = staticColors[c];
+          if (isFinite(c1)) {
+            colorDict[c.toLowerCase()] = getColorIndex(c1);
+          } else {
+            colorDict[c.toLowerCase()] = Color(staticColors[c]);
+          }
+        });
+      }
+      // Custom color assign
+      function getColor(__, data) {
+        let ret;
+        const name = data[3];
+        if (name === null) return Color().hsl(0, 40, 38);
+        if (name === undefined) return Color().hsl(120, 40, 38);
+        const name1 = name.toLowerCase();
+        if (ret === undefined) {
+          ret = colorDict[name1];
+        }
+        if (ret === undefined) {
+          ret = getColorIndex(colorIndex);
+          colorIndex++;
+          colorDict[name1] = ret;
+        }
+        return ret;
+      }
+      return getColor;
+    }
+  }
+  customElements.define(HaChartBase.is, HaChartBase);
+}
+</script>
diff --git a/src/components/state-history-chart-line.html b/src/components/state-history-chart-line.html
index 313d95cb25..551f9b89ba 100644
--- a/src/components/state-history-chart-line.html
+++ b/src/components/state-history-chart-line.html
@@ -1,299 +1,274 @@
-<link rel="import" href="../../bower_components/polymer/polymer.html">
+<link rel="import" href="../../bower_components/polymer/polymer-element.html">
 <link rel="import" href="../../bower_components/polymer/lib/utils/debounce.html">
+<link rel="import" href="./entity/ha-chart-base.html">
 
+<dom-module id='state-history-chart-line'>
+  <template>
+      <ha-chart-base publish data="[[chartData]]"></ha-chart-base>
+  </template>
+</dom-module>
 <script>
-{
-  function range(start, end) {
-    var result = [];
-    var i;
+class StateHistoryChartLine extends Polymer.Element {
+  static get is() { return 'state-history-chart-line'; }
+  static get properties() {
+    return {
+      data: {
+        type: Object,
+      },
 
-    for (i = start; i < end; i++) {
-      result.push(i);
-    }
+      unit: {
+        type: String,
+      },
 
-    return result;
+      isSingleDevice: {
+        type: Boolean,
+        value: false,
+      },
+
+      endTime: {
+        type: Object,
+      },
+    };
+  }
+  static get observers() {
+    return ['dataChanged(data, endTime)'];
   }
 
-  function saveParseFloat(value) {
-    var parsed = parseFloat(value);
-    return !isNaN(parsed) && isFinite(parsed) ? parsed : null;
+  connectedCallback() {
+    super.connectedCallback();
+    this._isAttached = true;
+    this.drawChart();
   }
 
-  class StateHistoryChartLine extends Polymer.Element {
-    static get is() { return 'state-history-chart-line'; }
-    static get properties() {
-      return {
-        data: {
-          type: Object,
-        },
+  dataChanged() {
+    this.drawChart();
+  }
 
-        unit: {
-          type: String,
-        },
+  drawChart() {
+    const unit = this.unit;
+    const deviceStates = this.data;
+    const datasets = [];
+    let endTime;
 
-        isSingleDevice: {
-          type: Boolean,
-          value: false,
-        },
-
-        endTime: {
-          type: Object,
-        },
-
-        chartEngine: {
-          type: Object,
-        },
-      };
+    if (!this._isAttached) {
+      return;
     }
 
-    static get observers() {
-      return ['dataChanged(data, endTime)'];
+    if (deviceStates.length === 0) {
+      return;
     }
 
-    connectedCallback() {
-      super.connectedCallback();
-      this._isAttached = true;
-      this.drawChart();
-
-      this._resizeListener = () => {
-        this._debouncer = Polymer.Debouncer.debounce(
-          this._debouncer,
-          Polymer.Async.timeOut.after(10),
-          () => {
-            if (this._isAttached) {
-              this.drawChart();
-            }
-          }
-        );
-      };
-      window.addEventListener('resize', this._resizeListener);
+    function safeParseFloat(value) {
+      const parsed = parseFloat(value);
+      return isFinite(parsed) ? parsed : null;
     }
 
-    disconnectedCallback() {
-      super.disconnectedCallback();
-      this._isAttached = false;
-      window.removeEventListener('resize', this._resizeListener);
+    endTime = this.endTime ||
+      new Date(Math.max.apply(null, deviceStates.map(states =>
+        new Date(states.states[states.states.length - 1].last_changed))));
+    if (endTime > new Date()) {
+      endTime = new Date();
     }
 
-    dataChanged() {
-      this.drawChart();
-    }
+    deviceStates.forEach((states) => {
+      const domain = states.domain;
+      const name = states.name;
+      // array containing [value1, value2, etc]
+      let prevValues;
+      const data = [];
 
-    drawChart() {
-      var unit = this.unit;
-      var deviceStates = this.data;
-      var options;
-      var startTime;
-      var endTime;
-      var dataTables;
-      var finalDataTable;
-      var daysDelta;
 
-      if (!this._isAttached) {
-        return;
+      function pushData(timestamp, datavalues) {
+        if (!datavalues) return;
+        if (timestamp > endTime) {
+          // Drop datapoints that are after the requested endTime. This could happen if
+          // endTime is "now" and client time is not in sync with server time.
+          return;
+        }
+        data.forEach((d, i) => {
+          d.data.push({ x: timestamp, y: datavalues[i] });
+        });
+        prevValues = datavalues;
       }
 
-      if (!this.chartEngine) {
-        this.chartEngine = new window.google.visualization.ComboChart(this);
+      function addColumn(nameY, step, fill) {
+        let dataFill = false;
+        let dataStep = false;
+        if (fill) {
+          dataFill = 'origin';
+        }
+        if (step) {
+          dataStep = 'before';
+        }
+        data.push({
+          label: nameY,
+          fill: dataFill,
+          steppedLine: dataStep,
+          pointRadius: 0,
+          data: [],
+          unitText: unit
+        });
       }
 
-      if (deviceStates.length === 0) {
-        return;
-      }
+      if (domain === 'thermostat' || domain === 'climate') {
+        // We differentiate between thermostats that have a target temperature
+        // range versus ones that have just a target temperature
 
-      options = {
-        backgroundColor: '#fafafa',
-        legend: { position: 'top' },
-        interpolateNulls: true,
-        titlePosition: 'none',
-        vAxes: {
-          // Adds units to the left hand side of the graph
-          0: { title: unit },
-        },
-        hAxis: {
-          format: 'H:mm',
-        },
-        chartArea: { left: '60', width: '95%' },
-        explorer: {
-          actions: ['dragToZoom', 'rightClickToReset', 'dragToPan'],
-          keepInBounds: true,
-          axis: 'horizontal',
-          maxZoomIn: 0.1,
-        },
-        seriesType: 'line',
-      };
+        // Using step chart by step-before so manually interpolation not needed.
+        const hasTargetRange = states.states.some(state => state.attributes &&
+          state.attributes.target_temp_high !== state.attributes.target_temp_low);
+        const hasHeat = states.states.some(state => state.state === 'heat');
+        const hasCool = states.states.some(state => state.state === 'cool');
 
-      if (this.isSingleDevice) {
-        options.legend.position = 'none';
-        options.vAxes[0].title = null;
-        options.chartArea.left = 40;
-        options.chartArea.height = '80%';
-        options.chartArea.top = 5;
-      }
 
-      startTime = new Date(Math.min.apply(null, deviceStates.map(function (states) {
-        return new Date(states.states[0].last_changed);
-      })));
-
-      endTime = this.endTime ||
-        new Date(Math.max.apply(null, deviceStates.map(states =>
-          new Date(states.states[states.states.length - 1].last_changed))));
-      if (endTime > new Date()) {
-        endTime = new Date();
-      }
-
-      daysDelta = (endTime - startTime) / (24 * 3600 * 1000);
-      // Avoid rounding up when the API returns a few extra seconds.
-      if (daysDelta > 30.1) {
-        options.hAxis.format = 'MMM d';
-      } else if (daysDelta > 3.1) {
-        options.hAxis.format = 'EEE, MMM d';
-      } else if (daysDelta > 1.1) {
-        options.hAxis.format = 'EEE, MMM d, H:mm';
-      }
-
-      dataTables = deviceStates.map(function (states) {
-        var domain = states.domain;
-        var name = states.name;
-        var data = [];
-        var dataTable = new window.google.visualization.DataTable();
-        // array containing [time, value1, value2, etc]
-        var prevValues;
-        var processState;
-        var noInterpolations;
-        var series;
-        dataTable.addColumn({ type: 'datetime', id: 'Time' });
-
-        function pushData(values, noInterpolationValues) {
-          var timestamp = values[0];
-          if (timestamp > endTime) {
-            // Drop datapoints that are after the requested endTime. This could happen if
-            // endTime is "now" and client time is not in sync with server time.
-            return;
-          }
-          if (prevValues && noInterpolationValues) {
-            // if we have to prevent interpolation, we add an old value for each
-            // value that should not be interpolated at the same time that our new
-            // line will be published.
-            data.push([timestamp].concat(prevValues.slice(1).map(function (val, index) {
-              return noInterpolationValues[index] ? val : null;
-            })));
-          }
-          data.push(values);
-          prevValues = values;
+        addColumn(name + ' current temperature', true);
+        if (hasHeat) {
+          addColumn(name + ' heating', true, true);
+          // The "heating" series uses steppedArea to shade the area below the current
+          // temperature when the thermostat is calling for heat.
+        }
+        if (hasCool) {
+          addColumn(name + ' cooling', true, true);
+          // The "cooling" series uses steppedArea to shade the area below the current
+          // temperature when the thermostat is calling for heat.
         }
 
-        if (domain === 'thermostat' || domain === 'climate') {
-          // We differentiate between thermostats that have a target temperature
-          // range versus ones that have just a target temperature
-          const hasTargetRange = states.states.some(state => state.attributes &&
-            state.attributes.target_temp_high !== state.attributes.target_temp_low);
-          const hasHeat = states.states.some(state => state.state === 'heat');
-          const hasCool = states.states.some(state => state.state === 'cool');
+        if (hasTargetRange) {
+          addColumn(name + ' target temperature high', true);
+          addColumn(name + ' target temperature low', true);
+        } else {
+          addColumn(name + ' target temperature', true);
+        }
 
-
-          dataTable.addColumn('number', name + ' current temperature');
-          if (hasHeat || hasCool) {
-            options.series = Object.assign({}, options.series);
-          }
+        states.states.forEach((state) => {
+          if (!state.attributes) return;
+          const curTemp = safeParseFloat(state.attributes.current_temperature);
+          const series = [curTemp];
           if (hasHeat) {
-            dataTable.addColumn('number', name + ' heating');
-            // The "heating" series uses steppedArea to shade the area below the current
-            // temperature when the thermostat is calling for heat.
-            options.series[dataTable.getNumberOfColumns() - 1] =
-              { type: 'steppedArea' };
+            series.push(state.state === 'heat' ? curTemp : null);
           }
           if (hasCool) {
-            dataTable.addColumn('number', name + ' cooling');
-            // The "cooling" series uses steppedArea to shade the area below the current
-            // temperature when the thermostat is calling for heat.
-            options.series[dataTable.getNumberOfColumns() - 1] =
-              { type: 'steppedArea' };
+            series.push(state.state === 'cool' ? curTemp : null);
           }
           if (hasTargetRange) {
-            dataTable.addColumn('number', name + ' target temperature high');
-            dataTable.addColumn('number', name + ' target temperature low');
-          } else {
-            dataTable.addColumn('number', name + ' target temperature');
-          }
-
-          processState = function (state) {
-            if (!state.attributes) return;
-            const curTemp = saveParseFloat(state.attributes.current_temperature);
-
-            series = [curTemp];
-            noInterpolations = [false];
-
-            // Drawing the 'heating'/'cooling' area up to the current temp should keep it from
-            // overlapping but avoid any weird gaps or range mismatches
-            if (hasHeat) {
-              series.push(state.state === 'heat' ? curTemp : null);
-              noInterpolations.push(true);
-            }
-            if (hasCool) {
-              series.push(state.state === 'cool' ? curTemp : null);
-              noInterpolations.push(true);
-            }
-
-            if (hasTargetRange) {
-              var targetHigh = saveParseFloat(state.attributes.target_temp_high);
-              var targetLow = saveParseFloat(state.attributes.target_temp_low);
-
-              series = series.concat([targetHigh, targetLow]);
-              noInterpolations = noInterpolations.concat([true, true]);
-            } else {
-              var target = saveParseFloat(state.attributes.temperature);
-
-              series.push(target);
-              noInterpolations.push(true);
-            }
-
+            const targetHigh = safeParseFloat(state.attributes.target_temp_high);
+            const targetLow = safeParseFloat(state.attributes.target_temp_low);
+            series.push(targetHigh, targetLow);
             pushData(
-              [new Date(state.last_changed)].concat(series),
-              noInterpolations
+              new Date(state.last_changed),
+              series
             );
-          };
-
-          states.states.forEach(processState);
-        } else {
-          dataTable.addColumn('number', name);
-
-          // Only disable interpolation for sensors
-          noInterpolations = domain !== 'sensor' && [true];
-
-          states.states.forEach(function (state) {
-            var value = saveParseFloat(state.state);
-            pushData([new Date(state.last_changed), value], noInterpolations);
-          });
-        }
-
-        // Add an entry for final values
-        if (prevValues) {
-          pushData([endTime].concat(prevValues.slice(1)), false);
-        }
-
-        dataTable.addRows(data);
-        return dataTable;
-      });
-
-      if (dataTables.length === 1) {
-        finalDataTable = dataTables[0];
+          } else {
+            const target = safeParseFloat(state.attributes.temperature);
+            series.push(target);
+            pushData(
+              new Date(state.last_changed),
+              series
+            );
+          }
+        });
       } else {
-        finalDataTable = dataTables.slice(1).reduce(
-          function (tot, cur) {
-            return window.google.visualization.data.join(
-              tot, cur, 'full', [[0, 0]],
-              range(1, tot.getNumberOfColumns()),
-              range(1, cur.getNumberOfColumns())
-            );
-          },
-          dataTables[0]
-        );
+        // Only disable interpolation for sensors
+        const isStep = domain === 'sensor';
+        addColumn(name, isStep);
+
+        let lastValue = null;
+        let lastDate = null;
+        let lastNullDate = null;
+
+        // Process chart data.
+        // When state is `unknown`, calculate the value and break the line.
+        states.states.forEach((state) => {
+          const value = safeParseFloat(state.state);
+          const date = new Date(state.last_changed);
+          if (value !== null && lastNullDate !== null) {
+            const dateTime = date.getTime();
+            const lastNullDateTime = lastNullDate.getTime();
+            const lastDateTime = lastDate.getTime();
+            const tmpValue = ((value - lastValue) *
+              ((lastNullDateTime - lastDateTime) / (dateTime - lastDateTime))) + lastValue;
+            pushData(lastNullDate, [tmpValue]);
+            pushData(new Date(lastNullDateTime + 1), [null]);
+            pushData(date, [value]);
+            lastDate = date;
+            lastValue = value;
+            lastNullDate = null;
+          } else if (value !== null && lastNullDate === null) {
+            pushData(date, [value]);
+            lastDate = date;
+            lastValue = value;
+          } else if (value === null && lastNullDate === null && lastValue !== null) {
+            lastNullDate = date;
+          }
+        });
       }
 
-      this.chartEngine.draw(finalDataTable, options);
-    }
+      // Add an entry for final values
+      pushData(endTime, prevValues, false);
+
+      // Concat two arrays
+      Array.prototype.push.apply(datasets, data);
+    });
+
+    const chartOptions = {
+      type: 'line',
+      unit: unit,
+      legend: !this.isSingleDevice,
+      options: {
+        scales: {
+          xAxes: [{
+            type: 'time',
+            ticks: {
+              major: {
+                fontStyle: 'bold',
+              },
+            },
+          }],
+          yAxes: [{
+            ticks: {
+              maxTicksLimit: 7,
+            },
+            // Add space to prevent cut-off.
+            afterDataLimits: (axis) => {
+              const min = axis.min;
+              const max = axis.max;
+              if (isFinite(min) && isFinite(max)) {
+                const padding = (max - min) * 0.05;
+                axis.min -= padding;
+                axis.max += padding;
+              }
+            },
+          }],
+        },
+        tooltips: {
+          mode: 'neareach',
+        },
+        hover: {
+          mode: 'neareach',
+        },
+        elements: {
+          line: {
+            tension: 0.1,
+            pointRadius: 0,
+            borderWidth: 1.5,
+          },
+          point: {
+            hitRadius: 5,
+          }
+        },
+        plugins: {
+          filler: {
+            propagate: true,
+          }
+        },
+      },
+      data: {
+        labels: [],
+        datasets: datasets
+      }
+    };
+    this.chartData = chartOptions;
   }
-  customElements.define(StateHistoryChartLine.is, StateHistoryChartLine);
 }
+customElements.define(StateHistoryChartLine.is, StateHistoryChartLine);
 </script>
diff --git a/src/components/state-history-chart-timeline.html b/src/components/state-history-chart-timeline.html
index 15c5f3b9a2..30e87580c8 100644
--- a/src/components/state-history-chart-timeline.html
+++ b/src/components/state-history-chart-timeline.html
@@ -1,13 +1,25 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
+<link rel='import' href='../../bower_components/polymer/polymer-element.html'>
 <link rel="import" href="../../bower_components/polymer/lib/utils/debounce.html">
+<link rel='import' href='./entity/ha-chart-base.html'>
 
+<dom-module id='state-history-chart-timeline'>
+  <template>
+      <ha-chart-base publish data="[[chartData]]"></ha-chart-base>
+  </template>
+</dom-module>
 <script>
+'use strict';
+
 class StateHistoryChartTimeline extends Polymer.Element {
   static get is() { return 'state-history-chart-timeline'; }
   static get properties() {
     return {
+      hass: {
+        type: Object,
+      },
       data: {
         type: Object,
+        observer: 'dataChanged',
       },
       noSingle: Boolean,
       endTime: Date,
@@ -15,32 +27,13 @@ class StateHistoryChartTimeline extends Polymer.Element {
   }
 
   static get observers() {
-    return ['dataChanged(data, endTime)'];
+    return ['dataChanged(data, endTime, localize, language)'];
   }
 
   connectedCallback() {
     super.connectedCallback();
     this._isAttached = true;
     this.drawChart();
-
-    this._resizeListener = () => {
-      this._debouncer = Polymer.Debouncer.debounce(
-        this._debouncer,
-        Polymer.Async.timeOut.after(10),
-        () => {
-          if (this._isAttached) {
-            this.drawChart();
-          }
-        }
-      );
-    };
-    window.addEventListener('resize', this._resizeListener);
-  }
-
-  disconnectedCallback() {
-    super.disconnectedCallback();
-    this._isAttached = false;
-    window.removeEventListener('resize', this._resizeListener);
   }
 
   dataChanged() {
@@ -48,119 +41,124 @@ class StateHistoryChartTimeline extends Polymer.Element {
   }
 
   drawChart() {
-    var stateHistory = this.data;
-    var chart;
-    var dataTable;
-    var startTime;
-    var endTime;
-    var numTimelines;
-    var format;
-    var daysDelta;
+    const staticColors = {
+      on: 1,
+      off: 0,
+      unavailable: '#a0a0a0',
+      unknown: '#606060',
+      idle: 2
+    };
+    let stateHistory = this.data;
 
     if (!this._isAttached) {
       return;
     }
 
-    while (this.lastChild) {
-      this.removeChild(this.lastChild);
+    if (!stateHistory) {
+      stateHistory = [];
     }
 
-    if (!stateHistory || stateHistory.length === 0) {
-      return;
-    }
-
-    chart = new window.google.visualization.Timeline(this);
-    dataTable = new window.google.visualization.DataTable();
-
-    dataTable.addColumn({ type: 'string', id: 'Entity' });
-    dataTable.addColumn({ type: 'string', id: 'State' });
-    dataTable.addColumn({ type: 'date', id: 'Start' });
-    dataTable.addColumn({ type: 'date', id: 'End' });
-
-    function addRow(entityDisplay, stateStr, start, end) {
-      var stateDisplay = stateStr.replace(/_/g, ' ');
-      dataTable.addRow([entityDisplay, stateDisplay, start, end]);
-    }
-
-    startTime = new Date(stateHistory.reduce(function (minTime, stateInfo) {
-      return Math.min(minTime, new Date(stateInfo.data[0].last_changed));
-    }, new Date()));
+    const startTime = new Date(stateHistory.reduce(
+      (minTime, stateInfo) => Math.min(minTime, new Date(stateInfo.data[0].last_changed)),
+      new Date()
+    ));
 
     // end time is Math.max(startTime, last_event)
-    endTime = this.endTime ||
-      new Date(stateHistory.reduce(function (maxTime, stateInfo) {
-        return Math.max(
-          maxTime,
-          new Date(stateInfo.data[stateInfo.data.length - 1].last_changed)
-        );
-      }, startTime));
+    let endTime = this.endTime ||
+      new Date(stateHistory.reduce((maxTime, stateInfo) => Math.max(
+        maxTime,
+        new Date(stateInfo.data[stateInfo.data.length - 1].last_changed)
+      ), startTime));
 
     if (endTime > new Date()) {
       endTime = new Date();
     }
-    format = 'H:mm';
-    daysDelta = (endTime - startTime) / (24 * 3600 * 1000);
-    // Avoid rounding up when the API returns a few extra seconds.
-    if (daysDelta > 30.1) {
-      format = 'MMM d';
-    } else if (daysDelta > 3.1) {
-      format = 'EEE, MMM d';
-    } else if (daysDelta > 1.1) {
-      format = 'EEE, MMM d, H:mm';
-    }
 
-    numTimelines = 0;
+    const labels = [];
+    const datasets = [];
     // stateHistory is a list of lists of sorted state objects
-    stateHistory.forEach(function (stateInfo) {
-      var entityDisplay;
-      var newLastChanged;
-      var prevState = null;
-      var prevLastChanged = null;
+    stateHistory.forEach((stateInfo) => {
+      let newLastChanged;
+      let prevState = null;
+      let locState = null;
+      let prevLastChanged = startTime;
+      const entityDisplay = stateInfo.name;
+      const dataRow = [];
 
-      if (stateInfo.data.length === 0) return;
 
-      entityDisplay = stateInfo.name;
-
-      stateInfo.data.forEach(function (state) {
-        var timeStamp = new Date(state.last_changed);
+      stateInfo.data.forEach((state) => {
+        let newState = state.state;
+        const timeStamp = new Date(state.last_changed);
+        if (newState === undefined || newState === '') {
+          newState = null;
+        }
         if (timeStamp > endTime) {
           // Drop datapoints that are after the requested endTime. This could happen if
-          // endTime is "now" and client time is not in sync with server time.
+          // endTime is 'now' and client time is not in sync with server time.
           return;
         }
-        if (prevState !== null && state.state !== prevState) {
+        if (prevState !== null && newState !== prevState) {
           newLastChanged = new Date(state.last_changed);
 
-          addRow(entityDisplay, prevState, prevLastChanged, newLastChanged);
+          dataRow.push([
+            prevLastChanged,
+            newLastChanged,
+            locState,
+            prevState,
+          ]);
 
-          prevState = state.state;
+          prevState = newState;
+          locState = state.state_localize;
           prevLastChanged = newLastChanged;
         } else if (prevState === null) {
-          prevState = state.state;
+          prevState = newState;
+          locState = state.state_localize;
           prevLastChanged = new Date(state.last_changed);
         }
       });
 
       if (prevState !== null) {
-        addRow(entityDisplay, prevState, prevLastChanged, endTime);
+        dataRow.push([
+          prevLastChanged,
+          endTime,
+          locState,
+          prevState,
+        ]);
       }
-      numTimelines++;
+      datasets.push({ data: dataRow });
+      labels.push(entityDisplay);
     });
 
-    chart.draw(dataTable, {
-      backgroundColor: '#fafafa',
-
-      height: 55 + (numTimelines * 42),
-
-      timeline: {
-        showRowLabels: this.noSingle || stateHistory.length > 1,
+    const chartOptions = {
+      type: 'timeline',
+      options: {
+        scales: {
+          xAxes: [{
+            ticks: {
+              major: {
+                fontStyle: 'bold',
+              },
+            },
+          }],
+          yAxes: [{
+            afterSetDimensions: (yaxe) => {
+              yaxe.maxWidth = yaxe.chart.width * 0.18;
+            }
+          }],
+        },
       },
-
-      hAxis: {
-        format: format
+      data: {
+        labels: labels,
+        datasets: datasets
       },
-    });
+      colors: {
+        staticColors: staticColors,
+        staticColorIndex: 3,
+      }
+    };
+    this.chartData = chartOptions;
   }
 }
 customElements.define(StateHistoryChartTimeline.is, StateHistoryChartTimeline);
+
 </script>
diff --git a/src/components/state-history-charts.html b/src/components/state-history-charts.html
index 315960ebc2..576f6c16c5 100644
--- a/src/components/state-history-charts.html
+++ b/src/components/state-history-charts.html
@@ -1,27 +1,16 @@
 <link rel="import" href="../../bower_components/polymer/polymer-element.html">
 <link rel="import" href="../../bower_components/paper-spinner/paper-spinner.html">
 
-<link rel="import" href="../../bower_components/google-apis/google-legacy-loader.html">
-
 <link rel="import" href="./state-history-chart-timeline.html">
 <link rel="import" href="./state-history-chart-line.html">
 
 <dom-module id="state-history-charts">
   <template>
-    <link href="https://ajax.googleapis.com/ajax/static/modules/gviz/1.0/core/tooltip.css" rel="stylesheet" type="text/css">
     <style>
     :host {
       display: block;
     }
 
-    .google-visualization-tooltip {
-      z-index: 200;
-    }
-
-    state-history-chart-timeline, state-history-chart-line {
-      display: block;
-    }
-
     .loading-container {
       text-align: center;
       padding: 8px;
@@ -33,33 +22,25 @@
     }
     </style>
 
-    <google-legacy-loader on-api-load="_googleApiLoaded"></google-legacy-loader>
-
-    <template is='dom-if' if='[[_isLoading]]'>
-      <div class='loading-container'>
-        <paper-spinner active alt='Updating history data'></paper-spinner>
-      </div>
+    <template is='dom-if' if='[[_computeIsEmpty(historyData)]]'>
+      No state history found.
     </template>
 
-    <template is='dom-if' if='[[!_isLoading]]'>
-      <template is='dom-if' if='[[_computeIsEmpty(historyData)]]'>
-        No state history found.
-      </template>
-
+    <template is='dom-if' if='[[historyData.timeline.length]]'>
       <state-history-chart-timeline
         data='[[historyData.timeline]]'
         end-time='[[_computeEndTime(endTime, upToNow, historyData)]]'
         no-single='[[noSingle]]'>
       </state-history-chart-timeline>
+    </template>
 
-      <template is='dom-repeat' items='[[historyData.line]]'>
-        <state-history-chart-line
-          unit='[[item.unit]]'
-          data='[[item.data]]'
-          is-single-device='[[_computeIsSingleLineChart(historyData, noSingle)]]'
-          end-time='[[_computeEndTime(endTime, upToNow, historyData)]]'>
-        </state-history-chart-line>
-      </template>
+    <template is='dom-repeat' items='[[historyData.line]]'>
+      <state-history-chart-line
+        unit='[[item.unit]]'
+        data='[[item.data]]'
+        is-single-device='[[_computeIsSingleLineChart(item.data, noSingle)]]'
+        end-time='[[_computeEndTime(endTime, upToNow, historyData)]]'>
+      </state-history-chart-line>
     </template>
   </template>
 </dom-module>
@@ -69,6 +50,9 @@ class StateHistoryCharts extends Polymer.Element {
   static get is() { return 'state-history-charts'; }
   static get properties() {
     return {
+      hass: {
+        type: Object
+      },
       historyData: {
         type: Object,
         value: null,
@@ -85,35 +69,11 @@ class StateHistoryCharts extends Polymer.Element {
 
       upToNow: Boolean,
       noSingle: Boolean,
-
-      _apiLoaded: {
-        type: Boolean,
-        value: false,
-      },
-
-      _isLoading: {
-        type: Boolean,
-        computed: '_computeIsLoading(isLoadingData, _apiLoaded)',
-      },
     };
   }
 
-  _computeIsSingleLineChart(historyData, noSingle) {
-    return !noSingle && historyData && historyData.line.length === 1;
-  }
-
-  _googleApiLoaded() {
-    window.google.load('visualization', '1', {
-      packages: ['timeline', 'corechart'],
-      language: navigator.language,
-      callback: function () {
-        this._apiLoaded = true;
-      }.bind(this),
-    });
-  }
-
-  _computeIsLoading(_isLoadingData, _apiLoaded) {
-    return _isLoadingData || !_apiLoaded;
+  _computeIsSingleLineChart(data, noSingle) {
+    return !noSingle && data && data.length === 1;
   }
 
   _computeIsEmpty(historyData) {
diff --git a/src/data/ha-state-history-data.html b/src/data/ha-state-history-data.html
index d188a6161c..a2ef584741 100644
--- a/src/data/ha-state-history-data.html
+++ b/src/data/ha-state-history-data.html
@@ -35,7 +35,8 @@
           entity_id: stateInfo[0].entity_id,
           data: stateInfo
             .map(state => ({
-              state: window.hassUtil.computeStateDisplay(localize, state, language),
+              state_localize: window.hassUtil.computeStateDisplay(localize, state, language),
+              state: state.state,
               last_changed: state.last_changed,
             }))
             .filter((element, index, arr) => {
@@ -140,7 +141,7 @@
       super.connectedCallback();
       this.filterChanged(
         this.filterType, this.entityId, this.startTime, this.endTime,
-        this.cacheConfig, this.localize, this.language
+        this.cacheConfig
       );
     }
 
@@ -164,6 +165,7 @@
     filterChanged(filterType, entityId, startTime, endTime, cacheConfig, localize, language) {
       if (!this.hass) return;
       if (cacheConfig && !cacheConfig.cacheKey) return;
+      if (!localize || !language) return;
       this._madeFirstCall = true;
       let data;
 
diff --git a/src/resources/ha-chart-scripts.html b/src/resources/ha-chart-scripts.html
new file mode 100644
index 0000000000..4e0acacd16
--- /dev/null
+++ b/src/resources/ha-chart-scripts.html
@@ -0,0 +1,74 @@
+<script src="../../bower_components/moment/moment.js"></script>
+<script src="../../bower_components/chart.js/dist/Chart.min.js"></script>
+<script src="../../bower_components/chartjs-chart-timeline/timeline.js"></script>
+<script>
+// Use minified(Chart.min.js) version to fix strange color after uglify
+// eslint-disable-next-line no-unused-vars
+/* global Chart moment */
+{
+  // This function add a new interaction mode to Chart.js that
+  // returns one point for every dataset.
+  Chart.Interaction.modes.neareach = function (chart, e, options) {
+    const getRange = {
+      x: (a, b) => Math.abs(a.x - b.x),
+      y: (a, b) => Math.abs(a.y - b.y),
+      // eslint-disable-next-line no-restricted-properties
+      xy: (a, b) => Math.pow(a.x - b.x, 2) + Math.pow(a.y - b.y, 2),
+    };
+    const getRangeMax = {
+      x: r => r,
+      y: r => r,
+      xy: r => r * r,
+    };
+    let position;
+    if (e.native) {
+      position = {
+        x: e.x,
+        y: e.y
+      };
+    } else {
+      position = Chart.helpers.getRelativePosition(e, chart);
+    }
+    const elements = [];
+    const elementsRange = [];
+    const datasets = chart.data.datasets;
+    let meta;
+    options.axis = options.axis || 'xy';
+    const rangeFunc = getRange[options.axis];
+    const rangeMaxFunc = getRangeMax[options.axis];
+
+    for (let i = 0, ilen = datasets.length; i < ilen; ++i) {
+      if (!chart.isDatasetVisible(i)) {
+        continue;
+      }
+
+      meta = chart.getDatasetMeta(i);
+      for (let j = 0, jlen = meta.data.length; j < jlen; ++j) {
+        const element = meta.data[j];
+        if (!element._view.skip) {
+          const vm = element._view;
+          const range = rangeFunc(vm, position);
+          const oldRange = elementsRange[i];
+          if (range < rangeMaxFunc(vm.radius + vm.hitRadius)) {
+            if (oldRange === undefined || oldRange > range) {
+              elementsRange[i] = range;
+              elements[i] = element;
+            }
+          }
+        }
+      }
+    }
+    const ret = elements.filter(n => n !== undefined);
+    return ret;
+  };
+
+  // Fix infinite loop bug in Chart.js 2.7.1
+  const x = Chart.scaleService.constructors.time.prototype;
+  x._getLabelCapacity = x.getLabelCapacity;
+  x.getLabelCapacity = function () {
+    // eslint-disable-next-line prefer-rest-params
+    const ret = this._getLabelCapacity.apply(this, arguments);
+    return ret > 0 ? ret : 1;
+  };
+}
+</script>
\ No newline at end of file