data: Add desktop autostart file for extension warning

Adding this file allows gnome-session to trigger the warning after it disabled extensions in the non-systemd case. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/695
data: Add systemd service file for extension disabled warning
2019-08-30 18:58:50 +02:00 · 2019-08-30 18:58:50 +02:00 · 2019-08-30 18:58:50 +02:00 · 2019-08-30 18:58:30 +02:00 · 2019-08-30 18:56:24 +02:00 · 2019-08-30 17:19:23 +02:00
304 changed files with 38007 additions and 23051 deletions
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -0,0 +1,6 @@
+{
+    "extends": [
+        "./lint/eslintrc-gjs.json",
+        "./lint/eslintrc-shell.json"
+    ]
+}
--- a/.gitignore
+++ b/.gitignore
@@ -80,3 +80,4 @@ tests/run-test.sh
 *~
 *.patch
 *.sw?
+.vscode
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,5 @@
 stages:
 - review
- - source_check
 - build
 - test

@@ -15,10 +14,10 @@ variables:
        - merge_requests

 check_commit_log:
-    image: registry.fedoraproject.org/fedora:latest
+    image: registry.gitlab.gnome.org/gnome/mutter/master:v2
    stage: review
-    before_script:
-        - dnf install -y git
+    variables:
+        GIT_DEPTH: "100"
    script:
        - ./.gitlab-ci/check-commit-log.sh
    only:
@@ -26,28 +25,36 @@ check_commit_log:

 js_check:
    image: registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v1
-    stage: source_check
+    stage: review
    script:
        - find js -name '*.js' -exec js60 -c -s '{}' ';' 2>&1 | tee $JS_LOG
        - (! grep -q . $JS_LOG)
    <<: *only_default
-    only:
-        changes:
-            - js/**/*
    artifacts:
        paths:
            - ${JS_LOG}
        when: on_failure

+eslint:
+    image: registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v1
+    stage: review
+    script:
+        - ./.gitlab-ci/run-eslint.sh
+    <<: *only_default
+    artifacts:
+        paths:
+            - reports
+        when: always
+
 build:
-    image: registry.gitlab.gnome.org/gnome/gnome-shell/master:v1
+    image: registry.gitlab.gnome.org/gnome/mutter/master:v2
    stage: build
    before_script:
        - .gitlab-ci/checkout-mutter.sh
        - meson mutter mutter/build --prefix=/usr -Dtests=false
        - ninja -C mutter/build install
    script:
-        - meson . build -Dbuiltype=debugoptimized
+        - meson . build -Dbuiltype=debugoptimized -Dman=false
        - ninja -C build
        - ninja -C build install
    <<: *only_default
@@ -58,8 +65,10 @@ build:
            - build

 test:
-    image: registry.gitlab.gnome.org/gnome/gnome-shell/master:v1
+    image: registry.gitlab.gnome.org/gnome/mutter/master:v2
    stage: test
+    variables:
+        XDG_RUNTIME_DIR: "$CI_PROJECT_DIR/runtime-dir"
    before_script:
        - ninja -C mutter/build install
    script:
@@ -72,7 +81,7 @@ test:
        when: on_failure

 test-pot:
-    image: registry.gitlab.gnome.org/gnome/gnome-shell/master:v1
+    image: registry.gitlab.gnome.org/gnome/mutter/master:v2
    stage: test
    before_script:
        - ninja -C mutter/build install
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -1,19 +0,0 @@
-FROM registry.gitlab.gnome.org/gnome/mutter/master:v1
-
-RUN dnf -y update && dnf -y upgrade && \
-    dnf install -y 'dnf-command(copr)' && \
-    dnf copr enable -y fmuellner/gnome-shell-ci && \
-    dnf builddep -y gnome-shell --setopt=install_weak_deps=False && \
-
-    # bt only exports HAVE_BLUETOOTH to js, rest are outdated build-requires
-    dnf remove -y gnome-bluetooth-libs-devel dbus-glib-devel \
-                  upower-devel python3-devel && \
-
-    # We'll build mutter ourselves
-    dnf remove -y --noautoremove mutter mutter-devel && \
-
-    # Needed for tests
-    dnf install -y '*/xvfb-run' gdm-lib accountsservice-libs && \
-
-    dnf clean all && \
-    rm -rf /var/cache/dnf
--- a/.gitlab-ci/Dockerfile.extension-ci
+++ b/.gitlab-ci/Dockerfile.extension-ci
@@ -1,7 +1,7 @@
 FROM registry.fedoraproject.org/fedora:latest

 RUN dnf -y update && dnf -y upgrade && \
-    dnf install -y 'dnf-command(copr)' && \
+    dnf install -y 'dnf-command(copr)' git && \

    # For syntax checks with `find . -name '*.js' -exec js60 -c -s '{}' ';'`
    dnf install -y findutils mozjs60-devel && \
--- a/.gitlab-ci/checkout-mutter.sh
+++ b/.gitlab-ci/checkout-mutter.sh
@@ -17,15 +17,19 @@ if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ]; then
  merge_request_branch=$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME

  echo Looking for $merge_request_branch on remote ...
-  if git fetch $merge_request_remote $merge_request_branch >/dev/null 2>&1; then
+  if git fetch -q $merge_request_remote $merge_request_branch 2>/dev/null; then
    mutter_target=FETCH_HEAD
+  else
+    mutter_target=origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME
+    echo Using $mutter_target instead
  fi
 fi

 if [ -z "$mutter_target" ]; then
-  mutter_target=$(git branch -r -l $shell_branch)
+  mutter_target=$(git branch -r -l origin/$shell_branch)
+  mutter_target=${mutter_target:-$(git branch -r -l ${shell_branch#remotes/})}
  mutter_target=${mutter_target:-origin/master}
  echo Using $mutter_target instead
 fi

-git checkout $mutter_target
+git checkout -q $mutter_target
--- a/.gitlab-ci/run-eslint.sh
+++ b/.gitlab-ci/run-eslint.sh
@@ -0,0 +1,97 @@
+#!/usr/bin/env bash
+
+OUTPUT_REGULAR=reports/lint-regular-report.txt
+OUTPUT_LEGACY=reports/lint-legacy-report.txt
+OUTPUT_FINAL=reports/lint-common-report.txt
+
+OUTPUT_MR=reports/lint-mr-report.txt
+
+LINE_CHANGES=changed-lines.txt
+
+is_empty() {
+  (! grep -q . $1)
+}
+
+run_eslint() {
+  ARGS_LEGACY='--config lint/eslintrc-legacy.json'
+
+  local extra_args=ARGS_$1
+  local output=OUTPUT_$1
+  eslint -f unix ${!extra_args} -o ${!output} js
+}
+
+list_commit_range_additions() {
+  # Turn raw context-less git-diff into a list of
+  # filename:lineno pairs of new (+) lines
+  git diff -U0 "$@" -- js |
+  awk '
+    BEGIN { file=""; }
+    /^+++ b/ { file=substr($0,7); }
+    /^@@ / {
+        len = split($3,a,",")
+        start=a[1]
+        count=(len > 1) ? a[2] : 1
+
+        for (line=start; line<start+count; line++)
+            printf "%s/%s:%d:\n",ENVIRON["PWD"],file,line;
+    }'
+}
+
+copy_matched_lines() {
+  local source=$1
+  local matches=$2
+  local target=$3
+
+  echo -n > $target
+  for l in $(<$matches); do
+    grep $l $source >> $target
+  done
+}
+
+create_common() {
+  # comm requires sorted input;
+  # we also strip the error message to make the following a "common" error:
+  # regular:
+  #  file.js:42:23 Indentation of 55, expected 42
+  # legacy:
+  #  file.js:42:23 Indentation of 55, extected 24
+  prepare() {
+    sed 's: .*::' $1 | sort
+  }
+
+  comm -12 <(prepare $OUTPUT_REGULAR) <(prepare $OUTPUT_LEGACY) >$OUTPUT_FINAL.tmp
+
+  # Now add back the stripped error messages
+  copy_matched_lines $OUTPUT_REGULAR $OUTPUT_FINAL.tmp $OUTPUT_FINAL
+  rm $OUTPUT_FINAL.tmp
+}
+
+if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ]; then
+  git fetch $CI_MERGE_REQUEST_PROJECT_URL.git $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
+  branch_point=$(git merge-base HEAD FETCH_HEAD)
+  commit_range=$branch_point...$CI_COMMIT_SHA
+
+  list_commit_range_additions $commit_range > $LINE_CHANGES
+
+  # Don't bother with running lint when no JS changed
+  if is_empty $LINE_CHANGES; then
+    exit 0
+  fi
+fi
+
+echo Generating lint report using regular configuration
+run_eslint REGULAR
+echo Generating lint report using legacy configuration
+run_eslint LEGACY
+echo Done.
+create_common
+
+# Just show the report and succeed when not testing a MR
+if [ -z "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ]; then
+  cat $OUTPUT_FINAL
+  exit 0
+fi
+
+copy_matched_lines $OUTPUT_FINAL $LINE_CHANGES $OUTPUT_MR
+cat $OUTPUT_MR
+is_empty $OUTPUT_MR
--- a/HACKING.md
+++ b/HACKING.md
@@ -84,7 +84,6 @@ don't use.

    const Main = imports.ui.main;
    const Params = imports.misc.params;
-    const Tweener = imports.ui.tweener;
    const Util = imports.misc.util;
 ```
 The alphabetical ordering should be done independently of the location of the
@@ -277,34 +276,49 @@ If your usage of an object is like a hash table (and thus conceptually the keys
 can have special chars in them), don't use quotes, but use brackets: `{ bar: 42
 }`, `foo['bar']`.

-## Getters, setters, and Tweener
+## Animations
+
+Most objects that are animated are actors, and most properties used in animations
+are animatable, which means they can use implicit animations:

-Getters and setters should be used when you are dealing with an API that is
-designed around setting properties, like Tweener. If you want to animate an
-arbitrary property, create a getter and setter, and use Tweener to animate the
-property.
 ```javascript
-    var ANIMATION_TIME = 2000;
-
-    var MyClass = class {
-        constructor() {
-            this.actor = new St.BoxLayout();
-            this._position = 0;
-        }
-
-        get position() {
-            return this._position;
-        }
-
-        set position(value) {
-            this._position = value;
-            this.actor.set_position(value, value);
-        }
-    };
-
-    let myThing = new MyClass();
-    Tweener.addTween(myThing,
-                     { position: 100,
-                       time: ANIMATION_TIME,
-                       transition: 'easeOutQuad' });
+    moveActor(actor, x, y) {
+        actor.ease({
+            x,
+            y,
+            duration: 500, // ms
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD
+        });
+    }
+```
+
+The above is a convenience wrapper around the actual Clutter API, and should generally
+be preferred over the more verbose:
+
+```javascript
+    moveActor(actor, x, y) {
+        actor.save_easing_state();
+
+        actor.set_easing_duration(500);
+        actor.set_easing_mode(Clutter.AnimationMode.EASE_OUT_QUAD);
+        actor.set({
+            x,
+            y
+        });
+
+        actor.restore_easing_state();
+    }
+```
+
+There is a similar convenience API around Clutter.PropertyTransition to animate
+actor (or actor meta) properties that cannot use implicit animations:
+
+```javascript
+    desaturateActor(actor, desaturate) {
+        let factor = desaturate ? 1.0 : 0.0;
+        actor.ease_property('@effects.desaturate.factor', factor, {
+            duration: 500, // ms
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD
+        });
+    }
 ```
--- a/173
+++ b/173
@@ -1,3 +1,176 @@
+3.33.91
+=======
+* Fix regression when adjusting brightness [Florian; #1500]
+* Fix pointer a11y timeout animation [Jonas D.; #1533]
+* Add new extensions CLI tool [Florian; #1234]
+* Only track top-level windows [Carlos; #556]
+* Misc. bug fixes and cleanups [Jonas D., Jonas Å., Piotr, Florian;
+  !678, !682, !686]
+
+Contributors:
+  Jonas Ådahl, Jonas Dreßler, Carlos Garnacho, Florian Müllner
+
+Translators:
+  Asier Sarasua Garmendia [eu], Sveinn í Felli [is], Anders Jonsson [sv],
+  Jordi Mas [ca], Kukuh Syafaat [id], Florentina Mușat [ro], Jiri Grönroos [fi],
+  Aurimas Černius [lt], Daniel Mustieles [es], Piotr Drąg [pl],
+  Danial Behzadi [fa]
+
+3.33.90
+=======
+* Implement DND app picker folder management [Georges; !643, !645, !664, !671]
+* Make Clocks/Weather integration work with sandboxed apps [Florian; #1158]
+* Support startup via systemd user instance [Benjamin; !507]
+* Replace Tweener with Clutter animations [Florian; !663, !22, !666, !668, !669]
+* Minimize travel distance in overview animation [Sergey; !267]
+* Rescan icon theme when installed apps changed [Georges; !661]
+* Consistently animate new window actions [Jonas; !662, !673]
+* Misc. bug fixes and cleanups [Florian, Daniel, Ray, Bastien, Jonas, Niels,
+  Marco, Georges; !635, !636, !637, #1462, !628, !640, !641, !627, !644, !647,
+  !385, #1474, !651, #1144, !646, !653, !652, !655, #1482, !656, $654, !665,
+  !667, !670, #1357, !672, !657, #1507, !674, !677]
+
+Contributors:
+  Benjamin Berg, Sergey Bugaev, Jonas Dreßler, Niels De Graef, Florian Müllner,
+  Georges Basile Stavracas Neto, Bastien Nocera, Ray Strode,
+  Marco Trevisan (Treviño), verdre, Daniel van Vugt
+
+Translators:
+  Asier Sarasua Garmendia [eu], Rafael Fontenelle [pt_BR],
+  Kristjan SCHMIDT [eo], Jor Teron [mjw], Daniel Mustieles [es],
+  Kukuh Syafaat [id], Jordi Mas [ca], Fabio Tomat [fur], Daniel Șerbănescu [ro],
+  Anders Jonsson [sv]
+
+3.33.4
+======
+* Fix unintentional interference between gestures [Jonas; !598]
+* Fix unintentional loop while polkit dialog is active [Ray; !602]
+* Fix alt-tab icon size on HiDPI [Jonas; !587]
+* Style fixes and improvements [Frederik, Jakub; !610, #1446, #1449]
+* Fix style updates for non-background CSS properties [Florian; #1212]
+* Fix cursor visibility in screen recordings [Illya; #1208]
+* Add option for disabling the hot corner [Florian; #688320]
+* Use more fine-grained levels in battery indicator [Florian; !561, #1442]
+* Fix the calculation of the maximum number of app search results [Jonas; !110]
+* Handle horizontal workspace layout with gestures/animations [Florian; !575]
+* Improve handling of session mode extensions [Florian, Didier; #789852]
+* Misc. bug fixes and cleanups [Jonas, Florian, Sonny, Carlos, Mario, Benjamin,
+  Marco, Ting-Wei; !599, !600, !591, !606, !152, !607, !604, !495, !608, !611,
+  !614, !612, !615, !618, #369, !620, #774, !621, !616, #1065, !609, !626,
+  !491, !631, !632, !633, #1457]
+
+Contributors:
+  Benjamin Berg, Jonas Dreßler, Frederik Feichtmeier, Carlos Garnacho,
+  Illya Klymov, Ting-Wei Lan, Florian Müllner, Sonny Piers, Mario Sanchez Prada,
+  Didier Roche, Jakub Steiner, Ray Strode, Jor Teron, Marco Trevisan (Treviño)
+
+Translators:
+  Jordi Mas [ca], Jor Teron [mjw]
+
+3.33.3
+======
+* Prepare for optional X11 [Carlos; !378]
+* Fix opening window menu [Marco; !557]
+* Reload search providers when installed applications change [Cosimo; !562]
+* Implement locate-pointer accessibility feature [Olivier; #981]
+* Allow to disable window menus via session mode [Cosimo; !569]
+* Implement mouse accessibility [Olivier; !474]
+* Call GDM's RegisterSession() after startup [Iain; !570]
+* Fix extended keys popups being hidden by on-screen keyboard [Marco; !583]
+* Fix top bar being hidden by lock screen [Jonas; !571]
+* Update theme to better match GTK's Adwaita [Frederik; #841]
+* Set up GJS profiler when GJS_TRACE_FD is set [Christian; !573]
+* Misc. bug fixes and cleanups [Jonas, Cosimo, Robert, Florian, Marco, Simon,
+  Laurent, Niels, Will; !551, !555, !464, #1333, !565, !572, !568, !558, #1205,
+  #1336, !579, !576, #1392, !582, !586, #1406, #1351]
+
+Contributors:
+  Laurent Bigonville, Cosimo Cecchi, Piotr Drąg, Jonas Dreßler,
+  Frederik Feichtmeier, Olivier Fourdan, Carlos Garnacho, Niels De Graef,
+  Christian Hergert, Iain Lane, Robert Mader, Florian Müllner, Simon Schampijer,
+  Jakub Steiner, Will Thompson, Marco Trevisan (Treviño)
+
+Translators:
+  Kukuh Syafaat [id], Balázs Meskó [hu], Daniel Mustieles [es],
+  Fabio Tomat [fur], Nathan Follens [nl], Goran Vidović [hr], Jordi Mas [ca]
+
+3.33.2
+======
+* Fix keeping actors visible in scrollviews [Marco; #1061]
+* Move some chrome above popup windows [Jonas D.; !358]
+* Include 'sandboxed-app-id' in winodw introspection info [Florian; #1289]
+* Port to libecal-2.0 [Milan; !501]
+* Support TCRYPT in mount password dialog [segfault; !126]
+* Misc. bug fixes and cleanups [Florian, Marco, Veerasamy; !517, #745, !499,
+  !510, !515, !546, !549]
+
+Contributors:
+  Cosimo Cecchi, Milan Crha, Jonas Dreßler, Florian Müllner, segfault,
+  Veerasamy Sevagen, Marco Trevisan (Treviño)
+
+Translators:
+  Daniel Mustieles [es]
+
+3.33.1
+======
+* Refine the app menu [Florian; #968]
+* Refine window preview style [Feichtmeier; !461]
+* Only emit ::style-changed on actual changes [Carlos; #1153]
+* Disable emoji on-screen keyboard support on X11 [Florian; #1172]
+* Fix tablet button mapping overlay [Carlos; #1220]
+* Don't crash for world clock locations with no timezone [Florian; #1062]
+* Don't leak old on-screen keyboard layout groups [Carlos; mutter#556]
+* Fix ellipsization in dialog subtitles/bodies [Marco; !531]
+* Fix glitch of fullscreen window in workspace switch animation [Jonas D.; !322]
+* Fix distortion of some image contents [Florian; !525]
+* Allow dragging unfocused tiled/maximized windows from top bar [Dylan; #679290]
+* Handle network interface name changes [Fabrice; !534]
+* Avoid unnecessary style changes when computing :first/:last-child
+  [Florian; !529]
+* Misc. bug fixes and cleanups [Florian, Marco, Robert, Georges, Carlos, Simon,
+  Jonas D.; !487, !441, !502, !503, !504, !506, #822, !551, !512, !509, !511,
+  #1054, !524, #1065, !331, !540]
+
+Contributors:
+  Fabrice Bellet, Jonas Dreßler, Feichtmeier, Carlos Garnacho, Robert Mader,
+  Dylan McCall, Simon McVittie, Florian Müllner, Georges Basile Stavracas Neto,
+  Marco Trevisan (Treviño)
+
+Translators:
+  Daniel Mustieles [es], Kukuh Syafaat [id], Fabio Tomat [fur],
+  Carmen Bianca BAKKER [eo], Dingzhong Chen [zh_CN], Tim Sabsch [de]
+
+3.32.1
+======
+* Fix avatar scaling on login screen [Florian; #1024]
+* Fix distortion of desktop zoom [Florian; #646]
+* Fix mouse cursor visibility when using desktop zoom [Florian, Marco; #1020]
+* Fix screen dimming after wake-up on lock screen [Xiaoguang; #900]
+* Fix Alt+Esc switcher [Florian; #1064]
+* Respect struts for popover placement [Andrea; #1102]
+* Fix app icons updates after theme changes [Florian; #1117]
+* Fix desktop zoom after resolution changes [Marco; #1120]
+* Implement stick-to-finger workspace switch overview gestures [Florian; #516]
+* Make World Clocks offsets relative to local time [Florian; #1157]
+* Fix top app icon disappearing from dash [Florian; #1053]
+* Update switch style to match new Adwaita [Jakub; !496]
+* Ensure CSS units are pixel-aligned when scaling is used [Carlos; #91]
+* Misc. bug fixes and cleanups [Florian, Jakub, Robert, Alex, Carlos, Phil,
+  Marco, Benjamin, AsciiWolf, Ray, verdre; !444, #1016, #1018, !449, #1036,
+  !455, #1094, !440, #1023, #624, #1017, !476, !473, !480, #1130, !485, !481,
+  !490, !489, #1151, !435, #1160, !482, #1150, #1166, !384]
+
+Contributors:
+  AsciiWolf, Andrea Azzarone, Benjamin Berg, Carlos Garnacho, Victor Ibragimov,
+  Robert Mader, Alex Monday, Florian Müllner, Jakub Steiner, Ray Strode,
+  Marco Trevisan (Treviño), verdre, Xiaoguang Wang, Phil Wyett
+
+Translators:
+  Victor Ibragimov [tg, af, et, ja], Bruce Cowan [en_GB], Piotr Drąg [tg],
+  Charles Monzat [fr], Khaled Hosny [ar], Goran Vidović [hr],
+  Cheng-Chia Tseng [zh_TW], Carmen Bianca BAKKER [eo], Daniel Mustieles [es],
+  Dušan Kazik [sk]
+
 3.32.0
 ======
 * Fix sizing issues in on-screen-keyboard emoji panel [Carlos; !439]
--- a/data/dbus-interfaces/org.gnome.Shell.ClocksIntegration.xml
+++ b/data/dbus-interfaces/org.gnome.Shell.ClocksIntegration.xml
@@ -0,0 +1,15 @@
+<node>
+
+  <!--
+      org.gnome.Shell.ClocksIntegration:
+      @short_description: Clocks integration interface
+
+      The interface used for exporting location settings to GNOME Shell's
+      world clocks integration.
+  -->
+  <interface name="org.gnome.Shell.ClocksIntegration">
+
+  <property name="Locations" type="av" access="read"/>
+
+  </interface>
+</node>
--- a/data/dbus-interfaces/org.gnome.Shell.Extensions.xml
+++ b/data/dbus-interfaces/org.gnome.Shell.Extensions.xml
@@ -173,6 +173,30 @@
      <arg type="s" direction="in" name="uuid"/>
    </method>

+    <!--
+        EnableExtension:
+        @uuid: The UUID of the extension
+        @success: Whether the operation was successful
+
+        Enable an extension.
+    -->
+    <method name="EnableExtension"> \
+      <arg type="s" direction="in" name="uuid"/> \
+      <arg type="b" direction="out" name="success"/> \
+    </method> \
+
+    <!--
+        DisableExtension:
+        @uuid: The UUID of the extension
+        @success: Whether the operation was successful
+
+        Disable an extension.
+    -->
+    <method name="DisableExtension"> \
+      <arg type="s" direction="in" name="uuid"/> \
+      <arg type="b" direction="out" name="success"/> \
+    </method> \
+
    <!--
        LaunchExtensionPrefs:
        @uuid: The UUID of the extension
@@ -189,6 +213,15 @@
    -->
    <method name="CheckForUpdates"/>

+    <signal name="ExtensionStateChanged">
+      <arg type="s" name="uuid"/>
+      <arg type="a{sv}" name="state"/>
+    </signal>
+
+    <!--
+        ExtensionStatusChanged:
+        Deprecated for ExtensionStateChanged
+    -->
    <signal name="ExtensionStatusChanged">
      <arg type="s" name="uuid"/>
      <arg type="i" name="state"/>
--- a/data/dbus-interfaces/org.gnome.Shell.WeatherIntegration.xml
+++ b/data/dbus-interfaces/org.gnome.Shell.WeatherIntegration.xml
@@ -0,0 +1,16 @@
+<node>
+
+  <!--
+      org.gnome.Shell.WeatherIntegration:
+      @short_description: Weather integration interface
+
+      The interface used for exporting location settings to GNOME Shell's
+      weather integration.
+  -->
+  <interface name="org.gnome.Shell.WeatherIntegration">
+
+  <property name="AutomaticLocation" type="b" access="read"/>
+  <property name="Locations" type="av" access="read"/>
+
+  </interface>
+</node>
--- a/data/dbus-interfaces/org.gnome.Shell.xml
+++ b/data/dbus-interfaces/org.gnome.Shell.xml
@@ -10,9 +10,6 @@
      <arg type="a{sv}" direction="in" name="params"/>
    </method>
    <method name="ShowMonitorLabels">
-      <arg type="a{uv}" direction="in" name="params"/>
-    </method>
-    <method name="ShowMonitorLabels2">
      <arg type="a{sv}" direction="in" name="params"/>
    </method>
    <method name="HideMonitorLabels"/>
--- a/data/gnome-shell-dbus-interfaces.gresource.xml
+++ b/data/gnome-shell-dbus-interfaces.gresource.xml
@@ -40,6 +40,7 @@
    <file preprocess="xml-stripblanks">org.gnome.SettingsDaemon.Wacom.xml</file>
    <file preprocess="xml-stripblanks">org.gnome.Shell.AudioDeviceSelection.xml</file>
    <file preprocess="xml-stripblanks">org.gnome.Shell.CalendarServer.xml</file>
+    <file preprocess="xml-stripblanks">org.gnome.Shell.ClocksIntegration.xml</file>
    <file preprocess="xml-stripblanks">org.gnome.Shell.Extensions.xml</file>
    <file preprocess="xml-stripblanks">org.gnome.Shell.Introspect.xml</file>
    <file preprocess="xml-stripblanks">org.gnome.Shell.HotplugSniffer.xml</file>
@@ -48,6 +49,7 @@
    <file preprocess="xml-stripblanks">org.gnome.Shell.Screencast.xml</file>
    <file preprocess="xml-stripblanks">org.gnome.Shell.Screenshot.xml</file>
    <file preprocess="xml-stripblanks">org.gnome.Shell.Wacom.PadOsd.xml</file>
+    <file preprocess="xml-stripblanks">org.gnome.Shell.WeatherIntegration.xml</file>
    <file preprocess="xml-stripblanks">org.gnome.Shell.xml</file>
    <file preprocess="xml-stripblanks">org.Gtk.MountOperationHandler.xml</file>
    <file preprocess="xml-stripblanks">org.gtk.Notifications.xml</file>
--- a/data/gnome-shell-disable-extensions.service
+++ b/data/gnome-shell-disable-extensions.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Disable GNOME Shell extensions after failure
+DefaultDependencies=no
+
+# Only disable extensions for a short period of time after login.
+# This means we err on the side of failing the first login after a broken
+# extension was installed.
+Requisite=gnome-session-stable.timer
+
+[Service]
+Type=simple
+# Disable extensions
+ExecStart=gsettings set org.gnome.shell disable-user-extensions true
+Restart=no
--- a/data/gnome-shell-extensions-disabled-warning.desktop.in.in
+++ b/data/gnome-shell-extensions-disabled-warning.desktop.in.in
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Name=GNOME Shell Extensions Disabled Warning
+Comment=Warning shown if extensions were disabled due to a failure
+Exec=@bindir@/gnome-shell-extension-prefs --disabled-warning
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-shell
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-Version=@VERSION@
+OnlyShowIn=GNOME;
+AutostartCondition=if-exists gnome-shell-extensions-disabled-warning
+X-GNOME-HiddenUnderSystemd=@systemd_hidden@
--- a/data/gnome-shell-extensions-disabled-warning.service.in
+++ b/data/gnome-shell-extensions-disabled-warning.service.in
@@ -0,0 +1,13 @@
+[Unit]
+Description=Warn about GNOME Shell extensions being disabled
+ConditionPathExists=%E/gnome-shell-extensions-disabled-warning
+
+Requisite=gnome-session.target
+After=gnome-session.target
+
+[Service]
+Type=simple
+ExecStartPre=-/bin/rm %E/gnome-shell-extensions-disabled-warning
+ExecStart=@bindir@/gnome-shell-extension-prefs --disabled-warning
+Restart=no
+
--- a/data/gnome-shell-theme.gresource.xml
+++ b/data/gnome-shell-theme.gresource.xml
@@ -20,12 +20,16 @@
    <file>no-notifications.svg</file>
    <file>noise-texture.png</file>
    <file>pad-osd.css</file>
+    <file alias="icons/pointer-double-click-symbolic.svg">pointer-double-click-symbolic.svg</file>
+    <file alias="icons/pointer-drag-symbolic.svg">pointer-drag-symbolic.svg</file>
+    <file alias="icons/pointer-primary-click-symbolic.svg">pointer-primary-click-symbolic.svg</file>
+    <file alias="icons/pointer-secondary-click-symbolic.svg">pointer-secondary-click-symbolic.svg</file>
    <file>process-working.svg</file>
-    <file>toggle-off-us.svg</file>
-    <file>toggle-off-intl.svg</file>
+    <file>toggle-off.svg</file>
+    <file>toggle-off-dark.svg</file>
    <file>toggle-off-hc.svg</file>
-    <file>toggle-on-us.svg</file>
-    <file>toggle-on-intl.svg</file>
+    <file>toggle-on.svg</file>
+    <file>toggle-on-dark.svg</file>
    <file>toggle-on-hc.svg</file>
  </gresource>
 </gresources>
--- a/data/gnome-shell-wayland.service.in
+++ b/data/gnome-shell-wayland.service.in
@@ -0,0 +1,25 @@
+[Unit]
+Description=GNOME Shell on Wayland
+# On wayland, force a session shutdown
+OnFailure=gnome-shell-disable-extensions.service gnome-session-shutdown.target
+OnFailureJobMode=replace-irreversibly
+CollectMode=inactive-or-failed
+RefuseManualStart=on
+RefuseManualStop=on
+
+After=gnome-session-manager.target
+
+Requisite=gnome-session-initialized.target
+PartOf=gnome-session-initialized.target
+Before=gnome-session-initialized.target
+
+# The units already conflict because they use the same BusName
+#Conflicts=gnome-shell-x11.service
+
+[Service]
+Type=notify
+ExecStart=@bindir@/gnome-shell
+# Exit code 1 means we are probably *not* dealing with an extension failure
+SuccessExitStatus=1
+# On wayland we cannot restart
+Restart=no
--- a/data/gnome-shell-wayland.target
+++ b/data/gnome-shell-wayland.target
@@ -1,5 +1,12 @@
 [Unit]
-Description=GNOME Shell (wayland sync point)
-After=gnome-shell.service
-BindsTo=gnome-shell.service
-Conflicts=gnome-shell-x11.target
+Description=GNOME Shell on Wayland
+DefaultDependencies=no
+
+Requisite=gnome-session-initialized.target
+PartOf=gnome-session-initialized.target
+Before=gnome-session-initialized.target
+
+Requires=gnome-shell-wayland.service
+After=gnome-shell-wayland.service
+
+Wants=gnome-shell-extensions-disabled-warning.service
--- a/data/gnome-shell-x11.service.in
+++ b/data/gnome-shell-x11.service.in
@@ -0,0 +1,31 @@
+[Unit]
+Description=GNOME Shell on X11
+# On X11, try to show the GNOME Session Failed screen
+OnFailure=gnome-shell-disable-extensions.service gnome-session-failed.target
+OnFailureJobMode=replace
+CollectMode=inactive-or-failed
+RefuseManualStart=on
+RefuseManualStop=on
+
+After=gnome-session-manager.target
+
+Requisite=gnome-session-initialized.target
+PartOf=gnome-session-initialized.target
+Before=gnome-session-initialized.target
+
+# The units already conflict because they use the same BusName
+#Conflicts=gnome-shell-wayland.service
+
+# Limit startup frequency more than the default
+StartLimitIntervalSec=15s
+StartLimitBurst=3
+
+[Service]
+Type=notify
+ExecStart=@bindir@/gnome-shell
+# Exit code 1 means we are probably *not* dealing with an extension failure
+SuccessExitStatus=1
+# On X11 we want to restart on-success (Alt+F2 + r) and on-failure.
+Restart=always
+# Do not wait before restarting the shell
+RestartSec=0ms
--- a/data/gnome-shell-x11.target
+++ b/data/gnome-shell-x11.target
@@ -1,5 +1,12 @@
 [Unit]
-Description=GNOME Shell (x11 sync point)
-After=gnome-shell.service
-BindsTo=gnome-shell.service
-Conflicts=gnome-shell-wayland.target
+Description=GNOME Shell on X11
+DefaultDependencies=no
+
+Requisite=gnome-session-initialized.target
+PartOf=gnome-session-initialized.target
+Before=gnome-session-initialized.target
+
+Requires=gnome-shell-x11.service
+After=gnome-shell-x11.service
+
+Wants=gnome-shell-extensions-disabled-warning.service
--- a/data/gnome-shell.service.in
+++ b/data/gnome-shell.service.in
@@ -1,11 +0,0 @@
-[Unit]
-Description=GNOME Shell
-Wants=gnome-session.service
-After=graphical-session-pre.target gnome-session-bus.target
-PartOf=graphical-session.target
-
-[Service]
-Type=dbus
-ExecStart=@bindir@/gnome-shell
-Restart=on-failure
-BusName=org.gnome.Shell
--- a/data/meson.build
+++ b/data/meson.build
@@ -14,6 +14,8 @@ desktopconf = configuration_data()
 # file when built in a non-system prefix
 desktopconf.set('bindir', bindir)
 desktopconf.set('VERSION', meson.project_version())
+desktopconf.set('systemd_hidden', have_systemd ? 'true' : 'false')
+
 foreach desktop_file : desktop_files
  i18n.merge_file('desktop',
    input: configure_file(
@@ -22,13 +24,26 @@ foreach desktop_file : desktop_files
      configuration: desktopconf
    ),
    output: desktop_file,
-    po_dir: '../po',
+    po_dir: po_dir,
    install: true,
    install_dir: desktopdir,
    type: 'desktop'
  )
 endforeach

+i18n.merge_file('desktop',
+  input: configure_file(
+    input: 'gnome-shell-extensions-disabled-warning.desktop.in.in',
+    output: 'gnome-shell-extensions-disabled-warning.desktop.in',
+    configuration: desktopconf
+  ),
+  output: 'gnome-shell-extension-disabled-warning.desktop',
+  po_dir: po_dir,
+  install: true,
+  install_dir: autostartdir,
+  type: 'desktop'
+)
+
 serviceconf = configuration_data()
 serviceconf.set('libexecdir', libexecdir)
 foreach service_file : service_files
@@ -98,15 +113,23 @@ if have_systemd
  unitconf = configuration_data()
  unitconf.set('bindir', bindir)

-  unit = configure_file(
-    input: 'gnome-shell.service.in',
-    output: 'gnome-shell.service',
+  configure_file(
+    input: 'gnome-shell-x11.service.in',
+    output: 'gnome-shell-x11.service',
    configuration: unitconf,
    install_dir: systemduserunitdir
  )

-  units = files('gnome-shell-wayland.target',
-                'gnome-shell-x11.target')
+  configure_file(
+    input: 'gnome-shell-wayland.service.in',
+    output: 'gnome-shell-wayland.service',
+    configuration: unitconf,
+    install_dir: systemduserunitdir
+  )
+
+  units = files('gnome-shell-x11.target',
+                'gnome-shell-wayland.target',
+                'gnome-shell-disable-extensions.service')

  install_data(units, install_dir: systemduserunitdir)
 endif
--- a/data/org.gnome.Shell.desktop.in.in
+++ b/data/org.gnome.Shell.desktop.in.in
@@ -14,3 +14,4 @@ X-GNOME-Autostart-Phase=DisplayServer
 X-GNOME-Provides=panel;windowmanager;
 X-GNOME-Autostart-Notify=true
 X-GNOME-AutoRestart=false
+X-GNOME-HiddenUnderSystemd=@systemd_hidden@
--- a/data/org.gnome.shell.gschema.xml.in
+++ b/data/org.gnome.shell.gschema.xml.in
@@ -21,6 +21,17 @@
        EnableExtension and DisableExtension D-Bus methods on org.gnome.Shell.
      </description>
    </key>
+    <key name="disabled-extensions" type="as">
+      <default>[]</default>
+      <summary>UUIDs of extensions to force disabling</summary>
+      <description>
+        GNOME Shell extensions have a UUID property; this key lists extensions
+        which should be disabled, even if loaded as part of the current mode.
+        You can also manipulate this list with the EnableExtension and
+        DisableExtension D-Bus methods on org.gnome.Shell.
+        This key takes precedence over the “enabled-extensions” setting.
+      </description>
+    </key>
    <key name="disable-user-extensions" type="b">
      <default>false</default>
      <summary>Disable user extensions</summary>
@@ -99,7 +110,6 @@
      </description>
    </key>
    <child name="keybindings" schema="org.gnome.shell.keybindings"/>
-    <child name="keyboard" schema="org.gnome.shell.keyboard"/>
  </schema>

  <schema id="org.gnome.shell.keybindings" path="/org/gnome/shell/keybindings/"
@@ -140,11 +150,6 @@
        Keybinding to focus the active notification.
      </description>
    </key>
-    <key name="pause-resume-tweens" type="as">
-      <default>[]</default>
-      <summary>Keybinding that pauses and resumes all running tweens, for debugging purposes</summary>
-      <description></description>
-    </key>
    <key name="switch-to-application-1" type="as">
      <default>["&lt;Super&gt;1"]</default>
      <summary>Switch to application 1</summary>
@@ -183,17 +188,6 @@
    </key>
  </schema>

-  <schema id="org.gnome.shell.keyboard" path="/org/gnome/shell/keyboard/"
-          gettext-domain="@GETTEXT_PACKAGE@">
-    <key name="keyboard-type" type="s">
-      <default>'touch'</default>
-      <summary>Which keyboard to use</summary>
-      <description>
-        The type of keyboard to use.
-      </description>
-    </key>
-  </schema>
-
  <schema id="org.gnome.shell.app-switcher"
          path="/org/gnome/shell/app-switcher/"
          gettext-domain="@GETTEXT_PACKAGE@">
@@ -234,6 +228,36 @@
    </key>
  </schema>

+  <schema id="org.gnome.shell.world-clocks" path="/org/gnome/shell/world-clocks/"
+          gettext-domain="@GETTEXT_PACKAGE@">
+    <key name="locations" type="av">
+      <summary>Locations</summary>
+      <description>
+        The locations to show in world clocks
+      </description>
+      <default>[]</default>
+    </key>
+  </schema>
+
+  <schema id="org.gnome.shell.weather" path="/org/gnome/shell/weather/"
+          gettext-domain="@GETTEXT_PACKAGE@">
+    <key name="automatic-location" type="b">
+      <summary>Automatic location</summary>
+      <description>
+        Whether to fetch the current location or not
+      </description>
+      <default>false</default>
+    </key>
+
+    <key name="locations" type="av">
+      <summary>Location</summary>
+      <description>
+        The location for which to show a forecast
+      </description>
+      <default>[]</default>
+    </key>
+  </schema>
+
  <!-- unused, change 00_org.gnome.shell.gschema.override instead -->
  <schema id="org.gnome.shell.overrides" path="/org/gnome/shell/overrides/"
 	  gettext-domain="@GETTEXT_PACKAGE@">
--- a/data/theme/gnome-shell-high-contrast.scss
+++ b/data/theme/gnome-shell-high-contrast.scss
@@ -1,3 +1,5 @@
+$variant: 'light';
+
@import "gnome-shell-sass/_high-contrast-colors"; //use gtk colors
@import "gnome-shell-sass/_drawing";
@import "gnome-shell-sass/_common";
--- a/data/theme/gnome-shell-sass/_colors.scss
+++ b/data/theme/gnome-shell-sass/_colors.scss
@@ -3,11 +3,11 @@


 $base_color: if($variant == 'light', #ffffff, lighten(desaturate(#241f31, 20%), 2%));
-$bg_color: if($variant == 'light', #f6f5f4, desaturate(#3d3846, 10%));
+$bg_color: if($variant == 'light', #f6f5f4, darken(desaturate(#3d3846, 100%), 4%));
 $fg_color: if($variant == 'light', #2e3436, #eeeeec);

 $selected_fg_color: #ffffff;
-$selected_bg_color: if($variant == 'light', #3584e4, darken(#3584e4, 20%));
+$selected_bg_color: if($variant == 'light', #3584e4, darken(#3584e4, 10%));
 $selected_borders_color: if($variant== 'light', darken($selected_bg_color, 15%), darken($selected_bg_color, 30%));
 $borders_color: if($variant == 'light', darken($bg_color, 18%), darken($bg_color, 10%));
 $borders_edge: if($variant == 'light', transparentize(white, 0.2), transparentize($fg_color, 0.93));
@@ -21,11 +21,15 @@ $success_color: if($variant == 'light', #33d17a, darken(#33d17a, 10%));
 $destructive_color: if($variant == 'light', #e01b24, darken(#e01b24, 10%));

 $osd_fg_color: #eeeeec;
-$osd_bg_color: #2e3436;
+$osd_text_color: white;
+$osd_bg_color: transparentize(darken(desaturate(#3d3846, 100%), 12%),0.04);
+$osd_insensitive_bg_color: transparentize(mix($osd_fg_color, opacify($osd_bg_color, 1), 10%), 0.5);
+$osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 50%);
 $osd_borders_color: transparentize(black, 0.3);
-$osd_outer_borders_color: transparentize(white, 0.9);
+$osd_outer_borders_color: transparentize(white, 0.84);

 $tooltip_borders_color: $osd_outer_borders_color;
+$shadow_color: transparentize(black, 0.9);

 //insensitive state derived colors
 $insensitive_fg_color: mix($fg_color, $bg_color, 50%);
--- a/data/theme/gnome-shell-sass/_common.scss
+++ b/data/theme/gnome-shell-sass/_common.scss
--- a/data/theme/gnome-shell-sass/_drawing.scss
+++ b/data/theme/gnome-shell-sass/_drawing.scss
@@ -37,16 +37,13 @@
 // possible $t values:
 // normal, focus, insensitive
 //
-  $_inner_shadows: inset 0 2px 4px transparentize(black, 0.6);

  @if $t==normal {
    background-color: $base_color;
    border-color: $borders_color;
-    @include _shadows($_inner_shadows);

  }
  @if $t==focus {
-    @include _shadows($_inner_shadows);
    border-color: if($fc==$selected_bg_color,
                     $selected_borders_color,
                     darken($fc,35%));
@@ -111,7 +108,7 @@
  }
 }

-@mixin button($t, $c:$osd_bg_color, $tc:$fg_color, $edge: $borders_edge) {
+@mixin button($t, $c:$bg_color, $tc:$fg_color, $edge: $borders_edge) {
 //
 // Button drawing function
 //
@@ -130,46 +127,39 @@
  $_hilight_color: _button_hilight_color($c);
  $_button_edge: if($edge == none, none, _widget_edge($edge));
  $_blank_edge: if($edge == none, none, _widget_edge(transparentize($edge,1)));
-
+  $_button_shadow: 0 1px 2px transparentize($shadow_color, 0.03);

  @if $t==normal {
  //
  // normal button
  //
-    $_bg: if($c!=$osd_bg_color, transparentize($c, 0.5),
-                            $osd_bg_color);

-    color: $osd_fg_color;
-    background-color: $_bg;
-    border-color: $osd_borders_color;
-    box-shadow: inset 0 1px lighten($osd_bg_color,10%);
+    color: $tc;
+    background-color: $c;
+    border-color: $borders_color;
+    box-shadow: $_button_shadow;
    text-shadow: 0 1px black;
    icon-shadow: 0 1px black;
  }
  @if $t==focus {
  //
  // focused button
-  //
-    $_bg: if($c!=$osd_bg_color, transparentize($c, 0.3),
-                          lighten($osd_bg_color,3%));
-
-    color: $osd_fg_color;
+  //  
+    color: $tc;
    text-shadow: 0 1px black;
    icon-shadow: 0 1px black;
-    box-shadow: inset 0px 0px 0px 1px $selected_bg_color;
+    box-shadow: inset 0px 0px 0px 2px $selected_bg_color;
+    //border-color: $selected_bg_color;
  }

  @else if $t==hover {
  //
  // active osd button
  //
-    $_bg: if($c!=$osd_bg_color, transparentize($c, 0.3),
-                            lighten($osd_bg_color,3%));
-
-    color: white;
-    border-color: $osd_borders_color;
-    background-color: $_bg;
-    box-shadow: inset 0 1px lighten($osd_bg_color,20%);
+    color: $tc;
+    border-color: $borders_color;
+    background-color: $c;
+    box-shadow: $_button_shadow;
    text-shadow: 0 1px black;
    icon-shadow: 0 1px black;

@@ -178,27 +168,18 @@
  //
  // active osd button
  //
-    $_bg: if($c!=$bg_color, $c, $osd_borders_color);
-
-    color: white;
-    border-color: $osd_borders_color;
-    background-color: $selected_bg_color;
-    // This should be none, but it's creating some issues with borders, so to
-    // workaround it for now, use inset wich goes through a different code path.
-    // see https://bugzilla.gnome.org/show_bug.cgi?id=752934
-    box-shadow: inset 0 0 black;
+    color: $tc;
+    border-color: $borders_color;
+    background-color: $c;
    text-shadow: none;
    icon-shadow: none;
+    box-shadow: none;
  }
  @else if $t==insensitive {
-  //
-  // insensitive osd button
-  //
-    $_bg: transparentize(mix($insensitive_fg_color,$osd_bg_color,20%),0.3);

    color: $insensitive_fg_color;
-    border-color: $osd_borders_color;
-    background-color: $_bg;
+    border-color: $insensitive_borders_color;
+    background-color: $insensitive_bg_color;
    box-shadow: none;
    text-shadow: none;
    icon-shadow: none;
--- a/data/theme/gnome-shell-sass/_high-contrast-colors.scss
+++ b/data/theme/gnome-shell-sass/_high-contrast-colors.scss
@@ -26,6 +26,7 @@ $osd_borders_color: transparentize(black, 0.3);
 $osd_outer_borders_color: transparentize(white, 0.9);

 $tooltip_borders_color: $osd_outer_borders_color;
+$shadow_color: transparentize(black, 0.9);

 //insensitive state derived colors
 $insensitive_fg_color: mix($fg_color, $bg_color, 50%);
--- a/data/theme/pointer-double-click-symbolic.svg
+++ b/data/theme/pointer-double-click-symbolic.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="20"
+   height="20"
+   id="svg2">
+  <g
+     id="layer1"
+     style="display:inline">
+    <g
+       id="id1"
+       transform="translate(-19,-0.75)">
+      <path
+         style="color:#000000;shape-padding:0;clip-rule:nonzero;display:block;overflow:visible;visibility:visible;opacity:1;solid-color:#000000;solid-opacity:1;fill:#464646;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         d="m 19.855469,0.45507812 c 0,6.69466128 0,13.38932288 0,20.08398388 1.414713,-1.38151 2.829427,-2.763021 4.24414,-4.144531 0.5882,1.18866 1.158389,2.386561 1.758464,3.569127 1.108631,1.640259 4.157538,0.465128 3.89799,-1.495859 0.01057,-0.470226 -0.405577,-0.908445 -0.434651,-1.313638 0.259401,-0.25321 0.518802,-0.50642 0.778203,-0.75963 0.5882,1.18866 1.158389,2.386561 1.758464,3.569127 1.108631,1.640259 4.157538,0.465128 3.89799,-1.495859 -0.192325,-0.904303 -0.717854,-1.698026 -1.068629,-2.548967 -0.238908,-0.512658 -0.477817,-1.025315 -0.716725,-1.537973 1.755859,0 3.511719,0 5.267578,0 C 34.777352,9.738932 30.31641,5.0970051 25.855469,0.45507812 c 0,2.08138018 0,4.16276048 0,6.24414068 -2,-2.0813802 -4,-4.1627605 -6,-6.24414068 z m 1.5,3.72656248 c 2,2.0813801 4,4.1627603 6,6.2441404 0,-2.0813801 0,-4.1627603 0,-6.2441404 2.786458,2.8997395 5.572917,5.7994789 8.359375,8.6992184 -1.366537,0 -2.733073,0 -4.09961,0 0.883468,1.903435 1.781983,3.800273 2.656081,5.707817 0.0065,0.622781 -1.227555,0.980575 -1.325116,0.207118 -0.80433,-1.640251 -1.608661,-3.280501 -2.412991,-4.920752 -1.020182,0.995443 -2.040365,1.990885 -3.060547,2.986328 0.263642,0.608048 0.596803,1.192457 0.814693,1.816134 -0.182662,0.601037 -1.26833,0.8373 -1.365856,0.06795 -0.796094,-1.623456 -1.592189,-3.246912 -2.388284,-4.870368 -1.059245,1.033854 -2.118489,2.067708 -3.177734,3.101562 -4e-6,-4.265002 -7e-6,-8.5300036 -1.1e-5,-12.7950054 z"
+         id="path5565" />
+    </g>
+    <g
+       id="id2"
+       transform="translate(-25,-0.75)" />
+  </g>
+</svg>
--- a/data/theme/pointer-drag-symbolic.svg
+++ b/data/theme/pointer-drag-symbolic.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="20"
+   height="20"
+   id="svg2">
+  <g
+     id="g835">
+    <path
+       style="color:#000000;shape-padding:0;clip-rule:nonzero;display:block;overflow:visible;visibility:visible;opacity:1;solid-color:#000000;solid-opacity:1;fill:#464646;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       d="M 10.705078 1.671875 C 9.8685536 1.7465699 8.886927 1.5353073 8.2578125 2.2480469 C 8.0785627 2.7511513 7.8667422 2.9777446 7.3125 2.8652344 C 6.5186841 2.8141575 5.6105879 2.9190179 5.125 3.6386719 C 4.5700923 4.4696324 4.8113194 5.4949043 4.7578125 6.4316406 L 4.7578125 7.9335938 C 4.2480917 7.6156216 3.6258927 7.8015358 3.0585938 7.7519531 C 2.6157606 7.7312277 2.1774807 7.7771069 1.7402344 7.84375 C 1.7971654 10.529678 1.813967 13.217089 1.8613281 15.902344 C 1.9550191 17.204635 3.0933719 18.307155 4.40625 18.326172 C 5.0391993 18.341272 5.8885801 18.332951 6.6308594 18.337891 C 9.8526764 18.325821 13.076973 18.38774 16.296875 18.28125 C 17.459088 18.161027 18.510143 17.092798 18.367188 15.884766 L 18.367188 6.4042969 C 17.660379 5.4636119 16.551912 4.623434 15.308594 4.8339844 C 15.009045 4.3804158 14.822476 3.3608651 14.082031 3.0351562 C 13.727176 2.744118 13.242443 2.9253873 12.822266 2.8730469 C 12.524824 2.8003648 11.966366 3.0655864 11.953125 2.6210938 C 11.795774 2.0995736 11.23789 1.7125276 10.705078 1.671875 z M 10.599609 3.1757812 C 10.764131 3.4472414 10.782382 3.9294982 10.818359 4.3007812 C 10.824915 4.3076775 10.838155 4.3066925 10.845703 4.3125 C 10.836598 4.3123268 10.827465 4.3126732 10.818359 4.3125 L 11.3125 10.212891 L 11.976562 4.3710938 L 13.322266 4.375 C 13.858345 4.7645492 13.735252 5.5154752 13.876953 6.0976562 C 13.865826 6.1651282 13.88335 6.1937019 13.892578 6.234375 C 13.891928 6.2343667 13.891276 6.2343833 13.890625 6.234375 L 13.902344 6.3203125 L 14.384766 10.185547 L 15.048828 6.265625 C 15.622863 6.228498 16.206517 6.3041365 16.607422 6.7675781 C 17.017062 6.9844433 16.823063 7.4565491 16.867188 7.8261719 L 16.867188 16.167969 C 16.530129 17.131654 15.267211 16.71624 14.492188 16.828125 C 11.121671 16.841205 7.7500508 16.861953 4.3808594 16.814453 C 3.4051926 16.786173 3.2389196 15.744474 3.3398438 14.972656 C 3.3282027 13.065594 3.2950998 11.158732 3.2617188 9.2519531 C 3.5880829 9.2584131 3.9376766 9.2391948 4.25 9.2617188 C 4.7438842 10.17694 4.7346154 11.262903 4.7578125 12.277344 C 5.2504494 12.270544 5.8011939 12.317174 6.2578125 12.277344 C 6.2669593 9.7577406 6.2393741 7.2373172 6.2714844 4.71875 C 6.3763823 4.198849 7.0022289 4.409587 7.3828125 4.3652344 L 8.0585938 4.3652344 L 8.546875 10.212891 L 9.2167969 4.3359375 L 9.2128906 4.3359375 C 9.2438386 3.9531035 9.0622615 3.4401006 9.4609375 3.2167969 L 10.599609 3.1757812 z "
+       id="path5630" />
+  </g>
+</svg>
--- a/data/theme/pointer-primary-click-symbolic.svg
+++ b/data/theme/pointer-primary-click-symbolic.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="20"
+   height="20"
+   id="svg2"
+   version="1.1">
+  <g
+     id="layer1"
+     style="display:inline">
+    <g
+       id="id1"
+       transform="translate(-22.25,-0.75)">
+      <path
+         style="color:#000000;shape-padding:0;clip-rule:nonzero;display:block;overflow:visible;visibility:visible;opacity:1;solid-color:#000000;solid-opacity:1;fill:#464646;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         d="m 25.855469,0.45507812 c 0,6.69466128 0,13.38932288 0,20.08398388 1.414713,-1.380859 2.829427,-2.761719 4.24414,-4.142578 0.612408,1.215372 1.173049,2.460221 1.819709,3.656095 1.141947,1.476279 3.975266,0.389006 3.846009,-1.473608 -0.09413,-0.822519 -0.594755,-1.521423 -0.899969,-2.277599 -0.298869,-0.640171 -0.597739,-1.280342 -0.896608,-1.920513 1.75651,0 3.513021,0 5.269531,0 C 34.777344,9.738932 30.316406,5.0970051 25.855469,0.45507812 Z m 1.5,3.72656248 c 2.786458,2.8997395 5.572917,5.7994789 8.359375,8.6992184 -1.367188,0 -2.734375,0 -4.101563,0 0.885072,1.903196 1.781799,3.80152 2.659622,5.707744 0.0349,0.566084 -1.149057,0.988823 -1.282093,0.297971 -0.818567,-1.671162 -1.637133,-3.342323 -2.455699,-5.013485 -1.059896,1.034505 -2.119791,2.06901 -3.179687,3.103515 1.5e-5,-4.264988 3e-5,-8.5299756 4.5e-5,-12.7949634 z"
+         id="path5565" />
+    </g>
+  </g>
+</svg>
--- a/data/theme/pointer-secondary-click-symbolic.svg
+++ b/data/theme/pointer-secondary-click-symbolic.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="20"
+   height="20"
+   id="svg2">
+  <g
+     id="layer1"
+     style="display:inline;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1">
+    <g
+       transform="matrix(-1,0,0,1,42,-0.75)"
+       id="g5847"
+       style="stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1">
+      <path
+         style="color:#000000;shape-padding:0;clip-rule:nonzero;display:block;overflow:visible;visibility:visible;opacity:1;solid-color:#000000;solid-opacity:1;fill:#464646;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         d="m 25.855469,0.45507812 c 0,6.69466128 0,13.38932288 0,20.08398388 1.414713,-1.380859 2.829427,-2.761719 4.24414,-4.142578 0.612408,1.215372 1.173049,2.460221 1.819709,3.656095 1.141947,1.476279 3.975266,0.389006 3.846009,-1.473608 -0.09413,-0.822519 -0.594755,-1.521423 -0.899969,-2.277599 -0.298869,-0.640171 -0.597739,-1.280342 -0.896608,-1.920513 1.75651,0 3.513021,0 5.269531,0 C 34.777344,9.738932 30.316406,5.0970051 25.855469,0.45507812 Z m 1.5,3.72656248 c 2.786458,2.8997395 5.572917,5.7994789 8.359375,8.6992184 -1.367188,0 -2.734375,0 -4.101563,0 0.885072,1.903196 1.781799,3.80152 2.659622,5.707744 0.0349,0.566084 -1.149057,0.988823 -1.282093,0.297971 -0.818567,-1.671162 -1.637133,-3.342323 -2.455699,-5.013485 -1.059896,1.034505 -2.119791,2.06901 -3.179687,3.103515 1.5e-5,-4.264988 3e-5,-8.5299756 4.5e-5,-12.7949634 z"
+         id="path5851" />
+    </g>
+  </g>
+</svg>
--- a/data/theme/toggle-off-dark.svg
+++ b/data/theme/toggle-off-dark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="46" height="22"><defs><linearGradient id="a"><stop offset="0" stop-color="#39393a"/><stop offset="1" stop-color="#302f30"/></linearGradient><linearGradient xlink:href="#a" id="b" x1="53" y1="294.429" x2="53" y2="309.804" gradientUnits="userSpaceOnUse" gradientTransform="translate(-42.76)"/></defs><g transform="translate(0 -291.18)" stroke-width="1.085"><rect style="marker:none" width="44.446" height="20.911" x=".625" y="291.715" rx="10.455" ry="10.073" fill="#323233" stroke="#272728"/><rect ry="10.455" rx="10.455" y="291.715" x=".543" height="20.911" width="21.143" style="marker:none" fill="url(#b)" stroke="#151515"/></g></svg>
--- a/data/theme/toggle-off-intl.svg
+++ b/data/theme/toggle-off-intl.svg
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="65"
-   height="22"
-   id="svg2857"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="toggle-off-us.svg">
-  <defs
-     id="defs2859">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2865" />
-    <inkscape:perspective
-       id="perspective2843"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76469-7-7-4"
-       id="linearGradient38024"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0215462,0,0,1.0322581,717.22867,428.68472)"
-       x1="6"
-       y1="102.95528"
-       x2="6"
-       y2="84.505203" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient76469-7-7-4">
-      <stop
-         style="stop-color:#2e3232;stop-opacity:1"
-         offset="0"
-         id="stop76471-7-1-5" />
-      <stop
-         style="stop-color:#3e4545;stop-opacity:1"
-         offset="1"
-         id="stop76473-9-0-0" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect77541-4"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect77541-4-0"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37802-8"
-       id="linearGradient12311-3-1-0-5-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.5918367,0,0,0.85714285,-256.56122,59.071426)"
-       x1="610.13782"
-       y1="501.43866"
-       x2="610.13782"
-       y2="492.52756" />
-    <linearGradient
-       id="linearGradient37802-8"
-       inkscape:collect="always">
-      <stop
-         id="stop37804-1"
-         offset="0"
-         style="stop-color:#2c2c2c;stop-opacity:1" />
-      <stop
-         id="stop37806-8"
-         offset="1"
-         style="stop-color:#16191a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       y2="492.52756"
-       x2="610.13782"
-       y1="501.43866"
-       x1="610.13782"
-       gradientTransform="matrix(1.5918367,0,0,0.85714285,-900.56122,-423.92857)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient13602"
-       xlink:href="#linearGradient37802-8"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="-5.0602834"
-     inkscape:cy="16.473273"
-     inkscape:document-units="px"
-     inkscape:current-layer="g37994"
-     showgrid="false"
-     inkscape:window-width="2560"
-     inkscape:window-height="1375"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true"
-     showborder="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid12954"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2862">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-444.64286,-781.36218)">
-    <g
-       transform="matrix(0.6526046,0,0,0.80554422,99.592644,-636.32172)"
-       id="g37994">
-      <g
-         id="g37996"
-         transform="translate(-115,1277)">
-        <rect
-           style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964000000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.19591837"
-           id="rect13475"
-           width="98"
-           height="25"
-           x="644.5"
-           y="484.61118"
-           rx="4.7429576"
-           ry="3.8424656" />
-        <rect
-           ry="3.8424656"
-           rx="4.7429576"
-           y="483.5"
-           x="644.5"
-           height="25"
-           width="98"
-           id="rect38000"
-           style="color:#000000;fill:url(#linearGradient12311-3-1-0-5-4);fill-opacity:1;fill-rule:nonzero;stroke:#16191a;stroke-width:1.37920942;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" />
-      </g>
-      <g
-         transform="translate(-49.946213,-1.890275)"
-         id="g38002">
-        <g
-           transform="translate(-115,1247)"
-           style="display:inline"
-           id="g38004">
-          <rect
-             ry="3.7972314"
-             rx="4.6871223"
-             y="515.5"
-             x="694.53046"
-             height="25"
-             width="45.969578"
-             id="rect38006"
-             style="color:#000000;fill:url(#linearGradient38024);fill-opacity:1;fill-rule:nonzero;stroke:#1f2020;stroke-width:1.37920964;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-          <path
-             sodipodi:nodetypes="cc"
-             style="opacity:0.1;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             d="m 699.09675,516.7365 36.86904,0"
-             id="path38016"
-             inkscape:path-effect="#path-effect77541-4"
-             inkscape:original-d="m 699.09675,516.7365 36.86904,0"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-      <path
-         sodipodi:type="arc"
-         style="color:#000000;fill:none;stroke:#ffffff;stroke-width:2.15627193;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-         id="path13479"
-         sodipodi:cx="16.4375"
-         sodipodi:cy="10.8125"
-         sodipodi:rx="4.3125"
-         sodipodi:ry="4.3125"
-         d="m 20.75,10.8125 a 4.3125,4.3125 0 1 1 -8.625,0 4.3125,4.3125 0 1 1 8.625,0 z"
-         transform="matrix(1.4212691,0,0,1.1514287,577.38488,1761.1138)" />
-    </g>
-  </g>
-</svg>
--- a/data/theme/toggle-off-us.svg
+++ b/data/theme/toggle-off-us.svg
@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="65"
-   height="22"
-   id="svg2857"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="toggle-on-intl.svg">
-  <defs
-     id="defs2859">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2865" />
-    <inkscape:perspective
-       id="perspective2843"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76469-7-7-4"
-       id="linearGradient38024"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0215462,0,0,1.0322581,717.22867,428.68472)"
-       x1="6"
-       y1="102.95528"
-       x2="6"
-       y2="84.505203" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient76469-7-7-4">
-      <stop
-         style="stop-color:#2e3232;stop-opacity:1"
-         offset="0"
-         id="stop76471-7-1-5" />
-      <stop
-         style="stop-color:#3e4545;stop-opacity:1"
-         offset="1"
-         id="stop76473-9-0-0" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect77541-4"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37802"
-       id="linearGradient12311-3-1-0-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.5918367,0,0,0.85714285,-256.56122,59.071426)"
-       x1="610.13782"
-       y1="501.43866"
-       x2="610.13782"
-       y2="492.52756" />
-    <linearGradient
-       id="linearGradient37802"
-       inkscape:collect="always">
-      <stop
-         id="stop37804"
-         offset="0"
-         style="stop-color:#2c2c2c;stop-opacity:1" />
-      <stop
-         id="stop37806"
-         offset="1"
-         style="stop-color:#16191a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76469-7-7-4-3"
-       id="linearGradient77680"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.0322581,717.71949,428.68472)"
-       x1="6"
-       y1="102.95528"
-       x2="6"
-       y2="84.505203" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient76469-7-7-4-3">
-      <stop
-         style="stop-color:#2e3232;stop-opacity:1"
-         offset="0"
-         id="stop76471-7-1-5-7" />
-      <stop
-         style="stop-color:#3e4545;stop-opacity:1"
-         offset="1"
-         id="stop76473-9-0-0-9" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect77541-4-0"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37802-8"
-       id="linearGradient12311-3-1-0-5-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.5918367,0,0,0.85714285,-256.56122,59.071426)"
-       x1="610.13782"
-       y1="501.43866"
-       x2="610.13782"
-       y2="492.52756" />
-    <linearGradient
-       id="linearGradient37802-8"
-       inkscape:collect="always">
-      <stop
-         id="stop37804-1"
-         offset="0"
-         style="stop-color:#2c2c2c;stop-opacity:1" />
-      <stop
-         id="stop37806-8"
-         offset="1"
-         style="stop-color:#16191a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       y2="492.52756"
-       x2="610.13782"
-       y1="501.43866"
-       x1="610.13782"
-       gradientTransform="matrix(1.5918367,0,0,0.85714285,-900.56122,-423.92857)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient13602"
-       xlink:href="#linearGradient37802-8"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="16.760995"
-     inkscape:cy="21.955673"
-     inkscape:document-units="px"
-     inkscape:current-layer="g37994"
-     showgrid="false"
-     inkscape:window-width="2560"
-     inkscape:window-height="1375"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true"
-     showborder="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid12954"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2862">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-444.64286,-781.36218)">
-    <g
-       transform="matrix(0.6526046,0,0,0.80554422,99.592644,-636.32172)"
-       id="g37994">
-      <g
-         id="g37996"
-         transform="translate(-115,1277)">
-        <rect
-           style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964000000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.19591837"
-           id="rect13475"
-           width="98"
-           height="25"
-           x="644.5"
-           y="484.61118"
-           rx="4.7429576"
-           ry="3.8424656" />
-        <rect
-           ry="3.8424656"
-           rx="4.7429576"
-           y="483.5"
-           x="644.5"
-           height="25"
-           width="98"
-           id="rect38000"
-           style="color:#000000;fill:url(#linearGradient12311-3-1-0-5-4);fill-opacity:1;fill-rule:nonzero;stroke:#16191a;stroke-width:1.37920942;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" />
-      </g>
-      <g
-         transform="translate(-49.946213,-1.890275)"
-         id="g38002">
-        <g
-           transform="translate(-115,1247)"
-           style="display:inline"
-           id="g38004">
-          <rect
-             ry="3.7972314"
-             rx="4.6871223"
-             y="515.5"
-             x="694.53046"
-             height="25"
-             width="45.969578"
-             id="rect38006"
-             style="color:#000000;fill:url(#linearGradient38024);fill-opacity:1;fill-rule:nonzero;stroke:#1f2020;stroke-width:1.37920964;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-          <path
-             sodipodi:nodetypes="cc"
-             style="opacity:0.1;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             d="m 699.09675,516.7365 36.86904,0"
-             id="path38016"
-             inkscape:path-effect="#path-effect77541-4"
-             inkscape:original-d="m 699.09675,516.7365 36.86904,0"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-      <text
-         xml:space="preserve"
-         style="font-size:13.79166794px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
-         x="520.29974"
-         y="1997.0011"
-         id="text75614"
-         sodipodi:linespacing="125%"
-         transform="scale(1.1236771,0.88993537)"><tspan
-           sodipodi:role="line"
-           id="tspan75616"
-           x="520.29974"
-           y="1997.0011">OFF</tspan></text>
-    </g>
-  </g>
-</svg>
--- a/data/theme/toggle-off.svg
+++ b/data/theme/toggle-off.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="46" height="22"><g transform="translate(0 -291.18)"><rect style="marker:none;font-variant-east_asian:normal" width="44.446" height="20.911" x=".625" y="291.715" rx="10.455" ry="10.073" fill="#e1dedb" stroke="#cdc7c2" stroke-linecap="round" stroke-linejoin="round"/><rect ry="10.455" rx="10.455" y="291.715" x=".543" height="20.911" width="21.143" style="marker:none;font-variant-east_asian:normal" fill="#f8f7f7" stroke="#aa9f98" stroke-linecap="round" stroke-linejoin="round"/><g transform="matrix(.97148 0 0 1 1658.914 -2552.91)" stroke-width="1.015" stroke-linecap="round" stroke-linejoin="round"><rect ry="13.17" rx="13.556" y="1234.681" x="-1242.732" height="26" width="49.409" style="marker:none" fill="#e1dedb" stroke="#cdc7c2"/><rect style="marker:none" width="26.763" height="26" x="-1242.732" y="1234.769" rx="13.511" ry="13.126" fill="#f8f7f7" stroke="#aa9f98"/></g><g transform="matrix(.97148 0 0 1 1658.914 -2512.91)" stroke-width="1.015" stroke="#2b73cc"><rect style="marker:none" width="49.409" height="26" x="-1242.732" y="1234.681" rx="13.556" ry="13.17" fill="#3081e3"/><rect ry="13.126" rx="13.511" y="1234.769" x="-1220.086" height="26" width="26.763" style="marker:none" fill="#f8f7f7" stroke-linecap="round" stroke-linejoin="round"/></g></g></svg>
--- a/data/theme/toggle-on-dark.svg
+++ b/data/theme/toggle-on-dark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="46" height="22"><defs><linearGradient id="a"><stop offset="0" stop-color="#39393a"/><stop offset="1" stop-color="#302f30"/></linearGradient><linearGradient xlink:href="#a" id="b" x1="53" y1="294.429" x2="53" y2="309.804" gradientUnits="userSpaceOnUse" gradientTransform="translate(-19)"/></defs><g transform="translate(0 -291.18)" stroke="#030e1b" stroke-width="1.085"><rect style="marker:none" width="44.446" height="20.911" x=".625" y="291.715" rx="10.455" ry="10.073" fill="#15539e"/><rect ry="10.455" rx="10.455" y="291.715" x="24.304" height="20.911" width="21.143" style="marker:none" fill="url(#b)"/></g></svg>
--- a/data/theme/toggle-on-intl.svg
+++ b/data/theme/toggle-on-intl.svg
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="65"
-   height="22"
-   id="svg2857"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="toggle-on-intl.svg">
-  <defs
-     id="defs2859">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2865" />
-    <inkscape:perspective
-       id="perspective2843"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient77461"
-       id="linearGradient77551"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3066667,0,0,1,-841.64667,-483)"
-       x1="1164.7644"
-       y1="962.93695"
-       x2="1164.7644"
-       y2="970.51404" />
-    <linearGradient
-       id="linearGradient77461"
-       inkscape:collect="always">
-      <stop
-         id="stop77463"
-         offset="0"
-         style="stop-color:#182f4c;stop-opacity:1" />
-      <stop
-         id="stop77465"
-         offset="1"
-         style="stop-color:#205b9a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76469-7-7-4"
-       id="linearGradient38024"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0215462,0,0,1.0322581,717.22867,428.68472)"
-       x1="6"
-       y1="102.95528"
-       x2="6"
-       y2="84.505203" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient76469-7-7-4">
-      <stop
-         style="stop-color:#2e3232;stop-opacity:1"
-         offset="0"
-         id="stop76471-7-1-5" />
-      <stop
-         style="stop-color:#3e4545;stop-opacity:1"
-         offset="1"
-         id="stop76473-9-0-0" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect77541-4"
-       is_visible="true" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="37.410841"
-     inkscape:cy="16.009314"
-     inkscape:document-units="px"
-     inkscape:current-layer="g37994"
-     showgrid="false"
-     inkscape:window-width="2560"
-     inkscape:window-height="1376"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true"
-     showborder="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid12954"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2862">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-444.64286,-781.36218)">
-    <g
-       transform="matrix(0.6526046,0,0,0.80554422,99.592644,-636.32172)"
-       id="g37994">
-      <g
-         id="g37996"
-         transform="translate(-115,1277)">
-        <rect
-           style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964000000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.19591837"
-           id="rect13475"
-           width="98"
-           height="25"
-           x="644.5"
-           y="484.61118"
-           rx="4.7429576"
-           ry="3.8424656" />
-        <rect
-           ry="3.8424656"
-           rx="4.7429576"
-           y="483.5"
-           x="644.5"
-           height="25"
-           width="98"
-           id="rect38000"
-           style="color:#000000;fill:url(#linearGradient77551);fill-opacity:1;fill-rule:nonzero;stroke:#182f4c;stroke-width:1.37920964;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      </g>
-      <g
-         transform="translate(2.0625,-2)"
-         id="g38002">
-        <g
-           transform="translate(-115,1247)"
-           style="display:inline"
-           id="g38004">
-          <rect
-             ry="3.7972314"
-             rx="4.6871223"
-             y="515.5"
-             x="694.53046"
-             height="25"
-             width="45.969578"
-             id="rect38006"
-             style="color:#000000;fill:url(#linearGradient38024);fill-opacity:1;fill-rule:nonzero;stroke:#1f2020;stroke-width:1.37920964;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-          <path
-             sodipodi:nodetypes="cc"
-             style="opacity:0.1;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             d="m 699.09675,516.7365 36.86904,0"
-             id="path38016"
-             inkscape:path-effect="#path-effect77541-4"
-             inkscape:original-d="m 699.09675,516.7365 36.86904,0"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-      <rect
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-         id="rect13678"
-         width="3.0646207"
-         height="12.414008"
-         x="554.77728"
-         y="1767.3566" />
-    </g>
-  </g>
-</svg>
--- a/data/theme/toggle-on-us.svg
+++ b/data/theme/toggle-on-us.svg
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="65"
-   height="22"
-   id="svg2857"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="toggle-on-us.svg">
-  <defs
-     id="defs2859">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2865" />
-    <inkscape:perspective
-       id="perspective2843"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient76469-7-7-4"
-       id="linearGradient38024"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0215462,0,0,1.0322581,717.22867,428.68472)"
-       x1="6"
-       y1="102.95528"
-       x2="6"
-       y2="84.505203" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient76469-7-7-4">
-      <stop
-         style="stop-color:#2e3232;stop-opacity:1"
-         offset="0"
-         id="stop76471-7-1-5" />
-      <stop
-         style="stop-color:#3e4545;stop-opacity:1"
-         offset="1"
-         id="stop76473-9-0-0" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect77541-4"
-       is_visible="true" />
-    <linearGradient
-       id="linearGradient77461-1"
-       inkscape:collect="always">
-      <stop
-         id="stop77463-1"
-         offset="0"
-         style="stop-color:#182f4c;stop-opacity:1" />
-      <stop
-         id="stop77465-4"
-         offset="1"
-         style="stop-color:#205b9a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient77461-1"
-       id="linearGradient77551-6-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.8527367,0,0,0.80554422,-969.41608,-778.00299)"
-       x1="1164.7644"
-       y1="962.93695"
-       x2="1164.7644"
-       y2="970.51404" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient77461-1"
-       id="linearGradient11198"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3066667,0,0,1,-1066.3709,794.25325)"
-       x1="1322.5831"
-       y1="-312.51855"
-       x2="1322.5831"
-       y2="-306.53461" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="-26.798898"
-     inkscape:cy="5.3753009"
-     inkscape:document-units="px"
-     inkscape:current-layer="g37994"
-     showgrid="false"
-     inkscape:window-width="2560"
-     inkscape:window-height="1376"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true"
-     showborder="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid12954"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2862">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-444.64286,-781.36218)">
-    <g
-       transform="matrix(0.6526046,0,0,0.80554422,99.592644,-636.32172)"
-       id="g37994">
-      <g
-         id="g37996"
-         transform="translate(-115,1277)">
-        <rect
-           style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964000000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.19591837"
-           id="rect13475"
-           width="98"
-           height="25"
-           x="644.5"
-           y="484.61118"
-           rx="4.7429576"
-           ry="3.8424656" />
-        <rect
-           ry="3.8424656"
-           rx="4.7429576"
-           y="483.5"
-           x="644.5"
-           height="25"
-           width="98"
-           id="rect38000"
-           style="color:#000000;fill:url(#linearGradient11198);fill-opacity:1;fill-rule:nonzero;stroke:#182f4c;stroke-width:1.37920964;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" />
-      </g>
-      <g
-         transform="translate(2.0625,-2)"
-         id="g38002">
-        <g
-           transform="translate(-115,1247)"
-           style="display:inline"
-           id="g38004">
-          <rect
-             ry="3.7972314"
-             rx="4.6871223"
-             y="515.5"
-             x="694.53046"
-             height="25"
-             width="45.969578"
-             id="rect38006"
-             style="color:#000000;fill:url(#linearGradient38024);fill-opacity:1;fill-rule:nonzero;stroke:#1f2020;stroke-width:1.37920964;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-          <path
-             sodipodi:nodetypes="cc"
-             style="opacity:0.1;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37920964px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             d="m 699.09675,516.7365 36.86904,0"
-             id="path38016"
-             inkscape:path-effect="#path-effect77541-4"
-             inkscape:original-d="m 699.09675,516.7365 36.86904,0"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-      <text
-         transform="scale(1.1000946,0.90901274)"
-         sodipodi:linespacing="125%"
-         id="text38018"
-         y="1955.5205"
-         x="495.94223"
-         style="font-size:13.29953671px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
-         xml:space="preserve"><tspan
-           y="1955.5205"
-           x="495.94223"
-           id="tspan38020"
-           sodipodi:role="line">ON</tspan></text>
-    </g>
-  </g>
-</svg>
--- a/data/theme/toggle-on.svg
+++ b/data/theme/toggle-on.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="46" height="22"><g transform="translate(0 -291.18)" stroke="#2b73cc"><rect style="marker:none;font-variant-east_asian:normal" width="44.446" height="20.911" x=".625" y="291.715" rx="10.455" ry="10.073" fill="#3081e3"/><rect ry="10.455" rx="10.455" y="291.715" x="24.304" height="20.911" width="21.143" style="marker:none;font-variant-east_asian:normal" fill="#f8f7f7" stroke-linecap="round" stroke-linejoin="round"/></g></svg>
--- a/docs/reference/shell/meson.build
+++ b/docs/reference/shell/meson.build
@@ -28,7 +28,7 @@ foreach iface : ifaces
    output: 'doc-gen-' + iface[1],
    command: [
      'gdbus-codegen',
-      '--interface-prefix=@0@.'.format(iface),
+      '--interface-prefix=@0@.'.format(iface[0]),
      '--generate-docbook', 'doc-gen',
      '--output-directory', '@OUTDIR@',
      '@INPUT@'
--- a/js/extensionPrefs/main.js
+++ b/js/extensionPrefs/main.js
@@ -1,3 +1,7 @@
+/* exported main */
+imports.gi.versions.Gdk = '3.0';
+imports.gi.versions.Gtk = '3.0';
+
 const Gettext = imports.gettext;
 const { Gdk, GLib, Gio, GObject, Gtk, Pango } = imports.gi;
 const Format = imports.format;
@@ -6,7 +10,9 @@ const _ = Gettext.gettext;

 const Config = imports.misc.config;
 const ExtensionUtils = imports.misc.extensionUtils;
-const { loadInterfaceXML } = imports.misc.fileUtils;
+const { loadInterfaceXML, deleteGFile } = imports.misc.fileUtils;
+
+const { ExtensionState } = ExtensionUtils;

 const GnomeShellIface = loadInterfaceXML('org.gnome.Shell.Extensions');
 const GnomeShellProxy = Gio.DBusProxy.makeProxyWrapper(GnomeShellIface);
@@ -17,74 +23,54 @@ function stripPrefix(string, prefix) {
    return string;
 }

-var Application = class {
-    constructor() {
+var Application = GObject.registerClass({
+    GTypeName: 'ExtensionPrefs_Application'
+}, class Application extends Gtk.Application {
+    _init() {
        GLib.set_prgname('gnome-shell-extension-prefs');
-        this.application = new Gtk.Application({
+        super._init({
            application_id: 'org.gnome.shell.ExtensionPrefs',
            flags: Gio.ApplicationFlags.HANDLES_COMMAND_LINE
        });

-        this.application.connect('activate', this._onActivate.bind(this));
-        this.application.connect('command-line', this._onCommandLine.bind(this));
-        this.application.connect('startup', this._onStartup.bind(this));
-
-        this._extensionPrefsModules = {};
-
        this._startupUuid = null;
        this._loaded = false;
        this._skipMainWindow = false;
+        this._shellProxy = null;
    }

-    _extensionAvailable(uuid) {
-        let extension = ExtensionUtils.extensions[uuid];
+    get shellProxy() {
+        return this._shellProxy;
+    }

-        if (!extension)
+    _showPrefs(uuid) {
+        let row = this._extensionSelector.get_children().find(c => {
+            return c.uuid === uuid && c.hasPrefs;
+        });
+
+        if (!row)
            return false;

-        if (!extension.dir.get_child('prefs.js').query_exists(null))
-            return false;
-
-        return true;
-    }
-
-    _getExtensionPrefsModule(extension) {
-        let uuid = extension.metadata.uuid;
-
-        if (this._extensionPrefsModules.hasOwnProperty(uuid))
-            return this._extensionPrefsModules[uuid];
-
-        ExtensionUtils.installImporter(extension);
-
-        let prefsModule = extension.imports.prefs;
-        prefsModule.init(extension.metadata);
-
-        this._extensionPrefsModules[uuid] = prefsModule;
-        return prefsModule;
-    }
-
-    _selectExtension(uuid) {
-        if (!this._extensionAvailable(uuid))
-            return;
-
-        let extension = ExtensionUtils.extensions[uuid];
        let widget;

        try {
-            let prefsModule = this._getExtensionPrefsModule(extension);
-            widget = prefsModule.buildPrefsWidget();
+            widget = row.prefsModule.buildPrefsWidget();
        } catch (e) {
-            widget = this._buildErrorUI(extension, e);
+            widget = this._buildErrorUI(row, e);
        }

-        let dialog = new Gtk.Window({ modal: !this._skipMainWindow,
-                                      type_hint: Gdk.WindowTypeHint.DIALOG });
-        dialog.set_titlebar(new Gtk.HeaderBar({ show_close_button: true,
-                                                title: extension.metadata.name,
-                                                visible: true }));
+        let dialog = new Gtk.Window({
+            modal: !this._skipMainWindow,
+            type_hint: Gdk.WindowTypeHint.DIALOG
+        });
+        dialog.set_titlebar(new Gtk.HeaderBar({
+            show_close_button: true,
+            title: row.name,
+            visible: true
+        }));

        if (this._skipMainWindow) {
-            this.application.add_window(dialog);
+            this.add_window(dialog);
            if (this._window)
                this._window.destroy();
            this._window = dialog;
@@ -96,9 +82,11 @@ var Application = class {
        dialog.set_default_size(600, 400);
        dialog.add(widget);
        dialog.show();
+
+        return true;
    }

-    _buildErrorUI(extension, exc) {
+    _buildErrorUI(row, exc) {
        let scroll = new Gtk.ScrolledWindow({
            hscrollbar_policy: Gtk.PolicyType.NEVER,
            propagate_natural_height: true
@@ -168,13 +156,20 @@ var Application = class {

        copyButton.connect('clicked', w => {
            let clipboard = Gtk.Clipboard.get_default(w.get_display());
-            let backticks = '```';
-            clipboard.set_text(
-                // markdown for pasting in gitlab issues
-                `The settings of extension ${extension.uuid} had an error:\n${
-                backticks}\n${exc}\n${backticks}\n\nStack trace:\n${
-                backticks}\n${exc.stack}${backticks}\n`, -1
-            );
+            // markdown for pasting in gitlab issues
+            let lines = [
+                `The settings of extension ${row.uuid} had an error:`,
+                '```',
+                `${exc}`,
+                '```',
+                '',
+                'Stack trace:',
+                '```',
+                exc.stack.replace(/\n$/, ''), // stack without trailing newline
+                '```',
+                ''
+            ];
+            clipboard.set_text(lines.join('\n'), -1);
        });

        let spacing = new Gtk.SeparatorToolItem({ draw: false });
@@ -185,13 +180,13 @@ var Application = class {
            label: _("Homepage"),
            tooltip_text: _("Visit extension homepage"),
            no_show_all: true,
-            visible: extension.metadata.url != null
+            visible: row.url != null
        });
        toolbar.add(urlButton);

        urlButton.connect('clicked', w => {
            let context = w.get_display().get_app_launch_context();
-            Gio.AppInfo.launch_default_for_uri(extension.metadata.url, context);
+            Gio.AppInfo.launch_default_for_uri(row.url, context);
        });

        let expandedBox = new Gtk.Box({
@@ -206,8 +201,8 @@ var Application = class {
        return scroll;
    }

-    _buildUI(app) {
-        this._window = new Gtk.ApplicationWindow({ application: app,
+    _buildUI() {
+        this._window = new Gtk.ApplicationWindow({ application: this,
                                                   window_position: Gtk.WindowPosition.CENTER });

        this._window.set_default_size(800, 500);
@@ -224,10 +219,33 @@ var Application = class {
                            Gio.SettingsBindFlags.DEFAULT |
                            Gio.SettingsBindFlags.INVERT_BOOLEAN);

+        let vbox = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL });
+        this._window.add(vbox);
+
+        this.disabledInfobar = new Gtk.InfoBar({
+            message_type: Gtk.MessageType.ERROR,
+            revealed: false,
+            show_close_button: true
+        });
+        this.disabledInfobar.connect('response',  () => {
+            this.disabledInfobar.revealed = false;
+        });
+        let contentArea = this.disabledInfobar.get_content_area();
+        let label = new Gtk.Label({
+            label: _('A problem was detected and extensions were automatically disabled. It is recommended to disable or reconfigure any extensions that may have caused the issue before re-enabling them at the top.'),
+            ellipsize: Pango.EllipsizeMode.END,
+            wrap: true,
+            lines: 2,
+            xalign: 0,
+            margin: 6
+        });
+        contentArea.add(label);
+        vbox.add(this.disabledInfobar);
+
        this._mainStack = new Gtk.Stack({
            transition_type: Gtk.StackTransitionType.CROSSFADE
        });
-        this._window.add(this._mainStack);
+        vbox.add(this._mainStack);

        let scroll = new Gtk.ScrolledWindow({ hscrollbar_policy: Gtk.PolicyType.NEVER });

@@ -241,18 +259,14 @@ var Application = class {
        this._mainStack.add_named(new EmptyPlaceholder(), 'placeholder');

        this._shellProxy = new GnomeShellProxy(Gio.DBus.session, 'org.gnome.Shell', '/org/gnome/Shell');
-        this._shellProxy.connectSignal('ExtensionStatusChanged', (proxy, senderName, [uuid, state, error]) => {
-            if (ExtensionUtils.extensions[uuid] !== undefined)
-                this._scanExtensions();
-        });
+        this._shellProxy.connectSignal('ExtensionStateChanged',
+            this._onExtensionStateChanged.bind(this));

        this._window.show_all();
    }

    _sortList(row1, row2) {
-        let name1 = ExtensionUtils.extensions[row1.uuid].metadata.name;
-        let name2 = ExtensionUtils.extensions[row2.uuid].metadata.name;
-        return name1.localeCompare(name2);
+        return row1.name.localeCompare(row2.name);
    }

    _updateHeader(row, before) {
@@ -263,19 +277,55 @@ var Application = class {
        row.set_header(sep);
    }

-    _scanExtensions() {
-        let finder = new ExtensionUtils.ExtensionFinder();
-        finder.connect('extension-found', this._extensionFound.bind(this));
-        finder.scanExtensions();
-        this._extensionsLoaded();
+    _findExtensionRow(uuid) {
+        return this._extensionSelector.get_children().find(c => c.uuid === uuid);
    }

-    _extensionFound(finder, extension) {
-        let row = new ExtensionRow(extension.uuid);
+    _onExtensionStateChanged(proxy, senderName, [uuid, newState]) {
+        let row = this._findExtensionRow(uuid);
+        if (row) {
+            let { state } = ExtensionUtils.deserializeExtension(newState);
+            if (state == ExtensionState.UNINSTALLED)
+                row.destroy();
+            return; // we only deal with new and deleted extensions here
+        }
+
+        this._shellProxy.GetExtensionInfoRemote(uuid, ([serialized]) => {
+            let extension = ExtensionUtils.deserializeExtension(serialized);
+            if (!extension)
+                return;
+            // check the extension wasn't added in between
+            if (this._findExtensionRow(uuid) != null)
+                return;
+            this._addExtensionRow(extension);
+        });
+    }
+
+    _scanExtensions() {
+        this._shellProxy.ListExtensionsRemote(([extensionsMap], e) => {
+            if (e) {
+                if (e instanceof Gio.DBusError) {
+                    log(`Failed to connect to shell proxy: ${e}`);
+                    this._mainStack.add_named(new NoShellPlaceholder(), 'noshell');
+                    this._mainStack.visible_child_name = 'noshell';
+                } else
+                    throw e;
+                return;
+            }
+
+            for (let uuid in extensionsMap) {
+                let extension = ExtensionUtils.deserializeExtension(extensionsMap[uuid]);
+                this._addExtensionRow(extension);
+            }
+            this._extensionsLoaded();
+        });
+    }
+
+    _addExtensionRow(extension) {
+        let row = new ExtensionRow(extension);

-        row.prefsButton.visible = this._extensionAvailable(row.uuid);
        row.prefsButton.connect('clicked', () => {
-            this._selectExtension(row.uuid);
+            this._showPrefs(row.uuid);
        });

        row.show_all();
@@ -288,27 +338,43 @@ var Application = class {
        else
            this._mainStack.visible_child_name = 'placeholder';

-        if (this._startupUuid && this._extensionAvailable(this._startupUuid))
-            this._selectExtension(this._startupUuid);
+        if (this._startupUuid)
+            this._showPrefs(this._startupUuid);
        this._startupUuid = null;
        this._skipMainWindow = false;
        this._loaded = true;
    }

-    _onActivate() {
+    vfunc_activate() {
        this._window.present();
    }

-    _onStartup(app) {
-        this._buildUI(app);
+    vfunc_startup() {
+        super.vfunc_startup();
+
+        this._buildUI();
        this._scanExtensions();
    }

-    _onCommandLine(app, commandLine) {
-        app.activate();
+    vfunc_command_line(commandLine) {
+        this.activate();
        let args = commandLine.get_arguments();

        if (args.length) {
+            if (args[0] == '--disabled-warning') {
+                if (!this._settings.is_writable('disable-user-extensions'))
+                    this.quit();
+
+                this.disabledInfobar.set_revealed(true);
+
+                let file = GLib.build_filenamev ([GLib.get_user_config_dir(), 'gnome-shell-extensions-disabled-warning']);
+                let gfile = Gio.File.new_for_path(file);
+                if (gfile.query_exists(null))
+                    deleteGFile(gfile);
+
+                return 0;
+            }
+
            let uuid = args[0];

            this._skipMainWindow = true;
@@ -316,16 +382,14 @@ var Application = class {
            // Strip off "extension:///" prefix which fakes a URI, if it exists
            uuid = stripPrefix(uuid, "extension:///");

-            if (this._extensionAvailable(uuid))
-                this._selectExtension(uuid);
-            else if (!this._loaded)
+            if (!this._loaded)
                this._startupUuid = uuid;
-            else
+            else if (!this._showPrefs(uuid))
                this._skipMainWindow = false;
        }
        return 0;
    }
-};
+});

 var Expander = GObject.registerClass({
    Properties: {
@@ -492,6 +556,35 @@ class EmptyPlaceholder extends Gtk.Box {
    }
 });

+var NoShellPlaceholder = GObject.registerClass(
+class NoShellPlaceholder extends Gtk.Box {
+    _init() {
+        super._init({
+            orientation: Gtk.Orientation.VERTICAL,
+            spacing: 12,
+            margin: 100,
+            margin_bottom: 60
+        });
+
+        let label = new Gtk.Label({
+            label: '<span size="x-large">%s</span>'.format(
+                _("Something’s gone wrong")),
+            use_markup: true
+        });
+        label.get_style_context().add_class(Gtk.STYLE_CLASS_DIM_LABEL);
+        this.add(label);
+
+        label = new Gtk.Label({
+            label: _("We’re very sorry, but it was not possible to get the list of installed extensions. Make sure you are logged into GNOME and try again."),
+            justify: Gtk.Justification.CENTER,
+            wrap: true
+        });
+        this.add(label);
+
+        this.show_all();
+    }
+});
+
 var DescriptionLabel = GObject.registerClass(
 class DescriptionLabel extends Gtk.Label {
    vfunc_get_preferred_height_for_width(width) {
@@ -504,30 +597,58 @@ class DescriptionLabel extends Gtk.Label {

 var ExtensionRow = GObject.registerClass(
 class ExtensionRow extends Gtk.ListBoxRow {
-    _init(uuid) {
+    _init(extension) {
        super._init();

-        this.uuid = uuid;
+        this._app = Gio.Application.get_default();
+        this._extension = extension;
+        this._prefsModule = null;

-        this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell' });
-        this._settings.connect('changed::enabled-extensions', () => {
-            this._switch.state = this._isEnabled();
-        });
-        this._settings.connect('changed::disable-extension-version-validation',
-            () => {
-                this._switch.sensitive = this._canEnable();
-            });
-        this._settings.connect('changed::disable-user-extensions',
-            () => {
-                this._switch.sensitive = this._canEnable();
+        this._extensionStateChangedId = this._app.shellProxy.connectSignal(
+            'ExtensionStateChanged', (p, sender, [uuid, newState]) => {
+                if (this.uuid !== uuid)
+                    return;
+
+                this._extension = ExtensionUtils.deserializeExtension(newState);
+                let state = (this._extension.state == ExtensionState.ENABLED);
+                this._switch.freeze_notify();
+                this._switch.state = state;
+                this._switch.active = this._extension.isRequested;
+                this._switch.sensitive = this._canToggle();
+                this._switch.thaw_notify();
            });

+        this.connect('destroy', this._onDestroy.bind(this));
+
        this._buildUI();
    }

-    _buildUI() {
-        let extension = ExtensionUtils.extensions[this.uuid];
+    get uuid() {
+        return this._extension.uuid;
+    }

+    get name() {
+        return this._extension.metadata.name;
+    }
+
+    get hasPrefs() {
+        return this._extension.hasPrefs;
+    }
+
+    get url() {
+        return this._extension.metadata.url;
+    }
+
+    _onDestroy() {
+        if (!this._app.shellProxy)
+            return;
+
+        if (this._extensionStateChangedId)
+            this._app.shellProxy.disconnectSignal(this._extensionStateChangedId);
+        this._extensionStateChangedId = 0;
+    }
+
+    _buildUI() {
        let hbox = new Gtk.Box({ orientation: Gtk.Orientation.HORIZONTAL,
                                 hexpand: true, margin_end: 24, spacing: 24,
                                 margin: 12 });
@@ -537,73 +658,64 @@ class ExtensionRow extends Gtk.ListBoxRow {
                                 spacing: 6, hexpand: true });
        hbox.add(vbox);

-        let name = GLib.markup_escape_text(extension.metadata.name, -1);
+        let name = GLib.markup_escape_text(this.name, -1);
        let label = new Gtk.Label({ label: '<b>' + name + '</b>',
                                    use_markup: true,
                                    halign: Gtk.Align.START });
        vbox.add(label);

-        let desc = extension.metadata.description.split('\n')[0];
+        let desc = this._extension.metadata.description.split('\n')[0];
        label = new DescriptionLabel({ label: desc, wrap: true, lines: 2,
                                       ellipsize: Pango.EllipsizeMode.END,
                                       xalign: 0, yalign: 0 });
        vbox.add(label);

        let button = new Gtk.Button({ valign: Gtk.Align.CENTER,
+                                      visible: this.hasPrefs,
                                      no_show_all: true });
-        button.add(new Gtk.Image({ icon_name: 'emblem-system-symbolic',
-                                   icon_size: Gtk.IconSize.BUTTON,
-                                   visible: true }));
+        button.set_image(new Gtk.Image({ icon_name: 'emblem-system-symbolic',
+                                         icon_size: Gtk.IconSize.BUTTON,
+                                         visible: true }));
        button.get_style_context().add_class('circular');
        hbox.add(button);

        this.prefsButton = button;

-        this._switch = new Gtk.Switch({ valign: Gtk.Align.CENTER,
-                                        sensitive: this._canEnable(),
-                                        state: this._isEnabled() });
+        this._switch = new Gtk.Switch({
+            valign: Gtk.Align.CENTER,
+            sensitive: this._canToggle(),
+        });
        this._switch.connect('notify::active', () => {
            if (this._switch.active)
-                this._enable();
+                this._app.shellProxy.EnableExtensionRemote(this.uuid);
            else
-                this._disable();
+                this._app.shellProxy.DisableExtensionRemote(this.uuid);
        });
        this._switch.connect('state-set', () => true);
+        this._switch.freeze_notify();
+        this._switch.state = this._extension.state === ExtensionState.ENABLED;
+        this._switch.active = this._extension.isRequested;
+        this._switch.thaw_notify();
+
        hbox.add(this._switch);
    }

-    _canEnable() {
-        let extension = ExtensionUtils.extensions[this.uuid];
-        let checkVersion = !this._settings.get_boolean('disable-extension-version-validation');
-
-        return !this._settings.get_boolean('disable-user-extensions') &&
-               !(checkVersion && ExtensionUtils.isOutOfDate(extension));
+    _canToggle() {
+        return this._extension.canChange;
    }

-    _isEnabled() {
-        let extensions = this._settings.get_strv('enabled-extensions');
-        return extensions.indexOf(this.uuid) != -1;
-    }
+    get prefsModule() {
+        if (!this._prefsModule) {
+            ExtensionUtils.installImporter(this._extension);

-    _enable() {
-        let extensions = this._settings.get_strv('enabled-extensions');
-        if (extensions.indexOf(this.uuid) != -1)
-            return;
+            // give extension prefs access to their own extension object
+            ExtensionUtils.getCurrentExtension = () => this._extension;

-        extensions.push(this.uuid);
-        this._settings.set_strv('enabled-extensions', extensions);
-    }
+            this._prefsModule = this._extension.imports.prefs;
+            this._prefsModule.init(this._extension.metadata);
+        }

-    _disable() {
-        let extensions = this._settings.get_strv('enabled-extensions');
-        let pos = extensions.indexOf(this.uuid);
-        if (pos == -1)
-            return;
-        do {
-            extensions.splice(pos, 1);
-            pos = extensions.indexOf(this.uuid);
-        } while (pos != -1);
-        this._settings.set_strv('enabled-extensions', extensions);
+        return this._prefsModule;
    }
 });

@@ -611,12 +723,12 @@ function initEnvironment() {
    // Monkey-patch in a "global" object that fakes some Shell utilities
    // that ExtensionUtils depends on.
    window.global = {
-        log() {
-            print([].join.call(arguments, ', '));
+        log(...args) {
+            print(args.join(', '));
        },

        logError(s) {
-            log('ERROR: ' + s);
+            log(`ERROR: ${s}`);
        },

        userdatadir: GLib.build_filenamev([GLib.get_user_data_dir(), 'gnome-shell'])
@@ -631,6 +743,5 @@ function main(argv) {
    Gettext.bindtextdomain(Config.GETTEXT_PACKAGE, Config.LOCALEDIR);
    Gettext.textdomain(Config.GETTEXT_PACKAGE);

-    let app = new Application();
-    app.application.run(argv);
+    new Application().run(argv);
 }
--- a/js/gdm/authPrompt.js
+++ b/js/gdm/authPrompt.js
@@ -8,14 +8,13 @@ const Batch = imports.gdm.batch;
 const GdmUtil = imports.gdm.util;
 const Params = imports.misc.params;
 const ShellEntry = imports.ui.shellEntry;
-const Tweener = imports.ui.tweener;
 const UserWidget = imports.ui.userWidget;

 var DEFAULT_BUTTON_WELL_ICON_SIZE = 16;
-var DEFAULT_BUTTON_WELL_ANIMATION_DELAY = 1.0;
-var DEFAULT_BUTTON_WELL_ANIMATION_TIME = 0.3;
+var DEFAULT_BUTTON_WELL_ANIMATION_DELAY = 1000;
+var DEFAULT_BUTTON_WELL_ANIMATION_TIME = 300;

-var MESSAGE_FADE_OUT_ANIMATION_TIME = 0.5;
+var MESSAGE_FADE_OUT_ANIMATION_TIME = 500;

 var AuthPromptMode = {
    UNLOCK_ONLY: 0,
@@ -59,23 +58,23 @@ var AuthPrompt = class {
        this.smartcardDetected = this._userVerifier.smartcardDetected;

        this.connect('next', () => {
-                this.updateSensitivity(false);
-                this.startSpinning();
-                if (this._queryingService) {
-                    this._userVerifier.answerQuery(this._queryingService, this._entry.text);
-                } else {
-                    this._preemptiveAnswer = this._entry.text;
-                }
-            });
+            this.updateSensitivity(false);
+            this.startSpinning();
+            if (this._queryingService) {
+                this._userVerifier.answerQuery(this._queryingService, this._entry.text);
+            } else {
+                this._preemptiveAnswer = this._entry.text;
+            }
+        });

        this.actor = new St.BoxLayout({ style_class: 'login-dialog-prompt-layout',
                                        vertical: true });
        this.actor.connect('destroy', this._onDestroy.bind(this));
        this.actor.connect('key-press-event', (actor, event) => {
-                if (event.get_key_symbol() == Clutter.KEY_Escape)
-                    this.cancel();
-                return Clutter.EVENT_PROPAGATE;
-            });
+            if (event.get_key_symbol() == Clutter.KEY_Escape)
+                this.cancel();
+            return Clutter.EVENT_PROPAGATE;
+        });

        this._userWell = new St.Bin({ x_fill: true,
                                      x_align: St.Align.START });
@@ -112,7 +111,7 @@ var AuthPrompt = class {
        this._buttonBox = new St.BoxLayout({ style_class: 'login-dialog-button-box',
                                             vertical: false });
        this.actor.add(this._buttonBox,
-                       { expand:  true,
+                       { expand: true,
                         x_align: St.Align.MIDDLE,
                         y_align: St.Align.END });

@@ -138,7 +137,7 @@ var AuthPrompt = class {
                                            reactive: true,
                                            can_focus: true,
                                            label: _("Cancel") });
-        this.cancelButton.connect('clicked', () => { this.cancel(); });
+        this.cancelButton.connect('clicked', () => this.cancel());
        this._buttonBox.add(this.cancelButton,
                            { expand: false,
                              x_fill: false,
@@ -157,7 +156,7 @@ var AuthPrompt = class {
                                          reactive: true,
                                          can_focus: true,
                                          label: _("Next") });
-        this.nextButton.connect('clicked', () => { this.emit('next'); });
+        this.nextButton.connect('clicked', () => this.emit('next'));
        this.nextButton.add_style_pseudo_class('default');
        this._buttonBox.add(this.nextButton,
                            { expand: false,
@@ -267,7 +266,7 @@ var AuthPrompt = class {
        let oldActor = this._defaultButtonWellActor;

        if (oldActor)
-            Tweener.removeTweens(oldActor);
+            oldActor.remove_all_transitions();

        let wasSpinner;
        if (oldActor == this._spinner.actor)
@@ -290,19 +289,18 @@ var AuthPrompt = class {
                        this._spinner.stop();
                }
            } else {
-                Tweener.addTween(oldActor,
-                                 { opacity: 0,
-                                   time: DEFAULT_BUTTON_WELL_ANIMATION_TIME,
-                                   delay: DEFAULT_BUTTON_WELL_ANIMATION_DELAY,
-                                   transition: 'linear',
-                                   onCompleteScope: this,
-                                   onComplete() {
-                                      if (wasSpinner) {
-                                          if (this._spinner)
-                                              this._spinner.stop();
-                                      }
-                                   }
-                                 });
+                oldActor.ease({
+                    opacity: 0,
+                    duration: DEFAULT_BUTTON_WELL_ANIMATION_TIME,
+                    delay: DEFAULT_BUTTON_WELL_ANIMATION_DELAY,
+                    mode: Clutter.AnimationMode.LINEAR,
+                    onComplete: () => {
+                        if (wasSpinner) {
+                            if (this._spinner)
+                                this._spinner.stop();
+                        }
+                    }
+                });
            }
        }

@@ -313,11 +311,12 @@ var AuthPrompt = class {
            if (!animate)
                actor.opacity = 255;
            else
-                Tweener.addTween(actor,
-                                 { opacity: 255,
-                                   time: DEFAULT_BUTTON_WELL_ANIMATION_TIME,
-                                   delay: DEFAULT_BUTTON_WELL_ANIMATION_DELAY,
-                                   transition: 'linear' });
+                actor.ease({
+                    opacity: 255,
+                    duration: DEFAULT_BUTTON_WELL_ANIMATION_TIME,
+                    delay: DEFAULT_BUTTON_WELL_ANIMATION_DELAY,
+                    mode: Clutter.AnimationMode.LINEAR
+                });
        }

        this._defaultButtonWellActor = actor;
@@ -366,12 +365,12 @@ var AuthPrompt = class {
    _fadeOutMessage() {
        if (this._message.opacity == 0)
            return;
-        Tweener.removeTweens(this._message);
-        Tweener.addTween(this._message,
-                         { opacity: 0,
-                           time: MESSAGE_FADE_OUT_ANIMATION_TIME,
-                           transition: 'easeOutQuad'
-                         });
+        this._message.remove_all_transitions();
+        this._message.ease({
+            opacity: 0,
+            duration: MESSAGE_FADE_OUT_ANIMATION_TIME,
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD
+        });
    }

    setMessage(message, type) {
@@ -386,7 +385,7 @@ var AuthPrompt = class {
            this._message.remove_style_class_name('login-dialog-message-hint');

        if (message) {
-            Tweener.removeTweens(this._message);
+            this._message.remove_all_transitions();
            this._message.text = message;
            this._message.opacity = 255;
        } else {
--- a/js/gdm/batch.js
+++ b/js/gdm/batch.js
@@ -20,7 +20,7 @@
 * In order for transformation animations to look good, they need to be
 * incremental and have some order to them (e.g., fade out hidden items,
 * then shrink to close the void left over). Chaining animations in this way can
- * be error-prone and wordy using just Tweener callbacks.
+ * be error-prone and wordy using just ease() callbacks.
 *
 * The classes in this file help with this:
 *
@@ -44,6 +44,7 @@
 * replaced by something else.
 */

+const { GObject } = imports.gi;
 const Signals = imports.signals;

 var Task = class {
@@ -124,7 +125,7 @@ var Batch = class extends Task {
    }

    process() {
-        throw new Error('Not implemented');
+        throw new GObject.NotImplementedError(`process in ${this.constructor.name}`);
    }

    runTask() {
@@ -176,36 +177,36 @@ Signals.addSignalMethods(Batch.prototype);

 var ConcurrentBatch = class extends Batch {
    process() {
-       let hold = this.runTask();
+        let hold = this.runTask();

-       if (hold) {
-           this.hold.acquireUntilAfter(hold);
-       }
+        if (hold) {
+            this.hold.acquireUntilAfter(hold);
+        }

-       // Regardless of the state of the just run task,
-       // fire off the next one, so all the tasks can run
-       // concurrently.
-       this.nextTask();
+        // Regardless of the state of the just run task,
+        // fire off the next one, so all the tasks can run
+        // concurrently.
+        this.nextTask();
    }
 };
 Signals.addSignalMethods(ConcurrentBatch.prototype);

 var ConsecutiveBatch = class extends Batch {
    process() {
-       let hold = this.runTask();
+        let hold = this.runTask();

-       if (hold && hold.isAcquired()) {
-           // This task is inhibiting the batch. Wait on it
-           // before processing the next one.
-           let signalId = hold.connect('release', () => {
-               hold.disconnect(signalId);
-               this.nextTask();
-           });
-           return;
-       } else {
-           // This task finished, process the next one
-           this.nextTask();
-       }
+        if (hold && hold.isAcquired()) {
+            // This task is inhibiting the batch. Wait on it
+            // before processing the next one.
+            let signalId = hold.connect('release', () => {
+                hold.disconnect(signalId);
+                this.nextTask();
+            });
+            return;
+        } else {
+            // This task finished, process the next one
+            this.nextTask();
+        }
    }
 };
 Signals.addSignalMethods(ConsecutiveBatch.prototype);
--- a/js/gdm/fingerprint.js
+++ b/js/gdm/fingerprint.js
@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported FprintManager */

 const Gio = imports.gi.Gio;

@@ -23,8 +24,8 @@ function FprintManager() {

    try {
        self.init(null);
-    } catch(e) {
-        log('Failed to connect to Fprint service: ' + e.message);
+    } catch (e) {
+        log(`Failed to connect to Fprint service: ${e.message}`);
        return null;
    }

--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported LoginDialog */
 /*
 * Copyright 2011 Red Hat, Inc
 *
@@ -30,11 +31,10 @@ const LoginManager = imports.misc.loginManager;
 const Main = imports.ui.main;
 const PopupMenu = imports.ui.popupMenu;
 const Realmd = imports.gdm.realmd;
-const Tweener = imports.ui.tweener;
 const UserWidget = imports.ui.userWidget;

-const _FADE_ANIMATION_TIME = 0.25;
-const _SCROLL_ANIMATION_TIME = 0.5;
+const _FADE_ANIMATION_TIME = 250;
+const _SCROLL_ANIMATION_TIME = 500;
 const _TIMED_LOGIN_IDLE_THRESHOLD = 5.0;
 const _LOGO_ICON_HEIGHT = 48;
 const _MAX_BOTTOM_MENU_ITEMS = 5;
@@ -43,7 +43,7 @@ var UserListItem = class {
    constructor(user) {
        this.user = user;
        this._userChangedId = this.user.connect('changed',
-                                                 this._onUserChanged.bind(this));
+                                                this._onUserChanged.bind(this));

        let layout = new St.BoxLayout({ vertical: true });
        this.actor = new St.Button({ style_class: 'login-dialog-user-list-item',
@@ -150,7 +150,7 @@ Signals.addSignalMethods(UserListItem.prototype);

 var UserList = class {
    constructor() {
-        this.actor = new St.ScrollView({ style_class: 'login-dialog-user-list-view'});
+        this.actor = new St.ScrollView({ style_class: 'login-dialog-user-list-view' });
        this.actor.set_policy(St.PolicyType.NEVER,
                              St.PolicyType.AUTOMATIC);

@@ -187,8 +187,6 @@ var UserList = class {
    }

    updateStyle(isExpanded) {
-        let tasks = [];
-
        if (isExpanded)
            this._box.add_style_pseudo_class('expanded');
        else
@@ -206,11 +204,10 @@ var UserList = class {
        let adjustment = this.actor.get_vscroll_bar().get_adjustment();

        let value = (box.y1 + adjustment.step_increment / 2.0) - (adjustment.page_size / 2.0);
-        Tweener.removeTweens(adjustment);
-        Tweener.addTween (adjustment,
-                          { value: value,
-                            time: _SCROLL_ANIMATION_TIME,
-                            transition: 'easeOutQuad' });
+        adjustment.ease(value, {
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+            duration: _SCROLL_ANIMATION_TIME
+        });
    }

    jumpToItem(item) {
@@ -244,7 +241,7 @@ var UserList = class {
            return;

        if (user.locked)
-           return;
+            return;

        let userName = user.get_user_name();

@@ -261,7 +258,7 @@ var UserList = class {
        item.connect('activate', this._onItemActivated.bind(this));

        // Try to keep the focused item front-and-center
-        item.actor.connect('key-focus-in', () => { this.scrollToItem(item); });
+        item.actor.connect('key-focus-in', () => this.scrollToItem(item));

        this._moveFocusToItems();

@@ -319,17 +316,17 @@ var SessionMenuButton = class {
        this._menu.actor.hide();

        this._menu.connect('open-state-changed', (menu, isOpen) => {
-             if (isOpen)
-                 this._button.add_style_pseudo_class('active');
-             else
-                 this._button.remove_style_pseudo_class('active');
+            if (isOpen)
+                this._button.add_style_pseudo_class('active');
+            else
+                this._button.remove_style_pseudo_class('active');
        });

-        this._manager = new PopupMenu.PopupMenuManager({ actor: this._button },
+        this._manager = new PopupMenu.PopupMenuManager(this._button,
                                                       { actionMode: Shell.ActionMode.NONE });
        this._manager.addMenu(this._menu);

-        this._button.connect('clicked', () => { this._menu.toggle(); });
+        this._button.connect('clicked', () => this._menu.toggle());

        this._items = {};
        this._activeSessionId = null;
@@ -353,11 +350,11 @@ var SessionMenuButton = class {
    }

    setActiveSession(sessionId) {
-         if (sessionId == this._activeSessionId)
-             return;
+        if (sessionId == this._activeSessionId)
+            return;

-         this._activeSessionId = sessionId;
-         this._updateOrnament();
+        this._activeSessionId = sessionId;
+        this._updateOrnament();
    }

    close() {
@@ -374,7 +371,7 @@ var SessionMenuButton = class {
        }

        for (let i = 0; i < ids.length; i++) {
-            let [sessionName, sessionDescription] = Gdm.get_session_name_and_description(ids[i]);
+            let [sessionName, sessionDescription_] = Gdm.get_session_name_and_description(ids[i]);

            let id = ids[i];
            let item = new PopupMenu.PopupMenuItem(sessionName);
@@ -403,18 +400,18 @@ var LoginDialog = GObject.registerClass({
        this.connect('destroy', this._onDestroy.bind(this));
        parentActor.add_child(this);

-        this._userManager = AccountsService.UserManager.get_default()
+        this._userManager = AccountsService.UserManager.get_default();
        this._gdmClient = new Gdm.Client();

        this._settings = new Gio.Settings({ schema_id: GdmUtil.LOGIN_SCREEN_SCHEMA });

-        this._settings.connect('changed::' + GdmUtil.BANNER_MESSAGE_KEY,
+        this._settings.connect(`changed::${GdmUtil.BANNER_MESSAGE_KEY}`,
                               this._updateBanner.bind(this));
-        this._settings.connect('changed::' + GdmUtil.BANNER_MESSAGE_TEXT_KEY,
+        this._settings.connect(`changed::${GdmUtil.BANNER_MESSAGE_TEXT_KEY}`,
                               this._updateBanner.bind(this));
-        this._settings.connect('changed::' + GdmUtil.DISABLE_USER_LIST_KEY,
+        this._settings.connect(`changed::${GdmUtil.DISABLE_USER_LIST_KEY}`,
                               this._updateDisableUserList.bind(this));
-        this._settings.connect('changed::' + GdmUtil.LOGO_KEY,
+        this._settings.connect(`changed::${GdmUtil.LOGO_KEY}`,
                               this._updateLogo.bind(this));

        this._textureCache = St.TextureCache.get_default();
@@ -520,7 +517,7 @@ var LoginDialog = GObject.registerClass({
    _getBannerAllocation(dialogBox) {
        let actorBox = new Clutter.ActorBox();

-        let [minWidth, minHeight, natWidth, natHeight] = this._bannerView.get_preferred_size();
+        let [, , natWidth, natHeight] = this._bannerView.get_preferred_size();
        let centerX = dialogBox.x1 + (dialogBox.x2 - dialogBox.x1) / 2;

        actorBox.x1 = Math.floor(centerX - natWidth / 2);
@@ -534,7 +531,7 @@ var LoginDialog = GObject.registerClass({
    _getLogoBinAllocation(dialogBox) {
        let actorBox = new Clutter.ActorBox();

-        let [minWidth, minHeight, natWidth, natHeight] = this._logoBin.get_preferred_size();
+        let [, , natWidth, natHeight] = this._logoBin.get_preferred_size();
        let centerX = dialogBox.x1 + (dialogBox.x2 - dialogBox.x1) / 2;

        actorBox.x1 = Math.floor(centerX - natWidth / 2);
@@ -548,7 +545,7 @@ var LoginDialog = GObject.registerClass({
    _getCenterActorAllocation(dialogBox, actor) {
        let actorBox = new Clutter.ActorBox();

-        let [minWidth, minHeight, natWidth, natHeight] = actor.get_preferred_size();
+        let [, , natWidth, natHeight] = actor.get_preferred_size();
        let centerX = dialogBox.x1 + (dialogBox.x2 - dialogBox.x1) / 2;
        let centerY = dialogBox.y1 + (dialogBox.y2 - dialogBox.y1) / 2;

@@ -575,19 +572,15 @@ var LoginDialog = GObject.registerClass({
        // First find out what space the children require
        let bannerAllocation = null;
        let bannerHeight = 0;
-        let bannerWidth = 0;
        if (this._bannerView.visible) {
            bannerAllocation = this._getBannerAllocation(dialogBox, this._bannerView);
            bannerHeight = bannerAllocation.y2 - bannerAllocation.y1;
-            bannerWidth = bannerAllocation.x2 - bannerAllocation.x1;
        }

        let authPromptAllocation = null;
-        let authPromptHeight = 0;
        let authPromptWidth = 0;
        if (this._authPrompt.actor.visible) {
            authPromptAllocation = this._getCenterActorAllocation(dialogBox, this._authPrompt.actor);
-            authPromptHeight = authPromptAllocation.y2 - authPromptAllocation.y1;
            authPromptWidth = authPromptAllocation.x2 - authPromptAllocation.x1;
        }

@@ -619,64 +612,64 @@ var LoginDialog = GObject.registerClass({
            let leftOverYSpace = bannerSpace - bannerHeight;

            if (leftOverYSpace > 0) {
-                 // First figure out how much left over space is up top
-                 let leftOverTopSpace = leftOverYSpace / 2;
+                // First figure out how much left over space is up top
+                let leftOverTopSpace = leftOverYSpace / 2;

-                 // Then, shift the banner into the middle of that extra space
-                 let yShift = Math.floor(leftOverTopSpace / 2);
+                // Then, shift the banner into the middle of that extra space
+                let yShift = Math.floor(leftOverTopSpace / 2);

-                 bannerAllocation.y1 += yShift;
-                 bannerAllocation.y2 += yShift;
+                bannerAllocation.y1 += yShift;
+                bannerAllocation.y2 += yShift;
            } else {
-                 // Then figure out how much space there would be if we switched to a
-                 // wide layout with banner on one side and authprompt on the other.
-                 let leftOverXSpace = dialogWidth - authPromptWidth;
+                // Then figure out how much space there would be if we switched to a
+                // wide layout with banner on one side and authprompt on the other.
+                let leftOverXSpace = dialogWidth - authPromptWidth;

-                 // In a wide view, half of the available space goes to the banner,
-                 // and the other half goes to the margins.
-                 let wideBannerWidth = leftOverXSpace / 2;
-                 let wideSpacing  = leftOverXSpace - wideBannerWidth;
+                // In a wide view, half of the available space goes to the banner,
+                // and the other half goes to the margins.
+                let wideBannerWidth = leftOverXSpace / 2;
+                let wideSpacing  = leftOverXSpace - wideBannerWidth;

-                 // If we do go with a wide layout, we need there to be at least enough
-                 // space for the banner and the auth prompt to be the same width,
-                 // so it doesn't look unbalanced.
-                 if (authPromptWidth > 0 && wideBannerWidth > authPromptWidth) {
-                     let centerX = dialogBox.x1 + dialogWidth / 2;
-                     let centerY = dialogBox.y1 + dialogHeight / 2;
+                // If we do go with a wide layout, we need there to be at least enough
+                // space for the banner and the auth prompt to be the same width,
+                // so it doesn't look unbalanced.
+                if (authPromptWidth > 0 && wideBannerWidth > authPromptWidth) {
+                    let centerX = dialogBox.x1 + dialogWidth / 2;
+                    let centerY = dialogBox.y1 + dialogHeight / 2;

-                     // A small portion of the spacing goes down the center of the
-                     // screen to help delimit the two columns of the wide view
-                     let centerGap = wideSpacing / 8;
+                    // A small portion of the spacing goes down the center of the
+                    // screen to help delimit the two columns of the wide view
+                    let centerGap = wideSpacing / 8;

-                     // place the banner along the left edge of the center margin
-                     bannerAllocation.x2 = Math.floor(centerX - centerGap / 2);
-                     bannerAllocation.x1 = Math.floor(bannerAllocation.x2 - wideBannerWidth);
+                    // place the banner along the left edge of the center margin
+                    bannerAllocation.x2 = Math.floor(centerX - centerGap / 2);
+                    bannerAllocation.x1 = Math.floor(bannerAllocation.x2 - wideBannerWidth);

-                     // figure out how tall it would like to be and try to accomodate
-                     // but don't let it get too close to the logo
-                     let [wideMinHeight, wideBannerHeight] = this._bannerView.get_preferred_height(wideBannerWidth);
+                    // figure out how tall it would like to be and try to accommodate
+                    // but don't let it get too close to the logo
+                    let [, wideBannerHeight] = this._bannerView.get_preferred_height(wideBannerWidth);

-                     let maxWideHeight = dialogHeight - 3 * logoHeight;
-                     wideBannerHeight = Math.min(maxWideHeight, wideBannerHeight);
-                     bannerAllocation.y1 = Math.floor(centerY - wideBannerHeight / 2);
-                     bannerAllocation.y2 = bannerAllocation.y1 + wideBannerHeight;
+                    let maxWideHeight = dialogHeight - 3 * logoHeight;
+                    wideBannerHeight = Math.min(maxWideHeight, wideBannerHeight);
+                    bannerAllocation.y1 = Math.floor(centerY - wideBannerHeight / 2);
+                    bannerAllocation.y2 = bannerAllocation.y1 + wideBannerHeight;

-                     // place the auth prompt along the right edge of the center margin
-                     authPromptAllocation.x1 = Math.floor(centerX + centerGap / 2);
-                     authPromptAllocation.x2 = authPromptAllocation.x1 + authPromptWidth;
-                 } else {
-                     // If we aren't going to do a wide view, then we need to limit
-                     // the height of the banner so it will present scrollbars
+                    // place the auth prompt along the right edge of the center margin
+                    authPromptAllocation.x1 = Math.floor(centerX + centerGap / 2);
+                    authPromptAllocation.x2 = authPromptAllocation.x1 + authPromptWidth;
+                } else {
+                    // If we aren't going to do a wide view, then we need to limit
+                    // the height of the banner so it will present scrollbars

-                     // First figure out how much space there is without the banner
-                     leftOverYSpace += bannerHeight;
+                    // First figure out how much space there is without the banner
+                    leftOverYSpace += bannerHeight;

-                     // Then figure out how much of that space is up top
-                     let availableTopSpace = Math.floor(leftOverYSpace / 2);
+                    // Then figure out how much of that space is up top
+                    let availableTopSpace = Math.floor(leftOverYSpace / 2);

-                     // Then give all of that space to the banner
-                     bannerAllocation.y2 = bannerAllocation.y1 + availableTopSpace;
-                 }
+                    // Then give all of that space to the banner
+                    bannerAllocation.y2 = bannerAllocation.y1 + availableTopSpace;
+                }
            }
        } else if (userSelectionAllocation) {
            // Grow the user list to fill the space
@@ -764,14 +757,15 @@ var LoginDialog = GObject.registerClass({

    _fadeInBannerView() {
        this._bannerView.show();
-        Tweener.addTween(this._bannerView,
-                         { opacity: 255,
-                           time: _FADE_ANIMATION_TIME,
-                           transition: 'easeOutQuad' });
+        this._bannerView.ease({
+            opacity: 255,
+            duration: _FADE_ANIMATION_TIME,
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD
+        });
    }

    _hideBannerView() {
-        Tweener.removeTweens(this._bannerView);
+        this._bannerView.remove_all_transitions();
        this._bannerView.opacity = 0;
        this._bannerView.hide();
    }
@@ -851,10 +845,10 @@ var LoginDialog = GObject.registerClass({
    _shouldShowSessionMenuButton() {
        if (this._authPrompt.verificationStatus != AuthPrompt.AuthPromptStatus.VERIFYING &&
            this._authPrompt.verificationStatus != AuthPrompt.AuthPromptStatus.VERIFICATION_FAILED)
-          return false;
+            return false;

        if (this._user && this._user.is_loaded && this._user.is_logged_in())
-          return false;
+            return false;

        return true;
    }
@@ -864,10 +858,11 @@ var LoginDialog = GObject.registerClass({
            return;
        this._authPrompt.actor.opacity = 0;
        this._authPrompt.actor.show();
-        Tweener.addTween(this._authPrompt.actor,
-                         { opacity: 255,
-                           time: _FADE_ANIMATION_TIME,
-                           transition: 'easeOutQuad' });
+        this._authPrompt.actor.ease({
+            opacity: 255,
+            duration: _FADE_ANIMATION_TIME,
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD
+        });
        this._fadeInBannerView();
    }

@@ -911,28 +906,31 @@ var LoginDialog = GObject.registerClass({
        this._showPrompt();
    }

+    _bindOpacity() {
+        this._bindings = Main.layoutManager.uiGroup.get_children()
+            .filter(c => c != Main.layoutManager.screenShieldGroup)
+            .map(c => this.bind_property('opacity', c, 'opacity', 0));
+    }
+
+    _unbindOpacity() {
+        this._bindings.forEach(b => b.unbind());
+    }
+
    _loginScreenSessionActivated() {
        if (this.opacity == 255 && this._authPrompt.verificationStatus == AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
            return;

-        Tweener.addTween(this,
-                         { opacity: 255,
-                           time: _FADE_ANIMATION_TIME,
-                           transition: 'easeOutQuad',
-                           onUpdate() {
-                               let children = Main.layoutManager.uiGroup.get_children();
-
-                               for (let i = 0; i < children.length; i++) {
-                                   if (children[i] != Main.layoutManager.screenShieldGroup)
-                                       children[i].opacity = this.opacity;
-                               }
-                           },
-                           onUpdateScope: this,
-                           onComplete() {
-                               if (this._authPrompt.verificationStatus != AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
-                                   this._authPrompt.reset();
-                           },
-                           onCompleteScope: this });
+        this._bindOpacity();
+        this.actor.ease({
+            opacity: 255,
+            duration: _FADE_ANIMATION_TIME,
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+            onComplete: () => {
+                if (this._authPrompt.verificationStatus != AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
+                    this._authPrompt.reset();
+                this._unbindOpacity();
+            }
+        });
    }

    _gotGreeterSessionProxy(proxy) {
@@ -945,34 +943,27 @@ var LoginDialog = GObject.registerClass({
    }

    _startSession(serviceName) {
-        Tweener.addTween(this,
-                         { opacity: 0,
-                           time: _FADE_ANIMATION_TIME,
-                           transition: 'easeOutQuad',
-                           onUpdate() {
-                               let children = Main.layoutManager.uiGroup.get_children();
-
-                               for (let i = 0; i < children.length; i++) {
-                                   if (children[i] != Main.layoutManager.screenShieldGroup)
-                                       children[i].opacity = this.opacity;
-                               }
-                           },
-                           onUpdateScope: this,
-                           onComplete() {
-                               this._greeter.call_start_session_when_ready_sync(serviceName, true, null);
-                           },
-                           onCompleteScope: this });
+        this._bindOpacity();
+        this.actor.ease({
+            opacity: 0,
+            duration: _FADE_ANIMATION_TIME,
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+            onComplete: () => {
+                this._greeter.call_start_session_when_ready_sync(serviceName, true, null);
+                this._unbindOpacity();
+            }
+        });
    }

    _onSessionOpened(client, serviceName) {
-        this._authPrompt.finish(() => { this._startSession(serviceName); });
+        this._authPrompt.finish(() => this._startSession(serviceName));
    }

    _waitForItemForUser(userName) {
        let item = this._userList.getItemFromUserName(userName);

        if (item)
-          return null;
+            return null;

        let hold = new Batch.Hold();
        let signalId = this._userList.connect('item-added',
@@ -983,7 +974,7 @@ var LoginDialog = GObject.registerClass({
                    hold.release();
            });

-        hold.connect('release', () => { this._userList.disconnect(signalId); });
+        hold.connect('release', () => this._userList.disconnect(signalId));

        return hold;
    }
@@ -1047,6 +1038,7 @@ var LoginDialog = GObject.registerClass({
                             return this._blockTimedLoginUntilIdle();
                         } else {
                             animationTime = delay;
+                             return null;
                         }
                     },

@@ -1082,12 +1074,12 @@ var LoginDialog = GObject.registerClass({

        // Restart timed login on user interaction
        global.stage.connect('captured-event', (actor, event) => {
-           if (event.type() == Clutter.EventType.KEY_PRESS ||
+            if (event.type() == Clutter.EventType.KEY_PRESS ||
               event.type() == Clutter.EventType.BUTTON_PRESS) {
-               this._startTimedLogin(userName, seconds);
-           }
+                this._startTimedLogin(userName, seconds);
+            }

-           return Clutter.EVENT_PROPAGATE;
+            return Clutter.EVENT_PROPAGATE;
        });
    }

@@ -1233,10 +1225,11 @@ var LoginDialog = GObject.registerClass({

        Main.pushModal(this, { actionMode: Shell.ActionMode.LOGIN_SCREEN });

-        Tweener.addTween(this,
-                         { opacity: 255,
-                           time: 1,
-                           transition: 'easeInQuad' });
+        this.ease({
+            opacity: 255,
+            duration: 1000,
+            mode: Clutter.AnimationMode.EASE_IN_QUAD
+        });

        return true;
    }
@@ -1250,7 +1243,7 @@ var LoginDialog = GObject.registerClass({
        this._authPrompt.cancel();
    }

-    addCharacter(unichar) {
+    addCharacter(_unichar) {
        // Don't allow type ahead at the login screen
    }

--- a/js/gdm/oVirt.js
+++ b/js/gdm/oVirt.js
@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported getOVirtCredentialsManager */

 const Gio = imports.gi.Gio;
 const Signals = imports.signals;
--- a/js/gdm/realmd.js
+++ b/js/gdm/realmd.js
@@ -15,11 +15,11 @@ const RealmIface = loadInterfaceXML("org.freedesktop.realmd.Realm");
 const Realm = Gio.DBusProxy.makeProxyWrapper(RealmIface);

 var Manager = class {
-    constructor(parentActor) {
+    constructor() {
        this._aggregateProvider = Provider(Gio.DBus.system,
                                           'org.freedesktop.realmd',
                                           '/org/freedesktop/realmd',
-                                           this._reloadRealms.bind(this))
+                                           this._reloadRealms.bind(this));
        this._realms = {};

        this._signalId = this._aggregateProvider.connect('g-properties-changed',
@@ -36,10 +36,10 @@ var Manager = class {
            return;

        for (let i = 0; i < realmPaths.length; i++) {
-            let realm = Realm(Gio.DBus.system,
-                              'org.freedesktop.realmd',
-                              realmPaths[i],
-                              this._onRealmLoaded.bind(this));
+            Realm(Gio.DBus.system,
+                  'org.freedesktop.realmd',
+                  realmPaths[i],
+                  this._onRealmLoaded.bind(this));
        }
    }

@@ -98,10 +98,10 @@ var Manager = class {
        Service(Gio.DBus.system,
                'org.freedesktop.realmd',
                '/org/freedesktop/realmd',
-                service => { service.ReleaseRemote(); });
+                service => service.ReleaseRemote());
        this._aggregateProvider.disconnect(this._signalId);
        this._realms = { };
        this._updateLoginFormat();
    }
 };
-Signals.addSignalMethods(Manager.prototype)
+Signals.addSignalMethods(Manager.prototype);
--- a/js/gdm/util.js
+++ b/js/gdm/util.js
@@ -1,4 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported BANNER_MESSAGE_KEY, BANNER_MESSAGE_TEXT_KEY, LOGO_KEY,
+            DISABLE_USER_LIST_KEY, fadeInActor, fadeOutActor, cloneAndFadeOutActor */

 const { Clutter, Gio, GLib } = imports.gi;
 const Signals = imports.signals;
@@ -9,14 +11,13 @@ const OVirt = imports.gdm.oVirt;
 const Main = imports.ui.main;
 const Params = imports.misc.params;
 const SmartcardManager = imports.misc.smartcardManager;
-const Tweener = imports.ui.tweener;

 var PASSWORD_SERVICE_NAME = 'gdm-password';
 var FINGERPRINT_SERVICE_NAME = 'gdm-fingerprint';
 var SMARTCARD_SERVICE_NAME = 'gdm-smartcard';
 var OVIRT_SERVICE_NAME = 'gdm-ovirtcred';
-var FADE_ANIMATION_TIME = 0.16;
-var CLONE_FADE_ANIMATION_TIME = 0.25;
+var FADE_ANIMATION_TIME = 160;
+var CLONE_FADE_ANIMATION_TIME = 250;

 var LOGIN_SCREEN_SCHEMA = 'org.gnome.login-screen';
 var PASSWORD_AUTHENTICATION_KEY = 'enable-password-authentication';
@@ -30,7 +31,7 @@ var LOGO_KEY = 'logo';
 var DISABLE_USER_LIST_KEY = 'disable-user-list';

 // Give user 48ms to read each character of a PAM message
-var USER_READ_TIME = 48
+var USER_READ_TIME = 48;

 var MessageType = {
    NONE: 0,
@@ -45,20 +46,20 @@ function fadeInActor(actor) {

    let hold = new Batch.Hold();
    actor.show();
-    let [minHeight, naturalHeight] = actor.get_preferred_height(-1);
+    let [, naturalHeight] = actor.get_preferred_height(-1);

    actor.opacity = 0;
    actor.set_height(0);
-    Tweener.addTween(actor,
-                     { opacity: 255,
-                       height: naturalHeight,
-                       time: FADE_ANIMATION_TIME,
-                       transition: 'easeOutQuad',
-                       onComplete() {
-                           this.set_height(-1);
-                           hold.release();
-                       },
-                     });
+    actor.ease({
+        opacity: 255,
+        height: naturalHeight,
+        duration: FADE_ANIMATION_TIME,
+        mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+        onComplete: () => {
+            this.set_height(-1);
+            hold.release();
+        }
+    });

    return hold;
 }
@@ -71,17 +72,17 @@ function fadeOutActor(actor) {
    }

    let hold = new Batch.Hold();
-    Tweener.addTween(actor,
-                     { opacity: 0,
-                       height: 0,
-                       time: FADE_ANIMATION_TIME,
-                       transition: 'easeOutQuad',
-                       onComplete() {
-                           this.hide();
-                           this.set_height(-1);
-                           hold.release();
-                       },
-                     });
+    actor.ease({
+        opacity: 0,
+        height: 0,
+        duration: FADE_ANIMATION_TIME,
+        mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+        onComplete: () => {
+            this.hide();
+            this.set_height(-1);
+            hold.release();
+        }
+    });
    return hold;
 }

@@ -101,15 +102,15 @@ function cloneAndFadeOutActor(actor) {
    clone.set_position(x, y);

    let hold = new Batch.Hold();
-    Tweener.addTween(clone,
-                     { opacity: 0,
-                       time: CLONE_FADE_ANIMATION_TIME,
-                       transition: 'easeOutQuad',
-                       onComplete() {
-                           clone.destroy();
-                           hold.release();
-                       }
-                     });
+    clone.ease({
+        opacity: 0,
+        duration: CLONE_FADE_ANIMATION_TIME,
+        mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+        onComplete: () => {
+            clone.destroy();
+            hold.release();
+        }
+    });
    return hold;
 }

@@ -303,7 +304,7 @@ var ShellUserVerifier = class {
            });
    }

-    _oVirtUserAuthenticated(token) {
+    _oVirtUserAuthenticated(_token) {
        this._preemptingService = OVIRT_SERVICE_NAME;
        this.emit('ovirt-user-authenticated');
    }
@@ -342,7 +343,7 @@ var ShellUserVerifier = class {
        try {
            this._clearUserVerifier();
            this._userVerifier = client.open_reauthentication_channel_finish(result);
-        } catch(e) {
+        } catch (e) {
            if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
                return;
            if (e.matches(Gio.DBusError, Gio.DBusError.ACCESS_DENIED) &&
@@ -369,7 +370,7 @@ var ShellUserVerifier = class {
        try {
            this._clearUserVerifier();
            this._userVerifier = client.get_user_verifier_finish(result);
-        } catch(e) {
+        } catch (e) {
            if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
                return;
            this._reportInitError('Failed to obtain user verifier', e);
@@ -423,36 +424,31 @@ var ShellUserVerifier = class {
    _startService(serviceName) {
        this._hold.acquire();
        if (this._userName) {
-           this._userVerifier.call_begin_verification_for_user(serviceName,
-                                                               this._userName,
-                                                               this._cancellable,
-                                                               (obj, result) => {
-               try {
-                   obj.call_begin_verification_for_user_finish(result);
-               } catch(e) {
-                   if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
-                       return;
-                   this._reportInitError('Failed to start verification for user', e);
-                   return;
-               }
+            this._userVerifier.call_begin_verification_for_user(serviceName, this._userName, this._cancellable, (obj, result) => {
+                try {
+                    obj.call_begin_verification_for_user_finish(result);
+                } catch (e) {
+                    if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
+                        return;
+                    this._reportInitError('Failed to start verification for user', e);
+                    return;
+                }

-               this._hold.release();
-           });
+                this._hold.release();
+            });
        } else {
-           this._userVerifier.call_begin_verification(serviceName,
-                                                      this._cancellable,
-                                                      (obj, result) => {
-               try {
-                   obj.call_begin_verification_finish(result);
-               } catch(e) {
-                   if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
-                       return;
-                   this._reportInitError('Failed to start verification', e);
-                   return;
-               }
+            this._userVerifier.call_begin_verification(serviceName, this._cancellable, (obj, result) => {
+                try {
+                    obj.call_begin_verification_finish(result);
+                } catch (e) {
+                    if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
+                        return;
+                    this._reportInitError('Failed to start verification', e);
+                    return;
+                }

-               this._hold.release();
-           });
+                this._hold.release();
+            });
        }
    }

--- a/js/js-resources.gresource.xml
+++ b/js/js-resources.gresource.xml
@@ -64,6 +64,7 @@
    <file>ui/keyboard.js</file>
    <file>ui/layout.js</file>
    <file>ui/lightbox.js</file>
+    <file>ui/locatePointer.js</file>
    <file>ui/lookingGlass.js</file>
    <file>ui/magnifier.js</file>
    <file>ui/magnifierDBus.js</file>
@@ -81,9 +82,11 @@
    <file>ui/pageIndicators.js</file>
    <file>ui/panel.js</file>
    <file>ui/panelMenu.js</file>
+    <file>ui/pointerA11yTimeout.js</file>
    <file>ui/pointerWatcher.js</file>
    <file>ui/popupMenu.js</file>
    <file>ui/remoteSearch.js</file>
+    <file>ui/ripples.js</file>
    <file>ui/runDialog.js</file>
    <file>ui/screenShield.js</file>
    <file>ui/screencast.js</file>
@@ -120,6 +123,7 @@

    <file>ui/status/accessibility.js</file>
    <file>ui/status/brightness.js</file>
+    <file>ui/status/dwellClick.js</file>
    <file>ui/status/location.js</file>
    <file>ui/status/keyboard.js</file>
    <file>ui/status/nightLight.js</file>
--- a/js/misc/extensionUtils.js
+++ b/js/misc/extensionUtils.js
@@ -1,23 +1,37 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported ExtensionState, ExtensionType, getCurrentExtension,
+   getSettings, initTranslations, isOutOfDate, installImporter,
+   serializeExtension, deserializeExtension */

 // Common utils for the extension system and the extension
 // preferences tool

-const Gettext = imports.gettext;
-const Signals = imports.signals;
+const { Gio, GLib } = imports.gi;

-const Gio = imports.gi.Gio;
+const Gettext = imports.gettext;
+const Lang = imports.lang;

 const Config = imports.misc.config;
-const FileUtils = imports.misc.fileUtils;

 var ExtensionType = {
    SYSTEM: 1,
    PER_USER: 2
 };

-// Maps uuid -> metadata object
-var extensions = {};
+var ExtensionState = {
+    ENABLED: 1,
+    DISABLED: 2,
+    ERROR: 3,
+    OUT_OF_DATE: 4,
+    DOWNLOADING: 5,
+    INITIALIZED: 6,
+
+    // Used as an error state for operations on unknown extensions,
+    // should never be in a real extensionMeta object.
+    UNINSTALLED: 99
+};
+
+const SERIALIZED_PROPERTIES = ['type', 'state', 'path', 'error', 'hasPrefs', 'canChange', 'isRequested'];

 /**
 * getCurrentExtension:
@@ -31,7 +45,7 @@ function getCurrentExtension() {
    // Search for an occurrence of an extension stack frame
    // Start at 1 because 0 is the stack frame of this function
    for (let i = 1; i < stack.length; i++) {
-        if (stack[i].indexOf('/gnome-shell/extensions/') > -1) {
+        if (stack[i].includes('/gnome-shell/extensions/')) {
            extensionStackLine = stack[i];
            break;
        }
@@ -49,13 +63,17 @@ function getCurrentExtension() {
    if (!match)
        return null;

+    // local import, as the module is used from outside the gnome-shell process
+    // as well (not this function though)
+    let extensionManager = imports.ui.main.extensionManager;
+
    let path = match[1];
    let file = Gio.File.new_for_path(path);

    // Walk up the directory tree, looking for an extension with
    // the same UUID as a directory name.
    while (file != null) {
-        let extension = extensions[file.get_basename()];
+        let extension = extensionManager.lookup(file.get_basename());
        if (extension !== undefined)
            return extension;
        file = file.get_parent();
@@ -161,54 +179,50 @@ function isOutOfDate(extension) {
    return false;
 }

-function createExtensionObject(uuid, dir, type) {
-    let info;
+function serializeExtension(extension) {
+    let obj = {};
+    Lang.copyProperties(extension.metadata, obj);

-    let metadataFile = dir.get_child('metadata.json');
-    if (!metadataFile.query_exists(null)) {
-        throw new Error('Missing metadata.json');
-    }
+    SERIALIZED_PROPERTIES.forEach(prop => {
+        obj[prop] = extension[prop];
+    });

-    let metadataContents, success, tag;
-    try {
-        [success, metadataContents, tag] = metadataFile.load_contents(null);
-        if (metadataContents instanceof Uint8Array)
-            metadataContents = imports.byteArray.toString(metadataContents);
-    } catch (e) {
-        throw new Error('Failed to load metadata.json: ' + e);
-    }
-    let meta;
-    try {
-        meta = JSON.parse(metadataContents);
-    } catch (e) {
-        throw new Error('Failed to parse metadata.json: ' + e);
-    }
-
-    let requiredProperties = ['uuid', 'name', 'description', 'shell-version'];
-    for (let i = 0; i < requiredProperties.length; i++) {
-        let prop = requiredProperties[i];
-        if (!meta[prop]) {
-            throw new Error('missing "' + prop + '" property in metadata.json');
+    let res = {};
+    for (let key in obj) {
+        let val = obj[key];
+        let type;
+        switch (typeof val) {
+        case 'string':
+            type = 's';
+            break;
+        case 'number':
+            type = 'd';
+            break;
+        case 'boolean':
+            type = 'b';
+            break;
+        default:
+            continue;
        }
+        res[key] = GLib.Variant.new(type, val);
    }

-    if (uuid != meta.uuid) {
-        throw new Error('uuid "' + meta.uuid + '" from metadata.json does not match directory name "' + uuid + '"');
+    return res;
+}
+
+function deserializeExtension(variant) {
+    let res = { metadata: {} };
+    for (let prop in variant) {
+        let val = variant[prop].unpack();
+        if (SERIALIZED_PROPERTIES.includes(prop))
+            res[prop] = val;
+        else
+            res.metadata[prop] = val;
    }
-
-    let extension = {};
-
-    extension.metadata = meta;
-    extension.uuid = meta.uuid;
-    extension.type = type;
-    extension.dir = dir;
-    extension.path = dir.get_path();
-    extension.error = '';
-    extension.hasPrefs = dir.get_child('prefs.js').query_exists(null);
-
-    extensions[uuid] = extension;
-
-    return extension;
+    // add the 2 additional properties to create a valid extension object, as createExtensionObject()
+    res.uuid = res.metadata.uuid;
+    res.dir = Gio.File.new_for_path(res.path);
+    return res;
 }

 function installImporter(extension) {
@@ -219,36 +233,3 @@ function installImporter(extension) {
    extension.imports = imports[extension.uuid];
    imports.searchPath = oldSearchPath;
 }
-
-var ExtensionFinder = class {
-    _loadExtension(extensionDir, info, perUserDir) {
-        let fileType = info.get_file_type();
-        if (fileType != Gio.FileType.DIRECTORY)
-            return;
-        let uuid = info.get_name();
-        let existing = extensions[uuid];
-        if (existing) {
-            log('Extension %s already installed in %s. %s will not be loaded'.format(uuid, existing.path, extensionDir.get_path()));
-            return;
-        }
-
-        let extension;
-        let type = extensionDir.has_prefix(perUserDir) ? ExtensionType.PER_USER
-                                                       : ExtensionType.SYSTEM;
-        try {
-            extension = createExtensionObject(uuid, extensionDir, type);
-        } catch(e) {
-            logError(e, 'Could not load extension %s'.format(uuid));
-            return;
-        }
-        this.emit('extension-found', extension);
-    }
-
-    scanExtensions() {
-        let perUserDir = Gio.File.new_for_path(global.userdatadir);
-        FileUtils.collectFromDatadirs('extensions', true, (dir, info) => {
-            this._loadExtension(dir, info, perUserDir);
-        });
-    }
-};
-Signals.addSignalMethods(ExtensionFinder.prototype);
--- a/js/misc/fileUtils.js
+++ b/js/misc/fileUtils.js
@@ -1,4 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported collectFromDatadirs, deleteGFile, recursivelyDeleteDir,
+            recursivelyMoveDir, loadInterfaceXML */

 const { Gio, GLib } = imports.gi;
 const Config = imports.misc.config;
@@ -36,7 +38,7 @@ function recursivelyDeleteDir(dir, deleteParent) {
    let children = dir.enumerate_children('standard::name,standard::type',
                                          Gio.FileQueryInfoFlags.NONE, null);

-    let info, child;
+    let info;
    while ((info = children.next_file(null)) != null) {
        let type = info.get_file_type();
        let child = dir.get_child(info.get_name());
@@ -57,7 +59,7 @@ function recursivelyMoveDir(srcDir, destDir) {
    if (!destDir.query_exists(null))
        destDir.make_directory_with_parents(null);

-    let info, child;
+    let info;
    while ((info = children.next_file(null)) != null) {
        let type = info.get_file_type();
        let srcChild = srcDir.get_child(info.get_name());
@@ -84,13 +86,13 @@ function loadInterfaceXML(iface) {
    let f = Gio.File.new_for_uri(uri);

    try {
-        let [ok, bytes] = f.load_contents(null);
+        let [ok_, bytes] = f.load_contents(null);
        if (bytes instanceof Uint8Array)
-            xml = imports.byteArray.toString(bytes)
+            xml = imports.byteArray.toString(bytes);
        else
            xml = bytes.toString();
    } catch (e) {
-        log('Failed to load D-Bus interface ' + iface);
+        log(`Failed to load D-Bus interface ${iface}`);
    }

    return xml;
--- a/js/misc/gnomeSession.js
+++ b/js/misc/gnomeSession.js
@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported PresenceStatus, Presence, Inhibitor, SessionManager */

 const Gio = imports.gi.Gio;

--- a/js/misc/history.js
+++ b/js/misc/history.js
@@ -18,7 +18,7 @@ var HistoryManager = class {
        this._historyIndex = 0;
        if (this._key) {
            this._history = global.settings.get_strv(this._key);
-            global.settings.connect('changed::' + this._key,
+            global.settings.connect(`changed::${this._key}`,
                                    this._historyChanged.bind(this));

        } else {
@@ -66,7 +66,7 @@ var HistoryManager = class {
            this._indexChanged();
        }

-        return this._historyIndex ? this._history[this._historyIndex -1] : null;
+        return this._historyIndex ? this._history[this._historyIndex - 1] : null;
    }

    addItem(input) {
--- a/js/misc/ibusManager.js
+++ b/js/misc/ibusManager.js
@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported getIBusManager */

 const { Gio, GLib, IBus } = imports.gi;
 const Mainloop = imports.mainloop;
@@ -42,7 +43,7 @@ var IBusManager = class {
        this._candidatePopup = new IBusCandidatePopup.CandidatePopup();

        this._panelService = null;
-        this._engines = {};
+        this._engines = new Map();
        this._ready = false;
        this._registerPropertiesId = 0;
        this._currentEngineName = null;
@@ -62,8 +63,8 @@ var IBusManager = class {
        try {
            Gio.Subprocess.new(['ibus-daemon', '--xim', '--panel', 'disable'],
                               Gio.SubprocessFlags.NONE);
-        } catch(e) {
-            log('Failed to launch ibus-daemon: ' + e.message);
+        } catch (e) {
+            log(`Failed to launch ibus-daemon: ${e.message}`);
        }
    }

@@ -73,7 +74,7 @@ var IBusManager = class {

        this._panelService = null;
        this._candidatePopup.setPanelService(null);
-        this._engines = {};
+        this._engines.clear();
        this._ready = false;
        this._registerPropertiesId = 0;
        this._currentEngineName = null;
@@ -96,7 +97,7 @@ var IBusManager = class {
        if (enginesList) {
            for (let i = 0; i < enginesList.length; ++i) {
                let name = enginesList[i].get_name();
-                this._engines[name] = enginesList[i];
+                this._engines.set(name, enginesList[i]);
            }
            this._updateReadiness();
        } else {
@@ -119,7 +120,7 @@ var IBusManager = class {
                if (!GLib.str_has_suffix(path, '/InputContext_1'))
                    this.emit ('focus-in');
            });
-            this._panelService.connect('focus-out', () => { this.emit('focus-out'); });
+            this._panelService.connect('focus-out', () => this.emit('focus-out'));

            try {
                // IBus versions older than 1.5.10 have a bug which
@@ -138,7 +139,7 @@ var IBusManager = class {
                    engine = this._ibus.get_global_engine_async_finish(result);
                    if (!engine)
                        return;
-                } catch(e) {
+                } catch (e) {
                    return;
                }
                this._engineChanged(this._ibus, engine.get_name());
@@ -150,8 +151,7 @@ var IBusManager = class {
    }

    _updateReadiness() {
-        this._ready = (Object.keys(this._engines).length > 0 &&
-                       this._panelService != null);
+        this._ready = this._engines.size > 0 && this._panelService != null;
        this.emit('ready', this._ready);
    }

@@ -189,10 +189,10 @@ var IBusManager = class {
    }

    getEngineDesc(id) {
-        if (!this._ready || !this._engines.hasOwnProperty(id))
+        if (!this._ready || !this._engines.has(id))
            return null;

-        return this._engines[id];
+        return this._engines.get(id);
    }

    setEngine(id, callback) {
--- a/js/misc/inputMethod.js
+++ b/js/misc/inputMethod.js
@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported InputMethod */
 const { Clutter, GLib, GObject, IBus } = imports.gi;

 const Keyboard = imports.ui.status.keyboard;
@@ -74,7 +75,7 @@ class InputMethod extends Clutter.InputMethod {
        this._context = null;
        this._hints = 0;
        this._purpose = 0;
-        this._preeditStr = ''
+        this._preeditStr = '';
        this._preeditPos = 0;
        this._preeditVisible = false;
    }
@@ -84,15 +85,15 @@ class InputMethod extends Clutter.InputMethod {
            this.emit('request-surrounding');
    }

-    _onCommitText(context, text) {
+    _onCommitText(_context, text) {
        this.commit(text.get_text());
    }

-    _onDeleteSurroundingText(context) {
+    _onDeleteSurroundingText() {
        this.delete_surrounding();
    }

-    _onUpdatePreeditText(context, text, pos, visible) {
+    _onUpdatePreeditText(_context, text, pos, visible) {
        if (text == null)
            return;

@@ -108,17 +109,17 @@ class InputMethod extends Clutter.InputMethod {
        this._preeditVisible = visible;
    }

-    _onShowPreeditText(context) {
+    _onShowPreeditText() {
        this._preeditVisible = true;
        this.set_preedit_text(this._preeditStr, this._preeditPos);
    }

-    _onHidePreeditText(context) {
+    _onHidePreeditText() {
        this.set_preedit_text(null, this._preeditPos);
        this._preeditVisible = false;
    }

-    _onForwardKeyEvent(context, keyval, keycode, state) {
+    _onForwardKeyEvent(_context, keyval, keycode, state) {
        let press = (state & IBus.ModifierType.RELEASE_MASK) == 0;
        state &= ~(IBus.ModifierType.RELEASE_MASK);

@@ -262,7 +263,7 @@ class InputMethod extends Clutter.InputMethod {
                                                      let retval = context.process_key_event_async_finish(res);
                                                      this.notify_key_event(event, retval);
                                                  } catch (e) {
-                                                      log('Error processing key on IM: ' + e.message);
+                                                      log(`Error processing key on IM: ${e.message}`);
                                                  }
                                              });
        return true;
--- a/js/misc/introspect.js
+++ b/js/misc/introspect.js
@@ -1,3 +1,4 @@
+/* exported IntrospectService */
 const { Gio, GLib, Meta, Shell } = imports.gi;

 const INTROSPECT_SCHEMA = 'org.gnome.shell';
@@ -42,17 +43,20 @@ var IntrospectService = class {
    }

    _isStandaloneApp(app) {
-        let windows = app.get_windows();
-
        return app.get_windows().some(w => w.transient_for == null);
    }

    _isIntrospectEnabled() {
-       return this._settings.get_boolean(INTROSPECT_KEY);
+        return this._settings.get_boolean(INTROSPECT_KEY);
    }

    _isSenderWhitelisted(sender) {
-       return APP_WHITELIST.includes(sender);
+        return APP_WHITELIST.includes(sender);
+    }
+
+    _getSandboxedAppId(app) {
+        let ids = app.get_windows().map(w => w.get_sandboxed_app_id());
+        return ids.find(id => id != null);
    }

    _syncRunningApplications() {
@@ -76,6 +80,10 @@ var IntrospectService = class {
                newActiveApplication = app.get_id();
            }

+            let sandboxedAppId = this._getSandboxedAppId(app);
+            if (sandboxedAppId)
+                appInfo['sandboxed-app-id'] = new GLib.Variant('s', sandboxedAppId);
+
            newRunningApplications[app.get_id()] = appInfo;
        }

@@ -137,6 +145,7 @@ var IntrospectService = class {
                let frameRect = window.get_frame_rect();
                let title = window.get_title();
                let wmClass = window.get_wm_class();
+                let sandboxedAppId = window.get_sandboxed_app_id();

                windowsList[windowId] = {
                    'app-id': GLib.Variant.new('s', app.get_id()),
@@ -153,6 +162,10 @@ var IntrospectService = class {

                if (wmClass != null)
                    windowsList[windowId]['wm-class'] = GLib.Variant.new('s', wmClass);
+
+                if (sandboxedAppId != null)
+                    windowsList[windowId]['sandboxed-app-id'] =
+                        GLib.Variant.new('s', sandboxedAppId);
            }
        }
        invocation.return_value(new GLib.Variant('(a{ta{sv}})', [windowsList]));
--- a/js/misc/jsParse.js
+++ b/js/misc/jsParse.js
@@ -1,4 +1,5 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* exported getCompletions, getCommonPrefix, getDeclaredConstants */

 // Returns a list of potential completions for text. Completions either
 // follow a dot (e.g. foo.ba -> bar) or they are picked from globalCompletionList (e.g. fo -> foo)
@@ -8,7 +9,7 @@
 // This function is likely the one you want to call from external modules
 function getCompletions(text, commandHeader, globalCompletionList) {
    let methods = [];
-    let expr, base;
+    let expr_, base;
    let attrHead = '';
    if (globalCompletionList == null) {
        globalCompletionList = [];
@@ -21,7 +22,7 @@ function getCompletions(text, commandHeader, globalCompletionList) {
        // Look for expressions like "Main.panel.foo" and match Main.panel and foo
        let matches = text.match(/(.*)\.(.*)/);
        if (matches) {
-            [expr, base, attrHead] = matches;
+            [expr_, base, attrHead] = matches;

            methods = getPropertyNamesFromExpression(base, commandHeader).filter(
                attr => attr.slice(0, attrHead.length) == attrHead
@@ -32,7 +33,7 @@ function getCompletions(text, commandHeader, globalCompletionList) {
        // not proceeded by a dot and match them against global constants
        matches = text.match(/^(\w*)$/);
        if (text == '' || matches) {
-            [expr, attrHead] = matches;
+            [expr_, attrHead] = matches;
            methods = globalCompletionList.filter(
                attr => attr.slice(0, attrHead.length) == attrHead
            );
@@ -51,14 +52,14 @@ function getCompletions(text, commandHeader, globalCompletionList) {
 // if we encounter anything that isn't a letter, '.', ')', or ']',
 // we should stop parsing.
 function isStopChar(c) {
-    return !c.match(/[\w\.\)\]]/);
+    return !c.match(/[\w.)\]]/);
 }

 // Given the ending position of a quoted string, find where it starts
 function findMatchingQuote(expr, offset) {
    let quoteChar = expr.charAt(offset);
    for (let i = offset - 1; i >= 0; --i) {
-        if (expr.charAt(i) == quoteChar && expr.charAt(i-1) != '\\'){
+        if (expr.charAt(i) == quoteChar && expr.charAt(i - 1) != '\\') {
            return i;
        }
    }
@@ -68,7 +69,7 @@ function findMatchingQuote(expr, offset) {
 // Given the ending position of a regex, find where it starts
 function findMatchingSlash(expr, offset) {
    for (let i = offset - 1; i >= 0; --i) {
-        if (expr.charAt(i) == '/' && expr.charAt(i-1) != '\\'){
+        if (expr.charAt(i) == '/' && expr.charAt(i - 1) != '\\') {
            return i;
        }
    }
@@ -81,7 +82,7 @@ function findMatchingSlash(expr, offset) {
 // findMatchingBrace("[(])", 3) returns 1.
 function findMatchingBrace(expr, offset) {
    let closeBrace = expr.charAt(offset);
-    let openBrace = ({')': '(', ']': '['})[closeBrace];
+    let openBrace = ({ ')': '(', ']': '[' })[closeBrace];

    function findTheBrace(expr, offset) {
        if (offset < 0) {
@@ -117,11 +118,11 @@ function getExpressionOffset(expr, offset) {
    while (offset >= 0) {
        let currChar = expr.charAt(offset);

-        if (isStopChar(currChar)){
+        if (isStopChar(currChar)) {
            return offset + 1;
        }

-        if (currChar.match(/[\)\]]/)) {
+        if (currChar.match(/[)\]]/)) {
            offset = findMatchingBrace(expr, offset);
        }

@@ -151,15 +152,11 @@ function getAllProps(obj) {
 // e.g., expr="({ foo: null, bar: null, 4: null })" will
 // return ["foo", "bar", ...] but the list will not include "4",
 // since methods accessed with '.' notation must star with a letter or _.
-function getPropertyNamesFromExpression(expr, commandHeader) {
-    if (commandHeader == null) {
-        commandHeader = '';
-    }
-
+function getPropertyNamesFromExpression(expr, commandHeader = '') {
    let obj = {};
    if (!isUnsafeExpression(expr)) {
        try {
-                obj = eval(commandHeader + expr);
+            obj = eval(commandHeader + expr);
        } catch (e) {
            return [];
        }
@@ -168,7 +165,7 @@ function getPropertyNamesFromExpression(expr, commandHeader) {
    }

    let propsUnique = {};
-    if (typeof obj === 'object'){
+    if (typeof obj === 'object') {
        let allProps = getAllProps(obj);
        // Get only things we are allowed to complete following a '.'
        allProps = allProps.filter( isValidPropertyName );
@@ -234,10 +231,10 @@ function isUnsafeExpression(str) {
 function getDeclaredConstants(str) {
    let ret = [];
    str.split(';').forEach(s => {
-        let base, keyword;
+        let base_, keyword;
        let match = s.match(/const\s+(\w+)\s*=/);
        if (match) {
-            [base, keyword] = match;
+            [base_, keyword] = match;
            ret.push(keyword);
        }
    });
--- a/js/misc/keyboardManager.js
+++ b/js/misc/keyboardManager.js
@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported getKeyboardManager, holdKeyboard, releaseKeyboard */

 const { GLib, GnomeDesktop, Meta } = imports.gi;

@@ -60,7 +61,7 @@ var KeyboardManager = class {
            this._currentKeymap.options == options)
            return;

-        this._currentKeymap = {layouts, variants, options};
+        this._currentKeymap = { layouts, variants, options };
        Meta.get_backend().set_keymap(layouts, variants, options);
    }

@@ -125,7 +126,7 @@ var KeyboardManager = class {

    _getLocaleLayout() {
        let locale = GLib.get_language_names()[0];
-        if (locale.indexOf('_') == -1)
+        if (!locale.includes('_'))
            locale = DEFAULT_LOCALE;

        let [found, , id] = GnomeDesktop.get_input_source_from_locale(locale);
--- a/js/misc/loginManager.js
+++ b/js/misc/loginManager.js
@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported canLock, getLoginManager, registerSessionWithGDM */

 const { GLib, Gio } = imports.gi;
 const Signals = imports.signals;
@@ -43,11 +44,33 @@ function canLock() {

        let version = result.deep_unpack()[0].deep_unpack();
        return haveSystemd() && versionCompare('3.5.91', version);
-    } catch(e) {
+    } catch (e) {
        return false;
    }
 }

+
+function registerSessionWithGDM() {
+    log("Registering session with GDM");
+    Gio.DBus.system.call('org.gnome.DisplayManager',
+                         '/org/gnome/DisplayManager/Manager',
+                         'org.gnome.DisplayManager.Manager',
+                         'RegisterSession',
+                         GLib.Variant.new('(a{sv})', [{}]), null,
+                         Gio.DBusCallFlags.NONE, -1, null,
+        (source, result) => {
+            try {
+                source.call_finish(result);
+            } catch (e) {
+                if (!e.matches(Gio.DBusError, Gio.DBusError.UNKNOWN_METHOD))
+                    log(`Error registering session with GDM: ${e.message}`);
+                else
+                    log("Not calling RegisterSession(): method not exported, GDM too old?");
+            }
+        }
+    );
+}
+
 let _loginManager = null;

 /**
@@ -87,7 +110,7 @@ var LoginManagerSystemd = class {
        let sessionId = GLib.getenv('XDG_SESSION_ID');
        if (!sessionId) {
            log('Unset XDG_SESSION_ID, getCurrentSessionProxy() called outside a user session. Asking logind directly.');
-            let [session, objectPath] = this._userProxy.Display;
+            let [session, objectPath_] = this._userProxy.Display;
            if (session) {
                log(`Will monitor session ${session}`);
                sessionId = session;
@@ -160,10 +183,10 @@ var LoginManagerSystemd = class {
            (proxy, result) => {
                let fd = -1;
                try {
-                    let [outVariant, fdList] = proxy.call_with_unix_fd_list_finish(result);
+                    let [outVariant_, fdList] = proxy.call_with_unix_fd_list_finish(result);
                    fd = fdList.steal_fds()[0];
                    callback(new Gio.UnixInputStream({ fd: fd }));
-                } catch(e) {
+                } catch (e) {
                    logError(e, "Error getting systemd inhibitor");
                    callback(null);
                }
@@ -177,7 +200,7 @@ var LoginManagerSystemd = class {
 Signals.addSignalMethods(LoginManagerSystemd.prototype);

 var LoginManagerDummy = class {
-    getCurrentSessionProxy(callback) {
+    getCurrentSessionProxy(_callback) {
        // we could return a DummySession object that fakes whatever callers
        // expect (at the time of writing: connect() and connectSignal()
        // methods), but just never calling the callback should be safer
--- a/js/misc/modemManager.js
+++ b/js/misc/modemManager.js
@@ -26,33 +26,33 @@ function _getMobileProvidersDatabase() {
 }

 // _findProviderForMccMnc:
-// @operator_name: operator name
-// @operator_code: operator code
+// @operatorName: operator name
+// @operatorCode: operator code
 //
 // Given an operator name string (which may not be a real operator name) and an
 // operator code string, tries to find a proper operator name to display.
 //
-function _findProviderForMccMnc(operator_name, operator_code) {
-    if (operator_name) {
-        if (operator_name.length != 0 &&
-            (operator_name.length > 6 || operator_name.length < 5)) {
+function _findProviderForMccMnc(operatorName, operatorCode) {
+    if (operatorName) {
+        if (operatorName.length != 0 &&
+            (operatorName.length > 6 || operatorName.length < 5)) {
            // this looks like a valid name, i.e. not an MCCMNC (that some
            // devices return when not yet connected
-            return operator_name;
+            return operatorName;
        }

-        if (isNaN(parseInt(operator_name))) {
+        if (isNaN(parseInt(operatorName))) {
            // name is definitely not a MCCMNC, so it may be a name
            // after all; return that
-            return operator_name;
+            return operatorName;
        }
    }

    let needle;
-    if ((!operator_name || operator_name.length == 0) && operator_code)
-        needle = operator_code;
-    else if (operator_name && (operator_name.length == 6 || operator_name.length == 5))
-        needle = operator_name;
+    if ((!operatorName || operatorName.length == 0) && operatorCode)
+        needle = operatorCode;
+    else if (operatorName && (operatorName.length == 6 || operatorName.length == 5))
+        needle = operatorName;
    else // nothing to search
        return null;

@@ -71,7 +71,7 @@ function _findProviderForMccMnc(operator_name, operator_code) {
 // Tries to find the operator name corresponding to the given SID
 //
 function _findProviderForSid(sid) {
-    if (sid == 0)
+    if (!sid)
        return null;

    let mpd = _getMobileProvidersDatabase();
@@ -110,7 +110,7 @@ var ModemGsm = class {
            this.signal_quality = quality;
            this.emit('notify::signal-quality');
        });
-        this._proxy.connectSignal('RegistrationInfo', (proxy, sender, [status, code, name]) => {
+        this._proxy.connectSignal('RegistrationInfo', (proxy, sender, [_status, code, name]) => {
            this.operator_name = _findProviderForMccMnc(name, code);
            this.emit('notify::operator-name');
        });
@@ -120,7 +120,7 @@ var ModemGsm = class {
                return;
            }

-            let [status, code, name] = result;
+            let [status_, code, name] = result;
            this.operator_name = _findProviderForMccMnc(name, code);
            this.emit('notify::operator-name');
        });
@@ -171,9 +171,9 @@ var ModemCdma = class {
                // it will return an error if the device is not connected
                this.operator_name = null;
            } else {
-                let [bandClass, band, sid] = result;
+                let [bandClass_, band_, sid] = result;

-                this.operator_name = _findProviderForSid(sid)
+                this.operator_name = _findProviderForSid(sid);
            }
            this.emit('notify::operator-name');
        });
@@ -224,23 +224,23 @@ var BroadbandModem = class {
    }

    _reloadSignalQuality() {
-        let [quality, recent] = this._proxy.SignalQuality;
+        let [quality, recent_] = this._proxy.SignalQuality;
        this.signal_quality = quality;
        this.emit('notify::signal-quality');
    }

    _reloadOperatorName() {
-        let new_name = "";
+        let newName = "";
        if (this.operator_name_3gpp && this.operator_name_3gpp.length > 0)
-            new_name += this.operator_name_3gpp;
+            newName += this.operator_name_3gpp;

        if (this.operator_name_cdma && this.operator_name_cdma.length > 0) {
-            if (new_name != "")
-                new_name += ", ";
-            new_name += this.operator_name_cdma;
+            if (newName != "")
+                newName += ", ";
+            newName += this.operator_name_cdma;
        }

-        this.operator_name = new_name;
+        this.operator_name = newName;
        this.emit('notify::operator-name');
    }

--- a/js/misc/objectManager.js
+++ b/js/misc/objectManager.js
@@ -77,54 +77,51 @@ var ObjectManager = class {
        let info = this._interfaceInfos[interfaceName];

        if (!info) {
-           if (onFinished)
-               onFinished();
-           return;
+            if (onFinished)
+                onFinished();
+            return;
        }

        let proxy = new Gio.DBusProxy({ g_connection: this._connection,
-                                       g_name: this._serviceName,
-                                       g_object_path: objectPath,
-                                       g_interface_name: interfaceName,
-                                       g_interface_info: info,
-                                       g_flags: Gio.DBusProxyFlags.DO_NOT_AUTO_START });
+                                        g_name: this._serviceName,
+                                        g_object_path: objectPath,
+                                        g_interface_name: interfaceName,
+                                        g_interface_info: info,
+                                        g_flags: Gio.DBusProxyFlags.DO_NOT_AUTO_START });

-        proxy.init_async(GLib.PRIORITY_DEFAULT,
-                         this._cancellable,
-                         (initable, result) => {
-               let error = null;
-               try {
-                   initable.init_finish(result);
-               } catch(e) {
-                   logError(e, 'could not initialize proxy for interface ' + interfaceName);
+        proxy.init_async(GLib.PRIORITY_DEFAULT, this._cancellable, (initable, result) => {
+            try {
+                initable.init_finish(result);
+            } catch (e) {
+                logError(e, `could not initialize proxy for interface ${interfaceName}`);

-                   if (onFinished)
-                       onFinished();
-                   return;
-               }
+                if (onFinished)
+                    onFinished();
+                return;
+            }

-               let isNewObject;
-               if (!this._objects[objectPath]) {
-                   this._objects[objectPath] = {};
-                   isNewObject = true;
-               } else {
-                   isNewObject = false;
-               }
+            let isNewObject;
+            if (!this._objects[objectPath]) {
+                this._objects[objectPath] = {};
+                isNewObject = true;
+            } else {
+                isNewObject = false;
+            }

-               this._objects[objectPath][interfaceName] = proxy;
+            this._objects[objectPath][interfaceName] = proxy;

-               if (!this._interfaces[interfaceName])
-                   this._interfaces[interfaceName] = [];
+            if (!this._interfaces[interfaceName])
+                this._interfaces[interfaceName] = [];

-               this._interfaces[interfaceName].push(proxy);
+            this._interfaces[interfaceName].push(proxy);

-               if (isNewObject)
-                   this.emit('object-added', objectPath);
+            if (isNewObject)
+                this.emit('object-added', objectPath);

-               this.emit('interface-added', interfaceName, proxy);
+            this.emit('interface-added', interfaceName, proxy);

-               if (onFinished)
-                   onFinished();
+            if (onFinished)
+                onFinished();
        });
    }

@@ -155,11 +152,10 @@ var ObjectManager = class {
    }

    _onManagerProxyLoaded(initable, result) {
-        let error = null;
        try {
            initable.init_finish(result);
-        } catch(e) {
-            logError(e, 'could not initialize object manager for object ' + this._serviceName);
+        } catch (e) {
+            logError(e, `could not initialize object manager for object ${this._serviceName}`);

            this._tryToCompleteLoad();
            return;
@@ -197,7 +193,7 @@ var ObjectManager = class {
        this._managerProxy.GetManagedObjectsRemote((result, error) => {
            if (!result) {
                if (error) {
-                   logError(error, 'could not get remote objects for service ' + this._serviceName + ' path ' + this._managerPath);
+                    logError(error, `could not get remote objects for service ${this._serviceName} path ${this._managerPath}`);
                }

                this._tryToCompleteLoad();
--- a/js/misc/params.js
+++ b/js/misc/params.js
@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported parse */

 // parse:
 // @params: caller-provided parameter object, or %null
@@ -14,22 +15,13 @@
 //
 // Return value: a new object, containing the merged parameters from
 // @params and @defaults
-function parse(params, defaults, allowExtras) {
-    let ret = {}, prop;
-
-    if (!params)
-        params = {};
-
-    for (prop in params) {
-        if (!(prop in defaults) && !allowExtras)
-            throw new Error('Unrecognized parameter "' + prop + '"');
-        ret[prop] = params[prop];
+function parse(params = {}, defaults, allowExtras) {
+    if (!allowExtras) {
+        for (let prop in params)
+            if (!(prop in defaults))
+                throw new Error(`Unrecognized parameter "${prop}"`);
    }

-    for (prop in defaults) {
-        if (!(prop in params))
-            ret[prop] = defaults[prop];
-    }
-
-    return ret;
-}
+    let defaultsCopy = Object.assign({}, defaults);
+    return Object.assign(defaultsCopy, params);
+}
--- a/js/misc/permissionStore.js
+++ b/js/misc/permissionStore.js
@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported PermissionStore */

 const Gio = imports.gi.Gio;

@@ -12,4 +13,4 @@ function PermissionStore(initCallback, cancellable) {
                                    'org.freedesktop.impl.portal.PermissionStore',
                                    '/org/freedesktop/impl/portal/PermissionStore',
                                    initCallback, cancellable);
-};
+}
--- a/js/misc/smartcardManager.js
+++ b/js/misc/smartcardManager.js
@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported getSmartcardManager */

 const Gio = imports.gi.Gio;
 const Signals = imports.signals;
@@ -29,7 +30,7 @@ var SmartcardManager = class {
        this._objectManager = new ObjectManager.ObjectManager({ connection: Gio.DBus.session,
                                                                name: "org.gnome.SettingsDaemon.Smartcard",
                                                                objectPath: '/org/gnome/SettingsDaemon/Smartcard',
-                                                                knownInterfaces: [ SmartcardTokenIface ],
+                                                                knownInterfaces: [SmartcardTokenIface],
                                                                onLoaded: this._onLoaded.bind(this) });
        this._insertedTokens = {};
        this._loginToken = null;
--- a/js/misc/systemActions.js
+++ b/js/misc/systemActions.js
@@ -1,3 +1,4 @@
+/* exported getDefault */
 const { AccountsService, Clutter, Gdm, Gio, GLib, GObject, Meta } = imports.gi;

 const GnomeSession = imports.misc.gnomeSession;
@@ -83,48 +84,54 @@ const SystemActions = GObject.registerClass({
        this._canHaveSuspend = true;

        this._actions = new Map();
-        this._actions.set(POWER_OFF_ACTION_ID,
-                          { // Translators: The name of the power-off action in search
-                            name: C_("search-result", "Power Off"),
-                            iconName: 'system-shutdown-symbolic',
-                            // Translators: A list of keywords that match the power-off action, separated by semicolons
-                            keywords: _("power off;shutdown;reboot;restart").split(';'),
-                            available: false });
-        this._actions.set(LOCK_SCREEN_ACTION_ID,
-                          { // Translators: The name of the lock screen action in search
-                            name: C_("search-result", "Lock Screen"),
-                            iconName: 'system-lock-screen-symbolic',
-                            // Translators: A list of keywords that match the lock screen action, separated by semicolons
-                            keywords: _("lock screen").split(';'),
-                            available: false });
-        this._actions.set(LOGOUT_ACTION_ID,
-                          { // Translators: The name of the logout action in search
-                            name: C_("search-result", "Log Out"),
-                            iconName: 'application-exit-symbolic',
-                            // Translators: A list of keywords that match the logout action, separated by semicolons
-                            keywords: _("logout;sign off").split(';'),
-                            available: false });
-        this._actions.set(SUSPEND_ACTION_ID,
-                          { // Translators: The name of the suspend action in search
-                            name: C_("search-result", "Suspend"),
-                            iconName: 'media-playback-pause-symbolic',
-                            // Translators: A list of keywords that match the suspend action, separated by semicolons
-                            keywords: _("suspend;sleep").split(';'),
-                            available: false });
-        this._actions.set(SWITCH_USER_ACTION_ID,
-                          { // Translators: The name of the switch user action in search
-                            name: C_("search-result", "Switch User"),
-                            iconName: 'system-switch-user-symbolic',
-                            // Translators: A list of keywords that match the switch user action, separated by semicolons
-                            keywords: _("switch user").split(';'),
-                            available: false });
-        this._actions.set(LOCK_ORIENTATION_ACTION_ID,
-                          { // Translators: The name of the lock orientation action in search
-                            name: C_("search-result", "Lock Orientation"),
-                            iconName: '',
-                            // Translators: A list of keywords that match the lock orientation action, separated by semicolons
-                            keywords: _("lock orientation;screen;rotation").split(';'),
-                            available: false });
+        this._actions.set(POWER_OFF_ACTION_ID, {
+            // Translators: The name of the power-off action in search
+            name: C_("search-result", "Power Off"),
+            iconName: 'system-shutdown-symbolic',
+            // Translators: A list of keywords that match the power-off action, separated by semicolons
+            keywords: _("power off;shutdown;reboot;restart").split(/[; ]/),
+            available: false
+        });
+        this._actions.set(LOCK_SCREEN_ACTION_ID, {
+            // Translators: The name of the lock screen action in search
+            name: C_("search-result", "Lock Screen"),
+            iconName: 'system-lock-screen-symbolic',
+            // Translators: A list of keywords that match the lock screen action, separated by semicolons
+            keywords: _("lock screen").split(/[; ]/),
+            available: false
+        });
+        this._actions.set(LOGOUT_ACTION_ID, {
+            // Translators: The name of the logout action in search
+            name: C_("search-result", "Log Out"),
+            iconName: 'application-exit-symbolic',
+            // Translators: A list of keywords that match the logout action, separated by semicolons
+            keywords: _("logout;log out;sign off").split(/[; ]/),
+            available: false
+        });
+        this._actions.set(SUSPEND_ACTION_ID, {
+            // Translators: The name of the suspend action in search
+            name: C_("search-result", "Suspend"),
+            iconName: 'media-playback-pause-symbolic',
+            // Translators: A list of keywords that match the suspend action, separated by semicolons
+            keywords: _("suspend;sleep").split(/[; ]/),
+            available: false
+        });
+        this._actions.set(SWITCH_USER_ACTION_ID, {
+            // Translators: The name of the switch user action in search
+            name: C_("search-result", "Switch User"),
+            iconName: 'system-switch-user-symbolic',
+            // Translators: A list of keywords that match the switch user action, separated by semicolons
+            keywords: _("switch user").split(/[; ]/),
+            available: false
+        });
+        this._actions.set(LOCK_ORIENTATION_ACTION_ID, {
+            // Translators: The name of the lock orientation action in search
+            name: C_("search-result", "Lock Orientation"),
+            iconName: '',
+            // Translators: A list of keywords that match the lock orientation action, separated by semicolons
+            keywords: _("lock orientation;screen;rotation").split(/[; ]/),
+            available: false
+        });

        this._loginScreenSettings = new Gio.Settings({ schema_id: LOGIN_SCREEN_SCHEMA });
        this._lockdownSettings = new Gio.Settings({ schema_id: LOCKDOWN_SCHEMA });
@@ -137,92 +144,96 @@ const SystemActions = GObject.registerClass({
        this._userManager = AccountsService.UserManager.get_default();

        this._userManager.connect('notify::is-loaded',
-                                  () => { this._updateMultiUser(); });
+                                  () => this._updateMultiUser());
        this._userManager.connect('notify::has-multiple-users',
-                                  () => { this._updateMultiUser(); });
+                                  () => this._updateMultiUser());
        this._userManager.connect('user-added',
-                                  () => { this._updateMultiUser(); });
+                                  () => this._updateMultiUser());
        this._userManager.connect('user-removed',
-                                  () => { this._updateMultiUser(); });
+                                  () => this._updateMultiUser());

-        this._lockdownSettings.connect('changed::' + DISABLE_USER_SWITCH_KEY,
-                                       () => { this._updateSwitchUser(); });
-        this._lockdownSettings.connect('changed::' + DISABLE_LOG_OUT_KEY,
-                                       () => { this._updateLogout(); });
-        global.settings.connect('changed::' + ALWAYS_SHOW_LOG_OUT_KEY,
-                                () => { this._updateLogout(); });
+        this._lockdownSettings.connect(`changed::${DISABLE_USER_SWITCH_KEY}`,
+                                       () => this._updateSwitchUser());
+        this._lockdownSettings.connect(`changed::${DISABLE_LOG_OUT_KEY}`,
+                                       () => this._updateLogout());
+        global.settings.connect(`changed::${ALWAYS_SHOW_LOG_OUT_KEY}`,
+                                () => this._updateLogout());

-        this._lockdownSettings.connect('changed::' + DISABLE_LOCK_SCREEN_KEY,
-                                       () => { this._updateLockScreen(); });
+        this._lockdownSettings.connect(`changed::${DISABLE_LOCK_SCREEN_KEY}`,
+                                       () => this._updateLockScreen());

-        this._lockdownSettings.connect('changed::' + DISABLE_LOG_OUT_KEY,
-                                       () => { this._updateHaveShutdown(); });
+        this._lockdownSettings.connect(`changed::${DISABLE_LOG_OUT_KEY}`,
+                                       () => this._updateHaveShutdown());

        this.forceUpdate();

        this._orientationSettings.connect('changed::orientation-lock',
-                                          () => { this._updateOrientationLock();
-                                                  this._updateOrientationLockIcon(); });
+                                          () => {
+                                              this._updateOrientationLock();
+                                              this._updateOrientationLockIcon();
+                                          });
        Main.layoutManager.connect('monitors-changed',
-                                   () => { this._updateOrientationLock(); });
-        Gio.DBus.system.watch_name(SENSOR_BUS_NAME,
-                                   Gio.BusNameWatcherFlags.NONE,
-                                   () => { this._sensorProxyAppeared(); },
-                                   () => {
-                                       this._sensorProxy = null;
-                                       this._updateOrientationLock();
-                                   });
+                                   () => this._updateOrientationLock());
+        this._sensorProxy = new SensorProxy(Gio.DBus.system,
+            SENSOR_BUS_NAME,
+            SENSOR_OBJECT_PATH,
+            (proxy, error)  => {
+                if (error)
+                    log(error.message);
+            },
+            null,
+            Gio.DBusProxyFlags.DO_NOT_AUTO_START);
+        this._sensorProxy.connect('g-properties-changed', () => {
+            this._updateOrientationLock();
+        });
+        this._sensorProxy.connect('notify::g-name-owner', () => {
+            this._updateOrientationLock();
+        });
        this._updateOrientationLock();
        this._updateOrientationLockIcon();

-        Main.sessionMode.connect('updated', () => { this._sessionUpdated(); });
+        Main.sessionMode.connect('updated', () => this._sessionUpdated());
        this._sessionUpdated();
    }

+    // eslint-disable-next-line camelcase
    get can_power_off() {
        return this._actions.get(POWER_OFF_ACTION_ID).available;
    }

+    // eslint-disable-next-line camelcase
    get can_suspend() {
        return this._actions.get(SUSPEND_ACTION_ID).available;
    }

+    // eslint-disable-next-line camelcase
    get can_lock_screen() {
        return this._actions.get(LOCK_SCREEN_ACTION_ID).available;
    }

+    // eslint-disable-next-line camelcase
    get can_switch_user() {
        return this._actions.get(SWITCH_USER_ACTION_ID).available;
    }

+    // eslint-disable-next-line camelcase
    get can_logout() {
        return this._actions.get(LOGOUT_ACTION_ID).available;
    }

+    // eslint-disable-next-line camelcase
    get can_lock_orientation() {
        return this._actions.get(LOCK_ORIENTATION_ACTION_ID).available;
    }

+    // eslint-disable-next-line camelcase
    get orientation_lock_icon() {
        return this._actions.get(LOCK_ORIENTATION_ACTION_ID).iconName;
    }

-    _sensorProxyAppeared() {
-        this._sensorProxy = new SensorProxy(Gio.DBus.system, SENSOR_BUS_NAME, SENSOR_OBJECT_PATH,
-            (proxy, error)  => {
-                if (error) {
-                    log(error.message);
-                    return;
-                }
-                this._sensorProxy.connect('g-properties-changed',
-                                          () => { this._updateOrientationLock(); });
-                this._updateOrientationLock();
-            });
-    }
-
    _updateOrientationLock() {
        let available = false;
-        if (this._sensorProxy)
+        if (this._sensorProxy.g_name_owner)
            available = this._sensorProxy.HasAccelerometer &&
                        this._monitorManager.get_is_builtin_display_on();

@@ -257,12 +268,12 @@ const SystemActions = GObject.registerClass({

    getMatchingActions(terms) {
        // terms is a list of strings
-        terms = terms.map((term) => { return term.toLowerCase(); });
+        terms = terms.map((term) => term.toLowerCase());

        let results = [];

-        for (let [key, {available, keywords}] of this._actions)
-            if (available && terms.every(t => keywords.some(k => (k.indexOf(t) >= 0))))
+        for (let [key, { available, keywords }] of this._actions)
+            if (available && terms.every(t => keywords.some(k => k.startsWith(t))))
                results.push(key);

        return results;
@@ -278,24 +289,24 @@ const SystemActions = GObject.registerClass({

    activateAction(id) {
        switch (id) {
-            case POWER_OFF_ACTION_ID:
-                this.activatePowerOff();
-                break;
-            case LOCK_SCREEN_ACTION_ID:
-                this.activateLockScreen();
-                break;
-            case LOGOUT_ACTION_ID:
-                this.activateLogout();
-                break;
-            case SUSPEND_ACTION_ID:
-                this.activateSuspend();
-                break;
-            case SWITCH_USER_ACTION_ID:
-                this.activateSwitchUser();
-                break;
-            case LOCK_ORIENTATION_ACTION_ID:
-                this.activateLockOrientation();
-                break;
+        case POWER_OFF_ACTION_ID:
+            this.activatePowerOff();
+            break;
+        case LOCK_SCREEN_ACTION_ID:
+            this.activateLockScreen();
+            break;
+        case LOGOUT_ACTION_ID:
+            this.activateLogout();
+            break;
+        case SUSPEND_ACTION_ID:
+            this.activateSuspend();
+            break;
+        case SWITCH_USER_ACTION_ID:
+            this.activateSwitchUser();
+            break;
+        case LOCK_ORIENTATION_ACTION_ID:
+            this.activateLockOrientation();
+            break;
        }
    }

--- a/js/misc/util.js
+++ b/js/misc/util.js
@@ -1,15 +1,16 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported findUrls, spawn, spawnCommandLine, spawnApp, trySpawnCommandLine,
+            formatTime, formatTimeSpan, createTimeLabel, insertSorted,
+            makeCloseButton, ensureActorVisibleInScrollView */

 const { Clutter, Gio, GLib, GObject, Shell, St } = imports.gi;
 const Gettext = imports.gettext;
 const Mainloop = imports.mainloop;
-const Signals = imports.signals;

 const Main = imports.ui.main;
-const Tweener = imports.ui.tweener;
 const Params = imports.misc.params;

-var SCROLL_TIME = 0.1;
+var SCROLL_TIME = 100;

 // http://daringfireball.net/2010/07/improved_regex_for_matching_urls
 const _balancedParens = '\\([^\\s()<>]+\\)';
@@ -17,7 +18,7 @@ const _leadingJunk = '[\\s`(\\[{\'\\"<\u00AB\u201C\u2018]';
 const _notTrailingJunk = '[^\\s`!()\\[\\]{};:\'\\".,<>?\u00AB\u00BB\u201C\u201D\u2018\u2019]';

 const _urlRegexp = new RegExp(
-    '(^|' + _leadingJunk + ')' +
+    `(^|${_leadingJunk})` +
    '(' +
        '(?:' +
            '(?:http|https|ftp)://' +             // scheme://
@@ -29,12 +30,12 @@ const _urlRegexp = new RegExp(
        '(?:' +                                   // one or more:
            '[^\\s()<>]+' +                       // run of non-space non-()
            '|' +                                 // or
-            _balancedParens +                     // balanced parens
+            `${_balancedParens}` +                // balanced parens
        ')+' +
        '(?:' +                                   // end with:
-            _balancedParens +                     // balanced parens
+            `${_balancedParens}` +                // balanced parens
            '|' +                                 // or
-            _notTrailingJunk +                    // last non-junk char
+            `${_notTrailingJunk}` +               // last non-junk char
        ')' +
    ')', 'gi');

@@ -69,16 +70,16 @@ function spawn(argv) {
 }

 // spawnCommandLine:
-// @command_line: a command line
+// @commandLine: a command line
 //
-// Runs @command_line in the background, handling any errors that
+// Runs @commandLine in the background, handling any errors that
 // occur when trying to parse or start the program.
-function spawnCommandLine(command_line) {
+function spawnCommandLine(commandLine) {
    try {
-        let [success, argv] = GLib.shell_parse_argv(command_line);
+        let [success_, argv] = GLib.shell_parse_argv(commandLine);
        trySpawn(argv);
    } catch (err) {
-        _handleSpawnError(command_line, err);
+        _handleSpawnError(commandLine, err);
    }
 }

@@ -93,7 +94,7 @@ function spawnApp(argv) {

        let context = global.create_app_launch_context(0, -1);
        app.launch([], context);
-    } catch(err) {
+    } catch (err) {
        _handleSpawnError(argv[0], err);
    }
 }
@@ -103,13 +104,12 @@ function spawnApp(argv) {
 //
 // Runs @argv in the background. If launching @argv fails,
 // this will throw an error.
-function trySpawn(argv)
-{
-    var success, pid;
+function trySpawn(argv) {
+    var success_, pid;
    try {
-        [success, pid] = GLib.spawn_async(null, argv, null,
-                                          GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.DO_NOT_REAP_CHILD,
-                                          null);
+        [success_, pid] = GLib.spawn_async(null, argv, null,
+                                           GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.DO_NOT_REAP_CHILD,
+                                           null);
    } catch (err) {
        /* Rewrite the error in case of ENOENT */
        if (err.matches(GLib.SpawnError, GLib.SpawnError.NOENT)) {
@@ -135,19 +135,19 @@ function trySpawn(argv)
 }

 // trySpawnCommandLine:
-// @command_line: a command line
+// @commandLine: a command line
 //
-// Runs @command_line in the background. If launching @command_line
+// Runs @commandLine in the background. If launching @commandLine
 // fails, this will throw an error.
-function trySpawnCommandLine(command_line) {
-    let success, argv;
+function trySpawnCommandLine(commandLine) {
+    let success_, argv;

    try {
-        [success, argv] = GLib.shell_parse_argv(command_line);
+        [success_, argv] = GLib.shell_parse_argv(commandLine);
    } catch (err) {
        // Replace "Error invoking GLib.shell_parse_argv: " with
        // something nicer
-        err.message = err.message.replace(/[^:]*: /, _("Could not parse command:") + "\n");
+        err.message = err.message.replace(/[^:]*: /, `${_("Could not parse command:")}\n`);
        throw err;
    }

@@ -222,7 +222,7 @@ function formatTime(time, params) {
            /* Translators: Time in 24h format */
            format = N_("%H\u2236%M");
        // Show the word "Yesterday" and time if date is on yesterday
-        else if (daysAgo <2)
+        else if (daysAgo < 2)
            /* Translators: this is the word "Yesterday" followed by a
             time string in 24h format. i.e. "Yesterday, 14:30" */
            // xgettext:no-c-format
@@ -251,7 +251,7 @@ function formatTime(time, params) {
            /* Translators: Time in 12h format */
            format = N_("%l\u2236%M %p");
        // Show the word "Yesterday" and time if date is on yesterday
-        else if (daysAgo <2)
+        else if (daysAgo < 2)
            /* Translators: this is the word "Yesterday" followed by a
             time string in 12h format. i.e. "Yesterday, 2:30 pm" */
            // xgettext:no-c-format
@@ -289,7 +289,7 @@ function createTimeLabel(date, params) {
    let id = _desktopSettings.connect('changed::clock-format', () => {
        label.text = formatTime(date, params);
    });
-    label.connect('destroy', () => { _desktopSettings.disconnect(id); });
+    label.connect('destroy', () => _desktopSettings.disconnect(id));
    return label;
 }

@@ -346,7 +346,7 @@ function insertSorted(array, val, cmp) {
 var CloseButton = GObject.registerClass(
 class CloseButton extends St.Button {
    _init(boxpointer) {
-        super._init({ style_class: 'notification-close'});
+        super._init({ style_class: 'notification-close' });

        // This is a bit tricky. St.Bin has its own x-align/y-align properties
        // that compete with Clutter's properties. This should be fixed for
@@ -366,7 +366,7 @@ class CloseButton extends St.Button {
    }

    _computeBoxPointerOffset() {
-        if (!this._boxPointer || !this._boxPointer.actor.get_stage())
+        if (!this._boxPointer || !this._boxPointer.get_stage())
            return 0;

        let side = this._boxPointer.arrowSide;
@@ -380,7 +380,7 @@ class CloseButton extends St.Button {
        let themeNode = this.get_theme_node();

        let offY = this._computeBoxPointerOffset();
-        this.translation_x = themeNode.get_length('-shell-close-overlap-x')
+        this.translation_x = themeNode.get_length('-shell-close-overlap-x');
        this.translation_y = themeNode.get_length('-shell-close-overlap-y') + offY;
    }

@@ -396,7 +396,7 @@ function makeCloseButton(boxpointer) {

 function ensureActorVisibleInScrollView(scrollView, actor) {
    let adjustment = scrollView.vscroll.adjustment;
-    let [value, lower, upper, stepIncrement, pageIncrement, pageSize] = adjustment.get_values();
+    let [value, lower_, upper, stepIncrement_, pageIncrement_, pageSize] = adjustment.get_values();

    let offset = 0;
    let vfade = scrollView.get_effect("fade");
@@ -424,97 +424,8 @@ function ensureActorVisibleInScrollView(scrollView, actor) {
    else
        return;

-    Tweener.addTween(adjustment,
-                     { value: value,
-                       time: SCROLL_TIME,
-                       transition: 'easeOutQuad' });
+    adjustment.ease(value, {
+        mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+        duration: SCROLL_TIME
+    });
 }
-
-var AppSettingsMonitor = class {
-    constructor(appId, schemaId) {
-        this._appId = appId;
-        this._schemaId = schemaId;
-
-        this._app = null;
-        this._settings = null;
-        this._handlers = [];
-
-        this._schemaSource = Gio.SettingsSchemaSource.get_default();
-
-        this._appSystem = Shell.AppSystem.get_default();
-        this._appSystem.connect('installed-changed',
-                                this._onInstalledChanged.bind(this));
-        this._onInstalledChanged();
-    }
-
-    get available() {
-        return this._app != null && this._settings != null;
-    }
-
-    activateApp() {
-        if (this._app)
-            this._app.activate();
-    }
-
-    watchSetting(key, callback) {
-        let handler = { id: 0, key: key, callback: callback };
-        this._handlers.push(handler);
-
-        this._connectHandler(handler);
-    }
-
-    _connectHandler(handler) {
-        if (!this._settings || handler.id > 0)
-            return;
-
-        handler.id = this._settings.connect('changed::' + handler.key,
-                                            handler.callback);
-        handler.callback(this._settings, handler.key);
-    }
-
-    _disconnectHandler(handler) {
-        if (this._settings && handler.id > 0)
-            this._settings.disconnect(handler.id);
-        handler.id = 0;
-    }
-
-    _onInstalledChanged() {
-        let hadApp = (this._app != null);
-        this._app = this._appSystem.lookup_app(this._appId);
-        let haveApp = (this._app != null);
-
-        if (hadApp == haveApp)
-            return;
-
-        if (haveApp)
-            this._checkSettings();
-        else
-            this._setSettings(null);
-    }
-
-    _setSettings(settings) {
-        this._handlers.forEach((handler) => { this._disconnectHandler(handler); });
-
-        let hadSettings = (this._settings != null);
-        this._settings = settings;
-        let haveSettings = (this._settings != null);
-
-        this._handlers.forEach((handler) => { this._connectHandler(handler); });
-
-        if (hadSettings != haveSettings)
-            this.emit('available-changed');
-    }
-
-    _checkSettings() {
-        let schema = this._schemaSource.lookup(this._schemaId, true);
-        if (schema) {
-            this._setSettings(new Gio.Settings({ settings_schema: schema }));
-        } else if (this._app) {
-            Mainloop.timeout_add_seconds(1, () => {
-                this._checkSettings();
-                return GLib.SOURCE_REMOVE;
-            });
-        }
-    }
-};
-Signals.addSignalMethods(AppSettingsMonitor.prototype);
--- a/js/misc/weather.js
+++ b/js/misc/weather.js
@@ -1,10 +1,19 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

-const { Geoclue, Gio, GLib, GWeather } = imports.gi;
+const { Geoclue, Gio, GLib, GWeather, Shell } = imports.gi;
 const Signals = imports.signals;

 const PermissionStore = imports.misc.permissionStore;
-const Util = imports.misc.util;
+
+const { loadInterfaceXML } = imports.misc.fileUtils;
+
+const WeatherIntegrationIface = loadInterfaceXML('org.gnome.Shell.WeatherIntegration');
+
+const WEATHER_BUS_NAME = 'org.gnome.Weather';
+const WEATHER_OBJECT_PATH = '/org/gnome/Weather';
+const WEATHER_INTEGRATION_IFACE = 'org.gnome.Shell.WeatherIntegration';
+
+const WEATHER_APP_ID = 'org.gnome.Weather.desktop';

 // Minimum time between updates to show loading indication
 var UPDATE_THRESHOLD = 10 * GLib.TIME_SPAN_MINUTE;
@@ -26,13 +35,21 @@ var WeatherClient = class {
        this._weatherAuthorized = false;
        this._permStore = new PermissionStore.PermissionStore((proxy, error) => {
            if (error) {
-                log('Failed to connect to permissionStore: ' + error.message);
+                log(`Failed to connect to permissionStore: ${error.message}`);
+                return;
+            }
+
+            if (this._permStore.g_name_owner == null) {
+                // Failed to auto-start, likely because xdg-desktop-portal
+                // isn't installed; don't restrict access to location service
+                this._weatherAuthorized = true;
+                this._updateAutoLocation();
                return;
            }

            this._permStore.LookupRemote('gnome', 'geolocation', (res, error) => {
                if (error)
-                    log('Error looking up permission: ' + error.message);
+                    log(`Error looking up permission: ${error.message}`);

                let [perms, data] = error ? [{}, null] : res;
                let  params = ['gnome', 'geolocation', false, data, perms];
@@ -58,17 +75,38 @@ var WeatherClient = class {
            this.emit('changed');
        });

-        this._weatherAppMon = new Util.AppSettingsMonitor('org.gnome.Weather.desktop',
-                                                          'org.gnome.Weather');
-        this._weatherAppMon.connect('available-changed', () => { this.emit('changed'); });
-        this._weatherAppMon.watchSetting('automatic-location',
-                                         this._onAutomaticLocationChanged.bind(this));
-        this._weatherAppMon.watchSetting('locations',
-                                         this._onLocationsChanged.bind(this));
+        this._weatherApp = null;
+        this._weatherProxy = null;
+
+        let nodeInfo = Gio.DBusNodeInfo.new_for_xml(WeatherIntegrationIface);
+        Gio.DBusProxy.new(
+            Gio.DBus.session,
+            Gio.DBusProxyFlags.DO_NOT_AUTO_START | Gio.DBusProxyFlags.GET_INVALIDATED_PROPERTIES,
+            nodeInfo.lookup_interface(WEATHER_INTEGRATION_IFACE),
+            WEATHER_BUS_NAME,
+            WEATHER_OBJECT_PATH,
+            WEATHER_INTEGRATION_IFACE,
+            null,
+            this._onWeatherProxyReady.bind(this));
+
+        this._settings = new Gio.Settings({
+            schema_id: 'org.gnome.shell.weather'
+        });
+        this._settings.connect('changed::automatic-location',
+            this._onAutomaticLocationChanged.bind(this));
+        this._onAutomaticLocationChanged();
+        this._settings.connect('changed::locations',
+            this._onLocationsChanged.bind(this));
+        this._onLocationsChanged();
+
+        this._appSystem = Shell.AppSystem.get_default();
+        this._appSystem.connect('installed-changed',
+            this._onInstalledChanged.bind(this));
+        this._onInstalledChanged();
    }

    get available() {
-        return this._weatherAppMon.available;
+        return this._weatherApp != null;
    }

    get loading() {
@@ -84,7 +122,8 @@ var WeatherClient = class {
    }

    activateApp() {
-        this._weatherAppMon.activateApp();
+        if (this._weatherApp)
+            this._weatherApp.activate();
    }

    update() {
@@ -106,6 +145,38 @@ var WeatherClient = class {
               this._weatherAuthorized;
    }

+    _onWeatherProxyReady(o, res) {
+        try {
+            this._weatherProxy = Gio.DBusProxy.new_finish(res);
+        } catch (e) {
+            log(`Failed to create GNOME Weather proxy: ${e}`);
+            return;
+        }
+
+        this._weatherProxy.connect('g-properties-changed',
+            this._onWeatherPropertiesChanged.bind(this));
+        this._onWeatherPropertiesChanged();
+    }
+
+    _onWeatherPropertiesChanged() {
+        if (this._weatherProxy.g_name_owner == null)
+            return;
+
+        this._settings.set_boolean('automatic-location',
+            this._weatherProxy.AutomaticLocation);
+        this._settings.set_value('locations',
+            new GLib.Variant('av', this._weatherProxy.Locations));
+    }
+
+    _onInstalledChanged() {
+        let hadApp = (this._weatherApp != null);
+        this._weatherApp = this._appSystem.lookup_app(WEATHER_APP_ID);
+        let haveApp = (this._weatherApp != null);
+
+        if (hadApp !== haveApp)
+            this.emit('changed');
+    }
+
    _loadInfo() {
        let id = this._weatherInfo.connect('updated', () => {
            this._weatherInfo.disconnect(id);
@@ -170,8 +241,8 @@ var WeatherClient = class {
            (o, res) => {
                try {
                    this._gclueService = Geoclue.Simple.new_finish(res);
-                } catch(e) {
-                    log('Failed to connect to Geoclue2 service: ' + e.message);
+                } catch (e) {
+                    log(`Failed to connect to Geoclue2 service: ${e.message}`);
                    this._setLocation(this._mostRecentLocation);
                    return;
                }
@@ -190,8 +261,8 @@ var WeatherClient = class {
        this._setLocation(location);
    }

-    _onAutomaticLocationChanged(settings, key) {
-        let useAutoLocation = settings.get_boolean(key);
+    _onAutomaticLocationChanged() {
+        let useAutoLocation = this._settings.get_boolean('automatic-location');
        if (this._autoLocationRequested == useAutoLocation)
            return;

@@ -209,8 +280,9 @@ var WeatherClient = class {
            this._setLocation(this._mostRecentLocation);
    }

-    _onLocationsChanged(settings, key) {
-        let serialized = settings.get_value(key).deep_unpack().shift();
+    _onLocationsChanged() {
+        let locations = this._settings.get_value('locations').deep_unpack();
+        let serialized = locations.shift();
        let mostRecentLocation = null;

        if (serialized)
@@ -226,7 +298,7 @@ var WeatherClient = class {
    }

    _onPermStoreChanged(proxy, sender, params) {
-        let [table, id, deleted, data, perms] = params;
+        let [table, id, deleted_, data_, perms] = params;

        if (table != 'gnome' || id != 'geolocation')
            return;
--- a/js/perf/core.js
+++ b/js/perf/core.js
@@ -1,4 +1,9 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported run, script_overviewShowStart, script_overviewShowDone,
+            script_applicationsShowStart, script_applicationsShowDone,
+            script_afterShowHide, malloc_usedSize, glx_swapComplete,
+            clutter_stagePaintDone */
+/* eslint camelcase: ["error", { properties: "never", allow: ["^script_", "^malloc", "^glx", "^clutter"] }] */

 const System = imports.system;

@@ -10,7 +15,7 @@ const Scripting = imports.ui.scripting;
 // someone should be able to get an idea of how well the shell is performing
 // on a particular system.

-let METRICS = {
+var METRICS = {
    overviewLatencyFirst:
    { description: "Time to first frame after triggering overview, first time",
      units: "us" },
@@ -19,7 +24,7 @@ let METRICS = {
      units: "frames / s" },
    overviewLatencySubsequent:
    { description: "Time to first frame after triggering overview, second time",
-      units: "us"},
+      units: "us" },
    overviewFpsSubsequent:
    { description: "Frames rate when going to the overview, second time",
      units: "frames / s" },
@@ -52,7 +57,7 @@ let METRICS = {
      units: "us" },
    applicationsShowTimeSubsequent:
    { description: "Time to switch to applications view, second time",
-      units: "us"}
+      units: "us" }
 };

 let WINDOW_CONFIGS = [
@@ -121,9 +126,11 @@ function *run() {

    for (let i = 0; i < 2; i++) {
        Scripting.scriptEvent('applicationsShowStart');
+        // eslint-disable-next-line require-atomic-updates
        Main.overview._dash.showAppsButton.checked = true;
        yield Scripting.waitLeisure();
        Scripting.scriptEvent('applicationsShowDone');
+        // eslint-disable-next-line require-atomic-updates
        Main.overview._dash.showAppsButton.checked = false;
        yield Scripting.waitLeisure();
    }
@@ -136,7 +143,6 @@ let overviewFrames;
 let overviewLatency;
 let mallocUsedSize = 0;
 let overviewShowCount = 0;
-let firstOverviewUsedSize;
 let haveSwapComplete = false;
 let applicationsShowStart;
 let applicationsShowCount = 0;
@@ -148,7 +154,7 @@ function script_overviewShowStart(time) {
    overviewFrames = 0;
 }

-function script_overviewShowDone(time) {
+function script_overviewShowDone(_time) {
    // We've set up the state at the end of the zoom out, but we
    // need to wait for one more frame to paint before we count
    // ourselves as done.
@@ -167,7 +173,7 @@ function script_applicationsShowDone(time) {
        METRICS.applicationsShowTimeSubsequent.value = time - applicationsShowStart;
 }

-function script_afterShowHide(time) {
+function script_afterShowHide(_time) {
    if (overviewShowCount == 1) {
        METRICS.usedAfterOverview.value = mallocUsedSize;
    } else {
--- a/js/perf/hwtest.js
+++ b/js/perf/hwtest.js
@@ -1,8 +1,17 @@
-const { Clutter, Gio, Gtk, Shell } = imports.gi;
+/* exported run, script_desktopShown, script_overviewShowStart,
+            script_overviewShowDone, script_applicationsShowStart,
+            script_applicationsShowDone, script_mainViewDrawStart,
+            script_mainViewDrawDone, script_overviewDrawStart,
+            script_overviewDrawDone, script_redrawTestStart,
+            script_redrawTestDone, script_collectTimings,
+            script_geditLaunch, script_geditFirstFrame,
+            clutter_stagePaintStart, clutter_paintCompletedTimestamp */
+/* eslint camelcase: ["error", { properties: "never", allow: ["^script_", "^clutter"] }] */
+const { Clutter, Gio, Shell } = imports.gi;
 const Main = imports.ui.main;
 const Scripting = imports.ui.scripting;

-let METRICS = {
+var METRICS = {
    timeToDesktop:
    { description: "Time from starting graphical.target to desktop showing",
      units: "us" },
@@ -30,7 +39,7 @@ let METRICS = {
    geditStartTime:
    { description: "Time from gedit launch to window drawn",
      units: "us" },
-}
+};

 function waitAndDraw(milliseconds) {
    let cb;
@@ -38,7 +47,7 @@ function waitAndDraw(milliseconds) {
    let timeline = new Clutter.Timeline({ duration: milliseconds });
    timeline.start();

-    timeline.connect('new-frame', (timeline, frame) => {
+    timeline.connect('new-frame', (_timeline, _frame) => {
        global.stage.queue_redraw();
    });

@@ -48,7 +57,7 @@ function waitAndDraw(milliseconds) {
            cb();
    });

-    return callback => { cb = callback; };
+    return callback => cb = callback;
 }

 function waitSignal(object, signal) {
@@ -60,7 +69,7 @@ function waitSignal(object, signal) {
            cb();
    });

-    return callback => { cb = callback; };
+    return callback => cb = callback;
 }

 function extractBootTimestamp() {
@@ -73,8 +82,8 @@ function extractBootTimestamp() {
    let result = null;

    let datastream = Gio.DataInputStream.new(sp.get_stdout_pipe());
-    while (true) {
-        let [line, length] = datastream.read_line_utf8(null);
+    while (true) { // eslint-disable-line no-constant-condition
+        let [line, length_] = datastream.read_line_utf8(null);
        if (line === null)
            break;

@@ -104,7 +113,10 @@ function *run() {
    yield Scripting.waitLeisure();
    Scripting.scriptEvent('desktopShown');

-    Gtk.Settings.get_default().gtk_enable_animations = false;
+    let interfaceSettings = new Gio.Settings({
+        schema_id: 'org.gnome.desktop.interface'
+    });
+    interfaceSettings.set_boolean('enable-animations', false);

    Scripting.scriptEvent('overviewShowStart');
    Main.overview.show();
@@ -114,6 +126,7 @@ function *run() {
    yield Scripting.sleep(1000);

    Scripting.scriptEvent('applicationsShowStart');
+    // eslint-disable-next-line require-atomic-updates
    Main.overview._dash.showAppsButton.checked = true;

    yield Scripting.waitLeisure();
@@ -154,7 +167,7 @@ function *run() {
    Main.overview.hide();

    yield Scripting.createTestWindow({ maximized: true,
-                                       redraws: true});
+                                       redraws: true });
    yield Scripting.waitTestWindows();

    yield Scripting.sleep(1000);
@@ -200,7 +213,7 @@ function *run() {

    yield Scripting.sleep(1000);

-    Gtk.Settings.get_default().gtk_enable_animations = true;
+    interfaceSettings.set_boolean('enable-animations', true);
 }

 let overviewShowStart;
@@ -231,31 +244,31 @@ function script_applicationsShowDone(time) {
    METRICS.applicationsShowTime.value = time - applicationsShowStart;
 }

-function script_mainViewDrawStart(time) {
+function script_mainViewDrawStart(_time) {
    redrawTiming = 'mainView';
 }

-function script_mainViewDrawDone(time) {
+function script_mainViewDrawDone(_time) {
    redrawTiming = null;
 }

-function script_overviewDrawStart(time) {
+function script_overviewDrawStart(_time) {
    redrawTiming = 'overview';
 }

-function script_overviewDrawDone(time) {
+function script_overviewDrawDone(_time) {
    redrawTiming = null;
 }

-function script_redrawTestStart(time) {
+function script_redrawTestStart(_time) {
    redrawTiming = 'application';
 }

-function script_redrawTestDone(time) {
+function script_redrawTestDone(_time) {
    redrawTiming = null;
 }

-function script_collectTimings(time) {
+function script_collectTimings(_time) {
    for (let timing in redrawTimes) {
        let times = redrawTimes[timing];
        times.sort((a, b) => a - b);
@@ -266,11 +279,11 @@ function script_collectTimings(time) {
        if (len == 0)
            median = -1;
        else if (len % 2 == 1)
-            median = times[(len - 1)/ 2];
+            median = times[(len - 1) / 2];
        else
            median = Math.round((times[len / 2 - 1] + times[len / 2]) / 2);

-        METRICS[timing + 'RedrawTime'].value = median;
+        METRICS[`${timing}RedrawTime`].value = median;
    }
 }

--- a/js/portalHelper/main.js
+++ b/js/portalHelper/main.js
@@ -1,3 +1,4 @@
+/* exported main */
 const Format = imports.format;
 const Gettext = imports.gettext;
 const { Gio, GLib, GObject, Gtk, Pango, Soup, WebKit2: WebKit } = imports.gi;
@@ -19,7 +20,6 @@ const PortalHelperSecurityLevel = {
    INSECURE: 2
 };

-const INACTIVITY_TIMEOUT = 30000; //ms
 const CONNECTIVITY_CHECK_HOST = 'nmcheck.gnome.org';
 const CONNECTIVITY_CHECK_URI = 'http://' + CONNECTIVITY_CHECK_HOST;
 const CONNECTIVITY_RECHECK_RATELIMIT_TIMEOUT = 30 * GLib.USEC_PER_SEC;
@@ -59,7 +59,7 @@ class PortalHeaderBar extends Gtk.HeaderBar {
                                             single_line_mode: true,
                                             ellipsize: Pango.EllipsizeMode.END,
                                             valign: Gtk.Align.BASELINE,
-                                             selectable: true});
+                                             selectable: true });
        this.subtitleLabel.get_style_context().add_class('subtitle');
        hbox.add(this.subtitleLabel);

@@ -152,7 +152,7 @@ class PortalWindow extends Gtk.ApplicationWindow {
        this._webView.load_uri(this._originalUrl);
    }

-    vfunc_delete_event(event) {
+    vfunc_delete_event(_event) {
        if (this._recheckAtExit)
            this._doneCallback(PortalHelperResult.RECHECK);
        else
@@ -178,7 +178,7 @@ class PortalWindow extends Gtk.ApplicationWindow {
        this._headerBar.setSecurityIcon(PortalHelperSecurityLevel.INSECURE);
    }

-    _onLoadFailedWithTlsErrors(view, failingURI, certificate, errors) {
+    _onLoadFailedWithTlsErrors(view, failingURI, certificate, _errors) {
        this._headerBar.setSecurityIcon(PortalHelperSecurityLevel.INSECURE);
        let uri = new Soup.URI(failingURI);
        this._webContext.allow_tls_certificate_for_host(certificate, uri.get_host());
@@ -265,7 +265,7 @@ class WebPortalHelper extends Gtk.Application {
        this._queue = [];

        let action = new Gio.SimpleAction({ name: 'quit' });
-        action.connect('activate', () => { this.active_window.destroyWindow(); });
+        action.connect('activate', () => this.active_window.destroyWindow());
        this.add_action(action);
    }

--- a/js/ui/accessDialog.js
+++ b/js/ui/accessDialog.js
@@ -1,4 +1,5 @@
-const { Clutter, Gio, GLib, Shell } = imports.gi;
+/* exported AccessDialogDBus */
+const { Clutter, Gio, GLib, GObject, Shell } = imports.gi;

 const CheckBox = imports.ui.checkBox;
 const Dialog = imports.ui.dialog;
@@ -15,9 +16,10 @@ var DialogResponse = {
    CLOSED: 2
 };

-var AccessDialog = class extends ModalDialog.ModalDialog {
-    constructor(invocation, handle, title, subtitle, body, options) {
-        super({ styleClass: 'access-dialog' });
+var AccessDialog = GObject.registerClass(
+class AccessDialog extends ModalDialog.ModalDialog {
+    _init(invocation, handle, title, subtitle, body, options) {
+        super._init({ styleClass: 'access-dialog' });

        this._invocation = invocation;
        this._handle = handle;
@@ -68,7 +70,7 @@ var AccessDialog = class extends ModalDialog.ModalDialog {
        this.addButton({ label: grantLabel,
                         action: () => {
                             this._sendResponse(DialogResponse.OK);
-                         }});
+                         } });
    }

    open() {
@@ -78,7 +80,7 @@ var AccessDialog = class extends ModalDialog.ModalDialog {
        this._requestExported = this._request.export(connection, this._handle);
    }

-    CloseAsync(invocation, params) {
+    CloseAsync(invocation, _params) {
        if (this._invocation.get_sender() != invocation.get_sender()) {
            invocation.return_error_literal(Gio.DBusError,
                                            Gio.DBusError.ACCESS_DENIED,
@@ -109,7 +111,7 @@ var AccessDialog = class extends ModalDialog.ModalDialog {
        });
        this.close();
    }
-};
+});

 var AccessDialogDBus = class {
    constructor() {
@@ -131,10 +133,10 @@ var AccessDialogDBus = class {
            return;
        }

-        let [handle, appId, parentWindow, title, subtitle, body, options] = params;
+        let [handle, appId, parentWindow_, title, subtitle, body, options] = params;
        // We probably want to use parentWindow and global.display.focus_window
        // for this check in the future
-        if (appId && appId + '.desktop' != this._windowTracker.focus_app.id) {
+        if (appId && `${appId}.desktop` != this._windowTracker.focus_app.id) {
            invocation.return_error_literal(Gio.DBusError,
                                            Gio.DBusError.ACCESS_DENIED,
                                            'Only the focused app is allowed to show a system access dialog');
@@ -145,7 +147,7 @@ var AccessDialogDBus = class {
                                      subtitle, body, options);
        dialog.open();

-        dialog.connect('closed', () => { this._accessDialog = null; });
+        dialog.connect('closed', () => this._accessDialog = null);

        this._accessDialog = dialog;
    }
--- a/js/ui/altTab.js
+++ b/js/ui/altTab.js
@@ -1,17 +1,18 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported AppSwitcherPopup, GroupCyclerPopup, WindowSwitcherPopup,
+            WindowCyclerPopup */

 const { Atk, Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
 const Mainloop = imports.mainloop;

 const Main = imports.ui.main;
 const SwitcherPopup = imports.ui.switcherPopup;
-const Tweener = imports.ui.tweener;

 var APP_ICON_HOVER_TIMEOUT = 200; // milliseconds

 var THUMBNAIL_DEFAULT_SIZE = 256;
 var THUMBNAIL_POPUP_TIME = 500; // milliseconds
-var THUMBNAIL_FADE_TIME = 0.1; // seconds
+var THUMBNAIL_FADE_TIME = 100; // milliseconds

 var WINDOW_PREVIEW_SIZE = 128;
 var APP_ICON_SIZE = 96;
@@ -36,7 +37,7 @@ function _createWindowClone(window, size) {
                               // usual hack for the usual bug in ClutterBinLayout...
                               x_expand: true,
                               y_expand: true });
-};
+}

 function getWindows(workspace) {
    // We ignore skip-taskbar windows in switchers, but if they are attached
@@ -87,9 +88,9 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
            let hPadding = leftPadding + rightPadding;

            let icon = this._items[this._selectedIndex];
-            let [posX, posY] = icon.get_transformed_position();
+            let [posX] = icon.get_transformed_position();
            let thumbnailCenter = posX + icon.width / 2;
-            let [childMinWidth, childNaturalWidth] = this._thumbnails.get_preferred_width(-1);
+            let [, childNaturalWidth] = this._thumbnails.get_preferred_width(-1);
            childBox.x1 = Math.max(primary.x + leftPadding, Math.floor(thumbnailCenter - childNaturalWidth / 2));
            if (childBox.x1 + childNaturalWidth > primary.x + primary.width - hPadding) {
                let offset = childBox.x1 + childNaturalWidth - primary.width + hPadding;
@@ -103,7 +104,7 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
                childBox.x2 = primary.x + primary.width - rightPadding;
            childBox.y1 = this._switcherList.allocation.y2 + spacing;
            this._thumbnails.addClones(primary.y + primary.height - bottomPadding - childBox.y1);
-            let [childMinHeight, childNaturalHeight] = this._thumbnails.get_preferred_height(-1);
+            let [, childNaturalHeight] = this._thumbnails.get_preferred_height(-1);
            childBox.y2 = childBox.y1 + childNaturalHeight;
            this._thumbnails.allocate(childBox, flags);
        }
@@ -360,15 +361,15 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {

    _destroyThumbnails() {
        let thumbnailsActor = this._thumbnails;
-        Tweener.addTween(thumbnailsActor,
-                         { opacity: 0,
-                           time: THUMBNAIL_FADE_TIME,
-                           transition: 'easeOutQuad',
-                           onComplete: () => {
-                               thumbnailsActor.destroy();
-                               this.thumbnailsVisible = false;
-                           }
-                         });
+        this._thumbnails.ease({
+            opacity: 0,
+            duration: THUMBNAIL_FADE_TIME,
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+            onComplete: () => {
+                thumbnailsActor.destroy();
+                this.thumbnailsVisible = false;
+            }
+        });
        this._thumbnails = null;
        if (this._switcherList._items[this._selectedIndex])
            this._switcherList._items[this._selectedIndex].remove_accessible_state (Atk.StateType.EXPANDED);
@@ -391,12 +392,14 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
        this._thumbnails.get_allocation_box();

        this._thumbnails.opacity = 0;
-        Tweener.addTween(this._thumbnails,
-                         { opacity: 255,
-                           time: THUMBNAIL_FADE_TIME,
-                           transition: 'easeOutQuad',
-                           onComplete: () => { this.thumbnailsVisible = true; }
-                         });
+        this._thumbnails.ease({
+            opacity: 255,
+            duration: THUMBNAIL_FADE_TIME,
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+            onComplete: () => {
+                this.thumbnailsVisible = true;
+            }
+        });

        this._switcherList._items[this._selectedIndex].add_accessible_state (Atk.StateType.EXPANDED);
    }
@@ -459,7 +462,7 @@ class CyclerHighlight {
    _onDestroy() {
        this.window = null;
    }
-};
+}

 // We don't show an actual popup, so just provide what SwitcherPopup
 // expects instead of inheriting from SwitcherList
@@ -469,17 +472,15 @@ var CyclerList = GObject.registerClass({
               'item-removed': { param_types: [GObject.TYPE_INT] },
               'item-highlighted': { param_types: [GObject.TYPE_INT] } },
 }, class CyclerList extends St.Widget {
-    highlight(index, justOutline) {
+    highlight(index, _justOutline) {
        this.emit('item-highlighted', index);
    }
 });

-var CyclerPopup = GObject.registerClass(
-class CyclerPopup extends SwitcherPopup.SwitcherPopup {
+var CyclerPopup = GObject.registerClass({
+    GTypeFlags: GObject.TypeFlags.ABSTRACT
+}, class CyclerPopup extends SwitcherPopup.SwitcherPopup {
    _init() {
-        if (new.target === CyclerPopup)
-            throw new TypeError('Cannot instantiate abstract class ' + new.target.name);
-
        super._init();

        this._items = this._getWindows();
@@ -496,7 +497,7 @@ class CyclerPopup extends SwitcherPopup.SwitcherPopup {
        });
    }

-    _highlightItem(index, justOutline) {
+    _highlightItem(index, _justOutline) {
        this._highlight.window = this._items[index];
        global.window_group.set_child_above_sibling(this._highlight.actor, null);
    }
@@ -619,9 +620,8 @@ class WindowSwitcherPopup extends SwitcherPopup.SwitcherPopup {
 var WindowCyclerPopup = GObject.registerClass(
 class WindowCyclerPopup extends CyclerPopup {
    _init() {
-        super._init();
-
        this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell.window-switcher' });
+        super._init();
    }

    _getWindows() {
@@ -663,17 +663,10 @@ class AppIcon extends St.BoxLayout {
        this.add(this.label, { x_fill: false });
    }

+    // eslint-disable-next-line camelcase
    set_size(size) {
        this.icon = this.app.create_icon_texture(size);
        this._iconBin.child = this.icon;
-        this._iconBin.set_size(size, size);
-    }
-
-    vfunc_get_preferred_width(forHeight) {
-        let [minWidth, ] = super.vfunc_get_preferred_width(forHeight);
-
-        minWidth = Math.max(minWidth, forHeight);
-        return [minWidth, minWidth];
    }
 });

@@ -727,15 +720,16 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {

    _setIconSize() {
        let j = 0;
-        while(this._items.length > 1 && this._items[j].style_class != 'item-box') {
-                j++;
+        while (this._items.length > 1 && this._items[j].style_class != 'item-box') {
+            j++;
        }
        let themeNode = this._items[j].get_theme_node();
+        this._list.ensure_style();

        let iconPadding = themeNode.get_horizontal_padding();
        let iconBorder = themeNode.get_border_width(St.Side.LEFT) + themeNode.get_border_width(St.Side.RIGHT);
-        let [iconMinHeight, iconNaturalHeight] = this.icons[j].label.get_preferred_height(-1);
-        let iconSpacing = iconNaturalHeight + iconPadding + iconBorder;
+        let [, labelNaturalHeight] = this.icons[j].label.get_preferred_height(-1);
+        let iconSpacing = labelNaturalHeight + iconPadding + iconBorder;
        let totalSpacing = this._list.spacing * (this._items.length - 1);

        // We just assume the whole screen here due to weirdness happing with the passed width
@@ -748,7 +742,7 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
        let iconSize = baseIconSizes[0];

        if (this._items.length > 1) {
-            for(let i =  0; i < baseIconSizes.length; i++) {
+            for (let i =  0; i < baseIconSizes.length; i++) {
                iconSize = baseIconSizes[i];
                let height = iconSizes[i] + iconSpacing;
                let w = height * this._items.length + totalSpacing;
@@ -759,7 +753,7 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {

        this._iconSize = iconSize;

-        for(let i = 0; i < this.icons.length; i++) {
+        for (let i = 0; i < this.icons.length; i++) {
            if (this.icons[i].icon != null)
                break;
            this.icons[i].set_size(iconSize);
@@ -805,12 +799,13 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
                                                            return GLib.SOURCE_REMOVE;
                                                        });
            GLib.Source.set_name_by_id(this._mouseTimeOutId, '[gnome-shell] this._enterItem');
-        } else
-           this._itemEntered(index);
+        } else {
+            this._itemEntered(index);
+        }
    }

    _enterItem(index) {
-        let [x, y, mask] = global.get_pointer();
+        let [x, y] = global.get_pointer();
        let pickedActor = global.stage.get_actor_at_pos(Clutter.PickMode.ALL, x, y);
        if (this._items[index].contains(pickedActor))
            this._itemEntered(index);
@@ -851,9 +846,8 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
                this._removeIcon(app);
        });

-        let n = this._arrows.length;
        let arrow = new St.DrawingArea({ style_class: 'switcher-arrow' });
-        arrow.connect('repaint', () => { SwitcherPopup.drawArrow(arrow, St.Side.BOTTOM); });
+        arrow.connect('repaint', () => SwitcherPopup.drawArrow(arrow, St.Side.BOTTOM));
        this.add_actor(arrow);
        this._arrows.push(arrow);

@@ -918,7 +912,7 @@ class ThumbnailList extends SwitcherPopup.SwitcherList {
            return;
        let totalPadding = this._items[0].get_theme_node().get_horizontal_padding() + this._items[0].get_theme_node().get_vertical_padding();
        totalPadding += this.get_theme_node().get_horizontal_padding() + this.get_theme_node().get_vertical_padding();
-        let [labelMinHeight, labelNaturalHeight] = this._labels[0].get_preferred_height(-1);
+        let [, labelNaturalHeight] = this._labels[0].get_preferred_height(-1);
        let spacing = this._items[0].child.get_theme_node().get_length('spacing');
        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
        let thumbnailSize = THUMBNAIL_DEFAULT_SIZE * scaleFactor;
@@ -994,23 +988,23 @@ class WindowIcon extends St.BoxLayout {
        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;

        switch (mode) {
-            case AppIconMode.THUMBNAIL_ONLY:
-                size = WINDOW_PREVIEW_SIZE;
-                this._icon.add_actor(_createWindowClone(mutterWindow, size * scaleFactor));
-                break;
+        case AppIconMode.THUMBNAIL_ONLY:
+            size = WINDOW_PREVIEW_SIZE;
+            this._icon.add_actor(_createWindowClone(mutterWindow, size * scaleFactor));
+            break;

-            case AppIconMode.BOTH:
-                size = WINDOW_PREVIEW_SIZE;
-                this._icon.add_actor(_createWindowClone(mutterWindow, size * scaleFactor));
+        case AppIconMode.BOTH:
+            size = WINDOW_PREVIEW_SIZE;
+            this._icon.add_actor(_createWindowClone(mutterWindow, size * scaleFactor));

-                if (this.app)
-                    this._icon.add_actor(this._createAppIcon(this.app,
-                                                             APP_ICON_SIZE_SMALL));
-                break;
+            if (this.app)
+                this._icon.add_actor(this._createAppIcon(this.app,
+                                                         APP_ICON_SIZE_SMALL));
+            break;

-            case AppIconMode.APP_ICON_ONLY:
-                size = APP_ICON_SIZE;
-                this._icon.add_actor(this._createAppIcon(this.app, size));
+        case AppIconMode.APP_ICON_ONLY:
+            size = APP_ICON_SIZE;
+            this._icon.add_actor(this._createAppIcon(this.app, size));
        }

        this._icon.set_size(size * scaleFactor, size * scaleFactor);
@@ -1047,7 +1041,7 @@ class WindowList extends SwitcherPopup.SwitcherList {
            this.icons.push(icon);

            icon._unmanagedSignalId = icon.window.connect('unmanaged', (window) => {
-                this._removeWindow(window)
+                this._removeWindow(window);
            });
        }

@@ -1083,7 +1077,7 @@ class WindowList extends SwitcherPopup.SwitcherList {
        childBox.y1 = childBox.y2 - this._label.height;
        this._label.allocate(childBox, flags);

-        let totalLabelHeight = this._label.height + themeNode.get_padding(St.Side.BOTTOM)
+        let totalLabelHeight = this._label.height + themeNode.get_padding(St.Side.BOTTOM);
        childBox.x1 = box.x1;
        childBox.x2 = box.x2;
        childBox.y1 = box.y1;
--- a/js/ui/animation.js
+++ b/js/ui/animation.js
@@ -1,13 +1,12 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported Animation, AnimatedIcon, Spinner */

-const { GLib, Gio, St } = imports.gi;
+const { Clutter, GLib, Gio, St } = imports.gi;
 const Mainloop = imports.mainloop;

-const Tweener = imports.ui.tweener;
-
 var ANIMATED_ICON_UPDATE_TIMEOUT = 16;
-var SPINNER_ANIMATION_TIME = 0.3;
-var SPINNER_ANIMATION_DELAY = 1.0;
+var SPINNER_ANIMATION_TIME = 300;
+var SPINNER_ANIMATION_DELAY = 1000;

 var Animation = class {
    constructor(file, width, height, speed) {
@@ -62,11 +61,11 @@ var Animation = class {
        if (!validResourceScale)
            return;

-        let texture_cache = St.TextureCache.get_default();
+        let textureCache = St.TextureCache.get_default();
        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-        this._animations = texture_cache.load_sliced_image(file, width, height,
-                                                           scaleFactor, resourceScale,
-                                                           this._animationsLoaded.bind(this));
+        this._animations = textureCache.load_sliced_image(file, width, height,
+                                                          scaleFactor, resourceScale,
+                                                          this._animationsLoaded.bind(this));
        this.actor.set_child(this._animations);
    }

@@ -123,7 +122,7 @@ var AnimatedIcon = class extends Animation {
 };

 var Spinner = class extends AnimatedIcon {
-    constructor(size, animate=false) {
+    constructor(size, animate = false) {
        let file = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/process-working.svg');
        super(file, size);

@@ -137,15 +136,15 @@ var Spinner = class extends AnimatedIcon {
    }

    play() {
-        Tweener.removeTweens(this.actor);
+        this.actor.remove_all_transitions();

        if (this._animate) {
            super.play();
-            Tweener.addTween(this.actor, {
+            this.actor.ease({
                opacity: 255,
                delay: SPINNER_ANIMATION_DELAY,
-                time: SPINNER_ANIMATION_TIME,
-                transition: 'linear'
+                duration: SPINNER_ANIMATION_TIME,
+                mode: Clutter.AnimationMode.LINEAR
            });
        } else {
            this.actor.opacity = 255;
@@ -154,16 +153,14 @@ var Spinner = class extends AnimatedIcon {
    }

    stop() {
-        Tweener.removeTweens(this.actor);
+        this.actor.remove_all_transitions();

        if (this._animate) {
-            Tweener.addTween(this.actor, {
+            this.actor.ease({
                opacity: 0,
                time: SPINNER_ANIMATION_TIME,
                transition: 'linear',
-                onComplete: () => {
-                    this.stop(false);
-                }
+                onComplete: () => super.stop()
            });
        } else {
            this.actor.opacity = 0;
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
--- a/js/ui/appFavorites.js
+++ b/js/ui/appFavorites.js
@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported getAppFavorites */

 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
@@ -14,39 +15,47 @@ const RENAMED_DESKTOP_IDS = {
    'epiphany.desktop': 'org.gnome.Epiphany.desktop',
    'evolution.desktop': 'org.gnome.Evolution.desktop',
    'file-roller.desktop': 'org.gnome.FileRoller.desktop',
+    'five-or-more.desktop': 'org.gnome.five-or-more.desktop',
+    'four-in-a-row.desktop': 'org.gnome.Four-in-a-row.desktop',
    'gcalctool.desktop': 'org.gnome.Calculator.desktop',
    'geary.desktop': 'org.gnome.Geary.desktop',
    'gedit.desktop': 'org.gnome.gedit.desktop',
-    'glchess.desktop': 'gnome-chess.desktop',
-    'glines.desktop': 'five-or-more.desktop',
-    'gnect.desktop': 'four-in-a-row.desktop',
+    'glchess.desktop': 'org.gnome.Chess.desktop',
+    'glines.desktop': 'org.gnome.five-or-more.desktop',
+    'gnect.desktop': 'org.gnome.Four-in-a-row.desktop',
    'gnibbles.desktop': 'org.gnome.Nibbles.desktop',
-    'gnobots2.desktop': 'gnome-robots.desktop',
+    'gnobots2.desktop': 'org.gnome.Robots.desktop',
    'gnome-boxes.desktop': 'org.gnome.Boxes.desktop',
    'gnome-calculator.desktop': 'org.gnome.Calculator.desktop',
+    'gnome-chess.desktop': 'org.gnome.Chess.desktop',
    'gnome-clocks.desktop': 'org.gnome.clocks.desktop',
    'gnome-contacts.desktop': 'org.gnome.Contacts.desktop',
    'gnome-documents.desktop': 'org.gnome.Documents.desktop',
    'gnome-font-viewer.desktop': 'org.gnome.font-viewer.desktop',
+    'gnome-klotski.desktop': 'org.gnome.Klotski.desktop',
    'gnome-nibbles.desktop': 'org.gnome.Nibbles.desktop',
    'gnome-mahjongg.desktop': 'org.gnome.Mahjongg.desktop',
+    'gnome-mines.desktop': 'org.gnome.Mines.desktop',
    'gnome-music.desktop': 'org.gnome.Music.desktop',
    'gnome-photos.desktop': 'org.gnome.Photos.desktop',
+    'gnome-robots.desktop': 'org.gnome.Robots.desktop',
    'gnome-screenshot.desktop': 'org.gnome.Screenshot.desktop',
    'gnome-software.desktop': 'org.gnome.Software.desktop',
    'gnome-terminal.desktop': 'org.gnome.Terminal.desktop',
+    'gnome-tetravex.desktop': 'org.gnome.Tetravex.desktop',
    'gnome-tweaks.desktop': 'org.gnome.tweaks.desktop',
    'gnome-weather.desktop': 'org.gnome.Weather.desktop',
-    'gnomine.desktop': 'gnome-mines.desktop',
-    'gnotravex.desktop': 'gnome-tetravex.desktop',
-    'gnotski.desktop': 'gnome-klotski.desktop',
-    'gtali.desktop': 'tali.desktop',
+    'gnomine.desktop': 'org.gnome.Mines.desktop',
+    'gnotravex.desktop': 'org.gnome.Tetravex.desktop',
+    'gnotski.desktop': 'org.gnome.Klotski.desktop',
+    'gtali.desktop': 'org.gnome.Tali.desktop',
    'iagno.desktop': 'org.gnome.Reversi.desktop',
    'nautilus.desktop': 'org.gnome.Nautilus.desktop',
    'org.gnome.gnome-2048.desktop': 'org.gnome.TwentyFortyEight.desktop',
    'org.gnome.taquin.desktop': 'org.gnome.Taquin.desktop',
    'org.gnome.Weather.Application.desktop': 'org.gnome.Weather.desktop',
    'polari.desktop': 'org.gnome.Polari.desktop',
+    'tali.desktop': 'org.gnome.Tali.desktop',
    'totem.desktop': 'org.gnome.Totem.desktop',
    'evince.desktop': 'org.gnome.Evince.desktop',
 };
@@ -55,7 +64,7 @@ class AppFavorites {
    constructor() {
        this.FAVORITE_APPS_KEY = 'favorite-apps';
        this._favorites = {};
-        global.settings.connect('changed::' + this.FAVORITE_APPS_KEY, this._onFavsChanged.bind(this));
+        global.settings.connect(`changed::${this.FAVORITE_APPS_KEY}`, this._onFavsChanged.bind(this));
        this.reload();
    }

@@ -179,7 +188,7 @@ class AppFavorites {
                                   }
                                 });
    }
-};
+}
 Signals.addSignalMethods(AppFavorites.prototype);

 var appFavoritesInstance = null;
--- a/js/ui/audioDeviceSelection.js
+++ b/js/ui/audioDeviceSelection.js
@@ -1,4 +1,5 @@
-const { Clutter, Gio, GLib, Meta, Shell, St } = imports.gi;
+/* exported AudioDeviceSelectionDBus */
+const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;

 const Main = imports.ui.main;
 const ModalDialog = imports.ui.modalDialog;
@@ -13,10 +14,11 @@ var AudioDevice = {

 const AudioDeviceSelectionIface = loadInterfaceXML('org.gnome.Shell.AudioDeviceSelection');

-var AudioDeviceSelectionDialog =
-class AudioDeviceSelectionDialog extends ModalDialog.ModalDialog {
-    constructor(devices) {
-        super({ styleClass: 'audio-device-selection-dialog' });
+var AudioDeviceSelectionDialog = GObject.registerClass({
+    Signals: { 'device-selected': { param_types: [GObject.TYPE_UINT] } }
+}, class AudioDeviceSelectionDialog extends ModalDialog.ModalDialog {
+    _init(devices) {
+        super._init({ styleClass: 'audio-device-selection-dialog' });

        this._deviceItems = {};

@@ -33,11 +35,7 @@ class AudioDeviceSelectionDialog extends ModalDialog.ModalDialog {
            throw new Error('Too few devices for a selection');
    }

-    destroy() {
-        super.destroy();
-    }
-
-    _buildLayout(devices) {
+    _buildLayout() {
        let title = new St.Label({ style_class: 'audio-selection-title',
                                   text: _("Select Audio Device"),
                                   x_align: Clutter.ActorAlign.CENTER });
@@ -57,28 +55,28 @@ class AudioDeviceSelectionDialog extends ModalDialog.ModalDialog {
    }

    _getDeviceLabel(device) {
-        switch(device) {
-            case AudioDevice.HEADPHONES:
-                return _("Headphones");
-            case AudioDevice.HEADSET:
-                return _("Headset");
-            case AudioDevice.MICROPHONE:
-                return _("Microphone");
-            default:
-                return null;
+        switch (device) {
+        case AudioDevice.HEADPHONES:
+            return _("Headphones");
+        case AudioDevice.HEADSET:
+            return _("Headset");
+        case AudioDevice.MICROPHONE:
+            return _("Microphone");
+        default:
+            return null;
        }
    }

    _getDeviceIcon(device) {
-        switch(device) {
-            case AudioDevice.HEADPHONES:
-                return 'audio-headphones-symbolic';
-            case AudioDevice.HEADSET:
-                return 'audio-headset-symbolic';
-            case AudioDevice.MICROPHONE:
-                return 'audio-input-microphone-symbolic';
-            default:
-                return null;
+        switch (device) {
+        case AudioDevice.HEADPHONES:
+            return 'audio-headphones-symbolic';
+        case AudioDevice.HEADSET:
+            return 'audio-headset-symbolic';
+        case AudioDevice.MICROPHONE:
+            return 'audio-input-microphone-symbolic';
+        default:
+            return null;
        }
    }

@@ -88,6 +86,7 @@ class AudioDeviceSelectionDialog extends ModalDialog.ModalDialog {
        box.connect('notify::height', () => {
            Meta.later_add(Meta.LaterType.BEFORE_REDRAW, () => {
                box.width = box.height;
+                return GLib.SOURCE_REMOVE;
            });
        });

@@ -113,11 +112,11 @@ class AudioDeviceSelectionDialog extends ModalDialog.ModalDialog {
    }

    _openSettings() {
-        let desktopFile = 'gnome-sound-panel.desktop'
+        let desktopFile = 'gnome-sound-panel.desktop';
        let app = Shell.AppSystem.get_default().lookup_app(desktopFile);

        if (!app) {
-            log('Settings panel for desktop file ' + desktopFile + ' could not be loaded!');
+            log(`Settings panel for desktop file ${desktopFile} could not be loaded!`);
            return;
        }

@@ -125,7 +124,7 @@ class AudioDeviceSelectionDialog extends ModalDialog.ModalDialog {
        Main.overview.hide();
        app.activate();
    }
-};
+});

 var AudioDeviceSelectionDBus = class AudioDeviceSelectionDBus {
    constructor() {
@@ -162,12 +161,12 @@ var AudioDeviceSelectionDBus = class AudioDeviceSelectionDBus {

        let [deviceNames] = params;
        let devices = 0;
-        deviceNames.forEach(n => { devices |= AudioDevice[n.toUpperCase()]; });
+        deviceNames.forEach(n => devices |= AudioDevice[n.toUpperCase()]);

        let dialog;
        try {
            dialog = new AudioDeviceSelectionDialog(devices);
-        } catch(e) {
+        } catch (e) {
            invocation.return_value(null);
            return;
        }
--- a/js/ui/background.js
+++ b/js/ui/background.js
@@ -99,7 +99,6 @@ const Signals = imports.signals;
 const LoginManager = imports.misc.loginManager;
 const Main = imports.ui.main;
 const Params = imports.misc.params;
-const Tweener = imports.ui.tweener;

 var DEFAULT_BACKGROUND_COLOR = Clutter.Color.from_pixel(0x2e3436ff);

@@ -108,10 +107,9 @@ const PRIMARY_COLOR_KEY = 'primary-color';
 const SECONDARY_COLOR_KEY = 'secondary-color';
 const COLOR_SHADING_TYPE_KEY = 'color-shading-type';
 const BACKGROUND_STYLE_KEY = 'picture-options';
-const PICTURE_OPACITY_KEY = 'picture-opacity';
 const PICTURE_URI_KEY = 'picture-uri';

-var FADE_ANIMATION_TIME = 1.0;
+var FADE_ANIMATION_TIME = 1000;

 // These parameters affect how often we redraw.
 // The first is how different (percent crossfaded) the slide show
@@ -257,14 +255,15 @@ var Background = class Background {
                this._refreshAnimation();
            });

-        this._settingsChangedSignalId = this._settings.connect('changed', () => {
-            this.emit('changed');
-        });
+        this._settingsChangedSignalId =
+            this._settings.connect('changed', this._emitChangedSignal.bind(this));

        this._load();
    }

    destroy() {
+        this.background = null;
+
        this._cancellable.cancel();
        this._removeAnimationTimeout();

@@ -288,6 +287,22 @@ var Background = class Background {
        if (this._settingsChangedSignalId != 0)
            this._settings.disconnect(this._settingsChangedSignalId);
        this._settingsChangedSignalId = 0;
+
+        if (this._changedIdleId) {
+            GLib.source_remove(this._changedIdleId);
+            this._changedIdleId = 0;
+        }
+    }
+
+    _emitChangedSignal() {
+        if (this._changedIdleId)
+            return;
+
+        this._changedIdleId = GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
+            this._changedIdleId = 0;
+            this.emit('changed');
+            return GLib.SOURCE_REMOVE;
+        });
    }

    updateResolution() {
@@ -317,12 +332,12 @@ var Background = class Background {
    }

    _loadPattern() {
-        let colorString, res, color, secondColor;
+        let colorString, res_, color, secondColor;

        colorString = this._settings.get_string(PRIMARY_COLOR_KEY);
-        [res, color] = Clutter.Color.from_string(colorString);
+        [res_, color] = Clutter.Color.from_string(colorString);
        colorString = this._settings.get_string(SECONDARY_COLOR_KEY);
-        [res, secondColor] = Clutter.Color.from_string(colorString);
+        [res_, secondColor] = Clutter.Color.from_string(colorString);

        let shadingType = this._settings.get_enum(COLOR_SHADING_TYPE_KEY);

@@ -343,7 +358,7 @@ var Background = class Background {
                                               if (changedFile.equal(file)) {
                                                   let imageCache = Meta.BackgroundImageCache.get_default();
                                                   imageCache.purge(changedFile);
-                                                   this.emit('changed');
+                                                   this._emitChangedSignal();
                                               }
                                           });
        this._fileWatches[key] = signalId;
@@ -416,12 +431,12 @@ var Background = class Background {
            return;

        this._updateAnimationTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT,
-                                                      interval,
-                                                      () => {
-                                                          this._updateAnimationTimeoutId = 0;
-                                                          this._updateAnimation();
-                                                          return GLib.SOURCE_REMOVE;
-                                                      });
+                                                          interval,
+                                                          () => {
+                                                              this._updateAnimationTimeoutId = 0;
+                                                              this._updateAnimation();
+                                                              return GLib.SOURCE_REMOVE;
+                                                          });
        GLib.Source.set_name_by_id(this._updateAnimationTimeoutId, '[gnome-shell] this._updateAnimation');
    }

@@ -448,9 +463,9 @@ var Background = class Background {

        let cache = Meta.BackgroundImageCache.get_default();
        let image = cache.load(file);
-        if (image.is_loaded())
+        if (image.is_loaded()) {
            this._setLoaded();
-        else {
+        } else {
            let id = image.connect('loaded', () => {
                this._setLoaded();
                image.disconnect(id);
@@ -617,9 +632,9 @@ var Animation = class Animation {
    }

    load(callback) {
-        this._show = new GnomeDesktop.BGSlideShow({ filename: this.file.get_path() });
+        this._show = new GnomeDesktop.BGSlideShow({ file: this.file });

-        this._show.load_async(null, (object, result) => {
+        this._show.load_async(null, () => {
            this.loaded = true;
            if (callback)
                callback();
@@ -635,7 +650,7 @@ var Animation = class Animation {
        if (this._show.get_num_slides() < 1)
            return;

-        let [progress, duration, isFixed, filename1, filename2] = this._show.get_current_slide(monitor.width, monitor.height);
+        let [progress, duration, isFixed_, filename1, filename2] = this._show.get_current_slide(monitor.width, monitor.height);

        this.transitionDuration = duration;
        this.transitionProgress = progress;
@@ -694,15 +709,12 @@ var BackgroundManager = class BackgroundManager {
        this._newBackgroundActor = null;
        this.emit('changed');

-        Tweener.addTween(oldBackgroundActor,
-                         { opacity: 0,
-                           time: FADE_ANIMATION_TIME,
-                           transition: 'easeOutQuad',
-                           onComplete() {
-                               oldBackgroundActor.background.run_dispose();
-                               oldBackgroundActor.destroy();
-                           }
-                         });
+        oldBackgroundActor.ease({
+            opacity: 0,
+            duration: FADE_ANIMATION_TIME,
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+            onComplete: () => oldBackgroundActor.destroy()
+        });
    }

    _updateBackgroundActor() {
--- a/js/ui/backgroundMenu.js
+++ b/js/ui/backgroundMenu.js
@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported addBackgroundMenu */

 const { Clutter, St } = imports.gi;

@@ -25,7 +26,7 @@ var BackgroundMenu = class BackgroundMenu extends PopupMenu.PopupMenu {
 function addBackgroundMenu(actor, layoutManager) {
    actor.reactive = true;
    actor._backgroundMenu = new BackgroundMenu(layoutManager);
-    actor._backgroundManager = new PopupMenu.PopupMenuManager({ actor: actor });
+    actor._backgroundManager = new PopupMenu.PopupMenuManager(actor);
    actor._backgroundManager.addMenu(actor._backgroundMenu);

    function openMenu(x, y) {
--- a/js/ui/barLevel.js
+++ b/js/ui/barLevel.js
@@ -1,74 +1,106 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* exported BarLevel */

-const { Atk, Clutter, St } = imports.gi;
-const Signals = imports.signals;
+const { Atk, Clutter, GObject, St } = imports.gi;

-var BarLevel = class {
-    constructor(value, params) {
-        if (isNaN(value))
-            // Avoid spreading NaNs around
-            throw TypeError('The bar level value must be a number');
+var BarLevel = GObject.registerClass({
+    Properties: {
+        'value': GObject.ParamSpec.double(
+            'value', 'value', 'value',
+            GObject.ParamFlags.READWRITE,
+            0, 2, 0),
+        'maximum-value': GObject.ParamSpec.double(
+            'maximum-value', 'maximum-value', 'maximum-value',
+            GObject.ParamFlags.READWRITE,
+            1, 2, 1),
+        'overdrive-start': GObject.ParamSpec.double(
+            'overdrive-start', 'overdrive-start', 'overdrive-start',
+            GObject.ParamFlags.READWRITE,
+            1, 2, 1)
+    }
+}, class BarLevel extends St.DrawingArea {
+    _init(params) {
        this._maxValue = 1;
-        this._value = Math.max(Math.min(value, this._maxValue), 0);
+        this._value = 0;
        this._overdriveStart = 1;
        this._barLevelWidth = 0;

-        if (params == undefined)
-            params = {}
-
-        this.actor = new St.DrawingArea({ styleClass: params['styleClass'] || 'barlevel',
-                                          can_focus: params['canFocus'] || false,
-                                          reactive: params['reactive'] || false,
-                                          accessible_role: params['accessibleRole'] || Atk.Role.LEVEL_BAR });
-        this.actor.connect('repaint', this._barLevelRepaint.bind(this));
-        this.actor.connect('allocation-changed', (actor, box) => {
+        let defaultParams = {
+            style_class: 'barlevel',
+            accessible_role: Atk.Role.LEVEL_BAR
+        };
+        super._init(Object.assign(defaultParams, params));
+        this.connect('allocation-changed', (actor, box) => {
            this._barLevelWidth = box.get_width();
        });

-        this._customAccessible = St.GenericAccessible.new_for_actor(this.actor);
-        this.actor.set_accessible(this._customAccessible);
+        this._customAccessible = St.GenericAccessible.new_for_actor(this);
+        this.set_accessible(this._customAccessible);

        this._customAccessible.connect('get-current-value', this._getCurrentValue.bind(this));
        this._customAccessible.connect('get-minimum-value', this._getMinimumValue.bind(this));
        this._customAccessible.connect('get-maximum-value', this._getMaximumValue.bind(this));
        this._customAccessible.connect('set-current-value', this._setCurrentValue.bind(this));

-        this.connect('value-changed', this._valueChanged.bind(this));
+        this.connect('notify::value', this._valueChanged.bind(this));
    }

-    setValue(value) {
-        if (isNaN(value))
-            throw TypeError('The bar level value must be a number');
-
-        this._value = Math.max(Math.min(value, this._maxValue), 0);
-        this.actor.queue_repaint();
+    get value() {
+        return this._value;
    }

-    setMaximumValue(value) {
-        if (isNaN(value))
-            throw TypeError('The bar level max value must be a number');
+    set value(value) {
+        value = Math.max(Math.min(value, this._maxValue), 0);

-        this._maxValue = Math.max(value, 1);
+        if (this._value == value)
+            return;
+
+        this._value = value;
+        this.notify('value');
+        this.queue_repaint();
+    }
+
+    // eslint-disable-next-line camelcase
+    get maximum_value() {
+        return this._maxValue;
+    }
+
+    // eslint-disable-next-line camelcase
+    set maximum_value(value) {
+        value = Math.max(value, 1);
+
+        if (this._maxValue == value)
+            return;
+
+        this._maxValue = value;
        this._overdriveStart = Math.min(this._overdriveStart, this._maxValue);
-        this.actor.queue_repaint();
+        this.notify('maximum-value');
+        this.queue_repaint();
    }

-    setOverdriveStart(value) {
-        if (isNaN(value))
-            throw TypeError('The overdrive limit value must be a number');
+    // eslint-disable-next-line camelcase
+    get overdrive_start() {
+        return this._overdriveStart;
+    }
+
+    // eslint-disable-next-line camelcase
+    set overdrive_start(value) {
+        if (this._overdriveStart == value)
+            return;
+
        if (value > this._maxValue)
            throw new Error(`Tried to set overdrive value to ${value}, ` +
                `which is a number greater than the maximum allowed value ${this._maxValue}`);

        this._overdriveStart = value;
-        this._value = Math.max(Math.min(value, this._maxValue), 0);
-        this.actor.queue_repaint();
+        this.notify('overdrive-start');
+        this.queue_repaint();
    }

-    _barLevelRepaint(area) {
-        let cr = area.get_context();
-        let themeNode = area.get_theme_node();
-        let [width, height] = area.get_surface_size();
+    vfunc_repaint() {
+        let cr = this.get_context();
+        let themeNode = this.get_theme_node();
+        let [width, height] = this.get_surface_size();

        let barLevelHeight = themeNode.get_length('-barlevel-height');
        let barLevelBorderRadius = Math.min(width, barLevelHeight) / 2;
@@ -105,7 +137,7 @@ var BarLevel = class {
            overdriveSeparatorWidth = themeNode.get_length('-barlevel-overdrive-separator-width');

        /* background bar */
-        cr.arc(width - barLevelBorderRadius - barLevelBorderWidth, height / 2, barLevelBorderRadius, TAU * 3 / 4, TAU * 1 / 4);
+        cr.arc(width - barLevelBorderRadius - barLevelBorderWidth, height / 2, barLevelBorderRadius, TAU * (3 / 4), TAU * (1 / 4));
        cr.lineTo(endX, (height + barLevelHeight) / 2);
        cr.lineTo(endX, (height - barLevelHeight) / 2);
        cr.lineTo(width - barLevelBorderRadius - barLevelBorderWidth, (height - barLevelHeight) / 2);
@@ -117,11 +149,12 @@ var BarLevel = class {

        /* normal progress bar */
        let x = Math.min(endX, overdriveSeparatorX - overdriveSeparatorWidth / 2);
-        cr.arc(barLevelBorderRadius + barLevelBorderWidth, height / 2, barLevelBorderRadius, TAU * 1 / 4, TAU * 3 / 4);
+        cr.arc(barLevelBorderRadius + barLevelBorderWidth, height / 2, barLevelBorderRadius, TAU * (1 / 4), TAU * (3 / 4));
        cr.lineTo(x, (height - barLevelHeight) / 2);
        cr.lineTo(x, (height + barLevelHeight) / 2);
        cr.lineTo(barLevelBorderRadius + barLevelBorderWidth, (height + barLevelHeight) / 2);
-        Clutter.cairo_set_source_color(cr, barLevelActiveColor);
+        if (this._value > 0)
+            Clutter.cairo_set_source_color(cr, barLevelActiveColor);
        cr.fillPreserve();
        Clutter.cairo_set_source_color(cr, barLevelActiveBorderColor);
        cr.setLineWidth(barLevelBorderWidth);
@@ -143,17 +176,19 @@ var BarLevel = class {
        }

        /* end progress bar arc */
-        if (this._value <= this._overdriveStart)
-            Clutter.cairo_set_source_color(cr, barLevelActiveColor);
-        else
-            Clutter.cairo_set_source_color(cr, barLevelOverdriveColor);
-        cr.arc(endX, height / 2, barLevelBorderRadius, TAU * 3 / 4, TAU * 1 / 4);
-        cr.lineTo(Math.floor(endX), (height + barLevelHeight) / 2);
-        cr.lineTo(Math.floor(endX), (height - barLevelHeight) / 2);
-        cr.lineTo(endX, (height - barLevelHeight) / 2);
-        cr.fillPreserve();
-        cr.setLineWidth(barLevelBorderWidth);
-        cr.stroke();
+        if (this._value > 0) {
+            if (this._value <= this._overdriveStart)
+                Clutter.cairo_set_source_color(cr, barLevelActiveColor);
+            else
+                Clutter.cairo_set_source_color(cr, barLevelOverdriveColor);
+            cr.arc(endX, height / 2, barLevelBorderRadius, TAU * (3 / 4), TAU * (1 / 4));
+            cr.lineTo(Math.floor(endX), (height + barLevelHeight) / 2);
+            cr.lineTo(Math.floor(endX), (height - barLevelHeight) / 2);
+            cr.lineTo(endX, (height - barLevelHeight) / 2);
+            cr.fillPreserve();
+            cr.setLineWidth(barLevelBorderWidth);
+            cr.stroke();
+        }

        /* draw overdrive separator */
        if (overdriveActive) {
@@ -172,32 +207,27 @@ var BarLevel = class {
        cr.$dispose();
    }

-    _getCurrentValue(actor) {
+    _getCurrentValue() {
        return this._value;
    }

-    _getOverdriveStart(actor) {
+    _getOverdriveStart() {
        return this._overdriveStart;
    }

-    _getMinimumValue(actor) {
+    _getMinimumValue() {
        return 0;
    }

-    _getMaximumValue(actor) {
+    _getMaximumValue() {
        return this._maxValue;
    }

-    _setCurrentValue(actor, value) {
+    _setCurrentValue(_actor, value) {
        this._value = value;
    }

-    _valueChanged(barLevel, value, property) {
+    _valueChanged() {
        this._customAccessible.notify("accessible-value");
    }
-
-    get value() {
-        return this._value;
-    }
-};
-Signals.addSignalMethods(BarLevel.prototype);
+});
--- a/js/ui/boxpointer.js
+++ b/js/ui/boxpointer.js
@@ -1,9 +1,9 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported BoxPointer */

-const { Clutter, GObject, Meta, Shell, St } = imports.gi;
+const { Clutter, GObject, Shell, St } = imports.gi;

 const Main = imports.ui.main;
-const Tweener = imports.ui.tweener;

 var PopupAnimation = {
    NONE:  0,
@@ -12,7 +12,7 @@ var PopupAnimation = {
    FULL:  ~0,
 };

-var POPUP_ANIMATION_TIME = 0.15;
+var POPUP_ANIMATION_TIME = 150;

 /**
 * BoxPointer:
@@ -24,7 +24,7 @@ var POPUP_ANIMATION_TIME = 0.15;
 * placed.  The arrow position may be controlled via
 * setArrowOrigin(). The arrow side might be temporarily flipped
 * depending on the box size and source position to keep the box
- * totally inside the monitor if possible.
+ * totally inside the monitor workarea if possible.
 *
 */
 var BoxPointer = GObject.registerClass({
@@ -33,8 +33,6 @@ var BoxPointer = GObject.registerClass({
    _init(arrowSide, binProperties) {
        super._init();

-        this.actor = this;
-
        this.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS);

        this._arrowSide = arrowSide;
@@ -47,13 +45,18 @@ var BoxPointer = GObject.registerClass({
        this._border.connect('repaint', this._drawBorder.bind(this));
        this.add_actor(this._border);
        this.bin.raise(this._border);
-        this._xOffset = 0;
-        this._yOffset = 0;
-        this._xPosition = 0;
-        this._yPosition = 0;
        this._sourceAlignment = 0.5;
        this._capturedEventId = 0;
        this._muteInput();
+
+        this.connect('destroy', this._onDestroy.bind(this));
+    }
+
+    _onDestroy() {
+        if (this._sourceActorDestroyId) {
+            this._sourceActor.disconnect(this._sourceActorDestroyId);
+            delete this._sourceActorDestroyId;
+        }
    }

    get arrowSide() {
@@ -73,36 +76,6 @@ var BoxPointer = GObject.registerClass({
        }
    }

-    // BoxPointer.show() and BoxPointer.hide() are here for only compatibility
-    // purposes, and will be removed in 3.32.
-    show(animate, onComplete) {
-        if (animate !== undefined) {
-            try {
-                throw new Error('BoxPointer.show() has been moved to BoxPointer.open(), this code will break in the future.');
-            } catch(e) {
-                logError(e);
-                this.open(animate, onComplete);
-                return;
-            }
-        }
-
-        this.visible = true;
-    }
-
-    hide(animate, onComplete) {
-        if (animate !== undefined) {
-            try {
-                throw new Error('BoxPointer.hide() has been moved to BoxPointer.close(), this code will break in the future.');
-            } catch(e) {
-                logError(e);
-                this.close(animate, onComplete);
-                return;
-            }
-        }
-
-        this.visible = false;
-    }
-
    open(animate, onComplete) {
        let themeNode = this.get_theme_node();
        let rise = themeNode.get_length('-arrow-rise');
@@ -117,39 +90,41 @@ var BoxPointer = GObject.registerClass({

        if (animate & PopupAnimation.SLIDE) {
            switch (this._arrowSide) {
-                case St.Side.TOP:
-                    this.yOffset = -rise;
-                    break;
-                case St.Side.BOTTOM:
-                    this.yOffset = rise;
-                    break;
-                case St.Side.LEFT:
-                    this.xOffset = -rise;
-                    break;
-                case St.Side.RIGHT:
-                    this.xOffset = rise;
-                    break;
+            case St.Side.TOP:
+                this.translation_y = -rise;
+                break;
+            case St.Side.BOTTOM:
+                this.translation_y = rise;
+                break;
+            case St.Side.LEFT:
+                this.translation_x = -rise;
+                break;
+            case St.Side.RIGHT:
+                this.translation_x = rise;
+                break;
            }
        }

-        Tweener.addTween(this, { opacity: 255,
-                                 xOffset: 0,
-                                 yOffset: 0,
-                                 transition: 'linear',
-                                 onComplete: () => {
-                                     this._unmuteInput();
-                                     if (onComplete)
-                                         onComplete();
-                                 },
-                                 time: animationTime });
+        this.ease({
+            opacity: 255,
+            translation_x: 0,
+            translation_y: 0,
+            duration: animationTime,
+            mode: Clutter.AnimationMode.LINEAR,
+            onComplete: () => {
+                this._unmuteInput();
+                if (onComplete)
+                    onComplete();
+            }
+        });
    }

    close(animate, onComplete) {
        if (!this.visible)
            return;

-        let xOffset = 0;
-        let yOffset = 0;
+        let translationX = 0;
+        let translationY = 0;
        let themeNode = this.get_theme_node();
        let rise = themeNode.get_length('-arrow-rise');
        let fade = (animate & PopupAnimation.FADE);
@@ -157,38 +132,39 @@ var BoxPointer = GObject.registerClass({

        if (animate & PopupAnimation.SLIDE) {
            switch (this._arrowSide) {
-                case St.Side.TOP:
-                    yOffset = rise;
-                    break;
-                case St.Side.BOTTOM:
-                    yOffset = -rise;
-                    break;
-                case St.Side.LEFT:
-                    xOffset = rise;
-                    break;
-                case St.Side.RIGHT:
-                    xOffset = -rise;
-                    break;
+            case St.Side.TOP:
+                translationY = rise;
+                break;
+            case St.Side.BOTTOM:
+                translationY = -rise;
+                break;
+            case St.Side.LEFT:
+                translationX = rise;
+                break;
+            case St.Side.RIGHT:
+                translationX = -rise;
+                break;
            }
        }

        this._muteInput();

-        Tweener.removeTweens(this);
-        Tweener.addTween(this, { opacity: fade ? 0 : 255,
-                                 xOffset: xOffset,
-                                 yOffset: yOffset,
-                                 transition: 'linear',
-                                 time: animationTime,
-                                 onComplete: () => {
-                                     this.hide();
-                                     this.opacity = 0;
-                                     this.xOffset = 0;
-                                     this.yOffset = 0;
-                                     if (onComplete)
-                                         onComplete();
-                                 }
-                               });
+        this.remove_all_transitions();
+        this.ease({
+            opacity: fade ? 0 : 255,
+            translation_x: translationX,
+            translation_y: translationY,
+            duration: animationTime,
+            mode: Clutter.AnimationMode.LINEAR,
+            onComplete: () => {
+                this.hide();
+                this.opacity = 0;
+                this.translation_x = 0;
+                this.translation_y = 0;
+                if (onComplete)
+                    onComplete();
+            }
+        });
    }

    _adjustAllocationForArrow(isWidth, minSize, natSize) {
@@ -231,13 +207,10 @@ var BoxPointer = GObject.registerClass({
        this.set_allocation(box, flags);

        let themeNode = this.get_theme_node();
-        box = themeNode.get_content_box(box);
-
        let borderWidth = themeNode.get_length('-arrow-border-width');
        let rise = themeNode.get_length('-arrow-rise');
        let childBox = new Clutter.ActorBox();
-        let availWidth = box.x2 - box.x1;
-        let availHeight = box.y2 - box.y1;
+        let [availWidth, availHeight] = themeNode.get_content_box(box).get_size();

        childBox.x1 = 0;
        childBox.y1 = 0;
@@ -250,24 +223,25 @@ var BoxPointer = GObject.registerClass({
        childBox.x2 = availWidth - borderWidth;
        childBox.y2 = availHeight - borderWidth;
        switch (this._arrowSide) {
-            case St.Side.TOP:
-                childBox.y1 += rise;
-                break;
-            case St.Side.BOTTOM:
-                childBox.y2 -= rise;
-                break;
-            case St.Side.LEFT:
-                childBox.x1 += rise;
-                break;
-            case St.Side.RIGHT:
-                childBox.x2 -= rise;
-                break;
+        case St.Side.TOP:
+            childBox.y1 += rise;
+            break;
+        case St.Side.BOTTOM:
+            childBox.y2 -= rise;
+            break;
+        case St.Side.LEFT:
+            childBox.x1 += rise;
+            break;
+        case St.Side.RIGHT:
+            childBox.x2 -= rise;
+            break;
        }
        this.bin.allocate(childBox, flags);

        if (this._sourceActor && this._sourceActor.mapped) {
-            this._reposition();
-            this._updateFlip();
+            this._reposition(box);
+            this._updateFlip(box);
+            this.set_allocation(box, flags);
        }
    }

@@ -293,7 +267,7 @@ var BoxPointer = GObject.registerClass({
        let borderRadius = themeNode.get_length('-arrow-border-radius');

        let halfBorder = borderWidth / 2;
-        let halfBase = Math.floor(base/2);
+        let halfBase = Math.floor(base / 2);

        let backgroundColor = themeNode.get_color('-arrow-background-color');

@@ -374,7 +348,7 @@ var BoxPointer = GObject.registerClass({
        if (!skipTopRight) {
            cr.lineTo(x2 - borderRadius, y1);
            cr.arc(x2 - borderRadius, y1 + borderRadius, borderRadius,
-                   3*Math.PI/2, Math.PI*2);
+                   3 * Math.PI / 2, Math.PI * 2);
        }

        if (this._arrowSide == St.Side.RIGHT && rise) {
@@ -395,7 +369,7 @@ var BoxPointer = GObject.registerClass({
        if (!skipBottomRight) {
            cr.lineTo(x2, y2 - borderRadius);
            cr.arc(x2 - borderRadius, y2 - borderRadius, borderRadius,
-                   0, Math.PI/2);
+                   0, Math.PI / 2);
        }

        if (this._arrowSide == St.Side.BOTTOM && rise) {
@@ -416,7 +390,7 @@ var BoxPointer = GObject.registerClass({
        if (!skipBottomLeft) {
            cr.lineTo(x1 + borderRadius, y2);
            cr.arc(x1 + borderRadius, y2 - borderRadius, borderRadius,
-                   Math.PI/2, Math.PI);
+                   Math.PI / 2, Math.PI);
        }

        if (this._arrowSide == St.Side.LEFT && rise) {
@@ -425,7 +399,7 @@ var BoxPointer = GObject.registerClass({
                cr.lineTo(x1 - rise, y1);
                cr.lineTo(x1 + borderRadius, y1);
            } else if (skipBottomLeft) {
-                cr.lineTo(x1 - rise, y2)
+                cr.lineTo(x1 - rise, y2);
                cr.lineTo(x1 - rise, y2 - halfBase);
            } else {
                cr.lineTo(x1, this._arrowOrigin + halfBase);
@@ -437,7 +411,7 @@ var BoxPointer = GObject.registerClass({
        if (!skipTopLeft) {
            cr.lineTo(x1, y1 + borderRadius);
            cr.arc(x1 + borderRadius, y1 + borderRadius, borderRadius,
-                   Math.PI, 3*Math.PI/2);
+                   Math.PI, 3 * Math.PI / 2);
        }

        Clutter.cairo_set_source_color(cr, backgroundColor);
@@ -454,15 +428,25 @@ var BoxPointer = GObject.registerClass({
    }

    setPosition(sourceActor, alignment) {
-        // We need to show it now to force an allocation,
-        // so that we can query the correct size.
-        this.show();
+        if (!this._sourceActor || sourceActor != this._sourceActor) {
+            if (this._sourceActorDestroyId) {
+                this._sourceActor.disconnect(this._sourceActorDestroyId);
+                delete this._sourceActorDestroyId;
+            }
+
+            this._sourceActor = sourceActor;
+
+            if (this._sourceActor) {
+                this._sourceActorDestroyId = this._sourceActor.connect('destroy', () => {
+                    this._sourceActor = null;
+                    delete this._sourceActorDestroyId;
+                });
+            }
+        }

-        this._sourceActor = sourceActor;
        this._arrowAlignment = alignment;

-        this._reposition();
-        this._updateFlip();
+        this.queue_relayout();
    }

    setSourceAlignment(alignment) {
@@ -474,22 +458,26 @@ var BoxPointer = GObject.registerClass({
        this.setPosition(this._sourceActor, this._arrowAlignment);
    }

-    _reposition() {
+    _reposition(allocationBox) {
        let sourceActor = this._sourceActor;
        let alignment = this._arrowAlignment;
+        let monitorIndex = Main.layoutManager.findIndexForActor(sourceActor);
+
+        this._sourceAllocation = Shell.util_get_transformed_allocation(sourceActor);
+        this._workArea = Main.layoutManager.getWorkAreaForMonitor(monitorIndex);

        // Position correctly relative to the sourceActor
        let sourceNode = sourceActor.get_theme_node();
        let sourceContentBox = sourceNode.get_content_box(sourceActor.get_allocation_box());
-        let sourceAllocation = Shell.util_get_transformed_allocation(sourceActor);
+        let sourceAllocation = this._sourceAllocation;
        let sourceCenterX = sourceAllocation.x1 + sourceContentBox.x1 + (sourceContentBox.x2 - sourceContentBox.x1) * this._sourceAlignment;
        let sourceCenterY = sourceAllocation.y1 + sourceContentBox.y1 + (sourceContentBox.y2 - sourceContentBox.y1) * this._sourceAlignment;
-        let [minWidth, minHeight, natWidth, natHeight] = this.get_preferred_size();
+        let [, , natWidth, natHeight] = this.get_preferred_size();

        // We also want to keep it onscreen, and separated from the
        // edge by the same distance as the main part of the box is
        // separated from its sourceActor
-        let monitor = Main.layoutManager.findMonitorForActor(sourceActor);
+        let workarea = this._workArea;
        let themeNode = this.get_theme_node();
        let borderWidth = themeNode.get_length('-arrow-border-width');
        let arrowBase = themeNode.get_length('-arrow-base');
@@ -528,7 +516,7 @@ var BoxPointer = GObject.registerClass({
        //     of the box to maintain the arrow's accuracy.

        let arrowOrigin;
-        let halfBase = Math.floor(arrowBase/2);
+        let halfBase = Math.floor(arrowBase / 2);
        let halfBorder = borderWidth / 2;
        let halfMargin = margin / 2;
        let [x1, y1] = [halfBorder, halfBorder];
@@ -539,8 +527,8 @@ var BoxPointer = GObject.registerClass({
        case St.Side.BOTTOM:
            resX = sourceCenterX - (halfMargin + (natWidth - margin) * alignment);

-            resX = Math.max(resX, monitor.x + padding);
-            resX = Math.min(resX, monitor.x + monitor.width - (padding + natWidth));
+            resX = Math.max(resX, workarea.x + padding);
+            resX = Math.min(resX, workarea.x + workarea.width - (padding + natWidth));

            arrowOrigin = sourceCenterX - resX;
            if (arrowOrigin <= (x1 + (borderRadius + halfBase))) {
@@ -558,8 +546,8 @@ var BoxPointer = GObject.registerClass({
        case St.Side.RIGHT:
            resY = sourceCenterY - (halfMargin + (natHeight - margin) * alignment);

-            resY = Math.max(resY, monitor.y + padding);
-            resY = Math.min(resY, monitor.y + monitor.height - (padding + natHeight));
+            resY = Math.max(resY, workarea.y + padding);
+            resY = Math.min(resY, workarea.y + workarea.height - (padding + natHeight));

            arrowOrigin = sourceCenterY - resY;
            if (arrowOrigin <= (y1 + (borderRadius + halfBase))) {
@@ -583,9 +571,8 @@ var BoxPointer = GObject.registerClass({
            parent = parent.get_parent();
        }

-        this._xPosition = Math.floor(x);
-        this._yPosition = Math.floor(y);
-        this._shiftActor();
+        // Actually set the position
+        allocationBox.set_origin(Math.floor(x), Math.floor(y));
    }

    // @origin: Coordinate specifying middle of the arrow, along
@@ -608,44 +595,30 @@ var BoxPointer = GObject.registerClass({
        }
    }

-    _shiftActor() {
-        // Since the position of the BoxPointer depends on the allocated size
-        // of the BoxPointer and the position of the source actor, trying
-        // to position the BoxPointer via the x/y properties will result in
-        // allocation loops and warnings. Instead we do the positioning via
-        // the anchor point, which is independent of allocation, and leave
-        // x == y == 0.
-        this.set_anchor_point(-(this._xPosition + this._xOffset),
-                              -(this._yPosition + this._yOffset));
-    }
-
    _calculateArrowSide(arrowSide) {
-        let sourceAllocation = Shell.util_get_transformed_allocation(this._sourceActor);
-        let [minWidth, minHeight, boxWidth, boxHeight] = this.get_preferred_size();
-        let monitorActor = this.sourceActor;
-        if (!monitorActor)
-            monitorActor = this;
-        let monitor = Main.layoutManager.findMonitorForActor(monitorActor);
+        let sourceAllocation = this._sourceAllocation;
+        let [, , boxWidth, boxHeight] = this.get_preferred_size();
+        let workarea = this._workArea;

        switch (arrowSide) {
        case St.Side.TOP:
-            if (sourceAllocation.y2 + boxHeight > monitor.y + monitor.height &&
-                boxHeight < sourceAllocation.y1 - monitor.y)
+            if (sourceAllocation.y2 + boxHeight > workarea.y + workarea.height &&
+                boxHeight < sourceAllocation.y1 - workarea.y)
                return St.Side.BOTTOM;
            break;
        case St.Side.BOTTOM:
-            if (sourceAllocation.y1 - boxHeight < monitor.y &&
-                boxHeight < monitor.y + monitor.height - sourceAllocation.y2)
+            if (sourceAllocation.y1 - boxHeight < workarea.y &&
+                boxHeight < workarea.y + workarea.height - sourceAllocation.y2)
                return St.Side.TOP;
            break;
        case St.Side.LEFT:
-            if (sourceAllocation.x2 + boxWidth > monitor.x + monitor.width &&
-                boxWidth < sourceAllocation.x1 - monitor.x)
+            if (sourceAllocation.x2 + boxWidth > workarea.x + workarea.width &&
+                boxWidth < sourceAllocation.x1 - workarea.x)
                return St.Side.RIGHT;
            break;
        case St.Side.RIGHT:
-            if (sourceAllocation.x1 - boxWidth < monitor.x &&
-                boxWidth < monitor.x + monitor.width - sourceAllocation.x2)
+            if (sourceAllocation.x1 - boxWidth < workarea.x &&
+                boxWidth < workarea.x + workarea.width - sourceAllocation.x2)
                return St.Side.LEFT;
            break;
        }
@@ -653,38 +626,16 @@ var BoxPointer = GObject.registerClass({
        return arrowSide;
    }

-    _updateFlip() {
+    _updateFlip(allocationBox) {
        let arrowSide = this._calculateArrowSide(this._userArrowSide);
        if (this._arrowSide != arrowSide) {
            this._arrowSide = arrowSide;
-            this._reposition();
-            Meta.later_add(Meta.LaterType.BEFORE_REDRAW, () => {
-                this.queue_relayout();
-                return false;
-            });
+            this._reposition(allocationBox);

            this.emit('arrow-side-changed');
        }
    }

-    set xOffset(offset) {
-        this._xOffset = offset;
-        this._shiftActor();
-    }
-
-    get xOffset() {
-        return this._xOffset;
-    }
-
-    set yOffset(offset) {
-        this._yOffset = offset;
-        this._shiftActor();
-    }
-
-    get yOffset() {
-        return this._yOffset;
-    }
-
    updateArrowSide(side) {
        this._arrowSide = side;
        this._border.queue_repaint();
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported Calendar, CalendarMessageList */

 const { Clutter, Gio, GLib, Shell, St } = imports.gi;
 const Signals = imports.signals;
@@ -17,7 +18,7 @@ var ELLIPSIS_CHAR = '\u2026';

 var MESSAGE_ICON_SIZE = -1; // pick up from CSS

-var NC_ = (context, str) => context + '\u0004' + str;
+var NC_ = (context, str) => `${context}\u0004${str}`;

 function sameYear(dateA, dateB) {
    return (dateA.getYear() == dateB.getYear());
@@ -38,7 +39,7 @@ function isToday(date) {
 function _isWorkDay(date) {
    /* Translators: Enter 0-6 (Sunday-Saturday) for non-work days. Examples: "0" (Sunday) "6" (Saturday) "06" (Sunday and Saturday). */
    let days = C_('calendar-no-work', "06");
-    return days.indexOf(date.getDay().toString()) == -1;
+    return !days.includes(date.getDay().toString());
 }

 function _getBeginningOfDay(date) {
@@ -109,15 +110,15 @@ var EmptyEventSource = class EmptyEventSource {
    destroy() {
    }

-    requestRange(begin, end) {
+    requestRange(_begin, _end) {
    }

-    getEvents(begin, end) {
+    getEvents(_begin, _end) {
        let result = [];
        return result;
    }

-    hasEvents(day) {
+    hasEvents(_day) {
        return false;
    }
 };
@@ -143,8 +144,7 @@ function _datesEqual(a, b) {
    return true;
 }

-function _dateIntervalsOverlap(a0, a1, b0, b1)
-{
+function _dateIntervalsOverlap(a0, a1, b0, b1) {
    if (a1 <= b0)
        return false;
    else if (b1 <= a0)
@@ -168,7 +168,7 @@ var DBusEventSource = class DBusEventSource {
            try {
                this._dbusProxy.init_finish(result);
                loaded = true;
-            } catch(e) {
+            } catch (e) {
                if (e.matches(Gio.DBusError, Gio.DBusError.TIMED_OUT)) {
                    // Ignore timeouts and install signals as normal, because with high
                    // probability the service will appear later on, and we will get a
@@ -178,7 +178,7 @@ var DBusEventSource = class DBusEventSource {
                    // about the HasCalendars property and would cause an exception trying
                    // to read it)
                } else {
-                    log('Error loading calendars: ' + e.message);
+                    log(`Error loading calendars: ${e.message}`);
                    return;
                }
            }
@@ -221,13 +221,13 @@ var DBusEventSource = class DBusEventSource {
        this._lastRequestEnd = null;
    }

-    _onNameAppeared(owner) {
+    _onNameAppeared() {
        this._initialized = true;
        this._resetCache();
        this._loadEvents(true);
    }

-    _onNameVanished(oldOwner) {
+    _onNameVanished() {
        this._resetCache();
        this.emit('changed');
    }
@@ -236,22 +236,20 @@ var DBusEventSource = class DBusEventSource {
        this._loadEvents(false);
    }

-    _onEventsReceived(results, error) {
+    _onEventsReceived(results, _error) {
        let newEvents = [];
-        let appointments = results ? results[0] : null;
-        if (appointments != null) {
-            for (let n = 0; n < appointments.length; n++) {
-                let a = appointments[n];
-                let date = new Date(a[4] * 1000);
-                let end = new Date(a[5] * 1000);
-                let id = a[0];
-                let summary = a[1];
-                let allDay = a[3];
-                let event = new CalendarEvent(id, date, end, summary, allDay);
-                newEvents.push(event);
-            }
-            newEvents.sort((ev1, ev2) => ev1.date.getTime() - ev2.date.getTime());
+        let appointments = results[0] || [];
+        for (let n = 0; n < appointments.length; n++) {
+            let a = appointments[n];
+            let date = new Date(a[4] * 1000);
+            let end = new Date(a[5] * 1000);
+            let id = a[0];
+            let summary = a[1];
+            let allDay = a[3];
+            let event = new CalendarEvent(id, date, end, summary, allDay);
+            newEvents.push(event);
        }
+        newEvents.sort((ev1, ev2) => ev1.date.getTime() - ev2.date.getTime());

        this._events = newEvents;
        this.isLoading = false;
@@ -263,7 +261,7 @@ var DBusEventSource = class DBusEventSource {
        if (!this._initialized)
            return;

-        if (this._curRequestBegin && this._curRequestEnd){
+        if (this._curRequestBegin && this._curRequestEnd) {
            this._dbusProxy.GetEventsRemote(this._curRequestBegin.getTime() / 1000,
                                            this._curRequestEnd.getTime() / 1000,
                                            forceReload,
@@ -285,7 +283,7 @@ var DBusEventSource = class DBusEventSource {

    getEvents(begin, end) {
        let result = [];
-        for(let n = 0; n < this._events.length; n++) {
+        for (let n = 0; n < this._events.length; n++) {
            let event = this._events[n];

            if (_dateIntervalsOverlap (event.date, event.end, begin, end)) {
@@ -320,7 +318,7 @@ var Calendar = class Calendar {
        this._weekStart = Shell.util_get_week_start();
        this._settings = new Gio.Settings({ schema_id: 'org.gnome.desktop.calendar' });

-        this._settings.connect('changed::' + SHOW_WEEKDATE_KEY, this._onSettingsChange.bind(this));
+        this._settings.connect(`changed::${SHOW_WEEKDATE_KEY}`, this._onSettingsChange.bind(this));
        this._useWeekdate = this._settings.get_boolean(SHOW_WEEKDATE_KEY);

        /**
@@ -402,8 +400,8 @@ var Calendar = class Calendar {
        this._topBox.add(this._backButton);
        this._backButton.connect('clicked', this._onPrevMonthButtonClicked.bind(this));

-        this._monthLabel = new St.Label({style_class: 'calendar-month-label',
-                                         can_focus: true });
+        this._monthLabel = new St.Label({ style_class: 'calendar-month-label',
+                                          can_focus: true });
        this._topBox.add(this._monthLabel, { expand: true, x_fill: false, x_align: St.Align.MIDDLE });

        this._forwardButton = new St.Button({ style_class: 'calendar-change-month-forward pager-button',
@@ -466,8 +464,7 @@ var Calendar = class Calendar {
                let day = 32 - new Date(newDate.getFullYear() - 1, 11, 32).getDate();
                newDate = new Date(newDate.getFullYear() - 1, 11, day);
            }
-        }
-        else {
+        } else {
            newDate.setMonth(oldMonth - 1);
            if (newDate.getMonth() != oldMonth - 1) {
                let day = 32 - new Date(newDate.getFullYear(), oldMonth - 1, 32).getDate();
@@ -490,8 +487,7 @@ var Calendar = class Calendar {
                let day = 32 - new Date(newDate.getFullYear() + 1, 0, 32).getDate();
                newDate = new Date(newDate.getFullYear() + 1, 0, day);
            }
-        }
-        else {
+        } else {
            newDate.setMonth(oldMonth + 1);
            if (newDate.getMonth() != oldMonth + 1) {
                let day = 32 - new Date(newDate.getFullYear(), oldMonth + 1, 32).getDate();
@@ -546,8 +542,6 @@ var Calendar = class Calendar {
        this._calendarBegin = new Date(beginDate);
        this._markedAsToday = now;

-        let year = beginDate.getYear();
-
        let daysToWeekStart = (7 + beginDate.getDay() - this._weekStart) % 7;
        let startsOnWeekStart = daysToWeekStart == 0;
        let weekPadding = startsOnWeekStart ? 7 : 0;
@@ -559,7 +553,7 @@ var Calendar = class Calendar {
        let row = 2;
        // nRows here means 6 weeks + one header + one navbar
        let nRows = 8;
-        while (row < 8) {
+        while (row < nRows) {
            // xgettext:no-javascript-format
            let button = new St.Button({ label: iter.toLocaleFormat(C_("date day number format", "%d")),
                                         can_focus: true });
@@ -585,12 +579,12 @@ var Calendar = class Calendar {

            // Hack used in lieu of border-collapse - see gnome-shell.css
            if (row == 2)
-                styleClass = 'calendar-day-top ' + styleClass;
+                styleClass = `calendar-day-top ${styleClass}`;

            let leftMost = rtl ? iter.getDay() == (this._weekStart + 6) % 7
                               : iter.getDay() == this._weekStart;
            if (leftMost)
-                styleClass = 'calendar-day-left ' + styleClass;
+                styleClass = `calendar-day-left ${styleClass}`;

            if (sameDay(now, iter))
                styleClass += ' calendar-today';
@@ -648,9 +642,9 @@ var Calendar = class Calendar {
                button.add_style_pseudo_class('selected');
                if (this._shouldDateGrabFocus)
                    button.grab_key_focus();
-            }
-            else
+            } else {
                button.remove_style_pseudo_class('selected');
+            }
        });
    }
 };
@@ -741,7 +735,7 @@ class NotificationMessage extends MessageList.Message {
            return this.notification.source.createIcon(MESSAGE_ICON_SIZE);
    }

-    _onUpdated(n, clear) {
+    _onUpdated(n, _clear) {
        this.setIcon(this._getIcon());
        this.setTitle(n.title);
        this.setBody(n.bannerBodyText);
@@ -1077,7 +1071,7 @@ var CalendarMessageList = class CalendarMessageList {
        this._clearButton.set_x_align(Clutter.ActorAlign.END);
        this._clearButton.connect('clicked', () => {
            let sections = [...this._sections.keys()];
-            sections.forEach((s) => { s.clear(); });
+            sections.forEach((s) => s.clear());
        });
        box.add_actor(this._clearButton);

@@ -1103,7 +1097,7 @@ var CalendarMessageList = class CalendarMessageList {
    _addSection(section) {
        let obj = {
            destroyId: 0,
-            visibleId:  0,
+            visibleId: 0,
            emptyChangedId: 0,
            canClearChangedId: 0,
            keyFocusId: 0
--- a/js/ui/checkBox.js
+++ b/js/ui/checkBox.js
@@ -1,3 +1,4 @@
+/* exported CheckBox */
 const { Clutter, Pango, St } = imports.gi;

 var CheckBox = class CheckBox {
--- a/js/ui/closeDialog.js
+++ b/js/ui/closeDialog.js
@@ -1,17 +1,17 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported CloseDialog */

 const { Clutter, Gio, GLib, GObject, Meta, Shell } = imports.gi;

 const Dialog = imports.ui.dialog;
 const Main = imports.ui.main;
-const Tweener = imports.ui.tweener;

-var FROZEN_WINDOW_BRIGHTNESS = -0.3
-var DIALOG_TRANSITION_TIME = 0.15
+var FROZEN_WINDOW_BRIGHTNESS = -0.3;
+var DIALOG_TRANSITION_TIME = 150;
 var ALIVE_TIMEOUT = 5000;

 var CloseDialog = GObject.registerClass({
-    Implements: [ Meta.CloseDialog ],
+    Implements: [Meta.CloseDialog],
    Properties: {
        'window': GObject.ParamSpec.override('window', Meta.CloseDialog)
    },
@@ -56,12 +56,12 @@ var CloseDialog = GObject.registerClass({
        this._dialog.height = windowActor.height;

        this._dialog.addContent(this._createDialogContent());
-        this._dialog.addButton({ label:   _('Force Quit'),
-                                 action:  this._onClose.bind(this),
+        this._dialog.addButton({ label: _('Force Quit'),
+                                 action: this._onClose.bind(this),
                                 default: true });
-        this._dialog.addButton({ label:  _('Wait'),
+        this._dialog.addButton({ label: _('Wait'),
                                 action: this._onWait.bind(this),
-                                 key:    Clutter.Escape });
+                                 key: Clutter.Escape });

        global.focus_manager.add_group(this._dialog);
    }
@@ -148,12 +148,12 @@ var CloseDialog = GObject.registerClass({
        this._dialog.scale_y = 0;
        this._dialog.set_pivot_point(0.5, 0.5);

-        Tweener.addTween(this._dialog,
-                         { scale_y: 1,
-                           transition: 'linear',
-                           time: DIALOG_TRANSITION_TIME,
-                           onComplete: this._onFocusChanged.bind(this)
-                         });
+        this._dialog.ease({
+            scale_y: 1,
+            mode: Clutter.AnimationMode.LINEAR,
+            duration: DIALOG_TRANSITION_TIME,
+            onComplete: this._onFocusChanged.bind(this)
+        });
    }

    vfunc_hide() {
@@ -165,7 +165,7 @@ var CloseDialog = GObject.registerClass({
        GLib.source_remove(this._timeoutId);
        this._timeoutId = 0;

-        global.display.disconnect(this._windowFocusChangedId)
+        global.display.disconnect(this._windowFocusChangedId);
        this._windowFocusChangedId = 0;

        global.stage.disconnect(this._keyFocusChangedId);
@@ -175,14 +175,12 @@ var CloseDialog = GObject.registerClass({
        this._dialog = null;
        this._removeWindowEffect();

-        Tweener.addTween(dialog,
-                         { scale_y: 0,
-                           transition: 'linear',
-                           time: DIALOG_TRANSITION_TIME,
-                           onComplete: () => {
-                               dialog.destroy();
-                           }
-                         });
+        dialog.ease({
+            scale_y: 0,
+            mode: Clutter.AnimationMode.LINEAR,
+            duration: DIALOG_TRANSITION_TIME,
+            onComplete: () => dialog.destroy()
+        });
    }

    vfunc_focus() {
--- a/js/ui/components/init.js
+++ b/js/ui/components/init.js
@@ -1,3 +1,4 @@
+/* exported ComponentManager */
 const Main = imports.ui.main;

 var ComponentManager = class {
@@ -13,13 +14,13 @@ var ComponentManager = class {
        let newEnabledComponents = Main.sessionMode.components;

        newEnabledComponents.filter(
-            name => this._enabledComponents.indexOf(name) == -1
+            name => !this._enabledComponents.includes(name)
        ).forEach(name => {
            this._enableComponent(name);
        });

        this._enabledComponents.filter(
-            name => newEnabledComponents.indexOf(name) == -1
+            name => !newEnabledComponents.includes(name)
        ).forEach(name => {
            this._disableComponent(name);
        });
@@ -37,8 +38,8 @@ var ComponentManager = class {
        if (component)
            return component;

-	if (Main.sessionMode.isLocked)
-	    return null;
+        if (Main.sessionMode.isLocked)
+            return null;

        let constructor = this._importComponent(name);
        component = new constructor();
@@ -48,7 +49,7 @@ var ComponentManager = class {

    _enableComponent(name) {
        let component = this._ensureComponent(name);
-	if (component)
+        if (component)
            component.enable();
    }

--- a/js/ui/components/automountManager.js
+++ b/js/ui/components/automountManager.js
@@ -1,10 +1,12 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported Component */

 const { Gio, GLib } = imports.gi;
 const Mainloop = imports.mainloop;
 const Params = imports.misc.params;

 const GnomeSession = imports.misc.gnomeSession;
+const Main = imports.ui.main;
 const ShellMountOperation = imports.ui.shellMountOperation;

 var GNOME_SESSION_AUTOMOUNT_INHIBIT = 16;
@@ -54,7 +56,7 @@ var AutomountManager = class {
        }
    }

-    _InhibitorsChanged(object, senderName, [inhibtor]) {
+    _InhibitorsChanged(_object, _senderName, [_inhibitor]) {
        this._session.IsInhibitedRemote(GNOME_SESSION_AUTOMOUNT_INHIBIT,
            (result, error) => {
                if (!error) {
@@ -108,25 +110,23 @@ var AutomountManager = class {
        // we force stop/eject in this case, so we don't have to pass a
        // mount operation object
        if (drive.can_stop()) {
-            drive.stop
-                (Gio.MountUnmountFlags.FORCE, null, null,
-                 (drive, res) => {
-                     try {
-                         drive.stop_finish(res);
-                     } catch (e) {
-                         log("Unable to stop the drive after drive-eject-button " + e.toString());
-                     }
-                 });
+            drive.stop(Gio.MountUnmountFlags.FORCE, null, null,
+                (drive, res) => {
+                    try {
+                        drive.stop_finish(res);
+                    } catch (e) {
+                        log(`Unable to stop the drive after drive-eject-button ${e.toString()}`);
+                    }
+                });
        } else if (drive.can_eject()) {
-            drive.eject_with_operation 
-                (Gio.MountUnmountFlags.FORCE, null, null,
-                 (drive, res) => {
-                     try {
-                         drive.eject_with_operation_finish(res);
-                     } catch (e) {
-                         log("Unable to eject the drive after drive-eject-button " + e.toString());
-                     }
-                 });
+            drive.eject_with_operation(Gio.MountUnmountFlags.FORCE, null, null,
+                (drive, res) => {
+                    try {
+                        drive.eject_with_operation_finish(res);
+                    } catch (e) {
+                        log(`Unable to eject the drive after drive-eject-button ${e.toString()}`);
+                    }
+                });
        }
    }

@@ -199,12 +199,20 @@ var AutomountManager = class {
            // error strings are not unique for the cases in the comments below.
            if (e.message.includes('No key available with this passphrase') || // cryptsetup
                e.message.includes('No key available to unlock device') ||     // udisks (no password)
-                e.message.includes('Error unlocking')) {                       // udisks (wrong password)
+                // libblockdev wrong password opening LUKS device
+                e.message.includes('Failed to activate device: Incorrect passphrase') ||
+                // cryptsetup returns EINVAL in many cases, including wrong TCRYPT password/parameters
+                e.message.includes('Failed to load device\'s parameters: Invalid argument')) {
+
                this._reaskPassword(volume);
            } else {
-                if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
-                    log('Unable to mount volume ' + volume.get_name() + ': ' + e.toString());
+                if (e.message.includes('Compiled against a version of libcryptsetup that does not support the VeraCrypt PIM setting')) {
+                    Main.notifyError(_("Unable to unlock volume"),
+                        _("The installed udisks version does not support the PIM setting"));
+                }

+                if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
+                    log(`Unable to mount volume ${volume.get_name()}: ${e.toString()}`);
                this._closeOperation(volume);
            }
        }
--- a/js/ui/components/autorunManager.js
+++ b/js/ui/components/autorunManager.js
@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported Component */

 const { Gio, St } = imports.gi;

@@ -40,7 +41,7 @@ function isMountRootHidden(root) {
    let path = root.get_path();

    // skip any mounts in hidden directory hierarchies
-    return (path.indexOf('/.') != -1);
+    return (path.includes('/.'));
 }

 function isMountNonLocal(mount) {
@@ -65,8 +66,7 @@ function startAppForMount(app, mount) {
        retval = app.launch(files, 
                            global.create_app_launch_context(0, -1));
    } catch (e) {
-        log('Unable to launch the application ' + app.get_name()
-            + ': ' + e.toString());
+        log(`Unable to launch the application ${app.get_name()}: ${e}`);
    }

    return retval;
@@ -107,8 +107,7 @@ var ContentTypeDiscoverer = class {
        try {
            contentTypes = mount.guess_content_type_finish(res);
        } catch (e) {
-            log('Unable to guess content types on added mount ' + mount.get_name()
-                + ': ' + e.toString());
+            log(`Unable to guess content types on added mount ${mount.get_name()}: ${e}`);
        }

        if (contentTypes.length) {
@@ -124,10 +123,7 @@ var ContentTypeDiscoverer = class {
        }
    }

-    _emitCallback(mount, contentTypes) {
-        if (!contentTypes)
-            contentTypes = [];
-
+    _emitCallback(mount, contentTypes = []) {
        // we're not interested in win32 software content types here
        contentTypes = contentTypes.filter(
            type => (type != 'x-content/win32-software')
@@ -192,15 +188,15 @@ var AutorunDispatcher = class {

    _getAutorunSettingForType(contentType) {
        let runApp = this._settings.get_strv(SETTING_START_APP);
-        if (runApp.indexOf(contentType) != -1)
+        if (runApp.includes(contentType))
            return AutorunSetting.RUN;

        let ignore = this._settings.get_strv(SETTING_IGNORE);
-        if (ignore.indexOf(contentType) != -1)
+        if (ignore.includes(contentType))
            return AutorunSetting.IGNORE;

        let openFiles = this._settings.get_strv(SETTING_OPEN_FOLDER);
-        if (openFiles.indexOf(contentType) != -1)
+        if (openFiles.includes(contentType))
            return AutorunSetting.FILES;

        return AutorunSetting.ASK;
--- a/js/ui/components/keyring.js
+++ b/js/ui/components/keyring.js
@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported Component */

 const { Clutter, Gcr, Gio, GObject, Pango, Shell, St } = imports.gi;

@@ -10,9 +11,10 @@ const CheckBox = imports.ui.checkBox;

 var WORK_SPINNER_ICON_SIZE = 16;

-var KeyringDialog = class extends ModalDialog.ModalDialog {
-    constructor() {
-        super({ styleClass: 'prompt-dialog' });
+var KeyringDialog = GObject.registerClass(
+class KeyringDialog extends ModalDialog.ModalDialog {
+    _init() {
+        super._init({ styleClass: 'prompt-dialog' });

        this.prompt = new Shell.KeyringPrompt();
        this.prompt.connect('show-password', this._onShowPassword.bind(this));
@@ -23,20 +25,8 @@ var KeyringDialog = class extends ModalDialog.ModalDialog {
        this._content = new Dialog.MessageDialogContent({ icon });
        this.contentLayout.add(this._content);

-        // FIXME: Why does this break now?
-        /*
        this.prompt.bind_property('message', this._content, 'title', GObject.BindingFlags.SYNC_CREATE);
        this.prompt.bind_property('description', this._content, 'body', GObject.BindingFlags.SYNC_CREATE);
-        */
-        this.prompt.connect('notify::message', () => {
-            this._content.title = this.prompt.message;
-        });
-        this._content.title = this.prompt.message;
-
-        this.prompt.connect('notify::description', () => {
-            this._content.body = this.prompt.description;
-        });
-        this._content.body = this.prompt.description;

        this._workSpinner = null;
        this._controlTable = null;
@@ -173,7 +163,7 @@ var KeyringDialog = class extends ModalDialog.ModalDialog {
        // NOTE: ModalDialog.open() is safe to call if the dialog is
        // already open - it just returns true without side-effects
        if (this.open())
-          return true;
+            return true;

        // The above fail if e.g. unable to get input grab
        //
@@ -183,25 +173,25 @@ var KeyringDialog = class extends ModalDialog.ModalDialog {

        log('keyringPrompt: Failed to show modal dialog.' +
            ' Dismissing prompt request');
-        this.prompt.cancel()
+        this.prompt.cancel();
        return false;
    }

-    _onShowPassword(prompt) {
+    _onShowPassword() {
        this._buildControlTable();
        this._ensureOpen();
        this._updateSensitivity(true);
        this._passwordEntry.grab_key_focus();
    }

-    _onShowConfirm(prompt) {
+    _onShowConfirm() {
        this._buildControlTable();
        this._ensureOpen();
        this._updateSensitivity(true);
        this._continueButton.grab_key_focus();
    }

-    _onHidePrompt(prompt) {
+    _onHidePrompt() {
        this.close();
    }

@@ -224,7 +214,7 @@ var KeyringDialog = class extends ModalDialog.ModalDialog {
    _onCancelButton() {
        this.prompt.cancel();
    }
-};
+});

 var KeyringDummyDialog = class {
    constructor() {
--- a/js/ui/components/networkAgent.js
+++ b/js/ui/components/networkAgent.js
@@ -1,6 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported Component */

-const { Clutter, Gio, GLib, NM, Pango, Shell, St } = imports.gi;
+const { Clutter, Gio, GLib, GObject, NM, Pango, Shell, St } = imports.gi;
 const Signals = imports.signals;

 const Config = imports.misc.config;
@@ -12,9 +13,10 @@ const ShellEntry = imports.ui.shellEntry;

 const VPN_UI_GROUP = 'VPN Plugin UI';

-var NetworkSecretDialog = class extends ModalDialog.ModalDialog {
-    constructor(agent, requestId, connection, settingName, hints, flags, contentOverride) {
-        super({ styleClass: 'prompt-dialog' });
+var NetworkSecretDialog = GObject.registerClass(
+class NetworkSecretDialog extends ModalDialog.ModalDialog {
+    _init(agent, requestId, connection, settingName, hints, flags, contentOverride) {
+        super._init({ styleClass: 'prompt-dialog' });

        this._agent = agent;
        this._requestId = requestId;
@@ -79,8 +81,9 @@ var NetworkSecretDialog = class extends ModalDialog.ModalDialog {
                        secret.valid = secret.value.length > 0;
                    this._updateOkButton();
                });
-            } else
+            } else {
                secret.valid = true;
+            }

            if (rtl) {
                layout.attach(secret.entry, 0, pos, 1, 1);
@@ -104,19 +107,19 @@ var NetworkSecretDialog = class extends ModalDialog.ModalDialog {
            descriptionLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;

            contentBox.messageBox.add(descriptionLabel,
-                                      { y_fill:  true,
+                                      { y_fill: true,
                                        y_align: St.Align.START,
                                        expand: true });
        }

-        this._okButton = { label:  _("Connect"),
+        this._okButton = { label: _("Connect"),
                           action: this._onOk.bind(this),
                           default: true
                         };

        this.setButtons([{ label: _("Cancel"),
                           action: this.cancel.bind(this),
-                           key:    Clutter.KEY_Escape,
+                           key: Clutter.KEY_Escape,
                         },
                         this._okButton]);

@@ -175,28 +178,29 @@ var NetworkSecretDialog = class extends ModalDialog.ModalDialog {
        let value = secret.value;
        if (secret.wep_key_type == NM.WepKeyType.KEY) {
            if (value.length == 10 || value.length == 26) {
-		for (let i = 0; i < value.length; i++) {
+                for (let i = 0; i < value.length; i++) {
                    if (!((value[i] >= 'a' && value[i] <= 'f')
                          || (value[i] >= 'A' && value[i] <= 'F')
                          || (value[i] >= '0' && value[i] <= '9')))
                        return false;
-		}
-	    } else if (value.length == 5 || value.length == 13) {
-		for (let i = 0; i < value.length; i++) {
+                }
+            } else if (value.length == 5 || value.length == 13) {
+                for (let i = 0; i < value.length; i++) {
                    if (!((value[i] >= 'a' && value[i] <= 'z')
                          || (value[i] >= 'A' && value[i] <= 'Z')))
                        return false;
                }
-            } else
+            } else {
                return false;
-	} else if (secret.wep_key_type == NM.WepKeyType.PASSPHRASE) {
-	    if (value.length < 0 || value.length > 64)
-	        return false;
-	}
+            }
+        } else if (secret.wep_key_type == NM.WepKeyType.PASSPHRASE) {
+            if (value.length < 0 || value.length > 64)
+                return false;
+        }
        return true;
    }

-    _getWirelessSecrets(secrets, wirelessSetting) {
+    _getWirelessSecrets(secrets, _wirelessSetting) {
        let wirelessSecuritySetting = this._connection.get_setting_wireless_security();

        if (this._settingName == '802-1x') {
@@ -213,7 +217,7 @@ var NetworkSecretDialog = class extends ModalDialog.ModalDialog {
                           validate: this._validateWpaPsk, password: true });
            break;
        case 'none': // static WEP
-            secrets.push({ label: _("Key: "), key: 'wep-key' + wirelessSecuritySetting.wep_tx_keyidx,
+            secrets.push({ label: _("Key: "), key: `wep-key${wirelessSecuritySetting.wep_tx_keyidx}`,
                           value: wirelessSecuritySetting.get_wep_key(wirelessSecuritySetting.wep_tx_keyidx) || '',
                           wep_key_type: wirelessSecuritySetting.wep_key_type,
                           validate: this._validateStaticWep, password: true });
@@ -229,13 +233,12 @@ var NetworkSecretDialog = class extends ModalDialog.ModalDialog {
            this._get8021xSecrets(secrets);
            break;
        default:
-            log('Invalid wireless key management: ' + wirelessSecuritySetting.key_mgmt);
+            log(`Invalid wireless key management: ${wirelessSecuritySetting.key_mgmt}`);
        }
    }

    _get8021xSecrets(secrets) {
        let ieee8021xSetting = this._connection.get_setting_802_1x();
-        let phase2method;

        /* If hints were given we know exactly what we need to ask */
        if (this._settingName == "802-1x" && this._hints.length) {
@@ -272,7 +275,7 @@ var NetworkSecretDialog = class extends ModalDialog.ModalDialog {
                           value: ieee8021xSetting.private_key_password || '', password: true });
            break;
        default:
-            log('Invalid EAP/IEEE802.1x method: ' + ieee8021xSetting.get_eap_method(0));
+            log(`Invalid EAP/IEEE802.1x method: ${ieee8021xSetting.get_eap_method(0)}`);
        }
    }

@@ -303,7 +306,7 @@ var NetworkSecretDialog = class extends ModalDialog.ModalDialog {
        let ssid;

        let content = { };
-        content.secrets = [ ];
+        content.secrets = [];

        switch (connectionType) {
        case '802-11-wireless':
@@ -326,7 +329,7 @@ var NetworkSecretDialog = class extends ModalDialog.ModalDialog {
            this._getPPPoESecrets(content.secrets);
            break;
        case 'gsm':
-            if (this._hints.indexOf('pin') != -1) {
+            if (this._hints.includes('pin')) {
                let gsmSetting = this._connection.get_setting_gsm();
                content.title = _("PIN code required");
                content.message = _("PIN code is needed for the mobile broadband device");
@@ -342,12 +345,12 @@ var NetworkSecretDialog = class extends ModalDialog.ModalDialog {
            this._getMobileSecrets(content.secrets, connectionType);
            break;
        default:
-            log('Invalid connection type: ' + connectionType);
-        };
+            log(`Invalid connection type: ${connectionType}`);
+        }

        return content;
    }
-};
+});

 var VPNRequestHandler = class {
    constructor(agent, requestId, authHelper, serviceType, connection, hints, flags) {
@@ -358,16 +361,15 @@ var VPNRequestHandler = class {
        this._pluginOutBuffer = [];
        this._title = null;
        this._description = null;
-        this._content = [ ];
+        this._content = [];
        this._shellDialog = null;

        let connectionSetting = connection.get_setting_connection();

-        let argv = [ authHelper.fileName,
-                     '-u', connectionSetting.uuid,
-                     '-n', connectionSetting.id,
-                     '-s', serviceType
-                   ];
+        let argv = [authHelper.fileName,
+                    '-u', connectionSetting.uuid,
+                    '-n', connectionSetting.id,
+                    '-s', serviceType];
        if (authHelper.externalUIMode)
            argv.push('--external-ui-mode');
        if (flags & NM.SecretAgentGetSecretsFlags.ALLOW_INTERACTION)
@@ -384,7 +386,7 @@ var VPNRequestHandler = class {
        this._newStylePlugin = authHelper.externalUIMode;

        try {
-            let [success, pid, stdin, stdout, stderr] =
+            let [success_, pid, stdin, stdout, stderr] =
                GLib.spawn_async_with_pipes(null, /* pwd */
                                            argv,
                                            null, /* envp */
@@ -406,7 +408,7 @@ var VPNRequestHandler = class {
                                                    this._vpnChildFinished.bind(this));

            this._writeConnection();
-        } catch(e) {
+        } catch (e) {
            logError(e, 'error while spawning VPN auth helper');

            this._agent.respond(requestId, Shell.NetworkAgentResponse.INTERNAL_ERROR);
@@ -423,7 +425,7 @@ var VPNRequestHandler = class {
        } else {
            try {
                this._stdin.write('QUIT\n\n', null);
-            } catch(e) { /* ignore broken pipe errors */ }
+            } catch (e) { /* ignore broken pipe errors */ }
        }

        this.destroy();
@@ -443,7 +445,7 @@ var VPNRequestHandler = class {
        this._destroyed = true;
    }

-    _vpnChildFinished(pid, status, requestObj) {
+    _vpnChildFinished(pid, status, _requestObj) {
        this._childWatch = 0;
        if (this._newStylePlugin) {
            // For new style plugin, all work is done in the async reading functions
@@ -458,8 +460,9 @@ var VPNRequestHandler = class {
                this._agent.respond(this._requestId, Shell.NetworkAgentResponse.USER_CANCELED);
            else
                this._agent.respond(this._requestId, Shell.NetworkAgentResponse.CONFIRMED);
-        } else
+        } else {
            this._agent.respond(this._requestId, Shell.NetworkAgentResponse.INTERNAL_ERROR);
+        }

        this.destroy();
    }
@@ -472,7 +475,7 @@ var VPNRequestHandler = class {
            if (line == '' && this._previousLine == '') {
                try {
                    this._stdin.write('QUIT\n\n', null);
-                } catch(e) { /* ignore broken pipe errors */ }
+                } catch (e) { /* ignore broken pipe errors */ }
            } else {
                this._agent.set_password(this._requestId, this._previousLine, line);
                this._previousLine = undefined;
@@ -484,7 +487,7 @@ var VPNRequestHandler = class {

    _readStdoutOldStyle() {
        this._dataStdout.read_line_async(GLib.PRIORITY_DEFAULT, null, (stream, result) => {
-            let [line, len] = this._dataStdout.read_line_finish_utf8(result);
+            let [line, len_] = this._dataStdout.read_line_finish_utf8(result);

            if (line == null) {
                // end of file
@@ -539,7 +542,7 @@ var VPNRequestHandler = class {
                                message: keyfile.get_string(VPN_UI_GROUP, 'Description'),
                                secrets: [] };

-            let [groups, len] = keyfile.get_groups();
+            let [groups, len_] = keyfile.get_groups();
            for (let i = 0; i < groups.length; i++) {
                if (groups[i] == VPN_UI_GROUP)
                    continue;
@@ -560,7 +563,7 @@ var VPNRequestHandler = class {
                    this._agent.set_password(this._requestId, groups[i], value);
                }
            }
-        } catch(e) {
+        } catch (e) {
            // No output is a valid case it means "both secrets are stored"
            if (data.length > 0) {
                logError(e, 'error while reading VPN plugin output keyfile');
@@ -586,15 +589,15 @@ var VPNRequestHandler = class {

        try {
            vpnSetting.foreach_data_item((key, value) => {
-                this._stdin.write('DATA_KEY=' + key + '\n', null);
-                this._stdin.write('DATA_VAL=' + (value || '') + '\n\n', null);
+                this._stdin.write(`DATA_KEY=${key}\n`, null);
+                this._stdin.write(`DATA_VAL=${value || ''}\n\n`, null);
            });
            vpnSetting.foreach_secret((key, value) => {
-                this._stdin.write('SECRET_KEY=' + key + '\n', null);
-                this._stdin.write('SECRET_VAL=' + (value || '') + '\n\n', null);
+                this._stdin.write(`SECRET_KEY=${key}\n`, null);
+                this._stdin.write(`SECRET_VAL=${value || ''}\n\n`, null);
            });
            this._stdin.write('DONE\n\n', null);
-        } catch(e) {
+        } catch (e) {
            logError(e, 'internal error while writing connection to helper');

            this._agent.respond(this._requestId, Shell.NetworkAgentResponse.INTERNAL_ERROR);
@@ -618,9 +621,9 @@ var NetworkAgent = class {
        this._pluginDir = Gio.file_new_for_path(Config.VPNDIR);
        try {
            let monitor = this._pluginDir.monitor(Gio.FileMonitorFlags.NONE, null);
-            monitor.connect('changed', () => { this._vpnCacheBuilt = false; });
-        } catch(e) {
-            log('Failed to create monitor for VPN plugin dir: ' + e.message);
+            monitor.connect('changed', () => this._vpnCacheBuilt = false);
+        } catch (e) {
+            log(`Failed to create monitor for VPN plugin dir: ${e.message}`);
        }

        this._native.connect('new-request', this._newRequest.bind(this));
@@ -631,7 +634,7 @@ var NetworkAgent = class {
            try {
                this._native.init_finish(res);
                this._initialized = true;
-            } catch(e) {
+            } catch (e) {
                this._native = null;
                logError(e, 'error initializing the NetworkManager Agent');
            }
@@ -679,12 +682,13 @@ var NetworkAgent = class {
        let connectionSetting = connection.get_setting_connection();
        let connectionType = connectionSetting.get_connection_type();
        switch (connectionType) {
-        case '802-11-wireless':
+        case '802-11-wireless': {
            let wirelessSetting = connection.get_setting_wireless();
            let ssid = NM.utils_ssid_to_utf8(wirelessSetting.get_ssid().get_data());
            title = _("Authentication required by wireless network");
            body = _("Passwords or encryption keys are required to access the wireless network “%s”.").format(ssid);
            break;
+        }
        case '802-3-ethernet':
            title = _("Wired 802.1X authentication");
            body = _("A password is required to connect to “%s”.".format(connection.get_id()));
@@ -694,8 +698,7 @@ var NetworkAgent = class {
            body = _("A password is required to connect to “%s”.".format(connection.get_id()));
            break;
        case 'gsm':
-            if (hints.indexOf('pin') != -1) {
-                let gsmSetting = connection.get_setting_gsm();
+            if (hints.includes('pin')) {
                title = _("PIN code required");
                body = _("PIN code is needed for the mobile broadband device");
                break;
@@ -707,7 +710,7 @@ var NetworkAgent = class {
            body = _("A password is required to connect to “%s”.").format(connectionSetting.get_id());
            break;
        default:
-            log('Invalid connection type: ' + connectionType);
+            log(`Invalid connection type: ${connectionType}`);
            this._native.respond(requestId, Shell.NetworkAgentResponse.INTERNAL_ERROR);
            return;
        }
--- a/js/ui/components/polkitAgent.js
+++ b/js/ui/components/polkitAgent.js
@@ -1,8 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported Component */

 const { AccountsService, Clutter, Gio, GLib,
-        Pango, PolkitAgent, Polkit, Shell, St } = imports.gi;
-const Signals = imports.signals;
+        GObject, Pango, PolkitAgent, Polkit, Shell, St } = imports.gi;

 const Animation = imports.ui.animation;
 const Dialog = imports.ui.dialog;
@@ -15,9 +15,11 @@ var DIALOG_ICON_SIZE = 48;

 var WORK_SPINNER_ICON_SIZE = 16;

-var AuthenticationDialog = class extends ModalDialog.ModalDialog {
-    constructor(actionId, body, cookie, userNames) {
-        super({ styleClass: 'prompt-dialog' });
+var AuthenticationDialog = GObject.registerClass({
+    Signals: { 'done': { param_types: [GObject.TYPE_BOOLEAN] } }
+}, class AuthenticationDialog extends ModalDialog.ModalDialog {
+    _init(actionId, body, cookie, userNames) {
+        super._init({ styleClass: 'prompt-dialog' });

        this.actionId = actionId;
        this.message = body;
@@ -25,7 +27,7 @@ var AuthenticationDialog = class extends ModalDialog.ModalDialog {
        this._wasDismissed = false;

        this._sessionUpdatedId = Main.sessionMode.connect('updated', () => {
-            this._group.visible = !Main.sessionMode.isLocked;
+            this.visible = !Main.sessionMode.isLocked;
        });

        this.connect('closed', this._onDialogClosed.bind(this));
@@ -37,19 +39,19 @@ var AuthenticationDialog = class extends ModalDialog.ModalDialog {
        this.contentLayout.add_actor(content);

        if (userNames.length > 1) {
-            log('polkitAuthenticationAgent: Received ' + userNames.length +
-                ' identities that can be used for authentication. Only ' +
+            log(`polkitAuthenticationAgent: Received ${userNames.length} ` +
+                'identities that can be used for authentication. Only ' +
                'considering one.');
        }

        let userName = GLib.get_user_name();
-        if (userNames.indexOf(userName) < 0)
+        if (!userNames.includes(userName))
            userName = 'root';
-        if (userNames.indexOf(userName) < 0)
+        if (!userNames.includes(userName))
            userName = userNames[0];

        this._user = AccountsService.UserManager.get_default().get_user(userName);
-        let userRealName = this._user.get_real_name()
+        let userRealName = this._user.get_real_name();
        this._userLoadedId = this._user.connect('notify::is_loaded',
                                                this._onUserChanged.bind(this));
        this._userChangedId = this._user.connect('changed',
@@ -76,15 +78,15 @@ var AuthenticationDialog = class extends ModalDialog.ModalDialog {
                                                       styleClass: 'polkit-dialog-user-icon' });
            this._userAvatar.actor.hide();
            userBox.add(this._userAvatar.actor,
-                        { x_fill:  true,
-                          y_fill:  false,
+                        { x_fill: true,
+                          y_fill: false,
                          x_align: St.Align.END,
                          y_align: St.Align.START });
            let userLabel = new St.Label(({ style_class: 'polkit-dialog-user-label',
                                            text: userRealName }));
            userBox.add(userLabel,
-                        { x_fill:  true,
-                          y_fill:  false,
+                        { x_fill: true,
+                          y_fill: false,
                          x_align: St.Align.END,
                          y_align: St.Align.MIDDLE });
        }
@@ -97,7 +99,7 @@ var AuthenticationDialog = class extends ModalDialog.ModalDialog {
        this._passwordBox.add(this._passwordLabel, { y_fill: false, y_align: St.Align.MIDDLE });
        this._passwordEntry = new St.Entry({ style_class: 'prompt-dialog-password-entry',
                                             text: "",
-                                             can_focus: true});
+                                             can_focus: true });
        ShellEntry.addContextMenu(this._passwordEntry, { isPassword: true });
        this._passwordEntry.clutter_text.connect('activate', this._onEntryActivate.bind(this));
        this._passwordBox.add(this._passwordEntry,
@@ -126,7 +128,7 @@ var AuthenticationDialog = class extends ModalDialog.ModalDialog {
         * gnome-shell.css sets the color to be transparent
         */
        this._nullMessageLabel = new St.Label({ style_class: 'prompt-dialog-null-label',
-                                                text: 'abc'});
+                                                text: 'abc' });
        this._nullMessageLabel.add_style_class_name('hidden');
        this._nullMessageLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
        this._nullMessageLabel.clutter_text.line_wrap = true;
@@ -136,7 +138,7 @@ var AuthenticationDialog = class extends ModalDialog.ModalDialog {
        this._cancelButton = this.addButton({ label: _("Cancel"),
                                              action: this.cancel.bind(this),
                                              key: Clutter.Escape });
-        this._okButton = this.addButton({ label:  _("Authenticate"),
+        this._okButton = this.addButton({ label: _("Authenticate"),
                                          action: this._onAuthenticateButtonPressed.bind(this),
                                          default: true });

@@ -179,9 +181,9 @@ var AuthenticationDialog = class extends ModalDialog.ModalDialog {
            //
            // We could add retrying if this turns out to be a problem

-            log('polkitAuthenticationAgent: Failed to show modal dialog.' +
-                ' Dismissing authentication request for action-id ' + this.actionId +
-                ' cookie ' + this._cookie);
+            log('polkitAuthenticationAgent: Failed to show modal dialog. ' +
+                `Dismissing authentication request for action-id ${this.actionId} ` +
+                `cookie ${this._cookie}`);
            this._emitDone(true);
        }
    }
@@ -249,14 +251,14 @@ var AuthenticationDialog = class extends ModalDialog.ModalDialog {
        }
    }

-    _onSessionRequest(session, request, echo_on) {
+    _onSessionRequest(session, request, echoOn) {
        // Cheap localization trick
        if (request == 'Password:' || request == 'Password: ')
            this._passwordLabel.set_text(_("Password:"));
        else
            this._passwordLabel.set_text(request);

-        if (echo_on)
+        if (echoOn)
            this._passwordEntry.clutter_text.set_password_char('');
        else
            this._passwordEntry.clutter_text.set_password_char('\u25cf'); // ● U+25CF BLACK CIRCLE
@@ -326,8 +328,7 @@ var AuthenticationDialog = class extends ModalDialog.ModalDialog {

        this._destroySession();
    }
-};
-Signals.addSignalMethods(AuthenticationDialog.prototype);
+});

 var AuthenticationAgent = class {
    constructor() {
@@ -342,7 +343,7 @@ var AuthenticationAgent = class {
    enable() {
        try {
            this._native.register();
-        } catch(e) {
+        } catch (e) {
            log('Failed to register AuthenticationAgent');
        }
    }
@@ -350,7 +351,7 @@ var AuthenticationAgent = class {
    disable() {
        try {
            this._native.unregister();
-        } catch(e) {
+        } catch (e) {
            log('Failed to unregister AuthenticationAgent');
        }
    }
@@ -383,11 +384,11 @@ var AuthenticationAgent = class {
        this._currentDialog.performAuthentication();
    }

-    _onCancel(nativeAgent) {
+    _onCancel(_nativeAgent) {
        this._completeRequest(false);
    }

-    _onDialogDone(dialog, dismissed) {
+    _onDialogDone(_dialog, dismissed) {
        this._completeRequest(dismissed);
    }

--- a/js/ui/components/telepathyClient.js
+++ b/js/ui/components/telepathyClient.js
@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported Component */

 const { Clutter, Gio, GLib, GObject, St } = imports.gi;
 const Lang = imports.lang;
@@ -8,7 +9,7 @@ var Tpl = null;
 var Tp = null;
 try {
    ({ TelepathyGLib: Tp, TelepathyLogger: Tpl } = imports.gi);
-} catch(e) {
+} catch (e) {
    log('Telepathy is not available, chat integration will be disabled.');
 }

@@ -40,10 +41,8 @@ var NotificationDirection = {
    RECEIVED: 'chat-received'
 };

-var N_ = s => s;
-
 function makeMessageFromTpMessage(tpMessage, direction) {
-    let [text, flags] = tpMessage.to_text();
+    let [text, flags_] = tpMessage.to_text();

    let timestamp = tpMessage.get_sent_timestamp();
    if (timestamp == 0)
@@ -89,7 +88,7 @@ var TelepathyComponent = class {
        try {
            this._client.register();
        } catch (e) {
-            throw new Error('Couldn\'t register Telepathy client. Error: \n' + e);
+            throw new Error(`Could not register Telepathy client. Error: ${e}`);
        }

        if (!this._client.account_manager.is_prepared(Tp.AccountManager.get_feature_quark_core()))
@@ -149,20 +148,20 @@ class TelepathyClient extends Tp.BaseClient {
            this._delegatedChannelsCb.bind(this));
    }

-    vfunc_observe_channels(account, conn, channels,
-                                     dispatchOp, requests, context) {
+    vfunc_observe_channels(...args) {
+        let [account, conn, channels, dispatchOp_, requests_, context] = args;
        let len = channels.length;
        for (let i = 0; i < len; i++) {
            let channel = channels[i];
-            let [targetHandle, targetHandleType] = channel.get_handle();
+            let [targetHandle_, targetHandleType] = channel.get_handle();

            if (channel.get_invalidated())
-              continue;
+                continue;

            /* Only observe contact text channels */
            if ((!(channel instanceof Tp.TextChannel)) ||
               targetHandleType != Tp.HandleType.CONTACT)
-               continue;
+                continue;

            this._createChatSource(account, conn, channel, channel.get_target_contact());
        }
@@ -182,8 +181,8 @@ class TelepathyClient extends Tp.BaseClient {
        });
    }

-    vfunc_handle_channels(account, conn, channels, requests,
-                                    user_action_time, context) {
+    vfunc_handle_channels(...args) {
+        let [account, conn, channels, requests_, userActionTime_, context] = args;
        this._handlingChannels(account, conn, channels, true);
        context.accept();
    }
@@ -200,7 +199,7 @@ class TelepathyClient extends Tp.BaseClient {
            }

            if (channel.get_invalidated())
-              continue;
+                continue;

            // 'notify' will be true when coming from an actual HandleChannels
            // call, and not when from a successful Claim call. The point is
@@ -222,8 +221,8 @@ class TelepathyClient extends Tp.BaseClient {
        }
    }

-    vfunc_add_dispatch_operation(account, conn, channels,
-                                           dispatchOp, context) {
+    vfunc_add_dispatch_operation(...args) {
+        let [account, conn, channels, dispatchOp, context] = args;
        let channel = channels[0];
        let chanType = channel.get_channel_type();

@@ -241,7 +240,7 @@ class TelepathyClient extends Tp.BaseClient {
    }

    _approveTextChannel(account, conn, channel, dispatchOp, context) {
-        let [targetHandle, targetHandleType] = channel.get_handle();
+        let [targetHandle_, targetHandleType] = channel.get_handle();

        if (targetHandleType != Tp.HandleType.CONTACT) {
            context.fail(new Tp.Error({ code: Tp.Error.INVALID_ARGUMENT,
@@ -255,14 +254,14 @@ class TelepathyClient extends Tp.BaseClient {
                dispatchOp.claim_with_finish(result);
                this._handlingChannels(account, conn, [channel], false);
            } catch (err) {
-                log('Failed to Claim channel: ' + err);
+                log(`Failed to Claim channel: ${err}`);
            }
        });

        context.accept();
    }

-    _delegatedChannelsCb(client, channels) {
+    _delegatedChannelsCb(_client, _channels) {
        // Nothing to do as we don't make a distinction between observed and
        // handled channels.
    }
@@ -362,28 +361,28 @@ var ChatSource = class extends MessageTray.Source {
        let presenceType = this._contact.get_presence_type();

        switch (presenceType) {
-            case Tp.ConnectionPresenceType.AVAILABLE:
-                iconName = 'user-available';
-                break;
-            case Tp.ConnectionPresenceType.BUSY:
-                iconName = 'user-busy';
-                break;
-            case Tp.ConnectionPresenceType.OFFLINE:
-                iconName = 'user-offline';
-                break;
-            case Tp.ConnectionPresenceType.HIDDEN:
-                iconName = 'user-invisible';
-                break;
-            case Tp.ConnectionPresenceType.AWAY:
-                iconName = 'user-away';
-                break;
-            case Tp.ConnectionPresenceType.EXTENDED_AWAY:
-                iconName = 'user-idle';
-                break;
-            default:
-                iconName = 'user-offline';
-       }
-       return new Gio.ThemedIcon({ name: iconName });
+        case Tp.ConnectionPresenceType.AVAILABLE:
+            iconName = 'user-available';
+            break;
+        case Tp.ConnectionPresenceType.BUSY:
+            iconName = 'user-busy';
+            break;
+        case Tp.ConnectionPresenceType.OFFLINE:
+            iconName = 'user-offline';
+            break;
+        case Tp.ConnectionPresenceType.HIDDEN:
+            iconName = 'user-invisible';
+            break;
+        case Tp.ConnectionPresenceType.AWAY:
+            iconName = 'user-away';
+            break;
+        case Tp.ConnectionPresenceType.EXTENDED_AWAY:
+            iconName = 'user-idle';
+            break;
+        default:
+            iconName = 'user-offline';
+        }
+        return new Gio.ThemedIcon({ name: iconName });
    }

    _updateAvatarIcon() {
@@ -401,7 +400,7 @@ var ChatSource = class extends MessageTray.Source {
        if (this._client.is_handling_channel(this._channel)) {
            // We are handling the channel, try to pass it to Empathy or Polari
            // (depending on the channel type)
-            // We don't check if either app is availble - mission control will
+            // We don't check if either app is available - mission control will
            // fallback to something else if activation fails

            let target;
@@ -429,7 +428,7 @@ var ChatSource = class extends MessageTray.Source {
    }

    _displayPendingMessages(logManager, result) {
-        let [success, events] = logManager.get_filtered_events_finish(result);
+        let [success_, events] = logManager.get_filtered_events_finish(result);

        let logMessages = events.map(makeMessageFromTplEvent);
        this._ensureNotification();
@@ -564,7 +563,7 @@ var ChatSource = class extends MessageTray.Source {

    // This is called for both messages we send from
    // our client and other clients as well.
-    _messageSent(channel, message, flags, token) {
+    _messageSent(channel, message, _flags, _token) {
        this._ensureNotification();
        message = makeMessageFromTpMessage(message, NotificationDirection.SENT);
        this._notification.appendMessage(message);
@@ -597,12 +596,12 @@ var ChatSource = class extends MessageTray.Source {
        // keep track of it with the ChatStateChanged signal but it is good
        // enough right now.
        if (state != this._chatState) {
-          this._chatState = state;
-          this._channel.set_chat_state_async(state, null);
+            this._chatState = state;
+            this._channel.set_chat_state_async(state, null);
        }
    }

-    _presenceChanged(contact, presence, status, message) {
+    _presenceChanged(_contact, _presence, _status, _message) {
        if (this._notification)
            this._notification.update(this._notification.title,
                                      this._notification.bannerBodyText,
--- a/js/ui/ctrlAltTab.js
+++ b/js/ui/ctrlAltTab.js
@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported CtrlAltTabManager */

 const { Clutter, GObject, Meta, Shell, St } = imports.gi;

@@ -7,7 +8,6 @@ const SwitcherPopup = imports.ui.switcherPopup;
 const Params = imports.misc.params;

 var POPUP_APPICON_SIZE = 96;
-var POPUP_FADE_TIME = 0.1; // seconds

 var SortGroup = {
    TOP:    0,
@@ -33,7 +33,7 @@ var CtrlAltTabManager = class CtrlAltTabManager {
        item.iconName = icon;

        this._items.push(item);
-        root.connect('destroy', () => { this.removeGroup(root); });
+        root.connect('destroy', () => this.removeGroup(root));
        if (root instanceof St.Widget)
            global.focus_manager.add_group(root);
    }
@@ -64,9 +64,8 @@ var CtrlAltTabManager = class CtrlAltTabManager {
        if (a.sortGroup != b.sortGroup)
            return a.sortGroup - b.sortGroup;

-        let ax, bx, y;
-        [ax, y] = a.proxy.get_transformed_position();
-        [bx, y] = b.proxy.get_transformed_position();
+        let [ax] = a.proxy.get_transformed_position();
+        let [bx] = b.proxy.get_transformed_position();

        return ax - bx;
    }
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported Dash */

 const { Clutter, GLib, GObject, Meta, Shell, St } = imports.gi;
 const Mainloop = imports.mainloop;
@@ -9,11 +10,10 @@ const AppFavorites = imports.ui.appFavorites;
 const DND = imports.ui.dnd;
 const IconGrid = imports.ui.iconGrid;
 const Main = imports.ui.main;
-const Tweener = imports.ui.tweener;

-var DASH_ANIMATION_TIME = 0.2;
-var DASH_ITEM_LABEL_SHOW_TIME = 0.15;
-var DASH_ITEM_LABEL_HIDE_TIME = 0.1;
+var DASH_ANIMATION_TIME = 200;
+var DASH_ITEM_LABEL_SHOW_TIME = 150;
+var DASH_ITEM_LABEL_HIDE_TIME = 100;
 var DASH_ITEM_HOVER_TIMEOUT = 300;

 function getAppFromSource(source) {
@@ -24,6 +24,30 @@ function getAppFromSource(source) {
    }
 }

+var DashIcon = class DashIcon extends AppDisplay.AppIcon {
+    constructor(app) {
+        super(app, {
+            setSizeManually: true,
+            showLabel: false
+        });
+    }
+
+    // Disable all DnD methods
+    _onDragBegin() {
+    }
+
+    _onDragEnd() {
+    }
+
+    handleDragOver() {
+        return DND.DragMotionResult.CONTINUE;
+    }
+
+    acceptDrop() {
+        return false;
+    }
+};
+
 // A container like StBin, but taking the child's scale into account
 // when requesting a size
 var DashItemContainer = GObject.registerClass(
@@ -31,20 +55,24 @@ class DashItemContainer extends St.Widget {
    _init() {
        super._init({ style_class: 'dash-item-container',
                      pivot_point: new Clutter.Point({ x: .5, y: .5 }),
+                      scale_x: 0,
+                      scale_y: 0,
+                      opacity: 0,
                      x_expand: true,
                      x_align: Clutter.ActorAlign.CENTER });

        this._labelText = "";
-        this.label = new St.Label({ style_class: 'dash-label'});
+        this.label = new St.Label({ style_class: 'dash-label' });
        this.label.hide();
        Main.layoutManager.addChrome(this.label);
        this.label_actor = this.label;

        this.child = null;
-        this._childScale = 0;
-        this._childOpacity = 0;
        this.animatingOut = false;

+        this.connect('notify::scale-x', () => this.queue_relayout());
+        this.connect('notify::scale-y', () => this.queue_relayout());
+
        this.connect('destroy', () => {
            if (this.child != null)
                this.child.destroy();
@@ -81,7 +109,7 @@ class DashItemContainer extends St.Widget {
        let itemHeight = this.allocation.y2 - this.allocation.y1;

        let labelHeight = this.label.get_height();
-        let yOffset = Math.floor((itemHeight - labelHeight) / 2)
+        let yOffset = Math.floor((itemHeight - labelHeight) / 2);

        let y = stageY + yOffset;

@@ -95,11 +123,11 @@ class DashItemContainer extends St.Widget {
            x = stageX + this.get_width() + xOffset;

        this.label.set_position(x, y);
-        Tweener.addTween(this.label,
-                         { opacity: 255,
-                           time: DASH_ITEM_LABEL_SHOW_TIME,
-                           transition: 'easeOutQuad',
-                         });
+        this.label.ease({
+            opacity: 255,
+            duration: DASH_ITEM_LABEL_SHOW_TIME,
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD
+        });
    }

    setLabelText(text) {
@@ -108,14 +136,12 @@ class DashItemContainer extends St.Widget {
    }

    hideLabel() {
-        Tweener.addTween(this.label,
-                         { opacity: 0,
-                           time: DASH_ITEM_LABEL_HIDE_TIME,
-                           transition: 'easeOutQuad',
-                           onComplete: () => {
-                               this.label.hide();
-                           }
-                         });
+        this.label.ease({
+            opacity: 0,
+            duration: DASH_ITEM_LABEL_HIDE_TIME,
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+            onComplete: () => this.label.hide()
+        });
    }

    setChild(actor) {
@@ -126,9 +152,6 @@ class DashItemContainer extends St.Widget {

        this.child = actor;
        this.add_actor(this.child);
-
-        this.set_scale(this._childScale, this._childScale);
-        this.set_opacity(this._childOpacity);
    }

    show(animate) {
@@ -136,12 +159,13 @@ class DashItemContainer extends St.Widget {
            return;

        let time = animate ? DASH_ANIMATION_TIME : 0;
-        Tweener.addTween(this,
-                         { childScale: 1.0,
-                           childOpacity: 255,
-                           time: time,
-                           transition: 'easeOutQuad'
-                         });
+        this.ease({
+            scale_x: 1,
+            scale_y: 1,
+            opacity: 255,
+            duration: time,
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD
+        });
    }

    animateOutAndDestroy() {
@@ -153,37 +177,14 @@ class DashItemContainer extends St.Widget {
        }

        this.animatingOut = true;
-        Tweener.addTween(this,
-                         { childScale: 0.0,
-                           childOpacity: 0,
-                           time: DASH_ANIMATION_TIME,
-                           transition: 'easeOutQuad',
-                           onComplete: () => {
-                               this.destroy();
-                           }
-                         });
-    }
-
-    set childScale(scale) {
-        this._childScale = scale;
-
-        this.set_scale(scale, scale);
-        this.queue_relayout();
-    }
-
-    get childScale() {
-        return this._childScale;
-    }
-
-    set childOpacity(opacity) {
-        this._childOpacity = opacity;
-
-        this.set_opacity(opacity);
-        this.queue_redraw();
-    }
-
-    get childOpacity() {
-        return this._childOpacity;
+        this.ease({
+            scale_x: 0,
+            scale_y: 0,
+            opacity: 0,
+            duration: DASH_ANIMATION_TIME,
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+            onComplete: () => this.destroy()
+        });
    }
 });

@@ -198,9 +199,9 @@ class ShowAppsIcon extends DashItemContainer {
                                            toggle_mode: true });
        this._iconActor = null;
        this.icon = new IconGrid.BaseIcon(_("Show Applications"),
-                                           { setSizeManually: true,
-                                             showLabel: false,
-                                             createIcon: this._createIcon.bind(this) });
+                                          { setSizeManually: true,
+                                            showLabel: false,
+                                            createIcon: this._createIcon.bind(this) });
        this.toggleButton.add_actor(this.icon);
        this.toggleButton._delegate = this;

@@ -241,14 +242,14 @@ class ShowAppsIcon extends DashItemContainer {
            this.setLabelText(_("Show Applications"));
    }

-    handleDragOver(source, actor, x, y, time) {
+    handleDragOver(source, _actor, _x, _y, _time) {
        if (!this._canRemoveApp(getAppFromSource(source)))
            return DND.DragMotionResult.NO_DROP;

        return DND.DragMotionResult.MOVE_DROP;
    }

-    acceptDrop(source, actor, x, y, time) {
+    acceptDrop(source, _actor, _x, _y, _time) {
        let app = getAppFromSource(source);
        if (!this._canRemoveApp(app))
            return false;
@@ -296,7 +297,7 @@ class DashActor extends St.Widget {
        this.set_allocation(box, flags);

        let [appIcons, showAppsButton] = this.get_children();
-        let [showAppsMinHeight, showAppsNatHeight] = showAppsButton.get_preferred_height(availWidth);
+        let [, showAppsNatHeight] = showAppsButton.get_preferred_height(availWidth);

        let childBox = new Clutter.ActorBox();
        childBox.x1 = contentBox.x1;
@@ -321,14 +322,14 @@ class DashActor extends St.Widget {
        let themeNode = this.get_theme_node();
        let adjustedForWidth = themeNode.adjust_for_width(forWidth);
        let [, showAppsButton] = this.get_children();
-        let [minHeight, ] = showAppsButton.get_preferred_height(adjustedForWidth);
-        [minHeight, ] = themeNode.adjust_preferred_height(minHeight, natHeight);
+        let [minHeight] = showAppsButton.get_preferred_height(adjustedForWidth);
+        [minHeight] = themeNode.adjust_preferred_height(minHeight, natHeight);

        return [minHeight, natHeight];
    }
 });

-const baseIconSizes = [ 16, 22, 24, 32, 48, 64 ];
+const baseIconSizes = [16, 22, 24, 32, 48, 64];

 var Dash = class Dash {
    constructor() {
@@ -351,8 +352,7 @@ var Dash = class Dash {
        this._container.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS);

        this._showAppsIcon = new ShowAppsIcon();
-        this._showAppsIcon.childScale = 1;
-        this._showAppsIcon.childOpacity = 255;
+        this._showAppsIcon.show(false);
        this._showAppsIcon.icon.setIconSize(this.iconSize);
        this._hookUpLabel(this._showAppsIcon);

@@ -474,19 +474,7 @@ var Dash = class Dash {
    }

    _createAppItem(app) {
-        let appIcon = new AppDisplay.AppIcon(app,
-                                             { setSizeManually: true,
-                                               showLabel: false });
-        if (appIcon._draggable) {
-            appIcon._draggable.connect('drag-begin',
-                                       () => {
-                                           appIcon.actor.opacity = 50;
-                                       });
-            appIcon._draggable.connect('drag-end',
-                                       () => {
-                                           appIcon.actor.opacity = 255;
-                                       });
-        }
+        let appIcon = new DashIcon(app);

        appIcon.connect('menu-state-changed',
                        (appIcon, opened) => {
@@ -584,22 +572,18 @@ var Dash = class Dash {
        let firstButton = iconChildren[0].child;
        let firstIcon = firstButton._delegate.icon;

-        let minHeight, natHeight;
-        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-
-        // Enforce the current icon size during the size request
+        // Enforce valid spacings during the size request
        firstIcon.icon.ensure_style();
-        let [, currentHeight] = firstIcon.icon.get_size();
-        firstIcon.icon.set_height(this.iconSize * scaleFactor);
-        [minHeight, natHeight] = firstButton.get_preferred_height(-1);
-        firstIcon.icon.set_height(currentHeight);
+        let [, iconHeight] = firstIcon.icon.get_preferred_height(-1);
+        let [, buttonHeight] = firstButton.get_preferred_height(-1);

        // Subtract icon padding and box spacing from the available height
-        availHeight -= iconChildren.length * (natHeight - this.iconSize * scaleFactor) +
+        availHeight -= iconChildren.length * (buttonHeight - iconHeight) +
                       (iconChildren.length - 1) * spacing;

        let availSize = availHeight / iconChildren.length;

+        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
        let iconSizes = baseIconSizes.map(s => s * scaleFactor);

        let newIconSize = baseIconSizes[0];
@@ -637,12 +621,12 @@ var Dash = class Dash {
            icon.icon.set_size(icon.icon.width * scale,
                               icon.icon.height * scale);

-            Tweener.addTween(icon.icon,
-                             { width: targetWidth,
-                               height: targetHeight,
-                               time: DASH_ANIMATION_TIME,
-                               transition: 'easeOutQuad',
-                             });
+            icon.icon.ease({
+                width: targetWidth,
+                height: targetHeight,
+                time: DASH_ANIMATION_TIME,
+                mode: Clutter.AnimationMode.EASE_OUT_QUAD
+            });
        }
    }

@@ -652,10 +636,10 @@ var Dash = class Dash {
        let running = this._appSystem.get_running();

        let children = this._box.get_children().filter(actor => {
-                return actor.child &&
-                       actor.child._delegate &&
-                       actor.child._delegate.app;
-            });
+            return actor.child &&
+                   actor.child._delegate &&
+                   actor.child._delegate.app;
+        });
        // Apps currently in the dash
        let oldApps = children.map(actor => actor.child._delegate.app);
        // Apps supposed to be in the dash
@@ -704,14 +688,14 @@ var Dash = class Dash {
            }

            // App removed at oldIndex
-            if (oldApp && newApps.indexOf(oldApp) == -1) {
+            if (oldApp && !newApps.includes(oldApp)) {
                removedActors.push(children[oldIndex]);
                oldIndex++;
                continue;
            }

            // App added at newIndex
-            if (newApp && oldApps.indexOf(newApp) == -1) {
+            if (newApp && !oldApps.includes(newApp)) {
                addedItems.push({ app: newApp,
                                  item: this._createAppItem(newApp),
                                  pos: newIndex });
@@ -794,7 +778,7 @@ var Dash = class Dash {
        }
    }

-    handleDragOver(source, actor, x, y, time) {
+    handleDragOver(source, actor, x, y, _time) {
        let app = getAppFromSource(source);

        // Don't allow favoriting of transient apps
@@ -872,7 +856,7 @@ var Dash = class Dash {
    }

    // Draggable target interface
-    acceptDrop(source, actor, x, y, time) {
+    acceptDrop(source, _actor, _x, _y, _time) {
        let app = getAppFromSource(source);

        // Don't allow favoriting of transient apps
@@ -903,7 +887,7 @@ var Dash = class Dash {
                favPos++;
        }

-        // No drag placeholder means we don't wan't to favorite the app
+        // No drag placeholder means we don't want to favorite the app
        // and we are dragging it to its original position
        if (!this._dragPlaceholder)
            return true;
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@@ -1,6 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported DateMenuButton */

-const { Clutter, GLib, GnomeDesktop,
+const { Clutter, Gio, GLib, GnomeDesktop,
        GObject, GWeather, Shell, St } = imports.gi;

 const Util = imports.misc.util;
@@ -10,8 +11,13 @@ const Calendar = imports.ui.calendar;
 const Weather = imports.misc.weather;
 const System = imports.system;

+const { loadInterfaceXML } = imports.misc.fileUtils;
+
 const MAX_FORECASTS = 5;

+const ClocksIntegrationIface = loadInterfaceXML('org.gnome.Shell.ClocksIntegration');
+const ClocksProxy = Gio.DBusProxy.makeProxyWrapper(ClocksIntegrationIface);
+
 function _isToday(date) {
    let now = new Date();
    return now.getYear() == date.getYear() &&
@@ -47,7 +53,7 @@ var TodayButton = class TodayButton {
        this._calendar.connect('selected-date-changed', (calendar, date) => {
            // Make the button reactive only if the selected date is not the
            // current date.
-            this.actor.reactive = !_isToday(date)
+            this.actor.reactive = !_isToday(date);
        });
    }

@@ -82,7 +88,8 @@ var WorldClocksSection = class WorldClocksSection {
                                     x_fill: true,
                                     can_focus: true });
        this.actor.connect('clicked', () => {
-            this._clockAppMon.activateApp();
+            if (this._clocksApp)
+                this._clocksApp.activate();

            Main.overview.hide();
            Main.panel.closeCalendar();
@@ -95,30 +102,41 @@ var WorldClocksSection = class WorldClocksSection {

        this.actor.child = this._grid;

-        this._clockAppMon = new Util.AppSettingsMonitor('org.gnome.clocks.desktop',
-                                                        'org.gnome.clocks');
-        this._clockAppMon.connect('available-changed',
-                                  this._sync.bind(this));
-        this._clockAppMon.watchSetting('world-clocks',
-                                       this._clocksChanged.bind(this));
+        this._clocksApp = null;
+        this._clocksProxy = new ClocksProxy(
+            Gio.DBus.session,
+            'org.gnome.clocks',
+            '/org/gnome/clocks',
+            this._onProxyReady.bind(this),
+            null /* cancellable */,
+            Gio.DBusProxyFlags.DO_NOT_AUTO_START | Gio.DBusProxyFlags.GET_INVALIDATED_PROPERTIES);
+
+        this._settings = new Gio.Settings({
+            schema_id: 'org.gnome.shell.world-clocks'
+        });
+        this._settings.connect('changed', this._clocksChanged.bind(this));
+        this._clocksChanged();
+
+        this._appSystem = Shell.AppSystem.get_default();
+        this._appSystem.connect('installed-changed',
+            this._sync.bind(this));
        this._sync();
    }

    _sync() {
-        this.actor.visible = this._clockAppMon.available;
+        this._clocksApp = this._appSystem.lookup_app('org.gnome.clocks.desktop');
+        this.actor.visible = this._clocksApp != null;
    }

-    _clocksChanged(settings) {
+    _clocksChanged() {
        this._grid.destroy_all_children();
        this._locations = [];

        let world = GWeather.Location.get_world();
-        let clocks = settings.get_value('world-clocks').deep_unpack();
+        let clocks = this._settings.get_value('locations').deep_unpack();
        for (let i = 0; i < clocks.length; i++) {
-            if (!clocks[i].location)
-                continue;
-            let l = world.deserialize(clocks[i].location);
-            if (l)
+            let l = world.deserialize(clocks[i]);
+            if (l && l.get_timezone() != null)
                this._locations.push({ location: l });
        }

@@ -136,11 +154,12 @@ var WorldClocksSection = class WorldClocksSection {
        layout.attach(header, 0, 0, 2, 1);
        this.actor.label_actor = header;

+        let localOffset = GLib.DateTime.new_now_local().get_utc_offset();
+
        for (let i = 0; i < this._locations.length; i++) {
            let l = this._locations[i].location;

-            let name = l.get_level() == GWeather.LocationLevel.NAMED_TIMEZONE ? l.get_name()
-                                                                              : l.get_city_name();
+            let name = l.get_city_name() || l.get_name();
            let label = new St.Label({ style_class: 'world-clocks-city',
                                       text: name,
                                       x_align: Clutter.ActorAlign.START,
@@ -149,7 +168,8 @@ var WorldClocksSection = class WorldClocksSection {

            let time = new St.Label({ style_class: 'world-clocks-time' });

-            let offset = l.get_timezone().get_offset() / 60.;
+            let otherOffset = this._getTimeAtLocation(l).get_utc_offset();
+            let offset = (otherOffset - localOffset) / GLib.TIME_SPAN_HOUR;
            let fmt = (Math.trunc(offset) == offset) ? '%s%.0f' : '%s%.1f';
            let prefix = (offset >= 0) ? '+' : '-';
            let tz = new St.Label({ style_class: 'world-clocks-timezone',
@@ -182,14 +202,37 @@ var WorldClocksSection = class WorldClocksSection {
        }
    }

+    _getTimeAtLocation(location) {
+        let tz = GLib.TimeZone.new(location.get_timezone().get_tzid());
+        return GLib.DateTime.new_now(tz);
+    }
+
    _updateLabels() {
        for (let i = 0; i < this._locations.length; i++) {
            let l = this._locations[i];
-            let tz = GLib.TimeZone.new(l.location.get_timezone().get_tzid());
-            let now = GLib.DateTime.new_now(tz);
+            let now = this._getTimeAtLocation(l.location);
            l.actor.text = Util.formatTime(now, { timeOnly: true });
        }
    }
+
+    _onProxyReady(proxy, error) {
+        if (error) {
+            log(`Failed to create GNOME Clocks proxy: ${error}`);
+            return;
+        }
+
+        this._clocksProxy.connect('g-properties-changed',
+            this._onClocksPropertiesChanged.bind(this));
+        this._onClocksPropertiesChanged();
+    }
+
+    _onClocksPropertiesChanged() {
+        if (this._clocksProxy.g_name_owner == null)
+            return;
+
+        this._settings.set_value('locations',
+            new GLib.Variant('av', this._clocksProxy.Locations));
+    }
 };

 var WeatherSection = class WeatherSection {
@@ -211,7 +254,7 @@ var WeatherSection = class WeatherSection {
        });

        let box = new St.BoxLayout({ style_class: 'weather-box',
-                                      vertical: true });
+                                     vertical: true });

        this.actor.child = box;

@@ -243,12 +286,12 @@ var WeatherSection = class WeatherSection {
        let current = info;
        let infos = [info];
        for (let i = 0; i < forecasts.length; i++) {
-            let [ok, timestamp] = forecasts[i].get_value_update();
+            let [ok_, timestamp] = forecasts[i].get_value_update();
            let datetime = new Date(timestamp * 1000);
            if (!_isToday(datetime))
                continue; // Ignore forecasts from other days

-            [ok, timestamp] = current.get_value_update();
+            [ok_, timestamp] = current.get_value_update();
            let currenttime = new Date(timestamp * 1000);
            if (currenttime.getHours() == datetime.getHours())
                continue; // Enforce a minimum interval of 1h
@@ -269,7 +312,7 @@ var WeatherSection = class WeatherSection {

        let col = 0;
        infos.forEach(fc => {
-            let [ok, timestamp] = fc.get_value_update();
+            let [ok_, timestamp] = fc.get_value_update();
            let timeStr = Util.formatTime(new Date(timestamp * 1000), {
                timeOnly: true
            });
@@ -351,7 +394,7 @@ var MessagesIndicator = class MessagesIndicator {
        Main.messageTray.connect('queue-changed', this._updateCount.bind(this));

        let sources = Main.messageTray.getSources();
-        sources.forEach(source => { this._onSourceAdded(null, source); });
+        sources.forEach(source => this._onSourceAdded(null, source));
    }

    _onSourceAdded(tray, source) {
@@ -367,7 +410,7 @@ var MessagesIndicator = class MessagesIndicator {

    _updateCount() {
        let count = 0;
-        this._sources.forEach(source => { count += source.unseenCount; });
+        this._sources.forEach(source => count += source.unseenCount);
        count -= Main.messageTray.queueCount;

        this.actor.visible = (count > 0);
@@ -378,8 +421,8 @@ var IndicatorPad = GObject.registerClass(
 class IndicatorPad extends St.Widget {
    _init(actor) {
        this._source = actor;
-        this._source.connect('notify::visible', () => { this.queue_relayout(); });
-        this._source.connect('notify::size', () => { this.queue_relayout(); });
+        this._source.connect('notify::visible', () => this.queue_relayout());
+        this._source.connect('notify::size', () => this.queue_relayout());
        super._init();
    }

@@ -453,7 +496,6 @@ class CalendarColumnLayout extends Clutter.BoxLayout {
 var DateMenuButton = GObject.registerClass(
 class DateMenuButton extends PanelMenu.Button {
    _init() {
-        let item;
        let hbox;
        let vbox;

@@ -470,10 +512,9 @@ class DateMenuButton extends PanelMenu.Button {
        box.add_actor(this._clockDisplay);
        box.add_actor(this._indicator.actor);

-        this.actor.label_actor = this._clockDisplay;
-        this.actor.add_actor(box);
-        this.actor.add_style_class_name ('clock-display');
-
+        this.label_actor = this._clockDisplay;
+        this.add_actor(box);
+        this.add_style_class_name ('clock-display');

        let layout = new FreezableBinLayout();
        let bin = new St.Widget({ layout_manager: layout });
--- a/js/ui/dialog.js
+++ b/js/ui/dialog.js
@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported Dialog, MessageDialogContent */

 const { Clutter, Gio, GObject, Pango, St } = imports.gi;

@@ -25,9 +26,9 @@ class Dialog extends St.Widget {

    _createDialog() {
        this._dialog = new St.BoxLayout({ style_class: 'modal-dialog',
-                                          x_align:     Clutter.ActorAlign.CENTER,
-                                          y_align:     Clutter.ActorAlign.CENTER,
-                                          vertical:    true });
+                                          x_align: Clutter.ActorAlign.CENTER,
+                                          y_align: Clutter.ActorAlign.CENTER,
+                                          vertical: true });

        // modal dialogs are fixed width and grow vertically; set the request
        // mode accordingly so wrapped labels are handled correctly during
@@ -38,13 +39,13 @@ class Dialog extends St.Widget {
        this.contentLayout = new St.BoxLayout({ vertical: true,
                                                style_class: "modal-dialog-content-box" });
        this._dialog.add(this.contentLayout,
-                         { expand:  true,
-                           x_fill:  true,
-                           y_fill:  true,
+                         { expand: true,
+                           x_fill: true,
+                           y_fill: true,
                           x_align: St.Align.MIDDLE,
                           y_align: St.Align.START });

-        this.buttonLayout = new St.Widget ({ layout_manager: new Clutter.BoxLayout({ homogeneous:true }) });
+        this.buttonLayout = new St.Widget ({ layout_manager: new Clutter.BoxLayout({ homogeneous: true }) });
        this._dialog.add(this.buttonLayout,
                         { x_align: St.Align.MIDDLE,
                           y_align: St.Align.START });
@@ -116,11 +117,11 @@ class Dialog extends St.Widget {

        let button = new St.Button({ style_class: 'modal-dialog-linked-button',
                                     button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
-                                     reactive:    true,
-                                     can_focus:   true,
-                                     x_expand:    true,
-                                     y_expand:    true,
-                                     label:       label });
+                                     reactive: true,
+                                     can_focus: true,
+                                     x_expand: true,
+                                     y_expand: true,
+                                     label: label });
        button.connect('clicked', action);

        buttonInfo['button'] = button;
@@ -175,15 +176,13 @@ var MessageDialogContent = GObject.registerClass({
            this[`_${prop}`].add_style_class_name(`message-dialog-${prop}`);
        });

-        let textProps = { ellipsize_mode: Pango.EllipsizeMode.NONE,
+        let textProps = { ellipsize: Pango.EllipsizeMode.NONE,
                          line_wrap: true };
-        Object.assign(this._subtitle.clutter_text, textProps);
-        Object.assign(this._body.clutter_text, textProps);
+        this._subtitle.clutter_text.set(textProps);
+        this._body.clutter_text.set(textProps);

-        if (!params.hasOwnProperty('style_class'))
-            params.style_class = 'message-dialog-main-layout';
-
-        super._init(params);
+        let defaultParams = { style_class: 'message-dialog-main-layout' };
+        super._init(Object.assign(defaultParams, params));

        this.messageBox = new St.BoxLayout({ style_class: 'message-dialog-content',
                                             x_expand: true,
@@ -214,7 +213,10 @@ var MessageDialogContent = GObject.registerClass({
    }

    set icon(icon) {
-        Object.assign(this._icon, { gicon: icon, visible: icon != null });
+        this._icon.set({
+            gicon: icon,
+            visible: icon != null
+        });
        this.notify('icon');
    }

@@ -231,7 +233,10 @@ var MessageDialogContent = GObject.registerClass({
    }

    _setLabel(label, prop, value) {
-        Object.assign(label, { text: value || '', visible: value != null });
+        label.set({
+            text: value || '',
+            visible: value != null
+        });
        this.notify(prop);
    }

--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@@ -1,18 +1,18 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported addDragMonitor, removeDragMonitor, makeDraggable */

 const { Clutter, GLib, Meta, Shell, St } = imports.gi;
 const Signals = imports.signals;

 const Main = imports.ui.main;
 const Params = imports.misc.params;
-const Tweener = imports.ui.tweener;

 // Time to scale down to maxDragActorSize
-var SCALE_ANIMATION_TIME = 0.25;
+var SCALE_ANIMATION_TIME = 250;
 // Time to animate to original position on cancel
-var SNAP_BACK_ANIMATION_TIME = 0.25;
+var SNAP_BACK_ANIMATION_TIME = 250;
 // Time to animate to original position on success
-var REVERT_ANIMATION_TIME = 0.75;
+var REVERT_ANIMATION_TIME = 750;

 var DragMotionResult = {
    NO_DROP:   0,
@@ -111,9 +111,6 @@ var _Draggable = class _Draggable {
        if (event.get_button() != 1)
            return Clutter.EVENT_PROPAGATE;

-        if (Tweener.getTweenCount(actor))
-            return Clutter.EVENT_PROPAGATE;
-
        this._buttonDown = true;
        this._grabActor(event.get_device());

@@ -139,9 +136,6 @@ var _Draggable = class _Draggable {
            !global.display.is_pointer_emulating_sequence(event.get_event_sequence()))
            return Clutter.EVENT_PROPAGATE;

-        if (Tweener.getTweenCount(actor))
-            return Clutter.EVENT_PROPAGATE;
-
        this._buttonDown = true;
        this._grabActor(event.get_device(), event.get_event_sequence());

@@ -306,6 +300,9 @@ var _Draggable = class _Draggable {
     * for the draggable.
     */
    startDrag(stageX, stageY, time, sequence, device) {
+        if (currentDraggable)
+            return;
+
        if (device == undefined) {
            let event = Clutter.get_current_event();

@@ -425,20 +422,22 @@ var _Draggable = class _Draggable {
                // to the final position because that tween would
                // fight with updates as the user continues dragging
                // the mouse; instead we do the position computations in
-                // an onUpdate() function.
-                Tweener.addTween(this._dragActor,
-                                 { scale_x: scale * origScale,
-                                   scale_y: scale * origScale,
-                                   time: SCALE_ANIMATION_TIME,
-                                   transition: 'easeOutQuad',
-                                   onUpdate() {
-                                       let currentScale = this._dragActor.scale_x / origScale;
-                                       this._dragOffsetX = currentScale * origDragOffsetX;
-                                       this._dragOffsetY = currentScale * origDragOffsetY;
-                                       this._dragActor.set_position(this._dragX + this._dragOffsetX,
-                                                                    this._dragY + this._dragOffsetY);
-                                   },
-                                   onUpdateScope: this });
+                // a ::new-frame handler.
+                this._dragActor.ease({
+                    scale_x: scale * origScale,
+                    scale_y: scale * origScale,
+                    duration: SCALE_ANIMATION_TIME,
+                    mode: Clutter.AnimationMode.EASE_OUT_QUAD
+                });
+
+                this._dragActor.get_transition('scale-x').connect('new-frame', () => {
+                    let currentScale = this._dragActor.scale_x / origScale;
+                    this._dragOffsetX = currentScale * origDragOffsetX;
+                    this._dragOffsetY = currentScale * origDragOffsetY;
+                    this._dragActor.set_position(
+                        this._dragX + this._dragOffsetX,
+                        this._dragY + this._dragOffsetY);
+                });
            }
        }
    }
@@ -447,7 +446,8 @@ var _Draggable = class _Draggable {
        let [stageX, stageY] = event.get_coords();

        // See if the user has moved the mouse enough to trigger a drag
-        let threshold = St.Settings.get().drag_threshold;
+        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
+        let threshold = St.Settings.get().drag_threshold * scaleFactor;
        if (!currentDraggable &&
            (Math.abs(stageX - this._dragStartX) > threshold ||
             Math.abs(stageY - this._dragStartY) > threshold)) {
@@ -500,7 +500,7 @@ var _Draggable = class _Draggable {

        while (target) {
            if (target._delegate && target._delegate.handleDragOver) {
-                let [r, targX, targY] = target.transform_stage_point(this._dragX, this._dragY);
+                let [r_, targX, targY] = target.transform_stage_point(this._dragX, this._dragY);
                // We currently loop through all parents on drag-over even if one of the children has handled it.
                // We can check the return value of the function and break the loop if it's true if we don't want
                // to continue checking the parents.
@@ -557,11 +557,11 @@ var _Draggable = class _Draggable {
            let dropFunc = dragMonitors[i].dragDrop;
            if (dropFunc)
                switch (dropFunc(dropEvent)) {
-                    case DragDropResult.FAILURE:
-                    case DragDropResult.SUCCESS:
-                        return true;
-                    case DragDropResult.CONTINUE:
-                        continue;
+                case DragDropResult.FAILURE:
+                case DragDropResult.SUCCESS:
+                    return true;
+                case DragDropResult.CONTINUE:
+                    continue;
                }
        }

@@ -572,7 +572,7 @@ var _Draggable = class _Draggable {

        while (target) {
            if (target._delegate && target._delegate.acceptDrop) {
-                let [r, targX, targY] = target.transform_stage_point(dropX, dropY);
+                let [r_, targX, targY] = target.transform_stage_point(dropX, dropY);
                if (target._delegate.acceptDrop(this.actor._delegate,
                                                this._dragActor,
                                                targX,
@@ -584,8 +584,9 @@ var _Draggable = class _Draggable {
                        if (this._restoreOnSuccess) {
                            this._restoreDragActor(event.get_time());
                            return true;
-                        } else
+                        } else {
                            this._dragActor.destroy();
+                        }
                    }

                    this._dragState = DragState.INIT;
@@ -609,15 +610,15 @@ var _Draggable = class _Draggable {
        if (this._dragActorSource && this._dragActorSource.visible) {
            // Snap the clone back to its source
            [x, y] = this._dragActorSource.get_transformed_position();
-            let [sourceScaledWidth, sourceScaledHeight] = this._dragActorSource.get_transformed_size();
-            scale = sourceScaledWidth ? this._dragActor.width / sourceScaledWidth : 0;
+            let [sourceScaledWidth] = this._dragActorSource.get_transformed_size();
+            scale = sourceScaledWidth ? sourceScaledWidth / this._dragActor.width : 0;
        } else if (this._dragOrigParent) {
            // Snap the actor back to its original position within
            // its parent, adjusting for the fact that the parent
            // may have been moved or scaled
            let [parentX, parentY] = this._dragOrigParent.get_transformed_position();
-            let [parentWidth, parentHeight] = this._dragOrigParent.get_size();
-            let [parentScaledWidth, parentScaledHeight] = this._dragOrigParent.get_transformed_size();
+            let [parentWidth] = this._dragOrigParent.get_size();
+            let [parentScaledWidth] = this._dragOrigParent.get_transformed_size();
            let parentScale = 1.0;
            if (parentWidth != 0)
                parentScale = parentScaledWidth / parentWidth;
@@ -653,13 +654,13 @@ var _Draggable = class _Draggable {

        let [snapBackX, snapBackY, snapBackScale] = this._getRestoreLocation();

-        this._animateDragEnd(eventTime,
-                             { x: snapBackX,
-                               y: snapBackY,
-                               scale_x: snapBackScale,
-                               scale_y: snapBackScale,
-                               time: SNAP_BACK_ANIMATION_TIME,
-                             });
+        this._animateDragEnd(eventTime, {
+            x: snapBackX,
+            y: snapBackY,
+            scale_x: snapBackScale,
+            scale_y: snapBackScale,
+            duration: SNAP_BACK_ANIMATION_TIME
+        });
    }

    _restoreDragActor(eventTime) {
@@ -671,26 +672,27 @@ var _Draggable = class _Draggable {
        this._dragActor.set_scale(restoreScale, restoreScale);
        this._dragActor.opacity = 0;

-        this._animateDragEnd(eventTime,
-                             { time: REVERT_ANIMATION_TIME });
+        this._animateDragEnd(eventTime, {
+            duration: REVERT_ANIMATION_TIME
+        });
    }

    _animateDragEnd(eventTime, params) {
        this._animationInProgress = true;

-        params['opacity']          = this._dragOrigOpacity;
-        params['transition']       = 'easeOutQuad';
-        params['onComplete']       = this._onAnimationComplete;
-        params['onCompleteScope']  = this;
-        params['onCompleteParams'] = [this._dragActor, eventTime];
-
        // start the animation
-        Tweener.addTween(this._dragActor, params)
+        this._dragActor.ease(Object.assign(params, {
+            opacity: this._dragOrigOpacity,
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+            onComplete: () => {
+                this._onAnimationComplete(this._dragActor, eventTime);
+            }
+        }));
    }

    _finishAnimation() {
        if (!this._animationInProgress)
-            return
+            return;

        this._animationInProgress = false;
        if (!this._buttonDown)
--- a/js/ui/edgeDragAction.js
+++ b/js/ui/edgeDragAction.js
@@ -1,4 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported EdgeDragAction */

 const { Clutter, GObject, Meta, St } = imports.gi;

@@ -16,7 +17,7 @@ var EdgeDragAction = GObject.registerClass({
        this._allowedModes = allowedModes;
        this.set_n_touch_points(1);

-        global.display.connect('grab-op-begin', () => { this.cancel(); });
+        global.display.connect('grab-op-begin', () => this.cancel());
    }

    _getMonitorRect(x, y) {
@@ -26,7 +27,7 @@ var EdgeDragAction = GObject.registerClass({
        return global.display.get_monitor_geometry(monitorIndex);
    }

-    vfunc_gesture_prepare(actor) {
+    vfunc_gesture_prepare(_actor) {
        if (this.get_n_current_points() == 0)
            return false;

@@ -42,7 +43,7 @@ var EdgeDragAction = GObject.registerClass({
                (this._side == St.Side.BOTTOM && y > monitorRect.y + monitorRect.height - EDGE_THRESHOLD));
    }

-    vfunc_gesture_progress(actor) {
+    vfunc_gesture_progress(_actor) {
        let [startX, startY] = this.get_press_coords(0);
        let [x, y] = this.get_motion_coords(0);
        let offsetX = Math.abs (x - startX);
@@ -62,7 +63,7 @@ var EdgeDragAction = GObject.registerClass({
        return true;
    }

-    vfunc_gesture_end(actor) {
+    vfunc_gesture_end(_actor) {
        let [startX, startY] = this.get_press_coords(0);
        let [x, y] = this.get_motion_coords(0);
        let monitorRect = this._getMonitorRect(startX, startY);
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="46" height="22"><defs><linearGradient id="a"><stop offset="0" stop-color="#39393a"/><stop offset="1" stop-color="#302f30"/></linearGradient><linearGradient xlink:href="#a" id="b" x1="53" y1="294.429" x2="53" y2="309.804" gradientUnits="userSpaceOnUse" gradientTransform="translate(-42.76)"/></defs><g transform="translate(0 -291.18)" stroke-width="1.085"><rect style="marker:none" width="44.446" height="20.911" x=".625" y="291.715" rx="10.455" ry="10.073" fill="#323233" stroke="#272728"/><rect ry="10.455" rx="10.455" y="291.715" x=".543" height="20.911" width="21.143" style="marker:none" fill="url(#b)" stroke="#151515"/></g></svg>
				`@@ -0,0 +1 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" width="46" height="22"><g transform="translate(0 -291.18)" stroke="#2b73cc"><rect style="marker:none;font-variant-east_asian:normal" width="44.446" height="20.911" x=".625" y="291.715" rx="10.455" ry="10.073" fill="#3081e3"/><rect ry="10.455" rx="10.455" y="291.715" x="24.304" height="20.911" width="21.143" style="marker:none;font-variant-east_asian:normal" fill="#f8f7f7" stroke-linecap="round" stroke-linejoin="round"/></g></svg>`