Bump version to 3.18.4

Update NEWS.
apps-menu: Catch menu tree entries we can't resolve to an app
2016-03-03 17:47:18 +01:00 · 2016-03-03 17:42:24 +01:00 · 2016-01-09 10:35:23 +01:00 · 2016-01-09 10:29:57 +01:00 · 2016-01-09 10:29:54 +01:00 · 2015-11-12 13:25:32 +01:00
155 changed files with 10948 additions and 10857 deletions
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,6 +0,0 @@
-{
-    "extends": [
-        "./lint/eslintrc-gjs.json",
-        "./lint/eslintrc-shell.json"
-    ]
-}
--- a/.gitignore
+++ b/.gitignore
@@ -1,22 +1,14 @@
-ABOUT-NLS
 Makefile
 Makefile.in
 Makefile.in.in
-aclocal.m4
-autom4te.cache/
-config/
 configure
 config.log
 config.status
+aclocal.m4
+autom4te.cache/
 data/*.json
-m4/
-po/*.header
-po/*.sed
-po/*.sin
-po/Makevars.template
-po/POTFILES
-po/Rules-quot
 po/gnome-shell-extensions.pot
+po/POTFILES
 po/stamp-it
 staging/
 zip-files/
@@ -25,5 +17,7 @@ zip-files/
 *.gmo
 metadata.json
 *.desktop
+*.desktop.in
+*.gschema.xml
 *.gschema.valid
 *.session
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,40 +0,0 @@
-stages:
- - commit_check
- - source_check
- - build
-
-variables:
- LINT_LOG: "eslint-report.txt"
-
-.only_default: &only_default
-    only:
-        - branches
-        - tags
-        - merge_requests
-
-check_commit_log:
-    image: registry.gitlab.gnome.org/gnome/gjs:fedora.static-analysis
-    stage: commit_check
-    script:
-        - ./.gitlab-ci/check-commit-log.sh
-    only:
-        - merge_requests
-
-eslint:
-  image: registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v1
-  stage: source_check
-  script:
-    - eslint -o $LINT_LOG --no-color || { cat $LINT_LOG; false; }
-  <<: *only_default
-  artifacts:
-    paths:
-      - ${LINT_LOG}
-    when: on_failure
-
-build-shell-extensions:
-  image: registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v1
-  stage: build
-  script:
-    - meson _build .
-    - ninja -C _build test install
-  <<: *only_default
--- a/.gitlab-ci/check-commit-log.sh
+++ b/.gitlab-ci/check-commit-log.sh
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-
-if [ -z "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ]; then
-  echo Cannot review non-merge request
-  exit 1
-fi
-
-git fetch $CI_MERGE_REQUEST_PROJECT_URL.git $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
-
-branch_point=$(git merge-base HEAD FETCH_HEAD)
-
-commits=$(git log --format='format:%H' $branch_point..$CI_COMMIT_SHA)
-
-if [ -z "$commits" ]; then
-  echo Commit range empty
-  exit 1
-fi
-
-function commit_message_has_url() {
-  commit=$1
-  commit_message=$(git show -s --format='format:%b' $commit)
-  echo "$commit_message" | grep -qe "\($CI_MERGE_REQUEST_PROJECT_URL/\(issues\|merge_requests\)/[0-9]\+\|https://bugzilla.gnome.org/show_bug.cgi?id=[0-9]\+\)"
-  return $?
-}
-
-for commit in $commits; do
-  if ! commit_message_has_url $commit; then
-    echo "Missing merge request or issue URL on commit $(echo $commit | cut -c -8)"
-    exit 1
-  fi
-done
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "data/gnome-shell-sass"]
 	path = data/gnome-shell-sass
-	url = https://gitlab.gnome.org/GNOME/gnome-shell-sass.git
+	url = https://git.gnome.org/browse/gnome-shell-sass/
--- a/31
+++ b/31
@@ -0,0 +1,31 @@
+--- Creating a New Extension ---
+
+To create a new extension, add a subdirectory in extensions.
+Then create a Makefile.am like the one in example, replacing
+the EXTENSION_ID with the basename of your extension, which
+must match the UUID in metadata.json.
+If you need additional files, add them to EXTENSION_EXTRA.
+
+Then modify extensions/Makefile.am and configure.ac. It should
+be pretty self-explanatory.
+
+Don't forget to add any translatable file to po/POTFILES.in, and
+then you're done.
+The Gettext domain you should choose is gnome-shell-extensions,
+not gnome-shell, unless you're sure there is the string you
+need in gnome-shell.
+
+--- Coding Style ---
+
+Generally, we follow GJS coding style (you can find it at
+http://git.gnome.org/browse/gjs/tree/doc/Style_Guide.txt), which
+in short is: indent 4 spaces, no tabs, space after comma, no space
+after function call.
+
+The Emacs mode line for this
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+Imports should be at the top, in two groups, one for standard
+imports (like imports.lang or imports.dbus) and introspection,
+the other for Shell API. Within the same group, put everything
+in alphabetic order.
--- a/HACKING.md
+++ b/HACKING.md
@@ -1,31 +0,0 @@
-## Creating a New Extension
-
-To create a new extension, add a subdirectory in extensions. Then create
-a meson.build from the provided [template](extensions/meson.build.template).
-If you need additional sources, add them to extension_sources. Similarily add
-GSettings schemas to extension_schemas and other files to extension_data.
-
-Then modify the [toplevel Meson file](meson.build) to add the new
-extension name in the appropriate set (that is one of classic_extensions,
-default_extensions or all_extensions).
-
-Don't forget to add any translatable file to po/POTFILES.in, and
-then you're done.
-The Gettext domain you should choose is gnome-shell-extensions,
-not gnome-shell, unless you're sure there is the string you
-need in gnome-shell.
-
-## Coding Style
-
-Generally, we follow [GJS coding style][coding-style], which in short is:
-indent 4 spaces, no tabs, space after comma, no space after function call.
-
-The Emacs mode line for this
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-Imports should be at the top, in two groups, one for standard
-imports (like imports.lang or imports.dbus) and introspection,
-the other for Shell API. Within the same group, put everything
-in alphabetic order.
-
-[coding-style]: https://gitlab.gnome.org/GNOME/gjs/blob/master/doc/Style_Guide.md
--- a/Makefile.am
+++ b/Makefile.am
@@ -0,0 +1,52 @@
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
+DIST_SUBDIRS = data extensions po
+
+SUBDIRS = extensions po
+
+if CLASSIC_MODE
+SUBDIRS += data
+endif
+
+EXTRA_DIST = lib/convenience.js
+
+DISTCHECK_CONFIGURE_FLAGS = --enable-extensions=all
+
+include include.mk
+
+zip-file: all
+	-rm -fR $(builddir)/_build
+	-rm -fR $(builddir)/zip-files
+	$(MKDIR_P) $(builddir)/_build; \
+	$(MKDIR_P) $(builddir)/zip-files; \
+	$(MAKE) install DESTDIR="$(abs_builddir)/_build"; \
+	for i in $(ENABLED_EXTENSIONS); do \
+		mv "$(builddir)/_build$(topextensiondir)/$${i}$(extensionbase)" "$(builddir)/_build/"; \
+		cp -r "$(builddir)/_build$(datadir)/locale" "$(builddir)/_build/$${i}$(extensionbase)"; \
+		cp "$(srcdir)/COPYING" -t "$(builddir)/_build/$${i}$(extensionbase)"; \
+		cp "$(srcdir)/NEWS" -t "$(builddir)/_build/$${i}$(extensionbase)"; \
+		if [ -f "$(builddir)/_build$(datadir)/glib-2.0/schemas/$(gschemabase).$${i}.gschema.xml" ]; then \
+			$(MKDIR_P) "$(builddir)/_build/$${i}$(extensionbase)/schemas"; \
+			mv "$(builddir)/_build$(datadir)/glib-2.0/schemas/$(gschemabase).$${i}.gschema.xml" "$(builddir)/_build/$${i}$(extensionbase)/schemas"; \
+			glib-compile-schemas "$(builddir)/_build/$${i}$(extensionbase)/schemas"; \
+		fi; \
+		(cd "$(builddir)/_build/$${i}$(extensionbase)"; \
+		 zip -qr "$(abs_builddir)/zip-files/$${i}$(extensionbase).shell-extension.zip" .; \
+		); \
+	done
+	-rm -fR $(builddir)/_build
+
+localprefix = $(HOME)/.local/share/gnome-shell/extensions
+
+local-install: zip-file
+	for i in $(ENABLED_EXTENSIONS); do \
+	    uuid="$${i}$(extensionbase)"; \
+	    zip_file="$(abs_builddir)/zip-files/$${uuid}.shell-extension.zip"; \
+	    if [ -d "$(localprefix)/$${uuid}" ]; then \
+		rm -fR "$(localprefix)/$${uuid}"; \
+	    fi; \
+	    $(MKDIR_P) $(localprefix)/$${uuid}; \
+	    (cd $(localprefix)/$${uuid}; \
+		unzip -q $${zip_file}; \
+	    ); \
+	done
--- a/313
+++ b/313
@@ -1,315 +1,14 @@
-3.33.3
+3.18.4
 ======
-* Misc. bug fixes [Florian, Marco; !67, !68]
+* apps-menu: Ignore .desktop entries from legacy dirs

-Contributors:
-  Florian Müllner, Marco Trevisan (Treviño)
-
-3.33.2
+3.18.3
 ======
-* Misc. bug fixes and cleanups [Florian; !66]
+* apps-menu: Fix .desktop entries in subdirectories

-Contributors:
-  Florian Müllner
-
-3.33.1
+3.18.2
 ======
-* 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]
-
-Contributors:
-  Florian Müllner
-
-3.31.91
-=======
-* apps-menu: Remove outdated legacy-tray handling [Florian; !53]
-* user-theme: Allow using XDG user data dir [Tomasz; !55]
-* Misc. bug fixes and cleanups [Florian; !52, !54, !56]
-
-Contributors:
-  Tomasz Gąsior, Florian Müllner
-
-Translators:
-  Matej Urbančič [sl], Gun Chleoc [gd]
-
-3.31.90
-=======
-* Misc. bug fixes and cleanups [Florian; !49, !50, !51]
-
-Contributors:
-  Florian Müllner
-
-Translators:
-  Ryuta Fujii [ja], Charles Monzat [fr], Pieter Schalk Schoeman [af]
-
-3.31.2
-======
-* Remove obsolete alternate-tab extension [Florian; #786496]
-* Adjust to gnome-shell changes [Florian; #113]
-
-Contributors:
-  Florian Müllner
-
-3.30.1
-======
-* apps-menu: Fix height on HiDPI systems [Florian; #102]
-* window-list: Only switch between windows on active workspace when scrolling
-  [Florian; #78]
-
-Contributors:
-  Florian Müllner
-
-3.30.0
-======
-* Bump version
-
-3.29.91
-=======
-* Misc. bug fixes [Florian; #90]
-
-Contributors:
-  Florian Müllner
-
-3.29.90
-=======
-* Misc. bug fixes [Florian; #786496]
-
-Contributors:
-  Florian Müllner
-
-3.29.3
-======
-* Adjust to global.screen removal [Jonas; #759538]
-
-Contributors:
-  Jonas Ådahl, Florian Müllner
-
-3.29.2
-======
-* Misc. bug fixes [Florian; #69]
-
-Contributors:
-  Florian Müllner
-
-3.28.1
-======
-* Misc. bug fixes [Xiaoguang, Florian; #59, #62]
-
-Contributors:
-  Florian Müllner, Xiaoguang Wang
-
-Translators:
-  Dz Chen [zh_CN]
-
-3.28.0
-======
-
-Contributors:
-  Florian Müllner, Xiaoguang Wang
-
-Translators:
-  Aman Alam [pa], Bruce Cowan [en_GB]
-
-3.27.92
-=======
-
-Contributors:
-  Florian Müllner
-
-Translators:
-  Piotr Drąg [es], GNOME Translation Robot [gd], Daniel Șerbănescu [ro]
-
-3.27.91
-=======
-* places-menu: Support unmounting ejectable places [Rémy; #17]
-* apps-menu: Support separators and custom sort order [Florian; #27]
-* Port to meson [Florian; #31, #45]
-* window-list: Fix missing icons on wayland [Florian; #10]
-* places-menu: Fix terminating gnome-shell with recent gjs [Florian; #44]
-* auto-move: Make it work with wayland windows [Florian; #33]
-* Classic theme fixes [Florian, Jonas; #26, #41, #39, #40]
-* Require sassc for classic styling [Florian; !28]
-* Misc. bug fixes [Piotr, Florian; #772211, #32, #30]
-
-Contributors:
-  Jeremy Bicha, Piotr Drąg, Jonas Kümmerlin, Rémy Lefevre, Iñigo Martínez,
-  Florian Müllner
-
-Translators:
-  Matej Urbančič [sl], Kjartan Maraas [nb]
-
-3.27.1
-======
-* updated translations (ca@valencia)
-
-3.26.1
-======
-* native-window-placement: Adjust to gnome-shell changes
-* updated translations: el, fa, ru, sv
-
-3.26.0
-======
-* updated translations (be, bg, ca, da, eu, fi, is, it, ko, lv, ml,
-  nl, pt_BR, vi, zh_TW)
-
-3.25.91
-=======
-* updated translations (ca, fr, it, pl, pt_BR, sr, sr@latin, tr)
-
-3.25.90
-=======
-* updated translations (es, gl, hr, hu, kk, sl, sv, sv)
-
-3.25.4
-======
-* screenshot-window-sizer: Fix backward cycling
-* updated translations (ar, be, ca, cs, de, fur, id, lt, pl, sk)
-
-3.25.3
-======
-* places-menu: Use mount operation if necessary
-* window-list: Respect MWM hints
-* updated translations (es, fur, kk)
-
-3.25.2
-======
-* places-menu: Make URI launching asynchronous
-* updated translations (de, fur, hr, hu, id, sl)
-
-3.25.1
-======
-* apps-menu: Mark copied launchers as trusted
-* places-menu: Make icon lookup asynchronous
-* updated translations (hr)
-
-3.24.1
-======
-* apps-menu: Allow creating desktop launchers via DND
-* updated translations (el, vi)
-
-3.24.0
-======
-* updated translations (lv, tr)
-
-3.23.92
-=======
-* update classic theme
-* updated translations (be, ko, ca, da, cs, ru, lt)
-
-3.23.91
-=======
-* updated translations (de, es, eu, fi, fr, fur, gl, hu, id, it, kk, nb, pl, pt_BR,
-  sk, sr, sr@latin, sv, uk, zh_TW)
-
-3.23.90
-=======
-* window-list: Improve styling
-* window-list: Hide workspace indicator when there's a single (static) workspace
-* new translation (be)
-
-3.23.2
-======
-* alternateTab: Don't take over 'switch-group' shortcut
-* updated translations (zh_CN)
-
-3.22.1
-======
-* window-list: Update icon on app changes
-
-3.22.0
-======
-* updated translations (en_GB)
-
-3.21.92
-=======
-* update style
-* updated translations (pl, vi)
-
-3.21.91
-=======
-* updated translations (pl)
-
-3.21.90
-=======
-* updated translations (es, gu)
-
-3.21.4
-======
-* apps-menu: Fix entries from non-standard AppDir directories
-
-3.21.3
-======
-* adjust to gnome-shell changes
-* updated translations (oc)
-
-3.21.2
-======
-* version bump, nothing to see here
-
-3.20.1
-======
-* update classic style
-* updated translations (gd, oc)
-
-3.20.0
-======
-* version bump, nothing to see here
-
-3.19.92
-=======
-* version bump, nothing to see here
-
-3.19.91
-=======
-* updated translations (oc)
-
-3.19.90
-=======
-* version bump, nothing to see here
-
-3.19.4
-======
-* screenshot-window-sizer: HiDPI support
-* Fix gnome-shell component in classic session
-* updated translations (lt)
-
-3.19.3
-======
-* native-window-placement: Don't let border overlap title
-* apps-menu: Fix handling of .desktop files in subdirectories
-* updated translations (is)
-
-3.19.2
-======
-* updated translations (gd)
-
-3.19.1
-======
-* Fix some theme issues
+* Fix classic style issues

 3.18.1
 ======
--- a/74
+++ b/74
@@ -0,0 +1,74 @@
+GNOME Shell Extensions is a collection of extensions providing additional
+and optional functionality to GNOME Shell.
+
+Since GNOME Shell is not API stable, extensions work only against a very
+specific version of the shell, usually the same as this package (see
+"configure --version"). The extensions in this package are supported by GNOME
+and will be updated to reflect future API changes in GNOME Shell.
+
+For more information about GNOME Shell Extensions
+ https://wiki.gnome.org/Projects/GnomeShell/Extensions
+
+For general information about GNOME Shell
+ https://wiki.gnome.org/Projects/GnomeShell
+
+Bugs should be reported at https://bugzilla.gnome.org against the 'gnome-shell'
+product, with the 'extensions' component.
+
+Extensions
+==========
+
+alternate-tab
+
+  Lets you use classic Alt+Tab (window-based instead of app-based) in GNOME Shell.
+
+apps-menu
+
+  Lets you reach an application using gnome 2.x style menu on the panel.
+
+auto-move-windows
+
+  Lets you manage your workspaces more easily, assigning a specific workspace to
+each application as soon as it creates a window, in a manner configurable with a
+GSettings key.
+
+dock
+
+  Shows a dock-style task switcher on the right side of the screen.
+
+drive-menu
+  Shows a status menu for rapid unmount and power off of external storage devices
+  (i.e. pendrives)
+
+example
+
+  A minimal example illustrating how to write extensions.
+
+gajim
+
+  Integration with Gajim, a Jabber/XMPP instant messaging client.
+
+native-window-placement
+
+  An alternative algorithm for layouting the thumbnails in the windows overview, that
+  more closely reflects the actual positions and sizes.
+
+places-menu
+
+  Shows a status Indicator for navigating to Places.
+
+user-theme
+
+  Loads a shell theme from ~/.themes/<name>/gnome-shell.
+
+windowsNavigator
+
+  Allow keyboard selection of windows and workspaces in overlay mode.
+
+License
+=======
+GNOME Shell Extensions are distributed under the terms of the GNU General Public License,
+version 2 or later. See the COPYING file for details.
+Individual extensions may be licensed under different terms, see each source
+file for details.
+
--- a/README.md
+++ b/README.md
@@ -1,83 +0,0 @@
-# GNOME Shell Extensions
-
-GNOME Shell Extensions is a collection of extensions providing additional
-and optional functionality to GNOME Shell.
-
-Since GNOME Shell is not API stable, extensions work only against a very
-specific version of the shell, usually the same as this package (see
-"configure --version"). The extensions in this package are supported by GNOME
-and will be updated to reflect future API changes in GNOME Shell.
-
-The GNOME wiki has more information about [GNOME Shell Extensions][project-page],
-as well as some general information about [GNOME Shell][shell-page].
-
-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.
-
- * auto-move-windows
-
-     Lets you manage your workspaces more easily, assigning a specific workspace to
-each application as soon as it creates a window, in a manner configurable with a
-GSettings key.
-
- * drive-menu
- 
-     Shows a status menu for rapid unmount and power off of external storage devices
-  (i.e. pendrives)
-
- * launch-new-instance
-
-     Changes application icons to always launch a new instance when activated.
-
- * native-window-placement
-
-     An alternative algorithm for layouting the thumbnails in the windows overview, that
-  more closely reflects the actual positions and sizes.
-
- * places-menu
-
-     Shows a status Indicator for navigating to Places.
-
- * screenshot-window-sizer
-
-     Adds a shortcut for resizing the focus window to a size that is suitable for GNOME Software screenshots
-
- * user-theme
-
-     Loads a shell theme from ~/.themes/<name>/gnome-shell.
-
- * window-list
-
-     Adds a bottom panel with a traditional window list.
-
- * windowsNavigator
-
-     Allow keyboard selection of windows and workspaces in overlay mode.
-
- * workspace-indicator
-
-     Adds a simple workspace switcher to the top bar.
-
-## License
-
-GNOME Shell Extensions are distributed under the terms of the GNU General
-Public License, version 2 or later. See the [COPYING file][license] for details.
-Individual extensions may be licensed under different terms, see each source
-file for details.
-
-[project-page]: https://wiki.gnome.org/Projects/GnomeShell/Extensions
-[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/autogen.sh
+++ b/autogen.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+test -f $srcdir/configure.ac || {
+    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+    echo " top-level gnome-shell-extensions directory"
+    exit 1
+}
+
+# Fetch submodules if needed
+if test ! -f data/gnome-shell-sass/COPYING;
+then
+  echo "+ Setting up submodules"
+  git submodule init
+fi
+git submodule update
+
+which gnome-autogen.sh || {
+    echo "You need to install gnome-common from GNOME Git (or from"
+    echo "your OS vendor's package manager)."
+    exit 1
+}
+. gnome-autogen.sh
--- a/config/.gitignore
+++ b/config/.gitignore
@@ -0,0 +1,3 @@
+install-sh
+mkinstalldirs
+missing
--- a/configure.ac
+++ b/configure.ac
@@ -0,0 +1,96 @@
+AC_PREREQ(2.63)
+AC_INIT([gnome-shell-extensions],[3.18.4],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=extensions])
+
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR([config])
+
+AM_INIT_AUTOMAKE([1.10 dist-xz no-dist-gzip foreign tar-ustar])
+
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+
+GETTEXT_PACKAGE=gnome-shell-extensions
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
+                   [The prefix for our gettext translation domains.])
+IT_PROG_INTLTOOL(0.26)
+
+PKG_PROG_PKG_CONFIG([0.22])
+
+GLIB_GSETTINGS
+
+SHELL_VERSION="$PACKAGE_VERSION"
+shell_major=`echo "$PACKAGE_VERSION" | cut -d'.' -f1`
+shell_minor=`echo "$PACKAGE_VERSION" | cut -d'.' -f2`
+if test "$(($shell_minor % 2))" -eq 0; then
+	SHELL_VERSION="$shell_major.$shell_minor"
+fi
+AC_SUBST([SHELL_VERSION])
+
+dnl keep this in alphabetic order
+CLASSIC_EXTENSIONS="apps-menu places-menu alternate-tab launch-new-instance window-list"
+DEFAULT_EXTENSIONS="$CLASSIC_EXTENSIONS drive-menu screenshot-window-sizer windowsNavigator workspace-indicator"
+ALL_EXTENSIONS="$DEFAULT_EXTENSIONS auto-move-windows example native-window-placement user-theme"
+AC_SUBST(CLASSIC_EXTENSIONS, [$CLASSIC_EXTENSIONS])
+AC_SUBST(ALL_EXTENSIONS, [$ALL_EXTENSIONS])
+AC_ARG_ENABLE([extensions],
+	[AS_HELP_STRING([--enable-extensions],[Space separated list of extensions to enable.
+	The default is to build and distribute all extensions that can be installed in the home directory and have no external depedencies.
+	Use "all" to enable all available extensions, or "classic-mode" to enable extensions that restore GNOME 2 functionality.])],
+	[],
+	[enable_extensions=$DEFAULT_EXTENSIONS]
+)
+
+if test x"$enable_extensions" = xall; then
+   enable_extensions="$ALL_EXTENSIONS"
+   enable_classic_mode_default=yes
+elif test x"$enable_extensions" = xclassic-mode; then
+   enable_extensions="$CLASSIC_EXTENSIONS"
+   enable_classic_mode_default=yes
+else
+   enable_classic_mode_default=no
+fi
+
+AC_ARG_ENABLE([classic-mode],
+        [AS_HELP_STRING([--enable-classic-mode],[Enable installing data files for classic mode.
+        Defaults to yes if enabling all or classic-mode extensions, and no otherwise.])],
+        [],
+        [enable_classic_mode=$enable_classic_mode_default])
+AM_CONDITIONAL([CLASSIC_MODE], [test x"$enable_classic_mode" != xno])
+
+ENABLED_EXTENSIONS=
+for e in $enable_extensions; do
+	case $e in
+dnl		keep this in alphabetic order
+		alternate-tab|apps-menu|auto-move-windows|drive-menu|example|launch-new-instance|native-window-placement|places-menu|screenshot-window-sizer|user-theme|window-list|windowsNavigator|workspace-indicator)
+			ENABLED_EXTENSIONS="$ENABLED_EXTENSIONS $e"
+			;;
+		*)
+			AC_MSG_ERROR([invalid extension $e])
+	esac
+done
+
+AC_SUBST(ENABLED_EXTENSIONS, [$ENABLED_EXTENSIONS])
+
+AC_PATH_PROG([SASS],[sass],[])
+
+dnl Please keep this sorted alphabetically
+AC_CONFIG_FILES([
+  data/Makefile
+  extensions/alternate-tab/Makefile
+  extensions/apps-menu/Makefile
+  extensions/auto-move-windows/Makefile
+  extensions/drive-menu/Makefile
+  extensions/example/Makefile
+  extensions/launch-new-instance/Makefile
+  extensions/native-window-placement/Makefile
+  extensions/places-menu/Makefile
+  extensions/screenshot-window-sizer/Makefile
+  extensions/user-theme/Makefile
+  extensions/window-list/Makefile
+  extensions/windowsNavigator/Makefile
+  extensions/workspace-indicator/Makefile
+  extensions/Makefile
+  Makefile
+  po/Makefile.in
+])
+AC_OUTPUT
--- a/data/00_org.gnome.shell.extensions.classic.gschema.override
+++ b/data/00_org.gnome.shell.extensions.classic.gschema.override
@@ -1,9 +0,0 @@
-[org.gnome.mutter:GNOME-Classic]
-dynamic-workspaces=false
-
-[org.gnome.desktop.wm.preferences:GNOME-Classic]
-button-layout='appmenu:minimize,maximize,close'
-
-[org.gnome.desktop.wm.keybindings:GNOME-Classic]
-switch-applications=[]
-switch-windows=['<Super>Tab','<Alt>Tab']
--- a/data/HACKING
+++ b/data/HACKING
@@ -1,2 +1,6 @@
+To generate the css files, from the project directory:
+
+sass --sourcemap=none --update .
+
 To update the gnome-shell-sass submodule to latest upstream commit:
 git submodule update --rebase
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -0,0 +1,81 @@
+include $(top_srcdir)/include.mk
+
+sessiondir = $(datadir)/gnome-session/sessions
+session_in_in_files = gnome-classic.session.desktop.in.in
+session_in_files = $(session_in_in_files:.session.desktop.in.in=.session.desktop.in)
+session_DATA = $(session_in_files:.session.desktop.in=.session)
+
+xsessiondir = $(datadir)/xsessions
+xsession_in_files = gnome-classic.desktop.in
+xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
+
+modedir = $(datadir)/gnome-shell/modes
+mode_in_files = classic.json.in
+mode_DATA = $(mode_in_files:.json.in=.json)
+
+themedir = $(datadir)/gnome-shell/theme
+theme_DATA = 				\
+	$(srcdir)/calendar-today.svg		\
+	$(srcdir)/classic-process-working.svg		\
+	$(srcdir)/classic-toggle-off-intl.svg		\
+	$(srcdir)/classic-toggle-off-us.svg		\
+	$(srcdir)/classic-toggle-on-intl.svg		\
+	$(srcdir)/classic-toggle-on-us.svg		\
+	$(srcdir)/gnome-classic.css			\
+	$(srcdir)/gnome-classic-high-contrast.css	\
+	$(NULL)
+
+theme_sources =							\
+	$(srcdir)/gnome-classic.scss				\
+	$(srcdir)/gnome-shell-sass/_colors.scss			\
+	$(srcdir)/gnome-shell-sass/_common.scss			\
+	$(srcdir)/gnome-shell-sass/_drawing.scss		\
+	$(srcdir)/gnome-shell-sass/_high-contrast-colors.scss	\
+	$(NULL)
+
+%.css: %.scss $(theme_sources)
+	@if test -n "$(SASS)"; then \
+		if $(AM_V_P); then PS4= set -x; else echo "  GEN      $@"; fi; \
+		$(SASS) --sourcemap=none --update -f -q $<; \
+	fi
+
+gsettings_in_files = org.gnome.shell.extensions.classic-overrides.gschema.xml.in
+gsettings_SCHEMAS = $(gsettings_in_files:.xml.in=.xml)
+
+@INTLTOOL_XML_NOMERGE_RULE@
+@GSETTINGS_RULES@
+
+%.desktop.in:%.desktop.in.in
+	$(AM_V_GEN) sed \
+		-e "s|\@bindir\@|$(bindir)|" \
+		-e "s|\@VERSION\@|$(VERSION)|" \
+		$< > $@
+
+comma:=,
+empty:=
+space:= $(empty) $(empty)
+extensions:=$(patsubst %,\"%$(extensionbase)\",$(CLASSIC_EXTENSIONS))
+extension_list:=$(subst $(space),$(comma),$(extensions))
+%.json:%.json.in
+	$(AM_V_GEN) sed \
+		-e "s|\@CLASSIC_EXTENSIONS\@|$(extension_list)|g" \
+		$< > $@
+
+%.session: %.session.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
+
+@INTLTOOL_DESKTOP_RULE@
+
+EXTRA_DIST = \
+	$(session_in_in_files) \
+	$(xsession_in_files) \
+	$(mode_in_files) \
+	$(gsettings_in_files) \
+	$(theme_DATA) \
+	$(NULL)
+
+CLEANFILES = \
+	$(session_DATA) \
+	$(xsession_DATA) \
+	$(mode_DATA) \
+	$(gsettings_SCHEMAS) \
+	$(NULL)
--- a/data/gnome-classic.css
+++ b/data/gnome-classic.css
--- a/data/gnome-classic.desktop.in
+++ b/data/gnome-classic.desktop.in
@@ -1,7 +1,8 @@
 [Desktop Entry]
-Name=GNOME Classic
-Comment=This session logs you into GNOME Classic
+_Name=GNOME Classic
+_Comment=This session logs you into GNOME Classic
 Exec=env GNOME_SHELL_SESSION_MODE=classic gnome-session --session gnome-classic
 TryExec=gnome-session
+Icon=
 Type=Application
-DesktopNames=GNOME-Classic;GNOME;
+DesktopNames=GNOME-Classic;GNOME
--- a/data/gnome-classic.scss
+++ b/data/gnome-classic.scss
@@ -7,7 +7,7 @@ $variant: 'light';

 /* Overrides */

-#panel, #panel.solid {
+#panel {
  font-weight: normal;
  background-color: $bg_color;
  background-gradient-direction: vertical;
@@ -31,7 +31,6 @@ $variant: 'light';
    -minimum-hpadding: 4px;
    font-weight: normal;
    color: $fg_color;
-    text-shadow: none;
    &:active, &:overview, &:focus, &:checked {
      // Trick due to St limitations. It needs a background to draw
      // a box-shadow
@@ -40,15 +39,7 @@ $variant: 'light';
      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 {
-      icon-shadow: none;
-    }
  }

  .panel-corner,
@@ -60,9 +51,9 @@ $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; }
  }
@@ -90,16 +81,3 @@ $variant: 'light';
 .calendar-day-with-events {
  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
@@ -1,3 +0,0 @@
-[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-classic.session.desktop.in.in
+++ b/data/gnome-classic.session.desktop.in.in
@@ -0,0 +1,3 @@
+[GNOME Session]
+_Name=GNOME Classic
+RequiredComponents=gnome-shell;gnome-settings-daemon;nautilus-classic;
--- a/data/gnome-shell-sass
+++ b/data/gnome-shell-sass
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,63 +0,0 @@
-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
-    classic_uuids += e + uuid_suffix
-endforeach
-
-mode_conf = configuration_data()
-mode_conf.set('CLASSIC_EXTENSIONS', '"' + '", "'.join(classic_uuids) + '"')
-
-mode_file = 'classic.json'
-configure_file(
-  input: mode_file + '.in',
-  output: mode_file,
-  configuration: mode_conf,
-  install_dir: modedir
-)
-
-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'
-)
-
-theme_data = [
-  'calendar-today.svg',
-  'classic-process-working.svg',
-  'classic-toggle-off-intl.svg',
-  'classic-toggle-off-us.svg',
-  'classic-toggle-on-intl.svg',
-  'classic-toggle-on-us.svg',
-  'gnome-classic-high-contrast.css'
-]
-
-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)
-
-classic_override = '00_org.gnome.shell.extensions.classic.gschema.override'
-install_data(classic_override, install_dir: schemadir)
--- a/data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in
+++ b/data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in
@@ -0,0 +1,46 @@
+<schemalist>
+  <schema id="org.gnome.shell.extensions.classic-overrides"
+          path="/org/gnome/shell/extensions/classic-overrides/"
+	  gettext-domain="gnome-shell-extensions">
+    <key name="attach-modal-dialogs" type="b">
+      <default>true</default>
+      <_summary>Attach modal dialog to the parent window</_summary>
+      <_description>
+        This key overrides the key in org.gnome.mutter when running
+        GNOME Shell.
+      </_description>
+    </key>
+
+    <key name="button-layout" type="s">
+      <default>"appmenu:minimize,maximize,close"</default>
+      <_summary>Arrangement of buttons on the titlebar</_summary>
+      <_description>
+        This key overrides the key in org.gnome.desktop.wm.preferences when running GNOME Shell.
+      </_description>
+    </key>
+
+    <key name="edge-tiling" type="b">
+      <default>true</default>
+      <_summary>Enable edge tiling when dropping windows on screen edges</_summary>
+      <_description>
+        This key overrides the key in org.gnome.mutter when running GNOME Shell.
+      </_description>
+    </key>
+
+    <key name="workspaces-only-on-primary" type="b">
+      <default>true</default>
+      <_summary>Workspaces only on primary monitor</_summary>
+      <_description>
+        This key overrides the key in org.gnome.mutter when running GNOME Shell.
+      </_description>
+    </key>
+
+    <key name="focus-change-on-pointer-rest" type="b">
+      <default>true</default>
+      <_summary>Delay focus changes in mouse mode until the pointer stops moving</_summary>
+      <_description>
+        This key overrides the key in org.gnome.mutter when running GNOME Shell.
+      </_description>
+    </key>
+  </schema>
+</schemalist>
--- a/export-zips.sh
+++ b/export-zips.sh
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-srcdir=`dirname $0`
-srcdir=`(cd $srcdir && pwd)`
-
-builddir=`mktemp -p $srcdir -d _build.XXXXXX` || exit 1
-installdir=`mktemp -p $srcdir -d _install.XXXXXX` || exit 1
-
-meson setup --prefix=$installdir -Dextension_set=all $srcdir $builddir
-ninja -C$builddir install
-
-rm -rf $srcdir/zip-files
-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
-
-  cp $srcdir/NEWS $srcdir/COPYING $f
-  cp -r $localedir $f
-
-  if [ -f $schema ]; then
-    mkdir $f/schemas
-    cp $schema $f/schemas;
-    glib-compile-schemas $f/schemas
-  fi
-
-  (cd $f && zip -rmq $srcdir/zip-files/$uuid.shell-extension.zip .)
-done
-
-rm -rf $builddir
-rm -rf $installdir
--- a/extension.mk
+++ b/extension.mk
@@ -0,0 +1,18 @@
+include $(top_srcdir)/include.mk
+
+dist_extension_DATA = extension.js stylesheet.css $(EXTRA_MODULES)
+nodist_extension_DATA = metadata.json $(top_srcdir)/lib/convenience.js $(EXTRA_EXTENSION)
+
+EXTRA_DIST = metadata.json.in
+
+metadata.json: metadata.json.in $(top_builddir)/config.status
+	$(AM_V_GEN) sed \
+            -e "s|[@]extension_id@|$(EXTENSION_ID)|" \
+	    -e "s|[@]uuid@|$(uuid)|" \
+	    -e "s|[@]gschemaname@|$(gschemaname)|" \
+	    -e "s|[@]gettext_domain@|$(GETTEXT_PACKAGE)|" \
+	    -e "s|[@]shell_current@|$(SHELL_VERSION)|" \
+	    -e "s|[@]url@|$(extensionurl)|" \
+	    $< > $@
+
+CLEANFILES = metadata.json
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -0,0 +1,3 @@
+DIST_SUBDIRS = $(ALL_EXTENSIONS)
+
+SUBDIRS = $(ENABLED_EXTENSIONS)
--- a/extensions/alternate-tab/Makefile.am
+++ b/extensions/alternate-tab/Makefile.am
@@ -0,0 +1,5 @@
+EXTENSION_ID = alternate-tab
+
+EXTRA_MODULES = prefs.js
+
+include ../../extension.mk
--- a/extensions/alternate-tab/extension.js
+++ b/extensions/alternate-tab/extension.js
@@ -0,0 +1,52 @@
+/* -*- mode: js; js-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const Clutter = imports.gi.Clutter;
+const Lang = imports.lang;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+
+const AltTab = imports.ui.altTab;
+const Main = imports.ui.main;
+
+let injections = {};
+
+function init(metadata) {
+}
+
+function setKeybinding(name, func) {
+    Main.wm.setCustomKeybindingHandler(name, Shell.ActionMode.NORMAL, func);
+}
+
+function enable() {
+    injections['_keyPressHandler'] = AltTab.WindowSwitcherPopup.prototype._keyPressHandler;
+    AltTab.WindowSwitcherPopup.prototype._keyPressHandler = function(keysym, action) {
+        switch(action) {
+            case Meta.KeyBindingAction.SWITCH_APPLICATIONS:
+            case Meta.KeyBindingAction.SWITCH_GROUP:
+              action = Meta.KeyBindingAction.SWITCH_WINDOWS;
+              break;
+            case Meta.KeyBindingAction.SWITCH_APPLICATIONS_BACKWARD:
+            case Meta.KeyBindingAction.SWITCH_GROUP_BACKWARD:
+              action = Meta.KeyBindingAction.SWITCH_WINDOWS_BACKWARD;
+              break;
+        }
+        return injections['_keyPressHandler'].call(this, keysym, action);
+    };
+
+    setKeybinding('switch-applications', Lang.bind(Main.wm, Main.wm._startWindowSwitcher));
+    setKeybinding('switch-group', Lang.bind(Main.wm, Main.wm._startWindowSwitcher));
+    setKeybinding('switch-applications-backward', Lang.bind(Main.wm, Main.wm._startWindowSwitcher));
+    setKeybinding('switch-group-backward', Lang.bind(Main.wm, Main.wm._startWindowSwitcher));
+}
+
+function disable() {
+    var prop;
+
+    setKeybinding('switch-applications', Lang.bind(Main.wm, Main.wm._startAppSwitcher));
+    setKeybinding('switch-group', Lang.bind(Main.wm, Main.wm._startAppSwitcher));
+    setKeybinding('switch-applications-backward', Lang.bind(Main.wm, Main.wm._startAppSwitcher));
+    setKeybinding('switch-group-backward', Lang.bind(Main.wm, Main.wm._startAppSwitcher));
+
+    for (prop in injections)
+        AltTab.WindowSwitcherPopup.prototype[prop] = injections[prop];
+}
--- a/extensions/alternate-tab/metadata.json.in
+++ b/extensions/alternate-tab/metadata.json.in
@@ -0,0 +1,11 @@
+{
+"extension-id": "@extension_id@",
+"uuid": "@uuid@",
+"settings-schema": "@gschemaname@",
+"gettext-domain": "@gettext_domain@",
+"name": "AlternateTab",
+"description": "Substitute Alt-Tab with a window based switcher that does not group by application.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME Bugzilla instead.",
+"original-authors": [  "jw@bargsten.org", "thomas.bouffon@gmail.com" ],
+"shell-version": [ "@shell_current@" ],
+"url": "@url@"
+}
--- a/extensions/alternate-tab/prefs.js
+++ b/extensions/alternate-tab/prefs.js
@@ -0,0 +1,85 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const Gio = imports.gi.Gio;
+const Gtk = imports.gi.Gtk;
+const GObject = imports.gi.GObject;
+const Lang = imports.lang;
+
+const Gettext = imports.gettext.domain('gnome-shell-extensions');
+const _ = Gettext.gettext;
+const N_ = function(e) { return e };
+
+const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;
+
+const SETTINGS_APP_ICON_MODE = 'app-icon-mode';
+const SETTINGS_CURRENT_WORKSPACE_ONLY = 'current-workspace-only';
+
+const MODES = {
+    'thumbnail-only': N_("Thumbnail only"),
+    'app-icon-only': N_("Application icon only"),
+    'both': N_("Thumbnail and application icon"),
+};
+
+const AltTabSettingsWidget = new GObject.Class({
+    Name: 'AlternateTab.Prefs.AltTabSettingsWidget',
+    GTypeName: 'AltTabSettingsWidget',
+    Extends: Gtk.Grid,
+
+    _init : function(params) {
+        this.parent(params);
+        this.margin = 24;
+        this.row_spacing = 6;
+	this.orientation = Gtk.Orientation.VERTICAL;
+
+        this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell.window-switcher' });
+
+        let presentLabel = '<b>' + _("Present windows as") + '</b>';
+        this.add(new Gtk.Label({ label: presentLabel, use_markup: true,
+                                 halign: Gtk.Align.START }));
+
+        let align = new Gtk.Alignment({ left_padding: 12 });
+        this.add(align);
+
+        let grid = new Gtk.Grid({ orientation: Gtk.Orientation.VERTICAL,
+                                  row_spacing: 6,
+                                  column_spacing: 6 });
+        align.add(grid);
+
+        let radio = null;
+        let currentMode = this._settings.get_string(SETTINGS_APP_ICON_MODE);
+        for (let mode in MODES) {
+            // copy the mode variable because it has function scope, not block scope
+            // so cannot be used in a closure
+            let modeCapture = mode;
+            let name = Gettext.gettext(MODES[mode]);
+
+            radio = new Gtk.RadioButton({ group: radio, label: name, valign: Gtk.Align.START });
+            radio.connect('toggled', Lang.bind(this, function(widget) {
+                if (widget.active)
+                    this._settings.set_string(SETTINGS_APP_ICON_MODE, modeCapture);
+            }));
+            grid.add(radio);
+
+            if (mode == currentMode)
+                radio.active = true;
+        }
+
+	let check = new Gtk.CheckButton({ label: _("Show only windows in the current workspace"),
+	                                  margin_top: 6 });
+	this._settings.bind(SETTINGS_CURRENT_WORKSPACE_ONLY, check, 'active', Gio.SettingsBindFlags.DEFAULT);
+	this.add(check);
+    },
+});
+
+function init() {
+    Convenience.initTranslations();
+}
+
+function buildPrefsWidget() {
+    let widget = new AltTabSettingsWidget();
+    widget.show_all();
+
+    return widget;
+}
--- a/extensions/alternate-tab/stylesheet.css
+++ b/extensions/alternate-tab/stylesheet.css
@@ -0,0 +1 @@
+/* This extensions requires no special styling */
--- a/extensions/apps-menu/Makefile.am
+++ b/extensions/apps-menu/Makefile.am
@@ -0,0 +1,3 @@
+EXTENSION_ID = apps-menu
+
+include ../../extension.mk
--- a/extensions/apps-menu/extension.js
+++ b/extensions/apps-menu/extension.js
@@ -1,19 +1,25 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-/* exported init enable disable */

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

 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;

 const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;

 const appSys = Shell.AppSystem.get_default();

@@ -22,96 +28,75 @@ const HORIZ_FACTOR = 5;
 const MENU_HEIGHT_OFFSET = 132;
 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');
+const ActivitiesMenuItem = new Lang.Class({
+    Name: 'ActivitiesMenuItem',
+    Extends: PopupMenu.PopupBaseMenuItem,

-var ActivitiesMenuItem = GObject.registerClass(
-class ActivitiesMenuItem extends PopupMenu.PopupBaseMenuItem {
-    _init(button) {
-        super._init();
+    _init: function(button) {
+	this.parent();
        this._button = button;
-        this.add_child(new St.Label({ text: _('Activities Overview') }));
-    }
+        this.actor.add_child(new St.Label({ text: _("Activities Overview") }));
+    },

-    activate(event) {
+    activate: function(event) {
        this._button.menu.toggle();
        Main.overview.toggle();
-        super.activate(event);
-    }
+	this.parent(event);
+    },
 });

-var ApplicationMenuItem = GObject.registerClass(
-class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
-    _init(button, app) {
-        super._init();
-        this._app = app;
+const ApplicationMenuItem = new Lang.Class({
+    Name: 'ApplicationMenuItem',
+    Extends: PopupMenu.PopupBaseMenuItem,
+
+    _init: function(button, app) {
+	this.parent();
+	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
-        });
-        this.add_child(appLabel);
-        this.label_actor = appLabel;
+        let appLabel = new St.Label({ text: app.get_name(), y_expand: true,
+                                      y_align: Clutter.ActorAlign.CENTER });
+        this.actor.add_child(appLabel, { expand: true });
+        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', () => {
-            textureCache.disconnect(iconThemeChangedId);
-        });
+                                                      Lang.bind(this, this._updateIcon));
+        this.actor.connect('destroy', Lang.bind(this,
+            function() {
+                textureCache.disconnect(iconThemeChangedId);
+            }));
        this._updateIcon();
+    },

-        this._delegate = this;
-        let draggable = DND.makeDraggable(this);
-
-        let maybeStartDrag = draggable._maybeStartDrag;
-        draggable._maybeStartDrag = (event) => {
-            if (this._dragEnabled)
-                return maybeStartDrag.call(draggable, event);
-            return false;
-        };
-    }
-
-    activate(event) {
-        this._app.open_new_window(-1);
-        this._button.selectCategory(null);
+    activate: function(event) {
+	this._app.open_new_window(-1);
+        this._button.selectCategory(null, null);
        this._button.menu.toggle();
-        super.activate(event);
-    }
+	this.parent(event);
+    },

-    setActive(active, params) {
+    setActive: function(active, params) {
        if (active)
            this._button.scrollToButton(this);
-        super.setActive(active, params);
-    }
+        this.parent(active, params);
+    },

-    setDragEnabled(enable) {
-        this._dragEnabled = enable;
-    }
-
-    getDragActor() {
-        return this._app.create_icon_texture(APPLICATION_ICON_SIZE);
-    }
-
-    getDragActorSource() {
-        return this._iconBin;
-    }
-
-    _updateIcon() {
-        this._iconBin.set_child(this.getDragActor());
+    _updateIcon: function() {
+        this._iconBin.set_child(this._app.create_icon_texture(APPLICATION_ICON_SIZE));
    }
 });

-var CategoryMenuItem = GObject.registerClass(
-class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
-    _init(button, category) {
-        super._init();
-        this._category = category;
+const CategoryMenuItem = new Lang.Class({
+    Name: 'CategoryMenuItem',
+    Extends: PopupMenu.PopupBaseMenuItem,
+
+    _init: function(button, category) {
+	this.parent();
+	this._category = category;
        this._button = button;

        this._oldX = -1;
@@ -121,21 +106,20 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
        if (this._category)
            name = this._category.get_name();
        else
-            name = _('Favorites');
+            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', Lang.bind(this, this._onMotionEvent));
+    },

-    activate(event) {
-        this._button.selectCategory(this._category);
+    activate: function(event) {
+        this._button.selectCategory(this._category, this);
        this._button.scrollToCatButton(this);
-        super.activate(event);
-    }
+	this.parent(event);
+    },

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

        if (this._oldX == -1) {
            this._oldX = x;
@@ -150,11 +134,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
@@ -175,36 +159,36 @@ 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)
-            return true;
+        if (((this.actor.width * y) - (NAVIGATION_REGION_OVERSHOOT * x)) <= 0)
+             return true;

        return false;
-    }
+    },

-    _onMotionEvent(actor, event) {
+    _onMotionEvent: function(actor, event) {
        if (!Clutter.get_pointer_grab()) {
            this._oldX = -1;
            this._oldY = -1;
-            Clutter.grab_pointer(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;
+        this.actor.hover = false;
        Clutter.ungrab_pointer();

        let source = event.get_source();
@@ -212,330 +196,202 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
            source.sync_hover();

        return false;
-    }
+    },

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

-class ApplicationsMenu extends PopupMenu.PopupMenu {
-    constructor(sourceActor, arrowAlignment, arrowSide, button) {
-        super(sourceActor, arrowAlignment, arrowSide);
+const ApplicationsMenu = new Lang.Class({
+    Name: 'ApplicationsMenu',
+    Extends: PopupMenu.PopupMenu,
+
+    _init: function(sourceActor, arrowAlignment, arrowSide, button) {
+        this.parent(sourceActor, arrowAlignment, arrowSide);
        this._button = button;
-    }
+    },

-    isEmpty() {
-        return false;
-    }
+    isEmpty: function() {
+	return false;
+    },

-    open(animate) {
+    open: function(animate) {
        this._button.hotCorner.setBarrierSize(0);
        if (this._button.hotCorner.actor) // fallback corner
            this._button.hotCorner.actor.hide();
-        super.open(animate);
-    }
+        this.parent(animate);
+    },

-    close(animate) {
+    close: function(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);
-    }
+        this.parent(animate);
+    },

-    toggle() {
+    toggle: function() {
        if (this.isOpen) {
-            this._button.selectCategory(null);
+            this._button.selectCategory(null, null);
        } else {
            if (Main.overview.visible)
                Main.overview.hide();
        }
-        super.toggle();
+        this.parent();
    }
-}
+});

-class DesktopTarget {
-    constructor() {
-        this._desktop = null;
-        this._desktopDestroyedId = 0;
+const ApplicationsButton = new Lang.Class({
+    Name: 'ApplicationsButton',
+    Extends: PanelMenu.Button,

-        this._windowAddedId =
-            global.window_group.connect('actor-added',
-                this._onWindowAdded.bind(this));
+    _init: function() {
+        this.parent(1.0, null, false);

-        global.get_window_actors().forEach(a => {
-            this._onWindowAdded(a.get_parent(), a);
-        });
-    }
-
-    get hasDesktop() {
-        return this._desktop != null;
-    }
-
-    _onWindowAdded(group, actor) {
-        if (!(actor instanceof Meta.WindowActor))
-            return;
-
-        if (actor.meta_window.get_window_type() == Meta.WindowType.DESKTOP)
-            this._setDesktop(actor);
-    }
-
-    _setDesktop(desktop) {
-        if (this._desktop) {
-            this._desktop.disconnect(this._desktopDestroyedId);
-            this._desktopDestroyedId = 0;
-
-            delete this._desktop._delegate;
-        }
-
-        this._desktop = desktop;
-        this.emit('desktop-changed');
-
-        if (this._desktop) {
-            this._desktopDestroyedId = this._desktop.connect('destroy', () => {
-                this._setDesktop(null);
-            });
-            this._desktop._delegate = this;
-        }
-    }
-
-    _getSourceAppInfo(source) {
-        if (!(source instanceof ApplicationMenuItem))
-            return null;
-        return source._app.app_info;
-    }
-
-    async _markTrusted(file) {
-        let modeAttr = Gio.FILE_ATTRIBUTE_UNIX_MODE;
-        let trustedAttr = 'metadata::trusted';
-        let queryFlags = Gio.FileQueryInfoFlags.NONE;
-        let ioPriority = GLib.PRIORITY_DEFAULT;
-
-        try {
-            let info = await file.query_info_async(modeAttr, queryFlags, ioPriority, null);
-
-            let mode = info.get_attribute_uint32(modeAttr) | 0o100;
-            info.set_attribute_uint32(modeAttr, mode);
-            info.set_attribute_string(trustedAttr, 'yes');
-            await file.set_attributes_async(info, queryFlags, ioPriority, null);
-
-            // Hack: force nautilus to reload file info
-            info = new Gio.FileInfo();
-            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) {
-                log(`Failed to update access time: ${e.message}`);
-            }
-        } catch (e) {
-            log(`Failed to mark file as trusted: ${e.message}`);
-        }
-    }
-
-    destroy() {
-        if (this._windowAddedId)
-            global.window_group.disconnect(this._windowAddedId);
-        this._windowAddedId = 0;
-
-        this._setDesktop(null);
-    }
-
-    handleDragOver(source, _actor, _x, _y, _time) {
-        let appInfo = this._getSourceAppInfo(source);
-        if (!appInfo)
-            return DND.DragMotionResult.CONTINUE;
-
-        return DND.DragMotionResult.COPY_DROP;
-    }
-
-    acceptDrop(source, _actor, _x, _y, _time) {
-        let appInfo = this._getSourceAppInfo(source);
-        if (!appInfo)
-            return false;
-
-        this.emit('app-dropped');
-
-        let desktop = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_DESKTOP);
-
-        let src = Gio.File.new_for_path(appInfo.get_filename());
-        let dst = Gio.File.new_for_path(GLib.build_filenamev([desktop, src.get_basename()]));
-
-        try {
-            // copy_async() isn't introspectable :-(
-            src.copy(dst, Gio.FileCopyFlags.OVERWRITE, null, null);
-            this._markTrusted(dst);
-        } catch (e) {
-            log(`Failed to copy to desktop: ${e.message}`);
-        }
-
-        return true;
-    }
-}
-Signals.addSignalMethods(DesktopTarget.prototype);
-
-let ApplicationsButton = GObject.registerClass(
-class ApplicationsButton extends PanelMenu.Button {
-    _init() {
-        super._init(1.0, null, false);
-
-        this.setMenu(new ApplicationsMenu(this, 1.0, St.Side.TOP, this));
+        this.setMenu(new ApplicationsMenu(this.actor, 1.0, St.Side.TOP, this));
        Main.panel.menuManager.addMenu(this.menu);

        // At this moment applications menu is not keyboard navigable at
        // all (so not accessible), so it doesn't make sense to set as
        // role ATK_ROLE_MENU like other elements of the panel.
-        this.accessible_role = Atk.Role.LABEL;
+        this.actor.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
-        });
+        this._label = new St.Label({ text: _("Applications"),
+                                     y_expand: true,
+                                     y_align: Clutter.ActorAlign.CENTER });
        hbox.add_child(this._label);
        hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));

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

-        this.connect('captured-event', this._onCapturedEvent.bind(this));
+        this.actor.connect('captured-event', Lang.bind(this, this._onCapturedEvent));
+        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));

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

-        this._desktopTarget = new DesktopTarget();
-        this._desktopTarget.connect('app-dropped', () => {
-            this.menu.close();
-        });
-        this._desktopTarget.connect('desktop-changed', () => {
-            this._applicationsButtons.forEach(item => {
-                item.setDragEnabled(this._desktopTarget.hasDesktop);
-            });
-        });
-
-        this._tree = new GMenu.Tree({ menu_basename: 'applications.menu' });
-        this._treeChangedId = this._tree.connect('changed',
-            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._installedChangedId = appSys.connect('installed-changed', Lang.bind(this, function() {
+            if (this.menu.isOpen) {
+                this._redisplay();
+                this.mainBox.show();
+            } else {
+                this.reloadFlag = true;
+            }
+        }));

-    _onTreeChanged() {
-        if (this.menu.isOpen) {
-            this._redisplay();
-            this.mainBox.show();
-        } else {
-            this.reloadFlag = true;
-        }
-    }
+        // Since the hot corner uses stage coordinates, Clutter won't
+        // queue relayouts for us when the panel moves. Queue a relayout
+        // when that happens.
+        this._panelBoxChangedId = Main.layoutManager.connect('panel-box-changed', Lang.bind(this, function() {
+            container.queue_relayout();
+        }));
+    },

    get hotCorner() {
        return Main.layoutManager.hotCorners[Main.layoutManager.primaryIndex];
-    }
+    },

-    _createVertSeparator() {
-        let separator = new St.DrawingArea({
-            style_class: 'calendar-vertical-separator',
-            pseudo_class: 'highlighted'
-        });
-        separator.connect('repaint', this._onVertSepRepaint.bind(this));
+    _createVertSeparator: function() {
+        let separator = new St.DrawingArea({ style_class: 'calendar-vertical-separator',
+                                             pseudo_class: 'highlighted' });
+        separator.connect('repaint', Lang.bind(this, this._onVertSepRepaint));
        return separator;
-    }
+    },

-    _onDestroy() {
+    _onDestroy: function() {
        Main.overview.disconnect(this._showingId);
        Main.overview.disconnect(this._hidingId);
+        Main.layoutManager.disconnect(this._panelBoxChangedId);
        appSys.disconnect(this._installedChangedId);
-        this._tree.disconnect(this._treeChangedId);
-        this._tree = 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,
+                                           Main.sessionMode.hasOverview ?
+                                           Lang.bind(Main.overview, Main.overview.toggle) :
+                                           null);
+    },

-        this._desktopTarget.destroy();
-    }
-
-    _onCapturedEvent(actor, event) {
+    _onCapturedEvent: function(actor, event) {
        if (event.type() == Clutter.EventType.BUTTON_PRESS) {
            if (!Main.overview.shouldToggleByCornerOrButton())
                return true;
        }
        return false;
-    }
+    },

-    _onMenuKeyPress(actor, event) {
+    _onMenuKeyPress: function(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;
+            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;
        }
-        return super._onMenuKeyPress(actor, event);
-    }
+        return this.parent(actor, event);
+    },

-    _onVertSepRepaint(area) {
+    _onVertSepRepaint: function(area) {
        let cr = area.get_context();
        let themeNode = area.get_theme_node();
        let [width, height] = area.get_surface_size();
        let stippleColor = themeNode.get_color('-stipple-color');
        let stippleWidth = themeNode.get_length('-stipple-width');
-        let x = Math.floor(width / 2) + 0.5;
+        let x = Math.floor(width/2) + 0.5;
        cr.moveTo(x, 0);
        cr.lineTo(x, height);
        Clutter.cairo_set_source_color(cr, stippleColor);
        cr.setDash([1, 3], 1); // Hard-code for now
        cr.setLineWidth(stippleWidth);
        cr.stroke();
-    }
+    },

-    _onOpenStateChanged(menu, open) {
-        if (open) {
-            if (this.reloadFlag) {
-                this._redisplay();
-                this.reloadFlag = false;
-            }
-            this.mainBox.show();
-        }
-        super._onOpenStateChanged(menu, open);
-    }
+    _onOpenStateChanged: function(menu, open) {
+       if (open) {
+           if (this.reloadFlag) {
+               this._redisplay();
+               this.reloadFlag = false;
+           }
+           this.mainBox.show();
+       }
+       this.parent(menu, open);
+    },

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

-    _redisplay() {
+    _redisplay: function() {
        this.applicationsBox.destroy_all_children();
        this.categoriesBox.destroy_all_children();
        this._display();
-    }
+    },

-    _loadCategory(categoryId, dir) {
+    _loadCategory: function(categoryId, dir) {
        let iter = dir.iter();
        let nextType;
        while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) {
@@ -544,30 +400,26 @@ class ApplicationsButton extends PanelMenu.Button {
                let id;
                try {
                    id = entry.get_desktop_file_id(); // catch non-UTF8 filenames
-                } catch (e) {
+                } catch(e) {
                    continue;
                }
                let app = appSys.lookup_app(id);
-                if (!app)
-                    app = new Shell.App({ app_info: entry.get_app_info() });
-                if (app.get_app_info().should_show())
+                if (app && app.get_app_info().should_show())
                    this.applicationsByCategory[categoryId].push(app);
-            } else if (nextType == GMenu.TreeItemType.SEPARATOR) {
-                this.applicationsByCategory[categoryId].push('separator');
            } else if (nextType == GMenu.TreeItemType.DIRECTORY) {
                let subdir = iter.get_directory();
                if (!subdir.get_is_nodisplay())
                    this._loadCategory(categoryId, subdir);
            }
        }
-    }
+    },

-    scrollToButton(button) {
+    scrollToButton: function(button) {
        let appsScrollBoxAdj = this.applicationsScrollBox.get_vscroll_bar().get_adjustment();
        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;
@@ -575,14 +427,14 @@ class ApplicationsButton extends PanelMenu.Button {
            newScrollValue = buttonAlloc.y2 - boxHeight + 10;
        if (newScrollValue != currentScrollValue)
            appsScrollBoxAdj.set_value(newScrollValue);
-    }
+    },

-    scrollToCatButton(button) {
+    scrollToCatButton: function(button) {
        let catsScrollBoxAdj = this.categoriesScrollBox.get_vscroll_bar().get_adjustment();
        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;
@@ -590,148 +442,133 @@ class ApplicationsButton extends PanelMenu.Button {
            newScrollValue = buttonAlloc.y2 - boxHeight + 10;
        if (newScrollValue != currentScrollValue)
            catsScrollBoxAdj.set_value(newScrollValue);
-    }
+    },

-    _createLayout() {
+    _createLayout: function() {
        let section = new PopupMenu.PopupMenuSection();
        this.menu.addMenuItem(section);
        this.mainBox = new St.BoxLayout({ vertical: false });
        this.leftBox = new St.BoxLayout({ vertical: true });
-        this.applicationsScrollBox = new St.ScrollView({
-            x_fill: true,
-            y_fill: false,
-            y_align: St.Align.START,
-            style_class: 'apps-menu vfade'
-        });
+        this.applicationsScrollBox = new St.ScrollView({ 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();
-        vscroll.connect('scroll-start', () => {
+        vscroll.connect('scroll-start', Lang.bind(this, function() {
            this.menu.passEvents = true;
-        });
-        vscroll.connect('scroll-stop', () => {
+        }));
+        vscroll.connect('scroll-stop', Lang.bind(this, function() {
            this.menu.passEvents = false;
-        });
-        this.categoriesScrollBox = new St.ScrollView({
-            x_fill: true,
-            y_fill: false,
-            y_align: St.Align.START,
-            style_class: 'vfade'
-        });
+        }));
+        this.categoriesScrollBox = new St.ScrollView({ 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(this.categoriesScrollBox, {
-            expand: true,
-            x_fill: true,
-            y_fill: true,
-            y_align: St.Align.START
-        });
+        vscroll.connect('scroll-start', Lang.bind(this, function() {
+                              this.menu.passEvents = true;
+                          }));
+        vscroll.connect('scroll-stop', Lang.bind(this, function() {
+            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, {
-            expand: false,
-            x_fill: true,
-            y_fill: false,
-            y_align: St.Align.START
-        });
+        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);
        this.categoriesBox = new St.BoxLayout({ vertical: true });
-        this.categoriesScrollBox.add_actor(this.categoriesBox);
+        this.categoriesScrollBox.add_actor(this.categoriesBox, { expand: true, x_fill: false });

        this.mainBox.add(this.leftBox);
-        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
-        });
+        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);
-    }
+    },

-    _display() {
-        this._applicationsButtons.clear();
-        this.mainBox.style = 'width: 35em;';
+    _display: function() {
+        this._applicationsButtons = new Array();
+        this.mainBox.style=('width: 35em;');
        this.mainBox.hide();

        //Load categories
        this.applicationsByCategory = {};
-        this._tree.load_sync();
-        let root = this._tree.get_root_directory();
+        let tree = new GMenu.Tree({ menu_basename: 'applications.menu' });
+        tree.load_sync();
+        let root = 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)
-                continue;
-
-            let dir = iter.get_directory();
-            if (dir.get_is_nodisplay())
-                continue;
-
-            let categoryId = dir.get_menu_id();
-            this.applicationsByCategory[categoryId] = [];
-            this._loadCategory(categoryId, dir);
-            if (this.applicationsByCategory[categoryId].length > 0) {
-                let categoryMenuItem = new CategoryMenuItem(this, dir);
-                this.categoriesBox.add_actor(categoryMenuItem);
+            if (nextType == GMenu.TreeItemType.DIRECTORY) {
+                let dir = iter.get_directory();
+                if (!dir.get_is_nodisplay()) {
+                    let categoryId = dir.get_menu_id();
+                    this.applicationsByCategory[categoryId] = [];
+                    this._loadCategory(categoryId, dir);
+                    if (this.applicationsByCategory[categoryId].length > 0) {
+                        let categoryMenuItem = new CategoryMenuItem(this, dir);
+                        this.categoriesBox.add_actor(categoryMenuItem.actor);
+                    }
+                }
            }
        }

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

-        let themeContext = St.ThemeContext.get_for_stage(global.stage);
-        let scaleFactor = themeContext.scale_factor;
-        let categoriesHeight = this.categoriesBox.height / scaleFactor;
-        let height = Math.round(categoriesHeight) + MENU_HEIGHT_OFFSET;
-        this.mainBox.style += `height: ${height}px`;
-    }
+        let height = this.categoriesBox.height + MENU_HEIGHT_OFFSET + 'px';
+        this.mainBox.style+=('height: ' + height);
+    },

-    selectCategory(dir) {
-        this.applicationsBox.get_children().forEach(c => {
-            if (c._delegate instanceof PopupMenu.PopupSeparatorMenuItem)
-                c._delegate.destroy();
-            else
-                this.applicationsBox.remove_actor(c);
-        });
+    _clearApplicationsBox: function(selectedActor) {
+        let actors = this.applicationsBox.get_children();
+        for (let i = 0; i < actors.length; i++) {
+            let actor = actors[i];
+            this.applicationsBox.remove_actor(actor);
+        }
+    },
+
+    selectCategory: function(dir, categoryMenuItem) {
+        if (categoryMenuItem)
+            this._clearApplicationsBox(categoryMenuItem.actor);
+        else
+            this._clearApplicationsBox(null);

        if (dir)
            this._displayButtons(this._listApplications(dir.get_menu_id()));
        else
            this._displayButtons(this._listApplications(null));
-    }
+    },

-    _displayButtons(apps) {
-        for (let i = 0; i < apps.length; i++) {
-            let app = apps[i];
-            let item;
-            if (app instanceof Shell.App)
-                item = this._applicationsButtons.get(app);
-            else
-                item = new PopupMenu.PopupSeparatorMenuItem();
-            if (!item) {
-                item = new ApplicationMenuItem(this, app);
-                item.setDragEnabled(this._desktopTarget.hasDesktop);
-                this._applicationsButtons.set(app, item);
+    _displayButtons: function(apps) {
+         if (apps) {
+            for (let i = 0; i < apps.length; i++) {
+               let app = apps[i];
+               if (!this._applicationsButtons[app]) {
+                  let applicationMenuItem = new ApplicationMenuItem(this, app);
+                  this._applicationsButtons[app] = applicationMenuItem;
+               }
+               if (!this._applicationsButtons[app].actor.get_parent())
+                  this.applicationsBox.add_actor(this._applicationsButtons[app].actor);
            }
-            if (!item.get_parent())
-                this.applicationsBox.add_actor(item);
-        }
-    }
+         }
+    },

-    _listApplications(categoryMenuId) {
+    _listApplications: function(category_menu_id) {
        let applist;

-        if (categoryMenuId) {
-            applist = this.applicationsByCategory[categoryMenuId];
+        if (category_menu_id) {
+            applist = this.applicationsByCategory[category_menu_id];
+            applist.sort(function(a,b) {
+                return a.get_name().toLowerCase() > b.get_name().toLowerCase();
+            });
        } else {
            applist = new Array();
            let favorites = global.settings.get_strv('favorite-apps');
@@ -743,6 +580,11 @@ class ApplicationsButton extends PanelMenu.Button {
        }

        return applist;
+    },
+
+    destroy: function() {
+        this.menu.actor.get_children().forEach(function(c) { c.destroy() });
+        this.parent();
    }
 });

@@ -762,6 +604,6 @@ function disable() {
    activitiesButton.container.show();
 }

-function init() {
-    ExtensionUtils.initTranslations();
+function init(metadata) {
+    Convenience.initTranslations();
 }
--- a/extensions/apps-menu/meson.build
+++ b/extensions/apps-menu/meson.build
@@ -1,5 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)
--- a/extensions/apps-menu/metadata.json.in
+++ b/extensions/apps-menu/metadata.json.in
@@ -3,7 +3,7 @@
 "uuid": "@uuid@",
 "gettext-domain": "@gettext_domain@",
 "name": "Applications Menu",
-"description": "Add a category-based menu for applications.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance instead.",
+"description": "Add a category-based menu for applications.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME Bugzilla instead.",
 "original-authors": [ "e2002@bk.ru", "debarshir@gnome.org" ],
 "shell-version": [ "@shell_current@" ],
 "url": "@url@"
--- a/extensions/auto-move-windows/Makefile.am
+++ b/extensions/auto-move-windows/Makefile.am
@@ -0,0 +1,7 @@
+EXTENSION_ID = auto-move-windows
+
+EXTRA_MODULES = prefs.js
+
+include ../../extension.mk
+include ../../settings.mk
+
--- a/extensions/auto-move-windows/extension.js
+++ b/extensions/auto-move-windows/extension.js
@@ -1,134 +1,149 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
 // Start apps on custom workspaces
-/* exported init enable disable */

+const Glib = imports.gi.GLib;
+const Gio = imports.gi.Gio;
+const Lang = imports.lang;
+const Mainloop = imports.mainloop;
+const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
+const St = imports.gi.St;

 const Main = imports.ui.main;

 const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;

-class WindowMover {
-    constructor() {
-        this._settings = ExtensionUtils.getSettings();
-        this._appSystem = Shell.AppSystem.get_default();
-        this._appConfigs = new Map();
-        this._appData = new Map();
+const SETTINGS_KEY = 'application-list';

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

-        this._settings.connect('changed', this._updateAppConfigs.bind(this));
-        this._updateAppConfigs();
-    }
+const WindowMover = new Lang.Class({
+    Name: 'AutoMoveWindows.WindowMover',

-    _updateAppConfigs() {
-        this._appConfigs.clear();
+    _init: function() {
+        this._settings = settings;
+        this._windowTracker = Shell.WindowTracker.get_default();

-        this._settings.get_strv('application-list').forEach(v => {
-            let [appId, num] = v.split(':');
-            this._appConfigs.set(appId, parseInt(num) - 1);
-        });
+        let display = global.screen.get_display();
+        // Connect after so the handler from ShellWindowTracker has already run
+        this._windowCreatedId = display.connect_after('window-created', Lang.bind(this, this._findAndMove));
+    },

-        this._updateAppData();
-    }
-
-    _updateAppData() {
-        let ids = [...this._appConfigs.keys()];
-        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 != null && !this._appData.has(app)
-        );
-        addedApps.forEach(app => {
-            let data = {
-                windowsChangedId: app.connect('windows-changed',
-                    this._appWindowsChanged.bind(this)),
-                moveWindowsId: 0,
-                windows: app.get_windows()
-            };
-            this._appData.set(app, data);
-        });
-    }
-
-    destroy() {
-        if (this._appsChangedId) {
-            this._appSystem.disconnect(this._appsChangedId);
-            this._appsChangedId = 0;
+    destroy: function() {
+        if (this._windowCreatedId) {
+            global.screen.get_display().disconnect(this._windowCreatedId);
+            this._windowCreatedId = 0;
        }
+    },

-        if (this._settings) {
-            this._settings.run_dispose();
-            this._settings = null;
+    _ensureAtLeastWorkspaces: function(num, window) {
+        for (let j = global.screen.n_workspaces; j <= num; j++) {
+            window.change_workspace_by_index(j-1, false);
+            global.screen.append_new_workspace(false, 0);
        }
+    },

-        this._appConfigs.clear();
-        this._updateAppData();
-    }
-
-    _moveWindow(window, workspaceNum) {
+    _findAndMove: function(display, window, noRecurse) {
        if (window.skip_taskbar)
            return;

-        // ensure we have the required number of workspaces
-        let workspaceManager = global.workspace_manager;
-        for (let i = workspaceManager.n_workspaces; i <= workspaceNum; i++) {
-            window.change_workspace_by_index(i - 1, false);
-            workspaceManager.append_new_workspace(false, 0);
+        let spaces = this._settings.get_strv(SETTINGS_KEY);
+
+        let app = this._windowTracker.get_window_app(window);
+        if (!app) {
+            if (!noRecurse) {
+                // window is not tracked yet
+                Mainloop.idle_add(Lang.bind(this, function() {
+                    this._findAndMove(display, window, true);
+                    return false;
+                }));
+            } else
+                log ('Cannot find application for window');
+            return;
        }
+        let app_id = app.get_id();
+        for ( let j = 0 ; j < spaces.length; j++ ) {
+            let apps_to_space = spaces[j].split(":");
+            // Match application id
+            if (apps_to_space[0] == app_id) {
+                let workspace_num = parseInt(apps_to_space[1]) - 1;

-        window.change_workspace_by_index(workspaceNum, false);
+                if (workspace_num >= global.screen.n_workspaces)
+                    this._ensureAtLeastWorkspaces(workspace_num, window);
+
+                window.change_workspace_by_index(workspace_num, false);
+            }
+        }
    }
-
-    _appWindowsChanged(app) {
-        let data = this._appData.get(app);
-        let windows = app.get_windows();
-
-        // If get_compositor_private() returns non-NULL on a removed windows,
-        // 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 => !windows.includes(w) && w.get_compositor_private() != null
-        ));
-
-        let workspaceNum = this._appConfigs.get(app.id);
-        windows.filter(w => !data.windows.includes(w)).forEach(window => {
-            this._moveWindow(window, workspaceNum);
-        });
-        data.windows = windows;
-    }
-}
+});

 let prevCheckWorkspaces;
 let winMover;

 function init() {
-    ExtensionUtils.initTranslations();
+    Convenience.initTranslations();
+    settings = Convenience.getSettings();
 }

 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().length > 0;
-        else if (!this._workspaces[i]._keepAliveId)
-            keepAliveWorkspaces.push(this._workspaces[i]);
+    let i;
+    let emptyWorkspaces = new Array(this._workspaces.length);
+
+    if (!Meta.prefs_get_dynamic_workspaces()) {
+        this._checkWorkspacesId = 0;
+        return false;
    }

-    // make sure the original method only removes empty workspaces at the end
-    keepAliveWorkspaces.forEach(ws => ws._keepAliveId = 1);
-    prevCheckWorkspaces.call(this);
-    keepAliveWorkspaces.forEach(ws => delete ws._keepAliveId);
+    for (i = 0; i < this._workspaces.length; i++) {
+        let lastRemoved = this._workspaces[i]._lastRemovedWindow;
+        if ((lastRemoved &&
+             (lastRemoved.get_window_type() == Meta.WindowType.SPLASHSCREEN ||
+              lastRemoved.get_window_type() == Meta.WindowType.DIALOG ||
+              lastRemoved.get_window_type() == Meta.WindowType.MODAL_DIALOG)) ||
+            this._workspaces[i]._keepAliveId)
+            emptyWorkspaces[i] = false;
+        else
+            emptyWorkspaces[i] = true;
+    }

+    let sequences = Shell.WindowTracker.get_default().get_startup_sequences();
+    for (i = 0; i < sequences.length; i++) {
+        let index = sequences[i].get_workspace();
+        if (index >= 0 && index <= global.screen.n_workspaces)
+            emptyWorkspaces[index] = false;
+    }
+
+    let windows = global.get_window_actors();
+    for (i = 0; i < windows.length; i++) {
+	let winActor = windows[i];
+        let win = winActor.meta_window;
+	if (win.is_on_all_workspaces())
+            continue;
+
+	let workspaceIndex = win.get_workspace().index();
+	emptyWorkspaces[workspaceIndex] = false;
+    }
+
+    // If we don't have an empty workspace at the end, add one
+    if (!emptyWorkspaces[emptyWorkspaces.length -1]) {
+	global.screen.append_new_workspace(false, global.get_current_time());
+	emptyWorkspaces.push(false);
+    }
+
+    let activeWorkspaceIndex = global.screen.get_active_workspace_index();
+    emptyWorkspaces[activeWorkspaceIndex] = false;
+
+    // Delete other empty workspaces; do it from the end to avoid index changes
+    for (i = emptyWorkspaces.length - 2; i >= 0; i--) {
+        if (emptyWorkspaces[i])
+            global.screen.remove_workspace(this._workspaces[i], global.get_current_time());
+        else
+            break;
+    }
+
+    this._checkWorkspacesId = 0;
    return false;
 }

--- a/extensions/auto-move-windows/meson.build
+++ b/extensions/auto-move-windows/meson.build
@@ -1,8 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)
-
-extension_sources += files('prefs.js')
-extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')
--- a/extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in
+++ b/extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in
@@ -3,8 +3,8 @@
    <key name="application-list" type="as">
      <!-- FIXME: should be a(su), when JS supports more of GVariant -->
      <default>[ ]</default>
-      <summary>Application and workspace list</summary>
-      <description>A list of strings, each containing an application id (desktop file name), followed by a colon and the workspace number</description>
+      <_summary>Application and workspace list</_summary>
+      <_description>A list of strings, each containing an application id (desktop file name), followed by a colon and the workspace number</_description>
    </key>
  </schema>
 </schemalist>
--- a/extensions/auto-move-windows/prefs.js
+++ b/extensions/auto-move-windows/prefs.js
@@ -1,14 +1,22 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
 // Start apps on custom workspaces
-/* exported init buildPrefsWidget */

-const { Gio, GObject, Gtk } = imports.gi;
+const GdkPixbuf = imports.gi.GdkPixbuf;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const GMenu = imports.gi.GMenu;
+const Gtk = imports.gi.Gtk;
+const Lang = imports.lang;
+const Mainloop = imports.mainloop;

 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
-const N_ = e => e;
+const N_ = function(e) { return e };

 const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;

 const SETTINGS_KEY = 'application-list';

@@ -22,257 +30,240 @@ const Columns = {
    ADJUSTMENT: 4
 };

-const Widget = GObject.registerClass({
+const Widget = new GObject.Class({
+    Name: 'AutoMoveWindows.Prefs.Widget',
    GTypeName: 'AutoMoveWindowsPrefsWidget',
-}, class Widget extends Gtk.Grid {
-    _init(params) {
-        super._init(params);
+    Extends: Gtk.Grid,
+
+    _init: function(params) {
+	this.parent(params);
        this.set_orientation(Gtk.Orientation.VERTICAL);

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

-        this._store = new Gtk.ListStore();
-        this._store.set_column_types([
-            Gio.AppInfo,
-            GObject.TYPE_STRING,
-            Gio.Icon,
-            GObject.TYPE_INT,
-            Gtk.Adjustment
-        ]);
+	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 });
+        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);
+	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 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);
+	let workspaceColumn = new Gtk.TreeViewColumn({ title: _("Workspace"),
+                                                       sort_column_id: Columns.WORKSPACE });
+	let workspaceRenderer = new Gtk.CellRendererSpin({ editable: true });
+	workspaceRenderer.connect('edited', Lang.bind(this, this._workspaceEdited));
+	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);
+	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 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 newButton = new Gtk.ToolButton({ icon_name: 'bookmark-new-symbolic',
+                                             label: _("Add Rule"),
+					     is_important: true });
+	newButton.connect('clicked', Lang.bind(this, this._createNew));
+	toolbar.add(newButton);

-        let delButton = new Gtk.ToolButton({ icon_name: 'edit-delete-symbolic' });
-        delButton.connect('clicked', this._deleteSelected.bind(this));
-        toolbar.add(delButton);
+	let delButton = new Gtk.ToolButton({ icon_name: 'edit-delete-symbolic'  });
+	delButton.connect('clicked', Lang.bind(this, this._deleteSelected));
+	toolbar.add(delButton);

        let selection = this._treeView.get_selection();
-        selection.connect('changed', () => {
-            delButton.sensitive = selection.count_selected_rows() > 0;
-        });
+        selection.connect('changed',
+            function() {
+                delButton.sensitive = selection.count_selected_rows() > 0;
+            });
        delButton.sensitive = selection.count_selected_rows() > 0;

-        this._changedPermitted = true;
-        this._refresh();
-    }
+	this._changedPermitted = true;
+	this._refresh();
+    },

-    _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);
+    _createNew: function() {
+	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 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', Lang.bind(this,
+            function(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
-        });
+	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);
+	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.connect('response', Lang.bind(this, function(dialog, id) {
+	    if (id != Gtk.ResponseType.OK) {
                dialog.destroy();
-                return;
+		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;
+	    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._changedPermitted = false;
+	    this._appendItem(appInfo.get_id(), index);
+	    this._changedPermitted = true;

-            this._appendRow(appInfo, index);
+	    let iter = this._store.append();
+	    let adj = new Gtk.Adjustment({ lower: 1,
+					   upper: WORKSPACE_MAX,
+					   step_increment: 1,
+                                           value: index });
+	    this._store.set(iter,
+			    [Columns.APPINFO, Columns.ICON, Columns.DISPLAY_NAME, Columns.WORKSPACE, Columns.ADJUSTMENT],
+			    [appInfo, appInfo.get_icon(), appInfo.get_display_name(), index, adj]);

            dialog.destroy();
-        });
-        dialog.show_all();
-    }
+	}));
+	dialog.show_all();
+    },

-    _deleteSelected() {
-        let [any, model_, iter] = this._treeView.get_selection().get_selected();
+    _deleteSelected: function() {
+	let [any, model, iter] = this._treeView.get_selection().get_selected();

-        if (any) {
-            let appInfo = this._store.get_value(iter, Columns.APPINFO);
+	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);
-        }
-    }
+	    this._changedPermitted = false;
+	    this._removeItem(appInfo.get_id());
+	    this._changedPermitted = true;
+	    this._store.remove(iter);
+	}
+    },

-    _workspaceEdited(renderer, pathString, text) {
-        let index = parseInt(text);
-        if (isNaN(index) || index < 0)
-            index = 1;
+    _workspaceEdited: function(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);
+	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;
-    }
+	this._changedPermitted = false;
+	this._changeItem(appInfo.get_id(), index);
+	this._store.set_value(iter, Columns.WORKSPACE, index);
+	this._changedPermitted = true;
+    },

-    _refresh() {
-        if (!this._changedPermitted)
-            // Ignore this notification, model is being modified outside
-            return;
+    _refresh: function() {
+	if (!this._changedPermitted)
+	    // Ignore this notification, model is being modified outside
+	    return;

-        this._store.clear();
+	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]);
+	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));
-        }
+	    let iter = this._store.append();
+	    let adj = new Gtk.Adjustment({ lower: 1,
+					   upper: WORKSPACE_MAX,
+					   step_increment: 1,
+                                           value: index });
+	    this._store.set(iter,
+			    [Columns.APPINFO, Columns.ICON, Columns.DISPLAY_NAME, Columns.WORKSPACE, Columns.ADJUSTMENT],
+			    [appInfo, appInfo.get_icon(), appInfo.get_display_name(), parseInt(index), adj]);
+	}

-        if (validItems.length != currentItems.length) // some items were filtered out
-            this._settings.set_strv(SETTINGS_KEY, validItems);
-    }
+	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]);
-    }
-
-    _checkId(id) {
+    _checkId: function(id) {
        let items = this._settings.get_strv(SETTINGS_KEY);
-        return !items.some(i => i.startsWith(`${id}:`));
-    }
+        return !items.some(function(i) { return i.startsWith(id + ':'); });
+    },

-    _appendItem(id, workspace) {
-        let currentItems = this._settings.get_strv(SETTINGS_KEY);
-        currentItems.push(`${id}:${workspace}`);
-        this._settings.set_strv(SETTINGS_KEY, currentItems);
-    }
+    _appendItem: function(id, workspace) {
+	let currentItems = this._settings.get_strv(SETTINGS_KEY);
+	currentItems.push(id + ':' + workspace);
+	this._settings.set_strv(SETTINGS_KEY, currentItems);
+    },

-    _removeItem(id) {
-        let currentItems = this._settings.get_strv(SETTINGS_KEY);
-        let index = currentItems.map(el => el.split(':')[0]).indexOf(id);
+    _removeItem: function(id) {
+	let currentItems = this._settings.get_strv(SETTINGS_KEY);
+	let index = currentItems.map(function(el) {
+	    return el.split(':')[0];
+	}).indexOf(id);

-        if (index < 0)
-            return;
-        currentItems.splice(index, 1);
-        this._settings.set_strv(SETTINGS_KEY, currentItems);
-    }
+	if (index < 0)
+	    return;
+	currentItems.splice(index, 1);
+	this._settings.set_strv(SETTINGS_KEY, currentItems);
+    },

-    _changeItem(id, workspace) {
-        let currentItems = this._settings.get_strv(SETTINGS_KEY);
-        let index = currentItems.map(el => el.split(':')[0]).indexOf(id);
+    _changeItem: function(id, workspace) {
+	let currentItems = this._settings.get_strv(SETTINGS_KEY);
+	let index = currentItems.map(function(el) {
+	    return el.split(':')[0];
+	}).indexOf(id);

-        if (index < 0)
-            currentItems.push(`${id}:${workspace}`);
-        else
-            currentItems[index] = `${id}:${workspace}`;
-        this._settings.set_strv(SETTINGS_KEY, currentItems);
+	if (index < 0)
+	    currentItems.push(id + ':' + workspace);
+	else
+	    currentItems[index] = id + ':' + workspace;
+	this._settings.set_strv(SETTINGS_KEY, currentItems);
    }
 });


 function init() {
-    ExtensionUtils.initTranslations();
+    Convenience.initTranslations();
 }

 function buildPrefsWidget() {
--- a/extensions/drive-menu/Makefile.am
+++ b/extensions/drive-menu/Makefile.am
@@ -0,0 +1,3 @@
+EXTENSION_ID = drive-menu
+
+include ../../extension.mk
--- a/extensions/drive-menu/extension.js
+++ b/extensions/drive-menu/extension.js
@@ -1,52 +1,56 @@
-/* exported init enable disable */
 // Drive menu extension
-const { Gio, GObject, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const Lang = imports.lang;
+const St = imports.gi.St;
+const Shell = imports.gi.Shell;

 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;

 const Main = imports.ui.main;
+const Panel = imports.ui.panel;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 const ShellMountOperation = imports.ui.shellMountOperation;

 const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;

-var MountMenuItem = GObject.registerClass(
-class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
-    _init(mount) {
-        super._init();
+const MountMenuItem = new Lang.Class({
+    Name: 'DriveMenu.MountMenuItem',
+    Extends: PopupMenu.PopupBaseMenuItem,

-        this.label = new St.Label({ text: mount.get_name() });
-        this.add(this.label, { expand: true });
-        this.label_actor = this.label;
+    _init: function(mount) {
+	this.parent();

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

-        this.connect('destroy', this._onDestroy.bind(this));
+	this.mount = mount;

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

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

-    _onDestroy() {
+    destroy: function() {
        if (this._changedId) {
            this.mount.disconnect(this._changedId);
            this._changedId = 0;
        }

-        super.destroy();
-    }
+        this.parent();
+    },

-    _isInteresting() {
+    _isInteresting: function() {
        if (!this.mount.can_eject() && !this.mount.can_unmount())
            return false;
        if (this.mount.is_shadowed())
@@ -61,136 +65,135 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
        }

        return volume.get_identifier('class') != 'network';
-    }
+    },

-    _syncVisibility() {
-        this.visible = this._isInteresting();
-    }
+    _syncVisibility: function() {
+        this.actor.visible = this._isInteresting();
+    },

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

-        if (this.mount.can_eject())
-            this.mount.eject_with_operation(...unmountArgs,
-                this._ejectFinish.bind(this));
-        else
-            this.mount.unmount_with_operation(...unmountArgs,
-                this._unmountFinish.bind(this));
-    }
+	if (this.mount.can_eject())
+	    this.mount.eject_with_operation(Gio.MountUnmountFlags.NONE,
+                                            mountOp.mountOp,
+					    null, // Gio.Cancellable
+					    Lang.bind(this, this._ejectFinish));
+	else
+	    this.mount.unmount_with_operation(Gio.MountUnmountFlags.NONE,
+                                              mountOp.mountOp,
+			                      null, // Gio.Cancellable
+			                      Lang.bind(this, this._unmountFinish));
+    },

-    _unmountFinish(mount, result) {
-        try {
-            mount.unmount_with_operation_finish(result);
-        } catch (e) {
-            this._reportFailure(e);
-        }
-    }
+    _unmountFinish: function(mount, result) {
+	try {
+	    mount.unmount_with_operation_finish(result);
+	} catch(e) {
+	    this._reportFailure(e);
+	}
+    },

-    _ejectFinish(mount, result) {
-        try {
-            mount.eject_with_operation_finish(result);
-        } catch (e) {
-            this._reportFailure(e);
-        }
-    }
+    _ejectFinish: function(mount, result) {
+	try {
+	    mount.eject_with_operation_finish(result);
+	} catch(e) {
+	    this._reportFailure(e);
+	}
+    },

-    _reportFailure(exception) {
-        // TRANSLATORS: %s is the filesystem name
-        let msg = _('Ejecting drive “%s” failed:').format(this.mount.get_name());
-        Main.notifyError(msg, exception.message);
-    }
+    _reportFailure: function(exception) {
+	let msg = _("Ejecting drive '%s' failed:").format(this.mount.get_name());
+	Main.notifyError(msg, exception.message);
+    },

-    activate(event) {
-        let uri = this.mount.get_root().get_uri();
+    activate: function(event) {
        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);
+	this.parent(event);
    }
 });

-let DriveMenu = GObject.registerClass(
-class DriveMenu extends PanelMenu.Button {
-    _init() {
-        super._init(0.0, _('Removable devices'));
+const DriveMenu = new Lang.Class({
+    Name: 'DriveMenu.DriveMenu',
+    Extends: PanelMenu.Button,
+
+    _init: function() {
+        this.parent(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'
-        });
+        let icon = new St.Icon({ icon_name: 'media-eject-symbolic',
+                                 style_class: 'system-status-icon' });

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

-        this._monitor = Gio.VolumeMonitor.get();
-        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();
-        });
+	this._monitor = Gio.VolumeMonitor.get();
+	this._addedId = this._monitor.connect('mount-added', Lang.bind(this, function(monitor, mount) {
+	    this._addMount(mount);
+	    this._updateMenuVisibility();
+	}));
+	this._removedId = this._monitor.connect('mount-removed', Lang.bind(this, function(monitor, mount) {
+	    this._removeMount(mount);
+	    this._updateMenuVisibility();
+	}));

-        this._mounts = [];
+	this._mounts = [ ];

-        this._monitor.get_mounts().forEach(this._addMount.bind(this));
+	this._monitor.get_mounts().forEach(Lang.bind(this, this._addMount));

-        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-        this.menu.addAction(_('Open Files'), event => {
-            let appSystem = Shell.AppSystem.get_default();
-            let app = appSystem.lookup_app('org.gnome.Nautilus.desktop');
-            app.activate_full(-1, event.get_time());
-        });
+	this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+	this.menu.addAction(_("Open File"), function(event) {
+	    let appSystem = Shell.AppSystem.get_default();
+	    let app = appSystem.lookup_app('org.gnome.Nautilus.desktop');
+	    app.activate_full(-1, event.get_time());
+	});

-        this._updateMenuVisibility();
-    }
+	this._updateMenuVisibility();
+    },

-    _updateMenuVisibility() {
-        if (this._mounts.filter(i => i.actor.visible).length > 0)
-            this.show();
-        else
-            this.hide();
-    }
+    _updateMenuVisibility: function() {
+	if (this._mounts.filter(function(i) i.actor.visible).length > 0)
+	    this.actor.show();
+	else
+	    this.actor.hide();
+    },

-    _addMount(mount) {
-        let item = new MountMenuItem(mount);
-        this._mounts.unshift(item);
-        this.menu.addMenuItem(item, 0);
-    }
+    _addMount: function(mount) {
+	let item = new MountMenuItem(mount);
+	this._mounts.unshift(item);
+	this.menu.addMenuItem(item, 0);
+    },

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

-    _onDestroy() {
-        if (this._addedId) {
-            this._monitor.disconnect(this._addedId);
-            this._monitor.disconnect(this._removedId);
-            this._addedId = 0;
-            this._removedId = 0;
+    destroy: function() {
+        if (this._connectedId) {
+	    this._monitor.disconnect(this._connectedId);
+	    this._monitor.disconnect(this._disconnectedId);
+            this._connectedId = 0;
+            this._disconnectedId = 0;
        }

-        super._onDestroy();
-    }
+	this.parent();
+    },
 });

 function init() {
-    ExtensionUtils.initTranslations();
+    Convenience.initTranslations();
 }

 let _indicator;
--- a/extensions/drive-menu/meson.build
+++ b/extensions/drive-menu/meson.build
@@ -1,5 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)
--- a/extensions/example/Makefile.am
+++ b/extensions/example/Makefile.am
@@ -0,0 +1,6 @@
+EXTENSION_ID = example
+
+EXTRA_MODULES = prefs.js
+
+include ../../extension.mk
+include ../../settings.mk
--- a/extensions/example/extension.js
+++ b/extensions/example/extension.js
@@ -0,0 +1,49 @@
+// -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
+// Sample extension code, makes clicking on the panel show a message
+const St = imports.gi.St;
+const Mainloop = imports.mainloop;
+
+const Gettext = imports.gettext.domain('gnome-shell-extensions');
+const _ = Gettext.gettext;
+
+const Main = imports.ui.main;
+
+const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;
+
+function _showHello() {
+    let settings = Convenience.getSettings();
+    let text = settings.get_string('hello-text') || _("Hello, world!");
+
+    let label = new St.Label({ style_class: 'helloworld-label', text: text });
+    let monitor = Main.layoutManager.primaryMonitor;
+    global.stage.add_actor(label);
+    label.set_position(Math.floor (monitor.width / 2 - label.width / 2), Math.floor(monitor.height / 2 - label.height / 2));
+    Mainloop.timeout_add(3000, function () { label.destroy(); });
+}
+
+// Put your extension initialization code here
+function init(metadata) {
+    log ('Example extension initalized');
+
+    Convenience.initTranslations();
+}
+
+let signalId;
+
+function enable() {
+    log ('Example extension enabled');
+
+    Main.panel.actor.reactive = true;
+    signalId = Main.panel.actor.connect('button-release-event', _showHello);
+}
+
+function disable() {
+    log ('Example extension disabled');
+
+    if (signalId) {
+	Main.panel.actor.disconnect(signalId);
+	signalId = 0;
+    }
+}
--- a/extensions/example/metadata.json.in
+++ b/extensions/example/metadata.json.in
@@ -0,0 +1,10 @@
+{
+ "extension-id": "@extension_id@",
+ "uuid": "@uuid@",
+ "settings-schema": "@gschemaname@",
+ "gettext-domain": "@gettext_domain@",
+ "name": "Hello, World!",
+ "description": "An example extension to show how it works. Shows Hello, world when clicking on the top panel.",
+ "shell-version": [ "@shell_current@" ],
+ "url": "@url@"
+}
--- a/extensions/example/org.gnome.shell.extensions.example.gschema.xml.in
+++ b/extensions/example/org.gnome.shell.extensions.example.gschema.xml.in
@@ -0,0 +1,9 @@
+<schemalist gettext-domain="gnome-shell-extensions">
+  <schema id="org.gnome.shell.extensions.example" path="/org/gnome/shell/extensions/example/">
+    <key name="hello-text" type="s">
+      <default>''</default>
+      <_summary>Alternative greeting text.</_summary>
+      <_description>If not empty, it contains the text that will be shown when clicking on the panel.</_description>
+    </key>
+  </schema>
+</schemalist>
--- a/extensions/example/prefs.js
+++ b/extensions/example/prefs.js
@@ -0,0 +1,57 @@
+// -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
+
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Gio = imports.gi.Gio;
+const Gtk = imports.gi.Gtk;
+
+const Gettext = imports.gettext.domain('gnome-shell-extensions');
+const _ = Gettext.gettext;
+
+const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;
+
+function init() {
+    Convenience.initTranslations();
+}
+
+const ExamplePrefsWidget = new GObject.Class({
+    Name: 'Example.Prefs.Widget',
+    GTypeName: 'ExamplePrefsWidget',
+    Extends: Gtk.Grid,
+
+    _init: function(params) {
+	this.parent(params);
+        this.margin = 12;
+        this.row_spacing = this.column_spacing = 6;
+        this.set_orientation(Gtk.Orientation.VERTICAL);
+
+	this.add(new Gtk.Label({ label: '<b>' + _("Message") + '</b>',
+                                 use_markup: true,
+                                 halign: Gtk.Align.START }));
+
+        let entry = new Gtk.Entry({ hexpand: true,
+                                    margin_bottom: 12 });
+        this.add(entry);
+
+	this._settings = Convenience.getSettings();
+	this._settings.bind('hello-text', entry, 'text', Gio.SettingsBindFlags.DEFAULT);
+
+	// TRANSLATORS: Example is the name of the extension, should not be
+	// translated
+	let primaryText = _("Example aims to show how to build well behaved \
+extensions for the Shell and as such it has little functionality on its own.\n\
+Nevertheless it's possible to customize the greeting message.");
+
+	this.add(new Gtk.Label({ label: primaryText,
+                                 wrap: true, xalign: 0 }));
+    }
+});
+
+function buildPrefsWidget() {
+    let widget = new ExamplePrefsWidget();
+    widget.show_all();
+
+    return widget;
+}
--- a/extensions/example/stylesheet.css
+++ b/extensions/example/stylesheet.css
@@ -0,0 +1,8 @@
+/* Example stylesheet */
+.helloworld-label {
+    font-size: 36px;
+    font-weight: bold;
+    color: #ffffff;
+    background-color: rgba(10,10,10,0.7);
+    border-radius: 5px;
+}
--- a/extensions/launch-new-instance/Makefile.am
+++ b/extensions/launch-new-instance/Makefile.am
@@ -0,0 +1,3 @@
+EXTENSION_ID = launch-new-instance
+
+include ../../extension.mk
--- a/extensions/launch-new-instance/extension.js
+++ b/extensions/launch-new-instance/extension.js
@@ -1,15 +1,17 @@
-/* exported enable disable */
 const AppDisplay = imports.ui.appDisplay;

 let _activateOriginal = null;

+function init() {
+}
+
 function enable() {
-    _activateOriginal = AppDisplay.AppIcon.prototype.activate;
-    AppDisplay.AppIcon.prototype.activate = function() {
-        _activateOriginal.call(this, 2);
-    };
+  _activateOriginal = AppDisplay.AppIcon.prototype.activate;
+  AppDisplay.AppIcon.prototype.activate = function() {
+      _activateOriginal.call(this, 2);
+  };
 }

 function disable() {
-    AppDisplay.AppIcon.prototype.activate = _activateOriginal;
+  AppDisplay.AppIcon.prototype.activate = _activateOriginal;
 }
--- a/extensions/launch-new-instance/meson.build
+++ b/extensions/launch-new-instance/meson.build
@@ -1,5 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)
--- a/extensions/launch-new-instance/metadata.json.in
+++ b/extensions/launch-new-instance/metadata.json.in
@@ -4,7 +4,7 @@
 "settings-schema": "@gschemaname@",
 "gettext-domain": "@gettext_domain@",
 "name": "Launch new instance",
-"description": "Always launch a new instance when clicking in the dash or the application view.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance instead.",
+"description": "Always launch a new instance when clicking in the dash or the application view.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME Bugzilla instead.",
 "shell-version": [ "@shell_current@" ],
 "url": "@url@"
 }
--- a/extensions/meson.build
+++ b/extensions/meson.build
@@ -1,45 +0,0 @@
-extension_schemas = []
-js_sources = []
-
-metadata_name = 'metadata.json'
-
-foreach e : all_extensions
-  uuid = e + uuid_suffix
-
-  metadata_conf = configuration_data()
-  metadata_conf.set('extension_id', e)
-  metadata_conf.set('uuid', uuid)
-  metadata_conf.set('gschemaname', 'org.gnome.shell.extensions.' + e)
-  metadata_conf.set('gettext_domain', gettext_domain)
-  metadata_conf.set('shell_current', shell_version)
-  metadata_conf.set('url', 'https://gitlab.gnome.org/GNOME/gnome-shell-extensions')
-
-  extension_sources = files(e + '/extension.js')
-  extension_data = files(e + '/stylesheet.css')
-
-  subdir(e)
-
-  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/meson.build.template
+++ b/extensions/meson.build.template
@@ -1,8 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)
-
-# extension_sources += files('prefs.js')
-# extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')
--- a/extensions/native-window-placement/Makefile.am
+++ b/extensions/native-window-placement/Makefile.am
@@ -0,0 +1,5 @@
+EXTENSION_ID = native-window-placement
+
+include ../../extension.mk
+include ../../settings.mk
+
--- a/extensions/native-window-placement/extension.js
+++ b/extensions/native-window-placement/extension.js
@@ -1,93 +1,149 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
-/* exported enable disable */
+// import just everything from workspace.js:
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const Lang = imports.lang;
+const Mainloop = imports.mainloop;
+const Meta = imports.gi.Meta;
+const Pango = imports.gi.Pango;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
+const Signals = imports.signals;
+
+const DND = imports.ui.dnd;
+const Lightbox = imports.ui.lightbox;
+const Main = imports.ui.main;
+const Overview = imports.ui.overview;
+const Panel = imports.ui.panel;
+const Tweener = imports.ui.tweener;
+
 const Workspace = imports.ui.workspace;
+const WindowPositionFlags = Workspace.WindowPositionFlags;

 const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;

 // testing settings for natural window placement strategy:
+const WINDOW_PLACEMENT_NATURAL_FILLGAPS = true;                     // enlarge windows at the end to fill gaps         // not implemented yet
+const WINDOW_PLACEMENT_NATURAL_GRID_FALLBACK = true;                // fallback to grid mode if all windows have the same size and positions.     // not implemented yet
 const WINDOW_PLACEMENT_NATURAL_ACCURACY = 20;                       // accuracy of window translate moves  (KDE-default: 20)
 const WINDOW_PLACEMENT_NATURAL_GAPS = 5;                            // half of the minimum gap between windows
 const WINDOW_PLACEMENT_NATURAL_MAX_TRANSLATIONS = 5000;             // safety limit for preventing endless loop if something is wrong in the algorithm

-class Rect {
-    constructor(x, y, width, height) {
-        [this.x, this.y, this.width, this.height] = [x, y, width, height];
+const PLACE_WINDOW_CAPTIONS_ON_TOP = true;                          // place window titles in overview on top of windows with overlap parameter
+
+const WORKSPACE_BORDER_GAP = 10;                                    // minimum gap between the workspace area and the workspace selector
+const WINDOW_AREA_TOP_GAP = 20;                                     // minimum gap between the workspace area and the top border. This keeps window captions and close buttons visible. 13px (26/2) should currently be enough.
+
+const BUTTON_LAYOUT_SCHEMA = 'org.gnome.desktop.wm.preferences';
+const BUTTON_LAYOUT_KEY = 'button-layout';
+
+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;
    }
+}
+
+const Rect = new Lang.Class({
+    Name: 'NativeWindowPlacement.Rect',
+
+    _init: function(x, y, width, height) {
+        [this.x, this.y, this.width, this.height] = [x, y, width, height];
+    },

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

-    union(rect2) {
+    union: function(rect2) {
        let dest = this.copy();
-        if (rect2.x < dest.x) {
+        if (rect2.x < dest.x)
+          {
            dest.width += dest.x - rect2.x;
            dest.x = rect2.x;
-        }
-        if (rect2.y < dest.y) {
+          }
+        if (rect2.y < dest.y)
+          {
            dest.height += dest.y - rect2.y;
            dest.y = rect2.y;
-        }
+          }
        if (rect2.x + rect2.width > dest.x + dest.width)
-            dest.width = rect2.x + rect2.width - dest.x;
+          dest.width = rect2.x + rect2.width - dest.x;
        if (rect2.y + rect2.height > dest.y + dest.height)
-            dest.height = rect2.y + rect2.height - dest.y;
+          dest.height = rect2.y + rect2.height - dest.y;

        return dest;
-    }
+    },

-    adjusted(dx, dy, dx2, dy2) {
+    adjusted: function(dx, dy, dx2, dy2) {
        let dest = this.copy();
        dest.x += dx;
        dest.y += dy;
        dest.width += -dx + dx2;
        dest.height += -dy + dy2;
        return dest;
-    }
+    },

-    overlap(rect2) {
+    overlap: function(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));
-    }
+    },

-    center() {
+    center: function() {
        return [this.x + this.width / 2, this.y + this.height / 2];
-    }
+    },

-    translate(dx, dy) {
+    translate: function(dx, dy) {
        this.x += dx;
        this.y += dy;
    }
+});
+
+let winInjections, workspaceInjections, connectedSignals;
+
+function resetState() {
+    winInjections = { };
+    workspaceInjections = { };
+    connectedSignals = [ ];
 }

-class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
-    constructor(settings) {
-        super();
-        this._settings = settings;
-    }
+function enable() {
+    resetState();

-    computeLayout(windows, layout) {
-        layout.windows = windows;
-    }
+    let settings = Convenience.getSettings();
+    let useMoreScreen = settings.get_boolean('use-more-screen');
+    let windowCaptionsOnTop = settings.get_boolean('window-captions-on-top');
+    let signalId = settings.connect('changed::use-more-screen', function() {
+        useMoreScreen = settings.get_boolean('use-more-screen');
+    });
+    connectedSignals.push({ obj: settings, id: signalId });

    /**
+     * _calculateWindowTransformationsNatural:
+     * @clones: Array of #MetaWindow
+     *
     * 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:
     * https://projects.kde.org/projects/kde/kdebase/kde-workspace/repository/revisions/master/entry/kwin/effects/presentwindows/presentwindows.cpp
     */
-    computeWindowSlots(layout, area) {
+    Workspace.Workspace.prototype._calculateWindowTransformationsNatural = function(clones, area) {
        // As we are using pseudo-random movement (See "slot") we need to make sure the list
        // is always sorted the same way no matter which window is currently active.

-        let areaRect = new Rect(area.x, area.y, area.width, area.height);
-        let bounds = areaRect.copy();
-        let clones = layout.windows;
+        let area_rect = new Rect(area.x, area.y, area.width, area.height);
+        let bounds = area_rect.copy();

        let direction = 0;
        let directions = [];
@@ -106,32 +162,31 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
            }
        }

-        let loopCounter = 0;
+        let loop_counter = 0;
        let overlap;
        do {
            overlap = false;
            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);
-                    let iAdjusted = rects[i].adjusted(...adjustments);
-                    let jAdjusted = rects[j].adjusted(...adjustments);
-                    if (i != j && iAdjusted.overlap(jAdjusted)) {
-                        loopCounter++;
+                    if (i != j && rects[i].adjusted(-WINDOW_PLACEMENT_NATURAL_GAPS, -WINDOW_PLACEMENT_NATURAL_GAPS,
+                                                    WINDOW_PLACEMENT_NATURAL_GAPS, WINDOW_PLACEMENT_NATURAL_GAPS).overlap(
+                                                     rects[j].adjusted(-WINDOW_PLACEMENT_NATURAL_GAPS, -WINDOW_PLACEMENT_NATURAL_GAPS,
+                                                                       WINDOW_PLACEMENT_NATURAL_GAPS, WINDOW_PLACEMENT_NATURAL_GAPS))) {
+                        loop_counter++;
                        overlap = true;

                        // TODO: something like a Point2D would be nicer here:

                        // Determine pushing direction
-                        let iCenter = rects[i].center();
-                        let jCenter = rects[j].center();
-                        let diff = [jCenter[0] - iCenter[0], jCenter[1] - iCenter[1]];
+                        let i_center = rects[i].center();
+                        let j_center = rects[j].center();
+                        let diff = [j_center[0] - i_center[0], j_center[1] - i_center[1]];

                        // Prevent dividing by zero and non-movement
                        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 > area_rect.height / area_rect.width )
                            diff[0] *= 2;
                        else
                            diff[1] *= 2;
@@ -146,7 +201,7 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
                        rects[j].translate(diff[0], diff[1]);


-                        if (this._settings.get_boolean('use-more-screen')) {
+                        if (useMoreScreen) {
                            // Try to keep the bounding rect the same aspect as the screen so that more
                            // screen real estate is utilised. We do this by splitting the screen into nine
                            // equal sections, if the window center is in any of the corner sections pull the
@@ -160,7 +215,7 @@ 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));

-                            let iCenter = rects[i].center();
+                            let i_center = 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
@@ -170,23 +225,23 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
                                    ySection = (directions[i] % 2 ? 2 : 0);
                            }
                            if (xSection == 0 && ySection == 0) {
-                                diff[0] = bounds.x - iCenter[0];
-                                diff[1] = bounds.y - iCenter[1];
+                                diff[0] = bounds.x - i_center[0];
+                                diff[1] = bounds.y - i_center[1];
                            }
                            if (xSection == 2 && ySection == 0) {
-                                diff[0] = bounds.x + bounds.width - iCenter[0];
-                                diff[1] = bounds.y - iCenter[1];
+                                diff[0] = bounds.x + bounds.width - i_center[0];
+                                diff[1] = bounds.y - i_center[1];
                            }
                            if (xSection == 2 && ySection == 2) {
-                                diff[0] = bounds.x + bounds.width - iCenter[0];
-                                diff[1] = bounds.y + bounds.height - iCenter[1];
+                                diff[0] = bounds.x + bounds.width - i_center[0];
+                                diff[1] = bounds.y + bounds.height - i_center[1];
                            }
                            if (xSection == 0 && ySection == 2) {
-                                diff[0] = bounds.x - iCenter[0];
-                                diff[1] = bounds.y + bounds.height - iCenter[1];
+                                diff[0] = bounds.x - i_center[0];
+                                diff[1] = bounds.y + bounds.height - i_center[1];
                            }
                            if (diff[0] != 0 || diff[1] != 0) {
-                                let length = Math.sqrt(diff[0] * diff[0] + diff[1] * diff[1]);
+                                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]);
@@ -199,70 +254,222 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
                    }
                }
            }
-        } while (overlap && loopCounter < WINDOW_PLACEMENT_NATURAL_MAX_TRANSLATIONS);
+        } while (overlap && loop_counter < WINDOW_PLACEMENT_NATURAL_MAX_TRANSLATIONS);

        // 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(area_rect.width / bounds.width,
+                         area_rect.height / bounds.height,
+                         1.0);

        // Make bounding rect fill the screen size for later steps
-        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;
+        bounds.x = bounds.x - (area_rect.width - bounds.width * scale) / 2;
+        bounds.y = bounds.y - (area_rect.height - bounds.height * scale) / 2;
+        bounds.width = area_rect.width / scale;
+        bounds.height = area_rect.height / scale;

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

+        // TODO: Implement the KDE part "Try to fill the gaps by enlarging windows if they have the space" here. (If this is wanted)
+
        // rescale to workspace
+        let scales = [];
+
+        let buttonOuterHeight, captionHeight;
+        let buttonOuterWidth = 0;
+
        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].x = rects[i].x * scale + area_rect.x;
+            rects[i].y = rects[i].y * scale + area_rect.y;

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

        return slots;
    }
-}
+    workspaceInjections['_calculateWindowTransformationsNatural'] = undefined;

-let winInjections, workspaceInjections;
+    /**
+     * _updateWindowPositions:
+     * @flags:
+     *  INITIAL - this is the initial positioning of the windows.
+     *  ANIMATE - Indicates that we need animate changing position.
+     */
+    workspaceInjections['_updateWindowPositions'] = Workspace.Workspace.prototype._updateWindowPositions;
+    Workspace.Workspace.prototype._updateWindowPositions = function(flags) {
+            if (this._currentLayout == null) {
+                this._recalculateWindowPositions(flags);
+                return;
+            }

-function resetState() {
-    winInjections = { };
-    workspaceInjections = { };
-}
+            let initialPositioning = flags & WindowPositionFlags.INITIAL;
+            let animate = flags & WindowPositionFlags.ANIMATE;

-function enable() {
-    resetState();
+            let layout = this._currentLayout;
+            let strategy = layout.strategy;

-    let settings = ExtensionUtils.getSettings();
+            let [, , padding] = this._getSpacingAndPadding();
+            let area = Workspace.padArea(this._actualGeometry, padding);

-    workspaceInjections['_getBestLayout'] = Workspace.Workspace.prototype._getBestLayout;
-    Workspace.Workspace.prototype._getBestLayout = function(windows) {
-        let strategy = new NaturalLayoutStrategy(settings);
-        let layout = { strategy };
-        strategy.computeLayout(windows, layout);
+            /// EDIT replace this version by our own:
+            //let slots = strategy.computeWindowSlots(layout, area);

-        return layout;
-    };

-    /// 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;
+            /// EDIT copied from _realRecalculateWindowPositions:
+            let clones = this._windows.slice();
+            if (clones.length == 0)
+                return;
+
+            clones.sort(function(a, b) {
+                return a.metaWindow.get_stable_sequence() - b.metaWindow.get_stable_sequence();
+            });
+
+            if (this._reservedSlot)
+                clones.push(this._reservedSlot);
+
+            /// EDIT our own window placement function:
+            let slots = this._calculateWindowTransformationsNatural(clones, area);
+
+
+            let currentWorkspace = global.screen.get_active_workspace();
+            let isOnCurrentWorkspace = this.metaWorkspace == null || this.metaWorkspace == currentWorkspace;
+
+            for (let i = 0; i < slots.length; i++) {
+                let slot = slots[i];
+                let [x, y, scale, clone] = slot;
+                let metaWindow = clone.metaWindow;
+                let overlay = clone.overlay;
+                clone.slotId = i;
+
+                // Positioning a window currently being dragged must be avoided;
+                // we'll just leave a blank spot in the layout for it.
+                if (clone.inDrag)
+                    continue;
+
+                let cloneWidth = clone.actor.width * scale;
+                let cloneHeight = clone.actor.height * scale;
+                clone.slot = [x, y, cloneWidth, cloneHeight];
+
+                if (overlay && (initialPositioning || !clone.positioned))
+                    overlay.hide();
+
+                if (!clone.positioned) {
+                    // This window appeared after the overview was already up
+                    // Grow the clone from the center of the slot
+                    clone.actor.x = x + cloneWidth / 2;
+                    clone.actor.y = y + cloneHeight / 2;
+                    clone.actor.scale_x = 0;
+                    clone.actor.scale_y = 0;
+                    clone.positioned = true;
+                }
+
+                if (animate && isOnCurrentWorkspace) {
+                    if (!metaWindow.showing_on_its_workspace()) {
+                        /* Hidden windows should fade in and grow
+                         * therefore we need to resize them now so they
+                         * can be scaled up later */
+                        if (initialPositioning) {
+                            clone.actor.opacity = 0;
+                            clone.actor.scale_x = 0;
+                            clone.actor.scale_y = 0;
+                            clone.actor.x = x;
+                            clone.actor.y = y;
+                        }
+
+                        Tweener.addTween(clone.actor,
+                                         { opacity: 255,
+                                           time: Overview.ANIMATION_TIME,
+                                           transition: 'easeInQuad'
+                                         });
+                    }
+
+                    this._animateClone(clone, overlay, x, y, scale, initialPositioning);
+                } else {
+                    // cancel any active tweens (otherwise they might override our changes)
+                    Tweener.removeTweens(clone.actor);
+                    clone.actor.set_position(x, y);
+                    clone.actor.set_scale(scale, scale);
+                    clone.overlay.relayout(false);
+                    this._showWindowOverlay(clone, overlay, isOnCurrentWorkspace);
+                }
+            }
        }

-        winInjections['relayout'].call(this, animate);
-    };
+
+
+    /// position window titles on top of windows in overlay ////
+    if (windowCaptionsOnTop) {
+
+        /// This is almost a direct copy of the original relayout function. Differences are marked.
+        winInjections['relayout'] = Workspace.WindowOverlay.prototype.relayout;
+        Workspace.WindowOverlay.prototype.relayout = function(animate) {
+            let button = this.closeButton;
+            let title = this.title;
+            let border = this.border;
+
+            Tweener.removeTweens(button);
+            Tweener.removeTweens(title);
+            Tweener.removeTweens(border);
+
+            let [cloneX, cloneY, cloneWidth, cloneHeight] = this._windowClone.slot;
+
+            let layout = Meta.prefs_get_button_layout();
+            let side = layout.left_buttons.indexOf(Meta.ButtonFunction.CLOSE) > -1 ? St.Side.LEFT : St.Side.RIGHT;
+
+            let buttonX;
+            let buttonY = cloneY - (button.height - button._overlap);
+            if (side == St.Side.LEFT)
+                buttonX = cloneX - (button.width - button._overlap);
+            else
+                buttonX = cloneX + (cloneWidth - button._overlap);
+
+            if (animate)
+                this._animateOverlayActor(button, Math.floor(buttonX), Math.floor(buttonY), button.width);
+            else
+                button.set_position(Math.floor(buttonX), Math.floor(buttonY));
+
+            // Clutter.Actor.get_preferred_width() will return the fixed width if one
+            // is set, so we need to reset the width by calling set_width(-1), to forward
+            // the call down to StLabel.
+            // We also need to save and restore the current width, otherwise the animation
+            // starts from the wrong point.
+            let prevTitleWidth = title.width;
+            title.set_width(-1);
+            let [titleMinWidth, titleNatWidth] = title.get_preferred_width(-1);
+            let titleWidth = Math.max(titleMinWidth, Math.min(titleNatWidth, cloneWidth));
+            title.width = prevTitleWidth;
+
+            let titleX = cloneX + (cloneWidth - titleWidth) / 2;
+
+            /// this is the actual difference to original gnome-shell:
+            //let titleY = cloneY + cloneHeight + title._spacing;
+            let titleY = cloneY - title.height + title._spacing;
+
+            if (animate)
+                this._animateOverlayActor(title, Math.floor(titleX), Math.floor(titleY), titleWidth);
+            else {
+                title.width = titleWidth;
+                title.set_position(Math.floor(titleX), Math.floor(titleY));
+            }
+
+            let borderX = cloneX - this.borderSize;
+            let borderY = cloneY - this.borderSize;
+            let borderWidth = cloneWidth + 2 * this.borderSize;
+            let borderHeight = cloneHeight + 2 * this.borderSize;
+
+            if (animate) {
+                this._animateOverlayActor(this.border, borderX, borderY,
+                                          borderWidth, borderHeight);
+            } else {
+                this.border.set_position(borderX, borderY);
+                this.border.set_size(borderWidth, borderHeight);
+            }
+        };
+    }
 }

 function removeInjection(object, injection, name) {
@@ -280,6 +487,13 @@ function disable() {
    for (i in winInjections)
        removeInjection(Workspace.WindowOverlay.prototype, winInjections, i);

+    for each (i in connectedSignals)
+        i.obj.disconnect(i.id);
+
    global.stage.queue_relayout();
    resetState();
 }
+
+function init() {
+    /* do nothing */
+}
--- a/extensions/native-window-placement/meson.build
+++ b/extensions/native-window-placement/meson.build
@@ -1,7 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)
-
-extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')
--- a/extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in
+++ b/extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in
@@ -2,15 +2,15 @@
  <schema id="org.gnome.shell.extensions.native-window-placement" path="/org/gnome/shell/extensions/native-window-placement/">
    <key name="use-more-screen" type="b">
      <default>true</default>
-      <summary>Use more screen for windows</summary>
-      <description>Try to use more screen for placing window thumbnails by adapting to screen aspect ratio, and consolidating
-      them further to reduce the bounding box. This setting applies only with the natural placement strategy.</description>
+      <_summary>Use more screen for windows</_summary>
+      <_description>Try to use more screen for placing window thumbnails by adapting to screen aspect ratio, and consolidating
+      them further to reduce the bounding box. This setting applies only with the natural placement strategy.</_description>
    </key>
    <key name="window-captions-on-top" type="b">
      <default>true</default>
-      <summary>Place window captions on top</summary>
-      <description>If true, place window captions on top the respective thumbnail, overriding shell default of placing it at
-      the bottom. Changing this setting requires restarting the shell to have any effect.</description>
+      <_summary>Place window captions on top</_summary>
+      <_description>If true, place window captions on top the respective thumbnail, overriding shell default of placing it at
+      the bottom. Changing this setting requires restarting the shell to have any effect.</_description>
    </key>
  </schema>
 </schemalist>
--- a/extensions/places-menu/Makefile.am
+++ b/extensions/places-menu/Makefile.am
@@ -0,0 +1,5 @@
+EXTENSION_ID = places-menu
+
+EXTRA_MODULES = placeDisplay.js
+
+include ../../extension.mk
--- a/extensions/places-menu/extension.js
+++ b/extensions/places-menu/extension.js
@@ -1,70 +1,66 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-/* exported init enable disable */

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

 const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
+const Panel = imports.ui.panel;

 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
-const N_ = x => x;
+const N_ = function(x) { return x; }

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

 const PLACE_ICON_SIZE = 16;

-var PlaceMenuItem = GObject.registerClass(
-class PlaceMenuItem extends PopupMenu.PopupBaseMenuItem {
-    _init(info) {
-        super._init();
-        this._info = info;
+const PlaceMenuItem = new Lang.Class({
+    Name: 'PlaceMenuItem',
+    Extends: PopupMenu.PopupBaseMenuItem,

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

-        this._label = new St.Label({ text: info.name, x_expand: true });
-        this.add_child(this._label);
+        this._icon = new St.Icon({ gicon: info.icon,
+                                   icon_size: PLACE_ICON_SIZE });
+	this.actor.add_child(this._icon);

-        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 });
-            this._ejectButton.connect('clicked', info.eject.bind(info));
-            this.add_child(this._ejectButton);
-        }
+        this._label = new St.Label({ text: info.name });
+        this.actor.add_child(this._label);

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

-    destroy() {
+    destroy: function() {
        if (this._changedId) {
            this._info.disconnect(this._changedId);
            this._changedId = 0;
        }

-        super.destroy();
-    }
+        this.parent();
+    },

-    activate(event) {
-        this._info.launch(event.get_time());
+    activate: function(event) {
+	this._info.launch(event.get_time());

-        super.activate(event);
-    }
+	this.parent(event);
+    },

-    _propertiesChanged(info) {
+    _propertiesChanged: function(info) {
        this._icon.gicon = info.icon;
        this._label.text = info.name;
-    }
+    },
 });

 const SECTIONS = [
@@ -72,63 +68,63 @@ const SECTIONS = [
    'devices',
    'bookmarks',
    'network'
-];
+]

-let PlacesMenu = GObject.registerClass(
-class PlacesMenu extends PanelMenu.Button {
-    _init() {
-        super._init(0.0, _('Places'));
+const PlacesMenu = new Lang.Class({
+    Name: 'PlacesMenu.PlacesMenu',
+    Extends: PanelMenu.Button,
+
+    _init: function() {
+        this.parent(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
-        });
+        let label = new St.Label({ text: _("Places"),
+                                   y_expand: true,
+                                   y_align: Clutter.ActorAlign.CENTER });
        hbox.add_child(label);
        hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
-        this.add_actor(hbox);
+        this.actor.add_actor(hbox);

        this.placesManager = new PlaceDisplay.PlacesManager();

-        this._sections = { };
+	this._sections = { };

-        for (let i = 0; i < SECTIONS.length; i++) {
-            let id = SECTIONS[i];
-            this._sections[id] = new PopupMenu.PopupMenuSection();
-            this.placesManager.connect(`${id}-updated`, () => {
-                this._redisplay(id);
-            });
+	for (let i=0; i < SECTIONS.length; i++) {
+	    let id = SECTIONS[i];
+	    this._sections[id] = new PopupMenu.PopupMenuSection();
+	    this.placesManager.connect(id + '-updated', Lang.bind(this, function() {
+		this._redisplay(id);
+	    }));

-            this._create(id);
-            this.menu.addMenuItem(this._sections[id]);
-            this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-        }
-    }
+	    this._create(id);
+	    this.menu.addMenuItem(this._sections[id]);
+	    this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+	}
+    },

-    _onDestroy() {
-        this.placesManager.destroy();
+    destroy: function() {
+	this.placesManager.destroy();

-        super._onDestroy();
-    }
+        this.parent();
+    },

-    _redisplay(id) {
-        this._sections[id].removeAll();
+    _redisplay: function(id) {
+	this._sections[id].removeAll();
        this._create(id);
-    }
+    },

-    _create(id) {
+    _create: function(id) {
        let places = this.placesManager.get(id);

        for (let i = 0; i < places.length; i++)
            this._sections[id].addMenuItem(new PlaceMenuItem(places[i]));

-        this._sections[id].actor.visible = places.length > 0;
+	this._sections[id].actor.visible = places.length > 0;
    }
 });

 function init() {
-    ExtensionUtils.initTranslations();
+    Convenience.initTranslations();
 }

 let _indicator;
@@ -138,7 +134,7 @@ function enable() {

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

--- a/extensions/places-menu/meson.build
+++ b/extensions/places-menu/meson.build
@@ -1,7 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)
-
-extension_sources += files('placeDisplay.js')
--- a/extensions/places-menu/metadata.json.in
+++ b/extensions/places-menu/metadata.json.in
@@ -4,7 +4,7 @@
 "settings-schema": "@gschemaname@",
 "gettext-domain": "@gettext_domain@",
 "name": "Places Status Indicator",
-"description": "Add a menu for quickly navigating places in the system.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance instead.",
+"description": "Add a menu for quickly navigating places in the system.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME Bugzilla instead.",
 "shell-version": [ "@shell_current@" ],
 "url": "@url@"
 }
--- a/extensions/places-menu/placeDisplay.js
+++ b/extensions/places-menu/placeDisplay.js
@@ -1,14 +1,22 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

-const { Gio, GLib, Shell } = imports.gi;
+const GLib = imports.gi.GLib;
+const Gio = imports.gi.Gio;
+const Shell = imports.gi.Shell;
+const Lang = imports.lang;
+const Mainloop = imports.mainloop;
 const Signals = imports.signals;
+const St = imports.gi.St;

+const DND = imports.ui.dnd;
 const Main = imports.ui.main;
-const ShellMountOperation = imports.ui.shellMountOperation;
+const Params = imports.misc.params;
+const Search = imports.ui.search;
+const Util = imports.misc.util;

 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
-const N_ = x => x;
+const N_ = function(x) { return x; }

 const BACKGROUND_SCHEMA = 'org.gnome.desktop.background';

@@ -19,246 +27,154 @@ const Hostname1Iface = '<node> \
 </node>';
 const Hostname1 = Gio.DBusProxy.makeProxyWrapper(Hostname1Iface);

-class PlaceInfo {
-    constructor() {
-        this._init.apply(this, arguments);
-    }
+const PlaceInfo = new Lang.Class({
+    Name: 'PlaceInfo',

-    _init(kind, file, name, icon) {
+    _init: function(kind, file, name, icon) {
        this.kind = kind;
        this.file = file;
        this.name = name || this._getFileName();
        this.icon = icon ? new Gio.ThemedIcon({ name: icon }) : this.getIcon();
-    }
+    },

-    destroy() {
-    }
+    destroy: function() {
+    },

-    isRemovable() {
+    isRemovable: function() {
        return false;
-    }
+    },

-    async _ensureMountAndLaunch(context, tryMount) {
-        try {
-            await this._launchDefaultForUri(this.file.get_uri(), context, null);
-        } 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
-            };
-            let op = new ShellMountOperation.ShellMountOperation(source);
-            try {
-                await this._mountEnclosingVolume(0, op.mountOp, null);
-
-                if (tryMount)
-                    this._ensureMountAndLaunch(context, false);
-            } catch (e) {
-                if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
-                    Main.notifyError(_('Failed to mount volume for “%s”').format(this.name), e.message);
-            } finally {
-                op.close();
-            }
-        }
-    }
-
-    launch(timestamp) {
+    launch: function(timestamp) {
        let launchContext = global.create_app_launch_context(timestamp, -1);
-        this._ensureMountAndLaunch(launchContext, true);
-    }

-    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;
-                }
+        try {
+            Gio.AppInfo.launch_default_for_uri(this.file.get_uri(),
+                                               launchContext);
+        } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_MOUNTED)) {
+            this.file.mount_enclosing_volume(0, null, null, function(file, result) {
+                file.mount_enclosing_volume_finish(result);
+                Gio.AppInfo.launch_default_for_uri(file.get_uri(), launchContext);
            });
-
-        // return a generic icon for this kind for now, until we have the
-        // icon from the query info above
-        switch (this.kind) {
-        case 'network':
-            return new Gio.ThemedIcon({ name: 'folder-remote-symbolic' });
-        case 'devices':
-            return new Gio.ThemedIcon({ name: 'drive-harddisk-symbolic' });
-        case 'special':
-        case 'bookmarks':
-        default:
-            if (!this.file.is_native())
-                return new Gio.ThemedIcon({ name: 'folder-remote-symbolic' });
-            else
-                return new Gio.ThemedIcon({ name: 'folder-symbolic' });
+        } catch(e) {
+            Main.notifyError(_("Failed to launch \"%s\"").format(this.name), e.message);
        }
-    }
+    },

-    _getFileName() {
+    getIcon: function() {
+        try {
+            let info = this.file.query_info('standard::symbolic-icon', 0, null);
+	    return info.get_symbolic_icon();
+        } catch(e if e instanceof Gio.IOErrorEnum) {
+            // return a generic icon for this kind
+            switch (this.kind) {
+            case 'network':
+                return new Gio.ThemedIcon({ name: 'folder-remote-symbolic' });
+            case 'devices':
+                return new Gio.ThemedIcon({ name: 'drive-harddisk-symbolic' });
+            case 'special':
+            case 'bookmarks':
+            default:
+                if (!this.file.is_native())
+                    return new Gio.ThemedIcon({ name: 'folder-remote-symbolic' });
+                else
+                    return new Gio.ThemedIcon({ name: 'folder-symbolic' });
+            }
+        }
+    },
+
+    _getFileName: function() {
        try {
            let info = this.file.query_info('standard::display-name', 0, null);
            return info.get_display_name();
-        } catch (e) {
-            if (e instanceof Gio.IOErrorEnum)
-                return this.file.get_basename();
-            throw e;
+        } catch(e if e instanceof Gio.IOErrorEnum) {
+            return this.file.get_basename();
        }
-    }
-
-    _launchDefaultForUri(uri, context, cancel) {
-        return new Promise((resolve, reject) => {
-            Gio.AppInfo.launch_default_for_uri_async(uri, context, cancel, (o, res) => {
-                try {
-                    Gio.AppInfo.launch_default_for_uri_finish(res);
-                    resolve();
-                } catch (e) {
-                    reject(e);
-                }
-            });
-        });
-    }
-
-    _mountEnclosingVolume(flags, mountOp, cancel) {
-        return new Promise((resolve, reject) => {
-            this.file.mount_enclosing_volume(flags, mountOp, cancel, (o, res) => {
-                try {
-                    this.file.mount_enclosing_volume_finish(res);
-                    resolve();
-                } catch (e) {
-                    reject(e);
-                }
-            });
-        });
-    }
-}
+    },
+});
 Signals.addSignalMethods(PlaceInfo.prototype);

-class RootInfo extends PlaceInfo {
-    _init() {
-        super._init('devices', Gio.File.new_for_path('/'), _('Computer'));
+const RootInfo = new Lang.Class({
+    Name: 'RootInfo',
+    Extends: PlaceInfo,

-        let busName = 'org.freedesktop.hostname1';
-        let objPath = '/org/freedesktop/hostname1';
-        new Hostname1(Gio.DBus.system, busName, objPath, (obj, error) => {
-            if (error)
-                return;
+    _init: function() {
+        this.parent('devices', Gio.File.new_for_path('/'), _("Computer"));

-            this._proxy = obj;
-            this._proxy.connect('g-properties-changed',
-                this._propertiesChanged.bind(this));
-            this._propertiesChanged(obj);
-        });
-    }
+        this._proxy = new Hostname1(Gio.DBus.system,
+                                    'org.freedesktop.hostname1',
+                                    '/org/freedesktop/hostname1',
+                                    Lang.bind(this, function(obj, error) {
+                                        if (error)
+                                            return;

-    getIcon() {
+                                        this._proxy.connect('g-properties-changed',
+                                                            Lang.bind(this, this._propertiesChanged));
+                                        this._propertiesChanged(obj);
+                                    }));
+    },
+
+    getIcon: function() {
        return new Gio.ThemedIcon({ name: 'drive-harddisk-symbolic' });
-    }
+    },

-    _propertiesChanged(proxy) {
+    _propertiesChanged: function(proxy) {
        // GDBusProxy will emit a g-properties-changed when hostname1 goes down
        // ignore it
        if (proxy.g_name_owner) {
-            this.name = proxy.PrettyHostname || _('Computer');
+            this.name = proxy.PrettyHostname || _("Computer");
            this.emit('changed');
        }
+    },
+
+    destroy: function() {
+        this._proxy.run_dispose();
+        this.parent();
    }
-
-    destroy() {
-        if (this._proxy) {
-            this._proxy.run_dispose();
-            this._proxy = null;
-        }
-        super.destroy();
-    }
-}
+});


-class PlaceDeviceInfo extends PlaceInfo {
-    _init(kind, mount) {
+const PlaceDeviceInfo = new Lang.Class({
+    Name: 'PlaceDeviceInfo',
+    Extends: PlaceInfo,
+
+    _init: function(kind, mount) {
        this._mount = mount;
-        super._init(kind, mount.get_root(), mount.get_name());
-    }
+        this.parent(kind, mount.get_root(), mount.get_name());
+    },

-    getIcon() {
+    getIcon: function() {
        return this._mount.get_symbolic_icon();
    }
+});

-    isRemovable() {
-        return this._mount.can_eject();
-    }
+const PlaceVolumeInfo = new Lang.Class({
+    Name: 'PlaceVolumeInfo',
+    Extends: PlaceInfo,

-    eject() {
-        let unmountArgs = [
-            Gio.MountUnmountFlags.NONE,
-            (new ShellMountOperation.ShellMountOperation(this._mount)).mountOp,
-            null // Gio.Cancellable
-        ];
-
-        if (this._mount.can_eject())
-            this._mount.eject_with_operation(...unmountArgs,
-                this._ejectFinish.bind(this));
-        else
-            this._mount.unmount_with_operation(...unmountArgs,
-                this._unmountFinish.bind(this));
-    }
-
-    _ejectFinish(mount, result) {
-        try {
-            mount.eject_with_operation_finish(result);
-        } catch (e) {
-            this._reportFailure(e);
-        }
-    }
-
-    _unmountFinish(mount, result) {
-        try {
-            mount.unmount_with_operation_finish(result);
-        } catch (e) {
-            this._reportFailure(e);
-        }
-    }
-
-    _reportFailure(exception) {
-        let msg = _('Ejecting drive “%s” failed:').format(this._mount.get_name());
-        Main.notifyError(msg, exception.message);
-    }
-}
-
-class PlaceVolumeInfo extends PlaceInfo {
-    _init(kind, volume) {
+    _init: function(kind, volume) {
        this._volume = volume;
-        super._init(kind, volume.get_activation_root(), volume.get_name());
-    }
+        this.parent(kind, volume.get_activation_root(), volume.get_name());
+    },

-    launch(timestamp) {
+    launch: function(timestamp) {
        if (this.file) {
-            super.launch(timestamp);
+            this.parent(timestamp);
            return;
        }

-        this._volume.mount(0, null, null, (volume, result) => {
+        this._volume.mount(0, null, null, Lang.bind(this, function(volume, result) {
            volume.mount_finish(result);

            let mount = volume.get_mount();
            this.file = mount.get_root();
-            super.launch(timestamp);
-        });
-    }
+            this.parent(timestamp);
+        }));
+    },

-    getIcon() {
+    getIcon: function() {
        return this._volume.get_symbolic_icon();
    }
-}
+});

 const DEFAULT_DIRECTORIES = [
    GLib.UserDirectory.DIRECTORY_DOCUMENTS,
@@ -268,8 +184,10 @@ const DEFAULT_DIRECTORIES = [
    GLib.UserDirectory.DIRECTORY_VIDEOS,
 ];

-var PlacesManager = class {
-    constructor() {
+const PlacesManager = new Lang.Class({
+    Name: 'PlacesManager',
+
+    _init: function() {
        this._places = {
            special: [],
            devices: [],
@@ -278,8 +196,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',
+                                   Lang.bind(this, this._updateSpecials));
        this._updateSpecials();

        /*
@@ -289,50 +208,41 @@ var PlacesManager = class {
        this._connectVolumeMonitorSignals();
        this._updateMounts();

-        this._bookmarksFile = this._findBookmarksFile();
+        this._bookmarksFile = this._findBookmarksFile()
        this._bookmarkTimeoutId = 0;
        this._monitor = null;

        if (this._bookmarksFile) {
            this._monitor = this._bookmarksFile.monitor_file(Gio.FileMonitorFlags.NONE, null);
-            this._monitor.connect('changed', () => {
+            this._monitor.connect('changed', Lang.bind(this, function () {
                if (this._bookmarkTimeoutId > 0)
                    return;
                /* Defensive event compression */
-                this._bookmarkTimeoutId = GLib.timeout_add(
-                    GLib.PRIORITY_DEFAULT, 100, () => {
-                        this._bookmarkTimeoutId = 0;
-                        this._reloadBookmarks();
-                        return false;
-                    });
-            });
+                this._bookmarkTimeoutId = Mainloop.timeout_add(100, Lang.bind(this, function () {
+                    this._bookmarkTimeoutId = 0;
+                    this._reloadBookmarks();
+                    return false;
+                }));
+            }));

            this._reloadBookmarks();
        }
-    }
+    },

-    _connectVolumeMonitorSignals() {
-        const signals = [
-            'volume-added',
-            'volume-removed',
-            'volume-changed',
-            'mount-added',
-            'mount-removed',
-            'mount-changed',
-            'drive-connected',
-            'drive-disconnected',
-            'drive-changed'
-        ];
+    _connectVolumeMonitorSignals: function() {
+        const signals = ['volume-added', 'volume-removed', 'volume-changed',
+                         'mount-added', 'mount-removed', 'mount-changed',
+                         'drive-connected', 'drive-disconnected', 'drive-changed'];

        this._volumeMonitorSignals = [];
-        let func = this._updateMounts.bind(this);
+        let func = Lang.bind(this, this._updateMounts);
        for (let i = 0; i < signals.length; i++) {
            let id = this._volumeMonitor.connect(signals[i], func);
            this._volumeMonitorSignals.push(id);
        }
-    }
+    },

-    destroy() {
+    destroy: function() {
        if (this._settings)
            this._settings.disconnect(this._showDesktopIconsChangedId);
        this._settings = null;
@@ -343,19 +253,18 @@ var PlacesManager = class {
        if (this._monitor)
            this._monitor.cancel();
        if (this._bookmarkTimeoutId)
-            GLib.source_remove(this._bookmarkTimeoutId);
-    }
+            Mainloop.source_remove(this._bookmarkTimeoutId);
+    },

-    _updateSpecials() {
-        this._places.special.forEach(p => p.destroy());
+    _updateSpecials: function() {
+        this._places.special.forEach(function (p) { p.destroy(); });
        this._places.special = [];

        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();
@@ -371,50 +280,49 @@ var PlacesManager = class {
            let file = Gio.File.new_for_path(specialPath), info;
            try {
                info = new PlaceInfo('special', file);
-            } catch (e) {
-                if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
-                    continue;
-                throw e;
+            } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND)) {
+                continue;
            }

            specials.push(info);
        }

-        specials.sort((a, b) => GLib.utf8_collate(a.name, b.name));
+        specials.sort(function(a, b) {
+            return GLib.utf8_collate(a.name, b.name);
+        });
        this._places.special = this._places.special.concat(specials);

        this.emit('special-updated');
-    }
+    },

-    _updateMounts() {
+    _updateMounts: function() {
        let networkMounts = [];
        let networkVolumes = [];

-        this._places.devices.forEach(p => p.destroy());
+        this._places.devices.forEach(function (p) { p.destroy(); });
        this._places.devices = [];
-        this._places.network.forEach(p => p.destroy());
+        this._places.network.forEach(function (p) { p.destroy(); });
        this._places.network = [];

        /* 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();
        for (let i = 0; i < drives.length; i++) {
            let volumes = drives[i].get_volumes();

-            for (let j = 0; j < volumes.length; j++) {
+            for(let j = 0; j < volumes.length; j++) {
                let identifier = volumes[j].get_identifier('class');
-                if (identifier && identifier.includes('network')) {
+                if (identifier && identifier.indexOf('network') >= 0) {
                    networkVolumes.push(volumes[j]);
                } else {
                    let mount = volumes[j].get_mount();
-                    if (mount != null)
+                    if(mount != null)
                        this._addMount('devices', mount);
                }
            }
@@ -422,27 +330,27 @@ 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() != null)
+        for(let i = 0; i < volumes.length; i++) {
+            if(volumes[i].get_drive() != null)
                continue;

            let identifier = volumes[i].get_identifier('class');
-            if (identifier && identifier.includes('network')) {
+            if (identifier && identifier.indexOf('network') >= 0) {
                networkVolumes.push(volumes[i]);
            } else {
                let mount = volumes[i].get_mount();
-                if (mount != null)
+                if(mount != null)
                    this._addMount('devices', mount);
            }
        }

        /* add mounts that have no volume (/etc/mtab mounts, ftp, sftp,...) */
        let mounts = this._volumeMonitor.get_mounts();
-        for (let i = 0; i < mounts.length; i++) {
-            if (mounts[i].is_shadowed())
+        for(let i = 0; i < mounts.length; i++) {
+            if(mounts[i].is_shadowed())
                continue;

-            if (mounts[i].get_volume())
+            if(mounts[i].get_volume())
                continue;

            let root = mounts[i].get_default_location();
@@ -468,9 +376,9 @@ var PlacesManager = class {

        this.emit('devices-updated');
        this.emit('network-updated');
-    }
+    },

-    _findBookmarksFile() {
+    _findBookmarksFile: function() {
        let paths = [
            GLib.build_filenamev([GLib.get_user_config_dir(), 'gtk-3.0', 'bookmarks']),
            GLib.build_filenamev([GLib.get_home_dir(), '.gtk-bookmarks']),
@@ -482,9 +390,9 @@ var PlacesManager = class {
        }

        return null;
-    }
+    },

-    _reloadBookmarks() {
+    _reloadBookmarks: function() {

        this._bookmarks = [];

@@ -532,38 +440,34 @@ var PlacesManager = class {
        this._places.bookmarks = bookmarks;

        this.emit('bookmarks-updated');
-    }
+    },

-    _addMount(kind, mount) {
+    _addMount: function(kind, mount) {
        let devItem;

        try {
            devItem = new PlaceDeviceInfo(kind, mount);
-        } catch (e) {
-            if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
-                return;
-            throw e;
+        } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND)) {
+            return;
        }

        this._places[kind].push(devItem);
-    }
+    },

-    _addVolume(kind, volume) {
+    _addVolume: function(kind, volume) {
        let volItem;

        try {
            volItem = new PlaceVolumeInfo(kind, volume);
-        } catch (e) {
-            if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
-                return;
-            throw e;
+        } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND)) {
+            return;
        }

        this._places[kind].push(volItem);
-    }
+    },

-    get(kind) {
+    get: function (kind) {
        return this._places[kind];
    }
-};
+});
 Signals.addSignalMethods(PlacesManager.prototype);
--- a/extensions/screenshot-window-sizer/Makefile.am
+++ b/extensions/screenshot-window-sizer/Makefile.am
@@ -0,0 +1,4 @@
+EXTENSION_ID = screenshot-window-sizer
+
+include ../../extension.mk
+include ../../settings.mk
--- a/extensions/screenshot-window-sizer/extension.js
+++ b/extensions/screenshot-window-sizer/extension.js
@@ -1,4 +1,3 @@
-/* exported enable disable */
 /* Screenshot Window Sizer for Gnome Shell
 *
 * Copyright (c) 2013 Owen Taylor <otaylor@redhat.com>
@@ -19,16 +18,21 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */

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

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

 const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;

 const MESSAGE_FADE_TIME = 2;

-let text;
+let text, button;

 function hideMessage() {
    text.destroy();
@@ -47,16 +51,14 @@ function flashMessage(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));

-    Tweener.addTween(text, {
-        opacity: 0,
-        time: MESSAGE_FADE_TIME,
-        transition: 'easeOutQuad',
-        onComplete: hideMessage
-    });
+    Tweener.addTween(text,
+                     { opacity: 0,
+                       time: MESSAGE_FADE_TIME,
+                       transition: 'easeOutQuad',
+                       onComplete: hideMessage });
 }

 let SIZES = [
@@ -64,34 +66,28 @@ 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) {
+function cycleScreenshotSizes(display, screen, 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;

    // Unmaximize first
-    if (window.get_maximized() != 0)
-        window.unmaximize(Meta.MaximizeFlags.BOTH);
+    if (window.maximized_horizontally || window.maximizedVertically)
+        window.unmaximize(Meta.MaximizeFlags.HORIZONTAL | Meta.MaximizeFlags.VERTICAL);

    let workArea = window.get_work_area_current_monitor();
    let outerRect = window.get_frame_rect();

-    // 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));
-
    // Find the nearest 16:9 size for the current window size
    let nearestIndex;
    let nearestError;

-    for (let i = 0; i < scaledSizes.length; i++) {
-        let [width, height] = scaledSizes[i];
+    for (let i = 0; i < SIZES.length; i++) {
+        let [width, height] = SIZES[i];

        // ignore sizes bigger than the workArea
        if (width > workArea.width || height > workArea.height)
@@ -106,11 +102,11 @@ function cycleScreenshotSizes(display, window, binding) {
    }

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

    // Push the window onscreen if it would be resized offscreen
    let newX = outerRect.x;
@@ -123,9 +119,7 @@ function cycleScreenshotSizes(display, window, binding) {
    window.move_resize_frame(true, newX, newY, newWidth, newHeight);

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

    // 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
@@ -137,22 +131,17 @@ function cycleScreenshotSizes(display, window, binding) {
    flashMessage(message);
 }

+function init() {
+}
+
 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',
+                          Convenience.getSettings(),
+                          Meta.KeyBindingFlags.PER_WINDOW | Meta.KeyBindingFlags.REVERSES,
+                          Shell.ActionMode.NORMAL,
+                          cycleScreenshotSizes);
 }

 function disable() {
    Main.wm.removeKeybinding('cycle-screenshot-sizes');
-    Main.wm.removeKeybinding('cycle-screenshot-sizes-backward');
 }
--- a/extensions/screenshot-window-sizer/meson.build
+++ b/extensions/screenshot-window-sizer/meson.build
@@ -1,7 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)
-
-extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')
--- a/extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml.in
+++ b/extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml.in
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schemalist gettext-domain="gnome-shell-extensions">
+<schemalist>
  <schema id="org.gnome.shell.extensions.screenshot-window-sizer"
          path="/org/gnome/shell/extensions/screenshot-window-sizer/">
    <key type="as" name="cycle-screenshot-sizes">
      <default><![CDATA[['<Alt><Control>s']]]></default>
-      <summary>Cycle Screenshot Sizes</summary>
-    </key>
-    <key type="as" name="cycle-screenshot-sizes-backward">
-      <default><![CDATA[['<Shift><Alt><Control>s']]]></default>
-      <summary>Cycle Screenshot Sizes Backward</summary>
+      <_summary>Cycle Screenshot Sizes</_summary>
    </key>
  </schema>
 </schemalist>
--- a/extensions/user-theme/Makefile.am
+++ b/extensions/user-theme/Makefile.am
@@ -0,0 +1,5 @@
+EXTENSION_ID = user-theme
+
+include ../../extension.mk
+include ../../settings.mk
+
--- a/extensions/user-theme/extension.js
+++ b/extensions/user-theme/extension.js
@@ -1,25 +1,30 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
-// Load shell theme from ~/.local/share/themes/name/gnome-shell
-/* exported init */
+// Load shell theme from ~/.themes/name/gnome-shell

-const { Gio, GLib } = imports.gi;
+const GLib = imports.gi.GLib;
+const Gio = imports.gi.Gio;
+const Lang = imports.lang;
 const Main = imports.ui.main;

 const SETTINGS_KEY = 'name';

 const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;

-class ThemeManager {
-    constructor() {
-        this._settings = ExtensionUtils.getSettings();
-    }
+const ThemeManager = new Lang.Class({
+    Name: 'UserTheme.ThemeManager',

-    enable() {
-        this._changedId = this._settings.connect(`changed::${SETTINGS_KEY}`, this._changeTheme.bind(this));
+    _init: function() {
+        this._settings = Convenience.getSettings();
+    },
+
+    enable: function() {
+        this._changedId = this._settings.connect('changed::'+SETTINGS_KEY, Lang.bind(this, this._changeTheme));
        this._changeTheme();
-    }
+    },

-    disable() {
+    disable: function() {
        if (this._changedId) {
            this._settings.disconnect(this._changedId);
            this._changedId = 0;
@@ -27,35 +32,39 @@ class ThemeManager {

        Main.setThemeStylesheet(null);
        Main.loadTheme();
-    }
+    },

-    _changeTheme() {
-        let stylesheet = null;
-        let themeName = this._settings.get_string(SETTINGS_KEY);
+    _changeTheme: function() {
+        let _stylesheet = null;
+        let _themeName = this._settings.get_string(SETTINGS_KEY);

-        if (themeName) {
-            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);
-                return file.query_exists(null);
-            });
+        if (_themeName) {
+            let _userCssStylesheet = GLib.get_home_dir() + '/.themes/' + _themeName + '/gnome-shell/gnome-shell.css';
+            let file = Gio.file_new_for_path(_userCssStylesheet);
+            if (file.query_exists(null))
+                _stylesheet = _userCssStylesheet;
+            else {
+                let sysdirs = GLib.get_system_data_dirs();
+                sysdirs.unshift(GLib.get_user_data_dir());
+                for (let i = 0; i < sysdirs.length; i++) {
+                    _userCssStylesheet = sysdirs[i] + '/themes/' + _themeName + '/gnome-shell/gnome-shell.css';
+                    let file = Gio.file_new_for_path(_userCssStylesheet);
+                    if (file.query_exists(null)) {
+                        _stylesheet = _userCssStylesheet;
+                        break;
+                    }
+                }
+            }
        }

-        if (stylesheet)
-            global.log(`loading user theme: ${stylesheet}`);
+        if (_stylesheet)
+            global.log('loading user theme: ' + _stylesheet);
        else
            global.log('loading default theme (Adwaita)');
-        Main.setThemeStylesheet(stylesheet);
+        Main.setThemeStylesheet(_stylesheet);
        Main.loadTheme();
    }
-}
+});

 function init() {
    return new ThemeManager();
--- a/extensions/user-theme/meson.build
+++ b/extensions/user-theme/meson.build
@@ -1,7 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)
-
-extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')
--- a/extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in
+++ b/extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in
@@ -2,8 +2,8 @@
  <schema id="org.gnome.shell.extensions.user-theme" path="/org/gnome/shell/extensions/user-theme/">
    <key name="name" type="s">
      <default>""</default>
-      <summary>Theme name</summary>
-      <description>The name of the theme, to be loaded from ~/.themes/name/gnome-shell</description>
+      <_summary>Theme name</_summary>
+      <_description>The name of the theme, to be loaded from ~/.themes/name/gnome-shell</_description>
    </key>
  </schema>
 </schemalist>
--- a/extensions/window-list/Makefile.am
+++ b/extensions/window-list/Makefile.am
@@ -0,0 +1,10 @@
+EXTENSION_ID = window-list
+
+EXTRA_MODULES = prefs.js
+
+if CLASSIC_MODE
+  EXTRA_MODULES += classic.css
+endif
+
+include ../../extension.mk
+include ../../settings.mk
--- a/extensions/window-list/classic.css
+++ b/extensions/window-list/classic.css
@@ -12,35 +12,40 @@
    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);
+    padding: 4px 6px 2px;
    text-shadow: 0 0 transparent;
+    box-shadow: inset -1px -1px 1px rgba(0,0,0,0.5);
  }

  .bottom-panel .window-button:hover > StWidget {
-    background-color: #f9f9f9;
+    background-color: #fff;
+    background-gradient-start: #fff;
+    background-gradient-end: #fefefe;
  }

-  .bottom-panel .window-button:active > StWidget,
-  .bottom-panel .window-button:focus > StWidget {
+  .bottom-panel .window-button:active > StWidget {
    box-shadow: inset 1px 1px 2px rgba(0,0,0,0.5);
+    background-color: #ededed;
+    background-gradient-start: #ededed;
+    background-gradient-end: #ededed;
  }

  .bottom-panel .window-button.focused > StWidget {
    background-color: #ddd;
-    box-shadow: inset 1px 1px 1px rgba(0,0,0,0.5);
+    background-color: #ddd;
+    background-gradient-end: #dedede;
+    color: white;
+    box-shadow: inset 1px 1px 2px rgba(0,0,0,0.5);
  }

  .bottom-panel .window-button.focused:hover > StWidget {
-    background-color: #e9e9e9;
+    background-color: #b9b9b9;
+    background-gradient-end: #c0c0c0;
  }

  .bottom-panel .window-button.minimized > StWidget {
-    color: #888;
-    box-shadow: inset -1px -1px 1px rgba(0,0,0,0.5);
+    color: #000;
+    box-shadow: inset -1px -1px 1px rgba(0,0,0,0.4);
  }
+
--- a/extensions/window-list/extension.js
+++ b/extensions/window-list/extension.js
--- a/extensions/window-list/meson.build
+++ b/extensions/window-list/meson.build
@@ -1,12 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)
-
-extension_sources += files('prefs.js')
-extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')
-
-if classic_mode_enabled
-  extension_data += files('classic.css')
-endif
--- a/extensions/window-list/metadata.json.in
+++ b/extensions/window-list/metadata.json.in
@@ -4,7 +4,7 @@
 "settings-schema": "@gschemaname@",
 "gettext-domain": "@gettext_domain@",
 "name": "Window List",
-"description": "Display a window list at the bottom of the screen.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance instead.",
+"description": "Display a window list at the bottom of the screen.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME Bugzilla instead.",
 "shell-version": [ "@shell_current@" ],
 "url": "@url@"
 }
--- a/extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in
+++ b/extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in
@@ -9,19 +9,19 @@
    <key name="grouping-mode"
         enum="org.gnome.shell.extensions.window-list.GroupingMode">
      <default>'never'</default>
-      <summary>When to group windows</summary>
-      <description>
+      <_summary>When to group windows</_summary>
+      <_description>
        Decides when to group windows from the same application on the
-        window list. Possible values are “never”, “auto” and “always”.
-      </description>
+        window list. Possible values are "never", "auto" and "always".
+      </_description>
    </key>
    <key name="show-on-all-monitors" type="b">
      <default>false</default>
-      <summary>Show the window list on all monitors</summary>
-      <description>
+      <_summary>Show the window list on all monitors</_summary>
+      <_description>
        Whether to show the window list on all connected monitors or
        only on the primary one.
-      </description>
+      </_description>
    </key>
  </schema>
 </schemalist>
--- a/extensions/window-list/prefs.js
+++ b/extensions/window-list/prefs.js
@@ -1,52 +1,55 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
-/* exported init buildPrefsWidget */

-const { Gio, GObject, Gtk } = imports.gi;
+const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
+const Gtk = imports.gi.Gtk;
+const Lang = imports.lang;

 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;

 const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;


 function init() {
-    ExtensionUtils.initTranslations();
+    Convenience.initTranslations();
 }

-const WindowListPrefsWidget = GObject.registerClass(
-class WindowListPrefsWidget extends Gtk.Grid {
-    _init(params) {
-        super._init(params);
+const WindowListPrefsWidget = new GObject.Class({
+    Name: 'WindowList.Prefs.Widget',
+    GTypeName: 'WindowListPrefsWidget',
+    Extends: Gtk.Grid,
+
+    _init: function(params) {
+        this.parent(params);

        this.margin = 24;
        this.row_spacing = 6;
        this.orientation = Gtk.Orientation.VERTICAL;

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

        let align = new Gtk.Alignment({ left_padding: 12 });
        this.add(align);

-        let grid = new Gtk.Grid({
-            orientation: Gtk.Orientation.VERTICAL,
-            row_spacing: 6,
-            column_spacing: 6
-        });
+        let grid = new Gtk.Grid({ orientation: Gtk.Orientation.VERTICAL,
+                                  row_spacing: 6,
+                                  column_spacing: 6 });
        align.add(grid);

-        this._settings = ExtensionUtils.getSettings();
+        this._settings = Convenience.getSettings();
        let currentMode = this._settings.get_string('grouping-mode');
        let range = this._settings.get_range('grouping-mode');
        let modes = range.deep_unpack()[1].deep_unpack();

        let modeLabels = {
-            'never': _('Never group windows'),
-            'auto': _('Group windows when space is limited'),
-            'always': _('Always group windows')
+            'never': _("Never group windows"),
+            'auto': _("Group windows when space is limited"),
+            'always': _("Always group windows")
        };

        let radio = null;
@@ -54,27 +57,23 @@ class WindowListPrefsWidget extends Gtk.Grid {
            let mode = modes[i];
            let label = modeLabels[mode];
            if (!label) {
-                log('Unhandled option "%s" for grouping-mode'.format(mode));
-                continue;
+               log('Unhandled option "%s" for grouping-mode'.format(mode));
+               continue;
            }

-            radio = new Gtk.RadioButton({
-                active: currentMode == mode,
-                label: label,
-                group: radio
-            });
+            radio = new Gtk.RadioButton({ active: currentMode == mode,
+                                          label: label,
+                                          group: radio });
            grid.add(radio);

-            radio.connect('toggled', button => {
+            radio.connect('toggled', Lang.bind(this, function(button) {
                if (button.active)
                    this._settings.set_string('grouping-mode', mode);
-            });
+            }));
        }

-        let check = new Gtk.CheckButton({
-            label: _('Show on all monitors'),
-            margin_top: 6
-        });
+        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.add(check);
    }
--- a/extensions/windowsNavigator/Makefile.am
+++ b/extensions/windowsNavigator/Makefile.am
@@ -0,0 +1,3 @@
+EXTENSION_ID = windowsNavigator
+
+include ../../extension.mk
--- a/extensions/windowsNavigator/extension.js
+++ b/extensions/windowsNavigator/extension.js
@@ -1,65 +1,52 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-/* exported init */
-const { Clutter, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Lang = imports.lang;
+const Mainloop = imports.mainloop;
+const St = imports.gi.St;

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

-var MyWindowOverlay = class extends Workspace.WindowOverlay {
-    constructor(windowClone, parentActor) {
-        super(windowClone, parentActor);
-
-        this._id = null;
-        this._text = new St.Label({
-            style_class: 'extension-windowsNavigator-window-tooltip',
-            visible: false
-        });
-        parentActor.add_actor(this._text);
+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;
+}

-    showTooltip() {
+let winInjections, workspaceInjections, workViewInjections, createdActors, connectedSignals;
+
+function resetState() {
+    winInjections = { };
+    workspaceInjections = { };
+    workViewInjections = { };
+    createdActors = [ ];
+    connectedSignals = [ ];
+}
+
+function enable() {
+    resetState();
+
+    Workspace.WindowOverlay.prototype.showTooltip = function() {
        this._text.raise_top();
        this._text.show();
        this._text.text = (this._windowClone.slotId + 1).toString();
    }
+    winInjections['showTooltip'] = undefined;

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

-    relayout(animate) {
-        super.relayout(animate);
-
-        let [cloneX, cloneY, cloneWidth_, cloneHeight_] = this._windowClone.slot;
-
-        let textX = cloneX - 2;
-        let textY = cloneY - 2;
-        this._text.set_position(Math.floor(textX) + 5, Math.floor(textY) + 5);
-        this._text.raise_top();
-    }
-};
-
-var MyWorkspace = class extends Workspace.Workspace {
-    constructor(metaWorkspace, monitorIndex) {
-        super(metaWorkspace, monitorIndex);
-
-        if (metaWorkspace && metaWorkspace.index() < 9) {
-            this._tip = new St.Label({
-                style_class: 'extension-windowsNavigator-window-tooltip',
-                visible: false
-            });
-            this.actor.add_actor(this._tip);
-
-            this.actor.connect('notify::scale-x', () => {
-                this._tip.set_scale(1 / this.actor.scale_x, 1 / this.actor.scale_x);
-            });
-        } else
-            this._tip = null;
-    }
-
-    showTooltip() {
+    Workspace.Workspace.prototype.showTooltip = function() {
        if (this._tip == null || this._actualGeometry == null)
            return;
        this._tip.text = (this.metaWorkspace.index() + 1).toString();
@@ -80,73 +67,60 @@ var MyWorkspace = class extends Workspace.Workspace {
        this._tip.show();
        this._tip.raise_top();
    }
+    workspaceInjections['showTooltip'] = undefined;

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

-    getWindowWithTooltip(id) {
+    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;

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

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

-var MyWorkspacesView = class extends WorkspacesView.WorkspacesView {
-    constructor(width, height, x, y, workspaces) {
-        super(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));
-    }
-
-    _onDestroy() {
-        super._onDestroy();
-
-        global.stage.disconnect(this._keyPressEventId);
-        global.stage.disconnect(this._keyReleaseEventId);
-    }
-
-    _hideTooltips() {
+    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))
@@ -156,22 +130,20 @@ var MyWorkspacesView = class extends WorkspacesView.WorkspacesView {
             o.get_key_symbol() == Clutter.KEY_Control_R))
            this._hideWorkspacesTooltips();
    }
+    workViewInjections['_onKeyRelease'] = undefined;

-    _onKeyPress(s, o) {
-        let viewSelector = Main.overview.viewSelector;
-        if (viewSelector._activePage != viewSelector._workspacesPage)
+    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) {
            this._prevFocusActor = global.stage.get_key_focus();
            global.stage.set_key_focus(null);
-            this._active = workspaceManager.get_active_workspace_index();
+            this._active = global.screen.get_active_workspace_index();
            this._pickWindow = true;
-            this._workspaces[workspaceManager.get_active_workspace_index()].showWindowsTooltips();
+            this._workspaces[global.screen.get_active_workspace_index()].showWindowsTooltips();
            return true;
        }
        if ((o.get_key_symbol() == Clutter.KEY_Control_L ||
@@ -195,7 +167,7 @@ var MyWorkspacesView = class extends WorkspacesView.WorkspacesView {
            return true;

        if (this._pickWindow) {
-            if (this._active != workspaceManager.get_active_workspace_index()) {
+            if (this._active != global.screen.get_active_workspace_index()) {
                this._hideTooltips();
                return false;
            }
@@ -237,28 +209,80 @@ var MyWorkspacesView = class extends WorkspacesView.WorkspacesView {
        }
        return false;
    }
-};
+    workViewInjections['_onKeyPress'] = undefined;

-class Extension {
-    constructor() {
-        this._origWindowOverlay = Workspace.WindowOverlay;
-        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.WindowOverlay = MyWindowOverlay;
-        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.WindowOverlay = this._origWindowOverlay;
-        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', Lang.bind(this, function() {
+                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', Lang.bind(this, this._onKeyPress));
+        this._keyReleaseEventId = global.stage.connect('key-release-event', Lang.bind(this, this._onKeyRelease));
+        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 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 each (i in connectedSignals)
+        i.obj.disconnect(i.id);
+
+    for each (i in createdActors)
+        i.destroy();
+
+    resetState();
 }

 function init() {
-    return new Extension();
+    /* do nothing */
 }
--- a/extensions/windowsNavigator/meson.build
+++ b/extensions/windowsNavigator/meson.build
@@ -1,5 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)
--- a/extensions/workspace-indicator/Makefile.am
+++ b/extensions/workspace-indicator/Makefile.am
@@ -0,0 +1,5 @@
+EXTENSION_ID = workspace-indicator
+
+EXTRA_MODULES = prefs.js
+
+include ../../extension.mk
--- a/extensions/workspace-indicator/extension.js
+++ b/extensions/workspace-indicator/extension.js
@@ -1,9 +1,14 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
-/* exported init enable disable */

-const { Clutter, Gio, GObject, Meta, St } = imports.gi;
+const Gio = imports.gi.Gio;
+const Meta = imports.gi.Meta;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
+const Lang = imports.lang;
+const Mainloop = imports.mainloop;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
+const Panel = imports.ui.panel;

 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
@@ -11,129 +16,120 @@ const _ = Gettext.gettext;
 const Main = imports.ui.main;

 const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;

 const WORKSPACE_SCHEMA = 'org.gnome.desktop.wm.preferences';
 const WORKSPACE_KEY = 'workspace-names';

-let WorkspaceIndicator = GObject.registerClass(
-class WorkspaceIndicator extends PanelMenu.Button {
-    _init() {
-        super._init(0.0, _('Workspace Indicator'));
+const WorkspaceIndicator = new Lang.Class({
+    Name: 'WorkspaceIndicator.WorkspaceIndicator',
+    Extends: PanelMenu.Button,

-        let workspaceManager = global.workspace_manager;
+    _init: function(){
+	this.parent(0.0, _("Workspace Indicator"));

-        this._currentWorkspace = workspaceManager.get_active_workspace().index();
-        this.statusLabel = new St.Label({
-            y_align: Clutter.ActorAlign.CENTER,
-            text: this._labelText()
-        });
+	this._currentWorkspace = global.screen.get_active_workspace().index();
+	this.statusLabel = new St.Label({ y_align: Clutter.ActorAlign.CENTER,
+                                          text: this._labelText() });

-        this.add_actor(this.statusLabel);
+	this.actor.add_actor(this.statusLabel);

-        this.workspacesItems = [];
-        this._workspaceSection = new PopupMenu.PopupMenuSection();
-        this.menu.addMenuItem(this._workspaceSection);
+	this.workspacesItems = [];
+	this._workspaceSection = new PopupMenu.PopupMenuSection();
+	this.menu.addMenuItem(this._workspaceSection);

-        this._workspaceManagerSignals = [
-            workspaceManager.connect_after('workspace-added',
-                this._createWorkspacesSection.bind(this)),
-            workspaceManager.connect_after('workspace-removed',
-                this._createWorkspacesSection.bind(this)),
-            workspaceManager.connect_after('workspace-switched',
-                this._updateIndicator.bind(this))
-        ];
+	this._screenSignals = [];
+	this._screenSignals.push(global.screen.connect_after('workspace-added', Lang.bind(this,this._createWorkspacesSection)));
+	this._screenSignals.push(global.screen.connect_after('workspace-removed', Lang.bind(this,this._createWorkspacesSection)));
+	this._screenSignals.push(global.screen.connect_after('workspace-switched', Lang.bind(this,this._updateIndicator)));

-        this.connect('scroll-event', this._onScrollEvent.bind(this));
-        this._createWorkspacesSection();
+	this.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
+	this._createWorkspacesSection();

-        //styling
-        this.statusLabel.add_style_class_name('panel-workspace-indicator');
+	//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._createWorkspacesSection.bind(this));
-    }
+        this._settingsChangedId = this._settings.connect('changed::' + WORKSPACE_KEY, Lang.bind(this, this._createWorkspacesSection));
+    },

-    _onDestroy() {
-        for (let i = 0; i < this._workspaceManagerSignals.length; i++)
-            global.workspace_manager.disconnect(this._workspaceManagerSignals[i]);
+    destroy: function() {
+	for (let i = 0; i < this._screenSignals.length; i++)
+	    global.screen.disconnect(this._screenSignals[i]);

        if (this._settingsChangedId) {
            this._settings.disconnect(this._settingsChangedId);
            this._settingsChangedId = 0;
        }

-        super._onDestroy();
-    }
+	this.parent();
+    },

-    _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);
+    _updateIndicator: function() {
+	this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.NONE);
+	this._currentWorkspace = global.screen.get_active_workspace().index();
+	this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.DOT);

-        this.statusLabel.set_text(this._labelText());
-    }
+	this.statusLabel.set_text(this._labelText());
+    },

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

-    _createWorkspacesSection() {
-        let workspaceManager = global.workspace_manager;
+    _createWorkspacesSection : function() {
+	this._workspaceSection.removeAll();
+	this.workspacesItems = [];
+	this._currentWorkspace = global.screen.get_active_workspace().index();

-        this._workspaceSection.removeAll();
-        this.workspacesItems = [];
-        this._currentWorkspace = workspaceManager.get_active_workspace().index();
+	let i = 0;
+	for(; i < global.screen.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;
+	    let self = this;
+	    this.workspacesItems[i].connect('activate', Lang.bind(this, function(actor, event) {
+		this._activate(actor.workspaceId);
+	    }));

-        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._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());
+    },

-        this.statusLabel.set_text(this._labelText());
-    }
+    _activate : function (index) {
+	if(index >= 0 && index <  global.screen.n_workspaces) {
+	    let metaWorkspace = global.screen.get_workspace_by_index(index);
+	    metaWorkspace.activate(global.get_current_time());
+	}
+    },

-    _activate(index) {
-        let workspaceManager = global.workspace_manager;
+    _onScrollEvent : function(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;
+	}

-        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 = global.workspace_manager.get_active_workspace().index() + diff;
-        this._activate(newIndex);
-    }
+	let newIndex = global.screen.get_active_workspace().index() + diff;
+	this._activate(newIndex);
+    },
 });

-function init() {
-    ExtensionUtils.initTranslations();
+function init(meta) {
+    Convenience.initTranslations();
 }

 let _indicator;
--- a/extensions/workspace-indicator/meson.build
+++ b/extensions/workspace-indicator/meson.build
@@ -1,7 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)
-
-extension_sources += files('prefs.js')
--- a/extensions/workspace-indicator/prefs.js
+++ b/extensions/workspace-indicator/prefs.js
@@ -1,40 +1,48 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
-/* exported init buildPrefsWidget */

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

 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
-const N_ = e => e;
+const N_ = function(e) { return e };

 const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;

 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);
+const WorkspaceNameModel = new GObject.Class({
+    Name: 'WorkspaceIndicator.WorkspaceNameModel',
+    GTypeName: 'WorkspaceNameModel',
+    Extends: Gtk.ListStore,
+
+    Columns: {
+        LABEL: 0,
+    },
+
+    _init: function(params) {
+        this.parent(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._settings.connect('changed::workspace-names', Lang.bind(this, this._reloadFromSettings));

        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));
-    }
+        this.connect('row-changed', Lang.bind(this, this._onRowChanged));
+        this.connect('row-inserted', Lang.bind(this, this._onRowInserted));
+        this.connect('row-deleted', Lang.bind(this, this._onRowDeleted));
+    },

-    _reloadFromSettings() {
+    _reloadFromSettings: function() {
        if (this._preventChanges)
            return;
        this._preventChanges = true;
@@ -59,9 +67,9 @@ class WorkspaceNameModel extends Gtk.ListStore {
        }

        this._preventChanges = false;
-    }
+    },

-    _onRowChanged(self, path, iter) {
+    _onRowChanged: function(self, path, iter) {
        if (this._preventChanges)
            return;
        this._preventChanges = true;
@@ -80,9 +88,9 @@ class WorkspaceNameModel extends Gtk.ListStore {
        this._settings.set_strv(WORKSPACE_KEY, names);

        this._preventChanges = false;
-    }
+    },

-    _onRowInserted(self, path, iter) {
+    _onRowInserted: function(self, path, iter) {
        if (this._preventChanges)
            return;
        this._preventChanges = true;
@@ -95,9 +103,9 @@ class WorkspaceNameModel extends Gtk.ListStore {
        this._settings.set_strv(WORKSPACE_KEY, names);

        this._preventChanges = false;
-    }
+    },

-    _onRowDeleted(self, path) {
+    _onRowDeleted: function(self, path) {
        if (this._preventChanges)
            return;
        this._preventChanges = true;
@@ -111,46 +119,44 @@ class WorkspaceNameModel extends Gtk.ListStore {
        names.splice(index, 1);

        // compact the array
-        for (let i = names.length - 1; i >= 0 && !names[i]; i++)
+        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.Grid {
-    _init(params) {
-        super._init(params);
+const WorkspaceSettingsWidget = new GObject.Class({
+    Name: 'WorkspaceIndicator.WorkspaceSettingsWidget',
+    GTypeName: 'WorkspaceSettingsWidget',
+    Extends: Gtk.Grid,
+
+    _init: function(params) {
+        this.parent(params);
        this.margin = 12;
        this.orientation = Gtk.Orientation.VERTICAL;

-        this.add(new Gtk.Label({
-            label: '<b>%s</b>'.format(_('Workspace Names')),
-            use_markup: true,
-            margin_bottom: 6,
-            hexpand: true,
-            halign: Gtk.Align.START
-        }));
+        this.add(new Gtk.Label({ label: '<b>' + _("Workspace Names") + '</b>',
+                                 use_markup: true, margin_bottom: 6,
+                                 hexpand: true, halign: Gtk.Align.START }));

        let scrolled = new Gtk.ScrolledWindow({ shadow_type: Gtk.ShadowType.IN });
        scrolled.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
        this.add(scrolled);

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

-        let column = new Gtk.TreeViewColumn({ title: _('Name') });
+        let column = new Gtk.TreeViewColumn({ title: _("Name") });
        let renderer = new Gtk.CellRendererText({ editable: true });
-        renderer.connect('edited', this._cellEdited.bind(this));
+        renderer.connect('edited', Lang.bind(this, this._cellEdited));
        column.pack_start(renderer, true);
        column.add_attribute(renderer, 'text', this._store.Columns.LABEL);
        this._treeView.append_column(column);
@@ -161,39 +167,40 @@ class WorkspaceSettingsWidget extends Gtk.Grid {
        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));
+        newButton.connect('clicked', Lang.bind(this, this._newClicked));
        toolbar.add(newButton);

        let delButton = new Gtk.ToolButton({ icon_name: 'list-remove-symbolic' });
-        delButton.connect('clicked', this._delClicked.bind(this));
+        delButton.connect('clicked', Lang.bind(this, this._delClicked));
        toolbar.add(delButton);

        let selection = this._treeView.get_selection();
-        selection.connect('changed', () => {
-            delButton.sensitive = selection.count_selected_rows() > 0;
-        });
+        selection.connect('changed',
+            function() {
+                delButton.sensitive = selection.count_selected_rows() > 0;
+            });
        delButton.sensitive = selection.count_selected_rows() > 0;

        this.add(toolbar);
-    }
+    },

-    _cellEdited(renderer, path, newText) {
+    _cellEdited: function(renderer, path, new_text) {
        let [ok, iter] = this._store.get_iter_from_string(path);

        if (ok)
-            this._store.set(iter, [this._store.Columns.LABEL], [newText]);
-    }
+            this._store.set(iter, [this._store.Columns.LABEL], [new_text]);
+    },

-    _newClicked() {
+    _newClicked: function() {
        let iter = this._store.append();
        let index = this._store.get_path(iter).get_indices()[0];

-        let label = _('Workspace %d').format(index + 1);
+        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();
+    _delClicked: function() {
+        let [any, model, iter] = this._treeView.get_selection().get_selected();

        if (any)
            this._store.remove(iter);
@@ -201,7 +208,7 @@ class WorkspaceSettingsWidget extends Gtk.Grid {
 });

 function init() {
-    ExtensionUtils.initTranslations();
+    Convenience.initTranslations();
 }

 function buildPrefsWidget() {
--- a/gnome-shell-extensions.doap
+++ b/gnome-shell-extensions.doap
@@ -15,7 +15,7 @@ and will be picked automatically at next login.
  <homepage rdf:resource="https://wiki.gnome.org/Projects/GnomeShell/Extensions" />
  <mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/gnome-shell-list" />
  <download-page rdf:resource="http://download.gnome.org/sources/gnome-shell-extensions/" />
-  <bug-database rdf:resource="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/issues" />
+  <bug-database rdf:resource="http://bugzilla.gnome.org/browse.cgi?product=gnome-shell&amp;component=extensions" />

  <category rdf:resource="http://api.gnome.org/doap-extensions#core" />
  <programming-language>JavaScript</programming-language>
--- a/include.mk
+++ b/include.mk
@@ -0,0 +1,12 @@
+extensionurl = http://git.gnome.org/gnome-shell-extensions
+
+# Change these to modify how installation is performed
+topextensiondir = $(datadir)/gnome-shell/extensions
+extensionbase = @gnome-shell-extensions.gcampax.github.com
+
+gschemabase = org.gnome.shell.extensions
+
+uuid = $(EXTENSION_ID)$(extensionbase)
+gschemaname = $(gschemabase).$(EXTENSION_ID)
+
+extensiondir = $(topextensiondir)/$(uuid)
--- a/lib/convenience.js
+++ b/lib/convenience.js
@@ -0,0 +1,93 @@
+/* -*- mode: js; js-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+  Copyright (c) 2011-2012, Giovanni Campagna <scampa.giovanni@gmail.com>
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the GNOME nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+const Gettext = imports.gettext;
+const Gio = imports.gi.Gio;
+
+const Config = imports.misc.config;
+const ExtensionUtils = imports.misc.extensionUtils;
+
+/**
+ * initTranslations:
+ * @domain: (optional): the gettext domain to use
+ *
+ * Initialize Gettext to load translations from extensionsdir/locale.
+ * If @domain is not provided, it will be taken from metadata['gettext-domain']
+ */
+function initTranslations(domain) {
+    let extension = ExtensionUtils.getCurrentExtension();
+
+    domain = domain || extension.metadata['gettext-domain'];
+
+    // check if this extension was built with "make zip-file", and thus
+    // has the locale files in a subfolder
+    // otherwise assume that extension has been installed in the
+    // same prefix as gnome-shell
+    let localeDir = extension.dir.get_child('locale');
+    if (localeDir.query_exists(null))
+        Gettext.bindtextdomain(domain, localeDir.get_path());
+    else
+        Gettext.bindtextdomain(domain, Config.LOCALEDIR);
+}
+
+/**
+ * getSettings:
+ * @schema: (optional): the GSettings schema id
+ *
+ * Builds and return a GSettings schema for @schema, using schema files
+ * in extensionsdir/schemas. If @schema is not provided, it is taken from
+ * metadata['settings-schema'].
+ */
+function getSettings(schema) {
+    let extension = ExtensionUtils.getCurrentExtension();
+
+    schema = schema || extension.metadata['settings-schema'];
+
+    const GioSSS = Gio.SettingsSchemaSource;
+
+    // check if this extension was built with "make zip-file", and thus
+    // has the schema files in a subfolder
+    // otherwise assume that extension has been installed in the
+    // same prefix as gnome-shell (and therefore schemas are available
+    // in the standard folders)
+    let schemaDir = extension.dir.get_child('schemas');
+    let schemaSource;
+    if (schemaDir.query_exists(null))
+        schemaSource = GioSSS.new_from_directory(schemaDir.get_path(),
+                                                 GioSSS.get_default(),
+                                                 false);
+    else
+        schemaSource = GioSSS.get_default();
+
+    let schemaObj = schemaSource.lookup(schema, true);
+    if (!schemaObj)
+        throw new Error('Schema ' + schema + ' could not be found for extension '
+                        + extension.metadata.uuid + '. Please check your installation.');
+
+    return new Gio.Settings({ settings_schema: schemaObj });
+}
+								  
--- a/lint/eslintrc-gjs.json
+++ b/lint/eslintrc-gjs.json
@@ -1,130 +0,0 @@
-{
-    "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-shell.json
+++ b/lint/eslintrc-shell.json
@@ -1,30 +0,0 @@
-{
-    "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/m4/.gitignore
+++ b/m4/.gitignore
@@ -0,0 +1 @@
+intltool.m4
--- a/meson.build
+++ b/meson.build
@@ -1,95 +0,0 @@
-project('gnome-shell-extensions',
-  version: '3.33.3',
-  meson_version: '>= 0.44.0',
-  license: 'GPL2+'
-)
-
-gettext_domain = meson.project_name()
-
-gnome = import('gnome')
-i18n = import('i18n')
-
-datadir = get_option('datadir')
-
-shelldir = join_paths(datadir, 'gnome-shell')
-extensiondir = join_paths(shelldir, 'extensions')
-modedir = join_paths(shelldir, 'modes')
-themedir = join_paths(shelldir, 'theme')
-
-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('.')
-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'
-
-classic_extensions = [
-  'apps-menu',
-  'places-menu',
-  'launch-new-instance',
-  'window-list'
-]
-
-default_extensions = classic_extensions
-default_extensions += [
-  'drive-menu',
-  'screenshot-window-sizer',
-  'windowsNavigator',
-  'workspace-indicator'
-]
-
-all_extensions = default_extensions
-all_extensions += [
-  'auto-move-windows',
-  'native-window-placement',
-  'user-theme'
-]
-
-enabled_extensions = get_option('enable_extensions')
-
-if enabled_extensions.length() == 0
-  set = get_option('extension_set')
-
-  if set == 'classic'
-    enabled_extensions += classic_extensions
-  elif set == 'default'
-    enabled_extensions += default_extensions
-  elif set == 'all'
-    enabled_extensions += all_extensions
-  endif
-endif
-
-classic_mode_enabled = get_option('classic_mode')
-
-if classic_mode_enabled
-  # Sanity check: Make sure all classic extensions are enabled
-  foreach e : classic_extensions
-    if not enabled_extensions.contains(e)
-      error('Classic mode is enabled, ' +
-            'but the required extension @0@ is not.'.format(e))
-    endif
-  endforeach
-endif
-
-# Sanity check: Make sure enabled extensions are valid
-foreach e : enabled_extensions
-  if not all_extensions.contains(e)
-    error('Invalid extension @0@.'.format(e))
-  endif
-endforeach
-
-if classic_mode_enabled
-  sassc = find_program('sassc', required: true)
-  subdir('data')
-endif
-
-subdir('extensions')
-subdir('po')
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,18 +0,0 @@
-option('extension_set',
-  type: 'combo',
-  choices: ['classic', 'default', 'all'],
-  value: 'default',
-  description: 'Predefined sets of extensions'
-)
-
-option('enable_extensions',
-  type: 'array',
-  value: [],
-  description: 'Comma separated list of extensions to enable instead of a predefined set.'
-)
-
-option('classic_mode',
-  type: 'boolean',
-  value: false,
-  description: 'Enable installing data files for classic mode.'
-)
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -2,7 +2,6 @@ af
 an
 ar
 as
-be
 bg
 bn_IN
 bs
@@ -21,12 +20,10 @@ fa
 fi
 fr
 fur
-gd
 gl
 gu
 he
 hi
-hr
 hu
 id
 is
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,19 +1,24 @@
 data/gnome-classic.desktop.in
-data/gnome-classic.session.desktop.in
+data/gnome-classic.session.desktop.in.in
+data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in
+extensions/alternate-tab/prefs.js
 extensions/apps-menu/extension.js
 extensions/auto-move-windows/extension.js
-extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml
+extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in
 extensions/auto-move-windows/prefs.js
 extensions/drive-menu/extension.js
+extensions/example/extension.js
+extensions/example/org.gnome.shell.extensions.example.gschema.xml.in
+extensions/example/prefs.js
 extensions/native-window-placement/extension.js
-extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml
+extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in
 extensions/places-menu/extension.js
 extensions/places-menu/placeDisplay.js
-extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml
+extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml.in
 extensions/user-theme/extension.js
-extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml
+extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in
 extensions/window-list/extension.js
-extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml
+extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in
 extensions/window-list/prefs.js
 extensions/windowsNavigator/extension.js
 extensions/workspace-indicator/extension.js
--- a/po/af.po
+++ b/po/af.po
@@ -1,370 +1,311 @@
 # Afrikaans translation for gnome-shell-extensions.
 # This file is distributed under the same license as the gnome-shell-extensions package.
 # F Wolff <friedel@translate.org.za>, 2013.
-# Pieter Schoeman <pieter@sonbesie.co.za>, 2017.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
-"issues\n"
-"POT-Creation-Date: 2018-09-06 10:29+0000\n"
-"PO-Revision-Date: 2018-02-06 17:47+0200\n"
-"Last-Translator: Pieter Schalk Schoeman <pieter@sonbesie.co.za>\n"
-"Language-Team: Afrikaans <pieter@sonbesie.co.za>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"shell&keywords=I18N+L10N&component=extensions\n"
+"POT-Creation-Date: 2013-09-26 20:32+0000\n"
+"PO-Revision-Date: 2013-09-27 16:17+0200\n"
+"Last-Translator: F Wolff <friedel@translate.org.za>\n"
+"Language-Team: translate-discuss-af@lists.sourceforge.net\n"
 "Language: af\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.3\n"
+"X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"

-#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
+#: ../data/gnome-classic.desktop.in.h:1
+#: ../data/gnome-classic.session.desktop.in.in.h:1
 msgid "GNOME Classic"
 msgstr "GNOME Klassiek"

-#: data/gnome-classic.desktop.in:4
+#: ../data/gnome-classic.desktop.in.h:2
 msgid "This session logs you into GNOME Classic"
 msgstr "Hierdie sessie laat mens aanmeld by GNOME Klassiek"

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:7
-msgid "Attach modal dialog to the parent window"
-msgstr "Heg modale dialoogvenster vas aan die ouervenster"
+#: ../data/gnome-shell-classic.desktop.in.in.h:1
+msgid "GNOME Shell Classic"
+msgstr "GNOME Shell Klassiek"

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:8
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:25
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:33
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:41
+#: ../data/gnome-shell-classic.desktop.in.in.h:2
+msgid "Window management and application launching"
+msgstr "Vensterbestuur en toepassinglansering"
+
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:1
+msgid "Attach modal dialog to the parent window"
+msgstr ""
+
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:2
 msgid ""
 "This key overrides the key in org.gnome.mutter when running GNOME Shell."
 msgstr ""
-"Hierdie sleutel oorskryf die sleutel in org.gnome.mutter wanneer GNOME Shell "
-"uitgevoer word."

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:16
-msgid "Arrangement of buttons on the titlebar"
-msgstr "Knoppie rangskikking op die titelbalk"
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:17
-msgid ""
-"This key overrides the key in org.gnome.desktop.wm.preferences when running "
-"GNOME Shell."
-msgstr ""
-"Die sleutel oorheers die sleutel in org.gnome.desktop.wm.preferences wanneer "
-"GNOME uitgevoer word."
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:24
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:3
 msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr "Aktiveer rand-tilering wanneer vensters op skermrand laat val word"
+msgstr ""

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:32
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:4
 msgid "Workspaces only on primary monitor"
-msgstr "Werkspasies slegs op primêre monitor"
+msgstr "Werkruimtes slegs op primêre monitor"

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:40
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:5
 msgid "Delay focus changes in mouse mode until the pointer stops moving"
-msgstr "Vertraag fokusverandering in muismodus totdat die wyser ophou beweeg"
+msgstr ""

-#: extensions/alternate-tab/prefs.js:19
+#: ../extensions/alternate-tab/prefs.js:20
 msgid "Thumbnail only"
-msgstr "Slegs duimnael"
+msgstr ""

-#: extensions/alternate-tab/prefs.js:20
+#: ../extensions/alternate-tab/prefs.js:21
 msgid "Application icon only"
 msgstr "Slegs toepassingsikoon"

-#: extensions/alternate-tab/prefs.js:21
+#: ../extensions/alternate-tab/prefs.js:22
 msgid "Thumbnail and application icon"
 msgstr "Duimnael en toepassingsikoon"

-#: extensions/alternate-tab/prefs.js:34
+#: ../extensions/alternate-tab/prefs.js:37
 msgid "Present windows as"
 msgstr "Wys vensters as"

-#: extensions/alternate-tab/prefs.js:65
+#: ../extensions/alternate-tab/prefs.js:62
 msgid "Show only windows in the current workspace"
 msgstr "Wys slegs vensters van die huidige werkruimte"

-#: extensions/apps-menu/extension.js:37
+#: ../extensions/apps-menu/extension.js:39
 msgid "Activities Overview"
 msgstr "Aktiwiteite-oorsig"

-#: extensions/apps-menu/extension.js:130
+#: ../extensions/apps-menu/extension.js:113
 msgid "Favorites"
 msgstr "Gunstelinge"

-#: extensions/apps-menu/extension.js:417
+#: ../extensions/apps-menu/extension.js:282
 msgid "Applications"
 msgstr "Toepassings"

-#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
+#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:1
 msgid "Application and workspace list"
-msgstr "Toepassing- en werkspasielys"
+msgstr "Toepassing- en werkruimtelys"

-#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:7
+#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:2
 msgid ""
 "A list of strings, each containing an application id (desktop file name), "
 "followed by a colon and the workspace number"
 msgstr ""
-"'n Lys stringe wat elkeen 'n toepassing id (werkskerm en lêernaam) sowel as "
-"komma gevolg deur 'n werkspasie nommer bevat"

-#: extensions/auto-move-windows/prefs.js:53
+#: ../extensions/auto-move-windows/prefs.js:55
 msgid "Application"
 msgstr "Toepassing"

-#: extensions/auto-move-windows/prefs.js:62
-#: extensions/auto-move-windows/prefs.js:117
+#: ../extensions/auto-move-windows/prefs.js:64
+#: ../extensions/auto-move-windows/prefs.js:106
 msgid "Workspace"
-msgstr "Werkspasie"
+msgstr "Werkruimte"

-#: extensions/auto-move-windows/prefs.js:78
-msgid "Add Rule"
+#: ../extensions/auto-move-windows/prefs.js:80
+msgid "Add rule"
 msgstr "Voeg reël by"

-#: extensions/auto-move-windows/prefs.js:98
+#: ../extensions/auto-move-windows/prefs.js:94
 msgid "Create new matching rule"
-msgstr "Skep 'n nuwe ooreenstemmende reël"
+msgstr ""

-#: extensions/auto-move-windows/prefs.js:103
+#: ../extensions/auto-move-windows/prefs.js:98
 msgid "Add"
 msgstr "Voeg by"

-#. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:103
-#: extensions/places-menu/placeDisplay.js:219
-#, javascript-format
-msgid "Ejecting drive “%s” failed:"
-msgstr "Kon nie skyf \"%s\" uitskiet nie:"
+#: ../extensions/drive-menu/extension.js:73
+#, c-format
+msgid "Ejecting drive '%s' failed:"
+msgstr "Kon nie skyf '%s' uitskiet nie:"

-#: extensions/drive-menu/extension.js:118
+#: ../extensions/drive-menu/extension.js:90
 msgid "Removable devices"
 msgstr "Verwyderbare toestelle"

-#: extensions/drive-menu/extension.js:143
-msgid "Open Files"
+#: ../extensions/drive-menu/extension.js:117
+msgid "Open File"
 msgstr "Open lêer"

-#: extensions/example/extension.js:17
+#: ../extensions/example/extension.js:17
 msgid "Hello, world!"
 msgstr "Hallo, wêreld!"

-#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:5
+#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:1
 msgid "Alternative greeting text."
-msgstr "Alternatiewe groetboodskap."
+msgstr ""

-#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:6
+#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:2
 msgid ""
 "If not empty, it contains the text that will be shown when clicking on the "
 "panel."
 msgstr ""
-"Indien dit nie leeg is nie bevat dit die teks wat op die paneel gewys word "
-"as daarop geklik word."
-
-#: extensions/example/prefs.js:27
-msgid "Message"
-msgstr "Boodskap"

 #. TRANSLATORS: Example is the name of the extension, should not be
 #. translated
-#: extensions/example/prefs.js:40
+#: ../extensions/example/prefs.js:30
 msgid ""
 "Example aims to show how to build well behaved extensions for the Shell and "
 "as such it has little functionality on its own.\n"
-"Nevertheless it’s possible to customize the greeting message."
+"Nevertheless it's possible to customize the greeting message."
 msgstr ""
-"Example het ten doel om te wys hoe om goeie uitbreidings vir die Shell te "
-"skep en het dus min funksionaliteit.\n"
-"Tog is dit moontlik om die groeteboodskap aan te pas."

-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
+#: ../extensions/example/prefs.js:36
+msgid "Message:"
+msgstr "Boodskap:"
+
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:1
 msgid "Use more screen for windows"
-msgstr "Gebruik meer skermspasie vir vensters"
+msgstr ""

-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:6
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:2
 msgid ""
 "Try to use more screen for placing window thumbnails by adapting to screen "
 "aspect ratio, and consolidating them further to reduce the bounding box. "
 "This setting applies only with the natural placement strategy."
 msgstr ""
-"Probeer om meer skermspasie te gebruik vir die plasing van vensterduimnaels "
-"deur aan te pas by die skerm-aspekverhouding. Hierdie instelling is slegs "
-"van toepassing op die normale plasingstrategie."

-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:3
 msgid "Place window captions on top"
-msgstr "Plaas venster opskrifte bo"
+msgstr ""

-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:12
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:4
 msgid ""
 "If true, place window captions on top the respective thumbnail, overriding "
 "shell default of placing it at the bottom. Changing this setting requires "
 "restarting the shell to have any effect."
 msgstr ""
-"As waar, plaas venster opskrifte bo hul onderskeie duimnaels, anders as die "
-"shell standaard waar hulle onder sou verskyn. As u hierdie instelling "
-"verander, moet die shell weer begin word om enige effek te toon."

-#: extensions/places-menu/extension.js:79
-#: extensions/places-menu/extension.js:82
+#: ../extensions/places-menu/extension.js:78
+#: ../extensions/places-menu/extension.js:81
 msgid "Places"
 msgstr "Plekke"

-#: extensions/places-menu/placeDisplay.js:66
-#, javascript-format
-msgid "Failed to mount volume for “%s”"
-msgstr "Kon nie die \"%s\" volume heg nie"
-
-#: extensions/places-menu/placeDisplay.js:79
-#, javascript-format
-msgid "Failed to launch “%s”"
+#: ../extensions/places-menu/placeDisplay.js:56
+#, c-format
+msgid "Failed to launch \"%s\""
 msgstr "Kon nie \"%s\" lanseer nie"

-#: extensions/places-menu/placeDisplay.js:135
-#: extensions/places-menu/placeDisplay.js:158
+#: ../extensions/places-menu/placeDisplay.js:98
+#: ../extensions/places-menu/placeDisplay.js:121
 msgid "Computer"
 msgstr "Rekenaar"

-#: extensions/places-menu/placeDisplay.js:336
+#: ../extensions/places-menu/placeDisplay.js:199
 msgid "Home"
 msgstr "Tuis"

-#: extensions/places-menu/placeDisplay.js:378
+#: ../extensions/places-menu/placeDisplay.js:286
 msgid "Browse Network"
 msgstr "Blaai deur netwerk"

-#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
-msgid "Cycle Screenshot Sizes"
-msgstr "Rol deur skermkiekies"
+#: ../extensions/systemMonitor/extension.js:214
+msgid "CPU"
+msgstr "SVE"

-#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
-msgid "Cycle Screenshot Sizes Backward"
-msgstr "Rol agteruit deur skermkiekies"
+#: ../extensions/systemMonitor/extension.js:267
+msgid "Memory"
+msgstr "Geheue"

-#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
+#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:1
 msgid "Theme name"
 msgstr "Temanaam"

-#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:6
+#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:2
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr ""
-"Die naam van die tema wat van ~/.themes/name/gnome-shell gelaai moet word"

-#: extensions/window-list/extension.js:106
+#: ../extensions/window-list/extension.js:92
 msgid "Close"
 msgstr "Sluit"

-#: extensions/window-list/extension.js:125
+#: ../extensions/window-list/extension.js:102
 msgid "Unminimize"
-msgstr "Onminimeer"
+msgstr ""

-#: extensions/window-list/extension.js:126
+#: ../extensions/window-list/extension.js:103
 msgid "Minimize"
 msgstr "Minimeer"

-#: extensions/window-list/extension.js:132
+#: ../extensions/window-list/extension.js:109
 msgid "Unmaximize"
-msgstr "Onmaksimeer"
+msgstr ""

-#: extensions/window-list/extension.js:133
+#: ../extensions/window-list/extension.js:110
 msgid "Maximize"
 msgstr "Maksimeer"

-#: extensions/window-list/extension.js:408
+#: ../extensions/window-list/extension.js:270
 msgid "Minimize all"
 msgstr "Minimeer almal"

-#: extensions/window-list/extension.js:414
+#: ../extensions/window-list/extension.js:278
 msgid "Unminimize all"
-msgstr "Onminimeer almal"
+msgstr ""

-#: extensions/window-list/extension.js:420
+#: ../extensions/window-list/extension.js:286
 msgid "Maximize all"
 msgstr "Maksimeer almal"

-#: extensions/window-list/extension.js:429
+#: ../extensions/window-list/extension.js:295
 msgid "Unmaximize all"
-msgstr "Ommaksimeer almal"
+msgstr ""

-#: extensions/window-list/extension.js:438
+#: ../extensions/window-list/extension.js:304
 msgid "Close all"
 msgstr "Sluit almal"

-#: extensions/window-list/extension.js:646
-#: extensions/workspace-indicator/extension.js:26
+#: ../extensions/window-list/extension.js:591
+#: ../extensions/workspace-indicator/extension.js:30
 msgid "Workspace Indicator"
-msgstr "Werkspasie aanwyser"
+msgstr ""

-#: extensions/window-list/extension.js:811
+#: ../extensions/window-list/extension.js:743
 msgid "Window List"
 msgstr "Vensterlys"

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:12
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:1
 msgid "When to group windows"
 msgstr "Wanneer om vensters te groepeer"

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:2
 msgid ""
 "Decides when to group windows from the same application on the window list. "
-"Possible values are “never”, “auto” and “always”."
+"Possible values are \"never\", \"auto\" and \"always\"."
 msgstr ""
 "Besluit wanneer om vensters van dieselfde toepassing in die vensterlys te "
-"groepeer. Moontlike waardes is \"nooit\", \"outomaties\" en \"altyd\"."
+"groepeer. Moontlike waardes is \"never\", \"auto\" en \"always\"."

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
-msgid "Show the window list on all monitors"
-msgstr "Wys vensterlys op alle skerms"
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
-msgid ""
-"Whether to show the window list on all connected monitors or only on the "
-"primary one."
-msgstr ""
-"Of die vensterlys op alle gekonnekteerde monitors vertoon moet word of slegs "
-"die primêre een."
-
-#: extensions/window-list/prefs.js:28
+#: ../extensions/window-list/prefs.js:30
 msgid "Window Grouping"
 msgstr "Venstergroepering"

-#: extensions/window-list/prefs.js:46
+#: ../extensions/window-list/prefs.js:49
 msgid "Never group windows"
 msgstr "Moet nooit vensters groepeer nie"

-#: extensions/window-list/prefs.js:47
+#: ../extensions/window-list/prefs.js:50
 msgid "Group windows when space is limited"
 msgstr "Groepeer vensters wanneer ruimte beperk is"

-#: extensions/window-list/prefs.js:48
+#: ../extensions/window-list/prefs.js:51
 msgid "Always group windows"
 msgstr "Groepeer vensters altyd"

-#: extensions/window-list/prefs.js:71
-msgid "Show on all monitors"
-msgstr "Wys op alle skerms"
+#: ../extensions/workspace-indicator/prefs.js:141
+msgid "Workspace names:"
+msgstr "Werkruimtename:"

-#: extensions/workspace-indicator/prefs.js:134
-msgid "Workspace Names"
-msgstr "Werkspasiename"
-
-#: extensions/workspace-indicator/prefs.js:150
+#: ../extensions/workspace-indicator/prefs.js:152
 msgid "Name"
 msgstr "Naam"

-#: extensions/workspace-indicator/prefs.js:190
-#, javascript-format
+#: ../extensions/workspace-indicator/prefs.js:186
+#, c-format
 msgid "Workspace %d"
-msgstr "Werkspasie %d"
-
-#~ msgid "GNOME Shell Classic"
-#~ msgstr "GNOME Shell Klassiek"
-
-#~ msgid "Window management and application launching"
-#~ msgstr "Vensterbestuur en toepassinglansering"
-
-#~ msgid "CPU"
-#~ msgstr "SVE"
-
-#~ msgid "Memory"
-#~ msgstr "Geheue"
+msgstr "Werkruimte %d"
--- a/po/ar.po
+++ b/po/ar.po
@@ -1,14 +1,13 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Khaled Hosny <khaledhosny@eglug.org>, 2012, 2013, 2015, 2017.
+# Khaled Hosny <khaledhosny@eglug.org>, 2012, 2013, 2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2017-07-02 06:04+0200\n"
-"PO-Revision-Date: 2017-07-02 06:12+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-23 23:54+0200\n"
+"PO-Revision-Date: 2015-09-23 23:56+0200\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
 "Language: ar\n"
@@ -17,319 +16,310 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Virtaal 1.0.0-beta1\n"
+"X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"

-#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
+#: ../data/gnome-classic.desktop.in.h:1
+#: ../data/gnome-classic.session.desktop.in.in.h:1
 msgid "GNOME Classic"
 msgstr "جنوم تقليدية"

-#: data/gnome-classic.desktop.in:4
+#: ../data/gnome-classic.desktop.in.h:2
 msgid "This session logs you into GNOME Classic"
 msgstr "تولجك هذه الجلسة في جنوم التقليدية"

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:7
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:1
 msgid "Attach modal dialog to the parent window"
 msgstr "اربط المربعات الحوارية العائمة بالنافذة الأم"

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:8
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:25
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:33
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:41
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:2
 msgid ""
 "This key overrides the key in org.gnome.mutter when running GNOME Shell."
-msgstr "يغلب هذا المفتاح على مفتاح org.gnome.mutter عند استخدام صدفة جنوم."
+msgstr ""

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:16
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:3
 msgid "Arrangement of buttons on the titlebar"
 msgstr "ترتيب الأزرار في شريط العناوين"

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:17
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:4
 msgid ""
 "This key overrides the key in org.gnome.desktop.wm.preferences when running "
 "GNOME Shell."
 msgstr ""
-"يغلب هذا المفتاح على مفتاح org.gnome.desktop.wm.preferences عند استخدام صدفة "
-"جنوم."

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:24
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:5
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr ""

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:32
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:6
 msgid "Workspaces only on primary monitor"
 msgstr "مساحات عمل على الشاشة الرئيسية فقط"

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:40
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:7
 msgid "Delay focus changes in mouse mode until the pointer stops moving"
 msgstr ""

-#: extensions/alternate-tab/prefs.js:20
+#: ../extensions/alternate-tab/prefs.js:20
 msgid "Thumbnail only"
 msgstr "مصغّرة فقط"

-#: extensions/alternate-tab/prefs.js:21
+#: ../extensions/alternate-tab/prefs.js:21
 msgid "Application icon only"
 msgstr "أيقونة التطبيق فقط"

-#: extensions/alternate-tab/prefs.js:22
+#: ../extensions/alternate-tab/prefs.js:22
 msgid "Thumbnail and application icon"
 msgstr "مصغّرة وأيقونة التطبيق"

-#: extensions/alternate-tab/prefs.js:38
+#: ../extensions/alternate-tab/prefs.js:38
 msgid "Present windows as"
 msgstr "كيفية عرض التطبيقات"

-#: extensions/alternate-tab/prefs.js:69
+#: ../extensions/alternate-tab/prefs.js:69
 msgid "Show only windows in the current workspace"
 msgstr "أظهر نوافذ مساحات العمل الحالية فقط"

-#: extensions/apps-menu/extension.js:41
+#: ../extensions/apps-menu/extension.js:38
 msgid "Activities Overview"
 msgstr "ملخص الأنشطة"

-#: extensions/apps-menu/extension.js:141
+#: ../extensions/apps-menu/extension.js:109
 msgid "Favorites"
 msgstr "المفضّلات"

-#: extensions/apps-menu/extension.js:436
+#: ../extensions/apps-menu/extension.js:261
 msgid "Applications"
 msgstr "التطبيقات"

-#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
+#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:1
 msgid "Application and workspace list"
 msgstr "قائمة التطبيقات ومساحات العمل"

-#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:7
+#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:2
 msgid ""
 "A list of strings, each containing an application id (desktop file name), "
 "followed by a colon and the workspace number"
 msgstr ""

-#: extensions/auto-move-windows/prefs.js:60
+#: ../extensions/auto-move-windows/prefs.js:60
 msgid "Application"
 msgstr "التطبيق"

-#: extensions/auto-move-windows/prefs.js:69
-#: extensions/auto-move-windows/prefs.js:127
+#: ../extensions/auto-move-windows/prefs.js:69
+#: ../extensions/auto-move-windows/prefs.js:127
 msgid "Workspace"
 msgstr "مساحة العمل"

-#: extensions/auto-move-windows/prefs.js:85
+#: ../extensions/auto-move-windows/prefs.js:85
 msgid "Add Rule"
 msgstr "أضِف قاعدة"

-#: extensions/auto-move-windows/prefs.js:106
+#: ../extensions/auto-move-windows/prefs.js:106
 msgid "Create new matching rule"
 msgstr "أنشئ قاعدة تطابق"

-#: extensions/auto-move-windows/prefs.js:111
+#: ../extensions/auto-move-windows/prefs.js:111
 msgid "Add"
 msgstr "أضِف"

-#: extensions/drive-menu/extension.js:106
+#: ../extensions/drive-menu/extension.js:106
 #, javascript-format
-msgid "Ejecting drive “%s” failed:"
-msgstr "فشل إخراج ”%s“:"
+msgid "Ejecting drive '%s' failed:"
+msgstr "فشل إخراج '%s':"

-#: extensions/drive-menu/extension.js:124
+#: ../extensions/drive-menu/extension.js:124
 msgid "Removable devices"
 msgstr "الأجهزة المنفصلة"

-#: extensions/drive-menu/extension.js:149
-msgid "Open Files"
-msgstr "افتح الملفات"
+#: ../extensions/drive-menu/extension.js:149
+msgid "Open File"
+msgstr "افتح الملف"

-#: extensions/example/extension.js:17
+#: ../extensions/example/extension.js:17
 msgid "Hello, world!"
 msgstr "أهلا، يا عالم!"

-#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:5
+#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:1
 msgid "Alternative greeting text."
 msgstr "نص ترحيب بديل"

-#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:6
+#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:2
 msgid ""
 "If not empty, it contains the text that will be shown when clicking on the "
 "panel."
 msgstr ""

-#: extensions/example/prefs.js:30
+#: ../extensions/example/prefs.js:30
 msgid "Message"
 msgstr "الرسالة"

 #. TRANSLATORS: Example is the name of the extension, should not be
 #. translated
-#: extensions/example/prefs.js:43
+#: ../extensions/example/prefs.js:43
 msgid ""
 "Example aims to show how to build well behaved extensions for the Shell and "
 "as such it has little functionality on its own.\n"
-"Nevertheless it’s possible to customize the greeting message."
+"Nevertheless it's possible to customize the greeting message."
 msgstr ""

-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:1
 msgid "Use more screen for windows"
 msgstr ""

-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:6
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:2
 msgid ""
 "Try to use more screen for placing window thumbnails by adapting to screen "
 "aspect ratio, and consolidating them further to reduce the bounding box. "
 "This setting applies only with the natural placement strategy."
 msgstr ""

-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:3
 msgid "Place window captions on top"
 msgstr ""

-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:12
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:4
 msgid ""
 "If true, place window captions on top the respective thumbnail, overriding "
 "shell default of placing it at the bottom. Changing this setting requires "
 "restarting the shell to have any effect."
 msgstr ""

-#: extensions/places-menu/extension.js:78
-#: extensions/places-menu/extension.js:81
+#: ../extensions/places-menu/extension.js:78
+#: ../extensions/places-menu/extension.js:81
 msgid "Places"
 msgstr "الأماكن"

-#: extensions/places-menu/placeDisplay.js:65
+#: ../extensions/places-menu/placeDisplay.js:59
 #, javascript-format
-msgid "Failed to mount volume for “%s”"
-msgstr "فشل وصل الجزء ”%s“"
+msgid "Failed to launch \"%s\""
+msgstr "فشل تشغيل \"%s\""

-#: extensions/places-menu/placeDisplay.js:78
-#, javascript-format
-msgid "Failed to launch “%s”"
-msgstr "فشل تشغيل ”%s“"
-
-#: extensions/places-menu/placeDisplay.js:137
-#: extensions/places-menu/placeDisplay.js:160
+#: ../extensions/places-menu/placeDisplay.js:101
+#: ../extensions/places-menu/placeDisplay.js:124
 msgid "Computer"
 msgstr "الحاسوب"

-#: extensions/places-menu/placeDisplay.js:303
+#: ../extensions/places-menu/placeDisplay.js:267
 msgid "Home"
 msgstr "المنزل"

-#: extensions/places-menu/placeDisplay.js:347
+#: ../extensions/places-menu/placeDisplay.js:311
 msgid "Browse Network"
 msgstr "تصفّح الشبكة"

-#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
+#: ../extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml.in.h:1
 msgid "Cycle Screenshot Sizes"
 msgstr ""

-#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
+#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:1
 msgid "Theme name"
 msgstr "اسم السمة"

-#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:6
+#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:2
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
-msgstr "اسم السمة، يمكن تحميلة من ‪~/.themes/name/gnome-shell‬"
+msgstr ""

-#: extensions/window-list/extension.js:110
+#: ../extensions/window-list/extension.js:110
 msgid "Close"
 msgstr "أغلق"

-#: extensions/window-list/extension.js:129
+#: ../extensions/window-list/extension.js:120
 msgid "Unminimize"
 msgstr "ألغِ التصغير"

-#: extensions/window-list/extension.js:130
+#: ../extensions/window-list/extension.js:121
 msgid "Minimize"
 msgstr "صغّر"

-#: extensions/window-list/extension.js:136
+#: ../extensions/window-list/extension.js:127
 msgid "Unmaximize"
 msgstr "ألغِ التكبير"

-#: extensions/window-list/extension.js:137
+#: ../extensions/window-list/extension.js:128
 msgid "Maximize"
 msgstr "كبّر"

-#: extensions/window-list/extension.js:420
+#: ../extensions/window-list/extension.js:403
 msgid "Minimize all"
 msgstr "صغّر الكل"

-#: extensions/window-list/extension.js:428
+#: ../extensions/window-list/extension.js:411
 msgid "Unminimize all"
 msgstr "ألغِ تصغير الكل"

-#: extensions/window-list/extension.js:436
+#: ../extensions/window-list/extension.js:419
 msgid "Maximize all"
 msgstr "كبّر الكل"

-#: extensions/window-list/extension.js:445
+#: ../extensions/window-list/extension.js:428
 msgid "Unmaximize all"
 msgstr "ألغِ تكبير الكل"

-#: extensions/window-list/extension.js:454
+#: ../extensions/window-list/extension.js:437
 msgid "Close all"
 msgstr "أغلق الكل"

-#: extensions/window-list/extension.js:678
-#: extensions/workspace-indicator/extension.js:30
+#: ../extensions/window-list/extension.js:661
+#: ../extensions/workspace-indicator/extension.js:30
 msgid "Workspace Indicator"
 msgstr "مؤشر مساحات العمل"

-#: extensions/window-list/extension.js:842
+#: ../extensions/window-list/extension.js:820
 msgid "Window List"
 msgstr "قائمة النوافذ"

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:12
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:1
 msgid "When to group windows"
 msgstr "متى تجمّع النوافذ"

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:2
 msgid ""
 "Decides when to group windows from the same application on the window list. "
-"Possible values are “never”, “auto” and “always”."
+"Possible values are \"never\", \"auto\" and \"always\"."
 msgstr ""
-"يقرر متى تجمع نوافذ نفس التطبيق في قائمة النوافذ. القيم الممكنة هي ”never“،‏ "
-"”auto“ و ”always“."
+"يقرر متى تجمع نوافذ نفس التطبيق في قائمة النوافذ. القيم الممكنة هي \"never"
+"\"، \"auto\" و \"always\"."

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:3
 msgid "Show the window list on all monitors"
-msgstr "اعرض قائمة النوافذ على كل الشاشات"
+msgstr ""

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:4
 msgid ""
 "Whether to show the window list on all connected monitors or only on the "
 "primary one."
 msgstr ""
-"ما إذا كانت قائمة النوافذ ستعرض على كل الشاشات المتصلة أم الشاشة الرئيسية."

-#: extensions/window-list/prefs.js:32
+#: ../extensions/window-list/prefs.js:32
 msgid "Window Grouping"
 msgstr "تجميع النوافذ"

-#: extensions/window-list/prefs.js:50
+#: ../extensions/window-list/prefs.js:50
 msgid "Never group windows"
 msgstr "لا تجمّع النوافذ أبدا"

-#: extensions/window-list/prefs.js:51
+#: ../extensions/window-list/prefs.js:51
 msgid "Group windows when space is limited"
 msgstr "جمّع النوافذ عندما تكون المساحة محدودة"

-#: extensions/window-list/prefs.js:52
+#: ../extensions/window-list/prefs.js:52
 msgid "Always group windows"
 msgstr "جمّع النوافذ دائما"

-#: extensions/window-list/prefs.js:75
+#: ../extensions/window-list/prefs.js:75
 msgid "Show on all monitors"
-msgstr "اعرض على كل الشاشات"
+msgstr ""

-#: extensions/workspace-indicator/prefs.js:141
+#: ../extensions/workspace-indicator/prefs.js:141
+#, fuzzy
 msgid "Workspace Names"
 msgstr "أسماء مساحات العمل"

-#: extensions/workspace-indicator/prefs.js:157
+#: ../extensions/workspace-indicator/prefs.js:157
 msgid "Name"
 msgstr "الاسم"

-#: extensions/workspace-indicator/prefs.js:198
+#: ../extensions/workspace-indicator/prefs.js:198
 #, javascript-format
 msgid "Workspace %d"
 msgstr "مساحة العمل %Id"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Florian Müllner	15080613bc	Bump version to 3.18.4 Update NEWS.	2016-03-03 17:47:18 +01:00
Florian Müllner	2383462a60	apps-menu: Catch menu tree entries we can't resolve to an app The default .menu file still contains a number of legacy directories that have been deprecated for over 15 years, which GIO (and in extension the shell's AppSystem) ignore. Encountering such an entry currently triggers an exception and an entire category ends up empty, fix this by silently skipping over the offending entry. https://bugzilla.gnome.org/show_bug.cgi?id=759004	2016-03-03 17:42:24 +01:00
Florian Müllner	c0920301b4	Bump version to 3.18.3 Update NEWS.	2016-01-09 10:35:23 +01:00
Florian Müllner	5a46645948	apps-menu: Fix .desktop entries in subdirectories GMenu's TreeEntries return an AppInfo that is created from the .desktop filename, not from a desktop ID as expected by the AppSystem. As a result, g_app_info_get_id() will simply return the file's basename, which only matches the desktop ID if no prefix-to-subdirectory mapping as described in the menu spec is involved. Fix this by basing the app lookup on the entry's desktop ID instead of the AppInfo. https://bugzilla.gnome.org/show_bug.cgi?id=759004	2016-01-09 10:29:57 +01:00
Florian Müllner	7c247e6b84	apps-menu: Remove unused variable https://bugzilla.gnome.org/show_bug.cgi?id=759004	2016-01-09 10:29:54 +01:00
Florian Müllner	fc15dfa3d7	Bump version to 3.18.2 Update NEWS.	2015-11-12 13:25:32 +01:00
Jakub Steiner	adadc96146	window-list button colors - not sure I win the override game https://bugzilla.gnome.org/show_bug.cgi?id=756807	2015-10-30 19:53:28 +01:00
Jakub Steiner	8b0263cf83	make spinner 60fps & 16x16px https://bugzilla.gnome.org/show_bug.cgi?id=756888	2015-10-21 14:18:19 +02:00
				`@@ -0,0 +1 @@`
				`/* This extensions requires no special styling */`