From f93e685b56191aa964b9c65e0669a2bc34c6914c Mon Sep 17 00:00:00 2001
From: Wouter Born <github@maindrain.net>
Date: Sat, 1 Jun 2019 12:12:19 +0200
Subject: [PATCH] Update repository for openHAB fork of Eclipse SmartHome (#11)

* Because Eclipse SmartHome (ESH) continues as openHAB Core all references to ESH have been updated for this change:
  * File renames:
    * smarthome-grafana.js -> openhab-grafana.js
    * smarthome-grafana-user-defaults.js -> openhab-grafana-user-defaults.js
  * Code changes:
    * SmartHomeSubscriber -> OHSubscriber
    * SMARTHOME_GRAFANA_DEFAULTS -> OHG_DEFAULTS
* The project itself has also been renamed from smarthome-grafana to openhab-grafana
* The README.md has been updated to allow for easier code diffs by starting each sentence on a new line
* Since this is a major change the version is update from 0.1.0 to 1.0.0.
  The code before all these changes is available in the 0.1.0 release, see:
  https://github.com/wborn/openhab-grafana/releases/tag/0.1.0

Signed-off-by: Wouter Born <github@maindrain.net>
---
 Gruntfile.js                                  |  10 +-
 README.md                                     | 149 +++++++++++-------
 example/html/demo-combo1.html                 |   4 +-
 example/html/demo-combo2.html                 |   4 +-
 example/html/demo-multi1.html                 |   4 +-
 example/html/demo.html                        |   4 +-
 example/html/openhab-grafana-user-defaults.js |  13 ++
 example/html/openhab-grafana.js               |   1 +
 .../html/smarthome-grafana-user-defaults.js   |  13 --
 example/html/smarthome-grafana.js             |   1 -
 package.json                                  |   6 +-
 ...marthome-grafana.js => openhab-grafana.js} |  28 ++--
 web/openhab-grafana.js                        |   1 +
 web/smarthome-grafana.js                      |   1 -
 14 files changed, 138 insertions(+), 101 deletions(-)
 create mode 100644 example/html/openhab-grafana-user-defaults.js
 create mode 100644 example/html/openhab-grafana.js
 delete mode 100644 example/html/smarthome-grafana-user-defaults.js
 delete mode 100644 example/html/smarthome-grafana.js
 rename web-src/{smarthome-grafana.js => openhab-grafana.js} (95%)
 create mode 100644 web/openhab-grafana.js
 delete mode 100644 web/smarthome-grafana.js

diff --git a/Gruntfile.js b/Gruntfile.js
index 91e4a64..dea6165 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -10,8 +10,8 @@ module.exports = function(grunt) {
 
 		clean: {
 			all: [
-				"example/html/smarthome-grafana.js",
-				"web/smarthome-grafana.js",
+				"example/html/openhab-grafana.js",
+				"web/openhab-grafana.js",
 			]
 		},
 
@@ -19,14 +19,14 @@ module.exports = function(grunt) {
 			options: {
 				configFile: "eslint.json"
 			},
-			target: ["web-src/smarthome-grafana.js"]
+			target: ["web-src/openhab-grafana.js"]
 		},
 
 		uglify: {
 			all: {
 				files: {
-					"example/html/smarthome-grafana.js": ["web-src/smarthome-grafana.js"],
-					"web/smarthome-grafana.js": ["web-src/smarthome-grafana.js"]
+					"example/html/openhab-grafana.js": ["web-src/openhab-grafana.js"],
+					"web/openhab-grafana.js": ["web-src/openhab-grafana.js"]
 				}
 			}
 		}
diff --git a/README.md b/README.md
index 9c5a7ec..c0fb3ce 100644
--- a/README.md
+++ b/README.md
@@ -1,43 +1,48 @@
-# smarthome-grafana
+# openhab-grafana
 
-This project provides a JavaScript library with examples to simplify embedding [Grafana](https://grafana.net) panels in [Eclipse SmartHome](http://www.eclipse.org/smarthome) (ESH) and its derivatives like [openHAB 2](http://www.openhab.org) (OH2).
+This project provides a JavaScript library with examples to simplify embedding [Grafana](https://grafana.net) panels in [openHAB 2](http://www.openhab.org) (OH) and its derivatives.
 
 The library provides the following functionality:
 
-* Generation of Grafana embedded panel URL parameters based on the state of ESH items (using REST and subscribing to [Server-sent events (SSE)](https://en.wikipedia.org/wiki/Server-sent_events))
+* Generation of Grafana embedded panel URL parameters based on the state of OH items (using REST and subscribing to [Server-sent events (SSE)](https://en.wikipedia.org/wiki/Server-sent_events))
 * Smart parameter resolution (more on that later)
 * Debug mode for debugging URL generation
 
-This functionality solves the issue of having to create a `Webview` with a `visibility=[..]` configuration for user customizable Grafana panel parameters. The resulting sitemaps have less duplication and page load times decrease because a only single `Webview` has to be loaded.
+This functionality solves the issue of having to create a `Webview` with a `visibility=[..]` configuration for user customizable Grafana panel parameters.
+The resulting sitemaps have less duplication and page load times decrease because a only single `Webview` has to be loaded.
 
 
 ## Requirements
 
-* Eclipse SmartHome (ESH) installation, e.g. follow: http://docs.openhab.org/installation/index.html
+* openHAB (OH) installation, e.g. follow: https://www.openhab.org/docs/installation/
 * Grafana installation/configuration, e.g. follow: https://community.openhab.org/t/influxdb-grafana-persistence-and-graphing/13761
-* **ESH and Grafana accessible via the same host/port to prevent [Same-origin policy](https://en.wikipedia.org/wiki/Same-origin_policy) violations.** E.g. setup a reverse proxy using the [configuration examples](#reverse-proxy-configuration) below.
+* **OH and Grafana accessible via the same host/port to prevent [Same-origin policy](https://en.wikipedia.org/wiki/Same-origin_policy) violations.** E.g. setup a reverse proxy using the [configuration examples](#reverse-proxy-configuration) below.
 
 
 ## Library objects, their parameters and how they are resolved
 
 The library consists of two kinds of objects:
 
-* `SmartHomeSubscriber`: resolves initial ESH item values and listens for item value changes
-* `GrafanaPanel`: keeps track of the properties of a Grafana panel properties, the enclosing `<iframe>` tag and updates the `<iframe>` source URL when ESH item values change.
+* `OHSubscriber`: resolves initial OH item values and listens for item value changes
+* `GrafanaPanel`: keeps track of the properties of a Grafana panel properties, the enclosing `<iframe>` tag and updates the `<iframe>` source URL when OH item values change.
 
-A `SmartHomeSubscriber` instance is always created when the JavaScript of the library loaded. `GrafanaPanel` objects are created using JavaScript. The utility method `addGrafanaPanel(uniqueId, grafanaPanelParameters)` can be used to create and add a Grafana panel to the `<body>` of the HTML document.
+A `OHSubscriber` instance is always created when the JavaScript of the library loaded.
+`GrafanaPanel` objects are created using JavaScript.
+The utility method `addGrafanaPanel(uniqueId, grafanaPanelParameters)` can be used to create and add a Grafana panel to the `<body>` of the HTML document.
 
-Library objects require some parameters for their functionality. These parameters are resolved in the following order:
+Library objects require some parameters for their functionality.
+These parameters are resolved in the following order:
 
 1. JavaScript object constructor arguments
-2. query parameters of the HTML document, the URL of the document that is loaded in a ESH `Webview`
-3. query parameters of the parent HTML document, the URL of ESH itself
-4. the `SMARTHOME_GRAFANA_DEFAULTS` defined in [smarthome-grafana.js](web-src/smarthome-grafana.js)
+2. query parameters of the HTML document, the URL of the document that is loaded in a OH `Webview`
+3. query parameters of the parent HTML document, the URL of OH itself
+4. the `OHG_DEFAULTS` defined in [openhab-grafana.js](web-src/openhab-grafana.js)
 
 
-### `SmartHomeSubscriber` parameters
+### `OHSubscriber` parameters
 
-The `SmartHomeSubscriber` typically resolves its parameters from the ESH URL. These parameters can be manually added to the browser URL when showing the page outside of ESH.
+The `OHSubscriber` typically resolves its parameters from the OH URL.
+These parameters can be manually added to the browser URL when showing the page outside of OH.
 
 | Parameter name | Comment                                  |
 |----------------|------------------------------------------|
@@ -55,44 +60,44 @@ The `SmartHomeSubscriber` typically resolves its parameters from the ESH URL. Th
 | renderPanelPath       | the rendered path in Grafana panel URLs, e.g. "/render/dashboard-solo/db/"                           |
 |                       |                                                                                                      |
 | debug                 | shows the generated URL instead of the panel when set to "true"                                      |
-| debugItem             | the name of the ESH item used for resolving the debug value, e.g. "Combo2_Debug"                     |
+| debugItem             | the name of the OH item used for resolving the debug value, e.g. "Combo2_Debug"                      |
 | debugItemFunction     | the function for mapping the `debugItem` value to "true" or "false" (JavaScript only)                |
 |                       |                                                                                                      |
 | dashboard             | static definition of the Grafana dashboard name, e.g. "motion"                                       |
-| dashboardItem         | the name of the ESH item used for resolving the dashboard Grafana URL value, e.g. "Combo2_Dashboard" |
+| dashboardItem         | the name of the OH item used for resolving the dashboard Grafana URL value, e.g. "Combo2_Dashboard"  |
 | dashboardItemFunction | the function for mapping the `dashboardItem` value to a Grafana URL value (JavaScript only)          |
 |                       |                                                                                                      |
 | from                  | static definition of the `from=` Grafana URL value, e.g. "now-1w"                                    |
-| fromItem              | the name of the ESH item used for resolving the `from=` value, e.g. "Combo2_From"                    |
+| fromItem              | the name of the OH item used for resolving the `from=` value, e.g. "Combo2_From"                     |
 | fromItemFunction      | the function for mapping the `fromItem` value to a Grafana URL value (JavaScript only)               |
 |                       |                                                                                                      |
 | to                    | static definition of the `to=` Grafana URL value, e.g. "now"                                         |
-| toItem                | the name of the ESH item used for resolving the `to=` value, e.g. "Combo2_To"                        |
+| toItem                | the name of the OH item used for resolving the `to=` value, e.g. "Combo2_To"                         |
 | toItemFunction        | the function for mapping the `toItem` value to a Grafana URL value (JavaScript only)                 |
 |                       |                                                                                                      |
 | panel                 | static definition of the `panelId=` Grafana URL value, e.g. "5"                                      |
-| panelItem             | the name of the ESH item used for resolving the `panelId=` value, e.g. "Combo2_Panel"                |
+| panelItem             | the name of the OH item used for resolving the `panelId=` value, e.g. "Combo2_Panel"                 |
 | panelItemFunction     | the function for mapping the `panelItem` value to a Grafana URL value (JavaScript only)              |
 |                       |                                                                                                      |
 | theme                 | static definition of the `theme=` Grafana URL value, e.g. "light"                                    |
-| themeItem             | the name of the ESH item used for resolving the `theme=` value, e.g. "Combo2_Theme"                  |
+| themeItem             | the name of the OH item used for resolving the `theme=` value, e.g. "Combo2_Theme"                   |
 | themeItemFunction     | the function for mapping the `themeItem` value to a Grafana URL value (JavaScript only)              |
 |                       |                                                                                                      |
 | render                | makes Grafana render an image of the panel, use "true" or "false", when set to "true" the width, height and refresh parameters are used |
-| renderItem            | the name of the ESH item used for resolving the render value, e.g. "Render2_Render"                  |
+| renderItem            | the name of the OH item used for resolving the render value, e.g. "Render2_Render"                   |
 | renderItemFunction    | the function for mapping the `renderItem` value to "true" or "false" (JavaScript only)               |
 |                       |                                                                                                      |
 | width                 | static definition of the `width=` Grafana URL value, e.g. "1000" (only used when render is "true", use `width=auto` to use the width of the frame |
-| widthItem             | the name of the ESH item used for resolving the `width=` value, e.g. "Render2_Width"                 |
-| widthItemFunction     | the function for mapping the `widthItem` value to a number or "auto" (JavaScript only)                          |
+| widthItem             | the name of the OH item used for resolving the `width=` value, e.g. "Render2_Width"                  |
+| widthItemFunction     | the function for mapping the `widthItem` value to a number or "auto" (JavaScript only)               |
 |                       |                                                                                                      |
 | height                | static definition of the `height=` Grafana URL value, e.g. "300" (only used when render is "true", use `height=auto` to use the height of the frame |
-| heightItem            | the name of the ESH item used for resolving the `height=` value, e.g. "Render2_Height"               |
-| heightItemFunction    | the function for mapping the `heightItem` value to a number or "auto" (JavaScript only)                         |
+| heightItem            | the name of the OH item used for resolving the `height=` value, e.g. "Render2_Height"                |
+| heightItemFunction    | the function for mapping the `heightItem` value to a number or "auto" (JavaScript only)              |
 |                       |                                                                                                      |
 | refresh               | static definition of the refresh interval for a rendered panel in milliseconds, e.g. "60000" for refreshing every minute, use "0" to disable |
-| refreshItem           | the name of the ESH item used for resolving the refresh value, e.g. "Render2_Refresh"                |
-| refreshItemFunction   | the function for mapping the `refreshItem` value to a number (JavaScript only)                        |
+| refreshItem           | the name of the OH item used for resolving the refresh value, e.g. "Render2_Refresh"                 |
+| refreshItemFunction   | the function for mapping the `refreshItem` value to a number (JavaScript only)                       |
 
 
 ## Grafana time units
@@ -107,11 +112,14 @@ Use [Grunt](http://gruntjs.com) to check the library code with eslint and minify
 
 ## Demo
 
-A demo is included that has some examples on how to use the library. A Grafana installation is not required for the demo, because it uses the library in debug mode. In this mode it does not load Grafana panels. Instead it shows the generated panel URLs.
+A demo is included that has some examples on how to use the library.
+A Grafana installation is not required for the demo, because it uses the library in debug mode.
+In this mode it does not load Grafana panels.
+Instead it shows the generated panel URLs.
 
 To run the demo:
 
-1. add the files in the [example](example/) directory to the `/conf/` directory of an existing ESH/openHAB 2 installation
+1. add the files in the [example](example/) directory to the `/conf/` directory of an existing openHAB 2 installation
 2. start the demo by opening the grafana sitemap, e.g. navigate to: [http://localhost:8080/basicui/app?sitemap=grafana](http://localhost:8080/basicui/app?sitemap=grafana)
 
 
@@ -119,7 +127,7 @@ To run the demo:
 
 Click on a thumbnail below to zoom in on a demo page.
 
-| Main menu                                             | 
+| Main menu                                             |
 |-------------------------------------------------------|
 | [![Main](doc/main-thumbnail.png)](doc/main.png)       |
 
@@ -144,8 +152,8 @@ These three panels are created using the same [demo.html](example/html/demo.html
 <head>
     <meta http-equiv="Content-type" CONTENT="text/html; charset=utf-8">
     <link rel="stylesheet" type="text/css" href="panel-300px.css" />
-    <script src="smarthome-grafana.js"></script>
-    <script src="smarthome-grafana-user-defaults.js"></script>
+    <script src="openhab-grafana.js"></script>
+    <script src="openhab-grafana-user-defaults.js"></script>
 </head>
 
 <body>
@@ -158,24 +166,36 @@ These three panels are created using the same [demo.html](example/html/demo.html
 </html>
 ```
 
-This allows for reusing the same CSS and some Grafana defaults defined in [smarthome-grafana-user-defaults.js](example/html/smarthome-grafana-user-defaults.js).
+This allows for reusing the same CSS and some Grafana defaults defined in [openhab-grafana-user-defaults.js](example/html/openhab-grafana-user-defaults.js).
 
-Because of these defaults, the `urlPrefix` is automatically added and the `light` Grafana theme is used even though they are not defined in the `Webview` URLs in [grafana.sitemap](example/sitemaps/grafana.sitemap). The URL of the *Static 3* `Webview` in the sitemap also specifies `theme=dark` which overrides the `light` default. 
+Because of these defaults, the `urlPrefix` is automatically added and the `light` Grafana theme is used even though they are not defined in the `Webview` URLs in [grafana.sitemap](example/sitemaps/grafana.sitemap).
+The URL of the *Static 3* `Webview` in the sitemap also specifies `theme=dark` which overrides the `light` default.
 
-By using the debug mode, the library only shows the generated URLs and not the actual pages. This mode can disabled by commenting the debug line in [smarthome-grafana-user-defaults.js](example/html/smarthome-grafana-user-defaults.js). In debug mode clicking on a generated link loads the actual Grafana panel. When debug mode is disabled, it can be reenabled for a particular `Webview` by adding `&debug=true` its respective URL. It can also be reenabled by adding `&debug=true` to your browser URL, e.g.: [http://localhost:8080/basicui/app?w=0000&sitemap=grafana&debug=true](http://localhost:8080/basicui/app?w=0000&sitemap=grafana&debug=true)
+By using the debug mode, the library only shows the generated URLs and not the actual pages.
+This mode can disabled by commenting the debug line in [openhab-grafana-user-defaults.js](example/html/openhab-grafana-user-defaults.js).
+In debug mode clicking on a generated link loads the actual Grafana panel.
+When debug mode is disabled, it can be reenabled for a particular `Webview` by adding `&debug=true` its respective URL.
+It can also be reenabled by adding `&debug=true` to your browser URL, e.g.: [http://localhost:8080/basicui/app?w=0000&sitemap=grafana&debug=true](http://localhost:8080/basicui/app?w=0000&sitemap=grafana&debug=true)
 
 
 ### Combining panels
 
-On this page the Grafana URL panel parameters are generated by the library using the state of ESH items. There are only two `Webview`s on this page. Without the library, for each parameter combination a `Webview` with a `visibility=[..]` expression needs to be added to the sitemap. For *Combo 2* this would have resulted in `2*4*5*6*2 = 480` `Webview`s being added to the sitemap. It would also take a lot of time to load such a page.
+On this page the Grafana URL panel parameters are generated by the library using the state of OH items.
+There are only two `Webview`s on this page.
+Without the library, for each parameter combination a `Webview` with a `visibility=[..]` expression needs to be added to the sitemap.
+For *Combo 2* this would have resulted in `2*4*5*6*2 = 480` `Webview`s being added to the sitemap.
+It would also take a lot of time to load such a page.
 
-Using ESH items as Grafana panel URL parameters is done by adding their names to the URL of a `Webview`. For instance *Combo 2* uses the following `Webview` definition:
+Using OH items as Grafana panel URL parameters is done by adding their names to the URL of a `Webview`.
+For instance *Combo 2* uses the following `Webview` definition:
 
 ```javascript
 Webview url="/static/demo-combo2.html?dashboardItem=Combo2_Dashboard&fromItem=Combo2_From&toItem=Combo2_To&panelItem=Combo2_Panel&themeItem=Combo2_Theme" height=9
 ```
 
-The library retrieves the initial values of these items using a REST call. It also subscribes to sitemap events so it can update them when they are changed. A JavaScript function can be defined to map ESH item values to Grafana panel parameter values.
+The library retrieves the initial values of these items using a REST call.
+It also subscribes to sitemap events so it can update them when they are changed.
+A JavaScript function can be defined to map OH item values to Grafana panel parameter values.
 
 This is straightforward and for instance done in [demo-combo2.html](example/html/demo-combo2.html) using:
 
@@ -215,12 +235,15 @@ addGrafanaPanel("combination", {
 });
 ```
 
-*Combo 3* shows how to completely work without JavaScript functions for mapping item values to URL values. This can be done by using the Grafana URL values with double quotes `"` in the [grafana.sitemap](example/sitemaps/grafana.sitemap) mappings. This also allows for reusing the same HTML page ([demo.html](example/html/demo.html)) for a lot of `Webview`s.
+*Combo 3* shows how to completely work without JavaScript functions for mapping item values to URL values.
+This can be done by using the Grafana URL values with double quotes `"` in the [grafana.sitemap](example/sitemaps/grafana.sitemap) mappings.
+This also allows for reusing the same HTML page ([demo.html](example/html/demo.html)) for a lot of `Webview`s.
 
 
 ### Multiple panels
 
-This page shows how a JavaScript for loop is used to show several panels of the same dashboard in the same `Webview`. The panel numbers are calculated and added in [demo-multi1.html](example/html/demo-multi1.html) as follows:
+This page shows how a JavaScript for loop is used to show several panels of the same dashboard in the same `Webview`.
+The panel numbers are calculated and added in [demo-multi1.html](example/html/demo-multi1.html) as follows:
 
 ```javascript
 for (var i = 1; i <= 10; i++) {
@@ -230,38 +253,48 @@ for (var i = 1; i <= 10; i++) {
 }
 ```
 
-Generated panel tags all have a unique identifier that can be used for CSS styling. The identifiers are based on the first parameter of the `addGrafanaPanel` function. In this example the library generates:
+Generated panel tags all have a unique identifier that can be used for CSS styling.
+The identifiers are based on the first parameter of the `addGrafanaPanel` function.
+In this example the library generates:
 
 * `panel-1-frame`, `panel-2-frame`, ... for Grafana panel `<iframe>` tags
 * `panel-1-container`, `panel-2-container`, ... for the `<div>` tags enclosing the corresponding `<iframe>` tags
 
 ### Rendered panels
 
-This page shows how the library is used to generate URLs for rendered Grafana panels. *Render 1* again uses [demo.html](example/html/demo.html) and a static parameter definition for the `Webview` URL in [grafana.sitemap](example/sitemaps/grafana.sitemap):
+This page shows how the library is used to generate URLs for rendered Grafana panels.
+*Render 1* again uses [demo.html](example/html/demo.html) and a static parameter definition for the `Webview` URL in [grafana.sitemap](example/sitemaps/grafana.sitemap):
 
 ```javascript
 Webview url="/static/demo.html?dashboard=wifireception&from=now-1w&to=now&panel=10&width=600&height=300&render=true&refresh=5000" height=9
 ```
 
-A rendered panel image is used when the URL contains `render=true`. To let the library calculate the width and height of a panel use `width=auto` and `height=auto`. It will then use the width and height of the frame for the Grafana URL values. The `refresh=5000` URL parameter makes the library reload the Grafana panel image every 5 seconds. Refresh can be disabled by omitting the value or by using `refresh=0`.
+A rendered panel image is used when the URL contains `render=true`.
+To let the library calculate the width and height of a panel use `width=auto` and `height=auto`.
+It will then use the width and height of the frame for the Grafana URL values.
+The `refresh=5000` URL parameter makes the library reload the Grafana panel image every 5 seconds.
+Refresh can be disabled by omitting the value or by using `refresh=0`.
 
-*Render 2* shows how ESH item values can be used for customizing the render, width, height and  refresh parameters.
+*Render 2* shows how OH item values can be used for customizing the render, width, height and  refresh parameters.
 
 
 ## Reverse proxy configuration
 
 When the Grafana panels do not properly update this is most likely caused by 
-[Same-origin policy](https://en.wikipedia.org/wiki/Same-origin_policy) violations. These can be resolved by for instance configuring a reverse proxy on the same host/port that proxies traffic to ESH/openHAB and Grafana. 
+[Same-origin policy](https://en.wikipedia.org/wiki/Same-origin_policy) violations.
+These can be resolved by for instance configuring a reverse proxy on the same host/port that proxies traffic to openHAB and Grafana.
 
-With the Apache2 and Nginx examples below Grafana will be accessible on `/grafana`, `htpasswd` is used for access control and SSL certificates for encrypting the data. See also the [openHAB Security Documentation](https://docs.openhab.org/installation/security.html) for information on this subject. 
+With the Apache2 and Nginx examples below Grafana will be accessible on `/grafana`, `htpasswd` is used for access control and SSL certificates for encrypting the data.
+See also the [openHAB Security Documentation](https://www.openhab.org/docs/installation/security.html) for information on this subject.
 
-Because Grafana runs on another port/URL with this reverse proxy setup don't forget to update the URL in [smarthome-grafana-user-defaults.js](example/html/smarthome-grafana-user-defaults.js) to something like the line below (where `hostname` is the IP/host you use in your browser): 
+Because Grafana runs on another port/URL with this reverse proxy setup don't forget to update the URL in [openhab-grafana-user-defaults.js](example/html/openhab-grafana-user-defaults.js) to something like the line below (where `hostname` is the IP/host you use in your browser): 
 
 ```javascript
-SMARTHOME_GRAFANA_DEFAULTS["urlPrefix"] = "https://hostname/grafana";
+OHG_DEFAULTS["urlPrefix"] = "https://hostname/grafana";
 ```
 
-Grafana will also need to be reconfigured to use `/grafana` as root URL. This is done by updating the root_url in grafana.ini (in `/etc/grafana`) to the configuration below and then restarting Grafana.
+Grafana will also need to be reconfigured to use `/grafana` as root URL.
+This is done by updating the root_url in grafana.ini (in `/etc/grafana`) to the configuration below and then restarting Grafana.
 
 ```
 # The full public facing url you use in browser, used for redirects and emails
@@ -269,18 +302,21 @@ Grafana will also need to be reconfigured to use `/grafana` as root URL. This is
 root_url = %(protocol)s://%(domain)s/grafana/
 ```
 
-The following sections contain configuration examples for Apache2 and Nginx. After editing your configuration make sure to restart the Apache2 or Nginx to reload the configuration. You should then be able to access both ESH/openHAB and Grafana via HTTPS on the same port in your browser using the reverse proxy (port 443 instead of 8080).
+The following sections contain configuration examples for Apache2 and Nginx.
+After editing your configuration make sure to restart the Apache2 or Nginx to reload the configuration.
+You should then be able to access both openHAB and Grafana via HTTPS on the same port in your browser using the reverse proxy (port 443 instead of 8080).
 
 If you still run into any issues with this you can:
 
 * Check your browser debug console (F12) for any errors
 * Check the Grafana log file for any errors (`/var/log/grafana/grafana.log`)
-* Restart ESH/openHAB, in the past there have been issues where newly added sitemap items were not properly updated in UIs
-* Read the comments in [this issue](https://github.com/wborn/smarthome-grafana/issues/5) which also contains some example error messages that are caused by Same-origin policy violations  
+* Restart openHAB, in the past there have been issues where newly added sitemap items were not properly updated in UIs
+* Read the comments in [this issue](https://github.com/wborn/openhab-grafana/issues/5) which also contains some example error messages that are caused by Same-origin policy violations
 
 ### Apache2
 
-With Apache2 you can create an enabled site with the configuration below. In Debian based distributions (Ubuntu, openHABian, Raspbian) the enabled sites are usually stored in `/etc/apache2/sites-enabled`.
+With Apache2 you can create an enabled site with the configuration below.
+In Debian based distributions (Ubuntu, openHABian, Raspbian) the enabled sites are usually stored in `/etc/apache2/sites-enabled`.
 
 ```
 SSLStaplingCache shmcb:/tmp/stapling_cache(128000)
@@ -345,7 +381,8 @@ SSLStaplingCache shmcb:/tmp/stapling_cache(128000)
 
 ### Nginx
 
-With Nginx you can add a server to your server configuration file. In Debian based distributions (Ubuntu, openHABian, Raspbian) the enabled sites are usually stored in `/etc/nginx/sites-enabled`.
+With Nginx you can add a server to your server configuration file.
+In Debian based distributions (Ubuntu, openHABian, Raspbian) the enabled sites are usually stored in `/etc/nginx/sites-enabled`.
 
 ```
 server {
@@ -370,4 +407,4 @@ server {
         proxy_pass http://localhost:3000/;
     }
 }
-```
\ No newline at end of file
+```
diff --git a/example/html/demo-combo1.html b/example/html/demo-combo1.html
index e4066a6..4499598 100644
--- a/example/html/demo-combo1.html
+++ b/example/html/demo-combo1.html
@@ -3,8 +3,8 @@
 <head>
     <meta http-equiv="Content-type" CONTENT="text/html; charset=utf-8">
     <link rel="stylesheet" type="text/css" href="panel-300px.css" />
-    <script src="smarthome-grafana.js"></script>
-    <script src="smarthome-grafana-user-defaults.js"></script>
+    <script src="openhab-grafana.js"></script>
+    <script src="openhab-grafana-user-defaults.js"></script>
 </head>
 
 <body>
diff --git a/example/html/demo-combo2.html b/example/html/demo-combo2.html
index e47025a..807f0ef 100644
--- a/example/html/demo-combo2.html
+++ b/example/html/demo-combo2.html
@@ -3,8 +3,8 @@
 <head>
     <meta http-equiv="Content-type" CONTENT="text/html; charset=utf-8">
     <link rel="stylesheet" type="text/css" href="panel-300px.css" />
-    <script src="smarthome-grafana.js"></script>
-    <script src="smarthome-grafana-user-defaults.js"></script>
+    <script src="openhab-grafana.js"></script>
+    <script src="openhab-grafana-user-defaults.js"></script>
 </head>
 
 <body>
diff --git a/example/html/demo-multi1.html b/example/html/demo-multi1.html
index 721c3d5..a384399 100644
--- a/example/html/demo-multi1.html
+++ b/example/html/demo-multi1.html
@@ -3,8 +3,8 @@
 <head>
     <meta http-equiv="Content-type" CONTENT="text/html; charset=utf-8">
     <link rel="stylesheet" type="text/css" href="panel-75px.css" />
-    <script src="smarthome-grafana.js"></script>
-    <script src="smarthome-grafana-user-defaults.js"></script>
+    <script src="openhab-grafana.js"></script>
+    <script src="openhab-grafana-user-defaults.js"></script>
 </head>
 
 <body>
diff --git a/example/html/demo.html b/example/html/demo.html
index 4144801..277ac8c 100644
--- a/example/html/demo.html
+++ b/example/html/demo.html
@@ -3,8 +3,8 @@
 <head>
     <meta http-equiv="Content-type" CONTENT="text/html; charset=utf-8">
     <link rel="stylesheet" type="text/css" href="panel-300px.css" />
-    <script src="smarthome-grafana.js"></script>
-    <script src="smarthome-grafana-user-defaults.js"></script>
+    <script src="openhab-grafana.js"></script>
+    <script src="openhab-grafana-user-defaults.js"></script>
 </head>
 
 <body>
diff --git a/example/html/openhab-grafana-user-defaults.js b/example/html/openhab-grafana-user-defaults.js
new file mode 100644
index 0000000..6dd1665
--- /dev/null
+++ b/example/html/openhab-grafana-user-defaults.js
@@ -0,0 +1,13 @@
+
+// the prefix that is used for each Grafana panel URL
+OHG_DEFAULTS["urlPrefix"] = "http://grafana:3000";
+
+// use "false" so actual pages are loaded (or comment the line)
+OHG_DEFAULTS["debug"] = "true";
+
+// use "default" for the default openHAB sitemap (or comment the line)
+OHG_DEFAULTS["sitemap"] = "grafana";
+
+if (OHG_DEFAULTS["debug"] === "true") {
+    console.log("Using OHG_DEFAULTS = " + JSON.stringify(OHG_DEFAULTS));
+}
diff --git a/example/html/openhab-grafana.js b/example/html/openhab-grafana.js
new file mode 100644
index 0000000..8b87659
--- /dev/null
+++ b/example/html/openhab-grafana.js
@@ -0,0 +1 @@
+"use strict";function queryParams(a){if(!a)return{};var b,c=a.toString(),d=c.indexOf("?"),e=-1!==d?c.substring(d+1):"",f=/([^&=]+)=?([^&]*)/g,g=function(a){return decodeURIComponent(a.replace(/\+/g," "))},h={};do{(b=f.exec(e))&&(h[g(b[1])]=g(b[2]))}while(b);return h}function resolveParam(a,b){return void 0!==a&&void 0!==a[b]?a[b]:void 0!==urlParams&&void 0!==urlParams[b]?urlParams[b]:void 0!==parentUrlParams&&void 0!==parentUrlParams[b]?parentUrlParams[b]:OHG_DEFAULTS[b]}function OHSubscriber(a){function b(a){var b=a,c=void 0!==b.type?b.type:"GET",d=void 0!==b.data?b.data:"",e=void 0!==b.headers?b.headers:{},f=new XMLHttpRequest;f.open(c,b.url,!0);for(var g in e)f.setRequestHeader(g,e[g]);return f.onload=function(){if(f.status<200||f.status>400)return void("function"==typeof b.error&&b.error(f));"function"==typeof b.callback&&b.callback(f)},f.onerror=function(){"function"==typeof b.error&&b.error(f)},f.send(d),f}function c(){var a=[];for(var b in o)void 0===o[b].value&&a.push(b);return a}function d(){return 0===c().length}function e(){if(!m&&d()){m=!0;for(var a=0;a<n.length;a++)n[a]()}}function f(a,b){if(o[a].value!==b){o[a].value=b;for(var c=o[a].listeners,d=0;d<c.length;d++){(0,c[d])(a,b)}e()}}function g(a){var b=this;b.navigate=function(){},b.source=new EventSource(a),b.source.addEventListener("event",function(a){if(!b.paused){var c,d=JSON.parse(a.data),e=d.item.name;if(void 0!==o[e]){if("string"==typeof d.label&&-1!==d.label.indexOf("[")&&-1!==d.label.indexOf("]")){var g=d.label.indexOf("[");c=d.label.substr(g+1,d.label.lastIndexOf("]")-(g+1))}else c=d.item.state;f(e,c)}}})}function h(){function a(a){function b(a){a.forEach(function(a){if(void 0!==a.item){var b=a.item.name,c=a.item.state;void 0!==o[b]&&f(b,c)}})}try{a=JSON.parse(a)}catch(c){return}a.leaf?b(a.widgets):a.widgets.forEach(function(a){b(a.widgets)})}function c(){var e=Math.random().toString(16).slice(2);d.request=b({url:"/rest/sitemaps/"+p.sitemap+"/"+p.page+"?_="+e,headers:{"X-Atmosphere-Transport":"long-polling"},callback:function(b){a(b.responseText),setTimeout(function(){c()},1)},error:function(){setTimeout(function(){c()},1e3)}})}var d=this;c()}function i(){var a=this;a.startSubscriber=function(b){var c,d,e;try{c=JSON.parse(b.responseText)}catch(f){return}if("CREATED"===c.status){try{d=c.context.headers.Location[0]}catch(f){return}e=d.split("/"),p.id=e[e.length-1],"EventSource"in window?g.call(a,d+"?sitemap="+p.sitemap+"&pageid="+p.page):h.call(a)}},b({url:"/rest/sitemaps/events/subscribe",type:"POST",callback:a.startSubscriber})}function j(){var a=this;a.valueHandler=function(a){var b;try{b=JSON.parse(a.responseText)}catch(c){return}f(b.name,b.state)};for(var d=c(),g=0;g<d.length;g++)b({url:"/rest/items/"+d[g],type:"GET",callback:a.valueHandler});e()}function k(){void 0===p.page&&(p.page=p.sitemap),document.addEventListener("DOMContentLoaded",function(){p.valuesInitializer=new j,p.changeListener=new i})}var l=a,m=!1,n=[],o={},p={id:"",page:resolveParam(l,"w"),sitemap:resolveParam(l,"sitemap")};this.addItemListener=function(a,b){if("function"!=typeof b)throw new Error("addItemListener 'listener' is not a function");void 0!==o[a]?o[a].listeners.includes(b)||o[a].listeners.push(b):o[a]={listeners:[b],value:void 0}},this.addInitializedListener=function(a){if("function"!=typeof a)throw new Error("addInitializedListener 'listener' is not a function");n.push(a)},this.isInitialized=function(){return m},k()}function GrafanaPanel(a){function b(){var a=p.debug.value,c=p.render.value,d=p.refresh.value,e=document.getElementById(l),f=e.contentWindow.document,g=m;g+="true"===c?o:n,g+=q.dashboard.value;var h=!0;for(var i in q){var k=q[i].key,r=q[i].value;"width"===k?r="false"===c?void 0:"auto"===r?f.body.clientWidth:r:"height"===k&&(r="false"===c?void 0:"auto"===r?f.body.clientHeight:r),void 0!==k&&void 0!==r&&(g+=(h?"?":"&")+k+"="+r,h=!1)}if("true"===c&&(g+="&cacheBuster="+Date.now()),"true"===a)f.open(),f.write('<a href="'+g+'">'+g+"</a>"),f.close();else if("true"===c){var s=g.replace(o,n);f.open(),f.write("<style>body{margin:0px}p{margin:0px}</style>"),f.write('<p style="text-align:center;"><a href="'+s+'"><img src="'+g+'"></a></p>'),f.close()}else document.getElementById(l).src!==g&&e.contentWindow.location.replace(g);"true"===c&&d>0?(clearTimeout(j),j=setTimeout(b,d)):void 0!==j&&clearTimeout(j)}function c(){"true"!==p.render.value||"auto"!==q.width.value&&"auto"!==q.height.value?clearTimeout(k):(clearTimeout(k),k=setTimeout(b,500))}function d(a,b,c){for(var d in a)void 0!==a[d].itemName&&a[d].itemName===b&&(a[d].itemFunction&&(c=a[d].itemFunction(c)),a[d].value=c)}function e(a,c){d(p,a,c),d(q,a,c),ohSubscriber.isInitialized()&&b()}function f(a,b){if(void 0===b)throw new Error("Property '"+a+"' is undefined")}function g(a){for(var b in a){var c=a[b].itemName;if(void 0!==c)ohSubscriber.addItemListener(c,e);else if(void 0===a[b].value)throw new Error("Property '"+b+"' requires a default value or itemName to obtain the value from")}}function h(){f("frame",l),f("urlPrefix",m),f("panelPath",n),f("renderPanelPath",o),g(p),g(q),ohSubscriber.addInitializedListener(b),window.addEventListener("resize",c)}var i=a,j=void 0,k=void 0,l=resolveParam(i,"frame"),m=resolveParam(i,"urlPrefix"),n=resolveParam(i,"panelPath"),o=resolveParam(i,"renderPanelPath"),p={debug:{value:resolveParam(i,"debug"),itemName:resolveParam(i,"debugItem"),itemFunction:a.debugItemFunction},render:{value:resolveParam(i,"render"),itemName:resolveParam(i,"renderItem"),itemFunction:a.renderItemFunction},refresh:{value:resolveParam(i,"refresh"),itemName:resolveParam(i,"refreshItem"),itemFunction:a.refreshItemFunction}},q={dashboard:{value:resolveParam(i,"dashboard"),itemName:resolveParam(i,"dashboardItem"),itemFunction:a.dashboardItemFunction},from:{key:"from",value:resolveParam(i,"from"),itemName:resolveParam(i,"fromItem"),itemFunction:a.fromItemFunction},to:{key:"to",value:resolveParam(i,"to"),itemName:resolveParam(i,"toItem"),itemFunction:a.toItemFunction},panel:{key:"panelId",value:resolveParam(i,"panel"),itemName:resolveParam(i,"panelItem"),itemFunction:a.panelItemFunction},theme:{key:"theme",value:resolveParam(i,"theme"),itemName:resolveParam(i,"themeItem"),itemFunction:a.themeItemFunction},width:{key:"width",value:resolveParam(i,"width"),itemName:resolveParam(i,"widthItem"),itemFunction:a.widthItemFunction},height:{key:"height",value:resolveParam(i,"height"),itemName:resolveParam(i,"heightItem"),itemFunction:a.heightItemFunction}};h()}function createGuid(){return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,function(a){var b=16*Math.random()|0;return("x"===a?b:3&b|8).toString(16)})}function addGrafanaPanel(a,b){void 0===a&&(a=createGuid());var c=document.createElement("div");c.id="panel-"+a+"-container",c.className="panel-container",document.body.appendChild(c);var d=document.createElement("iframe");d.id="panel-"+a+"-frame",d.className="panel-frame",d.scrolling="no",c.appendChild(d),void 0===b&&(b={}),b.frame=d.id;var e=new GrafanaPanel(b);grafanaPanels.push(e)}var OHG_DEFAULTS={debug:"false",render:"false",refresh:"0",sitemap:"default",urlPrefix:"http://grafana:3000",panelPath:"/dashboard-solo/db/",renderPanelPath:"/render/dashboard-solo/db/",from:"now-1d",to:"now",theme:"light",width:"auto",height:"auto"},urlParams=queryParams(window.location),parentUrlParams=queryParams(window.parent.location.href),ohSubscriber=new OHSubscriber,grafanaPanels=[];
\ No newline at end of file
diff --git a/example/html/smarthome-grafana-user-defaults.js b/example/html/smarthome-grafana-user-defaults.js
deleted file mode 100644
index 9c9d9ef..0000000
--- a/example/html/smarthome-grafana-user-defaults.js
+++ /dev/null
@@ -1,13 +0,0 @@
-
-// the prefix that is used for each Grafana panel URL
-SMARTHOME_GRAFANA_DEFAULTS["urlPrefix"] = "http://grafana:3000";
-
-// use "false" so actual pages are loaded (or comment the line)
-SMARTHOME_GRAFANA_DEFAULTS["debug"] = "true";
-
-// use "default" for the default Eclipse SmartHome sitemap (or comment the line)
-SMARTHOME_GRAFANA_DEFAULTS["sitemap"] = "grafana";
-
-if (SMARTHOME_GRAFANA_DEFAULTS["debug"] === "true") {
-    console.log("Using SMARTHOME_GRAFANA_DEFAULTS = " + JSON.stringify(SMARTHOME_GRAFANA_DEFAULTS));
-}
diff --git a/example/html/smarthome-grafana.js b/example/html/smarthome-grafana.js
deleted file mode 100644
index 3a93e32..0000000
--- a/example/html/smarthome-grafana.js
+++ /dev/null
@@ -1 +0,0 @@
-"use strict";function queryParams(a){if(!a)return{};var b,c=a.toString(),d=c.indexOf("?"),e=-1!==d?c.substring(d+1):"",f=/([^&=]+)=?([^&]*)/g,g=function(a){return decodeURIComponent(a.replace(/\+/g," "))},h={};do{(b=f.exec(e))&&(h[g(b[1])]=g(b[2]))}while(b);return h}function resolveParam(a,b){return void 0!==a&&void 0!==a[b]?a[b]:void 0!==urlParams&&void 0!==urlParams[b]?urlParams[b]:void 0!==parentUrlParams&&void 0!==parentUrlParams[b]?parentUrlParams[b]:SMARTHOME_GRAFANA_DEFAULTS[b]}function SmartHomeSubscriber(a){function b(a){var b=a,c=void 0!==b.type?b.type:"GET",d=void 0!==b.data?b.data:"",e=void 0!==b.headers?b.headers:{},f=new XMLHttpRequest;f.open(c,b.url,!0);for(var g in e)f.setRequestHeader(g,e[g]);return f.onload=function(){if(f.status<200||f.status>400)return void("function"==typeof b.error&&b.error(f));"function"==typeof b.callback&&b.callback(f)},f.onerror=function(){"function"==typeof b.error&&b.error(f)},f.send(d),f}function c(){var a=[];for(var b in o)void 0===o[b].value&&a.push(b);return a}function d(){return 0===c().length}function e(){if(!m&&d()){m=!0;for(var a=0;a<n.length;a++)n[a]()}}function f(a,b){if(o[a].value!==b){o[a].value=b;for(var c=o[a].listeners,d=0;d<c.length;d++){(0,c[d])(a,b)}e()}}function g(a){var b=this;b.navigate=function(){},b.source=new EventSource(a),b.source.addEventListener("event",function(a){if(!b.paused){var c,d=JSON.parse(a.data),e=d.item.name;if(void 0!==o[e]){if("string"==typeof d.label&&-1!==d.label.indexOf("[")&&-1!==d.label.indexOf("]")){var g=d.label.indexOf("[");c=d.label.substr(g+1,d.label.lastIndexOf("]")-(g+1))}else c=d.item.state;f(e,c)}}})}function h(){function a(a){function b(a){a.forEach(function(a){if(void 0!==a.item){var b=a.item.name,c=a.item.state;void 0!==o[b]&&f(b,c)}})}try{a=JSON.parse(a)}catch(c){return}a.leaf?b(a.widgets):a.widgets.forEach(function(a){b(a.widgets)})}function c(){var e=Math.random().toString(16).slice(2);d.request=b({url:"/rest/sitemaps/"+p.sitemap+"/"+p.page+"?_="+e,headers:{"X-Atmosphere-Transport":"long-polling"},callback:function(b){a(b.responseText),setTimeout(function(){c()},1)},error:function(){setTimeout(function(){c()},1e3)}})}var d=this;c()}function i(){var a=this;a.startSubscriber=function(b){var c,d,e;try{c=JSON.parse(b.responseText)}catch(f){return}if("CREATED"===c.status){try{d=c.context.headers.Location[0]}catch(f){return}e=d.split("/"),p.id=e[e.length-1],"EventSource"in window?g.call(a,d+"?sitemap="+p.sitemap+"&pageid="+p.page):h.call(a)}},b({url:"/rest/sitemaps/events/subscribe",type:"POST",callback:a.startSubscriber})}function j(){var a=this;a.valueHandler=function(a){var b;try{b=JSON.parse(a.responseText)}catch(c){return}f(b.name,b.state)};for(var d=c(),g=0;g<d.length;g++)b({url:"/rest/items/"+d[g],type:"GET",callback:a.valueHandler});e()}function k(){void 0===p.page&&(p.page=p.sitemap),document.addEventListener("DOMContentLoaded",function(){p.valuesInitializer=new j,p.changeListener=new i})}var l=a,m=!1,n=[],o={},p={id:"",page:resolveParam(l,"w"),sitemap:resolveParam(l,"sitemap")};this.addItemListener=function(a,b){if("function"!=typeof b)throw new Error("addItemListener 'listener' is not a function");void 0!==o[a]?o[a].listeners.includes(b)||o[a].listeners.push(b):o[a]={listeners:[b],value:void 0}},this.addInitializedListener=function(a){if("function"!=typeof a)throw new Error("addInitializedListener 'listener' is not a function");n.push(a)},this.isInitialized=function(){return m},k()}function GrafanaPanel(a){function b(){var a=p.debug.value,c=p.render.value,d=p.refresh.value,e=document.getElementById(l),f=e.contentWindow.document,g=m;g+="true"===c?o:n,g+=q.dashboard.value;var h=!0;for(var i in q){var k=q[i].key,r=q[i].value;"width"===k?r="false"===c?void 0:"auto"===r?f.body.clientWidth:r:"height"===k&&(r="false"===c?void 0:"auto"===r?f.body.clientHeight:r),void 0!==k&&void 0!==r&&(g+=(h?"?":"&")+k+"="+r,h=!1)}if("true"===c&&(g+="&cacheBuster="+Date.now()),"true"===a)f.open(),f.write('<a href="'+g+'">'+g+"</a>"),f.close();else if("true"===c){var s=g.replace(o,n);f.open(),f.write("<style>body{margin:0px}p{margin:0px}</style>"),f.write('<p style="text-align:center;"><a href="'+s+'"><img src="'+g+'"></a></p>'),f.close()}else document.getElementById(l).src!==g&&e.contentWindow.location.replace(g);"true"===c&&d>0?(clearTimeout(j),j=setTimeout(b,d)):void 0!==j&&clearTimeout(j)}function c(){"true"!==p.render.value||"auto"!==q.width.value&&"auto"!==q.height.value?clearTimeout(k):(clearTimeout(k),k=setTimeout(b,500))}function d(a,b,c){for(var d in a)void 0!==a[d].itemName&&a[d].itemName===b&&(a[d].itemFunction&&(c=a[d].itemFunction(c)),a[d].value=c)}function e(a,c){d(p,a,c),d(q,a,c),smartHomeSubscriber.isInitialized()&&b()}function f(a,b){if(void 0===b)throw new Error("Property '"+a+"' is undefined")}function g(a){for(var b in a){var c=a[b].itemName;if(void 0!==c)smartHomeSubscriber.addItemListener(c,e);else if(void 0===a[b].value)throw new Error("Property '"+b+"' requires a default value or itemName to obtain the value from")}}function h(){f("frame",l),f("urlPrefix",m),f("panelPath",n),f("renderPanelPath",o),g(p),g(q),smartHomeSubscriber.addInitializedListener(b),window.addEventListener("resize",c)}var i=a,j=void 0,k=void 0,l=resolveParam(i,"frame"),m=resolveParam(i,"urlPrefix"),n=resolveParam(i,"panelPath"),o=resolveParam(i,"renderPanelPath"),p={debug:{value:resolveParam(i,"debug"),itemName:resolveParam(i,"debugItem"),itemFunction:a.debugItemFunction},render:{value:resolveParam(i,"render"),itemName:resolveParam(i,"renderItem"),itemFunction:a.renderItemFunction},refresh:{value:resolveParam(i,"refresh"),itemName:resolveParam(i,"refreshItem"),itemFunction:a.refreshItemFunction}},q={dashboard:{value:resolveParam(i,"dashboard"),itemName:resolveParam(i,"dashboardItem"),itemFunction:a.dashboardItemFunction},from:{key:"from",value:resolveParam(i,"from"),itemName:resolveParam(i,"fromItem"),itemFunction:a.fromItemFunction},to:{key:"to",value:resolveParam(i,"to"),itemName:resolveParam(i,"toItem"),itemFunction:a.toItemFunction},panel:{key:"panelId",value:resolveParam(i,"panel"),itemName:resolveParam(i,"panelItem"),itemFunction:a.panelItemFunction},theme:{key:"theme",value:resolveParam(i,"theme"),itemName:resolveParam(i,"themeItem"),itemFunction:a.themeItemFunction},width:{key:"width",value:resolveParam(i,"width"),itemName:resolveParam(i,"widthItem"),itemFunction:a.widthItemFunction},height:{key:"height",value:resolveParam(i,"height"),itemName:resolveParam(i,"heightItem"),itemFunction:a.heightItemFunction}};h()}function createGuid(){return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,function(a){var b=16*Math.random()|0;return("x"===a?b:3&b|8).toString(16)})}function addGrafanaPanel(a,b){void 0===a&&(a=createGuid());var c=document.createElement("div");c.id="panel-"+a+"-container",c.className="panel-container",document.body.appendChild(c);var d=document.createElement("iframe");d.id="panel-"+a+"-frame",d.className="panel-frame",d.scrolling="no",c.appendChild(d),void 0===b&&(b={}),b.frame=d.id;var e=new GrafanaPanel(b);grafanaPanels.push(e)}var SMARTHOME_GRAFANA_DEFAULTS={debug:"false",render:"false",refresh:"0",sitemap:"default",urlPrefix:"http://grafana:3000",panelPath:"/dashboard-solo/db/",renderPanelPath:"/render/dashboard-solo/db/",from:"now-1d",to:"now",theme:"light",width:"auto",height:"auto"},urlParams=queryParams(window.location),parentUrlParams=queryParams(window.parent.location.href),smartHomeSubscriber=new SmartHomeSubscriber,grafanaPanels=[];
\ No newline at end of file
diff --git a/package.json b/package.json
index f048e11..9b1b5f5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "smarthome-grafana",
-  "version": "0.1.0",
-  "description": "Eclipse SmartHome Grafana",
+  "name": "openhab-grafana",
+  "version": "1.0.0",
+  "description": "openHAB Grafana",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
diff --git a/web-src/smarthome-grafana.js b/web-src/openhab-grafana.js
similarity index 95%
rename from web-src/smarthome-grafana.js
rename to web-src/openhab-grafana.js
index 29ce8b1..1702540 100644
--- a/web-src/smarthome-grafana.js
+++ b/web-src/openhab-grafana.js
@@ -1,8 +1,8 @@
 /**
- * SmartHome Grafana panel utilities
+ * openHAB Grafana panel utilities
  *
- * Updates the source URL of Grafana <iframe> panels using Eclipse SmartHome server side events (SSE).
- * SmartHomeSubscriber is based on the javascript of the Eclipse SmartHome Basic UI by Vlad Ivanov.
+ * Updates the source URL of Grafana <iframe> panels using openHAB server side events (SSE).
+ * OHSubscriber is based on the javascript of the openHAB Basic UI by Vlad Ivanov.
  *
  * @author Wouter Born
  */
@@ -16,12 +16,12 @@
 "use strict";
 
 var
-    SMARTHOME_GRAFANA_DEFAULTS = {
+    OHG_DEFAULTS = {
         // library
         debug: "false",
         render: "false",
         refresh: "0",
-        // ESH sitemap
+        // OH sitemap
         sitemap: "default",
         // Grafana URL
         urlPrefix: "http://grafana:3000",
@@ -72,11 +72,11 @@ function resolveParam(params, name) {
     } else if (parentUrlParams !== undefined && parentUrlParams[name] !== undefined) {
         return parentUrlParams[name];
     } else {
-        return SMARTHOME_GRAFANA_DEFAULTS[name];
+        return OHG_DEFAULTS[name];
     }
 }
 
-function SmartHomeSubscriber(params) {
+function OHSubscriber(params) {
     var
         p = params,
         initialized = false,
@@ -375,7 +375,7 @@ function SmartHomeSubscriber(params) {
     initialize();
 }
 
-var smartHomeSubscriber = new SmartHomeSubscriber();
+var ohSubscriber = new OHSubscriber();
 
 function GrafanaPanel(params) {
     var
@@ -529,7 +529,7 @@ function GrafanaPanel(params) {
         updateVarsOnItemUpdate(libVars, itemName, value);
         updateVarsOnItemUpdate(urlVars, itemName, value);
 
-        if (smartHomeSubscriber.isInitialized()) {
+        if (ohSubscriber.isInitialized()) {
             updateFrameSourceURL();
         }
     }
@@ -540,11 +540,11 @@ function GrafanaPanel(params) {
         }
     }
 
-    function assertVarsDefinedOrSubscribeToESH(vars) {
+    function assertVarsDefinedOrSubscribeToOH(vars) {
         for (var key in vars) {
             var itemName = vars[key].itemName;
             if (itemName !== undefined) {
-                smartHomeSubscriber.addItemListener(itemName, onItemUpdated);
+                ohSubscriber.addItemListener(itemName, onItemUpdated);
             } else if (vars[key].value === undefined) {
                 throw new Error("Property '" + key + "' requires a default value or itemName to obtain the value from");
             }
@@ -557,10 +557,10 @@ function GrafanaPanel(params) {
         assertPropertyDefined("panelPath", panelPath);
         assertPropertyDefined("renderPanelPath", renderPanelPath);
 
-        assertVarsDefinedOrSubscribeToESH(libVars);
-        assertVarsDefinedOrSubscribeToESH(urlVars);
+        assertVarsDefinedOrSubscribeToOH(libVars);
+        assertVarsDefinedOrSubscribeToOH(urlVars);
 
-        smartHomeSubscriber.addInitializedListener(updateFrameSourceURL);
+        ohSubscriber.addInitializedListener(updateFrameSourceURL);
         window.addEventListener("resize", updateFrameOnResize);
     }
 
diff --git a/web/openhab-grafana.js b/web/openhab-grafana.js
new file mode 100644
index 0000000..8b87659
--- /dev/null
+++ b/web/openhab-grafana.js
@@ -0,0 +1 @@
+"use strict";function queryParams(a){if(!a)return{};var b,c=a.toString(),d=c.indexOf("?"),e=-1!==d?c.substring(d+1):"",f=/([^&=]+)=?([^&]*)/g,g=function(a){return decodeURIComponent(a.replace(/\+/g," "))},h={};do{(b=f.exec(e))&&(h[g(b[1])]=g(b[2]))}while(b);return h}function resolveParam(a,b){return void 0!==a&&void 0!==a[b]?a[b]:void 0!==urlParams&&void 0!==urlParams[b]?urlParams[b]:void 0!==parentUrlParams&&void 0!==parentUrlParams[b]?parentUrlParams[b]:OHG_DEFAULTS[b]}function OHSubscriber(a){function b(a){var b=a,c=void 0!==b.type?b.type:"GET",d=void 0!==b.data?b.data:"",e=void 0!==b.headers?b.headers:{},f=new XMLHttpRequest;f.open(c,b.url,!0);for(var g in e)f.setRequestHeader(g,e[g]);return f.onload=function(){if(f.status<200||f.status>400)return void("function"==typeof b.error&&b.error(f));"function"==typeof b.callback&&b.callback(f)},f.onerror=function(){"function"==typeof b.error&&b.error(f)},f.send(d),f}function c(){var a=[];for(var b in o)void 0===o[b].value&&a.push(b);return a}function d(){return 0===c().length}function e(){if(!m&&d()){m=!0;for(var a=0;a<n.length;a++)n[a]()}}function f(a,b){if(o[a].value!==b){o[a].value=b;for(var c=o[a].listeners,d=0;d<c.length;d++){(0,c[d])(a,b)}e()}}function g(a){var b=this;b.navigate=function(){},b.source=new EventSource(a),b.source.addEventListener("event",function(a){if(!b.paused){var c,d=JSON.parse(a.data),e=d.item.name;if(void 0!==o[e]){if("string"==typeof d.label&&-1!==d.label.indexOf("[")&&-1!==d.label.indexOf("]")){var g=d.label.indexOf("[");c=d.label.substr(g+1,d.label.lastIndexOf("]")-(g+1))}else c=d.item.state;f(e,c)}}})}function h(){function a(a){function b(a){a.forEach(function(a){if(void 0!==a.item){var b=a.item.name,c=a.item.state;void 0!==o[b]&&f(b,c)}})}try{a=JSON.parse(a)}catch(c){return}a.leaf?b(a.widgets):a.widgets.forEach(function(a){b(a.widgets)})}function c(){var e=Math.random().toString(16).slice(2);d.request=b({url:"/rest/sitemaps/"+p.sitemap+"/"+p.page+"?_="+e,headers:{"X-Atmosphere-Transport":"long-polling"},callback:function(b){a(b.responseText),setTimeout(function(){c()},1)},error:function(){setTimeout(function(){c()},1e3)}})}var d=this;c()}function i(){var a=this;a.startSubscriber=function(b){var c,d,e;try{c=JSON.parse(b.responseText)}catch(f){return}if("CREATED"===c.status){try{d=c.context.headers.Location[0]}catch(f){return}e=d.split("/"),p.id=e[e.length-1],"EventSource"in window?g.call(a,d+"?sitemap="+p.sitemap+"&pageid="+p.page):h.call(a)}},b({url:"/rest/sitemaps/events/subscribe",type:"POST",callback:a.startSubscriber})}function j(){var a=this;a.valueHandler=function(a){var b;try{b=JSON.parse(a.responseText)}catch(c){return}f(b.name,b.state)};for(var d=c(),g=0;g<d.length;g++)b({url:"/rest/items/"+d[g],type:"GET",callback:a.valueHandler});e()}function k(){void 0===p.page&&(p.page=p.sitemap),document.addEventListener("DOMContentLoaded",function(){p.valuesInitializer=new j,p.changeListener=new i})}var l=a,m=!1,n=[],o={},p={id:"",page:resolveParam(l,"w"),sitemap:resolveParam(l,"sitemap")};this.addItemListener=function(a,b){if("function"!=typeof b)throw new Error("addItemListener 'listener' is not a function");void 0!==o[a]?o[a].listeners.includes(b)||o[a].listeners.push(b):o[a]={listeners:[b],value:void 0}},this.addInitializedListener=function(a){if("function"!=typeof a)throw new Error("addInitializedListener 'listener' is not a function");n.push(a)},this.isInitialized=function(){return m},k()}function GrafanaPanel(a){function b(){var a=p.debug.value,c=p.render.value,d=p.refresh.value,e=document.getElementById(l),f=e.contentWindow.document,g=m;g+="true"===c?o:n,g+=q.dashboard.value;var h=!0;for(var i in q){var k=q[i].key,r=q[i].value;"width"===k?r="false"===c?void 0:"auto"===r?f.body.clientWidth:r:"height"===k&&(r="false"===c?void 0:"auto"===r?f.body.clientHeight:r),void 0!==k&&void 0!==r&&(g+=(h?"?":"&")+k+"="+r,h=!1)}if("true"===c&&(g+="&cacheBuster="+Date.now()),"true"===a)f.open(),f.write('<a href="'+g+'">'+g+"</a>"),f.close();else if("true"===c){var s=g.replace(o,n);f.open(),f.write("<style>body{margin:0px}p{margin:0px}</style>"),f.write('<p style="text-align:center;"><a href="'+s+'"><img src="'+g+'"></a></p>'),f.close()}else document.getElementById(l).src!==g&&e.contentWindow.location.replace(g);"true"===c&&d>0?(clearTimeout(j),j=setTimeout(b,d)):void 0!==j&&clearTimeout(j)}function c(){"true"!==p.render.value||"auto"!==q.width.value&&"auto"!==q.height.value?clearTimeout(k):(clearTimeout(k),k=setTimeout(b,500))}function d(a,b,c){for(var d in a)void 0!==a[d].itemName&&a[d].itemName===b&&(a[d].itemFunction&&(c=a[d].itemFunction(c)),a[d].value=c)}function e(a,c){d(p,a,c),d(q,a,c),ohSubscriber.isInitialized()&&b()}function f(a,b){if(void 0===b)throw new Error("Property '"+a+"' is undefined")}function g(a){for(var b in a){var c=a[b].itemName;if(void 0!==c)ohSubscriber.addItemListener(c,e);else if(void 0===a[b].value)throw new Error("Property '"+b+"' requires a default value or itemName to obtain the value from")}}function h(){f("frame",l),f("urlPrefix",m),f("panelPath",n),f("renderPanelPath",o),g(p),g(q),ohSubscriber.addInitializedListener(b),window.addEventListener("resize",c)}var i=a,j=void 0,k=void 0,l=resolveParam(i,"frame"),m=resolveParam(i,"urlPrefix"),n=resolveParam(i,"panelPath"),o=resolveParam(i,"renderPanelPath"),p={debug:{value:resolveParam(i,"debug"),itemName:resolveParam(i,"debugItem"),itemFunction:a.debugItemFunction},render:{value:resolveParam(i,"render"),itemName:resolveParam(i,"renderItem"),itemFunction:a.renderItemFunction},refresh:{value:resolveParam(i,"refresh"),itemName:resolveParam(i,"refreshItem"),itemFunction:a.refreshItemFunction}},q={dashboard:{value:resolveParam(i,"dashboard"),itemName:resolveParam(i,"dashboardItem"),itemFunction:a.dashboardItemFunction},from:{key:"from",value:resolveParam(i,"from"),itemName:resolveParam(i,"fromItem"),itemFunction:a.fromItemFunction},to:{key:"to",value:resolveParam(i,"to"),itemName:resolveParam(i,"toItem"),itemFunction:a.toItemFunction},panel:{key:"panelId",value:resolveParam(i,"panel"),itemName:resolveParam(i,"panelItem"),itemFunction:a.panelItemFunction},theme:{key:"theme",value:resolveParam(i,"theme"),itemName:resolveParam(i,"themeItem"),itemFunction:a.themeItemFunction},width:{key:"width",value:resolveParam(i,"width"),itemName:resolveParam(i,"widthItem"),itemFunction:a.widthItemFunction},height:{key:"height",value:resolveParam(i,"height"),itemName:resolveParam(i,"heightItem"),itemFunction:a.heightItemFunction}};h()}function createGuid(){return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,function(a){var b=16*Math.random()|0;return("x"===a?b:3&b|8).toString(16)})}function addGrafanaPanel(a,b){void 0===a&&(a=createGuid());var c=document.createElement("div");c.id="panel-"+a+"-container",c.className="panel-container",document.body.appendChild(c);var d=document.createElement("iframe");d.id="panel-"+a+"-frame",d.className="panel-frame",d.scrolling="no",c.appendChild(d),void 0===b&&(b={}),b.frame=d.id;var e=new GrafanaPanel(b);grafanaPanels.push(e)}var OHG_DEFAULTS={debug:"false",render:"false",refresh:"0",sitemap:"default",urlPrefix:"http://grafana:3000",panelPath:"/dashboard-solo/db/",renderPanelPath:"/render/dashboard-solo/db/",from:"now-1d",to:"now",theme:"light",width:"auto",height:"auto"},urlParams=queryParams(window.location),parentUrlParams=queryParams(window.parent.location.href),ohSubscriber=new OHSubscriber,grafanaPanels=[];
\ No newline at end of file
diff --git a/web/smarthome-grafana.js b/web/smarthome-grafana.js
deleted file mode 100644
index 3a93e32..0000000
--- a/web/smarthome-grafana.js
+++ /dev/null
@@ -1 +0,0 @@
-"use strict";function queryParams(a){if(!a)return{};var b,c=a.toString(),d=c.indexOf("?"),e=-1!==d?c.substring(d+1):"",f=/([^&=]+)=?([^&]*)/g,g=function(a){return decodeURIComponent(a.replace(/\+/g," "))},h={};do{(b=f.exec(e))&&(h[g(b[1])]=g(b[2]))}while(b);return h}function resolveParam(a,b){return void 0!==a&&void 0!==a[b]?a[b]:void 0!==urlParams&&void 0!==urlParams[b]?urlParams[b]:void 0!==parentUrlParams&&void 0!==parentUrlParams[b]?parentUrlParams[b]:SMARTHOME_GRAFANA_DEFAULTS[b]}function SmartHomeSubscriber(a){function b(a){var b=a,c=void 0!==b.type?b.type:"GET",d=void 0!==b.data?b.data:"",e=void 0!==b.headers?b.headers:{},f=new XMLHttpRequest;f.open(c,b.url,!0);for(var g in e)f.setRequestHeader(g,e[g]);return f.onload=function(){if(f.status<200||f.status>400)return void("function"==typeof b.error&&b.error(f));"function"==typeof b.callback&&b.callback(f)},f.onerror=function(){"function"==typeof b.error&&b.error(f)},f.send(d),f}function c(){var a=[];for(var b in o)void 0===o[b].value&&a.push(b);return a}function d(){return 0===c().length}function e(){if(!m&&d()){m=!0;for(var a=0;a<n.length;a++)n[a]()}}function f(a,b){if(o[a].value!==b){o[a].value=b;for(var c=o[a].listeners,d=0;d<c.length;d++){(0,c[d])(a,b)}e()}}function g(a){var b=this;b.navigate=function(){},b.source=new EventSource(a),b.source.addEventListener("event",function(a){if(!b.paused){var c,d=JSON.parse(a.data),e=d.item.name;if(void 0!==o[e]){if("string"==typeof d.label&&-1!==d.label.indexOf("[")&&-1!==d.label.indexOf("]")){var g=d.label.indexOf("[");c=d.label.substr(g+1,d.label.lastIndexOf("]")-(g+1))}else c=d.item.state;f(e,c)}}})}function h(){function a(a){function b(a){a.forEach(function(a){if(void 0!==a.item){var b=a.item.name,c=a.item.state;void 0!==o[b]&&f(b,c)}})}try{a=JSON.parse(a)}catch(c){return}a.leaf?b(a.widgets):a.widgets.forEach(function(a){b(a.widgets)})}function c(){var e=Math.random().toString(16).slice(2);d.request=b({url:"/rest/sitemaps/"+p.sitemap+"/"+p.page+"?_="+e,headers:{"X-Atmosphere-Transport":"long-polling"},callback:function(b){a(b.responseText),setTimeout(function(){c()},1)},error:function(){setTimeout(function(){c()},1e3)}})}var d=this;c()}function i(){var a=this;a.startSubscriber=function(b){var c,d,e;try{c=JSON.parse(b.responseText)}catch(f){return}if("CREATED"===c.status){try{d=c.context.headers.Location[0]}catch(f){return}e=d.split("/"),p.id=e[e.length-1],"EventSource"in window?g.call(a,d+"?sitemap="+p.sitemap+"&pageid="+p.page):h.call(a)}},b({url:"/rest/sitemaps/events/subscribe",type:"POST",callback:a.startSubscriber})}function j(){var a=this;a.valueHandler=function(a){var b;try{b=JSON.parse(a.responseText)}catch(c){return}f(b.name,b.state)};for(var d=c(),g=0;g<d.length;g++)b({url:"/rest/items/"+d[g],type:"GET",callback:a.valueHandler});e()}function k(){void 0===p.page&&(p.page=p.sitemap),document.addEventListener("DOMContentLoaded",function(){p.valuesInitializer=new j,p.changeListener=new i})}var l=a,m=!1,n=[],o={},p={id:"",page:resolveParam(l,"w"),sitemap:resolveParam(l,"sitemap")};this.addItemListener=function(a,b){if("function"!=typeof b)throw new Error("addItemListener 'listener' is not a function");void 0!==o[a]?o[a].listeners.includes(b)||o[a].listeners.push(b):o[a]={listeners:[b],value:void 0}},this.addInitializedListener=function(a){if("function"!=typeof a)throw new Error("addInitializedListener 'listener' is not a function");n.push(a)},this.isInitialized=function(){return m},k()}function GrafanaPanel(a){function b(){var a=p.debug.value,c=p.render.value,d=p.refresh.value,e=document.getElementById(l),f=e.contentWindow.document,g=m;g+="true"===c?o:n,g+=q.dashboard.value;var h=!0;for(var i in q){var k=q[i].key,r=q[i].value;"width"===k?r="false"===c?void 0:"auto"===r?f.body.clientWidth:r:"height"===k&&(r="false"===c?void 0:"auto"===r?f.body.clientHeight:r),void 0!==k&&void 0!==r&&(g+=(h?"?":"&")+k+"="+r,h=!1)}if("true"===c&&(g+="&cacheBuster="+Date.now()),"true"===a)f.open(),f.write('<a href="'+g+'">'+g+"</a>"),f.close();else if("true"===c){var s=g.replace(o,n);f.open(),f.write("<style>body{margin:0px}p{margin:0px}</style>"),f.write('<p style="text-align:center;"><a href="'+s+'"><img src="'+g+'"></a></p>'),f.close()}else document.getElementById(l).src!==g&&e.contentWindow.location.replace(g);"true"===c&&d>0?(clearTimeout(j),j=setTimeout(b,d)):void 0!==j&&clearTimeout(j)}function c(){"true"!==p.render.value||"auto"!==q.width.value&&"auto"!==q.height.value?clearTimeout(k):(clearTimeout(k),k=setTimeout(b,500))}function d(a,b,c){for(var d in a)void 0!==a[d].itemName&&a[d].itemName===b&&(a[d].itemFunction&&(c=a[d].itemFunction(c)),a[d].value=c)}function e(a,c){d(p,a,c),d(q,a,c),smartHomeSubscriber.isInitialized()&&b()}function f(a,b){if(void 0===b)throw new Error("Property '"+a+"' is undefined")}function g(a){for(var b in a){var c=a[b].itemName;if(void 0!==c)smartHomeSubscriber.addItemListener(c,e);else if(void 0===a[b].value)throw new Error("Property '"+b+"' requires a default value or itemName to obtain the value from")}}function h(){f("frame",l),f("urlPrefix",m),f("panelPath",n),f("renderPanelPath",o),g(p),g(q),smartHomeSubscriber.addInitializedListener(b),window.addEventListener("resize",c)}var i=a,j=void 0,k=void 0,l=resolveParam(i,"frame"),m=resolveParam(i,"urlPrefix"),n=resolveParam(i,"panelPath"),o=resolveParam(i,"renderPanelPath"),p={debug:{value:resolveParam(i,"debug"),itemName:resolveParam(i,"debugItem"),itemFunction:a.debugItemFunction},render:{value:resolveParam(i,"render"),itemName:resolveParam(i,"renderItem"),itemFunction:a.renderItemFunction},refresh:{value:resolveParam(i,"refresh"),itemName:resolveParam(i,"refreshItem"),itemFunction:a.refreshItemFunction}},q={dashboard:{value:resolveParam(i,"dashboard"),itemName:resolveParam(i,"dashboardItem"),itemFunction:a.dashboardItemFunction},from:{key:"from",value:resolveParam(i,"from"),itemName:resolveParam(i,"fromItem"),itemFunction:a.fromItemFunction},to:{key:"to",value:resolveParam(i,"to"),itemName:resolveParam(i,"toItem"),itemFunction:a.toItemFunction},panel:{key:"panelId",value:resolveParam(i,"panel"),itemName:resolveParam(i,"panelItem"),itemFunction:a.panelItemFunction},theme:{key:"theme",value:resolveParam(i,"theme"),itemName:resolveParam(i,"themeItem"),itemFunction:a.themeItemFunction},width:{key:"width",value:resolveParam(i,"width"),itemName:resolveParam(i,"widthItem"),itemFunction:a.widthItemFunction},height:{key:"height",value:resolveParam(i,"height"),itemName:resolveParam(i,"heightItem"),itemFunction:a.heightItemFunction}};h()}function createGuid(){return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,function(a){var b=16*Math.random()|0;return("x"===a?b:3&b|8).toString(16)})}function addGrafanaPanel(a,b){void 0===a&&(a=createGuid());var c=document.createElement("div");c.id="panel-"+a+"-container",c.className="panel-container",document.body.appendChild(c);var d=document.createElement("iframe");d.id="panel-"+a+"-frame",d.className="panel-frame",d.scrolling="no",c.appendChild(d),void 0===b&&(b={}),b.frame=d.id;var e=new GrafanaPanel(b);grafanaPanels.push(e)}var SMARTHOME_GRAFANA_DEFAULTS={debug:"false",render:"false",refresh:"0",sitemap:"default",urlPrefix:"http://grafana:3000",panelPath:"/dashboard-solo/db/",renderPanelPath:"/render/dashboard-solo/db/",from:"now-1d",to:"now",theme:"light",width:"auto",height:"auto"},urlParams=queryParams(window.location),parentUrlParams=queryParams(window.parent.location.href),smartHomeSubscriber=new SmartHomeSubscriber,grafanaPanels=[];
\ No newline at end of file