theme: OSK opaque

- the on screen keyboard is not an overlay in most cases. the semi-opacity is distracting. - use opaque background color - see discussion on https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/1028 FIXME: whitespace at the bottom without scaling everything down (padding) FIXME: don't behave as overlay anywhere (even for entries above the fold)
2020-02-20 15:02:28 +01:00
253 changed files with 21500 additions and 32642 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -60,6 +60,7 @@ src/calendar-server/evolution-calendar.desktop
 src/calendar-server/org.gnome.Shell.CalendarServer.service
 src/gnome-shell
 src/gnome-shell-calendar-server
+src/gnome-shell-extension-prefs
 src/gnome-shell-extension-tool
 src/gnome-shell-hotplug-sniffer
 src/gnome-shell-perf-helper
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,13 +1,9 @@
-include: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml'
-
 stages:
 - review
 - build
 - test
- - deploy

 variables:
-    BUNDLE: "extensions-git.flatpak"
    JS_LOG: "js-report.txt"
    POT_LOG: "pot-update.txt"

@@ -50,20 +46,6 @@ eslint:
            - reports
        when: always

-potfile_check:
-    image: registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v1
-    stage: review
-    script:
-        - ./.gitlab-ci/check-potfiles.sh
-    <<: *only_default
-
-no_template_check:
-    image: registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v1
-    stage: review
-    script:
-        - ./.gitlab-ci/check-template-strings.sh
-    <<: *only_default
-
 build:
    image: registry.gitlab.gnome.org/gnome/mutter/master:v3
    stage: build
@@ -114,24 +96,3 @@ test-pot:
          ' | tee $POT_LOG
        - (! grep -q . $POT_LOG)
    <<: *only_default
-
-flatpak:
-    stage: build
-    variables:
-        SUBPROJECT: "subprojects/extensions-app"
-        # Your manifest path
-        MANIFEST_PATH: "$SUBPROJECT/build-aux/flatpak/org.gnome.Extensions.json"
-        RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo"
-        FLATPAK_MODULE: "gnome-extensions-app"
-        APP_ID: "org.gnome.Extensions"
-        MESON_ARGS: "$SUBPROJECT"
-    extends: .flatpak
-    before_script:
-        - flatpak run --command=$SUBPROJECT/generate-translations.sh
-                      --filesystem=host org.gnome.Sdk//master
-    <<: *only_default
-
-nightly:
-  extends: '.publish_nightly'
-  variables:
-    BUNDLES: '$BUNDLE'
--- a/.gitlab-ci/check-commit-log.sh
+++ b/.gitlab-ci/check-commit-log.sh
@@ -19,7 +19,7 @@ fi
 function commit_message_has_url() {
  commit=$1
  commit_message=$(git show -s --format='format:%b' $commit)
-  echo "$commit_message" | grep -qe "\($CI_MERGE_REQUEST_PROJECT_URL/\(-/\)\?\(issues\|merge_requests\)/[0-9]\+\|https://bugzilla.gnome.org/show_bug.cgi?id=[0-9]\+\)"
+  echo "$commit_message" | grep -qe "\($CI_MERGE_REQUEST_PROJECT_URL/\(issues\|merge_requests\)/[0-9]\+\|https://bugzilla.gnome.org/show_bug.cgi?id=[0-9]\+\)"
  return $?
 }

--- a/.gitlab-ci/check-potfiles.sh
+++ b/.gitlab-ci/check-potfiles.sh
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-
-srcdirs="js src subprojects/extensions-tool"
-globs=('*.js' '*.c')
-
-# find source files that contain gettext keywords
-files=$(grep -lR ${globs[@]/#/--include=} '\(gettext\|[^I_)]_\)(' $srcdirs)
-
-# find those that aren't listed in POTFILES.in
-missing=$(for f in $files; do ! grep -q ^$f po/POTFILES.in && echo $f; done)
-
-if [ ${#missing} -eq 0 ]; then
-  exit 0
-fi
-
-cat >&2 <<EOT
-
-The following files are missing from po/POTFILES.po:
-
-EOT
-for f in $missing; do
-  echo "  $f" >&2
-done
-echo >&2
-
-exit 1
--- a/.gitlab-ci/check-template-strings.sh
+++ b/.gitlab-ci/check-template-strings.sh
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-
-# find files from POTFILES.in that use js template strings
-baddies=$(grep -l '${' $(grep ^js po/POTFILES.in))
-
-if [ ${#baddies} -eq 0 ]; then
-  exit 0
-fi
-
-cat >&2 <<EOT
-
-xgettext cannot handle template strings properly, so we ban their use
-in files with translatable strings.
-
-The following files are listed in po/POTFILES.in and use template strings:
-
-EOT
-for f in $baddies; do
-  echo "  $f" >&2
-done
-echo >&2
-
-exit 1
--- a/.gitlab-ci/run-eslint.sh
+++ b/.gitlab-ci/run-eslint.sh
@@ -23,7 +23,7 @@ run_eslint() {
  mkdir -p $(dirname $output)
  touch $output

-  eslint -f unix ${!extra_args} -o $output js subprojects/extensions-app/js
+  eslint -f unix ${!extra_args} -o $output js
 }

 list_commit_range_additions() {
--- a/233
+++ b/233
@@ -1,236 +1,3 @@
-3.36.5
-======
-* Fix extension updates when many extensions are installed [Jeremias; !1363]
-* Fix missing icons in on-screen keyboard [Emre; #2631, #3007]
-* Fix delay when showing calendar events [Sebastian; #2992]
-* Fix app picker regressions on small displays [Sebastian; #2234, !1375, !1378]
-* Fix top bar navigation when NumLock is active [Olivier; #550]
-* Delay login animation until wallpaper has loaded [Michael; #734996]
-* Revert changes that caused mispositioning in overview in multi-monitor setups
-  [Robert; #2971]
-* Reset auth prompt on login screen on VT switch before fade in [Ray; #2997]
-* Fix stuck grab when destroying open popup menu [Florian; #3022]
-* Misc. bug fixes and cleanups [Florian, Carlos, Andre, Jonas; !1357, !1371,
-  !1381, #3037, #3005, !1386, !1390]
-
-Contributors:
-  Michael Catanzaro, Jonas Dreßler, Olivier Fourdan, Carlos Garnacho,
-  Sebastian Keller, Robert Mader, Andre Moreira Magalhaes, Florian Müllner,
-  Jeremias Ortega, Ray Strode, Emre Uyguroglu
-
-Translators:
-  Boyuan Yang [zh_CN], Rafael Fontenelle [pt_BR]
-
-3.36.4
-======
-* Hide switch-user button on lock screen if unsupported [Chingkai; #2687]
-* Improve world clocks styling [PrOF-kk; #2825]
-* Improve calendar-server performance [Florian, Milan; #1875]
-* Fix regressions in redesigned modal dialogs [Florian, Jonas; #2491, !1336]
-* Better support sandboxed apps with multiple .desktop files [Florian; #219]
-* Fix on-screen keyboard size in portrait orientation [Florian; #2349]
-* Support scrolling anywhere in slider menu items [Peter; #2795]
-* Fixed crash [Marco; #2643]
-* Plugged leaks [Sebastian, Florian; !1306, !1341]
-* Misc. bug fixes and cleanups [Jonas, Daniel, Florian, Sebastian, MOZGIII,
-  Koki; !1119, !1289, !1331, !1192, !1340, !1327, !1279]
-
-Contributors:
-  Marco Trevisan (Treviño), Chingkai, Milan Crha, Jonas Dreßler, Koki Fukuda,
-  Sebastian Keller, MOZGIII, Robert Mader, Florian Müllner, PrOF-kk,
-  Peter Simonyi, Daniel van Vugt
-
-Translators:
-  Matej Urbančič [sl], sicklylife [ja], Fabio Tomat [fur],
-  Baurzhan Muftakhidinov [kk], Daniel Șerbănescu [ro]
-
-3.36.3
-======
-* Add gnome-shell-extension-prefs wrapper for compatibility [Florian; !1220]
-* Fix distorted fallback icons in top bar [Florian; #2578]
-* Lower timeout for scrolling in overview [Alexander; #2602]
-* Only start systemd units when running under systemd
-  [Carlos, Florian; #2755, !1242, !1252]
-* Fix "ghost" media controls  [Bryan; #2776]
-* Fix zombie sockets from extensions downloader [Michael; #2774]
-* Update world clocks offsets when timezone changes [Bryan; #2209]
-* Fix "Do Not Disturb" setting getting reset on startup [Florian; #2804]
-* Fix pad OSD glitches [Carlos; !1290]
-* Fix matching notifications by PID [Florian; #2592]
-* Only allow updates for extensions that aren't cached [Florian; !1248]
-* Fixed crashes [Jonas, Florian; #2709, #2757]
-* Misc. bug fixes and cleanups [Michael, Piotr, Philip, Florian, Amr,
-  AsciiWolf; !1233, !1205, !1229, #2751, !1232, #2796, !1249, !1263,
-  !1277, #2286, !1288, !1291]
-
-Contributors:
-  AsciiWolf, Michael Catanzaro, Philip Chimento, Jonas Dreßler, Bryan Dunsmore,
-  Carlos Garnacho, Amr Ibrahim, Michael Lass, Alexander Mikhaylenko,
-  Florian Müllner
-
-Translators:
-  Fabio Tomat [fur], Cheng-Chia Tseng [zh_TW], Dušan Kazik [sk],
-  Piotr Drąg [pl], Daniel Mustieles [es], Nathan Follens [nl],
-  Bruce Cowan [en_GB], Florentina Mușat [ro], Yuri Chornoivan [uk],
-  Milo Casagrande [it], Anders Jonsson [sv], Charles Monzat [fr],
-  Daniel Șerbănescu [ro], sicklylife [ja], Kukuh Syafaat [id],
-  Emin Tufan Çetin [tr], Jiri Grönroos [fi], Марко Костић [sr],
-  Christian Kirbach [de], Changwoo Ryu [ko], Aurimas Černius [lt],
-  Matej Urbančič [sl]
-
-3.36.2
-======
-* Add openPrefs() convenience method for extensions [Florian; !1163]
-* Bring back support for empty StIcons [Andre, Jonas D.; !1173, !1178]
-* Wake up screen when unlocking programmatically [Florian; !1158]
-* Improve handling of scale-factor changes [Georges; !1176]
-* Fix translations of folder names [Florian; #2623]
-* Fix delay on lock screen after entering wrong password [Jonas D.; #2655]
-* Match ASCII alternatives of system actions [Will; #2688]
-* Tone down weekend days with events in calendar [Jakub; #2588]
-* Fix area screenshots on multi-monitor systems [Jonas Å; !1224]
-* Fix stuck lock screen after unlock [Jonas D., Florian; #2446]
-* Fixed crashes [Jonas D., Florian, Carlos; #2584, #2625, !1223, !1218]
-* Misc. bug fixes and cleanups [Jonas Å., Marco, Andre, Florian, Jonas D.;
-  !1155, !1156, !1169, !1168, #2551, #2563, !1172, !1179, !1160, #2562, #2578,
-  !1203, #2649, #2628, #2691, #1615, #2607, !1228]
-
-Contributors:
-  Marco Trevisan (Treviño), Jonas Dreßler, Carlos Garnacho,
-  Andre Moreira Magalhaes, Florian Müllner, Georges Basile Stavracas Neto,
-  Jakub Steiner, Will Thompson, Jonas Ådahl
-
-Translators:
-  Fabio Tomat [fur], Cheng-Chia Tseng [zh_TW], Danial Behzadi [fa],
-  Jiri Grönroos [fi], Ibai Oihanguren Sala [eu], Марко Костић [sr],
-  Rūdolfs Mazurs [lv], Rafael Fontenelle [pt_BR], Petr Kovář [cs],
-  Daniel Rusek [cs]
-
-3.36.1
-======
-* Improve app folders [Jonas D.; !1011]
-* Fix launching ibus daemon [Alynx; !1080]
-* Do not shutdown ibus/xsettings on X11 compositor restart [Carlos; #2329]
-* Hide hint text in entries when preedit is used [Carlos; !1084]
-* Do not load app infos on main thread [Christian; #2282]
-* Don't expose FDO Notifications interface on main bus name [Florian; !547]
-* Fix icon of mobile broadband connections [Cosimo, Reik; !1097, !1105]
-* Fix high-contrast/symbolic icon mix-up [Florian; #2414]
-* Don't ellipsize times in world clock [Florian; !1090]
-* Only check for extension updates if there are any extensions [Florian; !1100]
-* Fix crash when trying to update removed extensions [Florian; #2343]
-* Make Extensions app available as flatpak [Florian; !1081, !1106, !1087, !1133]
-* Display fractional timezones as hours:minutes [Jonas D.; #2438]
-* Fix assigning pad keybindings [Carlos; #2451]
-* Handle embedded newlines in lock screen notifications [Florian; #2463]
-* Fix OSK layout fallback for unsupported variants [Florian; #2471]
-* Do not apply text color to color glyphs (emojis) [Carlos; #850]
-* Check "Install pending software updates" by default [Michael; #2427]
-* Do not warn about missing GDM on each login [Florian; #2432]
-* Fix telepathy chat notifications [Marco; !1112]
-* Fix offline updates support in end session dialog [Michael; #2276]
-* Fix activating notifications by keyboard [Florian; #2319]
-* Remove handling of 'blacklisted' extensions [Florian; !1132]
-* Only update extensions if Extensions app is installed [Florian; #2346]
-* Improve Norwegian on-screen-keyboard layout [Bjørn; !1073]
-* Fix IM support for deleting surrounding text [Takao; !477]
-* Fix blur effect with fractional scaling [Jonas D.; !1000]
-* Use better location name in weather section [Florian; #2468]
-* Fix glitch in sound feedback on volume changes [Florian; !1147]
-* Fix on-screen keyboard regressions [Jonas D.; !1142]
-* Improve screen-reader support [Luke; #2508, #2517]
-* Fix password entry resize on login/lock screen [Florian; #2423]
-* Fix crash when opening app picker [Jonas Å.; !1154]
-* Misc. bug fixes and cleanups [Florian, Sebastian, Jan, Daniel, Philip, Mario,
-  Ray, Marco, Jonas D., Carlos, Georges; #2298, #2305, !1078, !1077, #2334,
-  #2381, !1093, !1098, #2386, !1108, !1109, !1114, !1076, !1072, !1115, !1088,
-  !1101, #2467, !1121, !1122, #2476, !1123, !1117, !1129, !1113, !1102, !1127,
-  #2238, !1131, !1135, !1136, !849, #2504, #2371, !1146, !1141, #2510, !1150]
-
-Contributors:
-  Marco Trevisan (Treviño), Michael Catanzaro, Cosimo Cecchi, Jonas Dreßler,
-  Takao Fujiwara, Carlos Garnacho, Christian Hergert, Sebastian Keller,
-  Reik Keutterling, Bjørn Lie, Florian Müllner, Jwtiyar Nariman,
-  Georges Basile Stavracas Neto, Mario Sanchez Prada, Ray Strode, Jan Tojnar,
-  Daniel van Vugt, Philip Withnall, Luke Yelavich, Alynx Zhou, Jonas Ådahl
-
-Translators:
-  Марко Костић [sr], Jordi Mas [ca], sicklylife [ja], Marek Černocký [cs],
-  Daniel Rusek [cs], Kjartan Maraas [nb], Tim Sabsch [de], Stas Solovey [ru],
-  Peter Mráz [sk], Rafael Fontenelle [pt_BR], Piotr Drąg [pl],
-  Milo Casagrande [it], Anders Jonsson [sv], Yuri Chornoivan [uk],
-  Kukuh Syafaat [id], Guillaume Bernard [fr], Daniel Mustieles [es],
-  Danial Behzadi [fa], Goran Vidović [hr], Yosef Or Boczko [he],
-  Emin Tufan Çetin [tr], Wolfgang Stöggl [de], Ibai Oihanguren Sala [eu],
-  Jwtiyar Nariman [ckb], Aurimas Černius [lt]
-
-3.36.0
-======
-* Fix off-by-1900 error in date conversions [Florian; !1061]
-* Fix crash on startup with topIcons* extension enabled [Florian; #2308]
-* Don't require gsd-xsettings for X11 support on wayland [Olivier; !1065]
-* Fix ibus support in Xorg session [Carlos; #1690]
-* Improve Extensions D-Bus API [Florian; !1074]
-* Allow session modes to specify alternative resource name [Marco; !1063]
-* Fix link to location settings in aggregate menu [Sebastian; #2316]
-* Fix illegible app folder titles with light theme [ub; !1059]
-* Really fix visual glitch in sliders [Jonas; #1569]
-
-Contributors:
-  Marco Trevisan (Treviño), Jonas Dreßler, Olivier Fourdan, Carlos Garnacho,
-  Sebastian Keller, Florian Müllner, ub
-
-Translators:
-  Aman Alam [pa], Goran Vidović [hr], Aurimas Černius [lt],
-  Milo Casagrande [it], Daniel Korostil [uk], sicklylife [ja],
-  Marek Černocký [cs], Nathan Follens [nl]
-
-3.35.92
-=======
-* Plug a memory leak [Jonas D.; !1015]
-* Fix missing "back" button on login screen [Florian; #2228]
-* Fix width of window preview titles in overview [Jonas D.; #58]
-* Fix looking glass text with light style variant [Feichtmeier; !1023]
-* Center unlock entry [Florian; !1021]
-* Hide overlay scrollbars in notification popup [Jonas D.; !1013]
-* Work around add_actor() slowness in icon spring animation [Daniel; !1002]
-* Add disable-animations heuristics [Jonas Å.; !757]
-* Fix visual glitches in on-screen keyboard [Carlos; #2214]
-* Fix clearing changed textures from cache [Florian; #2244]
-* Fix visual glitch in sliders [Daniel; #1569]
-* Stop using dedicated lock screen background [Florian; !1001]
-* Fix entries disappearing after authentication errors [Florian; #2236]
-* Fix crash when animations are disabled [Florian; #2255]
-* Fix passing pointer events to clients when magnified [Jonas D.; !993]
-* Fix keynav on new lock screen [Florian; #2210]
-* Avoid short-lived allocations on actor removal [Christian; #2263]
-* Fix super-sized default avatars in user list [Florian, Sam; #2242]
-* Leave overview when locking the screen [Jonas D.; !1043]
-* Hide message list on login screen [Florian; #2241]
-* Avoid IO on the main thread [Christian, Florian; !1050, !1051]
-* Fix window animations getting stuck when client doesn't respond [Jonas; !1055]
-* Only subscribe to touchpad events for touchpad gestures [Daniel; !925]
-* Start X11 session services before Xwayland clients [Carlos; !836, !1056]
-* Only show switch-user button with unlock prompt [Florian; !1029]
-* Misc. bug fixes and cleanups [Jonas D., Florian, Georges, Jonas Å., Daniel,
-  Jakub, Philippe; !1018, !1020, !1024, !1027, !1026, !1022, !1031, !1035,
-  !1032, !1025, !1039, #2157, !1037, !1042, !1047, !1048, #2270, !1046,
-  !167, !1016]
-
-Contributors:
-  Jonas Dreßler, Feichtmeier, Carlos Garnacho, Christian Hergert, Sam Hewitt,
-  Florian Müllner, Georges Basile Stavracas Neto, Jakub Steiner, Philippe Troin,
-  Daniel van Vugt, Jonas Ådahl
-
-Translators:
-  Danial Behzadi [fa], Efstathios Iosifidis [el], Daniel Mustieles [es],
-  Sabri Ünal [tr], sicklylife [ja], Piotr Drąg [pl], Jordi Mas [ca],
-  Anders Jonsson [sv], Chao-Hsiung Liao [zh_TW], Asier Sarasua Garmendia [eu],
-  Rafael Fontenelle [pt_BR], Марко Костић [sr], Changwoo Ryu [ko],
-  Charles Monzat [fr], Jiri Grönroos [fi], Jor Teron [mjw], Bruce Cowan [en_GB],
-  Emin Tufan Çetin [tr], Alan Mortensen [da], Balázs Úr [hu], Fran Dieguez [gl],
-  Kukuh Syafaat [id]
-
 3.35.91
 =======
 * Improve magnifier [Carlos; !984]
--- a/data/cldr2json/README.md
+++ b/data/cldr2json/README.md
--- a/data/cldr2json/cldr2json.py
+++ b/data/cldr2json/cldr2json.py
@@ -161,16 +161,12 @@ def convert_file(source_file, destination_path):
    try:
        xkb_name = locale_to_xkb(root["locale"], root["name"])
    except KeyError as e:
-        logging.warning(e)
+        logging.warn(e)
        return False
    destination_file = os.path.join(destination_path, xkb_name + ".json")

-    try:
-        with open(destination_file, 'x', encoding="utf-8") as dest_fd:
-            json.dump(root, dest_fd, ensure_ascii=False, indent=2, sort_keys=True)
-    except FileExistsError as e:
-        logging.info("File %s exists, not updating", destination_file)
-        return False
+    with open(destination_file, 'w', encoding="utf-8") as dest_fd:
+        json.dump(root, dest_fd, ensure_ascii=False, indent=2, sort_keys=True)

    logging.debug("written %s", destination_file)

--- a/data/dbus-interfaces/org.gnome.Shell.CalendarServer.xml
+++ b/data/dbus-interfaces/org.gnome.Shell.CalendarServer.xml
@@ -1,19 +1,12 @@
 <node>
  <interface name="org.gnome.Shell.CalendarServer">
-    <method name="SetTimeRange">
-      <arg type="x" name="since" direction="in"/>
-      <arg type="x" name="until" direction="in"/>
-      <arg type="b" name="force_reload" direction="in"/>
+    <method name="GetEvents">
+      <arg type="x" direction="in" />
+      <arg type="x" direction="in" />
+      <arg type="b" direction="in" />
+      <arg type="a(sssbxxa{sv})" direction="out" />
    </method>
-    <signal name="EventsAddedOrUpdated">
-      <arg type="a(ssbxxa{sv})" name="events" direction="out"/>
-    </signal>
-    <signal name="EventsRemoved">
-      <arg type="as" name="ids" direction="out"/>
-    </signal>
-    <signal name="ClientDisappeared">
-      <arg type="s" name="source_uid" direction="out"/>
-    </signal>
    <property name="HasCalendars" type="b" access="read" />
+    <signal name="Changed" />
  </interface>
 </node>
--- a/data/dbus-interfaces/org.gnome.Shell.Extensions.xml
+++ b/data/dbus-interfaces/org.gnome.Shell.Extensions.xml
@@ -199,37 +199,14 @@

    <!--
        LaunchExtensionPrefs:
-        Deprecated for OpenExtensionPrefs
+        @uuid: The UUID of the extension
+
+        Launch preferences of an extension.
    -->
    <method name="LaunchExtensionPrefs">
      <arg type="s" direction="in" name="uuid"/>
    </method>

-    <!--
-        OpenExtensionPrefs:
-        @uuid: The UUID of the extension
-        @parent_window: Identifier for the application window
-        @options: Vardict with further options
-
-        Opens the prefs dialog of extension @uuid.
-
-        The following @options are recognized:
-
-        <variablelist>
-          <varlistentry>
-            <term>modal b</term>
-            <listitem>
-              <para>Whether the prefs window should be modal, default: false</para>
-            </listitem>
-          </varlistentry>
-        </variablelist>
-    -->
-    <method name="OpenExtensionPrefs">
-      <arg type="s" direction="in" name="uuid"/>
-      <arg type="s" direction="in" name="parent_window"/>
-      <arg type="a{sv}" direction="in" name="options"/>
-    </method>
-
    <!--
        CheckForUpdates:
        Update all extensions for which updates are available
@@ -257,11 +234,5 @@
    -->
    <property name="ShellVersion" type="s" access="read"/>

-    <!--
-        UserExtensionsEnabled:
-        Whether user extensions are enabled
-    -->
-    <property name="UserExtensionsEnabled" type="b" access="readwrite"/>
-
  </interface>
 </node>
--- a/data/gnome-shell-theme.gresource.xml
+++ b/data/gnome-shell-theme.gresource.xml
@@ -9,21 +9,21 @@
    <file>dash-placeholder.svg</file>
    <file>gnome-shell.css</file>
    <file>gnome-shell-high-contrast.css</file>
-    <file alias="icons/scalable/status/message-indicator-symbolic.svg">message-indicator-symbolic.svg</file>
+    <file alias="icons/message-indicator-symbolic.svg">message-indicator-symbolic.svg</file>
    <file>no-events.svg</file>
    <file>no-notifications.svg</file>
    <file>pad-osd.css</file>
-    <file alias="icons/scalable/status/eye-open-negative-filled-symbolic.svg">eye-open-negative-filled-symbolic.svg</file>
-    <file alias="icons/scalable/status/eye-not-looking-symbolic.svg">eye-not-looking-symbolic.svg</file>
-    <file alias="icons/scalable/actions/pointer-double-click-symbolic.svg">pointer-double-click-symbolic.svg</file>
-    <file alias="icons/scalable/actions/pointer-drag-symbolic.svg">pointer-drag-symbolic.svg</file>
-    <file alias="icons/scalable/actions/pointer-primary-click-symbolic.svg">pointer-primary-click-symbolic.svg</file>
-    <file alias="icons/scalable/actions/pointer-secondary-click-symbolic.svg">pointer-secondary-click-symbolic.svg</file>
-    <file alias="icons/scalable/status/keyboard-caps-lock-filled-symbolic.svg">keyboard-caps-lock-filled-symbolic.svg</file>
-    <file alias="icons/scalable/status/keyboard-enter-symbolic.svg">keyboard-enter-symbolic.svg</file>
-    <file alias="icons/scalable/status/keyboard-hide-symbolic.svg">keyboard-hide-symbolic.svg</file>
-    <file alias="icons/scalable/status/keyboard-layout-filled-symbolic.svg">keyboard-layout-filled-symbolic.svg</file>
-    <file alias="icons/scalable/status/keyboard-shift-filled-symbolic.svg">keyboard-shift-filled-symbolic.svg</file>
+    <file alias="icons/eye-open-negative-filled-symbolic.svg">eye-open-negative-filled-symbolic.svg</file>
+    <file alias="icons/eye-not-looking-symbolic.svg">eye-not-looking-symbolic.svg</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 alias="icons/keyboard-caps-lock-filled-symbolic.svg">keyboard-caps-lock-filled-symbolic.svg</file>
+    <file alias="icons/keyboard-enter-symbolic.svg">keyboard-enter-symbolic.svg</file>
+    <file alias="icons/keyboard-hide-symbolic.svg">keyboard-hide-symbolic.svg</file>
+    <file alias="icons/keyboard-layout-filled-symbolic.svg">keyboard-layout-filled-symbolic.svg</file>
+    <file alias="icons/keyboard-shift-filled-symbolic.svg">keyboard-shift-filled-symbolic.svg</file>
    <file>process-working.svg</file>
    <file>toggle-off.svg</file>
    <file>toggle-off-dark.svg</file>
--- a/data/gnome-shell-wayland.service.in
+++ b/data/gnome-shell-wayland.service.in
@@ -19,10 +19,6 @@ Before=gnome-session-initialized.target
 [Service]
 Type=notify
 ExecStart=@bindir@/gnome-shell
-
-# unset some environment variables that were set by the shell and won't work now that the shell is gone
-ExecStopPost=-systemctl --user unset-environment GNOME_SETUP_DISPLAY WAYLAND_DISPLAY DISPLAY XAUTHORITY
-
 # Exit code 1 means we are probably *not* dealing with an extension failure
 SuccessExitStatus=1
 # On wayland we cannot restart
--- a/subprojects/extensions-app/data/icons/hicolor/scalable/apps/org.gnome.Extensions.Devel.svg
+++ b/subprojects/extensions-app/data/icons/hicolor/scalable/apps/org.gnome.Extensions.Devel.svg
--- a/subprojects/extensions-app/data/icons/hicolor/scalable/apps/org.gnome.Extensions.svg
+++ b/subprojects/extensions-app/data/icons/hicolor/scalable/apps/org.gnome.Extensions.svg
--- a/data/icons/hicolor/scalable/apps/org.gnome.Shell.Extensions.svg
+++ b/data/icons/hicolor/scalable/apps/org.gnome.Shell.Extensions.svg
--- a/subprojects/extensions-app/data/icons/hicolor/symbolic/apps/org.gnome.Extensions-symbolic.svg
+++ b/subprojects/extensions-app/data/icons/hicolor/symbolic/apps/org.gnome.Extensions-symbolic.svg
--- a/data/icons/hicolor/symbolic/apps/org.gnome.Shell.Extensions-symbolic.svg
+++ b/data/icons/hicolor/symbolic/apps/org.gnome.Shell.Extensions-symbolic.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M6.5 1.031c-.371 0-.742-.035-1.11.016-.367.05-.73.203-.972.476-.125.141-.215.309-.266.485-.047.18-.054.367-.02.55.032.184.102.356.192.516.09.164.203.309.317.457L5 4H2a1.8 1.8 0 00-.41.035.791.791 0 00-.36.195.791.791 0 00-.195.36C1 4.723 1 4.863 1 5v2.75l.77-.344c.265-.117.542-.23.832-.242.289-.016.586.074.812.254.227.18.383.441.465.723.082.277.101.57.121.859.02.316.04.637-.016.95-.058.312-.199.616-.43.831a1.264 1.264 0 01-.874.32c-.317-.007-.618-.128-.91-.257L1 10.5V14c0 .137.004.277.035.41a.791.791 0 00.195.36c.098.097.227.16.36.195.133.035.273.035.41.035h3l-.328-.68c-.14-.293-.274-.597-.29-.922-.015-.32.095-.652.31-.894.214-.242.523-.39.84-.453.316-.067.644-.059.968-.059.324 0 .652-.008.969.059.316.062.625.21.84.453.214.242.324.574.308.894-.015.325-.148.63-.289.922L8 15h3a1.8 1.8 0 00.41-.035.791.791 0 00.36-.195.791.791 0 00.195-.36C12 14.277 12 14.137 12 14v-3.563l.703.297c.29.125.59.239.902.246.313.004.63-.101.864-.308.238-.203.386-.496.46-.8C15 9.565 15 9.25 15 8.937c0-.313 0-.63-.07-.934-.075-.305-.223-.598-.461-.8a1.288 1.288 0 00-.864-.31c-.312.008-.613.122-.902.247L12 7.437V5a1.8 1.8 0 00-.035-.41.791.791 0 00-.195-.36.791.791 0 00-.36-.195C11.277 4 11.137 4 11 4H8l.36-.469c.113-.148.226-.293.316-.457.09-.16.16-.332.191-.515a1.248 1.248 0 00-.02-.551 1.256 1.256 0 00-.265-.485c-.242-.273-.605-.425-.973-.476-.367-.05-.738-.016-1.109-.016zm0 0" fill="#474747"/></svg>
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,6 +1,6 @@
 desktop_files = [
  'org.gnome.Shell.desktop',
-  'org.gnome.Shell.Extensions.desktop',
+  'org.gnome.Extensions.desktop',
 ]
 service_files = []

--- a/subprojects/extensions-app/data/org.gnome.Extensions.desktop.in.in
+++ b/subprojects/extensions-app/data/org.gnome.Extensions.desktop.in.in
@@ -2,9 +2,8 @@
 Type=Application
 Name=Extensions
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=@app_id@
+Icon=org.gnome.Extensions
 Comment=Configure GNOME Shell Extensions
-Exec=@bindir@/@prgname@
-DBusActivatable=true
-Categories=GNOME;GTK;Utility;
+Exec=@bindir@/gnome-shell-extension-prefs %u
+Categories=GNOME;GTK;
 OnlyShowIn=GNOME;
--- a/data/org.gnome.Shell.Extensions.desktop.in.in
+++ b/data/org.gnome.Shell.Extensions.desktop.in.in
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-# Keep in sync with subprojects/extensions-app
-Name=Extensions
-# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=org.gnome.Shell.Extensions
-# Never launch this, just provide name+icon to portal dialog
-Exec=false
-OnlyShowIn=GNOME;
-NoDisplay=true
--- a/data/osk-layouts/no.json
+++ b/data/osk-layouts/no.json
@@ -12,9 +12,7 @@
            "w"
          ],
          [
-            "e",
-            "é",
-            "ë"
+            "e"
          ],
          [
            "r"
@@ -23,58 +21,30 @@
            "t"
          ],
          [
-            "y",
-            "ý",
-            "ÿ"
+            "y"
          ],
          [
-            "u",
-            "ú",
-            "ü",
-            "û",
-            "ù",
-            "ū"
+            "u"
          ],
          [
-            "i",
-            "í",
-            "ï"
+            "i"
          ],
          [
-            "o",
-            "ó",
-            "ô",
-            "ò",
-            "õ",
-            "œ",
-            "ō"
+            "o"
          ],
          [
            "p"
-          ],
-          [
-            "å"
          ]
        ],
        [
          [
-            "a",
-            "á",
-            "ä",
-            "à",
-            "â",
-            "ã",
-            "ā"
+            "a"
          ],
          [
-            "s",
-            "ß",
-            "ś",
-            "š"
+            "s"
          ],
          [
-            "d",
-            "ð"
+            "d"
          ],
          [
            "f"
@@ -92,16 +62,7 @@
            "k"
          ],
          [
-            "l",
-            "ł"
-          ],
-          [
-            "ø",
-            "ö"
-          ],
-          [
-            "æ",
-            "ä"
+            "l"
          ]
        ],
        [
@@ -121,9 +82,7 @@
            "b"
          ],
          [
-            "n",
-            "ñ",
-            "ń"
+            "n"
          ],
          [
            "m"
@@ -162,9 +121,7 @@
            "W"
          ],
          [
-            "E",
-            "É",
-            "Ë"
+            "E"
          ],
          [
            "R"
@@ -173,58 +130,30 @@
            "T"
          ],
          [
-            "Y",
-            "Ý",
-            "Ÿ"
+            "Y"
          ],
          [
-            "U",
-            "Ú",
-            "Ü",
-            "Û",
-            "Ù",
-            "Ū"
+            "U"
          ],
          [
-            "I",
-            "Í",
-            "Ï"
+            "I"
          ],
          [
-            "O",
-            "Ó",
-            "Ô",
-            "Ò",
-            "Õ",
-            "Œ",
-            "Ō"
+            "O"
          ],
          [
            "P"
-          ],
-          [
-            "Å"
          ]
        ],
        [
          [
-            "A",
-            "Á",
-            "Ä",
-            "À",
-            "Â",
-            "Ã",
-            "Ā"
+            "A"
          ],
          [
-            "S",
-            "SS",
-            "Ś",
-            "Š"
+            "S"
          ],
          [
-            "D",
-            "Ð"
+            "D"
          ],
          [
            "F"
@@ -242,16 +171,7 @@
            "K"
          ],
          [
-            "L",
-            "Ł"
-          ],
-          [
-            "Ø",
-            "Ö"
-          ],
-          [
-            "Æ",
-            "Ä"
+            "L"
          ]
        ],
        [
@@ -271,9 +191,7 @@
            "B"
          ],
          [
-            "N",
-            "Ñ",
-            "Ń"
+            "N"
          ],
          [
            "M"
@@ -359,10 +277,10 @@
            "#"
          ],
          [
-            "€",
+            "$",
            "¢",
            "£",
-            "$",
+            "€",
            "¥",
            "₱"
          ],
@@ -500,16 +418,15 @@
          [
            "£"
          ],
+          [
+            "¢"
+          ],
+          [
+            "€"
+          ],
          [
            "¥"
          ],
-          [
-            "$",
-            "¢"
-          ],
-          [
-            "¢"
-          ],
          [
            "^",
            "↑",
@@ -587,4 +504,4 @@
  ],
  "locale": "nb",
  "name": "Norwegian Bokmål"
-}
+}
--- a/data/theme/gnome-shell-sass/widgets/_app-grid.scss
+++ b/data/theme/gnome-shell-sass/widgets/_app-grid.scss
@@ -7,7 +7,7 @@ $app_icon_padding: 24px;
 .icon-grid {
  -shell-grid-horizontal-item-size: $app_icon_size + $app_icon_padding * 2;
  -shell-grid-vertical-item-size: $app_icon_size + $app_icon_padding * 2;
-  spacing: $base_spacing * 4;
+  spacing: $base_spacing * 6;

  .overview-icon {
    icon-size: $app_icon_size;
@@ -35,9 +35,9 @@ $app_grid_fg_color: #fff;
 }

 /* App Folders */
-.app-well-app.app-folder {
-  background-color: transparentize($osd_bg_color, 0.8);
-  border-radius: $base_border_radius + 4px; // same as %icon_tile
+.app-folder {
+  .overview-icon {
+  }
 }

 // expanded folder
@@ -60,7 +60,7 @@ $app_grid_fg_color: #fff;
    & .folder-name-entry { width: 300px }

    /* FIXME: this is to keep the label in sync with the entry */
-    & .folder-name-label { padding: 5px 7px; color: $osd_fg_color; }
+    & .folder-name-label { padding: 5px 7px }

    & .edit-folder-button {
      @extend %button;
@@ -73,6 +73,10 @@ $app_grid_fg_color: #fff;
      & > StIcon { icon-size: 16px }
    }
  }
+
+  & StButton#vhandle,
+  & StButton#vhandle:hover,
+  & StButton#vhandle:active { background-color: transparent; }
 }
 .app-folder-dialog-container {
  padding: 12px;
--- a/data/theme/gnome-shell-sass/widgets/_calendar.scss
+++ b/data/theme/gnome-shell-sass/widgets/_calendar.scss
@@ -1,13 +1,6 @@
 /* Date/Time Menu */

-.clock-display-box {
-  spacing: $base_spacing / 2;
-
-  .clock {
-    padding-left: $base_padding;
-    padding-right: $base_padding;
-  }
-}
+.clock-display-box { spacing: $base_spacing; }

 // overall menu
 #calendarArea {
@@ -153,11 +146,9 @@
  }

  .calendar-day-with-events {
+    color: lighten($fg_color,10%);
+    font-weight: bold;
    background-image: url("resource:///org/gnome/shell/theme/calendar-today.svg");
-    &.calendar-work-day {
-       color: lighten($fg_color,10%);
-       font-weight: bold;
-    }
  }

  .calendar-other-month-day {
@@ -204,11 +195,9 @@
  .world-clocks-time {
    font-weight: bold;
    color: $fg_color;
-    font-feature-settings: "tnum";
+    font-feature-settings: "lnum";
    @include fontsize($base_font_size);
-
-    &:ltr { text-align: right; }
-    &:rtl { text-align: left; }
+    text-align: right;
  }

  // timezone offset label
--- a/data/theme/gnome-shell-sass/widgets/_keyboard.scss
+++ b/data/theme/gnome-shell-sass/widgets/_keyboard.scss
@@ -3,14 +3,13 @@
 $key_size: 1.2em;
 $key_border_radius: $base_border_radius + 3px;
 $key_bg_color:  $bg_color;
-// $default_key_bg_color: darken($key_bg_color, 4%);
-$default_key_bg_color: if($variant=='light', darken($osd_bg_color, 11%), lighten($osd_bg_color, 2%));
+$default_key_bg_color: darken($bg_color, 2%);


 // draw keys using button function
 #keyboard {
-  background-color: transparentize(if($variant=='light', darken($bg_color, 5%), darken($bg_color, 8%)), 0.1);
-  box-shadow: inset 0 1px 0 0 $osd_outer_borders_color;
+  background-color: $bg_color;
+  box-shadow: inset 0 1px 0 0 $borders_color;

  .page-indicator {
    padding: $base_padding;
@@ -71,11 +70,11 @@ $default_key_bg_color: if($variant=='light', darken($osd_bg_color, 11%), lighten

 // long press on a key popup
 .keyboard-subkeys {
-  color: $osd_fg_color;
+  color: $fg_color;
  -arrow-border-radius: $modal_radius;
-  -arrow-background-color: $osd_bg_color;
+  -arrow-background-color: $bg_color;
  -arrow-border-width: 1px;
-  -arrow-border-color: lighten($osd_bg_color, 9%);
+  -arrow-border-color: $borders_color;
  -arrow-base: 20px;
  -arrow-rise: 10px;
  -boxpointer-gap: $base_spacing;
--- a/data/theme/gnome-shell-sass/widgets/_login-dialog.scss
+++ b/data/theme/gnome-shell-sass/widgets/_login-dialog.scss
@@ -138,10 +138,11 @@
 .user-widget.horizontal .user-widget-label {
  @include fontsize($base_font_size + 2);
  font-weight: bold;
+  text-align: left;
  padding-left: 15px;

-  &:ltr { padding-left: 14px; text-align: left; }
-  &:rtl { padding-right: 14px; text-align: right; }
+  &:ltr { padding-left: 14px; }
+  &:rtl { padding-right: 14px; }
 }

 .user-widget.vertical .user-widget-label {
--- a/data/theme/gnome-shell-sass/widgets/_message-list.scss
+++ b/data/theme/gnome-shell-sass/widgets/_message-list.scss
@@ -24,7 +24,7 @@
  margin: ($base_margin * 2) ($base_margin * 4) 0;
  // NOTE: remove the padding if notification_bubble could remove margin for drop shadow
  padding: $base_margin;
-  spacing: $base_spacing * 2;
+  spacing: $base_spacing;
 }

 // message bubbles
@@ -71,11 +71,9 @@
    > .event-time {
      color: transparentize($fg_color, 0.5);
      @include fontsize($base_font_size - 2);
+      text-align: right;
      /* HACK: the label should be baseline-aligned with a 1em label, fake this with some bottom padding */
      padding-bottom: 0.13em;
-
-      &:ltr { text-align: right };
-      &:rtl { text-align: left };
    }
  }

--- a/data/theme/gnome-shell-sass/widgets/_misc.scss
+++ b/data/theme/gnome-shell-sass/widgets/_misc.scss
@@ -15,28 +15,18 @@

  & StIcon {
    background-color: transparentize($osd_fg_color,0.95);
+    padding: 18px 20px 22px 20px;
+    width: 88px; height: 88px;
    border-radius: 99px;
  }
 }

 .user-widget.vertical .user-icon {
-  icon-size: $base_icon_size * 6; // 128px
-
-  & StIcon {
-    padding: $base_padding * 3 + 2px; // 20px
-    padding-top: $base_padding * 3; // 18 px
-    padding-bottom: $base_padding * 3 + 4px; // 22px
-    width: $base_icon_size * 5.5; height:  $base_icon_size * 5.5; // 88px;
-  }
+  icon-size: 128px;
 }

 .user-widget.horizontal .user-icon {
-  icon-size: $base_icon_size * 4; // 64px
-
-  & StIcon {
-    padding: $base_padding * 2 ; // 12px
-    width: $base_icon_size * 2.5; height:  $base_icon_size * 2.5; // 40px;
-  }
+  icon-size: 64px;
 }

 .lightbox { background-color: black; }
--- a/data/theme/gnome-shell-sass/widgets/_panel.scss
+++ b/data/theme/gnome-shell-sass/widgets/_panel.scss
@@ -54,6 +54,9 @@ $panel_height: 1.86em;
    }

    &:active, &:overview, &:focus, &:checked {
+      // Trick due to St limitations. It needs a background to draw a box-shadow
+      background-color: rgba(0, 0, 0, 0.01);
+      box-shadow: inset 0 -2px 0 0 lighten($selected_bg_color,5%);
      color: lighten($panel_fg_color, 20%);
    }

@@ -79,26 +82,6 @@ $panel_height: 1.86em;
    }
  }

-  .panel-button {
-    &:active, &:overview, &:focus, &:checked {
-      // Trick due to St limitations. It needs a background to draw a box-shadow
-      background-color: rgba(0, 0, 0, 0.01);
-      box-shadow: inset 0 -2px 0 0 lighten($selected_bg_color,5%);
-    }
-  }
-
-  .panel-button.clock-display {
-    // Move highlight from .panel-button to .clock
-    &:active, &:overview, &:focus, &:checked {
-      box-shadow: none;
-
-      .clock {
-        background-color: rgba(0, 0, 0, 0.01);
-        box-shadow: inset 0 -2px 0 0 lighten($selected_bg_color,5%);
-      }
-    }
-  }
-
  .panel-status-indicators-box,
  .panel-status-menu-box {
    spacing: 2px;
--- a/data/theme/gnome-shell-sass/widgets/_popovers.scss
+++ b/data/theme/gnome-shell-sass/widgets/_popovers.scss
@@ -76,10 +76,8 @@ $popover_arrow_height: 12px;

 // container for radio and check boxes
 .popup-menu-ornament {
+  text-align: right;
  width: 1.2em;
-
-  &:ltr { text-align: right };
-  &:rtl { text-align: left };
 }

 // separator
--- a/data/theme/gnome-shell-sass/widgets/_switcher-popup.scss
+++ b/data/theme/gnome-shell-sass/widgets/_switcher-popup.scss
@@ -15,11 +15,13 @@
    border: 1px solid transparent;

    &:outlined {
-      background-color: transparentize($osd_fg_color, 0.7);
+      border: 1px solid darken($borders_color,5%);
+      background-color: transparentize($osd_fg_color, 0.9);
+      box-shadow: inset 0 2px 2px 0 rgba(0,0,0,0.4);
    }

    &:selected {
-      background-color: transparentize($osd_fg_color, 0.7);
+      background-color: transparentize($osd_fg_color, 0.9);
      color: $osd_fg_color;
    }
  }
--- a/data/theme/toggle-off-dark.svg
+++ b/data/theme/toggle-off-dark.svg
@@ -1 +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" stroke="#151515"><rect style="marker:none" width="44.446" height="20.911" x=".625" y="291.715" rx="10.455" ry="10.073" fill="#282828"/><rect ry="10.455" rx="10.455" y="291.715" x=".543" height="20.911" width="21.143" style="marker:none" fill="url(#b)"/></g></svg>
+<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/update-osk-layouts.sh
+++ b/data/update-osk-layouts.sh
@@ -1,9 +1,10 @@
 #!/bin/env bash

 CLDR_LAYOUTS_TARBALL="http://www.unicode.org/Public/cldr/latest/keyboards.zip"
+CLDR2JSON_GIT="git://repo.or.cz/cldr2json.git"

 WORKDIR=".osk-layout-workbench"
-CLDR2JSON="cldr2json/cldr2json.py"
+CLDR2JSON="$WORKDIR/cldr2json/cldr2json.py"
 SRCDIR="$WORKDIR/keyboards/android"
 DESTDIR="osk-layouts"
 GRESOURCE_FILE="gnome-shell-osk-layouts.gresource.xml"
@@ -19,6 +20,7 @@ mkdir -p "osk-layouts"
 # Download stuff on the work dir
 pushd $WORKDIR
 gio copy $CLDR_LAYOUTS_TARBALL .
+git clone $CLDR2JSON_GIT
 unzip keyboards.zip
 popd

--- a/js/dbusServices/dbus-service.in
+++ b/js/dbusServices/dbus-service.in
@@ -1,5 +0,0 @@
-imports.package.start({
-    name: '@PACKAGE_NAME@',
-    prefix: '@prefix@',
-    libdir: '@libdir@',
-});
--- a/js/dbusServices/dbus-service.service.in
+++ b/js/dbusServices/dbus-service.service.in
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=@service@
-Exec=@gjs@ @pkgdatadir@/@service@
--- a/js/dbusServices/dbusService.js
+++ b/js/dbusServices/dbusService.js
@@ -1,177 +0,0 @@
-/* exported DBusService, ServiceImplementation */
-
-const { Gio, GLib } = imports.gi;
-
-const Signals = imports.signals;
-
-const IDLE_SHUTDOWN_TIME = 2; // s
-
-var ServiceImplementation = class {
-    constructor(info, objectPath) {
-        this._objectPath = objectPath;
-        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(info, this);
-
-        this._injectTracking('return_dbus_error');
-        this._injectTracking('return_error_literal');
-        this._injectTracking('return_gerror');
-        this._injectTracking('return_value');
-        this._injectTracking('return_value_with_unix_fd_list');
-
-        this._senders = new Map();
-        this._holdCount = 0;
-
-        this._hasSignals = this._dbusImpl.get_info().signals.length > 0;
-        this._shutdownTimeoutId = 0;
-
-        // subclasses may override this to disable automatic shutdown
-        this._autoShutdown = true;
-    }
-
-    // subclasses may override this to own additional names
-    register() {
-    }
-
-    export() {
-        this._dbusImpl.export(Gio.DBus.session, this._objectPath);
-    }
-
-    unexport() {
-        this._dbusImpl.unexport();
-    }
-
-    hold() {
-        this._holdCount++;
-    }
-
-    release() {
-        if (this._holdCount === 0) {
-            logError(new Error('Unmatched call to release()'));
-            return;
-        }
-
-        this._holdCount--;
-
-        if (this._holdCount === 0)
-            this._queueShutdownCheck();
-    }
-
-    /**
-     * _handleError:
-     * @param {Gio.DBusMethodInvocation}
-     * @param {Error}
-     *
-     * Complete @invocation with an appropriate error if @error is set;
-     * useful for implementing early returns from method implementations.
-     *
-     * @returns {bool} - true if @invocation was completed
-     */
-
-    _handleError(invocation, error) {
-        if (error === null)
-            return false;
-
-        if (error instanceof GLib.Error) {
-            invocation.return_gerror(error);
-        } else {
-            let name = error.name;
-            if (!name.includes('.')) // likely a normal JS error
-                name = `org.gnome.gjs.JSError.${name}`;
-            invocation.return_dbus_error(name, error.message);
-        }
-
-        return true;
-    }
-
-    _maybeShutdown() {
-        if (!this._autoShutdown)
-            return;
-
-        if (this._holdCount > 0)
-            return;
-
-        this.emit('shutdown');
-    }
-
-    _queueShutdownCheck() {
-        if (this._shutdownTimeoutId)
-            GLib.source_remove(this._shutdownTimeoutId);
-
-        this._shutdownTimeoutId = GLib.timeout_add_seconds(
-            GLib.PRIORITY_DEFAULT, IDLE_SHUTDOWN_TIME,
-            () => {
-                this._shutdownTimeoutId = 0;
-                this._maybeShutdown();
-
-                return GLib.SOURCE_REMOVE;
-            });
-    }
-
-    _trackSender(sender) {
-        if (this._senders.has(sender))
-            return;
-
-        this.hold();
-        this._senders.set(sender,
-            this._dbusImpl.get_connection().watch_name(
-                sender,
-                Gio.BusNameWatcherFlags.NONE,
-                null,
-                () => this._untrackSender(sender)));
-    }
-
-    _untrackSender(sender) {
-        const id = this._senders.get(sender);
-
-        if (id)
-            this._dbusImpl.get_connection().unwatch_name(id);
-
-        if (this._senders.delete(sender))
-            this.release();
-    }
-
-    _injectTracking(methodName) {
-        const { prototype } = Gio.DBusMethodInvocation;
-        const origMethod = prototype[methodName];
-        const that = this;
-
-        prototype[methodName] = function (...args) {
-            origMethod.apply(this, args);
-
-            if (that._hasSignals)
-                that._trackSender(this.get_sender());
-
-            that._queueShutdownCheck();
-        };
-    }
-};
-Signals.addSignalMethods(ServiceImplementation.prototype);
-
-var DBusService = class {
-    constructor(name, service) {
-        this._name = name;
-        this._service = service;
-        this._loop = new GLib.MainLoop(null, false);
-
-        this._service.connect('shutdown', () => this._loop.quit());
-    }
-
-    run() {
-        // Bail out when not running under gnome-shell
-        Gio.DBus.watch_name(Gio.BusType.SESSION,
-            'org.gnome.Shell',
-            Gio.BusNameWatcherFlags.NONE,
-            null,
-            () => this._loop.quit());
-
-        this._service.register();
-
-        Gio.DBus.own_name(Gio.BusType.SESSION,
-            this._name,
-            Gio.BusNameOwnerFlags.REPLACE,
-            () => this._service.export(),
-            null,
-            () => this._loop.quit());
-
-        this._loop.run();
-    }
-};
--- a/js/dbusServices/extensions/css/application.css
+++ b/js/dbusServices/extensions/css/application.css
@@ -1,2 +0,0 @@
-.expander-frame > * { border-top-width: 0; }
-.expander-toolbar { border: 0 solid @borders; border-top-width: 1px; }
--- a/js/dbusServices/extensions/extensionsService.js
+++ b/js/dbusServices/extensions/extensionsService.js
@@ -1,274 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-/* exported ExtensionsService */
-
-const { Gdk, Gio, GLib, GObject, Gtk, Shew } = imports.gi;
-
-const ExtensionUtils = imports.misc.extensionUtils;
-
-const { loadInterfaceXML } = imports.misc.fileUtils;
-const { ServiceImplementation } = imports.dbusService;
-
-const ExtensionsIface = loadInterfaceXML('org.gnome.Shell.Extensions');
-const ExtensionsProxy = Gio.DBusProxy.makeProxyWrapper(ExtensionsIface);
-
-var ExtensionsService = class extends ServiceImplementation {
-    constructor() {
-        super(ExtensionsIface, '/org/gnome/Shell/Extensions');
-
-        this._proxy = new ExtensionsProxy(Gio.DBus.session,
-            'org.gnome.Shell', '/org/gnome/Shell');
-
-        this._proxy.connectSignal('ExtensionStateChanged',
-            (proxy, sender, params) => {
-                this._dbusImpl.emit_signal('ExtensionStateChanged',
-                    new GLib.Variant('(sa{sv})', params));
-            });
-
-        this._proxy.connect('g-properties-changed', () => {
-            this._dbusImpl.emit_property_changed('UserExtensionsEnabled',
-                new GLib.Variant('b', this._proxy.UserExtensionsEnabled));
-        });
-    }
-
-    get ShellVersion() {
-        return this._proxy.ShellVersion;
-    }
-
-    get UserExtensionsEnabled() {
-        return this._proxy.UserExtensionsEnabled;
-    }
-
-    set UserExtensionsEnabled(enable) {
-        this._proxy.UserExtensionsEnabled = enable;
-    }
-
-    ListExtensionsAsync(params, invocation) {
-        this._proxy.ListExtensionsRemote(...params, (res, error) => {
-            if (this._handleError(invocation, error))
-                return;
-
-            invocation.return_value(new GLib.Variant('(a{sa{sv}})', res));
-        });
-    }
-
-    GetExtensionInfoAsync(params, invocation) {
-        this._proxy.GetExtensionInfoRemote(...params, (res, error) => {
-            if (this._handleError(invocation, error))
-                return;
-
-            invocation.return_value(new GLib.Variant('(a{sv})', res));
-        });
-    }
-
-    GetExtensionErrorsAsync(params, invocation) {
-        this._proxy.GetExtensionErrorsRemote(...params, (res, error) => {
-            if (this._handleError(invocation, error))
-                return;
-
-            invocation.return_value(new GLib.Variant('(as)', res));
-        });
-    }
-
-    InstallRemoteExtensionAsync(params, invocation) {
-        this._proxy.InstallRemoteExtensionRemote(...params, (res, error) => {
-            if (this._handleError(invocation, error))
-                return;
-
-            invocation.return_value(new GLib.Variant('(s)', res));
-        });
-    }
-
-    UninstallExtensionAsync(params, invocation) {
-        this._proxy.UninstallExtensionRemote(...params, (res, error) => {
-            if (this._handleError(invocation, error))
-                return;
-
-            invocation.return_value(new GLib.Variant('(b)', res));
-        });
-    }
-
-    EnableExtensionAsync(params, invocation) {
-        this._proxy.EnableExtensionRemote(...params, (res, error) => {
-            if (this._handleError(invocation, error))
-                return;
-
-            invocation.return_value(new GLib.Variant('(b)', res));
-        });
-    }
-
-    DisableExtensionAsync(params, invocation) {
-        this._proxy.DisableExtensionRemote(...params, (res, error) => {
-            if (this._handleError(invocation, error))
-                return;
-
-            invocation.return_value(new GLib.Variant('(b)', res));
-        });
-    }
-
-    LaunchExtensionPrefsAsync([uuid], invocation) {
-        this.OpenExtensionPrefsAsync([uuid, '', {}], invocation);
-    }
-
-    OpenExtensionPrefsAsync(params, invocation) {
-        const [uuid, parentWindow, options] = params;
-
-        this._proxy.GetExtensionInfoRemote(uuid, (res, error) => {
-            if (this._handleError(invocation, error))
-                return;
-
-            const [serialized] = res;
-            const extension = ExtensionUtils.deserializeExtension(serialized);
-
-            const window = new ExtensionPrefsDialog(extension);
-            window.realize();
-
-            let externalWindow = null;
-
-            if (parentWindow)
-                externalWindow = Shew.ExternalWindow.new_from_handle(parentWindow);
-
-            if (externalWindow)
-                externalWindow.set_parent_of(window.window);
-
-            if (options.modal)
-                window.modal = options.modal.get_boolean();
-
-            window.connect('destroy', () => this.release());
-            this.hold();
-
-            window.show();
-
-            invocation.return_value(null);
-        });
-    }
-
-    CheckForUpdatesAsync(params, invocation) {
-        this._proxy.CheckForUpdatesRemote(...params, (res, error) => {
-            if (this._handleError(invocation, error))
-                return;
-
-            invocation.return_value(null);
-        });
-    }
-};
-
-var ExtensionPrefsDialog = GObject.registerClass({
-    GTypeName: 'ExtensionPrefsDialog',
-    Template: 'resource:///org/gnome/Shell/Extensions/ui/extension-prefs-dialog.ui',
-    InternalChildren: [
-        'headerBar',
-        'stack',
-        'expander',
-        'expanderArrow',
-        'revealer',
-        'errorView',
-    ],
-}, class ExtensionPrefsDialog extends Gtk.Window {
-    _init(extension) {
-        super._init();
-
-        this._uuid = extension.uuid;
-        this._url = extension.metadata.url || '';
-
-        this._headerBar.title = extension.metadata.name;
-
-        this._actionGroup = new Gio.SimpleActionGroup();
-        this.insert_action_group('win', this._actionGroup);
-
-        this._initActions();
-        this._addCustomStylesheet();
-
-        this._gesture = new Gtk.GestureMultiPress({
-            widget: this._expander,
-            button: 0,
-            exclusive: true,
-        });
-
-        this._gesture.connect('released', (gesture, nPress) => {
-            if (nPress === 1)
-                this._revealer.reveal_child = !this._revealer.reveal_child;
-        });
-
-        this._revealer.connect('notify::reveal-child', () => {
-            this._expanderArrow.icon_name = this._revealer.reveal_child
-                ? 'pan-down-symbolic'
-                : 'pan-end-symbolic';
-        });
-
-        try {
-            ExtensionUtils.installImporter(extension);
-
-            // give extension prefs access to their own extension object
-            ExtensionUtils.getCurrentExtension = () => extension;
-
-            const prefsModule = extension.imports.prefs;
-            prefsModule.init(extension.metadata);
-
-            const widget = prefsModule.buildPrefsWidget();
-            this._stack.add(widget);
-            this._stack.visible_child = widget;
-        } catch (e) {
-            this._setError(e);
-        }
-    }
-
-    _setError(exc) {
-        this._errorView.buffer.text = `${exc}\n\nStack trace:\n`;
-        // Indent stack trace.
-        this._errorView.buffer.text +=
-            exc.stack.split('\n').map(line => `  ${line}`).join('\n');
-
-        // markdown for pasting in gitlab issues
-        let lines = [
-            `The settings of extension ${this._uuid} had an error:`,
-            '```',
-            `${exc}`,
-            '```',
-            '',
-            'Stack trace:',
-            '```',
-            exc.stack.replace(/\n$/, ''), // stack without trailing newline
-            '```',
-            '',
-        ];
-        this._errorMarkdown = lines.join('\n');
-        this._actionGroup.lookup('copy-error').enabled = true;
-    }
-
-    _initActions() {
-        let action;
-
-        action = new Gio.SimpleAction({
-            name: 'copy-error',
-            enabled: false,
-        });
-        action.connect('activate', () => {
-            const clipboard = Gtk.Clipboard.get_default(this.get_display());
-            clipboard.set_text(this._errorMarkdown, -1);
-        });
-        this._actionGroup.add_action(action);
-
-        action = new Gio.SimpleAction({
-            name: 'show-url',
-            enabled: this._url !== '',
-        });
-        action.connect('activate', () => {
-            Gio.AppInfo.launch_default_for_uri(this._url,
-                this.get_display().get_app_launch_context());
-        });
-        this._actionGroup.add_action(action);
-    }
-
-    _addCustomStylesheet() {
-        let provider = new Gtk.CssProvider();
-        let uri = 'resource:///org/gnome/Shell/Extensions/css/application.css';
-        try {
-            provider.load_from_file(Gio.File.new_for_uri(uri));
-        } catch (e) {
-            logError(e, 'Failed to add application style');
-        }
-        Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(),
-            provider,
-            Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
-    }
-});
--- a/js/dbusServices/extensions/main.js
+++ b/js/dbusServices/extensions/main.js
@@ -1,20 +0,0 @@
-/* exported main */
-
-imports.gi.versions.Gdk = '3.0';
-imports.gi.versions.Gtk = '3.0';
-
-const { Gtk } = imports.gi;
-const pkg = imports.package;
-
-const { DBusService } = imports.dbusService;
-const { ExtensionsService } = imports.extensionsService;
-
-function main() {
-    Gtk.init(null);
-    pkg.initFormat();
-
-    const service = new DBusService(
-        'org.gnome.Shell.Extensions',
-        new ExtensionsService());
-    service.run();
-}
--- a/js/dbusServices/extensions/ui/extension-prefs-dialog.ui
+++ b/js/dbusServices/extensions/ui/extension-prefs-dialog.ui
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
-<interface>
-  <requires lib="gtk+" version="3.20"/>
-  <template class="ExtensionPrefsDialog" parent="GtkWindow">
-    <property name="default_width">600</property>
-    <property name="default_height">400</property>
-    <child type="titlebar">
-      <object class="GtkHeaderBar" id="headerBar">
-        <property name="visible">True</property>
-        <property name="show_close_button">True</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkStack" id="stack">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <child>
-          <object class="GtkScrolledWindow">
-            <property name="visible">True</property>
-            <property name="hscrollbar_policy">never</property>
-            <property name="propagate_natural_height">True</property>
-            <child>
-              <object class="GtkViewport">
-                <property name="visible">True</property>
-                <child>
-                  <object class="GtkBox">
-                    <property name="visible">True</property>
-                    <property name="orientation">vertical</property>
-                    <property name="margin">100</property>
-                    <property name="margin_bottom">60</property>
-                    <property name="spacing">12</property>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Something’s gone wrong</property>
-                        <attributes>
-                          <attribute name="scale" value="1.44"/> <!-- x-large -->
-                        </attributes>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">We’re very sorry, but there’s been a problem: the settings for this extension can’t be displayed. We recommend that you report the issue to the extension authors.</property>
-                        <property name="justify">center</property>
-                        <property name="wrap">True</property>
-                        <property name="xalign">0.5</property>
-                        <property name="yalign">0.5</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="orientation">vertical</property>
-                        <property name="margin_top">12</property>
-                        <child>
-                          <object class="GtkFrame" id="expander">
-                            <property name="visible">True</property>
-                            <property name="hexpand">True</property>
-                            <property name="shadow_type">in</property>
-                            <child>
-                              <object class="GtkEventBox">
-                                <property name="visible">True</property>
-                                <child>
-                                  <object class="GtkBox">
-                                    <property name="visible">True</property>
-                                    <property name="margin">12</property>
-                                    <property name="spacing">6</property>
-                                    <child>
-                                      <object class="GtkImage" id="expanderArrow">
-                                        <property name="visible">True</property>
-                                        <property name="icon_name">pan-end-symbolic</property>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel">
-                                        <property name="visible">True</property>
-                                        <property name="label" translatable="yes">Technical Details</property>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkRevealer" id="revealer">
-                            <property name="visible">True</property>
-                            <child>
-                              <object class="GtkFrame">
-                                <property name="visible">True</property>
-                                <property name="shadow_type">in</property>
-                                <style>
-                                  <class name="expander-frame"/>
-                                </style>
-                                <child>
-                                  <object class="GtkBox">
-                                    <property name="visible">True</property>
-                                    <property name="orientation">vertical</property>
-                                    <child>
-                                      <object class="GtkTextView" id="errorView">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="monospace">True</property>
-                                        <property name="editable">False</property>
-                                        <property name="wrap_mode">word</property>
-                                        <property name="left_margin">12</property>
-                                        <property name="right_margin">12</property>
-                                        <property name="top_margin">12</property>
-                                        <property name="bottom_margin">12</property>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolbar">
-                                        <property name="visible">True</property>
-                                        <style>
-                                          <class name="expander-toolbar"/>
-                                        </style>
-                                        <child>
-                                          <object class="GtkToolItem">
-                                            <property name="visible">True</property>
-                                            <child>
-                                              <object class="GtkButton">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="receives_default">True</property>
-                                                <property name="action_name">win.copy-error</property>
-                                                <style>
-                                                  <class name="flat"/>
-                                                  <class name="image-button"/>
-                                                </style>
-                                                <child>
-                                                  <object class="GtkImage">
-                                                    <property name="visible">True</property>
-                                                    <property name="icon_name">edit-copy-symbolic</property>
-                                                  </object>
-                                                </child>
-                                              </object>
-                                            </child>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkSeparatorToolItem">
-                                            <property name="visible">True</property>
-                                            <property name="draw">False</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">True</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkToolItem">
-                                            <property name="visible">True</property>
-                                            <child>
-                                              <object class="GtkButton" id="homeButton">
-                                                <property name="visible"
-                                                          bind-source="homeButton"
-                                                          bind-property="sensitive"
-                                                          bind-flags="sync-create"/>
-                                                <property name="label" translatable="yes">Homepage</property>
-                                                <property name="tooltip_text" translatable="yes">Visit extension homepage</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="receives_default">True</property>
-                                                <property name="no_show_all">True</property>
-                                                <property name="action_name">win.show-url</property>
-                                                <style>
-                                                  <class name="flat"/>
-                                                </style>
-                                              </object>
-                                            </child>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </template>
-</interface>
--- a/js/dbusServices/meson.build
+++ b/js/dbusServices/meson.build
@@ -1,42 +0,0 @@
-launcherconf = configuration_data()
-launcherconf.set('PACKAGE_NAME', meson.project_name())
-launcherconf.set('prefix', prefix)
-launcherconf.set('libdir', libdir)
-
-dbus_services = {
-  'org.gnome.Shell.Extensions': 'extensions',
-  'org.gnome.Shell.Notifications': 'notifications',
-}
-
-config_dir = '@0@/..'.format(meson.current_build_dir())
-
-foreach service, dir : dbus_services
-  configure_file(
-    input: 'dbus-service.in',
-    output: service,
-    configuration: launcherconf,
-    install_dir: pkgdatadir,
-  )
-
-  serviceconf = configuration_data()
-  serviceconf.set('service', service)
-  serviceconf.set('gjs', gjs.path())
-  serviceconf.set('pkgdatadir', pkgdatadir)
-
-  configure_file(
-    input: 'dbus-service.service.in',
-    output: service + '.service',
-    configuration: serviceconf,
-    install_dir: servicedir
-  )
-
-  gnome.compile_resources(
-    service + '.src',
-    service + '.src.gresource.xml',
-    dependencies: [config_js],
-    source_dir: ['.', '..', dir, config_dir],
-    gresource_bundle: true,
-    install: true,
-    install_dir: pkgdatadir
-  )
-endforeach
--- a/js/dbusServices/notifications/main.js
+++ b/js/dbusServices/notifications/main.js
@@ -1,11 +0,0 @@
-/* exported main */
-
-const { DBusService } = imports.dbusService;
-const { NotificationDaemon } = imports.notificationDaemon;
-
-function main() {
-    const service = new DBusService(
-        'org.gnome.Shell.Notifications',
-        new NotificationDaemon());
-    service.run();
-}
--- a/js/dbusServices/notifications/notificationDaemon.js
+++ b/js/dbusServices/notifications/notificationDaemon.js
@@ -1,105 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-/* exported NotificationDaemon */
-
-const { Gio, GLib } = imports.gi;
-
-const { loadInterfaceXML } = imports.misc.fileUtils;
-const { ServiceImplementation } = imports.dbusService;
-
-const NotificationsIface = loadInterfaceXML('org.freedesktop.Notifications');
-const NotificationsProxy = Gio.DBusProxy.makeProxyWrapper(NotificationsIface);
-
-Gio._promisify(Gio.DBusConnection.prototype, 'call', 'call_finish');
-
-var NotificationDaemon = class extends ServiceImplementation {
-    constructor() {
-        super(NotificationsIface, '/org/freedesktop/Notifications');
-
-        this._autoShutdown = false;
-
-        this._proxy = new NotificationsProxy(Gio.DBus.session,
-            'org.gnome.Shell',
-            '/org/freedesktop/Notifications',
-            (proxy, error) => {
-                if (error)
-                    log(error.message);
-            });
-
-        this._proxy.connectSignal('ActionInvoked',
-            (proxy, sender, params) => {
-                this._dbusImpl.emit_signal('ActionInvoked',
-                    new GLib.Variant('(us)', params));
-            });
-        this._proxy.connectSignal('NotificationClosed',
-            (proxy, sender, params) => {
-                this._dbusImpl.emit_signal('NotificationClosed',
-                    new GLib.Variant('(uu)', params));
-            });
-    }
-
-    register() {
-        Gio.DBus.session.own_name(
-            'org.freedesktop.Notifications',
-            Gio.BusNameOwnerFlags.REPLACE,
-            null, null);
-    }
-
-    async NotifyAsync(params, invocation) {
-        const pid = await this._getSenderPid(invocation.get_sender());
-        const hints = params[6];
-
-        params[6] = {
-            ...hints,
-            'sender-pid': new GLib.Variant('u', pid),
-        };
-
-        this._proxy.NotifyRemote(...params, (res, error) => {
-            if (this._handleError(invocation, error))
-                return;
-
-            invocation.return_value(new GLib.Variant('(u)', res));
-        });
-    }
-
-    CloseNotificationAsync(params, invocation) {
-        this._proxy.CloseNotificationRemote(...params, (res, error) => {
-            if (this._handleError(invocation, error))
-                return;
-
-            invocation.return_value(null);
-        });
-    }
-
-    GetCapabilitiesAsync(params, invocation) {
-        this._proxy.GetCapabilitiesRemote(...params, (res, error) => {
-            if (this._handleError(invocation, error))
-                return;
-
-            invocation.return_value(new GLib.Variant('(as)', res));
-        });
-    }
-
-    GetServerInformationAsync(params, invocation) {
-        this._proxy.GetServerInformationRemote(...params, (res, error) => {
-            if (this._handleError(invocation, error))
-                return;
-
-            invocation.return_value(new GLib.Variant('(ssss)', res));
-        });
-    }
-
-    async _getSenderPid(sender) {
-        const res = await Gio.DBus.session.call(
-            'org.freedesktop.DBus',
-            '/',
-            'org.freedesktop.DBus',
-            'GetConnectionUnixProcessID',
-            new GLib.Variant('(s)', [sender]),
-            new GLib.VariantType('(u)'),
-            Gio.DBusCallFlags.NONE,
-            -1,
-            null);
-        const [pid] = res.deepUnpack();
-        return pid;
-    }
-};
--- a/js/dbusServices/org.gnome.Shell.Extensions.src.gresource.xml
+++ b/js/dbusServices/org.gnome.Shell.Extensions.src.gresource.xml
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/org/gnome/Shell/Extensions/js">
-    <file>main.js</file>
-    <file>extensionsService.js</file>
-    <file>dbusService.js</file>
-
-    <file>misc/config.js</file>
-    <file>misc/extensionUtils.js</file>
-    <file>misc/fileUtils.js</file>
-    <file>misc/params.js</file>
-  </gresource>
-
-  <gresource prefix="/org/gnome/Shell/Extensions">
-    <file>css/application.css</file>
-    <file>ui/extension-prefs-dialog.ui</file>
-  </gresource>
-</gresources>
--- a/js/dbusServices/org.gnome.Shell.Notifications.src.gresource.xml
+++ b/js/dbusServices/org.gnome.Shell.Notifications.src.gresource.xml
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/org/gnome/Shell/Notifications/js">
-    <file>main.js</file>
-    <file>notificationDaemon.js</file>
-    <file>dbusService.js</file>
-
-    <file>misc/config.js</file>
-    <file>misc/fileUtils.js</file>
-  </gresource>
-</gresources>
--- a/subprojects/extensions-app/data/css/application.css
+++ b/subprojects/extensions-app/data/css/application.css
--- a/subprojects/extensions-app/js/main.js
+++ b/subprojects/extensions-app/js/main.js
@@ -3,44 +3,34 @@ imports.gi.versions.Gdk = '3.0';
 imports.gi.versions.Gtk = '3.0';

 const Gettext = imports.gettext;
-const Package = imports.package;
-const { Gdk, GLib, Gio, GObject, Gtk, Shew } = imports.gi;
+const { Gdk, GLib, Gio, GObject, Gtk } = imports.gi;
+const Format = imports.format;

-Package.initFormat();
+const _ = Gettext.gettext;

+const Config = imports.misc.config;
 const ExtensionUtils = imports.misc.extensionUtils;
+const { loadInterfaceXML } = imports.misc.fileUtils;

 const { ExtensionState, ExtensionType } = ExtensionUtils;

 const GnomeShellIface = loadInterfaceXML('org.gnome.Shell.Extensions');
 const GnomeShellProxy = Gio.DBusProxy.makeProxyWrapper(GnomeShellIface);

-Gio._promisify(Shew.WindowExporter.prototype, 'export', 'export_finish');
-
-function loadInterfaceXML(iface) {
-    const uri = 'resource:///org/gnome/Extensions/dbus-interfaces/%s.xml'.format(iface);
-    const f = Gio.File.new_for_uri(uri);
-
-    try {
-        let [ok_, bytes] = f.load_contents(null);
-        return imports.byteArray.toString(bytes);
-    } catch (e) {
-        log('Failed to load D-Bus interface %s'.format(iface));
-    }
-
-    return null;
-}
-
-function toggleState(action) {
-    let state = action.get_state();
-    action.change_state(new GLib.Variant('b', !state.get_boolean()));
+function stripPrefix(string, prefix) {
+    if (string.slice(0, prefix.length) == prefix)
+        return string.slice(prefix.length);
+    return string;
 }

 var Application = GObject.registerClass(
 class Application extends Gtk.Application {
    _init() {
-        GLib.set_prgname('gnome-extensions-app');
-        super._init({ application_id: 'org.gnome.Extensions' });
+        GLib.set_prgname('gnome-shell-extension-prefs');
+        super._init({
+            application_id: 'org.gnome.Extensions',
+            flags: Gio.ApplicationFlags.HANDLES_COMMAND_LINE,
+        });
    }

    get shellProxy() {
@@ -56,7 +46,7 @@ class Application extends Gtk.Application {
        super.vfunc_startup();

        let provider = new Gtk.CssProvider();
-        let uri = 'resource:///org/gnome/Extensions/css/application.css';
+        let uri = 'resource:///org/gnome/shell/css/application.css';
        try {
            provider.load_from_file(Gio.File.new_for_uri(uri));
        } catch (e) {
@@ -66,19 +56,34 @@ class Application extends Gtk.Application {
            provider,
            Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);

-        this._shellProxy = new GnomeShellProxy(Gio.DBus.session,
-            'org.gnome.Shell.Extensions', '/org/gnome/Shell/Extensions');
-
+        this._shellProxy = new GnomeShellProxy(Gio.DBus.session, 'org.gnome.Shell', '/org/gnome/Shell');
        this._window = new ExtensionsWindow({ application: this });
    }
+
+    vfunc_command_line(commandLine) {
+        let args = commandLine.get_arguments();
+
+        if (args.length) {
+            let uuid = args[0];
+
+            // Strip off "extension:///" prefix which fakes a URI, if it exists
+            uuid = stripPrefix(uuid, 'extension:///');
+
+            this._window.openPrefs(uuid);
+        } else {
+            this.activate();
+        }
+        return 0;
+    }
 });

 var ExtensionsWindow = GObject.registerClass({
    GTypeName: 'ExtensionsWindow',
-    Template: 'resource:///org/gnome/Extensions/ui/extensions-window.ui',
+    Template: 'resource:///org/gnome/shell/ui/extensions-window.ui',
    InternalChildren: [
        'userList',
        'systemList',
+        'killSwitch',
        'mainBox',
        'mainStack',
        'scrolledWindow',
@@ -89,11 +94,11 @@ var ExtensionsWindow = GObject.registerClass({
    _init(params) {
        super._init(params);

+        this._startupUuid = null;
+        this._loaded = false;
+        this._prefsDialog = null;
        this._updatesCheckId = 0;

-        this._exporter = new Shew.WindowExporter({ window: this });
-        this._exportedHandle = '';
-
        this._mainBox.set_focus_vadjustment(this._scrolledWindow.vadjustment);

        let action;
@@ -105,15 +110,10 @@ var ExtensionsWindow = GObject.registerClass({
        action.connect('activate', this._logout.bind(this));
        this.add_action(action);

-        action = new Gio.SimpleAction({
-            name: 'user-extensions-enabled',
-            state: new GLib.Variant('b', false),
-        });
-        action.connect('activate', toggleState);
-        action.connect('change-state', (a, state) => {
-            this._shellProxy.UserExtensionsEnabled = state.get_boolean();
-        });
-        this.add_action(action);
+        this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell' });
+        this._settings.bind('disable-user-extensions',
+            this._killSwitch, 'active',
+            Gio.SettingsBindFlags.DEFAULT | Gio.SettingsBindFlags.INVERT_BOOLEAN);

        this._userList.set_sort_func(this._sortList.bind(this));
        this._userList.set_header_func(this._updateHeader.bind(this));
@@ -124,10 +124,6 @@ var ExtensionsWindow = GObject.registerClass({
        this._shellProxy.connectSignal('ExtensionStateChanged',
            this._onExtensionStateChanged.bind(this));

-        this._shellProxy.connect('g-properties-changed',
-            this._onUserExtensionsEnabledChanged.bind(this));
-        this._onUserExtensionsEnabledChanged();
-
        this._scanExtensions();
    }

@@ -157,18 +153,58 @@ var ExtensionsWindow = GObject.registerClass({
        dialog.present();
    }

-    async openPrefs(uuid) {
-        if (!this._exportedHandle) {
-            try {
-                this._exportedHandle = await this._exporter.export();
-            } catch (e) {
-                log('Failed to export window: %s'.format(e.message));
-            }
+    openPrefs(uuid) {
+        if (!this._loaded)
+            this._startupUuid = uuid;
+        else if (!this._showPrefs(uuid))
+            this.present();
+    }
+
+    _showPrefs(uuid) {
+        if (this._prefsDialog)
+            return false;
+
+        let row = this._findExtensionRow(uuid);
+        if (!row || !row.hasPrefs)
+            return false;
+
+        let widget;
+
+        try {
+            widget = row.prefsModule.buildPrefsWidget();
+        } catch (e) {
+            widget = this._buildErrorUI(row, e);
        }

-        this._shellProxy.OpenExtensionPrefsRemote(uuid,
-            this._exportedHandle,
-            { modal: new GLib.Variant('b', true) });
+        this._prefsDialog = new Gtk.Window({
+            application: this.application,
+            default_width: 600,
+            default_height: 400,
+            modal: this.visible,
+            type_hint: Gdk.WindowTypeHint.DIALOG,
+            window_position: Gtk.WindowPosition.CENTER,
+        });
+
+        this._prefsDialog.set_titlebar(new Gtk.HeaderBar({
+            show_close_button: true,
+            title: row.name,
+            visible: true,
+        }));
+
+        if (this.visible)
+            this._prefsDialog.transient_for = this;
+
+        this._prefsDialog.connect('destroy', () => {
+            this._prefsDialog = null;
+
+            if (!this.visible)
+                this.destroy();
+        });
+
+        this._prefsDialog.add(widget);
+        this._prefsDialog.show();
+
+        return true;
    }

    _showAbout() {
@@ -183,7 +219,7 @@ var ExtensionsWindow = GObject.registerClass({
            comments: _('Manage your GNOME Extensions'),
            license_type: Gtk.License.GPL_2_0,
            logo_icon_name: 'org.gnome.Extensions',
-            version: imports.package.version,
+            version: Config.PACKAGE_VERSION,

            transient_for: this,
            modal: true,
@@ -207,6 +243,121 @@ var ExtensionsWindow = GObject.registerClass({
            });
    }

+    _buildErrorUI(row, exc) {
+        let scroll = new Gtk.ScrolledWindow({
+            hscrollbar_policy: Gtk.PolicyType.NEVER,
+            propagate_natural_height: true,
+        });
+
+        let box = new Gtk.Box({
+            orientation: Gtk.Orientation.VERTICAL,
+            spacing: 12,
+            margin: 100,
+            margin_bottom: 60,
+        });
+        scroll.add(box);
+
+        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);
+        box.add(label);
+
+        label = new Gtk.Label({
+            label: _("We’re very sorry, but there’s been a problem: the settings for this extension can’t be displayed. We recommend that you report the issue to the extension authors."),
+            justify: Gtk.Justification.CENTER,
+            wrap: true,
+        });
+        box.add(label);
+
+        let expander = new Expander({
+            label: _("Technical Details"),
+            margin_top: 12,
+        });
+        box.add(expander);
+
+        let errortext = '%s\n\nStack trace:\n'.format(exc);
+        // Indent stack trace.
+        errortext +=
+            exc.stack.split('\n').map(line => '  %s'.format(line)).join('\n');
+
+        let buffer = new Gtk.TextBuffer({ text: errortext });
+        let textview = new Gtk.TextView({
+            buffer,
+            wrap_mode: Gtk.WrapMode.WORD,
+            monospace: true,
+            editable: false,
+            top_margin: 12,
+            bottom_margin: 12,
+            left_margin: 12,
+            right_margin: 12,
+        });
+
+        let toolbar = new Gtk.Toolbar();
+        let provider = new Gtk.CssProvider();
+        provider.load_from_data(`* {
+            border: 0 solid @borders;
+            border-top-width: 1px;
+        }`);
+        toolbar.get_style_context().add_provider(
+            provider,
+            Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION
+        );
+
+        let copyButton = new Gtk.ToolButton({
+            icon_name: 'edit-copy-symbolic',
+            tooltip_text: _("Copy Error"),
+        });
+        toolbar.add(copyButton);
+
+        copyButton.connect('clicked', w => {
+            let clipboard = Gtk.Clipboard.get_default(w.get_display());
+            // markdown for pasting in gitlab issues
+            let lines = [
+                'The settings of extension %s had an error:'.format(row.uuid),
+                '```', // '`' (xgettext throws up on odd number of backticks)
+                exc.toString(),
+                '```', // '`'
+                '',
+                'Stack trace:',
+                '```', // '`'
+                exc.stack.replace(/\n$/, ''), // stack without trailing newline
+                '```', // '`'
+                '',
+            ];
+            clipboard.set_text(lines.join('\n'), -1);
+        });
+
+        let spacing = new Gtk.SeparatorToolItem({ draw: false });
+        toolbar.add(spacing);
+        toolbar.child_set_property(spacing, "expand", true);
+
+        let urlButton = new Gtk.ToolButton({
+            label: _("Homepage"),
+            tooltip_text: _("Visit extension homepage"),
+            no_show_all: true,
+            visible: row.url !== '',
+        });
+        toolbar.add(urlButton);
+
+        urlButton.connect('clicked', w => {
+            let context = w.get_display().get_app_launch_context();
+            Gio.AppInfo.launch_default_for_uri(row.url, context);
+        });
+
+        let expandedBox = new Gtk.Box({
+            orientation: Gtk.Orientation.VERTICAL,
+        });
+        expandedBox.add(textview);
+        expandedBox.add(toolbar);
+
+        expander.add(expandedBox);
+
+        scroll.show_all();
+        return scroll;
+    }
+
    _sortList(row1, row2) {
        return row1.name.localeCompare(row2.name);
    }
@@ -226,12 +377,6 @@ var ExtensionsWindow = GObject.registerClass({
        ].find(c => c.uuid === uuid);
    }

-    _onUserExtensionsEnabledChanged() {
-        let action = this.lookup_action('user-extensions-enabled');
-        action.set_state(
-            new GLib.Variant('b', this._shellProxy.UserExtensionsEnabled));
-    }
-
    _onExtensionStateChanged(proxy, senderName, [uuid, newState]) {
        let extension = ExtensionUtils.deserializeExtension(newState);
        let row = this._findExtensionRow(uuid);
@@ -249,11 +394,9 @@ var ExtensionsWindow = GObject.registerClass({
        if (row) {
            if (extension.state === ExtensionState.UNINSTALLED)
                row.destroy();
-        } else {
-            this._addExtensionRow(extension);
+            return; // we only deal with new and deleted extensions here
        }
-
-        this._syncListVisibility();
+        this._addExtensionRow(extension);
    }

    _scanExtensions() {
@@ -299,16 +442,6 @@ var ExtensionsWindow = GObject.registerClass({
            });
    }

-    _syncListVisibility() {
-        this._userList.visible = this._userList.get_children().length > 0;
-        this._systemList.visible = this._systemList.get_children().length > 0;
-
-        if (this._userList.visible || this._systemList.visible)
-            this._mainStack.visible_child_name = 'main';
-        else
-            this._mainStack.visible_child_name = 'placeholder';
-    }
-
    _checkUpdates() {
        let nUpdates = this._userList.get_children().filter(c => c.hasUpdate).length;

@@ -320,21 +453,131 @@ var ExtensionsWindow = GObject.registerClass({
    }

    _extensionsLoaded() {
-        this._syncListVisibility();
+        this._userList.visible = this._userList.get_children().length > 0;
+        this._systemList.visible = this._systemList.get_children().length > 0;
+
+        if (this._userList.visible || this._systemList.visible)
+            this._mainStack.visible_child_name = 'main';
+        else
+            this._mainStack.visible_child_name = 'placeholder';
+
        this._checkUpdates();
+
+        if (this._startupUuid)
+            this._showPrefs(this._startupUuid);
+        this._startupUuid = null;
+        this._loaded = true;
+    }
+});
+
+var Expander = GObject.registerClass({
+    Properties: {
+        'label': GObject.ParamSpec.string(
+            'label', 'label', 'label',
+            GObject.ParamFlags.READWRITE,
+            null
+        ),
+    },
+}, class Expander extends Gtk.Box {
+    _init(params = {}) {
+        this._labelText = null;
+
+        super._init(Object.assign(params, {
+            orientation: Gtk.Orientation.VERTICAL,
+            spacing: 0,
+        }));
+
+        this._frame = new Gtk.Frame({
+            shadow_type: Gtk.ShadowType.IN,
+            hexpand: true,
+        });
+
+        let eventBox = new Gtk.EventBox();
+        this._frame.add(eventBox);
+
+        let hbox = new Gtk.Box({
+            spacing: 6,
+            margin: 12,
+        });
+        eventBox.add(hbox);
+
+        this._arrow = new Gtk.Image({
+            icon_name: 'pan-end-symbolic',
+        });
+        hbox.add(this._arrow);
+
+        this._label = new Gtk.Label({ label: this._labelText });
+        hbox.add(this._label);
+
+        this._revealer = new Gtk.Revealer();
+
+        this._childBin = new Gtk.Frame({
+            shadow_type: Gtk.ShadowType.IN,
+        });
+        this._revealer.add(this._childBin);
+
+        // Directly chain up to parent for internal children
+        super.add(this._frame);
+        super.add(this._revealer);
+
+        let provider = new Gtk.CssProvider();
+        provider.load_from_data('* { border-top-width: 0; }');
+        this._childBin.get_style_context().add_provider(
+            provider,
+            Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION
+        );
+
+        this._gesture = new Gtk.GestureMultiPress({
+            widget: this._frame,
+            button: 0,
+            exclusive: true,
+        });
+        this._gesture.connect('released', (gesture, nPress) => {
+            if (nPress == 1)
+                this._revealer.reveal_child = !this._revealer.reveal_child;
+        });
+        this._revealer.connect('notify::reveal-child', () => {
+            if (this._revealer.reveal_child)
+                this._arrow.icon_name = 'pan-down-symbolic';
+            else
+                this._arrow.icon_name = 'pan-end-symbolic';
+        });
+    }
+
+    get label() {
+        return this._labelText;
+    }
+
+    set label(text) {
+        if (this._labelText == text)
+            return;
+
+        if (this._label)
+            this._label.label = text;
+        this._labelText = text;
+        this.notify('label');
+    }
+
+    add(child) {
+        // set expanded child
+        this._childBin.get_children().forEach(c => {
+            this._childBin.remove(c);
+        });
+
+        if (child)
+            this._childBin.add(child);
    }
 });

 var ExtensionRow = GObject.registerClass({
    GTypeName: 'ExtensionRow',
-    Template: 'resource:///org/gnome/Extensions/ui/extension-row.ui',
+    Template: 'resource:///org/gnome/shell/ui/extension-row.ui',
    InternalChildren: [
        'nameLabel',
        'descriptionLabel',
        'versionLabel',
        'authorLabel',
        'updatesIcon',
-        'switch',
        'revealButton',
        'revealer',
    ],
@@ -378,7 +621,10 @@ var ExtensionRow = GObject.registerClass({
            name: 'enabled',
            state: new GLib.Variant('b', false),
        });
-        action.connect('activate', toggleState);
+        action.connect('activate', () => {
+            let state = action.get_state();
+            action.change_state(new GLib.Variant('b', !state.get_boolean()));
+        });
        action.connect('change-state', (a, state) => {
            if (state.get_boolean())
                this._app.shellProxy.EnableExtensionRemote(this.uuid);
@@ -387,7 +633,8 @@ var ExtensionRow = GObject.registerClass({
        });
        this._actionGroup.add_action(action);

-        this._nameLabel.label = this.name;
+        let name = GLib.markup_escape_text(this.name, -1);
+        this._nameLabel.label = name;

        let desc = this._extension.metadata.description.split('\n')[0];
        this._descriptionLabel.label = desc;
@@ -454,9 +701,6 @@ var ExtensionRow = GObject.registerClass({
        action.set_state(new GLib.Variant('b', state));
        action.enabled = this._canToggle();

-        if (!action.enabled)
-            this._switch.active = state;
-
        this._updatesIcon.visible = this.hasUpdate;

        this._versionLabel.label = this.version.toString();
@@ -478,6 +722,20 @@ var ExtensionRow = GObject.registerClass({
    _canToggle() {
        return this._extension.canChange;
    }
+
+    get prefsModule() {
+        // give extension prefs access to their own extension object
+        ExtensionUtils.getCurrentExtension = () => this._extension;
+
+        if (!this._prefsModule) {
+            ExtensionUtils.installImporter(this._extension);
+
+            this._prefsModule = this._extension.imports.prefs;
+            this._prefsModule.init(this._extension.metadata);
+        }
+
+        return this._prefsModule;
+    }
 });

 function initEnvironment() {
@@ -494,11 +752,12 @@ function initEnvironment() {

        userdatadir: GLib.build_filenamev([GLib.get_user_data_dir(), 'gnome-shell']),
    };
+
+    String.prototype.format = Format.format;
 }

 function main(argv) {
    initEnvironment();
-    Package.initGettext();

    new Application().run(argv);
 }
--- a/subprojects/extensions-app/data/ui/extension-row.ui
+++ b/subprojects/extensions-app/data/ui/extension-row.ui
@@ -54,7 +54,7 @@
          </object>
        </child>
        <child>
-          <object class="GtkSwitch" id="switch">
+          <object class="GtkSwitch">
            <property name="visible">True</property>
            <property name="can_focus">True</property>
            <property name="valign">center</property>
--- a/subprojects/extensions-app/data/ui/extensions-window.ui
+++ b/subprojects/extensions-app/data/ui/extensions-window.ui
@@ -90,10 +90,8 @@
          </packing>
        </child>
        <child>
-          <object class="GtkSwitch">
+          <object class="GtkSwitch" id="killSwitch">
            <property name="visible">True</property>
-            <property name="action-name">win.user-extensions-enabled</property>
-            <property name="valign">center</property>
          </object>
          <packing>
            <property name="pack_type">end</property>
@@ -270,7 +268,7 @@
                  <object class="GtkLabel">
                    <property name="visible">True</property>
                    <property name="halign">start</property>
-                    <property name="label" translatable="yes">Extension Updates Ready</property>
+                    <property name="label">Extension Updates Ready</property>
                    <attributes>
                      <attribute name="weight" value="bold"/>
                    </attributes>
--- a/js/gdm/authPrompt.js
+++ b/js/gdm/authPrompt.js
@@ -55,7 +55,6 @@ var AuthPrompt = GObject.registerClass({

        this._gdmClient = gdmClient;
        this._mode = mode;
-        this._defaultButtonWellActor = null;

        let reauthenticationOnly;
        if (this._mode == AuthPromptMode.UNLOCK_ONLY)
@@ -120,7 +119,7 @@ var AuthPrompt = GObject.registerClass({
    vfunc_key_press_event(keyPressEvent) {
        if (keyPressEvent.keyval == Clutter.KEY_Escape)
            this.cancel();
-        return super.vfunc_key_press_event(keyPressEvent);
+        return Clutter.EVENT_PROPAGATE;
    }

    _initEntryRow() {
@@ -132,10 +131,9 @@ var AuthPrompt = GObject.registerClass({

        this.cancelButton = new St.Button({
            style_class: 'modal-dialog-button button cancel-button',
-            accessible_name: _('Cancel'),
            button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
            reactive: this._hasCancelButton,
-            can_focus: this._hasCancelButton,
+            can_focus: true,
            x_align: Clutter.ActorAlign.START,
            y_align: Clutter.ActorAlign.CENTER,
            child: new St.Icon({ icon_name: 'go-previous-symbolic' }),
@@ -184,7 +182,7 @@ var AuthPrompt = GObject.registerClass({
        });
        this._defaultButtonWell.add_constraint(new Clutter.BindConstraint({
            source: this.cancelButton,
-            coordinate: Clutter.BindCoordinate.WIDTH,
+            coordinate: Clutter.BindCoordinate.SIZE,
        }));
        this._mainBox.add_child(this._defaultButtonWell);

@@ -286,7 +284,6 @@ var AuthPrompt = GObject.registerClass({
        this.setActorInDefaultButtonWell(null);
        this.verificationStatus = AuthPromptStatus.VERIFICATION_SUCCEEDED;
        this.cancelButton.reactive = false;
-        this.cancelButton.can_focus = false;
    }

    _onReset() {
@@ -424,13 +421,8 @@ var AuthPrompt = GObject.registerClass({
    }

    updateSensitivity(sensitive) {
-        if (this._entry.reactive === sensitive)
-            return;
-
        this._entry.reactive = sensitive;
-
-        if (sensitive)
-            this._entry.grab_key_focus();
+        this._entry.clutter_text.editable = sensitive;
    }

    vfunc_hide() {
@@ -460,7 +452,6 @@ var AuthPrompt = GObject.registerClass({
        let oldStatus = this.verificationStatus;
        this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
        this.cancelButton.reactive = this._hasCancelButton;
-        this.cancelButton.can_focus = this._hasCancelButton;
        this._preemptiveAnswer = null;

        if (this._userVerifier)
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -35,6 +35,7 @@ const UserWidget = imports.ui.userWidget;
 const _FADE_ANIMATION_TIME = 250;
 const _SCROLL_ANIMATION_TIME = 500;
 const _TIMED_LOGIN_IDLE_THRESHOLD = 5.0;
+const _LOGO_ICON_HEIGHT = 48;

 var UserListItem = GObject.registerClass({
    Signals: { 'activate': {} },
@@ -177,7 +178,6 @@ var UserList = GObject.registerClass({
    }

    vfunc_key_focus_in() {
-        super.vfunc_key_focus_in();
        this._moveFocusToItems();
    }

@@ -456,6 +456,7 @@ var LoginDialog = GObject.registerClass({
        let notListedLabel = new St.Label({
            text: _("Not listed?"),
            style_class: 'login-dialog-not-listed-label',
+            x_align: Clutter.ActorAlign.START,
        });
        this._notListedButton = new St.Button({
            style_class: 'login-dialog-not-listed-button',
@@ -463,7 +464,6 @@ var LoginDialog = GObject.registerClass({
            can_focus: true,
            child: notListedLabel,
            reactive: true,
-            x_align: Clutter.ActorAlign.START,
        });

        this._notListedButton.connect('clicked', this._hideUserListAskForUsernameAndBeginVerification.bind(this));
@@ -813,7 +813,7 @@ var LoginDialog = GObject.registerClass({
        if (this._logoFile && this._logoBin.resource_scale > 0) {
            let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
            this._logoBin.add_child(this._textureCache.load_file_async(this._logoFile,
-                                                                       -1, -1,
+                                                                       -1, _LOGO_ICON_HEIGHT,
                                                                       scaleFactor,
                                                                       this._logoBin.resource_scale));
        }
@@ -952,15 +952,16 @@ var LoginDialog = GObject.registerClass({
        if (this.opacity == 255 && this._authPrompt.verificationStatus == AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
            return;

-        if (this._authPrompt.verificationStatus !== AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
-            this._authPrompt.reset();
-
        this._bindOpacity();
        this.ease({
            opacity: 255,
            duration: _FADE_ANIMATION_TIME,
            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-            onComplete: () => this._unbindOpacity(),
+            onComplete: () => {
+                if (this._authPrompt.verificationStatus != AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
+                    this._authPrompt.reset();
+                this._unbindOpacity();
+            },
        });
    }

--- a/js/meson.build
+++ b/js/meson.build
@@ -1,5 +1,4 @@
 subdir('misc')
-subdir('dbusServices')

 js_resources = gnome.compile_resources(
  'js-resources', 'js-resources.gresource.xml',
@@ -14,3 +13,10 @@ portal_resources = gnome.compile_resources(
  c_name: 'portal_js_resources',
  dependencies: [config_js]
 )
+
+prefs_resources = gnome.compile_resources(
+  'prefs-resources', 'prefs-resources.gresource.xml',
+  source_dir: ['.', meson.current_build_dir()],
+  c_name: 'prefs_js_resources',
+  dependencies: [config_js]
+)
--- a/js/misc/config.js.in
+++ b/js/misc/config.js.in
@@ -15,5 +15,6 @@ var LOCALEDIR = '@datadir@/locale';
 /* other standard directories */
 var LIBEXECDIR = '@libexecdir@';
 var PKGDATADIR = '@datadir@/@PACKAGE_NAME@';
+var VPNDIR = '@vpndir@';
 /* g-i package versions */
 var LIBMUTTER_API_VERSION = '@LIBMUTTER_API_VERSION@'
--- a/js/misc/extensionUtils.js
+++ b/js/misc/extensionUtils.js
@@ -1,7 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported ExtensionState, ExtensionType, getCurrentExtension,
-   getSettings, initTranslations, openPrefs, isOutOfDate,
-   installImporter, serializeExtension, deserializeExtension */
+   getSettings, initTranslations, isOutOfDate, installImporter,
+   serializeExtension, deserializeExtension */

 // Common utils for the extension system and the extension
 // preferences tool
@@ -153,27 +153,6 @@ function getSettings(schema) {
    return new Gio.Settings({ settings_schema: schemaObj });
 }

-/**
- * openPrefs:
- *
- * Open the preference dialog of the current extension
- */
-function openPrefs() {
-    const extension = getCurrentExtension();
-
-    if (!extension)
-        throw new Error('openPrefs() can only be called from extensions');
-
-    try {
-        const extensionManager = imports.ui.main.extensionManager;
-        extensionManager.openExtensionPrefs(extension.uuid, '', {});
-    } catch (e) {
-        if (e.name === 'ImportError')
-            throw new Error('openPrefs() cannot be called from preferences');
-        logError(e, 'Failed to open extension preferences');
-    }
-}
-
 /**
 * versionCheck:
 * @param {string[]} required - an array of versions we're compatible with
--- a/js/misc/fileUtils.js
+++ b/js/misc/fileUtils.js
@@ -76,15 +76,19 @@ function loadInterfaceXML(iface) {
        _ifaceResource._register();
    }

+    let xml = null;
    let uri = `resource:///org/gnome/shell/dbus-interfaces/${iface}.xml`;
    let f = Gio.File.new_for_uri(uri);

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

-    return null;
+    return xml;
 }
--- a/js/misc/ibusManager.js
+++ b/js/misc/ibusManager.js
@@ -1,7 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported getIBusManager */

-const { Gio, GLib, IBus, Meta } = imports.gi;
+const { Gio, GLib, IBus } = imports.gi;
 const Signals = imports.signals;

 const IBusCandidatePopup = imports.ui.ibusCandidatePopup;
@@ -55,18 +55,13 @@ var IBusManager = class {
        this._ibus.set_watch_ibus_signal(true);
        this._ibus.connect('global-engine-changed', this._engineChanged.bind(this));

-        this._spawn(Meta.is_wayland_compositor() ? [] : ['--xim']);
+        this._spawn();
    }

    _spawn(extraArgs = []) {
        try {
            let cmdLine = ['ibus-daemon', '--panel', 'disable', ...extraArgs];
-            let launcher = Gio.SubprocessLauncher.new(Gio.SubprocessFlags.NONE);
-            // Forward the right X11 Display for ibus-x11
-            let display = GLib.getenv('GNOME_SETUP_DISPLAY');
-            if (display)
-                launcher.setenv('DISPLAY', display, true);
-            launcher.spawnv(cmdLine);
+            Gio.Subprocess.new(cmdLine, Gio.SubprocessFlags.NONE);
        } catch (e) {
            log(`Failed to launch ibus-daemon: ${e.message}`);
        }
@@ -127,55 +122,56 @@ var IBusManager = class {
    }

    _initPanelService(ibus, result) {
+        let success = false;
        try {
-            this._ibus.request_name_async_finish(result);
+            success = !!this._ibus.request_name_async_finish(result);
        } catch (e) {
-            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED)) {
-                logError(e);
-                this._clear();
-            }
-            return;
-        }
-
-        this._panelService = new IBus.PanelService({
-            connection: this._ibus.get_connection(),
-            object_path: IBus.PATH_PANEL,
-        });
-        this._candidatePopup.setPanelService(this._panelService);
-        this._panelService.connect('update-property', this._updateProperty.bind(this));
-        this._panelService.connect('set-cursor-location', (ps, x, y, w, h) => {
-            let cursorLocation = { x, y, width: w, height: h };
-            this.emit('set-cursor-location', cursorLocation);
-        });
-        this._panelService.connect('focus-in', (panel, path) => {
-            if (!GLib.str_has_suffix(path, '/InputContext_1'))
-                this.emit('focus-in');
-        });
-        this._panelService.connect('focus-out', () => this.emit('focus-out'));
-
-        try {
-            // IBus versions older than 1.5.10 have a bug which
-            // causes spurious set-content-type emissions when
-            // switching input focus that temporarily lose purpose
-            // and hints defeating its intended semantics and
-            // confusing users. We thus don't use it in that case.
-            _checkIBusVersion(1, 5, 10);
-            this._panelService.connect('set-content-type', this._setContentType.bind(this));
-        } catch (e) {
-        }
-        // If an engine is already active we need to get its properties
-        this._ibus.get_global_engine_async(-1, this._cancellable, (_bus, res) => {
-            let engine;
-            try {
-                engine = this._ibus.get_global_engine_async_finish(res);
-                if (!engine)
-                    return;
-            } catch (e) {
+            if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
                return;
+            logError(e);
+        }
+
+        if (success) {
+            this._panelService = new IBus.PanelService({ connection: this._ibus.get_connection(),
+                                                         object_path: IBus.PATH_PANEL });
+            this._candidatePopup.setPanelService(this._panelService);
+            this._panelService.connect('update-property', this._updateProperty.bind(this));
+            this._panelService.connect('set-cursor-location', (ps, x, y, w, h) => {
+                let cursorLocation = { x, y, width: w, height: h };
+                this.emit('set-cursor-location', cursorLocation);
+            });
+            this._panelService.connect('focus-in', (panel, path) => {
+                if (!GLib.str_has_suffix(path, '/InputContext_1'))
+                    this.emit('focus-in');
+            });
+            this._panelService.connect('focus-out', () => this.emit('focus-out'));
+
+            try {
+                // IBus versions older than 1.5.10 have a bug which
+                // causes spurious set-content-type emissions when
+                // switching input focus that temporarily lose purpose
+                // and hints defeating its intended semantics and
+                // confusing users. We thus don't use it in that case.
+                _checkIBusVersion(1, 5, 10);
+                this._panelService.connect('set-content-type', this._setContentType.bind(this));
+            } catch (e) {
            }
-            this._engineChanged(this._ibus, engine.get_name());
-        });
-        this._updateReadiness();
+            // If an engine is already active we need to get its properties
+            this._ibus.get_global_engine_async(-1, this._cancellable, (_bus, res) => {
+                let engine;
+                try {
+                    engine = this._ibus.get_global_engine_async_finish(res);
+                    if (!engine)
+                        return;
+                } catch (e) {
+                    return;
+                }
+                this._engineChanged(this._ibus, engine.get_name());
+            });
+            this._updateReadiness();
+        } else {
+            this._clear();
+        }
    }

    _updateReadiness() {
--- a/js/misc/inputMethod.js
+++ b/js/misc/inputMethod.js
@@ -97,13 +97,8 @@ class InputMethod extends Clutter.InputMethod {
        this.commit(text.get_text());
    }

-    _onDeleteSurroundingText(_context, offset, nchars) {
-        try {
-            this.delete_surrounding(offset, nchars);
-        } catch (e) {
-            // We may get out of bounds for negative offset on older mutter
-            this.delete_surrounding(0, nchars + offset);
-        }
+    _onDeleteSurroundingText() {
+        this.delete_surrounding();
    }

    _onUpdatePreeditText(_context, text, pos, visible) {
--- a/js/misc/meson.build
+++ b/js/misc/meson.build
@@ -7,6 +7,7 @@ jsconf.set10('HAVE_BLUETOOTH', bt_dep.found())
 jsconf.set10('HAVE_NETWORKMANAGER', have_networkmanager)
 jsconf.set('datadir', datadir)
 jsconf.set('libexecdir', libexecdir)
+jsconf.set('vpndir', vpndir)

 config_js = configure_file(
  input: 'config.js.in',
--- a/js/misc/modemManager.js
+++ b/js/misc/modemManager.js
@@ -223,7 +223,7 @@ var BroadbandModem = GObject.registerClass({
 }, class BroadbandModem extends ModemBase {
    _init(path, capabilities) {
        super._init({ capabilities });
-        this._proxy = new BroadbandModemProxy(Gio.DBus.system, 'org.freedesktop.ModemManager1', path);
+        this._proxy = new BroadbandModemProxy(Gio.DBus.system, 'org.freedesktop.ModemManager', path);
        this._proxy_3gpp = new BroadbandModem3gppProxy(Gio.DBus.system, 'org.freedesktop.ModemManager1', path);
        this._proxy_cdma = new BroadbandModemCdmaProxy(Gio.DBus.system, 'org.freedesktop.ModemManager1', path);

@@ -249,7 +249,7 @@ var BroadbandModem = GObject.registerClass({
    }

    _reloadSignalQuality() {
-        let [quality, recent_] = this._proxy.SignalQuality;
+        let [quality, recent_] = this.SignalQuality;
        this._setSignalQuality(quality);
    }

--- a/js/misc/systemActions.js
+++ b/js/misc/systemActions.js
@@ -83,17 +83,13 @@ const SystemActions = GObject.registerClass({
        this._canHavePowerOff = true;
        this._canHaveSuspend = true;

-        function tokenizeKeywords(keywords) {
-            return keywords.split(';').map(keyword => GLib.str_tokenize_and_fold(keyword, null)).flat(2);
-        }
-
        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: tokenizeKeywords(_('power off;shutdown;reboot;restart;halt;stop')),
+            keywords: _('power off;shutdown;reboot;restart;halt;stop').split(/[; ]/),
            available: false,
        });
        this._actions.set(LOCK_SCREEN_ACTION_ID, {
@@ -101,15 +97,15 @@ const SystemActions = GObject.registerClass({
            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: tokenizeKeywords(_('lock screen')),
+            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: 'system-log-out-symbolic',
+            iconName: 'application-exit-symbolic',
            // Translators: A list of keywords that match the logout action, separated by semicolons
-            keywords: tokenizeKeywords(_('logout;log out;sign off')),
+            keywords: _("logout;log out;sign off").split(/[; ]/),
            available: false,
        });
        this._actions.set(SUSPEND_ACTION_ID, {
@@ -117,7 +113,7 @@ const SystemActions = GObject.registerClass({
            name: C_("search-result", "Suspend"),
            iconName: 'media-playback-pause-symbolic',
            // Translators: A list of keywords that match the suspend action, separated by semicolons
-            keywords: tokenizeKeywords(_('suspend;sleep')),
+            keywords: _("suspend;sleep").split(/[; ]/),
            available: false,
        });
        this._actions.set(SWITCH_USER_ACTION_ID, {
@@ -125,14 +121,14 @@ const SystemActions = GObject.registerClass({
            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: tokenizeKeywords(_('switch user')),
+            keywords: _("switch user").split(/[; ]/),
            available: false,
        });
        this._actions.set(LOCK_ORIENTATION_ACTION_ID, {
            name: '',
            iconName: '',
            // Translators: A list of keywords that match the lock orientation action, separated by semicolons
-            keywords: tokenizeKeywords(_('lock orientation;unlock orientation;screen;rotation')),
+            keywords: _("lock orientation;unlock orientation;screen;rotation").split(/[; ]/),
            available: false,
        });

@@ -281,7 +277,7 @@ const SystemActions = GObject.registerClass({

    getMatchingActions(terms) {
        // terms is a list of strings
-        terms = terms.map(term => GLib.str_tokenize_and_fold(term, null)[0]);
+        terms = terms.map(term => term.toLowerCase());

        let results = [];

--- a/js/misc/util.js
+++ b/js/misc/util.js
@@ -445,9 +445,6 @@ function ensureActorVisibleInScrollView(scrollView, actor) {
 }

 function wiggle(actor, params) {
-    if (!St.Settings.get().enable_animations)
-        return;
-
    params = Params.parse(params, {
        offset: WIGGLE_OFFSET,
        duration: WIGGLE_DURATION,
--- a/js/portal-resources.gresource.xml
+++ b/js/portal-resources.gresource.xml
@@ -5,5 +5,6 @@

    <file>misc/config.js</file>
    <file>misc/fileUtils.js</file>
+    <file>misc/params.js</file>
  </gresource>
 </gresources>
--- a/js/prefs-resources.gresource.xml
+++ b/js/prefs-resources.gresource.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/shell">
+    <file>extensionPrefs/main.js</file>
+
+    <file>misc/config.js</file>
+    <file>misc/extensionUtils.js</file>
+    <file>misc/fileUtils.js</file>
+    <file>misc/params.js</file>
+
+    <file alias="css/application.css">extensionPrefs/css/application.css</file>
+
+    <file alias="ui/extension-row.ui">extensionPrefs/ui/extension-row.ui</file>
+    <file alias="ui/extensions-window.ui">extensionPrefs/ui/extensions-window.ui</file>
+  </gresource>
+</gresources>
--- a/js/ui/altTab.js
+++ b/js/ui/altTab.js
@@ -280,10 +280,12 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
    }

    _onDestroy() {
+        super._onDestroy();
+
+        if (this._thumbnails)
+            this._destroyThumbnails();
        if (this._thumbnailTimeoutId != 0)
            GLib.source_remove(this._thumbnailTimeoutId);
-
-        super._onDestroy();
    }

    /**
@@ -363,7 +365,8 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
            },
        });
        this._thumbnails = null;
-        this._switcherList.removeAccessibleState(this._selectedIndex, Atk.StateType.EXPANDED);
+        if (this._switcherList._items[this._selectedIndex])
+            this._switcherList._items[this._selectedIndex].remove_accessible_state(Atk.StateType.EXPANDED);
    }

    _createThumbnails() {
@@ -392,7 +395,7 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
            },
        });

-        this._switcherList.addAccessibleState(this._selectedIndex, Atk.StateType.EXPANDED);
+        this._switcherList._items[this._selectedIndex].add_accessible_state(Atk.StateType.EXPANDED);
    }
 });

@@ -773,9 +776,7 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {

    // We override SwitcherList's _onItemEnter method to delay
    // activation when the thumbnail list is open
-    _onItemEnter(item) {
-        const index = this._items.indexOf(item);
-
+    _onItemEnter(index) {
        if (this._mouseTimeOutId != 0)
            GLib.source_remove(this._mouseTimeOutId);
        if (this._altTabPopup.thumbnailsVisible) {
@@ -853,9 +854,6 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
        if (index === -1)
            return;

-        this._arrows[index].destroy();
-        this._arrows.splice(index, 1);
-
        this.icons.splice(index, 1);
        this.removeItem(index);
    }
@@ -1063,25 +1061,25 @@ class WindowSwitcher extends SwitcherPopup.SwitcherList {
    vfunc_allocate(box, flags) {
        let themeNode = this.get_theme_node();
        let contentBox = themeNode.get_content_box(box);
-        const labelHeight = this._label.height;
-        const totalLabelHeight =
-            labelHeight + themeNode.get_padding(St.Side.BOTTOM);

-        box.y2 -= totalLabelHeight;
-        super.vfunc_allocate(box, flags);
+        let childBox = new Clutter.ActorBox();
+        childBox.x1 = contentBox.x1;
+        childBox.x2 = contentBox.x2;
+        childBox.y2 = contentBox.y2;
+        childBox.y1 = childBox.y2 - this._label.height;
+        this._label.allocate(childBox, flags);
+
+        let totalLabelHeight = this._label.height + themeNode.get_padding(St.Side.BOTTOM);
+        childBox.x1 = box.x1;
+        childBox.x2 = box.x2;
+        childBox.y1 = box.y1;
+        childBox.y2 = box.y2 - totalLabelHeight;
+        super.vfunc_allocate(childBox, flags);

        // Hooking up the parent vfunc will call this.set_allocation() with
        // the height without the label height, so call it again with the
        // correct size here.
-        box.y2 += totalLabelHeight;
        this.set_allocation(box, flags);
-
-        const childBox = new Clutter.ActorBox();
-        childBox.x1 = contentBox.x1;
-        childBox.x2 = contentBox.x2;
-        childBox.y2 = contentBox.y2;
-        childBox.y1 = childBox.y2 - labelHeight;
-        this._label.allocate(childBox, flags);
    }

    highlight(index, justOutline) {
--- a/js/ui/animation.js
+++ b/js/ui/animation.js
@@ -15,7 +15,8 @@ class Animation extends St.Bin {
        const themeContext = St.ThemeContext.get_for_stage(global.stage);

        super._init({
-            style: `width: ${width}px; height: ${height}px;`,
+            width: width * themeContext.scale_factor,
+            height: height * themeContext.scale_factor,
        });

        this.connect('destroy', this._onDestroy.bind(this));
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -36,7 +36,6 @@ var VIEWS_SWITCH_TIME = 400;
 var VIEWS_SWITCH_ANIMATION_DELAY = 100;

 var PAGE_SWITCH_TIME = 250;
-var SCROLL_TIMEOUT_TIME = 150;

 var APP_ICON_SCALE_IN_TIME = 500;
 var APP_ICON_SCALE_IN_DELAY = 700;
@@ -72,9 +71,15 @@ function _getFolderName(folder) {
    let name = folder.get_string('name');

    if (folder.get_boolean('translate')) {
-        let translated = Shell.util_get_translated_folder_name(name);
-        if (translated !== null)
-            return translated;
+        let keyfile = new GLib.KeyFile();
+        let path = 'desktop-directories/%s'.format(name);
+
+        try {
+            keyfile.load_from_data_dirs(path, GLib.KeyFileFlags.NONE);
+            name = keyfile.get_locale_string('Desktop Entry', 'Name', null);
+        } catch (e) {
+            return name;
+        }
    }

    return name;
@@ -115,10 +120,15 @@ function _findBestFolderName(apps) {
    }, commonCategories);

    for (let category of commonCategories) {
-        const directory = '%s.directory'.format(category);
-        const translated = Shell.util_get_translated_folder_name(directory);
-        if (translated !== null)
-            return translated;
+        let keyfile = new GLib.KeyFile();
+        let path = 'desktop-directories/%s.directory'.format(category);
+
+        try {
+            keyfile.load_from_data_dirs(path, GLib.KeyFileFlags.NONE);
+            return keyfile.get_locale_string('Desktop Entry', 'Name', null);
+        } catch (e) {
+            continue;
+        }
    }

    return null;
@@ -159,10 +169,6 @@ var BaseAppView = GObject.registerClass({

        this._items = new Map();
        this._orderedItems = [];
-
-        this._animateLaterId = 0;
-        this._viewLoadedHandlerId = 0;
-        this._viewIsReady = false;
    }

    _childFocused(_actor) {
@@ -198,7 +204,6 @@ var BaseAppView = GObject.registerClass({
            this._items.set(icon.id, icon);
        });

-        this._viewIsReady = true;
        this.emit('view-loaded');
    }

@@ -248,18 +253,6 @@ var BaseAppView = GObject.registerClass({
            Main.overview.dash.showAppsButton);
    }

-    _clearAnimateLater() {
-        if (this._animateLaterId) {
-            Meta.later_remove(this._animateLaterId);
-            this._animateLaterId = 0;
-        }
-        if (this._viewLoadedHandlerId) {
-            this.disconnect(this._viewLoadedHandlerId);
-            this._viewLoadedHandlerId = 0;
-        }
-        this._grid.opacity = 255;
-    }
-
    animate(animationDirection, onComplete) {
        if (onComplete) {
            let animationDoneId = this._grid.connect('animation-done', () => {
@@ -268,38 +261,16 @@ var BaseAppView = GObject.registerClass({
            });
        }

-        this._clearAnimateLater();
-
        if (animationDirection == IconGrid.AnimationDirection.IN) {
-            const doSpringAnimationLater = laterType => {
-                this._animateLaterId = Meta.later_add(laterType,
-                    () => {
-                        this._animateLaterId = 0;
-                        this._doSpringAnimation(animationDirection);
-                        return GLib.SOURCE_REMOVE;
-                    });
-            };
-
-            if (this._viewIsReady) {
-                this._grid.opacity = 0;
-                doSpringAnimationLater(Meta.LaterType.IDLE);
-            } else {
-                this._viewLoadedHandlerId = this.connect('view-loaded',
-                    () => {
-                        this._clearAnimateLater();
-                        doSpringAnimationLater(Meta.LaterType.BEFORE_REDRAW);
-                    });
-            }
+            let id = this._grid.connect('paint', () => {
+                this._grid.disconnect(id);
+                this._doSpringAnimation(animationDirection);
+            });
        } else {
            this._doSpringAnimation(animationDirection);
        }
    }

-    vfunc_unmap() {
-        this._clearAnimateLater();
-        super.vfunc_unmap();
-    }
-
    animateSwitch(animationDirection) {
        this.remove_all_transitions();
        this._grid.remove_all_transitions();
@@ -421,12 +392,10 @@ var AllView = GObject.registerClass({
        this._redisplayWorkId = Main.initializeDeferredWork(this, this._redisplay.bind(this));

        Shell.AppSystem.get_default().connect('installed-changed', () => {
-            this._viewIsReady = false;
            Main.queueDeferredWork(this._redisplayWorkId);
        });
        this._folderSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.app-folders' });
        this._folderSettings.connect('changed::folder-children', () => {
-            this._viewIsReady = false;
            Main.queueDeferredWork(this._redisplayWorkId);
        });

@@ -462,10 +431,6 @@ var AllView = GObject.registerClass({

    _redisplay() {
        super._redisplay();
-
-        this._folderIcons.forEach(icon => {
-            icon.view._redisplay();
-        });
        this._refilterApps();
    }

@@ -653,7 +618,7 @@ var AllView = GObject.registerClass({

        this._canScroll = false;
        this._scrollTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT,
-            SCROLL_TIMEOUT_TIME, () => {
+            PAGE_SWITCH_TIME, () => {
                this._canScroll = true;
                this._scrollTimeoutId = 0;
                return GLib.SOURCE_REMOVE;
@@ -734,6 +699,8 @@ var AllView = GObject.registerClass({

            // Toggle search entry
            Main.overview.searchEntry.reactive = !isOpen;
+            Main.overview.searchEntry.clutter_text.reactive = !isOpen;
+            Main.overview.searchEntry.clutter_text.editable = !isOpen;

            this._displayingPopup = isOpen;
        });
@@ -1292,8 +1259,8 @@ var AppSearchProvider = class AppSearchProvider {
        let results = [];
        groups.forEach(group => {
            group = group.filter(appID => {
-                const app = this._appSys.lookup_app(appID);
-                return app && app.app_info.should_show();
+                let app = Gio.DesktopAppInfo.new(appID);
+                return app && app.should_show();
            });
            results = results.concat(group.sort(
                (a, b) => usage.compare(a, b)
@@ -1336,16 +1303,12 @@ class FolderView extends BaseAppView {
        this._parentView = parentView;
        this._grid._delegate = this;

-        this._relayoutLaterId = 0;
-        this._oldWidth = null;
-        this._oldHeight = null;
-
        this._scrollView = new St.ScrollView({
            overlay_scrollbars: true,
            x_expand: true,
            y_expand: true,
        });
-        this._scrollView.set_policy(St.PolicyType.NEVER, St.PolicyType.EXTERNAL);
+        this._scrollView.set_policy(St.PolicyType.NEVER, St.PolicyType.AUTOMATIC);
        this.add_actor(this._scrollView);

        let scrollableContainer = new St.BoxLayout({
@@ -1361,8 +1324,7 @@ class FolderView extends BaseAppView {
        action.connect('pan', this._onPan.bind(this));
        this._scrollView.add_action(action);

-        this.connect('destroy', this._onDestroy.bind(this));
-
+        this._folder.connect('changed', this._redisplay.bind(this));
        this._redisplay();
    }

@@ -1384,12 +1346,12 @@ class FolderView extends BaseAppView {
        });
        layout.hookup_style(icon);
        let subSize = Math.floor(FOLDER_SUBICON_FRACTION * size);
+        let scale = St.ThemeContext.get_for_stage(global.stage).scale_factor;

        let numItems = this._orderedItems.length;
        let rtl = icon.get_text_direction() == Clutter.TextDirection.RTL;
        for (let i = 0; i < 4; i++) {
-            const style = 'width: %dpx; height: %dpx;'.format(subSize, subSize);
-            let bin = new St.Bin({ style });
+            let bin = new St.Bin({ width: subSize * scale, height: subSize * scale });
            if (i < numItems)
                bin.child = this._orderedItems[i].app.create_icon_texture(subSize);
            layout.attach(bin, rtl ? (i + 1) % 2 : i % 2, Math.floor(i / 2), 1, 1);
@@ -1405,18 +1367,6 @@ class FolderView extends BaseAppView {
        return false;
    }

-    _onDestroy() {
-        if (this._relayoutLaterId) {
-            Meta.later_remove(this._relayoutLaterId);
-            this._relayoutLaterId = 0;
-        }
-    }
-
-    _relayoutLater() {
-        this._relayoutLaterId = 0;
-        this._grid.queue_relayout();
-    }
-
    adaptToSize(width, height) {
        this._parentAvailableWidth = width;
        this._parentAvailableHeight = height;
@@ -1436,16 +1386,6 @@ class FolderView extends BaseAppView {
        this._grid.bottomPadding = Math.max(this._grid.bottomPadding, 0);
        this._grid.leftPadding = Math.max(this._grid.leftPadding, 0);
        this._grid.rightPadding = Math.max(this._grid.rightPadding, 0);
-
-        if (width !== this._oldWidth || height !== this._oldHeight) {
-            this._oldWidth = width;
-            this._oldHeight = height;
-
-            if (!this._relayoutLaterId) {
-                this._relayoutLaterId = Meta.later_add(Meta.LaterType.BEFORE_REDRAW,
-                                                       this._relayoutLater.bind(this));
-            }
-        }
    }

    _loadApps() {
@@ -1489,22 +1429,6 @@ class FolderView extends BaseAppView {
        return apps;
    }

-    addApp(app) {
-        let folderApps = this._folder.get_strv('apps');
-        folderApps.push(app.id);
-
-        this._folder.set_strv('apps', folderApps);
-
-        // Also remove from 'excluded-apps' if the app id is listed
-        // there. This is only possible on categories-based folders.
-        let excludedApps = this._folder.get_strv('excluded-apps');
-        let index = excludedApps.indexOf(app.id);
-        if (index >= 0) {
-            excludedApps.splice(index, 1);
-            this._folder.set_strv('excluded-apps', excludedApps);
-        }
-    }
-
    removeApp(app) {
        let folderApps = this._folder.get_strv('apps');
        let index = folderApps.indexOf(app.id);
@@ -1535,6 +1459,8 @@ class FolderView extends BaseAppView {
        } else {
            this._folder.set_strv('apps', folderApps);
        }
+
+        return true;
    }
 });

@@ -1568,26 +1494,26 @@ var FolderIcon = GObject.registerClass({

        this.view = new FolderView(this._folder, id, parentView);

-        this._iconIsHovering = false;
+        this._itemDragBeginId = Main.overview.connect(
+            'item-drag-begin', this._onDragBegin.bind(this));
+        this._itemDragEndId = Main.overview.connect(
+            'item-drag-end', this._onDragEnd.bind(this));

        this.connect('destroy', this._onDestroy.bind(this));

-        this._folderChangedId = this._folder.connect(
-            'changed', this._sync.bind(this));
-        this._sync();
+        this._folder.connect('changed', this._redisplay.bind(this));
+        this._redisplay();
    }

    _onDestroy() {
-        if (this._dragMonitor) {
-            DND.removeDragMonitor(this._dragMonitor);
-            this._dragMonitor = null;
-        }
+        Main.overview.disconnect(this._itemDragBeginId);
+        Main.overview.disconnect(this._itemDragEndId);

        this.view.destroy();

-        if (this._folderChangedId) {
-            this._folder.disconnect(this._folderChangedId);
-            delete this._folderChangedId;
+        if (this._spaceReadySignalId) {
+            this._parentView.disconnect(this._spaceReadySignalId);
+            this._spaceReadySignalId = 0;
        }

        if (this._dialog)
@@ -1615,32 +1541,29 @@ var FolderIcon = GObject.registerClass({
        return this.view.getAllItems().map(item => item.id);
    }

-    _setHoveringByDnd(hovering) {
-        if (this._iconIsHovering == hovering)
-            return;
-
-        this._iconIsHovering = hovering;
-
-        if (hovering) {
-            this._dragMonitor = {
-                dragMotion: this._onDragMotion.bind(this),
-            };
-            DND.addDragMonitor(this._dragMonitor);
-            this.add_style_pseudo_class('drop');
-        } else {
-            DND.removeDragMonitor(this._dragMonitor);
-            this.remove_style_pseudo_class('drop');
-        }
+    _onDragBegin() {
+        this._dragMonitor = {
+            dragMotion: this._onDragMotion.bind(this),
+        };
+        DND.addDragMonitor(this._dragMonitor);
    }

    _onDragMotion(dragEvent) {
-        if (!this.contains(dragEvent.targetActor) ||
-            !this._canAccept(dragEvent.source))
-            this._setHoveringByDnd(false);
+        let target = dragEvent.targetActor;
+
+        if (!this.contains(target) || !this._canAccept(dragEvent.source))
+            this.remove_style_pseudo_class('drop');
+        else
+            this.add_style_pseudo_class('drop');

        return DND.DragMotionResult.CONTINUE;
    }

+    _onDragEnd() {
+        this.remove_style_pseudo_class('drop');
+        DND.removeDragMonitor(this._dragMonitor);
+    }
+
    _canAccept(source) {
        if (!(source instanceof AppIcon))
            return false;
@@ -1659,18 +1582,27 @@ var FolderIcon = GObject.registerClass({
        if (!this._canAccept(source))
            return DND.DragMotionResult.NO_DROP;

-        this._setHoveringByDnd(true);
-
        return DND.DragMotionResult.MOVE_DROP;
    }

    acceptDrop(source) {
-        this._setHoveringByDnd(false);
-
        if (!this._canAccept(source))
            return false;

-        this.view.addApp(source.app);
+        let app = source.app;
+        let folderApps = this._folder.get_strv('apps');
+        folderApps.push(app.id);
+
+        this._folder.set_strv('apps', folderApps);
+
+        // Also remove from 'excluded-apps' if the app id is listed
+        // there. This is only possible on categories-based folders.
+        let excludedApps = this._folder.get_strv('excluded-apps');
+        let index = excludedApps.indexOf(app.id);
+        if (index >= 0) {
+            excludedApps.splice(index, 1);
+            this._folder.set_strv('excluded-apps', excludedApps);
+        }

        return true;
    }
@@ -1685,11 +1617,11 @@ var FolderIcon = GObject.registerClass({
        this.emit('name-changed');
    }

-    _sync() {
-        this.emit('apps-changed');
+    _redisplay() {
        this._updateName();
        this.visible = this.view.getAllItems().length > 0;
        this.icon.update();
+        this.emit('apps-changed');
    }

    _createIcon(iconSize) {
@@ -1970,7 +1902,6 @@ var AppFolderDialog = GObject.registerClass({

    vfunc_allocate(box, flags) {
        let contentBox = this.get_theme_node().get_content_box(box);
-        contentBox = this._viewBox.get_theme_node().get_content_box(contentBox);

        let [, entryBoxHeight] = this._entryBox.get_size();
        let spacing = this._viewBox.layout_manager.spacing;
@@ -1979,8 +1910,6 @@ var AppFolderDialog = GObject.registerClass({
            contentBox.get_width(),
            contentBox.get_height() - entryBoxHeight - spacing);

-        this._view._grid.topPadding = 0;
-
        super.vfunc_allocate(box, flags);

        // We can only start zooming after receiving an allocation
@@ -2096,6 +2025,7 @@ var AppIcon = GObject.registerClass({

        this._delegate = this;

+        this._hasDndHover = false;
        this._folderPreviewId = 0;

        // Get the isDraggable property without passing it on to the BaseIcon:
@@ -2144,7 +2074,11 @@ var AppIcon = GObject.registerClass({
            });
        }

-        this._otherIconIsHovering = false;
+        this._dragMonitor = null;
+        this._itemDragBeginId = Main.overview.connect(
+            'item-drag-begin', this._onDragBegin.bind(this));
+        this._itemDragEndId = Main.overview.connect(
+            'item-drag-end', this._onDragEnd.bind(this));

        this._menuTimeoutId = 0;
        this._stateChangedId = this.app.connect('notify::state', () => {
@@ -2156,6 +2090,9 @@ var AppIcon = GObject.registerClass({
    }

    _onDestroy() {
+        Main.overview.disconnect(this._itemDragBeginId);
+        Main.overview.disconnect(this._itemDragEndId);
+
        if (this._folderPreviewId > 0) {
            GLib.source_remove(this._folderPreviewId);
            this._folderPreviewId = 0;
@@ -2402,17 +2339,7 @@ var AppIcon = GObject.registerClass({
    }

    _setHoveringByDnd(hovering) {
-        if (this._otherIconIsHovering == hovering)
-            return;
-
-        this._otherIconIsHovering = hovering;
-
        if (hovering) {
-            this._dragMonitor = {
-                dragMotion: this._onDragMotion.bind(this),
-            };
-            DND.addDragMonitor(this._dragMonitor);
-
            if (this._folderPreviewId > 0)
                return;

@@ -2424,8 +2351,6 @@ var AppIcon = GObject.registerClass({
                    return GLib.SOURCE_REMOVE;
                });
        } else {
-            DND.removeDragMonitor(this._dragMonitor);
-
            if (this._folderPreviewId > 0) {
                GLib.source_remove(this._folderPreviewId);
                this._folderPreviewId = 0;
@@ -2435,13 +2360,32 @@ var AppIcon = GObject.registerClass({
        }
    }

+    _onDragBegin() {
+        this._dragMonitor = {
+            dragMotion: this._onDragMotion.bind(this),
+        };
+        DND.addDragMonitor(this._dragMonitor);
+    }
+
    _onDragMotion(dragEvent) {
-        if (!this.contains(dragEvent.targetActor))
-            this._setHoveringByDnd(false);
+        let target = dragEvent.targetActor;
+        let isHovering = target == this || this.contains(target);
+        let canDrop = this._canAccept(dragEvent.source);
+        let hasDndHover = isHovering && canDrop;
+
+        if (this._hasDndHover != hasDndHover) {
+            this._setHoveringByDnd(hasDndHover);
+            this._hasDndHover = hasDndHover;
+        }

        return DND.DragMotionResult.CONTINUE;
    }

+    _onDragEnd() {
+        this.remove_style_pseudo_class('drop');
+        DND.removeDragMonitor(this._dragMonitor);
+    }
+
    handleDragOver(source) {
        if (source == this)
            return DND.DragMotionResult.NO_DROP;
@@ -2449,8 +2393,6 @@ var AppIcon = GObject.registerClass({
        if (!this._canAccept(source))
            return DND.DragMotionResult.CONTINUE;

-        this._setHoveringByDnd(true);
-
        return DND.DragMotionResult.MOVE_DROP;
    }

@@ -2495,7 +2437,7 @@ var AppIconMenu = class AppIconMenu extends PopupMenu.PopupMenu {
        Main.uiGroup.add_actor(this.actor);
    }

-    _rebuildMenu() {
+    _redisplay() {
        this.removeAll();

        let windows = this._source.app.get_windows().filter(
@@ -2591,7 +2533,7 @@ var AppIconMenu = class AppIconMenu extends PopupMenu.PopupMenu {
                                 'org.gtk.Actions', 'Activate',
                                 GLib.Variant.new('(sava{sv})',
                                                  ['details', [args], null]),
-                                 null, 0, -1, null);
+                                 null, 0, -1, null, null);
                        Main.overview.hide();
                    });
                });
@@ -2612,7 +2554,7 @@ var AppIconMenu = class AppIconMenu extends PopupMenu.PopupMenu {
    }

    popup(_activatingButton) {
-        this._rebuildMenu();
+        this._redisplay();
        this.open();
    }
 };
--- a/js/ui/appFavorites.js
+++ b/js/ui/appFavorites.js
@@ -12,7 +12,6 @@ const RENAMED_DESKTOP_IDS = {
    'cheese.desktop': 'org.gnome.Cheese.desktop',
    'dconf-editor.desktop': 'ca.desrt.dconf-editor.desktop',
    'empathy.desktop': 'org.gnome.Empathy.desktop',
-    'eog.desktop': 'org.gnome.eog.desktop',
    'epiphany.desktop': 'org.gnome.Epiphany.desktop',
    'evolution.desktop': 'org.gnome.Evolution.desktop',
    'file-roller.desktop': 'org.gnome.FileRoller.desktop',
--- a/js/ui/background.js
+++ b/js/ui/background.js
@@ -347,8 +347,6 @@ var Background = GObject.registerClass({
            this.set_color(color);
        else
            this.set_gradient(shadingType, color, secondColor);
-
-        this._setLoaded();
    }

    _watchFile(file) {
@@ -760,27 +758,10 @@ var BackgroundManager = class BackgroundManager {
            this._updateBackgroundActor();
        });

-        let loadedSignalId;
-        if (background.isLoaded) {
-            GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
-                this.emit('loaded');
-                return GLib.SOURCE_REMOVE;
-            });
-        } else {
-            loadedSignalId = background.connect('loaded', () => {
-                background.disconnect(loadedSignalId);
-                loadedSignalId = null;
-                this.emit('loaded');
-            });
-        }
-
        backgroundActor.connect('destroy', () => {
            if (changeSignalId)
                background.disconnect(changeSignalId);

-            if (loadedSignalId)
-                background.disconnect(loadedSignalId);
-
            if (backgroundActor.loadedSignalId)
                background.disconnect(backgroundActor.loadedSignalId);
        });
--- a/js/ui/boxpointer.js
+++ b/js/ui/boxpointer.js
@@ -197,11 +197,6 @@ var BoxPointer = GObject.registerClass({
    }

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

        let themeNode = this.get_theme_node();
@@ -235,6 +230,12 @@ var BoxPointer = GObject.registerClass({
            break;
        }
        this.bin.allocate(childBox, flags);
+
+        if (this._sourceActor && this._sourceActor.mapped) {
+            this._reposition(box);
+            this._updateFlip(box);
+            this.set_allocation(box, flags);
+        }
    }

    _drawBorder(area) {
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@@ -220,12 +220,7 @@ class DBusEventSource extends EventSourceBase {
                }
            }

-            this._dbusProxy.connectSignal('EventsAddedOrUpdated',
-                this._onEventsAddedOrUpdated.bind(this));
-            this._dbusProxy.connectSignal('EventsRemoved',
-                this._onEventsRemoved.bind(this));
-            this._dbusProxy.connectSignal('ClientDisappeared',
-                this._onClientDisappeared.bind(this));
+            this._dbusProxy.connectSignal('Changed', this._onChanged.bind(this));

            this._dbusProxy.connect('notify::g-name-owner', () => {
                if (this._dbusProxy.g_name_owner)
@@ -262,7 +257,7 @@ class DBusEventSource extends EventSourceBase {
    }

    _resetCache() {
-        this._events = new Map();
+        this._events = [];
        this._lastRequestBegin = null;
        this._lastRequestEnd = null;
    }
@@ -278,47 +273,28 @@ class DBusEventSource extends EventSourceBase {
        this.emit('changed');
    }

-    _onEventsAddedOrUpdated(dbusProxy, nameOwner, argArray) {
-        const [appointments = []] = argArray;
-        let changed = false;
+    _onChanged() {
+        this._loadEvents(false);
+    }

+    _onEventsReceived(results, _error) {
+        let newEvents = [];
+        let appointments = results[0] || [];
        for (let n = 0; n < appointments.length; n++) {
-            const [id, summary, allDay, startTime, endTime] = appointments[n];
-            const date = new Date(startTime * 1000);
-            const end = new Date(endTime * 1000);
+            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);
-            this._events.set(event.id, event);
-
-            changed = true;
+            newEvents.push(event);
        }
+        newEvents.sort((ev1, ev2) => ev1.date.getTime() - ev2.date.getTime());

-        if (changed)
-            this.emit('changed');
-    }
-
-    _onEventsRemoved(dbusProxy, nameOwner, argArray) {
-        const [ids = []] = argArray;
-
-        let changed = false;
-        for (const id of ids)
-            changed |= this._events.delete(id);
-
-        if (changed)
-            this.emit('changed');
-    }
-
-    _onClientDisappeared(dbusProxy, nameOwner, argArray) {
-        let [sourceUid = ''] = argArray;
-        sourceUid += '\n';
-
-        let changed = false;
-        for (const id of this._events.keys()) {
-            if (id.startsWith(sourceUid))
-                changed |= this._events.delete(id);
-        }
-
-        if (changed)
-            this.emit('changed');
+        this._events = newEvents;
+        this._isLoading = false;
+        this.emit('changed');
    }

    _loadEvents(forceReload) {
@@ -327,38 +303,33 @@ class DBusEventSource extends EventSourceBase {
            return;

        if (this._curRequestBegin && this._curRequestEnd) {
-            if (forceReload) {
-                this._events.clear();
-                this.emit('changed');
-            }
-            this._dbusProxy.SetTimeRangeRemote(
-                this._curRequestBegin.getTime() / 1000,
-                this._curRequestEnd.getTime() / 1000,
-                forceReload,
-                Gio.DBusCallFlags.NONE);
+            this._dbusProxy.GetEventsRemote(this._curRequestBegin.getTime() / 1000,
+                                            this._curRequestEnd.getTime() / 1000,
+                                            forceReload,
+                                            this._onEventsReceived.bind(this),
+                                            Gio.DBusCallFlags.NONE);
        }
    }

    requestRange(begin, end) {
        if (!(_datesEqual(begin, this._lastRequestBegin) && _datesEqual(end, this._lastRequestEnd))) {
+            this._isLoading = true;
            this._lastRequestBegin = begin;
            this._lastRequestEnd = end;
            this._curRequestBegin = begin;
            this._curRequestEnd = end;
-            this._loadEvents(true);
-        }
-    }
-
-    *_getFilteredEvents(begin, end) {
-        for (const event of this._events.values()) {
-            if (_dateIntervalsOverlap(event.date, event.end, begin, end))
-                yield event;
+            this._loadEvents(false);
        }
    }

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

+            if (_dateIntervalsOverlap(event.date, event.end, begin, end))
+                result.push(event);
+        }
        result.sort((event1, event2) => {
            // sort events by end time on ending day
            let d1 = event1.date < begin && event1.end <= end ? event1.end : event1.date;
@@ -372,8 +343,12 @@ class DBusEventSource extends EventSourceBase {
        let dayBegin = _getBeginningOfDay(day);
        let dayEnd = _getEndOfDay(day);

-        const { done } = this._getFilteredEvents(dayBegin, dayEnd).next();
-        return !done;
+        let events = this.getEvents(dayBegin, dayEnd);
+
+        if (events.length == 0)
+            return false;
+
+        return true;
    }
 });

@@ -725,11 +700,12 @@ var Calendar = GObject.registerClass({
 var EventMessage = GObject.registerClass(
 class EventMessage extends MessageList.Message {
    _init(event, date) {
-        super._init('', '');
+        super._init('', event.summary);

+        this._event = event;
        this._date = date;

-        this.update(event);
+        this.setTitle(this._formatEventTime());

        this._icon = new St.Icon({ icon_name: 'x-office-calendar-symbolic' });
        this.setIcon(this._icon);
@@ -741,13 +717,6 @@ class EventMessage extends MessageList.Message {
        super.vfunc_style_changed();
    }

-    update(event) {
-        this._event = event;
-
-        this.setTitle(this._formatEventTime());
-        this.setBody(event.summary);
-    }
-
    _formatEventTime() {
        let periodBegin = _getBeginningOfDay(this._date);
        let periodEnd = _getEndOfDay(this._date);
@@ -868,9 +837,8 @@ class EventsSection extends MessageList.MessageListSection {
        this._title.connect('clicked', this._onTitleClicked.bind(this));
        this._title.connect('key-focus-in', this._onKeyFocusIn.bind(this));

-        this._appSys = Shell.AppSystem.get_default();
-        this._appSys.connect('installed-changed',
-            this._appInstalledChanged.bind(this));
+        Shell.AppSystem.get_default().connect('installed-changed',
+                                              this._appInstalledChanged.bind(this));
        this._appInstalledChanged();
    }

@@ -905,7 +873,7 @@ class EventsSection extends MessageList.MessageListSection {
    }

    _reloadEvents() {
-        if (this._eventSource.isLoading || this._reloading)
+        if (this._eventSource.isLoading)
            return;

        this._reloading = true;
@@ -931,7 +899,6 @@ class EventsSection extends MessageList.MessageListSection {
                this._messageById.set(event.id, message);
                this.addMessage(message, false);
            } else {
-                message.update(event);
                this.moveMessage(message, i, false);
            }
        }
@@ -964,13 +931,10 @@ class EventsSection extends MessageList.MessageListSection {
        Main.overview.hide();
        Main.panel.closeCalendar();

-        let appInfo = this._getCalendarApp();
-        if (appInfo.get_id() === 'org.gnome.Evolution.desktop') {
-            let app = this._appSys.lookup_app('evolution-calendar.desktop');
-            if (app)
-                appInfo = app.app_info;
-        }
-        appInfo.launch([], global.create_app_launch_context(0, -1));
+        let app = this._getCalendarApp();
+        if (app.get_id() == 'evolution.desktop')
+            app = Gio.DesktopAppInfo.new('evolution-calendar.desktop');
+        app.launch([], global.create_app_launch_context(0, -1));
    }

    setDate(date) {
@@ -1185,22 +1149,17 @@ class CalendarMessageList extends St.Widget {
        let hbox = new St.BoxLayout({ style_class: 'message-list-controls' });
        box.add_child(hbox);

-        const dndLabel = new St.Label({
+        hbox.add_child(new St.Label({
            text: _('Do Not Disturb'),
            y_align: Clutter.ActorAlign.CENTER,
-        });
-        hbox.add_child(dndLabel);
+        }));

        this._dndSwitch = new DoNotDisturbSwitch();
        this._dndButton = new St.Button({
            can_focus: true,
-            toggle_mode: true,
            child: this._dndSwitch,
-            label_actor: dndLabel,
        });
-        this._dndSwitch.bind_property('state',
-            this._dndButton, 'checked',
-            GObject.BindingFlags.BIDIRECTIONAL | GObject.BindingFlags.SYNC_CREATE);
+        this._dndButton.connect('clicked', () => this._dndSwitch.toggle());
        hbox.add_child(this._dndButton);

        this._clearButton = new St.Button({
--- a/js/ui/checkBox.js
+++ b/js/ui/checkBox.js
@@ -1,5 +1,5 @@
 /* exported CheckBox */
-const { Atk, Clutter, GObject, Pango, St } = imports.gi;
+const { Clutter, GObject, Pango, St } = imports.gi;

 var CheckBox = GObject.registerClass(
 class CheckBox extends St.Button {
@@ -15,7 +15,6 @@ class CheckBox extends St.Button {
            toggle_mode: true,
            can_focus: true,
        });
-        this.set_accessible_role(Atk.Role.CHECK_BOX);

        this._box = new St.Bin({ y_align: Clutter.ActorAlign.START });
        container.add_actor(this._box);
@@ -23,7 +22,6 @@ class CheckBox extends St.Button {
        this._label = new St.Label({ y_align: Clutter.ActorAlign.CENTER });
        this._label.clutter_text.set_line_wrap(true);
        this._label.clutter_text.set_ellipsize(Pango.EllipsizeMode.NONE);
-        this.set_label_actor(this._label);
        container.add_actor(this._label);

        if (label)
--- a/js/ui/closeDialog.js
+++ b/js/ui/closeDialog.js
@@ -188,13 +188,10 @@ var CloseDialog = GObject.registerClass({
        global.stage.disconnect(this._keyFocusChangedId);
        this._keyFocusChangedId = 0;

-        this._dialog._dialog.remove_all_transitions();
-
        let dialog = this._dialog;
        this._dialog = null;
        this._removeWindowEffect();

-        dialog.makeInactive();
        dialog._dialog.ease({
            scale_y: 0,
            mode: Clutter.AnimationMode.LINEAR,
--- a/js/ui/components/keyring.js
+++ b/js/ui/components/keyring.js
@@ -111,11 +111,15 @@ class KeyringDialog extends ModalDialog.ModalDialog {
    }

    _updateSensitivity(sensitive) {
-        if (this._passwordEntry)
+        if (this._passwordEntry) {
            this._passwordEntry.reactive = sensitive;
+            this._passwordEntry.clutter_text.editable = sensitive;
+        }

-        if (this._confirmEntry)
+        if (this._confirmEntry) {
            this._confirmEntry.reactive = sensitive;
+            this._confirmEntry.clutter_text.editable = sensitive;
+        }

        this._continueButton.can_focus = sensitive;
        this._continueButton.reactive = sensitive;
--- a/js/ui/components/networkAgent.js
+++ b/js/ui/components/networkAgent.js
@@ -4,15 +4,13 @@
 const { Clutter, Gio, GLib, GObject, NM, Pango, Shell, St } = imports.gi;
 const Signals = imports.signals;

+const Config = imports.misc.config;
 const Dialog = imports.ui.dialog;
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
 const ModalDialog = imports.ui.modalDialog;
 const ShellEntry = imports.ui.shellEntry;

-Gio._promisify(Shell.NetworkAgent.prototype,
-    'search_vpn_plugin', 'search_vpn_plugin_finish');
-
 const VPN_UI_GROUP = 'VPN Plugin UI';

 var NetworkSecretDialog = GObject.registerClass(
@@ -617,6 +615,14 @@ var NetworkAgent = class {
        this._vpnRequests = { };
        this._notifications = { };

+        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: %s'.format(e.message));
+        }
+
        this._native.connect('new-request', this._newRequest.bind(this));
        this._native.connect('cancel-request', this._cancelRequest.bind(this));

@@ -760,11 +766,13 @@ var NetworkAgent = class {
        }
    }

-    async _vpnRequest(requestId, connection, hints, flags) {
+    _vpnRequest(requestId, connection, hints, flags) {
        let vpnSetting = connection.get_setting_vpn();
        let serviceType = vpnSetting.service_type;

-        let binary = await this._findAuthBinary(serviceType);
+        this._buildVPNServiceCache();
+
+        let binary = this._vpnBinaries[serviceType];
        if (!binary) {
            log('Invalid VPN service type (cannot find authentication binary)');

@@ -780,30 +788,36 @@ var NetworkAgent = class {
        this._vpnRequests[requestId] = vpnRequest;
    }

-    async _findAuthBinary(serviceType) {
-        let plugin;
+    _buildVPNServiceCache() {
+        if (this._vpnCacheBuilt)
+            return;

-        try {
-            plugin = await this._native.search_vpn_plugin(serviceType);
-        } catch (e) {
-            logError(e);
-            return null;
-        }
+        this._vpnCacheBuilt = true;
+        this._vpnBinaries = { };

-        const fileName = plugin.get_auth_dialog();
-        if (!GLib.file_test(fileName, GLib.FileTest.IS_EXECUTABLE)) {
-            log('VPN plugin at %s is not executable'.format(fileName));
-            return null;
-        }
+        NM.VpnPluginInfo.list_load().forEach(plugin => {
+            let service = plugin.get_service();
+            let fileName = plugin.get_auth_dialog();
+            let supportsHints = plugin.supports_hints();
+            let externalUIMode = false;

-        const prop = plugin.lookup_property('GNOME', 'supports-external-ui-mode');
-        const trimmedProp = prop ? prop.trim().toLowerCase() : '';
+            let prop = plugin.lookup_property('GNOME', 'supports-external-ui-mode');
+            if (prop) {
+                prop = prop.trim().toLowerCase();
+                externalUIMode = ['true', 'yes', 'on', '1'].includes(prop);
+            }

-        return {
-            fileName,
-            supportsHints: plugin.supports_hints(),
-            externalUIMode: ['true', 'yes', 'on', '1'].includes(trimmedProp),
-        };
+            if (GLib.file_test(fileName, GLib.FileTest.IS_EXECUTABLE)) {
+                let binary = { fileName, externalUIMode, supportsHints };
+                this._vpnBinaries[service] = binary;
+
+                plugin.get_aliases().forEach(alias => {
+                    this._vpnBinaries[alias] = binary;
+                });
+            } else {
+                log('VPN plugin at %s is not executable'.format(fileName));
+            }
+        });
    }
 };
 var Component = NetworkAgent;
--- a/js/ui/components/polkitAgent.js
+++ b/js/ui/components/polkitAgent.js
@@ -327,8 +327,6 @@ var AuthenticationDialog = GObject.registerClass({
        }

        let resetDialog = () => {
-            this._sessionRequestTimeoutId = 0;
-
            if (this.state != ModalDialog.State.OPENED)
                return;

--- a/js/ui/components/telepathyClient.js
+++ b/js/ui/components/telepathyClient.js
@@ -2,6 +2,7 @@
 /* exported Component */

 const { Clutter, Gio, GLib, GObject, St } = imports.gi;
+const Lang = imports.lang;

 var Tpl = null;
 var Tp = null;
@@ -39,59 +40,36 @@ var NotificationDirection = {
    RECEIVED: 'chat-received',
 };

-const ChatMessage = HAVE_TP ? GObject.registerClass({
-    Properties: {
-        'message-type': GObject.ParamSpec.int(
-            'message-type', 'message-type', 'message-type',
-            GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
-            Math.min(...Object.values(Tp.ChannelTextMessageType)),
-            Math.max(...Object.values(Tp.ChannelTextMessageType)),
-            Tp.ChannelTextMessageType.NORMAL),
-        'text': GObject.ParamSpec.string(
-            'text', 'text', 'text',
-            GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
-            null),
-        'sender': GObject.ParamSpec.string(
-            'sender', 'sender', 'sender',
-            GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
-            null),
-        'timestamp': GObject.ParamSpec.int64(
-            'timestamp', 'timestamp', 'timestamp',
-            GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
-            0, Number.MAX_SAFE_INTEGER, 0),
-        'direction': GObject.ParamSpec.string(
-            'direction', 'direction', 'direction',
-            GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
-            null),
-    },
-}, class ChatMessageClass extends GObject.Object {
-    static newFromTpMessage(tpMessage, direction) {
-        return new ChatMessage({
-            'message-type': tpMessage.get_message_type(),
-            'text': tpMessage.to_text()[0],
-            'sender': tpMessage.sender.alias,
-            'timestamp': direction === NotificationDirection.RECEIVED
-                ? tpMessage.get_received_timestamp() : tpMessage.get_sent_timestamp(),
-            direction,
-        });
-    }
+function makeMessageFromTpMessage(tpMessage, direction) {
+    let [text, flags_] = tpMessage.to_text();

-    static newFromTplTextEvent(tplTextEvent) {
-        let direction =
-            tplTextEvent.get_sender().get_entity_type() === Tpl.EntityType.SELF
-                ? NotificationDirection.SENT : NotificationDirection.RECEIVED;
+    let timestamp = tpMessage.get_sent_timestamp();
+    if (timestamp == 0)
+        timestamp = tpMessage.get_received_timestamp();

-        return new ChatMessage({
-            'message-type': tplTextEvent.get_message_type(),
-            'text': tplTextEvent.get_message(),
-            'sender': tplTextEvent.get_sender().get_alias(),
-            'timestamp': tplTextEvent.get_timestamp(),
-            direction,
-        });
-    }
-}) : null;
+    return {
+        messageType: tpMessage.get_message_type(),
+        text,
+        sender: tpMessage.sender.alias,
+        timestamp,
+        direction,
+    };
+}


+function makeMessageFromTplEvent(event) {
+    let sent = event.get_sender().get_entity_type() == Tpl.EntityType.SELF;
+    let direction = sent ? NotificationDirection.SENT : NotificationDirection.RECEIVED;
+
+    return {
+        messageType: event.get_message_type(),
+        text: event.get_message(),
+        sender: event.get_sender().get_alias(),
+        timestamp: event.get_timestamp(),
+        direction,
+    };
+}
+
 var TelepathyComponent = class {
    constructor() {
        this._client = null;
@@ -292,12 +270,12 @@ class TelepathyClient extends Tp.BaseClient {
 var ChatSource = HAVE_TP ? GObject.registerClass(
 class ChatSource extends MessageTray.Source {
    _init(account, conn, channel, contact, client) {
+        super._init(contact.get_alias());
+
        this._account = account;
        this._contact = contact;
        this._client = client;

-        super._init(contact.get_alias());
-
        this.isChat = true;
        this._pendingMessages = [];

@@ -453,7 +431,7 @@ class ChatSource extends MessageTray.Source {
    _displayPendingMessages(logManager, result) {
        let [success_, events] = logManager.get_filtered_events_finish(result);

-        let logMessages = events.map(e => ChatMessage.newFromTplTextEvent(e));
+        let logMessages = events.map(makeMessageFromTplEvent);
        this._ensureNotification();

        let pendingTpMessages = this._channel.get_pending_messages();
@@ -465,8 +443,7 @@ class ChatSource extends MessageTray.Source {
            if (message.get_message_type() == Tp.ChannelTextMessageType.DELIVERY_REPORT)
                continue;

-            pendingMessages.push(ChatMessage.newFromTpMessage(message,
-                NotificationDirection.RECEIVED));
+            pendingMessages.push(makeMessageFromTpMessage(message, NotificationDirection.RECEIVED));

            this._pendingMessages.push(message);
        }
@@ -564,8 +541,7 @@ class ChatSource extends MessageTray.Source {
        this._pendingMessages.push(message);
        this.countUpdated();

-        message = ChatMessage.newFromTpMessage(message,
-            NotificationDirection.RECEIVED);
+        message = makeMessageFromTpMessage(message, NotificationDirection.RECEIVED);
        this._notification.appendMessage(message);

        // Wait a bit before notifying for the received message, a handler
@@ -590,8 +566,7 @@ class ChatSource extends MessageTray.Source {
    // our client and other clients as well.
    _messageSent(channel, message, _flags, _token) {
        this._ensureNotification();
-        message = ChatMessage.newFromTpMessage(message,
-            NotificationDirection.SENT);
+        message = makeMessageFromTpMessage(message, NotificationDirection.SENT);
        this._notification.appendMessage(message);
    }

@@ -655,19 +630,11 @@ class ChatSource extends MessageTray.Source {
    }
 }) : null;

-const ChatNotificationMessage = HAVE_TP ? GObject.registerClass(
-class ChatNotificationMessage extends GObject.Object {
-    _init(props = {}) {
-        super._init();
-        this.set(props);
-    }
-}) : null;
-
 var ChatNotification = HAVE_TP ? GObject.registerClass({
    Signals: {
-        'message-removed': { param_types: [ChatNotificationMessage.$gtype] },
-        'message-added': { param_types: [ChatNotificationMessage.$gtype] },
-        'timestamp-changed': { param_types: [ChatNotificationMessage.$gtype] },
+        'message-removed': { param_types: [Tp.Message.$gtype] },
+        'message-added': { param_types: [Tp.Message.$gtype] },
+        'timestamp-changed': { param_types: [Tp.Message.$gtype] },
    },
 }, class ChatNotification extends MessageTray.Notification {
    _init(source) {
@@ -768,24 +735,21 @@ var ChatNotification = HAVE_TP ? GObject.registerClass({
                                      styles: [],
                                      timestamp: currentTime,
                                      noTimestamp: false });
-        const { noTimestamp } = props;
-        delete props.noTimestamp;

        // Reset the old message timeout
        if (this._timestampTimeoutId)
            GLib.source_remove(this._timestampTimeoutId);
        this._timestampTimeoutId = 0;

-        let message = new ChatNotificationMessage({
-            realMessage: props.group !== 'meta',
-            showTimestamp: false,
-            ...props,
-        });
+        let message = { realMessage: props.group != 'meta',
+                        showTimestamp: false };
+        Lang.copyProperties(props, message);
+        delete message.noTimestamp;

        this.messages.unshift(message);
        this.emit('message-added', message);

-        if (!noTimestamp) {
+        if (!props.noTimestamp) {
            let timestamp = props.timestamp;
            if (timestamp < currentTime - SCROLLBACK_IMMEDIATE_TIME) {
                this.appendTimestamp();
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@@ -94,7 +94,6 @@ class WorldClocksSection extends St.Button {
        });
        this._clock = new GnomeDesktop.WallClock();
        this._clockNotifyId = 0;
-        this._tzNotifyId = 0;

        this._locations = [];

@@ -167,6 +166,8 @@ class WorldClocksSection extends St.Button {
        layout.attach(header, 0, 0, 2, 1);
        this.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;

@@ -179,14 +180,14 @@ class WorldClocksSection extends St.Button {

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

-            const tz = new St.Label({
-                style_class: 'world-clocks-timezone',
-                x_align: Clutter.ActorAlign.END,
-                y_align: Clutter.ActorAlign.CENTER,
-            });
-
-            time.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-            tz.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
+            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',
+                                    text: fmt.format(prefix, Math.abs(offset)),
+                                    x_align: Clutter.ActorAlign.END,
+                                    y_align: Clutter.ActorAlign.CENTER });

            if (this._grid.text_direction == Clutter.TextDirection.RTL) {
                layout.attach(tz, 0, i + 1, 1, 1);
@@ -198,65 +199,32 @@ class WorldClocksSection extends St.Button {
                layout.attach(tz, 2, i + 1, 1, 1);
            }

-            this._locations[i].timeLabel = time;
-            this._locations[i].tzLabel = tz;
+            this._locations[i].actor = time;
        }

        if (this._grid.get_n_children() > 1) {
            if (!this._clockNotifyId) {
                this._clockNotifyId =
-                    this._clock.connect('notify::clock', this._updateTimeLabels.bind(this));
+                    this._clock.connect('notify::clock', this._updateLabels.bind(this));
            }
-            if (!this._tzNotifyId) {
-                this._tzNotifyId =
-                    this._clock.connect('notify::timezone', this._updateTimezoneLabels.bind(this));
-            }
-            this._updateTimeLabels();
-            this._updateTimezoneLabels();
+            this._updateLabels();
        } else {
            if (this._clockNotifyId)
                this._clock.disconnect(this._clockNotifyId);
            this._clockNotifyId = 0;
-
-            if (this._tzNotifyId)
-                this._clock.disconnect(this._tzNotifyId);
-            this._tzNotifyId = 0;
        }
    }

-    _getTimezoneOffsetAtLocation(location) {
-        const localOffset = GLib.DateTime.new_now_local().get_utc_offset();
-        const utcOffset = this._getTimeAtLocation(location).get_utc_offset();
-        const offsetCurrentTz = utcOffset - localOffset;
-        const offsetHours = Math.abs(offsetCurrentTz) / GLib.TIME_SPAN_HOUR;
-        const offsetMinutes =
-            (Math.abs(offsetCurrentTz) % GLib.TIME_SPAN_HOUR) /
-            GLib.TIME_SPAN_MINUTE;
-
-        const prefix = offsetCurrentTz >= 0 ? '+' : '-';
-        const text = offsetMinutes === 0
-            ? '%s%d'.format(prefix, offsetHours)
-            : '%s%d\u2236%d'.format(prefix, offsetHours, offsetMinutes);
-        return text;
-    }
-
    _getTimeAtLocation(location) {
        let tz = GLib.TimeZone.new(location.get_timezone().get_tzid());
        return GLib.DateTime.new_now(tz);
    }

-    _updateTimeLabels() {
+    _updateLabels() {
        for (let i = 0; i < this._locations.length; i++) {
            let l = this._locations[i];
            let now = this._getTimeAtLocation(l.location);
-            l.timeLabel.text = Util.formatTime(now, { timeOnly: true });
-        }
-    }
-
-    _updateTimezoneLabels() {
-        for (let i = 0; i < this._locations.length; i++) {
-            let l = this._locations[i];
-            l.tzLabel.text = this._getTimezoneOffsetAtLocation(l.location);
+            l.actor.text = Util.formatTime(now, { timeOnly: true });
        }
    }

@@ -416,20 +384,6 @@ class WeatherSection extends St.Button {
        layout.attach(label, 0, 0, 1, 1);
    }

-    _findBestLocationName(loc) {
-        const locName = loc.get_name();
-
-        if (loc.get_level() === GWeather.LocationLevel.CITY ||
-            !loc.has_coords())
-            return locName;
-
-        const world = GWeather.Location.get_world();
-        const city = world.find_nearest_city(...loc.get_coords());
-        const cityName = city.get_name();
-
-        return locName.includes(cityName) ? cityName : locName;
-    }
-
    _updateForecasts() {
        this._forecastGrid.destroy_all_children();

@@ -438,8 +392,13 @@ class WeatherSection extends St.Button {
            return;
        }

-        const { info } = this._weatherClient;
-        this._titleLocation.text = this._findBestLocationName(info.location);
+        let info = this._weatherClient.info;
+        let loc = info.get_location();
+        if (loc.get_level() !== GWeather.LocationLevel.CITY && loc.has_coords()) {
+            let world = GWeather.Location.get_world();
+            loc = world.find_nearest_city(...loc.get_coords());
+        }
+        this._titleLocation.text = loc.get_name();

        if (this._weatherClient.loading) {
            this._setStatusLabel(_("Loading…"));
@@ -481,6 +440,7 @@ class MessagesIndicator extends St.Icon {

        this._sources = [];
        this._count = 0;
+        this._doNotDisturb = false;

        this._settings = new Gio.Settings({
            schema_id: 'org.gnome.desktop.notifications',
@@ -494,8 +454,6 @@ class MessagesIndicator extends St.Icon {
        let sources = Main.messageTray.getSources();
        sources.forEach(source => this._onSourceAdded(null, source));

-        this._sync();
-
        this.connect('destroy', () => {
            this._settings.run_dispose();
            this._settings = null;
@@ -590,12 +548,12 @@ class DateMenuButton extends PanelMenu.Button {
        let hbox;
        let vbox;

-        super._init(0.5);
-
-        this._clockDisplay = new St.Label({ style_class: 'clock' });
-        this._clockDisplay.clutter_text.y_align = Clutter.ActorAlign.CENTER;
-        this._clockDisplay.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
+        let menuAlignment = 0.5;
+        if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
+            menuAlignment = 1.0 - menuAlignment;
+        super._init(menuAlignment);

+        this._clockDisplay = new St.Label({ y_align: Clutter.ActorAlign.CENTER });
        this._indicator = new MessagesIndicator();

        const indicatorPad = new St.Widget();
--- a/js/ui/dialog.js
+++ b/js/ui/dialog.js
@@ -1,7 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Dialog, MessageDialogContent, ListSection, ListSectionItem */

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

 function _setLabel(label, value) {
    label.set({
@@ -58,16 +58,10 @@ class Dialog extends St.Widget {
        this._dialog.add_child(this.buttonLayout);
    }

-    makeInactive() {
+    _onDestroy() {
        if (this._eventId != 0)
            this._parentActor.disconnect(this._eventId);
        this._eventId = 0;
-
-        this.buttonLayout.get_children().forEach(c => c.set_reactive(false));
-    }
-
-    _onDestroy() {
-        this.makeInactive();
    }

    _modalEventHandler(actor, event) {
@@ -221,16 +215,13 @@ var MessageDialogContent = GObject.registerClass({
            this._updateTitleStyleLater = Meta.later_add(Meta.LaterType.BEFORE_REDRAW, () => {
                this._updateTitleStyleLater = 0;
                this._title.add_style_class_name('leightweight');
-                return GLib.SOURCE_REMOVE;
+                return false;
            });
        }

    }

    set title(title) {
-        if (this._title.text === title)
-            return;
-
        _setLabel(this._title, title);

        this._title.remove_style_class_name('leightweight');
@@ -240,9 +231,6 @@ var MessageDialogContent = GObject.registerClass({
    }

    set description(description) {
-        if (this._description.text === description)
-            return;
-
        _setLabel(this._description, description);
        this.notify('description');
    }
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@@ -346,8 +346,10 @@ class EndSessionDialog extends ModalDialog.ModalDialog {

        // Use a different description when we are installing a system upgrade
        // if the PackageKit proxy is available (i.e. PackageKit is available).
-        if (dialogContent.upgradeDescription) {
-            const { name, version } = this._updateInfo.PreparedUpgrade;
+        if (this._pkOfflineProxy && dialogContent.upgradeDescription) {
+            let name = this._pkOfflineProxy.PreparedUpgrade['name'].deep_unpack();
+            let version = this._pkOfflineProxy.PreparedUpgrade['version'].deep_unpack();
+
            if (name != null && version != null)
                description = dialogContent.upgradeDescription(name, version);
        }
@@ -606,46 +608,16 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
        });
    }

-    async _getUpdateInfo() {
-        const connection = this._pkOfflineProxy.get_connection();
-        const reply = await connection.call(
-            this._pkOfflineProxy.g_name,
-            this._pkOfflineProxy.g_object_path,
-            'org.freedesktop.DBus.Properties',
-            'GetAll',
-            new GLib.Variant('(s)', [this._pkOfflineProxy.g_interface_name]),
-            null,
-            Gio.DBusCallFlags.NONE,
-            -1,
-            null);
-        const [info] = reply.recursiveUnpack();
-        return info;
-    }
-
-    async OpenAsync(parameters, invocation) {
+    OpenAsync(parameters, invocation) {
        let [type, timestamp, totalSecondsToStayOpen, inhibitorObjectPaths] = parameters;
        this._totalSecondsToStayOpen = totalSecondsToStayOpen;
        this._type = type;

-        try {
-            this._updateInfo = await this._getUpdateInfo();
-        } catch (e) {
-            if (this._pkOfflineProxy !== null)
-                log('Failed to get update info from PackageKit: %s'.format(e.message));
-
-            this._updateInfo = {
-                UpdateTriggered: false,
-                UpdatePrepared: false,
-                UpgradeTriggered: false,
-                PreparedUpgrade: {},
-            };
-        }
-
        // Only consider updates and upgrades if PackageKit is available.
        if (this._pkOfflineProxy && this._type == DialogType.RESTART) {
-            if (this._updateInfo.UpdateTriggered)
+            if (this._pkOfflineProxy.UpdateTriggered)
                this._type = DialogType.UPDATE_RESTART;
-            else if (this._updateInfo.UpgradeTriggered)
+            else if (this._pkOfflineProxy.UpgradeTriggered)
                this._type = DialogType.UPGRADE_RESTART;
        }

@@ -674,8 +646,9 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
        if (dialogContent.showOtherSessions)
            this._loadSessions();

-        let updateTriggered = this._updateInfo.UpdateTriggered;
-        let updatePrepared = this._updateInfo.UpdatePrepared;
+        // Only consider updates and upgrades if PackageKit is available.
+        let updateTriggered = this._pkOfflineProxy ? this._pkOfflineProxy.UpdateTriggered : false;
+        let updatePrepared = this._pkOfflineProxy ? this._pkOfflineProxy.UpdatePrepared : false;
        let updatesAllowed = this._updatesPermission && this._updatesPermission.allowed;

        _setCheckBoxLabel(this._checkBox, dialogContent.checkBoxText || '');
--- a/js/ui/environment.js
+++ b/js/ui/environment.js
@@ -10,13 +10,8 @@ imports.gi.versions.Gtk = '3.0';
 imports.gi.versions.TelepathyGLib = '0.12';
 imports.gi.versions.TelepathyLogger = '0.2';

-const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
+const { Clutter, GLib, GObject, Meta, Shell, St } = imports.gi;
 const Gettext = imports.gettext;
-const System = imports.system;
-
-Gio._promisify(Gio.DBusConnection.prototype, 'call', 'call_finish');
-
-let _localTimeZone = null;

 // We can't import shell JS modules yet, because they may have
 // variable initializations, etc, that depend on init() already having
@@ -116,11 +111,6 @@ function _easeActor(actor, params) {
        autoReverse = params.autoReverse;
    delete params.autoReverse;

-    // repeatCount doesn't include the initial iteration
-    const numIterations = repeatCount + 1;
-    // whether the transition should finish where it started
-    const isReversed = autoReverse && numIterations % 2 === 0;
-
    if (params.mode != undefined)
        actor.set_easing_mode(params.mode);
    delete params.mode;
@@ -132,8 +122,7 @@ function _easeActor(actor, params) {
    let animatedProps = Object.keys(params).map(p => p.replace('_', '-', 'g'));
    animatedProps.forEach(p => actor.remove_transition(p));

-    if (actor.get_easing_duration() > 0 || !isReversed)
-        actor.set(params);
+    actor.set(params);
    actor.restore_easing_state();

    let transition = animatedProps.map(p => actor.get_transition(p))
@@ -172,11 +161,6 @@ function _easeActorProperty(actor, propName, target, params) {
        autoReverse = params.autoReverse;
    delete params.autoReverse;

-    // repeatCount doesn't include the initial iteration
-    const numIterations = repeatCount + 1;
-    // whether the transition should finish where it started
-    const isReversed = autoReverse && numIterations % 2 === 0;
-
    // Copy Clutter's behavior for implicit animations, see
    // should_skip_implicit_transition()
    if (actor instanceof Clutter.Actor && !actor.mapped)
@@ -190,9 +174,7 @@ function _easeActorProperty(actor, propName, target, params) {

    if (duration == 0) {
        let [obj, prop] = _getPropertyTarget(actor, propName);
-
-        if (!isReversed)
-            obj[prop] = target;
+        obj[prop] = target;

        Meta.disable_unredirect_for_display(global.display);
        callback(true);
@@ -290,13 +272,6 @@ function init() {
        },
    });

-    Gio._LocalFilePrototype.touch_async = function (callback) {
-        Shell.util_touch_file_async(this, callback);
-    };
-    Gio._LocalFilePrototype.touch_finish = function (result) {
-        return Shell.util_touch_file_finish(this, result);
-    };
-
    St.set_slow_down_factor = function (factor) {
        let { stack } = new Error();
        log(`St.set_slow_down_factor() is deprecated, use St.Settings.slow_down_factor\n${stack}`);
@@ -316,25 +291,9 @@ function init() {
        }
    };

-    // Override to clear our own timezone cache as well
-    const origClearDateCaches = System.clearDateCaches;
-    System.clearDateCaches = function () {
-        _localTimeZone = null;
-        origClearDateCaches();
-    };
-
    // Work around https://bugzilla.mozilla.org/show_bug.cgi?id=508783
    Date.prototype.toLocaleFormat = function (format) {
-        if (_localTimeZone === null)
-            _localTimeZone = GLib.TimeZone.new_local();
-
-        let dt = GLib.DateTime.new(_localTimeZone,
-            this.getFullYear(),
-            this.getMonth() + 1,
-            this.getDate(),
-            this.getHours(),
-            this.getMinutes(),
-            this.getSeconds());
+        let dt = GLib.DateTime.new_from_unix_local(this.getTime() / 1000);
        return dt ? dt.format(format) : '';
    };

--- a/js/ui/extensionDownloader.js
+++ b/js/ui/extensionDownloader.js
@@ -56,15 +56,6 @@ function uninstallExtension(uuid) {
        return false;

    FileUtils.recursivelyDeleteDir(extension.dir, true);
-
-    try {
-        const updatesDir = Gio.File.new_for_path(GLib.build_filenamev(
-            [global.userdatadir, 'extension-updates', extension.uuid]));
-        FileUtils.recursivelyDeleteDir(updatesDir, true);
-    } catch (e) {
-        // not an error
-    }
-
    return true;
 }

@@ -108,9 +99,6 @@ function gotExtensionZipFile(session, message, uuid, dir, callback, errback) {
 }

 function downloadExtensionUpdate(uuid) {
-    if (!Main.extensionManager.updatesSupported)
-        return;
-
    let dir = Gio.File.new_for_path(
        GLib.build_filenamev([global.userdatadir, 'extension-updates', uuid]));

@@ -129,9 +117,6 @@ function downloadExtensionUpdate(uuid) {
 }

 function checkForUpdates() {
-    if (!Main.extensionManager.updatesSupported)
-        return;
-
    let metadatas = {};
    Main.extensionManager.getUuids().forEach(uuid => {
        let extension = Main.extensionManager.lookup(uuid);
@@ -139,14 +124,9 @@ function checkForUpdates() {
            return;
        if (extension.hasUpdate)
            return;
-        metadatas[uuid] = {
-            version: extension.metadata.version,
-        };
+        metadatas[uuid] = extension.metadata;
    });

-    if (Object.keys(metadatas).length === 0)
-        return; // nothing to update
-
    let versionCheck = global.settings.get_boolean(
        'disable-extension-version-validation');
    let params = {
@@ -164,7 +144,9 @@ function checkForUpdates() {
        let operations = JSON.parse(message.response_body.data);
        for (let uuid in operations) {
            let operation = operations[uuid];
-            if (operation === 'upgrade' || operation === 'downgrade')
+            if (operation == 'blacklist')
+                uninstallExtension(uuid);
+            else if (operation == 'upgrade' || operation == 'downgrade')
                downloadExtensionUpdate(uuid);
        }
    });
@@ -240,7 +222,7 @@ class InstallExtensionDialog extends ModalDialog.ModalDialog {
 });

 function init() {
-    _httpSession = new Soup.Session({ ssl_use_system_ca_file: true });
+    _httpSession = new Soup.SessionAsync({ ssl_use_system_ca_file: true });

    // See: https://bugzilla.gnome.org/show_bug.cgi?id=655189 for context.
    // _httpSession.add_feature(new Soup.ProxyResolverDefault());
--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@@ -26,7 +26,6 @@ var ExtensionManager = class {
        this._updateNotified = false;

        this._extensions = new Map();
-        this._unloadedExtensions = new Map();
        this._enabledExtensions = [];
        this._extensionOrder = [];

@@ -61,11 +60,6 @@ var ExtensionManager = class {
        ExtensionDownloader.checkForUpdates();
    }

-    get updatesSupported() {
-        const appSys = Shell.AppSystem.get_default();
-        return appSys.lookup_app('org.gnome.Extensions.desktop') !== null;
-    }
-
    lookup(uuid) {
        return this._extensions.get(uuid);
    }
@@ -103,18 +97,18 @@ var ExtensionManager = class {
            }
        }

-        try {
-            extension.stateObj.disable();
-        } catch (e) {
-            this.logExtensionError(uuid, e);
-        }
-
        if (extension.stylesheet) {
            let theme = St.ThemeContext.get_for_stage(global.stage).get_theme();
            theme.unload_stylesheet(extension.stylesheet);
            delete extension.stylesheet;
        }

+        try {
+            extension.stateObj.disable();
+        } catch (e) {
+            this.logExtensionError(uuid, e);
+        }
+
        for (let i = 0; i < order.length; i++) {
            let otherUuid = order[i];
            try {
@@ -216,25 +210,6 @@ var ExtensionManager = class {
        return true;
    }

-    openExtensionPrefs(uuid, parentWindow, options) {
-        const extension = this.lookup(uuid);
-        if (!extension || !extension.hasPrefs)
-            return false;
-
-        Gio.DBus.session.call(
-            'org.gnome.Shell.Extensions',
-            '/org/gnome/Shell/Extensions',
-            'org.gnome.Shell.Extensions',
-            'OpenExtensionPrefs',
-            new GLib.Variant('(ssa{sv})', [uuid, parentWindow, options]),
-            null,
-            Gio.DBusCallFlags.NONE,
-            -1,
-            null,
-            (conn, res) => conn.call_finish(res));
-        return true;
-    }
-
    notifyExtensionUpdate(uuid) {
        let extension = this.lookup(uuid);
        if (!extension)
@@ -270,7 +245,6 @@ var ExtensionManager = class {
        extension.errors.push(message);

        logError(error, 'Extension %s'.format(uuid));
-        this._updateCanChange(extension);
        this.emit('extension-state-changed', extension);
    }

@@ -320,14 +294,6 @@ var ExtensionManager = class {
        return extension;
    }

-    _canLoad(extension) {
-        if (!this._unloadedExtensions.has(extension.uuid))
-            return true;
-
-        const version = this._unloadedExtensions.get(extension.uuid);
-        return extension.metadata.version === version;
-    }
-
    loadExtension(extension) {
        // Default to error, we set success as the last step
        extension.state = ExtensionState.ERROR;
@@ -336,9 +302,6 @@ var ExtensionManager = class {

        if (checkVersion && ExtensionUtils.isOutOfDate(extension)) {
            extension.state = ExtensionState.OUT_OF_DATE;
-        } else if (!this._canLoad(extension)) {
-            this.logExtensionError(extension.uuid, new Error(
-                'A different version was loaded previously. You need to log out for changes to take effect.'));
        } else {
            let enabled = this._enabledExtensions.includes(extension.uuid);
            if (enabled) {
@@ -349,8 +312,6 @@ var ExtensionManager = class {
            } else {
                extension.state = ExtensionState.INITIALIZED;
            }
-
-            this._unloadedExtensions.delete(extension.uuid);
        }

        this._updateCanChange(extension);
@@ -358,22 +319,15 @@ var ExtensionManager = class {
    }

    unloadExtension(extension) {
-        const { uuid, type } = extension;
-
        // Try to disable it -- if it's ERROR'd, we can't guarantee that,
        // but it will be removed on next reboot, and hopefully nothing
        // broke too much.
-        this._callExtensionDisable(uuid);
+        this._callExtensionDisable(extension.uuid);

        extension.state = ExtensionState.UNINSTALLED;
        this.emit('extension-state-changed', extension);

-        // If we did install an importer, it is now cached and it's
-        // impossible to load a different version
-        if (type === ExtensionType.PER_USER && extension.imports)
-            this._unloadedExtensions.set(uuid, extension.metadata.version);
-
-        this._extensions.delete(uuid);
+        this._extensions.delete(extension.uuid);
        return true;
    }

@@ -527,9 +481,6 @@ var ExtensionManager = class {
    }

    _installExtensionUpdates() {
-        if (!this.updatesSupported)
-            return;
-
        FileUtils.collectFromDatadirs('extension-updates', true, (dir, info) => {
            let fileType = info.get_file_type();
            if (fileType !== Gio.FileType.DIRECTORY)
@@ -538,14 +489,9 @@ var ExtensionManager = class {
            let extensionDir = Gio.File.new_for_path(
                GLib.build_filenamev([global.userdatadir, 'extensions', uuid]));

-            try {
-                FileUtils.recursivelyDeleteDir(extensionDir, false);
-                FileUtils.recursivelyMoveDir(dir, extensionDir);
-            } catch (e) {
-                log('Failed to install extension updates for %s'.format(uuid));
-            } finally {
-                FileUtils.recursivelyDeleteDir(dir, true);
-            }
+            FileUtils.recursivelyDeleteDir(extensionDir, false);
+            FileUtils.recursivelyMoveDir(dir, extensionDir);
+            FileUtils.recursivelyDeleteDir(dir, true);
        });
    }

--- a/js/ui/iconGrid.js
+++ b/js/ui/iconGrid.js
@@ -845,10 +845,8 @@ var IconGrid = GObject.registerClass({
    // Note that this is ICON_SIZE as used by BaseIcon, not elsewhere in IconGrid; it's a bit messed up
    _updateIconSizes() {
        this._updateIconSizesLaterId = 0;
-        let extraWidth = Math.max(0, this._hItemSize - ICON_SIZE);
-        let extraHeight = Math.max(0, this._vItemSize - ICON_SIZE);
-        let newIconSize = Math.min(this._fixedHItemSize - extraWidth,
-                                   this._fixedVItemSize - extraHeight);
+        let scale = Math.min(this._fixedHItemSize, this._fixedVItemSize) / Math.max(this._hItemSize, this._vItemSize);
+        let newIconSize = Math.floor(ICON_SIZE * scale);
        for (let i in this._items)
            this._items[i].icon.setIconSize(newIconSize);

--- a/js/ui/inhibitShortcutsDialog.js
+++ b/js/ui/inhibitShortcutsDialog.js
@@ -1,5 +1,5 @@
 /* exported InhibitShortcutsDialog */
-const { Clutter, Gio, GLib, GObject, Gtk, Meta, Pango, Shell, St } = imports.gi;
+const { Clutter, Gio, GLib, GObject, Gtk, Meta, Shell, St } = imports.gi;

 const Dialog = imports.ui.dialog;
 const ModalDialog = imports.ui.modalDialog;
@@ -90,8 +90,6 @@ var InhibitShortcutsDialog = GObject.registerClass({
                text: _('You can restore shortcuts by pressing %s.').format(restoreAccel),
                style_class: 'message-dialog-description',
            });
-            restoreLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-            restoreLabel.clutter_text.line_wrap = true;
            content.add_child(restoreLabel);
        }

--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -42,7 +42,7 @@ const defaultKeysPost = [
    [[{ width: 1.5, keyval: Clutter.KEY_BackSpace, icon: 'edit-clear-symbolic' }],
     [{ width: 2, keyval: Clutter.KEY_Return, extraClassName: 'enter-key', icon: 'keyboard-enter-symbolic' }],
     [{ label: '=/<', width: 3, level: 3, right: true }],
-     [{ action: 'emoji', icon: 'face-smile-symbolic' }, { action: 'languageMenu', extraClassName: 'layout-key', icon: 'keyboard-layout-filled-symbolic' }, { action: 'hide', extraClassName: 'hide-key', icon: 'go-down-symbolic' }]],
+     [{ action: 'emoji', icon: 'face-smile-symbolic' }, { action: 'languageMenu', extraClassName: 'layout-key' }, { action: 'hide', extraClassName: 'hide-key' }]],
    [[{ width: 1.5, keyval: Clutter.KEY_BackSpace, icon: 'edit-clear-symbolic' }],
     [{ width: 2, keyval: Clutter.KEY_Return, extraClassName: 'enter-key', icon: 'keyboard-enter-symbolic' }],
     [{ label: '?123', width: 3, level: 2, right: true }],
@@ -61,24 +61,6 @@ class AspectContainer extends St.Widget {
        this.queue_relayout();
    }

-    vfunc_get_preferred_width(forHeight) {
-        let [min, nat] = super.vfunc_get_preferred_width(forHeight);
-
-        if (forHeight > 0)
-            nat = forHeight * this._ratio;
-
-        return [min, nat];
-    }
-
-    vfunc_get_preferred_height(forWidth) {
-        let [min, nat] = super.vfunc_get_preferred_height(forWidth);
-
-        if (forWidth > 0)
-            nat = forWidth / this._ratio;
-
-        return [min, nat];
-    }
-
    vfunc_allocate(box, flags) {
        if (box.get_width() > 0 && box.get_height() > 0) {
            let sizeRatio = box.get_width() / box.get_height();
@@ -516,7 +498,7 @@ var Key = GObject.registerClass({
 var KeyboardModel = class {
    constructor(groupName) {
        let names = [groupName];
-        if (groupName.includes('+'))
+        if (names.includes('+'))
            names.push(groupName.replace(/\+.*/, ''));
        names.push('us');

@@ -1092,8 +1074,8 @@ var Keypad = GObject.registerClass({
            { label: '8', keyval: Clutter.KEY_8, left: 1, top: 2 },
            { label: '9', keyval: Clutter.KEY_9, left: 2, top: 2 },
            { label: '0', keyval: Clutter.KEY_0, left: 1, top: 3 },
-            { keyval: Clutter.KEY_BackSpace, icon: 'edit-clear-symbolic', left: 3, top: 0 },
-            { keyval: Clutter.KEY_Return, extraClassName: 'enter-key', icon: 'keyboard-enter-symbolic', left: 3, top: 1, height: 2 },
+            { label: '⌫', keyval: Clutter.KEY_BackSpace, left: 3, top: 0 },
+            { keyval: Clutter.KEY_Return, extraClassName: 'enter-key', left: 3, top: 1, height: 2 },
        ];

        super._init({
@@ -1110,7 +1092,7 @@ var Keypad = GObject.registerClass({

        for (let i = 0; i < keys.length; i++) {
            let cur = keys[i];
-            let key = new Key(cur.label || "", [], cur.icon);
+            let key = new Key(cur.label || "", []);

            if (keys[i].extraClassName)
                key.keyButton.add_style_class_name(cur.extraClassName);
@@ -1138,11 +1120,10 @@ var KeyboardManager = class KeyBoardManager {

        this._lastDevice = null;
        Meta.get_backend().connect('last-device-changed', (backend, device) => {
-            if (device.device_type === Clutter.InputDeviceType.KEYBOARD_DEVICE)
-                return;
-
-            this._lastDevice = device;
-            this._syncEnabled();
+            if (device.get_device_name().indexOf('XTEST') < 0) {
+                this._lastDevice = device;
+                this._syncEnabled();
+            }
        });
        this._syncEnabled();
    }
@@ -1167,9 +1148,9 @@ var KeyboardManager = class KeyBoardManager {
            this._keyboard = new Keyboard();
        } else if (!enabled && this._keyboard) {
            this._keyboard.setCursorLocation(null);
+            Main.layoutManager.hideKeyboard(true);
            this._keyboard.destroy();
            this._keyboard = null;
-            Main.layoutManager.hideKeyboard(true);
        }
    }

@@ -1275,10 +1256,6 @@ class Keyboard extends St.BoxLayout {
        return this._keyboardVisible && super.visible;
    }

-    set visible(visible) {
-        super.visible = visible;
-    }
-
    _onFocusPositionChanged(focusTracker) {
        let rect = focusTracker.getCurrentRect();
        this.setCursorLocation(focusTracker.currentWindow, rect.x, rect.y, rect.width, rect.height);
@@ -1627,9 +1604,7 @@ class Keyboard extends St.BoxLayout {
             * we allow the OSK being smaller than 1/3rd of the monitor height
             * there.
             */
-            const forWidth = this.get_theme_node().adjust_for_width(monitor.width);
-            const [, natHeight] = this.get_preferred_height(forWidth);
-            this.height = Math.min(maxHeight, natHeight);
+            this.height = Math.min(maxHeight, this.get_preferred_height(monitor.width));
        }
    }

@@ -1893,10 +1868,6 @@ var KeyboardController = class {
        Main.inputMethod.disconnect(this._notifyContentPurposeId);
        Main.inputMethod.disconnect(this._notifyContentHintsId);
        Main.inputMethod.disconnect(this._notifyInputPanelStateId);
-
-        // Make sure any buttons pressed by the virtual device are released
-        // immediately instead of waiting for the next GC cycle
-        this._virtualDevice.run_dispose();
    }

    _onSourcesModified() {
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@@ -470,15 +470,6 @@ var LayoutManager = GObject.registerClass({
        }
    }

-    _waitLoaded(bgManager) {
-        return new Promise(resolve => {
-            const id = bgManager.connect('loaded', () => {
-                bgManager.disconnect(id);
-                resolve();
-            });
-        });
-    }
-
    _updateBackgrounds() {
        for (let i = 0; i < this._bgManagers.length; i++)
            this._bgManagers[i].destroy();
@@ -486,7 +477,7 @@ var LayoutManager = GObject.registerClass({
        this._bgManagers = [];

        if (Main.sessionMode.isGreeter)
-            return Promise.resolve();
+            return;

        for (let i = 0; i < this.monitors.length; i++) {
            let bgManager = this._createBackgroundManager(i);
@@ -495,8 +486,6 @@ var LayoutManager = GObject.registerClass({
            if (i != this.primaryIndex && this._startingUp)
                bgManager.backgroundActor.hide();
        }
-
-        return Promise.all(this._bgManagers.map(this._waitLoaded));
    }

    _updateKeyboardBox() {
@@ -623,20 +612,10 @@ var LayoutManager = GObject.registerClass({

        let signalId = this._systemBackground.connect('loaded', () => {
            this._systemBackground.disconnect(signalId);
+            this._systemBackground.show();
+            global.stage.show();

-            // We're mostly prepared for the startup animation
-            // now, but since a lot is going on asynchronously
-            // during startup, let's defer the startup animation
-            // until the event loop is uncontended and idle.
-            // This helps to prevent us from running the animation
-            // when the system is bogged down
-            const id = GLib.idle_add(GLib.PRIORITY_LOW, () => {
-                this._systemBackground.show();
-                global.stage.show();
-                this._prepareStartupAnimation();
-                return GLib.SOURCE_REMOVE;
-            });
-            GLib.Source.set_name_by_id(id, '[gnome-shell] Startup Animation');
+            this._prepareStartupAnimation();
        });
    }

@@ -655,7 +634,7 @@ var LayoutManager = GObject.registerClass({
    // When starting a normal user session, we want to grow it out of the middle
    // of the screen.

-    async _prepareStartupAnimation() {
+    _prepareStartupAnimation() {
        // During the initial transition, add a simple actor to block all events,
        // so they don't get delivered to X11 windows that have been transformed.
        this._coverPane = new Clutter.Actor({ opacity: 0,
@@ -672,6 +651,8 @@ var LayoutManager = GObject.registerClass({
        } else if (Main.sessionMode.isGreeter) {
            this.panelBox.translation_y = -this.panelBox.height;
        } else {
+            this._updateBackgrounds();
+
            // We need to force an update of the regions now before we scale
            // the UI group to get the correct allocation for the struts.
            this._updateRegions();
@@ -687,13 +668,21 @@ var LayoutManager = GObject.registerClass({
            this.uiGroup.scale_x = this.uiGroup.scale_y = 0.75;
            this.uiGroup.opacity = 0;
            global.window_group.set_clip(monitor.x, monitor.y, monitor.width, monitor.height);
-
-            await this._updateBackgrounds();
        }

        this.emit('startup-prepared');

-        this._startupAnimation();
+        // We're mostly prepared for the startup animation
+        // now, but since a lot is going on asynchronously
+        // during startup, let's defer the startup animation
+        // until the event loop is uncontended and idle.
+        // This helps to prevent us from running the animation
+        // when the system is bogged down
+        let id = GLib.idle_add(GLib.PRIORITY_LOW, () => {
+            this._startupAnimation();
+            return GLib.SOURCE_REMOVE;
+        });
+        GLib.Source.set_name_by_id(id, '[gnome-shell] this._startupAnimation');
    }

    _startupAnimation() {
@@ -749,7 +738,7 @@ var LayoutManager = GObject.registerClass({
    showKeyboard() {
        this.keyboardBox.show();
        this.keyboardBox.ease({
-            translation_y: -this.keyboardBox.height,
+            anchor_y: this.keyboardBox.height,
            opacity: 255,
            duration: KEYBOARD_ANIMATION_TIME,
            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
@@ -766,7 +755,7 @@ var LayoutManager = GObject.registerClass({
        this._updateRegions();

        this._keyboardHeightNotifyId = this.keyboardBox.connect('notify::height', () => {
-            this.keyboardBox.translation_y = -this.keyboardBox.height;
+            this.keyboardBox.anchor_y = this.keyboardBox.height;
        });
    }

@@ -776,7 +765,7 @@ var LayoutManager = GObject.registerClass({
            this._keyboardHeightNotifyId = 0;
        }
        this.keyboardBox.ease({
-            translation_y: 0,
+            anchor_y: 0,
            opacity: 0,
            duration: immediate ? 0 : KEYBOARD_ANIMATION_TIME,
            mode: Clutter.AnimationMode.EASE_IN_QUAD,
@@ -1240,9 +1229,8 @@ class HotCorner extends Clutter.Actor {
            return;

        if (Main.overview.shouldToggleByCornerOrButton()) {
+            this._ripples.playAnimation(this._x, this._y);
            Main.overview.toggle();
-            if (Main.overview.animationInProgress)
-                this._ripples.playAnimation(this._x, this._y);
        }
    }

--- a/js/ui/lookingGlass.js
+++ b/js/ui/lookingGlass.js
@@ -1127,7 +1127,7 @@ class LookingGlass extends St.BoxLayout {
            else if (symbol == Clutter.KEY_Page_Down)
                this._notebook.nextTab();
        }
-        return super.vfunc_key_press_event(keyPressEvent);
+        return Clutter.EVENT_PROPAGATE;
    }

    open() {
--- a/js/ui/magnifier.js
+++ b/js/ui/magnifier.js
@@ -127,10 +127,6 @@ var Magnifier = class Magnifier {
     * Show the system mouse pointer.
     */
    showSystemCursor() {
-        const seat = Clutter.get_default_backend().get_default_seat();
-
-        if (seat.is_unfocus_inhibited())
-            seat.uninhibit_unfocus();
        this._cursorTracker.set_pointer_visible(true);
    }

@@ -139,10 +135,6 @@ var Magnifier = class Magnifier {
     * Hide the system mouse pointer.
     */
    hideSystemCursor() {
-        const seat = Clutter.get_default_backend().get_default_seat();
-
-        if (!seat.is_unfocus_inhibited())
-            seat.inhibit_unfocus();
        this._cursorTracker.set_pointer_visible(false);
    }

@@ -177,7 +169,7 @@ var Magnifier = class Magnifier {
        // Make sure system mouse pointer is shown when all zoom regions are
        // invisible.
        if (!activate)
-            this.showSystemCursor();
+            this._cursorTracker.set_pointer_visible(true);

        // Notify interested parties of this change
        this.emit('active-changed', activate);
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -93,9 +93,6 @@ let _a11ySettings = null;
 let _themeResource = null;
 let _oskResource = null;

-Gio._promisify(Gio._LocalFilePrototype, 'delete_async', 'delete_finish');
-Gio._promisify(Gio._LocalFilePrototype, 'touch_async', 'touch_finish');
-
 function _sessionUpdated() {
    if (sessionMode.isPrimary)
        _loadDefaultStylesheet();
@@ -132,9 +129,7 @@ function start() {
        notifyError(msg, detail);
    });

-    let currentDesktop = GLib.getenv('XDG_CURRENT_DESKTOP');
-    if (!currentDesktop || !currentDesktop.split(':').includes('GNOME'))
-        Gio.DesktopAppInfo.set_desktop_env('GNOME');
+    Gio.DesktopAppInfo.set_desktop_env('GNOME');

    sessionMode = new SessionMode.SessionMode();
    sessionMode.connect('updated', _sessionUpdated);
@@ -147,11 +142,6 @@ function start() {
    shellDBusService = new ShellDBus.GnomeShell();
    shellMountOpDBusService = new ShellMountOperation.GnomeShellMountOpHandler();

-    const watchId = Gio.DBus.session.watch_name('org.gnome.Shell.Notifications',
-        Gio.BusNameWatcherFlags.AUTO_START,
-        bus => bus.unwatch_name(watchId),
-        bus => bus.unwatch_name(watchId));
-
    _sessionUpdated();
 }

@@ -281,8 +271,11 @@ function _initializeUI() {
        }

        if (sessionMode.currentMode !== 'gdm' &&
-            sessionMode.currentMode !== 'initial-setup')
-            _handleLockScreenWarning();
+            sessionMode.currentMode !== 'initial-setup' &&
+            screenShield === null) {
+            notify(_('Screen Lock disabled'),
+                   _('Screen Locking requires the GNOME display manager.'));
+        }

        LoginManager.registerSessionWithGDM();

@@ -295,32 +288,6 @@ function _initializeUI() {
    });
 }

-async function _handleLockScreenWarning() {
-    const path = '%s/lock-warning-shown'.format(global.userdatadir);
-    const file = Gio.File.new_for_path(path);
-
-    const hasLockScreen = screenShield !== null;
-    if (hasLockScreen) {
-        try {
-            await file.delete_async(0, null);
-        } catch (e) {
-            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
-                logError(e);
-        }
-    } else {
-        try {
-            if (!await file.touch_async())
-                return;
-        } catch (e) {
-            logError(e);
-        }
-
-        notify(
-            _('Screen Lock disabled'),
-            _('Screen Locking requires the GNOME display manager.'));
-    }
-}
-
 function _getStylesheet(name) {
    let stylesheet;

@@ -394,8 +361,7 @@ function reloadThemeResource() {
    if (_themeResource)
        _themeResource._unregister();

-    _themeResource = Gio.Resource.load('%s/%s'.format(global.datadir,
-        sessionMode.themeResourceName));
+    _themeResource = Gio.Resource.load('%s/gnome-shell-theme.gresource'.format(global.datadir));
    _themeResource._register();
 }

@@ -521,9 +487,7 @@ function pushModal(actor, params) {
    let prevFocusDestroyId;
    if (prevFocus != null) {
        prevFocusDestroyId = prevFocus.connect('destroy', () => {
-            const index = modalActorFocusStack.findIndex(
-                record => record.prevFocus === prevFocus);
-
+            let index = _findModal(actor);
            if (index >= 0)
                modalActorFocusStack[index].prevFocus = null;
        });
--- a/js/ui/messageList.js
+++ b/js/ui/messageList.js
@@ -530,7 +530,7 @@ var Message = GObject.registerClass({
            this.close();
            return Clutter.EVENT_STOP;
        }
-        return super.vfunc_key_press_event(keyEvent);
+        return Clutter.EVENT_PROPAGATE;
    }
 });

--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -136,22 +136,29 @@ var FocusGrabber = class FocusGrabber {
 var NotificationPolicy = GObject.registerClass({
    Properties: {
        'enable': GObject.ParamSpec.boolean(
-            'enable', 'enable', 'enable', GObject.ParamFlags.READABLE, true),
+            'enable', 'enable', 'enable',
+            GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
+            true),
        'enable-sound': GObject.ParamSpec.boolean(
            'enable-sound', 'enable-sound', 'enable-sound',
-            GObject.ParamFlags.READABLE, true),
+            GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
+            true),
        'show-banners': GObject.ParamSpec.boolean(
            'show-banners', 'show-banners', 'show-banners',
-            GObject.ParamFlags.READABLE, true),
+            GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
+            true),
        'force-expanded': GObject.ParamSpec.boolean(
            'force-expanded', 'force-expanded', 'force-expanded',
-            GObject.ParamFlags.READABLE, false),
+            GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
+            false),
        'show-in-lock-screen': GObject.ParamSpec.boolean(
            'show-in-lock-screen', 'show-in-lock-screen', 'show-in-lock-screen',
-            GObject.ParamFlags.READABLE, false),
+            GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
+            false),
        'details-in-lock-screen': GObject.ParamSpec.boolean(
            'details-in-lock-screen', 'details-in-lock-screen', 'details-in-lock-screen',
-            GObject.ParamFlags.READABLE, false),
+            GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
+            false),
    },
 }, class NotificationPolicy extends GObject.Object {
    // Do nothing for the default policy. These methods are only useful for the
@@ -162,28 +169,24 @@ var NotificationPolicy = GObject.registerClass({
        this.run_dispose();
    }

-    get enable() {
-        return true;
-    }
-
    get enableSound() {
-        return true;
+        return this.enable_sound;
    }

    get showBanners() {
-        return true;
+        return this.show_banners;
    }

    get forceExpanded() {
-        return false;
+        return this.force_expanded;
    }

    get showInLockScreen() {
-        return false;
+        return this.show_in_lock_screen;
    }

    get detailsInLockScreen() {
-        return false;
+        return this.details_in_lock_screen;
    }
 });

@@ -759,10 +762,12 @@ var Source = GObject.registerClass({

        this.notifications = [];

-        this._policy = this._createPolicy();
+        this._policy = null;
    }

    get policy() {
+        if (!this._policy)
+            this._policy = this._createPolicy();
        return this._policy;
    }

@@ -875,6 +880,8 @@ var Source = GObject.registerClass({
    }

    destroy(reason) {
+        this.policy.destroy();
+
        let notifications = this.notifications;
        this.notifications = [];

@@ -883,7 +890,6 @@ var Source = GObject.registerClass({

        this.emit('destroy', reason);

-        this.policy.destroy();
        this.run_dispose();
    }

--- a/js/ui/mpris.js
+++ b/js/ui/mpris.js
@@ -173,11 +173,6 @@ var MprisPlayer = class MprisPlayer {
                if (!this._mprisProxy.g_name_owner)
                    this._close();
            });
-        // It is possible for the bus to disappear before the previous signal
-        // is connected, so we must ensure that the bus still exists at this
-        // point.
-        if (!this._mprisProxy.g_name_owner)
-            this._close();
    }

    _onPlayerProxyReady() {
@@ -256,10 +251,6 @@ class MediaSection extends MessageList.MessageListSection {
        return !this.empty && Calendar.isToday(this._date);
    }

-    get allowed() {
-        return !Main.sessionMode.isGreeter;
-    }
-
    _addPlayer(busName) {
        if (this._players.get(busName))
            return;
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@@ -10,6 +10,13 @@ const Params = imports.misc.params;

 const { loadInterfaceXML } = imports.misc.fileUtils;

+// Should really be defined in Gio.js
+const BusIface = loadInterfaceXML('org.freedesktop.DBus');
+var BusProxy = Gio.DBusProxy.makeProxyWrapper(BusIface);
+function Bus() {
+    return new BusProxy(Gio.DBus.session, 'org.freedesktop.DBus', '/org/freedesktop/DBus');
+}
+
 const FdoNotificationsIface = loadInterfaceXML('org.freedesktop.Notifications');

 var NotificationClosedReason = {
@@ -42,7 +49,9 @@ var FdoNotificationDaemon = class FdoNotificationDaemon {
        this._dbusImpl.export(Gio.DBus.session, '/org/freedesktop/Notifications');

        this._sources = [];
+        this._senderToPid = {};
        this._notifications = {};
+        this._busProxy = new Bus();

        this._nextNotificationId = 1;

@@ -107,9 +116,12 @@ var FdoNotificationDaemon = class FdoNotificationDaemon {
    //
    // If no existing source is found, a new source is created as long as
    // pid is provided.
+    //
+    // Either a pid or ndata.notification is needed to retrieve or
+    // create a source.
    _getSource(title, pid, ndata, sender) {
        if (!pid && !(ndata && ndata.notification))
-            throw new Error('Either a pid or ndata.notification is needed');
+            return null;

        // We use notification's source for the notifications we still have
        // around that are getting replaced because we don't keep sources
@@ -206,10 +218,42 @@ var FdoNotificationDaemon = class FdoNotificationDaemon {
        this._notifications[id] = ndata;

        let sender = invocation.get_sender();
-        let pid = hints['sender-pid'];
+        let pid = this._senderToPid[sender];

        let source = this._getSource(appName, pid, ndata, sender, null);
-        this._notifyForSource(source, ndata);
+
+        if (source) {
+            this._notifyForSource(source, ndata);
+            return invocation.return_value(GLib.Variant.new('(u)', [id]));
+        }
+
+        if (replacesId) {
+            // There's already a pending call to GetConnectionUnixProcessID,
+            // which will see the new notification data when it finishes,
+            // so we don't have to do anything.
+            return invocation.return_value(GLib.Variant.new('(u)', [id]));
+        }
+
+        this._busProxy.GetConnectionUnixProcessIDRemote(sender, (result, excp) => {
+            // The app may have updated or removed the notification
+            ndata = this._notifications[id];
+            if (!ndata)
+                return;
+
+            if (excp) {
+                logError(excp, 'Call to GetConnectionUnixProcessID failed');
+                return;
+            }
+
+            [pid] = result;
+            source = this._getSource(appName, pid, ndata, sender, null);
+
+            this._senderToPid[sender] = pid;
+            source.connect('destroy', () => {
+                delete this._senderToPid[sender];
+            });
+            this._notifyForSource(source, ndata);
+        });

        return invocation.return_value(GLib.Variant.new('(u)', [id]));
    }
@@ -372,11 +416,12 @@ var FdoNotificationDaemon = class FdoNotificationDaemon {
 var FdoNotificationDaemonSource = GObject.registerClass(
 class FdoNotificationDaemonSource extends MessageTray.Source {
    _init(title, pid, sender, appId) {
+        super._init(title);
+
        this.pid = pid;
-        this.initialTitle = title;
        this.app = this._getApp(appId);

-        super._init(title);
+        this.initialTitle = title;

        if (this.app)
            this.title = this.app.get_name();
@@ -425,20 +470,19 @@ class FdoNotificationDaemonSource extends MessageTray.Source {
    }

    _getApp(appId) {
-        const appSys = Shell.AppSystem.get_default();
        let app;

        app = Shell.WindowTracker.get_default().get_app_from_pid(this.pid);
        if (app != null)
            return app;

-        if (appId)
-            app = appSys.lookup_app('%s.desktop'.format(appId));
+        if (appId) {
+            app = Shell.AppSystem.get_default().lookup_app('%s.desktop'.format(appId));
+            if (app != null)
+                return app;
+        }

-        if (!app)
-            app = appSys.lookup_app('%s.desktop'.format(this.initialTitle));
-
-        return app;
+        return null;
    }

    setTitle(title) {
@@ -587,12 +631,12 @@ class GtkNotificationDaemonAppSource extends MessageTray.Source {
        if (!app)
            throw new InvalidAppError();

+        super._init(app.get_name());
+
        this._appId = appId;
        this._app = app;
        this._objectPath = objectPath;

-        super._init(app.get_name());
-
        this._notifications = {};
        this._notificationPending = false;
    }
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -4,10 +4,6 @@
 const { Clutter, GLib, GObject, Meta, Shell, St } = imports.gi;
 const Signals = imports.signals;

-// Time for initial animation going into Overview mode;
-// this is defined here to make it available in imports.
-var ANIMATION_TIME = 250;
-
 const Background = imports.ui.background;
 const DND = imports.ui.dnd;
 const LayoutManager = imports.ui.layout;
@@ -18,6 +14,9 @@ const OverviewControls = imports.ui.overviewControls;
 const Params = imports.misc.params;
 const WorkspaceThumbnail = imports.ui.workspaceThumbnail;

+// Time for initial animation going into Overview mode
+var ANIMATION_TIME = 250;
+
 // Must be less than ANIMATION_TIME, since we switch to
 // or from the overview completely after ANIMATION_TIME,
 // and don't want the shading animation to get cut off
@@ -271,11 +270,7 @@ var Overview = class {
    }

    _sessionUpdated() {
-        const { hasOverview } = Main.sessionMode;
-        if (!hasOverview)
-            this.hide();
-
-        this.isDummy = !hasOverview;
+        this.isDummy = !Main.sessionMode.hasOverview;
        this._createOverview();
    }

--- a/js/ui/overviewControls.js
+++ b/js/ui/overviewControls.js
@@ -8,9 +8,8 @@ const Main = imports.ui.main;
 const Params = imports.misc.params;
 const ViewSelector = imports.ui.viewSelector;
 const WorkspaceThumbnail = imports.ui.workspaceThumbnail;
-const Overview = imports.ui.overview;

-var SIDE_CONTROLS_ANIMATION_TIME = Overview.ANIMATION_TIME;
+var SIDE_CONTROLS_ANIMATION_TIME = 160;

 function getRtlSlideDirection(direction, actor) {
    let rtl = actor.text_direction == Clutter.TextDirection.RTL;
@@ -474,7 +473,6 @@ class ControlsManager extends St.Widget {

        // A workspace might have been inserted or removed before the active
        // one, causing the adjustment to go out of sync, so update the value
-        this._workspaceAdjustment.remove_transition('value');
        this._workspaceAdjustment.value = activeIndex;
    }

--- a/js/ui/padOsd.js
+++ b/js/ui/padOsd.js
@@ -2,7 +2,7 @@
 /* exported PadOsd, PadOsdService */

 const { Atk, Clutter, GDesktopEnums, Gio,
-        GLib, GObject, Gtk, Meta, Pango, Rsvg, St } = imports.gi;
+        GLib, GObject, Gtk, Meta, Rsvg, St } = imports.gi;
 const Signals = imports.signals;

 const Main = imports.ui.main;
@@ -89,7 +89,7 @@ var PadChooser = GObject.registerClass({
 });

 var KeybindingEntry = GObject.registerClass({
-    Signals: { 'keybinding-edited': { param_types: [GObject.TYPE_STRING] } },
+    Signals: { 'keybinding-edited': {} },
 }, class KeybindingEntry extends St.Entry {
    _init() {
        super._init({ hint_text: _("New shortcut…"), style: 'width: 10em' });
@@ -329,7 +329,6 @@ var PadDiagram = GObject.registerClass({

        this._imagePath = imagePath;
        this._handle = this._composeStyledDiagram();
-        this._initLabels();
    }

    // eslint-disable-next-line camelcase
@@ -344,26 +343,6 @@ var PadDiagram = GObject.registerClass({
        this.add_actor(actor);
    }

-    _initLabels() {
-        let i = 0;
-        for (i = 0; ; i++) {
-            if (!this._addLabel(Meta.PadActionType.BUTTON, i))
-                break;
-        }
-
-        for (i = 0; ; i++) {
-            if (!this._addLabel(Meta.PadActionType.RING, i, CW) ||
-                !this._addLabel(Meta.PadActionType.RING, i, CCW))
-                break;
-        }
-
-        for (i = 0; ; i++) {
-            if (!this._addLabel(Meta.PadActionType.STRIP, i, UP) ||
-                !this._addLabel(Meta.PadActionType.STRIP, i, DOWN))
-                break;
-        }
-    }
-
    _wrappingSvgHeader() {
        return '<?xml version="1.0" encoding="UTF-8" standalone="no"?>' +
               '<svg version="1.1" xmlns="http://www.w3.org/2000/svg" ' +
@@ -383,8 +362,10 @@ var PadDiagram = GObject.registerClass({

        for (let i = 0; i < this._activeButtons.length; i++) {
            let ch = String.fromCharCode('A'.charCodeAt() + this._activeButtons[i]);
-            css += '.%s.Leader { stroke: %s !important; }'.format(ch, ACTIVE_COLOR);
-            css += '.%s.Button { stroke: %s !important; fill: %s !important; }'.format(ch, ACTIVE_COLOR, ACTIVE_COLOR);
+            css += '.%s {'.format(ch);
+            css += '    stroke: %s !important;'.format(ACTIVE_COLOR);
+            css += '    fill: %s !important;'.format(ACTIVE_COLOR);
+            css += '}';
        }

        return css;
@@ -409,6 +390,9 @@ var PadDiagram = GObject.registerClass({
    }

    _updateDiagramScale() {
+        if (this._handle == null)
+            return;
+
        [this._actorWidth, this._actorHeight] = this.get_size();
        let dimensions = this._handle.get_dimensions();
        let scaleX = this._actorWidth / dimensions.width;
@@ -421,11 +405,6 @@ var PadDiagram = GObject.registerClass({
        let [, natWidth] = child.get_preferred_width(natHeight);
        let childBox = new Clutter.ActorBox();

-        // I miss Cairo.Matrix
-        let dimensions = this._handle.get_dimensions();
-        x = x * this._scale + this._actorWidth / 2 - dimensions.width / 2 * this._scale;
-        y = y * this._scale + this._actorHeight / 2 - dimensions.height / 2 * this._scale;
-
        if (direction == LTR) {
            childBox.x1 = x;
            childBox.x2 = x + natWidth;
@@ -441,18 +420,17 @@ var PadDiagram = GObject.registerClass({

    vfunc_allocate(box, flags) {
        super.vfunc_allocate(box, flags);
-        if (this._handle === null)
-            return;
-
        this._updateDiagramScale();

        for (let i = 0; i < this._labels.length; i++) {
-            const { label, x, y, arrangement } = this._labels[i];
+            let [label, action, idx, dir] = this._labels[i];
+            let [found_, x, y, arrangement] = this.getLabelCoords(action, idx, dir);
            this._allocateChild(label, x, y, arrangement);
        }

        if (this._editorActor && this._curEdited) {
-            const { x, y, arrangement } = this._curEdited;
+            let [label_, action, idx, dir] = this._curEdited;
+            let [found_, x, y, arrangement] = this.getLabelCoords(action, idx, dir);
            this._allocateChild(this._editorActor, x, y, arrangement);
        }
    }
@@ -479,6 +457,17 @@ var PadDiagram = GObject.registerClass({
        cr.$dispose();
    }

+    _transformPoint(x, y) {
+        if (this._handle == null || this._scale == null)
+            return [x, y];
+
+        // I miss Cairo.Matrix
+        let dimensions = this._handle.get_dimensions();
+        x = x * this._scale + this._actorWidth / 2 - dimensions.width / 2 * this._scale;
+        y = y * this._scale + this._actorHeight / 2 - dimensions.height / 2 * this._scale;
+        return [Math.round(x), Math.round(y)];
+    }
+
    _getItemLabelCoords(labelName, leaderName) {
        if (this._handle == null)
            return [false];
@@ -506,39 +495,44 @@ var PadDiagram = GObject.registerClass({
            pos.y = this._imageHeight - pos.y;
        }

-        return [true, pos.x, pos.y, direction];
+        let [x, y] = this._transformPoint(pos.x, pos.y);
+
+        return [true, x, y, direction];
    }

-    _getButtonLabels(button) {
+    getButtonLabelCoords(button) {
        let ch = String.fromCharCode('A'.charCodeAt() + button);
        let labelName = 'Label%s'.format(ch);
        let leaderName = 'Leader%s'.format(ch);
-        return [labelName, leaderName];
+
+        return this._getItemLabelCoords(labelName, leaderName);
    }

-    _getRingLabels(number, dir) {
+    getRingLabelCoords(number, dir) {
        let numStr = number > 0 ? (number + 1).toString() : '';
        let dirStr = dir == CW ? 'CW' : 'CCW';
        let labelName = 'LabelRing%s%s'.format(numStr, dirStr);
        let leaderName = 'LeaderRing%s%s'.format(numStr, dirStr);
-        return [labelName, leaderName];
+
+        return this._getItemLabelCoords(labelName, leaderName);
    }

-    _getStripLabels(number, dir) {
+    getStripLabelCoords(number, dir) {
        let numStr = number > 0 ? (number + 1).toString() : '';
        let dirStr = dir == UP ? 'Up' : 'Down';
        let labelName = 'LabelStrip%s%s'.format(numStr, dirStr);
        let leaderName = 'LeaderStrip%s%s'.format(numStr, dirStr);
-        return [labelName, leaderName];
+
+        return this._getItemLabelCoords(labelName, leaderName);
    }

-    _getLabelCoords(action, idx, dir) {
+    getLabelCoords(action, idx, dir) {
        if (action == Meta.PadActionType.BUTTON)
-            return this._getItemLabelCoords(...this._getButtonLabels(idx));
+            return this.getButtonLabelCoords(idx);
        else if (action == Meta.PadActionType.RING)
-            return this._getItemLabelCoords(...this._getRingLabels(idx, dir));
+            return this.getRingLabelCoords(idx, dir);
        else if (action == Meta.PadActionType.STRIP)
-            return this._getItemLabelCoords(...this._getStripLabels(idx, dir));
+            return this.getStripLabelCoords(idx, dir);

        return [false];
    }
@@ -563,30 +557,26 @@ var PadDiagram = GObject.registerClass({
        this._invalidateSvg();
    }

-    _addLabel(action, idx, dir) {
-        let [found, x, y, arrangement] = this._getLabelCoords(action, idx, dir);
-        if (!found)
-            return false;
-
-        let label = new St.Label();
-        this._labels.push({ label, action, idx, dir, x, y, arrangement });
+    addLabel(label, type, idx, dir) {
+        this._labels.push([label, type, idx, dir]);
        this.add_actor(label);
-        return true;
    }

    updateLabels(getText) {
        for (let i = 0; i < this._labels.length; i++) {
-            const { label, action, idx, dir } = this._labels[i];
+            let [label, action, idx, dir] = this._labels[i];
            let str = getText(action, idx, dir);
            label.set_text(str);
        }
-
-        this.queue_relayout();
    }

    _applyLabel(label, action, idx, dir, str) {
-        if (str !== null)
+        if (str != null) {
            label.set_text(str);
+
+            let [found_, x, y, arrangement] = this.getLabelCoords(action, idx, dir);
+            this._allocateChild(label, x, y, arrangement);
+        }
        label.show();
    }

@@ -594,20 +584,18 @@ var PadDiagram = GObject.registerClass({
        this._editorActor.hide();

        if (this._prevEdited) {
-            const { label, action, idx, dir } = this._prevEdited;
+            let [label, action, idx, dir] = this._prevEdited;
            this._applyLabel(label, action, idx, dir, str);
            this._prevEdited = null;
        }

        if (this._curEdited) {
-            const { label, action, idx, dir } = this._curEdited;
+            let [label, action, idx, dir] = this._curEdited;
            this._applyLabel(label, action, idx, dir, str);
            if (continues)
                this._prevEdited = this._curEdited;
            this._curEdited = null;
        }
-
-        this.queue_relayout();
    }

    startEdition(action, idx, dir) {
@@ -617,19 +605,21 @@ var PadDiagram = GObject.registerClass({
            return;

        for (let i = 0; i < this._labels.length; i++) {
-            if (action == this._labels[i].action &&
-                idx == this._labels[i].idx && dir == this._labels[i].dir) {
+            let [label, itemAction, itemIdx, itemDir] = this._labels[i];
+            if (action == itemAction && idx == itemIdx && dir == itemDir) {
                this._curEdited = this._labels[i];
-                editedLabel = this._curEdited.label;
+                editedLabel = label;
                break;
            }
        }

        if (this._curEdited == null)
            return;
+        let [found] = this.getLabelCoords(action, idx, dir);
+        if (!found)
+            return;
        this._editorActor.show();
        editedLabel.hide();
-        this.queue_relayout();
    }
 });

@@ -703,7 +693,6 @@ var PadOsd = GObject.registerClass({

        this._titleLabel = new St.Label({ style: 'font-side: larger; font-weight: bold;',
                                          x_align: Clutter.ActorAlign.CENTER });
-        this._titleLabel.clutter_text.set_ellipsize(Pango.EllipsizeMode.NONE);
        this._titleLabel.clutter_text.set_text(padDevice.get_device_name());
        labelBox.add_actor(this._titleLabel);

@@ -721,7 +710,31 @@ var PadOsd = GObject.registerClass({
                                            x_expand: true,
                                            y_expand: true });
        this.add_actor(this._padDiagram);
-        this._updateActionLabels();
+
+        // FIXME: Fix num buttons.
+        let i = 0;
+        for (i = 0; i < 50; i++) {
+            let [found] = this._padDiagram.getButtonLabelCoords(i);
+            if (!found)
+                break;
+            this._createLabel(Meta.PadActionType.BUTTON, i);
+        }
+
+        for (i = 0; i < padDevice.get_n_rings(); i++) {
+            let [found] = this._padDiagram.getRingLabelCoords(i, CW);
+            if (!found)
+                break;
+            this._createLabel(Meta.PadActionType.RING, i, CW);
+            this._createLabel(Meta.PadActionType.RING, i, CCW);
+        }
+
+        for (i = 0; i < padDevice.get_n_strips(); i++) {
+            let [found] = this._padDiagram.getStripLabelCoords(i, UP);
+            if (!found)
+                break;
+            this._createLabel(Meta.PadActionType.STRIP, i, UP);
+            this._createLabel(Meta.PadActionType.STRIP, i, DOWN);
+        }

        let buttonBox = new St.Widget({ layout_manager: new Clutter.BinLayout(),
                                        x_expand: true,
@@ -774,6 +787,11 @@ var PadOsd = GObject.registerClass({
        return str ? str : _("None");
    }

+    _createLabel(type, number, dir) {
+        let label = new St.Label({ text: this._getActionText(type, number) });
+        this._padDiagram.addLabel(label, type, number, dir);
+    }
+
    _updateActionLabels() {
        this._padDiagram.updateLabels(this._getActionText.bind(this));
    }
@@ -849,7 +867,8 @@ var PadOsd = GObject.registerClass({
            this._tipLabel.set_text(_("Press any key to exit"));
        }

-        this._titleLabel.set_text(title);
+        this._titleLabel.clutter_text.set_markup(
+            '<span size="larger"><b>%s</b></span>'.format(title));
    }

    _isEditedAction(type, number, dir) {
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -100,7 +100,7 @@ class AppMenu extends PopupMenu.PopupMenu {
                         'org.gtk.Actions', 'Activate',
                         GLib.Variant.new('(sava{sv})',
                                          ['details', [args], null]),
-                         null, 0, -1, null);
+                         null, 0, -1, null, null);
            });
        });

@@ -216,10 +216,7 @@ var AppMenuButton = GObject.registerClass({
                             this._onIconThemeChanged.bind(this));

        let iconEffect = new Clutter.DesaturateEffect();
-        this._iconBox = new St.Bin({
-            style_class: 'app-menu-icon',
-            y_align: Clutter.ActorAlign.CENTER,
-        });
+        this._iconBox = new St.Bin({ style_class: 'app-menu-icon' });
        this._iconBox.add_effect(iconEffect);
        this._container.add_actor(this._iconBox);

@@ -536,9 +533,6 @@ class PanelCorner extends St.DrawingArea {
        if (index < 0)
            return null;

-        if (!(children[index] instanceof St.Widget))
-            return null;
-
        if (!children[index].has_style_class_name('panel-menu') &&
            !children[index].has_style_class_name('panel-button'))
            return this._findRightmostButton(children[index]);
@@ -564,9 +558,6 @@ class PanelCorner extends St.DrawingArea {
        if (index == children.length)
            return null;

-        if (!(children[index] instanceof St.Widget))
-            return null;
-
        if (!children[index].has_style_class_name('panel-menu') &&
            !children[index].has_style_class_name('panel-button'))
            return this._findLeftmostButton(children[index]);
@@ -967,7 +958,7 @@ class Panel extends St.Widget {
            return Clutter.EVENT_STOP;
        }

-        return super.vfunc_key_press_event(keyEvent);
+        return Clutter.EVENT_PROPAGATE;
    }

    _toggleMenu(indicator) {
--- a/js/ui/panelMenu.js
+++ b/js/ui/panelMenu.js
@@ -183,9 +183,10 @@ var Button = GObject.registerClass({
    }

    _onDestroy() {
+        super._onDestroy();
+
        if (this.menu)
            this.menu.destroy();
-        super._onDestroy();
    }
 });

--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -881,10 +881,9 @@ var PopupMenu = class extends PopupMenuBase {

        let state = event.get_state();

-        // if user has a modifier down (except capslock and numlock)
+        // if user has a modifier down (except capslock)
        // then don't handle the key press here
        state &= ~Clutter.ModifierType.LOCK_MASK;
-        state &= ~Clutter.ModifierType.MOD2_MASK;
        state &= Clutter.ModifierType.MODIFIER_MASK;

        if (state)
@@ -1325,7 +1324,7 @@ var PopupMenuManager = class {

    removeMenu(menu) {
        if (menu == this.activeMenu)
-            this._grabHelper.ungrab({ actor: menu.actor });
+            this._closeMenu(false, menu);

        let position = this._findMenu(menu);
        if (position == -1) // not a menu we manage
--- a/js/ui/remoteSearch.js
+++ b/js/ui/remoteSearch.js
@@ -247,7 +247,7 @@ var RemoteSearchProvider = class {
            if (error.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
                return;

-            log('Received error from D-Bus search provider %s: %s'.format(this.id, String(error)));
+            log('Received error from DBus search provider %s: %s'.format(this.id, String(error)));
            callback([]);
            return;
        }
@@ -274,7 +274,7 @@ var RemoteSearchProvider = class {
    _getResultMetasFinished(results, error, callback) {
        if (error) {
            if (!error.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
-                log('Received error from D-Bus search provider %s during GetResultMetas: %s'.format(this.id, String(error)));
+                log('Received error from DBus search provider %s during GetResultMetas: %s'.format(this.id, String(error)));
            callback([]);
            return;
        }
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M6.5 1.031c-.371 0-.742-.035-1.11.016-.367.05-.73.203-.972.476-.125.141-.215.309-.266.485-.047.18-.054.367-.02.55.032.184.102.356.192.516.09.164.203.309.317.457L5 4H2a1.8 1.8 0 00-.41.035.791.791 0 00-.36.195.791.791 0 00-.195.36C1 4.723 1 4.863 1 5v2.75l.77-.344c.265-.117.542-.23.832-.242.289-.016.586.074.812.254.227.18.383.441.465.723.082.277.101.57.121.859.02.316.04.637-.016.95-.058.312-.199.616-.43.831a1.264 1.264 0 01-.874.32c-.317-.007-.618-.128-.91-.257L1 10.5V14c0 .137.004.277.035.41a.791.791 0 00.195.36c.098.097.227.16.36.195.133.035.273.035.41.035h3l-.328-.68c-.14-.293-.274-.597-.29-.922-.015-.32.095-.652.31-.894.214-.242.523-.39.84-.453.316-.067.644-.059.968-.059.324 0 .652-.008.969.059.316.062.625.21.84.453.214.242.324.574.308.894-.015.325-.148.63-.289.922L8 15h3a1.8 1.8 0 00.41-.035.791.791 0 00.36-.195.791.791 0 00.195-.36C12 14.277 12 14.137 12 14v-3.563l.703.297c.29.125.59.239.902.246.313.004.63-.101.864-.308.238-.203.386-.496.46-.8C15 9.565 15 9.25 15 8.937c0-.313 0-.63-.07-.934-.075-.305-.223-.598-.461-.8a1.288 1.288 0 00-.864-.31c-.312.008-.613.122-.902.247L12 7.437V5a1.8 1.8 0 00-.035-.41.791.791 0 00-.195-.36.791.791 0 00-.36-.195C11.277 4 11.137 4 11 4H8l.36-.469c.113-.148.226-.293.316-.457.09-.16.16-.332.191-.515a1.248 1.248 0 00-.02-.551 1.256 1.256 0 00-.265-.485c-.242-.273-.605-.425-.973-.476-.367-.05-.738-.016-1.109-.016zm0 0" fill="#474747"/></svg>