Finalise changelog

New upstream release
Update upstream source from tag 'upstream/3.31.92'
2019-03-06 15:45:15 +00:00 · 2019-03-06 15:41:51 +00:00 · 2019-03-06 15:39:48 +00:00 · 2019-02-21 10:33:13 +00:00 · 2019-02-21 10:15:11 +00:00 · 2019-02-21 10:15:11 +00:00
152 changed files with 13238 additions and 14194 deletions
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -0,0 +1,6 @@
+{
+    "extends": [
+        "./lint/eslintrc-gjs.json",
+        "./lint/eslintrc-shell.json"
+    ]
+}
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -1,3 +0,0 @@
-extends:
- - ./lint/eslintrc-gjs.yml
- - ./lint/eslintrc-shell.yml
--- a/341
+++ b/341
@@ -1,344 +1,3 @@
-40.4
-====
-* drive-menu: Fix indicator visibility [Florian; !176]
-* Use distinct gettext domain for e.g.o uploads [Florian; #335]
-
-Contributors:
-  Florian Müllner
-
-
-40.3
-====
-* drive-menu: Improve detection of network mounts [Florian; !27]
-* Misc. bug fixes [Florian; #340]
-
-Contributors:
-  Florian Müllner
-
-40.2
-====
-* window-list: Extend reactive area of minimap to screen edges [Adam; !171]
-* Misc. bug fixes [Florian; !172]
-
-Contributors:
-  Adam Goode, Florian Müllner
-
-Translators:
-  Hugo Carvalho [pt], Juliano de Souza Camargo [pt]
-
-40.1
-====
-* Disable welcome dialog in classic session [Florian; !169]
-* windowsNavigator: Adjust to a late gnome-shell change [Florian; !170]
-
-Contributors:
-  Florian Müllner
-
-Translators:
-  Ngọc Quân Trần [vi], Anders Jonsson [sv], Carmen Bianca BAKKER [eo],
-  Pawan Chitrakar [ne], Quentin PAGÈS [oc]
-
-40.0
-====
-
-Translators:
-  Jiri Grönroos [fi]
-
-40.rc
-=====
-* native-window-placement: Adjust to gnome-shell changes [Florian; !164]
-* windows-navigator: Adjust to gnome-shell changes [Florian; !163]
-* window-list, workspace-indicator: Only show previews for up to six workspaces
-  [Florian; !165]
-* window-list, workspace-indicator: Improve workspace preview appearance
-  [Florian; !166]
-
-Contributors:
-  Florian Müllner
-
-Translators:
-  Fran Dieguez [gl]
-
-40.beta
-=======
-* Add tooltips to workspace thumbnails [Florian; !155]
-* Drop arrows from top bar menus [Florian; !156]
-* drive-menu: Mark mounts that can be unmounted as removable [Michael; !152]
-* Remove horizontal-workspaces extension [Florian; !158]
-* Adjust to shell overview changes [Florian; !159, !160]
-* Fix crashes [Daniel; !157]
-* Misc. bug fixes and cleanups [Florian; !154, !161]
-
-Contributors:
-  Michael Lawton, Florian Müllner, Daniel van Vugt
-
-Translators:
-  Аляксей [be], A S Alam [pa]
-
-40.alpha.1
-==========
-* Don't depend on sassc when building from tarball [Florian; !150]
-* Port extensions preferences to GTK4 [Florian; !148]
-* Misc. bug fixes and cleanups [Florian, Jonas; !149, !151, !153]
-
-Contributors:
-  Jonas Dreßler, Florian Müllner
-
-40.alpha
-========
-* window-list: Honor changes in skip-taskbar property [Sergio; !130]
-* window-list, workspace-indicator: Adjust to 3.38 changes [Florian; !133]
-* window-list, workspace-indicator: Improve previews in workspace thumbs
-  [Florian; #260, !142]
-* auto-move: Improve behavior on multi-monitor setups [Florian; !135]
-* windowNavigator: Adjust to 3.38 changes [Thun; #259]
-* Misc. bug fixes and cleanups [Florian, Jonas Å, Jordan, Ray; !131, !136,
-  !137, !140, !141, !144, !146, !145]
-
-Contributors:
-  Sergio Costas, Florian Müllner, Jordan Petridis, Thun Pin, Ray Strode,
-  Jonas Ådahl
-
-Translators:
-  Fabio Tomat [fur], Jordi Mas [ca]
-
-3.38.1
-======
-
-Contributors:
-  Yacine Bouklif, Florian Müllner
-
-Translators:
-  Yacine Bouklif [kab], Cheng-Chia Tseng [zh_TW], Stas Solovey [ru],
-  Yosef Or Boczko [he]
-
-3.38.0
-======
-
-Translators:
-  Balázs Meskó [hu], Alan Mortensen [da], Juliano Camargo [pt], Tim Sabsch [de],
-  Milo Casagrande [it], Rūdolfs Mazurs [lv]
-
-3.37.92
-=======
-
-Translators:
-  Nathan Follens [nl], Zander Brown [en_GB], Aurimas Černius [lt],
-  Marek Černocký [cs], Changwoo Ryu [ko], Dušan Kazik [sk]
-
-3.37.91
-=======
-
-Contributors:
-  Florian Müllner
-
-Translators:
-  Fran Dieguez [gl], Akarshan Biswas [bn_IN], Kukuh Syafaat [id],
-  Piotr Drąg [pl], Rafael Fontenelle [pt_BR], Jiri Grönroos [fi],
-  Марко Костић [sr], Goran Vidović [hr]
-
-3.37.90
-=======
-* Misc. bug fixes and cleanups [Florian, Piotr; !126, !128]
-
-Contributors:
-  Piotr Drąg, Florian Müllner
-
-Translators:
-  Fabio Tomat [fur], Efstathios Iosifidis [el], Anders Jonsson [sv],
-  Asier Sarasua Garmendia [eu], Alexandre Franke [fr]
-
-3.37.3
-======
-* window-list, native-window-placement: Adjust to shell changes [Florian; !124]
-
-Contributors:
-  Florian Müllner
-
-Translators:
-  Jordi Mas [ca], sicklylife [ja], Boyuan Yang [zh_CN],
-  Baurzhan Muftakhidinov [kk]
-
-3.37.2
-======
-* window-list, auto-move: Modernize preference dialogs [Florian; !121]
-* Adjust to gnome-shell changes [Florian; !122]
-
-Contributors:
-  Florian Müllner
-
-Translators:
-  Cheng-Chia Tseng [zh_TW], Yuri Chornoivan [uk], Daniel Mustieles [es],
-  Emin Tufan Çetin [tr], Danial Behzadi [fa], Daniel Șerbănescu [ro],
-  Matej Urbančič [sl]
-
-3.37.1
-======
-* drive-menu: Emphasize eject buttons [Florian; #223]
-* user-theme: Add preference dialog [Florian; !117]
-* window-list: Fix inconsistent state in preference dialog [Milan; !119]
-* workspace-indicator: Overhaul preference dialog [Florian; !120]
-* user-theme: Support session mode styles [Florian; !118]
-* Misc. bug fixes and cleanups [Florian, Xiaoguang; !113, !106, !114, !116]
-
-Contributors:
-  Milan Crha, Florian Müllner, Xiaoguang Wang
-
-Translators:
-  Daniel Korostil [uk], Yosef Or Boczko [he], Kristjan SCHMIDT [eo],
-  Dz Chen [zh_CN], Danial Behzadi [fa], Yuri Chornoivan [uk],
-  Anders Jonsson [sv], Daniel Mustieles [es]
-
-3.36.0
-======
-
-Contributors:
-  Florian Müllner
-
-3.35.91
-=======
-
-Contributors:
-  Florian Müllner
-
-Translators:
-  Zander Brown [en_GB]
-
-3.35.90
-=======
-* Adjust to gnome-shell changes [Florian; !100, !101, !102]
-* Force single-line window titles in window list [Florian; #202]
-* Misc. bug fixes and cleanup [Florian; !104, !105]
-
-Contributors:
-  Florian Müllner
-
-Translators:
-  sicklylife [ja], Umarzuki Bin Mochlis Moktar [ms]
-
-3.35.3
-======
-
-Translators:
-  Fran Dieguez [gl]
-
-3.35.2
-======
-* Adjust to gnome-shell changes [Marco, Florian; !89, !95, !96]
-* window-list, workspace-indicator: Exclude DESKTOP windows from previews
-  [Florian; !93]
-* screenshot-window-sizer: Fix cycling through all valid sizes [Willy; !97]
-
-Contributors:
-  Marco Trevisan (Treviño), Florian Müllner, Willy Stadnick
-
-3.34.1
-======
-* Adjust to gnome-settings-daemon plugin removals [Xiaoguang; !94]
-
-Contributors:
-  Florian Müllner, Xiaoguang Wang
-
-Translators:
-  Nathan Follens [nl], Dušan Kazik [sk], Ask Hjorth Larsen [da],
-  Yi-Jyun Pan [zh_TW]
-
-3.34.0
-======
-
-Translators:
-  Rafael Fontenelle [pt_BR], Efstathios Iosifidis [el], Milo Casagrande [it],
-  Sabri Ünal [tr]
-
-3.33.92
-=======
-
-Translators:
-  Марко Костић [sr], Tim Sabsch [de], Rūdolfs Mazurs [lv], Matej Urbančič [sl],
-  Balázs Úr [hu], Claude Paroz [fr], Fran Dieguez [gl], Changwoo Ryu [ko],
-  Ryuta Fujii [ja], Fabio Tomat [fur], Goran Vidović [hr]
-
-3.33.91
-=======
-* Misc. bug fixes and cleanups [Florian; !88, !90, !91, !92]
-
-Contributors:
-  Florian Müllner
-
-Translators:
-  Asier Sarasua Garmendia [eu], Anders Jonsson [sv], Marek Černocký [cs],
-  Kukuh Syafaat [id], Jiri Grönroos [fi], Florentina Mușat [ro],
-  Aurimas Černius [lt], Daniel Mustieles [es], Piotr Drąg [pl], Jordi Mas [ca],
-  Danial Behzadi [fa]
-3.33.90
-=======
-* window-list: Support showing windows from all workspaces [Florian; #154]
-* Misc. bug fixes and cleanups [Florian; !86, !87]
-
-Contributors:
-  Florian Müllner
-
-Translators:
-  Jor Teron [mjw]
-
-3.33.4
-======
-* Make GNOME Classic more classic:
-  - Disable GNOME 3 overview [Florian; !69]
-  - Add window picker button to window list [Florian; !73, !80]
-  - Style improvements and fixes [Jakub; #169, !82]
-  - Support horizontal workspace layout in window list [Florian; !70]
-  - Add draggable previews to window list workspace switcher [Florian; !74]
-  - Arrange workspaces horizontally [Florian; !72]
-* workspace-indicator: Support horizontal workspace layout [Florian; !71]
-* workspace-indicator: Add draggable previews [Florian; !77]
-* Misc. bug fixes and cleanups [Florian; !75, !76, !79, !78, #168, !84]
-
-Contributors:
-  Florian Müllner, Jakub Steiner, Jor Teron
-
-Translators:
-  Jor Teron [mjw]
-
-3.33.3
-======
-* Misc. bug fixes [Florian, Marco; !67, !68]
-
-Contributors:
-  Florian Müllner, Marco Trevisan (Treviño)
-
-3.33.2
-======
-* Misc. bug fixes and cleanups [Florian; !66]
-
-Contributors:
-  Florian Müllner
-
-3.33.1
-======
-* Misc. bug fixes [Florian; !64]
-
-Contributors:
-  Florian Müllner
-
-3.32.1
-======
-* Fix windowsNavigator extension after ES6 port [Florian; #143]
-* screenshot-window-sizer: Add phone screenshot sizes [Adrien; !65]
-* Misc. bug fixes and cleanups [Fabian; !62]
-
-Contributors:
-  Florian Müllner, Adrien Plazas, Fabian P. Schmidt
-
-3.32.0
-======
-
-Contributors:
-  Florian Müllner
-
-Translations:
-  Victor Ibragimov [tg], Kristjan SCHMIDT [eo], Mart Raudsepp [et]
-
 3.31.92
 =======
 * Misc. bug fixes and cleanups [Florian; !57, !58, !59, !60]
--- a/README.md
+++ b/README.md
@@ -15,12 +15,6 @@ Bugs should be reported to the GNOME [bug tracking system][bug-tracker].

 ## Extensions

- * alternate-tab (**OBSOLETE**)
- 
-     Lets you use classic Alt+Tab (window-based instead of app-based) in GNOME Shell.
-     This extension is obsolete since GNOME 3.30, see [this blogpost][alternatetab-post]
-     for further details.
-
 * apps-menu

     Lets you reach an application using gnome 2.x style menu on the panel.
@@ -80,4 +74,3 @@ file for details.
 [shell-page]: https://wiki.gnome.org/Projects/GnomeShell
 [bug-tracker]: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/issues
 [license]: COPYING
-[alternatetab-post]: https://blogs.gnome.org/fmuellner/2018/10/11/the-future-of-alternatetab-and-why-you-need-not-worry/
--- a/data/classic.json.in
+++ b/data/classic.json.in
@@ -1,10 +1,8 @@
 {
    "parentMode": "user",
    "stylesheetName": "gnome-classic.css",
-    "hasOverview": false,
-    "showWelcomeDialog": false,
    "enabledExtensions": [@CLASSIC_EXTENSIONS@],
-    "panel": { "left": ["appMenu"],
+    "panel": { "left": ["activities", "appMenu"],
               "center": [],
               "right": ["a11y", "keyboard", "dateMenu", "aggregateMenu"]
             }
--- a/data/gnome-classic.desktop.in
+++ b/data/gnome-classic.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=GNOME Classic
 Comment=This session logs you into GNOME Classic
-Exec=env GNOME_SHELL_SESSION_MODE=classic gnome-session
+Exec=env GNOME_SHELL_SESSION_MODE=classic gnome-session --session gnome-classic
 TryExec=gnome-session
 Type=Application
 DesktopNames=GNOME-Classic;GNOME;
--- a/data/gnome-classic.scss
+++ b/data/gnome-classic.scss
@@ -4,7 +4,6 @@ $variant: 'light';
@import "gnome-shell-sass/_colors"; //use gtk colors
@import "gnome-shell-sass/_drawing";
@import "gnome-shell-sass/_common";
-@import "gnome-shell-sass/_widgets";

 /* Overrides */

@@ -33,32 +32,18 @@ $variant: 'light';
    font-weight: normal;
    color: $fg_color;
    text-shadow: none;
-    transition-duration: 0ms;
-    border: 0;
-    border-radius: 0px;
-
-    &.clock-display {
-      .clock {
-        transition-duration: 0ms;
-        border: 0;
-        border-radius: 0px;
-      }
-    }
-
-    &:hover {
-      color: lighten($fg_color,10%);
-      text-shadow: none;
-      & .system-status-icon { icon-shadow: none; }
-    }
    &:active, &:overview, &:focus, &:checked {
      // Trick due to St limitations. It needs a background to draw
      // a box-shadow
-      background-color: $selected_bg_color;
-      color: $selected_fg_color;
+      background-color: $selected_bg_color !important;
+      color: $selected_fg_color !important;
      box-shadow: none;
      & > .system-status-icon { icon-shadow: none; }
    }
-
+    &:hover {
+      text-shadow: none;
+      & .system-status-icon { icon-shadow: none; }
+    }
    .app-menu-icon { width: 0; height: 0; margin: 0; } // shell's display:none; :D

    .system-status-icon {
@@ -75,12 +60,13 @@ $variant: 'light';
  &.lock-screen,
  &.unlock-screen, 
  &.login-screen { 
-    background-color: transparentize($bg_color, 0.5);
-    background-gradient-start: transparentize($bg_color, 0.5);
-    background-gradient-end: transparentize($bg_color, 0.5);
+    background-color: transparentize($_bubble_bg_color, 0.5);
+    background-gradient-start: transparentize($_bubble_bg_color, 0.5);
+    background-gradient-end: transparentize($_bubble_bg_color, 0.5);
    border-bottom: none;
    .panel-button { color: $osd_fg_color; }
  }
+  .popup-menu-arrow { width: 0; height: 0;  } // shell's display: none;
 }

 #appMenu { 
@@ -105,3 +91,15 @@ $variant: 'light';
  background-image: url("calendar-today.svg");
 }

+.message-list-clear-button.button {
+  color: $fg_color
+}
+
+.notification-banner {
+  background-color: $bg_color !important;
+  color: $fg_color;
+  .notification-button {
+    background-color: darken($bg_color,5%);
+    &:hover, &focus { background-color: darken($bg_color,2%); }
+  }
+}
--- a/data/gnome-classic.session.desktop.in
+++ b/data/gnome-classic.session.desktop.in
@@ -0,0 +1,3 @@
+[GNOME Session]
+Name=GNOME Classic
+RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;
--- a/data/gnome-shell-sass/_colors.scss
+++ b/data/gnome-shell-sass/_colors.scss
@@ -1,39 +1,36 @@
 // When color definition differs for dark and light variant,
 // it gets @if ed depending on $variant

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

-$selected_fg_color: #fff;
-$selected_bg_color: if($variant == 'light', #3584e4, darken(#3584e4, 10%));
+$selected_fg_color: #ffffff;
+$selected_bg_color: if($variant == 'light', #3584e4, darken(#3584e4, 20%));
 $selected_borders_color: if($variant== 'light', darken($selected_bg_color, 15%), darken($selected_bg_color, 30%));
-$borders_color: if($variant == 'light', darken($bg_color, 18%), darken($bg_color, 8%));
-$borders_edge: if($variant == 'light', rgba(255,255,255,0.8), transparentize($fg_color, 0.93));
+$borders_color: if($variant == 'light', darken($bg_color, 18%), darken($bg_color, 10%));
+$borders_edge: if($variant == 'light', transparentize(white, 0.2), transparentize($fg_color, 0.93));
 $link_color: if($variant == 'light', darken($selected_bg_color, 10%), lighten($selected_bg_color, 20%));
 $link_visited_color: if($variant == 'light', darken($selected_bg_color, 20%), lighten($selected_bg_color, 10%));
 $top_hilight: $borders_edge;

 $warning_color: #f57900;
-$error_color: #ff8080;
+$error_color: #cc0000;
 $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_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_bg_color: #2e3436;
 $osd_borders_color: transparentize(black, 0.3);
-$osd_outer_borders_color: transparentize(white, 0.84);
+$osd_outer_borders_color: transparentize(white, 0.9);

-$shadow_color: if($variant == 'light', rgba(0,0,0,0.1), rgba(0,0,0,0.2));
-$system_bg_color: desaturate(#241f31,100%); //neutralize the HIG color
+$tooltip_borders_color: $osd_outer_borders_color;

 //insensitive state derived colors
 $insensitive_fg_color: mix($fg_color, $bg_color, 50%);
 $insensitive_bg_color: mix($bg_color, $base_color, 60%);
-$insensitive_borders_color: mix($borders_color, $base_color, 60%);
+$insensitive_borders_color: $borders_color;

 //colors for the backdrop state, derived from the main colors.
 $backdrop_base_color: if($variant =='light', darken($base_color,1%), lighten($base_color,1%));
--- a/data/gnome-shell-sass/_common.scss
+++ b/data/gnome-shell-sass/_common.scss
--- a/data/gnome-shell-sass/_drawing.scss
+++ b/data/gnome-shell-sass/_drawing.scss
@@ -2,7 +2,7 @@

 // generic drawing of more complex things

-@function draw_widget_edge($c:$borders_edge) {
+@function _widget_edge($c:$borders_edge) {
 // outer highlight "used" on most widgets
  @return 0 1px $c;
 }
@@ -13,7 +13,7 @@
  //font-size: ($size / $base) * 1rem;
 }

-@mixin draw_shadows($shadow1, $shadow2:none, $shadow3:none, $shadow4:none) {
+@mixin _shadows($shadow1, $shadow2:none, $shadow3:none, $shadow4:none) {
 //
 // Helper function to stack up to 4 box-shadows;
 //
@@ -31,22 +31,25 @@
 //
 // $t: entry type
 // $fc: focus color
-// $edge: set to none to not draw the bottom edge or specify a color to not use the default one
+// $edge: set to none to not draw the bottom edge or specify a color to not
+//        use the default one
 //
 // possible $t values:
 // normal, focus, insensitive
 //
+  $_inner_shadows: inset 0 2px 4px transparentize(black, 0.6);

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

  }
  @if $t==focus {
+    @include _shadows($_inner_shadows);
    border-color: if($fc==$selected_bg_color,
-              $selected_borders_color,
-              darken($fc,35%));
-    box-shadow: inset 0 0 0 1px $fc;
+                     $selected_borders_color,
+                     darken($fc,35%));
  }
  @if $t==hover { }
  @if $t==insensitive {
@@ -58,39 +61,36 @@

 // buttons

-@function draw_border_color ($c) {
-  //
-  // colored buttons want the border form the base color
-  //
-  @return if($variant == 'light', darken($c, 18%), darken($c, 4%));
-}
+@function _border_color ($c) { @return darken($c,25%); } // colored buttons want
+                                                         // the border form the
+                                                         // base color

-@function draw_text_shadow_color ($tc:$fg_color, $bg:$bg_color) {
+@function _text_shadow_color ($tc:$fg_color, $bg:$bg_color) {
 //
 // calculate the color of text shadows
 //
 // $tc is the text color
 // $bg is the background color
 //
-  $lbg: lightness($bg)/100%;
-  @if lightness($tc)<50% { @return rgba(255,255,255,$lbg/($lbg*1.3)); }
-  @else { @return rgba(0,0,0,1-$lbg*0.8); }
+  $_lbg: lightness($bg)/100%;
+  @if lightness($tc)<50% { @return transparentize(white,1-$_lbg/($_lbg*1.3)); }
+  @else { @return transparentize(black,$_lbg*0.8); }
 }

-@function draw_button_hilight_color($c) {
+@function _button_hilight_color($c) {
 //
-// calculate the right top highlight color for buttons
+// calculate the right top hilight color for buttons
 //
 // $c: base color;
 //
  @if lightness($c)>90% { @return white; }
-  @else if lightness($c)>80% { @return rgba(255,255,255, 0.7); }
-  @else if lightness($c)>50% { @return rgba(255,255,255, 0.5); }
-  @else if lightness($c)>40% { @return rgba(255,255,255, 0.3); }
-  @else { @return rgba(255,255,255, 0.1); }
+  @else if lightness($c)>80% { @return transparentize(white, 0.3); }
+  @else if lightness($c)>50% { @return transparentize(white, 0.5); }
+  @else if lightness($c)>40% { @return transparentize(white, 0.7); }
+  @else { @return transparentize(white, 0.9); }
 }

-@mixin draw_button_text_shadow ($tc:$fg_color, $bg:$bg_color) {
+@mixin _button_text_shadow ($tc:$fg_color, $bg:$bg_color) {
 //
 // helper function for the text emboss effect
 //
@@ -99,19 +99,19 @@
 // TODO: this functions needs a way to deal with special cases
 //

-  $shadow: draw_text_shadow_color($tc, $bg);
+  $_shadow: _text_shadow_color($tc, $bg);

  @if lightness($tc)<50% {
-    text-shadow: 0 1px $shadow;
-    icon-shadow: 0 1px $shadow;
+    text-shadow: 0 1px $_shadow;
+    icon-shadow: 0 1px $_shadow;
  }
  @else {
-    text-shadow: 0 -1px $shadow;
-    icon-shadow: 0 -1px $shadow;
+    text-shadow: 0 -1px $_shadow;
+    icon-shadow: 0 -1px $_shadow;
  }
 }

-@mixin button($t, $c:$bg_color, $tc:$fg_color, $edge: $borders_edge, $shadow: $shadow_color) {
+@mixin button($t, $c:$osd_bg_color, $tc:$fg_color, $edge: $borders_edge) {
 //
 // Button drawing function
 //
@@ -120,8 +120,6 @@
 // $tc:   optional text color for colored* types
 // $edge: set to none to not draw the bottom edge or specify a color to not
 //        use the default one
-// $shadow: set to none to not draw the drop shadow or specify a color to not
-//          use the default one
 //
 // possible $t values:
 // normal, hover, active, insensitive, insensitive-active,
@@ -129,104 +127,95 @@
 // osd, osd-hover, osd-active, osd-insensitive, osd-backdrop, undecorated
 //

-  $hilight_color: draw_button_hilight_color($c);
-  $button_edge: if($edge == none, none, draw_widget_edge($edge));
-  $blank_edge: if($edge == none, none, draw_widget_edge(transparentize($edge,1)));
-  $button_shadow: if($shadow == none, none, 0 1px 1px 0 $shadow);
+  $_hilight_color: _button_hilight_color($c);
+  $_button_edge: if($edge == none, none, _widget_edge($edge));
+  $_blank_edge: if($edge == none, none, _widget_edge(transparentize($edge,1)));
+

-  // normal button
  @if $t==normal {
-    color: $tc;
-    background-color: lighten($c, 3%);
-    border-color: draw_border_color($c);
-    @include draw_shadows($button_shadow);
-    // box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1);
-    text-shadow: 0 1px $text_shadow_color;
-    icon-shadow: 0 1px $text_shadow_color;
-  }
+  //
+  // normal button
+  //
+    $_bg: if($c!=$osd_bg_color, transparentize($c, 0.5),
+                            $osd_bg_color);

-  // focused button
+    color: $osd_fg_color;
+    background-color: $_bg;
+    border-color: $osd_borders_color;
+    box-shadow: inset 0 1px lighten($osd_bg_color,10%);
+    text-shadow: 0 1px black;
+    icon-shadow: 0 1px black;
+  }
  @if $t==focus {
-    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);
-    //border-color: $selected_bg_color;
+  //
+  // focused button
+  //
+    $_bg: if($c!=$osd_bg_color, transparentize($c, 0.3),
+                          lighten($osd_bg_color,3%));
+
+    color: $osd_fg_color;
+    text-shadow: 0 1px black;
+    icon-shadow: 0 1px black;
+    box-shadow: inset 0px 0px 0px 1px $selected_bg_color;
  }

-  // hover button
  @else if $t==hover {
-    color: $tc;
-    background-color: lighten($c, if($variant == 'light', 8%, 5%));
-    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;
-    icon-shadow: 0 1px $text_shadow_color;
-  }
+  //
+  // active osd button
+  //
+    $_bg: if($c!=$osd_bg_color, transparentize($c, 0.3),
+                            lighten($osd_bg_color,3%));

-  // active button
+    color: white;
+    border-color: $osd_borders_color;
+    background-color: $_bg;
+    box-shadow: inset 0 1px lighten($osd_bg_color,20%);
+    text-shadow: 0 1px black;
+    icon-shadow: 0 1px black;
+
+  }
  @else if $t==active {
-    color: $tc;
-    background-color: darken($c,3%);
-    border-color: draw_border_color(if($variant == 'light', $c, darken($c,7%)));
+  //
+  // active osd button
+  //
+    $_bg: if($c!=$bg_color, $c, $osd_borders_color);
+
+    color: white;
+    border-color: $osd_borders_color;
+    background-color: $selected_bg_color;
+    // This should be none, but it's creating some issues with borders, so to
+    // workaround it for now, use inset wich goes through a different code path.
+    // see https://bugzilla.gnome.org/show_bug.cgi?id=752934
+    box-shadow: inset 0 0 black;
    text-shadow: none;
    icon-shadow: none;
-    box-shadow: none;
  }
-
-  // insensitive button
  @else if $t==insensitive {
+  //
+  // insensitive osd button
+  //
+    $_bg: transparentize(mix($insensitive_fg_color,$osd_bg_color,20%),0.3);
+
    color: $insensitive_fg_color;
-    border-color: $insensitive_borders_color;
-    background-color: $insensitive_bg_color;
+    border-color: $osd_borders_color;
+    background-color: $_bg;
    box-shadow: none;
    text-shadow: none;
    icon-shadow: none;
  }
-
-  // reset
  @else if $t==undecorated {
+  //
+  // reset
+  //
    border-color: transparent;
    background-color: transparent;
    background-image: none;
-    @include draw_shadows(inset 0 1px rgba(255,255,255,0),$blank_edge);
+
+    @include _shadows(inset 0 1px transparentize(white,1),
+                      $_blank_edge);
+
    text-shadow: none;
    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 {
-      border: 2px solid $selected_bg_color; //already 2px transparent so no jumping
-      background-color: transparentize($selected_bg_color, .8);
-    }
-  }
-
-  &:active,
-  &:checked {
-    .overview-icon {
-      background-color: transparentize(darken($osd_bg_color, 10%), .5);
-    }
-  }
-}
--- a/data/gnome-shell-sass/_high-contrast-colors.scss
+++ b/data/gnome-shell-sass/_high-contrast-colors.scss
@@ -22,11 +22,10 @@ $destructive_color: darken(#ef2929,10%);

 $osd_fg_color: #eeeeec;
 $osd_bg_color: #2e3436;
-$osd_borders_color: rgba(0,0,0, 0.7);
-$osd_outer_borders_color: rgba(255,255,255, 0.1);
+$osd_borders_color: transparentize(black, 0.3);
+$osd_outer_borders_color: transparentize(white, 0.9);

-$shadow_color: rgba(0,0,0, 0.1);
-$system_bg_color: desaturate(#241f31,100%); //neutralize the HIG color
+$tooltip_borders_color: $osd_outer_borders_color;

 //insensitive state derived colors
 $insensitive_fg_color: mix($fg_color, $bg_color, 50%);
--- a/data/gnome-shell-sass/_widgets.scss
+++ b/data/gnome-shell-sass/_widgets.scss
@@ -1,51 +0,0 @@
-//
-// Shell widgets stylesheets are placed in separate .scss files
-// in 'widgets' and imported into the main stylesheet in this file.
-// To create or update a widget for the shell modify the list below.
-//
-
-/* WIDGETS */
-
-// Primary widgets
-@import 'widgets/base';
-@import 'widgets/entries';
-@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/corner-ripple';
-// Overview
-@import 'widgets/overview';
-@import 'widgets/window-picker';
-@import 'widgets/search-entry';
-@import 'widgets/search-results';
-@import 'widgets/dash';
-@import 'widgets/app-grid';
-@import 'widgets/workspace-thumbnails';
-// A11y / misc
-@import 'widgets/a11y';
-@import 'widgets/misc';
-@import 'widgets/tiled-previews';
-@import 'widgets/keyboard';
-@import 'widgets/looking-glass';
-// Lock / login screens
-@import 'widgets/login-dialog';
-@import 'widgets/screen-shield';
--- a/data/gnome-shell-sass/widgets/_a11y.scss
+++ b/data/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/gnome-shell-sass/widgets/_app-grid.scss
+++ b/data/gnome-shell-sass/widgets/_app-grid.scss
@@ -1,168 +0,0 @@
-/* App Grid */
-
-$app_icon_size: 96px;
-
-// app icons
-.icon-grid {
-  row-spacing: $base_spacing * 2;
-  column-spacing: $base_spacing * 2;
-  max-row-spacing: $base_spacing * 12;
-  max-column-spacing: $base_spacing * 12;
-  page-padding-top: $base_padding * 4;
-  page-padding-bottom: $base_padding * 4;
-  page-padding-left: $base_padding * 2;
-  page-padding-right: $base_padding * 2;
-}
-
-/* App Icons */
-
-$app_grid_fg_color: #fff;
-
-// Icon tiles in the app grid
-.app-well-app,
-%app-well-app {
-  @include overview-icon($app_grid_fg_color);
-
-  .overview-icon.overview-icon-with-label {
-    padding: 10px 8px 5px 8px;
-
-    > StBoxLayout {
-      spacing: $base_spacing;
-    }
-  }
-}
-
-/* App Folders */
-.app-well-app.app-folder {
-  background-color: $dash_background_color;
-  border-radius: $base_border_radius + 4px; // same as %icon_tile
-}
-
-// expanded folder
-.app-folder-dialog { //style like the dash
-  border-radius: $modal_radius * 1.5;
-  background-color: $dash_background_color;
-  padding: 12px 0px 12px 0px;
-
-  & .folder-name-container {
-    padding: 24px 36px 0;
-    spacing: 12px;
-
-    & .folder-name-label,
-    & .folder-name-entry {
-      font-size: 18pt;
-      font-weight: 800;
-    }
-
-    & .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; }
-
-    & .edit-folder-button {
-      @extend %button;
-
-      padding: 0;
-      width: 36px;
-      height: 36px;
-      border-radius: 18px;
-
-      & > StIcon { icon-size: 16px }
-    }
-  }
-
-  & .icon-grid {
-    row-spacing: $base_spacing * 2;
-    column-spacing: $base_spacing * 5;
-    page-padding-top: 0;
-    page-padding-bottom: 0;
-    page-padding-left: 0;
-    page-padding-right: 0;
-  }
-
-  & .page-indicators {
-    margin-bottom: 18px;
-  }
-}
-.app-folder-dialog-container {
-  padding: 12px;
-  width: 620px;
-  height: 620px;
-}
-
-// Running app indicator (also shown in dash)
-.app-well-app-running-dot {
-  height: 5px;
-  width: 5px;
-  border-radius:5px;
-  background-color: $osd_fg_color;
-  margin-bottom: 1px;
-}
-
-// Rename popup for app folders
-.rename-folder-popup {
-  .rename-folder-popup-item {
-    spacing: $base_spacing;
-    &:ltr, &:rtl { padding: 0 $base_padding * 2; }
-  }
-}
-
-// right-click app menu
-.app-menu,
-.app-well-menu {
-  max-width: 27.25em;
-}
-
-// App Grid pagination indicators
-.page-indicator {
-  padding: $base_padding $base_padding * 2 0;
-
-  .page-indicator-icon {
-    width: 10px;
-    height: 10px;
-    border-radius: 10px; // the same as height&width
-    background-color: white;
-  }
-}
-
-.apps-scroll-view {
-  padding: 0;
-}
-
-// shutdown and other actions in the grid
-.system-action-icon {
-  background-color: rgba(0,0,0,0.8);
-  color: #fff;
-  border-radius: 99px;
-  icon-size: $app_icon_size * 0.5;
-}
-
-.page-navigation-hint {
-  width: 300px;
-
-  &.dnd {
-    background: rgba(255, 255, 255, 0.1);
-  }
-
-  &.next:ltr,
-  &.previous:rtl {
-    background-gradient-start: rgba(255, 255, 255, 0.05);
-    background-gradient-end: transparent;
-    background-gradient-direction: horizontal;
-    border-radius: 15px 0px 0px 15px;
-  }
-
-  &.previous:ltr,
-  &.next:rtl {
-    background-gradient-start: transparent;
-    background-gradient-end: rgba(255, 255, 255, 0.05);
-    background-gradient-direction: horizontal;
-    border-radius: 0px 15px 15px 0px;
-  }
-}
-
-.page-navigation-arrow {
-  margin: 6px;
-  width: 24px;
-  height: 24px;
-}
--- a/data/gnome-shell-sass/widgets/_base.scss
+++ b/data/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 5px rgba(black, 0.8);
-}
--- a/data/gnome-shell-sass/widgets/_buttons.scss
+++ b/data/gnome-shell-sass/widgets/_buttons.scss
@@ -1,5 +0,0 @@
-/* Buttons */
-
-.button {
-  @extend %button; // that's it
-}
--- a/data/gnome-shell-sass/widgets/_calendar.scss
+++ b/data/gnome-shell-sass/widgets/_calendar.scss
@@ -1,291 +0,0 @@
-/* Date/Time Menu */
-
-.clock-display-box {
-  spacing: 2px;
-
-  .clock {
-    padding-left: $base_padding * 2;
-    padding-right: $base_padding * 2;
-  }
-}
-
-// overall menu
-#calendarArea {
-  padding:0;
-}
-
-// Calendar menu side column
-.datemenu-calendar-column {
-  spacing: $base_spacing;
-  border: 0 solid $bubble_borders_color;
-  padding: 0 $base_padding * 2;
-
-  &:ltr {margin-right: $base_margin * 2; border-left-width: 1px; }
-  &:rtl {margin-left: $base_margin * 2; border-right-width: 1px; }
-
-  .datemenu-displays-section {
-  }
-
-  .datemenu-displays-box {
-    spacing: $base_spacing;
-  }
-}
-
-.events-section-title {
-  @include notification_bubble($flat: true);
-  color: desaturate(darken($fg_color,40%), 10%);
-  font-weight: bold;
-  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 {
-    color: lighten($fg_color,5%);
-    font-weight: bold;
-    padding: 8px 0;
-    &:focus {}
-  }
-
-  // prev/next month icons
-  .calendar-change-month-back StIcon,
-  .calendar-change-month-forward StIcon {
-    icon-size: $base_icon_size;
-  }
-
-  .pager-button {
-    background-color: transparent;
-    height: 32px;
-    width: 32px;
-    border-radius: $base_border_radius;
-    &:hover, &:focus { background-color: lighten($hover_bg_color, 5%); }
-    &:active { background-color: $active_bg_color; }
-  }
-
-
-  $calendar_day_size: 32px;
-
-  .calendar-day-base {
-    @include fontsize($base_font_size - 3);
-    text-align: center;
-    width: $calendar_day_size;
-    height: $calendar_day_size;
-    padding: 0;
-    margin: 2px;
-    border-radius: $calendar_day_size * 0.5 + 2px;
-    border: 1px solid transparent; //avoid jumparound due to today
-    font-feature-settings: "tnum";
-    &:hover, &:focus { background-color: $hover_bg_color; }
-    &:active,&:selected {
-      color: lighten($fg_color,10%);
-      background-color: darken($bg_color,5%);
-    }
-
-    // day of week heading
-    &.calendar-day-heading {
-      color: lighten($fg_color,10%);
-      margin-top: 1em;
-      @include fontsize($base_font_size - 4);
-    }
-  }
-
-  .calendar-day { //border collapse hack - see calendar.js
-    border-width: 0;
-  }
-
-  .calendar-day-top {
-    border-top-width: 1px;
-  }
-
-  .calendar-day-left {
-    border-left-width: 1px;
-  }
-
-  .calendar-work-day {}
-
-  .calendar-nonwork-day {
-    color: $insensitive_fg_color;
-  }
-
-  // Today
-  .calendar-today {
-    font-weight: bold;
-    border: 1px solid transparent;
-    background-color: $selected_bg_color;
-    color: $selected_fg_color;
-
-    &:hover,&:focus {
-      background-color:lighten($selected_bg_color, 3%);
-      color: $selected_fg_color;
-    }
-
-    &: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 {
-    background-image: url("resource:///org/gnome/shell/theme/calendar-today.svg");
-    &.calendar-work-day {
-       color: lighten($fg_color,10%);
-       font-weight: bold;
-    }
-  }
-
-  .calendar-other-month-day {
-    color: transparentize($fg_color ,0.5);
-  }
-
-  .calendar-week-number {
-    @include fontsize($base_font_size - 4);
-    font-weight: bold;
-    height: 1.8em;
-    width: 2.3em; 
-    border-radius: 2px;
-    margin: 6px;
-    background-color: darken($bg_color, 2%);
-    color: lighten($fg_color, 5%);
-  }
-}
-
-/* Events */
-.events-button {
-  @include notification_bubble;
-  padding: $base_padding * 2;
-
-  .events-box {
-    spacing: $base_spacing;
-  }
-
-  .events-list {
-    spacing: 2 * $base_spacing;
-  }
-
-  .events-title {
-    color: desaturate(darken($fg_color,40%), 10%);
-    font-weight: bold;
-    margin-bottom: $base_margin;
-  }
-
-  .event-time {
-    color: darken($fg_color,20%);
-    font-feature-settings: "tnum";
-    @include fontsize($base_font_size - 1);
-  }
-}
-
-/* World clocks */
-.world-clocks-button {
-  @include notification_bubble;
-  padding: $base_padding * 2;
-
-  .world-clocks-grid {
-    spacing-rows: $base_spacing;
-    spacing-columns: $base_spacing * 2;
-  }
-
-  // title
-  .world-clocks-header {
-    color: desaturate(darken($fg_color,40%), 10%);
-    font-weight: bold;
-  }
-
-  // city label
-  .world-clocks-city {
-    color: $fg_color;
-    @include fontsize($base_font_size);
-    font-weight: normal;
-  }
-
-  // timezone time
-  .world-clocks-time {
-    font-weight: bold;
-    color: $fg_color;
-    font-feature-settings: "tnum";
-    @include fontsize($base_font_size);
-
-    &:ltr { text-align: right; }
-    &:rtl { text-align: left; }
-  }
-
-  // timezone offset label
-  .world-clocks-timezone {
-    color: darken($fg_color,20%);
-    font-feature-settings: "tnum";
-    @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/gnome-shell-sass/widgets/_check-box.scss
+++ b/data/gnome-shell-sass/widgets/_check-box.scss
@@ -1,18 +0,0 @@
-/* Check Boxes */
-
-// these are equal to the size of the SVG assets
-$check_height: 22px;
-$check_width: 24px;
-
-
-.check-box {
-  StBoxLayout { spacing: .8em; }
-  StBin {
-    width: $check_width;
-    height: $check_height;
-    background-image: url("resource:///org/gnome/shell/theme/checkbox-off.svg");
-  }
-  &:focus StBin { background-image: url("resource:///org/gnome/shell/theme/checkbox-off-focused.svg"); }
-  &:checked StBin { background-image: url("resource:///org/gnome/shell/theme/checkbox.svg"); }
-  &:focus:checked StBin { background-image: url("resource:///org/gnome/shell/theme/checkbox-focused.svg"); }
-}
--- a/data/gnome-shell-sass/widgets/_corner-ripple.scss
+++ b/data/gnome-shell-sass/widgets/_corner-ripple.scss
@@ -1,15 +0,0 @@
-/* Activities Ripple */
-
-$ripple_size: 50px;
-
-.ripple-box {
-  background-color: lighten(transparentize($selected_bg_color, 0.7), 40%);
-  box-shadow: 0 0 2px 2px lighten($selected_bg_color, 20%);
-  // plus + 2px for the border (box-shadow)
-  width: $ripple_size + 2px;
-  height: $ripple_size + 2px;
-  border-radius: 0 0 $ripple_size + 2px 0; // radius equals the size of the box to give us the curve
-
-  // just a simple change to the border radius position
-  &:rtl { border-radius: 0 0 0 $ripple_size + 2px; }
-}
--- a/data/gnome-shell-sass/widgets/_dash.scss
+++ b/data/gnome-shell-sass/widgets/_dash.scss
@@ -1,73 +0,0 @@
-/* Dash */
-
-$dash_background_color: #3b3b3b;
-$dash_placeholder_size: 32px;
-$dash_padding: $base_padding + 4px; // 10px
-$dash_spacing: $base_padding / 4;
-
-$dash_bottom_margin: $base_margin * 4;
-
-$dash_border_radius: $modal_radius * 1.5;
-
-#dash {
-  @include fontsize($base_font_size - 2);
-  margin-top: $base_spacing * 3;
-  padding: 0 $dash_padding;
-
-  .placeholder {
-    // background-image: url("resource:///org/gnome/shell/theme/dash-placeholder.svg");
-    background-image:none;
-    background-size: contain;
-    height: $dash_placeholder_size;
-  }
-
-  .empty-dash-drop-target {
-    width: $dash_placeholder_size;
-    height: $dash_placeholder_size;
-  }
-
-  .overview-icon {
-    padding: $dash_padding / 2;
-  }
-}
-
-.dash-background {
-  background-color: $dash_background_color;
-  margin-bottom: $dash_bottom_margin;
-  padding: $dash_padding;
-  border-radius: $dash_border_radius;
-}
-
-// Dash Items
-.dash-item-container .app-well-app, .show-apps {
-  padding: $dash_padding $dash_spacing $dash_padding + $dash_bottom_margin;
-}
-
-.dash-separator {
-  width: 1px;
-  margin: 0 ($dash_spacing + ($dash_padding / 2)) $dash_bottom_margin;
-  background-color: transparentize($osd_fg_color,0.7);
-}
-
-// OSD Tooltip
-.dash-label {
-  color: $osd_fg_color;
-  background-color: $osd_bg_color;
-  border-radius: 99px;
-  padding: $base_padding $base_padding * 2;
-  text-align: center;
-  -y-offset: $base_margin * 3; // distance from the dash edge
-}
-
-// Show apps button
-.show-apps {
-  @include overview-icon($osd_fg_color);
-
-  &:focus,
-  &:checked {
-    .overview-icon {
-      background-color: transparentize($osd_bg_color,0.5);
-      color: $fg_color;
-    }
-  }
-}
--- a/data/gnome-shell-sass/widgets/_dialogs.scss
+++ b/data/gnome-shell-sass/widgets/_dialogs.scss
@@ -1,173 +0,0 @@
-/* Modal Dialogs */
-
-.headline {
-  @include fontsize($base_font_size + 1);
-}
-
-.modal-dialog {
-  border-radius: $modal_radius;
-  @extend %bubble_panel;
-
-  .modal-dialog-content-box {
-    margin: 32px 40px;
-    spacing: 32px;
-    max-width: 28em;
-  }
-
-  .modal-dialog-linked-button {
-    @extend %bubble_button;
-  }
-}
-
-/* End Session Dialog */
-.end-session-dialog {
-  width: 30em;
-
-  .end-session-dialog-battery-warning,
-  .dialog-list-title {
-    color: $warning_color;
-  }
-}
-
-/* Message Dialog */
-.message-dialog-content {
-  spacing: 18px;
-
-  .message-dialog-title {
-    text-align: center;
-    font-size: 18pt;
-    font-weight: 800;
-
-    &.lightweight {
-      font-size: 13pt;
-      font-weight: 800;
-    }
-  }
-  .message-dialog-description { text-align: center; }
-}
-
-/* Dialog List */
-.dialog-list {
-  spacing: 18px;
-
-  .dialog-list-title {
-    text-align: center;
-    font-weight: bold;
-  }
-
-  .dialog-list-scrollview { max-height: 200px; }
-  .dialog-list-box {
-    spacing: 1em;
-
-    .dialog-list-item {
-      spacing: 1em;
-
-      .dialog-list-item-title { font-weight: bold; }
-      .dialog-list-item-description {
-        color: darken($fg_color,5%);
-        @include fontsize($base_font_size - 1);
-      }
-    }
-  }
-}
-
-/* Run Dialog */
-.run-dialog {
-  .modal-dialog-content-box {
-    margin-top: 24px;
-    margin-bottom: 14px;
-  }
-  .run-dialog-entry { width: 20em; }
-  .run-dialog-description {
-    @include fontsize($base_font_size - 1);
-    text-align: center;
-    color: darken($fg_color, 20%);
-  }
-}
-
-/* Password or Authentication Dialog */
-
-.prompt-dialog {
-  width: 28em;
-
-  .modal-dialog-content-box {
-    margin-bottom: 24px;
-  }
-}
-
-.prompt-dialog-password-grid {
-  spacing-rows: 8px;
-  spacing-columns: 4px;
-
-  .prompt-dialog-password-entry {
-    width: auto;
-
-    // 4px (spacing) + 16px (spinner-width)
-    &:ltr { margin-left: 20px; }
-    &:rtl { margin-right: 20px; }
-  }
-}
-
-.prompt-dialog-password-layout {
-  spacing: 8px;
-}
-
-.prompt-dialog-password-entry {
-  width: 20em;
-}
-
-.prompt-dialog-error-label,
-.prompt-dialog-info-label,
-.prompt-dialog-null-label {
-  text-align: center;
-  @include fontsize($base_font_size - 1);
-}
-
-.prompt-dialog-error-label {
-  color: $warning_color;
-}
-
-
-/* Polkit Dialog */
-
-.polkit-dialog-user-layout {
-  text-align: center;
-  spacing: 8px;
-  margin-bottom: 6px;
-
-  .polkit-dialog-user-root-label { color: $warning_color; }
-}
-
-/* Audio selection dialog */
-.audio-device-selection-dialog {
-  .modal-dialog-content-box { margin-bottom: 28px; }
-  .audio-selection-box { spacing: 20px; }
-}
-
-.audio-selection-device {
-  border: 1px solid $bubble_borders_color;
-  border-radius: 12px;
-  &:hover,&:focus { background-color: $hover_bg_color; }
-  &:active { 
-    background-color: $selected_bg_color;
-    color: $selected_fg_color;
-  }
-}
-
-.audio-selection-device-box {
-  padding: 20px;
-  spacing: 20px;
-}
-
-.audio-selection-device-icon {
-  icon-size: $base_icon_size * 4;
-}
-
-/* Welcome dialog */
-.welcome-dialog-image {
-  background-image: url("resource:///org/gnome/shell/theme/gnome-shell-start.svg");
-  background-size: contain;
-  /* Reasonable maximum dimensions */
-  height: 300px;
-  width: 300px;
-}
--- a/data/gnome-shell-sass/widgets/_entries.scss
+++ b/data/gnome-shell-sass/widgets/_entries.scss
@@ -1,27 +0,0 @@
-/* Entries */
-
-StEntry {
-  border-radius: $base_border_radius;
-  padding: 8px;
-  border-width: 1px;
-  color: $fg_color;
-  @include entry(normal);
-  //&:hover { @include entry(hover);}
-  &:focus { @include entry(focus);}
-  &:insensitive { @include entry(insensitive);}
-  selection-background-color: $selected_bg_color;
-  selected-color: $selected_fg_color;
-  StIcon.capslock-warning {
-    icon-size: 16px;
-    warning-color: $warning_color;
-    padding: 0 4px;
-  }
-  StIcon.peek-password {
-    icon-size: $base_icon_size;
-    padding: 0 4px;
-  }
-  StLabel.hint-text {
-    margin-left: 2px;
-    color: transparentize($fg_color, 0.3);
-  }
-}
--- a/data/gnome-shell-sass/widgets/_hotplug.scss
+++ b/data/gnome-shell-sass/widgets/_hotplug.scss
@@ -1,10 +0,0 @@
-// hotplug
-
-.hotplug-notification-item {
-  @extend %bubble_button;
-}
-
-.hotplug-notification-item-icon {
-  icon-size: 24px;
-  padding: 0 4px;
-}
--- a/data/gnome-shell-sass/widgets/_ibus-popup.scss
+++ b/data/gnome-shell-sass/widgets/_ibus-popup.scss
@@ -1,35 +0,0 @@
-// IBus Candidate Popup
-
-.candidate-popup-boxpointer {
-  @extend .popup-menu-boxpointer;
-}
-
-.candidate-popup-content {
-  padding: 0.5em;
-  spacing: 0.3em;
-}
-
-.candidate-index {
-  padding: 0 0.5em 0 0;
-  color: darken($fg_color,10%);
-}
-
-.candidate-box {
-  padding: 0.3em 0.5em 0.3em 0.5em;
-  border-radius: $base_border_radius;
-  &:selected,&:hover { background-color: $selected_bg_color; color: $selected_fg_color; }
-}
-
-.candidate-page-button-box {
-  height: 2em;
-  .vertical & { padding-top: 0.5em; }
-  .horizontal & { padding-left: 0.5em; }
-}
-
-.candidate-page-button {
-  padding: 4px;
-}
-
-.candidate-page-button-previous { border-radius: $base_border_radius 0px 0px $base_border_radius; border-right-width: 0; }
-.candidate-page-button-next { border-radius: 0px $base_border_radius $base_border_radius 0px;  }
-.candidate-page-button-icon { icon-size: 1em; }
--- a/data/gnome-shell-sass/widgets/_keyboard.scss
+++ b/data/gnome-shell-sass/widgets/_keyboard.scss
@@ -1,115 +0,0 @@
-/* On-screen Keyboard */
-
-$key_size: 1.2em;
-$key_border_radius: $base_border_radius + 3px;
-$key_bg_color:  $bg_color;
-// $default_key_bg_color: darken($key_bg_color, 4%);
-$default_key_bg_color: if($variant=='light', darken($osd_bg_color, 11%), lighten($osd_bg_color, 2%));
-
-
-// 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;
-
-  .page-indicator {
-    padding: $base_padding;
-
-    .page-indicator-icon {
-      width: 8px;
-      height: 8px;
-    }
-  }
-}
-
-// the container for individual keys
-.key-container {
-  padding: $base_margin;
-  spacing: $base_margin;
-}
-
-// the keys
-.keyboard-key {
-
-  @include button(normal, $c:$key_bg_color);
-
-  &:focus { @include button(focus);}
-  &:hover, &:checked { @include button(hover, $c: $key_bg_color);}
-  &:active { @include button(active, $c: $key_bg_color); }
-
-  @include fontsize($base_font_size + 5);
-  min-height: $key_size;
-  min-width: $key_size;
-  border-width: 1px;
-  border-style: solid;
-  border-radius: $key_border_radius;
-
-  &:grayed { //FIXMEy
-    background-color: darken($bg_color, 3%);
-    color: $osd_fg_color;
-    border-color: $osd_borders_color;
-  }
-
-  // non-character keys
-  &.default-key {
-    @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);}
-  }
-
-  // enter key is suggested-action
-  &.enter-key {
-    @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; }
-}
-
-// long press on a key popup
-.keyboard-subkeys {
-  color: $osd_fg_color;
-  -arrow-border-radius: $modal_radius;
-  -arrow-background-color: $osd_bg_color;
-  -arrow-border-width: 1px;
-  -arrow-border-color: lighten($osd_bg_color, 9%);
-  -arrow-base: 20px;
-  -arrow-rise: 10px;
-  -boxpointer-gap: $base_spacing;
-
-  .keyboard-key {
-    @include button(normal, $c:$key_bg_color);
-
-    &:focus { @include button(focus);}
-    &:hover, &:checked { @include button(hover, $c: $key_bg_color);}
-    &:active { @include button(active, $c: $key_bg_color); }
-
-    border-radius:$base_border_radius;
-  }
-}
-
-// emoji
-.emoji-page {
-  .keyboard-key {
-    background-color: transparent;
-    border: none;
-    color: initial;
-  }
-}
-
-.emoji-panel {
-  .keyboard-key:latched {
-    border-color: lighten($selected_bg_color, 5%);
-    background-color: $selected_bg_color;
-  }
-}
-
-// suggestions
-.word-suggestions {
-  @include fontsize($base_font_size + 3);
-  spacing: 12px;
-  min-height: 20pt;
-}
--- a/data/gnome-shell-sass/widgets/_login-dialog.scss
+++ b/data/gnome-shell-sass/widgets/_login-dialog.scss
@@ -1,174 +0,0 @@
-/* Login Dialog */
-
-.login-dialog-banner-view {
-  padding-top: 24px;
-  max-width: 23em;
-}
-
-.login-dialog,
-.unlock-dialog {
-  //reset
-  border: none;
-  background-color: transparent;
-
-  $_gdm_bg: $system_bg_color;
-
-  StEntry {
-    @if $variant=='dark' {
-      $_gdm_entry_bg: darken($system_bg_color, 3%);
-      background-color: $_gdm_entry_bg;
-      color: $fg_color;
-    }
-  }
-
-  .modal-dialog-button-box { spacing: 3px; }
-  .modal-dialog-button {
-    padding: 4px 18px;
-    box-shadow: 0 1px 3px rgba(0,0,0,0.2);
-    background-color: darken($system_bg_color, 3%);
-    border-color: darken($system_bg_color, 3%);
-    color: $osd_fg_color;
-
-    $_hover_c: lighten($_gdm_bg, 5%);
-    &:hover, &:focus {
-      background-color: $_hover_c;
-      border-color: $_hover_c;
-    }
-    &:active {
-      $_active_c: darken($_gdm_bg, 5%);
-      box-shadow: none;
-      background-color: $_active_c;
-      border-color: $_active_c;
-    }
-    &:insensitive {
-      @include button(insensitive);
-      border-color: darken($_gdm_bg, 5%);
-      background-color: darken($_gdm_bg, 5%);
-      color: transparentize($osd_fg_color, 0.3);
-    }
-    &:default {
-      @include button(normal, $c:$selected_bg_color, $tc:$selected_fg_color);
-      border-color: $selected_bg_color;
-      &:hover, &:focus { 
-        @include button(hover,$c:$selected_bg_color, $tc:$selected_fg_color);
-        $_def_hover_c: lighten($selected_bg_color, 5%);
-        background-color: $_def_hover_c;
-        border-color: $_def_hover_c;
-      }
-      &:active {
-        @include button(active,$c:$selected_bg_color, $tc:$selected_fg_color);
-        $_def_active_c: darken($selected_bg_color, 5%);
-        background-color: $_def_active_c;
-        border-color: $_def_active_c;
-      }
-      &:insensitive {
-        @include button(insensitive);
-        border-color: darken($selected_bg_color, 10%);
-        background-color: darken($selected_bg_color, 10%);
-        color: transparentize($selected_fg_color, 0.3);
-      }
-    }
-  }
-
-  .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: darken($system_bg_color, 3%);
-    background-color: darken($system_bg_color, 3%);
-
-    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-user-selection-box { padding: 100px 0px; }
-.login-dialog-not-listed-label {
-  padding-left: 2px;
-  .login-dialog-not-listed-button:focus &,
-  .login-dialog-not-listed-button:hover & {
-    color: $osd_fg_color;
-  }
-}
-
-.login-dialog-not-listed-label {
-  @include fontsize($base_font_size - 1);
-  font-weight: bold;
-  color: darken($osd_fg_color,30%);
-  padding-top: 1em;
-}
-
-.login-dialog-user-list-view { -st-vfade-offset: 1em; }
-.login-dialog-user-list {
-  spacing: 12px;
-  width: 23em;
-  &:expanded .login-dialog-user-list-item:selected { background-color: $selected_bg_color; color: $selected_fg_color; }
-  &:expanded .login-dialog-user-list-item:logged-in { border-right: 2px solid $selected_bg_color; }
-}
-
-.login-dialog-user-list-item {
-  border-radius: $base_border_radius + 4px;
-  padding: 6px;
-  color: darken($osd_fg_color,30%);
-  &:ltr .user-widget { padding-right: 1em; }
-  &:rtl .user-widget { padding-left: 1em; }
-  .login-dialog-timed-login-indicator {
-    height: 2px;
-    margin-top: 6px;
-    background-color: $osd_fg_color;
-  }
-  &:focus .login-dialog-timed-login-indicator { background-color: $selected_fg_color; }
-}
-
-.user-widget-label {
-  color: $osd_fg_color;
-}
-
-.user-widget.horizontal .user-widget-label {
-  @include fontsize($base_font_size + 2);
-  font-weight: bold;
-  padding-left: 15px;
-
-  &:ltr { padding-left: 14px; text-align: left; }
-  &:rtl { padding-right: 14px; text-align: right; }
-}
-
-.user-widget.vertical .user-widget-label {
-  @include fontsize($base_font_size + 5);
-  text-align: center;
-  font-weight: normal;
-  padding-top: 16px;
-}
-
-.login-dialog-timed-login-indicator {
-    height: 2px;
-    background-color: darken($fg_color,40%);
-}
-
-.login-dialog-prompt-layout {
-  padding-top: 24px;
-  padding-bottom: 12px;
-  spacing: $base_spacing * 2;
-  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;
-}
--- a/data/gnome-shell-sass/widgets/_looking-glass.scss
+++ b/data/gnome-shell-sass/widgets/_looking-glass.scss
@@ -1,109 +0,0 @@
-/* Looking Glass */
-
-$text_fg_color: #ccc;
-
-// Dialog
-#LookingGlassDialog {
-  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;
-
-  & > #Toolbar {
-    border: none;
-    border-radius: $base_border_radius;
-    background-color: $osd_bg_color;
-  }
-
-  .labels { spacing: $base_spacing; }
-  .notebook-tab {
-    -natural-hpadding: $base_padding * 2;
-    -minimum-hpadding: 6px;
-    font-weight: bold;
-    color: darken($osd_fg_color, 15%);
-    transition-duration: 100ms;
-    padding-left: .3em;
-    padding-right: .3em;
-    border-bottom-width: 2px;
-    &:hover {
-      color: $osd_fg_color;
-    }
-    &:selected {
-      border-bottom-width: 2px;
-      box-shadow: inset 0 -2px 0 0 lighten($selected_bg_color, 5%);
-      color: $osd_fg_color;
-    }
-  }
-  StBoxLayout#EvalBox { padding: 4px; spacing: $base_spacing; }
-  StBoxLayout#ResultsArea { spacing: $base_spacing; }
-}
-
-.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;
-  }
-  .shell-link {
-    color: $link_color;
-    &:hover { color: lighten($link_color, 10%); }
-    &:active { color: darken($link_color, 10%); }
-   }
-  .actor-link {
-    color: $text_fg_color;
-    &:hover { color: lighten($text_fg_color, 20%); }
-    &:active { color: darken($text_fg_color, 20%); }
-   }
-}
-
-.lg-completions-text {
-    font-size: .9em;
-    font-style: italic;
-}
-
-.lg-obj-inspector-title {
-    spacing: $base_spacing;
-}
-
-.lg-obj-inspector-button {
-    border: 1px solid $osd_borders_color;
-    padding: 4px;
-    border-radius: $base_border_radius;
-    &:hover { border: 1px solid #ffffff; }
-}
-
-// Extensions
-#lookingGlassExtensions { padding: 4px; }
-
-.lg-extensions-list {
-    padding: 4px;
-    spacing: 6px;
-}
-
-.lg-extension {
-    border: 1px solid lighten($osd_borders_color, 5%);
-    background-color: lighten($osd_bg_color, 5%);
-    border-radius: $base_border_radius;
-    padding: 4px;
-}
-
-.lg-extension-name {
-    font-weight: bold;
-}
-
-.lg-extension-meta {
-    spacing: 6px;
-}
-
-// Inspector
-#LookingGlassPropertyInspector {
-  background: $osd_bg_color;
-  border: 1px solid $osd_borders_color;
-  border-radius: $base_border_radius;
-  padding: 6px;
-}
--- a/data/gnome-shell-sass/widgets/_message-list.scss
+++ b/data/gnome-shell-sass/widgets/_message-list.scss
@@ -1,136 +0,0 @@
-/* Message List */
-// a.k.a. notifications in the menu
-
-// main list
-.message-list {
-  width: 31.5em;
-  padding: 0 $base_padding * 2;
-
-  .message-list-placeholder { spacing: 12px; }
-}
-
-.message-list-sections {
-  spacing: $base_spacing;
-  margin: 0 $base_margin * 4; // to account for scrollbar
-}
-
-.message-list-section,
-.message-list-section-list {
-  spacing: $base_spacing;
-}
-
-// 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;
-}
-
-// message bubbles
-.message {
-  @include 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;
-    }
-  }
-
-  // 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);
-      /* HACK: the label should be baseline-aligned with a 1em label, fake this with some bottom padding */
-      padding-bottom: 0.13em;
-
-      &:ltr { text-align: right };
-      &:rtl { text-align: left };
-    }
-  }
-
-  // close button
-  .message-close-button {
-    color: lighten($fg_color, 15%);
-    &:hover { color: if($variant=='light', lighten($fg_color, 30%), darken($fg_color, 10%)); }
-    &: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;
-}
-
-/* Media Controls */
-.message-media-control {
-  padding: $base_padding * 2 1.64em; // $base_padding * 4 = 24px
-  color: darken($fg_color, 15%);
-
-  // uses $hover_bg_color since the media controls are in a notification_bubble
-  &:hover {
-    background-color: lighten($hover_bg_color, 5%);
-    color: $fg_color;
-  }
-
-  &:active { 
-    background-color: darken($hover_bg_color, 2%);
-    color: $fg_color;
-  }
-
-  &: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; }
-}
-
-// album-art
-.media-message-cover-icon {
-  icon-size: $base_icon_size*2 !important; // 48px
-  border-radius: $base_border_radius;
-
-  // when there is no artwork
-  &.fallback {
-    color: darken($fg_color, 17%);
-    background-color: $bg_color;
-    border: 1px solid transparent;
-    border-radius: $base_border_radius;
-    icon-size: $base_icon_size * 2 !important;
-  }
-}
--- a/data/gnome-shell-sass/widgets/_misc.scss
+++ b/data/gnome-shell-sass/widgets/_misc.scss
@@ -1,59 +0,0 @@
-// Rubberband for select-area screenshots
-.select-area-rubberband {
-  background-color: transparentize($selected_bg_color,0.7);
-  border: 1px solid $selected_bg_color;
-}
-
-// User icon
-.user-icon {
-  background-size: contain;
-  color: $osd_fg_color;
-  border-radius: 99px;
-  icon-size: $base_icon_size * 4; // 64px
-  &:hover {
-    color: lighten($osd_fg_color,30%);
-  }
-
-  & StIcon {
-    background-color: transparentize($osd_fg_color,0.95);
-    border-radius: 99px;
-    padding: $base_padding * 2 ; // 12px
-    width: $base_icon_size * 2.5; height:  $base_icon_size * 2.5; // 40px;
-  }
-
-  &.user-avatar {
-    border: 2px $osd_fg_color;
-  }
-}
-
-.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;
-  }
-}
-
-.lightbox { background-color: black; }
-.flashspot { background-color: white; }
-
-
-// Hidden
-.hidden { color: rgba(0,0,0,0);}
-
-// Caps-lock warning
-.caps-lock-warning-label {
-  text-align: center;
-  padding-bottom: 8px;
-  @include fontsize($base_font_size - 1);
-  color: $warning_color;
-}
-
-/* Workspace animation */
-
-.workspace-animation {
-  background-color: $system_bg_color;
-}
--- a/data/gnome-shell-sass/widgets/_network-dialog.scss
+++ b/data/gnome-shell-sass/widgets/_network-dialog.scss
@@ -1,56 +0,0 @@
-/* Network Dialogs */
-.nm-dialog {
-  max-height: 34em;
-  min-height: 31em;
-  min-width: 32em;
-}
-
-.nm-dialog-content {
-  spacing: 20px;
-  padding: 24px;
-}
-
-.nm-dialog-airplane-box { spacing: 12px; }
-
-.nm-dialog-airplane-headline {
-  font-weight: bold;
-  text-align: center;
-}
-
-.nm-dialog-airplane-text { color: $fg_color; }
-
-// header
-.nm-dialog-header {
-  font-weight: bold;
-}
-.nm-dialog-header-icon {
-  icon-size: $base_icon_size * 2;
-}
-.nm-dialog-header-hbox { spacing: 10px; }
-
-// list of networks
-.nm-dialog-scroll-view {
-  border: 1px solid $borders_color;
-  padding:0;
-  background-color: darken($bg_color, 3%);
-}
-
-// list item
-.nm-dialog-item {
-  @include fontsize($base_font_size);
-  border-bottom: 1px solid $borders_color;
-  padding: $base_padding * 2;
-  spacing: 0px;
-  &:selected {
-    background-color: $selected_bg_color;
-    color: $selected_fg_color;
-  }
-}
-
-// icons in list
-.nm-dialog-icon { icon-size: $base_icon_size; }
-.nm-dialog-icons { spacing: $base_spacing * 2; }
-
-// no networks
-.no-networks-label { color: $insensitive_fg_color; }
-.no-networks-box { spacing: $base_padding; }
--- a/data/gnome-shell-sass/widgets/_notifications.scss
+++ b/data/gnome-shell-sass/widgets/_notifications.scss
@@ -1,57 +0,0 @@
-/* Notifications & Message Tray */
-
-$notification_banner_height: 64px;
-$notification_banner_width: 34em;
-
-// Banner notifications
-.notification-banner {
-  min-height: $notification_banner_height;
-  width: $notification_banner_width;
-
-  .notification-actions {
-    spacing: 0;
-  }
-
-  .notification-button {
-    @extend %bubble_button;
-  }
-}
-
-// counter
-.summary-source-counter {
-  font-size: $base_font_size - 1pt;
-  font-weight: bold;
-  height: 1.6em;
-  width: 1.6em;
-  -shell-counter-overlap-x: 3px;
-  -shell-counter-overlap-y: 3px;
-  background-color: $selected_bg_color;
-  color: $selected_fg_color;
-  border: 2px solid $fg_color;
-  box-shadow: 0 2px 2px rgba(0,0,0,0.5);
-  border-radius: 0.9em; // should be 0.8 but whatever; wish I could do 50%;
-}
-
-// chat bubbles
-.chat-body { spacing: 5px; }
-.chat-response { margin: 5px; }
-.chat-log-message { color: darken($fg_color,10%); }
-.chat-new-group { padding-top: 1em; }
-.chat-received {
-  padding-left: 4px;
-  &:rtl { padding-left: 0px; padding-right: 4px; }
-}
-
-.chat-sent {
-  padding-left: 18pt;
-  color: lighten($fg_color, 15%);
-  &:rtl { padding-left: 0; padding-right: 18pt; }
-}
-
-.chat-meta-message {
-  padding-left: 4px;
-  @include fontsize($base_font_size - 2);
-  font-weight: bold;
-  color: lighten($fg_color,18%);
-  &:rtl { padding-left: 0; padding-right: 4px; }
-}
--- a/data/gnome-shell-sass/widgets/_osd.scss
+++ b/data/gnome-shell-sass/widgets/_osd.scss
@@ -1,45 +0,0 @@
-/* OSD */
-
-$osd_levelbar_height:8px;
-
-.osd-window {
-  @extend %osd_panel;
-  text-align: center;
-  font-weight: bold;
-  spacing: $base_spacing * 2; // 12px
-  margin: $base_margin * 8; // 32px
-  min-width: 64px;
-  min-height: 64px;
-
-  StIcon {
-    icon-size:$base_icon_size * 6;
-  }
-
-  .osd-monitor-label { font-size: 3em; }
-  
-  .level {
-    height: $osd_levelbar_height;
-    -barlevel-height: $osd_levelbar_height;
-    -barlevel-background-color: transparentize($osd_fg_color, if($variant=='light', 0.7, 0.9));
-    -barlevel-active-background-color: $osd_fg_color;
-    -barlevel-overdrive-color: $destructive_color;
-    -barlevel-overdrive-separator-width: 3px;
-  }
-}
-
-/* Pad OSD */
-.pad-osd-window {
-  padding: 32px;
-  background-color: transparentize(#000, 0.2);
-
-  .pad-osd-title-box { spacing: 12px; }
-  .pad-osd-title-menu-box { spacing: 6px; }
-}
-
-.combo-box-label {
-  width: 15em;
-}
-
-.resize-popup {
-  @extend %osd_panel;
-}
--- a/data/gnome-shell-sass/widgets/_overview.scss
+++ b/data/gnome-shell-sass/widgets/_overview.scss
@@ -1,13 +0,0 @@
-/* OVERVIEW */
-
-.controls-manager, .secondary-monitor-workspaces {
-  spacing: $base_spacing * 2;
-}
-
-#overviewGroup {
-  background-color: $system_bg_color;
-}
-
-.overview-controls {
-  padding-bottom: 32px;
-}
--- a/data/gnome-shell-sass/widgets/_panel.scss
+++ b/data/gnome-shell-sass/widgets/_panel.scss
@@ -1,135 +0,0 @@
-/* Top Bar */
-// a.k.a. the panel
-
-$panel_corner_radius: $base_border_radius+1;
-$panel_bg_color: #000;
-$panel_fg_color: #ddd;
-$panel_height: 2.2em;
-$panel_transition_duration: 250ms; // same as the overview transition duration
-
-#panel {
-  background-color: $panel_bg_color;
-  font-weight: bold;
-  height: $panel_height;
-  font-feature-settings: "tnum";
-  transition-duration: $panel_transition_duration;
-
-  // transparent panel on lock & login screens
-  &.unlock-screen,
-  &.login-screen,
-  &:overview {
-    background-color: transparent;
-
-    .panel-corner {
-      -panel-corner-opacity: 0;
-    }
-  }
-
-  // the rounded outset corners
-  .panel-corner {
-    -panel-corner-radius: $panel_corner_radius;
-    -panel-corner-background-color: $panel_bg_color;
-    -panel-corner-border-width: 2px;
-    -panel-corner-border-color: transparent;
-    -panel-corner-opacity: 1;
-    transition-duration: $panel_transition_duration;
-  }
-
-  // panel menus
-  .panel-button {
-    font-weight: bold;
-    color: $panel_fg_color;
-    -natural-hpadding: $base_padding * 2;
-    -minimum-hpadding: $base_padding;
-    transition-duration: 150ms;
-    border: 3px solid transparent;
-    border-radius: 99px;
-
-    &.clock-display {
-      .clock {
-        transition-duration: 150ms;
-        border: 3px solid transparent;
-        border-radius: 99px;
-      }
-    }
-
-    &:hover, &:active, &:overview, &:focus, &:checked {
-      box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.20);
-
-      // The clock display needs to have the background on .clock because
-      // we want to exclude the do-not-disturb indicator from the background
-      &.clock-display {
-        box-shadow: none;
-
-        .clock {
-          box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.20);
-        }
-      }
-    }
-
-    // status area icons
-    .system-status-icon {
-      icon-size: $base_icon_size;
-      padding: $base_padding - 1px;
-      margin: 0 $base_margin;
-    }
-
-    .panel-status-indicators-box .system-status-icon,
-    .panel-status-menu-box .system-status-icon {
-      margin: 0;
-    }
-
-    // app menu icon
-    .app-menu-icon {
-      -st-icon-style: symbolic;
-      // dimensions of the icon are hardcoded
-    }
-
-    &#panelActivities {
-      -natural-hpadding: $base_padding * 3;
-    }
-  }
-
-  &.unlock-screen,
-  &.login-screen,
-  &:overview {
-    .panel-button {
-      &:hover, &:active, &:overview, &:focus, &:checked {
-        box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.15);
-
-        &.clock-display {
-          box-shadow: none;
-
-          .clock {
-            box-shadow: inset 0 0 0 100px rgba(255, 255, 255, 0.15);
-          }
-        }
-      }
-    }
-  }
-
-  .panel-status-indicators-box,
-  .panel-status-menu-box {
-    spacing: 2px;
-  }
-
-  // spacing between power icon and (optional) percentage label
-  .power-status.panel-status-indicators-box {
-    spacing: 0;
-  }
-
-  // indicator for active
-  .screencast-indicator,
-  .remote-access-indicator { color: $warning_color; }
-}
-
-// App Menu
-#appMenu {
-  spacing: $base_spacing;
-  .label-shadow { color: transparent; }
-}
-
-#appMenu .panel-status-menu-box {
-  padding: 0 $base_padding;
-  spacing: $base_spacing;
-}
--- a/data/gnome-shell-sass/widgets/_popovers.scss
+++ b/data/gnome-shell-sass/widgets/_popovers.scss
@@ -1,131 +0,0 @@
-/* Popovers/Menus */
-
-$popover_arrow_height: 12px;
-
-//.the popover itself
-.popup-menu-boxpointer {
-  -arrow-border-radius: $base_border_radius+4;
-  -arrow-background-color: $bg_color;
-  -arrow-border-width: 1px;
-  -arrow-border-color: $borders_color;
-  -arrow-base: $popover_arrow_height * 2;
-  -arrow-rise: $popover_arrow_height;
-  -arrow-box-shadow: 0 1px 3px rgba(0,0,0,0.5); // dreaming bugzilla #689995
-}
-
-// container of the popover menu
-.popup-menu {
-  min-width: 15em;
-  color: $fg_color;
-
-  //.popup-status-menu-item { font-weight: normal;  color: pink; } //dunno what that is
-  &.panel-menu {
-    -boxpointer-gap: $base_margin; // distance from the panel
-    margin-bottom: 1.75em;
-  }
-}
-
-.popup-menu-content {
-  padding: $base_padding * 2 + $base_margin 0;
-}
-
-// menu items
-.popup-menu-item {
-  spacing: $base_padding;
-  padding: $base_padding;
-
-  &:ltr { padding-right:1.75em; padding-left: 0; }
-  &:rtl { padding-right: 0; padding-left:1.75em; }
-
-  &:checked {
-    background-color: lighten($bg_color, 2%);
-    box-shadow: none;
-  }
-
-  &.selected {
-    background-color: transparentize(white, if($variant=='light', 0.2, 0.9));
-    color: $fg_color;
-  }
-
-  &:active { 
-    background-color: $selected_bg_color;
-    color: $selected_fg_color;
-  }
-
-  &:insensitive { color: transparentize($fg_color,0.5);}
-}
-
-// all icons and other graphical elements
-.popup-inactive-menu-item {
-  color: $fg_color;
-
-  &:insensitive { color: transparentize($fg_color,0.5); }
-}
-
-// symbolic icons in popover
-.popup-menu-arrow,
-.popup-menu-icon { icon-size: $base_icon_size; }
-
-// popover submenus
-.popup-sub-menu {
-  background-color: darken($bg_color, 3%);
-  box-shadow: none;
-  border-top: 1px solid transparentize($borders_color, 0.2);
-  border-bottom: 1px solid transparentize($borders_color, 0.2);
-}
-
-// container for radio and check boxes
-.popup-menu-ornament {
-  width: 1.2em;
-
-  &:ltr { text-align: right };
-  &:rtl { text-align: left };
-}
-
-// 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%);
-      }
-    }
-  }
-}
-
-// desktop background menu
-.background-menu {
-  -boxpointer-gap: $base_margin;
-  -arrow-rise: 0px; // hide the beak on the menu
-}
-
-// system status menu
-.aggregate-menu {
-  min-width: 21em;
-
-  // lock screen, shutdown, etc. buttons
-  .popup-menu-icon { 
-    padding:0;
-    margin: 0 $base_margin;
-    -st-icon-style: symbolic;
-  }
-
-  .popup-sub-menu .popup-menu-item > :first-child {
-    // account for icons in submenus with padding
-    &:ltr {
-      padding-left: $base_padding + $base_margin * 2; 
-      margin-left: $base_icon_size;
-    }
-    &:rtl {
-      padding-right: $base_padding + $base_margin * 2; ;
-      margin-right: $base_icon_size;
-    }
-  }
-}
--- a/data/gnome-shell-sass/widgets/_screen-shield.scss
+++ b/data/gnome-shell-sass/widgets/_screen-shield.scss
@@ -1,78 +0,0 @@
-/* Screen Shield */
-
-.unlock-dialog-clock {
-  color: white;
-  font-weight: 300;
-  text-align: center;
-  spacing: 24px;
-  padding-bottom: 2.5em;
-}
-
-.unlock-dialog-clock-time {
-  font-size: 64pt;
-  padding-top: 42px;
-  font-feature-settings: "tnum";
-}
-
-.unlock-dialog-clock-date {
-  font-size: 16pt;
-  font-weight: normal;
-}
-
-.unlock-dialog-clock-hint {
-  font-weight: normal;
-  padding-top: 48px;
-}
-
-.unlock-dialog-notifications-container {
-  margin: 12px 0;
-  spacing: 6px;
-  width: 23em;
-  background-color: transparent;
-  .summary-notification-stack-scrollview {
-    padding-top: 0;
-    padding-bottom: 0;
-  }
-
-  .notification,
-  .unlock-dialog-notification-source {
-    padding: 12px 6px;
-    border: none;
-    background-color: transparentize($osd_bg_color,0.7);
-    color: $osd_fg_color;
-    border-radius: $modal_radius;
-
-    &.critical { background-color: transparentize($osd_bg_color,0.1) }
-  }
-}
-
-.unlock-dialog-notification-label {
-  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-background { //just the shadow, really
-  background: black;
-  box-shadow: 0px 2px 4px rgba(0,0,0,0.6);
-}
-
-#lockDialogGroup {
-  background-color: $system_bg_color;
-}
-
-#unlockDialogNotifications {
-  StButton#vhandle, StButton#hhandle {
-    background-color: transparentize($bg_color,0.7);
-    &:hover, &:focus { background-color: transparentize($bg_color,0.5); }
-    &:active { background-color: transparentize($selected_bg_color,0.5); }
-  }
-}
--- a/data/gnome-shell-sass/widgets/_scrollbars.scss
+++ b/data/gnome-shell-sass/widgets/_scrollbars.scss
@@ -1,29 +0,0 @@
-/* Scrollbars */
-
-StScrollView {
-  &.vfade { -st-vfade-offset: 68px; }
-  &.hfade { -st-hfade-offset: 68px; }
-}
-
-StScrollBar {
-  padding: 0;
-
-  StScrollView & {
-    min-width: 14px;
-    min-height: 14px;
-  }
-
-  StBin#trough {
-    border-radius: 0;
-    background-color: transparent;
-  }
-
-  StButton#vhandle, StButton#hhandle {
-    border-radius: 8px;
-    background-color: mix($fg_color, $bg_color, 60%);
-    //border: 3px solid transparent; //would be nice to margin or at least to transparent
-    margin: 3px;
-    &:hover { background-color: mix($fg_color, $bg_color, 80%); }
-    &:active { background-color: $selected_bg_color; }
-  }
-}
--- a/data/gnome-shell-sass/widgets/_search-entry.scss
+++ b/data/gnome-shell-sass/widgets/_search-entry.scss
@@ -1,37 +0,0 @@
-// Search entry
-
-$search_entry_width: 320px;
-$search_entry_height: 36px;
-
-%search_entry,
-.search-entry {
-  width: $search_entry_width;
-  padding: $base_padding+1 $base_padding+3;
-  border-radius: $search_entry_height * 0.5; // half the height
-  color: transparentize($fg_color,0.3);
-  background-color: $bg_color;
-  border-color: $borders_color;
-  margin-top: $base_spacing * 2;
-  margin-bottom: $base_spacing;
-
-  &:hover {
-    background-color: $hover_bg_color;
-    border-color: $hover_borders_color;
-    color: $hover_fg_color;
-  }
-
-  &:focus {
-    padding: $base_padding $base_padding+2; // 1px less to account for wider border
-    border-width: 2px;
-    border-style: solid;
-    border-color: $selected_bg_color;
-    color: $fg_color;
-    box-shadow: inset 0 1px 2px 1px rgba(0,0,0,0.2);
-  }
-
-  .search-entry-icon { 
-    icon-size: $base_icon_size;
-    padding: 0 4px;
-    color: inherit;
-  }
-}
--- a/data/gnome-shell-sass/widgets/_search-results.scss
+++ b/data/gnome-shell-sass/widgets/_search-results.scss
@@ -1,108 +0,0 @@
-/* Search */
-
-// 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;
-
-  // separator
-  .search-section-separator { 
-    // height: 1px;
-    // background-color: $osd_outer_borders_color;
-    height: 0;
-    background-color: transparent;
-  }
-}
-
-// content
-.search-section-content {
-  background-color: transparentize(lighten($osd_bg_color, 5%), 0.2);
-  border-radius: $modal_radius+3;
-  border: 1px solid $osd_outer_borders_color;
-  box-shadow: 0 2px 4px 0 $shadow_color;
-  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);
-  }
-}
-
-// "no results" text
-.search-statustext {
-  @extend %status_text;
-}
-
-.grid-search-results {
-  spacing: $base_spacing * 6;
-}
-
-// Search results with icons
-.grid-search-result {
-  @extend %app-well-app;
-}
-
-// search result provider
-.search-provider-icon {
-  @extend %search-section-content-item;
-
-  // content
-  .list-search-provider-content {
-    spacing: $base_spacing * 2;
-
-    // provider labels
-    .list-search-provider-details {
-      width: 120px;
-      margin-top: 0;
-      color: darken($osd_fg_color, 8%);
-      // font-weight: bold;
-    }
-  }
-}
-
-// search results list
-.list-search-results {
-  spacing: $base_spacing;
-}
-
-// search result listitem
-.list-search-result {
-  @extend %search-section-content-item;
-
-  // content
-  .list-search-result-content {
-    spacing: $base_padding;
-  }
-
-  // list item title (with leading icon)
-  .list-search-result-title {
-    spacing: $base_spacing * 2;
-    // font-weight: bold;
-  }
-
-  // list item description
-  .list-search-result-description {
-    color: darken($osd_fg_color, 30%);
-  }
-}
--- a/data/gnome-shell-sass/widgets/_slider.scss
+++ b/data/gnome-shell-sass/widgets/_slider.scss
@@ -1,27 +0,0 @@
-/* Slider */
-
-$slider_size: 15px;
-
-.slider {
-  height: $slider_size;
-  // slider trough
-  -barlevel-height: 3px; // has to be an odd number
-  -barlevel-background-color: $borders_color; //background of the trough
-  -barlevel-border-width: 1px; 
-  -barlevel-border-color: $borders_color; // trough border color
-  // fill style
-  -barlevel-active-background-color: $selected_bg_color; //active trough fill
-  -barlevel-active-border-color: if($variant == 'light', darken($selected_bg_color, 4%), lighten($selected_bg_color, 2%)); //active trough border
-  // overfill style (red in this case)
-  -barlevel-overdrive-color: $destructive_color;
-  -barlevel-overdrive-border-color: if($variant == 'light', darken($destructive_color, 4%), lighten($destructive_color, 2%)); //trough border when red;
-  -barlevel-overdrive-separator-width:1px;
-  // slider handler
-  -slider-handle-radius: $slider_size * 0.5; // half the size of the size
-  -slider-handle-border-width: 1px;
-  -slider-handle-border-color: if($variant == 'light', $borders_color, $fg_color);
-
-  color: if($variant == 'light', lighten($bg_color, 10%), $fg_color);
-  &:hover { color: $hover_bg_color; }
-  &:active { color: $active_bg_color; }
-}
--- a/data/gnome-shell-sass/widgets/_switcher-popup.scss
+++ b/data/gnome-shell-sass/widgets/_switcher-popup.scss
@@ -1,65 +0,0 @@
-/* App Switcher */
-
-.switcher-popup {
-  padding: 8px;
-  spacing: $base_spacing * 4;
-}
-
-// switcher onscreen panel
-.switcher-list {
-  @extend %osd_panel;
-
-  .item-box {
-    padding: 8px;
-    border-radius: $base_border_radius + 1px;
-    border: 1px solid transparent;
-
-    &:outlined {
-      background-color: transparentize($osd_fg_color, 0.7);
-    }
-
-    &:selected {
-      background-color: transparentize($osd_fg_color, 0.7);
-      color: $osd_fg_color;
-    }
-  }
-
-  // window thumbnails
-  .thumbnail-box {
-    padding: 2px;
-    spacing: $base_spacing;
-  }
-
-  .thumbnail {
-    width: 256px;
-  }
-
-  .separator {
-    width: 1px;
-    background: $borders_color;
-  }
-
-  .switcher-list-item-container {
-    spacing: $base_spacing * 2;
-  }
-}
-
-.switcher-arrow {
-  border-color: rgba(0,0,0,0);
-  color: transparentize($fg_color,0.2);
-  &: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/gnome-shell-sass/widgets/_switches.scss
+++ b/data/gnome-shell-sass/widgets/_switches.scss
@@ -1,16 +0,0 @@
-/* Switches */
-
-// these are equal to the size of the SVG assets
-$switch_height: 22px;
-$switch_width: 46px;
-
-.toggle-switch {
-  color: $fg_color;
-  height: $switch_height;
-  width: $switch_width;
-  background-size: contain;
-  background-image: if($variant == 'light', url("resource:///org/gnome/shell/theme/toggle-off.svg"),url("resource:///org/gnome/shell/theme/toggle-off-dark.svg"));
-  &:checked { 
-    background-image: if($variant == 'light', url("resource:///org/gnome/shell/theme/toggle-on.svg"),url("resource:///org/gnome/shell/theme/toggle-on-dark.svg"));
-  }
-}
--- a/data/gnome-shell-sass/widgets/_tiled-previews.scss
+++ b/data/gnome-shell-sass/widgets/_tiled-previews.scss
@@ -1,19 +0,0 @@
-
-/* Tiled window previews */
-$tile_corner_radius: $base_border_radius + 1px;
-.tile-preview {
-  background-color: transparentize($selected_bg_color,0.5);
-  border: 1px solid $selected_bg_color;
-}
-
-.tile-preview-left.on-primary {
-  border-radius: $tile_corner_radius 0 0 0;
-}
-
-.tile-preview-right.on-primary {
-  border-radius: 0 $tile_corner_radius 0 0;
-}
-
-.tile-preview-left.tile-preview-right.on-primary {
-  border-radius: $tile_corner_radius $tile_corner_radius 0 0;
-}
--- a/data/gnome-shell-sass/widgets/_window-picker.scss
+++ b/data/gnome-shell-sass/widgets/_window-picker.scss
@@ -1,53 +0,0 @@
-/* Window Picker */
-
-$window_picker_spacing: $base_spacing; // 6px
-$window_picker_padding: $base_padding * 2; // 12px
-
-$window_thumbnail_label_color: transparentize($osd_bg_color, 0.4);
-
-$window_close_button_size: 30px;
-$window_close_button_padding: 3px;
-
-// Window picker
-.window-picker {
-  // Space between window thumbnails
-  spacing: $window_picker_spacing;
-}
-
-// Window titles
-.window-caption {
-  color: $osd_fg_color;
-  background-color: $osd_bg_color;
-  border-radius: 99px;
-  padding: $base_padding $base_padding * 2;
-}
-
-// Close button
-.window-close {
-  background-color: $osd_bg_color;
-  color: $osd_fg_color;
-  border-radius: $window_close_button_size * 0.5 + $window_close_button_padding * 2;
-  padding: $window_close_button_padding;
-  height: $window_close_button_size;
-  width: $window_close_button_size;
-  box-shadow: -1px 1px 5px 0px rgba(0,0,0,0.5);
-  transition-duration: 300ms;
-
-  & StIcon { icon-size: 24px; }
-
-  &:hover {
-    background-color: lighten($osd_bg_color, 15%);
-  }
-
-  &:active {
-    color: transparentize($osd_fg_color, 0.2);
-    background-color: darken($osd_bg_color, 5%);
-  }
-}
-
-.workspace-background {
-  // keep in sync with BACKGROUND_CORNER_RADIUS_PIXELS in workspace.js
-  border-radius: 30px;
-  background-color: $osd_bg_color;
-  box-shadow: 0 4px 16px 4px transparentize(darken($osd_bg_color, 30%), 0.7);
-}
--- a/data/gnome-shell-sass/widgets/_workspace-switcher.scss
+++ b/data/gnome-shell-sass/widgets/_workspace-switcher.scss
@@ -1,36 +0,0 @@
-/* Workspace Switcher */
-.workspace-switcher-group {
-  padding: $base_padding * 2;
-}
-
-.workspace-switcher-container {
-  @extend %osd_panel;
-}
-
-.workspace-switcher {
-  background: transparent;
-  border: none;
-  border-radius: 0;
-  padding: 0;
-  spacing: $base_spacing * 2;
-}
-
-.ws-switcher-box {
-  background: transparent;
-  height: 50px;
-  background-size: 32px;
-  border: 1px solid transparentize($osd_fg_color,0.9);
-  border-radius: $base_border_radius + 3px;
-}
-
-// active workspace in the switcher
-.ws-switcher-active-up,
-.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;
-}
--- a/data/gnome-shell-sass/widgets/_workspace-thumbnails.scss
+++ b/data/gnome-shell-sass/widgets/_workspace-thumbnails.scss
@@ -1,28 +0,0 @@
-/* Workspace pager */
-
-// thumbnails in overview
-.workspace-thumbnails {
-  visible-width: 32px; //amount visible before hover
-  spacing: $base_spacing;
-  padding: $base_padding;
-
-  .workspace-thumbnail {
-    @extend %overview_panel;
-    border-radius: 3px;
-  }
-
-  // drag and drop indicator
-  .placeholder {
-    background-image: url("resource:///org/gnome/shell/theme/workspace-placeholder.svg");
-    background-size: contain;
-    width: 18px;
-  }
-}
-
-// 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/meson.build
+++ b/data/meson.build
@@ -1,12 +1,18 @@
-session_desktop = 'gnome-classic.desktop'
-i18n.merge_file('',
-  input:  session_desktop + '.in',
-  output: session_desktop,
-  po_dir: '../po',
-  install: true,
-  install_dir: xsessiondir,
-  type: 'desktop'
-)
+sessions = [
+  ['gnome-classic.session.desktop.in', sessiondir],
+  ['gnome-classic.desktop.in', xsessiondir]
+]
+foreach s : sessions
+  name_array = s[0].split('.')
+  i18n.merge_file('',
+    input:  s[0],
+    output: '.'.join([name_array[0], name_array[1]]),
+    po_dir: '../po',
+    install: true,
+    install_dir: s[1],
+    type: 'desktop'
+  )
+endforeach

 classic_uuids = []
 foreach e : classic_extensions
@@ -28,42 +34,7 @@ theme_sources = files(
  'gnome-shell-sass/_colors.scss',
  'gnome-shell-sass/_common.scss',
  '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/_buttons.scss',
-  'gnome-shell-sass/widgets/_calendar.scss',
-  'gnome-shell-sass/widgets/_check-box.scss',
-  'gnome-shell-sass/widgets/_corner-ripple.scss',
-  'gnome-shell-sass/widgets/_dash.scss',
-  'gnome-shell-sass/widgets/_dialogs.scss',
-  'gnome-shell-sass/widgets/_entries.scss',
-  'gnome-shell-sass/widgets/_hotplug.scss',
-  'gnome-shell-sass/widgets/_ibus-popup.scss',
-  'gnome-shell-sass/widgets/_keyboard.scss',
-  'gnome-shell-sass/widgets/_login-dialog.scss',
-  'gnome-shell-sass/widgets/_looking-glass.scss',
-  'gnome-shell-sass/widgets/_message-list.scss',
-  'gnome-shell-sass/widgets/_misc.scss',
-  'gnome-shell-sass/widgets/_network-dialog.scss',
-  'gnome-shell-sass/widgets/_notifications.scss',
-  'gnome-shell-sass/widgets/_osd.scss',
-  'gnome-shell-sass/widgets/_overview.scss',
-  'gnome-shell-sass/widgets/_panel.scss',
-  'gnome-shell-sass/widgets/_popovers.scss',
-  'gnome-shell-sass/widgets/_screen-shield.scss',
-  'gnome-shell-sass/widgets/_scrollbars.scss',
-  '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/_high-contrast-colors.scss'
 )

 theme_data = [
@@ -76,20 +47,15 @@ theme_data = [
  'gnome-classic-high-contrast.css'
 ]

-stylesheet = 'gnome-classic.css'
-if fs.exists(stylesheet)
-  install_data(stylesheet, install_dir: themedir)
-else
-  sassc = find_program('sassc', required: true)
-  custom_target(stylesheet,
-    input: fs.replace_suffix(stylesheet, '.scss'),
-    output: stylesheet,
-    depend_files: theme_sources,
-    command: [sassc, '-a', '@INPUT@', '@OUTPUT@'],
-    install: true,
-    install_dir: themedir
-  )
-endif
+style = 'gnome-classic'
+custom_target(style + '.css',
+  input: style + '.scss',
+  output: style + '.css',
+  depend_files: theme_sources,
+  command: [sassc, '-a', '@INPUT@', '@OUTPUT@'],
+  install: true,
+  install_dir: themedir
+)

 install_data(theme_data, install_dir: themedir)

--- a/debian/changelog
+++ b/debian/changelog
@@ -0,0 +1,586 @@
+gnome-shell-extensions (3.31.92-1) experimental; urgency=medium
+
+  * New upstream release
+
+ -- Iain Lane <laney@debian.org>  Wed, 06 Mar 2019 15:40:48 +0000
+
+gnome-shell-extensions (3.31.90-1) experimental; urgency=medium
+
+  * New upstream release
+    + Misc. bug fixes and cleanups
+    + Remove obsolete alternate-tab extension
+    + Adjust to gnome-shell changes
+  * debian/watch: Watch for unstable releases
+  * rules: alternate-tab is dropped; stop trying to enable it
+
+ -- Iain Lane <laney@debian.org>  Thu, 21 Feb 2019 10:33:12 +0000
+
+gnome-shell-extensions (3.30.1-1) unstable; urgency=medium
+
+  * Team upload
+  * New upstream release
+  * Bump Standards-Version to 4.2.1
+  * d/p/gnome-session-classic-wrapper-script.patch:
+    Re-word to avoid a Lintian warning
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 02 Nov 2018 09:26:47 +0000
+
+gnome-shell-extensions (3.30.0-1) unstable; urgency=medium
+
+  * New upstream release
+  * Release to unstable
+
+ -- Jeremy Bicha <jbicha@debian.org>  Wed, 05 Sep 2018 12:34:40 -0400
+
+gnome-shell-extensions (3.29.91-1) experimental; urgency=medium
+
+  * Team upload
+  * New upstream development release
+  * Bump Standards-Version to 4.2.0
+  * Sort dependency lists (wrap-and-sort -a)
+  * d/copyright: Remove unnecessary sentence fragment
+  * d/p/series: Remove commented-out line
+
+ -- Simon McVittie <smcv@debian.org>  Mon, 20 Aug 2018 20:27:57 +0100
+
+gnome-shell-extensions (3.29.90-1) experimental; urgency=medium
+
+  * Team upload
+  * New upstream development release
+
+ -- Simon McVittie <smcv@debian.org>  Thu, 02 Aug 2018 10:46:44 +0100
+
+gnome-shell-extensions (3.29.3+really3.29.3-1) experimental; urgency=medium
+
+  * Team upload
+  * d/watch: Watch for development versions
+  * Re-upload to experimental with a higher version than
+    3.29.3+really3.28.1-1, which reverted the incorrect upload of the
+    previous version to unstable
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 27 Jul 2018 23:56:10 +0100
+
+gnome-shell-extensions (3.29.3-1) unstable; urgency=medium
+
+  * Team upload
+
+  [ Arnaud Rebillout ]
+  * New upstream release
+
+  [ Simon McVittie ]
+  * Bump Standards-Version to 4.1.5
+  * Set Rules-Requires-Root to no
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 27 Jul 2018 09:37:34 +0100
+
+gnome-shell-extensions (3.28.1-1) unstable; urgency=medium
+
+  * New upstream release
+  * Bump Standards-Version to 4.1.4
+
+ -- Jeremy Bicha <jbicha@debian.org>  Mon, 14 May 2018 21:51:46 -0400
+
+gnome-shell-extensions (3.28.0-2) unstable; urgency=medium
+
+  * Fix typo in configure flag that resulted in missing
+    auto-move-windows, native-window-placement, & user-theme extensions
+
+ -- Jeremy Bicha <jbicha@debian.org>  Mon, 19 Mar 2018 18:20:53 -0400
+
+gnome-shell-extensions (3.28.0-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Jeremy Bicha <jbicha@debian.org>  Sun, 18 Mar 2018 20:17:17 -0400
+
+gnome-shell-extensions (3.27.92-2) unstable; urgency=medium
+
+  * Release to unstable
+
+ -- Jeremy Bicha <jbicha@debian.org>  Sat, 10 Mar 2018 19:37:45 -0500
+
+gnome-shell-extensions (3.27.92-1) experimental; urgency=medium
+
+  [ Jeremy Bicha ]
+  * New upstream release candidate
+  * Drop explicit dependency on mutter's gir. gnome-shell-extensions depends
+    on gnome-shell which depends on the gir. Dropping it will make transitions
+    easier.
+
+  [ Simon McVittie ]
+  * Recommend gnome-tweaks instead of transitional gnome-tweak-tool
+
+ -- Jeremy Bicha <jbicha@debian.org>  Mon, 05 Mar 2018 21:02:01 -0500
+
+gnome-shell-extensions (3.27.91-1) experimental; urgency=medium
+
+  * New upstream development release
+  * Build with meson
+  * Build-Depend on sassc
+  * Bump debhelper compat to 11
+  * Drop places-menu-Don-t-force-dispose-of-uninitialized-proxies.patch &
+    dont-require-nautilus-classic.patch: Applied in new release
+
+ -- Jeremy Bicha <jbicha@debian.org>  Fri, 23 Feb 2018 19:49:59 -0500
+
+gnome-shell-extensions (3.26.2-3) unstable; urgency=medium
+
+  * Team upload
+
+  [ Jeremy Bicha ]
+  * Update Vcs fields for migration to https://salsa.debian.org/
+
+  [ Simon McVittie ]
+  * d/patches: Re-export with gbp pq export
+  * d/p/places-menu-Don-t-force-dispose-of-uninitialized-proxies.patch:
+    Take patch from upstream to avoid frequent tracebacks from the Places
+    menu with gjs >= 1.50.2-3 (Closes: #888608)
+
+ -- Simon McVittie <smcv@debian.org>  Tue, 30 Jan 2018 09:15:54 +0000
+
+gnome-shell-extensions (3.26.2-2) unstable; urgency=medium
+
+  * Update Vcs fields for conversion to git
+  * Add debian/gbp.conf
+  * Bump Standards-Version to 4.1.2
+
+ -- Jeremy Bicha <jbicha@debian.org>  Fri, 15 Dec 2017 15:19:14 -0500
+
+gnome-shell-extensions (3.26.2-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 05 Nov 2017 20:17:03 +0100
+
+gnome-shell-extensions (3.26.1-2) unstable; urgency=medium
+
+  * Release to unstable
+  * Bump Standards-Version to 4.1.1
+
+ -- Jeremy Bicha <jbicha@debian.org>  Fri, 13 Oct 2017 16:49:30 -0400
+
+gnome-shell-extensions (3.26.1-1) experimental; urgency=medium
+
+  * Team upload
+  * New upstream stable release
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 06 Oct 2017 11:01:11 +0100
+
+gnome-shell-extensions (3.26.0-1) experimental; urgency=medium
+
+  * Team upload
+  * New upstream stable release
+
+ -- Simon McVittie <smcv@debian.org>  Wed, 13 Sep 2017 11:33:19 +0100
+
+gnome-shell-extensions (3.25.91-1) experimental; urgency=medium
+
+  * Team upload
+  * New upstream release, for GNOME Shell 3.25.91
+    - d/p/adapt-to-gsd324.patch: Drop, applied upstream
+    - Switch dependency to gir1.2-mutter-1
+
+ -- Simon McVittie <smcv@debian.org>  Tue, 05 Sep 2017 16:43:01 +0100
+
+gnome-shell-extensions (3.22.2-2) unstable; urgency=medium
+
+  * Add adapt-to-gsd324.patch (Closes: #869948):
+    - Adjust gnome-session file for gnome-settings-daemon 3.24
+  * debian/control.in:
+    - Bump Standards-Version to 4.0.0
+    - Explicitly depend on gnome-settings-daemon >= 3.24
+    - Drop version from gnome-tweak-tool recommends
+    - Depend on gnome-session-bin instead of gnome-session (LP: #1702832)
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Sun, 06 Aug 2017 17:38:06 -0400
+
+gnome-shell-extensions (3.22.2-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 10 Nov 2016 19:36:44 +0100
+
+gnome-shell-extensions (3.22.1-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 11 Oct 2016 17:58:31 +0200
+
+gnome-shell-extensions (3.22.0-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 20 Sep 2016 01:59:50 +0200
+
+gnome-shell-extensions (3.21.92-1) unstable; urgency=medium
+
+  * New upstream development release.
+  * Replace Build-Depends gnome-common with pkg-config and gettext.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 13 Sep 2016 22:13:19 +0200
+
+gnome-shell-extensions (3.21.91-1) unstable; urgency=medium
+
+  * New upstream beta release.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Tue, 30 Aug 2016 19:57:32 +0200
+
+gnome-shell-extensions (3.21.90-1) experimental; urgency=medium
+
+  [ Andreas Henriksson ]
+  * New upstream beta release.
+  * Update build-dependencies according to configure.ac changes:
+    - drop intltool, now gettext is used instead.
+
+  [ Jeremy Bicha ]
+  * Convert from cdbs to dh
+  * Add debian/docs to install NEWS and README
+  * Bump dh compat to 10
+  * Update Vcs fields
+  * Refresh patches
+
+ -- Andreas Henriksson <andreas@fatal.se>  Sun, 21 Aug 2016 05:36:17 +0200
+
+gnome-shell-extensions (3.21.4-1) experimental; urgency=medium
+
+  * New upstream development release.
+  * Stop hard-coding Victor Seva in the Uploaders field
+
+ -- Andreas Henriksson <andreas@fatal.se>  Fri, 12 Aug 2016 16:28:33 +0200
+
+gnome-shell-extensions (3.20.1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Bump Standards-Version to 3.9.8.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 11 May 2016 15:21:35 +0200
+
+gnome-shell-extensions (3.20.0-2) unstable; urgency=medium
+
+  * Upload to unstable.
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 17 Apr 2016 00:25:25 +0200
+
+gnome-shell-extensions (3.20.0-1) experimental; urgency=medium
+
+  * New upstream release.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Fri, 25 Mar 2016 10:48:00 +0100
+
+gnome-shell-extensions (3.19.92-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Update dont-require-nautilus-classic.patch to apply.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Thu, 17 Mar 2016 12:51:13 +0100
+
+gnome-shell-extensions (3.18.4-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Bump Standards-Version to 3.9.7.
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 06 Mar 2016 22:38:57 +0100
+
+gnome-shell-extensions (3.18.3-2) unstable; urgency=medium
+
+  * Add Breaks/Replaces gnome-shell-common (<< 3.18) (Closes: #808906)
+    - Helps upgrades from Jessie by allowing overwriting
+      /usr/share/gnome-shell/theme/calendar-today.svg et.al.
+      which was previously shipped in gnome-shell-common.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Wed, 10 Feb 2016 01:24:42 +0100
+
+gnome-shell-extensions (3.18.3-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 14 Jan 2016 22:49:16 +0100
+
+gnome-shell-extensions (3.18.2-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 13 Nov 2015 00:04:09 +0100
+
+gnome-shell-extensions (3.18.1-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 16 Oct 2015 22:09:01 +0200
+
+gnome-shell-extensions (3.18.0-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Laurent Bigonville <bigon@debian.org>  Sun, 11 Oct 2015 16:29:18 +0200
+
+gnome-shell-extensions (3.17.92-1) experimental; urgency=medium
+
+  * New upstream release candidate.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Fri, 18 Sep 2015 17:28:06 +0200
+
+gnome-shell-extensions (3.16.2-1) unstable; urgency=medium
+
+  [ Emilio Pozuelo Monfort ]
+  * debian/gnome-shell-extensions.gsettings-override:
+    + Dropped, no longer needed as the enabled extension no longer exists.
+      Thanks Artur Rona for noticing. (Closes: #782747)
+
+  [ Michael Biebl ]
+  * New upstream release.
+  * Update Homepage.
+  * Bump debhelper compatibility level to 9.
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 02 Jul 2015 19:13:32 +0200
+
+gnome-shell-extensions (3.16.1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * debian/control.in,
+    debian/rules:
+    + The system monitor extension was removed. Drop the libgtop
+      build and runtime dependencies and stop enabling it.
+  * debian/patches/apps-center-labels.patch,
+    debian/patches/window-list-pointerInNotification.patch,
+    debian/patches/menu-arrows-icons.patch:
+    + Dropped, merged upstream.
+  * debian/patches/dont-require-nautilus-classic.patch:
+    + Updated for the new version.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Sun, 14 Jun 2015 15:23:59 +0200
+
+gnome-shell-extensions (3.14.2-1) unstable; urgency=medium
+
+  * New upstream bugfix release.
+  * menu-arrows-icons: new patch. Make arrows consistent with the rest
+    of the shell.
+  * apps-center-labels.patch: patch from upstream git. Center labels
+    vertically in the applications menu.
+  * window-list-pointerInNotification.patch: patch from upstream git.
+    Update window-list extension for an older shell API change.
+
+ -- Josselin Mouette <joss@debian.org>  Sun, 30 Nov 2014 16:06:59 +0100
+
+gnome-shell-extensions (3.14.1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * debian/control.in: Bump Standards-Version to 3.9.6 (no further changes)
+  * Add missing dependencies against gir packages, including gir1.2-gmenu-3.0,
+    this should fix the apps-menu extension for some people (Closes: #765460).
+
+ -- Laurent Bigonville <bigon@debian.org>  Sun, 19 Oct 2014 21:17:58 +0200
+
+gnome-shell-extensions (3.14.0-2) unstable; urgency=medium
+
+  * Drop xrandr from EXTENSIONS_DISABLED, this extension was removed
+    upstream.
+  * Add new screenshot-window-sizer extension to EXTENSIONS_ENABLED.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 24 Sep 2014 01:15:32 +0200
+
+gnome-shell-extensions (3.14.0-1) unstable; urgency=medium
+
+  * debian/watch: only scan for stable releases.
+  * New upstream release.
+  * Upload to unstable.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Tue, 23 Sep 2014 15:46:30 +0200
+
+gnome-shell-extensions (3.13.91-1) experimental; urgency=medium
+
+  * New upstream development release.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Sat, 06 Sep 2014 11:16:39 -0700
+
+gnome-shell-extensions (3.12.2-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Bump Standards-Version to 3.9.5
+  * Upload to unstable.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Tue, 15 Jul 2014 00:06:09 +0200
+
+gnome-shell-extensions (3.12.0-1) experimental; urgency=low
+
+  [ Jean Schurger ]
+  * New upstream release (3.10.1)
+  * debian/rules: remove one of the 'windowsNavigator' extension listed twice
+    and the 'alternative-system-menu' extension (does not exists anymore)
+  * debian/copyright: Update 'Format:' line
+
+  [ Andreas Henriksson ]
+  * New upstream release (3.12.0)
+  * debian/local/gnome-session-classic,
+    debian/patches/gnome-session-classic-wrapper-script.patch:
+    - update script to include new GNOME_SHELL_SESSION_MODE env variable
+      and update patch to apply again.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Fri, 04 Apr 2014 21:43:18 +0200
+
+gnome-shell-extensions (3.8.4-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Sun, 13 Oct 2013 18:11:33 +0200
+
+gnome-shell-extensions (3.8.4-1) experimental; urgency=low
+
+  [ Jeremy Bicha ]
+  * New upstream release
+  * Dropped patches applied in new version:
+    - fix-hibernate.patch
+    - fix-applications-menu-resolution-change.patch
+    - look-in-data-home-for-themes.patch
+
+  [ Michael Biebl ]
+  * Add a wrapper script to start the GNOME Classic session as currently
+    Xsession doesn't allow to run gnome-session with custom arguments due to
+    #653327.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 11 Oct 2013 18:55:23 +0200
+
+gnome-shell-extensions (3.8.3.1-1) experimental; urgency=low
+
+  [ Jeremy Bicha ]
+  * New upstream release
+    - default-min-max and static-workspaces extensions have been dropped.
+      Use Classic Mode or tweak org.gnome.shell.overrides in dconf-editor
+  * debian/control.in:
+    - Depend on gnome-session 3.8, required for the new Classic mode.
+    - Update homepage
+  * debian/patches/dont-require-nautilus-classic.patch:
+    - Don't require nautilus-classic since it forces desktop icons
+  * debian/patches/fix-applications-menu-resolution-change.patch:
+    - Backport commit to not break applications menu when screen resolution
+      changes
+  * debian/patches/fix-hibernate.patch:
+    - Backport patch to fix checking whether hibernate is allowed
+  * debian/patches/look-in-data-home-for-themes.patch:
+    - Backport commit to also look in XDG_DATA_HOME (usually ~/.local/share/)
+      for user themes
+  * debian/rules:
+    - Run autoreconf
+
+ -- Andreas Henriksson <andreas@fatal.se>  Fri, 16 Aug 2013 20:25:30 +0200
+
+gnome-shell-extensions (3.8.2-1) experimental; urgency=low
+
+  * Team upload
+
+  [ Victor Seva ]
+  * Recommends gnome-tweak-tool
+
+  [ Jean Schurger ]
+  * New upstream release 3.7.92 (LP: #1017979, #1059152).
+  * Enabled new extensions.
+  * Dropped 'dock' and 'gajim'.
+  * Use ./configure instead of autoreconf.
+  * Bumped Standards-Version to 3.9.4.
+  * Updated Vcs-Svn.
+  * debian/control.in
+    - Added runtime dependency to 'gvfs' (>= 1.16.0).
+      The 'Places' extension rely on a 'gvfs' linked to 'udisks2'.
+
+  [ Simon McVittie ]
+  * New upstream release 3.8.2.
+  * Install the "classic mode"
+  * Enable windowNavigator extension (this means we have everything except
+    example and xrandr, the same as in the Ubuntu gnome3-team's PPA)
+
+ -- Simon McVittie <smcv@debian.org>  Thu, 23 May 2013 09:07:23 +0100
+
+gnome-shell-extensions (3.4.0-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 30 May 2012 13:22:54 +0200
+
+gnome-shell-extensions (3.4.0-1) experimental; urgency=low
+
+  * New upstream release.
+  * Remove 01_status-menu_disable_accounts.patch: The alternative-status-menu
+    extension no longer recreates the complete user menu but reuses the one
+    from gnome-shell, so we can't easily get rid of the "Online Accounts" menu
+    entry. We will patch gnome-shell directly instead.
+  * Remove 02-Revert-all-remove-all-GSettings-usage.patch and
+    03-Revert-Remove-all-references-to-localedir-from-metad.patch, no longer
+    required.
+  * Bump Standards-Version to 3.9.3
+
+ -- Michael Biebl <biebl@debian.org>  Mon, 21 May 2012 00:24:56 +0200
+
+gnome-shell-extensions (3.2.3-1) unstable; urgency=low
+
+  [ Josselin Mouette ]
+  * gnome-shell-extensions.gsettings-override: enable the alternative
+    status menu by default. Closes: #648112.
+  * Use ${gnome:Version} to generate strict dependencies, it’s very
+    unlikely that extensions remain compatible after a major upgrade.
+
+  [ Michael Biebl ]
+  * Upload to unstable.
+
+  [ Josselin Mouette ]
+  * 01_status-menu_disable_accounts.patch: new patch. Drop the unusable
+    advertisement for Google. It is already available in the control
+    center anyway.
+
+  [ Michael Biebl ]
+  * New upstream release.
+  * Drop patches which have been merged upstream:
+    - debian/patches/upstream/*
+    - debian/patches/fix-*
+  * Refresh 01_status-menu_disable_accounts.patch.
+  * Add 02-Revert-all-remove-all-GSettings-usage.patch: Use GSettings since we
+    install the extensions system-wide.
+  * Use dh-autoreconf to generate the build system.
+  * Add 03-Revert-Remove-all-references-to-localedir-from-metad.patch: Use
+    locales from system-wide location.
+
+ -- Michael Biebl <biebl@debian.org>  Sat, 11 Feb 2012 23:28:53 +0100
+
+gnome-shell-extensions (3.2.0-1) experimental; urgency=low
+
+  [ Victor Seva ]
+  * Initial release (Closes: #627515)
+    Package based on the work by Bilal Akhtar <bilalakhtar@ubuntu.com>
+  * debian/copyright
+    - Added myself
+    - Fixed syntax-error-in-dep5-copyright syntax error
+  * debian/control.in
+    - Added myself as maintainer.
+    - Fix gnome-shell dependency.
+    - Fix gir1.2-gtop-2.0 dependency for systemMonitor ext.
+  * debian/rules
+    - Added uploaders.mk gnome-version.mk includes.
+    - Removed unused variables.
+  * debian/watch added.
+  * No more gnome-shell-extension-* packages.
+  * debian/patches/upstream
+    - patch_967aee7aad2accfb38d91ab56b6c5e91d86a2722.diff
+      popup menu fix
+    - patch_66242aa76a5d59fb4659551575c1fbb42e50b8fb.diff
+      dock fix.
+    - patch_4c5a36e4c0cbe38f2e26b6b3c8b02e88b4b939f7.diff
+      patch_2bba98d6214cffae2eb5cecb9d7c1f6b6d244052.diff
+      systemMonitor: Properly enable/disable
+  * debian/patches
+    - fix_dock_gnome-shell_version.diff
+    - fix_alternate-tab_661281.diff
+    - fix_alternate-tab_gnome-shell_version.diff
+  * debian/rules
+    - EXTENSIONS_ENABLED, EXTENSIONS_DISABLED variables
+    - disabled xrandr-indicator
+
+  [ Michael Biebl ]
+  * debian/watch: Track .xz tarballs.
+  * debian/control.in:
+    - Set pkg-gnome-maintainers@lists.alioth.debian.org as Maintainer and add
+      Victor Seva <linuxmaniac@torreviejawireless.org> to Uploaders.
+    - Wrap (Build-)Depends.
+    - Add Vcs-Svn and Vcs-Browser field.
+  * debian/rules:
+    - Include gnome-get-source.mk.
+
+ -- Michael Biebl <biebl@debian.org>  Sat, 12 Nov 2011 18:32:22 +0100
--- a/debian/compat
+++ b/debian/compat
@@ -0,0 +1 @@
+11
--- a/debian/control
+++ b/debian/control
@@ -0,0 +1,49 @@
+# This file is autogenerated. DO NOT EDIT!
+#
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+Source: gnome-shell-extensions
+Section: gnome
+Priority: optional
+Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Uploaders: Iain Lane <laney@debian.org>, Jeremy Bicha <jbicha@debian.org>, Michael Biebl <biebl@debian.org>
+Build-Depends: debhelper (>= 11.1.3),
+               gnome-pkg-tools,
+               meson (>= 0.44.0),
+               sassc
+Rules-Requires-Root: no
+Standards-Version: 4.2.1
+Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-shell-extensions
+Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell-extensions.git
+Homepage: https://wiki.gnome.org/Projects/GnomeShell/Extensions
+
+Package: gnome-shell-extensions
+Architecture: all
+Depends: gir1.2-atk-1.0,
+         gir1.2-clutter-1.0,
+         gir1.2-gdkpixbuf-2.0,
+         gir1.2-glib-2.0,
+         gir1.2-gmenu-3.0,
+         gir1.2-gtk-3.0,
+         gir1.2-pango-1.0,
+         gnome-session-bin (>= 3.8),
+         gnome-settings-daemon (>= 3.24),
+         gnome-shell (<< ${gnome:NextVersion}),
+         gnome-shell (>= ${gnome:Version}),
+         gvfs (>= 1.16.0),
+         ${misc:Depends}
+Recommends: gnome-tweaks
+Replaces: gnome-shell-common (<< 3.18)
+Breaks: gnome-shell-common (<< 3.18)
+Description: Extensions to extend functionality of GNOME Shell
+ The GNOME Shell redefines user interactions with the GNOME desktop. In
+ particular, it offers new paradigms for launching applications,
+ accessing documents, and organizing open windows in GNOME. Later, it
+ will introduce a new applets eco-system and offer new solutions for
+ other desktop features, such as notifications and contacts management.
+ The GNOME Shell is intended to replace functions handled by the GNOME
+ Panel and by the window manager in previous versions of GNOME. The GNOME
+ Shell has rich visual effects enabled by new graphical technologies.
+ .
+ GNOME Shell is extensible using extensions. This package contains
+ official GNOME Shell extensions.
--- a/debian/control.in
+++ b/debian/control.in
@@ -0,0 +1,45 @@
+Source: gnome-shell-extensions
+Section: gnome
+Priority: optional
+Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Uploaders: @GNOME_TEAM@
+Build-Depends: debhelper (>= 11.1.3),
+               gnome-pkg-tools,
+               meson (>= 0.44.0),
+               sassc
+Rules-Requires-Root: no
+Standards-Version: 4.2.1
+Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-shell-extensions
+Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell-extensions.git
+Homepage: https://wiki.gnome.org/Projects/GnomeShell/Extensions
+
+Package: gnome-shell-extensions
+Architecture: all
+Depends: gir1.2-atk-1.0,
+         gir1.2-clutter-1.0,
+         gir1.2-gdkpixbuf-2.0,
+         gir1.2-glib-2.0,
+         gir1.2-gmenu-3.0,
+         gir1.2-gtk-3.0,
+         gir1.2-pango-1.0,
+         gnome-session-bin (>= 3.8),
+         gnome-settings-daemon (>= 3.24),
+         gnome-shell (<< ${gnome:NextVersion}),
+         gnome-shell (>= ${gnome:Version}),
+         gvfs (>= 1.16.0),
+         ${misc:Depends}
+Recommends: gnome-tweaks
+Replaces: gnome-shell-common (<< 3.18)
+Breaks: gnome-shell-common (<< 3.18)
+Description: Extensions to extend functionality of GNOME Shell
+ The GNOME Shell redefines user interactions with the GNOME desktop. In
+ particular, it offers new paradigms for launching applications,
+ accessing documents, and organizing open windows in GNOME. Later, it
+ will introduce a new applets eco-system and offer new solutions for
+ other desktop features, such as notifications and contacts management.
+ The GNOME Shell is intended to replace functions handled by the GNOME
+ Panel and by the window manager in previous versions of GNOME. The GNOME
+ Shell has rich visual effects enabled by new graphical technologies.
+ .
+ GNOME Shell is extensible using extensions. This package contains
+ official GNOME Shell extensions.
--- a/debian/copyright
+++ b/debian/copyright
@@ -0,0 +1,28 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: gnome-shell-extensions
+Upstream-Contact: 2011 Giovanni Campagna <gcampagna@src.gnome.org>
+Source: https://download.gnome.org/sources/gnome-shell-extensions/
+
+Files: *
+Copyright: 2011 Giovanni Campagna <gcampagna@src.gnome.org>
+License: GPL-2+
+
+Files: debian/*
+Copyright:
+    2011 Victor Seva <linuxmaniac@torreviejawireless.org>
+    2011 Bilal Akhtar <bilalakhtar@ubuntu.com>
+License: GPL-2+
+
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
--- a/debian/docs
+++ b/debian/docs
@@ -0,0 +1,2 @@
+NEWS
+README.md
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -0,0 +1,14 @@
+[DEFAULT]
+pristine-tar = True
+debian-branch = debian/master
+upstream-branch = upstream/latest
+upstream-vcs-tag = %(version)s
+
+[buildpackage]
+sign-tags = True
+
+[import-orig]
+postimport = dch -v%(version)s New upstream release; git add debian/changelog; debcommit
+
+[pq]
+patch-numbers = False
--- a/debian/install
+++ b/debian/install
@@ -0,0 +1 @@
+debian/local/gnome-session-classic usr/bin
--- a/debian/local/gnome-session-classic
+++ b/debian/local/gnome-session-classic
@@ -0,0 +1,2 @@
+#! /bin/sh
+env GNOME_SHELL_SESSION_MODE=classic gnome-session --session gnome-classic "$@"
--- a/debian/patches/gnome-session-classic-wrapper-script.patch
+++ b/debian/patches/gnome-session-classic-wrapper-script.patch
@@ -0,0 +1,30 @@
+From: Michael Biebl <biebl@debian.org>
+Date: Tue, 30 Jan 2018 09:04:03 +0000
+Subject: Use a wrapper script to start GNOME classic session
+
+Xsession currently doesn't allow passing more then one argument, as it
+otherwise fails with
+Xsession: unable to launch "gnome-session --session classic" X session ---
+"gnome-session --session classic" not found; falling back to default session.
+
+This is due to [1]. Add a wrapper script to start the GNOME classic session
+as a workaround. Once [1] is fixed, this should be removed again.
+
+[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=653327.
+---
+ data/gnome-classic.desktop.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/gnome-classic.desktop.in b/data/gnome-classic.desktop.in
+index 055ce64..34827ee 100644
+--- a/data/gnome-classic.desktop.in
+++ b/data/gnome-classic.desktop.in
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Name=GNOME Classic
+ Comment=This session logs you into GNOME Classic
+-Exec=env GNOME_SHELL_SESSION_MODE=classic gnome-session --session gnome-classic
+Exec=gnome-session-classic
+ TryExec=gnome-session
+ Type=Application
+ DesktopNames=GNOME-Classic;GNOME;
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+gnome-session-classic-wrapper-script.patch
--- a/debian/rules
+++ b/debian/rules
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+
+EXTENSIONS_ENABLED='apps-menu, places-menu, \
+ launch-new-instance, window-list, \
+ drive-menu, screenshot-window-sizer, \
+ windowsNavigator, workspace-indicator, \
+ auto-move-windows, native-window-placement, user-theme'
+
+EXTENSIONS_DISABLED='example'
+
+%:
+	dh $@ --with gnome
+
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		-Denable_extensions=$(EXTENSIONS_ENABLED) \
+		-Dclassic_mode=true
--- a/debian/source/format
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--- a/debian/watch
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=4
+https://download.gnome.org/sources/@PACKAGE@/([\d\.]+)/ \
+	@PACKAGE@@ANY_VERSION@\.tar\.xz
--- a/export-zips.sh
+++ b/export-zips.sh
@@ -14,33 +14,23 @@ mkdir $srcdir/zip-files

 extensiondir=$installdir/share/gnome-shell/extensions
 schemadir=$installdir/share/glib-2.0/schemas
+localedir=$installdir/share/locale

 for f in $extensiondir/*; do
  name=`basename ${f%%@*}`
  uuid=$name@gnome-shell-extensions.gcampax.github.com
  schema=$schemadir/org.gnome.shell.extensions.$name.gschema.xml

-  olddomain=gnome-shell-extensions
-  newdomain=gnome-shell-extension-$name
-  sed -i "/gettext-domain/ s:$olddomain:$newdomain:" $f/metadata.json
+  cp $srcdir/NEWS $srcdir/COPYING $f
+  cp -r $localedir $f

-  xgettext --from-code=UTF-8 --output-dir=$builddir --output=$name.pot $f/*.js
-
-  if [ -f $builddir/$name.pot ]; then
-    mkdir $f/po
-    for l in $(<$srcdir/po/LINGUAS); do
-      msgmerge --quiet --output-file=$f/po/$l.po \
-        $srcdir/po/$l.po $builddir/$name.pot
-    done
+  if [ -f $schema ]; then
+    mkdir $f/schemas
+    cp $schema $f/schemas;
+    glib-compile-schemas $f/schemas
  fi

-  cp $srcdir/NEWS $srcdir/COPYING $f
-  sources=(NEWS COPYING $(cd $f; ls *.js))
-
-  [ -f $schema ] || unset schema
-
-  gnome-extensions pack ${sources[@]/#/--extra-source=} \
-    ${schema:+--schema=$schema} --out-dir=$srcdir/zip-files $f
+  (cd $f && zip -rmq $srcdir/zip-files/$uuid.shell-extension.zip .)
 done

 rm -rf $builddir
--- a/extensions/.lock
+++ b/extensions/.lock
--- a/extensions/apps-menu/extension.js
+++ b/extensions/apps-menu/extension.js
@@ -2,20 +2,19 @@
 /* exported init enable disable */

 const {
-    Atk, Clutter, Gio, GLib, GMenu, GObject, Gtk, Meta, Shell, St,
+    Atk, Clutter, Gio, GLib, GMenu, GObject, Gtk, Meta, Shell, St
 } = imports.gi;
-const Signals = imports.signals;
-
 const DND = imports.ui.dnd;
-const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
+const Signals = imports.signals;

-const Me = ExtensionUtils.getCurrentExtension();
-const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']);
+const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;

+const ExtensionUtils = imports.misc.extensionUtils;
+
 const appSys = Shell.AppSystem.get_default();

 const APPLICATION_ICON_SIZE = 32;
@@ -26,37 +25,50 @@ const NAVIGATION_REGION_OVERSHOOT = 50;
 Gio._promisify(Gio._LocalFilePrototype, 'query_info_async', 'query_info_finish');
 Gio._promisify(Gio._LocalFilePrototype, 'set_attributes_async', 'set_attributes_finish');

-var ApplicationMenuItem = GObject.registerClass(
+class ActivitiesMenuItem extends PopupMenu.PopupBaseMenuItem {
+    constructor(button) {
+        super();
+        this._button = button;
+        this.actor.add_child(new St.Label({ text: _('Activities Overview') }));
+    }
+
+    activate(event) {
+        this._button.menu.toggle();
+        Main.overview.toggle();
+        super.activate(event);
+    }
+}
+
 class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
-    _init(button, app) {
-        super._init();
+    constructor(button, app) {
+        super();
        this._app = app;
        this._button = button;

        this._iconBin = new St.Bin();
-        this.add_child(this._iconBin);
+        this.actor.add_child(this._iconBin);

        let appLabel = new St.Label({
            text: app.get_name(),
            y_expand: true,
-            y_align: Clutter.ActorAlign.CENTER,
+            y_align: Clutter.ActorAlign.CENTER
        });
-        this.add_child(appLabel);
-        this.label_actor = appLabel;
+        this.actor.add_child(appLabel);
+        this.actor.label_actor = appLabel;

        let textureCache = St.TextureCache.get_default();
        let iconThemeChangedId = textureCache.connect('icon-theme-changed',
-            this._updateIcon.bind(this));
-        this.connect('destroy', () => {
+                                                      this._updateIcon.bind(this));
+        this.actor.connect('destroy', () => {
            textureCache.disconnect(iconThemeChangedId);
        });
        this._updateIcon();

-        this._delegate = this;
-        let draggable = DND.makeDraggable(this);
+        this.actor._delegate = this;
+        let draggable = DND.makeDraggable(this.actor);

        let maybeStartDrag = draggable._maybeStartDrag;
-        draggable._maybeStartDrag = event => {
+        draggable._maybeStartDrag = (event) => {
            if (this._dragEnabled)
                return maybeStartDrag.call(draggable, event);
            return false;
@@ -68,8 +80,6 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
        this._button.selectCategory(null);
        this._button.menu.toggle();
        super.activate(event);
-
-        Main.overview.hide();
    }

    setActive(active, params) {
@@ -78,8 +88,8 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
        super.setActive(active, params);
    }

-    setDragEnabled(enabled) {
-        this._dragEnabled = enabled;
+    setDragEnabled(enable) {
+        this._dragEnabled = enable;
    }

    getDragActor() {
@@ -91,16 +101,13 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
    }

    _updateIcon() {
-        let icon = this.getDragActor();
-        icon.style_class = 'icon-dropshadow';
-        this._iconBin.set_child(icon);
+        this._iconBin.set_child(this.getDragActor());
    }
-});
+}

-var CategoryMenuItem = GObject.registerClass(
 class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
-    _init(button, category) {
-        super._init();
+    constructor(button, category) {
+        super();
        this._category = category;
        this._button = button;

@@ -113,9 +120,8 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
        else
            name = _('Favorites');

-        this.add_child(new St.Label({ text: name }));
-        this.connect('motion-event', this._onMotionEvent.bind(this));
-        this.connect('notify::active', this._onActiveChanged.bind(this));
+        this.actor.add_child(new St.Label({ text: name }));
+        this.actor.connect('motion-event', this._onMotionEvent.bind(this));
    }

    activate(event) {
@@ -125,9 +131,9 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
    }

    _isNavigatingSubmenu([x, y]) {
-        let [posX, posY] = this.get_transformed_position();
+        let [posX, posY] = this.actor.get_transformed_position();

-        if (this._oldX === -1) {
+        if (this._oldX == -1) {
            this._oldX = x;
            this._oldY = y;
            return true;
@@ -140,11 +146,11 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
        this._oldY = y;

        // If it lies outside the x-coordinates then it is definitely outside.
-        if (posX > x || posX + this.width < x)
+        if (posX > x || posX + this.actor.width < x)
            return false;

        // If it lies inside the menu item then it is definitely inside.
-        if (posY <= y && posY + this.height >= y)
+        if (posY <= y && posY + this.actor.height >= y)
            return true;

        // We want the keep-up triangle only if the movement is more
@@ -165,38 +171,37 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
        // only check for triangle ABC.
        if (posY > y) {
            let offset = posY - y;
-            y = posY + this.height + offset;
+            y = posY + this.actor.height + offset;
        }

        // Ensure that A is (0, 0).
        x -= posX;
-        y -= posY + this.height;
+        y -= posY + this.actor.height;

        // Check which side of line AB the point P lies on by taking the
        // cross-product of AB and AP. See:
        // http://stackoverflow.com/questions/3461453/determine-which-side-of-a-line-a-point-lies
-        if (this.width * y - NAVIGATION_REGION_OVERSHOOT * x <= 0)
+        if (((this.actor.width * y) - (NAVIGATION_REGION_OVERSHOOT * x)) <= 0)
            return true;

        return false;
    }

    _onMotionEvent(actor, event) {
-        let device = event.get_device();
-        if (!device.get_grabbed_actor()) {
+        if (!Clutter.get_pointer_grab()) {
            this._oldX = -1;
            this._oldY = -1;
-            device.grab(this);
+            Clutter.grab_pointer(this.actor);
        }
-        this.hover = true;
+        this.actor.hover = true;

        if (this._isNavigatingSubmenu(event.get_coords()))
            return true;

        this._oldX = -1;
        this._oldY = -1;
-        this.hover = false;
-        device.ungrab();
+        this.actor.hover = false;
+        Clutter.ungrab_pointer();

        let source = event.get_source();
        if (source instanceof St.Widget)
@@ -205,14 +210,14 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
        return false;
    }

-    _onActiveChanged() {
-        if (!this.active)
-            return;
-
-        this._button.selectCategory(this._category);
-        this._button.scrollToCatButton(this);
+    setActive(active, params) {
+        if (active) {
+            this._button.selectCategory(this._category);
+            this._button.scrollToCatButton(this);
+        }
+        super.setActive(active, params);
    }
-});
+}

 class ApplicationsMenu extends PopupMenu.PopupMenu {
    constructor(sourceActor, arrowAlignment, arrowSide, button) {
@@ -224,9 +229,28 @@ class ApplicationsMenu extends PopupMenu.PopupMenu {
        return false;
    }

+    open(animate) {
+        this._button.hotCorner.setBarrierSize(0);
+        if (this._button.hotCorner.actor) // fallback corner
+            this._button.hotCorner.actor.hide();
+        super.open(animate);
+    }
+
+    close(animate) {
+        let size = Main.layoutManager.panelBox.height;
+        this._button.hotCorner.setBarrierSize(size);
+        if (this._button.hotCorner.actor) // fallback corner
+            this._button.hotCorner.actor.show();
+        super.close(animate);
+    }
+
    toggle() {
-        if (this.isOpen)
+        if (this.isOpen) {
            this._button.selectCategory(null);
+        } else {
+            if (Main.overview.visible)
+                Main.overview.hide();
+        }
        super.toggle();
    }
 }
@@ -238,7 +262,7 @@ class DesktopTarget {

        this._windowAddedId =
            global.window_group.connect('actor-added',
-                this._onWindowAdded.bind(this));
+                                        this._onWindowAdded.bind(this));

        global.get_window_actors().forEach(a => {
            this._onWindowAdded(a.get_parent(), a);
@@ -246,14 +270,14 @@ class DesktopTarget {
    }

    get hasDesktop() {
-        return this._desktop !== null;
+        return this._desktop != null;
    }

    _onWindowAdded(group, actor) {
        if (!(actor instanceof Meta.WindowActor))
            return;

-        if (actor.meta_window.get_window_type() === Meta.WindowType.DESKTOP)
+        if (actor.meta_window.get_window_type() == Meta.WindowType.DESKTOP)
            this._setDesktop(actor);
    }

@@ -298,8 +322,8 @@ class DesktopTarget {

            // Hack: force nautilus to reload file info
            info = new Gio.FileInfo();
-            info.set_attribute_uint64(
-                Gio.FILE_ATTRIBUTE_TIME_ACCESS, GLib.get_real_time());
+            info.set_attribute_uint64(Gio.FILE_ATTRIBUTE_TIME_ACCESS,
+                                      GLib.get_real_time());
            try {
                await file.set_attributes_async(info, queryFlags, ioPriority, null);
            } catch (e) {
@@ -364,24 +388,30 @@ class ApplicationsButton extends PanelMenu.Button {
        // role ATK_ROLE_MENU like other elements of the panel.
        this.accessible_role = Atk.Role.LABEL;

+        let hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
+
        this._label = new St.Label({
            text: _('Applications'),
            y_expand: true,
-            y_align: Clutter.ActorAlign.CENTER,
+            y_align: Clutter.ActorAlign.CENTER
        });
+        hbox.add_child(this._label);
+        hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));

-        this.add_actor(this._label);
+        this.add_actor(hbox);
        this.name = 'panelApplications';
        this.label_actor = this._label;

+        this.connect('captured-event', this._onCapturedEvent.bind(this));
+
        this._showingId = Main.overview.connect('showing', () => {
-            this.add_accessible_state(Atk.StateType.CHECKED);
+            this.add_accessible_state (Atk.StateType.CHECKED);
        });
        this._hidingId = Main.overview.connect('hiding', () => {
-            this.remove_accessible_state(Atk.StateType.CHECKED);
+            this.remove_accessible_state (Atk.StateType.CHECKED);
        });
        Main.layoutManager.connect('startup-complete',
-            this._setKeybinding.bind(this));
+                                   this._setKeybinding.bind(this));
        this._setKeybinding();

        this._desktopTarget = new DesktopTarget();
@@ -396,14 +426,14 @@ class ApplicationsButton extends PanelMenu.Button {

        this._tree = new GMenu.Tree({ menu_basename: 'applications.menu' });
        this._treeChangedId = this._tree.connect('changed',
-            this._onTreeChanged.bind(this));
+                                                 this._onTreeChanged.bind(this));

        this._applicationsButtons = new Map();
        this.reloadFlag = false;
        this._createLayout();
        this._display();
        this._installedChangedId = appSys.connect('installed-changed',
-            this._onTreeChanged.bind(this));
+                                                  this._onTreeChanged.bind(this));
    }

    _onTreeChanged() {
@@ -415,38 +445,49 @@ class ApplicationsButton extends PanelMenu.Button {
        }
    }

+    get hotCorner() {
+        return Main.layoutManager.hotCorners[Main.layoutManager.primaryIndex];
+    }
+
    _createVertSeparator() {
        let separator = new St.DrawingArea({
            style_class: 'calendar-vertical-separator',
-            pseudo_class: 'highlighted',
+            pseudo_class: 'highlighted'
        });
        separator.connect('repaint', this._onVertSepRepaint.bind(this));
        return separator;
    }

    _onDestroy() {
-        super._onDestroy();
-
        Main.overview.disconnect(this._showingId);
        Main.overview.disconnect(this._hidingId);
        appSys.disconnect(this._installedChangedId);
        this._tree.disconnect(this._treeChangedId);
        this._tree = null;

+        let handler = Main.sessionMode.hasOverview ?
+            Main.overview.toggle.bind(Main.overview) : null;
        Main.wm.setCustomKeybindingHandler('panel-main-menu',
-            Shell.ActionMode.NORMAL | Shell.ActionMode.OVERVIEW,
-            Main.sessionMode.hasOverview
-                ? Main.overview.toggle.bind(Main.overview)
-                : null);
+                                           Shell.ActionMode.NORMAL |
+                                           Shell.ActionMode.OVERVIEW,
+                                           handler);

        this._desktopTarget.destroy();
    }

+    _onCapturedEvent(actor, event) {
+        if (event.type() == Clutter.EventType.BUTTON_PRESS) {
+            if (!Main.overview.shouldToggleByCornerOrButton())
+                return true;
+        }
+        return false;
+    }
+
    _onMenuKeyPress(actor, event) {
        let symbol = event.get_key_symbol();
-        if (symbol === Clutter.KEY_Left || symbol === Clutter.KEY_Right) {
-            let direction = symbol === Clutter.KEY_Left
-                ? Gtk.DirectionType.LEFT : Gtk.DirectionType.RIGHT;
+        if (symbol == Clutter.KEY_Left || symbol == Clutter.KEY_Right) {
+            let direction = symbol == Clutter.KEY_Left ?
+                Gtk.DirectionType.LEFT : Gtk.DirectionType.RIGHT;
            if (this.menu.actor.navigate_focus(global.stage.key_focus, direction, false))
                return true;
        }
@@ -481,8 +522,9 @@ class ApplicationsButton extends PanelMenu.Button {

    _setKeybinding() {
        Main.wm.setCustomKeybindingHandler('panel-main-menu',
-            Shell.ActionMode.NORMAL | Shell.ActionMode.OVERVIEW,
-            () => this.menu.toggle());
+                                           Shell.ActionMode.NORMAL |
+                                           Shell.ActionMode.OVERVIEW,
+                                           () => this.menu.toggle());
    }

    _redisplay() {
@@ -494,8 +536,8 @@ class ApplicationsButton extends PanelMenu.Button {
    _loadCategory(categoryId, dir) {
        let iter = dir.iter();
        let nextType;
-        while ((nextType = iter.next()) !== GMenu.TreeItemType.INVALID) {
-            if (nextType === GMenu.TreeItemType.ENTRY) {
+        while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) {
+            if (nextType == GMenu.TreeItemType.ENTRY) {
                let entry = iter.get_entry();
                let id;
                try {
@@ -508,9 +550,9 @@ class ApplicationsButton extends PanelMenu.Button {
                    app = new Shell.App({ app_info: entry.get_app_info() });
                if (app.get_app_info().should_show())
                    this.applicationsByCategory[categoryId].push(app);
-            } else if (nextType === GMenu.TreeItemType.SEPARATOR) {
+            } else if (nextType == GMenu.TreeItemType.SEPARATOR) {
                this.applicationsByCategory[categoryId].push('separator');
-            } else if (nextType === GMenu.TreeItemType.DIRECTORY) {
+            } else if (nextType == GMenu.TreeItemType.DIRECTORY) {
                let subdir = iter.get_directory();
                if (!subdir.get_is_nodisplay())
                    this._loadCategory(categoryId, subdir);
@@ -523,13 +565,13 @@ class ApplicationsButton extends PanelMenu.Button {
        let appsScrollBoxAlloc = this.applicationsScrollBox.get_allocation_box();
        let currentScrollValue = appsScrollBoxAdj.get_value();
        let boxHeight = appsScrollBoxAlloc.y2 - appsScrollBoxAlloc.y1;
-        let buttonAlloc = button.get_allocation_box();
+        let buttonAlloc = button.actor.get_allocation_box();
        let newScrollValue = currentScrollValue;
        if (currentScrollValue > buttonAlloc.y1 - 10)
            newScrollValue = buttonAlloc.y1 - 10;
        if (boxHeight + currentScrollValue < buttonAlloc.y2 + 10)
            newScrollValue = buttonAlloc.y2 - boxHeight + 10;
-        if (newScrollValue !== currentScrollValue)
+        if (newScrollValue != currentScrollValue)
            appsScrollBoxAdj.set_value(newScrollValue);
    }

@@ -538,13 +580,13 @@ class ApplicationsButton extends PanelMenu.Button {
        let catsScrollBoxAlloc = this.categoriesScrollBox.get_allocation_box();
        let currentScrollValue = catsScrollBoxAdj.get_value();
        let boxHeight = catsScrollBoxAlloc.y2 - catsScrollBoxAlloc.y1;
-        let buttonAlloc = button.get_allocation_box();
+        let buttonAlloc = button.actor.get_allocation_box();
        let newScrollValue = currentScrollValue;
        if (currentScrollValue > buttonAlloc.y1 - 10)
            newScrollValue = buttonAlloc.y1 - 10;
        if (boxHeight + currentScrollValue < buttonAlloc.y2 + 10)
            newScrollValue = buttonAlloc.y2 - boxHeight + 10;
-        if (newScrollValue !== currentScrollValue)
+        if (newScrollValue != currentScrollValue)
            catsScrollBoxAdj.set_value(newScrollValue);
    }

@@ -554,8 +596,10 @@ class ApplicationsButton extends PanelMenu.Button {
        this.mainBox = new St.BoxLayout({ vertical: false });
        this.leftBox = new St.BoxLayout({ vertical: true });
        this.applicationsScrollBox = new St.ScrollView({
-            style_class: 'apps-menu vfade',
-            x_expand: true,
+            x_fill: true,
+            y_fill: false,
+            y_align: St.Align.START,
+            style_class: 'apps-menu vfade'
        });
        this.applicationsScrollBox.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
        let vscroll = this.applicationsScrollBox.get_vscroll_bar();
@@ -566,13 +610,29 @@ class ApplicationsButton extends PanelMenu.Button {
            this.menu.passEvents = false;
        });
        this.categoriesScrollBox = new St.ScrollView({
-            style_class: 'vfade',
+            x_fill: true,
+            y_fill: false,
+            y_align: St.Align.START,
+            style_class: 'vfade'
        });
        this.categoriesScrollBox.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
        vscroll = this.categoriesScrollBox.get_vscroll_bar();
-        vscroll.connect('scroll-start', () => (this.menu.passEvents = true));
-        vscroll.connect('scroll-stop', () => (this.menu.passEvents = false));
-        this.leftBox.add_child(this.categoriesScrollBox);
+        vscroll.connect('scroll-start', () => this.menu.passEvents = true);
+        vscroll.connect('scroll-stop', () => this.menu.passEvents = false);
+        this.leftBox.add(this.categoriesScrollBox, {
+            expand: true,
+            x_fill: true,
+            y_fill: true,
+            y_align: St.Align.START
+        });
+
+        let activities = new ActivitiesMenuItem(this);
+        this.leftBox.add(activities.actor, {
+            expand: false,
+            x_fill: true,
+            y_fill: false,
+            y_align: St.Align.START
+        });

        this.applicationsBox = new St.BoxLayout({ vertical: true });
        this.applicationsScrollBox.add_actor(this.applicationsBox);
@@ -580,8 +640,16 @@ class ApplicationsButton extends PanelMenu.Button {
        this.categoriesScrollBox.add_actor(this.categoriesBox);

        this.mainBox.add(this.leftBox);
-        this.mainBox.add_child(this._createVertSeparator());
-        this.mainBox.add_child(this.applicationsScrollBox);
+        this.mainBox.add(this._createVertSeparator(), {
+            expand: false,
+            x_fill: false,
+            y_fill: true
+        });
+        this.mainBox.add(this.applicationsScrollBox, {
+            expand: true,
+            x_fill: true,
+            y_fill: true
+        });
        section.actor.add_actor(this.mainBox);
    }

@@ -590,16 +658,16 @@ class ApplicationsButton extends PanelMenu.Button {
        this.mainBox.style = 'width: 35em;';
        this.mainBox.hide();

-        // Load categories
+        //Load categories
        this.applicationsByCategory = {};
        this._tree.load_sync();
        let root = this._tree.get_root_directory();
        let categoryMenuItem = new CategoryMenuItem(this, null);
-        this.categoriesBox.add_actor(categoryMenuItem);
+        this.categoriesBox.add_actor(categoryMenuItem.actor);
        let iter = root.iter();
        let nextType;
-        while ((nextType = iter.next()) !== GMenu.TreeItemType.INVALID) {
-            if (nextType !== GMenu.TreeItemType.DIRECTORY)
+        while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) {
+            if (nextType != GMenu.TreeItemType.DIRECTORY)
                continue;

            let dir = iter.get_directory();
@@ -610,12 +678,12 @@ class ApplicationsButton extends PanelMenu.Button {
            this.applicationsByCategory[categoryId] = [];
            this._loadCategory(categoryId, dir);
            if (this.applicationsByCategory[categoryId].length > 0) {
-                categoryMenuItem = new CategoryMenuItem(this, dir);
-                this.categoriesBox.add_actor(categoryMenuItem);
+                let categoryMenuItem = new CategoryMenuItem(this, dir);
+                this.categoriesBox.add_actor(categoryMenuItem.actor);
            }
        }

-        // Load applications
+        //Load applications
        this._displayButtons(this._listApplications(null));

        let themeContext = St.ThemeContext.get_for_stage(global.stage);
@@ -652,8 +720,8 @@ class ApplicationsButton extends PanelMenu.Button {
                item.setDragEnabled(this._desktopTarget.hasDesktop);
                this._applicationsButtons.set(app, item);
            }
-            if (!item.get_parent())
-                this.applicationsBox.add_actor(item);
+            if (!item.actor.get_parent())
+                this.applicationsBox.add_actor(item.actor);
        }
    }

@@ -663,9 +731,13 @@ class ApplicationsButton extends PanelMenu.Button {
        if (categoryMenuId) {
            applist = this.applicationsByCategory[categoryMenuId];
        } else {
-            applist = global.settings.get_strv('favorite-apps')
-               .map(id => appSys.lookup_app(id))
-               .filter(app => app);
+            applist = new Array();
+            let favorites = global.settings.get_strv('favorite-apps');
+            for (let i = 0; i < favorites.length; i++) {
+                let app = appSys.lookup_app(favorites[i]);
+                if (app)
+                    applist.push(app);
+            }
        }

        return applist;
@@ -673,16 +745,19 @@ class ApplicationsButton extends PanelMenu.Button {
 });

 let appsMenuButton;
+let activitiesButton;

 function enable() {
+    activitiesButton = Main.panel.statusArea['activities'];
+    activitiesButton.container.hide();
    appsMenuButton = new ApplicationsButton();
-    let index = Main.sessionMode.panel.left.indexOf('activities') + 1;
-    Main.panel.addToStatusArea('apps-menu', appsMenuButton, index, 'left');
+    Main.panel.addToStatusArea('apps-menu', appsMenuButton, 1, 'left');
 }

 function disable() {
    Main.panel.menuManager.removeMenu(appsMenuButton.menu);
    appsMenuButton.destroy();
+    activitiesButton.container.show();
 }

 function init() {
--- a/extensions/auto-move-windows/extension.js
+++ b/extensions/auto-move-windows/extension.js
@@ -2,10 +2,11 @@
 // Start apps on custom workspaces
 /* exported init enable disable */

-const { Shell } = imports.gi;
+const Shell = imports.gi.Shell;
+
+const Main = imports.ui.main;

 const ExtensionUtils = imports.misc.extensionUtils;
-const Main = imports.ui.main;

 class WindowMover {
    constructor() {
@@ -16,7 +17,7 @@ class WindowMover {

        this._appsChangedId =
            this._appSystem.connect('installed-changed',
-                this._updateAppData.bind(this));
+                                    this._updateAppData.bind(this));

        this._settings.connect('changed', this._updateAppConfigs.bind(this));
        this._updateAppConfigs();
@@ -35,22 +36,23 @@ class WindowMover {

    _updateAppData() {
        let ids = [...this._appConfigs.keys()];
-        let removedApps = [...this._appData.keys()]
-            .filter(a => !ids.includes(a.id));
+        let removedApps = [...this._appData.keys()].filter(
+            a => !ids.includes(a.id)
+        );
        removedApps.forEach(app => {
            app.disconnect(this._appData.get(app).windowsChangedId);
            this._appData.delete(app);
        });

-        let addedApps = ids
-            .map(id => this._appSystem.lookup_app(id))
-            .filter(app => app && !this._appData.has(app));
+        let addedApps = ids.map(id => this._appSystem.lookup_app(id)).filter(
+            app => app != null && !this._appData.has(app)
+        );
        addedApps.forEach(app => {
            let data = {
                windowsChangedId: app.connect('windows-changed',
-                    this._appWindowsChanged.bind(this)),
+                                              this._appWindowsChanged.bind(this)),
                moveWindowsId: 0,
-                windows: app.get_windows(),
+                windows: app.get_windows()
            };
            this._appData.set(app, data);
        });
@@ -72,7 +74,7 @@ class WindowMover {
    }

    _moveWindow(window, workspaceNum) {
-        if (window.skip_taskbar || window.is_on_all_workspaces())
+        if (window.skip_taskbar)
            return;

        // ensure we have the required number of workspaces
@@ -93,9 +95,9 @@ class WindowMover {
        // the window still exists and is just moved to a different workspace
        // or something; assume it'll be added back immediately, so keep it
        // to avoid moving it again
-        windows.push(...data.windows.filter(w => {
-            return !windows.includes(w) && w.get_compositor_private() !== null;
-        }));
+        windows.push(...data.windows.filter(
+            w => !windows.includes(w) && w.get_compositor_private() != null
+        ));

        let workspaceNum = this._appConfigs.get(app.id);
        windows.filter(w => !data.windows.includes(w)).forEach(window => {
@@ -116,16 +118,14 @@ function myCheckWorkspaces() {
    let keepAliveWorkspaces = [];
    let foundNonEmpty = false;
    for (let i = this._workspaces.length - 1; i >= 0; i--) {
-        if (!foundNonEmpty) {
-            foundNonEmpty = this._workspaces[i].list_windows().some(
-                w => !w.is_on_all_workspaces());
-        } else if (!this._workspaces[i]._keepAliveId) {
+        if (!foundNonEmpty)
+            foundNonEmpty = this._workspaces[i].list_windows().length > 0;
+        else if (!this._workspaces[i]._keepAliveId)
            keepAliveWorkspaces.push(this._workspaces[i]);
-        }
    }

    // make sure the original method only removes empty workspaces at the end
-    keepAliveWorkspaces.forEach(ws => (ws._keepAliveId = 1));
+    keepAliveWorkspaces.forEach(ws => ws._keepAliveId = 1);
    prevCheckWorkspaces.call(this);
    keepAliveWorkspaces.forEach(ws => delete ws._keepAliveId);

--- a/extensions/auto-move-windows/prefs.js
+++ b/extensions/auto-move-windows/prefs.js
@@ -2,275 +2,282 @@
 // Start apps on custom workspaces
 /* exported init buildPrefsWidget */

-const { Gio, GLib, GObject, Gtk, Pango } = imports.gi;
+const { Gio, GObject, Gtk } = imports.gi;
+
+const Gettext = imports.gettext.domain('gnome-shell-extensions');
+const _ = Gettext.gettext;
+const N_ = e => e;

 const ExtensionUtils = imports.misc.extensionUtils;
-const Me = ExtensionUtils.getCurrentExtension();
-
-const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']);
-const _ = Gettext.gettext;

 const SETTINGS_KEY = 'application-list';

 const WORKSPACE_MAX = 36; // compiled in limit of mutter

-const AutoMoveSettingsWidget = GObject.registerClass(
-class AutoMoveSettingsWidget extends Gtk.ScrolledWindow {
-    _init() {
-        super._init({
-            hscrollbar_policy: Gtk.PolicyType.NEVER,
-        });
+const Columns = {
+    APPINFO: 0,
+    DISPLAY_NAME: 1,
+    ICON: 2,
+    WORKSPACE: 3,
+    ADJUSTMENT: 4
+};

-        const box = new Gtk.Box({
-            orientation: Gtk.Orientation.VERTICAL,
-            halign: Gtk.Align.CENTER,
-            spacing: 12,
-            margin_top: 36,
-            margin_bottom: 36,
-            margin_start: 36,
-            margin_end: 36,
-        });
-        this.set_child(box);
-
-        box.append(new Gtk.Label({
-            label: '<b>%s</b>'.format(_('Workspace Rules')),
-            use_markup: true,
-            halign: Gtk.Align.START,
-        }));
-
-        this._list = new Gtk.ListBox({
-            selection_mode: Gtk.SelectionMode.NONE,
-            valign: Gtk.Align.START,
-            show_separators: true,
-        });
-        box.append(this._list);
-
-        const context = this._list.get_style_context();
-        const cssProvider = new Gtk.CssProvider();
-        cssProvider.load_from_data(
-            'list { min-width: 30em; }');
-
-        context.add_provider(cssProvider,
-            Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
-        context.add_class('frame');
-
-        this._list.append(new NewRuleRow());
-
-        this._actionGroup = new Gio.SimpleActionGroup();
-        this._list.insert_action_group('rules', this._actionGroup);
-
-        let action;
-        action = new Gio.SimpleAction({ name: 'add' });
-        action.connect('activate', this._onAddActivated.bind(this));
-        this._actionGroup.add_action(action);
-
-        action = new Gio.SimpleAction({
-            name: 'remove',
-            parameter_type: new GLib.VariantType('s'),
-        });
-        action.connect('activate', this._onRemoveActivated.bind(this));
-        this._actionGroup.add_action(action);
-
-        action = new Gio.SimpleAction({ name: 'update' });
-        action.connect('activate', () => {
-            this._settings.set_strv(SETTINGS_KEY,
-                this._getRuleRows().map(row => `${row.id}:${row.value}`));
-        });
-        this._actionGroup.add_action(action);
-        this._updateAction = action;
+const Widget = GObject.registerClass({
+    GTypeName: 'AutoMoveWindowsPrefsWidget',
+}, class Widget extends Gtk.Grid {
+    _init(params) {
+        super._init(params);
+        this.set_orientation(Gtk.Orientation.VERTICAL);

        this._settings = ExtensionUtils.getSettings();
-        this._changedId = this._settings.connect('changed',
-            this._sync.bind(this));
-        this._sync();
+        this._settings.connect('changed', this._refresh.bind(this));
+        this._changedPermitted = false;

-        this.connect('destroy', () => this._settings.run_dispose());
+        this._store = new Gtk.ListStore();
+        this._store.set_column_types([
+            Gio.AppInfo,
+            GObject.TYPE_STRING,
+            Gio.Icon,
+            GObject.TYPE_INT,
+            Gtk.Adjustment
+        ]);
+
+        let scrolled = new Gtk.ScrolledWindow({ shadow_type: Gtk.ShadowType.IN });
+        scrolled.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
+        this.add(scrolled);
+
+
+        this._treeView = new Gtk.TreeView({
+            model: this._store,
+            hexpand: true,
+            vexpand: true
+        });
+        this._treeView.get_selection().set_mode(Gtk.SelectionMode.SINGLE);
+
+        let appColumn = new Gtk.TreeViewColumn({
+            expand: true,
+            sort_column_id: Columns.DISPLAY_NAME,
+            title: _('Application')
+        });
+        let iconRenderer = new Gtk.CellRendererPixbuf;
+        appColumn.pack_start(iconRenderer, false);
+        appColumn.add_attribute(iconRenderer, 'gicon', Columns.ICON);
+        let nameRenderer = new Gtk.CellRendererText;
+        appColumn.pack_start(nameRenderer, true);
+        appColumn.add_attribute(nameRenderer, 'text', Columns.DISPLAY_NAME);
+        this._treeView.append_column(appColumn);
+
+        let workspaceColumn = new Gtk.TreeViewColumn({
+            title: _('Workspace'),
+            sort_column_id: Columns.WORKSPACE
+        });
+        let workspaceRenderer = new Gtk.CellRendererSpin({ editable: true });
+        workspaceRenderer.connect('edited', this._workspaceEdited.bind(this));
+        workspaceColumn.pack_start(workspaceRenderer, true);
+        workspaceColumn.add_attribute(workspaceRenderer, 'adjustment', Columns.ADJUSTMENT);
+        workspaceColumn.add_attribute(workspaceRenderer, 'text', Columns.WORKSPACE);
+        this._treeView.append_column(workspaceColumn);
+
+        scrolled.add(this._treeView);
+
+        let toolbar = new Gtk.Toolbar({ icon_size: Gtk.IconSize.SMALL_TOOLBAR });
+        toolbar.get_style_context().add_class(Gtk.STYLE_CLASS_INLINE_TOOLBAR);
+        this.add(toolbar);
+
+        let newButton = new Gtk.ToolButton({
+            icon_name: 'bookmark-new-symbolic',
+            label: _('Add Rule'),
+            is_important: true
+        });
+        newButton.connect('clicked', this._createNew.bind(this));
+        toolbar.add(newButton);
+
+        let delButton = new Gtk.ToolButton({ icon_name: 'edit-delete-symbolic' });
+        delButton.connect('clicked', this._deleteSelected.bind(this));
+        toolbar.add(delButton);
+
+        let selection = this._treeView.get_selection();
+        selection.connect('changed', () => {
+            delButton.sensitive = selection.count_selected_rows() > 0;
+        });
+        delButton.sensitive = selection.count_selected_rows() > 0;
+
+        this._changedPermitted = true;
+        this._refresh();
    }

-    _onAddActivated() {
-        const dialog = new NewRuleDialog(this.get_root());
-        dialog.connect('response', (dlg, id) => {
-            const appInfo = id === Gtk.ResponseType.OK
-                ? dialog.get_widget().get_app_info() : null;
-            if (appInfo) {
-                this._settings.set_strv(SETTINGS_KEY, [
-                    ...this._settings.get_strv(SETTINGS_KEY),
-                    `${appInfo.get_id()}:1`,
-                ]);
+    _createNew() {
+        let dialog = new Gtk.Dialog({
+            title: _('Create new matching rule'),
+            transient_for: this.get_toplevel(),
+            use_header_bar: true,
+            modal: true
+        });
+        dialog.add_button(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL);
+        let addButton = dialog.add_button(_('Add'), Gtk.ResponseType.OK);
+        dialog.set_default_response(Gtk.ResponseType.OK);
+
+        let grid = new Gtk.Grid({
+            column_spacing: 10,
+            row_spacing: 15,
+            margin: 10
+        });
+        dialog._appChooser = new Gtk.AppChooserWidget({ show_all: true });
+        dialog._appChooser.connect('application-selected', (w, appInfo) => {
+            addButton.sensitive = appInfo && this._checkId(appInfo.get_id());
+        });
+        let appInfo = dialog._appChooser.get_app_info();
+        addButton.sensitive = appInfo && this._checkId(appInfo.get_id());
+
+        grid.attach(dialog._appChooser, 0, 0, 2, 1);
+        grid.attach(new Gtk.Label({
+            label: _('Workspace'),
+            halign: Gtk.Align.END
+        }), 0, 1, 1, 1);
+        let adjustment = new Gtk.Adjustment({
+            lower: 1,
+            upper: WORKSPACE_MAX,
+            step_increment: 1
+        });
+        dialog._spin = new Gtk.SpinButton({
+            adjustment: adjustment,
+            snap_to_ticks: true
+        });
+        dialog._spin.set_value(1);
+        grid.attach(dialog._spin, 1, 1, 1, 1);
+        dialog.get_content_area().add(grid);
+
+        dialog.connect('response', (dialog, id) => {
+            if (id != Gtk.ResponseType.OK) {
+                dialog.destroy();
+                return;
            }
+
+            let appInfo = dialog._appChooser.get_app_info();
+            if (!appInfo)
+                return;
+            let index = Math.floor(dialog._spin.value);
+            if (isNaN(index) || index < 0)
+                index = 1;
+
+            this._changedPermitted = false;
+            this._appendItem(appInfo.get_id(), index);
+            this._changedPermitted = true;
+
+            this._appendRow(appInfo, index);
+
            dialog.destroy();
        });
-        dialog.show();
+        dialog.show_all();
    }

-    _onRemoveActivated(action, param) {
-        const removed = param.deepUnpack();
-        this._settings.set_strv(SETTINGS_KEY,
-            this._settings.get_strv(SETTINGS_KEY).filter(entry => {
-                const [id] = entry.split(':');
-                return id !== removed;
-            }));
+    _deleteSelected() {
+        let [any, model_, iter] = this._treeView.get_selection().get_selected();
+
+        if (any) {
+            let appInfo = this._store.get_value(iter, Columns.APPINFO);
+
+            this._changedPermitted = false;
+            this._removeItem(appInfo.get_id());
+            this._changedPermitted = true;
+            this._store.remove(iter);
+        }
    }

-    _getRuleRows() {
-        return [...this._list].filter(row => !!row.id);
+    _workspaceEdited(renderer, pathString, text) {
+        let index = parseInt(text);
+        if (isNaN(index) || index < 0)
+            index = 1;
+        let path = Gtk.TreePath.new_from_string(pathString);
+        let [model_, iter] = this._store.get_iter(path);
+        let appInfo = this._store.get_value(iter, Columns.APPINFO);
+
+        this._changedPermitted = false;
+        this._changeItem(appInfo.get_id(), index);
+        this._store.set_value(iter, Columns.WORKSPACE, index);
+        this._changedPermitted = true;
    }

-    _sync() {
-        const oldRules = this._getRuleRows();
-        const newRules = this._settings.get_strv(SETTINGS_KEY).map(entry => {
-            const [id, value] = entry.split(':');
-            return { id, value };
+    _refresh() {
+        if (!this._changedPermitted)
+            // Ignore this notification, model is being modified outside
+            return;
+
+        this._store.clear();
+
+        let currentItems = this._settings.get_strv(SETTINGS_KEY);
+        let validItems = [];
+        for (let i = 0; i < currentItems.length; i++) {
+            let [id, index] = currentItems[i].split(':');
+            let appInfo = Gio.DesktopAppInfo.new(id);
+            if (!appInfo)
+                continue;
+            validItems.push(currentItems[i]);
+
+            this._appendRow(appInfo, parseInt(index));
+        }
+
+        if (validItems.length != currentItems.length) // some items were filtered out
+            this._settings.set_strv(SETTINGS_KEY, validItems);
+    }
+
+    _appendRow(appInfo, workspace) {
+        let iter = this._store.append();
+        let icon = appInfo.get_icon();
+        let displayName = appInfo.get_display_name();
+        let adj = new Gtk.Adjustment({
+            lower: 1,
+            upper: WORKSPACE_MAX,
+            step_increment: 1,
+            value: workspace
        });
+        let { APPINFO, ICON, DISPLAY_NAME, WORKSPACE, ADJUSTMENT } = Columns;
+        this._store.set(iter,
+                        [APPINFO, ICON, DISPLAY_NAME, WORKSPACE, ADJUSTMENT],
+                        [appInfo, icon, displayName, workspace, adj]);
+    }

-        this._settings.block_signal_handler(this._changedId);
-        this._updateAction.enabled = false;
+    _checkId(id) {
+        let items = this._settings.get_strv(SETTINGS_KEY);
+        return !items.some(i => i.startsWith(`${id}:`));
+    }

-        newRules.forEach(({ id, value }, index) => {
-            const row = oldRules.find(r => r.id === id);
-            const appInfo = row
-                ? null : Gio.DesktopAppInfo.new(id);
+    _appendItem(id, workspace) {
+        let currentItems = this._settings.get_strv(SETTINGS_KEY);
+        currentItems.push(`${id}:${workspace}`);
+        this._settings.set_strv(SETTINGS_KEY, currentItems);
+    }

-            if (row)
-                row.set({ value });
-            else if (appInfo)
-                this._list.insert(new RuleRow(appInfo, value), index);
-        });
+    _removeItem(id) {
+        let currentItems = this._settings.get_strv(SETTINGS_KEY);
+        let index = currentItems.map(el => el.split(':')[0]).indexOf(id);

-        const removed = oldRules.filter(
-            ({ id }) => !newRules.find(r => r.id === id));
-        removed.forEach(r => this._list.remove(r));
+        if (index < 0)
+            return;
+        currentItems.splice(index, 1);
+        this._settings.set_strv(SETTINGS_KEY, currentItems);
+    }

-        this._settings.unblock_signal_handler(this._changedId);
-        this._updateAction.enabled = true;
+    _changeItem(id, workspace) {
+        let currentItems = this._settings.get_strv(SETTINGS_KEY);
+        let index = currentItems.map(el => el.split(':')[0]).indexOf(id);
+
+        if (index < 0)
+            currentItems.push(`${id}:${workspace}`);
+        else
+            currentItems[index] = `${id}:${workspace}`;
+        this._settings.set_strv(SETTINGS_KEY, currentItems);
    }
 });

-const RuleRow = GObject.registerClass({
-    Properties: {
-        'id': GObject.ParamSpec.string(
-            'id', 'id', 'id',
-            GObject.ParamFlags.READABLE,
-            ''),
-        'value': GObject.ParamSpec.uint(
-            'value', 'value', 'value',
-            GObject.ParamFlags.READWRITE,
-            1, WORKSPACE_MAX, 1),
-    },
-}, class RuleRow extends Gtk.ListBoxRow {
-    _init(appInfo, value) {
-        const box = new Gtk.Box({
-            spacing: 6,
-            margin_top: 6,
-            margin_bottom: 6,
-            margin_start: 6,
-            margin_end: 6,
-        });
-
-        super._init({
-            activatable: false,
-            value,
-            child: box,
-        });
-        this._appInfo = appInfo;
-
-        const icon = new Gtk.Image({
-            gicon: appInfo.get_icon(),
-            pixel_size: 32,
-        });
-        icon.get_style_context().add_class('icon-dropshadow');
-        box.append(icon);
-
-        const label = new Gtk.Label({
-            label: appInfo.get_display_name(),
-            halign: Gtk.Align.START,
-            hexpand: true,
-            max_width_chars: 20,
-            ellipsize: Pango.EllipsizeMode.END,
-        });
-        box.append(label);
-
-        const spinButton = new Gtk.SpinButton({
-            adjustment: new Gtk.Adjustment({
-                lower: 1,
-                upper: WORKSPACE_MAX,
-                step_increment: 1,
-            }),
-            snap_to_ticks: true,
-            margin_end: 6,
-        });
-        this.bind_property('value',
-            spinButton, 'value',
-            GObject.BindingFlags.SYNC_CREATE | GObject.BindingFlags.BIDIRECTIONAL);
-        box.append(spinButton);
-
-        const button = new Gtk.Button({
-            action_name: 'rules.remove',
-            action_target: new GLib.Variant('s', this.id),
-            icon_name: 'edit-delete-symbolic',
-        });
-        box.append(button);
-
-        this.connect('notify::value',
-            () => this.activate_action('rules.update', null));
-    }
-
-    get id() {
-        return this._appInfo.get_id();
-    }
-});
-
-const NewRuleRow = GObject.registerClass(
-class NewRuleRow extends Gtk.ListBoxRow {
-    _init() {
-        super._init({
-            action_name: 'rules.add',
-            child: new Gtk.Image({
-                icon_name: 'list-add-symbolic',
-                pixel_size: 16,
-                margin_top: 12,
-                margin_bottom: 12,
-                margin_start: 12,
-                margin_end: 12,
-            }),
-        });
-        this.update_property(
-            [Gtk.AccessibleProperty.LABEL], [_('Add Rule')]);
-    }
-});
-
-const NewRuleDialog = GObject.registerClass(
-class NewRuleDialog extends Gtk.AppChooserDialog {
-    _init(parent) {
-        super._init({
-            transient_for: parent,
-            modal: true,
-        });
-
-        this._settings = ExtensionUtils.getSettings();
-
-        this.get_widget().set({
-            show_all: true,
-            show_other: true, // hide more button
-        });
-
-        this.get_widget().connect('application-selected',
-            this._updateSensitivity.bind(this));
-        this._updateSensitivity();
-    }
-
-    _updateSensitivity() {
-        const rules = this._settings.get_strv(SETTINGS_KEY);
-        const appInfo = this.get_widget().get_app_info();
-        this.set_response_sensitive(Gtk.ResponseType.OK,
-            appInfo && !rules.some(i => i.startsWith(appInfo.get_id())));
-    }
-});

 function init() {
    ExtensionUtils.initTranslations();
 }

 function buildPrefsWidget() {
-    return new AutoMoveSettingsWidget();
+    let widget = new Widget({ margin: 12 });
+    widget.show_all();
+
+    return widget;
 }
--- a/extensions/drive-menu/extension.js
+++ b/extensions/drive-menu/extension.js
@@ -1,54 +1,40 @@
 /* exported init enable disable */
 // Drive menu extension
-const { Clutter, Gio, GObject, Shell, St } = imports.gi;
+const { Gio, GObject, Shell, St } = imports.gi;
+
+const Gettext = imports.gettext.domain('gnome-shell-extensions');
+const _ = Gettext.gettext;

-const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 const ShellMountOperation = imports.ui.shellMountOperation;

-const Me = ExtensionUtils.getCurrentExtension();
-const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']);
-const _ = Gettext.gettext;
+const ExtensionUtils = imports.misc.extensionUtils;

-var MountMenuItem = GObject.registerClass(
 class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
-    _init(mount) {
-        super._init({
-            style_class: 'drive-menu-item',
-        });
+    constructor(mount) {
+        super();

-        this.label = new St.Label({
-            text: mount.get_name(),
-            x_expand: true,
-            y_align: Clutter.ActorAlign.CENTER,
-        });
-        this.add_child(this.label);
-        this.label_actor = this.label;
+        this.label = new St.Label({ text: mount.get_name() });
+        this.actor.add(this.label, { expand: true });
+        this.actor.label_actor = this.label;

        this.mount = mount;

-        this.connect('destroy', this._onDestroy.bind(this));
-
        let ejectIcon = new St.Icon({
            icon_name: 'media-eject-symbolic',
-            style_class: 'popup-menu-icon',
-        });
-        let ejectButton = new St.Button({
-            child: ejectIcon,
-            style_class: 'button',
+            style_class: 'popup-menu-icon'
        });
+        let ejectButton = new St.Button({ child: ejectIcon });
        ejectButton.connect('clicked', this._eject.bind(this));
-        this.add(ejectButton);
-
-        this.hide();
+        this.actor.add(ejectButton);

        this._changedId = mount.connect('changed', this._syncVisibility.bind(this));
        this._syncVisibility();
    }

-    _onDestroy() {
+    destroy() {
        if (this._changedId) {
            this.mount.disconnect(this._changedId);
            this._changedId = 0;
@@ -57,21 +43,7 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
        super.destroy();
    }

-    _fsIsRemote(root) {
-        return new Promise((resolve, reject) => {
-            const attr = Gio.FILE_ATTRIBUTE_FILESYSTEM_REMOTE;
-            root.query_filesystem_info_async(attr, null, (o, res) => {
-                try {
-                    const info = root.query_filesystem_info_finish(res);
-                    resolve(!info.get_attribute_boolean(attr));
-                } catch (e) {
-                    reject(e);
-                }
-            });
-        });
-    }
-
-    async _isInteresting() {
+    _isInteresting() {
        if (!this.mount.can_eject() && !this.mount.can_unmount())
            return false;
        if (this.mount.is_shadowed())
@@ -79,39 +51,32 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {

        let volume = this.mount.get_volume();

-        if (volume)
-            return volume.get_identifier('class') !== 'network';
-
-        const root = this.mount.get_root();
-
-        try {
-            return await this._fsIsRemote(root);
-        } catch (e) {
-            log(`Failed to query filesystem: ${e.message}`);
+        if (volume == null) {
+            // probably a GDaemonMount, could be network or
+            // local, but we can't tell; assume it's local for now
+            return true;
        }

-        // Hack, fall back to looking at GType
-        return Gio._LocalFilePrototype.isPrototypeOf(root);
+        return volume.get_identifier('class') != 'network';
    }

-    async _syncVisibility() {
-        this.visible = await this._isInteresting();
+    _syncVisibility() {
+        this.actor.visible = this._isInteresting();
    }

    _eject() {
        let unmountArgs = [
            Gio.MountUnmountFlags.NONE,
-            new ShellMountOperation.ShellMountOperation(this.mount).mountOp,
-            null, // Gio.Cancellable
+            (new ShellMountOperation.ShellMountOperation(this.mount)).mountOp,
+            null // Gio.Cancellable
        ];

-        if (this.mount.can_eject()) {
+        if (this.mount.can_eject())
            this.mount.eject_with_operation(...unmountArgs,
-                this._ejectFinish.bind(this));
-        } else {
+                                            this._ejectFinish.bind(this));
+        else
            this.mount.unmount_with_operation(...unmountArgs,
-                this._unmountFinish.bind(this));
-        }
+                                              this._unmountFinish.bind(this));
    }

    _unmountFinish(mount, result) {
@@ -137,29 +102,34 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
    }

    activate(event) {
-        let uri = this.mount.get_root().get_uri();
        let context = global.create_app_launch_context(event.get_time(), -1);
-        Gio.AppInfo.launch_default_for_uri(uri, context);
+        Gio.AppInfo.launch_default_for_uri(this.mount.get_root().get_uri(),
+                                           context);

        super.activate(event);
    }
-});
+}

 let DriveMenu = GObject.registerClass(
 class DriveMenu extends PanelMenu.Button {
    _init() {
        super._init(0.0, _('Removable devices'));

+        let hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
        let icon = new St.Icon({
            icon_name: 'media-eject-symbolic',
-            style_class: 'system-status-icon',
+            style_class: 'system-status-icon'
        });

-        this.add_child(icon);
+        hbox.add_child(icon);
+        hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
+        this.add_child(hbox);

        this._monitor = Gio.VolumeMonitor.get();
-        this._addedId = this._monitor.connect('mount-added',
-            (monitor, mount) => this._addMount(mount));
+        this._addedId = this._monitor.connect('mount-added', (monitor, mount) => {
+            this._addMount(mount);
+            this._updateMenuVisibility();
+        });
        this._removedId = this._monitor.connect('mount-removed', (monitor, mount) => {
            this._removeMount(mount);
            this._updateMenuVisibility();
@@ -180,7 +150,7 @@ class DriveMenu extends PanelMenu.Button {
    }

    _updateMenuVisibility() {
-        if (this._mounts.filter(i => i.visible).length > 0)
+        if (this._mounts.filter(i => i.actor.visible).length > 0)
            this.show();
        else
            this.hide();
@@ -190,20 +160,18 @@ class DriveMenu extends PanelMenu.Button {
        let item = new MountMenuItem(mount);
        this._mounts.unshift(item);
        this.menu.addMenuItem(item, 0);
-
-        item.connect('notify::visible', () => this._updateMenuVisibility());
    }

    _removeMount(mount) {
        for (let i = 0; i < this._mounts.length; i++) {
            let item = this._mounts[i];
-            if (item.mount === mount) {
+            if (item.mount == mount) {
                item.destroy();
                this._mounts.splice(i, 1);
                return;
            }
        }
-        log('Removing a mount that was never added to the menu');
+        log ('Removing a mount that was never added to the menu');
    }

    _onDestroy() {
@@ -225,7 +193,7 @@ function init() {
 let _indicator;

 function enable() {
-    _indicator = new DriveMenu();
+    _indicator = new DriveMenu;
    Main.panel.addToStatusArea('drive-menu', _indicator);
 }

--- a/extensions/drive-menu/stylesheet.css
+++ b/extensions/drive-menu/stylesheet.css
@@ -1,7 +1 @@
-.drive-menu-item { spacing: 12px; }
-
-.drive-menu-item .button {
-  border-radius: 99px;
-  padding: 3px;
-  min-height: auto;
-}
+/* This extensions requires no custom styling */
--- a/extensions/launch-new-instance/extension.js
+++ b/extensions/launch-new-instance/extension.js
@@ -5,7 +5,7 @@ let _activateOriginal = null;

 function enable() {
    _activateOriginal = AppDisplay.AppIcon.prototype.activate;
-    AppDisplay.AppIcon.prototype.activate = function () {
+    AppDisplay.AppIcon.prototype.activate = function() {
        _activateOriginal.call(this, 2);
    };
 }
--- a/extensions/meson.build
+++ b/extensions/meson.build
@@ -3,7 +3,7 @@ js_sources = []

 metadata_name = 'metadata.json'

-foreach e : enabled_extensions
+foreach e : all_extensions
  uuid = e + uuid_suffix

  metadata_conf = configuration_data()
@@ -19,11 +19,27 @@ foreach e : enabled_extensions

  subdir(e)

-  install_data (extension_sources + extension_data,
-    install_dir: join_paths(extensiondir, uuid)
-  )
+  js_sources += extension_sources
+
+  if (enabled_extensions.contains(e))
+    install_data (extension_sources + extension_data,
+      install_dir: join_paths(extensiondir, uuid)
+    )
+  endif
 endforeach

 install_data (extension_schemas,
  install_dir: schemadir
 )
+
+foreach js_source : js_sources
+  if (js60.found())
+    path_array = '@0@'.format(js_source).split('/')
+    name = join_paths(path_array[-2], path_array[-1])
+
+    test('Checking syntax of ' + name, js60,
+      args: ['-s', '-c', js_source],
+      workdir: meson.current_source_dir()
+    )
+  endif
+endforeach
--- a/extensions/native-window-placement/extension.js
+++ b/extensions/native-window-placement/extension.js
@@ -1,11 +1,8 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
 /* exported enable disable */
-const { Clutter } = imports.gi;
+const Workspace = imports.ui.workspace;

 const ExtensionUtils = imports.misc.extensionUtils;
-const Main = imports.ui.main;
-const { WindowPreview } = imports.ui.windowPreview;
-const Workspace = imports.ui.workspace;

 // testing settings for natural window placement strategy:
 const WINDOW_PLACEMENT_NATURAL_ACCURACY = 20;                       // accuracy of window translate moves  (KDE-default: 20)
@@ -17,7 +14,9 @@ class Rect {
        [this.x, this.y, this.width, this.height] = [x, y, width, height];
    }

-    // used in _calculateWindowTransformationsNatural to replace Meta.Rectangle that is too slow.
+    /**
+     * used in _calculateWindowTransformationsNatural to replace Meta.Rectangle that is too slow.
+     */
    copy() {
        return new Rect(this.x, this.y, this.width, this.height);
    }
@@ -50,10 +49,10 @@ class Rect {
    }

    overlap(rect2) {
-        return !(this.x + this.width    <= rect2.x ||
-                 rect2.x + rect2.width  <= this.x ||
-                 this.y + this.height   <= rect2.y ||
-                 rect2.y + rect2.height <= this.y);
+        return !((this.x + this.width    <= rect2.x) ||
+                 (rect2.x + rect2.width  <= this.x) ||
+                 (this.y + this.height   <= rect2.y) ||
+                 (rect2.y + rect2.height <= this.y));
    }

    center() {
@@ -67,18 +66,16 @@ class Rect {
 }

 class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
-    constructor(params, settings) {
-        super(params);
+    constructor(settings) {
+        super();
        this._settings = settings;
    }

-    computeLayout(windows, _params) {
-        return {
-            windows,
-        };
+    computeLayout(windows, layout) {
+        layout.windows = windows;
    }

-    /*
+    /**
     * Returns clones with matching target coordinates and scales to arrange windows in a natural way that no overlap exists and relative window size is preserved.
     * This function is almost a 1:1 copy of the function
     * PresentWindowsEffect::calculateWindowTransformationsNatural() from KDE, see:
@@ -104,8 +101,9 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
            // This is used when the window is on the edge of the screen to try to use as much screen real estate as possible.
            directions[i] = direction;
            direction++;
-            if (direction === 4)
+            if (direction == 4) {
                direction = 0;
+            }
        }

        let loopCounter = 0;
@@ -115,10 +113,10 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
            for (let i = 0; i < rects.length; i++) {
                for (let j = 0; j < rects.length; j++) {
                    let adjustments = [-1, -1, 1, 1]
-                        .map(v => (v *= WINDOW_PLACEMENT_NATURAL_GAPS));
+                        .map(v => v *= WINDOW_PLACEMENT_NATURAL_GAPS);
                    let iAdjusted = rects[i].adjusted(...adjustments);
                    let jAdjusted = rects[j].adjusted(...adjustments);
-                    if (i !== j && iAdjusted.overlap(jAdjusted)) {
+                    if (i != j && iAdjusted.overlap(jAdjusted)) {
                        loopCounter++;
                        overlap = true;

@@ -130,10 +128,10 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
                        let diff = [jCenter[0] - iCenter[0], jCenter[1] - iCenter[1]];

                        // Prevent dividing by zero and non-movement
-                        if (diff[0] === 0 && diff[1] === 0)
+                        if (diff[0] == 0 && diff[1] == 0)
                            diff[0] = 1;
                        // Try to keep screen/workspace aspect ratio
-                        if (bounds.height / bounds.width > areaRect.height / areaRect.width)
+                        if ( bounds.height / bounds.width > areaRect.height / areaRect.width )
                            diff[0] *= 2;
                        else
                            diff[1] *= 2;
@@ -162,33 +160,33 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
                            let xSection = Math.round((rects[i].x - bounds.x) / (bounds.width / 3));
                            let ySection = Math.round((rects[i].y - bounds.y) / (bounds.height / 3));

-                            iCenter = rects[i].center();
+                            let iCenter = rects[i].center();
                            diff[0] = 0;
                            diff[1] = 0;
-                            if (xSection !== 1 || ySection !== 1) { // Remove this if you want the center to pull as well
-                                if (xSection === 1)
-                                    xSection = directions[i] / 2 ? 2 : 0;
-                                if (ySection === 1)
-                                    ySection = directions[i] % 2 ? 2 : 0;
+                            if (xSection != 1 || ySection != 1) { // Remove this if you want the center to pull as well
+                                if (xSection == 1)
+                                    xSection = (directions[i] / 2 ? 2 : 0);
+                                if (ySection == 1)
+                                    ySection = (directions[i] % 2 ? 2 : 0);
                            }
-                            if (xSection === 0 && ySection === 0) {
+                            if (xSection == 0 && ySection == 0) {
                                diff[0] = bounds.x - iCenter[0];
                                diff[1] = bounds.y - iCenter[1];
                            }
-                            if (xSection === 2 && ySection === 0) {
+                            if (xSection == 2 && ySection == 0) {
                                diff[0] = bounds.x + bounds.width - iCenter[0];
                                diff[1] = bounds.y - iCenter[1];
                            }
-                            if (xSection === 2 && ySection === 2) {
+                            if (xSection == 2 && ySection == 2) {
                                diff[0] = bounds.x + bounds.width - iCenter[0];
                                diff[1] = bounds.y + bounds.height - iCenter[1];
                            }
-                            if (xSection === 0 && ySection === 2) {
+                            if (xSection == 0 && ySection == 2) {
                                diff[0] = bounds.x - iCenter[0];
                                diff[1] = bounds.y + bounds.height - iCenter[1];
                            }
-                            if (diff[0] !== 0 || diff[1] !== 0) {
-                                length = Math.sqrt(diff[0] * diff[0] + diff[1] * diff[1]);
+                            if (diff[0] != 0 || diff[1] != 0) {
+                                let length = Math.sqrt(diff[0] * diff[0] + diff[1] * diff[1]);
                                diff[0] *= WINDOW_PLACEMENT_NATURAL_ACCURACY / length / 2;   // /2 to make it less influencing than the normal center-move above
                                diff[1] *= WINDOW_PLACEMENT_NATURAL_ACCURACY / length / 2;
                                rects[i].translate(diff[0], diff[1]);
@@ -205,31 +203,28 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {

        // Work out scaling by getting the most top-left and most bottom-right window coords.
        let scale;
-        scale = Math.min(
-            areaRect.width / bounds.width,
-            areaRect.height / bounds.height,
-            1.0);
+        scale = Math.min(areaRect.width / bounds.width,
+                         areaRect.height / bounds.height,
+                         1.0);

        // Make bounding rect fill the screen size for later steps
-        bounds.x -= (areaRect.width - bounds.width * scale) / 2;
-        bounds.y -= (areaRect.height - bounds.height * scale) / 2;
+        bounds.x = bounds.x - (areaRect.width - bounds.width * scale) / 2;
+        bounds.y = bounds.y - (areaRect.height - bounds.height * scale) / 2;
        bounds.width = areaRect.width / scale;
        bounds.height = areaRect.height / scale;

        // Move all windows back onto the screen and set their scale
-        for (let i = 0; i < rects.length; i++)
+        for (let i = 0; i < rects.length; i++) {
            rects[i].translate(-bounds.x, -bounds.y);
-
+        }

        // rescale to workspace
        let slots = [];
        for (let i = 0; i < rects.length; i++) {
            rects[i].x = rects[i].x * scale + areaRect.x;
            rects[i].y = rects[i].y * scale + areaRect.y;
-            rects[i].width *= scale;
-            rects[i].height *= scale;

-            slots.push([rects[i].x, rects[i].y, rects[i].width, rects[i].height, clones[i]]);
+            slots.push([rects[i].x, rects[i].y, scale, clones[i]]);
        }

        return slots;
@@ -248,37 +243,24 @@ function enable() {

    let settings = ExtensionUtils.getSettings();

-    workspaceInjections['_createBestLayout'] = Workspace.WorkspaceLayout.prototype._createBestLayout;
-    Workspace.WorkspaceLayout.prototype._createBestLayout = function (_area) {
-        this._layoutStrategy = new NaturalLayoutStrategy({
-            monitor: Main.layoutManager.monitors[this._monitorIndex],
-        }, settings);
-        return this._layoutStrategy.computeLayout(this._sortedWindows);
+    workspaceInjections['_getBestLayout'] = Workspace.Workspace.prototype._getBestLayout;
+    Workspace.Workspace.prototype._getBestLayout = function(windows) {
+        let strategy = new NaturalLayoutStrategy(settings);
+        let layout = { strategy };
+        strategy.computeLayout(windows, layout);
+
+        return layout;
    };

-    // position window titles on top of windows in overlay
-    winInjections['_init'] = WindowPreview.prototype._init;
-    WindowPreview.prototype._init = function (...args) {
-        winInjections['_init'].call(this, ...args);
+    /// position window titles on top of windows in overlay ////
+    winInjections['relayout'] = Workspace.WindowOverlay.prototype.relayout;
+    Workspace.WindowOverlay.prototype.relayout = function(animate) {
+        if (settings.get_boolean('window-captions-on-top')) {
+            let [, , , cloneHeight] = this._windowClone.slot;
+            this.title.translation_y = -cloneHeight;
+        }

-        if (!settings.get_boolean('window-captions-on-top'))
-            return;
-
-        const alignConstraint = this._title.get_constraints().find(
-            c => c.align_axis && c.align_axis === Clutter.AlignAxis.Y_AXIS);
-        alignConstraint.factor = 0;
-
-        const bindConstraint = this._title.get_constraints().find(
-            c => c.coordinate && c.coordinate === Clutter.BindCoordinate.Y);
-        bindConstraint.offset = 0;
-    };
-    winInjections['_adjustOverlayOffsets'] =
-        WindowPreview.prototype._adjustOverlayOffsets;
-    WindowPreview.prototype._adjustOverlayOffsets = function (...args) {
-        winInjections['_adjustOverlayOffsets'].call(this, ...args);
-
-        if (settings.get_boolean('window-captions-on-top'))
-            this._title.translation_y = -this._title.translation_y;
+        winInjections['relayout'].call(this, animate);
    };
 }

@@ -293,9 +275,9 @@ function disable() {
    var i;

    for (i in workspaceInjections)
-        removeInjection(Workspace.WorkspaceLayout.prototype, workspaceInjections, i);
+        removeInjection(Workspace.Workspace.prototype, workspaceInjections, i);
    for (i in winInjections)
-        removeInjection(WindowPreview.prototype, winInjections, i);
+        removeInjection(Workspace.WindowOverlay.prototype, winInjections, i);

    global.stage.queue_relayout();
    resetState();
--- a/extensions/places-menu/extension.js
+++ b/extensions/places-menu/extension.js
@@ -3,57 +3,46 @@

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

-const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;

-const Me = ExtensionUtils.getCurrentExtension();
-
-const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']);
+const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
 const N_ = x => x;

+const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
 const PlaceDisplay = Me.imports.placeDisplay;

 const PLACE_ICON_SIZE = 16;

-var PlaceMenuItem = GObject.registerClass(
 class PlaceMenuItem extends PopupMenu.PopupBaseMenuItem {
-    _init(info) {
-        super._init({
-            style_class: 'place-menu-item',
-        });
+    constructor(info) {
+        super();
        this._info = info;

        this._icon = new St.Icon({
            gicon: info.icon,
-            icon_size: PLACE_ICON_SIZE,
+            icon_size: PLACE_ICON_SIZE
        });
-        this.add_child(this._icon);
+        this.actor.add_child(this._icon);

-        this._label = new St.Label({
-            text: info.name,
-            x_expand: true,
-            y_align: Clutter.ActorAlign.CENTER,
-        });
-        this.add_child(this._label);
+        this._label = new St.Label({ text: info.name, x_expand: true });
+        this.actor.add_child(this._label);

        if (info.isRemovable()) {
            this._ejectIcon = new St.Icon({
                icon_name: 'media-eject-symbolic',
-                style_class: 'popup-menu-icon',
-            });
-            this._ejectButton = new St.Button({
-                child: this._ejectIcon,
-                style_class: 'button',
+                style_class: 'popup-menu-icon'
            });
+            this._ejectButton = new St.Button({ child: this._ejectIcon });
            this._ejectButton.connect('clicked', info.eject.bind(info));
-            this.add_child(this._ejectButton);
+            this.actor.add_child(this._ejectButton);
        }

        this._changedId = info.connect('changed',
-            this._propertiesChanged.bind(this));
+                                       this._propertiesChanged.bind(this));
    }

    destroy() {
@@ -75,13 +64,13 @@ class PlaceMenuItem extends PopupMenu.PopupBaseMenuItem {
        this._icon.gicon = info.icon;
        this._label.text = info.name;
    }
-});
+}

 const SECTIONS = [
    'special',
    'devices',
    'bookmarks',
-    'network',
+    'network'
 ];

 let PlacesMenu = GObject.registerClass(
@@ -89,12 +78,15 @@ class PlacesMenu extends PanelMenu.Button {
    _init() {
        super._init(0.0, _('Places'));

+        let hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
        let label = new St.Label({
            text: _('Places'),
            y_expand: true,
-            y_align: Clutter.ActorAlign.CENTER,
+            y_align: Clutter.ActorAlign.CENTER
        });
-        this.add_actor(label);
+        hbox.add_child(label);
+        hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
+        this.add_actor(hbox);

        this.placesManager = new PlaceDisplay.PlacesManager();

@@ -141,11 +133,11 @@ function init() {
 let _indicator;

 function enable() {
-    _indicator = new PlacesMenu();
+    _indicator = new PlacesMenu;

-    let pos = Main.sessionMode.panel.left.indexOf('appMenu');
+    let pos = 1;
    if ('apps-menu' in Main.panel.statusArea)
-        pos++;
+        pos = 2;
    Main.panel.addToStatusArea('places-menu', _indicator, pos, 'left');
 }

--- a/extensions/places-menu/placeDisplay.js
+++ b/extensions/places-menu/placeDisplay.js
@@ -3,13 +3,10 @@
 const { Gio, GLib, Shell } = imports.gi;
 const Signals = imports.signals;

-const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;
 const ShellMountOperation = imports.ui.shellMountOperation;

-const Me = ExtensionUtils.getCurrentExtension();
-
-const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']);
+const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
 const N_ = x => x;

@@ -23,8 +20,8 @@ const Hostname1Iface = '<node> \
 const Hostname1 = Gio.DBusProxy.makeProxyWrapper(Hostname1Iface);

 class PlaceInfo {
-    constructor(...params) {
-        this._init(...params);
+    constructor() {
+        this._init.apply(this, arguments);
    }

    _init(kind, file, name, icon) {
@@ -44,14 +41,14 @@ class PlaceInfo {
    async _ensureMountAndLaunch(context, tryMount) {
        try {
            await this._launchDefaultForUri(this.file.get_uri(), context, null);
-        } catch (err) {
-            if (!err.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_MOUNTED)) {
-                Main.notifyError(_('Failed to launch “%s”').format(this.name), err.message);
+        } catch (e) {
+            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_MOUNTED)) {
+                Main.notifyError(_('Failed to launch “%s”').format(this.name), e.message);
                return;
            }

            let source = {
-                get_icon: () => this.icon,
+                get_icon: () => this.icon
            };
            let op = new ShellMountOperation.ShellMountOperation(source);
            try {
@@ -74,21 +71,18 @@ class PlaceInfo {
    }

    getIcon() {
-        this.file.query_info_async('standard::symbolic-icon',
-            Gio.FileQueryInfoFlags.NONE,
-            0,
-            null,
-            (file, result) => {
-                try {
-                    let info = file.query_info_finish(result);
-                    this.icon = info.get_symbolic_icon();
-                    this.emit('changed');
-                } catch (e) {
-                    if (e instanceof Gio.IOErrorEnum)
-                        return;
-                    throw e;
-                }
-            });
+        this.file.query_info_async('standard::symbolic-icon', 0, 0, null,
+                                   (file, result) => {
+                                       try {
+                                           let info = file.query_info_finish(result);
+                                           this.icon = info.get_symbolic_icon();
+                                           this.emit('changed');
+                                       } catch (e) {
+                                           if (e instanceof Gio.IOErrorEnum)
+                                               return;
+                                           throw e;
+                                       }
+                                   });

        // return a generic icon for this kind for now, until we have the
        // icon from the query info above
@@ -158,7 +152,7 @@ class RootInfo extends PlaceInfo {

            this._proxy = obj;
            this._proxy.connect('g-properties-changed',
-                this._propertiesChanged.bind(this));
+                                this._propertiesChanged.bind(this));
            this._propertiesChanged(obj);
        });
    }
@@ -197,23 +191,22 @@ class PlaceDeviceInfo extends PlaceInfo {
    }

    isRemovable() {
-        return this._mount.can_eject() || this._mount.can_unmount();
+        return this._mount.can_eject();
    }

    eject() {
        let unmountArgs = [
            Gio.MountUnmountFlags.NONE,
-            new ShellMountOperation.ShellMountOperation(this._mount).mountOp,
-            null, // Gio.Cancellable
+            (new ShellMountOperation.ShellMountOperation(this._mount)).mountOp,
+            null // Gio.Cancellable
        ];

-        if (this._mount.can_eject()) {
+        if (this._mount.can_eject())
            this._mount.eject_with_operation(...unmountArgs,
-                this._ejectFinish.bind(this));
-        } else {
+                                             this._ejectFinish.bind(this));
+        else
            this._mount.unmount_with_operation(...unmountArgs,
-                this._unmountFinish.bind(this));
-        }
+                                               this._unmountFinish.bind(this));
    }

    _ejectFinish(mount, result) {
@@ -282,8 +275,9 @@ var PlacesManager = class {
        };

        this._settings = new Gio.Settings({ schema_id: BACKGROUND_SCHEMA });
-        this._showDesktopIconsChangedId = this._settings.connect(
-            'changed::show-desktop-icons', this._updateSpecials.bind(this));
+        this._showDesktopIconsChangedId =
+            this._settings.connect('changed::show-desktop-icons',
+                                   this._updateSpecials.bind(this));
        this._updateSpecials();

        /*
@@ -325,7 +319,7 @@ var PlacesManager = class {
            'mount-changed',
            'drive-connected',
            'drive-disconnected',
-            'drive-changed',
+            'drive-changed'
        ];

        this._volumeMonitorSignals = [];
@@ -356,10 +350,9 @@ var PlacesManager = class {

        let homePath = GLib.get_home_dir();

-        this._places.special.push(new PlaceInfo(
-            'special',
-            Gio.File.new_for_path(homePath),
-            _('Home')));
+        this._places.special.push(new PlaceInfo('special',
+                                                Gio.File.new_for_path(homePath),
+                                                _('Home')));

        let specials = [];
        let dirs = DEFAULT_DIRECTORIES.slice();
@@ -369,7 +362,7 @@ var PlacesManager = class {

        for (let i = 0; i < dirs.length; i++) {
            let specialPath = GLib.get_user_special_dir(dirs[i]);
-            if (!specialPath || specialPath === homePath)
+            if (specialPath == null || specialPath == homePath)
                continue;

            let file = Gio.File.new_for_path(specialPath), info;
@@ -401,11 +394,10 @@ var PlacesManager = class {

        /* Add standard places */
        this._places.devices.push(new RootInfo());
-        this._places.network.push(new PlaceInfo(
-            'network',
-            Gio.File.new_for_uri('network:///'),
-            _('Browse Network'),
-            'network-workgroup-symbolic'));
+        this._places.network.push(new PlaceInfo('network',
+                                                Gio.File.new_for_uri('network:///'),
+                                                _('Browse Network'),
+                                                'network-workgroup-symbolic'));

        /* first go through all connected drives */
        let drives = this._volumeMonitor.get_connected_drives();
@@ -418,7 +410,7 @@ var PlacesManager = class {
                    networkVolumes.push(volumes[j]);
                } else {
                    let mount = volumes[j].get_mount();
-                    if (mount)
+                    if (mount != null)
                        this._addMount('devices', mount);
                }
            }
@@ -427,7 +419,7 @@ var PlacesManager = class {
        /* add all volumes that is not associated with a drive */
        let volumes = this._volumeMonitor.get_volumes();
        for (let i = 0; i < volumes.length; i++) {
-            if (volumes[i].get_drive())
+            if (volumes[i].get_drive() != null)
                continue;

            let identifier = volumes[i].get_identifier('class');
@@ -435,7 +427,7 @@ var PlacesManager = class {
                networkVolumes.push(volumes[i]);
            } else {
                let mount = volumes[i].get_mount();
-                if (mount)
+                if (mount != null)
                    this._addMount('devices', mount);
            }
        }
@@ -466,9 +458,9 @@ var PlacesManager = class {
            this._addVolume('network', networkVolumes[i]);
        }

-        for (let i = 0; i < networkMounts.length; i++)
+        for (let i = 0; i < networkMounts.length; i++) {
            this._addMount('network', networkMounts[i]);
-
+        }

        this.emit('devices-updated');
        this.emit('network-updated');
@@ -489,6 +481,7 @@ var PlacesManager = class {
    }

    _reloadBookmarks() {
+
        this._bookmarks = [];

        let content = Shell.get_file_contents_utf8_sync(this._bookmarksFile.get_path());
@@ -498,7 +491,7 @@ var PlacesManager = class {
        for (let i = 0; i < lines.length; i++) {
            let line = lines[i];
            let components = line.split(' ');
-            let [bookmark] = components;
+            let bookmark = components[0];

            if (!bookmark)
                continue;
@@ -508,16 +501,16 @@ var PlacesManager = class {
                continue;

            let duplicate = false;
-            for (let j = 0; j < this._places.special.length; j++) {
-                if (file.equal(this._places.special[j].file)) {
+            for (let i = 0; i < this._places.special.length; i++) {
+                if (file.equal(this._places.special[i].file)) {
                    duplicate = true;
                    break;
                }
            }
            if (duplicate)
                continue;
-            for (let j = 0; j < bookmarks.length; j++) {
-                if (file.equal(bookmarks[j].file)) {
+            for (let i = 0; i < bookmarks.length; i++) {
+                if (file.equal(bookmarks[i].file)) {
                    duplicate = true;
                    break;
                }
--- a/extensions/places-menu/stylesheet.css
+++ b/extensions/places-menu/stylesheet.css
@@ -1,8 +1 @@
-.place-menu-item .button {
-  border-radius: 99px;
-  padding: 3px;
-  min-height: auto;
-}
-
-.place-menu-item .button:ltr { margin-left: 6px; }
-.place-menu-item .button:rtl { margin-right: 6px; }
+/* none used*/
--- a/extensions/screenshot-window-sizer/extension.js
+++ b/extensions/screenshot-window-sizer/extension.js
@@ -19,12 +19,14 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */

-const { Clutter, Meta, Shell, St } = imports.gi;
+const { Meta, Shell, St } = imports.gi;
+
+const Main = imports.ui.main;
+const Tweener = imports.ui.tweener;

 const ExtensionUtils = imports.misc.extensionUtils;
-const Main = imports.ui.main;

-const MESSAGE_FADE_TIME = 2000;
+const MESSAGE_FADE_TIME = 2;

 let text;

@@ -39,21 +41,20 @@ function flashMessage(message) {
        Main.uiGroup.add_actor(text);
    }

-    text.remove_all_transitions();
+    Tweener.removeTweens(text);
    text.text = message;

    text.opacity = 255;

    let monitor = Main.layoutManager.primaryMonitor;
-    text.set_position(
-        monitor.x + Math.floor(monitor.width / 2 - text.width / 2),
-        monitor.y + Math.floor(monitor.height / 2 - text.height / 2));
+    text.set_position(monitor.x + Math.floor(monitor.width / 2 - text.width / 2),
+                      monitor.y + Math.floor(monitor.height / 2 - text.height / 2));

-    text.ease({
+    Tweener.addTween(text, {
        opacity: 0,
-        duration: MESSAGE_FADE_TIME,
-        mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-        onComplete: hideMessage,
+        time: MESSAGE_FADE_TIME,
+        transition: 'easeOutQuad',
+        onComplete: hideMessage
    });
 }

@@ -62,19 +63,17 @@ let SIZES = [
    [800, 450],
    [1024, 576],
    [1200, 675],
-    [1600, 900],
-    [360, 654], // Phone portrait maximized
-    [720, 360], // Phone landscape fullscreen
+    [1600, 900]
 ];

 function cycleScreenshotSizes(display, window, binding) {
    // Probably this isn't useful with 5 sizes, but you can decrease instead
    // of increase by holding down shift.
    let modifiers = binding.get_modifiers();
-    let backwards = (modifiers & Meta.VirtualModifier.SHIFT_MASK) !== 0;
+    let backwards = (modifiers & Meta.VirtualModifier.SHIFT_MASK) != 0;

    // Unmaximize first
-    if (window.get_maximized() !== 0)
+    if (window.get_maximized() != 0)
        window.unmaximize(Meta.MaximizeFlags.BOTH);

    let workArea = window.get_work_area_current_monitor();
@@ -82,8 +81,7 @@ function cycleScreenshotSizes(display, window, binding) {

    // Double both axes if on a hidpi display
    let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-    let scaledSizes = SIZES.map(size => size.map(wh => wh * scaleFactor))
-        .filter(([w, h]) => w <= workArea.width && h <= workArea.height);
+    let scaledSizes = SIZES.map(size => size.map(wh => wh * scaleFactor));

    // Find the nearest 16:9 size for the current window size
    let nearestIndex;
@@ -98,7 +96,7 @@ function cycleScreenshotSizes(display, window, binding) {

        // get the best initial window size
        let error = Math.abs(width - outerRect.width) + Math.abs(height - outerRect.height);
-        if (nearestIndex === undefined || error < nearestError) {
+        if (nearestIndex == null || error < nearestError) {
            nearestIndex = i;
            nearestError = error;
        }
@@ -106,7 +104,10 @@ function cycleScreenshotSizes(display, window, binding) {

    // get the next size up or down from ideal
    let newIndex = (nearestIndex + (backwards ? -1 : 1)) % scaledSizes.length;
-    let [newWidth, newHeight] = scaledSizes[newIndex];
+    let newWidth, newHeight;
+    [newWidth, newHeight] = scaledSizes[newIndex];
+    if (newWidth > workArea.width || newHeight > workArea.height)
+        [newWidth, newHeight] = scaledSizes[0];

    // Push the window onscreen if it would be resized offscreen
    let newX = outerRect.x;
@@ -120,13 +121,13 @@ function cycleScreenshotSizes(display, window, binding) {

    let newOuterRect = window.get_frame_rect();
    let message = '%d×%d'.format(
-        newOuterRect.width / scaleFactor,
-        newOuterRect.height / scaleFactor);
+        (newOuterRect.width / scaleFactor),
+        (newOuterRect.height / scaleFactor));

    // The new size might have been constrained by geometry hints (e.g. for
    // a terminal) - in that case, include the actual ratio to the message
    // we flash
-    let actualNumerator = 9 * newOuterRect.width / newOuterRect.height;
+    let actualNumerator = (newOuterRect.width / newOuterRect.height) * 9;
    if (Math.abs(actualNumerator - 16) > 0.01)
        message += ' (%.2f:9)'.format(actualNumerator);

@@ -134,18 +135,17 @@ function cycleScreenshotSizes(display, window, binding) {
 }

 function enable() {
-    Main.wm.addKeybinding(
-        'cycle-screenshot-sizes',
-        ExtensionUtils.getSettings(),
-        Meta.KeyBindingFlags.PER_WINDOW,
-        Shell.ActionMode.NORMAL,
-        cycleScreenshotSizes);
-    Main.wm.addKeybinding(
-        'cycle-screenshot-sizes-backward',
-        ExtensionUtils.getSettings(),
-        Meta.KeyBindingFlags.PER_WINDOW | Meta.KeyBindingFlags.IS_REVERSED,
-        Shell.ActionMode.NORMAL,
-        cycleScreenshotSizes);
+    Main.wm.addKeybinding('cycle-screenshot-sizes',
+                          ExtensionUtils.getSettings(),
+                          Meta.KeyBindingFlags.PER_WINDOW,
+                          Shell.ActionMode.NORMAL,
+                          cycleScreenshotSizes);
+    Main.wm.addKeybinding('cycle-screenshot-sizes-backward',
+                          ExtensionUtils.getSettings(),
+                          Meta.KeyBindingFlags.PER_WINDOW |
+                          Meta.KeyBindingFlags.IS_REVERSED,
+                          Shell.ActionMode.NORMAL,
+                          cycleScreenshotSizes);
 }

 function disable() {
--- a/extensions/user-theme/extension.js
+++ b/extensions/user-theme/extension.js
@@ -2,16 +2,13 @@
 // Load shell theme from ~/.local/share/themes/name/gnome-shell
 /* exported init */

-const { Gio } = imports.gi;
-
-const ExtensionUtils = imports.misc.extensionUtils;
+const { Gio, GLib } = imports.gi;
 const Main = imports.ui.main;

-const Me = ExtensionUtils.getCurrentExtension();
-const Util = Me.imports.util;
-
 const SETTINGS_KEY = 'name';

+const ExtensionUtils = imports.misc.extensionUtils;
+
 class ThemeManager {
    constructor() {
        this._settings = ExtensionUtils.getSettings();
@@ -37,11 +34,13 @@ class ThemeManager {
        let themeName = this._settings.get_string(SETTINGS_KEY);

        if (themeName) {
-            const stylesheetPaths = Util.getThemeDirs()
-                .map(dir => `${dir}/${themeName}/gnome-shell/gnome-shell.css`);
-
-            stylesheetPaths.push(...Util.getModeThemeDirs()
-                .map(dir => `${dir}/${themeName}.css`));
+            let stylesheetPaths = [
+                [GLib.get_home_dir(), '.themes'],
+                [GLib.get_user_data_dir(), 'themes'],
+                ...GLib.get_system_data_dirs().map(dir => [dir, 'themes'])
+            ].map(themeDir => GLib.build_filenamev([
+                ...themeDir, themeName, 'gnome-shell', 'gnome-shell.css'
+            ]));

            stylesheet = stylesheetPaths.find(path => {
                let file = Gio.file_new_for_path(path);
--- a/extensions/user-theme/meson.build
+++ b/extensions/user-theme/meson.build
@@ -4,5 +4,4 @@ extension_data += configure_file(
  configuration: metadata_conf
 )

-extension_sources += files('prefs.js', 'util.js')
 extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')
--- a/extensions/user-theme/prefs.js
+++ b/extensions/user-theme/prefs.js
@@ -1,182 +0,0 @@
-// -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
-/* exported init buildPrefsWidget */
-
-// we use async/await here to not block the mainloop, not to parallelize
-/* eslint-disable no-await-in-loop */
-
-const { Gio, GLib, GObject, Gtk } = imports.gi;
-
-const ExtensionUtils = imports.misc.extensionUtils;
-
-const Me = ExtensionUtils.getCurrentExtension();
-const Util = Me.imports.util;
-
-Gio._promisify(Gio._LocalFilePrototype,
-    'enumerate_children_async', 'enumerate_children_finish');
-Gio._promisify(Gio._LocalFilePrototype,
-    'query_info_async', 'query_info_finish');
-Gio._promisify(Gio.FileEnumerator.prototype,
-    'next_files_async', 'next_files_finish');
-
-const UserThemePrefsWidget = GObject.registerClass(
-class UserThemePrefsWidget extends Gtk.ScrolledWindow {
-    _init() {
-        super._init({
-            hscrollbar_policy: Gtk.PolicyType.NEVER,
-        });
-
-        const box = new Gtk.Box();
-        this.set_child(box);
-
-        this._list = new Gtk.ListBox({
-            selection_mode: Gtk.SelectionMode.NONE,
-            show_separators: true,
-            halign: Gtk.Align.CENTER,
-            valign: Gtk.Align.START,
-            hexpand: true,
-            margin_start: 60,
-            margin_end: 60,
-            margin_top: 60,
-            margin_bottom: 60,
-        });
-        this._list.get_style_context().add_class('frame');
-        box.append(this._list);
-
-        this._actionGroup = new Gio.SimpleActionGroup();
-        this._list.insert_action_group('theme', this._actionGroup);
-
-        this._settings = ExtensionUtils.getSettings();
-        this._actionGroup.add_action(
-            this._settings.create_action('name'));
-
-        this.connect('destroy', () => this._settings.run_dispose());
-
-        this._rows = new Map();
-        this._addTheme(''); // default
-
-        this._collectThemes();
-    }
-
-    async _collectThemes() {
-        for (const dirName of Util.getThemeDirs()) {
-            const dir = Gio.File.new_for_path(dirName);
-            for (const name of await this._enumerateDir(dir)) {
-                if (this._rows.has(name))
-                    continue;
-
-                const file = dir.resolve_relative_path(
-                    `${name}/gnome-shell/gnome-shell.css`);
-                try {
-                    await file.query_info_async(
-                        Gio.FILE_ATTRIBUTE_STANDARD_NAME,
-                        Gio.FileQueryInfoFlags.NONE,
-                        GLib.PRIORITY_DEFAULT, null);
-                    this._addTheme(name);
-                } catch (e) {
-                    if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
-                        logError(e);
-                }
-            }
-        }
-
-        for (const dirName of Util.getModeThemeDirs()) {
-            const dir = Gio.File.new_for_path(dirName);
-            for (const filename of await this._enumerateDir(dir)) {
-                if (!filename.endsWith('.css'))
-                    continue;
-
-                const name = filename.slice(0, -4);
-                if (!this._rows.has(name))
-                    this._addTheme(name);
-            }
-        }
-    }
-
-    _addTheme(name) {
-        const row = new ThemeRow(name, this._settings);
-        this._rows.set(name, row);
-
-        this._list.append(row);
-    }
-
-    async _enumerateDir(dir) {
-        const fileInfos = [];
-        let fileEnum;
-
-        try {
-            fileEnum = await dir.enumerate_children_async(
-                Gio.FILE_ATTRIBUTE_STANDARD_NAME,
-                Gio.FileQueryInfoFlags.NONE,
-                GLib.PRIORITY_DEFAULT, null);
-        } catch (e) {
-            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
-                logError(e);
-            return [];
-        }
-
-        let infos;
-        do {
-            infos = await fileEnum.next_files_async(100,
-                GLib.PRIORITY_DEFAULT, null);
-            fileInfos.push(...infos);
-        } while (infos.length > 0);
-
-        return fileInfos.map(info => info.get_name());
-    }
-});
-
-const ThemeRow = GObject.registerClass(
-class ThemeRow extends Gtk.ListBoxRow {
-    _init(name, settings) {
-        this._name = name;
-        this._settings = settings;
-
-        const box = new Gtk.Box({
-            spacing: 12,
-            margin_start: 12,
-            margin_end: 12,
-            margin_top: 12,
-            margin_bottom: 12,
-        });
-        super._init({
-            action_name: 'theme.name',
-            action_target: new GLib.Variant('s', name),
-            child: box,
-        });
-
-        box.append(new Gtk.Label({
-            label: name || 'Default',
-            hexpand: true,
-            xalign: 0,
-            max_width_chars: 25,
-            width_chars: 25,
-        }));
-
-        this._checkmark = new Gtk.Image({
-            icon_name: 'emblem-ok-symbolic',
-            pixel_size: 16,
-        });
-        box.append(this._checkmark);
-
-        const id = this._settings.connect('changed::name',
-            this._syncCheckmark.bind(this));
-        this._syncCheckmark();
-
-        this.connect('destroy', () => {
-            this._settings.disconnect(id);
-            this._settings = null;
-        });
-    }
-
-    _syncCheckmark() {
-        const visible = this._name === this._settings.get_string('name');
-        this._checkmark.opacity = visible ? 1. : 0;
-    }
-});
-
-function init() {
-}
-
-function buildPrefsWidget() {
-    return new UserThemePrefsWidget();
-}
--- a/extensions/user-theme/util.js
+++ b/extensions/user-theme/util.js
@@ -1,17 +0,0 @@
-/* exported getThemeDirs getModeThemeDirs */
-const { GLib } = imports.gi;
-
-const fn = (...args) => GLib.build_filenamev(args);
-
-function getThemeDirs() {
-    return [
-        fn(GLib.get_home_dir(), '.themes'),
-        fn(GLib.get_user_data_dir(), 'themes'),
-        ...GLib.get_system_data_dirs().map(dir => fn(dir, 'themes')),
-    ];
-}
-
-function getModeThemeDirs() {
-    return GLib.get_system_data_dirs()
-        .map(dir => fn(dir, 'gnome-shell', 'theme'));
-}
--- a/extensions/window-list/classic.css
+++ b/extensions/window-list/classic.css
@@ -4,39 +4,36 @@
    border-top-width: 1px;
    border-bottom-width: 0px;
    height: 2.25em ;
-    padding: 2px;
-  }
-
-  .bottom-panel .window-button > StWidget,
-  .bottom-panel .window-picker-toggle > StWidget {
-    color: #2e3436;
-    background-color: #eee;
-    border-radius: 3px;
-    padding: 3px 6px 1px;
-    box-shadow: none;
-    text-shadow: none;
-    border: 1px solid rgba(0,0,0,0.2);
  }

  .bottom-panel .window-button > StWidget {
+    background-gradient-drection: vertical;
+    background-color: #fff;
+    background-gradient-start: #fff;
+    background-gradient-end: #eee;
+    color: #000;
    -st-natural-width: 18.7em;
    max-width: 18.75em;
+    color: #2e3436;
+    background-color: #eee;
+    border-radius: 2px;
+    padding: 3px 6px 1px;
+    box-shadow: inset -1px -1px 1px rgba(0,0,0,0.5);
+    text-shadow: 0 0 transparent;
  }

-  .bottom-panel .window-button:hover > StWidget,
-  .bottom-panel .window-picker-toggle:hover > StWidget {
+  .bottom-panel .window-button:hover > StWidget {
    background-color: #f9f9f9;
  }

  .bottom-panel .window-button:active > StWidget,
  .bottom-panel .window-button:focus > StWidget {
-    box-shadow: inset 0 1px 3px rgba(0,0,0,0.1);
+    box-shadow: inset 1px 1px 2px rgba(0,0,0,0.5);
  }

-  .bottom-panel .window-button.focused > StWidget,
-  .bottom-panel .window-picker-toggle:checked > StWidget {
-    background-color: #ccc;
-    box-shadow: inset 0 1px 3px rgba(0,0,0,0.1);
+  .bottom-panel .window-button.focused > StWidget {
+    background-color: #ddd;
+    box-shadow: inset 1px 1px 1px rgba(0,0,0,0.5);
  }

  .bottom-panel .window-button.focused:hover > StWidget {
@@ -45,24 +42,5 @@

  .bottom-panel .window-button.minimized > StWidget {
    color: #888;
-    box-shadow: none;
+    box-shadow: inset -1px -1px 1px rgba(0,0,0,0.5);
  }
-
-/* workspace switcher */
-.window-list-workspace-indicator .workspace {
-  border: 2px solid #f6f5f4;
-  background-color: #ccc;
-}
-
-.window-list-workspace-indicator .workspace.active {
-  border-color: #888;
-}
-
-.window-list-window-preview {
-  background-color: #ededed;
-  border: 1px solid #ccc;
-}
-
-.window-list-window-preview.active {
-  background-color: #f6f5f4;
-}
--- a/extensions/window-list/extension.js
+++ b/extensions/window-list/extension.js
--- a/extensions/window-list/meson.build
+++ b/extensions/window-list/meson.build
@@ -4,7 +4,7 @@ extension_data += configure_file(
  configuration: metadata_conf
 )

-extension_sources += files('prefs.js', 'windowPicker.js', 'workspaceIndicator.js')
+extension_sources += files('prefs.js')
 extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')

 if classic_mode_enabled
--- a/extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml
+++ b/extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml
@@ -15,13 +15,6 @@
        window list. Possible values are “never”, “auto” and “always”.
      </description>
    </key>
-    <key name="display-all-workspaces" type="b">
-      <default>false</default>
-      <summary>Show windows from all workspaces</summary>
-      <description>
-        Whether to show windows from all workspaces or only the current one.
-      </description>
-    </key>
    <key name="show-on-all-monitors" type="b">
      <default>false</default>
      <summary>Show the window list on all monitors</summary>
--- a/extensions/window-list/prefs.js
+++ b/extensions/window-list/prefs.js
@@ -3,52 +3,40 @@

 const { Gio, GObject, Gtk } = imports.gi;

-const ExtensionUtils = imports.misc.extensionUtils;
-const Me = ExtensionUtils.getCurrentExtension();
-
-const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']);
+const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;

+const ExtensionUtils = imports.misc.extensionUtils;
+

 function init() {
    ExtensionUtils.initTranslations();
 }

 const WindowListPrefsWidget = GObject.registerClass(
-class WindowListPrefsWidget extends Gtk.Box {
-    _init() {
-        super._init({
-            orientation: Gtk.Orientation.VERTICAL,
-            spacing: 6,
-            margin_top: 36,
-            margin_bottom: 36,
-            margin_start: 36,
-            margin_end: 36,
-            halign: Gtk.Align.CENTER,
-        });
+class WindowListPrefsWidget extends Gtk.Grid {
+    _init(params) {
+        super._init(params);
+
+        this.margin = 24;
+        this.row_spacing = 6;
+        this.orientation = Gtk.Orientation.VERTICAL;

        let groupingLabel = '<b>%s</b>'.format(_('Window Grouping'));
-        this.append(new Gtk.Label({
+        this.add(new Gtk.Label({
            label: groupingLabel, use_markup: true,
-            halign: Gtk.Align.START,
+            halign: Gtk.Align.START
        }));

-        const box = new Gtk.Box({
+        let align = new Gtk.Alignment({ left_padding: 12 });
+        this.add(align);
+
+        let grid = new Gtk.Grid({
            orientation: Gtk.Orientation.VERTICAL,
-            spacing: 12,
-            margin_bottom: 12,
+            row_spacing: 6,
+            column_spacing: 6
        });
-        this.append(box);
-
-        const context = box.get_style_context();
-        const cssProvider = new Gtk.CssProvider();
-        cssProvider.load_from_data(
-            'box { padding: 12px; }');
-
-        context.add_provider(cssProvider,
-            Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
-        context.add_class('frame');
-        context.add_class('view');
+        align.add(grid);

        this._settings = ExtensionUtils.getSettings();
        let currentMode = this._settings.get_string('grouping-mode');
@@ -58,11 +46,10 @@ class WindowListPrefsWidget extends Gtk.Box {
        let modeLabels = {
            'never': _('Never group windows'),
            'auto': _('Group windows when space is limited'),
-            'always': _('Always group windows'),
+            'always': _('Always group windows')
        };

        let radio = null;
-        let currentRadio = null;
        for (let i = 0; i < modes.length; i++) {
            let mode = modes[i];
            let label = modeLabels[mode];
@@ -71,16 +58,12 @@ class WindowListPrefsWidget extends Gtk.Box {
                continue;
            }

-            radio = new Gtk.CheckButton({
-                active: !i,
-                label,
-                group: radio,
-                margin_end: 12,
+            radio = new Gtk.RadioButton({
+                active: currentMode == mode,
+                label: label,
+                group: radio
            });
-            box.append(radio);
-
-            if (currentMode === mode)
-                currentRadio = radio;
+            grid.add(radio);

            radio.connect('toggled', button => {
                if (button.active)
@@ -88,23 +71,18 @@ class WindowListPrefsWidget extends Gtk.Box {
            });
        }

-        if (currentRadio)
-            currentRadio.active = true;
-
        let check = new Gtk.CheckButton({
            label: _('Show on all monitors'),
+            margin_top: 6
        });
        this._settings.bind('show-on-all-monitors', check, 'active', Gio.SettingsBindFlags.DEFAULT);
-        this.append(check);
-
-        check = new Gtk.CheckButton({
-            label: _('Show windows from all workspaces'),
-        });
-        this._settings.bind('display-all-workspaces', check, 'active', Gio.SettingsBindFlags.DEFAULT);
-        this.append(check);
+        this.add(check);
    }
 });

 function buildPrefsWidget() {
-    return new WindowListPrefsWidget();
+    let widget = new WindowListPrefsWidget();
+    widget.show_all();
+
+    return widget;
 }
--- a/extensions/window-list/stylesheet.css
+++ b/extensions/window-list/stylesheet.css
@@ -1,3 +1,10 @@
+.bottom-panel {
+  /* .window-button-icon height +
+     .window-button vertical padding +
+     .window-button > StWidget vertical padding) */
+  height: 2.25em;
+}
+
 .window-list {
  spacing: 2px;
  font-size: 10pt;
@@ -19,31 +26,18 @@
  spacing: 4px;
 }

-.window-button > StWidget,
-.window-picker-toggle > StWidget {
+.window-button > StWidget {
+  -st-natural-width: 18.75em;
+  max-width: 18.75em;
  color: #bbb;
  background-color: black;
-  border-radius: 2px;
+  border-radius: 4px;
  padding: 3px 6px 1px;
  box-shadow: inset 1px 1px 4px rgba(255,255,255,0.5);
  text-shadow: 1px 1px 4px rgba(0,0,0,0.8);
 }

-.window-picker-toggle {
-  padding: 3px;
-}
-
-.window-picker-toggle > StWidet {
-  border: 1px solid rgba(255,255,255,0.3);
-}
-
-.window-button > StWidget {
-  -st-natural-width: 18.75em;
-  max-width: 18.75em;
-}
-
-.window-button:hover > StWidget,
-.window-picker-toggle:hover > StWidget {
+.window-button:hover > StWidget {
  color: white;
  background-color: #1f1f1f;
 }
@@ -53,14 +47,12 @@
  box-shadow: inset 2px 2px 4px rgba(255,255,255,0.5);
 }

-.window-button.focused > StWidget,
-.window-picker-toggle:checked > StWidget {
+.window-button.focused > StWidget {
  color: white;
  box-shadow: inset 1px 1px 4px rgba(255,255,255,0.7);
 }

-.window-button.focused:active > StWidget,
-.window-picker-toggle:checked:active > StWidget {
+.window-button.focused:active > StWidget {
  box-shadow: inset 2px 2px 4px rgba(255,255,255,0.7);
 }

@@ -78,36 +70,13 @@
  height: 24px;
 }

-.window-list-workspace-indicator .status-label-bin {
-  background-color: rgba(200, 200, 200, .3);
-  border: 1px solid #cccccc;
-  padding: 0 3px;
-  margin: 3px;
-}
-
-.window-list-workspace-indicator .workspaces-box {
-  spacing: 3px;
+.window-list-workspace-indicator {
  padding: 3px;
 }

-.window-list-workspace-indicator .workspace {
-  border: 2px solid #000;
-  width: 52px;
-  border-radius: 4px;
-  background-color: #595959;
-}
-
-.window-list-workspace-indicator .workspace.active {
-  border-color: #fff;
-}
-
-.window-list-window-preview {
-  background-color: #bebebe;
-  border: 1px solid #828282;
-}
-
-.window-list-window-preview.active {
-  background-color: #d4d4d4;
+.window-list-workspace-indicator > StWidget {
+  background-color: rgba(200, 200, 200, .3);
+  border: 1px solid #cccccc;
 }

 .notification {
--- a/extensions/window-list/windowPicker.js
+++ b/extensions/window-list/windowPicker.js
@@ -1,344 +0,0 @@
-/* exported WindowPicker, WindowPickerToggle */
-const { Clutter, GObject, Shell, St } = imports.gi;
-
-const Layout = imports.ui.layout;
-const Main = imports.ui.main;
-const { WorkspacesDisplay } = imports.ui.workspacesView;
-const Workspace = imports.ui.workspace;
-
-const { VIGNETTE_BRIGHTNESS } = imports.ui.lightbox;
-const {
-    SIDE_CONTROLS_ANIMATION_TIME,
-    OverviewAdjustment,
-    ControlsState,
-} = imports.ui.overviewControls;
-
-let MyWorkspacesDisplay = GObject.registerClass(
-class MyWorkspacesDisplay extends WorkspacesDisplay {
-    _init(controls, overviewAdjustment) {
-        let workspaceManager = global.workspace_manager;
-
-        this._overviewAdjustment = overviewAdjustment;
-        this._workspaceAdjustment = new St.Adjustment({
-            value: workspaceManager.get_active_workspace_index(),
-            lower: 0,
-            page_increment: 1,
-            page_size: 1,
-            step_increment: 0,
-            upper: workspaceManager.n_workspaces,
-        });
-
-        this._nWorkspacesChangedId =
-            workspaceManager.connect('notify::n-workspaces',
-                this._updateAdjustment.bind(this));
-
-        super._init(controls, this._workspaceAdjustment, this._overviewAdjustment);
-
-        this._workspaceAdjustment.actor = this;
-
-        this.add_constraint(
-            new Layout.MonitorConstraint({
-                primary: true,
-                work_area: true,
-            }));
-    }
-
-    prepareToEnterOverview(...args) {
-        if (!this._scrollEventId) {
-            this._scrollEventId = Main.windowPicker.connect('scroll-event',
-                this._onScrollEvent.bind(this));
-        }
-
-        super.prepareToEnterOverview(...args);
-    }
-
-    vfunc_hide(...args) {
-        if (this._scrollEventId > 0)
-            Main.windowPicker.disconnect(this._scrollEventId);
-        this._scrollEventId = 0;
-
-        super.vfunc_hide(...args);
-    }
-
-    _updateAdjustment() {
-        let workspaceManager = global.workspace_manager;
-        this._workspaceAdjustment.set({
-            upper: workspaceManager.n_workspaces,
-            value: workspaceManager.get_active_workspace_index(),
-        });
-    }
-
-    _onDestroy() {
-        if (this._nWorkspacesChangedId)
-            global.workspace_manager.disconnect(this._nWorkspacesChangedId);
-        this._nWorkspacesChangedId = 0;
-
-        super._onDestroy();
-    }
-});
-
-const MyWorkspace = GObject.registerClass(
-class MyWorkspace extends Workspace.Workspace {
-    _init(...args) {
-        super._init(...args);
-
-        this._adjChangedId =
-            this._overviewAdjustment.connect('notify::value', () => {
-                const { value: progress } = this._overviewAdjustment;
-                const brightness = 1 - (1 - VIGNETTE_BRIGHTNESS) * progress;
-                for (const bg of this._background?._backgroundGroup ?? []) {
-                    bg.content.set({
-                        vignette: true,
-                        brightness,
-                    });
-                }
-            });
-    }
-
-    _onDestroy() {
-        super._onDestroy();
-
-        if (this._adjChangedId)
-            this._overviewAdjustment.disconnect(this._adjChangedId);
-        this._adjChangedId = 0;
-    }
-});
-
-const MyWorkspaceBackground = GObject.registerClass(
-class MyWorkspaceBackground extends Workspace.WorkspaceBackground {
-    _updateBorderRadius() {
-    }
-
-    vfunc_allocate(box) {
-        this.set_allocation(box);
-
-        const themeNode = this.get_theme_node();
-        const contentBox = themeNode.get_content_box(box);
-
-        this._bin.allocate(contentBox);
-
-        const [contentWidth, contentHeight] = contentBox.get_size();
-        const monitor = Main.layoutManager.monitors[this._monitorIndex];
-        const xRatio = contentWidth / this._workarea.width;
-        const yRatio = contentHeight / this._workarea.height;
-
-        const right = area => area.x + area.width;
-        const bottom = area => area.y + area.height;
-
-        const offsets = {
-            left: xRatio * (this._workarea.x - monitor.x),
-            right: xRatio * (right(monitor) - right(this._workarea)),
-            top: yRatio * (this._workarea.y - monitor.y),
-            bottom: yRatio * (bottom(monitor) - bottom(this._workarea)),
-        };
-
-        contentBox.set_origin(-offsets.left, -offsets.top);
-        contentBox.set_size(
-            offsets.left + contentWidth + offsets.right,
-            offsets.top + contentHeight + offsets.bottom);
-        this._backgroundGroup.allocate(contentBox);
-    }
-});
-
-var WindowPicker = GObject.registerClass({
-    Signals: {
-        'open-state-changed': { param_types: [GObject.TYPE_BOOLEAN] },
-    },
-}, class extends Clutter.Actor {
-    _init() {
-        this._visible = false;
-        this._modal = false;
-
-        this._overlayKeyId = 0;
-        this._stageKeyPressId = 0;
-
-        super._init({ reactive: true });
-
-        this._adjustment = new OverviewAdjustment(this);
-
-        this.connect('destroy', this._onDestroy.bind(this));
-
-        global.bind_property('screen-width',
-            this, 'width',
-            GObject.BindingFlags.SYNC_CREATE);
-        global.bind_property('screen-height',
-            this, 'height',
-            GObject.BindingFlags.SYNC_CREATE);
-
-        this._workspacesDisplay = new MyWorkspacesDisplay(this, this._adjustment);
-        this.add_child(this._workspacesDisplay);
-
-        Main.uiGroup.insert_child_below(this, global.window_group);
-
-        if (!Main.sessionMode.hasOverview) {
-            this._injectBackgroundShade();
-
-            this._overlayKeyId = global.display.connect('overlay-key', () => {
-                if (!this._visible)
-                    this.open();
-                else
-                    this.close();
-            });
-        }
-    }
-
-    _injectBackgroundShade() {
-        this._origWorkspace = Workspace.Workspace;
-        this._origWorkspaceBackground = Workspace.WorkspaceBackground;
-
-        Workspace.Workspace = MyWorkspace;
-        Workspace.WorkspaceBackground = MyWorkspaceBackground;
-    }
-
-    get visible() {
-        return this._visible;
-    }
-
-    open() {
-        if (this._visible)
-            return;
-
-        this._visible = true;
-
-        if (!this._syncGrab())
-            return;
-
-        this._fakeOverviewVisible(true);
-        this._workspacesDisplay.prepareToEnterOverview();
-        Main.overview._animationInProgress = true;
-
-        this._adjustment.value = ControlsState.HIDDEN;
-        this._adjustment.ease(ControlsState.WINDOW_PICKER, {
-            duration: SIDE_CONTROLS_ANIMATION_TIME,
-            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-            onComplete: () => (Main.overview._animationInProgress = false),
-        });
-
-        this._stageKeyPressId = global.stage.connect('key-press-event',
-            (a, event) => {
-                let sym = event.get_key_symbol();
-                if (sym === Clutter.KEY_Escape) {
-                    this.close();
-                    return Clutter.EVENT_STOP;
-                }
-                return Clutter.EVENT_PROPAGATE;
-            });
-
-        this.emit('open-state-changed', this._visible);
-    }
-
-    close() {
-        if (!this._visible)
-            return;
-
-        this._visible = false;
-
-        if (!this._syncGrab())
-            return;
-
-        this._workspacesDisplay.prepareToLeaveOverview();
-
-        Main.overview._animationInProgress = true;
-        this._adjustment.ease(ControlsState.HIDDEN, {
-            duration: SIDE_CONTROLS_ANIMATION_TIME,
-            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-            onComplete: () => {
-                Main.overview._animationInProgress = false;
-                this._workspacesDisplay.hide();
-                this._fakeOverviewVisible(false);
-            },
-        });
-
-        global.stage.disconnect(this._stageKeyPressId);
-        this._stageKeyPressId = 0;
-
-        this.emit('open-state-changed', this._visible);
-    }
-
-    getWorkspacesBoxForState() {
-        return this.allocation;
-    }
-
-    _fakeOverviewVisible(visible) {
-        // Fake overview state for WorkspacesDisplay
-        Main.overview._visible = visible;
-
-        // Hide real windows
-        Main.layoutManager._inOverview = visible;
-        Main.layoutManager._updateVisibility();
-    }
-
-    _syncGrab() {
-        if (this._visible) {
-            if (this._modal)
-                return true;
-
-            this._modal = Main.pushModal(this, {
-                actionMode: Shell.ActionMode.OVERVIEW,
-            });
-
-            if (!this._modal) {
-                this.hide();
-                return false;
-            }
-        } else if (this._modal) {
-            Main.popModal(this);
-            this._modal = false;
-        }
-        return true;
-    }
-
-    _onDestroy() {
-        if (this._origWorkspace)
-            Workspace.Workspace = this._origWorkspace;
-
-        if (this._origWorkspaceBackground)
-            Workspace.WorkspaceBackground = this._origWorkspaceBackground;
-
-        if (this._monitorsChangedId)
-            Main.layoutManager.disconnect(this._monitorsChangedId);
-        this._monitorsChangedId = 0;
-
-        if (this._overlayKeyId)
-            global.display.disconnect(this._overlayKeyId);
-        this._overlayKeyId = 0;
-
-        if (this._stageKeyPressId)
-            global.stage.disconnect(this._stageKeyPressId);
-        this._stageKeyPressId = 0;
-    }
-});
-
-var WindowPickerToggle = GObject.registerClass(
-class WindowPickerToggle extends St.Button {
-    _init() {
-        let iconBin = new St.Widget({
-            layout_manager: new Clutter.BinLayout(),
-        });
-        iconBin.add_child(new St.Icon({
-            icon_name: 'focus-windows-symbolic',
-            icon_size: 16,
-            x_expand: true,
-            y_expand: true,
-            x_align: Clutter.ActorAlign.CENTER,
-            y_align: Clutter.ActorAlign.CENTER,
-        }));
-        super._init({
-            style_class: 'window-picker-toggle',
-            child: iconBin,
-            visible: !Main.sessionMode.hasOverview,
-            toggle_mode: true,
-        });
-
-        this.connect('notify::checked', () => {
-            if (this.checked)
-                Main.windowPicker.open();
-            else
-                Main.windowPicker.close();
-        });
-
-        Main.windowPicker.connect('open-state-changed', () => {
-            this.checked = Main.windowPicker.visible;
-        });
-    }
-});
--- a/extensions/window-list/workspaceIndicator.js
+++ b/extensions/window-list/workspaceIndicator.js
@@ -1,442 +0,0 @@
-/* exported WorkspaceIndicator */
-const { Clutter, Gio, GObject, Meta, St } = imports.gi;
-
-const DND = imports.ui.dnd;
-const ExtensionUtils = imports.misc.extensionUtils;
-const Main = imports.ui.main;
-const PanelMenu = imports.ui.panelMenu;
-const PopupMenu = imports.ui.popupMenu;
-
-const Me = ExtensionUtils.getCurrentExtension();
-
-const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']);
-const _ = Gettext.gettext;
-
-const TOOLTIP_OFFSET = 6;
-const TOOLTIP_ANIMATION_TIME = 150;
-
-const MAX_THUMBNAILS = 6;
-
-let WindowPreview = GObject.registerClass(
-class WindowPreview extends St.Button {
-    _init(window) {
-        super._init({
-            style_class: 'window-list-window-preview',
-        });
-
-        this._delegate = this;
-        DND.makeDraggable(this, { restoreOnSuccess: true });
-
-        this._window = window;
-
-        this.connect('destroy', this._onDestroy.bind(this));
-
-        this._sizeChangedId = this._window.connect('size-changed',
-            () => this.queue_relayout());
-        this._positionChangedId = this._window.connect('position-changed',
-            () => {
-                this._updateVisible();
-                this.queue_relayout();
-            });
-        this._minimizedChangedId = this._window.connect('notify::minimized',
-            this._updateVisible.bind(this));
-
-        this._focusChangedId = global.display.connect('notify::focus-window',
-            this._onFocusChanged.bind(this));
-        this._onFocusChanged();
-    }
-
-    // needed for DND
-    get metaWindow() {
-        return this._window;
-    }
-
-    _onDestroy() {
-        this._window.disconnect(this._sizeChangedId);
-        this._window.disconnect(this._positionChangedId);
-        this._window.disconnect(this._minimizedChangedId);
-        global.display.disconnect(this._focusChangedId);
-    }
-
-    _onFocusChanged() {
-        if (global.display.focus_window === this._window)
-            this.add_style_class_name('active');
-        else
-            this.remove_style_class_name('active');
-    }
-
-    _updateVisible() {
-        const monitor = Main.layoutManager.findIndexForActor(this);
-        const workArea = Main.layoutManager.getWorkAreaForMonitor(monitor);
-        this.visible = this._window.get_frame_rect().overlap(workArea) &&
-            this._window.window_type !== Meta.WindowType.DESKTOP &&
-            this._window.showing_on_its_workspace();
-    }
-});
-
-let WorkspaceLayout = GObject.registerClass(
-class WorkspaceLayout extends Clutter.LayoutManager {
-    vfunc_get_preferred_width() {
-        return [0, 0];
-    }
-
-    vfunc_get_preferred_height() {
-        return [0, 0];
-    }
-
-    vfunc_allocate(container, box) {
-        const monitor = Main.layoutManager.findIndexForActor(container);
-        const workArea = Main.layoutManager.getWorkAreaForMonitor(monitor);
-        const hscale = box.get_width() / workArea.width;
-        const vscale = box.get_height() / workArea.height;
-
-        for (const child of container) {
-            const childBox = new Clutter.ActorBox();
-            const frameRect = child.metaWindow.get_frame_rect();
-            childBox.set_size(
-                Math.round(Math.min(frameRect.width, workArea.width) * hscale),
-                Math.round(Math.min(frameRect.height, workArea.height) * vscale));
-            childBox.set_origin(
-                Math.round((frameRect.x - workArea.x) * hscale),
-                Math.round((frameRect.y - workArea.y)  * vscale));
-            child.allocate(childBox);
-        }
-    }
-});
-
-let WorkspaceThumbnail = GObject.registerClass(
-class WorkspaceThumbnail extends St.Button {
-    _init(index) {
-        super._init({
-            style_class: 'workspace',
-            child: new Clutter.Actor({
-                layout_manager: new WorkspaceLayout(),
-                clip_to_allocation: true,
-            }),
-        });
-
-        this._tooltip = new St.Label({
-            style_class: 'dash-label',
-            visible: false,
-        });
-        Main.uiGroup.add_child(this._tooltip);
-
-        this.connect('destroy', this._onDestroy.bind(this));
-        this.connect('notify::hover', this._syncTooltip.bind(this));
-
-        this._index = index;
-        this._delegate = this; // needed for DND
-
-        this._windowPreviews = new Map();
-
-        let workspaceManager = global.workspace_manager;
-        this._workspace = workspaceManager.get_workspace_by_index(index);
-
-        this._windowAddedId = this._workspace.connect('window-added',
-            (ws, window) => {
-                this._addWindow(window);
-            });
-        this._windowRemovedId = this._workspace.connect('window-removed',
-            (ws, window) => {
-                this._removeWindow(window);
-            });
-        this._restackedId = global.display.connect('restacked',
-            this._onRestacked.bind(this));
-
-        this._workspace.list_windows().forEach(w => this._addWindow(w));
-        this._onRestacked();
-    }
-
-    acceptDrop(source) {
-        if (!source.metaWindow)
-            return false;
-
-        this._moveWindow(source.metaWindow);
-        return true;
-    }
-
-    handleDragOver(source) {
-        if (source.metaWindow)
-            return DND.DragMotionResult.MOVE_DROP;
-        else
-            return DND.DragMotionResult.CONTINUE;
-    }
-
-    _addWindow(window) {
-        if (this._windowPreviews.has(window))
-            return;
-
-        let preview = new WindowPreview(window);
-        preview.connect('clicked', (a, btn) => this.emit('clicked', btn));
-        this._windowPreviews.set(window, preview);
-        this.child.add_child(preview);
-    }
-
-    _removeWindow(window) {
-        let preview = this._windowPreviews.get(window);
-        if (!preview)
-            return;
-
-        this._windowPreviews.delete(window);
-        preview.destroy();
-    }
-
-    _onRestacked() {
-        let lastPreview = null;
-        let windows = global.get_window_actors().map(a => a.meta_window);
-        for (let i = 0; i < windows.length; i++) {
-            let preview = this._windowPreviews.get(windows[i]);
-            if (!preview)
-                continue;
-
-            this.child.set_child_above_sibling(preview, lastPreview);
-            lastPreview = preview;
-        }
-    }
-
-    _moveWindow(window) {
-        let monitorIndex = Main.layoutManager.findIndexForActor(this);
-        if (monitorIndex !== window.get_monitor())
-            window.move_to_monitor(monitorIndex);
-        window.change_workspace_by_index(this._index, false);
-    }
-
-    on_clicked() {
-        let ws = global.workspace_manager.get_workspace_by_index(this._index);
-        if (ws)
-            ws.activate(global.get_current_time());
-    }
-
-    _syncTooltip() {
-        if (this.hover) {
-            this._tooltip.set({
-                text: Meta.prefs_get_workspace_name(this._index),
-                visible: true,
-                opacity: 0,
-            });
-
-            const [stageX, stageY] = this.get_transformed_position();
-            const thumbWidth = this.allocation.get_width();
-            const tipWidth = this._tooltip.width;
-            const tipHeight = this._tooltip.height;
-            const xOffset = Math.floor((thumbWidth - tipWidth) / 2);
-            const monitor = Main.layoutManager.findMonitorForActor(this);
-            const x = Math.clamp(
-                stageX + xOffset,
-                monitor.x,
-                monitor.x + monitor.width - tipWidth);
-            const y = stageY - tipHeight - TOOLTIP_OFFSET;
-            this._tooltip.set_position(x, y);
-        }
-
-        this._tooltip.ease({
-            opacity: this.hover ? 255 : 0,
-            duration: TOOLTIP_ANIMATION_TIME,
-            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-            onComplete: () => (this._tooltip.visible = this.hover),
-        });
-    }
-
-    _onDestroy() {
-        this._tooltip.destroy();
-
-        this._workspace.disconnect(this._windowAddedId);
-        this._workspace.disconnect(this._windowRemovedId);
-        global.display.disconnect(this._restackedId);
-    }
-});
-
-var WorkspaceIndicator = GObject.registerClass(
-class WorkspaceIndicator extends PanelMenu.Button {
-    _init() {
-        super._init(0.0, _('Workspace Indicator'), true);
-        this.setMenu(new PopupMenu.PopupMenu(this, 0.0, St.Side.BOTTOM));
-        this.add_style_class_name('window-list-workspace-indicator');
-        this.remove_style_class_name('panel-button');
-        this.menu.actor.remove_style_class_name('panel-menu');
-
-        let container = new St.Widget({
-            layout_manager: new Clutter.BinLayout(),
-            x_expand: true,
-            y_expand: true,
-        });
-        this.add_actor(container);
-
-        let workspaceManager = global.workspace_manager;
-
-        this._currentWorkspace = workspaceManager.get_active_workspace_index();
-        this._statusLabel = new St.Label({ text: this._getStatusText() });
-
-        this._statusBin = new St.Bin({
-            style_class: 'status-label-bin',
-            x_expand: true,
-            y_expand: true,
-            child: this._statusLabel,
-        });
-        container.add_actor(this._statusBin);
-
-        this._thumbnailsBox = new St.BoxLayout({
-            style_class: 'workspaces-box',
-            y_expand: true,
-            reactive: true,
-        });
-        this._thumbnailsBox.connect('scroll-event',
-            this._onScrollEvent.bind(this));
-        container.add_actor(this._thumbnailsBox);
-
-        this._workspacesItems = [];
-
-        this._workspaceManagerSignals = [
-            workspaceManager.connect('notify::n-workspaces',
-                this._nWorkspacesChanged.bind(this)),
-            workspaceManager.connect_after('workspace-switched',
-                this._onWorkspaceSwitched.bind(this)),
-            workspaceManager.connect('notify::layout-rows',
-                this._updateThumbnailVisibility.bind(this)),
-        ];
-
-        this.connect('scroll-event', this._onScrollEvent.bind(this));
-        this._updateMenu();
-        this._updateThumbnails();
-        this._updateThumbnailVisibility();
-
-        this._settings = new Gio.Settings({ schema_id: 'org.gnome.desktop.wm.preferences' });
-        this._settingsChangedId = this._settings.connect(
-            'changed::workspace-names', this._updateMenuLabels.bind(this));
-    }
-
-    _onDestroy() {
-        for (let i = 0; i < this._workspaceManagerSignals.length; i++)
-            global.workspace_manager.disconnect(this._workspaceManagerSignals[i]);
-
-        if (this._settingsChangedId) {
-            this._settings.disconnect(this._settingsChangedId);
-            this._settingsChangedId = 0;
-        }
-
-        super._onDestroy();
-    }
-
-    _updateThumbnailVisibility() {
-        const { workspaceManager } = global;
-        const vertical = workspaceManager.layout_rows === -1;
-        const useMenu =
-            vertical || workspaceManager.n_workspaces > MAX_THUMBNAILS;
-        this.reactive = useMenu;
-
-        this._statusBin.visible = useMenu;
-        this._thumbnailsBox.visible = !useMenu;
-    }
-
-    _onWorkspaceSwitched() {
-        let workspaceManager = global.workspace_manager;
-        this._currentWorkspace = workspaceManager.get_active_workspace_index();
-
-        this._updateMenuOrnament();
-        this._updateActiveThumbnail();
-
-        this._statusLabel.set_text(this._getStatusText());
-    }
-
-    _nWorkspacesChanged() {
-        this._updateMenu();
-        this._updateThumbnails();
-        this._updateThumbnailVisibility();
-    }
-
-    _updateMenuOrnament() {
-        for (let i = 0; i < this._workspacesItems.length; i++) {
-            this._workspacesItems[i].setOrnament(i === this._currentWorkspace
-                ? PopupMenu.Ornament.DOT
-                : PopupMenu.Ornament.NONE);
-        }
-    }
-
-    _updateActiveThumbnail() {
-        let thumbs = this._thumbnailsBox.get_children();
-        for (let i = 0; i < thumbs.length; i++) {
-            if (i === this._currentWorkspace)
-                thumbs[i].add_style_class_name('active');
-            else
-                thumbs[i].remove_style_class_name('active');
-        }
-    }
-
-    _getStatusText() {
-        let workspaceManager = global.workspace_manager;
-        let current = workspaceManager.get_active_workspace_index();
-        let total = workspaceManager.n_workspaces;
-
-        return '%d / %d'.format(current + 1, total);
-    }
-
-    _updateMenuLabels() {
-        for (let i = 0; i < this._workspacesItems.length; i++) {
-            let item = this._workspacesItems[i];
-            let name = Meta.prefs_get_workspace_name(i);
-            item.label.text = name;
-        }
-    }
-
-    _updateMenu() {
-        let workspaceManager = global.workspace_manager;
-
-        this.menu.removeAll();
-        this._workspacesItems = [];
-        this._currentWorkspace = workspaceManager.get_active_workspace_index();
-
-        for (let i = 0; i < workspaceManager.n_workspaces; i++) {
-            let name = Meta.prefs_get_workspace_name(i);
-            let item = new PopupMenu.PopupMenuItem(name);
-            item.workspaceId = i;
-
-            item.connect('activate', () => {
-                this._activate(item.workspaceId);
-            });
-
-            if (i === this._currentWorkspace)
-                item.setOrnament(PopupMenu.Ornament.DOT);
-
-            this.menu.addMenuItem(item);
-            this._workspacesItems[i] = item;
-        }
-
-        this._statusLabel.set_text(this._getStatusText());
-    }
-
-    _updateThumbnails() {
-        let workspaceManager = global.workspace_manager;
-
-        this._thumbnailsBox.destroy_all_children();
-
-        for (let i = 0; i < workspaceManager.n_workspaces; i++) {
-            let thumb = new WorkspaceThumbnail(i);
-            this._thumbnailsBox.add_actor(thumb);
-        }
-        this._updateActiveThumbnail();
-    }
-
-    _activate(index) {
-        let workspaceManager = global.workspace_manager;
-
-        if (index >= 0 && index < workspaceManager.n_workspaces) {
-            let metaWorkspace = workspaceManager.get_workspace_by_index(index);
-            metaWorkspace.activate(global.get_current_time());
-        }
-    }
-
-    _onScrollEvent(actor, event) {
-        let direction = event.get_scroll_direction();
-        let diff = 0;
-        if (direction === Clutter.ScrollDirection.DOWN)
-            diff = 1;
-        else if (direction === Clutter.ScrollDirection.UP)
-            diff = -1;
-        else
-            return;
-
-        let newIndex = this._currentWorkspace + diff;
-        this._activate(newIndex);
-    }
-});
-
--- a/extensions/windowsNavigator/extension.js
+++ b/extensions/windowsNavigator/extension.js
@@ -1,178 +1,144 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-/* exported init */
-const { Clutter, Graphene, GObject, St } = imports.gi;
+/* exported enable disable */
+const { Clutter, St } = imports.gi;

 const Main = imports.ui.main;
-const OverviewControls = imports.ui.overviewControls;
 const Workspace = imports.ui.workspace;
 const WorkspacesView = imports.ui.workspacesView;

-const WINDOW_SLOT = 4;
+function injectToFunction(parent, name, func) {
+    let origin = parent[name];
+    parent[name] = function() {
+        let ret;
+        ret = origin.apply(this, arguments);
+        if (ret === undefined)
+            ret = func.apply(this, arguments);
+        return ret;
+    };
+    return origin;
+}

-var MyWorkspace = GObject.registerClass(
-class MyWorkspace extends Workspace.Workspace {
-    _init(...args) {
-        super._init(...args);
+let winInjections, workspaceInjections, workViewInjections, createdActors, connectedSignals;

-        if (this.metaWorkspace && this.metaWorkspace.index() < 9) {
-            this._tip = new St.Label({
-                style_class: 'extension-windowsNavigator-window-tooltip',
-                visible: false,
-            });
-            this.add_actor(this._tip);
+function resetState() {
+    winInjections = {};
+    workspaceInjections = {};
+    workViewInjections = {};
+    createdActors = [];
+    connectedSignals = [];
+}

-            this.connect('notify::scale-x', () => {
-                this._tip.set_scale(1 / this.scale_x, 1 / this.scale_x);
-            });
-        } else {
-            this._tip = null;
-        }
-    }
+function enable() {
+    resetState();

-    vfunc_allocate(box) {
-        super.vfunc_allocate(box);
+    Workspace.WindowOverlay.prototype.showTooltip = function() {
+        this._text.raise_top();
+        this._text.show();
+        this._text.text = (this._windowClone.slotId + 1).toString();
+    };
+    winInjections['showTooltip'] = undefined;

-        if (this._tip)
-            this._tip.allocate_preferred_size(0, 0);
-    }
+    Workspace.WindowOverlay.prototype.hideTooltip = function() {
+        if (this._text && this._text.visible)
+            this._text.hide();
+    };
+    winInjections['hideTooltip'] = undefined;

-    showTooltip() {
-        if (!this._tip)
+    Workspace.Workspace.prototype.showTooltip = function() {
+        if (this._tip == null || this._actualGeometry == null)
            return;
        this._tip.text = (this.metaWorkspace.index() + 1).toString();
+
+        // Hand code this instead of using _getSpacingAndPadding
+        // because that fails on empty workspaces
+        let node = this.actor.get_theme_node();
+        let padding = {
+            left: node.get_padding(St.Side.LEFT),
+            top: node.get_padding(St.Side.TOP),
+            bottom: node.get_padding(St.Side.BOTTOM),
+            right: node.get_padding(St.Side.RIGHT),
+        };
+
+        let area = Workspace.padArea(this._actualGeometry, padding);
+        this._tip.x = area.x;
+        this._tip.y = area.y;
        this._tip.show();
-        this.set_child_below_sibling(this._tip, null);
-    }
+        this._tip.raise_top();
+    };
+    workspaceInjections['showTooltip'] = undefined;

-    hideTooltip() {
-        if (this._tip)
-            this._tip.hide();
-    }
+    Workspace.Workspace.prototype.hideTooltip = function() {
+        if (this._tip == null)
+            return;
+        if (!this._tip.get_parent())
+            return;
+        this._tip.hide();
+    };
+    workspaceInjections['hideTooltip'] = undefined;

-    getWindowWithTooltip(id) {
-        const { layoutManager } = this._container;
-        const slot = layoutManager._windowSlots[id - 1];
-        return slot ? slot[WINDOW_SLOT].metaWindow : null;
-    }
-
-    showWindowsTooltips() {
-        const { layoutManager } = this._container;
-        for (let i = 0; i < layoutManager._windowSlots.length; i++) {
-            if (layoutManager._windowSlots[i])
-                layoutManager._windowSlots[i][WINDOW_SLOT].showTooltip(`${i + 1}`);
+    Workspace.Workspace.prototype.getWindowWithTooltip = function(id) {
+        for (let i = 0; i < this._windows.length; i++) {
+            if ((this._windows[i].slotId + 1) == id)
+                return this._windows[i].metaWindow;
        }
-    }
+        return null;
+    };
+    workspaceInjections['getWindowWithTooltip'] = undefined;

-    hideWindowsTooltips() {
-        const { layoutManager } = this._container;
-        for (let i in layoutManager._windowSlots) {
-            if (layoutManager._windowSlots[i])
-                layoutManager._windowSlots[i][WINDOW_SLOT].hideTooltip();
+    Workspace.Workspace.prototype.showWindowsTooltips = function() {
+        for (let i in this._windowOverlays) {
+            if (this._windowOverlays[i] != null)
+                this._windowOverlays[i].showTooltip();
        }
-    }
+    };
+    workspaceInjections['showWindowsTooltips'] = undefined;

-    // overriding _addWindowClone to apply the tooltip patch on the cloned
-    // windowPreview
-    _addWindowClone(metaWindow) {
-        const clone = super._addWindowClone(metaWindow);
+    Workspace.Workspace.prototype.hideWindowsTooltips = function() {
+        for (let i in this._windowOverlays) {
+            if (this._windowOverlays[i] != null)
+                this._windowOverlays[i].hideTooltip();
+        }
+    };
+    workspaceInjections['hideWindowsTooltips'] = undefined;

-        // appling the tooltip patch
-        (function patchPreview() {
-            this._text = new St.Label({
-                style_class: 'extension-windowsNavigator-window-tooltip',
-                visible: false,
-            });
-
-            this._text.add_constraint(new Clutter.BindConstraint({
-                source: this.windowContainer,
-                coordinate: Clutter.BindCoordinate.POSITION,
-            }));
-            this._text.add_constraint(new Clutter.AlignConstraint({
-                source: this.windowContainer,
-                align_axis: Clutter.AlignAxis.X_AXIS,
-                pivot_point: new Graphene.Point({ x: 0.5, y: -1 }),
-                factor: this._closeButtonSide === St.Side.LEFT ? 1 : 0,
-            }));
-            this._text.add_constraint(new Clutter.AlignConstraint({
-                source: this.windowContainer,
-                align_axis: Clutter.AlignAxis.Y_AXIS,
-                pivot_point: new Graphene.Point({ x: -1, y: 0.5 }),
-                factor: 0,
-            }));
-
-            this.add_child(this._text);
-        }).call(clone);
-
-        clone.showTooltip = function (text) {
-            this._text.set({ text });
-            this._text.show();
-        };
-
-        clone.hideTooltip = function () {
-            if (this._text && this._text.visible)
-                this._text.hide();
-        };
-
-        return clone;
-    }
-});
-
-var MyWorkspacesView = GObject.registerClass(
-class MyWorkspacesView extends WorkspacesView.WorkspacesView {
-    _init(...args) {
-        super._init(...args);
-
-        this._pickWorkspace = false;
-        this._pickWindow = false;
-        this._keyPressEventId =
-            global.stage.connect('key-press-event', this._onKeyPress.bind(this));
-        this._keyReleaseEventId =
-            global.stage.connect('key-release-event', this._onKeyRelease.bind(this));
-    }
-
-    _onDestroy() {
-        super._onDestroy();
-
-        global.stage.disconnect(this._keyPressEventId);
-        global.stage.disconnect(this._keyReleaseEventId);
-    }
-
-    _hideTooltips() {
-        if (global.stage.get_key_focus() === global.stage)
+    WorkspacesView.WorkspacesView.prototype._hideTooltips = function() {
+        if (global.stage.get_key_focus() == global.stage)
            global.stage.set_key_focus(this._prevFocusActor);
        this._pickWindow = false;
        for (let i = 0; i < this._workspaces.length; i++)
            this._workspaces[i].hideWindowsTooltips();
-    }
+    };
+    workViewInjections['_hideTooltips'] = undefined;

-    _hideWorkspacesTooltips() {
+    WorkspacesView.WorkspacesView.prototype._hideWorkspacesTooltips = function() {
        global.stage.set_key_focus(this._prevFocusActor);
        this._pickWorkspace = false;
        for (let i = 0; i < this._workspaces.length; i++)
            this._workspaces[i].hideTooltip();
-    }
+    };
+    workViewInjections['_hideWorkspacesTooltips'] = undefined;

-    _onKeyRelease(s, o) {
+    WorkspacesView.WorkspacesView.prototype._onKeyRelease = function(s, o) {
        if (this._pickWindow &&
-            (o.get_key_symbol() === Clutter.KEY_Alt_L ||
-             o.get_key_symbol() === Clutter.KEY_Alt_R))
+            (o.get_key_symbol() == Clutter.KEY_Alt_L ||
+             o.get_key_symbol() == Clutter.KEY_Alt_R))
            this._hideTooltips();
        if (this._pickWorkspace &&
-            (o.get_key_symbol() === Clutter.KEY_Control_L ||
-             o.get_key_symbol() === Clutter.KEY_Control_R))
+            (o.get_key_symbol() == Clutter.KEY_Control_L ||
+             o.get_key_symbol() == Clutter.KEY_Control_R))
            this._hideWorkspacesTooltips();
-    }
+    };
+    workViewInjections['_onKeyRelease'] = undefined;

-    _onKeyPress(s, o) {
-        const { ControlsState } = OverviewControls;
-        if (this._overviewAdjustment.value !== ControlsState.WINDOW_PICKER)
+    WorkspacesView.WorkspacesView.prototype._onKeyPress = function(s, o) {
+        if (Main.overview.viewSelector._activePage != Main.overview.viewSelector._workspacesPage)
            return false;

        let workspaceManager = global.workspace_manager;

-        if ((o.get_key_symbol() === Clutter.KEY_Alt_L ||
-             o.get_key_symbol() === Clutter.KEY_Alt_R) &&
-            !this._pickWorkspace) {
+        if ((o.get_key_symbol() == Clutter.KEY_Alt_L ||
+             o.get_key_symbol() == Clutter.KEY_Alt_R)
+            && !this._pickWorkspace) {
            this._prevFocusActor = global.stage.get_key_focus();
            global.stage.set_key_focus(null);
            this._active = workspaceManager.get_active_workspace_index();
@@ -180,9 +146,9 @@ class MyWorkspacesView extends WorkspacesView.WorkspacesView {
            this._workspaces[workspaceManager.get_active_workspace_index()].showWindowsTooltips();
            return true;
        }
-        if ((o.get_key_symbol() === Clutter.KEY_Control_L ||
-             o.get_key_symbol() === Clutter.KEY_Control_R) &&
-            !this._pickWindow) {
+        if ((o.get_key_symbol() == Clutter.KEY_Control_L ||
+             o.get_key_symbol() == Clutter.KEY_Control_R)
+            && !this._pickWindow) {
            this._prevFocusActor = global.stage.get_key_focus();
            global.stage.set_key_focus(null);
            this._pickWorkspace = true;
@@ -191,17 +157,17 @@ class MyWorkspacesView extends WorkspacesView.WorkspacesView {
            return true;
        }

-        if (global.stage.get_key_focus() !== global.stage)
+        if (global.stage.get_key_focus() != global.stage)
            return false;

        // ignore shift presses, they're required to get numerals in azerty keyboards
        if ((this._pickWindow || this._pickWorkspace) &&
-            (o.get_key_symbol() === Clutter.KEY_Shift_L ||
-             o.get_key_symbol() === Clutter.KEY_Shift_R))
+            (o.get_key_symbol() == Clutter.KEY_Shift_L ||
+             o.get_key_symbol() == Clutter.KEY_Shift_R))
            return true;

        if (this._pickWindow) {
-            if (this._active !== workspaceManager.get_active_workspace_index()) {
+            if (this._active != workspaceManager.get_active_workspace_index()) {
                this._hideTooltips();
                return false;
            }
@@ -242,26 +208,81 @@ class MyWorkspacesView extends WorkspacesView.WorkspacesView {
            return true;
        }
        return false;
-    }
-});
+    };
+    workViewInjections['_onKeyPress'] = undefined;

-class Extension {
-    constructor() {
-        this._origWorkspace = Workspace.Workspace;
-        this._origWorkspacesView = WorkspacesView.WorkspacesView;
-    }
+    winInjections['_init'] = injectToFunction(Workspace.WindowOverlay.prototype, '_init', function(windowClone, parentActor) {
+        this._id = null;
+        createdActors.push(this._text = new St.Label({ style_class: 'extension-windowsNavigator-window-tooltip' }));
+        this._text.hide();
+        parentActor.add_actor(this._text);
+    });

-    enable() {
-        Workspace.Workspace = MyWorkspace;
-        WorkspacesView.WorkspacesView = MyWorkspacesView;
-    }
+    winInjections['relayout'] = injectToFunction(Workspace.WindowOverlay.prototype, 'relayout', function(_animate) {
+        let [cloneX, cloneY, cloneWidth_, cloneHeight_] = this._windowClone.slot;

-    disable() {
-        Workspace.Workspace = this._origWorkspace;
-        WorkspacesView.WorkspacesView = this._origWorkspacesView;
-    }
+        let textX = cloneX - 2;
+        let textY = cloneY - 2;
+        this._text.set_position(Math.floor(textX) + 5, Math.floor(textY) + 5);
+        this._text.raise_top();
+    });
+
+    workspaceInjections['_init'] = injectToFunction(Workspace.Workspace.prototype, '_init', function(metaWorkspace) {
+        if (metaWorkspace && metaWorkspace.index() < 9) {
+            createdActors.push(this._tip = new St.Label({
+                style_class: 'extension-windowsNavigator-window-tooltip',
+                visible: false
+            }));
+
+            this.actor.add_actor(this._tip);
+            let signalId = this.actor.connect('notify::scale-x', () => {
+                this._tip.set_scale(1 / this.actor.scale_x, 1 / this.actor.scale_x);
+            });
+            connectedSignals.push({ obj: this.actor, id: signalId });
+        } else
+            this._tip = null;
+    });
+
+    workViewInjections['_init'] = injectToFunction(WorkspacesView.WorkspacesView.prototype, '_init', function(_width, _height, _x, _y, _workspaces) {
+        this._pickWorkspace = false;
+        this._pickWindow = false;
+        this._keyPressEventId =
+            global.stage.connect('key-press-event', this._onKeyPress.bind(this));
+        this._keyReleaseEventId =
+            global.stage.connect('key-release-event', this._onKeyRelease.bind(this));
+        connectedSignals.push({ obj: global.stage, id: this._keyPressEventId });
+        connectedSignals.push({ obj: global.stage, id: this._keyReleaseEventId });
+    });
+
+    workViewInjections['_onDestroy'] = injectToFunction(WorkspacesView.WorkspacesView.prototype, '_onDestroy', function() {
+        global.stage.disconnect(this._keyPressEventId);
+        global.stage.disconnect(this._keyReleaseEventId);
+        connectedSignals = [];
+    });
 }

-function init() {
-    return new Extension();
+function removeInjection(object, injection, name) {
+    if (injection[name] === undefined)
+        delete object[name];
+    else
+        object[name] = injection[name];
+}
+
+function disable() {
+    let i;
+
+    for (i in workspaceInjections)
+        removeInjection(Workspace.Workspace.prototype, workspaceInjections, i);
+    for (i in winInjections)
+        removeInjection(Workspace.WindowOverlay.prototype, winInjections, i);
+    for (i in workViewInjections)
+        removeInjection(WorkspacesView.WorkspacesView.prototype, workViewInjections, i);
+
+    for (i of connectedSignals)
+        i.obj.disconnect(i.id);
+
+    for (i of createdActors)
+        i.destroy();
+
+    resetState();
 }
--- a/extensions/workspace-indicator/extension.js
+++ b/extensions/workspace-indicator/extension.js
@@ -2,309 +2,56 @@
 /* exported init enable disable */

 const { Clutter, Gio, GObject, Meta, St } = imports.gi;
-
-const DND = imports.ui.dnd;
-const ExtensionUtils = imports.misc.extensionUtils;
-const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;

-const Me = ExtensionUtils.getCurrentExtension();
-
-const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']);
+const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;

+const Main = imports.ui.main;
+
+const ExtensionUtils = imports.misc.extensionUtils;
+
 const WORKSPACE_SCHEMA = 'org.gnome.desktop.wm.preferences';
 const WORKSPACE_KEY = 'workspace-names';

-const TOOLTIP_OFFSET = 6;
-const TOOLTIP_ANIMATION_TIME = 150;
-
-const MAX_THUMBNAILS = 6;
-
-let WindowPreview = GObject.registerClass(
-class WindowPreview extends St.Button {
-    _init(window) {
-        super._init({
-            style_class: 'workspace-indicator-window-preview',
-        });
-
-        this._delegate = this;
-        DND.makeDraggable(this, { restoreOnSuccess: true });
-
-        this._window = window;
-
-        this.connect('destroy', this._onDestroy.bind(this));
-
-        this._sizeChangedId = this._window.connect('size-changed',
-            () => this.queue_relayout());
-        this._positionChangedId = this._window.connect('position-changed',
-            () => {
-                this._updateVisible();
-                this.queue_relayout();
-            });
-        this._minimizedChangedId = this._window.connect('notify::minimized',
-            this._updateVisible.bind(this));
-
-        this._focusChangedId = global.display.connect('notify::focus-window',
-            this._onFocusChanged.bind(this));
-        this._onFocusChanged();
-    }
-
-    // needed for DND
-    get metaWindow() {
-        return this._window;
-    }
-
-    _onDestroy() {
-        this._window.disconnect(this._sizeChangedId);
-        this._window.disconnect(this._positionChangedId);
-        this._window.disconnect(this._minimizedChangedId);
-        global.display.disconnect(this._focusChangedId);
-    }
-
-    _onFocusChanged() {
-        if (global.display.focus_window === this._window)
-            this.add_style_class_name('active');
-        else
-            this.remove_style_class_name('active');
-    }
-
-    _updateVisible() {
-        const monitor = Main.layoutManager.findIndexForActor(this);
-        const workArea = Main.layoutManager.getWorkAreaForMonitor(monitor);
-        this.visible = this._window.get_frame_rect().overlap(workArea) &&
-            this._window.window_type !== Meta.WindowType.DESKTOP &&
-            this._window.showing_on_its_workspace();
-    }
-});
-
-let WorkspaceLayout = GObject.registerClass(
-class WorkspaceLayout extends Clutter.LayoutManager {
-    vfunc_get_preferred_width() {
-        return [0, 0];
-    }
-
-    vfunc_get_preferred_height() {
-        return [0, 0];
-    }
-
-    vfunc_allocate(container, box) {
-        const monitor = Main.layoutManager.findIndexForActor(container);
-        const workArea = Main.layoutManager.getWorkAreaForMonitor(monitor);
-        const hscale = box.get_width() / workArea.width;
-        const vscale = box.get_height() / workArea.height;
-
-        for (const child of container) {
-            const childBox = new Clutter.ActorBox();
-            const frameRect = child.metaWindow.get_frame_rect();
-            childBox.set_size(
-                Math.round(Math.min(frameRect.width, workArea.width) * hscale),
-                Math.round(Math.min(frameRect.height, workArea.height) * vscale));
-            childBox.set_origin(
-                Math.round((frameRect.x - workArea.x) * hscale),
-                Math.round((frameRect.y - workArea.y) * vscale));
-            child.allocate(childBox);
-        }
-    }
-});
-
-let WorkspaceThumbnail = GObject.registerClass(
-class WorkspaceThumbnail extends St.Button {
-    _init(index) {
-        super._init({
-            style_class: 'workspace',
-            child: new Clutter.Actor({
-                layout_manager: new WorkspaceLayout(),
-                clip_to_allocation: true,
-            }),
-        });
-
-        this._tooltip = new St.Label({
-            style_class: 'dash-label',
-            visible: false,
-        });
-        Main.uiGroup.add_child(this._tooltip);
-
-        this.connect('destroy', this._onDestroy.bind(this));
-        this.connect('notify::hover', this._syncTooltip.bind(this));
-
-        this._index = index;
-        this._delegate = this; // needed for DND
-
-        this._windowPreviews = new Map();
-
-        let workspaceManager = global.workspace_manager;
-        this._workspace = workspaceManager.get_workspace_by_index(index);
-
-        this._windowAddedId = this._workspace.connect('window-added',
-            (ws, window) => {
-                this._addWindow(window);
-            });
-        this._windowRemovedId = this._workspace.connect('window-removed',
-            (ws, window) => {
-                this._removeWindow(window);
-            });
-        this._restackedId = global.display.connect('restacked',
-            this._onRestacked.bind(this));
-
-        this._workspace.list_windows().forEach(w => this._addWindow(w));
-        this._onRestacked();
-    }
-
-    acceptDrop(source) {
-        if (!source.metaWindow)
-            return false;
-
-        this._moveWindow(source.metaWindow);
-        return true;
-    }
-
-    handleDragOver(source) {
-        if (source.metaWindow)
-            return DND.DragMotionResult.MOVE_DROP;
-        else
-            return DND.DragMotionResult.CONTINUE;
-    }
-
-    _addWindow(window) {
-        if (this._windowPreviews.has(window))
-            return;
-
-        let preview = new WindowPreview(window);
-        preview.connect('clicked', (a, btn) => this.emit('clicked', btn));
-        this._windowPreviews.set(window, preview);
-        this.child.add_child(preview);
-    }
-
-    _removeWindow(window) {
-        let preview = this._windowPreviews.get(window);
-        if (!preview)
-            return;
-
-        this._windowPreviews.delete(window);
-        preview.destroy();
-    }
-
-    _onRestacked() {
-        let lastPreview = null;
-        let windows = global.get_window_actors().map(a => a.meta_window);
-        for (let i = 0; i < windows.length; i++) {
-            let preview = this._windowPreviews.get(windows[i]);
-            if (!preview)
-                continue;
-
-            this.child.set_child_above_sibling(preview, lastPreview);
-            lastPreview = preview;
-        }
-    }
-
-    _moveWindow(window) {
-        let monitorIndex = Main.layoutManager.findIndexForActor(this);
-        if (monitorIndex !== window.get_monitor())
-            window.move_to_monitor(monitorIndex);
-        window.change_workspace_by_index(this._index, false);
-    }
-
-    on_clicked() {
-        let ws = global.workspace_manager.get_workspace_by_index(this._index);
-        if (ws)
-            ws.activate(global.get_current_time());
-    }
-
-    _syncTooltip() {
-        if (this.hover) {
-            this._tooltip.set({
-                text: Meta.prefs_get_workspace_name(this._index),
-                visible: true,
-                opacity: 0,
-            });
-
-            const [stageX, stageY] = this.get_transformed_position();
-            const thumbWidth = this.allocation.get_width();
-            const thumbHeight = this.allocation.get_height();
-            const tipWidth = this._tooltip.width;
-            const xOffset = Math.floor((thumbWidth - tipWidth) / 2);
-            const monitor = Main.layoutManager.findMonitorForActor(this);
-            const x = Math.clamp(
-                stageX + xOffset,
-                monitor.x,
-                monitor.x + monitor.width - tipWidth);
-            const y = stageY + thumbHeight + TOOLTIP_OFFSET;
-            this._tooltip.set_position(x, y);
-        }
-
-        this._tooltip.ease({
-            opacity: this.hover ? 255 : 0,
-            duration: TOOLTIP_ANIMATION_TIME,
-            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-            onComplete: () => (this._tooltip.visible = this.hover),
-        });
-    }
-
-    _onDestroy() {
-        this._tooltip.destroy();
-
-        this._workspace.disconnect(this._windowAddedId);
-        this._workspace.disconnect(this._windowRemovedId);
-        global.display.disconnect(this._restackedId);
-    }
-});
-
 let WorkspaceIndicator = GObject.registerClass(
 class WorkspaceIndicator extends PanelMenu.Button {
    _init() {
        super._init(0.0, _('Workspace Indicator'));

-        let container = new St.Widget({
-            layout_manager: new Clutter.BinLayout(),
-            x_expand: true,
-            y_expand: true,
-        });
-        this.add_actor(container);
-
        let workspaceManager = global.workspace_manager;

-        this._currentWorkspace = workspaceManager.get_active_workspace_index();
-        this._statusLabel = new St.Label({
-            style_class: 'panel-workspace-indicator',
+        this._currentWorkspace = workspaceManager.get_active_workspace().index();
+        this.statusLabel = new St.Label({
            y_align: Clutter.ActorAlign.CENTER,
-            text: this._labelText(),
+            text: this._labelText()
        });

-        container.add_actor(this._statusLabel);
+        this.add_actor(this.statusLabel);

-        this._thumbnailsBox = new St.BoxLayout({
-            style_class: 'panel-workspace-indicator-box',
-            y_expand: true,
-            reactive: true,
-        });
-
-        container.add_actor(this._thumbnailsBox);
-
-        this._workspacesItems = [];
+        this.workspacesItems = [];
        this._workspaceSection = new PopupMenu.PopupMenuSection();
        this.menu.addMenuItem(this._workspaceSection);

-        this._workspaceManagerSignals = [
-            workspaceManager.connect_after('notify::n-workspaces',
-                this._nWorkspacesChanged.bind(this)),
-            workspaceManager.connect_after('workspace-switched',
-                this._onWorkspaceSwitched.bind(this)),
-            workspaceManager.connect('notify::layout-rows',
-                this._updateThumbnailVisibility.bind(this)),
-        ];
+        this._workspaceManagerSignals = [];
+        this._workspaceManagerSignals.push(workspaceManager.connect_after('workspace-added',
+                                                                          this._createWorkspacesSection.bind(this)));
+        this._workspaceManagerSignals.push(workspaceManager.connect_after('workspace-removed',
+                                                                          this._createWorkspacesSection.bind(this)));
+        this._workspaceManagerSignals.push(workspaceManager.connect_after('workspace-switched',
+                                                                          this._updateIndicator.bind(this)));

        this.connect('scroll-event', this._onScrollEvent.bind(this));
-        this._thumbnailsBox.connect('scroll-event', this._onScrollEvent.bind(this));
        this._createWorkspacesSection();
-        this._updateThumbnails();
-        this._updateThumbnailVisibility();
+
+        //styling
+        this.statusLabel.add_style_class_name('panel-workspace-indicator');

        this._settings = new Gio.Settings({ schema_id: WORKSPACE_SCHEMA });
-        this._settingsChangedId = this._settings.connect(
-            `changed::${WORKSPACE_KEY}`,
-            this._updateMenuLabels.bind(this));
+        this._settingsChangedId =
+            this._settings.connect(`changed::${WORKSPACE_KEY}`,
+                                   this._createWorkspacesSection.bind(this));
    }

    _onDestroy() {
@@ -316,114 +63,53 @@ class WorkspaceIndicator extends PanelMenu.Button {
            this._settingsChangedId = 0;
        }

-        Main.panel.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS);
-
        super._onDestroy();
    }

-    _updateThumbnailVisibility() {
-        const { workspaceManager } = global;
-        const vertical = workspaceManager.layout_rows === -1;
-        const useMenu =
-            vertical || workspaceManager.n_workspaces > MAX_THUMBNAILS;
-        this.reactive = useMenu;
+    _updateIndicator() {
+        this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.NONE);
+        this._currentWorkspace = global.workspace_manager.get_active_workspace().index();
+        this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.DOT);

-        this._statusLabel.visible = useMenu;
-        this._thumbnailsBox.visible = !useMenu;
-
-        // Disable offscreen-redirect when showing the workspace switcher
-        // so that clip-to-allocation works
-        Main.panel.set_offscreen_redirect(useMenu
-            ? Clutter.OffscreenRedirect.ALWAYS
-            : Clutter.OffscreenRedirect.AUTOMATIC_FOR_OPACITY);
-    }
-
-    _onWorkspaceSwitched() {
-        this._currentWorkspace = global.workspace_manager.get_active_workspace_index();
-
-        this._updateMenuOrnament();
-        this._updateActiveThumbnail();
-
-        this._statusLabel.set_text(this._labelText());
-    }
-
-    _nWorkspacesChanged() {
-        this._createWorkspacesSection();
-        this._updateThumbnails();
-        this._updateThumbnailVisibility();
-    }
-
-    _updateMenuOrnament() {
-        for (let i = 0; i < this._workspacesItems.length; i++) {
-            this._workspacesItems[i].setOrnament(i === this._currentWorkspace
-                ? PopupMenu.Ornament.DOT
-                : PopupMenu.Ornament.NONE);
-        }
-    }
-
-    _updateActiveThumbnail() {
-        let thumbs = this._thumbnailsBox.get_children();
-        for (let i = 0; i < thumbs.length; i++) {
-            if (i === this._currentWorkspace)
-                thumbs[i].add_style_class_name('active');
-            else
-                thumbs[i].remove_style_class_name('active');
-        }
+        this.statusLabel.set_text(this._labelText());
    }

    _labelText(workspaceIndex) {
-        if (workspaceIndex === undefined) {
+        if (workspaceIndex == undefined) {
            workspaceIndex = this._currentWorkspace;
            return (workspaceIndex + 1).toString();
        }
        return Meta.prefs_get_workspace_name(workspaceIndex);
    }

-    _updateMenuLabels() {
-        for (let i = 0; i < this._workspacesItems.length; i++)
-            this._workspacesItems[i].label.text = this._labelText(i);
-    }
-
    _createWorkspacesSection() {
        let workspaceManager = global.workspace_manager;

        this._workspaceSection.removeAll();
-        this._workspacesItems = [];
-        this._currentWorkspace = workspaceManager.get_active_workspace_index();
+        this.workspacesItems = [];
+        this._currentWorkspace = workspaceManager.get_active_workspace().index();

        let i = 0;
        for (; i < workspaceManager.n_workspaces; i++) {
-            this._workspacesItems[i] = new PopupMenu.PopupMenuItem(this._labelText(i));
-            this._workspaceSection.addMenuItem(this._workspacesItems[i]);
-            this._workspacesItems[i].workspaceId = i;
-            this._workspacesItems[i].label_actor = this._statusLabel;
-            this._workspacesItems[i].connect('activate', (actor, _event) => {
+            this.workspacesItems[i] = new PopupMenu.PopupMenuItem(this._labelText(i));
+            this._workspaceSection.addMenuItem(this.workspacesItems[i]);
+            this.workspacesItems[i].workspaceId = i;
+            this.workspacesItems[i].label_actor = this.statusLabel;
+            this.workspacesItems[i].connect('activate', (actor, _event) => {
                this._activate(actor.workspaceId);
            });

-            if (i === this._currentWorkspace)
-                this._workspacesItems[i].setOrnament(PopupMenu.Ornament.DOT);
+            if (i == this._currentWorkspace)
+                this.workspacesItems[i].setOrnament(PopupMenu.Ornament.DOT);
        }

-        this._statusLabel.set_text(this._labelText());
-    }
-
-    _updateThumbnails() {
-        let workspaceManager = global.workspace_manager;
-
-        this._thumbnailsBox.destroy_all_children();
-
-        for (let i = 0; i < workspaceManager.n_workspaces; i++) {
-            let thumb = new WorkspaceThumbnail(i);
-            this._thumbnailsBox.add_actor(thumb);
-        }
-        this._updateActiveThumbnail();
+        this.statusLabel.set_text(this._labelText());
    }

    _activate(index) {
        let workspaceManager = global.workspace_manager;

-        if (index >= 0 && index < workspaceManager.n_workspaces) {
+        if (index >= 0 && index <  workspaceManager.n_workspaces) {
            let metaWorkspace = workspaceManager.get_workspace_by_index(index);
            metaWorkspace.activate(global.get_current_time());
        }
@@ -432,15 +118,15 @@ class WorkspaceIndicator extends PanelMenu.Button {
    _onScrollEvent(actor, event) {
        let direction = event.get_scroll_direction();
        let diff = 0;
-        if (direction === Clutter.ScrollDirection.DOWN)
+        if (direction == Clutter.ScrollDirection.DOWN) {
            diff = 1;
-        else if (direction === Clutter.ScrollDirection.UP)
+        } else if (direction == Clutter.ScrollDirection.UP) {
            diff = -1;
-        else
+        } else {
            return;
+        }

-
-        let newIndex = global.workspace_manager.get_active_workspace_index() + diff;
+        let newIndex = global.workspace_manager.get_active_workspace().index() + diff;
        this._activate(newIndex);
    }
 });
@@ -452,7 +138,7 @@ function init() {
 let _indicator;

 function enable() {
-    _indicator = new WorkspaceIndicator();
+    _indicator = new WorkspaceIndicator;
    Main.panel.addToStatusArea('workspace-indicator', _indicator);
 }

--- a/extensions/workspace-indicator/prefs.js
+++ b/extensions/workspace-indicator/prefs.js
@@ -1,212 +1,202 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
 /* exported init buildPrefsWidget */

-const { Gio, GLib, GObject, Gtk, Pango } = imports.gi;
+const { Gio, GObject, Gtk } = imports.gi;

-const ExtensionUtils = imports.misc.extensionUtils;
-const Me = ExtensionUtils.getCurrentExtension();
-
-const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']);
+const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
 const N_ = e => e;

+const ExtensionUtils = imports.misc.extensionUtils;
+
 const WORKSPACE_SCHEMA = 'org.gnome.desktop.wm.preferences';
 const WORKSPACE_KEY = 'workspace-names';

+const WorkspaceNameModel = GObject.registerClass(
+class WorkspaceNameModel extends Gtk.ListStore {
+    _init(params) {
+        super._init(params);
+        this.set_column_types([GObject.TYPE_STRING]);
+
+        this.Columns = {
+            LABEL: 0,
+        };
+
+        this._settings = new Gio.Settings({ schema_id: WORKSPACE_SCHEMA });
+        //this._settings.connect('changed::workspace-names', this._reloadFromSettings.bind(this));
+
+        this._reloadFromSettings();
+
+        // overriding class closure doesn't work, because GtkTreeModel
+        // plays tricks with marshallers and class closures
+        this.connect('row-changed', this._onRowChanged.bind(this));
+        this.connect('row-inserted', this._onRowInserted.bind(this));
+        this.connect('row-deleted', this._onRowDeleted.bind(this));
+    }
+
+    _reloadFromSettings() {
+        if (this._preventChanges)
+            return;
+        this._preventChanges = true;
+
+        let newNames = this._settings.get_strv(WORKSPACE_KEY);
+
+        let i = 0;
+        let [ok, iter] = this.get_iter_first();
+        while (ok && i < newNames.length) {
+            this.set(iter, [this.Columns.LABEL], [newNames[i]]);
+
+            ok = this.iter_next(iter);
+            i++;
+        }
+
+        while (ok)
+            ok = this.remove(iter);
+
+        for ( ; i < newNames.length; i++) {
+            iter = this.append();
+            this.set(iter, [this.Columns.LABEL], [newNames[i]]);
+        }
+
+        this._preventChanges = false;
+    }
+
+    _onRowChanged(self, path, iter) {
+        if (this._preventChanges)
+            return;
+        this._preventChanges = true;
+
+        let index = path.get_indices()[0];
+        let names = this._settings.get_strv(WORKSPACE_KEY);
+
+        if (index >= names.length) {
+            // fill with blanks
+            for (let i = names.length; i <= index; i++)
+                names[i] = '';
+        }
+
+        names[index] = this.get_value(iter, this.Columns.LABEL);
+
+        this._settings.set_strv(WORKSPACE_KEY, names);
+
+        this._preventChanges = false;
+    }
+
+    _onRowInserted(self, path, iter) {
+        if (this._preventChanges)
+            return;
+        this._preventChanges = true;
+
+        let index = path.get_indices()[0];
+        let names = this._settings.get_strv(WORKSPACE_KEY);
+        let label = this.get_value(iter, this.Columns.LABEL) || '';
+        names.splice(index, 0, label);
+
+        this._settings.set_strv(WORKSPACE_KEY, names);
+
+        this._preventChanges = false;
+    }
+
+    _onRowDeleted(self, path) {
+        if (this._preventChanges)
+            return;
+        this._preventChanges = true;
+
+        let index = path.get_indices()[0];
+        let names = this._settings.get_strv(WORKSPACE_KEY);
+
+        if (index >= names.length)
+            return;
+
+        names.splice(index, 1);
+
+        // compact the array
+        for (let i = names.length - 1; i >= 0 && !names[i]; i++)
+            names.pop();
+
+        this._settings.set_strv(WORKSPACE_KEY, names);
+
+        this._preventChanges = false;
+    }
+});
+
 const WorkspaceSettingsWidget = GObject.registerClass(
-class WorkspaceSettingsWidget extends Gtk.ScrolledWindow {
-    _init() {
-        super._init({
-            hscrollbar_policy: Gtk.PolicyType.NEVER,
-        });
+class WorkspaceSettingsWidget extends Gtk.Grid {
+    _init(params) {
+        super._init(params);
+        this.margin = 12;
+        this.orientation = Gtk.Orientation.VERTICAL;

-        const box = new Gtk.Box({
-            orientation: Gtk.Orientation.VERTICAL,
-            halign: Gtk.Align.CENTER,
-            spacing: 12,
-            margin_top: 36,
-            margin_bottom: 36,
-            margin_start: 36,
-            margin_end: 36,
-        });
-        this.set_child(box);
-
-        box.append(new Gtk.Label({
+        this.add(new Gtk.Label({
            label: '<b>%s</b>'.format(_('Workspace Names')),
            use_markup: true,
-            halign: Gtk.Align.START,
-        }));
-
-        this._list = new Gtk.ListBox({
-            selection_mode: Gtk.SelectionMode.NONE,
-            valign: Gtk.Align.START,
-            show_separators: true,
-        });
-        this._list.connect('row-activated', (l, row) => row.edit());
-        box.append(this._list);
-
-        const context = this._list.get_style_context();
-        const cssProvider = new Gtk.CssProvider();
-        cssProvider.load_from_data(
-            'list { min-width: 25em; }');
-
-        context.add_provider(cssProvider,
-            Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
-        context.add_class('frame');
-
-        this._list.append(new NewWorkspaceRow());
-
-        this._actionGroup = new Gio.SimpleActionGroup();
-        this._list.insert_action_group('workspaces', this._actionGroup);
-
-        let action;
-        action = new Gio.SimpleAction({ name: 'add' });
-        action.connect('activate', () => {
-            const names = this._settings.get_strv(WORKSPACE_KEY);
-            this._settings.set_strv(WORKSPACE_KEY, [
-                ...names,
-                _('Workspace %d').format(names.length + 1),
-            ]);
-        });
-        this._actionGroup.add_action(action);
-
-        action = new Gio.SimpleAction({
-            name: 'remove',
-            parameter_type: new GLib.VariantType('s'),
-        });
-        action.connect('activate', (a, param) => {
-            const removed = param.deepUnpack();
-            this._settings.set_strv(WORKSPACE_KEY,
-                this._settings.get_strv(WORKSPACE_KEY)
-                    .filter(name => name !== removed));
-        });
-        this._actionGroup.add_action(action);
-
-        action = new Gio.SimpleAction({ name: 'update' });
-        action.connect('activate', () => {
-            const names = this._getWorkspaceRows().map(row => row.name);
-            this._settings.set_strv(WORKSPACE_KEY, names);
-        });
-        this._actionGroup.add_action(action);
-
-        this._settings = new Gio.Settings({
-            schema_id: WORKSPACE_SCHEMA,
-        });
-        this._settings.connect(`changed::${WORKSPACE_KEY}`,
-            this._sync.bind(this));
-        this._sync();
-    }
-
-    _getWorkspaceRows() {
-        return [...this._list].filter(row => row.name);
-    }
-
-    _sync() {
-        const rows = this._getWorkspaceRows();
-
-        const oldNames = rows.map(row => row.name);
-        const newNames = this._settings.get_strv(WORKSPACE_KEY);
-
-        const removed = oldNames.filter(n => !newNames.includes(n));
-        const added = newNames.filter(n => !oldNames.includes(n));
-
-        removed.forEach(n => this._list.remove(rows.find(r => r.name === n)));
-        added.forEach(n => {
-            this._list.insert(new WorkspaceRow(n), newNames.indexOf(n));
-        });
-    }
-});
-
-const WorkspaceRow = GObject.registerClass(
-class WorkspaceRow extends Gtk.ListBoxRow {
-    _init(name) {
-        super._init({ name });
-
-        const controller = new Gtk.ShortcutController();
-        controller.add_shortcut(new Gtk.Shortcut({
-            trigger: Gtk.ShortcutTrigger.parse_string('Escape'),
-            action: Gtk.CallbackAction.new(this._stopEdit.bind(this)),
-        }));
-        this.add_controller(controller);
-
-        const box = new Gtk.Box({
-            spacing: 12,
-            margin_top: 6,
            margin_bottom: 6,
-            margin_start: 6,
-            margin_end: 6,
-        });
-
-        const label = new Gtk.Label({
            hexpand: true,
-            xalign: 0,
-            max_width_chars: 25,
-            ellipsize: Pango.EllipsizeMode.END,
-        });
-        this.bind_property('name', label, 'label',
-            GObject.BindingFlags.SYNC_CREATE);
-        box.append(label);
+            halign: Gtk.Align.START
+        }));

-        const button = new Gtk.Button({
-            action_name: 'workspaces.remove',
-            action_target: new GLib.Variant('s', name),
-            icon_name: 'edit-delete-symbolic',
-        });
-        box.append(button);
+        let scrolled = new Gtk.ScrolledWindow({ shadow_type: Gtk.ShadowType.IN });
+        scrolled.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
+        this.add(scrolled);

-        this._entry = new Gtk.Entry({
-            max_width_chars: 25,
+        this._store = new WorkspaceNameModel();
+        this._treeView = new Gtk.TreeView({
+            model: this._store,
+            headers_visible: false,
+            reorderable: true,
+            hexpand: true,
+            vexpand: true
        });

-        this._stack = new Gtk.Stack();
-        this._stack.add_named(box, 'display');
-        this._stack.add_named(this._entry, 'edit');
-        this.child = this._stack;
+        let column = new Gtk.TreeViewColumn({ title: _('Name') });
+        let renderer = new Gtk.CellRendererText({ editable: true });
+        renderer.connect('edited', this._cellEdited.bind(this));
+        column.pack_start(renderer, true);
+        column.add_attribute(renderer, 'text', this._store.Columns.LABEL);
+        this._treeView.append_column(column);

-        this._entry.connect('activate', () => {
-            this.name = this._entry.text;
-            this._stopEdit();
-        });
-        this._entry.connect('notify::has-focus', () => {
-            if (this._entry.has_focus)
-                return;
-            this._stopEdit();
-        });
+        scrolled.add(this._treeView);

-        this.connect('notify::name', () => {
-            button.action_target = new GLib.Variant('s', this.name);
-            this.activate_action('workspaces.update', null);
+        let toolbar = new Gtk.Toolbar({ icon_size: Gtk.IconSize.SMALL_TOOLBAR });
+        toolbar.get_style_context().add_class(Gtk.STYLE_CLASS_INLINE_TOOLBAR);
+
+        let newButton = new Gtk.ToolButton({ icon_name: 'list-add-symbolic' });
+        newButton.connect('clicked', this._newClicked.bind(this));
+        toolbar.add(newButton);
+
+        let delButton = new Gtk.ToolButton({ icon_name: 'list-remove-symbolic' });
+        delButton.connect('clicked', this._delClicked.bind(this));
+        toolbar.add(delButton);
+
+        let selection = this._treeView.get_selection();
+        selection.connect('changed', () => {
+            delButton.sensitive = selection.count_selected_rows() > 0;
        });
+        delButton.sensitive = selection.count_selected_rows() > 0;
+
+        this.add(toolbar);
    }

-    edit() {
-        this._entry.text = this.name;
-        this._entry.grab_focus();
-        this._stack.visible_child_name = 'edit';
+    _cellEdited(renderer, path, newText) {
+        let [ok, iter] = this._store.get_iter_from_string(path);
+
+        if (ok)
+            this._store.set(iter, [this._store.Columns.LABEL], [newText]);
    }

-    _stopEdit() {
-        this.grab_focus();
-        this._stack.visible_child_name = 'display';
-    }
-});
+    _newClicked() {
+        let iter = this._store.append();
+        let index = this._store.get_path(iter).get_indices()[0];

-const NewWorkspaceRow = GObject.registerClass(
-class NewWorkspaceRow extends Gtk.ListBoxRow {
-    _init() {
-        super._init({
-            action_name: 'workspaces.add',
-            child: new Gtk.Image({
-                icon_name: 'list-add-symbolic',
-                pixel_size: 16,
-                margin_top: 12,
-                margin_bottom: 12,
-                margin_start: 12,
-                margin_end: 12,
-            }),
-        });
-        this.update_property(
-            [Gtk.AccessibleProperty.LABEL], [_('Add Workspace')]);
+        let label = _('Workspace %d').format(index + 1);
+        this._store.set(iter, [this._store.Columns.LABEL], [label]);
+    }
+
+    _delClicked() {
+        let [any, model_, iter] = this._treeView.get_selection().get_selected();
+
+        if (any)
+            this._store.remove(iter);
    }
 });

@@ -215,5 +205,8 @@ function init() {
 }

 function buildPrefsWidget() {
-    return new WorkspaceSettingsWidget();
+    let widget = new WorkspaceSettingsWidget();
+    widget.show_all();
+
+    return widget;
 }
--- a/extensions/workspace-indicator/stylesheet.css
+++ b/extensions/workspace-indicator/stylesheet.css
@@ -1,28 +1,5 @@
 .panel-workspace-indicator {
-  padding: 0 8px;
-}
-
-.panel-workspace-indicator-box {
-  padding: 4px 0;
-  spacing: 4px;
-}
-
-.panel-workspace-indicator-box .workspace {
-  width: 40px;
-  border: 2px solid #000;
-  border-radius: 2px;
-  background-color: #595959;
-}
-
-.panel-workspace-indicator-box .workspace.active {
-  border-color: #fff;
-}
-
-.workspace-indicator-window-preview {
-  background-color: #bebebe;
-  border: 1px solid #828282;
-}
-
-.workspace-indicator-window-preview.active {
-  background-color: #d4d4d4;
+	padding: 0 8px;
+	background-color: rgba(200, 200, 200, .5);
+	border: 1px solid #cccccc;
 }
--- a/gnome-shell-extensions.doap
+++ b/gnome-shell-extensions.doap
@@ -34,10 +34,4 @@ and will be picked automatically at next login.
      <gnome:userid>fmuellner</gnome:userid>
    </foaf:Person>
  </maintainer>
-  <maintainer>
-    <foaf:Person>
-      <foaf:name>Marge Bot</foaf:name>
-      <gnome:userid>marge-bot</gnome:userid>
-    </foaf:Person>
-  </maintainer>
 </Project>
--- a/lint/eslintrc-gjs.json
+++ b/lint/eslintrc-gjs.json
@@ -0,0 +1,130 @@
+{
+    "env": {
+        "es6": true
+    },
+    "extends": "eslint:recommended",
+    "rules": {
+        "array-bracket-newline": [
+            "error",
+            "consistent"
+        ],
+        "array-bracket-spacing": [
+            "error",
+            "never"
+        ],
+        "arrow-spacing": "error",
+        "brace-style": "error",
+        "comma-spacing": [
+            "error",
+            {
+                "before": false,
+                "after": true
+            }
+        ],
+        "indent": [
+            "error",
+            4,
+            {
+                "ignoredNodes": [
+                    "CallExpression[callee.object.name=GObject][callee.property.name=registerClass] > ClassExpression:first-child"
+                ],
+                "MemberExpression": "off"
+            }
+        ],
+        "key-spacing": [
+            "error",
+            {
+                "beforeColon": false,
+                "afterColon": true
+            }
+        ],
+        "keyword-spacing": [
+            "error",
+            {
+                "before": true,
+                "after": true
+            }
+        ],
+        "linebreak-style": [
+            "error",
+            "unix"
+        ],
+        "no-empty": [
+            "error",
+            {
+                "allowEmptyCatch": true
+            }
+        ],
+        "no-implicit-coercion": [
+            "error",
+            {
+                "allow": ["!!"]
+            }
+        ],
+        "no-restricted-properties": [
+            "error",
+            {
+                "object": "Lang",
+                "property": "bind",
+                "message": "Use arrow notation or Function.prototype.bind()"
+            },
+            {
+                "object": "Lang",
+                "property": "Class",
+                "message": "Use ES6 classes"
+            }
+        ],
+        "nonblock-statement-body-position": [
+            "error",
+            "below"
+        ],
+        "object-curly-newline": [
+            "error",
+            {
+                "consistent": true
+            }
+        ],
+        "object-curly-spacing": "error",
+        "prefer-template": "error",
+        "quotes": [
+            "error",
+            "single",
+            {
+                "avoidEscape": true
+            }
+        ],
+        "semi": [
+            "error",
+            "always"
+        ],
+        "semi-spacing": [
+            "error",
+            {
+                "before": false,
+                "after": true
+            }
+        ],
+        "space-before-blocks": "error",
+        "space-infix-ops": [
+            "error",
+            {
+                "int32Hint": false
+            }
+        ]
+    },
+    "globals": {
+        "ARGV": false,
+        "Debugger": false,
+        "GIRepositoryGType": false,
+        "imports": false,
+        "Intl": false,
+        "log": false,
+        "logError": false,
+        "print": false,
+        "printerr": false,
+        "window": false
+    },
+    "parserOptions": {
+        "ecmaVersion": 2017
+    }
+}
--- a/lint/eslintrc-gjs.yml
+++ b/lint/eslintrc-gjs.yml
@@ -1,237 +0,0 @@
---
-# SPDX-License-Identifier: MIT OR LGPL-2.0-or-later
-env:
-  es6: true
-extends: 'eslint:recommended'
-rules:
-  array-bracket-newline:
-    - error
-    - consistent
-  array-bracket-spacing:
-    - error
-    - never
-  array-callback-return: error
-  arrow-parens:
-    - error
-    - as-needed
-  arrow-spacing: error
-  block-scoped-var: error
-  block-spacing: error
-  brace-style: error
-  # Waiting for this to have matured a bit in eslint
-  # camelcase:
-  #   - error
-  #   - properties: never
-  #     allow: [^vfunc_, ^on_, _instance_init]
-  comma-dangle:
-    - error
-    - arrays: always-multiline
-      objects: always-multiline
-      functions: never
-  comma-spacing:
-    - error
-    - before: false
-      after: true
-  comma-style:
-    - error
-    - last
-  computed-property-spacing: error
-  curly:
-    - error
-    - multi-or-nest
-    - consistent
-  dot-location:
-    - error
-    - property
-  eol-last: error
-  eqeqeq: error
-  func-call-spacing: error
-  func-name-matching: error
-  func-style:
-    - error
-    - declaration
-    - allowArrowFunctions: true
-  indent:
-    - error
-    - 4
-    - ignoredNodes:
-      # Allow not indenting the body of GObject.registerClass, since in the
-      # future it's intended to be a decorator
-      - 'CallExpression[callee.object.name=GObject][callee.property.name=registerClass] > ClassExpression:first-child'
-      # Allow dedenting chained member expressions
-      MemberExpression: 'off'
-  key-spacing:
-    - error
-    - beforeColon: false
-      afterColon: true
-  keyword-spacing:
-    - error
-    - before: true
-      after: true
-  linebreak-style:
-    - error
-    - unix
-  lines-between-class-members: error
-  max-nested-callbacks: error
-  max-statements-per-line: error
-  new-parens: error
-  no-array-constructor: error
-  no-await-in-loop: error
-  no-caller: error
-  no-constant-condition:
-    - error
-    - checkLoops: false
-  no-div-regex: error
-  no-empty:
-    - error
-    - allowEmptyCatch: true
-  no-extra-bind: error
-  no-extra-parens:
-    - error
-    - all
-    - conditionalAssign: false
-      nestedBinaryExpressions: false
-      returnAssign: false
-  no-implicit-coercion:
-    - error
-    - allow:
-      - '!!'
-  no-invalid-this: error
-  no-iterator: error
-  no-label-var: error
-  no-lonely-if: error
-  no-loop-func: error
-  no-nested-ternary: error
-  no-new-object: error
-  no-new-wrappers: error
-  no-octal-escape: error
-  no-proto: error
-  no-prototype-builtins: 'off'
-  no-restricted-properties:
-    - error
-    - object: Lang
-      property: copyProperties
-      message: Use Object.assign()
-    - object: Lang
-      property: bind
-      message: Use arrow notation or Function.prototype.bind()
-    - object: Lang
-      property: Class
-      message: Use ES6 classes
-  no-restricted-syntax:
-    - error
-    - selector: >-
-        MethodDefinition[key.name="_init"] >
-        FunctionExpression[params.length=1] >
-        BlockStatement[body.length=1]
-        CallExpression[arguments.length=1][callee.object.type="Super"][callee.property.name="_init"] >
-        Identifier:first-child
-      message: _init() that only calls super._init() is unnecessary
-    - selector: >-
-        MethodDefinition[key.name="_init"] >
-        FunctionExpression[params.length=0] >
-        BlockStatement[body.length=1]
-        CallExpression[arguments.length=0][callee.object.type="Super"][callee.property.name="_init"]
-      message: _init() that only calls super._init() is unnecessary
-    - selector: BinaryExpression[operator="instanceof"][right.name="Array"]
-      message: Use Array.isArray()
-  no-return-assign: error
-  no-return-await: error
-  no-self-compare: error
-  no-shadow: error
-  no-shadow-restricted-names: error
-  no-spaced-func: error
-  no-tabs: error
-  no-template-curly-in-string: error
-  no-throw-literal: error
-  no-trailing-spaces: error
-  no-undef-init: error
-  no-unneeded-ternary: error
-  no-unused-expressions: error
-  no-unused-vars:
-    - error
-    # Vars use a suffix _ instead of a prefix because of file-scope private vars
-    - varsIgnorePattern: (^unused|_$)
-      argsIgnorePattern: ^(unused|_)
-  no-useless-call: error
-  no-useless-computed-key: error
-  no-useless-concat: error
-  no-useless-constructor: error
-  no-useless-rename: error
-  no-useless-return: error
-  no-whitespace-before-property: error
-  no-with: error
-  nonblock-statement-body-position:
-    - error
-    - below
-  object-curly-newline:
-    - error
-    - consistent: true
-  object-curly-spacing: error
-  object-shorthand: error
-  operator-assignment: error
-  operator-linebreak: error
-  padded-blocks:
-    - error
-    - never
-  # These may be a bit controversial, we can try them out and enable them later
-  # prefer-const: error
-  # prefer-destructuring: error
-  prefer-numeric-literals: error
-  prefer-promise-reject-errors: error
-  prefer-rest-params: error
-  prefer-spread: error
-  prefer-template: error
-  quotes:
-    - error
-    - single
-    - avoidEscape: true
-  require-await: error
-  rest-spread-spacing: error
-  semi:
-    - error
-    - always
-  semi-spacing:
-    - error
-    - before: false
-      after: true
-  semi-style: error
-  space-before-blocks: error
-  space-before-function-paren:
-    - error
-    - named: never
-      # for `function ()` and `async () =>`, preserve space around keywords
-      anonymous: always
-      asyncArrow: always
-  space-in-parens: error
-  space-infix-ops:
-    - error
-    - int32Hint: false
-  space-unary-ops: error
-  spaced-comment: error
-  switch-colon-spacing: error
-  symbol-description: error
-  template-curly-spacing: error
-  template-tag-spacing: error
-  unicode-bom: error
-  valid-jsdoc:
-    - error
-    - requireReturn: false
-  wrap-iife:
-    - error
-    - inside
-  yield-star-spacing: error
-  yoda: error
-globals:
-  ARGV: readonly
-  Debugger: readonly
-  GIRepositoryGType: readonly
-  globalThis: readonly
-  imports: readonly
-  Intl: readonly
-  log: readonly
-  logError: readonly
-  print: readonly
-  printerr: readonly
-parserOptions:
-  ecmaVersion: 2020
--- a/lint/eslintrc-legacy.json
+++ b/lint/eslintrc-legacy.json
@@ -0,0 +1,16 @@
+{
+    "rules": {
+        "indent": [
+            "error",
+            4,
+            {
+                "ignoredNodes": [
+                    "CallExpression > ArrowFunctionExpression",
+                    "CallExpression[callee.object.name=GObject][callee.property.name=registerClass] > ClassExpression:first-child"
+                ],
+                "CallExpression": { "arguments": "first" },
+                "MemberExpression": "off"
+            }
+        ]
+   }
+}
--- a/lint/eslintrc-shell.json
+++ b/lint/eslintrc-shell.json
@@ -0,0 +1,30 @@
+{
+    "rules": {
+        "camelcase": [
+            "error",
+            {
+                "properties": "never",
+                "allow": ["^vfunc_"]
+            }
+        ],
+        "no-unused-vars": [
+            "error",
+            {
+                "argsIgnorePattern": "^_",
+                "varsIgnorePattern": "_$"
+            }
+        ],
+        "object-curly-spacing": [
+            "error",
+            "always"
+        ],
+        "prefer-arrow-callback": "error"
+    },
+    "globals": {
+        "global": false,
+        "_": false,
+        "C_": false,
+        "N_": false,
+        "ngettext": false
+    }
+}
--- a/lint/eslintrc-shell.yml
+++ b/lint/eslintrc-shell.yml
@@ -1,11 +0,0 @@
-rules:
-  camelcase:
-    - error
-    - properties: never
-      allow: [^vfunc_, ^on_]
-  object-curly-spacing:
-    - error
-    - always
-  prefer-arrow-callback: error
-globals:
-  global: readonly
--- a/lint/generate-report.sh
+++ b/lint/generate-report.sh
@@ -0,0 +1,61 @@
+#!/bin/sh
+SEP=`printf '\t'`
+OUTPUT=/dev/stderr
+CWD=`pwd`
+SRCDIR=`dirname $0`
+
+run_lint() {
+  eslint -f unix "$@" .
+}
+
+parse_opts() {
+  tmp=`getopt -l output: o: "$@"`
+  [ $? -ne 0 ] && exit 1
+
+  eval set -- $tmp
+  while true
+  do
+    case $1 in
+      --output|-o)
+        OUTPUT=`realpath $2`; shift 2; continue ;;
+      --)
+        shift; break ;;
+    esac
+  done
+}
+
+# delete lines that don't start with '/',
+# replace the first space with tab, sort
+process_for_join() {
+  sed -E "/\//!d; s|(\S+)\s|\1$SEP|" | sort -k 1b,1
+}
+
+# re-replace tab with space
+process_post_join() {
+  sed -E "s|$SEP| |"
+}
+
+create_report() {
+  tmp1=`mktemp --tmpdir lint-XXXX`
+  run_lint | process_for_join > $tmp1
+
+  tmp2=`mktemp --tmpdir lint-XXXX`
+  run_lint -c lint/eslintrc-legacy.json | process_for_join > $tmp2
+
+  join -t"$SEP" -o '0,1.2' $tmp1 $tmp2 | process_post_join
+  rm $tmp1 $tmp2
+}
+
+
+parse_opts "$@"
+
+cd $SRCDIR/..
+
+create_report | tee $OUTPUT | grep -q .
+rv=$(( $? == 0 ))
+
+cd $CWD
+
+[ $rv -eq 0 -a -f $OUTPUT ] && rm $OUTPUT
+
+exit $rv
--- a/meson.build
+++ b/meson.build
@@ -1,12 +1,11 @@
 project('gnome-shell-extensions',
-  version: '40.4',
+  version: '3.31.92',
  meson_version: '>= 0.44.0',
  license: 'GPL2+'
 )

 gettext_domain = meson.project_name()

-fs = import('fs')
 gnome = import('gnome')
 i18n = import('i18n')

@@ -21,8 +20,14 @@ schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
 sessiondir = join_paths(datadir, 'gnome-session', 'sessions')
 xsessiondir = join_paths(datadir, 'xsessions')

+js60 = find_program('js60', required: false)
+
 ver_arr = meson.project_version().split('.')
-shell_version = ver_arr[0]
+if ver_arr[1].to_int().is_even()
+  shell_version = '@0@.@1@'.format(ver_arr[0], ver_arr[1])
+else
+  shell_version = '.'.join(ver_arr)
+endif

 uuid_suffix = '@gnome-shell-extensions.gcampax.github.com'

@@ -82,10 +87,9 @@ foreach e : enabled_extensions
 endforeach

 if classic_mode_enabled
+  sassc = find_program('sassc', required: true)
  subdir('data')
 endif

 subdir('extensions')
 subdir('po')
-
-meson.add_dist_script('meson/generate-stylesheets.py')
--- a/Show More
+++ b/Show More