diff --git a/.eslintrc.yml b/.eslintrc.yml
new file mode 100644
index 0000000..62e05d3
--- /dev/null
+++ b/.eslintrc.yml
@@ -0,0 +1,247 @@
+env:
+  browser: true
+  es6: true
+extends: 'eslint:recommended'
+globals:
+  Atomics: readonly
+  SharedArrayBuffer: readonly
+parserOptions:
+  ecmaVersion: 2018
+  sourceType: module
+rules:
+  accessor-pairs: error
+  array-bracket-newline: 'off'
+  array-bracket-spacing: 'off'
+  array-callback-return: error
+  array-element-newline: 'off'
+  arrow-body-style: error
+  arrow-parens: 'off'
+  arrow-spacing:
+    - error
+    - after: true
+      before: true
+  block-scoped-var: error
+  block-spacing: error
+  brace-style: 'off'
+  callback-return: error
+  camelcase: 'off'
+  capitalized-comments: 'off'
+  class-methods-use-this: error
+  comma-dangle: error
+  comma-spacing: 'off'
+  comma-style:
+    - error
+    - last
+  complexity: error
+  computed-property-spacing:
+    - error
+    - never
+  consistent-return: error
+  consistent-this: error
+  curly: 'off'
+  default-case: error
+  dot-location: error
+  dot-notation: 'off'
+  eol-last: 'off'
+  eqeqeq: 'off'
+  func-call-spacing: 'off'
+  func-name-matching: error
+  func-names: 'off'
+  func-style: 'off'
+  function-paren-newline: 'off'
+  generator-star-spacing: error
+  global-require: error
+  guard-for-in: 'off'
+  handle-callback-err: error
+  id-blacklist: error
+  id-length: 'off'
+  id-match: error
+  implicit-arrow-linebreak: 'off'
+  indent: 'off'
+  indent-legacy: 'off'
+  init-declarations: 'off'
+  jsx-quotes: error
+  key-spacing: 'off'
+  keyword-spacing: 'off'
+  line-comment-position: 'off'
+  linebreak-style:
+    - error
+    - unix
+  lines-around-comment: 'off'
+  lines-around-directive: error
+  lines-between-class-members:
+    - error
+    - always
+  max-classes-per-file: error
+  max-depth: error
+  max-len: 'off'
+  max-lines: 'off'
+  max-lines-per-function: 'off'
+  max-nested-callbacks: error
+  max-params: 'off'
+  max-statements: 'off'
+  max-statements-per-line: error
+  multiline-comment-style: 'off'
+  new-cap: error
+  new-parens: error
+  newline-after-var: 'off'
+  newline-before-return: 'off'
+  newline-per-chained-call: 'off'
+  no-alert: error
+  no-array-constructor: error
+  no-async-promise-executor: error
+  no-await-in-loop: error
+  no-bitwise: 'off'
+  no-buffer-constructor: error
+  no-caller: error
+  no-catch-shadow: error
+  no-confusing-arrow: 'off'
+  no-continue: error
+  no-div-regex: error
+  no-duplicate-imports: error
+  no-else-return: 'off'
+  no-empty-function: error
+  no-eq-null: 'off'
+  no-eval: error
+  no-extend-native: error
+  no-extra-bind: error
+  no-extra-label: error
+  no-extra-parens: 'off'
+  no-floating-decimal: error
+  no-implicit-coercion: error
+  no-implicit-globals: error
+  no-implied-eval: error
+  no-inline-comments: 'off'
+  no-invalid-this: 'off'
+  no-iterator: error
+  no-label-var: error
+  no-labels: error
+  no-lone-blocks: error
+  no-lonely-if: error
+  no-loop-func: error
+  no-magic-numbers: 'off'
+  no-misleading-character-class: error
+  no-mixed-operators: error
+  no-mixed-requires: error
+  no-multi-assign: error
+  no-multi-spaces: 'off'
+  no-multi-str: error
+  no-multiple-empty-lines: error
+  no-native-reassign: error
+  no-negated-condition: 'off'
+  no-negated-in-lhs: error
+  no-nested-ternary: error
+  no-new: error
+  no-new-func: error
+  no-new-object: error
+  no-new-require: error
+  no-new-wrappers: error
+  no-octal-escape: error
+  no-param-reassign: 'off'
+  no-path-concat: error
+  no-plusplus: error
+  no-process-env: error
+  no-process-exit: error
+  no-proto: error
+  no-prototype-builtins: error
+  no-restricted-globals: error
+  no-restricted-imports: error
+  no-restricted-modules: error
+  no-restricted-properties: error
+  no-restricted-syntax: error
+  no-return-assign: error
+  no-return-await: error
+  no-script-url: error
+  no-self-compare: error
+  no-sequences: error
+  no-shadow: 'off'
+  no-shadow-restricted-names: error
+  no-spaced-func: 'off'
+  no-sync: error
+  no-tabs:
+    - error
+    - allowIndentationTabs: true
+  no-template-curly-in-string: error
+  no-ternary: 'off'
+  no-throw-literal: error
+  no-trailing-spaces: 'off'
+  no-undef-init: 'off'
+  no-undefined: 'off'
+  no-underscore-dangle: 'off'
+  no-unmodified-loop-condition: error
+  no-unneeded-ternary: error
+  no-unused-vars: 'warn'
+  no-unused-expressions: error
+  no-use-before-define: 'off'
+  no-useless-call: error
+  no-useless-catch: error
+  no-useless-computed-key: error
+  no-useless-concat: error
+  no-useless-constructor: error
+  no-useless-rename: error
+  no-useless-return: error
+  no-var: 'off'
+  no-void: error
+  no-warning-comments: 'off'
+  no-whitespace-before-property: error
+  no-with: error
+  object-curly-newline: error
+  object-curly-spacing: 'off'
+  object-shorthand: 'off'
+  one-var: 'off'
+  one-var-declaration-per-line: error
+  operator-assignment: 'off'
+  operator-linebreak: 'off'
+  padded-blocks: 'off'
+  padding-line-between-statements: error
+  prefer-arrow-callback: 'off'
+  prefer-const: 'off'
+  prefer-destructuring: 'off'
+  prefer-named-capture-group: error
+  prefer-numeric-literals: error
+  prefer-object-spread: error
+  prefer-promise-reject-errors: error
+  prefer-reflect: 'off'
+  prefer-rest-params: error
+  prefer-spread: error
+  prefer-template: 'off'
+  quote-props: 'off'
+  quotes: 'off'
+  radix: 'off'
+  require-atomic-updates: error
+  require-await: error
+  require-jsdoc: 'off'
+  require-unicode-regexp: 'off'
+  rest-spread-spacing: error
+  semi: 'off'
+  semi-spacing: error
+  semi-style:
+    - error
+    - last
+  sort-imports: error
+  sort-keys: 'off'
+  sort-vars: error
+  space-before-blocks: 'off'
+  space-before-function-paren: 'off'
+  space-in-parens: 'off'
+  space-infix-ops: 'off'
+  space-unary-ops: error
+  spaced-comment: 'off'
+  strict: error
+  switch-colon-spacing: error
+  symbol-description: error
+  template-curly-spacing:
+    - error
+    - never
+  template-tag-spacing: error
+  unicode-bom:
+    - error
+    - never
+  valid-jsdoc: 'off'
+  vars-on-top: 'off'
+  wrap-iife: error
+  wrap-regex: error
+  yield-star-spacing: error
+  yoda:
+    - error
+    - never
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..e425e44
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,32 @@
+---
+name: Bug report
+about: Bug report
+title: "[BUG]"
+labels: bug
+assignees: ''
+
+---
+
+>NOTE:
+>GNOME will sometimes report errors associated extensions if you manually update them via the extensions website. These errors can be resolved by restarting GNOME shell (logging out and then back in again). If it's still creating errors, then please go ahead create an issue.
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. Ubuntu 21.04]
+ - Extension Version: [e.g. 36]
+ - GNOME Version: [e.g. 40.0]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.gitignore b/.gitignore
index 5acb407..a2e7c59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 .vscode/*
 *~
 *.zip
+translations.txt
+
diff --git a/README.md b/README.md
index e8dc469..8dfba1b 100644
--- a/README.md
+++ b/README.md
@@ -1,30 +1,23 @@
 # GNOME Shell extension - Google Earth Wallpaper
 
-Lightweight GNOME shell extension to set your wallpaper to a random Google Earth photo from a selection of curated locations (recently to 2604 locations).
+![Jiamusi](/screenshot/Jiamusi_China.jpg)
 
-*Disclaimer*: this extension is unofficial and not affiliated with Google in any way. Images are protected by copyright, and are licensed only
-for use as wallpapers.
+[![Get it on GNOME extensions](/screenshot/get_it_on_gnome_extensions.png)](https://extensions.gnome.org/extension/1295/google-earth-wallpaper/) [![<3 Sponsor this project on GitHub <3](/screenshot/sponsor.png)](https://github.com/sponsors/neffo)
 
-This extension is derived from my [Bing Wallpaper](https://github.com/neffo/bing-wallpaper-gnome-extension) GNOME extension, which was based extensively on the NASA APOD extension by [Elinvention](https://github.com/Elinvention). Curated locations and images come from Google's [Earth View](https://earthview.withgoogle.com/) website and the [associated Chrome extension](https://chrome.google.com/webstore/detail/earth-view-from-google-ea/bhloflhklmhfpedakmangadcdofhnnoh?hl=en).
+Lightweight GNOME shell extension to set your wallpaper to a random Google Earth photo from a selection of pool of 2,604 curated locations.
+
+*Disclaimer*: this extension is unofficial and not affiliated with Google in any way. Images are protected by copyright, and are licensed only for use as wallpapers.
 
 ## Features
 
-* Fetches a random Google Earth wallpaper and sets as desktop wallpaper, lock screen and (finally!) the lock screen password prompt
+* Fetches a random Google Earth wallpaper and sets as desktop wallpaper and lock screen
 * User selectable refresh intervals (default is once per day)
 * Optional: keep images or clean up after (later is default)
 * View location on Google Maps, Bing Maps, Gnome Maps, OpenStreetMaps
-* Place pin on a map in settings
-* Adjustable indicator brightness (to match themes better)
-
-## TODO
-
-* Migrate to Champlain for Map View (in prefs)
-* Location relative to user
-* Pixel scale
 
 ## Requirements
 
-Gnome 3.28+ (Ubuntu Gnome 18.04+)
+GNOME Shell 3.38+ (Ubuntu Gnome 21.04+), legacy support exists for earlier GNOME Shell versions (3.28+)
 
 ## Install
 
@@ -32,7 +25,17 @@ Gnome 3.28+ (Ubuntu Gnome 18.04+)
 
 or install directly to your GNOME extensions directory (if you want to hack on it)
 
-`git clone https://github.com/neffo/earth-view-wallpaper-gnome-extension.git $HOME/.local/share/gnome-shell/extensions/GoogleEarthWallpaper@neffo.github.com`
+```
+mkdir ~/source
+cd ~/source
+git clone https://github.com/neffo/earth-view-wallpaper-gnome-extension.git
+cd earth-view-wallpaper-gnome-extension
+sh install.sh
+```
+
+## Other works
+
+This extension is derived from my [Bing Wallpaper](https://github.com/neffo/bing-wallpaper-gnome-extension) GNOME extension, which was based extensively on the NASA APOD extension by [Elinvention](https://github.com/Elinvention). Curated locations and images come from Google's [Earth View](https://earthview.withgoogle.com/) website and the [associated Chrome extension](https://chrome.google.com/webstore/detail/earth-view-from-google-ea/bhloflhklmhfpedakmangadcdofhnnoh?hl=en).
 
 ## Screenshots
 
@@ -40,6 +43,4 @@ or install directly to your GNOME extensions directory (if you want to hack on i
 
 ![Settings](/screenshot/settings.png)
 
-![About Page](/screenshot/map.png)
-
 ![Lockscreen](/screenshot/lockscreen-dialog.jpg)
diff --git a/buildzip.sh b/buildzip.sh
index e559ae3..7b85fbd 100755
--- a/buildzip.sh
+++ b/buildzip.sh
@@ -1,17 +1,24 @@
 #!/bin/bash
 
+EXTENSION_NAME=GoogleEarthWallpaper@neffo.github.com
+ZIP_NAME=$EXTENSION_NAME.zip
+
+# stop build if this doesn't work
+npm --version && (npm test; if [ $? -ne 0 ]; then exit 1; fi)
+
 glib-compile-schemas schemas/
-intltool-extract --type=gettext/glade Settings.ui
-xgettext -k -k_ -kN_ -o locale/GoogleEarthWallpaper.pot Settings.ui.h extension.js prefs.js utils.js --from-code=UTF-8
+intltool-extract --type=gettext/glade ui/Settings.ui 
+intltool-extract --type=gettext/glade ui/Settings4.ui
+xgettext -k -k_ -kN_ -o locale/GoogleEarthWallpaper.pot ui/Settings.ui.h ui/Settings4.ui.h extension.js prefs.js utils.js --from-code=UTF-8
 
 for D in locale/*; do
     if [ -d "${D}" ]; then
-        msgfmt -o "${D}/LC_MESSAGES/GoogleEarthWallpaper.mo" "${D}/LC_MESSAGES/GoogleEarthWallpaper.po" # compile translations
+        msgfmt --statistics --template=locale/GoogleEarthWallpaper.pot --verbose -o "${D}/LC_MESSAGES/GoogleEarthWallpaper.mo" "${D}/LC_MESSAGES/GoogleEarthWallpaper.po" 2> translations.txt  # compile translations
     fi
 done
 
-rm GoogleEarthWallpaper@neffo.github.com.zip
+rm $ZIP_NAME
 
-zip -r GoogleEarthWallpaper@neffo.github.com.zip *
+zip -r $ZIP_NAME *
 
-zip -d GoogleEarthWallpaper@neffo.github.com.zip screenshot/* screenshot buildzip.sh Settings.ui.h *.py *~
+zip -d $ZIP_NAME screenshot/* screenshot buildzip.sh Settings.ui.h *.py *~ *.sh .* translations.txt *.h package.json *.yaml *.po *.pot
diff --git a/convenience.js b/convenience.js
index dd01698..476de46 100644
--- a/convenience.js
+++ b/convenience.js
@@ -1,4 +1,6 @@
 /* -*- mode: js; js-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*global imports*/
+/*eslint no-unused-vars: "off"*/
 /*
   Copyright (c) 2011-2012, Giovanni Campagna <scampa.giovanni@gmail.com>
 
diff --git a/extension.js b/extension.js
index 532f63a..75f9019 100644
--- a/extension.js
+++ b/extension.js
@@ -1,14 +1,17 @@
-const St = imports.gi.St;
-const Main = imports.ui.main;
-const Soup = imports.gi.Soup;
-const Lang = imports.lang;
-const Mainloop = imports.mainloop;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
+// Earth View Wallpaper GNOME extension
+// Copyright (C) 2017-2021 Michael Carroll
+// This extension is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// See the GNU General Public License, version 3 or later for details.
+// Based on GNOME shell extension NASA APOD by Elia Argentieri https://github.com/Elinvention/gnome-shell-extension-nasa-apod
+/*global imports*/
+/*eslint class-methods-use-this: "off"*/
+
+const {St, Soup, Gio, GLib, Clutter, GObject} = imports.gi;
+const {main, panelMenu, popupMenu} = imports.ui;
 const Util = imports.misc.util;
-const PanelMenu = imports.ui.panelMenu;
-const PopupMenu = imports.ui.popupMenu;
-const Clutter = imports.gi.Clutter;
 
 const ExtensionUtils = imports.misc.extensionUtils;
 const Me = ExtensionUtils.getCurrentExtension();
@@ -28,20 +31,18 @@ const ICON = "pin";
 
 const providerNames = ['Google Earth', 'Google Maps', 'Bing Maps', 'OpenStreetMap' , 'GNOME Maps'];
 let googleearthWallpaperIndicator=null;
-let httpSession = new Soup.SessionAsync();
-Soup.Session.prototype.add_feature.call(httpSession, new Soup.ProxyResolverDefault());
 
 // remove this when dropping support for < 3.33, see https://github.com/OttoAllmendinger/
 const getActorCompat = (obj) =>
   Convenience.currentVersionGreaterEqual("3.33") ? obj : obj.actor;
 
 function log(msg) {
-    if (googleearthWallpaperIndicator==null || true || googleearthWallpaperIndicator._settings.get_boolean('debug-logging'))
+    if (googleearthWallpaperIndicator==null || googleearthWallpaperIndicator._settings.get_boolean('debug-logging'))
         print("GEWallpaper extension: " + msg); // disable to keep the noise down in journal
 }
 
 function notifyError(msg) {
-    Main.notifyError("GEWallpaper extension error", msg);
+    main.notifyError("GEWallpaper extension error", msg);
 }
 
 function doSetBackground(uri, schema) {
@@ -52,12 +53,10 @@ function doSetBackground(uri, schema) {
     gsettings.apply();
 }
 
-const GEWallpaperIndicator = new Lang.Class({
-    Name: IndicatorName,
-    Extends: PanelMenu.Button,
-
-    _init: function() {
-        this.parent(0.0, IndicatorName);
+const GEWallpaperIndicator = GObject.registerClass(
+class GEWallpaperIndicator extends panelMenu.Button {
+    _init (params = {}) {
+        super._init(0, IndicatorName, false);
 
         this._settings = Utils.getSettings();
         let gicon = Gio.icon_new_for_string(Me.dir.get_child('icons').get_path() + "/" + this._settings.get_string('icon') + "-symbolic.svg");
@@ -77,42 +76,30 @@ const GEWallpaperIndicator = new Lang.Class({
         this.link = "https://earthview.withgoogle.com/";
         this.imageid = 0;
         this.refreshdue = 0; // UNIX timestamp when next refresh is due
+        this.httpSession = new Soup.SessionAsync();
+        Soup.Session.prototype.add_feature.call(this.httpSession, new Soup.ProxyResolverDefault());
 
-        this._settings.connect('changed::hide', Lang.bind(this, function() {
+        this._settings.connect('changed::hide', function() {
             getActorCompat(this).visible = !this._settings.get_boolean('hide');
-        }));
+        });
         getActorCompat(this).visible = !this._settings.get_boolean('hide');
 
-        this._settings.connect('changed::map-link-provider', Lang.bind(this, function() {
-            this._updateProviderLink();
-        }));
-
-        // this is how we handle dynamic icon brightness - this is now better handled by 'symbolic' icons which match theme
-        this.bright_effect = new Clutter.BrightnessContrastEffect({});
-        this.bright_effect.set_brightness(-1.0 + (Utils.clamp_value(this._settings.get_int('brightness'),0,100)/100.0));
-        this.bright_effect.set_contrast(0);
-        this.icon.add_effect_with_name('brightness-contrast', this.bright_effect);
-        getActorCompat(this).add_child(this.icon);
+        this._settings.connect('changed::map-link-provider', this._updateProviderLink.bind(this));
         
+        getActorCompat(this).add_child(this.icon);
+        this._setIcon();
         // watch for indicator icon settings changes
-        this._settings.connect('changed::brightness', Lang.bind(this, function() {
-          this.bright_effect.set_contrast(0);
-          this.bright_effect.set_brightness(-1.0 + (Utils.clamp_value(this._settings.get_int('brightness'),0,100)/100.0));
-        }));
-        this._setIcon(this._settings.get_string('icon'));
-        this._settings.connect('changed::icon', Lang.bind(this, function() {
-            this._setIcon(this._settings.get_string('icon'));
-        }));
-
-        this.refreshDueItem = new PopupMenu.PopupMenuItem(_("<No refresh scheduled>"));
-        this.descriptionItem = new PopupMenu.PopupMenuItem(_("Text Location"));
-        this.locationItem = new PopupMenu.PopupMenuItem(_("Geo Location"));
-        this.extLinkItem = new PopupMenu.PopupMenuItem(_("External Link"));
-        this.copyrightItem = new PopupMenu.PopupMenuItem(_("Copyright"));
-        this.dwallpaperItem = new PopupMenu.PopupMenuItem(_("Set background image now"));
-        this.swallpaperItem = new PopupMenu.PopupMenuItem(_("Set lockscreen image now"));
-        this.refreshItem = new PopupMenu.PopupMenuItem(_("Refresh Now"));
-        this.settingsItem = new PopupMenu.PopupMenuItem(_("Extension settings"));
+        this._settings.connect('changed::icon', this._setIcon.bind(this));
+
+        this.refreshDueItem = new popupMenu.PopupMenuItem(_("<No refresh scheduled>"));
+        this.descriptionItem = new popupMenu.PopupMenuItem(_("Text Location"));
+        this.locationItem = new popupMenu.PopupMenuItem(_("Geo Location"));
+        this.extLinkItem = new popupMenu.PopupMenuItem(_("External Link"));
+        this.copyrightItem = new popupMenu.PopupMenuItem(_("Copyright"));
+        this.dwallpaperItem = new popupMenu.PopupMenuItem(_("Set background image now"));
+        this.swallpaperItem = new popupMenu.PopupMenuItem(_("Set lockscreen image now"));
+        this.refreshItem = new popupMenu.PopupMenuItem(_("Refresh Now"));
+        this.settingsItem = new popupMenu.PopupMenuItem(_("Extension settings"));
 
         // menu toggles for settings
         this.wallpaperToggle = this._newMenuSwitch(_("Set background image"), "set-background", this._settings.get_boolean('set-background'), true);
@@ -123,7 +110,7 @@ const GEWallpaperIndicator = new Lang.Class({
         this.menu.addMenuItem(this.extLinkItem);
         this.menu.addMenuItem(this.refreshDueItem);
         this.menu.addMenuItem(this.refreshItem);
-        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+        this.menu.addMenuItem(new popupMenu.PopupSeparatorMenuItem());
         this.menu.addMenuItem(this.dwallpaperItem);
         
         // disable until fresh is done
@@ -131,27 +118,23 @@ const GEWallpaperIndicator = new Lang.Class({
         this.descriptionItem.setSensitive(false);
         this.locationItem.setSensitive(false);
         
-        this.extLinkItem.connect('activate', Lang.bind(this, function() {
-            Util.spawn(["xdg-open", this.link]);
-        }));
-        this.dwallpaperItem.connect('activate', Lang.bind(this, this._setDesktopBackground));
+        this.extLinkItem.connect('activate', this._open_link.bind(this));
+        this.dwallpaperItem.connect('activate', this._setDesktopBackground.bind(this));
         if (!Convenience.currentVersionGreaterEqual("3.36")) { // lockscreen and desktop wallpaper are the same in GNOME 3.36+
-            this.swallpaperItem.connect('activate', Lang.bind(this, this._setLockscreenBackground));
+            this.swallpaperItem.connect('activate', this._setLockscreenBackground.bind(this));
             this.menu.addMenuItem(this.swallpaperItem);
         }
-        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-        this.refreshItem.connect('activate', Lang.bind(this, this._refresh));
-        this.settingsItem.connect('activate', function() {
-            Util.spawn(["gnome-shell-extension-prefs", Me.metadata.uuid]);
-        });
-        this.menu.addMenuItem(new PopupMenu.PopupMenuItem(_("On refresh:"), {reactive : false} ));
+        this.menu.addMenuItem(new popupMenu.PopupSeparatorMenuItem());
+        this.refreshItem.connect('activate', this._refresh.bind(this));
+        this.settingsItem.connect('activate', this._open_prefs.bind(this));
+        this.menu.addMenuItem(new popupMenu.PopupMenuItem(_("On refresh:"), {reactive : false} ));
         this.menu.addMenuItem(this.wallpaperToggle);
         if (!Convenience.currentVersionGreaterEqual("3.36")) { // lockscreen and desktop wallpaper are the same in GNOME 3.36+
             this.menu.addMenuItem(this.lockscreenToggle);
         }
         this.menu.addMenuItem(this.settingsItem);        
 
-        getActorCompat(this).connect('button-press-event', Lang.bind(this, this._updateMenu));
+        getActorCompat(this).connect('button-press-event', this._updateMenu.bind(this));
 
         if (this._settings.get_int('next-refresh') > 0 ) {
             this._restorePreviousState();
@@ -160,7 +143,15 @@ const GEWallpaperIndicator = new Lang.Class({
             log("no previous state to restore... (first run?)");
             this._restartTimeout(60); // wait 60 seconds before performing refresh
         }
-    },
+    }
+
+    _open_link () {
+        Util.spawn(["xdg-open", this.link]);
+    }
+
+    _open_prefs () {
+        Util.spawn(["gnome-shell-extension-prefs", Me.metadata.uuid]);
+    }
 
     _restorePreviousState () {
         log("restoring previous state...");
@@ -183,9 +174,9 @@ const GEWallpaperIndicator = new Lang.Class({
         this._updateProviderLink();
         this._setBackground();
         this._restartTimeout(seconds < 60 ? 60 : seconds); // never refresh early than 60 seconds after startup
-    },
+    }
 
-    _updateMenu: function () {
+    _updateMenu() {
         // Grey out menu items if an update is pending
         this.refreshItem.setSensitive(!this._updatePending);
         this.dwallpaperItem.setSensitive(!this._updatePending && this.filename != "");
@@ -198,9 +189,9 @@ const GEWallpaperIndicator = new Lang.Class({
         this.descriptionItem.label.set_text(this.explanation);
         this.copyrightItem.label.set_text(this.copyright);
         this.extLinkItem.label.set_text(this.provider_text);
-    },
+    }
 
-    _getProviderLink: function(provider = this._settings.get_enum('map-link-provider')) {
+    _getProviderLink(provider = this._settings.get_enum('map-link-provider')) {
         switch(provider) {
           case 1: // Google Maps
             return `https://www.google.com/maps/@${this.lat},${this.lon},${this.zoom}z/data=!3m1!1e3`;
@@ -215,15 +206,15 @@ const GEWallpaperIndicator = new Lang.Class({
           default:
             return `https://g.co/ev/${this.imageid}`;
         }
-    },
+    }
 
-    _updateProviderLink: function() {
+    _updateProviderLink() {
         const provider = this._settings.get_enum('map-link-provider');
         this.link = this._getProviderLink(provider)
         this.provider_text = _("View in ") + providerNames[provider];
-    },
+    }
 
-    _setBackground: function() {
+    _setBackground() {
         if (this.filename == "")
             return;
         if (this._settings.get_boolean('set-background')) {
@@ -232,21 +223,19 @@ const GEWallpaperIndicator = new Lang.Class({
         if (this._settings.get_boolean('set-lock-screen')) {
             this._setLockscreenBackground();
         }
-    },
+    }
 
     _setDesktopBackground() {
         doSetBackground(this.filename, 'org.gnome.desktop.background');
-    },
+    }
 
     _setLockscreenBackground() {
         doSetBackground(this.filename, 'org.gnome.desktop.screensaver');
-    },
+    }
 
     _newMenuSwitch(string, dconf_key, initialValue, writable) {
-        this._settings.connect(`changed::${dconf_key}`, Lang.bind(this, function() {
-            this._updateMenu();
-        }));
-        let widget = new PopupMenu.PopupSwitchMenuItem(string,
+        this._settings.connect(`changed::${dconf_key}`, this._updateMenu.bind(this));
+        let widget = new popupMenu.PopupSwitchMenuItem(string,
             initialValue);
         if (!writable) {
             widget.actor.reactive = false;
@@ -256,23 +245,23 @@ const GEWallpaperIndicator = new Lang.Class({
             });
         }
         return widget;
-    },
+    }
 
 
-    _restartTimeout: function(seconds = null) {
+    _restartTimeout(seconds = null) {
         if (this._timeout)
-            Mainloop.source_remove(this._timeout);
+            GLib.source_remove(this._timeout);
         if (seconds == null || seconds < 60)
             seconds = TIMEOUT_SECONDS;
-        this._timeout = Mainloop.timeout_add_seconds(seconds, Lang.bind(this, this._refresh));
+        this._timeout = GLib.timeout_add_seconds(GLib.PRIORITY_DEFAULT, seconds, this._refresh.bind(this));
         let timezone = GLib.TimeZone.new_local();
         let localTime = GLib.DateTime.new_now(timezone).add_seconds(seconds);
         this.refreshdue = localTime;
         this._settings.set_int('next-refresh',localTime.to_unix());
         log('next check in '+seconds+' seconds @ local time '+localTime.format('%F %X'));
-    },
+    }
 
-    _refresh: function() {
+    _refresh() {
         if (this._updatePending)
             return;
         this._updatePending = true;
@@ -287,25 +276,27 @@ const GEWallpaperIndicator = new Lang.Class({
         let request = Soup.Message.new('GET', url);
 
         // queue the http request
-        httpSession.queue_message(request, Lang.bind(this, function(httpSession, message) {
-            if (message.status_code == 200) {
-                log("Datatype: "+message.response_headers.get_content_type());
-                let data = message.response_body.data;
-                log("Recieved "+data.length+" bytes");
-                this._parseData(data);
-            } else if (message.status_code == 403) {
-                log("Access denied: "+message.status_code);
-                this._updatePending = false;
-                this._restartTimeout(TIMEOUT_SECONDS_ON_HTTP_ERROR);
-            } else {
-                log("Network error occured: "+message.status_code);
-                this._updatePending = false;
-                this._restartTimeout(TIMEOUT_SECONDS_ON_HTTP_ERROR);
-            }
-        }));
-    },
+        this.httpSession.queue_message(request, this._http_process_message.bind(this));
+    }
+
+    _http_process_message(httpSession, message) {
+        if (message.status_code == 200) {
+            log("Datatype: "+message.response_headers.get_content_type());
+            let data = message.response_body.data;
+            log("Recieved "+data.length+" bytes");
+            this._parseData(data);
+        } else if (message.status_code == 403) {
+            log("Access denied: "+message.status_code);
+            this._updatePending = false;
+            this._restartTimeout(TIMEOUT_SECONDS_ON_HTTP_ERROR);
+        } else {
+            log("Network error occured: "+message.status_code);
+            this._updatePending = false;
+            this._restartTimeout(TIMEOUT_SECONDS_ON_HTTP_ERROR);
+        }
+    }
 
-    _parseData: function(data) {
+    _parseData(data) {
         let imagejson = JSON.parse(data);
 
         if (imagejson.id != '') {
@@ -337,7 +328,7 @@ const GEWallpaperIndicator = new Lang.Class({
             }
 
             let prevfile = this._settings.get_string('image-filepath');
-            this.filename = GEWallpaperDir+(imagejson.id+'-'+location.trim()).replace(',','').replace(/[^a-z0-9]+/gi, '_').toLowerCase()+'.jpg';
+            this.filename = GEWallpaperDir+(imagejson.id+'-'+location.trim()).replace(/,/g,'').replace(/[^a-z0-9]+/gi, '_').toLowerCase()+'.jpg';
             let file = Gio.file_new_for_path(this.filename);
             let file_exists = file.query_exists(null);
             let file_info = file_exists ? file.query_info ('*',Gio.FileQueryInfoFlags.NONE,null): 0;
@@ -356,8 +347,8 @@ const GEWallpaperIndicator = new Lang.Class({
                 this._updatePending = false;
             }
             this._settings.set_string('image-details',[
-                this.explanation.replace('|', ''), // just incase (see below)
-                this.copyright.replace('|', '&'), // i think copyright info uses | instead of &
+                this.explanation.replace(/\|/gm, ''), // just incase (see below)
+                this.copyright.replace(/\|/gm, '&'), // i think copyright info uses | instead of &
                 this.lat.toString(),
                 this.lon.toString(),
                 this.zoom.toString()].join('|'));
@@ -370,9 +361,9 @@ const GEWallpaperIndicator = new Lang.Class({
         }
         this._updateMenu();
         this._restartTimeout(this._settings.get_int('refresh-interval'));
-    },
+    }
 
-    _delete_previous: function (to_delete) {
+    _delete_previous(to_delete) {
         if (to_delete == '')
             return;
         let deletepictures = this._settings.get_boolean('delete-previous');
@@ -383,9 +374,9 @@ const GEWallpaperIndicator = new Lang.Class({
                 log("deleted previous file: "+ to_delete);
             }
         }
-    },
+    }
 
-    _export_image: function(json, file) {
+    _export_image(json, file) {
         log("Exporting to " + file.get_uri())
 
         // open the Gfile
@@ -396,27 +387,21 @@ const GEWallpaperIndicator = new Lang.Class({
         this._updatePending = false;
 
         this._setBackground();
-    },
+    }
 
-    _setIcon: function(icon_name) {
-        //log('Icon set to : '+icon_name)
+    _setIcon() {
         Utils.validate_icon(this._settings);
+        let icon_name = this._settings.get_string('icon');
         let gicon = Gio.icon_new_for_string(Me.dir.get_child('icons').get_path() + "/" + Utils.icon_list_filename[Utils.icon_list.indexOf(icon_name)] + ".svg");
         this.icon = new St.Icon({gicon: gicon, style_class: 'system-status-icon'});
-        if (!this.icon.get_parent() && 0) {
-            log('New icon set to : '+icon_name);
-            getActorCompat(this).add_child(this.icon);
-        }
-        else {
-            log('Replace icon set to : '+icon_name);
-            getActorCompat(this).remove_all_children();
-            getActorCompat(this).add_child(this.icon);
-        }
-    },
+        log('Icon set to : '+icon_name);
+        getActorCompat(this).remove_all_children();
+        getActorCompat(this).add_child(this.icon);
+    }
 
-    stop: function () {
+    stop() {
         if (this._timeout)
-            Mainloop.source_remove(this._timeout);
+            GLib.source_remove(this._timeout);
         this._timeout = undefined;
         this.menu.removeAll();
     }
@@ -428,12 +413,10 @@ function init(extensionMeta) {
 
 function enable() {
     googleearthWallpaperIndicator = new GEWallpaperIndicator();
-    Main.panel.addToStatusArea(IndicatorName, googleearthWallpaperIndicator);
+    main.panel.addToStatusArea(IndicatorName, googleearthWallpaperIndicator);
 }
 
 function disable() {
-    if (this._timeout)
-            Mainloop.source_remove(this._timeout); // not strictly sure this is necessary, but let's clean it up anyway
     googleearthWallpaperIndicator.stop();
     googleearthWallpaperIndicator.destroy();
     googleearthWallpaperIndicator = null;
diff --git a/images.js b/images.js
index 74f8da7..0689525 100644
--- a/images.js
+++ b/images.js
@@ -1,5 +1,6 @@
 // image ids imported from chrome extension jscript
+/*eslint no-unused-vars: "off"*/
 
-const imageids = ["1003","1004","1006","1007","1008","1010","1012","1014","1017","1018","1019","1021","1022","1023","1024","1026","1027","1032","1033","1034","1035","1036","1037","1038","1039","1040","1041","1046","1047","1048","1049","1050","1052","1053","1054","1055","1056","1057","1063","1064","1065","1066","1067","1068","1069","1070","1071","1074","1075","1077","1078","1080","1081","1082","1084","1085","1086","1087","1089","1091","1092","1093","1094","1095","1096","1097","1098","1099","1101","1102","1103","1104","1105","1107","1109","1110","1114","1115","1116","1118","1119","1121","1122","1123","1125","1127","1128","1131","1132","1133","1134","1135","1138","1139","1140","1141","1143","1147","1148","1151","1152","1154","1155","1156","1157","1158","1159","1160","1161","1163","1164","1165","1166","1167","1168","1169","1170","1172","1173","1174","1176","1177","1178","1180","1181","1183","1184","1186","1190","1191","1192","1195","1196","1197","1198","1199","1206","1207","1209","1211","1212","1215","1216","1217","1221","1222","1224","1225","1226","1229","1230","1231","1233","1237","1238","1239","1240","1241","1242","1243","1245","1247","1248","1251","1253","1254","1255","1256","1257","1258","1259","1260","1265","1267","1268","1269","1270","1273","1274","1277","1280","1282","1285","1286","1287","1289","1290","1292","1293","1297","1298","1300","1301","1302","1308","1309","1312","1316","1317","1323","1324","1325","1326","1329","1332","1336","1337","1338","1341","1342","1343","1345","1348","1349","1350","1351","1352","1353","1354","1355","1356","1358","1359","1363","1364","1368","1369","1370","1371","1373","1374","1375","1377","1378","1381","1383","1385","1388","1393","1394","1396","1397","1398","1399","1400","1402","1403","1406","1407","1408","1409","1413","1414","1416","1417","1418","1419","1420","1421","1423","1427","1429","1430","1432","1434","1435","1436","1437","1438","1440","1443","1444","1446","1447","1448","1449","1450","1451","1456","1457","1463","1464","1466","1468","1470","1471","1472","1474","1475","1476","1477","1478","1484","1485","1487","1488","1490","1491","1492","1494","1495","1496","1498","1500","1501","1502","1505","1506","1508","1509","1510","1511","1512","1514","1515","1516","1517","1518","1519","1521","1523","1525","1526","1528","1529","1530","1531","1534","1537","1538","1539","1540","1541","1542","1543","1544","1545","1546","1548","1550","1551","1553","1556","1557","1558","1559","1560","1561","1563","1565","1567","1568","1569","1572","1574","1578","1579","1582","1583","1584","1585","1588","1589","1591","1594","1595","1598","1600","1606","1607","1608","1609","1610","1611","1612","1613","1614","1615","1617","1618","1620","1623","1626","1628","1629","1630","1634","1636","1637","1639","1640","1641","1643","1644","1645","1646","1648","1652","1653","1655","1657","1660","1661","1662","1663","1664","1666","1668","1669","1672","1673","1674","1675","1676","1681","1683","1684","1685","1686","1687","1688","1689","1690","1692","1694","1695","1697","1698","1699","1701","1702","1703","1704","1707","1710","1711","1712","1713","1714","1716","1718","1719","1720","1721","1722","1724","1725","1727","1728","1729","1730","1731","1732","1734","1735","1737","1738","1739","1740","1741","1742","1746","1750","1754","1756","1758","1759","1760","1761","1762","1763","1766","1767","1768","1770","1771","1772","1774","1775","1776","1777","1778","1779","1780","1782","1783","1784","1785","1786","1787","1788","1790","1792","1793","1796","1797","1799","1800","1801","1804","1805","1806","1807","1808","1809","1810","1811","1812","1816","1817","1820","1821","1822","1823","1824","1825","1826","1828","1829","1831","1832","1833","1834","1835","1836","1837","1838","1839","1840","1841","1842","1843","1844","1845","1846","1849","1852","1853","1854","1855","1857","1858","1859","1860","1861","1863","1864","1868","1870","1872","1873","1875","1883","1884","1885","1887","1888","1889","1890","1891","1893","1894","1897","1901","1902","1903","1904","1905","1907","1908","1909","1910","1911","1912","1913","1915","1919","1920","1921","1922","1923","1924","1925","1927","1934","1935","1936","1937","1938","1939","1940","1942","1943","1945","1946","1947","1948","1949","1951","1952","1954","1955","1956","1957","1959","1960","1961","1962","1964","1965","1966","1967","1968","1969","1970","1971","1972","1973","1974","1975","1976","1977","1978","1979","1980","1981","1982","1983","1984","1986","1987","1989","1990","1991","1992","1993","1994","1995","1998","1999","2000","2001","2002","2003","2007","2009","2010","2011","2012","2013","2014","2015","2016","2017","2018","2021","2022","2023","2024","2025","2026","2027","2028","2029","2030","2031","2032","2033","2034","2035","2036","2037","2038","2039","2040","2041","2042","2043","2044","2045","2046","2047","2048","2049","2050","2051","2052","2054","2055","2056","2057","2058","2059","2060","2061","2062","2063","2064","2065","2066","2067","2068","2069","2070","2071","2072","2074","2075","2076","2078","2081","2082","2083","2084","2088","2090","2091","2093","2095","2096","2097","2098","2100","2102","2103","2109","2112","2113","2116","2118","2120","2121","2124","2125","2126","2131","2132","2135","2137","2138","2139","2140","2141","2142","2145","2147","2148","2149","2150","2151","2152","2154","2156","2157","2159","2160","2161","2162","2165","2166","2167","2168","2169","2170","2171","2175","2176","2177","2179","2180","2181","2182","2183","2186","2187","2188","2190","2191","2192","2194","2195","2197","2198","2199","2202","2203","2204","2205","2206","2207","2209","2211","2212","2213","2216","2218","2220","2222","2223","2224","2227","2228","2229","2230","2231","2237","2239","2240","2241","2243","2244","2246","2247","2248","2249","2251","2252","2253","2256","2258","2259","2260","2263","2264","2265","2266","2268","2269","2270","2272","2273","2274","2275","2276","2277","2278","2280","2281","2284","2287","2288","2290","2291","2292","2293","2294","2295","2296","2297","2299","2303","2304","2305","2307","2308","2311","2312","2313","2314","2315","2316","2317","2318","2319","2321","2322","2323","2324","2325","2326","2327","2329","2330","2331","2332","2333","2334","2337","2340","2341","2342","2343","2344","2345","2346","2347","2350","2357","2360","2361","2364","2367","2368","2371","2372","2374","2375","2377","2378","2379","2380","2381","2382","2383","2385","2386","2388","2389","2390","2391","2392","2393","2395","2397","2398","2399","2401","2402","2403","2405","2406","2407","2408","2409","2410","2411","2412","2413","2414","2416","2418","2419","2421","2422","2423","2426","2430","2431","2432","2433","2434","2435","2436","2437","2438","2439","2442","2443","2444","2446","2447","2448","5003","5004","5005","5007","5008","5012","5015","5016","5019","5022","5023","5027","5028","5035","5037","5038","5039","5040","5041","5043","5044","5045","5046","5047","5048","5051","5052","5053","5056","5057","5060","5062","5063","5064","5065","5066","5071","5072","5073","5076","5077","5078","5079","5080","5081","5082","5097","5103","5104","5105","5111","5121","5126","5147","5163","5164","5165","5167","5168","5172","5173","5178","5179","5181","5182","5183","5188","5189","5192","5198","5199","5206","5207","5215","5216","5217","5228","5231","5234","5237","5238","5242","5243","5244","5245","5253","5254","5255","5290","5296","5302","5304","5310","5314","5319","5325","5329","5330","5333","5334","5338","5355","5361","5365","5375","5382","5389","5396","5403","5412","5422","5423","5424","5425","5426","5438","5445","5451","5452","5454","5456","5457","5460","5461","5462","5464","5474","5479","5480","5481","5484","5485","5487","5502","5508","5511","5513","5527","5528","5529","5530","5531","5533","5536","5538","5542","5551","5553","5555","5556","5560","5562","5563","5564","5565","5569","5575","5577","5583","5584","5586","5587","5588","5589","5591","5594","5595","5596","5597","5604","5607","5609","5611","5612","5614","5616","5617","5618","5619","5620","5624","5626","5628","5629","5630","5634","5635","5636","5641","5646","5651","5653","5654","5660","5663","5666","5668","5674","5675","5676","5686","5688","5689","5692","5705","5720","5723","5724","5729","5741","5744","5749","5755","5761","5762","5763","5766","5767","5770","5773","5778","5786","5787","5790","5792","5795","5796","5797","5809","5810","5818","5822","5828","5829","5836","5855","5859","5862","5864","5870","5874","5882","5884","5890","5898","5901","5924","5933","5938","5941","5944","5945","5951","5952","5954","5955","5957","5958","5959","5960","5964","5975","5977","5978","5979","5981","5982","5984","5989","5992","5995","5999","6001","6002","6003","6004","6005","6006","6007","6008","6011","6013","6014","6015","6016","6017","6018","6019","6022","6025","6032","6041","6043","6044","6045","6046","6048","6049","6050","6051","6052","6053","6054","6055","6056","6057","6058","6059","6060","6062","6063","6065","6066","6068","6069","6070","6072","6073","6074","6078","6079","6080","6081","6082","6095","6096","6097","6099","6100","6101","6102","6103","6105","6107","6108","6109","6110","6112","6114","6116","6117","6119","6120","6121","6122","6124","6125","6134","6135","6136","6137","6138","6139","6140","6141","6143","6144","6146","6149","6150","6151","6152","6153","6155","6160","6161","6167","6170","6175","6176","6177","6178","6180","6181","6182","6183","6184","6186","6187","6189","6201","6202","6204","6205","6206","6207","6208","6209","6210","6211","6213","6215","6216","6217","6218","6222","6228","6229","6230","6231","6232","6233","6234","6235","6241","6244","6248","6254","6255","6256","6257","6258","6259","6260","6262","6263","6264","6265","6266","6267","6269","6271","6272","6275","6276","6279","6280","6281","6282","6283","6284","6285","6287","6290","6291","6292","6293","6294","6295","6296","6298","6300","6301","6302","6303","6304","6311","6313","6315","6316","6317","6318","6319","6320","6321","6324","6325","6326","6339","6340","6341","6342","6344","6345","6346","6347","6348","6349","6350","6351","6352","6355","6356","6358","6359","6360","6361","6362","6363","6364","6365","6366","6367","6368","6371","6372","6374","6375","6376","6377","6378","6379","6380","6381","6382","6383","6384","6386","6387","6388","6389","6402","6409","6410","6424","6435","6436","6441","6443","6457","6459","6460","6465","6470","6473","6488","6491","6495","6496","6498","6500","6503","6504","6510","6512","6519","6524","6525","6527","6528","6531","6543","6545","6561","6565","6566","6575","6578","6579","6587","6588","6589","6590","6600","6607","7001","7002","7003","7004","7005","7006","7008","7009","7010","7011","7012","7013","7015","7016","7017","7018","7019","7020","7021","7023",
+var imageids = ["1003","1004","1006","1007","1008","1010","1012","1014","1017","1018","1019","1021","1022","1023","1024","1026","1027","1032","1033","1034","1035","1036","1037","1038","1039","1040","1041","1046","1047","1048","1049","1050","1052","1053","1054","1055","1056","1057","1063","1064","1065","1066","1067","1068","1069","1070","1071","1074","1075","1077","1078","1080","1081","1082","1084","1085","1086","1087","1089","1091","1092","1093","1094","1095","1096","1097","1098","1099","1101","1102","1103","1104","1105","1107","1109","1110","1114","1115","1116","1118","1119","1121","1122","1123","1125","1127","1128","1131","1132","1133","1134","1135","1138","1139","1140","1141","1143","1147","1148","1151","1152","1154","1155","1156","1157","1158","1159","1160","1161","1163","1164","1165","1166","1167","1168","1169","1170","1172","1173","1174","1176","1177","1178","1180","1181","1183","1184","1186","1190","1191","1192","1195","1196","1197","1198","1199","1206","1207","1209","1211","1212","1215","1216","1217","1221","1222","1224","1225","1226","1229","1230","1231","1233","1237","1238","1239","1240","1241","1242","1243","1245","1247","1248","1251","1253","1254","1255","1256","1257","1258","1259","1260","1265","1267","1268","1269","1270","1273","1274","1277","1280","1282","1285","1286","1287","1289","1290","1292","1293","1297","1298","1300","1301","1302","1308","1309","1312","1316","1317","1323","1324","1325","1326","1329","1332","1336","1337","1338","1341","1342","1343","1345","1348","1349","1350","1351","1352","1353","1354","1355","1356","1358","1359","1363","1364","1368","1369","1370","1371","1373","1374","1375","1377","1378","1381","1383","1385","1388","1393","1394","1396","1397","1398","1399","1400","1402","1403","1406","1407","1408","1409","1413","1414","1416","1417","1418","1419","1420","1421","1423","1427","1429","1430","1432","1434","1435","1436","1437","1438","1440","1443","1444","1446","1447","1448","1449","1450","1451","1456","1457","1463","1464","1466","1468","1470","1471","1472","1474","1475","1476","1477","1478","1484","1485","1487","1488","1490","1491","1492","1494","1495","1496","1498","1500","1501","1502","1505","1506","1508","1509","1510","1511","1512","1514","1515","1516","1517","1518","1519","1521","1523","1525","1526","1528","1529","1530","1531","1534","1537","1538","1539","1540","1541","1542","1543","1544","1545","1546","1548","1550","1551","1553","1556","1557","1558","1559","1560","1561","1563","1565","1567","1568","1569","1572","1574","1578","1579","1582","1583","1584","1585","1588","1589","1591","1594","1595","1598","1600","1606","1607","1608","1609","1610","1611","1612","1613","1614","1615","1617","1618","1620","1623","1626","1628","1629","1630","1634","1636","1637","1639","1640","1641","1643","1644","1645","1646","1648","1652","1653","1655","1657","1660","1661","1662","1663","1664","1666","1668","1669","1672","1673","1674","1675","1676","1681","1683","1684","1685","1686","1687","1688","1689","1690","1692","1694","1695","1697","1698","1699","1701","1702","1703","1704","1707","1710","1711","1712","1713","1714","1716","1718","1719","1720","1721","1722","1724","1725","1727","1728","1729","1730","1731","1732","1734","1735","1737","1738","1739","1740","1741","1742","1746","1750","1754","1756","1758","1759","1760","1761","1762","1763","1766","1767","1768","1770","1771","1772","1774","1775","1776","1777","1778","1779","1780","1782","1783","1784","1785","1786","1787","1788","1790","1792","1793","1796","1797","1799","1800","1801","1804","1805","1806","1807","1808","1809","1810","1811","1812","1816","1817","1820","1821","1822","1823","1824","1825","1826","1828","1829","1831","1832","1833","1834","1835","1836","1837","1838","1839","1840","1841","1842","1843","1844","1845","1846","1849","1852","1853","1854","1855","1857","1858","1859","1860","1861","1863","1864","1868","1870","1872","1873","1875","1883","1884","1885","1887","1888","1889","1890","1891","1893","1894","1897","1901","1902","1903","1904","1905","1907","1908","1909","1910","1911","1912","1913","1915","1919","1920","1921","1922","1923","1924","1925","1927","1934","1935","1936","1937","1938","1939","1940","1942","1943","1945","1946","1947","1948","1949","1951","1952","1954","1955","1956","1957","1959","1960","1961","1962","1964","1965","1966","1967","1968","1969","1970","1971","1972","1973","1974","1975","1976","1977","1978","1979","1980","1981","1982","1983","1984","1986","1987","1989","1990","1991","1992","1993","1994","1995","1998","1999","2000","2001","2002","2003","2007","2009","2010","2011","2012","2013","2014","2015","2016","2017","2018","2021","2022","2023","2024","2025","2026","2027","2028","2029","2030","2031","2032","2033","2034","2035","2036","2037","2038","2039","2040","2041","2042","2043","2044","2045","2046","2047","2048","2049","2050","2051","2052","2054","2055","2056","2057","2058","2059","2060","2061","2062","2063","2064","2065","2066","2067","2068","2069","2070","2071","2072","2074","2075","2076","2078","2081","2082","2083","2084","2088","2090","2091","2093","2095","2096","2097","2098","2100","2102","2103","2109","2112","2113","2116","2118","2120","2121","2124","2125","2126","2131","2132","2135","2137","2138","2139","2140","2141","2142","2145","2147","2148","2149","2150","2151","2152","2154","2156","2157","2159","2160","2161","2162","2165","2166","2167","2168","2169","2170","2171","2175","2176","2177","2179","2180","2181","2182","2183","2186","2187","2188","2190","2191","2192","2194","2195","2197","2198","2199","2202","2203","2204","2205","2206","2207","2209","2211","2212","2213","2216","2218","2220","2222","2223","2224","2227","2228","2229","2230","2231","2237","2239","2240","2241","2243","2244","2246","2247","2248","2249","2251","2252","2253","2256","2258","2259","2260","2263","2264","2265","2266","2268","2269","2270","2272","2273","2274","2275","2276","2277","2278","2280","2281","2284","2287","2288","2290","2291","2292","2293","2294","2295","2296","2297","2299","2303","2304","2305","2307","2308","2311","2312","2313","2314","2315","2316","2317","2318","2319","2321","2322","2323","2324","2325","2326","2327","2329","2330","2331","2332","2333","2334","2337","2340","2341","2342","2343","2344","2345","2346","2347","2350","2357","2360","2361","2364","2367","2368","2371","2372","2374","2375","2377","2378","2379","2380","2381","2382","2383","2385","2386","2388","2389","2390","2391","2392","2393","2395","2397","2398","2399","2401","2402","2403","2405","2406","2407","2408","2409","2410","2411","2412","2413","2414","2416","2418","2419","2421","2422","2423","2426","2430","2431","2432","2433","2434","2435","2436","2437","2438","2439","2442","2443","2444","2446","2447","2448","5003","5004","5005","5007","5008","5012","5015","5016","5019","5022","5023","5027","5028","5035","5037","5038","5039","5040","5041","5043","5044","5045","5046","5047","5048","5051","5052","5053","5056","5057","5060","5062","5063","5064","5065","5066","5071","5072","5073","5076","5077","5078","5079","5080","5081","5082","5097","5103","5104","5105","5111","5121","5126","5147","5163","5164","5165","5167","5168","5172","5173","5178","5179","5181","5182","5183","5188","5189","5192","5198","5199","5206","5207","5215","5216","5217","5228","5231","5234","5237","5238","5242","5243","5244","5245","5253","5254","5255","5290","5296","5302","5304","5310","5314","5319","5325","5329","5330","5333","5334","5338","5355","5361","5365","5375","5382","5389","5396","5403","5412","5422","5423","5424","5425","5426","5438","5445","5451","5452","5454","5456","5457","5460","5461","5462","5464","5474","5479","5480","5481","5484","5485","5487","5502","5508","5511","5513","5527","5528","5529","5530","5531","5533","5536","5538","5542","5551","5553","5555","5556","5560","5562","5563","5564","5565","5569","5575","5577","5583","5584","5586","5587","5588","5589","5591","5594","5595","5596","5597","5604","5607","5609","5611","5612","5614","5616","5617","5618","5619","5620","5624","5626","5628","5629","5630","5634","5635","5636","5641","5646","5651","5653","5654","5660","5663","5666","5668","5674","5675","5676","5686","5688","5689","5692","5705","5720","5723","5724","5729","5741","5744","5749","5755","5761","5762","5763","5766","5767","5770","5773","5778","5786","5787","5790","5792","5795","5796","5797","5809","5810","5818","5822","5828","5829","5836","5855","5859","5862","5864","5870","5874","5882","5884","5890","5898","5901","5924","5933","5938","5941","5944","5945","5951","5952","5954","5955","5957","5958","5959","5960","5964","5975","5977","5978","5979","5981","5982","5984","5989","5992","5995","5999","6001","6002","6003","6004","6005","6006","6007","6008","6011","6013","6014","6015","6016","6017","6018","6019","6022","6025","6032","6041","6043","6044","6045","6046","6048","6049","6050","6051","6052","6053","6054","6055","6056","6057","6058","6059","6060","6062","6063","6065","6066","6068","6069","6070","6072","6073","6074","6078","6079","6080","6081","6082","6095","6096","6097","6099","6100","6101","6102","6103","6105","6107","6108","6109","6110","6112","6114","6116","6117","6119","6120","6121","6122","6124","6125","6134","6135","6136","6137","6138","6139","6140","6141","6143","6144","6146","6149","6150","6151","6152","6153","6155","6160","6161","6167","6170","6175","6176","6177","6178","6180","6181","6182","6183","6184","6186","6187","6189","6201","6202","6204","6205","6206","6207","6208","6209","6210","6211","6213","6215","6216","6217","6218","6222","6228","6229","6230","6231","6232","6233","6234","6235","6241","6244","6248","6254","6255","6256","6257","6258","6259","6260","6262","6263","6264","6265","6266","6267","6269","6271","6272","6275","6276","6279","6280","6281","6282","6283","6284","6285","6287","6290","6291","6292","6293","6294","6295","6296","6298","6300","6301","6302","6303","6304","6311","6313","6315","6316","6317","6318","6319","6320","6321","6324","6325","6326","6339","6340","6341","6342","6344","6345","6346","6347","6348","6349","6350","6351","6352","6355","6356","6358","6359","6360","6361","6362","6363","6364","6365","6366","6367","6368","6371","6372","6374","6375","6376","6377","6378","6379","6380","6381","6382","6383","6384","6386","6387","6388","6389","6402","6409","6410","6424","6435","6436","6441","6443","6457","6459","6460","6465","6470","6473","6488","6491","6495","6496","6498","6500","6503","6504","6510","6512","6519","6524","6525","6527","6528","6531","6543","6545","6561","6565","6566","6575","6578","6579","6587","6588","6589","6590","6600","6607","7001","7002","7003","7004","7005","7006","7008","7009","7010","7011","7012","7013","7015","7016","7017","7018","7019","7020","7021","7023",
 // updated images from 2019/2020 v3.0.5.0 chrome extension
 "11935","11932","13942","13735","13730","13419","12078","14752","14737","14727","14719","14718","14669","14661","14647","14642","14632","14623","14613","14612","14603","14602","14599","14569","14560","14549","14542","14517","14508","14498","14489","14484","14478","14456","14434","14313","14312","14246","14111","14108","14097","14086","14068","14066","14059","14048","14046","14004","13986","13980","13925","13868","13763","13758","13678","13645","13581","13222","13208","13201","12986","12878","12861","12801","12686","12657","12623","14197","14196","14190","14188","14181","14171","14168","14145","14793","14792","14791","14790","14788","14787","14786","14784","14783","14782","14781","11566","13192","12277","12198","11573","14765","14700","14646","14523","14506","14504","14497","14451","14446","14436","14429","14362","14354","14344","14340","14339","14332","14309","14256","14254","14126","14124","14107","14105","14099","14096","14091","14090","14085","14084","14083","14074","14073","14072","14067","14060","14047","14015","14011","14007","14006","14005","13991","13984","13974","13973","13967","13933","13932","13924","13911","13907","13906","13897","13887","13886","13885","13871","13860","13859","13853","13841","13839","13830","13826","13824","13818","13788","13773","13770","13769","13765","13747","13745","13731","13687","13661","13660","13649","13646","13643","13640","13633","13631","13598","13591","13580","13547","13520","13519","13485","13467","13439","13414","13400","13394","13389","13288","13281","13280","13261","13249","13245","13238","13212","13209","13202","13200","13158","13151","13149","13004","12814","12773","12734","12724","12706","12692","12660","12658","12653","12646","12524","12523","12516","12496","12462","12444","12435","12424","12395","12390","12097","11782","11575","11601","12025","12024","12023","11862","14774","14741","14740","14739","14736","14734","14733","14732","14721","14686","14685","14680","14666","14664","14663","14653","14652","14630","14617","14611","14608","14597","14596","14592","14589","14582","14572","14561","14559","14555","14552","14491","14487","14479","14477","14438","14195","14194","14187","14186","14184","14182","14179","14178","14174","14169","14164","14162","14156","14143","14132","14129","14128","13716","13708","13707","13702","13195","12290","12261","12260","12257","11941","11939","11934","11931","11766","12026","12006","11653","11580","11567","12050","12048","12047","12039","11999","14730","14729","14708","14513","14511","14507","14505","14503","14499","14495","14455","14449","14417","14399","14396","14394","14390","14378","14373","14366","14331","14324","14322","14319","14310","14301","14297","14295","14294","14291","14289","14264","14259","14258","14244","14234","14232","14229","14228","14226","14211","14125","14123","14122","14114","14104","14102","14095","14093","14092","14079","14077","14071","14061","14058","14057","14056","14044","14043","14034","14026","14018","14012","14010","13997","13995","13985","13983","13982","13981","13978","13971","13965","13948","13947","13940","13939","13935","13931","13923","13914","13905","13896","13895","13892","13884","13879","13852","13844","13822","13821","13819","13814","13809","13799","13779","13754","13749","13746","13744","13728","13691","13670","13653","13650","13648","13642","13636","13622","13618","13615","13602","13600","13590","13582","13566","13546","13545","13543","13540","13537","13534","13532","13516","13515","13513","13508","13493","13489","13487","13472","13468","13462","13454","13426","13403","13402","13397","13383","13374","13366","13339","13332","13319","13316","13301","13289","13269","13252","13242","13239","13236","13218","13217","13207","13205","13204","13203","13183","13180","13161","13152","13150","13145","13135","13119","13117","13054","13050","13037","13025","13017","13012","13009","12995","12994","12988","12987","12968","12967","12937","12914","12907","12903","12891","12883","12882","12859","12858","12855","12854","12852","12846","12844","12843","12834","12833","12826","12816","12813","12812","12809","12807","12802","12800","12799","12761","12730","12728","12717","12693","12679","12672","12661","12659","12656","12634","12629","12626","12610","12606","12602","12597","12525","12502","12478","12455","12437","12434","12432","12425","12403","12400","12393","12382","12348","12347","12332","12321","12292","12207","12133","11688","11654","11603","11597","13705","13299","13193","12267","12156","11899","11650","11639","11626","11623","11698","11663","11658","11589","12056","12032","12031","12019","12008","14772","14768","14751","14747","14746","14744","14742","14738","14735","14726","14725","14724","14723","14722","14720","14677","14668","14667","14665","14662","14643","14641","14639","14636","14634","14631","14628","14616","14615","14601","14600","14598","14588","14587","14581","14580","14578","14577","14576","14575","14573","14564","14554","14548","14546","14543","14541","14538","14531","14492","14490","14483","14482","14480","14472","14471","14452","14443","14442","14201","14200","14198","14193","14192","14189","14180","14175","14173","14170","14166","14165","14163","14161","14158","14150","14149","14148","14144","14142","14141","14140","14134","14130","14127","12012","11946","11720","11651","11624","11610","14714","14711","14705","14703","14702","14688","14529","14525","14524","14521","14519","14518","14509","14468","14467","14466","14465","14463","14454","14428","14406","14402","14400","14398","14397","14392","14391","14386","14384","14383","14376","14374","14370","14360","14359","14348","14345","14341","14335","14334","14328","14318","14317","14315","14305","14303","14299","14290","14283","14282","14266","14260","14257","14255","14250","14249","14248","14247","14245","14242","14240","14236","14225","14218","14215","14214","14212","14112","14109","14098","14094","14089","14088","14087","14082","14081","14080","14075","14065","14055","14053","14052","14037","14036","14035","14033","14032","14031","14027","14024","14022","14021","14019","14017","14014","14002","13999","13996","13990","13977","13976","13975","13972","13962","13961","13960","13956","13954","13950","13945","13941","13936","13934","13929","13926","13921","13919","13917","13916","13913","13910","13902","13898","13891","13890","13889","13880","13873","13872","13870","13869","13865","13861","13854","13845","13842","13832","13831","13827","13823","13817","13816","13812","13811","13810","13808","13789","13786","13782","13781","13771","13767","13755","13750","13748","13743","13742","13693","13692","13676","13673","13667","13664","13663","13656","13654","13652","13647","13644","13639","13638","13634","13630","13629","13623","13619","13617","13614","13603","13601","13599","13595","13594","13592","13583","13578","13577","13572","13560","13553","13552","13549","13544","13539","13536","13531","13528","13526","13523","13517","13504","13492","13483","13481","13475","13474","13470","13466","13457","13456","13441","13440","13433","13430","13424","13420","13418","13409","13404","13401","13398","13388","13386","13361","13360","13358","13352","13350","13340","13338","13335","13331","13330","13329","13328","13327","13326","13321","13311","13306","13295","13293","13291","13286","13285","13284","13282","13277","13275","13270","13263","13258","13251","13250","13247","13246","13244","13241","13237","13233","13231","13228","13224","13221","13215","13206","13187","13184","13167","13166","13162","13157","13155","13147","13099","13069","13059","13056","13049","13048","13033","13031","13028","13026","13024","13023","13016","13015","13013","13008","13001","12989","12983","12979","12977","12955","12953","12951","12950","12947","12939","12936","12933","12932","12926","12923","12922","12904","12895","12892","12890","12876","12873","12860","12857","12850","12849","12848","12845","12839","12838","12835","12831","12810","12797","12753","12744","12723","12714","12705","12691","12684","12682","12680","12678","12675","12671","12669","12663","12655","12650","12648","12643","12640","12636","12635","12633","12621","12616","12613","12609","12608","12603","12601","12600","12599","12594","12593","12588","12585","12584","12577","12571","12570","12565","12561","12559","12554","12540","12533","12519","12510","12501","12497","12492","12488","12487","12479","12463","12458","12451","12441","12420","12419","12411","12402","12401","12397","12391","12378","12363","12355","12352","12346","12325","12317","12316","12313","12306","12303","12293","12237","12232","12213","12131","12127","12107","12101","11783","11775","11697","11691","11664","11585","11582","11571","13717","13706","13704","13198","13196","12351","12336","12279"];
\ No newline at end of file
diff --git a/install.sh b/install.sh
new file mode 100755
index 0000000..d126f74
--- /dev/null
+++ b/install.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+EXTENSION_NAME=GoogleEarthWallpaper@neffo.github.com
+INSTALL_PATH=~/.local/share/gnome-shell/extensions
+ZIP_NAME=$EXTENSION_NAME.zip
+
+./buildzip.sh
+if [ $? -ne 0 ]; then 
+    echo "ERROR: build failed!"
+    exit 1
+fi
+
+# this might be better to use the official installer script if it handles .zip files
+unzip -o $ZIP_NAME -d $INSTALL_PATH/$EXTENSION_NAME/
diff --git a/locale/GoogleEarthWallpaper.pot b/locale/GoogleEarthWallpaper.pot
index 8fa843d..5b0727c 100644
--- a/locale/GoogleEarthWallpaper.pot
+++ b/locale/GoogleEarthWallpaper.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-09 19:12+1000\n"
+"POT-Creation-Date: 2021-10-19 21:56+1000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,211 +17,215 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: Settings.ui.h:1
+#: ui/Settings.ui.h:1 ui/Settings4.ui.h:1
 msgid "Hide the indicator"
 msgstr ""
 
-#: Settings.ui.h:2
+#: ui/Settings.ui.h:2 ui/Settings4.ui.h:2
 msgid "Indicator brightness"
 msgstr ""
 
-#: Settings.ui.h:3
+#: ui/Settings.ui.h:3 ui/Settings4.ui.h:3
 msgid "Indicator"
 msgstr ""
 
-#: Settings.ui.h:4
+#: ui/Settings.ui.h:4 ui/Settings4.ui.h:4
 msgid "Indicator icon"
 msgstr ""
 
-#: Settings.ui.h:5
+#: ui/Settings.ui.h:5 ui/Settings4.ui.h:5
 msgid "Refresh interval"
 msgstr ""
 
-#: Settings.ui.h:6
+#: ui/Settings.ui.h:6 ui/Settings4.ui.h:6
 msgid "Change effective from next refresh"
 msgstr ""
 
-#: Settings.ui.h:7
+#: ui/Settings.ui.h:7 ui/Settings4.ui.h:7
 msgid "Map Provider for external links"
 msgstr ""
 
-#: Settings.ui.h:8
+#: ui/Settings.ui.h:8 ui/Settings4.ui.h:8
 msgid "Provider used to view wallpaper location and context"
 msgstr ""
 
-#: Settings.ui.h:9 extension.js:118
+#: ui/Settings.ui.h:9 ui/Settings4.ui.h:9 extension.js:105
 msgid "Set background image"
 msgstr ""
 
-#: Settings.ui.h:10
+#: ui/Settings.ui.h:10 ui/Settings4.ui.h:10
 msgid "Set lock screen image"
 msgstr ""
 
-#: Settings.ui.h:11
+#: ui/Settings.ui.h:11 ui/Settings4.ui.h:11
 msgid "Set lock screen password prompt image"
 msgstr ""
 
-#: Settings.ui.h:12
+#: ui/Settings.ui.h:12 ui/Settings4.ui.h:12
 msgid "Download folder:"
 msgstr ""
 
-#: Settings.ui.h:13
+#: ui/Settings.ui.h:13 ui/Settings4.ui.h:14
 msgid "Wallpaper pictures folder"
 msgstr ""
 
-#: Settings.ui.h:14
+#: ui/Settings.ui.h:14 ui/Settings4.ui.h:15
 msgid "Open download folder"
 msgstr ""
 
-#: Settings.ui.h:15
+#: ui/Settings.ui.h:15 ui/Settings4.ui.h:16
 msgid "Delete previously downloaded wallpapers:"
 msgstr ""
 
-#: Settings.ui.h:16
+#: ui/Settings.ui.h:16 ui/Settings4.ui.h:17
 msgid "Background"
 msgstr ""
 
-#: Settings.ui.h:17
-msgid "Map View"
+#: ui/Settings.ui.h:17 ui/Settings4.ui.h:18
+msgid "Changes since last version"
 msgstr ""
 
-#: Settings.ui.h:18
+#: ui/Settings.ui.h:18 ui/Settings4.ui.h:19
+msgid "Change log"
+msgstr ""
+
+#: ui/Settings.ui.h:19 ui/Settings4.ui.h:20
 msgid ""
 "<span size=\"small\">This program comes with ABSOLUTELY NO WARRANTY.\n"
 "See the <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
 "\">GNU General Public License, version 3 or later</a> for details.</span>"
 msgstr ""
 
-#: Settings.ui.h:20
+#: ui/Settings.ui.h:21 ui/Settings4.ui.h:22
 msgid "https://github.com/neffo/earth-view-wallpaper-gnome-extension"
 msgstr ""
 
-#: Settings.ui.h:21
+#: ui/Settings.ui.h:22 ui/Settings4.ui.h:23
 msgid "Based on NASA APOD Wallpaper extension by Elia Argentieri"
 msgstr ""
 
-#: Settings.ui.h:22
+#: ui/Settings.ui.h:23 ui/Settings4.ui.h:24
 msgid ""
 "This GNOME shell extension sets your wallpaper to a random Google Earth "
 "photo from a selection of curated locations."
 msgstr ""
 
-#: Settings.ui.h:23 extension.js:167 extension.js:312
+#: ui/Settings.ui.h:24 ui/Settings4.ui.h:25 extension.js:158 extension.js:303
 msgid "Google Earth Wallpaper"
 msgstr ""
 
-#: Settings.ui.h:24
+#: ui/Settings.ui.h:25 ui/Settings4.ui.h:26
 msgid "Maintained by Michael Carroll"
 msgstr ""
 
-#: Settings.ui.h:25
+#: ui/Settings.ui.h:26 ui/Settings4.ui.h:27
 msgid "About"
 msgstr ""
 
-#: extension.js:107
+#: ui/Settings4.ui.h:13
+msgid "Bing Wallpaper pictures folder"
+msgstr ""
+
+#: extension.js:94
 msgid "<No refresh scheduled>"
 msgstr ""
 
-#: extension.js:108
+#: extension.js:95
 msgid "Text Location"
 msgstr ""
 
-#: extension.js:109
+#: extension.js:96
 msgid "Geo Location"
 msgstr ""
 
-#: extension.js:110
+#: extension.js:97
 msgid "External Link"
 msgstr ""
 
-#: extension.js:111
+#: extension.js:98
 msgid "Copyright"
 msgstr ""
 
-#: extension.js:112
+#: extension.js:99
 msgid "Set background image now"
 msgstr ""
 
-#: extension.js:113
+#: extension.js:100
 msgid "Set lockscreen image now"
 msgstr ""
 
-#: extension.js:114
+#: extension.js:101
 msgid "Refresh Now"
 msgstr ""
 
-#: extension.js:115
+#: extension.js:102
 msgid "Extension settings"
 msgstr ""
 
-#: extension.js:119
+#: extension.js:106
 msgid "Set lockscreen image"
 msgstr ""
 
-#: extension.js:147
+#: extension.js:130
 msgid "On refresh:"
 msgstr ""
 
-#: extension.js:196
+#: extension.js:187
 msgid "Next refresh"
 msgstr ""
 
-#: extension.js:223
+#: extension.js:214
 msgid "View in "
 msgstr ""
 
-#: extension.js:280
+#: extension.js:269
 msgid "Fetching..."
 msgstr ""
 
-#: extension.js:366
+#: extension.js:357
 msgid "No wallpaper available"
 msgstr ""
 
-#: extension.js:367
+#: extension.js:358
 msgid "Something went wrong..."
 msgstr ""
 
-#: prefs.js:31
+#: prefs.js:24
 msgid "5 m"
 msgstr ""
 
-#: prefs.js:31
+#: prefs.js:24
 msgid "10 m"
 msgstr ""
 
-#: prefs.js:31
+#: prefs.js:24
 msgid "30 m"
 msgstr ""
 
-#: prefs.js:31
+#: prefs.js:24
 msgid "60 m"
 msgstr ""
 
-#: prefs.js:31
+#: prefs.js:24
 msgid "90 m"
 msgstr ""
 
-#: prefs.js:31
+#: prefs.js:24
 msgid "daily"
 msgstr ""
 
-#: prefs.js:85
-msgid "Please install WebKit2Gtk package to enable the map view."
-msgstr ""
-
-#: utils.js:51 utils.js:54
+#: utils.js:62 utils.js:65
 msgid "minutes"
 msgstr ""
 
-#: utils.js:57
+#: utils.js:68
 msgid "days"
 msgstr ""
 
-#: utils.js:60
+#: utils.js:71
 msgid "hours"
 msgstr ""
 
-#: utils.js:87
+#: utils.js:98
 msgid "No change log found for this release"
 msgstr ""
diff --git a/metadata.json b/metadata.json
index cd8ce91..751b06d 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,9 +1,9 @@
 {
     "uuid": "GoogleEarthWallpaper@neffo.github.com",
-    "shell-version": ["3.28", "3.30", "3.32", "3.34", "3.36", "3.38", "40.0"],
+    "shell-version": ["3.38", "40", "41"],
     "name": "Google Earth Wallpaper",
     "settings-schema": "org.gnome.shell.extensions.googleearthwallpaper",
-    "description": "Lightweight GNOME shell extension to set your wallpaper to a random photo from the curated Google Earth collection (1500 photos).\n\n*Disclaimer*: this extension is unofficial and not affiliated with Google in any way. Images are protected by copyright and are licensed only for use as wallpapers.\n\nSee also my other extension, Bing Wallpaper Changer (https://github.com/neffo/bing-wallpaper-gnome-extension) which was itself based on the NASA APOD extension by Elinvention (https://github.com/Elinvention).\n\nFeatures:\n* Fetches a random Google Earth wallpaper and sets as both lock screen and desktop wallpaper\n* User selectable refresh intervals (default is once per day)\n* Optional: keep images or clean up after (later is default)\n* View location on Google Maps, Bing Maps, Gnome Maps, OpenStreetMaps (in v2+)\n* In-extension map view (in v3+ - note this needs WebKitGTK+ GIR packages installed to function - gir1.2-webkit-3.0 in Ubuntu)\n*  German, Dutch and Chinese translations\n\nPlease report any bugs or suggestions to extension GitHub page below.",
-    "version": "12",
+    "description": "Lightweight GNOME shell extension to set your wallpaper to a random photo from the curated Google Earth collection (1500 photos).\n\n*Disclaimer*: this extension is unofficial and not affiliated with Google in any way. Images are protected by copyright and are licensed only for use as wallpapers.\n\nSee also my other extension, Bing Wallpaper Changer (https://github.com/neffo/bing-wallpaper-gnome-extension).\n\nFeatures:\n* Fetches a random Google Earth wallpaper and sets as both lock screen and desktop wallpaper\n* User selectable refresh intervals (default is once per day)\n* View location on Google Maps, Bing Maps, Gnome Maps, OpenStreetMaps\n*  German, Dutch and Chinese translations\n\nPlease report any bugs or suggestions to extension GitHub page below.",
+    "version": "13",
     "url": "https://github.com/neffo/earth-view-wallpaper-gnome-extension"
 }
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..b16471a
--- /dev/null
+++ b/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "earth-view-wallpaper-gnome-extension",
+  "version": "0.0.1",
+  "description": "Lightweight GNOME shell extension to set your wallpaper to a random Google Earth photo from a selection of curated locations (recently to 2604 locations).",
+  "main": "extension.js",
+  "scripts": {
+    "test": "eslint *.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/neffo/earth-view-wallpaper-gnome-extension.git"
+  },
+  "author": "Michael Carroll",
+  "license": "GPL-3.0-or-later",
+  "bugs": {
+    "url": "https://github.com/neffo/earth-view-wallpaper-gnome-extension/issues"
+  },
+  "homepage": "https://github.com/neffo/earth-view-wallpaper-gnome-extension#readme"
+}
diff --git a/prefs.js b/prefs.js
index 7021f50..292e679 100644
--- a/prefs.js
+++ b/prefs.js
@@ -1,31 +1,25 @@
-const Gtk = imports.gi.Gtk;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-var Util; // on some distributions (e.g. UBUNTU) this doesn't appear to work, some issue with GNOME introspection files
-try {
-    Util = imports.misc.util;
-} catch (e) {
-    Util = null; // we'll ignore and try handle this gracefully later on
-    log("Unable to load imports.misc.util");
-}
+// Earth View Wallpaper GNOME extension
+// Copyright (C) 2017-2021 Michael Carroll
+// This extension is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// See the GNU General Public License, version 3 or later for details.
+// Based on GNOME shell extension NASA APOD by Elia Argentieri https://github.com/Elinvention/gnome-shell-extension-nasa-apod
+/*global imports, log*/
+
+imports.gi.versions.Soup = '2.4';
+const {Gtk, Gio, GLib, Soup} = imports.gi;
 const Me = imports.misc.extensionUtils.getCurrentExtension();
 const Utils = Me.imports.utils;
 
-
-var Webkit;
-try {
-  Webkit = imports.gi.WebKit2;
-} catch (e) {
-  Webkit = null;
-  log("unable to load webkit : "+e);
-}
-
 const Convenience = Me.imports.convenience;
 const Gettext = imports.gettext.domain('GoogleEarthWallpaper');
 const _ = Gettext.gettext;
 const Images = Me.imports.images;
 
 let settings;
+let httpSession = null;
 
 const intervals = [ 300, 600, 1800, 3600, 4800, 86400 ];
 const interval_names = [ _("5 m"), _("10 m"), _("30 m"), _("60 m"), _("90 m"), _("daily")];
@@ -33,18 +27,18 @@ const interval_names = [ _("5 m"), _("10 m"), _("30 m"), _("60 m"), _("90 m"), _
 const providerNames = ['Google Earth', 'Google Maps', 'Bing Maps', 'OpenStreetMap' , 'GNOME Maps'];
 
 function init() {
-    settings = Utils.getSettings(Me);
     Convenience.initTranslations("GoogleEarthWallpaper");
 }
 
 function buildPrefsWidget(){
     // Prepare labels and controls
+    settings = Utils.getSettings(Me);
     let buildable = new Gtk.Builder();
     if (Gtk.get_major_version() == 4) { // GTK4 removes some properties, and builder breaks when it sees them
-        buildable.add_from_file( Me.dir.get_path() + '/Settings4.ui' );
+        buildable.add_from_file( Me.dir.get_path() + '/ui/Settings4.ui' );
     }
     else {
-        buildable.add_from_file( Me.dir.get_path() + '/Settings.ui' );
+        buildable.add_from_file( Me.dir.get_path() + '/ui/Settings.ui' );
     }
     let box = buildable.get_object('prefs_widget');
 
@@ -61,31 +55,14 @@ function buildPrefsWidget(){
     let deleteSwitch = buildable.get_object('delete_previous');
     let refreshSpin = buildable.get_object('refresh_combo');
     let providerSpin = buildable.get_object('map_provider_combo');
-    let globeFrame = buildable.get_object('globe_frame');
-    let brightnessValue = buildable.get_object('brightness_adjustment');
     let folderButton = buildable.get_object('button_open_download_folder');
     let icon_image = buildable.get_object('icon_image');
+    let change_log = buildable.get_object('change_log');
 
-    if (Webkit != null) {
-      let webview =  new Webkit.WebView ();
-      webview.transparent = true;
-      webview.margin_left = 0; // FIXME: depreciated in GTK4
-      webview.margin_right =0; // FIXME: as above
-      webview.margin_top = 0;
-      webview.margin_bottom = 0;
-      webview.vexpand = true;
-      globeFrame.add(webview);
-      update_globe(webview, buildable);
-
-      settings.connect('changed::image-details', function() {
-          update_globe(webview, buildable);
-      });
-    } else {
-      let wklabel = new Gtk.Label();
-      wklabel.set_label(_("Please install WebKit2Gtk package to enable the map view."))
-      /* globeFrame.add(wklabel); */
-
-    }
+    settings = Utils.getSettings(Me);
+    // enable change log access
+    httpSession = new Soup.SessionAsync();
+    Soup.Session.prototype.add_feature.call(httpSession, new Soup.ProxyResolverDefault());
 
     // Indicator
     settings.bind('hide', hideSwitch, 'active', Gio.SettingsBindFlags.DEFAULT);
@@ -93,7 +70,7 @@ function buildPrefsWidget(){
     settings.bind('set-background', bgSwitch, 'active', Gio.SettingsBindFlags.DEFAULT);
     settings.bind('set-lock-screen', lsSwitch, 'active', Gio.SettingsBindFlags.DEFAULT);
     settings.bind('set-lock-screen-dialog', ldSwitch, 'active', Gio.SettingsBindFlags.DEFAULT);
-    settings.bind('brightness', brightnessValue, 'value', Gio.SettingsBindFlags.DEFAULT);
+    //settings.bind('brightness', brightnessValue, 'value', Gio.SettingsBindFlags.DEFAULT);
     
     // adjustable indicator icons
     Utils.icon_list.forEach(function (iconname, index) { // add icons to dropdown list (aka a GtkComboText)
@@ -104,6 +81,7 @@ function buildPrefsWidget(){
         Utils.validate_icon(settings, icon_image);
     });
     iconEntry.set_active_id(settings.get_string('icon'));
+    Utils.validate_icon(settings, icon_image);
     //download folder
     if (Gtk.get_major_version() == 4) {
         fileChooserBtn.connect('clicked', function(widget) {
@@ -188,6 +166,10 @@ function buildPrefsWidget(){
     // not required in GTK4 as widgets are displayed by default
     if (Gtk.get_major_version() < 4)
         box.show_all();
+
+    // fetch
+    Utils.fetch_change_log(Me.metadata.version.toString(), change_log, httpSession);
+
     return box;
 }
 
@@ -197,25 +179,6 @@ function validate_interval() {
         settings.reset('refresh-interval');
 }
 
-function update_globe(webview, buildable) {
-    let imagedata = settings.get_string('image-details').split('|');
-    let lat = parseFloat(imagedata[2]);
-    let lon = parseFloat(imagedata[3]);
-    let address = imagedata[0] + '<br>' + Utils.friendly_coordinates(lat, lon);
-    //let bbox = (lat-5)+'%2C'+(lon-5)+'%2C'+(lat+5)+'%2C'+(lon+5);
-    let bbox = '-180,80,180,-50';
-    let marker = lat + '%2C' + lon;
-    let webcontent = '<html style="background-color: transparent;"><div style="border: 0px; background-color: white; padding: 0px; margin: 0px;">';
-    webcontent = webcontent + '<span style="margin: 0px; font-size: 0.7em; color: dark-grey;">'+address;
-    webcontent = webcontent + '</span><iframe width="100%" height="300" ';
-    webcontent = webcontent + ' src="http://www.openstreetmap.org/export/embed.html?bbox='+bbox+'&amp;layer=mapnik&amp;marker='+ marker;
-    webcontent = webcontent + ' "style="border: 0px solid black; margin: 0px 0px 0px 0px; overflow: hidden; padding: 0px;"></iframe></div></html>';
-
-    log('update_globe() -> imagedata: '+settings.get_string('image-details')+' \n bbox: '+bbox+' marker: '+marker+' html: '+webcontent);
-
-    webview.load_html(webcontent,'');
-}
-
 function ge_tryspawn(argv) {
     try {
         GLib.spawn_async(null, argv, null, GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.DO_NOT_REAP_CHILD, null);
diff --git a/screenshot/Jiamusi_China.jpg b/screenshot/Jiamusi_China.jpg
new file mode 100644
index 0000000..aaed181
Binary files /dev/null and b/screenshot/Jiamusi_China.jpg differ
diff --git a/screenshot/get_it_on_gnome_extensions.png b/screenshot/get_it_on_gnome_extensions.png
new file mode 100644
index 0000000..4d8f0b8
Binary files /dev/null and b/screenshot/get_it_on_gnome_extensions.png differ
diff --git a/screenshot/sponsor.png b/screenshot/sponsor.png
new file mode 100644
index 0000000..e60183d
Binary files /dev/null and b/screenshot/sponsor.png differ
diff --git a/Settings.ui b/ui/Settings.ui
similarity index 98%
rename from Settings.ui
rename to ui/Settings.ui
index 74f3d16..4a3dc5d 100644
--- a/Settings.ui
+++ b/ui/Settings.ui
@@ -103,6 +103,7 @@ Author: Michael Carroll <ineffable@gmail.com>
                             <property name="width">2</property>
                           </packing>
                         </child>
+                        <!-- 
                         <child>
                           <object class="GtkLabel" id="brightness_label">
                             <property name="visible">True</property>
@@ -138,6 +139,7 @@ Author: Michael Carroll <ineffable@gmail.com>
                             <property name="width">2</property>
                           </packing>
                         </child>
+                        -->
                         <child>
                           <object class="GtkLabel" id="indicator_label">
                             <property name="visible">True</property>
@@ -639,7 +641,7 @@ Author: Michael Carroll <ineffable@gmail.com>
       </packing>
     </child>
     <child>
-      <object class="GtkBox" id="map_box">
+      <object class="GtkBox" id="change_log_box">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="margin_left">12</property>
@@ -647,22 +649,15 @@ Author: Michael Carroll <ineffable@gmail.com>
         <property name="margin_top">12</property>
         <property name="orientation">vertical</property>
         <child>
-          <object class="GtkFrame" id="globe_frame">
-            <property name="height_request">340</property>
+          <object class="GtkLabel" id="change_log">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="margin_left">12</property>
             <property name="margin_right">12</property>
-            <property name="margin_top">12</property>
-            <property name="margin_bottom">12</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">in</property>
-            <child>
-              <placeholder/>
-            </child>
-            <child type="label_item">
-              <placeholder/>
-            </child>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
+            <property name="label" translatable="yes">Changes since last version</property>
+            <property name="wrap">True</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -675,14 +670,15 @@ Author: Michael Carroll <ineffable@gmail.com>
         <property name="position">2</property>
       </packing>
     </child>
+    
     <child type="tab">
       <object class="GtkLabel" id="map_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Map View</property>
+        <property name="label" translatable="yes">Change log</property>
       </object>
       <packing>
-        <property name="position">2</property>
+        <property name="position">3</property>
         <property name="tab_fill">False</property>
       </packing>
     </child>
@@ -893,7 +889,7 @@ See the &lt;a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"&gt;G
         <property name="label" translatable="yes">About</property>
       </object>
       <packing>
-        <property name="position">3</property>
+        <property name="position">2</property>
         <property name="tab_fill">False</property>
       </packing>
     </child>
diff --git a/Settings.ui.h b/ui/Settings.ui.h
similarity index 94%
rename from Settings.ui.h
rename to ui/Settings.ui.h
index 6cde941..22105d0 100644
--- a/Settings.ui.h
+++ b/ui/Settings.ui.h
@@ -14,7 +14,8 @@ char *s = N_("Wallpaper pictures folder");
 char *s = N_("Open download folder");
 char *s = N_("Delete previously downloaded wallpapers:");
 char *s = N_("Background");
-char *s = N_("Map View");
+char *s = N_("Changes since last version");
+char *s = N_("Change log");
 char *s = N_("<span size=\"small\">This program comes with ABSOLUTELY NO WARRANTY.\n"
              "See the <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html\">GNU General Public License, version 3 or later</a> for details.</span>");
 char *s = N_("https://github.com/neffo/earth-view-wallpaper-gnome-extension");
diff --git a/Settings4.ui b/ui/Settings4.ui
similarity index 98%
rename from Settings4.ui
rename to ui/Settings4.ui
index 8c2c31d..5db453b 100644
--- a/Settings4.ui
+++ b/ui/Settings4.ui
@@ -68,6 +68,7 @@
                                 </layout>
                               </object>
                             </child>
+                            <!--
                             <child>
                               <object class="GtkLabel" id="brightness_label">
                                 <property name="can_focus">0</property>
@@ -99,6 +100,7 @@
                                 </layout>
                               </object>
                             </child>
+                            -->
                             <child>
                               <object class="GtkLabel" id="indicator_label">
                                 <property name="can_focus">0</property>
@@ -526,29 +528,23 @@
     </child>
     <child>
       <object class="GtkNotebookPage">
-        <property name="position">2</property>
+        <property name="position">3</property>
         <property name="child">
-          <object class="GtkBox" id="map_box">
+          <object class="GtkBox" id="change_log_box">
             <property name="can_focus">0</property>
             <property name="margin-start">12</property>
             <property name="margin-end">12</property>
             <property name="margin_top">12</property>
             <property name="orientation">vertical</property>
             <child>
-              <object class="GtkFrame" id="globe_frame">
-                <property name="height_request">340</property>
-                <property name="can_focus">0</property>
-                <property name="margin-start">12</property>
-                <property name="margin-end">12</property>
-                <property name="margin_top">12</property>
-                <property name="margin_bottom">12</property>
-                <!-- <property name="shadow_type">in</property> -->
-                <child>
-                  <placeholder/>
-                </child>
-                <child type="label_item">
-                  <placeholder/>
-                </child>
+              <object class="GtkLabel" id="change_log">
+                    <property name="can_focus">0</property>
+                    <property name="margin-start">12</property>
+                    <property name="margin-end">12</property>
+                    <property name="hexpand">1</property>
+                    <property name="vexpand">1</property>
+                    <property name="label" translatable="yes">Changes since last version</property>
+                    <property name="wrap">1</property>
               </object>
             </child>
           </object>
@@ -556,14 +552,14 @@
         <property name="tab">
           <object class="GtkLabel" id="map_label">
             <property name="can_focus">0</property>
-            <property name="label" translatable="yes">Map View</property>
+            <property name="label" translatable="yes">Change log</property>
           </object>
         </property>
       </object>
     </child>
     <child>
       <object class="GtkNotebookPage">
-        <property name="position">3</property>
+        <property name="position">2</property>
         <property name="child">
           <object class="GtkBox" id="about_box">
             <property name="can_focus">0</property>
diff --git a/ui/Settings4.ui.h b/ui/Settings4.ui.h
new file mode 100644
index 0000000..836831b
--- /dev/null
+++ b/ui/Settings4.ui.h
@@ -0,0 +1,27 @@
+char *s = N_("Hide the indicator");
+char *s = N_("Indicator brightness");
+char *s = N_("Indicator");
+char *s = N_("Indicator icon");
+char *s = N_("Refresh interval");
+char *s = N_("Change effective from next refresh");
+char *s = N_("Map Provider for external links");
+char *s = N_("Provider used to view wallpaper location and context");
+char *s = N_("Set background image");
+char *s = N_("Set lock screen image");
+char *s = N_("Set lock screen password prompt image");
+char *s = N_("Download folder:");
+char *s = N_("Bing Wallpaper pictures folder");
+char *s = N_("Wallpaper pictures folder");
+char *s = N_("Open download folder");
+char *s = N_("Delete previously downloaded wallpapers:");
+char *s = N_("Background");
+char *s = N_("Changes since last version");
+char *s = N_("Change log");
+char *s = N_("<span size=\"small\">This program comes with ABSOLUTELY NO WARRANTY.\n"
+             "See the <a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html\">GNU General Public License, version 3 or later</a> for details.</span>");
+char *s = N_("https://github.com/neffo/earth-view-wallpaper-gnome-extension");
+char *s = N_("Based on NASA APOD Wallpaper extension by Elia Argentieri");
+char *s = N_("This GNOME shell extension sets your wallpaper to a random Google Earth photo from a selection of curated locations.");
+char *s = N_("Google Earth Wallpaper");
+char *s = N_("Maintained by Michael Carroll");
+char *s = N_("About");
diff --git a/utils.js b/utils.js
index 5d03dfe..d5ca544 100644
--- a/utils.js
+++ b/utils.js
@@ -1,13 +1,24 @@
+// Earth View Wallpaper GNOME extension
+// Copyright (C) 2017-2021 Michael Carroll
+// This extension is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// See the GNU General Public License, version 3 or later for details.
+// Based on GNOME shell extension NASA APOD by Elia Argentieri https://github.com/Elinvention/gnome-shell-extension-nasa-apod
+/*global imports, log*/
 
-const Gio = imports.gi.Gio;
+const {Gio, GLib, GdkPixbuf, Soup} = imports.gi;
 const ExtensionUtils = imports.misc.extensionUtils;
-const GLib = imports.gi.GLib;
 const Me = imports.misc.extensionUtils.getCurrentExtension();
-const GdkPixbuf = imports.gi.GdkPixbuf;
+const Gettext = imports.gettext.domain('BingWallpaper');
+const _ = Gettext.gettext;
 
 var icon_list = ['pin', 'globe','official'];
 var icon_list_filename = ['pin-symbolic', 'globe-symbolic', 'official'];
 
+var gitreleaseurl = 'https://api.github.com/repos/neffo/earth-view-wallpaper-gnome-extension/releases/tags/';
+
 function getSettings() {
 	let extension = ExtensionUtils.getCurrentExtension();
 	let schema = 'org.gnome.shell.extensions.googleearthwallpaper';
@@ -69,24 +80,24 @@ function clamp_value(value, min, max) {
 	return Math.min(Math.max(value, min), max);
 }
 
-function fetch_change_log(version, label) {
+function fetch_change_log(version, label, httpSession) {
 	// create an http message
 	let url = gitreleaseurl + "v" + version;
 	let request = Soup.Message.new('GET', url);
-	httpSession.user_agent = 'User-Agent: Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:'+version+') BingWallpaper Gnome Extension';
+	httpSession.user_agent = 'User-Agent: Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:'+version+') Google Earth Wallpaper Gnome Extension';
 	log("Fetching "+url);
 	// queue the http request
-	httpSession.queue_message(request, Lang.bind(this, function (httpSession, message) {
+	httpSession.queue_message(request, function (httpSession, message) {
 		if (message.status_code == 200) {
 			let data = message.response_body.data;
-			text = JSON.parse(data).body;
+			let text = JSON.parse(data).body;
 			label.set_label(text);
 		} 
 		else {
 			log("Change log not found: " + message.status_code + "\n" + message.response_body.data);
 			label.set_label(_("No change log found for this release") + ": " + message.status_code);
 		}
-	}));
+	});
 }
 
 function validate_icon(settings, icon_image = null) {