theme: update system grey background

Fixes https://gitlab.gnome.org/GNOME/gnome-shell/issues/2174
2020-02-04 15:28:56 +01:00
274 changed files with 23555 additions and 34960 deletions
--- 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/193
+++ b/193
@@ -1,196 +1,3 @@
-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]
-* Only enable OSK automatically if touch-mode is enabled [Carlos; #872]
-* Merge screen shield and unlock dialog to new lock screen [Georges; !872]
-* Improve ShellBlur effect [Jonas; !991]
-* Adapt user avatar for new lock screen [Umang, Georges; !922]
-* Animate prompt transition on lock screen [Florian; !972]
-* Reduce font-size in dialog titles if text doesn't fit [Jonas; !1012]
-* Various lock screen improvements and bug fixes [Jakub, Florian, Georges;
-  !996, !997, !999, #2212, !998, !1006, #2215, #2213]
-* Misc. bug fixes and cleanups [Daniel, Florian, Jakub, nana-4, Jonas; #2170,
-  #2167, !936, !988, #2187, !994, !995, !938, #2194, #2203, !1004, !977, !1014]
-
-Contributors:
-  Jonas Dreßler, Carlos Garnacho, Umang Jain, Daniel Mustieles, Florian Müllner,
-  Georges Basile Stavracas Neto, Jakub Steiner, Daniel van Vugt, nana-4
-
-Translators:
-  Daniel Mustieles [es, pt_BR], Rafael Fontenelle [pt_BR], Danial Behzadi [fa],
-  Anders Jonsson [sv], Asier Sarasua Garmendia [eu], Aurimas Černius [lt],
-  Bruce Cowan [en_GB], sicklylife [ja], Fran Dieguez [gl], Kukuh Syafaat [id],
-  Emin Tufan Çetin [tr], Jiri Grönroos [fi], Jordi Mas [ca], Claude Paroz [fr],
-  Ask Hjorth Larsen [da], Марко Костић [sr], Piotr Drąg [pl],
-  Charles Monzat [fr], Balázs Úr [hu]
-
-3.35.90
-=======
-* Update default favorite apps [Michael; !907]
-* Add Shell.Blur effect [Georges; !864, !924]
-* Overhaul scroll/swipe gestures [Alexander; !821, !825, !826]
-* Fix VPN connections when delaying request [Florian; #2008]
-* Overhaul theme [Sam, Jakub, nana-4; !904, !931, !957]
-* Improve visual appearance of Weather integration [Florian; #1143]
-* Implement new system dialog designs [Jonas; #1343]
-* Animate position changes of app icons [Georges; !882]
-* Add St.Viewport [Georges; !929]
-* Make app folders behave as dialogs [Georges; !896]
-* Add do-not-disturb functionality to calendar popup [Florian; #239]
-* Show hint actor in focused entries [Jonas; !944]
-* Switch screen-recorder back to VP8 [Björn; #256]
-* Allow to run perf-tool as wayland compositor [Olivier; !941]
-* Handle extension updates [Florian; !945]
-* Animate showing and hiding caps-lock warning [Jonas; !952]
-* Support "auto" lengths in CSS [Florian; !971]
-* Turn extension-prefs into the offical Extensions app [Florian; #1968]
-* Sandbox the portal helper [Michael; !983]
-* Misc. bug fixes and cleanups [Florian, Björn, Jakub, Alexander, Daniel V.,
-  Jonas, nana-4, Carlos, Sebastian, Daniel G., Georges, Piotr; !918, !917,
-  !919, !920, #763, #791659, !927, #2091, !930, !926, !888, !934, !168, #2133,
-  #682, #2142, #2131, !943, #2132, #1958, #2146, !951, #1779, #2130, !964,
-  !965, !948, #2151, #1746, !967, !760, !968, !970, !973, #2169, #2176, !978,
-  !980, !979, #2177, !981, #2180, !974]
-
-Contributors:
-  Michael Catanzaro, Björn Daase, Jonas Dreßler, Piotr Drąg, Olivier Fourdan,
-  Carlos Garnacho, Sam Hewitt, Sebastian Keller, Andre Klapper,
-  Alexander Mikhaylenko, Daniel García Moreno, Florian Müllner,
-  Georges Basile Stavracas Neto, Jakub Steiner, Daniel van Vugt, nana-4
-
-Translators:
-  Asier Sarasua Garmendia [eu], Daniel Mustieles [es], Andrej Shadura [sk],
-  Carmen Bianca BAKKER [eo], Sucipto [id], Dušan Kazik [sk], Goran Vidović [hr],
-  sicklylife [ja], Kukuh Syafaat [id], Yi-Jyun Pan [zh_TW],
-  Rafael Fontenelle [pt_BR], Jordi Mas [ca], Jiri Grönroos [fi],
-  Fabio Tomat [fur], Umarzuki Bin Mochlis Moktar [ms], Daniel Korostil [uk],
-  Jor Teron [mjw], Anders Jonsson [sv], Aurimas Černius [lt]
-
 3.35.3
 ======
 * Add discrete GPU support for NVidia drivers [Bastien; #1810]
--- 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.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/dbus-interfaces/org.gnome.Shell.Introspect.xml
+++ b/data/dbus-interfaces/org.gnome.Shell.Introspect.xml
@@ -57,19 +57,5 @@
    <method name="GetWindows">
      <arg name="windows" direction="out" type="a{ta{sv}}" />
    </method>
-
-    <!--
-       AnimationsEnabled:
-       @short_description: Whether the shell animations are enabled
-
-       By default determined by the org.gnome.desktop.interface enable-animations
-       gsetting, but may be overridden, e.g. if there is an active screen cast or
-       remote desktop session that asked for animations to be disabled.
-
-       Since: 2
-    -->
-    <property name="AnimationsEnabled" type="b" access="read"/>
-
-    <property name="version" type="u" access="read"/>
  </interface>
 </node>
--- a/data/gnome-shell-theme.gresource.xml
+++ b/data/gnome-shell-theme.gresource.xml
@@ -9,6 +9,12 @@
    <file>dash-placeholder.svg</file>
    <file>gnome-shell.css</file>
    <file>gnome-shell-high-contrast.css</file>
+    <file>key-enter.svg</file>
+    <file>key-hide.svg</file>
+    <file>key-layout.svg</file>
+    <file>key-shift.svg</file>
+    <file>key-shift-uppercase.svg</file>
+    <file>key-shift-latched-uppercase.svg</file>
    <file alias="icons/message-indicator-symbolic.svg">message-indicator-symbolic.svg</file>
    <file>no-events.svg</file>
    <file>no-notifications.svg</file>
@@ -19,11 +25,6 @@
    <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/data/icons/hicolor/scalable/apps/org.gnome.Extensions.svg
+++ b/data/icons/hicolor/scalable/apps/org.gnome.Extensions.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="128px" height="128px" viewBox="0 0 128 128" version="1.1">
+<g id="surface43907">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(10.196079%,37.254903%,70.588237%);fill-opacity:1;" d="M 58.847656 15.683594 L 49.074219 30.632812 C 46.921875 33.84375 42.480469 36.65625 39.378906 35.300781 C 34.488281 33.164062 35.859375 28.144531 31.28125 25.292969 C 28.070312 23.292969 16.839844 20.449219 14.804688 27.644531 C 13.761719 31.339844 14.480469 37.410156 17.398438 41.019531 C 20.164062 44.441406 26.8125 43.355469 28.898438 47.230469 C 30.34375 49.925781 29.738281 51.628906 28.347656 54.351562 C 26.796875 57.375 22.839844 61.359375 19.265625 64.585938 C 17.480469 66.199219 13.273438 65.710938 12.03125 66.730469 C 11.753906 66.949219 12.511719 70.285156 12.511719 70.285156 C 12.511719 70.285156 19.90625 82.707031 25.539062 87.285156 C 27.773438 89.101562 30.089844 91.808594 32.742188 90.695312 C 36.035156 89.316406 35.304688 82.289062 37.644531 79.597656 C 41.976562 74.605469 50.292969 73.761719 55.582031 78.144531 C 61.277344 82.867188 60.882812 89.472656 57.941406 94.683594 C 55.175781 99.578125 49.472656 98.453125 47.484375 102.28125 C 46.730469 103.730469 47.578125 105.664062 48.765625 106.785156 C 54.628906 112.335938 71.210938 118.988281 71.210938 118.988281 L 81.605469 102.429688 C 83.757812 99.222656 86.707031 97.742188 90.011719 98.46875 C 94.605469 99.472656 95.160156 105.945312 98.914062 108.785156 C 103.195312 112.019531 110.546875 111.765625 114.351562 105.753906 C 117.128906 101.371094 116.761719 97.449219 113.765625 91.414062 C 111.808594 87.476562 103.253906 89.382812 101.171875 85.507812 C 99.722656 82.8125 99.992188 80.214844 101.859375 77.796875 C 106.332031 72 117.003906 62.699219 117.003906 62.699219 C 117.003906 62.699219 117.144531 60.824219 116.246094 59.363281 C 115.15625 57.589844 107.472656 49.273438 104.65625 46.984375 C 102.421875 45.167969 99.6875 41.921875 97.03125 43.035156 C 93.742188 44.414062 94.417969 51.058594 92.082031 53.753906 C 86.5 60.179688 78.4375 59.101562 73.914062 54.648438 C 68.644531 49.453125 68.511719 44.488281 71.453125 39.277344 C 74.222656 34.382812 79.921875 35.3125 81.910156 31.484375 C 82.664062 30.035156 81.484375 27.070312 80.597656 25.390625 C 79.277344 22.890625 65.976562 18.902344 58.847656 15.683594 Z M 58.847656 15.683594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(20.784314%,51.764709%,89.411765%);fill-opacity:1;" d="M 58.089844 12.347656 L 48.316406 27.300781 C 46.164062 30.507812 41.726562 33.320312 38.625 31.964844 C 33.734375 29.828125 35.101562 24.808594 30.523438 21.960938 C 27.3125 19.957031 19.445312 19.160156 15.683594 25.625 C 13.730469 28.976562 13.722656 34.074219 16.644531 37.6875 C 19.410156 41.105469 26.058594 40.023438 28.140625 43.898438 C 29.589844 46.589844 28.984375 48.292969 27.589844 51.015625 C 24.492188 57.066406 11.753906 66.949219 11.753906 66.949219 C 11.753906 66.949219 19.148438 79.371094 24.785156 83.949219 C 27.019531 85.765625 29.332031 88.472656 31.988281 87.363281 C 35.277344 85.984375 34.550781 78.957031 36.886719 76.261719 C 41.21875 71.273438 49.535156 70.425781 54.824219 74.8125 C 60.519531 79.53125 60.125 86.140625 57.183594 91.347656 C 54.417969 96.242188 48.714844 95.117188 46.726562 98.949219 C 45.976562 100.398438 46.824219 102.328125 48.011719 103.449219 C 53.871094 109 70.457031 115.652344 70.457031 115.652344 L 80.847656 99.097656 C 83 95.886719 85.953125 94.40625 89.257812 95.132812 C 93.847656 96.140625 94.402344 102.609375 98.160156 105.449219 C 102.4375 108.683594 109.789062 108.433594 113.597656 102.421875 C 116.375 98.035156 116.152344 94.195312 112.175781 89.128906 C 109.460938 85.667969 102.496094 86.046875 100.414062 82.171875 C 98.96875 79.480469 99.234375 76.878906 101.101562 74.460938 C 105.578125 68.667969 116.246094 59.363281 116.246094 59.363281 C 116.246094 59.363281 109.535156 48.226562 103.898438 43.648438 C 101.664062 41.835938 98.929688 38.585938 96.277344 39.699219 C 92.988281 41.078125 93.660156 47.726562 91.324219 50.417969 C 85.746094 56.84375 77.679688 55.769531 73.15625 51.3125 C 67.886719 46.121094 67.757812 41.152344 70.699219 35.945312 C 73.464844 31.046875 79.164062 31.980469 81.152344 28.148438 C 81.90625 26.699219 80.066406 24.476562 78.878906 23.355469 C 73.015625 17.804688 58.089844 12.347656 58.089844 12.347656 Z M 58.089844 12.347656 "/>
+</g>
+</svg>
--- a/data/icons/hicolor/symbolic/apps/org.gnome.Extensions-symbolic.svg
+++ b/data/icons/hicolor/symbolic/apps/org.gnome.Extensions-symbolic.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M6.5 1C5.669 1 5 1.669 5 2.5V4H2c-.554 0-1 .446-1 1v3h1.5C3.331 8 4 8.669 4 9.5S3.331 11 2.5 11H1v3c0 .554.446 1 1 1h3v-1.5c0-.831.669-1.5 1.5-1.5s1.5.669 1.5 1.5V15h3c.554 0 1-.446 1-1v-3h1.5c.831 0 1.5-.669 1.5-1.5S14.331 8 13.5 8H12V5c0-.554-.446-1-1-1H8V2.5C8 1.669 7.331 1 6.5 1z" style="isolation:auto;mix-blend-mode:normal;marker:none" color="#000" overflow="visible" fill="#474747"/></svg>
--- a/subprojects/extensions-app/data/icons/meson.build
+++ b/subprojects/extensions-app/data/icons/meson.build
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,5 +1,6 @@
 desktop_files = [
  'org.gnome.Shell.desktop',
+  'org.gnome.Extensions.desktop',
 ]
 service_files = []

@@ -42,6 +43,7 @@ endforeach


 subdir('dbus-interfaces')
+subdir('icons')
 subdir('theme')

 data_resources = [
--- a/data/org.gnome.Extensions.desktop.in.in
+++ b/data/org.gnome.Extensions.desktop.in.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Extensions
+Icon=org.gnome.Extensions
+Comment=Configure GNOME Shell Extensions
+Exec=@bindir@/gnome-shell-extension-prefs %u
+Categories=GNOME;GTK;
+OnlyShowIn=GNOME;
--- 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/_colors.scss
+++ b/data/theme/gnome-shell-sass/_colors.scss
@@ -19,13 +19,13 @@ $error_color: #ff8080;
 $success_color: if($variant == 'light', #33d17a, darken(#33d17a, 10%));
 $destructive_color: if($variant == 'light', #e01b24, darken(#e01b24, 10%));

-$osd_fg_color: #eeeeec;
-$osd_text_color: white;
-$osd_bg_color: transparentize(darken(desaturate(#3d3846, 100%), 12%),0.04);
+$osd_fg_color: $fg_color;
+$osd_text_color: if($variant == 'light', #000, #fff);
+$osd_bg_color: if($variant == 'light', rgba(255,255,255,0.9), transparentize(darken(desaturate(#3d3846, 100%), 12%),0.04));
 $osd_insensitive_bg_color: transparentize(mix($osd_fg_color, opacify($osd_bg_color, 1), 10%), 0.5);
 $osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 50%);
-$osd_borders_color: transparentize(black, 0.3);
-$osd_outer_borders_color: transparentize(white, 0.84);
+$osd_borders_color: if($variant == 'light', rgba(255,255,255,0.1), rgba(0,0,0,0.7));
+$osd_outer_borders_color: if($variant == 'light', rgba(0,0,0,0.1), lighten($osd_bg_color, 7%));

 $shadow_color: if($variant == 'light', rgba(0,0,0,0.1), rgba(0,0,0,0.2));

@@ -40,4 +40,4 @@ $backdrop_bg_color: $bg_color;
 $backdrop_fg_color: mix($fg_color, $backdrop_bg_color, 80%);
 $backdrop_insensitive_color: if($variant =='light', darken($backdrop_bg_color,15%), lighten($backdrop_bg_color,15%));
 $backdrop_borders_color: mix($borders_color, $bg_color, 90%);
-$backdrop_dark_fill: mix($backdrop_borders_color,$backdrop_bg_color, 35%);
+$backdrop_dark_fill: mix($backdrop_borders_color,$backdrop_bg_color, 35%);
--- a/data/theme/gnome-shell-sass/_common.scss
+++ b/data/theme/gnome-shell-sass/_common.scss
@@ -54,8 +54,8 @@ $base_font_size: 11;
 $text_shadow_color: if($variant == 'light', rgba(255,255,255,0.3), rgba(0,0,0,0.2));

 // icons
-$base_icon_size: 1.09em;
-// $base_icon_size: 16px;
+// $base_icon_size: 1.09em;
+$base_icon_size: 16px;

 // Stage
 stage {
@@ -91,9 +91,13 @@ stage {

 // icon tiles
 %icon_tile {
+  background-color: transparent; // no background
+  color: $osd_fg_color;
  border-radius: $base_border_radius + 4px;
  padding: $base_padding;
-  border: 2px solid transparent;
+  border-width: 2px;
+  border-style: solid;
+  border-color: transparent;
  transition-duration: 100ms;
  text-align: center;
 }
@@ -151,17 +155,14 @@ stage {


 // notification styling
-@mixin notification_bubble($flat: false) {
+%notification_bubble {
  border-width: 1px;
  border-style: solid;
-  border-radius: $base_border_radius + 2px;
+  border-radius:$base_border_radius + 2px;
+  padding: 0;
  margin: $base_margin;

-  @if $flat {
-    @include button(undecorated);
-  } @else {
-    @include button(normal);
-  }
+  @include button(normal);

  &:focus {
    @include button(focus);
--- a/data/theme/gnome-shell-sass/_drawing.scss
+++ b/data/theme/gnome-shell-sass/_drawing.scss
@@ -137,7 +137,7 @@
  // normal button
  @if $t==normal {
    color: $tc;
-    background-color: lighten($c, 3%);
+    background-color: lighten($c, 3%) !important;
    border-color: draw_border_color($c);
    @include draw_shadows($button_shadow);
    // box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1);
@@ -150,14 +150,14 @@
    color: $tc;
    text-shadow: 0 1px $text_shadow_color;
    icon-shadow: 0 1px $text_shadow_color;
-    box-shadow: inset 0 0 0 2px transparentize($selected_bg_color, 0.4);
+    box-shadow: inset 0 0 0 2px transparentize($selected_bg_color, 0.7);
    //border-color: $selected_bg_color;
  }

  // hover button
  @else if $t==hover {
    color: $tc;
-    background-color: lighten($c, if($variant == 'light', 8%, 5%));
+    background-color: lighten($c, if($variant == 'light', 8%, 5%)) !important;
    border-color: if($variant == 'light', draw_border_color(lighten($c, 7%)), draw_border_color($c));
    @include draw_shadows($button_shadow);
    text-shadow: 0 1px $text_shadow_color;
@@ -167,7 +167,7 @@
  // active button
  @else if $t==active {
    color: $tc;
-    background-color: darken($c,3%);
+    background-color: darken($c,3%) !important;
    border-color: draw_border_color(if($variant == 'light', $c, darken($c,7%)));
    text-shadow: none;
    icon-shadow: none;
@@ -178,7 +178,7 @@
  @else if $t==insensitive {
    color: $insensitive_fg_color;
    border-color: $insensitive_borders_color;
-    background-color: $insensitive_bg_color;
+    background-color: $insensitive_bg_color !important;
    box-shadow: none;
    text-shadow: none;
    icon-shadow: none;
@@ -194,38 +194,3 @@
    icon-shadow: none;
  }
 }
-
-// overview icons
-@mixin overview-icon($color) {
-  .overview-icon {
-    @extend %icon_tile;
-    color: $color;
-  }
-
-  &:hover,
-  &:selected {
-    .overview-icon {
-      background-color: transparentize($color, .9);
-    }
-  }
-
-  &:focus {
-    .overview-icon {
-      background-color: transparentize($color, .7);
-      // border-color: $selected_bg_color;
-    }
-  }
-
-  &:drop {
-    .overview-icon {
-      background-color: transparentize($selected_bg_color, .15);
-    }
-  }
-
-  &:active,
-  &:checked {
-    .overview-icon {
-      background-color: transparentize(darken($osd_bg_color, 10%), .5);
-    }
-  }
-}
--- a/data/theme/gnome-shell-sass/_widgets.scss
+++ b/data/theme/gnome-shell-sass/_widgets.scss
@@ -5,47 +5,34 @@
 //

 /* WIDGETS */
-
-// Primary widgets
-@import 'widgets/base';
-@import 'widgets/entries';
+@import 'widgets/app-grid';
+@import 'widgets/app-switcher';
@import 'widgets/buttons';
-@import 'widgets/check-box';
-@import 'widgets/switches';
-@import 'widgets/slider';
-@import 'widgets/scrollbars';
-// Popovers
-@import 'widgets/popovers';
@import 'widgets/calendar';
-@import 'widgets/message-list';
-@import 'widgets/ibus-popup';
-// Notifications
-@import 'widgets/notifications';
-@import 'widgets/hotplug';
-// Dialogs
-@import 'widgets/dialogs';
-@import 'widgets/network-dialog';
-// OSDs
-@import 'widgets/osd';
-@import 'widgets/switcher-popup';
-@import 'widgets/workspace-switcher';
-// Panel
-@import 'widgets/panel';
+@import 'widgets/check-box';
@import 'widgets/corner-ripple';
-// Overview
+@import 'widgets/dash';
+@import 'widgets/dialogs';
+@import 'widgets/entries';
+@import 'widgets/hotplug';
+@import 'widgets/ibus-popup';
+@import 'widgets/keyboard';
+@import 'widgets/login-dialog';
+@import 'widgets/looking-glass';
+@import 'widgets/message-list';
+@import 'widgets/notifications';
+@import 'widgets/misc';
+@import 'widgets/network-dialog';
+@import 'widgets/osd';
@import 'widgets/overview';
-@import 'widgets/window-picker';
+@import 'widgets/panel';
+@import 'widgets/popovers';
+@import 'widgets/screen-shield';
+@import 'widgets/scrollbars';
@import 'widgets/search-entry';
@import 'widgets/search-results';
-@import 'widgets/app-grid';
-@import 'widgets/dash';
-@import 'widgets/workspace-thumbnails';
-// A11y / misc
-@import 'widgets/a11y';
-@import 'widgets/misc';
+@import 'widgets/slider';
+@import 'widgets/switches';
@import 'widgets/tiled-previews';
-@import 'widgets/keyboard';
-@import 'widgets/looking-glass';
-// Lock / login screens
-@import 'widgets/login-dialog';
-@import 'widgets/screen-shield';
+@import 'widgets/window-picker';
+@import 'widgets/workspace-switcher';
--- a/data/theme/gnome-shell-sass/widgets/_a11y.scss
+++ b/data/theme/gnome-shell-sass/widgets/_a11y.scss
@@ -1,24 +0,0 @@
-// Pointer location
-.ripple-pointer-location {
-  width: $ripple_size;
-  height: $ripple_size;
-  border-radius: $ripple_size * 0.5; // radius equals the size of the box to give us the curve
-  background-color: lighten(transparentize($selected_bg_color, 0.7), 30%);
-  box-shadow: 0 0 2px 2px lighten($selected_bg_color, 20%);
-}
-
-// Pointer accessibility notifications
-.pie-timer {
-  width: 60px;
-  height: 60px;
-  -pie-border-width: 3px;
-  -pie-border-color: $selected_bg_color;
-  -pie-background-color: lighten(transparentize($selected_bg_color, 0.7), 40%);
-}
-
-// Screen zoom/Magnifier
-.magnifier-zoom-region {
-  border: 2px solid $selected_bg_color;
-
-  &.full-screen { border-width: 0; }
-}
--- a/data/theme/gnome-shell-sass/widgets/_app-grid.scss
+++ b/data/theme/gnome-shell-sass/widgets/_app-grid.scss
@@ -11,6 +11,7 @@ $app_icon_padding: 24px;

  .overview-icon {
    icon-size: $app_icon_size;
+    StIcon { margin-bottom: $base_margin; } // margin on icon so label isn't close
  }
 }

@@ -20,24 +21,68 @@ $app_icon_padding: 24px;

 $app_grid_fg_color: #fff;

+// Outline for low res icons
+.lowres-icon {
+  icon-shadow: 0 1px 2px rgba(0,0,0,0.3);
+}
+
+// Dropshadow for large icons
+.icon-dropshadow {
+  icon-shadow: 0 1px 2px rgba(0,0,0,0.4);
+}
+
 // Icon tiles in the app grid
 .app-well-app,
-%app-well-app {
-  @include overview-icon($app_grid_fg_color);
+.app-folder {

-  .overview-icon.overview-icon-with-label {
-    padding: 10px 8px 5px 8px;
+  .overview-icon {
+    @extend %icon_tile;
+    color: $app_grid_fg_color !important;
+  }

-    > StBoxLayout {
-      spacing: $base_spacing;
+  &:selected {
+    .overview-icon {
+      background-color: transparentize($osd_bg_color,0.7);
+      color: $app_grid_fg_color;
+    }
+  }
+
+  &:hover,
+  &:focus,
+  &:selected {
+    .overview-icon {
+      background-color: transparentize($osd_fg_color,0.9);
+      color: $osd_fg_color;
+    }
+  }
+
+  &:focus {
+    .overview-icon {
+      background-color: transparentize($osd_fg_color,0.7  );
+      // border-color: $selected_bg_color;
+      color: $app_grid_fg_color;
+    }
+  }
+
+  &:drop {
+    .overview-icon {
+      background-color: transparentize($selected_bg_color,.15);
+    }
+  }
+
+  &:active,
+  &:checked {
+    .overview-icon {
+      background-color: transparentize(darken($osd_bg_color,10%), 0.5);
    }
  }
 }

 /* 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 {
+    @extend %icon_tile;
+  }
 }

 // expanded folder
@@ -60,7 +105,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 +118,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;
@@ -129,6 +178,11 @@ $app_grid_fg_color: #fff;
  padding: 0px 88px 10px 88px;
 }

+.app-well-app > .overview-icon.overview-icon-with-label {
+  padding: 10px 8px 5px 8px;
+  spacing: $base_spacing;
+}
+
 // Label when no frequent apps
 .no-frequent-applications-label { @extend %status_text; }

@@ -148,35 +202,41 @@ $app_grid_fg_color: #fff;
 }

 // buttons
-.app-view-control {
-  padding: 4px 32px;
-  margin: 0 4px;
+.app-view-control { 
+  padding: $base_padding $base_padding*5;
+  margin: 0;
+  background-color: transparentize($osd_bg_color, 0.5);
+  border-width: 1px;
+  color: darken($osd_fg_color, 25%);

-  &, &:hover, &:checked {
-    @include button(undecorated);
+  &:hover {
+    background-color: transparentize($osd_bg_color, 0.5) !important;
+    box-shadow:none !important;
    color: darken($osd_fg_color, 25%);
  }

-  &:hover {
-    color: $osd_fg_color;
-    box-shadow: inset 0 -2px darken($osd_fg_color, 25%);
-  }
-
  &:active {
-    box-shadow: inset 0 -2px $osd_fg_color;
+    box-shadow: none;
+    background-color: $selected_bg_color !important;
+    &:hover {
+      background-color: lighten($selected_bg_color, 11%) !important;
+    }
  }

  &:checked {
-    color: $osd_fg_color;
-    box-shadow: inset 0 -2px $selected_bg_color;
+    background-color: $selected_bg_color !important;
+    color: $selected_fg_color;
+    box-shadow: none;
+    &:active { background-color: darken($selected_bg_color, 4%) !important; }
+    &:hover { background-color: lighten($selected_bg_color, 7%) !important; }
  }

  &:first-child {
-    border-right-width: 0;
-    border-radius: 0;
+    border-right-width: 0 !important;
+    border-radius: $base_border_radius 0 0 $base_border_radius;
  }

  &:last-child {
-    border-radius: 0;
+    border-radius: 0 $base_border_radius $base_border_radius 0;
  }
 }
--- 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;
    }
  }
@@ -50,16 +52,4 @@
  &:highlighted {
    color: $fg_color;
  }
-}
-
-// Input Source Switcher
-.input-source-switcher-symbol {
-  font-size: 34pt;
-  width: 96px;
-  height: 96px;
-}
-
-// Window cycler highlight
-.cycler-highlight {
-  border: 5px solid $selected_bg_color;
-}
+}
--- a/data/theme/gnome-shell-sass/widgets/_base.scss
+++ b/data/theme/gnome-shell-sass/widgets/_base.scss
@@ -1,18 +0,0 @@
-// Links
-.shell-link {
-  color: $link_color;
-
-  &:hover {
-    color: lighten($link_color, 10%);
-  }
-}
-
-// Outline for low res icons
-.lowres-icon {
-  icon-shadow: 0 1px 2px rgba(black, 0.3);
-}
-
-// Dropshadow for large icons
-.icon-dropshadow {
-  icon-shadow: 0 1px 2px rgba(black, 0.4);
-}
--- a/data/theme/gnome-shell-sass/widgets/_calendar.scss
+++ b/data/theme/gnome-shell-sass/widgets/_calendar.scss
@@ -1,65 +1,87 @@
 /* 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 {
  padding:0;
+  margin:0;
 }

 // Calendar menu side column
 .datemenu-calendar-column {
-  spacing: $base_spacing;
+  spacing: 0;
  border: 0 solid $bubble_borders_color;
-  padding: 0 $base_padding * 2;
+  padding: $base_padding * 2;
+  padding-bottom: 3em; // account for the notifications clear button
+  padding-top:0;

  &:ltr {margin-right: $base_margin * 2; border-left-width: 1px; }
  &:rtl {margin-left: $base_margin * 2; border-right-width: 1px; }

+  // today button (the date)
+  .datemenu-today-button {
+    padding: $base_padding * 1.5;
+    margin: $base_margin;
+    border: 1px solid transparent;
+    border-radius: $base_border_radius + 2px;
+
+    &:hover { @include button(hover);}
+    &:focus { @include button(focus);}
+
+    &:active {
+      @include button(active);
+    }
+
+    // weekday label
+    .day-label {
+      @include fontsize($base_font_size+1);
+      font-weight: bold;
+    }
+
+    // date label
+    .date-label {
+      @include fontsize($base_font_size+7);
+      font-weight: 1000;
+    }
+  }
+
+  // calendar
+  .calendar {
+    @extend %notification_bubble;
+    margin:$base_margin !important;
+    margin-bottom: $base_padding + $base_margin !important;
+    padding:$base_padding !important;
+
+    // more below for sub-elements
+  }
+
  .datemenu-displays-section {
+    margin:0;
  }

  .datemenu-displays-box {
    spacing: $base_spacing;
+    margin:0;
+
+    // world clocks and weather
+    .world-clocks-button,
+    .weather-button {
+      @extend %notification_bubble;
+      padding:$base_padding !important;
+    }
  }
 }

 .events-section-title {
-  @include notification_bubble($flat: true);
  color: desaturate(darken($fg_color,40%), 10%);
  font-weight: bold;
+  border-radius: 4px;
  padding: .4em;
 }

-/* today button (the date) */
-.datemenu-today-button {
-  @include notification_bubble($flat: true);
-  padding: $base_padding * 1.5;
-
-  // weekday label
-  .day-label {
-    @include fontsize($base_font_size+1);
-    font-weight: bold;
-  }
-
-  // date label
-  .date-label {
-    @include fontsize($base_font_size+7);
-    font-weight: 1000;
-  }
-}
-
 /* Calendar */
 .calendar {
-  @include notification_bubble;
-  padding: $base_padding;

  // month
  .calendar-month-label {
@@ -110,7 +132,6 @@
      @include fontsize($base_font_size - 4);
    }
  }
-
  .calendar-day { //border collapse hack - see calendar.js
    border-width: 0;
  }
@@ -119,12 +140,8 @@
    border-top-width: 1px;
  }

-  .calendar-day-left {
-    border-left-width: 1px;
-  }
-
+  .calendar-day-left { border-left-width: 1px; }
  .calendar-work-day {}
-
  .calendar-nonwork-day {
    color: $insensitive_fg_color;
  }
@@ -144,14 +161,13 @@
    &:active,&:selected {
      background-color: $selected_bg_color;
      color: $selected_fg_color;
-
      &:hover,&:focus {
        background-color:lighten($selected_bg_color, 3%);
        color: $selected_fg_color;
      }
    }
-  }

+  }
  .calendar-day-with-events {
    color: lighten($fg_color,10%);
    font-weight: bold;
@@ -160,6 +176,7 @@

  .calendar-other-month-day {
    color: transparentize($fg_color ,0.5);
+    opacity: 0.5;
  }

  .calendar-week-number {
@@ -175,16 +192,51 @@
  }
 }

-/* World clocks */
-.world-clocks-button {
-  @include notification_bubble;
-  padding: $base_padding * 2;

-  .world-clocks-grid {
+/* Weather */
+.weather-box {
+  spacing: $base_spacing;
+  padding:$base_padding;
+
+  .weather-header {
+    color: desaturate(darken($fg_color,40%), 10%);
+    font-weight: bold;
+    &.location {
+      font-weight: normal;
+      @include fontsize($base_font_size - 1);
+    }
+  }
+
+  .weather-grid {
+    margin-top: $base_margin;
    spacing-rows: $base_spacing;
    spacing-columns: $base_spacing * 2;
  }

+  .weather-forecast-time {
+    color: darken($fg_color,30%);
+    font-feature-settings: "tnum";
+    @include fontsize($base_font_size - 2);
+    font-weight: normal;
+    padding-top: 0.2em;
+    padding-bottom: 0.4em;
+  }
+
+  .weather-forecast-icon {
+    icon-size: $base_icon_size * 2;
+  }
+
+  .weather-forecast-temp {
+    font-weight: bold;
+  }
+}
+
+/* World clocks */
+.world-clocks-grid {
+  padding:$base_padding;
+  spacing-rows: $base_spacing;
+  spacing-columns: $base_spacing * 2;
+
  // title
  .world-clocks-header {
    color: desaturate(darken($fg_color,40%), 10%);
@@ -214,49 +266,3 @@
    @include fontsize($base_font_size - 1);
  }
 }
-
-/* Weather */
-.weather-button {
-  @include notification_bubble;
-  padding: $base_padding * 2;
-
-  .weather-box {
-    spacing: $base_spacing + $base_margin;
-  }
-
-  .weather-header-box {
-    spacing: $base_spacing;
-  }
-
-  .weather-header {
-    color: desaturate(darken($fg_color,40%), 10%);
-    font-weight: bold;
-
-    &.location {
-      font-weight: normal;
-      @include fontsize($base_font_size - 1);
-    }
-  }
-
-  .weather-grid {
-    spacing-rows: $base_spacing;
-    spacing-columns: $base_spacing * 2;
-  }
-
-  .weather-forecast-time {
-    color: darken($fg_color,30%);
-    font-feature-settings: "tnum";
-    @include fontsize($base_font_size - 2);
-    font-weight: normal;
-    padding-top: 0.2em;
-    padding-bottom: 0.4em;
-  }
-
-  .weather-forecast-icon {
-    icon-size: $base_icon_size * 2;
-  }
-
-  .weather-forecast-temp {
-    font-weight: bold;
-  }
-}
--- a/data/theme/gnome-shell-sass/widgets/_corner-ripple.scss
+++ b/data/theme/gnome-shell-sass/widgets/_corner-ripple.scss
@@ -13,3 +13,12 @@ $ripple_size: 50px;
  // just a simple change to the border radius position
  &:rtl { border-radius: 0 0 0 $ripple_size + 2px; }
 }
+
+// Pointer location
+.ripple-pointer-location {
+  width: $ripple_size;
+  height: $ripple_size;
+  border-radius: $ripple_size * 0.5; // radius equals the size of the box to give us the curve
+  background-color: lighten(transparentize($selected_bg_color, 0.7), 30%);
+  box-shadow: 0 0 2px 2px lighten($selected_bg_color, 20%);
+}
--- a/data/theme/gnome-shell-sass/widgets/_dash.scss
+++ b/data/theme/gnome-shell-sass/widgets/_dash.scss
@@ -9,11 +9,12 @@ $dash_border_radius: $modal_radius * 1.5;
  @include fontsize($base_font_size - 2);
  padding: ($dash_spacing / 2) 0;

+  //fixme: can't have non uniform borders :(
  border-radius: 0 $dash_border_radius $dash_border_radius 0; 
-  border-left-width: 0;
-  &:rtl {
+  border-left-width: 0 !important;
+  &:rtl { 
    border-radius: $dash_border_radius 0 0 $dash_border_radius;
-    border-right-width: 0;
+    border-right-width: 0 !important;
  }

  .placeholder {
@@ -48,13 +49,36 @@ $dash_border_radius: $modal_radius * 1.5;

 // Show apps button
 .show-apps {
-  @include overview-icon($osd_fg_color);
+  color: $osd_fg_color;

+  & .overview-icon {
+    @extend %icon_tile;
+    color: $osd_fg_color;
+  }
+
+  &:hover,
  &:focus,
-  &:checked {
+  &:selected {
+    .overview-icon {
+      background-color: transparentize($osd_fg_color,0.9);
+      color: $osd_fg_color;
+    }
+  }
+
+  &:drop .overview-icon {
+    background-color: transparentize($selected_bg_color,.15);
+  }
+
+  &:active, &:checked {
    .overview-icon {
      background-color: darken($osd_bg_color,10%);
+    }
+  }
+
+  &:checked, &:focus {
+     .show-apps-icon {
      color: $fg_color;
+      transition-duration: 100ms;
    }
  }
 }
--- a/data/theme/gnome-shell-sass/widgets/_dialogs.scss
+++ b/data/theme/gnome-shell-sass/widgets/_dialogs.scss
@@ -1,9 +1,5 @@
 /* Modal Dialogs */

-.headline {
-  @include fontsize($base_font_size + 1);
-}
-
 .modal-dialog {
  border-radius: $modal_radius;
  @extend %bubble_panel;
@@ -19,7 +15,12 @@
  }
 }

+.mount-dialog-subject {
+  @include fontsize($base_font_size + 3);
+}
+
 /* End Session Dialog */
+
 .end-session-dialog {
  width: 30em;

@@ -37,11 +38,6 @@
    text-align: center;
    font-size: 18pt;
    font-weight: 800;
-
-    &.leightweight {
-      font-size: 13pt;
-      font-weight: 800;
-    }
  }
  .message-dialog-description { text-align: center; }
 }
@@ -166,3 +162,8 @@
 .audio-selection-device-icon {
  icon-size: $base_icon_size * 4;
 }
+
+/* Access Dialog */
+.access-dialog {
+  spacing: 30px;
+}
--- a/data/theme/gnome-shell-sass/widgets/_ibus-popup.scss
+++ b/data/theme/gnome-shell-sass/widgets/_ibus-popup.scss
@@ -1,9 +1,4 @@
 // IBus Candidate Popup
-
-.candidate-popup-boxpointer {
-  @extend .popup-menu-boxpointer;
-}
-
 .candidate-popup-content {
  padding: 0.5em;
  spacing: 0.3em;
--- a/data/theme/gnome-shell-sass/widgets/_keyboard.scss
+++ b/data/theme/gnome-shell-sass/widgets/_keyboard.scss
@@ -10,7 +10,7 @@ $default_key_bg_color: if($variant=='light', darken($osd_bg_color, 11%), lighten
 // 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;
+  box-shadow: inset 0 1px 0 0 $osd_outer_borders_color !important;

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

  // non-character keys
  &.default-key {
+
+    // size of the icon asset
+    background-size: 24px;
+
    @include button(normal, $c:$default_key_bg_color);
    &:hover, &:checked {@include button(hover, $c: $default_key_bg_color);}
    &:active { @include button(active, $c: $default_key_bg_color);}
@@ -59,14 +63,19 @@ $default_key_bg_color: if($variant=='light', darken($osd_bg_color, 11%), lighten

  // enter key is suggested-action
  &.enter-key {
+    background-image: url("resource:///org/gnome/shell/theme/key-enter.svg");
+
    @include button(normal, $c:$selected_bg_color, $tc:$selected_fg_color);
    &:hover, &:checked { @include button(hover, $c: lighten($selected_bg_color, 3%));}
    &:active {@include button(active, $c: darken($selected_bg_color, 2%));}
  }

-  &.shift-key-uppercase { color: $selected_bg_color }
-
-  StIcon { icon-size: 1.125em; }
+  // key assets
+  &.shift-key-lowercase {background-image: url("resource:///org/gnome/shell/theme/key-shift.svg");}
+  &.shift-key-uppercase {background-image: url("resource:///org/gnome/shell/theme/key-shift-uppercase.svg");}
+  &.shift-key-uppercase:latched {background-image: url("resource:///org/gnome/shell/theme/key-shift-latched-uppercase.svg");}
+  &.hide-key {background-image: url("resource:///org/gnome/shell/theme/key-hide.svg");}
+  &.layout-key {background-image: url("resource:///org/gnome/shell/theme/key-layout.svg");}
 }

 // long press on a key popup
@@ -112,4 +121,4 @@ $default_key_bg_color: if($variant=='light', darken($osd_bg_color, 11%), lighten
  @include fontsize($base_font_size + 3);
  spacing: 12px;
  min-height: 20pt;
-}
+}
--- a/data/theme/gnome-shell-sass/widgets/_login-dialog.scss
+++ b/data/theme/gnome-shell-sass/widgets/_login-dialog.scss
@@ -68,30 +68,12 @@
      }
    }
  }
-
-  .cancel-button,
-  .switch-user-button,
-  .login-dialog-session-list-button {
-    padding: 0;
-    border-radius: 99px;
-    width: $base_icon_size * 2;
-    height: $base_icon_size * 2;
-    border-color: transparentize($bg_color,0.7);
-    background-color: transparentize($bg_color,0.7);
-
-    StIcon { icon-size: $base_icon_size; }
-  }
-
-  .caps-lock-warning-label,
-  .login-dialog-message-warning {
-    color: $osd_fg_color;
-  }
 }

 .login-dialog-logo-bin { padding: 24px 0px; }
 .login-dialog-banner { color: darken($osd_fg_color,10%); }
-.login-dialog-button-box { width: 23em; spacing: 5px; }
-.login-dialog-message { text-align: center; }
+.login-dialog-button-box { spacing: 5px; }
+.login-dialog-message-warning { color: $warning_color; }
 .login-dialog-message-hint { padding-top: 0; padding-bottom: 20px; }
 .login-dialog-user-selection-box { padding: 100px 0px; }
 .login-dialog-not-listed-label {
@@ -118,7 +100,7 @@
 }

 .login-dialog-user-list-item {
-  border-radius: $base_border_radius + 4px;
+  border-radius: 5px;
  padding: 6px;
  color: darken($osd_fg_color,30%);
  &:ltr .user-widget { padding-right: 1em; }
@@ -131,25 +113,18 @@
  &:focus .login-dialog-timed-login-indicator { background-color: $selected_fg_color; }
 }

+.login-dialog-username,
 .user-widget-label {
  color: $osd_fg_color;
-}
-
-.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; }
-  &:rtl { padding-right: 14px; }
 }

-.user-widget.vertical .user-widget-label {
-  @include fontsize($base_font_size + 5);
-  text-align: center;
-  font-weight: normal;
-  padding-top: 16px;
+.user-widget-label {
+  &:ltr { padding-left: 14px; }
+  &:rtl { padding-right: 14px; }
 }

 .login-dialog-prompt-layout {
@@ -159,12 +134,18 @@
  width: 23em;
 }

-.login-dialog-prompt-entry {
-  height: 1.5em;
-}
-
 .login-dialog-prompt-label {
  color: darken($osd_fg_color, 20%);
  @include fontsize($base_font_size + 1);
  padding-top: 1em;
 }
+
+.login-dialog-session-list-button StIcon {
+  icon-size: 1.25em;
+}
+
+.login-dialog-session-list-button {
+  color: darken($osd_fg_color,30%);
+  &:hover,&:focus { color: $osd_fg_color; }
+  &:active { color: darken($osd_fg_color, 50%); }
+}
--- a/data/theme/gnome-shell-sass/widgets/_looking-glass.scss
+++ b/data/theme/gnome-shell-sass/widgets/_looking-glass.scss
@@ -5,14 +5,14 @@
  background-color: $osd_bg_color;
  spacing: $base_spacing;
  padding: 4px;
-  border: 1px solid transparentize($osd_fg_color, 0.8);
-  border-radius: $base_border_radius;
-  color: $osd_fg_color;
+  border: 2px solid transparentize($osd_fg_color, 0.8);
+  border-top-width:0;
+  border-radius: 0 0 $base_border_radius $base_border_radius;

  & > #Toolbar {
    border: none;
    border-radius: $base_border_radius;
-    background-color: $osd_bg_color;
+    background-color: darken($osd_bg_color, 10%);
  }

  .labels { spacing: $base_spacing; }
@@ -20,18 +20,19 @@
    -natural-hpadding: $base_padding * 2;
    -minimum-hpadding: 6px;
    font-weight: bold;
-    color: darken($osd_fg_color, 15%);
+    color: $fg_color;
    transition-duration: 100ms;
    padding-left: .3em;
    padding-right: .3em;
-    border-bottom-width: 2px;
    &:hover {
-      color: $osd_fg_color;
+      color: white;
+      text-shadow: black 0px 2px 2px;
    }
    &:selected {
      border-bottom-width: 2px;
-      box-shadow: inset 0 -2px 0 0 lighten($selected_bg_color, 5%);
-      color: $osd_fg_color;
+      border-color: lighten($selected_bg_color,5%);
+      color: white;
+      text-shadow: black 0px 2px 2px;
    }
  }
  StBoxLayout#EvalBox { padding: 4px; spacing: $base_spacing; }
@@ -40,17 +41,12 @@

 .lg-dialog {
  StEntry {
-    background-color: transparentize(lighten($osd_bg_color, 5%), 0.4);
-    color: $osd_fg_color;
-    border-color: transparentize($osd_fg_color, 0.8);
-    min-height: 22px;
-    selection-background-color: $selected_bg_color;
-    selected-color: $selected_fg_color;
+    selection-background-color: #bbbbbb;
+    selected-color: $osd_bg_color;
  }
  .shell-link {
-    color: $link_color;
-    &:hover { color: lighten($link_color, 10%); }
-    &:active { color: darken($link_color, 10%); }
+    color: #999999;
+    &:hover { color: #dddddd; }
   }
 }

@@ -64,7 +60,7 @@
 }

 .lg-obj-inspector-button {
-    border: 1px solid $osd_borders_color;
+    border: 1px solid gray;
    padding: 4px;
    border-radius: $base_border_radius;
    &:hover { border: 1px solid #ffffff; }
@@ -79,8 +75,7 @@
 }

 .lg-extension {
-    border: 1px solid lighten($osd_borders_color, 5%);
-    background-color: lighten($osd_bg_color, 5%);
+    border: 1px solid $osd_borders_color;
    border-radius: $base_border_radius;
    padding: 4px;
 }
--- a/data/theme/gnome-shell-sass/widgets/_message-list.scss
+++ b/data/theme/gnome-shell-sass/widgets/_message-list.scss
@@ -11,7 +11,7 @@

 .message-list-sections {
  spacing: $base_spacing;
-  margin: 0 $base_margin * 4; // to account for scrollbar
+  margin: $base_margin * 4; // to account for scrollbar
 }

 .message-list-section,
@@ -19,61 +19,40 @@
  spacing: $base_spacing;
 }

+.message-list-section-list {
+  &:ltr {padding:0;}
+  &:rtl {padding:0;}
+}
+
 // do-not-disturb + clear button
 .message-list-controls {
-  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;
+  margin: $base_margin $base_margin*2;
+  spacing: $base_spacing;
 }

 // message bubbles
 .message {
-  @include notification_bubble;
+  @extend %notification_bubble;

-  // icon container
-  .message-icon-bin {
-    padding: ($base_padding * 3) 0 ($base_padding * 3) ($base_padding * 2);
-
-    &:rtl {
-      padding: ($base_padding * 3) ($base_padding * 2) ($base_padding * 3) 0;
-    }
-
-    // icon size and color
-    > StIcon {
-      icon-size: $base_icon_size*2; // 32px
-      -st-icon-style: symbolic;
-    }
-
-    // fallback
-    > .fallback-app-icon {
-      width: $base_icon_size;
-      height: $base_icon_size;
-    }
+  // title
+  .message-title {
+    color: $fg_color;
+    font-weight: bold;
+    margin-bottom:4px;
  }

  // content
  .message-content {
-    padding: $base_padding + $base_margin * 2;
-    spacing: 4px;
-  }
-
-  // title
-  .message-title {
-    font-weight: bold;
-  }
-
-  // secondary container in title box
-  .message-secondary-bin {
-    padding: 0 $base_margin * 2;
-
-    // notification time stamp
-    > .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;
+    color: darken($fg_color, 10%);
+    padding: $base_padding 0;
+    margin:$base_margin * 2;
+    &:ltr {
+      margin-left: $base_margin;
+      padding-right:$base_padding;
+    }
+    &:rtl {
+      margin-right: $base_margin;
+      padding-left:$base_padding;
    }
  }

@@ -84,15 +63,48 @@
    &:active { color: if($variant=='light', lighten($fg_color, 40%), darken($fg_color, 20%)); }
  }

-  // body
-  .message-body {
-    color: darken($fg_color, 10%);
-  }
-}

-// URLs in messages
-.url-highlighter {
-  link-color: $link_color;
+  // icon container
+  .message-icon-bin {
+    padding: $base_padding;
+    margin:$base_padding 0;
+
+    &:rtl {
+      // padding: $base_padding;
+    }
+
+    // icon size and color
+    > StIcon {
+      color: $fg_color;
+      icon-size: $base_icon_size*2; // 32px
+      -st-icon-style: symbolic;
+
+      padding:0;
+      margin:$base_padding;
+    }
+
+    // fallback
+    > .fallback-app-icon {
+      width: $base_icon_size;
+      height: $base_icon_size;
+    }
+  }
+
+  // secondary container in title box
+  .message-secondary-bin {
+    padding: 0;
+
+    // notification time stamp
+    > .event-time {
+      color: transparentize($fg_color, 0.5);
+      @include fontsize($base_font_size - 2);
+      text-align: right;
+      margin: 0 $base_margin * 2;
+      /* HACK: the label should be baseline-aligned with a 1em label, fake this with some bottom padding */
+      padding-bottom: $base_padding;
+    }
+  }
+
 }

 /* Media Controls */
@@ -113,9 +125,9 @@

  &:insensitive { color: darken($fg_color,40%); }
  
-  // fix border-radius for last button
-  &:last-child:ltr { border-radius: 0 $base_border_radius+2 $base_border_radius+2 0; }
-  &:last-child:rtl { border-radius: $base_border_radius+2 0 0 $base_border_radius+2; }
+  // fix border-radius for last button on hover
+  &:last-child:ltr { &:hover {border-radius:  0 $base_border_radius+2 $base_border_radius+2 0;} }
+  &:last-child:rtl { &:hover {border-radius: $base_border_radius+2 0 0 $base_border_radius+2;} }
 }

 // album-art
@@ -130,5 +142,6 @@
    border: 1px solid transparent;
    border-radius: $base_border_radius;
    icon-size: $base_icon_size * 2 !important;
+    padding: $base_padding * 2;
  }
 }
--- a/data/theme/gnome-shell-sass/widgets/_misc.scss
+++ b/data/theme/gnome-shell-sass/widgets/_misc.scss
@@ -1,9 +1,32 @@
+// Links/URLs
+.shell-link {
+  color: $link_color;
+  &:hover { color: lighten($link_color,10%); }
+}
+
+.url-highlighter { link-color: $link_color; }
+
 // Rubberband for select-area screenshots
 .select-area-rubberband {
  background-color: transparentize($selected_bg_color,0.7);
  border: 1px solid $selected_bg_color;
 }

+// Pointer accessibility notifications
+.pie-timer {
+  width: 60px;
+  height: 60px;
+  -pie-border-width: 3px;
+  -pie-border-color: $selected_bg_color;
+  -pie-background-color: lighten(transparentize($selected_bg_color, 0.7), 40%);
+}
+
+// Screen zoom/Magnifier
+.magnifier-zoom-region {
+  border: 2px solid $selected_bg_color;
+  &.full-screen { border-width: 0; }
+}
+
 // User icon
 .user-icon {
  background-size: contain;
@@ -12,33 +35,22 @@
  &:hover {
    color: lighten($osd_fg_color,30%);
  }
-
-  & StIcon {
-    background-color: transparentize($osd_fg_color,0.95);
-    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;
-  }
+// Input Source Switcher
+.input-source-switcher-symbol {
+  font-size: 34pt;
+  width: 96px;
+  height: 96px;
 }

-.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;
-  }
+// Window cycler highlight
+.cycler-highlight {
+  border: 5px solid $selected_bg_color;
 }

+// Text
+.headline { @include fontsize($base_font_size + 1); }
 .lightbox { background-color: black; }
 .flashspot { background-color: white; }

--- a/data/theme/gnome-shell-sass/widgets/_notifications.scss
+++ b/data/theme/gnome-shell-sass/widgets/_notifications.scss
@@ -7,8 +7,39 @@ $notification_banner_width: 34em;
 .notification-banner {
  min-height: $notification_banner_height;
  width: $notification_banner_width;
+  @include fontsize($base_font_size);
+  margin: $base_margin;
+  border-radius: $modal_radius;
+
+  .message-title { color: $fg_color }
+  .message-content { color: $fg_color; }
+
+  &:hover { background: $bg_color; }
+  &, &:focus, &:active {
+    background-color: $bg_color;
+    .message-title { color: $fg_color }
+    .message-content { color: $fg_color; }
+  }
+
+  // icon
+  .message-icon-bin > StIcon {
+    icon-size: $base_icon_size * 2;
+    color: $fg_color;
+  }
+
+  .notification-icon {
+    padding: 5px;
+  }
+
+  .notification-content {
+    padding: 5px;
+    spacing: 5px;
+  }
+
+  .secondary-icon { icon-size: $base_icon_size; }

  .notification-actions {
+    padding-top: 0;
    spacing: 0;
  }

@@ -32,6 +63,8 @@ $notification_banner_width: 34em;
  border-radius: 0.9em; // should be 0.8 but whatever; wish I could do 50%;
 }

+.secondary-icon { icon-size: $base_icon_size; }
+
 // chat bubbles
 .chat-body { spacing: 5px; }
 .chat-response { margin: 5px; }
@@ -54,4 +87,4 @@ $notification_banner_width: 34em;
  font-weight: bold;
  color: lighten($fg_color,18%);
  &:rtl { padding-left: 0; padding-right: 4px; }
-}
+}
--- a/data/theme/gnome-shell-sass/widgets/_panel.scss
+++ b/data/theme/gnome-shell-sass/widgets/_panel.scss
@@ -2,8 +2,8 @@
 // a.k.a. the panel

 $panel_corner_radius: $base_border_radius+1;
-$panel_bg_color: #000;
-$panel_fg_color: #ccc;
+$panel_bg_color: if($variant == 'light', rgba(0,0,0,0.9), #000);
+$panel_fg_color: if($variant == 'light', darken($fg_color, 15%), darken($fg_color, 10%));
 $panel_height: 1.86em;


@@ -15,7 +15,8 @@ $panel_height: 1.86em;

  // transparent panel on lock & login screens
  &.unlock-screen,
-  &.login-screen {
+  &.login-screen,
+  &.lock-screen {
    background-color: transparent;

    .panel-corner {
@@ -54,6 +55,9 @@ $panel_height: 1.86em;
    }

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

@@ -73,32 +77,13 @@ $panel_height: 1.86em;

    // lock & login screen styles
    .unlock-screen &,
-    .login-screen & {
+    .login-screen &,
+    .lock-screen & {
      color: lighten($fg_color, 10%);
      &:focus, &:hover, &:active { color: lighten($fg_color, 10%); }
    }
  }

-  .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
@@ -3,7 +3,8 @@
 $popover_arrow_height: 12px;

 //.the popover itself
-.popup-menu-boxpointer {
+.popup-menu-boxpointer,
+.candidate-popup-boxpointer {
  -arrow-border-radius: $base_border_radius+4;
  -arrow-background-color: $bg_color;
  -arrow-border-width: 1px;
@@ -82,20 +83,11 @@ $popover_arrow_height: 12px;

 // separator
 .popup-separator-menu-item {
-  padding: 0;
-
-  .popup-separator-menu-item-separator {
-    //-margin-horizontal: 24px;
-    height: 1px; //not really the whole box
-    margin: 6px 64px;
-    background-color: lighten($borders_color, 2%);
-    .popup-sub-menu & { //submenu separators
-      margin: 0 64px 0 32px;
-      @if $variant == 'dark' {
-        background-color: lighten($bg_color,10%);
-      }
-    }
-  }
+  //-margin-horizontal: 24px;
+  height: 1px; //not really the whole box
+  margin: 6px 64px;
+  background-color: lighten($borders_color, 2%);
+  border: none !important;
 }

 // desktop background menu
@@ -126,4 +118,4 @@ $popover_arrow_height: 12px;
      margin-right: $base_icon_size;
    }
  }
-}
+}
--- a/data/theme/gnome-shell-sass/widgets/_screen-shield.scss
+++ b/data/theme/gnome-shell-sass/widgets/_screen-shield.scss
@@ -1,64 +1,68 @@
 /* Screen Shield */

-.unlock-dialog-clock {
-  color: white;
-  font-weight: 300;
-  text-align: center;
-  spacing: 24px;
-  padding-bottom: 2.5em;
+$_screenshield_shadow: 0px 0px 6px rgba(0, 0, 0, 0.726);
+
+.screen-shield-arrows {
+  padding-bottom: 3em;
 }

-.unlock-dialog-clock-time {
-  font-size: 64pt;
-  padding-top: 42px;
+.screen-shield-arrows Gjs_Arrow {
+  color: white;
+  width: 80px;
+  height: 48px;
+  -arrow-thickness: 12px;
+  -arrow-shadow: $_screenshield_shadow;
+}
+
+.screen-shield-clock {
+  color: white;
+  text-shadow: $_screenshield_shadow;
+  font-weight: bold;
+  text-align: center;
+  padding-bottom: 1.5em;
+}
+
+.screen-shield-clock-time {
+  font-size: 72pt;
+  text-shadow: $_screenshield_shadow;
  font-feature-settings: "tnum";
 }

-.unlock-dialog-clock-date {
-  font-size: 16pt;
+.screen-shield-clock-date { 
+  font-size: 28pt;
  font-weight: normal;
 }

-.unlock-dialog-clock-hint {
-  font-weight: normal;
-  padding-top: 48px;
-}
-
-.unlock-dialog-notifications-container {
-  margin: 12px 0;
+.screen-shield-notifications-container {
  spacing: 6px;
-  width: 23em;
+  width: 30em;
  background-color: transparent;
+  max-height: 500px;
  .summary-notification-stack-scrollview {
    padding-top: 0;
    padding-bottom: 0;
  }

  .notification,
-  .unlock-dialog-notification-source {
+  .screen-shield-notification-source {
    padding: 12px 6px;
-    border: none;
-    background-color: transparentize($osd_bg_color,0.7);
+    border: 1px solid $osd_outer_borders_color;
+    background-color: transparentize($osd_bg_color,0.5);
    color: $osd_fg_color;
-    border-radius: $modal_radius;
-
-    &.critical { background-color: transparentize($osd_bg_color,0.1) }
+    border-radius: 4px;
  }
+  .notification { margin-right: 15px; } //compensate for space allocated to the scrollbar
 }

-.unlock-dialog-notification-label {
+
+.screen-shield-notification-label {
+  font-weight: bold;
  padding: 0px 0px 0px 12px;
 }

-.unlock-dialog-notification-count-text {
-  weight: bold;
-  padding: 0 6px;
-  color: $osd_bg_color;
-  background-color: transparentize($osd_fg_color, 0.7);
-  border-radius: 99px;
-  margin-right: 12px;
+.screen-shield-notification-count-text { padding: 0px 0px 0px 12px; }

-}
+#panel.lock-screen { background-color: transparentize($osd_bg_color, 0.5); }

 .screen-shield-background { //just the shadow, really
  background: black;
@@ -69,7 +73,7 @@
  background-color: lighten(#2e3436, 8%);
 }

-#unlockDialogNotifications {
+#screenShieldNotifications {
  StButton#vhandle, StButton#hhandle {
    background-color: transparentize($bg_color,0.7);
    &:hover, &:focus { background-color: transparentize($bg_color,0.5); }
--- a/data/theme/gnome-shell-sass/widgets/_search-results.scss
+++ b/data/theme/gnome-shell-sass/widgets/_search-results.scss
@@ -3,16 +3,19 @@
 // search overview container
 #searchResultsContent {
  max-width: 1024px;
-  spacing: $base_margin * 2;
 }

 // search results sections "the boxes"
 .search-section {
-  // This should be equal to #searchResultsContent spacing
  spacing: $base_margin * 2;
-
+  padding:0 !important;
+  margin:0 !important;
+  background-color:transparent;
+  box-shadow:none;
+  border:none;
  // separator
  .search-section-separator { 
+    // margin-top: $base_padding * 2;
    // height: 1px;
    // background-color: $osd_outer_borders_color;
    height: 0;
@@ -29,24 +32,8 @@
  text-shadow: 0 1px if($variant == 'light', rgba(255,255,255,0.2), rgba(0,0,0,0.2));
  color: $osd_fg_color;
  padding: $base_padding * 3;
-  // This is the space between the provider icon and the results container
-  spacing: $base_margin * 2;
-}
-
-%search-section-content-item {
-  @extend %icon_tile;
-
-  &:focus,
-  &:hover,
-  &:selected {
-    background-color: transparentize($osd_fg_color, .9);
-    transition-duration: 200ms;
-  }
-
-  &:active,
-  &:checked {
-    background-color: transparentize(darken($osd_bg_color, 10%), .1);
-  }
+  margin: $base_margin 0;
+  spacing: 0;
 }

 // "no results" text
@@ -56,12 +43,54 @@

 // Search results with icons
 .grid-search-result {
-  @extend %app-well-app;
+  > .overview-icon {
+    @extend %icon_tile;
+    color: $osd_fg_color;
+  }
+
+  > .overview-icon.overview-icon-with-label {
+    padding: 10px 8px 5px 8px;
+    spacing: $base_spacing;
+  }
+
+  &:hover,
+  &:focus,
+  &:selected {
+    .overview-icon {
+      background-color: transparentize($osd_bg_color,0.8);
+      color: $osd_fg_color;
+    }
+  }
+
+  &:drop .overview-icon {
+    background-color: transparentize($selected_bg_color,.15);
+  }
+
+  &:active .overview-icon,
+  &:checked .overview-icon {
+    background-color: transparentize(darken($osd_bg_color,10%), 0.5);
+  }
 }

 // search result provider
 .search-provider-icon {
-  @extend %search-section-content-item;
+  @extend %icon_tile;
+
+  padding: $base_padding;
+  spacing: 0;
+  margin-right: $base_margin * 2;
+
+  &:focus,
+  &:selected,
+  &:hover {
+    background-color: transparentize($osd_fg_color,.9);
+    transition-duration: 200ms;
+  }
+
+  &:active,
+  &:checked {
+    background-color: transparentize(darken($osd_bg_color,10%),.1);
+  }

  // content
  .list-search-provider-content {
@@ -84,16 +113,34 @@

 // search result listitem
 .list-search-result {
-  @extend %search-section-content-item;
+  @extend %icon_tile;
+  spacing: 0;
+  padding: $base_padding;
+  color: $osd_fg_color;
+
+  border-radius: $base_border_radius + 2px !important;
+
+  &:focus,
+  &:selected,
+  &:hover {
+    background-color: transparentize($osd_fg_color,.9);
+    transition-duration: 200ms;
+  }
+  &:active,
+  &:checked {
+    background-color: transparentize(darken($osd_bg_color,10%),.1);
+  }

  // content
  .list-search-result-content {
-    spacing: $base_padding;
+    spacing: 0;
  }

-  // list item title (with leading icon)
+  // list item title
  .list-search-result-title {
+    color: $osd_fg_color;
    spacing: $base_spacing * 2;
+    padding-right: $base_padding;
    // font-weight: bold;
  }

--- a/data/theme/gnome-shell-sass/widgets/_window-picker.scss
+++ b/data/theme/gnome-shell-sass/widgets/_window-picker.scss
@@ -1,7 +1,7 @@
 /* Window Picker */

-$window_picker_spacing: $base_spacing * 2; // 16px
-$window_picker_padding: $base_padding * 2; // 16px
+$window_picker_spacing: $base_spacing * 8; // 48px
+$window_picker_padding: $base_padding * 10; // 60px

 $window_thumbnail_border_color:transparentize($selected_fg_color, 0.65);

@@ -63,4 +63,4 @@ $window_close_button_padding: 3px;
  &:active {
    background-color: darken($selected_bg_color, 5%);
  }
-}
+}
--- a/data/theme/gnome-shell-sass/widgets/_workspace-switcher.scss
+++ b/data/theme/gnome-shell-sass/widgets/_workspace-switcher.scss
@@ -16,6 +16,7 @@
 }

 .ws-switcher-box {
+  // background: transparent;
  background: transparent;
  height: 50px;
  background-size: 32px;
@@ -28,9 +29,44 @@
 .ws-switcher-active-down,
 .ws-switcher-active-left,
 .ws-switcher-active-right {
-  height: 52px;
  background-color: $selected_bg_color;
  border: 1px solid if($variant=='light', darken($selected_bg_color, 8%), lighten($selected_bg_color, 5%));
  border-radius: $base_border_radius + 3px;
  color: $selected_fg_color;
 }
+
+/* Workspace pager */
+
+// thumbnails in overview
+.workspace-thumbnails { 
+  @extend %overview_panel;
+  visible-width: 32px; //amount visible before hover
+  spacing: $base_spacing;
+  padding: $base_padding;
+
+  border-radius: $modal_radius 0 0 $modal_radius;
+  border-right-width: 0 !important;
+  //fixme: can't have non uniform borders :(
+  border-top-left-radius:0 !important;
+  border-bottom-left-radius:0 !important;
+
+  &:rtl { 
+    border-radius: 0 $modal_radius $modal_radius 0; 
+    border-left-width: 0 !important;
+  }
+
+  // drag and drop indicator
+  .placeholder {
+    background-image: url("resource:///org/gnome/shell/theme/dash-placeholder.svg");
+    background-size: contain;
+    height: 24px;
+  }
+}
+
+// selected indicator
+.workspace-thumbnail-indicator {
+  border: 3px solid $selected_bg_color;
+  border-radius: 3px;
+  padding: 0px;
+  // background-color: transparentize($selected_bg_color, 0.9);
+}
--- a/data/theme/gnome-shell-sass/widgets/_workspace-thumbnails.scss
+++ b/data/theme/gnome-shell-sass/widgets/_workspace-thumbnails.scss
@@ -1,32 +0,0 @@
-/* Workspace pager */
-
-// thumbnails in overview
-.workspace-thumbnails {
-  @extend %overview_panel;
-  visible-width: 32px; //amount visible before hover
-  spacing: $base_spacing;
-  padding: $base_padding;
-
-  border-radius: $modal_radius 0 0 $modal_radius;
-  border-right-width: 0;
-
-  &:rtl {
-    border-radius: 0 $modal_radius $modal_radius 0;
-    border-left-width: 0;
-  }
-
-  // drag and drop indicator
-  .placeholder {
-    background-image: url("resource:///org/gnome/shell/theme/dash-placeholder.svg");
-    background-size: contain;
-    height: 24px;
-  }
-}
-
-// selected indicator
-.workspace-thumbnail-indicator {
-  border: 3px solid $selected_bg_color;
-  border-radius: 3px;
-  padding: 0px;
-  // background-color: transparentize($selected_bg_color, 0.9);
-}
--- a/data/theme/key-enter.svg
+++ b/data/theme/key-enter.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="keyboard-key" width="24" height="24">
+    <path overflow="visible" font-weight="400" style="line-height:normal;-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;marker:none" d="M10 23H8.5c-.398 0-.796-.14-1.079-.422L.345 15.5l7.078-7.078C7.704 8.14 8.102 8 8.5 8H10v1.5c0 .398-.14.796-.422 1.079L4.657 15.5l4.921 4.922c.282.282.422.68.422 1.078z" color="#000" font-family="Bitstream Vera Sans" fill="#fff"/>
+    <path overflow="visible" d="M22 1.5v9a5 5 0 01-5 5H4" style="marker:none" color="#000" fill="none" stroke="#fff" stroke-width="3"/>
+</svg>
--- a/data/theme/key-hide.svg
+++ b/data/theme/key-hide.svg
@@ -0,0 +1,3 @@
+<svg class="keyboard-key" xmlns="http://www.w3.org/2000/svg" width="24" height="24">
+    <path d="M12 20.875L.562 9.438C.171 9.046 0 8.51 0 8V6h2c.511 0 1.046.17 1.438.563L12 15.125l8.563-8.562C20.953 6.17 21.488 6 22 6h2v2c0 .511-.17 1.046-.563 1.438z" fill="#e5e5e5"/>
+</svg>
--- a/data/theme/key-layout.svg
+++ b/data/theme/key-layout.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="keyboard-key" width="24" height="24">
+    <path d="M4.5 2v21" fill="#e5e5e5" fill-rule="evenodd" stroke="#e5e5e5" stroke-width="3"/>
+    <path d="M4 12h6l2 4h8V6h-6l-2-4H4z" fill="none" stroke="#e5e5e5" stroke-width="2" stroke-linejoin="round"/>
+    <path d="M4 12h6l2 4h8V6h-6l-2-4H4z" fill="#e5e5e5" fill-rule="evenodd"/>
+</svg>
--- a/data/theme/key-shift-latched-uppercase.svg
+++ b/data/theme/key-shift-latched-uppercase.svg
@@ -0,0 +1,3 @@
+<svg class="keyboard-key" xmlns="http://www.w3.org/2000/svg" width="24" height="24">
+    <path style="marker:none" d="M12 0L2 12h6v6h8v-6h6zM8 21v3h8v-3z" color="#000" overflow="visible" fill="#3584e4"/>
+</svg>
--- a/data/theme/key-shift-uppercase.svg
+++ b/data/theme/key-shift-uppercase.svg
@@ -0,0 +1,3 @@
+<svg class="keyboard-key" xmlns="http://www.w3.org/2000/svg" width="24" height="24">
+    <path d="M8 22v-8H2L12 2l10 12h-6v8z" style="marker:none" color="#000" overflow="visible" fill="#3584e4"/>
+</svg>
--- a/data/theme/key-shift.svg
+++ b/data/theme/key-shift.svg
@@ -0,0 +1,3 @@
+<svg class="keyboard-key" xmlns="http://www.w3.org/2000/svg" width="24" height="24">
+    <path d="M8 22v-8H2L12 2l10 12h-6v8z" style="marker:none" color="#000" overflow="visible" fill="#bebebe"/>
+</svg>
--- a/data/theme/keyboard-caps-lock-filled-symbolic.svg
+++ b/data/theme/keyboard-caps-lock-filled-symbolic.svg
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <g fill="#2e3436">
-        <path d="M6 8H2.937l5.126-5.781L13.186 8H10v2H6z" style="marker:none" color="#000" overflow="visible"/>
-        <path d="M6 11h4v2H6z" style="marker:none"/>
-    </g>
-</svg>
--- a/data/theme/keyboard-enter-symbolic.svg
+++ b/data/theme/keyboard-enter-symbolic.svg
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <g font-weight="400" fill="#2e3436">
-        <path d="M11.994 3v4.004c.002.666-.183.72-.445.852-.262.13-.555.144-.555.144H4v2h6.994s.71.014 1.45-.355c.738-.37 1.552-1.313 1.55-2.645V3z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;isolation:auto;mix-blend-mode:normal;solid-color:#000;solid-opacity:1;marker:none" color="#000" font-family="sans-serif" overflow="visible"/>
-        <path d="M6 12v-1c0-.257-.13-.528-.313-.719l-1.28-1.303 1.28-1.26C5.87 7.529 6 7.258 6 7V6H5c-.31 0-.552.09-.75.281L1.594 8.978l2.656 2.74c.198.192.44.282.75.282z" style="line-height:normal;-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;marker:none" color="#bebebe" font-family="Bitstream Vera Sans" overflow="visible"/>
-    </g>
-</svg>
--- a/data/theme/keyboard-hide-symbolic.svg
+++ b/data/theme/keyboard-hide-symbolic.svg
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <g color="#000" fill="#2e3436">
-        <path d="M4.707 5.293L3.293 6.707 8 11.414l4.707-4.707-1.414-1.414L8 8.586z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;isolation:auto;mix-blend-mode:normal;solid-color:#000;solid-opacity:1;marker:none" font-weight="400" font-family="sans-serif" overflow="visible"/>
-        <path d="M12 6V5h1v1zM3 6V5h1v1z" style="marker:none" overflow="visible"/>
-        <path d="M3 6c0-.554.446-1 1-1s1 .446 1 1-.446 1-1 1-1-.446-1-1zM11 6c0-.554.446-1 1-1s1 .446 1 1-.446 1-1 1-1-.446-1-1z" style="marker:none" overflow="visible"/>
-    </g>
-</svg>
--- a/data/theme/keyboard-layout-filled-symbolic.svg
+++ b/data/theme/keyboard-layout-filled-symbolic.svg
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <g fill="#2e3436" fill-rule="evenodd">
-        <path d="M2 1v14h2V1z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;isolation:auto;mix-blend-mode:normal;solid-color:#000;solid-opacity:1" color="#000" font-weight="400" font-family="sans-serif" overflow="visible"/>
-        <path d="M3 1a1 1 0 00-1 1v6a1 1 0 001 1h3.383l.722 1.447A1 1 0 008 11h5a1 1 0 001-1V4a1 1 0 00-1-1H9.617l-.722-1.447A1 1 0 008 1zm1 2h3.383l.722 1.447A1 1 0 009 5h3v4H8.617l-.722-1.447A1 1 0 007 7H4z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;isolation:auto;mix-blend-mode:normal;solid-color:#000;solid-opacity:1" color="#000" font-weight="400" font-family="sans-serif" overflow="visible"/>
-        <path d="M3 8h4l1 2h5V4H9L8 2H3z"/>
-    </g>
-</svg>
--- a/data/theme/keyboard-shift-filled-symbolic.svg
+++ b/data/theme/keyboard-shift-filled-symbolic.svg
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <path d="M6 13V9H2.937l5.126-5.781L13.186 9H10v4z" style="marker:none" color="#000" overflow="visible" fill="#2e3436"/>
-</svg>
--- a/data/theme/meson.build
+++ b/data/theme/meson.build
@@ -6,9 +6,8 @@ theme_sources = files([
  'gnome-shell-sass/_drawing.scss',
  'gnome-shell-sass/_high-contrast-colors.scss',
  'gnome-shell-sass/_widgets.scss',
-  'gnome-shell-sass/widgets/_a11y.scss',
  'gnome-shell-sass/widgets/_app-grid.scss',
-  'gnome-shell-sass/widgets/_base.scss',
+  'gnome-shell-sass/widgets/_app-switcher.scss',
  'gnome-shell-sass/widgets/_buttons.scss',
  'gnome-shell-sass/widgets/_calendar.scss',
  'gnome-shell-sass/widgets/_check-box.scss',
@@ -34,12 +33,10 @@ theme_sources = files([
  'gnome-shell-sass/widgets/_search-entry.scss',
  'gnome-shell-sass/widgets/_search-results.scss',
  'gnome-shell-sass/widgets/_slider.scss',
-  'gnome-shell-sass/widgets/_switcher-popup.scss',
  'gnome-shell-sass/widgets/_switches.scss',
  'gnome-shell-sass/widgets/_tiled-previews.scss',
  'gnome-shell-sass/widgets/_window-picker.scss',
-  'gnome-shell-sass/widgets/_workspace-switcher.scss',
-  'gnome-shell-sass/widgets/_workspace-thumbnails.scss'
+  'gnome-shell-sass/widgets/_workspace-switcher.scss'
 ])

 styles = [
--- 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,80 +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);
-
-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);
-    }
-
-    NotifyAsync(params, invocation) {
-        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));
-        });
-    }
-};
--- 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-shell-extension-prefs');
-        super._init({ application_id: 'org.gnome.Extensions' });
+        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 = `${exc}\n\nStack trace:\n${
+            // Indent stack trace.
+            exc.stack.split('\n').map(line => `  ${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 ${row.uuid} had an error:`,
+                '```', // '`' (xgettext throws up on odd number of backticks)
+                `${exc}`,
+                '```', // '`'
+                '',
+                'Stack trace:',
+                '```', // '`'
+                exc.stack.replace(/\n$/, ''), // stack without trailing newline
+                '```', // '`'
+                '',
+            ];
+            clipboard.set_text(lines.join('\n'), -1);
+        });
+
+        let spacing = new Gtk.SeparatorToolItem({ draw: false });
+        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,18 +394,16 @@ 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() {
        this._shellProxy.ListExtensionsRemote(([extensionsMap], e) => {
            if (e) {
                if (e instanceof Gio.DBusError) {
-                    log('Failed to connect to shell proxy: %s'.format(e.toString()));
+                    log(`Failed to connect to shell proxy: ${e}`);
                    this._mainStack.visible_child_name = 'noshell';
                } else {
                    throw e;
@@ -299,7 +442,17 @@ var ExtensionsWindow = GObject.registerClass({
            });
    }

-    _syncListVisibility() {
+    _checkUpdates() {
+        let nUpdates = this._userList.get_children().filter(c => c.hasUpdate).length;
+
+        this._updatesLabel.label = Gettext.ngettext(
+            '%d extension will be updated on next login.',
+            '%d extensions will be updated on next login.e',
+            nUpdates).format(nUpdates);
+        this._updatesBar.visible = nUpdates > 0;
+    }
+
+    _extensionsLoaded() {
        this._userList.visible = this._userList.get_children().length > 0;
        this._systemList.visible = this._systemList.get_children().length > 0;

@@ -307,27 +460,118 @@ var ExtensionsWindow = GObject.registerClass({
            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;
-
-        this._updatesLabel.label = Gettext.ngettext(
-            '%d extension will be updated on next login.',
-            '%d extensions will be updated on next login.',
-            nUpdates).format(nUpdates);
-        this._updatesBar.visible = nUpdates > 0;
-    }
-
-    _extensionsLoaded() {
-        this._syncListVisibility();
        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',
@@ -377,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);
@@ -386,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;
@@ -455,10 +703,10 @@ var ExtensionRow = GObject.registerClass({

        this._updatesIcon.visible = this.hasUpdate;

-        this._versionLabel.label = this.version.toString();
+        this._versionLabel.label = `${this.version}`;
        this._versionLabel.visible = this.version !== '';

-        this._authorLabel.label = this.creator.toString();
+        this._authorLabel.label = `${this.creator}`;
        this._authorLabel.visible = this.creator !== '';
    }

@@ -474,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() {
@@ -485,16 +747,17 @@ function initEnvironment() {
        },

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

        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
--- a/subprojects/extensions-app/data/ui/extensions-window.ui
+++ b/subprojects/extensions-app/data/ui/extensions-window.ui
@@ -90,9 +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>
          </object>
          <packing>
            <property name="pack_type">end</property>
@@ -257,7 +256,7 @@
                <property name="margin">6</property>
                <property name="icon_name">software-update-available-symbolic</property>
                <style>
-                  <class name="warning"/>
+                  <class name="warning"/>>
                </style>
              </object>
            </child>
@@ -285,7 +284,7 @@
            </child>
            <child>
              <object class="GtkButton">
-                <property name="label" translatable="yes">Log Out…</property>
+                <property name="label" translatable="yes">Logout…</property>
                <property name="visible">True</property>
                <property name="valign">center</property>
                <property name="action-name">win.logout</property>
--- a/js/gdm/authPrompt.js
+++ b/js/gdm/authPrompt.js
@@ -47,15 +47,12 @@ var AuthPrompt = GObject.registerClass({
        super._init({
            style_class: 'login-dialog-prompt-layout',
            vertical: true,
-            x_expand: true,
-            x_align: Clutter.ActorAlign.CENTER,
        });

        this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;

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

        let reauthenticationOnly;
        if (this._mode == AuthPromptMode.UNLOCK_ONLY)
@@ -74,6 +71,15 @@ var AuthPrompt = GObject.registerClass({
        this._userVerifier.connect('ovirt-user-authenticated', this._onOVirtUserAuthenticated.bind(this));
        this.smartcardDetected = this._userVerifier.smartcardDetected;

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

        this._userWell = new St.Bin({
@@ -81,75 +87,19 @@ var AuthPrompt = GObject.registerClass({
            y_expand: true,
        });
        this.add_child(this._userWell);
-
-        this._hasCancelButton = this._mode === AuthPromptMode.UNLOCK_OR_LOG_IN;
-
-        this._initEntryRow();
-
-        let capsLockPlaceholder = new St.Label();
-        this.add_child(capsLockPlaceholder);
-
-        this._capsLockWarningLabel = new ShellEntry.CapsLockWarning({
-            x_expand: true,
-            x_align: Clutter.ActorAlign.CENTER,
-        });
-        this.add_child(this._capsLockWarningLabel);
-
-        this._capsLockWarningLabel.bind_property('visible',
-            capsLockPlaceholder, 'visible',
-            GObject.BindingFlags.SYNC_CREATE | GObject.BindingFlags.INVERT_BOOLEAN);
-
-        this._message = new St.Label({
-            opacity: 0,
-            styleClass: 'login-dialog-message',
+        this._label = new St.Label({
+            style_class: 'login-dialog-prompt-label',
+            x_expand: false,
            y_expand: true,
-            x_expand: true,
-            y_align: Clutter.ActorAlign.START,
-            x_align: Clutter.ActorAlign.CENTER,
        });
-        this._message.clutter_text.line_wrap = true;
-        this._message.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-        this.add_child(this._message);
-    }

-    _onDestroy() {
-        this._userVerifier.destroy();
-        this._userVerifier = null;
-    }
-
-    vfunc_key_press_event(keyPressEvent) {
-        if (keyPressEvent.keyval == Clutter.KEY_Escape)
-            this.cancel();
-        return super.vfunc_key_press_event(keyPressEvent);
-    }
-
-    _initEntryRow() {
-        this._mainBox = new St.BoxLayout({
-            style_class: 'login-dialog-button-box',
-            vertical: false,
-        });
-        this.add_child(this._mainBox);
-
-        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,
-            x_align: Clutter.ActorAlign.START,
-            y_align: Clutter.ActorAlign.CENTER,
-            child: new St.Icon({ icon_name: 'go-previous-symbolic' }),
-        });
-        if (this._hasCancelButton)
-            this.cancelButton.connect('clicked', () => this.cancel());
-        else
-            this.cancelButton.opacity = 0;
-        this._mainBox.add_child(this.cancelButton);
+        this.add_child(this._label);

        let entryParams = {
            style_class: 'login-dialog-prompt-entry',
            can_focus: true,
-            x_expand: true,
+            x_expand: false,
+            y_expand: true,
        };

        this._entry = null;
@@ -161,57 +111,104 @@ var AuthPrompt = GObject.registerClass({
        ShellEntry.addContextMenu(this._passwordEntry, { actionMode: Shell.ActionMode.NONE });

        this._entry = this._passwordEntry;
-        this._mainBox.add_child(this._entry);
+        this.add_child(this._entry);
+
        this._entry.grab_key_focus();

-        [this._textEntry, this._passwordEntry].forEach(entry => {
-            entry.clutter_text.connect('text-changed', () => {
-                if (!this._userVerifier.hasPendingMessages)
-                    this._fadeOutMessage();
-            });
+        this._capsLockWarningLabel = new ShellEntry.CapsLockWarning();
+        this.add_child(this._capsLockWarningLabel);

-            entry.clutter_text.connect('activate', () => {
-                let shouldSpin = entry === this._passwordEntry;
-                if (entry.reactive)
-                    this._activateNext(shouldSpin);
-            });
+        this._message = new St.Label({
+            opacity: 0,
+            styleClass: 'login-dialog-message',
+            x_expand: false,
+            y_expand: true,
+            y_align: Clutter.ActorAlign.START,
        });
+        this._message.clutter_text.line_wrap = true;
+        this._message.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
+        this.add_child(this._message);
+
+        this._buttonBox = new St.BoxLayout({
+            style_class: 'login-dialog-button-box',
+            vertical: false,
+            y_align: Clutter.ActorAlign.END,
+        });
+        this.add_child(this._buttonBox);

        this._defaultButtonWell = new St.Widget({
            layout_manager: new Clutter.BinLayout(),
            x_align: Clutter.ActorAlign.END,
            y_align: Clutter.ActorAlign.CENTER,
        });
-        this._defaultButtonWell.add_constraint(new Clutter.BindConstraint({
-            source: this.cancelButton,
-            coordinate: Clutter.BindCoordinate.SIZE,
-        }));
-        this._mainBox.add_child(this._defaultButtonWell);
+
+        this._initButtons();

        this._spinner = new Animation.Spinner(DEFAULT_BUTTON_WELL_ICON_SIZE);
+        this._spinner.opacity = 0;
+        this._spinner.show();
        this._defaultButtonWell.add_child(this._spinner);
    }

-    _activateNext(shouldSpin) {
-        this.updateSensitivity(false);
+    _onDestroy() {
+        this._userVerifier.destroy();
+        this._userVerifier = null;
+    }

-        if (shouldSpin)
-            this.startSpinning();
+    vfunc_key_press_event(keyPressEvent) {
+        if (keyPressEvent.keyval == Clutter.KEY_Escape)
+            this.cancel();
+        return Clutter.EVENT_PROPAGATE;
+    }

-        if (this._queryingService)
-            this._userVerifier.answerQuery(this._queryingService, this._entry.text);
-        else
-            this._preemptiveAnswer = this._entry.text;
+    _initButtons() {
+        this.cancelButton = new St.Button({
+            style_class: 'modal-dialog-button button',
+            button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
+            reactive: true,
+            can_focus: true,
+            label: _("Cancel"),
+            x_expand: true,
+            x_align: Clutter.ActorAlign.START,
+            y_align: Clutter.ActorAlign.END,
+        });
+        this.cancelButton.connect('clicked', () => this.cancel());
+        this._buttonBox.add_child(this.cancelButton);

-        this.emit('next');
+        this._buttonBox.add_child(this._defaultButtonWell);
+        this.nextButton = new St.Button({
+            style_class: 'modal-dialog-button button',
+            button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
+            reactive: true,
+            can_focus: true,
+            label: _("Next"),
+            x_align: Clutter.ActorAlign.END,
+            y_align: Clutter.ActorAlign.END,
+        });
+        this.nextButton.connect('clicked', () => this.emit('next'));
+        this.nextButton.add_style_pseudo_class('default');
+        this._buttonBox.add_child(this.nextButton);
+
+        this._updateNextButtonSensitivity(this._entry.text.length > 0);
+
+        this._entry.clutter_text.connect('text-changed', () => {
+            if (!this._userVerifier.hasPendingMessages)
+                this._fadeOutMessage();
+
+            this._updateNextButtonSensitivity(this._entry.text.length > 0 || this.verificationStatus == AuthPromptStatus.VERIFYING);
+        });
+        this._entry.clutter_text.connect('activate', () => {
+            if (this.nextButton.reactive)
+                this.emit('next');
+        });
    }

    _updateEntry(secret) {
-        if (secret && this._entry !== this._passwordEntry) {
-            this._mainBox.replace_child(this._entry, this._passwordEntry);
+        if (secret && (this._entry != this._passwordEntry)) {
+            this.replace_child(this._entry, this._passwordEntry);
            this._entry = this._passwordEntry;
-        } else if (!secret && this._entry !== this._textEntry) {
-            this._mainBox.replace_child(this._entry, this._textEntry);
+        } else if (!secret && (this._entry != this._textEntry)) {
+            this.replace_child(this._entry, this._textEntry);
            this._entry = this._textEntry;
        }
        this._capsLockWarningLabel.visible = secret;
@@ -229,14 +226,16 @@ var AuthPrompt = GObject.registerClass({
        }

        this._updateEntry(secret);
+        this.setQuestion(question);

-        // Hack: The question string comes directly from PAM, if it's "Password:"
-        // we replace it with our own to allow localization, if it's something
-        // else we remove the last colon and any trailing or leading spaces.
-        if (question === 'Password:' || question === 'Password: ')
-            this.setQuestion(_('Password'));
-        else
-            this.setQuestion(question.replace(/: *$/, '').trim());
+        if (secret) {
+            if (this._userVerifier.reauthenticating)
+                this.nextButton.label = _("Unlock");
+            else
+                this.nextButton.label = C_("button", "Sign In");
+        } else {
+            this.nextButton.label = _("Next");
+        }

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

    _onReset() {
@@ -294,6 +292,10 @@ var AuthPrompt = GObject.registerClass({
        this.reset();
    }

+    addActorToDefaultButtonWell(actor) {
+        this._defaultButtonWell.add_child(actor);
+    }
+
    setActorInDefaultButtonWell(actor, animate) {
        if (!this._defaultButtonWellActor &&
            !actor)
@@ -373,9 +375,11 @@ var AuthPrompt = GObject.registerClass({
    }

    setQuestion(question) {
-        this._entry.hint_text = question;
+        this._label.set_text(question);

+        this._label.show();
        this._entry.show();
+
        this._entry.grab_key_focus();
    }

@@ -423,8 +427,15 @@ var AuthPrompt = GObject.registerClass({
        }
    }

+    _updateNextButtonSensitivity(sensitive) {
+        this.nextButton.reactive = sensitive;
+        this.nextButton.can_focus = sensitive;
+    }
+
    updateSensitivity(sensitive) {
+        this._updateNextButtonSensitivity(sensitive && (this._entry.text.length > 0 || this.verificationStatus == AuthPromptStatus.VERIFYING));
        this._entry.reactive = sensitive;
+        this._entry.clutter_text.editable = sensitive;
    }

    vfunc_hide() {
@@ -443,18 +454,18 @@ var AuthPrompt = GObject.registerClass({
        if (oldChild)
            oldChild.destroy();

-        let userWidget = new UserWidget.UserWidget(user, Clutter.Orientation.VERTICAL);
-        this._userWell.set_child(userWidget);
-
-        if (!user)
-            this._updateEntry(false);
+        if (user) {
+            let userWidget = new UserWidget.UserWidget(user);
+            userWidget.x_align = Clutter.ActorAlign.START;
+            this._userWell.set_child(userWidget);
+        }
    }

    reset() {
        let oldStatus = this.verificationStatus;
        this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
-        this.cancelButton.reactive = this._hasCancelButton;
-        this.cancelButton.can_focus = this._hasCancelButton;
+        this.cancelButton.reactive = true;
+        this.nextButton.label = _("Next");
        this._preemptiveAnswer = null;

        if (this._userVerifier)
@@ -464,7 +475,6 @@ var AuthPrompt = GObject.registerClass({
        this.clear();
        this._message.opacity = 0;
        this.setUser(null);
-        this._updateEntry(true);
        this.stopSpinning();

        if (oldStatus == AuthPromptStatus.VERIFICATION_FAILED)
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -35,6 +35,8 @@ 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;
+const _MAX_BOTTOM_MENU_ITEMS = 5;

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

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

@@ -311,21 +312,28 @@ var SessionMenuButton = GObject.registerClass({
    _init() {
        let gearIcon = new St.Icon({ icon_name: 'emblem-system-symbolic' });
        let button = new St.Button({
-            style_class: 'modal-dialog-button button login-dialog-session-list-button',
+            style_class: 'login-dialog-session-list-button',
            reactive: true,
            track_hover: true,
            can_focus: true,
            accessible_name: _("Choose Session"),
            accessible_role: Atk.Role.MENU,
-            x_align: Clutter.ActorAlign.CENTER,
-            y_align: Clutter.ActorAlign.CENTER,
            child: gearIcon,
        });

        super._init({ child: button });
        this._button = button;

-        this._menu = new PopupMenu.PopupMenu(this._button, 0, St.Side.BOTTOM);
+        let side = St.Side.TOP;
+        let align = 0;
+        if (Gdm.get_session_ids().length > _MAX_BOTTOM_MENU_ITEMS) {
+            if (this.text_direction == Clutter.TextDirection.RTL)
+                side = St.Side.RIGHT;
+            else
+                side = St.Side.LEFT;
+            align = 0.5;
+        }
+        this._menu = new PopupMenu.PopupMenu(this._button, align, side);
        Main.uiGroup.add_actor(this._menu.actor);
        this._menu.actor.hide();

@@ -350,7 +358,6 @@ var SessionMenuButton = GObject.registerClass({
    updateSensitivity(sensitive) {
        this._button.reactive = sensitive;
        this._button.can_focus = sensitive;
-        this.opacity = sensitive ? 255 : 0;
        this._menu.close(BoxPointer.PopupAnimation.NONE);
    }

@@ -402,10 +409,7 @@ var SessionMenuButton = GObject.registerClass({
 });

 var LoginDialog = GObject.registerClass({
-    Signals: {
-        'failed': {},
-        'wake-up-screen': {},
-    },
+    Signals: { 'failed': {} },
 }, class LoginDialog extends St.Widget {
    _init(parentActor) {
        super._init({ style_class: 'login-dialog', visible: false });
@@ -421,13 +425,13 @@ var LoginDialog = GObject.registerClass({

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

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

        this._textureCache = St.TextureCache.get_default();
@@ -456,6 +460,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 +468,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));
@@ -488,15 +492,6 @@ var LoginDialog = GObject.registerClass({
        bannerBox.add_child(this._bannerLabel);
        this._updateBanner();

-        this._sessionMenuButton = new SessionMenuButton();
-        this._sessionMenuButton.connect('session-activated',
-            (list, sessionId) => {
-                this._greeter.call_select_session_sync(sessionId, null);
-            });
-        this._sessionMenuButton.opacity = 0;
-        this._sessionMenuButton.show();
-        this.add_child(this._sessionMenuButton);
-
        this._logoBin = new St.Widget({ style_class: 'login-dialog-logo-bin',
                                        x_align: Clutter.ActorAlign.CENTER,
                                        y_align: Clutter.ActorAlign.END });
@@ -510,6 +505,16 @@ var LoginDialog = GObject.registerClass({
            this._onUserListActivated(item);
        });

+
+        this._sessionMenuButton = new SessionMenuButton();
+        this._sessionMenuButton.connect('session-activated',
+            (list, sessionId) => {
+                this._greeter.call_select_session_sync(sessionId, null);
+            });
+        this._sessionMenuButton.opacity = 0;
+        this._sessionMenuButton.show();
+        this._authPrompt.addActorToDefaultButtonWell(this._sessionMenuButton);
+
        this._disableUserList = undefined;
        this._userListLoaded = false;

@@ -554,23 +559,6 @@ var LoginDialog = GObject.registerClass({
        return actorBox;
    }

-    _getSessionMenuButtonAllocation(dialogBox) {
-        let actorBox = new Clutter.ActorBox();
-
-        let [, , natWidth, natHeight] = this._sessionMenuButton.get_preferred_size();
-
-        if (this.get_text_direction() === Clutter.TextDirection.RTL)
-            actorBox.x1 = dialogBox.x1 + natWidth;
-        else
-            actorBox.x1 = dialogBox.x2 - (natWidth * 2);
-
-        actorBox.y1 = dialogBox.y2 - (natHeight * 2);
-        actorBox.x2 = actorBox.x1 + natWidth;
-        actorBox.y2 = actorBox.y1 + natHeight;
-
-        return actorBox;
-    }
-
    _getCenterActorAllocation(dialogBox, actor) {
        let actorBox = new Clutter.ActorBox();

@@ -627,10 +615,6 @@ var LoginDialog = GObject.registerClass({
            logoHeight = logoAllocation.y2 - logoAllocation.y1;
        }

-        let sessionMenuButtonAllocation = null;
-        if (this._sessionMenuButton.visible)
-            sessionMenuButtonAllocation = this._getSessionMenuButtonAllocation(dialogBox);
-
        // Then figure out if we're overly constrained and need to
        // try a different layout, or if we have what extra space we
        // can hand out
@@ -729,9 +713,6 @@ var LoginDialog = GObject.registerClass({

        if (logoAllocation)
            this._logoBin.allocate(logoAllocation, flags);
-
-        if (sessionMenuButtonAllocation)
-            this._sessionMenuButton.allocate(sessionMenuButtonAllocation, flags);
    }

    _ensureUserListLoaded() {
@@ -813,7 +794,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));
        }
@@ -827,10 +808,12 @@ var LoginDialog = GObject.registerClass({
    }

    _onPrompted() {
-        const showSessionMenu = this._shouldShowSessionMenuButton();
-
-        this._sessionMenuButton.updateSensitivity(showSessionMenu);
-        this._sessionMenuButton.visible = showSessionMenu;
+        if (this._shouldShowSessionMenuButton()) {
+            this._sessionMenuButton.updateSensitivity(true);
+            this._authPrompt.setActorInDefaultButtonWell(this._sessionMenuButton);
+        } else {
+            this._sessionMenuButton.updateSensitivity(false);
+        }
        this._showPrompt();
    }

@@ -913,8 +896,7 @@ var LoginDialog = GObject.registerClass({
    }

    _askForUsernameAndBeginVerification() {
-        this._authPrompt.setUser(null);
-        this._authPrompt.setQuestion(_('Username'));
+        this._authPrompt.setQuestion(_("Username: "));

        this._showRealmLoginHint(this._realmManager.loginFormat);

@@ -928,6 +910,7 @@ var LoginDialog = GObject.registerClass({
                let answer = this._authPrompt.getAnswer();
                this._user = this._userManager.get_user(answer);
                this._authPrompt.clear();
+                this._authPrompt.startSpinning();
                this._authPrompt.begin({ userName: answer });
                this._updateCancelButton();
            });
@@ -1139,7 +1122,6 @@ var LoginDialog = GObject.registerClass({
        this._authPrompt.hide();
        this._hideBannerView();
        this._sessionMenuButton.close();
-        this._sessionMenuButton.hide();
        this._setUserListExpanded(true);
        this._notListedButton.show();
        this._userList.grab_key_focus();
@@ -1243,18 +1225,13 @@ var LoginDialog = GObject.registerClass({
        return GLib.SOURCE_REMOVE;
    }

-    activate() {
-        this._userList.grab_key_focus();
-        this.show();
-    }
-
    open() {
        Main.ctrlAltTabManager.addGroup(this,
                                        _("Login Window"),
                                        'dialog-password-symbolic',
                                        { sortGroup: CtrlAltTab.SortGroup.MIDDLE });
-        this.activate();
-
+        this._userList.grab_key_focus();
+        this.show();
        this.opacity = 0;

        Main.pushModal(this, { actionMode: Shell.ActionMode.LOGIN_SCREEN });
--- 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/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/introspect.js
+++ b/js/misc/introspect.js
@@ -1,12 +1,10 @@
 /* exported IntrospectService */
-const { Gio, GLib, Meta, Shell, St } = imports.gi;
+const { Gio, GLib, Meta, Shell } = imports.gi;

 const INTROSPECT_SCHEMA = 'org.gnome.shell';
 const INTROSPECT_KEY = 'introspect';
 const APP_WHITELIST = ['org.freedesktop.impl.portal.desktop.gtk'];

-const INTROSPECT_DBUS_API_VERSION = 2;
-
 const { loadInterfaceXML } = imports.misc.fileUtils;

 const IntrospectDBusIface = loadInterfaceXML('org.gnome.Shell.Introspect');
@@ -24,7 +22,6 @@ var IntrospectService = class {
        this._runningApplicationsDirty = true;
        this._activeApplication = null;
        this._activeApplicationDirty = true;
-        this._animationsEnabled = true;

        this._appSystem = Shell.AppSystem.get_default();
        this._appSystem.connect('app-state-changed',
@@ -33,9 +30,7 @@ var IntrospectService = class {
                                    this._syncRunningApplications();
                                });

-        this._introspectSettings = new Gio.Settings({
-            schema_id: INTROSPECT_SCHEMA,
-        });
+        this._settings = new Gio.Settings({ schema_id: INTROSPECT_SCHEMA });

        let tracker = Shell.WindowTracker.get_default();
        tracker.connect('notify::focus-app',
@@ -54,11 +49,6 @@ var IntrospectService = class {
                (conn, name, owner) => this._whitelistMap.set(name, owner),
                (conn, name) => this._whitelistMap.delete(name));
        });
-
-        this._settings = St.Settings.get();
-        this._settings.connect('notify::enable-animations',
-            this._syncAnimationsEnabled.bind(this));
-        this._syncAnimationsEnabled();
    }

    _isStandaloneApp(app) {
@@ -66,7 +56,7 @@ var IntrospectService = class {
    }

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

    _isSenderWhitelisted(sender) {
@@ -129,18 +119,9 @@ var IntrospectService = class {
                type == Meta.WindowType.UTILITY;
    }

-    _isInvocationAllowed(invocation) {
-        if (this._isIntrospectEnabled())
-            return true;
-
-        if (this._isSenderWhitelisted(invocation.get_sender()))
-            return true;
-
-        return false;
-    }
-
    GetRunningApplicationsAsync(params, invocation) {
-        if (!this._isInvocationAllowed(invocation)) {
+        if (!this._isIntrospectEnabled() &&
+            !this._isSenderWhitelisted(invocation.get_sender())) {
            invocation.return_error_literal(Gio.DBusError,
                                            Gio.DBusError.ACCESS_DENIED,
                                            'App introspection not allowed');
@@ -155,7 +136,8 @@ var IntrospectService = class {
        let apps = this._appSystem.get_running();
        let windowsList = {};

-        if (!this._isInvocationAllowed(invocation)) {
+        if (!this._isIntrospectEnabled() &&
+            !this._isSenderWhitelisted(invocation.get_sender())) {
            invocation.return_error_literal(Gio.DBusError,
                                            Gio.DBusError.ACCESS_DENIED,
                                            'App introspection not allowed');
@@ -199,21 +181,4 @@ var IntrospectService = class {
        }
        invocation.return_value(new GLib.Variant('(a{ta{sv}})', [windowsList]));
    }
-
-    _syncAnimationsEnabled() {
-        let wasAnimationsEnabled = this._animationsEnabled;
-        this._animationsEnabled = this._settings.enable_animations;
-        if (wasAnimationsEnabled !== this._animationsEnabled) {
-            let variant = new GLib.Variant('b', this._animationsEnabled);
-            this._dbusImpl.emit_property_changed('AnimationsEnabled', variant);
-        }
-    }
-
-    get AnimationsEnabled() {
-        return this._animationsEnabled;
-    }
-
-    get version() {
-        return INTROSPECT_DBUS_API_VERSION;
-    }
 };
--- 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
@@ -151,17 +151,17 @@ const SystemActions = GObject.registerClass({
        this._userManager.connect('user-removed',
                                  () => this._updateMultiUser());

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

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

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

        this.forceUpdate();
--- a/js/misc/util.js
+++ b/js/misc/util.js
@@ -21,7 +21,7 @@ const _leadingJunk = '[\\s`(\\[{\'\\"<\u00AB\u201C\u2018]';
 const _notTrailingJunk = '[^\\s`!()\\[\\]{};:\'\\".,<>?\u00AB\u00BB\u200E\u200F\u201C\u201D\u2018\u2019\u202A\u202C]';

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

@@ -153,7 +153,7 @@ function trySpawnCommandLine(commandLine) {
    } catch (err) {
        // Replace "Error invoking GLib.shell_parse_argv: " with
        // something nicer
-        err.message = err.message.replace(/[^:]*: /, '%s\n'.format(_('Could not parse command:')));
+        err.message = err.message.replace(/[^:]*: /, `${_("Could not parse command:")}\n`);
        throw err;
    }

@@ -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/portalHelper/main.js
+++ b/js/portalHelper/main.js
@@ -23,6 +23,7 @@ const PortalHelperSecurityLevel = {
 };

 const CONNECTIVITY_CHECK_HOST = 'nmcheck.gnome.org';
+const CONNECTIVITY_CHECK_URI = `http://${CONNECTIVITY_CHECK_HOST}`;
 const CONNECTIVITY_RECHECK_RATELIMIT_TIMEOUT = 30 * GLib.USEC_PER_SEC;

 const HelperDBusInterface = loadInterfaceXML('org.gnome.Shell.PortalHelper');
@@ -102,7 +103,7 @@ class PortalWindow extends Gtk.ApplicationWindow {
        this._headerBar.show();

        if (!url) {
-            url = 'http://%s'.format(CONNECTIVITY_CHECK_HOST);
+            url = CONNECTIVITY_CHECK_URI;
            this._originalUrlWasGnome = true;
        } else {
            this._originalUrlWasGnome = false;
@@ -117,10 +118,6 @@ class PortalWindow extends Gtk.ApplicationWindow {
        this._webContext = WebKit.WebContext.new_ephemeral();
        this._webContext.set_cache_model(WebKit.CacheModel.DOCUMENT_VIEWER);
        this._webContext.set_network_proxy_settings(WebKit.NetworkProxyMode.NO_PROXY, null);
-        if (this._webContext.set_sandbox_enabled) {
-            // We have WebKitGTK 2.26 or newer.
-            this._webContext.set_sandbox_enabled(true);
-        }

        this._webView = WebKit.WebView.new_with_context(this._webContext);
        this._webView.connect('decide-policy', this._onDecidePolicy.bind(this));
--- 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/accessDialog.js
+++ b/js/ui/accessDialog.js
@@ -138,7 +138,7 @@ var AccessDialogDBus = class {
        let [handle, appId, parentWindow_, title, description, body, options] = params;
        // We probably want to use parentWindow and global.display.focus_window
        // for this check in the future
-        if (appId && '%s.desktop'.format(appId) != this._windowTracker.focus_app.id) {
+        if (appId && `${appId}.desktop` != this._windowTracker.focus_app.id) {
            invocation.return_error_literal(Gio.DBusError,
                                            Gio.DBusError.ACCESS_DENIED,
                                            'Only the focused app is allowed to show a system access dialog');
--- 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) {
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -71,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/${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;
@@ -114,9 +120,15 @@ function _findBestFolderName(apps) {
    }, commonCategories);

    for (let category of commonCategories) {
-        let translated = Shell.util_get_translated_folder_name(category);
-        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;
@@ -192,9 +204,6 @@ var BaseAppView = GObject.registerClass({
            this._items.set(icon.id, icon);
        });

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

@@ -210,7 +219,7 @@ var BaseAppView = GObject.registerClass({
        if (this._items.has(id))
            this._items.get(id).navigate_focus(null, St.DirectionType.TAB_FORWARD, false);
        else
-            log('No such application %s'.format(id));
+            log(`No such application ${id}`);
    }

    selectApp(id) {
@@ -244,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', () => {
@@ -264,28 +261,11 @@ 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);
        }
@@ -313,7 +293,7 @@ var BaseAppView = GObject.registerClass({
    }

    adaptToSize(_width, _height) {
-        throw new GObject.NotImplementedError('adaptToSize in %s'.format(this.constructor.name));
+        throw new GObject.NotImplementedError(`adaptToSize in ${this.constructor.name}`);
    }
 });

@@ -407,19 +387,15 @@ var AllView = GObject.registerClass({
        this._lastOvershootY = -1;
        this._lastOvershootTimeoutId = 0;

-        this._viewIsReady = false;
-
        Main.overview.connect('hidden', () => this.goToPage(0));

        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);
        });

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

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

@@ -520,7 +492,7 @@ var AllView = GObject.registerClass({

        let folders = this._folderSettings.get_strv('folder-children');
        folders.forEach(id => {
-            let path = '%sfolders/%s/'.format(this._folderSettings.path, id);
+            let path = `${this._folderSettings.path}folders/${id}/`;
            let icon = this._items.get(id);
            if (!icon) {
                icon = new FolderIcon(id, path, this);
@@ -558,10 +530,8 @@ var AllView = GObject.registerClass({
    // Overridden from BaseAppView
    animate(animationDirection, onComplete) {
        this._scrollView.reactive = false;
-        this._swipeTracker.enabled = false;
        let completionFunc = () => {
            this._scrollView.reactive = true;
-            this._swipeTracker.enabled = this.mapped;
            if (onComplete)
                onComplete();
        };
@@ -727,6 +697,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;
        });
@@ -1285,8 +1257,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)
@@ -1334,7 +1306,7 @@ class FolderView extends BaseAppView {
            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({
@@ -1350,6 +1322,7 @@ class FolderView extends BaseAppView {
        action.connect('pan', this._onPan.bind(this));
        this._scrollView.add_action(action);

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

@@ -1454,22 +1427,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);
@@ -1500,6 +1457,8 @@ class FolderView extends BaseAppView {
        } else {
            this._folder.set_strv('apps', folderApps);
        }
+
+        return true;
    }
 });

@@ -1533,26 +1492,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)
@@ -1564,10 +1523,10 @@ var FolderIcon = GObject.registerClass({
    }

    vfunc_unmap() {
+        super.vfunc_unmap();
+
        if (this._dialog)
            this._dialog.popdown();
-
-        super.vfunc_unmap();
    }

    open() {
@@ -1580,32 +1539,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;
@@ -1624,18 +1580,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;
    }
@@ -1650,11 +1615,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) {
@@ -1690,6 +1655,10 @@ var AppFolderDialog = GObject.registerClass({
            x_align: Clutter.ActorAlign.CENTER,
            y_align: Clutter.ActorAlign.CENTER,
        });
+        this.add_constraint(new Clutter.BindConstraint({
+            source: Main.overview.viewSelector,
+            coordinate: Clutter.BindCoordinate.ALL,
+        }));

        this._source = source;
        this._folder = folder;
@@ -1935,7 +1904,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;
@@ -1944,8 +1912,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
@@ -2061,6 +2027,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:
@@ -2109,7 +2076,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', () => {
@@ -2121,6 +2092,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;
@@ -2302,7 +2276,7 @@ var AppIcon = GObject.registerClass({

    shellWorkspaceLaunch(params) {
        let { stack } = new Error();
-        log('shellWorkspaceLaunch is deprecated, use app.open_new_window() instead\n%s'.format(stack));
+        log(`shellWorkspaceLaunch is deprecated, use app.open_new_window() instead\n${stack}`);

        params = Params.parse(params, { workspace: -1,
                                        timestamp: 0 });
@@ -2367,17 +2341,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;

@@ -2389,8 +2353,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;
@@ -2400,13 +2362,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;
@@ -2414,8 +2395,6 @@ var AppIcon = GObject.registerClass({
        if (!this._canAccept(source))
            return DND.DragMotionResult.CONTINUE;

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

@@ -2460,7 +2439,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(
@@ -2577,7 +2556,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
@@ -66,7 +66,7 @@ class AppFavorites {
    constructor() {
        this.FAVORITE_APPS_KEY = 'favorite-apps';
        this._favorites = {};
-        global.settings.connect('changed::%s'.format(this.FAVORITE_APPS_KEY), this._onFavsChanged.bind(this));
+        global.settings.connect(`changed::${this.FAVORITE_APPS_KEY}`, this._onFavsChanged.bind(this));
        this.reload();
    }

--- a/js/ui/audioDeviceSelection.js
+++ b/js/ui/audioDeviceSelection.js
@@ -120,7 +120,7 @@ var AudioDeviceSelectionDialog = GObject.registerClass({
        let app = Shell.AppSystem.get_default().lookup_app(desktopFile);

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

--- a/js/ui/background.js
+++ b/js/ui/background.js
@@ -504,6 +504,7 @@ var SystemBackground = GObject.registerClass({
    Signals: { 'loaded': {} },
 }, class SystemBackground extends Meta.BackgroundActor {
    _init() {
+
        if (_systemBackground == null) {
            _systemBackground = new Meta.Background({ meta_display: global.display });
            _systemBackground.set_color(DEFAULT_BACKGROUND_COLOR);
@@ -515,11 +516,22 @@ var SystemBackground = GObject.registerClass({
            background: _systemBackground,
        });

-        let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
-            this.emit('loaded');
-            return GLib.SOURCE_REMOVE;
-        });
-        GLib.Source.set_name_by_id(id, '[gnome-shell] SystemBackground.loaded');
+        let cache = Meta.BackgroundImageCache.get_default();
+        let image = cache.load(file);
+        if (image.is_loaded()) {
+            image = null;
+            let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
+                this.emit('loaded');
+                return GLib.SOURCE_REMOVE;
+            });
+            GLib.Source.set_name_by_id(id, '[gnome-shell] SystemBackground.loaded');
+        } else {
+            let id = image.connect('loaded', () => {
+                this.emit('loaded');
+                image.disconnect(id);
+                image = null;
+            });
+        }
    }
 });

--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@@ -18,7 +18,7 @@ var ELLIPSIS_CHAR = '\u2026';

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

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

 function sameYear(dateA, dateB) {
    return dateA.getYear() == dateB.getYear();
@@ -114,26 +114,26 @@ var EventSourceBase = GObject.registerClass({
    Signals: { 'changed': {} },
 }, class EventSourceBase extends GObject.Object {
    get isLoading() {
-        throw new GObject.NotImplementedError('isLoading in %s'.format(this.constructor.name));
+        throw new GObject.NotImplementedError(`isLoading in ${this.constructor.name}`);
    }

    get hasCalendars() {
-        throw new GObject.NotImplementedError('hasCalendars in %s'.format(this.constructor.name));
+        throw new GObject.NotImplementedError(`hasCalendars in ${this.constructor.name}`);
    }

    destroy() {
    }

    requestRange(_begin, _end) {
-        throw new GObject.NotImplementedError('requestRange in %s'.format(this.constructor.name));
+        throw new GObject.NotImplementedError(`requestRange in ${this.constructor.name}`);
    }

    getEvents(_begin, _end) {
-        throw new GObject.NotImplementedError('getEvents in %s'.format(this.constructor.name));
+        throw new GObject.NotImplementedError(`getEvents in ${this.constructor.name}`);
    }

    hasEvents(_day) {
-        throw new GObject.NotImplementedError('hasEvents in %s'.format(this.constructor.name));
+        throw new GObject.NotImplementedError(`hasEvents in ${this.constructor.name}`);
    }
 });

@@ -215,7 +215,7 @@ class DBusEventSource extends EventSourceBase {
                    // about the HasCalendars property and would cause an exception trying
                    // to read it)
                } else {
-                    log('Error loading calendars: %s'.format(e.message));
+                    log(`Error loading calendars: ${e.message}`);
                    return;
                }
            }
@@ -359,7 +359,7 @@ var Calendar = GObject.registerClass({
        this._weekStart = Shell.util_get_week_start();
        this._settings = new Gio.Settings({ schema_id: 'org.gnome.desktop.calendar' });

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

        /**
@@ -626,13 +626,13 @@ var Calendar = GObject.registerClass({

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

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

            if (sameDay(now, iter))
                styleClass += ' calendar-today';
@@ -738,15 +738,15 @@ class EventMessage extends MessageList.Message {
        let rtl = Clutter.get_default_text_direction() == Clutter.TextDirection.RTL;
        if (this._event.date < periodBegin && !this._event.allDay) {
            if (rtl)
-                title = '%s%s'.format(title, ELLIPSIS_CHAR);
+                title = `${title}${ELLIPSIS_CHAR}`;
            else
-                title = '%s%s'.format(ELLIPSIS_CHAR, title);
+                title = `${ELLIPSIS_CHAR}${title}`;
        }
        if (this._event.end > periodEnd && !this._event.allDay) {
            if (rtl)
-                title = '%s%s'.format(ELLIPSIS_CHAR, title);
+                title = `${ELLIPSIS_CHAR}${title}`;
            else
-                title = '%s%s'.format(title, ELLIPSIS_CHAR);
+                title = `${title}${ELLIPSIS_CHAR}`;
        }
        return title;
    }
@@ -837,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();
    }

@@ -932,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) {
@@ -1153,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._dndButton.bind_property('checked',
-            this._dndSwitch, 'state',
-            GObject.BindingFlags.BIDIRECTIONAL | GObject.BindingFlags.SYNC_CREATE);
+        this._dndButton.connect('clicked', () => this._dndSwitch.toggle());
        hbox.add_child(this._dndButton);

        this._clearButton = new St.Button({
@@ -1213,7 +1204,7 @@ class CalendarMessageList extends St.Widget {

        for (let prop of ['visible', 'empty', 'can-clear']) {
            connectionsIds.push(
-                section.connect('notify::%s'.format(prop), this._sync.bind(this)));
+                section.connect(`notify::${prop}`, this._sync.bind(this)));
        }
        connectionsIds.push(section.connect('message-focused', (_s, messageActor) => {
            Util.ensureActorVisibleInScrollView(this._scrollView, messageActor);
--- 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/automountManager.js
+++ b/js/ui/components/automountManager.js
@@ -113,7 +113,7 @@ var AutomountManager = class {
                    try {
                        drive.stop_finish(res);
                    } catch (e) {
-                        log('Unable to stop the drive after drive-eject-button %s'.format(e.toString()));
+                        log(`Unable to stop the drive after drive-eject-button ${e.toString()}`);
                    }
                });
        } else if (drive.can_eject()) {
@@ -122,7 +122,7 @@ var AutomountManager = class {
                    try {
                        drive.eject_with_operation_finish(res);
                    } catch (e) {
-                        log('Unable to eject the drive after drive-eject-button %s'.format(e.toString()));
+                        log(`Unable to eject the drive after drive-eject-button ${e.toString()}`);
                    }
                });
        }
@@ -210,7 +210,7 @@ var AutomountManager = class {
                }

                if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
-                    log('Unable to mount volume %s: %s'.format(volume.get_name(), e.toString()));
+                    log(`Unable to mount volume ${volume.get_name()}: ${e.toString()}`);
                this._closeOperation(volume);
            }
        }
--- a/js/ui/components/autorunManager.js
+++ b/js/ui/components/autorunManager.js
@@ -66,7 +66,7 @@ function startAppForMount(app, mount) {
        retval = app.launch(files,
                            global.create_app_launch_context(0, -1));
    } catch (e) {
-        log('Unable to launch the application %s: %s'.format(app.get_name(), e.toString()));
+        log(`Unable to launch the application ${app.get_name()}: ${e}`);
    }

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

        if (contentTypes.length) {
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M6.5 1C5.669 1 5 1.669 5 2.5V4H2c-.554 0-1 .446-1 1v3h1.5C3.331 8 4 8.669 4 9.5S3.331 11 2.5 11H1v3c0 .554.446 1 1 1h3v-1.5c0-.831.669-1.5 1.5-1.5s1.5.669 1.5 1.5V15h3c.554 0 1-.446 1-1v-3h1.5c.831 0 1.5-.669 1.5-1.5S14.331 8 13.5 8H12V5c0-.554-.446-1-1-1H8V2.5C8 1.669 7.331 1 6.5 1z" style="isolation:auto;mix-blend-mode:normal;marker:none" color="#000" overflow="visible" fill="#474747"/></svg>`